repoburg 1.3.261 → 1.3.262

package/agent-pane/backend/dist/index.js

@@ -16108,20 +16108,20 @@ var require_resolve = __commonJS({
       return false;
     }
     function countKeys(schema) {
-      let count = 0;
+      let count2 = 0;
       for (const key in schema) {
         if (key === "$ref")
           return Infinity;
-        count++;
+        count2++;
         if (SIMPLE_INLINED.has(key))
           continue;
         if (typeof schema[key] == "object") {
-          (0, util_1.eachItem)(schema[key], (sch) => count += countKeys(sch));
+          (0, util_1.eachItem)(schema[key], (sch) => count2 += countKeys(sch));
         }
-        if (count === Infinity)
+        if (count2 === Infinity)
           return Infinity;
       }
-      return count;
+      return count2;
     }
     function getFullPath(resolver, id = "", normalize) {
       if (normalize !== false)
@@ -19319,8 +19319,8 @@ var require_contains = __commonJS({
         cxt.result(valid, () => cxt.reset());
         function validateItemsWithCount() {
           const schValid = gen.name("_valid");
-          const count = gen.let("count", 0);
-          validateItems(schValid, () => gen.if(schValid, () => checkLimits(count)));
+          const count2 = gen.let("count", 0);
+          validateItems(schValid, () => gen.if(schValid, () => checkLimits(count2)));
         }
         function validateItems(_valid, block) {
           gen.forRange("i", 0, len, (i) => {
@@ -19333,16 +19333,16 @@ var require_contains = __commonJS({
             block();
           });
         }
-        function checkLimits(count) {
-          gen.code((0, codegen_1._)`${count}++`);
+        function checkLimits(count2) {
+          gen.code((0, codegen_1._)`${count2}++`);
           if (max === void 0) {
-            gen.if((0, codegen_1._)`${count} >= ${min}`, () => gen.assign(valid, true).break());
+            gen.if((0, codegen_1._)`${count2} >= ${min}`, () => gen.assign(valid, true).break());
           } else {
-            gen.if((0, codegen_1._)`${count} > ${max}`, () => gen.assign(valid, false).break());
+            gen.if((0, codegen_1._)`${count2} > ${max}`, () => gen.assign(valid, false).break());
             if (min === 1)
               gen.assign(valid, true);
             else
-              gen.if((0, codegen_1._)`${count} >= ${min}`, () => gen.assign(valid, true));
+              gen.if((0, codegen_1._)`${count2} >= ${min}`, () => gen.assign(valid, true));
           }
         }
       }
@@ -21689,9 +21689,9 @@ var require_parseJson = __commonJS({
             pos++;
           } else if (c === "u") {
             pos++;
-            let count = 4;
+            let count2 = 4;
             let code = 0;
-            while (count--) {
+            while (count2--) {
               code <<= 4;
               c = s[pos];
               if (c === void 0) {
@@ -36953,7 +36953,7 @@ var require_fastify_plugin = __commonJS({
     "use strict";
     var getPluginName = require_getPluginName();
     var toCamelCase = require_toCamelCase();
-    var count = 0;
+    var count2 = 0;
     function plugin(fn, options = {}) {
       let autoName = false;
       if (fn.default !== void 0) {
@@ -36977,7 +36977,7 @@ var require_fastify_plugin = __commonJS({
       }
       if (!options.name) {
         autoName = true;
-        options.name = getPluginName(fn) + "-auto-" + count++;
+        options.name = getPluginName(fn) + "-auto-" + count2++;
       }
       fn[Symbol.for("skip-override")] = options.encapsulate !== true;
       fn[Symbol.for("fastify.display-name")] = options.name;
@@ -45478,6 +45478,100 @@ var EFFORT_LABELS2 = {
   max: "Max"
 };
 
+// src/claude/claude-context.ts
+function count(n) {
+  return typeof n === "number" && Number.isFinite(n) ? n : 0;
+}
+function lastMessageIteration(iterations) {
+  if (!Array.isArray(iterations)) return null;
+  for (let i = iterations.length - 1; i >= 0; i--) {
+    const it = iterations[i];
+    if (!it || typeof it !== "object") continue;
+    if ((it.type === "message" || it.type === "fallback_message") && typeof it.input_tokens === "number") return it;
+  }
+  return null;
+}
+function contextTokensFromUsage(usage) {
+  if (!usage || typeof usage !== "object") return null;
+  const u = lastMessageIteration(usage.iterations) ?? usage;
+  const read = count(u.input_tokens) + count(u.cache_creation_input_tokens) + count(u.cache_read_input_tokens);
+  if (read <= 0) return null;
+  return read + count(u.output_tokens);
+}
+function counterOf(entry) {
+  if (!entry.context) {
+    entry.context = {
+      window: null,
+      autoCompactThreshold: null,
+      tokens: null,
+      measured: false,
+      apiMessageId: null,
+      seq: 0,
+      windowRequested: false,
+      lastPublished: null
+    };
+  }
+  return entry.context;
+}
+function publish(entry, sessionId, db2) {
+  const ctx = counterOf(entry);
+  if (ctx.tokens === null) return;
+  if (!ctx.window) {
+    if (!ctx.windowRequested) void refreshContext(entry, sessionId, db2);
+    return;
+  }
+  const usage = {
+    totalTokens: ctx.tokens,
+    contextWindow: ctx.window,
+    percentage: Math.round(ctx.tokens / ctx.window * 100),
+    ...ctx.autoCompactThreshold ? { autoCompactThreshold: ctx.autoCompactThreshold } : {}
+  };
+  const json = JSON.stringify(usage);
+  if (json === ctx.lastPublished) return;
+  ctx.lastPublished = json;
+  broadcast("turn:contextUsage", { sessionId, ...usage });
+  db2.prepare("UPDATE sessions SET context_usage = ? WHERE id = ?").run(json, sessionId);
+}
+function recordApiUsage(entry, sessionId, db2, apiMessageId, usage) {
+  if (entry.threadId) return;
+  const tokens = contextTokensFromUsage(usage);
+  if (tokens === null) return;
+  const ctx = counterOf(entry);
+  const id = apiMessageId ?? ctx.apiMessageId;
+  if (ctx.measured && id !== null && id === ctx.apiMessageId && ctx.tokens !== null && tokens <= ctx.tokens) return;
+  ctx.apiMessageId = id;
+  ctx.tokens = tokens;
+  ctx.measured = true;
+  ctx.seq++;
+  publish(entry, sessionId, db2);
+}
+function resetContext(entry, sessionId, db2) {
+  if (entry.threadId) return;
+  const ctx = counterOf(entry);
+  ctx.tokens = null;
+  ctx.measured = false;
+  ctx.apiMessageId = null;
+  ctx.seq++;
+  void refreshContext(entry, sessionId, db2);
+}
+async function refreshContext(entry, sessionId, db2) {
+  if (entry.threadId) return;
+  const ctx = counterOf(entry);
+  ctx.windowRequested = true;
+  const seq = ctx.seq;
+  try {
+    const snap = await entry.query.getContextUsage({ detail: "summary" });
+    if (snap.maxTokens > 0) {
+      ctx.window = snap.maxTokens;
+      ctx.autoCompactThreshold = snap.isAutoCompactEnabled && snap.autoCompactThreshold && snap.autoCompactThreshold > 0 ? snap.autoCompactThreshold : null;
+    }
+    if (ctx.seq === seq && !ctx.measured && snap.totalTokens > 0) ctx.tokens = snap.totalTokens;
+  } catch {
+    return;
+  }
+  publish(entry, sessionId, db2);
+}
+
 // src/claude/claude-provider.ts
 var PromptQueue = class {
   buffer = [];
@@ -45736,6 +45830,7 @@ async function handleMessage(message, sessionId, turnId, entry, db2) {
             turnId,
             db2
           );
+          resetContext(entry, sessionId, db2);
         } else if (sub === "task_started") {
           handleTaskStarted(
             message,
@@ -45772,7 +45867,7 @@ async function handleMessage(message, sessionId, turnId, entry, db2) {
       break;
     }
     case "assistant": {
-      handleAssistantMessage(message, sessionId, turnId, db2);
+      handleAssistantMessage(message, sessionId, turnId, entry, db2);
       break;
     }
     case "user": {
@@ -45780,19 +45875,23 @@ async function handleMessage(message, sessionId, turnId, entry, db2) {
       break;
     }
     case "stream_event": {
-      handleStreamEvent(message, sessionId, turnId);
+      handleStreamEvent(message, sessionId, turnId, entry, db2);
       break;
     }
     case "result": {
       handleResultMessage(message, sessionId, turnId, entry, db2);
       break;
     }
+    case "conversation_reset": {
+      resetContext(entry, sessionId, db2);
+      break;
+    }
     default:
       break;
   }
 }
 var TOOL_CALL_TYPES = /* @__PURE__ */ new Set(["command_execution", "file_change", "mcp_tool_call"]);
-function handleAssistantMessage(message, sessionId, turnId, db2) {
+function handleAssistantMessage(message, sessionId, turnId, entry, db2) {
   const messageId = message.uuid;
   const parentToolUseId = message.parent_tool_use_id ?? null;
   if (parentToolUseId) {
@@ -45802,6 +45901,9 @@ function handleAssistantMessage(message, sessionId, turnId, db2) {
     db2.prepare("UPDATE turns SET external_turn_id = ?, updated_at = ? WHERE id = ?").run(messageId, nowExt2, turnId);
     return;
   }
+  if (message.message?.model !== "<synthetic>") {
+    recordApiUsage(entry, sessionId, db2, message.message?.id ?? null, message.message?.usage);
+  }
   const content = message.message.content;
   const anthropicMsgId = message.message?.id ?? messageId;
   const thinkingTexts = thinkingAccumulator.get(messageId);
@@ -45858,12 +45960,19 @@ function handleUserMessage(message, sessionId, turnId, db2) {
     );
   }
 }
-function handleStreamEvent(message, sessionId, turnId) {
+function handleStreamEvent(message, sessionId, turnId, entry, db2) {
   const rawEvent = message.event;
   const parentToolUseId = message.parent_tool_use_id ?? null;
   if (rawEvent.type === "message_start" && rawEvent.message?.id && !parentToolUseId) {
     streamingMessageIds.set(turnId, rawEvent.message.id);
   }
+  if (!parentToolUseId) {
+    if (rawEvent.type === "message_start" && rawEvent.message?.id) {
+      recordApiUsage(entry, sessionId, db2, rawEvent.message.id, rawEvent.message.usage);
+    } else if (rawEvent.type === "message_delta") {
+      recordApiUsage(entry, sessionId, db2, null, rawEvent.usage);
+    }
+  }
   const delta = mapPartialDelta(message.event);
   if (!delta) return;
   if (parentToolUseId) return;
@@ -46042,24 +46151,7 @@ async function handleResultMessage(message, sessionId, turnId, entry, db2) {
     const now = (/* @__PURE__ */ new Date()).toISOString();
     db2.prepare("UPDATE turns SET token_usage = ?, updated_at = ? WHERE id = ?").run(JSON.stringify(usage), now, turnId);
     broadcast("turn:tokenUsage", { sessionId, turnId, usage });
-    try {
-      const ctx = await entry.query.getContextUsage();
-      if (ctx.totalTokens > 0 && ctx.maxTokens > 0) {
-        const contextUsage = {
-          totalTokens: ctx.totalTokens,
-          contextWindow: ctx.maxTokens,
-          percentage: Math.round(ctx.percentage)
-        };
-        broadcast("turn:contextUsage", { sessionId, ...contextUsage });
-        const cuNow = (/* @__PURE__ */ new Date()).toISOString();
-        db2.prepare("UPDATE sessions SET context_usage = ?, updated_at = ? WHERE id = ?").run(
-          JSON.stringify(contextUsage),
-          cuNow,
-          sessionId
-        );
-      }
-    } catch {
-    }
+    await refreshContext(entry, sessionId, db2);
     completeTurn(db2, sessionId, turnId, usage);
   } else {
     const errorMsg = message.errors?.join("; ") ?? "Claude turn failed";
@@ -46219,6 +46311,7 @@ async function setModel(sessionId, model) {
   const entry = sessionMap2.get(sessionId);
   if (!entry) return;
   await entry.query.setModel(model);
+  void refreshContext(entry, sessionId, getDb());
 }
 async function stopTask(sessionId, taskId) {
   const entry = sessionMap2.get(sessionId);

package/agent-pane/backend/dist/server.js

@@ -16108,20 +16108,20 @@ var require_resolve = __commonJS({
       return false;
     }
     function countKeys(schema) {
-      let count = 0;
+      let count2 = 0;
       for (const key in schema) {
         if (key === "$ref")
           return Infinity;
-        count++;
+        count2++;
         if (SIMPLE_INLINED.has(key))
           continue;
         if (typeof schema[key] == "object") {
-          (0, util_1.eachItem)(schema[key], (sch) => count += countKeys(sch));
+          (0, util_1.eachItem)(schema[key], (sch) => count2 += countKeys(sch));
         }
-        if (count === Infinity)
+        if (count2 === Infinity)
           return Infinity;
       }
-      return count;
+      return count2;
     }
     function getFullPath(resolver, id = "", normalize) {
       if (normalize !== false)
@@ -19319,8 +19319,8 @@ var require_contains = __commonJS({
         cxt.result(valid, () => cxt.reset());
         function validateItemsWithCount() {
           const schValid = gen.name("_valid");
-          const count = gen.let("count", 0);
-          validateItems(schValid, () => gen.if(schValid, () => checkLimits(count)));
+          const count2 = gen.let("count", 0);
+          validateItems(schValid, () => gen.if(schValid, () => checkLimits(count2)));
         }
         function validateItems(_valid, block) {
           gen.forRange("i", 0, len, (i) => {
@@ -19333,16 +19333,16 @@ var require_contains = __commonJS({
             block();
           });
         }
-        function checkLimits(count) {
-          gen.code((0, codegen_1._)`${count}++`);
+        function checkLimits(count2) {
+          gen.code((0, codegen_1._)`${count2}++`);
           if (max === void 0) {
-            gen.if((0, codegen_1._)`${count} >= ${min}`, () => gen.assign(valid, true).break());
+            gen.if((0, codegen_1._)`${count2} >= ${min}`, () => gen.assign(valid, true).break());
           } else {
-            gen.if((0, codegen_1._)`${count} > ${max}`, () => gen.assign(valid, false).break());
+            gen.if((0, codegen_1._)`${count2} > ${max}`, () => gen.assign(valid, false).break());
             if (min === 1)
               gen.assign(valid, true);
             else
-              gen.if((0, codegen_1._)`${count} >= ${min}`, () => gen.assign(valid, true));
+              gen.if((0, codegen_1._)`${count2} >= ${min}`, () => gen.assign(valid, true));
           }
         }
       }
@@ -21689,9 +21689,9 @@ var require_parseJson = __commonJS({
             pos++;
           } else if (c === "u") {
             pos++;
-            let count = 4;
+            let count2 = 4;
             let code = 0;
-            while (count--) {
+            while (count2--) {
               code <<= 4;
               c = s[pos];
               if (c === void 0) {
@@ -36953,7 +36953,7 @@ var require_fastify_plugin = __commonJS({
     "use strict";
     var getPluginName = require_getPluginName();
     var toCamelCase = require_toCamelCase();
-    var count = 0;
+    var count2 = 0;
     function plugin(fn, options = {}) {
       let autoName = false;
       if (fn.default !== void 0) {
@@ -36977,7 +36977,7 @@ var require_fastify_plugin = __commonJS({
       }
       if (!options.name) {
         autoName = true;
-        options.name = getPluginName(fn) + "-auto-" + count++;
+        options.name = getPluginName(fn) + "-auto-" + count2++;
       }
       fn[Symbol.for("skip-override")] = options.encapsulate !== true;
       fn[Symbol.for("fastify.display-name")] = options.name;
@@ -45465,6 +45465,100 @@ var EFFORT_LABELS2 = {
   max: "Max"
 };
 
+// src/claude/claude-context.ts
+function count(n) {
+  return typeof n === "number" && Number.isFinite(n) ? n : 0;
+}
+function lastMessageIteration(iterations) {
+  if (!Array.isArray(iterations)) return null;
+  for (let i = iterations.length - 1; i >= 0; i--) {
+    const it = iterations[i];
+    if (!it || typeof it !== "object") continue;
+    if ((it.type === "message" || it.type === "fallback_message") && typeof it.input_tokens === "number") return it;
+  }
+  return null;
+}
+function contextTokensFromUsage(usage) {
+  if (!usage || typeof usage !== "object") return null;
+  const u = lastMessageIteration(usage.iterations) ?? usage;
+  const read = count(u.input_tokens) + count(u.cache_creation_input_tokens) + count(u.cache_read_input_tokens);
+  if (read <= 0) return null;
+  return read + count(u.output_tokens);
+}
+function counterOf(entry) {
+  if (!entry.context) {
+    entry.context = {
+      window: null,
+      autoCompactThreshold: null,
+      tokens: null,
+      measured: false,
+      apiMessageId: null,
+      seq: 0,
+      windowRequested: false,
+      lastPublished: null
+    };
+  }
+  return entry.context;
+}
+function publish(entry, sessionId, db2) {
+  const ctx = counterOf(entry);
+  if (ctx.tokens === null) return;
+  if (!ctx.window) {
+    if (!ctx.windowRequested) void refreshContext(entry, sessionId, db2);
+    return;
+  }
+  const usage = {
+    totalTokens: ctx.tokens,
+    contextWindow: ctx.window,
+    percentage: Math.round(ctx.tokens / ctx.window * 100),
+    ...ctx.autoCompactThreshold ? { autoCompactThreshold: ctx.autoCompactThreshold } : {}
+  };
+  const json = JSON.stringify(usage);
+  if (json === ctx.lastPublished) return;
+  ctx.lastPublished = json;
+  broadcast("turn:contextUsage", { sessionId, ...usage });
+  db2.prepare("UPDATE sessions SET context_usage = ? WHERE id = ?").run(json, sessionId);
+}
+function recordApiUsage(entry, sessionId, db2, apiMessageId, usage) {
+  if (entry.threadId) return;
+  const tokens = contextTokensFromUsage(usage);
+  if (tokens === null) return;
+  const ctx = counterOf(entry);
+  const id = apiMessageId ?? ctx.apiMessageId;
+  if (ctx.measured && id !== null && id === ctx.apiMessageId && ctx.tokens !== null && tokens <= ctx.tokens) return;
+  ctx.apiMessageId = id;
+  ctx.tokens = tokens;
+  ctx.measured = true;
+  ctx.seq++;
+  publish(entry, sessionId, db2);
+}
+function resetContext(entry, sessionId, db2) {
+  if (entry.threadId) return;
+  const ctx = counterOf(entry);
+  ctx.tokens = null;
+  ctx.measured = false;
+  ctx.apiMessageId = null;
+  ctx.seq++;
+  void refreshContext(entry, sessionId, db2);
+}
+async function refreshContext(entry, sessionId, db2) {
+  if (entry.threadId) return;
+  const ctx = counterOf(entry);
+  ctx.windowRequested = true;
+  const seq = ctx.seq;
+  try {
+    const snap = await entry.query.getContextUsage({ detail: "summary" });
+    if (snap.maxTokens > 0) {
+      ctx.window = snap.maxTokens;
+      ctx.autoCompactThreshold = snap.isAutoCompactEnabled && snap.autoCompactThreshold && snap.autoCompactThreshold > 0 ? snap.autoCompactThreshold : null;
+    }
+    if (ctx.seq === seq && !ctx.measured && snap.totalTokens > 0) ctx.tokens = snap.totalTokens;
+  } catch {
+    return;
+  }
+  publish(entry, sessionId, db2);
+}
+
 // src/claude/claude-provider.ts
 var PromptQueue = class {
   buffer = [];
@@ -45723,6 +45817,7 @@ async function handleMessage(message, sessionId, turnId, entry, db2) {
             turnId,
             db2
           );
+          resetContext(entry, sessionId, db2);
         } else if (sub === "task_started") {
           handleTaskStarted(
             message,
@@ -45759,7 +45854,7 @@ async function handleMessage(message, sessionId, turnId, entry, db2) {
       break;
     }
     case "assistant": {
-      handleAssistantMessage(message, sessionId, turnId, db2);
+      handleAssistantMessage(message, sessionId, turnId, entry, db2);
       break;
     }
     case "user": {
@@ -45767,19 +45862,23 @@ async function handleMessage(message, sessionId, turnId, entry, db2) {
       break;
     }
     case "stream_event": {
-      handleStreamEvent(message, sessionId, turnId);
+      handleStreamEvent(message, sessionId, turnId, entry, db2);
       break;
     }
     case "result": {
       handleResultMessage(message, sessionId, turnId, entry, db2);
       break;
     }
+    case "conversation_reset": {
+      resetContext(entry, sessionId, db2);
+      break;
+    }
     default:
       break;
   }
 }
 var TOOL_CALL_TYPES = /* @__PURE__ */ new Set(["command_execution", "file_change", "mcp_tool_call"]);
-function handleAssistantMessage(message, sessionId, turnId, db2) {
+function handleAssistantMessage(message, sessionId, turnId, entry, db2) {
   const messageId = message.uuid;
   const parentToolUseId = message.parent_tool_use_id ?? null;
   if (parentToolUseId) {
@@ -45789,6 +45888,9 @@ function handleAssistantMessage(message, sessionId, turnId, db2) {
     db2.prepare("UPDATE turns SET external_turn_id = ?, updated_at = ? WHERE id = ?").run(messageId, nowExt2, turnId);
     return;
   }
+  if (message.message?.model !== "<synthetic>") {
+    recordApiUsage(entry, sessionId, db2, message.message?.id ?? null, message.message?.usage);
+  }
   const content = message.message.content;
   const anthropicMsgId = message.message?.id ?? messageId;
   const thinkingTexts = thinkingAccumulator.get(messageId);
@@ -45845,12 +45947,19 @@ function handleUserMessage(message, sessionId, turnId, db2) {
     );
   }
 }
-function handleStreamEvent(message, sessionId, turnId) {
+function handleStreamEvent(message, sessionId, turnId, entry, db2) {
   const rawEvent = message.event;
   const parentToolUseId = message.parent_tool_use_id ?? null;
   if (rawEvent.type === "message_start" && rawEvent.message?.id && !parentToolUseId) {
     streamingMessageIds.set(turnId, rawEvent.message.id);
   }
+  if (!parentToolUseId) {
+    if (rawEvent.type === "message_start" && rawEvent.message?.id) {
+      recordApiUsage(entry, sessionId, db2, rawEvent.message.id, rawEvent.message.usage);
+    } else if (rawEvent.type === "message_delta") {
+      recordApiUsage(entry, sessionId, db2, null, rawEvent.usage);
+    }
+  }
   const delta = mapPartialDelta(message.event);
   if (!delta) return;
   if (parentToolUseId) return;
@@ -46029,24 +46138,7 @@ async function handleResultMessage(message, sessionId, turnId, entry, db2) {
     const now = (/* @__PURE__ */ new Date()).toISOString();
     db2.prepare("UPDATE turns SET token_usage = ?, updated_at = ? WHERE id = ?").run(JSON.stringify(usage), now, turnId);
     broadcast("turn:tokenUsage", { sessionId, turnId, usage });
-    try {
-      const ctx = await entry.query.getContextUsage();
-      if (ctx.totalTokens > 0 && ctx.maxTokens > 0) {
-        const contextUsage = {
-          totalTokens: ctx.totalTokens,
-          contextWindow: ctx.maxTokens,
-          percentage: Math.round(ctx.percentage)
-        };
-        broadcast("turn:contextUsage", { sessionId, ...contextUsage });
-        const cuNow = (/* @__PURE__ */ new Date()).toISOString();
-        db2.prepare("UPDATE sessions SET context_usage = ?, updated_at = ? WHERE id = ?").run(
-          JSON.stringify(contextUsage),
-          cuNow,
-          sessionId
-        );
-      }
-    } catch {
-    }
+    await refreshContext(entry, sessionId, db2);
     completeTurn(db2, sessionId, turnId, usage);
   } else {
     const errorMsg = message.errors?.join("; ") ?? "Claude turn failed";
@@ -46206,6 +46298,7 @@ async function setModel(sessionId, model) {
   const entry = sessionMap2.get(sessionId);
   if (!entry) return;
   await entry.query.setModel(model);
+  void refreshContext(entry, sessionId, getDb());
 }
 async function stopTask(sessionId, taskId) {
   const entry = sessionMap2.get(sessionId);