march-cli 0.1.0

package/src/cli/tui/syntax/tree-sitter/yaml.highlights.scm

@@ -0,0 +1,99 @@
+(boolean_scalar) @boolean
+
+(null_scalar) @constant.builtin
+
+(double_quote_scalar) @string
+
+(single_quote_scalar) @string
+
+((block_scalar) @string
+  (#set! priority 99))
+
+(string_scalar) @string
+
+(escape_sequence) @string.escape
+
+(integer_scalar) @number
+
+(float_scalar) @number
+
+(comment) @comment @spell
+
+[
+  (anchor_name)
+  (alias_name)
+] @label
+
+(tag) @type
+
+[
+  (yaml_directive)
+  (tag_directive)
+  (reserved_directive)
+] @keyword.directive
+
+(block_mapping_pair
+  key: (flow_node
+    [
+      (double_quote_scalar)
+      (single_quote_scalar)
+    ] @property))
+
+(block_mapping_pair
+  key: (flow_node
+    (plain_scalar
+      (string_scalar) @property)))
+
+(flow_mapping
+  (_
+    key: (flow_node
+      [
+        (double_quote_scalar)
+        (single_quote_scalar)
+      ] @property)))
+
+(flow_mapping
+  (_
+    key: (flow_node
+      (plain_scalar
+        (string_scalar) @property))))
+
+[
+  ","
+  "-"
+  ":"
+  ">"
+  "?"
+  "|"
+] @punctuation.delimiter
+
+[
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  "*"
+  "&"
+  "---"
+  "..."
+] @punctuation.special
+
+; help deal with for yaml's norway problem https://www.bram.us/2022/01/11/yaml-the-norway-problem/
+; only using `true` and `false`, since Treesitter parser targets YAML spec 1.2 https://github.com/nvim-treesitter/nvim-treesitter/pull/7512#issuecomment-2565397302
+(block_mapping_pair
+  value: (block_node
+    (block_sequence
+      (block_sequence_item
+        (flow_node
+          (plain_scalar
+            (string_scalar) @boolean
+            (#any-of? @boolean "TRUE" "FALSE" "True" "False")))))))
+
+(block_mapping_pair
+  value: (flow_node
+    (plain_scalar
+      (string_scalar) @boolean
+      (#any-of? @boolean "TRUE" "FALSE" "True" "False"))))

package/src/cli/tui/tool-rendering.mjs

@@ -0,0 +1,194 @@
+import { extractToolOutput } from "../tool-output.mjs";
+import { dim, red } from "./ui-theme.mjs";
+
+const TOOL_BODY_LIMIT = 40;
+const TOOL_ERROR_LIMIT = 6;
+
+export function writeToolStart({ output, name, args }) {
+  const block = createToolCardBlock({ name, args });
+  writeStructuredLines(output, block);
+  return block;
+}
+
+export function createToolCardBlock({ name, args }) {
+  return {
+    type: "tool-card",
+    name,
+    args,
+    title: formatToolStartLine(name, args),
+    state: "running",
+    isError: false,
+    summary: "running",
+    bodyLines: [],
+  };
+}
+
+export function writeToolEnd({
+  output,
+  name,
+  isError,
+  result,
+  toolsExpanded = false,
+  extractToolOutputImpl = extractToolOutput,
+  toolBlock = null,
+}) {
+  const card = formatToolEndCard({ name, isError, result, extractToolOutputImpl });
+  if (toolBlock?.type === "tool-card") {
+    Object.assign(toolBlock, card, { expanded: toolsExpanded });
+    return true;
+  }
+
+  const lines = renderToolEndFallbackLines({ name, card, toolsExpanded });
+  if (!lines.length) return false;
+  writeStructuredLines(output, { type: "tool", lines });
+  return true;
+}
+
+export function formatToolStartLine(name, args = {}) {
+  if (name === "edit_file") {
+    const path = compactPath(args?.path ?? "");
+    const editCount = Array.isArray(args?.edits) ? args.edits.length : 0;
+    const mode = args?.mode ?? "patch";
+    const summary = mode === "patch" ? `${editCount} edit${editCount === 1 ? "" : "s"}` : mode;
+    return joinToolParts("◆", name, [path, summary]);
+  }
+  if (name === "command_exec") return joinToolParts("◆", name, [compactText(args?.command ?? "")]);
+  if (name === "terminal_send") return joinToolParts("◆", name, [args?.shell_id, formatTerminalSendAction(args)]);
+  if (name?.startsWith?.("terminal_")) return joinToolParts("◆", name, [args?.shell_id, formatTerminalDetails(args)]);
+  if (name === "web_search") return joinToolParts("◆", name, [quoteCompact(args?.query ?? "")]);
+  if (name === "web_fetch") return joinToolParts("◆", name, [compactText(args?.url ?? "")]);
+  if (name === "context_stats") return joinToolParts("◆", name, []);
+  if (name === "read") {
+    const path = compactPath(args?.path ?? args?.filePath ?? "");
+    return joinToolParts("→", name, [path, formatReadRange(args)]);
+  }
+  if (name === "grep") {
+    const path = compactPath(args?.path ?? "");
+    return joinToolParts("✱", name, [quoteCompact(args?.pattern ?? ""), path]);
+  }
+  if (name === "glob") {
+    const path = compactPath(args?.path ?? "");
+    return joinToolParts("✱", name, [quoteCompact(args?.pattern ?? ""), path]);
+  }
+  if (name === "find") {
+    const path = compactPath(args?.path ?? "");
+    return joinToolParts("✱", name, [quoteCompact(args?.pattern ?? ""), path]);
+  }
+  return joinToolParts("◆", name, [formatSmallOptions(args)]);
+}
+
+export function formatToolSuccessSummary(name, result, out = "") {
+  if (name === "grep") {
+    const matches = result?.details?.results?.length ?? countMatchLines(out);
+    return `${matches} match${matches === 1 ? "" : "es"}`;
+  }
+  if (name === "glob") {
+    const matches = Array.isArray(result?.details?.matches) ? result.details.matches.length : countNonEmptyLines(out);
+    return `${matches} file${matches === 1 ? "" : "s"}`;
+  }
+  if (name === "find") {
+    const matches = result?.details?.count ?? countNonEmptyLines(out);
+    return `${matches} file${matches === 1 ? "" : "s"}`;
+  }
+  return "";
+}
+
+function formatToolEndCard({ name, isError, result, extractToolOutputImpl }) {
+  const out = extractToolOutputImpl(result);
+  if (isError) {
+    return {
+      state: "done",
+      isError: true,
+      summary: "failed",
+      bodyLines: out.split("\n").filter(Boolean).slice(0, TOOL_ERROR_LIMIT).map((line) => line.slice(0, 120)),
+    };
+  }
+
+  const summary = formatToolSuccessSummary(name, result, out) || "done";
+  return {
+    state: "done",
+    isError: false,
+    summary,
+    bodyLines: out ? out.split("\n").slice(0, TOOL_BODY_LIMIT).map((line) => line.slice(0, 120)) : [],
+  };
+}
+
+function renderToolEndFallbackLines({ name, card, toolsExpanded }) {
+  if (card.isError) {
+    return [
+      red(`  ◆ ${name} failed`),
+      ...card.bodyLines.map((line) => red(`    ${line}`)),
+    ];
+  }
+  if (!toolsExpanded) return card.summary && card.summary !== "done" ? [dim(`    ${card.summary}`)] : [];
+  return card.bodyLines.map((line) => dim(`    ${line}`));
+}
+
+function writeStructuredLines(output, block) {
+  if (typeof output.addBlock === "function") output.addBlock(block);
+  else {
+    const lines = block.lines ?? [dim(`  ${block.title}`)];
+    for (const line of lines) output.writeln(line);
+  }
+}
+
+function joinToolParts(icon, name, parts) {
+  const clean = parts.map((part) => String(part ?? "").trim()).filter(Boolean);
+  return `${icon} ${name}${clean.length ? ` · ${clean.join(" · ")}` : ""}`;
+}
+
+function formatReadRange(args = {}) {
+  if (args.offset == null && args.limit == null) return "";
+  if (args.offset != null && args.limit != null) return `lines ${args.offset}-${Number(args.offset) + Number(args.limit) - 1}`;
+  if (args.offset != null) return `from line ${args.offset}`;
+  return `limit ${args.limit}`;
+}
+
+function formatTerminalSendAction(args = {}) {
+  const hasText = typeof args.text === "string" && args.text.length > 0;
+  const key = args.key ? String(args.key) : "";
+  if (hasText && key) return `text+${key}`;
+  if (hasText) return args.text.includes("\n") || args.text.includes("\r") ? "text+enter" : "text";
+  return key || "send";
+}
+
+function formatTerminalDetails(args = {}) {
+  const details = [];
+  if (args.pattern) details.push(quoteCompact(args.pattern));
+  if (args.cols && args.rows) details.push(`${args.cols}x${args.rows}`);
+  if (args.command) details.push(compactText(args.command));
+  return details.join(" · ");
+}
+
+function formatSmallOptions(args = {}) {
+  const parts = [];
+  for (const [key, value] of Object.entries(args ?? {})) {
+    if (value == null || typeof value === "object") continue;
+    parts.push(`${key}=${compactText(value)}`);
+    if (parts.length >= 2) break;
+  }
+  return parts.join(", ");
+}
+
+function compactPath(path) {
+  return String(path ?? "").split(/[/\\]/).filter(Boolean).slice(-4).join("\\");
+}
+
+function quoteCompact(value) {
+  return JSON.stringify(compactText(value));
+}
+
+function compactText(value, limit = 80) {
+  const text = String(value ?? "").replace(/\s+/g, " ").trim();
+  return text.length > limit ? `${text.slice(0, limit - 1)}…` : text;
+}
+
+function countMatchLines(text) {
+  const match = String(text ?? "").match(/(\d+)\s+matches?\b/i);
+  if (match) return Number(match[1]);
+  return countNonEmptyLines(text);
+}
+
+function countNonEmptyLines(text) {
+  return String(text ?? "").split("\n").filter(Boolean).length;
+}

package/src/cli/tui/tui-diff-rendering.mjs

@@ -0,0 +1,157 @@
+import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { bold, dim, red, green, brightBlack } from "./ui-theme.mjs";
+import { highlightCodeLine, styleSyntax } from "./syntax/highlighting.mjs";
+
+const SPLIT_DIFF_MIN_WIDTH = 121;
+const BG_DEL = "48;2;55;34;44";
+const BG_ADD = "48;2;32;48;59";
+const BG_CTX = "";
+
+export function writeEditDiff({ output, path, diffLines }) {
+  const lines = formatEditDiffLines({ path, diffLines });
+  if (typeof output.addBlock === "function") output.addBlock({ type: "diff", path, diffLines, lines });
+  else for (const line of lines) output.writeln(line);
+}
+
+export function renderEditDiffBlock(block, width) {
+  return formatEditDiffLines({ path: block.path, diffLines: block.diffLines ?? [], width });
+}
+
+export function formatEditDiffLines({ path, diffLines, width = 0 }) {
+  if (width >= SPLIT_DIFF_MIN_WIDTH) return formatSplitDiffLines({ path, diffLines, width });
+  return formatUnifiedDiffLines({ path, diffLines });
+}
+
+function formatUnifiedDiffLines({ path, diffLines }) {
+  const counts = countChanges(diffLines);
+  const summary = [`± ${path}`];
+  if (counts.del > 0) summary.push(red(`${counts.del}-`));
+  if (counts.add > 0) summary.push(green(`${counts.add}+`));
+
+  const lines = [bold(summary.join("  "))];
+  const gutterWidth = maxLineNumber(diffLines);
+  for (const line of diffLines) {
+    const num = line.lineNum != null ? String(line.lineNum).padStart(gutterWidth) : " ".repeat(gutterWidth);
+    if (line.type === "del") lines.push(formatUnifiedSide({ num, sign: "-", text: line.text, type: "del", path }));
+    else if (line.type === "add") lines.push(formatUnifiedSide({ num, sign: "+", text: line.text, type: "add", path }));
+    else lines.push(`${brightBlack(`${num} │`)} ${dim(`  ${line.text}`)}`);
+  }
+  return lines;
+}
+
+function formatSplitDiffLines({ path, diffLines, width }) {
+  const rows = pairDiffRows(diffLines);
+  const counts = countChanges(diffLines);
+  const summary = [`± ${path}`];
+  if (counts.del > 0) summary.push(red(`${counts.del}-`));
+  if (counts.add > 0) summary.push(green(`${counts.add}+`));
+
+  const gutterWidth = maxLineNumber(diffLines);
+  const sep = brightBlack(" │ ");
+  const sepWidth = 3;
+  const sideWidth = Math.floor((width - sepWidth) / 2);
+  if (sideWidth < gutterWidth + 12) return formatUnifiedDiffLines({ path, diffLines });
+
+  const lines = [bold(summary.join("  "))];
+  for (const row of rows) {
+    const left = formatSplitSide({ side: row.left, sideWidth, gutterWidth, path, fallbackType: row.type });
+    const right = formatSplitSide({ side: row.right, sideWidth: width - sepWidth - sideWidth, gutterWidth, path, fallbackType: row.type });
+    lines.push(`${left}${sep}${right}`);
+  }
+  return lines;
+}
+
+function formatUnifiedSide({ num, sign, text, type, path }) {
+  const bg = type === "del" ? BG_DEL : BG_ADD;
+  const signScope = type === "del" ? "comment" : "string";
+  return `${stylePlain(`${num} │ `, "90", bg)}${styleSyntax(`${sign} `, signScope, bg)}${highlightCodeLine(text, path, { bg })}`;
+}
+
+function formatSplitSide({ side, sideWidth, gutterWidth, path, fallbackType }) {
+  if (!side) return formatEmptySplitSide({ sideWidth, gutterWidth });
+  const type = side.type ?? fallbackType;
+  const bg = type === "del" ? BG_DEL : type === "add" ? BG_ADD : BG_CTX;
+  const sign = type === "del" ? "-" : type === "add" ? "+" : " ";
+  const signScope = type === "del" ? "comment" : type === "add" ? "string" : "default";
+  const num = side.lineNum != null ? String(side.lineNum).padStart(gutterWidth) : " ".repeat(gutterWidth);
+  const line = [
+    stylePlain(`${num} │ `, "90", bg),
+    styleSyntax(`${sign} `, signScope, bg),
+    highlightCodeLine(side.text ?? "", path, { bg }),
+  ].join("");
+  return fitAnsiToWidth(line, sideWidth, bg);
+}
+
+function formatEmptySplitSide({ sideWidth, gutterWidth }) {
+  const line = [
+    stylePlain(`${" ".repeat(gutterWidth)} │ `, "90", ""),
+    styleSyntax("  ", "default", ""),
+  ].join("");
+  return fitAnsiToWidth(line, sideWidth, "");
+}
+
+function fitAnsiToWidth(text, width, bg = "") {
+  const fitted = truncateToWidth(String(text ?? ""), width, "…", false);
+  const padding = Math.max(0, width - visibleWidth(fitted));
+  return `${fitted}${stylePlain(" ".repeat(padding), "", bg)}`;
+}
+
+function pairDiffRows(lines) {
+  const rows = [];
+  for (let i = 0; i < lines.length;) {
+    const line = lines[i];
+    if (line.type === "ctx") {
+      rows.push({ type: "ctx", left: line, right: line });
+      i++;
+      continue;
+    }
+
+    if (line.type === "del") {
+      const del = [];
+      while (i < lines.length && lines[i].type === "del") del.push(lines[i++]);
+      const add = [];
+      while (i < lines.length && lines[i].type === "add") add.push(lines[i++]);
+      const max = Math.max(del.length, add.length);
+      for (let n = 0; n < max; n++) rows.push({ type: del[n] && add[n] ? "mod" : del[n] ? "del" : "add", left: del[n], right: add[n] });
+      continue;
+    }
+
+    if (line.type === "add") {
+      rows.push({ type: "add", left: null, right: line });
+      i++;
+      continue;
+    }
+
+    i++;
+  }
+  return rows;
+}
+
+function countChanges(lines) {
+  let del = 0; let add = 0;
+  for (const line of lines) {
+    if (line.type === "del") del += 1;
+    if (line.type === "add") add += 1;
+  }
+  return { del, add };
+}
+
+function maxLineNumber(lines) {
+  let max = 0;
+  for (const line of lines) {
+    if (line.lineNum != null && line.lineNum > max) max = line.lineNum;
+  }
+  return max > 0 ? String(max).length : 1;
+}
+
+function stylePlain(text, fg = "", bg = "") {
+  const plain = stripAnsi(String(text ?? ""));
+  const codes = [];
+  if (fg) codes.push(fg);
+  if (bg) codes.push(bg);
+  return codes.length ? `\x1b[${codes.join(";")}m${plain}\x1b[0m` : plain;
+}
+
+function stripAnsi(text) {
+  return String(text ?? "").replace(/\x1b(?:\][^\x07]*(?:\x07|\x1b\\)|[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "");
+}

package/src/cli/tui/tui-handlers.mjs

@@ -0,0 +1,110 @@
+import { buildModelSelectItems, persistModelSelection } from "../commands/model-command.mjs";
+import { pasteClipboardImage } from "../commands/paste-image-command.mjs";
+import { buildThinkingSelectItems } from "../commands/thinking-command.mjs";
+import { brightBlack } from "./ui-theme.mjs";
+
+export function wireTuiHandlers({
+  ui,
+  runner,
+  sessionState,
+  projectMarchDir,
+  refreshStatusBar = () => {},
+  isTurnRunning = () => false,
+  modeState = null,
+  pasteClipboardImageImpl = pasteClipboardImage,
+  configHomeDir,
+} = {}) {
+  let lastIdleCtrlCAt = 0;
+  ui.setEscapeHandler(() => {
+    lastIdleCtrlCAt = 0;
+    if (isTurnRunning()) {
+      runner.abort();
+      refreshStatusBar.markAborted?.();
+    }
+  });
+  ui.setCtrlCHandler?.(() => {
+    if (isTurnRunning()) {
+      lastIdleCtrlCAt = 0;
+      runner.abort();
+      refreshStatusBar.markAborted?.();
+      return;
+    }
+    const now = Date.now();
+    if (now - lastIdleCtrlCAt > 2000) {
+      lastIdleCtrlCAt = now;
+      ui.status?.("press Ctrl+C again to exit");
+      return;
+    }
+    ui.requestExit?.();
+  });
+
+  const selectThinkingLevel = async () => {
+    try {
+      const levels = runner.getAvailableThinkingLevels?.() || [];
+      if (!ui.selectList || levels.length === 0) {
+        ui.writeln(brightBlack(`● thinking: no selector available`));
+        return;
+      }
+      const current = runner.getThinkingLevel?.();
+      const selectedIndex = Math.max(0, levels.indexOf(current));
+      const item = await ui.selectList({
+        items: buildThinkingSelectItems(levels, current),
+        selectedIndex,
+        width: 48,
+      });
+      if (!item) {
+        ui.writeln(brightBlack(`● thinking: unchanged`));
+        return;
+      }
+      ui.writeln(brightBlack(`● thinking: ${runner.setThinkingLevel(item.level)}`));
+      refreshStatusBar();
+    } catch (err) {
+      ui.writeln(`Error: ${err.message}`);
+    }
+  };
+
+  ui.setShiftTabHandler(selectThinkingLevel);
+  ui.setToggleModeHandler?.(() => {
+    const mode = modeState?.toggle?.();
+    if (!mode) return;
+    refreshStatusBar();
+  });
+  ui.setCtrlTHandler(selectThinkingLevel);
+
+  ui.setCtrlLHandler(async () => {
+    try {
+      const scopedModels = runner.getScopedModels?.() || [];
+      if (ui.selectList && scopedModels.length > 0) {
+        const current = runner.getCurrentModel?.();
+        const selectedIndex = Math.max(0, scopedModels.findIndex(({ model }) =>
+          current && model.id === current.id && model.provider === current.provider
+        ));
+        const item = await ui.selectList({
+          items: buildModelSelectItems({ current, scopedModels }),
+          selectedIndex,
+          width: 72,
+        });
+        if (!item) {
+          ui.writeln(brightBlack(`● model: unchanged`));
+          return;
+        }
+        const model = await runner.setModel(item.model);
+        persistModelSelection(model, { configHomeDir });
+        const name = model.name || model.id;
+        ui.writeln(brightBlack(`● model: ${name} (${model.provider})`));
+        refreshStatusBar();
+        return;
+      }
+      ui.writeln(brightBlack(`● model: no selector available`));
+    } catch (err) {
+      ui.writeln(`Error: ${err.message}`);
+    }
+  });
+
+  ui.setPasteImageHandler(() => {
+    const sessionId = runner.getSessionStats?.().sessionId ?? sessionState.sessionId;
+    for (const line of pasteClipboardImageImpl({ ui, projectMarchDir, sessionId })) {
+      ui.status(line);
+    }
+  });
+}

package/src/cli/tui/tui-input-controller.mjs

@@ -0,0 +1,61 @@
+import { resolveAttachmentTokens, uniqueAttachmentToken, withLeadingSpace } from "../input/attachment-tokens.mjs";
+
+export function createTuiInputController({ editor, requestRender, historyStore = null }) {
+  let onSubmitResolve = null;
+  const attachmentTokens = new Map();
+
+  return {
+    readline() {
+      return new Promise((resolve) => {
+        onSubmitResolve = resolve;
+        editor.disableSubmit = false;
+        editor.onSubmit = (text) => {
+          const resolvedText = resolveAttachmentTokens(text, attachmentTokens);
+          if (attachmentTokens.size === 0) {
+            editor.addToHistory(text);
+            saveHistory();
+          }
+          clearSubmitState();
+          attachmentTokens.clear();
+          resolve(resolvedText);
+        };
+      });
+    },
+
+    requestExit() {
+      if (!onSubmitResolve) return;
+      const resolve = onSubmitResolve;
+      clearSubmitState();
+      attachmentTokens.clear();
+      resolve(null);
+    },
+
+    getInputText() {
+      return editor.getText();
+    },
+
+    insertTextAtCursor(text) {
+      editor.insertTextAtCursor(text);
+      requestRender();
+    },
+
+    insertAttachmentAtCursor({ marker, label }) {
+      const token = uniqueAttachmentToken(label || "[image]", attachmentTokens);
+      attachmentTokens.set(token, marker);
+      editor.insertTextAtCursor(withLeadingSpace(editor.getText(), token));
+      requestRender();
+    },
+  };
+
+  function clearSubmitState() {
+    editor.disableSubmit = true;
+    editor.onSubmit = undefined;
+    onSubmitResolve = null;
+  }
+
+  function saveHistory() {
+    try {
+      historyStore?.save?.(editor.history);
+    } catch {}
+  }
+}