@grinev/opencode-telegram-bot 0.17.0 → 0.18.0

package/dist/bot/index.js

@@ -66,7 +66,11 @@ import { scheduledTaskRuntime } from "../scheduled-task/runtime.js";
 import { assistantRunState } from "./assistant-run-state.js";
 import { ResponseStreamer } from "./streaming/response-streamer.js";
 import { ToolCallStreamer } from "./streaming/tool-call-streamer.js";
+import { attachManager } from "../attach/manager.js";
+import { markAttachedSessionBusy, markAttachedSessionIdle, restoreAttachedCurrentSession, } from "../attach/service.js";
+import { externalUserInputSuppressionManager } from "../external-input/suppression.js";
 import { prepareAssistantFinalStreamingPayload, prepareAssistantStreamingPayload, renderAssistantFinalPartsSafe, } from "./utils/assistant-rendering.js";
+import { deliverExternalUserInputNotification } from "./utils/external-user-input.js";
 let botInstance = null;
 let chatIdInstance = null;
 let commandsInitialized = false;
@@ -263,6 +267,27 @@ function getToolStreamKey(tool) {
     }
     return "default";
 }
+function getEventSessionId(event) {
+    const properties = event.properties;
+    return properties.sessionID || properties.info?.sessionID || properties.part?.sessionID || null;
+}
+function shouldMarkAttachedBusyFromEvent(event) {
+    switch (event.type) {
+        case "session.status":
+            return event.properties.status?.type === "busy";
+        case "message.updated": {
+            const info = event.properties.info;
+            return info?.role === "assistant" && !info.time?.completed;
+        }
+        case "message.part.updated":
+        case "message.part.delta":
+        case "question.asked":
+        case "permission.asked":
+            return true;
+        default:
+            return false;
+    }
+}
 async function ensureCommandsInitialized(ctx, next) {
     if (commandsInitialized || !ctx.from || ctx.from.id !== config.telegram.allowedUserId) {
         await next();
@@ -388,6 +413,26 @@ async function ensureEventSubscription(directory) {
             }
         });
     });
+    summaryAggregator.setOnExternalUserInput(async (sessionId, _messageId, messageText) => {
+        void enqueueSessionCompletionTask(sessionId, async () => {
+            if (!botInstance || !chatIdInstance) {
+                return;
+            }
+            try {
+                await deliverExternalUserInputNotification({
+                    api: botInstance.api,
+                    chatId: chatIdInstance,
+                    currentSessionId: getCurrentSession()?.id ?? null,
+                    sessionId,
+                    text: messageText,
+                    consumeSuppressedInput: (incomingSessionId, incomingText) => externalUserInputSuppressionManager.consume(incomingSessionId, incomingText),
+                });
+            }
+            catch (err) {
+                logger.error("[Bot] Failed to deliver external user input to Telegram:", err);
+            }
+        });
+    });
     summaryAggregator.setOnTool(async (toolInfo) => {
         if (!botInstance || !chatIdInstance) {
             logger.error("Bot or chat ID not available for sending tool notification");
@@ -461,18 +506,19 @@ async function ensureEventSubscription(directory) {
             logger.error("Failed to send file to Telegram:", err);
         }
     });
-    summaryAggregator.setOnQuestion(async (questions, requestID) => {
+    summaryAggregator.setOnQuestion(async (questions, requestID, sessionId) => {
         if (!botInstance || !chatIdInstance) {
             logger.error("Bot or chat ID not available for showing questions");
             return;
         }
         const currentSession = getCurrentSession();
-        if (currentSession) {
-            await Promise.all([
-                toolMessageBatcher.flushSession(currentSession.id, "question_asked"),
-                toolCallStreamer.flushSession(currentSession.id, "question_asked"),
-            ]);
+        if (!currentSession || currentSession.id !== sessionId) {
+            return;
         }
+        await Promise.all([
+            toolMessageBatcher.flushSession(currentSession.id, "question_asked"),
+            toolCallStreamer.flushSession(currentSession.id, "question_asked"),
+        ]);
         if (questionManager.isActive()) {
             logger.warn("[Bot] Replacing active poll with a new one");
             const previousMessageIds = questionManager.getMessageIds();
@@ -503,6 +549,10 @@ async function ensureEventSubscription(directory) {
             logger.error("Bot or chat ID not available for showing permission request");
             return;
         }
+        const currentSession = getCurrentSession();
+        if (!currentSession || currentSession.id !== request.sessionID) {
+            return;
+        }
         await Promise.all([
             toolMessageBatcher.flushSession(request.sessionID, "permission_asked"),
             toolCallStreamer.flushSession(request.sessionID, "permission_asked"),
@@ -583,6 +633,7 @@ async function ensureEventSubscription(directory) {
         }
     });
     summaryAggregator.setOnSessionIdle(async (sessionId) => {
+        await markAttachedSessionIdle(sessionId);
         await sessionCompletionTasks.get(sessionId)?.catch(() => undefined);
         const completedRun = assistantRunState.finishRun(sessionId, "session_idle");
         clearPromptResponseMode(sessionId);
@@ -627,6 +678,7 @@ async function ensureEventSubscription(directory) {
         }
     });
     summaryAggregator.setOnSessionError(async (sessionId, message) => {
+        await markAttachedSessionIdle(sessionId);
         if (!botInstance || !chatIdInstance) {
             clearPromptResponseMode(sessionId);
             assistantRunState.clearRun(sessionId, "session_error_no_bot_context");
@@ -706,6 +758,11 @@ async function ensureEventSubscription(directory) {
     });
     logger.info(`[Bot] Subscribing to OpenCode events for project: ${directory}`);
     subscribeToEvents(directory, (event) => {
+        const attached = attachManager.getSnapshot();
+        const eventSessionId = getEventSessionId(event);
+        if (attached && eventSessionId === attached.sessionId && shouldMarkAttachedBusyFromEvent(event)) {
+            void markAttachedSessionBusy(attached.sessionId);
+        }
         if (event.type === "session.created" || event.type === "session.updated") {
             const info = event.properties.info;
             if (info?.directory) {
@@ -723,6 +780,7 @@ async function ensureEventSubscription(directory) {
 export function createBot() {
     clearAllInteractionState("bot_startup");
     sessionCompletionTasks.clear();
+    attachManager.clear("bot_startup");
     assistantRunState.clearAll("bot_startup");
     if (heartbeatTimer) {
         clearInterval(heartbeatTimer);
@@ -748,6 +806,8 @@ export function createBot() {
         };
     }
     const bot = new Bot(config.telegram.token, botOptions);
+    botInstance = bot;
+    chatIdInstance = config.telegram.allowedUserId;
     // Heartbeat for diagnostics: verify the event loop is not blocked
     let heartbeatCounter = 0;
     heartbeatTimer = setInterval(() => {
@@ -806,7 +866,7 @@ export function createBot() {
     bot.command("worktree", worktreeCommand);
     bot.command("open", openCommand);
     bot.command("sessions", sessionsCommand);
-    bot.command("new", newCommand);
+    bot.command("new", (ctx) => newCommand(ctx, { bot, ensureEventSubscription }));
     bot.command("abort", abortCommand);
     bot.command("task", taskCommand);
     bot.command("tasklist", taskListCommand);
@@ -827,7 +887,7 @@ export function createBot() {
                 // Clean up path index when the open-directory menu is cancelled
                 clearOpenPathIndex();
             }
-            const handledSession = await handleSessionSelect(ctx);
+            const handledSession = await handleSessionSelect(ctx, { bot, ensureEventSubscription });
             const handledProject = await handleProjectSelect(ctx);
             const handledWorktree = await handleWorktreeCallback(ctx);
             const handledOpen = await handleOpenCallback(ctx);
@@ -960,6 +1020,14 @@ export function createBot() {
     });
     // Voice and audio message handlers (STT transcription -> prompt)
     const voicePromptDeps = { bot, ensureEventSubscription };
+    safeBackgroundTask({
+        taskName: "bot.restoreFollowedSession",
+        task: () => restoreAttachedCurrentSession({
+            bot,
+            chatId: config.telegram.allowedUserId,
+            ensureEventSubscription,
+        }),
+    });
     bot.on("message:voice", async (ctx) => {
         logger.debug(`[Bot] Received voice message, chatId=${ctx.chat.id}`);
         botInstance = bot;

package/dist/bot/middleware/interaction-guard.js

@@ -80,7 +80,7 @@ export async function interactionGuardMiddleware(ctx, next) {
     const message = decision.busy
         ? decision.state?.kind === "question" || decision.state?.kind === "permission"
             ? getInteractionBlockedMessage(decision.reason, decision.state.kind)
-            : t("interaction.blocked.finish_current")
+            : t("bot.session_busy")
         : getInteractionBlockedMessage(decision.reason, decision.state?.kind);
     logger.debug(`[InteractionGuard] Blocked input: interactionKind=${decision.state?.kind || "none"}, inputType=${decision.inputType}, reason=${decision.reason || "unknown"}, command=${decision.command || "-"}, busy=${decision.busy ? "yes" : "no"}`);
     if (ctx.callbackQuery) {

package/dist/bot/utils/busy-guard.js

@@ -1,10 +1,11 @@
 import { foregroundSessionState } from "../../scheduled-task/foreground-state.js";
+import { attachManager } from "../../attach/manager.js";
 import { t } from "../../i18n/index.js";
 export function isForegroundBusy() {
-    return foregroundSessionState.isBusy();
+    return foregroundSessionState.isBusy() || attachManager.isBusy();
 }
 export async function replyBusyBlocked(ctx) {
-    const message = t("interaction.blocked.finish_current");
+    const message = t("bot.session_busy");
     if (ctx.callbackQuery) {
         await ctx.answerCallbackQuery({ text: message }).catch(() => { });
         return;

package/dist/bot/utils/external-user-input.js

@@ -0,0 +1,46 @@
+import { t } from "../../i18n/index.js";
+import { escapePlainTextForTelegramMarkdownV2 } from "../../summary/formatter.js";
+import { sendBotText } from "./telegram-text.js";
+function normalizeExternalUserInputText(text) {
+    return text.replace(/\r\n/g, "\n").trim();
+}
+function buildQuotedPlainText(text) {
+    return text
+        .split("\n")
+        .map((line) => (line.length > 0 ? `> ${line}` : ">"))
+        .join("\n");
+}
+function buildQuotedMarkdownText(text) {
+    return text
+        .split("\n")
+        .map((line) => line.length > 0 ? `> ${escapePlainTextForTelegramMarkdownV2(line)}` : ">")
+        .join("\n");
+}
+export function buildExternalUserInputNotification(text) {
+    const normalizedText = normalizeExternalUserInputText(text);
+    if (!normalizedText) {
+        return null;
+    }
+    const title = `👤 ${t("bot.external_user_input")}`;
+    return {
+        text: `${escapePlainTextForTelegramMarkdownV2(title)}\n\n${buildQuotedMarkdownText(normalizedText)}`,
+        rawFallbackText: `${title}\n\n${buildQuotedPlainText(normalizedText)}`,
+    };
+}
+export async function deliverExternalUserInputNotification({ api, chatId, currentSessionId, sessionId, text, consumeSuppressedInput, }) {
+    const notification = buildExternalUserInputNotification(text);
+    if (!notification || currentSessionId !== sessionId) {
+        return false;
+    }
+    if (consumeSuppressedInput(sessionId, text)) {
+        return false;
+    }
+    await sendBotText({
+        api,
+        chatId,
+        text: notification.text,
+        rawFallbackText: notification.rawFallbackText,
+        format: "markdown_v2",
+    });
+    return true;
+}

package/dist/bot/utils/switch-project.js

@@ -3,6 +3,7 @@ import { clearSession } from "../../session/manager.js";
 import { summaryAggregator } from "../../summary/aggregator.js";
 import { pinnedMessageManager } from "../../pinned/manager.js";
 import { keyboardManager } from "../../keyboard/manager.js";
+import { detachAttachedSession } from "../../attach/service.js";
 import { getStoredAgent, resolveProjectAgent } from "../../agent/manager.js";
 import { getStoredModel } from "../../model/manager.js";
 import { formatVariantForButton } from "../../variant/manager.js";
@@ -23,6 +24,7 @@ import { logger } from "../../utils/logger.js";
  * @param reason    short tag for `clearAllInteractionState` (e.g. "project_switched")
  */
 export async function switchToProject(ctx, project, reason) {
+    detachAttachedSession(reason);
     setCurrentProject(project);
     clearSession();
     summaryAggregator.clear();

package/dist/external-input/suppression.js

@@ -0,0 +1,54 @@
+const SUPPRESSION_TTL_MS = 60_000;
+function normalizeExternalUserInputText(text) {
+    return text.replace(/\r\n/g, "\n").trim();
+}
+class ExternalUserInputSuppressionManager {
+    entriesBySession = new Map();
+    register(sessionId, text, now = Date.now()) {
+        const normalizedText = normalizeExternalUserInputText(text);
+        if (!sessionId || !normalizedText) {
+            return;
+        }
+        this.prune(now);
+        const sessionEntries = this.entriesBySession.get(sessionId) ?? [];
+        sessionEntries.push({ text: normalizedText, createdAt: now });
+        this.entriesBySession.set(sessionId, sessionEntries);
+    }
+    consume(sessionId, text, now = Date.now()) {
+        const normalizedText = normalizeExternalUserInputText(text);
+        if (!sessionId || !normalizedText) {
+            return false;
+        }
+        this.prune(now);
+        const sessionEntries = this.entriesBySession.get(sessionId);
+        if (!sessionEntries?.length) {
+            return false;
+        }
+        const entryIndex = sessionEntries.findIndex((entry) => entry.text === normalizedText);
+        if (entryIndex < 0) {
+            return false;
+        }
+        sessionEntries.splice(entryIndex, 1);
+        if (sessionEntries.length === 0) {
+            this.entriesBySession.delete(sessionId);
+        }
+        return true;
+    }
+    clearAll() {
+        this.entriesBySession.clear();
+    }
+    __resetForTests() {
+        this.clearAll();
+    }
+    prune(now) {
+        for (const [sessionId, sessionEntries] of this.entriesBySession.entries()) {
+            const activeEntries = sessionEntries.filter((entry) => now - entry.createdAt <= SUPPRESSION_TTL_MS);
+            if (activeEntries.length === 0) {
+                this.entriesBySession.delete(sessionId);
+                continue;
+            }
+            this.entriesBySession.set(sessionId, activeEntries);
+        }
+    }
+}
+export const externalUserInputSuppressionManager = new ExternalUserInputSuppressionManager();

package/dist/i18n/de.js

@@ -48,6 +48,7 @@ export const de = {
     "bot.prompt_send_error": "Anfrage konnte nicht an OpenCode gesendet werden.",
     "bot.session_error": "🔴 OpenCode meldete einen Fehler: {message}",
     "bot.session_retry": "🔁 {message}\n\nDer Provider liefert bei wiederholten Versuchen immer wieder denselben Fehler. Mit /abort abbrechen.",
+    "bot.external_user_input": "Externe Benutzereingabe",
     "bot.unknown_command": "⚠️ Unbekannter Befehl: {command}. Nutze /help, um verfügbare Befehle zu sehen.",
     "bot.photo_downloading": "⏳ Lade Foto herunter...",
     "bot.photo_too_large": "⚠️ Foto ist zu groß (max. {maxSizeMb}MB)",
@@ -113,6 +114,17 @@ export const de = {
     "sessions.preview.title": "Letzte Nachrichten:",
     "sessions.preview.you": "Du:",
     "sessions.preview.agent": "Agent:",
+    "attach.project_not_selected": "🏗 Projekt ist nicht ausgewählt.\n\nWähle zuerst ein Projekt mit /projects.",
+    "attach.session_not_selected": "💬 Keine Sitzung ausgewählt.\n\nWähle zuerst mit /sessions eine Sitzung aus.",
+    "attach.session_project_mismatch": "⚠️ Die ausgewählte Sitzung passt nicht zum aktuellen Projekt. Wähle sie über /sessions erneut aus.",
+    "attach.connected": "✅ Mit Sitzung verbunden: {title}",
+    "attach.already_connected": "ℹ️ Bereits mit Sitzung verbunden: {title}",
+    "attach.status.idle_message": "Status: idle. Warte auf neue Ereignisse.",
+    "attach.status.busy_message": "Status: busy. Neue Prompts sind vorübergehend blockiert.",
+    "attach.restored_question": "Eine ausstehende Frage für diese Sitzung wurde wiederhergestellt.",
+    "attach.restored_permissions": "Ausstehende Berechtigungsanfragen wiederhergestellt: {count}.",
+    "attach.disconnect_hint": "Zum Trennen einfach zu einer anderen Sitzung oder einem anderen Projekt wechseln.",
+    "attach.error": "🔴 Verbindung mit der aktuellen Sitzung fehlgeschlagen.",
     "new.project_not_selected": "🏗 Projekt ist nicht ausgewählt.\n\nWähle zuerst ein Projekt mit /projects.",
     "new.created": "✅ Neue Sitzung erstellt: {title}",
     "new.create_error": "🔴 OpenCode-Server ist nicht verfügbar oder beim Erstellen der Sitzung ist ein Fehler aufgetreten.",
@@ -232,6 +244,9 @@ export const de = {
     "pinned.line.project": "Projekt: {project}",
     "pinned.line.worktree": "Worktree: {worktree}",
     "pinned.line.model": "Modell: {model}",
+    "pinned.line.attach": "Tracking: {status}",
+    "pinned.attach.status.idle": "aktiv, idle",
+    "pinned.attach.status.busy": "aktiv, busy",
     "pinned.line.context": "Kontext: {used} / {limit} ({percent}%)",
     "pinned.line.cost": "Kosten: {cost} ausgegeben",
     "subagent.header": "Subagent {agent}: {description}",

package/dist/i18n/en.js

@@ -48,6 +48,7 @@ export const en = {
     "bot.prompt_send_error": "Failed to send request to OpenCode.",
     "bot.session_error": "🔴 OpenCode returned an error: {message}",
     "bot.session_retry": "🔁 {message}\n\nProvider keeps returning the same error on repeated retries. Use /abort to abort.",
+    "bot.external_user_input": "External user input",
     "bot.unknown_command": "⚠️ Unknown command: {command}. Use /help to see available commands.",
     "bot.photo_downloading": "⏳ Downloading photo...",
     "bot.photo_too_large": "⚠️ Photo is too large (max {maxSizeMb}MB)",
@@ -113,6 +114,17 @@ export const en = {
     "sessions.preview.title": "Recent messages:",
     "sessions.preview.you": "You:",
     "sessions.preview.agent": "Agent:",
+    "attach.project_not_selected": "🏗 Project is not selected.\n\nFirst select a project with /projects.",
+    "attach.session_not_selected": "💬 Session is not selected.\n\nFirst choose a session with /sessions.",
+    "attach.session_project_mismatch": "⚠️ The selected session does not match the current project. Choose the session again via /sessions.",
+    "attach.connected": "✅ Connected to session: {title}",
+    "attach.already_connected": "ℹ️ Already connected to session: {title}",
+    "attach.status.idle_message": "Status: idle. Waiting for new events.",
+    "attach.status.busy_message": "Status: busy. New prompts are temporarily blocked.",
+    "attach.restored_question": "Recovered a pending question for this session.",
+    "attach.restored_permissions": "Recovered pending permission requests: {count}.",
+    "attach.disconnect_hint": "To disconnect, switch to another session or project.",
+    "attach.error": "🔴 Failed to attach to the current session.",
     "new.project_not_selected": "🏗 Project is not selected.\n\nFirst select a project with /projects.",
     "new.created": "✅ New session created: {title}",
     "new.create_error": "🔴 OpenCode Server is unavailable or an error occurred while creating session.",
@@ -232,6 +244,9 @@ export const en = {
     "pinned.line.project": "Project: {project}",
     "pinned.line.worktree": "Worktree: {worktree}",
     "pinned.line.model": "Model: {model}",
+    "pinned.line.attach": "Tracking: {status}",
+    "pinned.attach.status.idle": "active, idle",
+    "pinned.attach.status.busy": "active, busy",
     "pinned.line.context": "Context: {used} / {limit} ({percent}%)",
     "pinned.line.cost": "Cost: {cost} spent",
     "subagent.header": "Subagent {agent}: {description}",

package/dist/i18n/es.js

@@ -48,6 +48,7 @@ export const es = {
     "bot.prompt_send_error": "No se pudo enviar la solicitud a OpenCode.",
     "bot.session_error": "🔴 OpenCode devolvió un error: {message}",
     "bot.session_retry": "🔁 {message}\n\nEl proveedor devuelve el mismo error en intentos repetidos. Usa /abort para detenerlo.",
+    "bot.external_user_input": "Entrada externa del usuario",
     "bot.unknown_command": "⚠️ Comando desconocido: {command}. Usa /help para ver los comandos disponibles.",
     "bot.photo_downloading": "⏳ Descargando foto...",
     "bot.photo_too_large": "⚠️ La foto es demasiado grande (max {maxSizeMb}MB)",
@@ -113,6 +114,17 @@ export const es = {
     "sessions.preview.title": "Mensajes recientes:",
     "sessions.preview.you": "Tú:",
     "sessions.preview.agent": "Agente:",
+    "attach.project_not_selected": "🏗 No hay un proyecto seleccionado.\n\nPrimero selecciona un proyecto con /projects.",
+    "attach.session_not_selected": "💬 No hay una sesión seleccionada.\n\nPrimero selecciona una sesión con /sessions.",
+    "attach.session_project_mismatch": "⚠️ La sesión seleccionada no coincide con el proyecto actual. Vuelve a seleccionarla con /sessions.",
+    "attach.connected": "✅ Conectado a la sesión: {title}",
+    "attach.already_connected": "ℹ️ Ya estás conectado a la sesión: {title}",
+    "attach.status.idle_message": "Estado: idle. Esperando nuevos eventos.",
+    "attach.status.busy_message": "Estado: busy. Los nuevos prompts están bloqueados temporalmente.",
+    "attach.restored_question": "Se restauró una pregunta pendiente para esta sesión.",
+    "attach.restored_permissions": "Se restauraron solicitudes de permiso pendientes: {count}.",
+    "attach.disconnect_hint": "Para desconectarte, cambia a otra sesión o proyecto.",
+    "attach.error": "🔴 No se pudo conectar a la sesión actual.",
     "new.project_not_selected": "🏗 No hay un proyecto seleccionado.\n\nPrimero selecciona un proyecto con /projects.",
     "new.created": "✅ Sesión nueva creada: {title}",
     "new.create_error": "🔴 OpenCode Server no está disponible u ocurrió un error al crear la sesión.",
@@ -232,6 +244,9 @@ export const es = {
     "pinned.line.project": "Proyecto: {project}",
     "pinned.line.worktree": "Worktree: {worktree}",
     "pinned.line.model": "Modelo: {model}",
+    "pinned.line.attach": "Tracking: {status}",
+    "pinned.attach.status.idle": "activo, idle",
+    "pinned.attach.status.busy": "activo, busy",
     "pinned.line.context": "Contexto: {used} / {limit} ({percent}%)",
     "pinned.line.cost": "Costo: {cost} gastado",
     "subagent.header": "Subagente {agent}: {description}",

package/dist/i18n/fr.js

@@ -48,6 +48,7 @@ export const fr = {
     "bot.prompt_send_error": "Impossible d'envoyer la requête à OpenCode.",
     "bot.session_error": "🔴 OpenCode a renvoyé une erreur : {message}",
     "bot.session_retry": "🔁 {message}\n\nLe fournisseur renvoie la même erreur à chaque nouvelle tentative. Utilisez /abort pour arrêter.",
+    "bot.external_user_input": "Entrée utilisateur externe",
     "bot.unknown_command": "⚠️ Commande inconnue : {command}. Utilisez /help pour voir les commandes disponibles.",
     "bot.photo_downloading": "⏳ Téléchargement de la photo...",
     "bot.photo_too_large": "⚠️ La photo est trop volumineuse (max {maxSizeMb}MB)",
@@ -113,6 +114,17 @@ export const fr = {
     "sessions.preview.title": "Messages récents :",
     "sessions.preview.you": "Vous :",
     "sessions.preview.agent": "Agent :",
+    "attach.project_not_selected": "🏗 Aucun projet sélectionné.\n\nSélectionnez d'abord un projet avec /projects.",
+    "attach.session_not_selected": "💬 Aucune session sélectionnée.\n\nSélectionnez d'abord une session avec /sessions.",
+    "attach.session_project_mismatch": "⚠️ La session sélectionnée ne correspond pas au projet actuel. Sélectionnez-la de nouveau via /sessions.",
+    "attach.connected": "✅ Connecté à la session : {title}",
+    "attach.already_connected": "ℹ️ Déjà connecté à la session : {title}",
+    "attach.status.idle_message": "Statut : idle. En attente de nouveaux événements.",
+    "attach.status.busy_message": "Statut : busy. Les nouveaux prompts sont temporairement bloqués.",
+    "attach.restored_question": "Une question en attente a été restaurée pour cette session.",
+    "attach.restored_permissions": "Demandes de permission en attente restaurées : {count}.",
+    "attach.disconnect_hint": "Pour vous déconnecter, passez simplement à une autre session ou à un autre projet.",
+    "attach.error": "🔴 Impossible de se connecter à la session actuelle.",
     "new.project_not_selected": "🏗 Aucun projet n'est sélectionné.\n\nSélectionnez d'abord un projet avec /projects.",
     "new.created": "✅ Nouvelle session créée : {title}",
     "new.create_error": "🔴 Le serveur OpenCode est indisponible ou une erreur s'est produite lors de la création de la session.",
@@ -232,6 +244,9 @@ export const fr = {
     "pinned.line.project": "Projet : {project}",
     "pinned.line.worktree": "Worktree : {worktree}",
     "pinned.line.model": "Modèle : {model}",
+    "pinned.line.attach": "Tracking : {status}",
+    "pinned.attach.status.idle": "actif, idle",
+    "pinned.attach.status.busy": "actif, busy",
     "pinned.line.context": "Contexte : {used} / {limit} ({percent}%)",
     "pinned.line.cost": "Coût : {cost} dépensé",
     "subagent.header": "Sous-agent {agent} : {description}",

package/dist/i18n/ru.js

@@ -48,6 +48,7 @@ export const ru = {
     "bot.prompt_send_error": "Не удалось отправить запрос в OpenCode.",
     "bot.session_error": "🔴 OpenCode вернул ошибку: {message}",
     "bot.session_retry": "🔁 {message}\n\nПровайдер возвращает одну и ту же ошибку при повторных запросах. Используйте /abort для остановки.",
+    "bot.external_user_input": "Внешний ввод пользователя",
     "bot.unknown_command": "⚠️ Неизвестная команда: {command}. Используйте /help для списка команд.",
     "bot.photo_downloading": "⏳ Скачиваю фото...",
     "bot.photo_too_large": "⚠️ Фото слишком большое (макс. {maxSizeMb}МБ)",
@@ -113,6 +114,17 @@ export const ru = {
     "sessions.preview.title": "Последние сообщения:",
     "sessions.preview.you": "Вы:",
     "sessions.preview.agent": "Агент:",
+    "attach.project_not_selected": "🏗 Проект не выбран.\n\nСначала выберите проект командой /projects.",
+    "attach.session_not_selected": "💬 Сессия не выбрана.\n\nСначала выберите сессию через /sessions.",
+    "attach.session_project_mismatch": "⚠️ Выбранная сессия не соответствует текущему проекту. Повторно выберите сессию через /sessions.",
+    "attach.connected": "✅ Подключился к сессии: {title}",
+    "attach.already_connected": "ℹ️ Уже подключен к сессии: {title}",
+    "attach.status.idle_message": "Статус: idle. Жду новые события.",
+    "attach.status.busy_message": "Статус: busy. Новые промты временно заблокированы.",
+    "attach.restored_question": "Восстановил ожидающий вопрос для этой сессии.",
+    "attach.restored_permissions": "Восстановил ожидающие запросы разрешений: {count}.",
+    "attach.disconnect_hint": "Чтобы отключиться, переключитесь на другую сессию или проект.",
+    "attach.error": "🔴 Не удалось подключиться к текущей сессии.",
     "new.project_not_selected": "🏗 Проект не выбран.\n\nСначала выберите проект командой /projects.",
     "new.created": "✅ Создана новая сессия: {title}",
     "new.create_error": "🔴 OpenCode Server недоступен или произошла ошибка при создании сессии.",
@@ -232,6 +244,9 @@ export const ru = {
     "pinned.line.project": "Проект: {project}",
     "pinned.line.worktree": "Worktree: {worktree}",
     "pinned.line.model": "Модель: {model}",
+    "pinned.line.attach": "Tracking: {status}",
+    "pinned.attach.status.idle": "активен, idle",
+    "pinned.attach.status.busy": "активен, busy",
     "pinned.line.context": "Контекст: {used} / {limit} ({percent}%)",
     "pinned.line.cost": "Стоимость: {cost} потрачено",
     "subagent.header": "Сабагент {agent}: {description}",

package/dist/i18n/zh.js

@@ -48,6 +48,7 @@ export const zh = {
     "bot.prompt_send_error": "向 OpenCode 发送请求失败。",
     "bot.session_error": "🔴 OpenCode 返回错误：{message}",
     "bot.session_retry": "🔁 {message}\n\n提供方在重复重试时持续返回同一错误。使用 /abort 可停止。",
+    "bot.external_user_input": "外部用户输入",
     "bot.unknown_command": "⚠️ 未知命令：{command}。使用 /help 查看可用命令。",
     "bot.photo_downloading": "⏳ 正在下载照片...",
     "bot.photo_too_large": "⚠️ 照片过大（最大 {maxSizeMb}MB）",
@@ -113,6 +114,17 @@ export const zh = {
     "sessions.preview.title": "最近消息：",
     "sessions.preview.you": "你：",
     "sessions.preview.agent": "代理：",
+    "attach.project_not_selected": "🏗 未选择项目。\n\n请先使用 /projects 选择一个项目。",
+    "attach.session_not_selected": "💬 未选择会话。\n\n请先使用 /sessions 选择一个会话。",
+    "attach.session_project_mismatch": "⚠️ 选中的会话与当前项目不匹配。请通过 /sessions 重新选择。",
+    "attach.connected": "✅ 已连接到会话：{title}",
+    "attach.already_connected": "ℹ️ 已经连接到会话：{title}",
+    "attach.status.idle_message": "状态：idle。正在等待新事件。",
+    "attach.status.busy_message": "状态：busy。新的提示词暂时被阻止。",
+    "attach.restored_question": "已恢复该会话的待处理问题。",
+    "attach.restored_permissions": "已恢复待处理权限请求：{count}。",
+    "attach.disconnect_hint": "如需断开连接，只需切换到其他会话或项目。",
+    "attach.error": "🔴 无法连接到当前会话。",
     "new.project_not_selected": "🏗 未选择项目。\n\n请先使用 /projects 选择一个项目。",
     "new.created": "✅ 新会话已创建：{title}",
     "new.create_error": "🔴 OpenCode 服务器不可用，或创建会话时发生错误。",
@@ -232,6 +244,9 @@ export const zh = {
     "pinned.line.project": "项目: {project}",
     "pinned.line.worktree": "Worktree: {worktree}",
     "pinned.line.model": "模型: {model}",
+    "pinned.line.attach": "Tracking: {status}",
+    "pinned.attach.status.idle": "active, idle",
+    "pinned.attach.status.busy": "active, busy",
     "pinned.line.context": "上下文: {used} / {limit} ({percent}%)",
     "pinned.line.cost": "费用: {cost}",
     "subagent.header": "子代理 {agent}: {description}",

package/dist/interaction/guard.js

@@ -1,6 +1,7 @@
 import { interactionManager } from "./manager.js";
 import { allowsBusyInteraction, isBusyAllowedCommand } from "./busy.js";
 import { foregroundSessionState } from "../scheduled-task/foreground-state.js";
+import { attachManager } from "../attach/manager.js";
 function normalizeIncomingCommand(text) {
     const trimmed = text.trim();
     if (!trimmed.startsWith("/")) {
@@ -83,7 +84,7 @@ function isAllowedTaskCallback(ctx, state) {
 export function resolveInteractionGuardDecision(ctx) {
     const state = interactionManager.getSnapshot();
     const { inputType, command } = classifyIncomingInput(ctx);
-    const isBusy = foregroundSessionState.isBusy();
+    const isBusy = foregroundSessionState.isBusy() || attachManager.isBusy();
     if (state && interactionManager.isExpired()) {
         interactionManager.clear("expired");
         return createBlockDecision(inputType, state, "expired", command, isBusy);

package/dist/opencode/events.js

@@ -8,6 +8,7 @@ let eventCallback = null;
 let isListening = false;
 let activeDirectory = null;
 let streamAbortController = null;
+let listenerGeneration = 0;
 function getReconnectDelayMs(attempt) {
     const exponentialDelay = RECONNECT_BASE_DELAY_MS * Math.pow(2, Math.max(0, attempt - 1));
     return Math.min(exponentialDelay, RECONNECT_MAX_DELAY_MS);
@@ -44,6 +45,7 @@ export async function subscribeToEvents(directory, callback) {
         activeDirectory = null;
     }
     const controller = new AbortController();
+    const generation = ++listenerGeneration;
     activeDirectory = directory;
     eventCallback = callback;
     isListening = true;
@@ -70,7 +72,16 @@ export async function subscribeToEvents(directory, callback) {
                         // Use setImmediate to avoid blocking the event loop
                         // and let grammY process incoming Telegram updates
                         const callbackSnapshot = eventCallback;
-                        setImmediate(() => callbackSnapshot(event));
+                        setImmediate(() => {
+                            if (streamAbortController !== controller ||
+                                controller.signal.aborted ||
+                                !isListening ||
+                                activeDirectory !== directory ||
+                                listenerGeneration !== generation) {
+                                return;
+                            }
+                            callbackSnapshot(event);
+                        });
                     }
                 }
                 eventStream = null;
@@ -130,6 +141,7 @@ export async function subscribeToEvents(directory, callback) {
     }
 }
 export function stopEventListening() {
+    listenerGeneration++;
     streamAbortController?.abort();
     streamAbortController = null;
     isListening = false;