laohuang 0.8.7 → 0.8.8

package/dist/bin.js

@@ -7,13 +7,177 @@ import { fileURLToPath } from "node:url";
 
 // ../../packages/session/session-context/dist/conversation-history.js
 import { randomUUID } from "node:crypto";
+
+// ../../packages/session/session-context/dist/token-estimator.js
+import { createHash } from "node:crypto";
+var TEXT_BYTES_PER_TOKEN = 4;
+var BLOCK_OVERHEAD = 4;
+var MESSAGE_OVERHEAD = 4;
+var DefaultTokenEstimator = class {
+  estimateMessages(messages) {
+    return messages.reduce((total, message) => total + this.estimateMessage(message), 0);
+  }
+  estimateTools(tools) {
+    if (tools.length === 0) {
+      return 0;
+    }
+    return this.estimateText(canonicalJson(tools.map(({ name, description, parameters }) => ({ name, description, parameters })))) + BLOCK_OVERHEAD;
+  }
+  estimateText(text2) {
+    return Math.ceil(Buffer.byteLength(text2, "utf8") / TEXT_BYTES_PER_TOKEN);
+  }
+  measure(input) {
+    const anchor = input.anchor ?? null;
+    if (anchor !== null && this.isValidAnchor(input, anchor)) {
+      const trailingEntries = input.entries.filter((entry) => entry.seq > anchor.throughSeq);
+      const trailingTokens = this.estimateMessages(messagesForEntries(trailingEntries));
+      return {
+        totalTokens: anchor.contextTokens + trailingTokens,
+        anchorTokens: anchor.contextTokens,
+        trailingTokens,
+        source: "provider_usage"
+      };
+    }
+    const totalTokens = this.estimateMessages(input.messages) + this.estimateTools(input.tools);
+    return {
+      totalTokens,
+      anchorTokens: 0,
+      trailingTokens: totalTokens,
+      source: "estimated"
+    };
+  }
+  estimateMessage(message) {
+    if (message.role === "system" && message.toolDefinitions !== void 0)
+      return 0;
+    if (message.role === "system" || message.role === "user") {
+      return MESSAGE_OVERHEAD + BLOCK_OVERHEAD + this.estimateText(message.content);
+    }
+    if (message.role === "tool-result") {
+      return MESSAGE_OVERHEAD + BLOCK_OVERHEAD + this.estimateText(message.content);
+    }
+    return MESSAGE_OVERHEAD + message.content.reduce((total, block) => {
+      if (block.type === "text" || block.type === "reasoning") {
+        return total + BLOCK_OVERHEAD + this.estimateText(block.text);
+      }
+      return total + BLOCK_OVERHEAD + this.estimateText(`${block.call.name}${canonicalJson(block.call.arguments)}`);
+    }, 0);
+  }
+  isValidAnchor(input, anchor) {
+    return anchor.provider === input.provider && anchor.model === input.model && anchor.systemFingerprint === input.systemFingerprint && anchor.projectInstructionsFingerprint === input.projectInstructionsFingerprint && anchor.toolsFingerprint === input.toolsFingerprint && input.entries.some((entry) => entry.id === anchor.throughEntryId && entry.seq === anchor.throughSeq);
+  }
+};
+function normalizeProviderUsage(usage) {
+  return usage.inputTokens + (usage.cacheReadTokens ?? 0) + (usage.cacheWriteTokens ?? 0) + usage.outputTokens;
+}
+function fingerprintContextPart(value) {
+  return createHash("sha256").update(canonicalJson(value)).digest("hex");
+}
+function canonicalJson(value) {
+  return JSON.stringify(sortStable(value));
+}
+function sortStable(value) {
+  if (Array.isArray(value)) {
+    return value.map(sortStable);
+  }
+  if (value !== null && typeof value === "object") {
+    const record = value;
+    const sorted = {};
+    for (const key of Object.keys(record).sort()) {
+      sorted[key] = sortStable(record[key]);
+    }
+    return sorted;
+  }
+  return value;
+}
+function messagesForEntries(entries) {
+  return entries.flatMap((entry) => {
+    if (entry.entryType === "tool_definitions" || entry.entryType === "tool_catalog")
+      return [entry.payload.message];
+    if (entry.entryType === "system_context") {
+      return [entry.payload.message];
+    }
+    if (entry.entryType === "project_instructions" || entry.entryType === "user_message" || entry.entryType === "reminder") {
+      return [entry.payload.message];
+    }
+    if (entry.entryType === "assistant_message") {
+      return [entry.payload.message];
+    }
+    if (entry.entryType === "tool_result") {
+      return [entry.payload.message];
+    }
+    return [];
+  });
+}
+
+// ../../packages/session/session-context/dist/context-usage.js
+var ContextUsage = class {
+  #tokens = 0;
+  constructor(entries = []) {
+    for (const entry of entries)
+      this.append(entry);
+  }
+  get tokens() {
+    return this.#tokens;
+  }
+  /** Histories are append-only and ordered; process each committed entry once. */
+  append(entry) {
+    if (entry.entryType === "compaction") {
+      this.#tokens = null;
+      return;
+    }
+    if (entry.entryType === "assistant_message") {
+      const usage = validUsageTokens(entry.payload.usage);
+      if (usage !== null) {
+        this.#tokens = usage;
+        return;
+      }
+    }
+    if (this.#tokens === null)
+      return;
+    if (entry.entryType === "user_message" || entry.entryType === "assistant_message" || entry.entryType === "tool_result" || entry.entryType === "reminder") {
+      this.#tokens += estimateMessage(entry.payload.message);
+    }
+  }
+};
+function validUsageTokens(usage) {
+  if (usage === void 0 || usage === null)
+    return null;
+  const fields = [
+    usage.inputTokens,
+    usage.outputTokens,
+    usage.cacheReadTokens ?? 0,
+    usage.cacheWriteTokens ?? 0
+  ];
+  if (!fields.every((value) => Number.isSafeInteger(value) && value >= 0))
+    return null;
+  const total = normalizeProviderUsage(usage);
+  return Number.isSafeInteger(total) && total > 0 ? total : null;
+}
+function estimateMessage(message) {
+  if (message.role === "system")
+    return 0;
+  if (message.role !== "assistant")
+    return Math.ceil(message.content.length / 4);
+  const chars = message.content.reduce((sum, block) => {
+    if (block.type === "tool-call") {
+      return sum + block.call.name.length + JSON.stringify(block.call.arguments).length;
+    }
+    return sum + block.text.length;
+  }, 0);
+  return Math.ceil(chars / 4);
+}
+
+// ../../packages/session/session-context/dist/conversation-history.js
 var ConversationHistory = class _ConversationHistory {
   #journal;
   #entries;
   #staged = /* @__PURE__ */ new Map();
+  #contextUsage;
+  #listeners = /* @__PURE__ */ new Set();
   constructor(entries, journal) {
     this.#entries = [...entries];
     this.#journal = journal;
+    this.#contextUsage = new ContextUsage(entries);
   }
   static fromReplay(replay, journal) {
     const history = new _ConversationHistory(replay.items.filter((item) => item.kind === "entry"), journal);
@@ -126,9 +290,21 @@ var ConversationHistory = class _ConversationHistory {
   entries() {
     return [...this.#entries];
   }
+  get contextTokens() {
+    return this.#contextUsage.tokens;
+  }
+  onChange(listener) {
+    this.#listeners.add(listener);
+    return () => {
+      this.#listeners.delete(listener);
+    };
+  }
   append(input) {
     const entry = this.#journal.appendEntry(input);
     this.#entries.push(entry);
+    this.#contextUsage.append(entry);
+    for (const listener of this.#listeners)
+      listener();
     return entry;
   }
 };
@@ -517,104 +693,6 @@ function validateToolPairs(selected) {
   }
 }
 
-// ../../packages/session/session-context/dist/token-estimator.js
-import { createHash } from "node:crypto";
-var TEXT_BYTES_PER_TOKEN = 4;
-var BLOCK_OVERHEAD = 4;
-var MESSAGE_OVERHEAD = 4;
-var DefaultTokenEstimator = class {
-  estimateMessages(messages) {
-    return messages.reduce((total, message) => total + this.estimateMessage(message), 0);
-  }
-  estimateTools(tools) {
-    if (tools.length === 0) {
-      return 0;
-    }
-    return this.estimateText(canonicalJson(tools.map(({ name, description, parameters }) => ({ name, description, parameters })))) + BLOCK_OVERHEAD;
-  }
-  estimateText(text2) {
-    return Math.ceil(Buffer.byteLength(text2, "utf8") / TEXT_BYTES_PER_TOKEN);
-  }
-  measure(input) {
-    const anchor = input.anchor ?? null;
-    if (anchor !== null && this.isValidAnchor(input, anchor)) {
-      const trailingEntries = input.entries.filter((entry) => entry.seq > anchor.throughSeq);
-      const trailingTokens = this.estimateMessages(messagesForEntries(trailingEntries));
-      return {
-        totalTokens: anchor.contextTokens + trailingTokens,
-        anchorTokens: anchor.contextTokens,
-        trailingTokens,
-        source: "provider_usage"
-      };
-    }
-    const totalTokens = this.estimateMessages(input.messages) + this.estimateTools(input.tools);
-    return {
-      totalTokens,
-      anchorTokens: 0,
-      trailingTokens: totalTokens,
-      source: "estimated"
-    };
-  }
-  estimateMessage(message) {
-    if (message.role === "system" && message.toolDefinitions !== void 0)
-      return 0;
-    if (message.role === "system" || message.role === "user") {
-      return MESSAGE_OVERHEAD + BLOCK_OVERHEAD + this.estimateText(message.content);
-    }
-    if (message.role === "tool-result") {
-      return MESSAGE_OVERHEAD + BLOCK_OVERHEAD + this.estimateText(message.content);
-    }
-    return MESSAGE_OVERHEAD + message.content.reduce((total, block) => {
-      if (block.type === "text" || block.type === "reasoning") {
-        return total + BLOCK_OVERHEAD + this.estimateText(block.text);
-      }
-      return total + BLOCK_OVERHEAD + this.estimateText(`${block.call.name}${canonicalJson(block.call.arguments)}`);
-    }, 0);
-  }
-  isValidAnchor(input, anchor) {
-    return anchor.provider === input.provider && anchor.model === input.model && anchor.systemFingerprint === input.systemFingerprint && anchor.projectInstructionsFingerprint === input.projectInstructionsFingerprint && anchor.toolsFingerprint === input.toolsFingerprint && input.entries.some((entry) => entry.id === anchor.throughEntryId && entry.seq === anchor.throughSeq);
-  }
-};
-function fingerprintContextPart(value) {
-  return createHash("sha256").update(canonicalJson(value)).digest("hex");
-}
-function canonicalJson(value) {
-  return JSON.stringify(sortStable(value));
-}
-function sortStable(value) {
-  if (Array.isArray(value)) {
-    return value.map(sortStable);
-  }
-  if (value !== null && typeof value === "object") {
-    const record = value;
-    const sorted = {};
-    for (const key of Object.keys(record).sort()) {
-      sorted[key] = sortStable(record[key]);
-    }
-    return sorted;
-  }
-  return value;
-}
-function messagesForEntries(entries) {
-  return entries.flatMap((entry) => {
-    if (entry.entryType === "tool_definitions" || entry.entryType === "tool_catalog")
-      return [entry.payload.message];
-    if (entry.entryType === "system_context") {
-      return [entry.payload.message];
-    }
-    if (entry.entryType === "project_instructions" || entry.entryType === "user_message" || entry.entryType === "reminder") {
-      return [entry.payload.message];
-    }
-    if (entry.entryType === "assistant_message") {
-      return [entry.payload.message];
-    }
-    if (entry.entryType === "tool_result") {
-      return [entry.payload.message];
-    }
-    return [];
-  });
-}
-
 // ../../packages/session/session-context/dist/summary-prompt.js
 var COMPACTION_SYSTEM_PROMPT = "Summarize the conversation for continuation. Preserve user goals, explicit constraints, completed work, modified files, architectural decisions, tool outcomes, failures, current TODOs, and concrete state needed to continue. Do not include credentials. Do not invent results.";
 
@@ -8686,7 +8764,6 @@ var UIEventReducer = class _UIEventReducer {
     }
     if (kind === "model.request_started") {
       this.state.sessionState = "RUNNING_MODEL";
-      this.#updateContextUsage(payload);
       this.state.activeResponse = {
         requestId: correlationId,
         text: "",
@@ -8785,7 +8862,6 @@ var UIEventReducer = class _UIEventReducer {
     if (kind === "model.switched") {
       this.state.provider = String("provider" in payload ? payload.provider : this.state.provider);
       this.state.model = String("model" in payload ? payload.model : this.state.model);
-      this.#updateContextUsage(payload);
       return createUpdate(kind, { payload });
     }
     return null;
@@ -8800,7 +8876,7 @@ var UIEventReducer = class _UIEventReducer {
   }
   #updateContextUsage(payload) {
     if ("context_tokens" in payload) {
-      this.state.contextTokens = toInt(payload.context_tokens);
+      this.state.contextTokens = payload.context_tokens === null ? null : toInt(payload.context_tokens);
     }
     if ("context_window" in payload) {
       this.state.contextWindow = toInt(payload.context_window);
@@ -9466,6 +9542,8 @@ function contextUsageLabel(tokens, contextWindow) {
   if (window <= 0) {
     return null;
   }
+  if (tokens === null)
+    return `context: ? (?/${formatCompactCount(window)})`;
   const used = normalizedCount(tokens);
   const ratio = Math.min(100, used / window * 100);
   const percent = ratio > 0 && ratio < 0.1 ? "<0.1" : formatScaled(ratio);
@@ -12335,12 +12413,15 @@ var TerminalUI = class {
     Object.assign(this.capabilities, capabilities);
   }
   setSessionId(sessionId) {
+    if (sessionId !== this.#sessionId)
+      this.state.contextTokens = 0;
     this.#sessionId = sessionId;
     this.#loop?.requestRender();
   }
   setContextUsage(tokens, contextWindow) {
     this.publishEvent({
       kind: "ui.context_usage",
+      session_id: this.#sessionId,
       payload: { context_tokens: tokens, context_window: contextWindow }
     });
   }
@@ -12529,6 +12610,8 @@ var TerminalUI = class {
   }
   /** Reduce a projected event and apply its append-only block change. */
   applyProjectedEvent(event) {
+    if (event.kind === "ui.context_usage" && event.session_id !== this.#sessionId)
+      return;
     for (const projected of this.#displayPolicy.project(event)) {
       this.#applyDisplayEvent(projected);
     }
@@ -16562,7 +16645,8 @@ Authentication failed for ${this.options.provider}. Run /login ${this.options.pr
       });
       if (!history.commitAssistant(result.message, {
         requestId,
-        finishReason: result.finishReason
+        finishReason: result.finishReason,
+        ...toolCalls.length > 0 || textOf(result.message) !== "" ? { usage: result.usage } : {}
       })) {
         this.emit("model_response_aborted", {
           round: modelRound,
@@ -16767,7 +16851,8 @@ var HistoryCommitter = class {
           this.conversationHistory?.appendAssistant({
             message,
             requestId: metadata.requestId,
-            finishReason: metadata.finishReason
+            finishReason: metadata.finishReason,
+            ...metadata.usage === void 0 ? {} : { usage: metadata.usage }
           });
         }
         this.messages.push(message);
@@ -16778,7 +16863,8 @@ var HistoryCommitter = class {
       this.conversationHistory?.appendAssistant({
         message,
         requestId: metadata.requestId,
-        finishReason: metadata.finishReason
+        finishReason: metadata.finishReason,
+        ...metadata.usage === void 0 ? {} : { usage: metadata.usage }
       });
     }
     this.messages.push(message);
@@ -17385,24 +17471,22 @@ function createSessionRuntime(options) {
     if (notify === void 0) {
       return;
     }
-    const entries = options.sessionController.history?.entries() ?? [];
-    const context = new ContextBuilder().build({
-      entries,
-      currentProvider: route.provider,
-      currentModel: route.model
-    });
-    const estimator = new DefaultTokenEstimator();
     notify({
-      contextTokens: estimator.estimateMessages(context.messages) + estimator.estimateTools(projectTools(context.messages)),
+      contextTokens: options.sessionController.history === null ? 0 : options.sessionController.history.contextTokens,
       contextWindow: selectedModel.contextWindow
     });
   };
+  let unsubscribeHistory;
   const refreshSession = () => {
     const sessionId = options.sessionController.currentSessionId;
     const history = options.sessionController.history;
     if (sessionId === null || history === null) {
       throw new Error("no active session");
     }
+    unsubscribeHistory?.();
+    unsubscribeHistory = history.onChange(() => {
+      if (options.sessionController.history === history) refreshContextUsage();
+    });
     session.setSessionId(sessionId);
     options.presentation?.sessionChanged?.(sessionId);
     let entries = history.entries();
@@ -17470,6 +17554,7 @@ function createSessionRuntime(options) {
     compact: () => options.sessionController.compact(),
     refreshContextUsage,
     async close() {
+      unsubscribeHistory?.();
       try {
         await recorder.close();
       } finally {