@grinev/opencode-telegram-bot 0.17.0 → 0.18.0

package/dist/pinned/manager.js

@@ -15,6 +15,8 @@ class PinnedMessageManager {
         chatId: null,
         sessionId: null,
         sessionTitle: t("pinned.default_session_title"),
+        attachActive: false,
+        attachBusy: false,
         projectPath: "",
         projectBranch: null,
         projectWorktreePath: null,
@@ -55,6 +57,8 @@ class PinnedMessageManager {
         // Update state
         this.state.sessionId = sessionId;
         this.state.sessionTitle = sessionTitle || t("pinned.default_session_title");
+        this.state.attachActive = false;
+        this.state.attachBusy = false;
         await this.refreshProjectMetadata();
         // Fetch context limit for current model
         await this.fetchContextLimit();
@@ -83,6 +87,15 @@ class PinnedMessageManager {
             await this.updatePinnedMessage();
         }
     }
+    async setAttachState(active, busy) {
+        const nextBusy = active ? busy : false;
+        if (this.state.attachActive === active && this.state.attachBusy === nextBusy) {
+            return;
+        }
+        this.state.attachActive = active;
+        this.state.attachBusy = nextBusy;
+        await this.updatePinnedMessage();
+    }
     /**
      * Load context token usage from session history
      */
@@ -672,6 +685,9 @@ class PinnedMessageManager {
             // Just reset state if not initialized
             this.state.messageId = null;
             this.state.sessionId = null;
+            this.state.sessionTitle = t("pinned.default_session_title");
+            this.state.attachActive = false;
+            this.state.attachBusy = false;
             this.state.tokensUsed = 0;
             this.state.tokensLimit = 0;
             this.state.projectPath = "";
@@ -691,6 +707,8 @@ class PinnedMessageManager {
             this.state.messageId = null;
             this.state.sessionId = null;
             this.state.sessionTitle = t("pinned.default_session_title");
+            this.state.attachActive = false;
+            this.state.attachBusy = false;
             this.state.projectPath = "";
             this.state.projectBranch = null;
             this.state.projectWorktreePath = null;

package/dist/summary/aggregator.js

@@ -32,6 +32,7 @@ class SummaryAggregator {
     lastUpdated = 0;
     onCompleteCallback = null;
     onPartialCallback = null;
+    onExternalUserInputCallback = null;
     onToolCallback = null;
     onToolFileCallback = null;
     onQuestionCallback = null;
@@ -50,6 +51,7 @@ class SummaryAggregator {
     onClearedCallback = null;
     processedToolStates = new Set();
     thinkingFiredForMessages = new Set();
+    deliveredExternalUserMessageIds = new Set();
     knownTextPartIds = new Map();
     bot = null;
     chatId = null;
@@ -73,6 +75,9 @@ class SummaryAggregator {
     setOnPartial(callback) {
         this.onPartialCallback = callback;
     }
+    setOnExternalUserInput(callback) {
+        this.onExternalUserInputCallback = callback;
+    }
     setOnTool(callback) {
         this.onToolCallback = callback;
     }
@@ -226,6 +231,7 @@ class SummaryAggregator {
         this.knownTextPartIds.clear();
         this.processedToolStates.clear();
         this.thinkingFiredForMessages.clear();
+        this.deliveredExternalUserMessageIds.clear();
         this.trackedSessionParents.clear();
         this.subagentStates.clear();
         this.subagentOrder = [];
@@ -605,6 +611,10 @@ class SummaryAggregator {
         }
         const messageID = info.id;
         this.messages.set(messageID, { role: info.role });
+        if (info.role === "user") {
+            this.emitExternalUserInputIfReady(info.sessionID, messageID);
+            return;
+        }
         if (info.role === "assistant") {
             if (!this.textMessageStates.has(messageID)) {
                 this.textMessageStates.set(messageID, {
@@ -655,15 +665,8 @@ class SummaryAggregator {
                         completedAt: time?.completed,
                     });
                 }
-                this.textMessageStates.delete(messageID);
-                this.messages.delete(messageID);
-                this.partHashes.delete(messageID);
-                this.knownTextPartIds.delete(messageID);
+                this.cleanupCompletedMessage(messageID);
                 logger.debug(`[Aggregator] Message completed cleanup: remaining messages=${this.textMessageStates.size}`);
-                if (this.textMessageStates.size === 0) {
-                    logger.debug("[Aggregator] No more active messages, stopping typing indicator");
-                    this.stopTypingIndicator();
-                }
             }
             this.lastUpdated = Date.now();
         }
@@ -741,6 +744,9 @@ class SummaryAggregator {
                 this.startTypingIndicator();
                 this.emitPartialText(part.sessionID, messageID, fullText);
             }
+            else if (messageInfo && messageInfo.role === "user") {
+                this.emitExternalUserInputIfReady(part.sessionID, messageID);
+            }
             else {
                 const state = this.getOrCreateTextMessageState(messageID);
                 state.optimisticUpdateCount++;
@@ -857,9 +863,48 @@ class SummaryAggregator {
         if (!combined.trim()) {
             return;
         }
+        const messageInfo = this.messages.get(messageID);
+        if (messageInfo?.role === "user") {
+            this.emitExternalUserInputIfReady(sessionID, messageID);
+            return;
+        }
         this.startTypingIndicator();
         this.emitPartialText(sessionID, messageID, combined);
     }
+    emitExternalUserInputIfReady(sessionId, messageId) {
+        if (sessionId !== this.currentSessionId || this.deliveredExternalUserMessageIds.has(messageId)) {
+            return;
+        }
+        const messageInfo = this.messages.get(messageId);
+        if (!messageInfo || messageInfo.role !== "user") {
+            return;
+        }
+        const messageText = this.getCombinedMessageText(messageId).trim();
+        if (!messageText) {
+            return;
+        }
+        this.deliveredExternalUserMessageIds.add(messageId);
+        this.cleanupCompletedMessage(messageId);
+        if (!this.onExternalUserInputCallback) {
+            return;
+        }
+        const callback = this.onExternalUserInputCallback;
+        setImmediate(() => {
+            Promise.resolve(callback(sessionId, messageId, messageText)).catch((err) => {
+                logger.error("[Aggregator] Error in external user input callback:", err);
+            });
+        });
+    }
+    cleanupCompletedMessage(messageId) {
+        this.textMessageStates.delete(messageId);
+        this.messages.delete(messageId);
+        this.partHashes.delete(messageId);
+        this.knownTextPartIds.delete(messageId);
+        if (this.textMessageStates.size === 0) {
+            logger.debug("[Aggregator] No more active messages, stopping typing indicator");
+            this.stopTypingIndicator();
+        }
+    }
     emitPartialText(sessionId, messageId, messageText) {
         if (!this.onPartialCallback || !messageText.trim()) {
             return;
@@ -1103,7 +1148,7 @@ class SummaryAggregator {
             const callback = this.onQuestionCallback;
             setImmediate(async () => {
                 try {
-                    await callback(questions, id);
+                    await callback(questions, id, sessionID);
                 }
                 catch (err) {
                     logger.error("[Aggregator] Error in question callback:", err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grinev/opencode-telegram-bot",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "Telegram bot client for OpenCode to run and monitor coding tasks from chat.",
   "type": "module",
   "main": "./dist/index.js",