cc-claw 0.20.19 → 0.20.21

package/dist/cli.js

@@ -33,7 +33,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = true ? "0.20.19" : (() => {
+    VERSION = true ? "0.20.21" : (() => {
       try {
         return JSON.parse(readFileSync(join(process.cwd(), "package.json"), "utf-8")).version ?? "unknown";
       } catch {
@@ -13694,6 +13694,12 @@ function spawnQuery(adapter, config2, model2, cancelState, thinkingLevel, timeou
       if (contentSilenceTimer) clearTimeout(contentSilenceTimer);
       contentSilenceTimer = setTimeout(() => {
         if (cancelState.cancelled || timedOut) return;
+        if (pendingTools.size > 0) {
+          const tools2 = Array.from(pendingTools.values()).map((t) => typeof t === "string" ? t : t.name).join(", ");
+          log(`[agent] Content silence timer fired but ${pendingTools.size} tool(s) still running (${tools2}) \u2014 resetting`);
+          resetContentSilenceTimer();
+          return;
+        }
         warn(`[agent] Content silence timeout after ${silenceTimeoutMs / 1e3}s for ${adapter.id} \u2014 no content events, killing`);
         timedOut = true;
         timeoutState.contentSilence = true;
@@ -18537,7 +18543,8 @@ async function handleMedia(msg, channel) {
     await channel.sendText(chatId, mLimitMsg, { parseMode: "plain" });
     return;
   }
-  await channel.sendText(chatId, "Processing your file...", { parseMode: "plain" });
+  const fileCount = 1 + (msg.extraFiles?.length ?? 0);
+  await channel.sendText(chatId, fileCount > 1 ? `Processing ${fileCount} files...` : "Processing your file...", { parseMode: "plain" });
   try {
     if (msg.type === "video") {
       const fileId = msg.metadata?.fileId ?? fileName;
@@ -18620,13 +18627,39 @@ Acknowledge receipt. Do NOT analyze the video unless they ask you to.`;
     if (msg.type === "photo" || isImageExt(ext)) {
       const imgExt = msg.type === "photo" ? "jpg" : ext || "jpg";
       tempFilePath = await saveMedia(fileBuffer, "img", imgExt);
-      prompt = caption ? `The user sent an image with caption: "${caption}"
+      const allPaths = [tempFilePath];
+      if (msg.extraFiles?.length) {
+        for (const extra of msg.extraFiles) {
+          try {
+            const extraBuffer = await channel.downloadFile(extra.fileName);
+            const extraExt = extra.mimeType.startsWith("image/") ? extra.mimeType.split("/")[1] || "jpg" : "jpg";
+            const extraPath = await saveMedia(extraBuffer, "img", extraExt);
+            allPaths.push(extraPath);
+          } catch (err) {
+            log(`[media] Failed to download extra file: ${errorMessage(err)}`);
+          }
+        }
+      }
+      if (allPaths.length === 1) {
+        prompt = caption ? `The user sent an image with caption: "${caption}"
 
 The image has been saved to: ${tempFilePath}
 
 Please read the image file and respond to their caption/question.` : `The user sent an image. It has been saved to: ${tempFilePath}
 
 Please read the image file and describe what you see.`;
+      } else {
+        const pathList = allPaths.map((p, i) => `${i + 1}. ${p}`).join("\n");
+        prompt = caption ? `The user sent ${allPaths.length} images with caption: "${caption}"
+
+The images have been saved to:
+${pathList}
+
+Please read all image files and respond to their caption/question.` : `The user sent ${allPaths.length} images. They have been saved to:
+${pathList}
+
+Please read all image files and describe what you see.`;
+      }
     } else if (isTextExt(ext)) {
       const MAX_TEXT_FILE_BYTES = 1048576;
       if (fileBuffer.length > MAX_TEXT_FILE_BYTES) {
@@ -28009,6 +28042,11 @@ var init_telegram2 = __esm({
       // messageId → chatId
       reactionHandlers = [];
       throttle;
+      // ── Media group debouncing ─────────────────────────────────────────
+      // Telegram sends each photo in a media group as a separate update.
+      // We buffer them by media_group_id and emit one merged IncomingMessage.
+      mediaGroupBuffer = /* @__PURE__ */ new Map();
+      static MEDIA_GROUP_DEBOUNCE_MS = 500;
       // ── Polling health tracking ─────────────────────────────────────────
       /** Timestamp of last update received from Telegram (message, callback, reaction) */
       lastUpdateAt = 0;
@@ -28038,20 +28076,6 @@ var init_telegram2 = __esm({
         this.allowedChatIds = new Set(ids);
         this.bot = new Bot(token);
         this.throttle = new TelegramThrottle();
-        this.throttle.setResumeNotifier(async (chatId, pausedSec, queuedCount) => {
-          if (pausedSec > 60) {
-            log(`[telegram] Skipping resume notification (paused ${pausedSec}s \u2014 too long, would risk another 429)`);
-            return;
-          }
-          try {
-            await this.bot.api.sendMessage(
-              numericChatId(chatId),
-              `\u26A0\uFE0F Rate-limited by Telegram for ${pausedSec}s \u2014 delivering ${queuedCount} pending message(s) now.`
-            );
-          } catch (err) {
-            warn("[telegram] Resume notification failed:", err instanceof Error ? err.message : err);
-          }
-        });
       }
       /** The first ID in ALLOWED_CHAT_ID — used for heartbeat, notifications, etc. */
       getPrimaryChatId() {
@@ -28171,6 +28195,19 @@ var init_telegram2 = __esm({
             return;
           }
           log(`[telegram] Processing ${msg.type}: "${msg.text?.slice(0, 50) || msg.command || "(media)"}"`);
+          const mediaGroupId = ctx.message?.media_group_id;
+          if (mediaGroupId && (msg.type === "photo" || msg.type === "video" || msg.type === "document")) {
+            const existing = this.mediaGroupBuffer.get(mediaGroupId);
+            if (existing) {
+              existing.messages.push(msg);
+              clearTimeout(existing.timer);
+              existing.timer = setTimeout(() => this.flushMediaGroup(mediaGroupId), _TelegramChannel.MEDIA_GROUP_DEBOUNCE_MS);
+            } else {
+              const timer = setTimeout(() => this.flushMediaGroup(mediaGroupId), _TelegramChannel.MEDIA_GROUP_DEBOUNCE_MS);
+              this.mediaGroupBuffer.set(mediaGroupId, { messages: [msg], timer, handler, channel: this });
+            }
+            return;
+          }
           if (isFastPathMessage(msg)) {
             handler(msg, this).catch((err) => {
               error("[telegram] Fast-path handler error:", err);
@@ -28619,6 +28656,30 @@ var init_telegram2 = __esm({
         }
         this.agentMessageIds.set(messageId, chatId);
       }
+      /**
+       * Flush a buffered media group — merge all files into a single IncomingMessage
+       * with the first file as primary and the rest in extraFiles.
+       */
+      flushMediaGroup(groupId) {
+        const group = this.mediaGroupBuffer.get(groupId);
+        if (!group) return;
+        this.mediaGroupBuffer.delete(groupId);
+        const [primary, ...rest] = group.messages;
+        if (rest.length > 0) {
+          primary.extraFiles = rest.map((m) => ({
+            fileName: m.fileName,
+            mimeType: m.mimeType ?? "application/octet-stream"
+          }));
+          if (!primary.caption) {
+            const withCaption = rest.find((m) => m.caption);
+            if (withCaption) primary.caption = withCaption.caption;
+          }
+          log(`[telegram] Media group ${groupId}: merged ${group.messages.length} files into one message`);
+        }
+        group.handler(primary, group.channel).catch((err) => {
+          error("[telegram] Media group handler error:", err);
+        });
+      }
       buildIncomingMessage(ctx) {
         const chatId = ctx.chat.id.toString();
         const messageId = ctx.message?.message_id?.toString() ?? "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-claw",
-  "version": "0.20.19",
+  "version": "0.20.21",
   "description": "CC-Claw: Personal AI assistant on Telegram — multi-backend (Claude, Gemini, Codex, Cursor), sub-agent orchestration, MCP management",
   "type": "module",
   "main": "dist/cli.js",