cc-claw 0.12.5 → 0.12.6

package/dist/cli.js

@@ -72,7 +72,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = true ? "0.12.5" : (() => {
+    VERSION = true ? "0.12.6" : (() => {
       try {
         return JSON.parse(readFileSync(join2(process.cwd(), "package.json"), "utf-8")).version ?? "unknown";
       } catch {
@@ -1610,6 +1610,8 @@ function initDatabase() {
       cache_read_tokens INTEGER NOT NULL DEFAULT 0,
       request_count INTEGER NOT NULL DEFAULT 0,
       last_input_tokens INTEGER NOT NULL DEFAULT 0,
+      last_cache_read_tokens INTEGER NOT NULL DEFAULT 0,
+      context_size INTEGER NOT NULL DEFAULT 0,
       updated_at TEXT NOT NULL DEFAULT (datetime('now'))
     );
   `);
@@ -1621,6 +1623,10 @@ function initDatabase() {
     db.exec("ALTER TABLE chat_usage ADD COLUMN last_cache_read_tokens INTEGER NOT NULL DEFAULT 0");
   } catch {
   }
+  try {
+    db.exec("ALTER TABLE chat_usage ADD COLUMN context_size INTEGER NOT NULL DEFAULT 0");
+  } catch {
+  }
   db.exec(`
     CREATE TABLE IF NOT EXISTS usage_log (
       id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -2361,14 +2367,15 @@ function determineEscalationTarget(chatId, currentMode) {
 }
 function getUsage(chatId) {
   const row = db.prepare(
-    "SELECT input_tokens, output_tokens, cache_read_tokens, request_count, last_input_tokens, last_cache_read_tokens FROM chat_usage WHERE chat_id = ?"
+    "SELECT input_tokens, output_tokens, cache_read_tokens, request_count, last_input_tokens, last_cache_read_tokens, context_size FROM chat_usage WHERE chat_id = ?"
   ).get(chatId);
-  return row ?? { input_tokens: 0, output_tokens: 0, cache_read_tokens: 0, request_count: 0, last_input_tokens: 0, last_cache_read_tokens: 0 };
+  return row ?? { input_tokens: 0, output_tokens: 0, cache_read_tokens: 0, request_count: 0, last_input_tokens: 0, last_cache_read_tokens: 0, context_size: 0 };
 }
-function addUsage(chatId, input, output2, cacheRead, model2, backend2) {
+function addUsage(chatId, input, output2, cacheRead, model2, backend2, contextSize) {
+  const finalContextSize = contextSize ?? input + cacheRead;
   db.prepare(`
-    INSERT INTO chat_usage (chat_id, input_tokens, output_tokens, cache_read_tokens, request_count, last_input_tokens, last_cache_read_tokens, updated_at)
-    VALUES (?, ?, ?, ?, 1, ?, ?, datetime('now'))
+    INSERT INTO chat_usage (chat_id, input_tokens, output_tokens, cache_read_tokens, request_count, last_input_tokens, last_cache_read_tokens, context_size, updated_at)
+    VALUES (?, ?, ?, ?, 1, ?, ?, ?, datetime('now'))
     ON CONFLICT(chat_id) DO UPDATE SET
       input_tokens = input_tokens + ?,
       output_tokens = output_tokens + ?,
@@ -2376,8 +2383,9 @@ function addUsage(chatId, input, output2, cacheRead, model2, backend2) {
       request_count = request_count + 1,
       last_input_tokens = ?,
       last_cache_read_tokens = ?,
+      context_size = ?,
       updated_at = datetime('now')
-  `).run(chatId, input, output2, cacheRead, input, cacheRead, input, output2, cacheRead, input, cacheRead);
+  `).run(chatId, input, output2, cacheRead, input, cacheRead, finalContextSize, input, output2, cacheRead, input, cacheRead, finalContextSize);
   if (model2) {
     db.prepare(
       "INSERT INTO usage_log (chat_id, model, input_tokens, output_tokens, cache_read_tokens, backend) VALUES (?, ?, ?, ?, ?, ?)"
@@ -8237,7 +8245,7 @@ data: ${JSON.stringify(data)}
               model: model2,
               permMode: mode
             });
-            if (response.usage) addUsage2(chatId, response.usage.input, response.usage.output, response.usage.cacheRead, model2 ?? "unknown");
+            if (response.usage) addUsage2(chatId, response.usage.input, response.usage.output, response.usage.cacheRead, model2 ?? "unknown", void 0, response.usage.contextSize);
             sendSSE("done", JSON.stringify({ text: response.text, usage: response.usage }));
             res.end();
           } catch (err) {
@@ -8246,7 +8254,7 @@ data: ${JSON.stringify(data)}
           }
         } else {
           const response = await askAgent2(chatId, body.message, { cwd, model: model2, permMode: mode });
-          if (response.usage) addUsage2(chatId, response.usage.input, response.usage.output, response.usage.cacheRead, model2 ?? "unknown");
+          if (response.usage) addUsage2(chatId, response.usage.input, response.usage.output, response.usage.cacheRead, model2 ?? "unknown", void 0, response.usage.contextSize);
           return jsonResponse(res, { text: response.text, usage: response.usage, sessionId: response.sessionId });
         }
       } catch (err) {
@@ -9154,6 +9162,7 @@ function spawnQuery(adapter, config2, model2, cancelState, thinkingLevel, timeou
     let input = 0;
     let output2 = 0;
     let cacheRead = 0;
+    let contextSize;
     let sawToolEvents = false;
     let sawResultEvent = false;
     let toolTurnCount = 0;
@@ -9230,6 +9239,7 @@ function spawnQuery(adapter, config2, model2, cancelState, thinkingLevel, timeou
               input += ev.usage.input;
               output2 += ev.usage.output;
               cacheRead += ev.usage.cacheRead;
+              contextSize = ev.usage.input + (ev.usage.cacheRead ?? 0);
             }
             break;
           case "result":
@@ -9240,6 +9250,7 @@ function spawnQuery(adapter, config2, model2, cancelState, thinkingLevel, timeou
               input = ev.usage.input;
               output2 = ev.usage.output;
               cacheRead = ev.usage.cacheRead;
+              contextSize = ev.usage.input + (ev.usage.cacheRead ?? 0);
             }
             if (adapter.shouldKillOnResult()) {
               try {
@@ -9296,7 +9307,7 @@ Partial output: ${accumulatedText.slice(-500)}`;
         reject(new Error(`CLI exited with code ${code}${stderr ? `: ${stderr.slice(0, 500)}` : ""}`));
         return;
       }
-      resolve({ resultText, sessionId, input, output: output2, cacheRead, sawToolEvents, sawResultEvent });
+      resolve({ resultText, sessionId, input, output: output2, cacheRead, contextSize, sawToolEvents, sawResultEvent });
     });
   });
 }
@@ -9458,7 +9469,7 @@ async function askAgentImpl(chatId, userMessage, opts) {
     activeChats.delete(chatId);
   }
   if (cancelState.cancelled) {
-    return { text: "Stopped.", usage: { input: result.input, output: result.output, cacheRead: result.cacheRead } };
+    return { text: "Stopped.", usage: { input: result.input, output: result.output, cacheRead: result.cacheRead, contextSize: result.contextSize } };
   }
   if (result.sessionId && !isSyntheticChatId(chatId)) {
     setSessionId(chatId, result.sessionId);
@@ -9490,7 +9501,7 @@ async function askAgentImpl(chatId, userMessage, opts) {
   return {
     text: result.resultText || `(No response from ${adapter.displayName})`,
     sessionId: result.sessionId,
-    usage: { input: result.input, output: result.output, cacheRead: result.cacheRead }
+    usage: { input: result.input, output: result.output, cacheRead: result.cacheRead, contextSize: result.contextSize }
   };
 }
 function getMcpConfigPath(chatId) {
@@ -10536,7 +10547,7 @@ async function runHeartbeat(chatId, config2) {
       } catch {
         heartbeatModel = getModel(chatId) ?? "unknown";
       }
-      addUsage(chatId, response.usage.input, response.usage.output, response.usage.cacheRead, heartbeatModel);
+      addUsage(chatId, response.usage.input, response.usage.output, response.usage.cacheRead, heartbeatModel, void 0, response.usage.contextSize);
     }
     const now = (/* @__PURE__ */ new Date()).toISOString();
     const next = new Date(Date.now() + config2.intervalMs).toISOString();
@@ -12796,7 +12807,7 @@ Tap to toggle:`,
       const mode = getMode(chatId);
       const modelSig = getModelSignature(chatId);
       const contextMax = adapter?.contextWindow[model2] ?? 2e5;
-      const contextUsed = usage2.last_input_tokens + usage2.last_cache_read_tokens;
+      const contextUsed = usage2.context_size;
       const contextPct = contextMax > 0 ? contextUsed / contextMax * 100 : 0;
       const ctxBar = buildBar(contextPct);
       const usedK = (contextUsed / 1e3).toFixed(1);
@@ -14156,7 +14167,7 @@ async function handleVoice(msg, channel) {
     const vVerbose = getVerboseLevel(chatId);
     const vToolCb = vVerbose !== "off" ? makeToolActionCallback(chatId, channel, vVerbose) : void 0;
     const response = await askAgent(chatId, transcript, { cwd: getCwd(chatId), model: vModel, permMode: mode, onToolAction: vToolCb });
-    if (response.usage) addUsage(chatId, response.usage.input, response.usage.output, response.usage.cacheRead, vModel);
+    if (response.usage) addUsage(chatId, response.usage.input, response.usage.output, response.usage.cacheRead, vModel, void 0, response.usage.contextSize);
     if (await handleResponseExhaustion(response.text, chatId, msg, channel)) return;
     const voiceResponse = ensureReaction(response.text, transcript);
     await sendResponse(chatId, channel, voiceResponse, msg.messageId);
@@ -14222,7 +14233,7 @@ Acknowledge receipt. Do NOT analyze the video unless they ask you to.`;
       const vidVerbose = getVerboseLevel(chatId);
       const vidToolCb = vidVerbose !== "off" ? makeToolActionCallback(chatId, channel, vidVerbose) : void 0;
       const response2 = await askAgent(chatId, prompt2, { cwd: getCwd(chatId), model: vidModel, permMode: vMode, onToolAction: vidToolCb });
-      if (response2.usage) addUsage(chatId, response2.usage.input, response2.usage.output, response2.usage.cacheRead, vidModel);
+      if (response2.usage) addUsage(chatId, response2.usage.input, response2.usage.output, response2.usage.cacheRead, vidModel, void 0, response2.usage.contextSize);
       if (await handleResponseExhaustion(response2.text, chatId, msg, channel)) return;
       const vidResponse = ensureReaction(response2.text, caption || "video");
       await sendResponse(chatId, channel, vidResponse, msg.messageId);
@@ -14264,7 +14275,7 @@ ${content}
     const mVerbose = getVerboseLevel(chatId);
     const mToolCb = mVerbose !== "off" ? makeToolActionCallback(chatId, channel, mVerbose) : void 0;
     const response = await askAgent(chatId, prompt, { cwd: getCwd(chatId), model: mediaModel, permMode: mMode, onToolAction: mToolCb });
-    if (response.usage) addUsage(chatId, response.usage.input, response.usage.output, response.usage.cacheRead, mediaModel);
+    if (response.usage) addUsage(chatId, response.usage.input, response.usage.output, response.usage.cacheRead, mediaModel, void 0, response.usage.contextSize);
     if (await handleResponseExhaustion(response.text, chatId, msg, channel)) return;
     const mediaResponse = ensureReaction(response.text, caption || "file");
     await sendResponse(chatId, channel, mediaResponse, msg.messageId);
@@ -14413,7 +14424,7 @@ async function handleText(msg, channel) {
       }
     });
     const elapsedSec = ((Date.now() - sigT0) / 1e3).toFixed(1);
-    if (response.usage) addUsage(chatId, response.usage.input, response.usage.output, response.usage.cacheRead, model2);
+    if (response.usage) addUsage(chatId, response.usage.input, response.usage.output, response.usage.cacheRead, model2, void 0, response.usage.contextSize);
     let responseText = response.text;
     const sigEnabled = getModelSignature(chatId);
     if (sigEnabled === "on" && responseText && !responseText.startsWith("(No response")) {
@@ -14571,7 +14582,7 @@ async function handleSideQuest(parentChatId, msg, channel) {
     const adapterForLog = backend2 ? getAdapter(backend2) : getAdapterForChat(parentChatId);
     appendToLog(parentChatId, `[side quest] ${userText}`, `[side quest] ${response.text ?? ""}`, adapterForLog.id, model2 ?? null, null);
     if (response.usage) {
-      addUsage(parentChatId, response.usage.input, response.usage.output, response.usage.cacheRead, model2 ?? void 0, backend2 ?? void 0);
+      addUsage(parentChatId, response.usage.input, response.usage.output, response.usage.cacheRead, model2 ?? void 0, backend2 ?? void 0, response.usage.contextSize);
     }
     try {
       const { detectAndLogSignals: detectAndLogSignals2 } = await Promise.resolve().then(() => (init_detect(), detect_exports));
@@ -15800,7 +15811,7 @@ Result: ${task.result.slice(0, 500)}` : ""
     const sVerbose = getVerboseLevel(chatId);
     const sToolCb = sVerbose !== "off" ? makeToolActionCallback(chatId, channel, sVerbose) : void 0;
     const response = await askAgent(chatId, skillContent, { cwd: getCwd(chatId), model: skillModel, permMode: sMode, onToolAction: sToolCb });
-    if (response.usage) addUsage(chatId, response.usage.input, response.usage.output, response.usage.cacheRead, skillModel);
+    if (response.usage) addUsage(chatId, response.usage.input, response.usage.output, response.usage.cacheRead, skillModel, void 0, response.usage.contextSize);
     await sendResponse(chatId, channel, response.text);
   } else if (data.startsWith("evolve:")) {
     const parts = data.split(":");
@@ -17159,7 +17170,7 @@ async function executeJob(job) {
     updateJobLastRun(job.id, (/* @__PURE__ */ new Date()).toISOString());
     resetJobFailures(job.id);
     if (response.usage) {
-      addUsage(job.chatId, response.usage.input, response.usage.output, response.usage.cacheRead, resolvedModel);
+      addUsage(job.chatId, response.usage.input, response.usage.output, response.usage.cacheRead, resolvedModel, void 0, response.usage.contextSize);
     }
     const delivered = await deliverJobOutput(job, response.text);
     const finalStatus = !delivered && contentStatus === "success" ? "delivery_failed" : contentStatus;

package/package.json

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