march-cli 0.1.24 → 0.1.26

package/src/cli/fallback-ui.mjs

@@ -1,156 +1,156 @@
-import { stdout } from "node:process";
-import { extractToolOutput } from "./tool-output.mjs";
-import { formatMemoryHintLines } from "./tui/recall-rendering.mjs";
-import { formatToolStartLine } from "./tui/tool-rendering.mjs";
-import { brightBlack, dim, red, green, yellow } from "./tui/ui-theme.mjs";
-
-export function createJsonUI() {
-  let thinkingBuf = "";
-  return {
-    readline: () => Promise.resolve(""),
-    write: () => {},
-    writeln: (text) => {
-      stdout.write(text + "\n");
-    },
-    thinkingStart: () => { thinkingBuf = ""; },
-    thinkingDelta: (delta) => { thinkingBuf += delta; },
-    thinkingEnd: (tokens) => {
-      stdout.write(JSON.stringify({ type: "thinking", tokens, content: thinkingBuf }) + "\n");
-      thinkingBuf = "";
-    },
-    thinkingBlock: (tokens, content) => {
-      stdout.write(JSON.stringify({ type: "thinking", tokens, content }) + "\n");
-    },
-    toggleLastThinking: () => {},
-    toolStart: (name, args) => {
-      stdout.write(JSON.stringify({ type: "tool_start", name, args }) + "\n");
-    },
-    toolEnd: (name, isError, result) => {
-      stdout.write(JSON.stringify({ type: "tool_end", name, isError, output: extractToolOutput(result) }) + "\n");
-    },
-    textDelta: (delta) => {
-      stdout.write(delta);
-    },
-    status: () => {},
-    memoryHint: () => {},
-    clearOutput: () => {},
-    restoreTranscript: () => {},
-    setStatusBar: () => {},
-    turnStart: () => {},
-    assistantReplyEnd: () => {},
-    turnEnd: () => {},
-    retryStart: (event) => {
-      stdout.write(JSON.stringify({ type: "retry_start", ...event }) + "\n");
-    },
-    retryEnd: (event) => {
-      stdout.write(JSON.stringify({ type: "retry_end", ...event }) + "\n");
-    },
-    editDiff: (path, diffLines) => {
-      stdout.write(JSON.stringify({ type: "edit_diff", path, diff: diffLines }) + "\n");
-    },
-    requestPermission: async () => true,
-    setEscapeHandler: () => {},
-    setCtrlCHandler: () => {},
-    setShiftTabHandler: () => {},
-    setCtrlTHandler: () => {},
-    setCtrlLHandler: () => {},
-    setPasteImageHandler: () => {},
-    getInputText: () => "",
-    insertTextAtCursor: () => {},
-    openExternalEditor: () => {},
-    toggleMouse: () => false,
-    toggleToolOutput: () => false,
-    requestExit: () => {},
-    close: () => {},
-  };
-}
-
-export function createPlainUI() {
-  let thinkingBuf = "";
-  let needsNewline = false;
-  const writeText = (text) => {
-    stdout.write(text);
-    needsNewline = text.length > 0 && !text.endsWith("\n");
-  };
-  const ensureNewline = () => {
-    if (needsNewline) stdout.write("\n");
-    needsNewline = false;
-  };
-  return {
-    readline: (_prompt) => Promise.resolve(""),
-    write: writeText,
-    writeln: (text) => { stdout.write(text + "\n"); needsNewline = false; },
-    thinkingStart: () => { thinkingBuf = ""; },
-    thinkingDelta: (delta) => { thinkingBuf += delta; },
-    thinkingEnd: (tokens) => {
-      stdout.write(`\n${brightBlack(`--- thinking (${tokens} tokens) ---`)}\n`);
-      stdout.write(`${brightBlack(thinkingBuf)}\n`);
-      stdout.write(`${brightBlack("--- end thinking ---")}\n\n`);
-      thinkingBuf = "";
-      needsNewline = false;
-    },
-    thinkingBlock: (tokens, content) => {
-      stdout.write(`\n${brightBlack(`--- thinking (${tokens} tokens) ---`)}\n`);
-      stdout.write(`${brightBlack(content)}\n`);
-      stdout.write(`${brightBlack("--- end thinking ---")}\n\n`);
-      needsNewline = false;
-    },
-    toggleLastThinking: () => {},
-    toolStart: (name, args) => {
-      stdout.write(`${dim(`  ${formatToolStartLine(name, args)}`)}\n`);
-    },
-    toolEnd: (name, isError, result) => {
-      const out = extractToolOutput(result);
-      if (isError) {
-        stdout.write(`${red(`  ◆ ${name} failed`)}\n`);
-        if (out) stdout.write(`${red(`    ${out.slice(0, 200)}`)}\n`);
-      } else if (out) {
-        stdout.write(`${dim(`    ${out.split("\n")[0].slice(0, 200)}`)}\n`);
-      }
-      needsNewline = false;
-    },
-    textDelta: writeText,
-    status: (text) => { ensureNewline(); stdout.write(`${brightBlack(`● ${text}`)}\n`); },
-    memoryHint: ({ hints }) => {
-      ensureNewline();
-      for (const line of formatMemoryHintLines(hints)) stdout.write(`${brightBlack(line)}\n`);
-    },
-    clearOutput: () => {},
-    restoreTranscript: () => {},
-    setStatusBar: () => {},
-    turnStart: () => {},
-    assistantReplyEnd: ensureNewline,
-    turnEnd: ensureNewline,
-    retryStart: ({ attempt, maxAttempts, delayMs, errorMessage }) => {
-      ensureNewline();
-      stdout.write(`${yellow(`● retrying (${attempt}/${maxAttempts}) in ${Math.ceil(delayMs / 1000)}s: ${errorMessage || "Unknown error"}`)}\n`);
-    },
-    retryEnd: ({ success, attempt, finalError }) => {
-      ensureNewline();
-      const status = success ? "recovered" : "stopped";
-      stdout.write(`${brightBlack(`● retry ${status} after ${attempt} attempt${attempt === 1 ? "" : "s"}${finalError ? `: ${finalError}` : ""}`)}\n`);
-    },
-    editDiff: (path, diffLines) => {
-      stdout.write(`\n${dim(`  ± ${path}`)}\n`);
-      for (const d of diffLines) {
-        if (d.type === "del") stdout.write(`${red(`    - ${d.text}`)}\n`);
-        else if (d.type === "add") stdout.write(`${green(`    + ${d.text}`)}\n`);
-        else stdout.write(`${dim(`      ${d.text}`)}\n`);
-      }
-    },
-    requestPermission: async () => true,
-    setEscapeHandler: () => {},
-    setCtrlCHandler: () => {},
-    setShiftTabHandler: () => {},
-    setCtrlTHandler: () => {},
-    setCtrlLHandler: () => {},
-    setPasteImageHandler: () => {},
-    getInputText: () => "",
-    insertTextAtCursor: () => {},
-    openExternalEditor: () => {},
-    toggleMouse: () => false,
-    toggleToolOutput: () => false,
-    requestExit: () => {},
-    close: () => {},
-  };
-}
+import { stdout } from "node:process";
+import { extractToolOutput } from "./tool-output.mjs";
+import { formatMemoryHintLines } from "./tui/recall-rendering.mjs";
+import { formatToolStartLine } from "./tui/tool-rendering.mjs";
+import { brightBlack, dim, red, green, yellow } from "./tui/ui-theme.mjs";
+
+export function createJsonUI() {
+  let thinkingBuf = "";
+  return {
+    readline: () => Promise.resolve(""),
+    write: () => {},
+    writeln: (text) => {
+      stdout.write(text + "\n");
+    },
+    thinkingStart: () => { thinkingBuf = ""; },
+    thinkingDelta: (delta) => { thinkingBuf += delta; },
+    thinkingEnd: (tokens) => {
+      stdout.write(JSON.stringify({ type: "thinking", tokens, content: thinkingBuf }) + "\n");
+      thinkingBuf = "";
+    },
+    thinkingBlock: (tokens, content) => {
+      stdout.write(JSON.stringify({ type: "thinking", tokens, content }) + "\n");
+    },
+    toggleLastThinking: () => {},
+    toolStart: (name, args) => {
+      stdout.write(JSON.stringify({ type: "tool_start", name, args }) + "\n");
+    },
+    toolEnd: (name, isError, result) => {
+      stdout.write(JSON.stringify({ type: "tool_end", name, isError, output: extractToolOutput(result) }) + "\n");
+    },
+    textDelta: (delta) => {
+      stdout.write(delta);
+    },
+    status: () => {},
+    memoryHint: () => {},
+    clearOutput: () => {},
+    restoreTranscript: () => {},
+    setStatusBar: () => {},
+    turnStart: () => {},
+    assistantReplyEnd: () => {},
+    turnEnd: () => {},
+    retryStart: (event) => {
+      stdout.write(JSON.stringify({ type: "retry_start", ...event }) + "\n");
+    },
+    retryEnd: (event) => {
+      stdout.write(JSON.stringify({ type: "retry_end", ...event }) + "\n");
+    },
+    editDiff: (path, diffLines) => {
+      stdout.write(JSON.stringify({ type: "edit_diff", path, diff: diffLines }) + "\n");
+    },
+    requestPermission: async () => true,
+    setEscapeHandler: () => {},
+    setCtrlCHandler: () => {},
+    setShiftTabHandler: () => {},
+    setCtrlTHandler: () => {},
+    setCtrlLHandler: () => {},
+    setPasteImageHandler: () => {},
+    getInputText: () => "",
+    insertTextAtCursor: () => {},
+    openExternalEditor: () => {},
+    toggleMouse: () => false,
+    toggleToolOutput: () => false,
+    requestExit: () => {},
+    close: () => {},
+  };
+}
+
+export function createPlainUI() {
+  let thinkingBuf = "";
+  let needsNewline = false;
+  const writeText = (text) => {
+    stdout.write(text);
+    needsNewline = text.length > 0 && !text.endsWith("\n");
+  };
+  const ensureNewline = () => {
+    if (needsNewline) stdout.write("\n");
+    needsNewline = false;
+  };
+  return {
+    readline: (_prompt) => Promise.resolve(""),
+    write: writeText,
+    writeln: (text) => { stdout.write(text + "\n"); needsNewline = false; },
+    thinkingStart: () => { thinkingBuf = ""; },
+    thinkingDelta: (delta) => { thinkingBuf += delta; },
+    thinkingEnd: (tokens) => {
+      stdout.write(`\n${brightBlack(`--- thinking (${tokens} tokens) ---`)}\n`);
+      stdout.write(`${brightBlack(thinkingBuf)}\n`);
+      stdout.write(`${brightBlack("--- end thinking ---")}\n\n`);
+      thinkingBuf = "";
+      needsNewline = false;
+    },
+    thinkingBlock: (tokens, content) => {
+      stdout.write(`\n${brightBlack(`--- thinking (${tokens} tokens) ---`)}\n`);
+      stdout.write(`${brightBlack(content)}\n`);
+      stdout.write(`${brightBlack("--- end thinking ---")}\n\n`);
+      needsNewline = false;
+    },
+    toggleLastThinking: () => {},
+    toolStart: (name, args) => {
+      stdout.write(`${dim(`  ${formatToolStartLine(name, args)}`)}\n`);
+    },
+    toolEnd: (name, isError, result) => {
+      const out = extractToolOutput(result);
+      if (isError) {
+        stdout.write(`${red(`  ◆ ${name} failed`)}\n`);
+        if (out) stdout.write(`${red(`    ${out.slice(0, 200)}`)}\n`);
+      } else if (out) {
+        stdout.write(`${dim(`    ${out.split("\n")[0].slice(0, 200)}`)}\n`);
+      }
+      needsNewline = false;
+    },
+    textDelta: writeText,
+    status: (text) => { ensureNewline(); stdout.write(`${brightBlack(`● ${text}`)}\n`); },
+    memoryHint: ({ hints }) => {
+      ensureNewline();
+      for (const line of formatMemoryHintLines(hints)) stdout.write(`${brightBlack(line)}\n`);
+    },
+    clearOutput: () => {},
+    restoreTranscript: () => {},
+    setStatusBar: () => {},
+    turnStart: () => {},
+    assistantReplyEnd: ensureNewline,
+    turnEnd: ensureNewline,
+    retryStart: ({ attempt, maxAttempts, delayMs, errorMessage }) => {
+      ensureNewline();
+      stdout.write(`${yellow(`● retrying (${attempt}/${maxAttempts}) in ${Math.ceil(delayMs / 1000)}s: ${errorMessage || "Unknown error"}`)}\n`);
+    },
+    retryEnd: ({ success, attempt, finalError }) => {
+      ensureNewline();
+      const status = success ? "recovered" : "stopped";
+      stdout.write(`${brightBlack(`● retry ${status} after ${attempt} attempt${attempt === 1 ? "" : "s"}${finalError ? `: ${finalError}` : ""}`)}\n`);
+    },
+    editDiff: (path, diffLines) => {
+      stdout.write(`\n${dim(`  ± ${path}`)}\n`);
+      for (const d of diffLines) {
+        if (d.type === "del") stdout.write(`${red(`    - ${d.text}`)}\n`);
+        else if (d.type === "add") stdout.write(`${green(`    + ${d.text}`)}\n`);
+        else stdout.write(`${dim(`      ${d.text}`)}\n`);
+      }
+    },
+    requestPermission: async () => true,
+    setEscapeHandler: () => {},
+    setCtrlCHandler: () => {},
+    setShiftTabHandler: () => {},
+    setCtrlTHandler: () => {},
+    setCtrlLHandler: () => {},
+    setPasteImageHandler: () => {},
+    getInputText: () => "",
+    insertTextAtCursor: () => {},
+    openExternalEditor: () => {},
+    toggleMouse: () => false,
+    toggleToolOutput: () => false,
+    requestExit: () => {},
+    close: () => {},
+  };
+}

package/src/cli/input/attachment-tokens.mjs

@@ -1,20 +1,20 @@
-export function resolveAttachmentTokens(text, tokens) {
-  let resolved = text;
-  for (const [token, marker] of tokens) {
-    resolved = resolved.split(token).join(marker);
-  }
-  return resolved;
-}
-
-export function uniqueAttachmentToken(label, tokens) {
-  if (!tokens.has(label)) return label;
-  for (let i = 2; ; i++) {
-    const candidate = label.replace(/\]$/, ` ${i}]`);
-    if (!tokens.has(candidate)) return candidate;
-  }
-}
-
-export function withLeadingSpace(currentText, text) {
-  if (!String(currentText || "").trim()) return text;
-  return ` ${text}`;
-}
+export function resolveAttachmentTokens(text, tokens) {
+  let resolved = text;
+  for (const [token, marker] of tokens) {
+    resolved = resolved.split(token).join(marker);
+  }
+  return resolved;
+}
+
+export function uniqueAttachmentToken(label, tokens) {
+  if (!tokens.has(label)) return label;
+  for (let i = 2; ; i++) {
+    const candidate = label.replace(/\]$/, ` ${i}]`);
+    if (!tokens.has(candidate)) return candidate;
+  }
+}
+
+export function withLeadingSpace(currentText, text) {
+  if (!String(currentText || "").trim()) return text;
+  return ` ${text}`;
+}

package/src/cli/input/autocomplete.mjs

@@ -1,74 +1,74 @@
-import { CombinedAutocompleteProvider } from "@earendil-works/pi-tui";
-import { FileSearchIndex } from "./file-search/index.mjs";
-
-const MARCH_COMMANDS = [
-  { name: "new", description: "Start a new pi session" },
-  { name: "exit", description: "Exit March" },
-  { name: "quit", description: "Exit March" },
-  { name: "help", description: "Show available commands" },
-  { name: "model", description: "Open model selector" },
-  { name: "models", description: "List available models" },
-  { name: "session", description: "Open previous session selector" },
-  { name: "save", description: "Show auto-save status" },
-  { name: "name", description: "Show or set session name" },
-  { name: "copy", description: "Copy last assistant response to clipboard" },
-  { name: "thinking", description: "Open thinking selector" },
-  { name: "thinking list", description: "List available thinking levels" },
-  { name: "mouse", description: "Toggle mouse wheel and TUI selection copy" },
-  { name: "hotkeys", description: "Show keyboard shortcuts and input prefixes" },
-  { name: "templates", description: "List project prompt templates" },
-  { name: "export jsonl", description: "Export current session turns as JSONL" },
-  { name: "export html", description: "Export current session turns as HTML" },
-  { name: "export gist html", description: "Share current session HTML as a private GitHub Gist" },
-  { name: "export gist jsonl", description: "Share current session JSONL as a private GitHub Gist" },
-  { name: "settings", description: "Show or edit global/project settings" },
-  { name: "shell", description: "List shells or inspect shell output" },
-  { name: "shell spawn", description: "Start a default PTY shell" },
-];
-
-export function buildMarchCommands(promptTemplates = []) {
-  const templateCommands = promptTemplates
-    .map((template) => ({
-      name: typeof template === "string" ? template : template.name,
-      description: "Expand prompt template",
-    }))
-    .filter((command) => command.name && !command.name.startsWith("/"));
-  return [...MARCH_COMMANDS, ...templateCommands];
-}
-
-export class MarchAutocompleteProvider {
-  constructor(commands, cwd) {
-    this.base = new CombinedAutocompleteProvider(commands, cwd);
-    this.fileSearchIndex = new FileSearchIndex(cwd);
-  }
-
-  async getSuggestions(lines, cursorLine, cursorCol, options) {
-    const suggestions = await this.base.getSuggestions(lines, cursorLine, cursorCol, options);
-    if (suggestions) return suggestions;
-    return this.getAtFileSuggestions(lines, cursorLine, cursorCol);
-  }
-
-  applyCompletion(lines, cursorLine, cursorCol, item, prefix) {
-    return this.base.applyCompletion(lines, cursorLine, cursorCol, item, prefix);
-  }
-
-  shouldTriggerFileCompletion(lines, cursorLine, cursorCol) {
-    return this.base.shouldTriggerFileCompletion(lines, cursorLine, cursorCol);
-  }
-
-  async getAtFileSuggestions(lines, cursorLine, cursorCol) {
-    const currentLine = lines[cursorLine] || "";
-    const textBeforeCursor = currentLine.slice(0, cursorCol);
-    const match = textBeforeCursor.match(/(?:^|[\s([{])(@[^\s]*)$/);
-    if (!match) return null;
-
-    const prefix = match[1];
-    const query = prefix.slice(1);
-    const items = await this.fileSearchIndex.search(query, {
-      limit: 50,
-      displayDotSlash: query.startsWith("./"),
-    });
-    if (items.length === 0) return null;
-    return { items, prefix };
-  }
-}
+import { CombinedAutocompleteProvider } from "@earendil-works/pi-tui";
+import { FileSearchIndex } from "./file-search/index.mjs";
+
+const MARCH_COMMANDS = [
+  { name: "new", description: "Start a new pi session" },
+  { name: "exit", description: "Exit March" },
+  { name: "quit", description: "Exit March" },
+  { name: "help", description: "Show available commands" },
+  { name: "model", description: "Open model selector" },
+  { name: "models", description: "List available models" },
+  { name: "session", description: "Open previous session selector" },
+  { name: "save", description: "Show auto-save status" },
+  { name: "name", description: "Show or set session name" },
+  { name: "copy", description: "Copy last assistant response to clipboard" },
+  { name: "thinking", description: "Open thinking selector" },
+  { name: "thinking list", description: "List available thinking levels" },
+  { name: "mouse", description: "Toggle mouse wheel and TUI selection copy" },
+  { name: "hotkeys", description: "Show keyboard shortcuts and input prefixes" },
+  { name: "templates", description: "List project prompt templates" },
+  { name: "export jsonl", description: "Export current session turns as JSONL" },
+  { name: "export html", description: "Export current session turns as HTML" },
+  { name: "export gist html", description: "Share current session HTML as a private GitHub Gist" },
+  { name: "export gist jsonl", description: "Share current session JSONL as a private GitHub Gist" },
+  { name: "settings", description: "Show or edit global/project settings" },
+  { name: "shell", description: "List shells or inspect shell output" },
+  { name: "shell spawn", description: "Start a default PTY shell" },
+];
+
+export function buildMarchCommands(promptTemplates = []) {
+  const templateCommands = promptTemplates
+    .map((template) => ({
+      name: typeof template === "string" ? template : template.name,
+      description: "Expand prompt template",
+    }))
+    .filter((command) => command.name && !command.name.startsWith("/"));
+  return [...MARCH_COMMANDS, ...templateCommands];
+}
+
+export class MarchAutocompleteProvider {
+  constructor(commands, cwd) {
+    this.base = new CombinedAutocompleteProvider(commands, cwd);
+    this.fileSearchIndex = new FileSearchIndex(cwd);
+  }
+
+  async getSuggestions(lines, cursorLine, cursorCol, options) {
+    const suggestions = await this.base.getSuggestions(lines, cursorLine, cursorCol, options);
+    if (suggestions) return suggestions;
+    return this.getAtFileSuggestions(lines, cursorLine, cursorCol);
+  }
+
+  applyCompletion(lines, cursorLine, cursorCol, item, prefix) {
+    return this.base.applyCompletion(lines, cursorLine, cursorCol, item, prefix);
+  }
+
+  shouldTriggerFileCompletion(lines, cursorLine, cursorCol) {
+    return this.base.shouldTriggerFileCompletion(lines, cursorLine, cursorCol);
+  }
+
+  async getAtFileSuggestions(lines, cursorLine, cursorCol) {
+    const currentLine = lines[cursorLine] || "";
+    const textBeforeCursor = currentLine.slice(0, cursorCol);
+    const match = textBeforeCursor.match(/(?:^|[\s([{])(@[^\s]*)$/);
+    if (!match) return null;
+
+    const prefix = match[1];
+    const query = prefix.slice(1);
+    const items = await this.fileSearchIndex.search(query, {
+      limit: 50,
+      displayDotSlash: query.startsWith("./"),
+    });
+    if (items.length === 0) return null;
+    return { items, prefix };
+  }
+}

package/src/cli/input/external-editor.mjs

@@ -1,39 +1,39 @@
-import { spawnSync } from "node:child_process";
-import { readFileSync, unlinkSync, writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-
-export function openTextInExternalEditor({
-  text = "",
-  editorCommand = getExternalEditorCommand(),
-  now = () => Date.now(),
-  spawn = spawnSync,
-  tempDir = tmpdir(),
-} = {}) {
-  if (!editorCommand) {
-    return { ok: false, error: "No editor configured. Set $VISUAL or $EDITOR." };
-  }
-
-  const tmpFile = join(tempDir, `march-editor-${now()}.md`);
-  try {
-    writeFileSync(tmpFile, String(text ?? ""), "utf8");
-    const [bin, ...args] = editorCommand.split(" ");
-    const result = spawn(bin, [...args, tmpFile], {
-      stdio: "inherit",
-      shell: process.platform === "win32",
-    });
-    if (result.status !== 0) {
-      return { ok: false, error: `Editor exited with status ${result.status ?? "unknown"}` };
-    }
-    return {
-      ok: true,
-      text: readFileSync(tmpFile, "utf8").replace(/\n$/, ""),
-    };
-  } finally {
-    try { unlinkSync(tmpFile); } catch {}
-  }
-}
-
-export function getExternalEditorCommand(env = process.env) {
-  return env.VISUAL || env.EDITOR || "";
-}
+import { spawnSync } from "node:child_process";
+import { readFileSync, unlinkSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+export function openTextInExternalEditor({
+  text = "",
+  editorCommand = getExternalEditorCommand(),
+  now = () => Date.now(),
+  spawn = spawnSync,
+  tempDir = tmpdir(),
+} = {}) {
+  if (!editorCommand) {
+    return { ok: false, error: "No editor configured. Set $VISUAL or $EDITOR." };
+  }
+
+  const tmpFile = join(tempDir, `march-editor-${now()}.md`);
+  try {
+    writeFileSync(tmpFile, String(text ?? ""), "utf8");
+    const [bin, ...args] = editorCommand.split(" ");
+    const result = spawn(bin, [...args, tmpFile], {
+      stdio: "inherit",
+      shell: process.platform === "win32",
+    });
+    if (result.status !== 0) {
+      return { ok: false, error: `Editor exited with status ${result.status ?? "unknown"}` };
+    }
+    return {
+      ok: true,
+      text: readFileSync(tmpFile, "utf8").replace(/\n$/, ""),
+    };
+  } finally {
+    try { unlinkSync(tmpFile); } catch {}
+  }
+}
+
+export function getExternalEditorCommand(env = process.env) {
+  return env.VISUAL || env.EDITOR || "";
+}