cc-claw 0.24.0 → 0.24.1

package/dist/cli.js

@@ -33,7 +33,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = true ? "0.24.0" : (() => {
+    VERSION = true ? "0.24.1" : (() => {
       try {
         return JSON.parse(readFileSync(join(process.cwd(), "package.json"), "utf-8")).version ?? "unknown";
       } catch {
@@ -4370,13 +4370,45 @@ var init_env = __esm({
 });
 
 // src/backends/strip-thinking.ts
+function hasGeminiSystemPromptLeak(text) {
+  const matches = text.match(/CRITICAL INSTRUCTION \d+:/gi);
+  return !!matches && matches.length >= 2;
+}
+function isGeminiLeakFragment(text) {
+  return /CRITICAL INSTRUCTION \d+:/i.test(text) || /^\s*\([a-z]\)\s+(NEVER|ALWAYS|DO NOT)\s/im.test(text);
+}
+function stripGeminiLeakedThinking(text) {
+  if (!hasGeminiSystemPromptLeak(text)) return text;
+  const re = /CRITICAL INSTRUCTION \d+:/gi;
+  let lastMatch = null;
+  let m;
+  while ((m = re.exec(text)) !== null) {
+    lastMatch = m;
+  }
+  if (!lastMatch) return text;
+  const afterLast = text.slice(lastMatch.index);
+  const ruleBlockEnd = afterLast.search(
+    /\n(?!\s*\([a-z]\)\s)(?!CRITICAL\s)(?!\s{2,})\S/
+  );
+  if (ruleBlockEnd === -1) return "";
+  const cleaned = afterLast.slice(ruleBlockEnd).trim();
+  return cleaned.replace(GEMINI_SYSTEM_PROMPT_LEAK, "").trim();
+}
 function stripThinkingContent(text) {
   let result = text;
   for (const pattern of THINKING_PATTERNS) {
     result = result.replace(pattern, "");
   }
+  result = stripGeminiLeakedThinking(result);
   return result.trim();
 }
+function stripThinkingTags(text) {
+  let result = text;
+  for (const pattern of THINKING_PATTERNS) {
+    result = result.replace(pattern, "");
+  }
+  return result;
+}
 function extractThinkingEvents(text) {
   const thinkingEvents = [];
   const thinkingMatches = [...text.matchAll(/<thinking>([\s\S]*?)<\/thinking>/gi)];
@@ -4391,10 +4423,10 @@ function extractThinkingEvents(text) {
   for (const match of reasoningMatches) {
     thinkingEvents.push({ type: "thinking", text: match[1].trim() });
   }
-  const cleanText = stripThinkingContent(text);
+  const cleanText = stripThinkingTags(text);
   return { cleanText, thinkingEvents };
 }
-var THINKING_PATTERNS;
+var THINKING_PATTERNS, GEMINI_SYSTEM_PROMPT_LEAK;
 var init_strip_thinking = __esm({
   "src/backends/strip-thinking.ts"() {
     "use strict";
@@ -4410,6 +4442,7 @@ var init_strip_thinking = __esm({
       // so match until the next [Thought: marker or end of string.
       /\[Thought:\s*true\][\s\S]*?(?=\[Thought:|$)/gi
     ];
+    GEMINI_SYSTEM_PROMPT_LEAK = /CRITICAL INSTRUCTION \d+:[\s\S]*?(?=CRITICAL INSTRUCTION \d+:|$)/gi;
   }
 });
 
@@ -8314,21 +8347,7 @@ var init_types2 = __esm({
 function appendTextChunk(accumulated, chunk) {
   if (!accumulated) return chunk;
   if (!chunk) return accumulated;
-  if (/\s$/.test(accumulated) || /^\s/.test(chunk)) {
-    return accumulated + chunk;
-  }
-  const tailChar = accumulated[accumulated.length - 1];
-  if ("/:@.=?&#%-_~+".includes(tailChar)) {
-    return accumulated + chunk;
-  }
-  const headChar = chunk[0];
-  if (`/:@.=?&#%-_~+,;)]}>'"`.includes(headChar)) {
-    return accumulated + chunk;
-  }
-  if (/\d$/.test(accumulated) && /^\d/.test(chunk)) {
-    return accumulated + chunk;
-  }
-  return accumulated + " " + chunk;
+  return accumulated + chunk;
 }
 var init_text_utils = __esm({
   "src/text-utils.ts"() {
@@ -14814,6 +14833,7 @@ function spawnQuery(adapter, config2, model2, cancelState, thinkingLevel, timeou
     let sawResultEvent = false;
     let toolTurnCount = 0;
     let loopKillReason;
+    let geminiLeakSuppressing = false;
     const loopDetector = new ToolLoopDetector();
     const t0 = Date.now();
     const elapsed = () => `${((Date.now() - t0) / 1e3).toFixed(1)}s`;
@@ -14894,7 +14914,16 @@ function spawnQuery(adapter, config2, model2, cancelState, thinkingLevel, timeou
             resetContentSilenceTimer();
             if (ev.text) {
               accumulatedText = appendTextChunk(accumulatedText, ev.text);
-              if (opts?.onStream) opts.onStream(ev.text);
+              if (adapter.id === "gemini" && isGeminiLeakFragment(ev.text)) {
+                geminiLeakSuppressing = true;
+              } else if (geminiLeakSuppressing) {
+                if (!isGeminiLeakFragment(ev.text)) {
+                  geminiLeakSuppressing = false;
+                  if (opts?.onStream) opts.onStream(ev.text);
+                }
+              } else {
+                if (opts?.onStream) opts.onStream(ev.text);
+              }
             }
             break;
           case "thinking":
@@ -14920,6 +14949,7 @@ function spawnQuery(adapter, config2, model2, cancelState, thinkingLevel, timeou
               }
             }
             resetContentSilenceTimer();
+            geminiLeakSuppressing = false;
             sawToolEvents = true;
             if (opts?.onToolAction && ev.toolName) {
               const toolInput = ev.toolInput ?? {};
@@ -16111,6 +16141,9 @@ __export(telegram_throttle_exports, {
   getThrottleState: () => getThrottleState
 });
 import { GrammyError } from "grammy";
+function perChatInterval(chatId) {
+  return parseInt(chatId) < 0 ? PER_GROUP_INTERVAL_MS : PER_DM_INTERVAL_MS;
+}
 function getThrottleState() {
   if (!_activeThrottle) return null;
   return _activeThrottle.getState();
@@ -16121,12 +16154,13 @@ function is429(err) {
 function sleep(ms) {
   return new Promise((r) => setTimeout(r, ms));
 }
-var PER_CHAT_INTERVAL_MS, GLOBAL_INTERVAL_MS, MAX_RETRIES2, RETRY_DELAY_MS, MAX_QUEUE_SIZE, MAX_TOTAL_PAUSE_MS, _activeThrottle, TelegramThrottle;
+var PER_DM_INTERVAL_MS, PER_GROUP_INTERVAL_MS, GLOBAL_INTERVAL_MS, MAX_RETRIES2, RETRY_DELAY_MS, MAX_QUEUE_SIZE, MAX_TOTAL_PAUSE_MS, _activeThrottle, TelegramThrottle;
 var init_telegram_throttle = __esm({
   "src/channels/telegram-throttle.ts"() {
     "use strict";
     init_log();
-    PER_CHAT_INTERVAL_MS = 1e3;
+    PER_DM_INTERVAL_MS = 1e3;
+    PER_GROUP_INTERVAL_MS = 3500;
     GLOBAL_INTERVAL_MS = 100;
     MAX_RETRIES2 = 2;
     RETRY_DELAY_MS = 1e3;
@@ -16180,7 +16214,7 @@ var init_telegram_throttle = __esm({
         if (this.queue.length > 10) return void 0;
         if (!opts?.skipRecord) {
           const lastChat = this.lastSendPerChat.get(chatId) ?? 0;
-          if (Date.now() - lastChat < PER_CHAT_INTERVAL_MS) return void 0;
+          if (Date.now() - lastChat < perChatInterval(chatId)) return void 0;
           if (Date.now() - this.lastGlobalSend < GLOBAL_INTERVAL_MS) return void 0;
         }
         try {
@@ -16236,7 +16270,7 @@ var init_telegram_throttle = __esm({
             }
             const item = this.queue[0];
             const lastChat = this.lastSendPerChat.get(item.chatId) ?? 0;
-            const chatWait = PER_CHAT_INTERVAL_MS - (Date.now() - lastChat);
+            const chatWait = perChatInterval(item.chatId) - (Date.now() - lastChat);
             if (chatWait > 0) await sleep(chatWait);
             const globalWait = GLOBAL_INTERVAL_MS - (Date.now() - this.lastGlobalSend);
             if (globalWait > 0) await sleep(globalWait);
@@ -18708,7 +18742,7 @@ function makeLiveStatus(chatId, channel, modelLabel, verboseLevel, showThinking)
   };
   return { liveStatus, toolCb };
 }
-var FLUSH_INTERVAL_DM_MS, FLUSH_INTERVAL_GROUP_MS, MAX_THINKING_CHARS, GLOBAL_MIN_GAP_MS, globalLastFlushAt, TRIM_THRESHOLD, MAX_ENTRIES, HEARTBEAT_FORCE_INTERVAL_MS, SPINNER_FRAMES, HEARTBEAT_TEXTS, LiveStatusMessage;
+var FLUSH_INTERVAL_DM_MS, FLUSH_INTERVAL_GROUP_MS, MAX_THINKING_CHARS, GLOBAL_MIN_GAP_MS, globalLastFlushAt, TRIM_THRESHOLD, MAX_ENTRIES, SPINNER_FRAMES, HEARTBEAT_TEXTS, LiveStatusMessage;
 var init_live_status = __esm({
   "src/router/live-status.ts"() {
     "use strict";
@@ -18722,7 +18756,6 @@ var init_live_status = __esm({
     globalLastFlushAt = 0;
     TRIM_THRESHOLD = 3500;
     MAX_ENTRIES = 200;
-    HEARTBEAT_FORCE_INTERVAL_MS = 15e3;
     SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
     HEARTBEAT_TEXTS = ["Still working\u2026", "Processing\u2026"];
     LiveStatusMessage = class _LiveStatusMessage {
@@ -18859,13 +18892,8 @@ var init_live_status = __esm({
         }
         if (Date.now() < this.nextFlushAllowedAt) return;
         const throttleState = getThrottleState();
-        if (throttleState?.isPaused) {
-          const staleSec = Date.now() - this.lastSuccessfulFlushAt;
-          const shouldForce = this.pendingTools.size > 0 && staleSec >= HEARTBEAT_FORCE_INTERVAL_MS;
-          if (!shouldForce) return;
-        } else {
-          if (!canFlushGlobally()) return;
-        }
+        if (throttleState?.isPaused) return;
+        if (!canFlushGlobally()) return;
         this.spinnerFrame++;
         const deduped = dedupThinking(this.entries);
         const body = renderEntries(
@@ -31580,7 +31608,7 @@ var init_telegram2 = __esm({
           if (!this.pollingExpected) return;
           const silenceMs = Date.now() - this.lastUpdateAt;
           if (silenceMs > _TelegramChannel.POLLING_SILENCE_THRESHOLD_MS) {
-            warn(
+            log(
               `[telegram] No updates received for ${Math.round(silenceMs / 1e3)}s \u2014 triggering reconnect`
             );
             markChannelDown("telegram", `No updates for ${Math.round(silenceMs / 1e3)}s`);

package/package.json

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