pi-telegram-plus 0.0.2 → 0.0.3

package/lib/controller.ts

@@ -12,6 +12,9 @@ import type {
   TelegramTurn,
 } from "./types.ts";
 import type { TelegramUiRuntime } from "./telegram-ui.ts";
+import { log } from "./logger.ts";
+
+const ctrlLog = log.child("controller");
 
 export type TelegramController = {
   handleMessage(message: TelegramMessage): Promise<void>;
@@ -221,7 +224,7 @@ export function createTelegramController(deps: {
     const mode = deps.getMessageMode();
     if (mode === "steer") {
       const task = runPrompt(text, chatId, replaceMessageId);
-      void task.catch(() => undefined);
+      void task.catch(ctrlLog.swallow("error", "steer-mode prompt task failed", { chatId }));
       return;
     }
 
@@ -233,7 +236,7 @@ export function createTelegramController(deps: {
         if (generation !== getInterruptGeneration(chatId)) return;
         return runPrompt(text, chatId, replaceMessageId);
       })
-      .catch(() => undefined);
+      .catch(ctrlLog.swallow("error", "queue-mode prompt task failed", { chatId }));
     setTail(chatId, task);
   };
 
@@ -247,11 +250,45 @@ export function createTelegramController(deps: {
     // prompts (e.g. /new confirmation), and awaiting them would stall the
     // polling loop and block callback processing for that update.
     const telegramUi = deps.ui.create(chatId);
+    const ctx = session.extensionRunner.createCommandContext();
+    // Capture idleness BEFORE the handler runs. Commands like /sisyphus and
+    // /goals enqueue the agent turn fire-and-forget via pi.sendUserMessage and
+    // return immediately; the actual turn (and any goal_question /
+    // propose_goal_draft / goal_questionnaire dialogs it raises) runs AFTER the
+    // handler resolves. If we let runWithTelegramUi restore the TUI UI at that
+    // point, those dialogs render to the local TUI and Telegram gets nothing.
+    // Only hold the swap when the agent was idle when the command arrived: if a
+    // local turn was already streaming, holding the swap would hijack the local
+    // user's TUI (modals would route to Telegram, editor would no-op).
+    const idleFn = typeof (ctx as any).isIdle === "function" ? (ctx as any).isIdle : undefined;
+    const waitFn = typeof (ctx as any).waitForIdle === "function" ? (ctx as any).waitForIdle : undefined;
+    const wasIdle = idleFn ? idleFn.call(ctx) : false;
     void runWithTelegramUi({
       session,
       ui: telegramUi,
-      run: async () => handler(args, session.extensionRunner.createCommandContext()),
-    }).catch(() => undefined);
+      run: async () => {
+        await handler(args, ctx);
+        if (!wasIdle || !idleFn || !waitFn) return;
+        // Hold the Telegram UI swap across the command's enqueued turn and any
+        // auto-continue chain it spawns. pi-goal schedules continuation turns via
+        // setTimeout(0 / 50ms) after a turn ends, so a single waitForIdle()
+        // resolves before the next turn starts. After each idle, yield one
+        // macrotask window (120ms > pi-goal's 50ms CONTINUATION_IDLE_RETRY_MS) to
+        // let a pending continuation begin; if the agent starts streaming again,
+        // keep waiting. Stop when the agent stays idle through the window — the
+        // chain has drained and the local TUI is fully usable again.
+        try {
+          for (;;) {
+            await waitFn.call(ctx);
+            await new Promise((r) => setTimeout(r, 120));
+            if (idleFn.call(ctx)) break;
+          }
+        } catch (err) {
+          // Session disposed / torn down during the wait — nothing to do but log.
+          ctrlLog.debug("waitForIdle during enqueued turn interrupted", { err });
+        }
+      },
+    }).catch(ctrlLog.swallow("warn", "beginTelegramTurn enqueued-turn wrapper failed"));
   };
 
   const tryHandleSlashCommand = async (text: string, chatId: number): Promise<boolean> => {
@@ -287,7 +324,7 @@ export function createTelegramController(deps: {
     async handleCallbackQuery(query) {
       const chatId = query.message?.chat?.id;
       if (typeof chatId !== "number") return;
-      await deps.transport.answerCallbackQuery(query.id).catch(() => undefined);
+      await deps.transport.answerCallbackQuery(query.id).catch(ctrlLog.swallow("debug", "answerCallbackQuery failed", { queryId: query.id }));
       if (!(await deps.authorizeUser(query.from?.id))) return;
       await deps.setActiveChatId(chatId);
 
@@ -297,15 +334,17 @@ export function createTelegramController(deps: {
         const result = deps.ui.resolveInput(chatId, uiValue, query.message?.message_id, true);
         if (!result.handled) {
           await deps.transport.sendText(chatId, "This prompt is no longer active.");
-        } else {
-          // Remove inline keyboards only for terminal UI callbacks. Select
-          // pagination callbacks continue the same flow and immediately edit the
-          // same message with the next page of buttons; removing the keyboard here
-          // can race after that edit and strip the new page buttons.
-          const isPaginationCallback = /^f:[^:]+:p:\d+$/.test(uiValue);
-          const promptMessageId = result.promptMessageId ?? query.message?.message_id;
-          if (!isPaginationCallback && promptMessageId) void deps.transport.removeInlineKeyboard(chatId, promptMessageId);
         }
+        // Keyboard cleanup is OWNED by each UI flow (confirm/input/select and the
+        // custom-dialog bridge): each calls removeInlineKeyboard on its own prompt
+        // message right before resolving a terminal value (yes/no/cancel/submit/...).
+        // The controller must NOT speculatively strip keyboards here. Doing so races
+        // with continuation flows (multi-question tab navigation, single-question
+        // option toggles, select pagination) that edit the SAME message in place:
+        // removeInlineKeyboard and editButtons hit Telegram concurrently on one
+        // message, and when the strip lands last the message is left with no
+        // buttons — the "answered Q1 but Q2 never appeared" bug. Terminal flows
+        // clean up themselves, so no controller-side strip is needed.
         return;
       }
 
@@ -368,7 +407,7 @@ export function createTelegramController(deps: {
             formatIncomingAttachmentReceipt("saved", downloadedMediaLines),
             formatIncomingAttachmentReceipt("failed", failedMediaLines),
           ].filter(Boolean);
-          await deps.transport.sendText(chatId, lines.join("\n\n")).catch(() => undefined);
+          await deps.transport.sendText(chatId, lines.join("\n\n")).catch(ctrlLog.swallow("warn", "sendText media receipt failed", { chatId }));
         }
       }
       const hasPromptInput = hasTextInput || hasMediaInput;