fix(bot): show buffered session retry errors and dedupe repeated warnings

Author: grinev

src/bot/index.ts

@@ -58,6 +58,7 @@ let chatIdInstance: number | null = null;
 let commandsInitialized = false;
 
 const TELEGRAM_DOCUMENT_CAPTION_MAX_LENGTH = 1024;
+const SESSION_RETRY_PREFIX = "🔁";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const TEMP_DIR = path.join(__dirname, "..", ".tmp");
@@ -393,6 +394,26 @@ async function ensureEventSubscription(directory: string): Promise<void> {
       });
   });
 
+  summaryAggregator.setOnSessionRetry(async ({ sessionId, message }) => {
+    if (!botInstance || !chatIdInstance) {
+      return;
+    }
+
+    const currentSession = getCurrentSession();
+    if (!currentSession || currentSession.id !== sessionId) {
+      return;
+    }
+
+    const normalizedMessage = message.trim() || t("common.unknown_error");
+    const truncatedMessage =
+      normalizedMessage.length > 3500
+        ? `${normalizedMessage.slice(0, 3497)}...`
+        : normalizedMessage;
+
+    const retryMessage = t("bot.session_retry", { message: truncatedMessage });
+    toolMessageBatcher.enqueueUniqueByPrefix(sessionId, retryMessage, SESSION_RETRY_PREFIX);
+  });
+
   summaryAggregator.setOnSessionDiff(async (_sessionId, diffs) => {
     if (!pinnedMessageManager.isInitialized()) {
       return;

src/i18n/de.ts

@@ -66,6 +66,8 @@ export const de: I18nDictionary = {
     "⚠️ Die aktive Sitzung passt nicht zum ausgewählten Projekt und wurde daher zurückgesetzt. Nutze /sessions zur Auswahl oder /new, um eine neue Sitzung zu erstellen.",
   "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 /stop abbrechen.",
   "bot.unknown_command":
     "⚠️ Unbekannter Befehl: {command}. Nutze /help, um verfügbare Befehle zu sehen.",
   "bot.photo_downloading": "⏳ Lade Foto herunter...",

src/i18n/en.ts

@@ -63,6 +63,8 @@ export const en = {
     "⚠️ Active session does not match the selected project, so it was reset. Use /sessions to pick one or /new to create a new session.",
   "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 /stop to abort.",
   "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)",

src/i18n/es.ts

@@ -66,6 +66,8 @@ export const es: I18nDictionary = {
     "⚠️ La sesión activa no coincide con el proyecto seleccionado, así que se reinició. Usa /sessions para elegir una o /new para crear una nueva.",
   "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 /stop para detenerlo.",
   "bot.unknown_command":
     "⚠️ Comando desconocido: {command}. Usa /help para ver los comandos disponibles.",
   "bot.photo_downloading": "⏳ Descargando foto...",

src/i18n/ru.ts

@@ -62,6 +62,8 @@ export const ru: I18nDictionary = {
     "⚠️ Активная сессия не соответствует выбранному проекту, поэтому была сброшена. Используйте /sessions для выбора или /new для создания новой сессии.",
   "bot.prompt_send_error": "Не удалось отправить запрос в OpenCode.",
   "bot.session_error": "🔴 OpenCode вернул ошибку: {message}",
+  "bot.session_retry":
+    "🔁 {message}\n\nПровайдер возвращает одну и ту же ошибку при повторных запросах. Используйте /stop для остановки.",
   "bot.unknown_command": "⚠️ Неизвестная команда: {command}. Используйте /help для списка команд.",
   "bot.photo_downloading": "⏳ Скачиваю фото...",
   "bot.photo_too_large": "⚠️ Фото слишком большое (макс. {maxSizeMb}МБ)",

src/i18n/zh.ts

@@ -55,6 +55,7 @@ export const zh: I18nDictionary = {
     "⚠️ 活动会话与所选项目不匹配，因此已重置。使用 /sessions 选择一个会话，或 /new 创建新会话。",
   "bot.prompt_send_error": "向 OpenCode 发送请求失败。",
   "bot.session_error": "🔴 OpenCode 返回错误：{message}",
+  "bot.session_retry": "🔁 {message}\n\n提供方在重复重试时持续返回同一错误。使用 /stop 可停止。",
   "bot.unknown_command": "⚠️ 未知命令：{command}。使用 /help 查看可用命令。",
   "bot.photo_downloading": "⏳ 正在下载照片...",
   "bot.photo_too_large": "⚠️ 照片过大（最大 {maxSizeMb}MB）",

src/summary/aggregator.ts

@@ -58,6 +58,15 @@ type SessionCompactedCallback = (sessionId: string, directory: string) => void;
 
 type SessionErrorCallback = (sessionId: string, message: string) => void;
 
+export interface SessionRetryInfo {
+  sessionId: string;
+  attempt?: number;
+  message: string;
+  next?: number;
+}
+
+type SessionRetryCallback = (retryInfo: SessionRetryInfo) => void;
+
 type PermissionCallback = (request: PermissionRequest) => void;
 
 type SessionDiffCallback = (sessionId: string, diffs: FileChange[]) => void;
@@ -115,6 +124,7 @@ class SummaryAggregator {
   private onTokensCallback: TokensCallback | null = null;
   private onSessionCompactedCallback: SessionCompactedCallback | null = null;
   private onSessionErrorCallback: SessionErrorCallback | null = null;
+  private onSessionRetryCallback: SessionRetryCallback | null = null;
   private onPermissionCallback: PermissionCallback | null = null;
   private onSessionDiffCallback: SessionDiffCallback | null = null;
   private onFileChangeCallback: FileChangeCallback | null = null;
@@ -167,6 +177,10 @@ class SummaryAggregator {
     this.onSessionErrorCallback = callback;
   }
 
+  setOnSessionRetry(callback: SessionRetryCallback): void {
+    this.onSessionRetryCallback = callback;
+  }
+
   setOnPermission(callback: PermissionCallback): void {
     this.onPermissionCallback = callback;
   }
@@ -649,11 +663,39 @@ class SummaryAggregator {
       type: "session.status";
     },
   ): void {
-    const { sessionID } = event.properties;
+    const { sessionID, status } = event.properties as {
+      sessionID: string;
+      status?: {
+        type?: string;
+        attempt?: number;
+        message?: string;
+        next?: number;
+      };
+    };
 
     if (sessionID !== this.currentSessionId) {
       return;
     }
+
+    if (status?.type !== "retry" || !this.onSessionRetryCallback) {
+      return;
+    }
+
+    const callback = this.onSessionRetryCallback;
+    const message = status.message?.trim() || "Unknown retry error";
+
+    logger.warn(
+      `[Aggregator] Session retry: session=${sessionID}, attempt=${status.attempt ?? "n/a"}, message=${message}`,
+    );
+
+    setImmediate(() => {
+      callback({
+        sessionId: sessionID,
+        attempt: status.attempt,
+        message,
+        next: status.next,
+      });
+    });
   }
 
   private handleSessionIdle(

src/summary/tool-message-batcher.ts

@@ -86,28 +86,11 @@ export class ToolMessageBatcher {
   }
 
   enqueue(sessionId: string, message: string): void {
-    const normalizedMessage = message.trim();
-    if (!sessionId || normalizedMessage.length === 0) {
-      return;
-    }
-
-    if (this.intervalSeconds === 0) {
-      const expectedGeneration = this.generation;
-      logger.debug(`[ToolBatcher] Sending immediate text message: session=${sessionId}`);
-      void this.enqueueTask(sessionId, () =>
-        this.sendTextSafe(sessionId, normalizedMessage, "immediate", expectedGeneration),
-      );
-      return;
-    }
-
-    const queue = this.queues.get(sessionId) ?? [];
-    queue.push({ kind: "text", text: normalizedMessage });
-    this.queues.set(sessionId, queue);
-    logger.debug(
-      `[ToolBatcher] Queued text message: session=${sessionId}, queueSize=${queue.length}, interval=${this.intervalSeconds}s`,
-    );
+    this.enqueueTextInternal(sessionId, message);
+  }
 
-    this.ensureTimer(sessionId);
+  enqueueUniqueByPrefix(sessionId: string, message: string, prefix: string): void {
+    this.enqueueTextInternal(sessionId, message, prefix);
   }
 
   enqueueFile(sessionId: string, fileData: CodeFileData): void {
@@ -220,6 +203,50 @@ export class ToolMessageBatcher {
     return nextTask;
   }
 
+  private enqueueTextInternal(sessionId: string, message: string, uniquePrefix?: string): void {
+    const normalizedMessage = message.trim();
+    if (!sessionId || normalizedMessage.length === 0) {
+      return;
+    }
+
+    if (this.intervalSeconds === 0) {
+      const expectedGeneration = this.generation;
+      logger.debug(`[ToolBatcher] Sending immediate text message: session=${sessionId}`);
+      void this.enqueueTask(sessionId, () =>
+        this.sendTextSafe(sessionId, normalizedMessage, "immediate", expectedGeneration),
+      );
+      return;
+    }
+
+    const normalizedPrefix = uniquePrefix?.trim();
+    const queue = this.queues.get(sessionId) ?? [];
+
+    if (normalizedPrefix) {
+      const existingUniqueMessage = queue.find(
+        (item): item is Extract<QueueItem, { kind: "text" }> =>
+          item.kind === "text" && item.text.startsWith(normalizedPrefix),
+      );
+
+      if (existingUniqueMessage) {
+        existingUniqueMessage.text = normalizedMessage;
+        this.queues.set(sessionId, queue);
+        logger.debug(
+          `[ToolBatcher] Updated queued unique text message: session=${sessionId}, prefix=${normalizedPrefix}, interval=${this.intervalSeconds}s`,
+        );
+        this.ensureTimer(sessionId);
+        return;
+      }
+    }
+
+    queue.push({ kind: "text", text: normalizedMessage });
+    this.queues.set(sessionId, queue);
+    logger.debug(
+      `[ToolBatcher] Queued text message: session=${sessionId}, queueSize=${queue.length}, interval=${this.intervalSeconds}s`,
+    );
+
+    this.ensureTimer(sessionId);
+  }
+
   private async flushSessionInternal(sessionId: string, reason: string): Promise<void> {
     const expectedGeneration = this.generation;
     this.clearTimer(sessionId);

tests/summary/aggregator.test.ts

@@ -27,6 +27,7 @@ describe("summary/aggregator", () => {
     summaryAggregator.setOnToolFile(() => {});
     summaryAggregator.setOnThinking(() => {});
     summaryAggregator.setOnSessionError(() => {});
+    summaryAggregator.setOnSessionRetry(() => {});
   });
 
   it("invokes onCleared callback when aggregator is cleared", () => {
@@ -273,6 +274,34 @@ describe("summary/aggregator", () => {
     expect(onSessionError).toHaveBeenCalledWith("session-1", "Model not found: opencode/foo.");
   });
 
+  it("reports session.status retry through callback", async () => {
+    const onSessionRetry = vi.fn();
+    summaryAggregator.setOnSessionRetry(onSessionRetry);
+    summaryAggregator.setSession("session-1");
+
+    summaryAggregator.processEvent({
+      type: "session.status",
+      properties: {
+        sessionID: "session-1",
+        status: {
+          type: "retry",
+          attempt: 2,
+          message: "Your current subscription plan does not yet include access to GLM-5",
+          next: 1772203141283,
+        },
+      },
+    } as unknown as Event);
+
+    await new Promise<void>((resolve) => setImmediate(resolve));
+
+    expect(onSessionRetry).toHaveBeenCalledWith({
+      sessionId: "session-1",
+      attempt: 2,
+      message: "Your current subscription plan does not yet include access to GLM-5",
+      next: 1772203141283,
+    });
+  });
+
   it("sends apply_patch payload as tool file", () => {
     const onToolFile = vi.fn();
     summaryAggregator.setOnToolFile(onToolFile);

tests/summary/tool-message-batcher.test.ts

@@ -74,6 +74,27 @@ describe("summary/tool-message-batcher", () => {
     expect(sendFile).not.toHaveBeenCalled();
   });
 
+  it("keeps only one queued retry message by prefix and updates it", async () => {
+    vi.useFakeTimers();
+
+    const sendText = vi.fn().mockResolvedValue(undefined);
+    const sendFile = vi.fn().mockResolvedValue(undefined);
+    const batcher = new ToolMessageBatcher({
+      intervalSeconds: 5,
+      sendText,
+      sendFile,
+    });
+
+    batcher.enqueueUniqueByPrefix("s1", "🔁 Retry attempt 1", "🔁");
+    batcher.enqueueUniqueByPrefix("s1", "🔁 Retry attempt 2", "🔁");
+
+    await vi.advanceTimersByTimeAsync(5000);
+
+    expect(sendText).toHaveBeenCalledTimes(1);
+    expect(sendText).toHaveBeenCalledWith("s1", "🔁 Retry attempt 2");
+    expect(sendFile).not.toHaveBeenCalled();
+  });
+
   it("flushes session queue immediately and cancels timer", async () => {
     vi.useFakeTimers();