laohuang 0.8.1 → 0.8.2

package/dist/bin.js

@@ -7288,9 +7288,9 @@ var MainScreenRenderer = class _MainScreenRenderer {
     const width = Math.max(1, size.columns);
     const height = Math.max(1, size.rows);
     const newLines = frame.lines;
-    _MainScreenRenderer.#validateLines(newLines, width);
     const widthChanged = this.#previousWidth !== 0 && this.#previousWidth !== width;
     const heightChanged = this.#previousHeight !== 0 && this.#previousHeight !== height;
+    _MainScreenRenderer.#validateLines(newLines, width, widthChanged || heightChanged ? [] : this.#previousLines);
     const previousBufferLength = this.#previousHeight > 0 ? this.#previousViewportTop + this.#previousHeight : height;
     const prevViewportTop = heightChanged ? Math.max(0, previousBufferLength - height) : this.#previousViewportTop;
     let viewportTop = prevViewportTop;
@@ -7509,8 +7509,10 @@ var MainScreenRenderer = class _MainScreenRenderer {
     this.#previousWidth = width;
     this.#previousHeight = height;
   }
-  static #validateLines(lines2, width) {
+  static #validateLines(lines2, width, previous) {
     lines2.forEach((line2, index) => {
+      if (previous[index] === line2)
+        return;
       if (/[\r\n]/u.test(line2)) {
         throw new Error(`rendered line ${index} contains a physical newline`);
       }
@@ -7521,15 +7523,28 @@ var MainScreenRenderer = class _MainScreenRenderer {
     });
   }
 };
+var WIDTH_CACHE_SIZE = 512;
+var WIDTH_CACHE_MAX_TEXT_LENGTH = 4096;
+var widthCache = /* @__PURE__ */ new Map();
 function visibleWidth(text) {
-  if (!text) {
-    return 0;
-  }
+  if (/^[\x20-\x7e]*$/u.test(text))
+    return text.length;
+  const cached = widthCache.get(text);
+  if (cached !== void 0)
+    return cached;
   const stripped = stripTerminalControls(text).replace(/\t/g, "   ");
   let width = 0;
   for (const cluster of graphemeClusters(stripped)) {
     width += clusterWidth(cluster);
   }
+  if (text.length <= WIDTH_CACHE_MAX_TEXT_LENGTH) {
+    if (widthCache.size >= WIDTH_CACHE_SIZE) {
+      const oldest = widthCache.keys().next().value;
+      if (oldest !== void 0)
+        widthCache.delete(oldest);
+    }
+    widthCache.set(text, width);
+  }
   return width;
 }
 function truncateToWidth(text, width) {
@@ -7783,7 +7798,7 @@ function truncateStyledLine(value, width, ellipsis = "\u2026") {
   if (!truncated) {
     return line(...mergeAdjacent(result));
   }
-  const ellipsisWidth = charCellWidth(ellipsis);
+  const ellipsisWidth = ellipsis === "" ? 0 : charCellWidth(ellipsis);
   while (result.length > 0 && used + ellipsisWidth > width) {
     const removed = result.pop();
     used -= charCellWidth(removed.text);
@@ -9161,6 +9176,10 @@ var UIEventReducer = class _UIEventReducer {
         payload
       });
     }
+    if (kind === "ui.context_usage") {
+      this.#updateContextUsage(payload);
+      return createUpdate(kind, { payload });
+    }
     if (kind === "task.state_changed") {
       const rawState = payload.state ?? "IDLE";
       this.state.sessionState = String(unwrapValue(rawState)).toUpperCase();
@@ -9761,6 +9780,23 @@ var TranscriptStore = class {
 };
 
 // ../../packages/terminal/tui/dist/tui/ansi-renderer.js
+var StyledLineCompiler = class {
+  #cache = /* @__PURE__ */ new WeakMap();
+  compile(values, width, theme) {
+    return values.map((value) => {
+      const cached = this.#cache.get(value);
+      if (cached !== void 0 && cached.width === width && cached.theme === theme) {
+        return cached.text;
+      }
+      const text = compileStyledLine(truncateStyledLine(value, width, ""), width, theme);
+      this.#cache.set(value, { width, theme, text });
+      return text;
+    });
+  }
+  invalidate() {
+    this.#cache = /* @__PURE__ */ new WeakMap();
+  }
+};
 function compileStyledLine(value, width, theme) {
   const text = value.spans.map((item) => compileSpan(item, theme)).join("");
   const renderedWidth = visibleWidth(text);
@@ -9821,7 +9857,7 @@ var CompletionPopup = class {
     const description = item.description.replace(/[\r\n]+/gu, " ").trim();
     const value = line(span(selected ? "\u203A " : "  ", selected ? { foreground: "accent" } : void 0), span(item.value, selected ? { foreground: "accent" } : void 0), ...description ? [span(`  ${description}`, { foreground: "muted" })] : []);
     const boundedWidth = Math.max(1, width);
-    return displayWidth2(lineText(value)) <= boundedWidth ? value : truncateStyledLine(value, boundedWidth + 1, "");
+    return displayWidth2(lineText(value)) <= boundedWidth ? value : truncateStyledLine(value, boundedWidth, "");
   }
 };
 function displayWidth2(value) {
@@ -9937,7 +9973,8 @@ function contextUsageLabel(tokens, contextWindow) {
     return null;
   }
   const used = normalizedCount(tokens);
-  const percent = Math.max(0, Math.min(100, Math.floor(used / window * 100)));
+  const ratio = Math.min(100, used / window * 100);
+  const percent = ratio > 0 && ratio < 0.1 ? "<0.1" : formatScaled(ratio);
   return `context: ${percent}% (${formatCompactCount(used)}/${formatCompactCount(window)})`;
 }
 function normalizedCount(value) {
@@ -10933,10 +10970,10 @@ var Transcript = class {
     const key = cacheKey(block);
     const signature = blockSignature(block);
     const cached = this.#cache.get(key);
-    if (cached !== void 0 && cached.width === context.width && cached.signature === signature) {
+    if (cached !== void 0 && cached.block === block && cached.width === context.width && cached.signature === signature) {
       return cached.lines;
     }
-    if (cached !== void 0 && cached.signature === signature) {
+    if (cached !== void 0 && cached.block === block && cached.signature === signature) {
       const lines3 = cached.component.render(context).lines;
       this.#cache.set(key, {
         ...cached,
@@ -10948,6 +10985,7 @@ var Transcript = class {
     const component = this.#createBlockComponent(block);
     const lines2 = component.render(context).lines;
     this.#cache.set(key, {
+      block,
       component,
       width: context.width,
       signature,
@@ -11096,6 +11134,11 @@ var FrameBuilder = class {
   #effort;
   #title;
   #theme;
+  #transcriptView;
+  #lineCompiler = new StyledLineCompiler();
+  #previousWidth = 0;
+  #previousSources = [];
+  #previousLines = [];
   constructor(options) {
     this.#state = options.state;
     this.#transcript = options.transcript;
@@ -11105,12 +11148,21 @@ var FrameBuilder = class {
     this.#effort = options.effort ?? null;
     this.#title = options.title ?? "laoHuang";
     this.#theme = options.theme ?? resolveTerminalTheme();
+    this.#transcriptView = new Transcript({ blocks: this.#transcript.blocks() });
   }
   build(options) {
     const terminalWidth = Math.max(1, options.width);
     const width = Math.max(1, terminalWidth - 1);
     const mainScreen = options.compiledMainScreen ?? this.#fallbackMainScreen(options, width);
-    const lines2 = mainScreen.lines.map((value) => visibleWidth(value) <= width ? value : truncateToWidth(value, width));
+    const lines2 = mainScreen.lines.map((value, index) => {
+      if (this.#previousWidth === width && this.#previousSources[index] === value) {
+        return this.#previousLines[index];
+      }
+      return visibleWidth(value) <= width ? value : truncateToWidth(value, width);
+    });
+    this.#previousWidth = width;
+    this.#previousSources = [...mainScreen.lines];
+    this.#previousLines = lines2;
     const cursor = {
       row: Math.max(0, Math.min(mainScreen.cursor.row, Math.max(0, lines2.length - 1))),
       col: Math.max(0, Math.min(mainScreen.cursor.column, width - 1))
@@ -11132,9 +11184,7 @@ var FrameBuilder = class {
     return this.#status().render({ width: Math.max(1, width), theme: this.#theme }).lines.map(lineText).join("\n");
   }
   #fallbackMainScreen(options, width) {
-    const transcript = new Transcript({
-      blocks: this.#transcript.blocks()
-    }).renderWithMetadata({ width, theme: this.#theme });
+    const transcript = this.#transcriptView.renderWithMetadata({ width, theme: this.#theme });
     const transcriptLines = transcript.lines;
     const composer = new Composer({
       editor: options.editor,
@@ -11149,7 +11199,7 @@ var FrameBuilder = class {
     const cursor = composer.cursor ?? { row: Math.max(0, composer.lines.length - 1), column: 0 };
     const lines2 = [...transcriptLines, ...composer.lines, ...completion.lines, ...status.lines];
     return {
-      lines: compileStyledLines(lines2, width, this.#theme),
+      lines: this.#lineCompiler.compile(lines2, width, this.#theme),
       cursor: {
         row: transcriptLines.length + cursor.row,
         column: cursor.column
@@ -12641,6 +12691,7 @@ var TerminalUI = class {
   #loop = null;
   #transcript;
   #transcriptView;
+  #lineCompiler = new StyledLineCompiler();
   #showReasoning = true;
   #displayPolicy = new DisplayPolicy({
     audience: "terminal",
@@ -12772,9 +12823,16 @@ var TerminalUI = class {
     this.#sessionId = sessionId;
     this.#loop?.requestRender();
   }
+  setContextUsage(tokens, contextWindow) {
+    this.publishEvent({
+      kind: "ui.context_usage",
+      payload: { context_tokens: tokens, context_window: contextWindow }
+    });
+  }
   replaceTranscript(items) {
     this.#transcript.replace(items);
     this.#transcriptView.invalidate();
+    this.#lineCompiler.invalidate();
     this.#loop?.requestRender();
   }
   setComposerText(text) {
@@ -12900,7 +12958,7 @@ var TerminalUI = class {
   #buildHistoryFrameParts(width) {
     const rendered = this.#transcriptView.renderWithMetadata({ width, theme: this.theme });
     return {
-      lines: compileStyledLines(rendered.lines, Math.max(12, width), this.theme),
+      lines: this.#lineCompiler.compile(rendered.lines, Math.max(12, width), this.theme),
       activeStart: rendered.activeStart
     };
   }
@@ -12931,7 +12989,7 @@ var TerminalUI = class {
         effort: this.effort
       })
     }).renderWithMetadata({ width: contentWidth, theme: this.theme });
-    const lines2 = compileStyledLines(rendered.lines.map((line2) => truncateStyledLine(line2, contentWidth, "")), contentWidth, this.theme);
+    const lines2 = this.#lineCompiler.compile(rendered.lines, contentWidth, this.theme);
     return this.#frameBuilder.build({
       ...options,
       compiledMainScreen: {
@@ -16668,6 +16726,15 @@ function resetEmptySessionTranscript(terminalUi) {
   terminalUi?.replaceTranscript([]);
   terminalUi?.showWelcome();
 }
+function refreshSessionContextUsage(terminalUi, input) {
+  if (terminalUi === null) return;
+  const context = new ContextBuilder().build(input);
+  const estimator = new DefaultTokenEstimator();
+  terminalUi.setContextUsage(
+    estimator.estimateMessages(context.messages) + estimator.estimateTools(input.tools),
+    input.contextWindow
+  );
+}
 async function main(argv, options = {}) {
   let parsed;
   try {
@@ -17105,6 +17172,16 @@ async function main(argv, options = {}) {
     input: presenterInput,
     secretInput: presenterSecretInput
   }) : new TerminalCommandPresenter(terminalUi);
+  const refreshContextUsage = () => {
+    refreshSessionContextUsage(terminalUi, {
+      entries: sessionController.history?.entries() ?? [],
+      currentProvider: config.provider,
+      currentModel: config.model,
+      tools: toolRegistry.definitions,
+      contextWindow: selectedModel?.contextWindow ?? 0
+    });
+  };
+  refreshContextUsage();
   const refreshSessionView = () => {
     const currentSessionId = sessionController.currentSessionId;
     if (currentSessionId !== null) {
@@ -17126,6 +17203,7 @@ async function main(argv, options = {}) {
         agent.messages = [system];
       }
       resetEmptySessionTranscript(terminalUi);
+      refreshContextUsage();
       return;
     }
     agent.messages = [...new ContextBuilder().build({
@@ -17134,6 +17212,7 @@ async function main(argv, options = {}) {
       currentModel: config.model
     }).messages];
     terminalUi?.replaceTranscript(projectTranscript(entries));
+    refreshContextUsage();
   };
   const commands = new SessionCommands({
     agent,
@@ -17173,6 +17252,7 @@ async function main(argv, options = {}) {
         terminalUi.state.model = selection.config.model;
         terminalUi.setRuntimeCapabilities({ reasoning: model?.reasoning ?? false });
       }
+      refreshContextUsage();
     }
   });
   const unsubscribers = [];
@@ -17180,6 +17260,9 @@ async function main(argv, options = {}) {
   unsubscribers.push(
     runtime.eventBus.subscribe((event) => {
       sessionSink.publishEvent(projector.project(event, "terminal"));
+      if (event.session_id === runtime.sessionId && (event.kind === "task.completed" || event.kind === "task.cancelled" || event.kind === "task.failed")) {
+        refreshContextUsage();
+      }
     })
   );
   if (terminalUi !== null) {