From fc2b9f6772c63bc9ca60f49e1e83fdef5414f44c Mon Sep 17 00:00:00 2001
From: Tamir <tamircher123@gmail.com>
Date: Fri, 5 Jun 2026 18:52:03 +0000
Subject: [PATCH] =?UTF-8?q?feat(telegram):=20multi-session=20threads=20?=
 =?UTF-8?q?=E2=80=94=20topics=20run=20in=20parallel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Each Telegram topic already gets its own session and the runner keeps
independent per-thread serial queues (threadQueues), but the handler
gated every incoming message on the global isMainBusy() — any in-flight
run anywhere blocked all topics.

Add per-thread busy tracking in the runner (isThreadBusy/isGlobalBusy)
and check only the target topic's queue (or the global session for
non-topic chats), so each topic is a fully independent session running
in parallel. A second message to the same topic still gets the polite
busy reply.
---
 src/commands/telegram.ts |  8 +++++---
 src/runner.ts            | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/commands/telegram.ts b/src/commands/telegram.ts
index d709432a..05d1360b 100644
--- a/src/commands/telegram.ts
+++ b/src/commands/telegram.ts
@@ -1,4 +1,4 @@
-import { ensureProjectClaudeMd, run, runUserMessage, runFork, killActive, isMainBusy, compactCurrentSession, compactCurrentThreadSession, isRateLimited, getRateLimitResetAt, getPermissionMode, setPermissionMode, type PermissionMode } from "../runner";
+import { ensureProjectClaudeMd, run, runUserMessage, runFork, killActive, isThreadBusy, isGlobalBusy, compactCurrentSession, compactCurrentThreadSession, isRateLimited, getRateLimitResetAt, getPermissionMode, setPermissionMode, type PermissionMode } from "../runner";
 import { wrapUntrusted } from "../prompt-safety";
 import { isAllowed } from "../allowlist";
 import { extractErrorDetail } from "../messaging";
@@ -1444,14 +1444,16 @@ async function handleMessage(message: TelegramMessage): Promise<void> {
       );
     }
     const prefixedPrompt = promptParts.join("\n");
-    const busy = isMainBusy();
+    // Per-thread busy check: only reject if THIS topic's queue (or the global
+    // session for non-topic chats) is mid-run. Different topics run in parallel.
+    const busy = sessionKey ? isThreadBusy(sessionKey) : isGlobalBusy();
     const verbose = verboseChats.has(chatId);
     const modelOverride = chatModels.get(chatId);
     let result;
     let streamMsgId: number | null = null;
     let hadToolLines = false;
     if (busy) {
-      await sendMessage(config.token, chatId, "Claude is busy — try again in a moment, or use /fork for a quick parallel task.", threadId);
+      await sendMessage(config.token, chatId, "Claude is still working on the previous message in this topic — try again in a moment, or use /fork for a quick parallel task.", threadId);
       return;
     } else {
       const stream = makeStreamCallback(config.token, chatId, threadId, { verbose });
diff --git a/src/runner.ts b/src/runner.ts
index 7d0ee6a1..00cacd2c 100644
--- a/src/runner.ts
+++ b/src/runner.ts
@@ -298,6 +298,22 @@ export function isMainBusy(): boolean {
   return mainRunCount > 0;
 }
 
+// Busy state per thread queue + global queue, so handlers can allow
+// parallel runs across different topics/threads while still rejecting
+// a second message to the SAME thread (or the global session).
+const busyThreads = new Set<string>();
+let busyGlobalCount = 0;
+
+/** True while THIS thread's queue is processing a task. */
+export function isThreadBusy(threadId: string): boolean {
+  return busyThreads.has(threadId);
+}
+
+/** True while a global-session (non-thread) run is in flight. */
+export function isGlobalBusy(): boolean {
+  return busyGlobalCount > 0;
+}
+
 function extractRateLimitMessage(stdout: string, stderr: string): string | null {
   const candidates = [stdout, stderr];
   for (const text of candidates) {
@@ -1031,6 +1047,7 @@ async function execClaude(
   onToolEvent?: (line: string) => void
 ): Promise<RunResult> {
   mainRunCount++;
+  if (threadId) busyThreads.add(threadId); else busyGlobalCount++;
   persistRunCount();
   try {
   await mkdir(LOGS_DIR, { recursive: true });
@@ -1426,6 +1443,7 @@ async function execClaude(
   return result;
   } finally {
     mainRunCount--;
+    if (threadId) busyThreads.delete(threadId); else busyGlobalCount = Math.max(0, busyGlobalCount - 1);
     persistRunCount();
   }
 }