march-cli 0.1.24 → 0.1.26

package/src/cli/tui/output-buffer.mjs

@@ -1,293 +1,293 @@
-import { brightBlack, dim } from "./ui-theme.mjs";
-import { renderToolCardBlock } from "./output/tool-card-renderer.mjs";
-import { renderMarkdown, renderStreamingMarkdown } from "./markdown-renderer.mjs";
-import { renderEditDiffBlock } from "./tui-diff-rendering.mjs";
-import { OutputScrollState } from "./output/scroll-state.mjs";
-import { appendTextLines, wrapLine } from "./output/text-line-renderer.mjs";
-import { sliceLinesWithTail } from "./output/visible-lines.mjs";
-
-const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
-
-
-
-function currentTextToBlocks(textLines, sealed, cache = null) {
-  const blocks = [];
-  for (let i = 0; i < textLines.length;) {
-    const markdown = textLines[i].markdown;
-    const batch = [];
-    while (i < textLines.length && textLines[i].markdown === markdown) {
-      batch.push(textLines[i].text);
-      i += 1;
-    }
-    blocks.push(markdown
-      ? { type: "markdown", text: batch.join("\n"), sealed, cache: sealed ? new Map() : (cache ?? new Map()) }
-      : { type: "plain", lines: batch });
-  }
-  return blocks;
-}
-
-function renderBlock(block, width) {
-  if (block.type === "diff") return renderEditDiffBlock(block, width);
-  if (block.type === "tool-card") return renderToolCardBlock(block, width);
-  if (block.type === "plain" || block.type === "tool" || block.type === "status") return renderPlainBlock(block, width);
-  if (block.type === "markdown") return renderMarkdownBlock(block, width);
-  if (block.type === "thinking") return renderThinkingBlock(block, width);
-  return [];
-}
-
-function renderPlainBlock(block, width) {
-  const lines = [];
-  appendTextLines(lines, block.lines, width);
-  return lines;
-}
-
-function renderMarkdownBlock(block, width) {
-  if (!block.sealed) return renderStreamingMarkdown(block.text, width, block.cache);
-  const cached = block.cache.get(width);
-  if (cached) return cached;
-  const rendered = renderMarkdown(block.text, width);
-  block.cache.set(width, rendered);
-  return rendered;
-}
-
-function renderThinkingBlock(block, width) {
-  const lines = [dim(`· thinking (${block.tokens} tokens)`)];
-  const indent = width > 40 ? width - 40 : width - 2;
-  const maxContentWidth = Math.max(20, indent);
-  for (const line of block.content) {
-    for (const w of wrapLine(line, maxContentWidth)) lines.push(dim(`  ${w}`));
-  }
-  return lines;
-}
-
-
-export class OutputBuffer {
-  constructor() {
-    this.segments = [];
-    this.currentText = [{ text: "", markdown: false }];
-    this.currentTextCache = new Map();
-    this.spinning = false;
-    this.spinnerText = "";
-    this.spinnerIdx = 0;
-    this._activeThinking = null;
-    this.overlayStatus = null;
-    this.scrollState = new OutputScrollState();
-    this._segmentLinesCache = new Map();
-    this._baseLinesCache = new Map();
-  }
-
-  get scrollOffset() {
-    return this.scrollState.offset;
-  }
-
-  clear() {
-    this.segments = [];
-    this.currentText = [{ text: "", markdown: false }];
-    this.currentTextCache = new Map();
-    this.spinning = false;
-    this.spinnerText = "";
-    this.spinnerIdx = 0;
-    this._activeThinking = null;
-    this.overlayStatus = null;
-    this.scrollState.clear();
-    this._segmentLinesCache = new Map();
-    this._baseLinesCache = new Map();
-  }
-
-  write(text) {
-    this._writeText(text, false);
-  }
-
-  writeMarkdown(text) {
-    this._writeText(text, true);
-  }
-
-  _writeText(text, markdown) {
-    this.overlayStatus = null;
-    this._invalidateBaseLines();
-    const current = this.currentText.at(-1);
-    if (current.markdown !== markdown && current.text !== "") {
-      this.currentText.push({ text: "", markdown });
-    } else {
-      current.markdown = markdown;
-    }
-    const parts = text.split("\n");
-    this.currentText[this.currentText.length - 1].text += parts[0];
-    for (let i = 1; i < parts.length; i++) this.currentText.push({ text: parts[i], markdown });
-  }
-
-  writeln(text) {
-    this.overlayStatus = null;
-    this._invalidateBaseLines();
-    this.currentText[this.currentText.length - 1].text += text;
-    this.currentText.push({ text: "", markdown: false });
-  }
-
-  ensureNewline() {
-    const current = this.currentText.at(-1);
-    if (!current || current.text === "") return false;
-    this.currentText.push({ text: "", markdown: false });
-    this._invalidateBaseLines();
-    return true;
-  }
-
-  startThinking() {
-    this.overlayStatus = null;
-    this._flushText();
-    const seg = { type: "thinking", tokens: 0, content: [] };
-    this.segments.push(seg);
-    this._invalidateSegmentLines();
-    this._activeThinking = seg;
-  }
-
-  appendThinking(text) {
-    if (!this._activeThinking) this.startThinking();
-    const parts = text.split("\n");
-    const lastIdx = this._activeThinking.content.length - 1;
-    if (lastIdx >= 0) this._activeThinking.content[lastIdx] += parts[0];
-    else this._activeThinking.content.push(parts[0]);
-    for (let i = 1; i < parts.length; i++) this._activeThinking.content.push(parts[i]);
-    this._invalidateBaseLines();
-  }
-
-  endThinking(tokens) {
-    if (this._activeThinking) {
-      this._activeThinking.tokens = tokens;
-      this._activeThinking = null;
-      this._invalidateSegmentLines();
-    }
-  }
-
-  addThinkingBlock(tokens, content) {
-    this.overlayStatus = null;
-    this._flushText();
-    this.segments.push({ type: "thinking", tokens, content: content.split("\n") });
-    this._invalidateSegmentLines();
-  }
-
-  addBlock(block) {
-    this.overlayStatus = null;
-    this._flushText();
-    this.segments.push(block);
-    this._invalidateSegmentLines();
-  }
-
-  setOverlayStatus(lines) {
-    this.overlayStatus = Array.isArray(lines) ? { type: "status", lines } : null;
-    this._invalidateBaseLines();
-  }
-
-  clearOverlayStatus() {
-    this.overlayStatus = null;
-    this._invalidateBaseLines();
-  }
-
-  sealCurrentText() {
-    return this._flushText();
-  }
-
-  _flushText() {
-    if (this.currentText.length <= 1 && this.currentText[0].text === "") return false;
-    this.segments.push(...currentTextToBlocks(this.currentText, true));
-    this._invalidateSegmentLines();
-    this.currentText = [{ text: "", markdown: false }];
-    this.currentTextCache = new Map();
-    return true;
-  }
-
-  setSpinner(on, text) {
-    this.spinning = on;
-    if (text !== undefined) this.spinnerText = text;
-  }
-
-  tick() {
-    this.spinnerIdx = (this.spinnerIdx + 1) % SPINNER_FRAMES.length;
-  }
-
-  scroll(delta, options) {
-    return this.scrollState.scroll(delta, options);
-  }
-
-  getScrollStep() {
-    return this.scrollState.getStep();
-  }
-
-  getMaxScrollOffset() {
-    return this.scrollState.getMaxOffset();
-  }
-
-  setViewportHeight(height) {
-    this.scrollState.setViewportHeight(height);
-  }
-
-  resetScroll() {
-    this.scrollState.reset();
-  }
-
-  setToolCardsExpanded(expanded) {
-    let changed = false;
-    for (const seg of this.segments) {
-      if (seg.type !== "tool-card") continue;
-      if (seg.expanded === expanded) continue;
-      seg.expanded = expanded;
-      changed = true;
-    }
-    if (changed) this._invalidateSegmentLines();
-    return changed;
-  }
-
-  invalidate() {
-    this._invalidateSegmentLines();
-  }
-
-  _invalidateSegmentLines() {
-    this._segmentLinesCache.clear();
-    this._invalidateBaseLines();
-  }
-
-  _invalidateBaseLines() {
-    this._baseLinesCache.clear();
-  }
-
-  render(width) {
-    const baseLines = this._renderBaseLines(width);
-    const tailLine = this.spinning ? this._spinnerLine() : null;
-    this.scrollState.setTotalLines(baseLines.length + (tailLine == null ? 0 : 1));
-    return sliceLinesWithTail(baseLines, tailLine, this.scrollState.sliceRange());
-  }
-
-  _spinnerLine() {
-    return brightBlack(`${SPINNER_FRAMES[this.spinnerIdx]} ${this.spinnerText}`);
-  }
-
-  _renderBaseLines(width) {
-    const cached = this._baseLinesCache.get(width);
-    if (cached) return cached;
-    const lines = [...this._renderCachedSegmentLines(width)];
-    const dynamicStart = this._cachedSegmentPrefixCount();
-    for (const seg of this.segments.slice(dynamicStart)) for (const line of renderBlock(seg, width)) lines.push(line);
-    for (const block of currentTextToBlocks(this.currentText, false, this.currentTextCache)) for (const line of renderBlock(block, width)) lines.push(line);
-    if (this.overlayStatus) for (const line of renderBlock(this.overlayStatus, width)) lines.push(line);
-    this._baseLinesCache.set(width, lines);
-    return lines;
-  }
-
-  _renderCachedSegmentLines(width) {
-    const prefixCount = this._cachedSegmentPrefixCount();
-    const cached = this._segmentLinesCache.get(width);
-    if (cached?.prefixCount === prefixCount) return cached.lines;
-
-    const lines = [];
-    for (let i = 0; i < prefixCount; i += 1) {
-      for (const line of renderBlock(this.segments[i], width)) lines.push(line);
-    }
-    this._segmentLinesCache.set(width, { prefixCount, lines });
-    return lines;
-  }
-
-  _cachedSegmentPrefixCount() {
-    if (!this._activeThinking) return this.segments.length;
-    const index = this.segments.indexOf(this._activeThinking);
-    return index < 0 ? this.segments.length : index;
-  }
-}
+import { brightBlack, dim } from "./ui-theme.mjs";
+import { renderToolCardBlock } from "./output/tool-card-renderer.mjs";
+import { renderMarkdown, renderStreamingMarkdown } from "./markdown-renderer.mjs";
+import { renderEditDiffBlock } from "./tui-diff-rendering.mjs";
+import { OutputScrollState } from "./output/scroll-state.mjs";
+import { appendTextLines, wrapLine } from "./output/text-line-renderer.mjs";
+import { sliceLinesWithTail } from "./output/visible-lines.mjs";
+
+const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+
+
+
+function currentTextToBlocks(textLines, sealed, cache = null) {
+  const blocks = [];
+  for (let i = 0; i < textLines.length;) {
+    const markdown = textLines[i].markdown;
+    const batch = [];
+    while (i < textLines.length && textLines[i].markdown === markdown) {
+      batch.push(textLines[i].text);
+      i += 1;
+    }
+    blocks.push(markdown
+      ? { type: "markdown", text: batch.join("\n"), sealed, cache: sealed ? new Map() : (cache ?? new Map()) }
+      : { type: "plain", lines: batch });
+  }
+  return blocks;
+}
+
+function renderBlock(block, width) {
+  if (block.type === "diff") return renderEditDiffBlock(block, width);
+  if (block.type === "tool-card") return renderToolCardBlock(block, width);
+  if (block.type === "plain" || block.type === "tool" || block.type === "status") return renderPlainBlock(block, width);
+  if (block.type === "markdown") return renderMarkdownBlock(block, width);
+  if (block.type === "thinking") return renderThinkingBlock(block, width);
+  return [];
+}
+
+function renderPlainBlock(block, width) {
+  const lines = [];
+  appendTextLines(lines, block.lines, width);
+  return lines;
+}
+
+function renderMarkdownBlock(block, width) {
+  if (!block.sealed) return renderStreamingMarkdown(block.text, width, block.cache);
+  const cached = block.cache.get(width);
+  if (cached) return cached;
+  const rendered = renderMarkdown(block.text, width);
+  block.cache.set(width, rendered);
+  return rendered;
+}
+
+function renderThinkingBlock(block, width) {
+  const lines = [dim(`· thinking (${block.tokens} tokens)`)];
+  const indent = width > 40 ? width - 40 : width - 2;
+  const maxContentWidth = Math.max(20, indent);
+  for (const line of block.content) {
+    for (const w of wrapLine(line, maxContentWidth)) lines.push(dim(`  ${w}`));
+  }
+  return lines;
+}
+
+
+export class OutputBuffer {
+  constructor() {
+    this.segments = [];
+    this.currentText = [{ text: "", markdown: false }];
+    this.currentTextCache = new Map();
+    this.spinning = false;
+    this.spinnerText = "";
+    this.spinnerIdx = 0;
+    this._activeThinking = null;
+    this.overlayStatus = null;
+    this.scrollState = new OutputScrollState();
+    this._segmentLinesCache = new Map();
+    this._baseLinesCache = new Map();
+  }
+
+  get scrollOffset() {
+    return this.scrollState.offset;
+  }
+
+  clear() {
+    this.segments = [];
+    this.currentText = [{ text: "", markdown: false }];
+    this.currentTextCache = new Map();
+    this.spinning = false;
+    this.spinnerText = "";
+    this.spinnerIdx = 0;
+    this._activeThinking = null;
+    this.overlayStatus = null;
+    this.scrollState.clear();
+    this._segmentLinesCache = new Map();
+    this._baseLinesCache = new Map();
+  }
+
+  write(text) {
+    this._writeText(text, false);
+  }
+
+  writeMarkdown(text) {
+    this._writeText(text, true);
+  }
+
+  _writeText(text, markdown) {
+    this.overlayStatus = null;
+    this._invalidateBaseLines();
+    const current = this.currentText.at(-1);
+    if (current.markdown !== markdown && current.text !== "") {
+      this.currentText.push({ text: "", markdown });
+    } else {
+      current.markdown = markdown;
+    }
+    const parts = text.split("\n");
+    this.currentText[this.currentText.length - 1].text += parts[0];
+    for (let i = 1; i < parts.length; i++) this.currentText.push({ text: parts[i], markdown });
+  }
+
+  writeln(text) {
+    this.overlayStatus = null;
+    this._invalidateBaseLines();
+    this.currentText[this.currentText.length - 1].text += text;
+    this.currentText.push({ text: "", markdown: false });
+  }
+
+  ensureNewline() {
+    const current = this.currentText.at(-1);
+    if (!current || current.text === "") return false;
+    this.currentText.push({ text: "", markdown: false });
+    this._invalidateBaseLines();
+    return true;
+  }
+
+  startThinking() {
+    this.overlayStatus = null;
+    this._flushText();
+    const seg = { type: "thinking", tokens: 0, content: [] };
+    this.segments.push(seg);
+    this._invalidateSegmentLines();
+    this._activeThinking = seg;
+  }
+
+  appendThinking(text) {
+    if (!this._activeThinking) this.startThinking();
+    const parts = text.split("\n");
+    const lastIdx = this._activeThinking.content.length - 1;
+    if (lastIdx >= 0) this._activeThinking.content[lastIdx] += parts[0];
+    else this._activeThinking.content.push(parts[0]);
+    for (let i = 1; i < parts.length; i++) this._activeThinking.content.push(parts[i]);
+    this._invalidateBaseLines();
+  }
+
+  endThinking(tokens) {
+    if (this._activeThinking) {
+      this._activeThinking.tokens = tokens;
+      this._activeThinking = null;
+      this._invalidateSegmentLines();
+    }
+  }
+
+  addThinkingBlock(tokens, content) {
+    this.overlayStatus = null;
+    this._flushText();
+    this.segments.push({ type: "thinking", tokens, content: content.split("\n") });
+    this._invalidateSegmentLines();
+  }
+
+  addBlock(block) {
+    this.overlayStatus = null;
+    this._flushText();
+    this.segments.push(block);
+    this._invalidateSegmentLines();
+  }
+
+  setOverlayStatus(lines) {
+    this.overlayStatus = Array.isArray(lines) ? { type: "status", lines } : null;
+    this._invalidateBaseLines();
+  }
+
+  clearOverlayStatus() {
+    this.overlayStatus = null;
+    this._invalidateBaseLines();
+  }
+
+  sealCurrentText() {
+    return this._flushText();
+  }
+
+  _flushText() {
+    if (this.currentText.length <= 1 && this.currentText[0].text === "") return false;
+    this.segments.push(...currentTextToBlocks(this.currentText, true));
+    this._invalidateSegmentLines();
+    this.currentText = [{ text: "", markdown: false }];
+    this.currentTextCache = new Map();
+    return true;
+  }
+
+  setSpinner(on, text) {
+    this.spinning = on;
+    if (text !== undefined) this.spinnerText = text;
+  }
+
+  tick() {
+    this.spinnerIdx = (this.spinnerIdx + 1) % SPINNER_FRAMES.length;
+  }
+
+  scroll(delta, options) {
+    return this.scrollState.scroll(delta, options);
+  }
+
+  getScrollStep() {
+    return this.scrollState.getStep();
+  }
+
+  getMaxScrollOffset() {
+    return this.scrollState.getMaxOffset();
+  }
+
+  setViewportHeight(height) {
+    this.scrollState.setViewportHeight(height);
+  }
+
+  resetScroll() {
+    this.scrollState.reset();
+  }
+
+  setToolCardsExpanded(expanded) {
+    let changed = false;
+    for (const seg of this.segments) {
+      if (seg.type !== "tool-card") continue;
+      if (seg.expanded === expanded) continue;
+      seg.expanded = expanded;
+      changed = true;
+    }
+    if (changed) this._invalidateSegmentLines();
+    return changed;
+  }
+
+  invalidate() {
+    this._invalidateSegmentLines();
+  }
+
+  _invalidateSegmentLines() {
+    this._segmentLinesCache.clear();
+    this._invalidateBaseLines();
+  }
+
+  _invalidateBaseLines() {
+    this._baseLinesCache.clear();
+  }
+
+  render(width) {
+    const baseLines = this._renderBaseLines(width);
+    const tailLine = this.spinning ? this._spinnerLine() : null;
+    this.scrollState.setTotalLines(baseLines.length + (tailLine == null ? 0 : 1));
+    return sliceLinesWithTail(baseLines, tailLine, this.scrollState.sliceRange());
+  }
+
+  _spinnerLine() {
+    return brightBlack(`${SPINNER_FRAMES[this.spinnerIdx]} ${this.spinnerText}`);
+  }
+
+  _renderBaseLines(width) {
+    const cached = this._baseLinesCache.get(width);
+    if (cached) return cached;
+    const lines = [...this._renderCachedSegmentLines(width)];
+    const dynamicStart = this._cachedSegmentPrefixCount();
+    for (const seg of this.segments.slice(dynamicStart)) for (const line of renderBlock(seg, width)) lines.push(line);
+    for (const block of currentTextToBlocks(this.currentText, false, this.currentTextCache)) for (const line of renderBlock(block, width)) lines.push(line);
+    if (this.overlayStatus) for (const line of renderBlock(this.overlayStatus, width)) lines.push(line);
+    this._baseLinesCache.set(width, lines);
+    return lines;
+  }
+
+  _renderCachedSegmentLines(width) {
+    const prefixCount = this._cachedSegmentPrefixCount();
+    const cached = this._segmentLinesCache.get(width);
+    if (cached?.prefixCount === prefixCount) return cached.lines;
+
+    const lines = [];
+    for (let i = 0; i < prefixCount; i += 1) {
+      for (const line of renderBlock(this.segments[i], width)) lines.push(line);
+    }
+    this._segmentLinesCache.set(width, { prefixCount, lines });
+    return lines;
+  }
+
+  _cachedSegmentPrefixCount() {
+    if (!this._activeThinking) return this.segments.length;
+    const index = this.segments.indexOf(this._activeThinking);
+    return index < 0 ? this.segments.length : index;
+  }
+}

package/src/cli/tui/permission-request-ui.mjs

@@ -1,18 +1,18 @@
-import { permissionLabel } from "../permissions.mjs";
-import { formatToolStartLine } from "./tool-rendering.mjs";
-import { brightBlack, yellow } from "./ui-theme.mjs";
-
-export async function requestToolPermission({ toolName, params, category, output, selectList, requestRender }) {
-  const label = permissionLabel(category);
-  output.writeln(yellow(`● ${toolName} needs ${label} permission`));
-  output.writeln(brightBlack(`  ${formatToolStartLine(toolName, params)}`));
-  requestRender();
-  const choice = await selectList({
-    items: [
-      { label: "Approve once", description: `Allow ${toolName} this time (${label})` },
-      { label: "Deny", description: "Block this tool call" },
-    ],
-    width: 58,
-  });
-  return choice?.label === "Approve once";
-}
+import { permissionLabel } from "../permissions.mjs";
+import { formatToolStartLine } from "./tool-rendering.mjs";
+import { brightBlack, yellow } from "./ui-theme.mjs";
+
+export async function requestToolPermission({ toolName, params, category, output, selectList, requestRender }) {
+  const label = permissionLabel(category);
+  output.writeln(yellow(`● ${toolName} needs ${label} permission`));
+  output.writeln(brightBlack(`  ${formatToolStartLine(toolName, params)}`));
+  requestRender();
+  const choice = await selectList({
+    items: [
+      { label: "Approve once", description: `Allow ${toolName} this time (${label})` },
+      { label: "Deny", description: "Block this tool call" },
+    ],
+    width: 58,
+  });
+  return choice?.label === "Approve once";
+}