cc-claw 0.19.0 → 0.19.2

package/dist/cli.js

@@ -33,7 +33,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = true ? "0.19.0" : (() => {
+    VERSION = true ? "0.19.2" : (() => {
       try {
         return JSON.parse(readFileSync(join(process.cwd(), "package.json"), "utf-8")).version ?? "unknown";
       } catch {
@@ -623,7 +623,7 @@ function listMcpServers(db3) {
 }
 function addPropagation(db3, mcpName, runnerId, scope) {
   db3.prepare(`
-    INSERT INTO mcp_propagation (mcpName, runnerId, scope, addedAt) VALUES (?, ?, ?, datetime('now'))
+    INSERT OR IGNORE INTO mcp_propagation (mcpName, runnerId, scope, addedAt) VALUES (?, ?, ?, datetime('now'))
   `).run(mcpName, runnerId, scope);
 }
 function removePropagation(db3, mcpName, runnerId, scope) {
@@ -13122,7 +13122,14 @@ function spawnQuery(adapter, config2, model2, cancelState, thinkingLevel, timeou
     const elapsed = () => `${((Date.now() - t0) / 1e3).toFixed(1)}s`;
     const pendingTools = /* @__PURE__ */ new Map();
     const stderrChunks = [];
-    proc.stderr?.on("data", (chunk) => stderrChunks.push(chunk));
+    let stderrBytes = 0;
+    const STDERR_CAP = 1e6;
+    proc.stderr?.on("data", (chunk) => {
+      if (stderrBytes < STDERR_CAP) {
+        stderrChunks.push(chunk);
+        stderrBytes += chunk.length;
+      }
+    });
     const rl2 = createInterface5({ input: proc.stdout });
     let firstLine = true;
     const frTimeoutMs = adapter.id === BACKEND.GEMINI ? opts?.firstResponseTimeoutMs ?? FIRST_RESPONSE_TIMEOUT_MS : 0;
@@ -15624,7 +15631,7 @@ var init_live_status = __esm({
     globalLastFlushAt = 0;
     TRIM_THRESHOLD = 3500;
     MAX_ENTRIES = 200;
-    LiveStatusMessage = class {
+    LiveStatusMessage = class _LiveStatusMessage {
       constructor(chatId, channel, modelLabel, verboseLevel, showThinking = false) {
         this.chatId = chatId;
         this.channel = channel;
@@ -15642,6 +15649,9 @@ var init_live_status = __esm({
       nextFlushAllowedAt = 0;
       /** Tracks whether entries have been trimmed at least once (for display hint). */
       hasTrimmed = false;
+      /** Consecutive non-429 edit failures. After 3, stop trying (message likely deleted). */
+      consecutiveEditFailures = 0;
+      static MAX_EDIT_FAILURES = 3;
       /** Resolve flush interval based on chat type (group chats are rate-limited more aggressively). */
       get flushIntervalMs() {
         const numericId = parseInt(this.chatId);
@@ -15720,6 +15730,7 @@ var init_live_status = __esm({
       // ── Internal ──────────────────────────────────────────────────────────
       async flush() {
         if (this.finalized || !this.messageId || !this.channel.editText) return;
+        if (this.consecutiveEditFailures >= _LiveStatusMessage.MAX_EDIT_FAILURES) return;
         if (Date.now() < this.nextFlushAllowedAt) return;
         if (!canFlushGlobally()) return;
         const deduped = dedupThinking(this.entries);
@@ -15729,6 +15740,7 @@ var init_live_status = __esm({
         markGlobalFlush();
         try {
           await this.channel.editText(this.chatId, this.messageId, body, "plain");
+          this.consecutiveEditFailures = 0;
         } catch (err) {
           this.handleRateLimit(err);
         }
@@ -15762,7 +15774,12 @@ var init_live_status = __esm({
           this.nextFlushAllowedAt = Date.now() + retrySec * 1e3;
           log(`[live-status] 429 rate-limited, backing off ${retrySec}s`);
         } else {
-          log(`[live-status] edit failed: ${msg}`);
+          this.consecutiveEditFailures++;
+          if (this.consecutiveEditFailures >= _LiveStatusMessage.MAX_EDIT_FAILURES) {
+            log(`[live-status] ${this.consecutiveEditFailures} consecutive edit failures \u2014 abandoning status updates (message likely deleted)`);
+          } else {
+            log(`[live-status] edit failed (${this.consecutiveEditFailures}/${_LiveStatusMessage.MAX_EDIT_FAILURES}): ${msg}`);
+          }
         }
       }
     };
@@ -16319,7 +16336,11 @@ async function sendResponse(chatId, channel, text, messageId, replyToMessageId)
       error("[router] TTS failed, falling back to text:", err);
     }
   }
-  await channel.sendText(chatId, cleanText, replyToMessageId ? { replyToMessageId } : void 0);
+  try {
+    await channel.sendText(chatId, cleanText, replyToMessageId ? { replyToMessageId } : void 0);
+  } catch (err) {
+    error("[response] Final sendText failed \u2014 response lost:", err instanceof Error ? err.message : err);
+  }
 }
 async function handleResponseExhaustion(responseText, chatId, msg, channel) {
   const raw = responseText.replace(/\n\n🧠 \[.+$/, "").trim();
@@ -24669,10 +24690,16 @@ import { marked } from "marked";
 function escapeHtml2(text) {
   return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
+function stripNonTelegramTags(html) {
+  return html.replace(/<\/?([a-zA-Z][a-zA-Z0-9_-]*)\b[^>]*>/g, (fullMatch, tagName) => {
+    if (TELEGRAM_ALLOWED_TAGS.has(tagName.toLowerCase())) return fullMatch;
+    return fullMatch.replace(/</g, "&lt;").replace(/>/g, "&gt;");
+  });
+}
 function formatForTelegram(markdown) {
   try {
     const html = marked(markdown);
-    return html.trimEnd();
+    return stripNonTelegramTags(html).trimEnd();
   } catch {
     return formatForTelegramFallback(markdown);
   }
@@ -24759,7 +24786,7 @@ function findSafeSplitPoint(text, maxLen) {
   }
   return safePositions[safePositions.length - 1];
 }
-var MAX_MESSAGE_LENGTH;
+var MAX_MESSAGE_LENGTH, TELEGRAM_ALLOWED_TAGS;
 var init_telegram = __esm({
   "src/formatter/telegram.ts"() {
     "use strict";
@@ -24823,6 +24850,35 @@ ${body.replace(/<[^>]*>/g, "").trim()}</code>
         }
       }
     });
+    TELEGRAM_ALLOWED_TAGS = /* @__PURE__ */ new Set([
+      "b",
+      "strong",
+      // bold
+      "i",
+      "em",
+      // italic
+      "u",
+      "ins",
+      // underline
+      "s",
+      "del",
+      "strike",
+      // strikethrough
+      "code",
+      "pre",
+      // code
+      "a",
+      // link
+      "span",
+      // used for <span class="tg-spoiler">
+      "tg-spoiler",
+      "tg-emoji",
+      // Telegram custom tags
+      "blockquote",
+      // block quote
+      "expandable-blockquote"
+      // expandable block quote
+    ]);
   }
 });
 
@@ -24832,22 +24888,24 @@ function tripCircuitBreaker(retrySec) {
   const until = Date.now() + retrySec * 1e3;
   if (until > circuitBreakerUntil) {
     circuitBreakerUntil = until;
-    warn(`[telegram] Circuit breaker tripped \u2014 pausing ALL Telegram API calls for ${retrySec}s`);
+    warn(`[telegram] Circuit breaker tripped \u2014 blocking ALL Telegram API calls for ${retrySec}s`);
   }
 }
-async function waitForCircuitBreaker() {
-  const remaining = circuitBreakerUntil - Date.now();
-  if (remaining <= 0) return false;
-  if (remaining > GIVE_UP_THRESHOLD_SEC * 1e3) return true;
-  await new Promise((r) => setTimeout(r, remaining));
-  return false;
+function isCircuitBreakerActive() {
+  return Date.now() < circuitBreakerUntil;
+}
+function isRateLimitError(err) {
+  return err instanceof GrammyError && err.error_code === 429;
 }
 async function withRetry(label2, fn) {
   for (let attempt = 0; attempt <= MAX_RETRIES2; attempt++) {
-    const tooLong = await waitForCircuitBreaker();
-    if (tooLong) {
-      warn(`[telegram] 429 on ${label2} \u2014 circuit breaker cooldown too long, giving up`);
-      throw new GrammyError(`Circuit breaker active \u2014 skipping ${label2}`, { ok: false, error_code: 429, description: "Rate limited (circuit breaker)" }, label2, {});
+    if (isCircuitBreakerActive()) {
+      throw new GrammyError(
+        `Circuit breaker active \u2014 skipping ${label2}`,
+        { ok: false, error_code: 429, description: "Rate limited (circuit breaker)" },
+        label2,
+        {}
+      );
     }
     try {
       return await fn();
@@ -24883,6 +24941,9 @@ function isFastPathMessage(msg) {
   }
   return false;
 }
+function sanitizeForTelegram(text) {
+  return text.replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x9F\uFFFD\uFFFE\uFFFF]/g, "");
+}
 function numericChatId(chatId) {
   if (chatId.startsWith("sq:") || chatId.startsWith("cron:")) {
     throw new Error(`Synthetic chatId "${chatId}" passed to Telegram API`);
@@ -24897,9 +24958,9 @@ var init_telegram2 = __esm({
     init_telegram();
     init_log();
     init_store5();
-    MAX_RETRIES2 = 3;
+    MAX_RETRIES2 = 2;
     FALLBACK_RETRY_SEC = 3;
-    GIVE_UP_THRESHOLD_SEC = 60;
+    GIVE_UP_THRESHOLD_SEC = 30;
     circuitBreakerUntil = 0;
     FAST_PATH_COMMANDS = /* @__PURE__ */ new Set(["stop", "status", "new", "newchat"]);
     TelegramChannel = class {
@@ -25107,14 +25168,17 @@ var init_telegram2 = __esm({
         await this.bot.stop();
       }
       async sendTyping(chatId) {
-        await this.bot.api.sendChatAction(numericChatId(chatId), "typing");
+        try {
+          await this.bot.api.sendChatAction(numericChatId(chatId), "typing");
+        } catch {
+        }
       }
       async sendText(chatId, text, opts) {
         const { parseMode, threadId, replyToMessageId } = opts ?? {};
         const threadOpts = threadId ? { message_thread_id: threadId } : {};
         const replyOpts = replyToMessageId ? { reply_parameters: { message_id: replyToMessageId } } : {};
         if (parseMode === "plain") {
-          const plainChunks = splitMessage(text);
+          const plainChunks = splitMessage(sanitizeForTelegram(text));
           for (const chunk of plainChunks) {
             const sent = await withRetry(
               "sendText:plain",
@@ -25124,7 +25188,7 @@ var init_telegram2 = __esm({
           }
           return;
         }
-        const formatted = parseMode === "html" ? text : formatForTelegram(text);
+        const formatted = sanitizeForTelegram(parseMode === "html" ? text : formatForTelegram(text));
         const chunks = splitMessage(formatted);
         for (const chunk of chunks) {
           try {
@@ -25138,6 +25202,7 @@ var init_telegram2 = __esm({
             );
             this.trackAgentMessage(sent.message_id, chatId);
           } catch (err) {
+            if (isRateLimitError(err)) throw err;
             warn("[telegram] sendText HTML failed, falling back to plain:", err instanceof Error ? err.message : err);
             const sent = await withRetry(
               "sendText:fallback",
@@ -25177,7 +25242,7 @@ var init_telegram2 = __esm({
       }
       async sendTextReturningId(chatId, text, parseMode) {
         try {
-          const formatted = parseMode === "html" ? text : parseMode === "plain" ? text : formatForTelegram(text);
+          const formatted = sanitizeForTelegram(parseMode === "html" ? text : parseMode === "plain" ? text : formatForTelegram(text));
           const opts = parseMode === "plain" ? {} : { parse_mode: "HTML" };
           const msg = await withRetry(
             "sendTextReturningId",
@@ -25190,7 +25255,7 @@ var init_telegram2 = __esm({
         }
       }
       async editText(chatId, messageId, text, parseMode) {
-        const formatted = parseMode === "html" ? text : formatForTelegram(text);
+        const formatted = sanitizeForTelegram(parseMode === "html" ? text : formatForTelegram(text));
         try {
           await withRetry(
             "editText:html",
@@ -25200,6 +25265,7 @@ var init_telegram2 = __esm({
           );
           return true;
         } catch (err) {
+          if (isRateLimitError(err)) return false;
           warn("[telegram] editText HTML failed, trying plain fallback:", err instanceof Error ? err.message : err);
           try {
             await withRetry(
@@ -25238,7 +25304,7 @@ var init_telegram2 = __esm({
         }
         const MAX_KEYBOARD_TEXT = 4e3;
         const safeText = text.length > MAX_KEYBOARD_TEXT ? text.slice(0, MAX_KEYBOARD_TEXT) + "\n\n\u2026(truncated)" : text;
-        const formatted = formatForTelegram(safeText);
+        const formatted = sanitizeForTelegram(formatForTelegram(safeText));
         try {
           const msg = await withRetry(
             "sendKeyboard",
@@ -25249,6 +25315,10 @@ var init_telegram2 = __esm({
           );
           return msg.message_id.toString();
         } catch (err) {
+          if (isRateLimitError(err)) {
+            warn(`[telegram] sendKeyboard rate-limited, skipping all fallbacks`);
+            return void 0;
+          }
           error(`[telegram] sendKeyboard failed (chat=${chatId}, textLen=${text.length}):`, err);
           try {
             const escaped = safeText.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
@@ -25260,6 +25330,7 @@ var init_telegram2 = __esm({
             );
             return retryMsg.message_id.toString();
           } catch (plainErr) {
+            if (isRateLimitError(plainErr)) return void 0;
             error(`[telegram] sendKeyboard plain retry also failed:`, plainErr);
           }
           try {
@@ -27405,19 +27476,20 @@ async function doctorCommand(globalOpts, localOpts) {
           else if (/spawn timeout|timeout after \d+s/i.test(line)) spawnTimeout++;
           else other++;
         }
+        const logFix = "cc-claw doctor --fix to clear stale errors";
         if (rate429 > 10) {
-          checks.push({ name: "Telegram rate limits", status: "error", message: `${rate429} rate-limit (429) errors in last 24h \u2014 message delivery blocked`, fix: "cc-claw logs --error" });
+          checks.push({ name: "Telegram rate limits", status: "error", message: `${rate429} rate-limit (429) errors in last 24h \u2014 message delivery blocked`, fix: logFix });
         } else if (rate429 > 0) {
-          checks.push({ name: "Telegram rate limits", status: "warning", message: `${rate429} rate-limit (429) errors in last 24h`, fix: "cc-claw logs --error" });
+          checks.push({ name: "Telegram rate limits", status: "warning", message: `${rate429} rate-limit (429) errors in last 24h`, fix: logFix });
         }
         if (contentSilence > 0) {
-          checks.push({ name: "Content silence", status: "warning", message: `${contentSilence} agent silence timeout(s) in last 24h \u2014 API went unresponsive`, fix: "cc-claw logs --error" });
+          checks.push({ name: "Content silence", status: "warning", message: `${contentSilence} agent silence timeout(s) in last 24h \u2014 API went unresponsive`, fix: logFix });
         }
         if (spawnTimeout > 0) {
-          checks.push({ name: "Spawn timeouts", status: "warning", message: `${spawnTimeout} backend timeout(s) in last 24h`, fix: "cc-claw logs --error" });
+          checks.push({ name: "Spawn timeouts", status: "warning", message: `${spawnTimeout} backend timeout(s) in last 24h`, fix: logFix });
         }
         if (other > 0) {
-          checks.push({ name: "Other errors", status: "warning", message: `${other} other error(s) in last 24h`, fix: "cc-claw logs --error" });
+          checks.push({ name: "Other errors", status: "warning", message: `${other} other error(s) in last 24h`, fix: logFix });
         }
         if (rate429 === 0 && contentSilence === 0 && spawnTimeout === 0 && other === 0) {
           checks.push({ name: "Recent errors", status: "ok", message: "none in last 24h" });
@@ -27508,6 +27580,21 @@ async function doctorCommand(globalOpts, localOpts) {
         }
       }
     }
+    const errorChecks = checks.filter(
+      (c) => ["Telegram rate limits", "Content silence", "Spawn timeouts", "Other errors"].includes(c.name) && c.status !== "ok"
+    );
+    if (errorChecks.length > 0 && existsSync30(ERROR_LOG_PATH)) {
+      try {
+        const { writeFileSync: writeFileSync13 } = await import("fs");
+        writeFileSync13(ERROR_LOG_PATH, "");
+        for (const c of errorChecks) {
+          c.status = "ok";
+          c.message = "cleared (log truncated)";
+          delete c.fix;
+        }
+      } catch {
+      }
+    }
   }
   const errors = checks.filter((c) => c.status === "error").length;
   const warnings = checks.filter((c) => c.status === "warning").length;
@@ -27533,8 +27620,9 @@ async function doctorCommand(globalOpts, localOpts) {
       lines.push(`  ${parts.join(", ")}`);
       const fixable = r.checks.filter((c) => c.fix);
       if (fixable.length > 0 && !localOpts.fix) {
-        for (const f of fixable) {
-          lines.push(muted(`  Fix: ${f.fix}`));
+        const uniqueFixes = [...new Set(fixable.map((f) => f.fix))];
+        for (const fix of uniqueFixes) {
+          lines.push(muted(`  Fix: ${fix}`));
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-claw",
-  "version": "0.19.0",
+  "version": "0.19.2",
   "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",