march-cli 0.1.21 → 0.1.22

package/src/cli/repl-loop.mjs

@@ -1,183 +1,183 @@
-import { brightBlack, inverse } from "./tui/ui-theme.mjs";
-import { handleSlashCommand } from "./slash-commands.mjs";
-import { appendModeReminder } from "./input/mode-state.mjs";
-import { expandPromptTemplate } from "./input/prompt-templates.mjs";
-import { parseInlineShellInput, runInlineShellCommand } from "./repl-commands.mjs";
-import { formatRecallHints } from "../memory/markdown-store.mjs";
-import { formatMessageAttachmentsForDisplay } from "../session/attachment-display.mjs";
-import { formatShellHints } from "../shell/hints.mjs";
-
-export async function runSingleShotPrompt({
-  prompt,
-  runner,
-  memoryStore,
-  currentProject,
-  ui,
-  sessionState,
-  refreshStatusBar,
-  modeState = null,
-}) {
-  memoryStore.beginTurn();
-  const carryoverAlreadyRendered = runner.engine.hasRenderedPendingAssistantRecallHints?.() ?? false;
-  const carryoverRecallHints = runner.engine.takePendingAssistantRecallHints?.() ?? [];
-  const userRecallHints = memoryStore.recallForUser(prompt, { currentProject, excludedIds: runner.engine.getRecentRecallMemoryIds?.() ?? [] });
-  const recallBlock = formatRecallHints("user", userRecallHints);
-  const carryoverRecallBlock = formatRecallHints("assistant", carryoverRecallHints);
-  const shellHints = formatShellHints(runner.shellRuntime);
-  const modePrompt = appendModeReminder(prompt, modeState?.get?.());
-  const fullPrompt = appendPromptBlocks(modePrompt, recallBlock, carryoverRecallBlock, shellHints);
-  ui.writeln(formatUserDisplayMessage(prompt));
-  ui.memoryHint?.({ source: "user", hints: userRecallHints });
-  if (carryoverRecallHints.length > 0 && !carryoverAlreadyRendered) ui.memoryHint?.({ source: "assistant", hints: carryoverRecallHints });
-  refreshStatusBar.startWorking?.();
-  try {
-    await runner.runTurn(fullPrompt, prompt, { userRecallHints, currentProject });
-    renderPendingAssistantRecallPreview({ runner, ui });
-  } finally {
-    refreshStatusBar.stopWorking?.();
-    memoryStore.endTurn();
-  }
-  refreshStatusBar();
-}
-
-export async function runInteractiveRepl({
-  cwd,
-  args,
-  ui,
-  runner,
-  memoryStore,
-  currentProject,
-  sessionState,
-  sessionsRoot,
-  projectMarchDir,
-  sessionSource,
-  extensionPaths,
-  keybindingConfig,
-  promptTemplateConfig,
-  renderStartupBanner = null,
-  refreshStatusBar,
-  setTurnRunning,
-  modeState = null,
-  configHomeDir,
-}) {
-  let lastInlineShellCommand = "";
-
-  for (;;) {
-    const line = await ui.readline("> ");
-    if (line === null) break;
-    let trimmed = line.trim();
-    if (!trimmed) continue;
-
-    const handledInline = handleInlineCommand(trimmed, { cwd, ui, lastInlineShellCommand });
-    if (handledInline.type === "handled") {
-      lastInlineShellCommand = handledInline.lastInlineShellCommand;
-      continue;
-    }
-    if (handledInline.type === "error") continue;
-
-    const slashResult = await handleSlashCommand(trimmed, {
-      ui,
-      runner,
-      sessionState,
-      sessionsRoot,
-      projectMarchDir,
-      sessionSource,
-      extensionPaths,
-      keybindings: keybindingConfig.keybindings,
-      keybindingDiagnostics: keybindingConfig.diagnostics,
-      promptTemplates: promptTemplateConfig.templates,
-      promptTemplateDiagnostics: promptTemplateConfig.diagnostics,
-      renderStartupBanner,
-      configHomeDir,
-    });
-    if (slashResult.exit) break;
-    if (slashResult.handled) {
-      refreshStatusBar(contextTokenRefreshOptions(slashResult, runner));
-      continue;
-    }
-
-    const templateResult = expandPromptTemplate(trimmed, promptTemplateConfig.templates);
-    if (templateResult.type === "template") {
-      ui.writeln(brightBlack(`● template: ${templateResult.name}`));
-      trimmed = templateResult.prompt;
-    }
-
-    await runReplTurn({
-      prompt: trimmed,
-      args,
-      runner,
-      memoryStore,
-      currentProject,
-      ui,
-      refreshStatusBar,
-      setTurnRunning,
-      modeState,
-    });
-  }
-}
-
-export function contextTokenRefreshOptions(slashResult, runner) {
-  if (!slashResult?.refreshContextTokens) return undefined;
-  if (typeof runner.estimateContextTokens !== "function") return undefined;
-  const contextTokens = runner.estimateContextTokens("");
-  if (contextTokens && typeof contextTokens.then === "function") return undefined;
-  return { contextTokens };
-}
-
-function handleInlineCommand(trimmed, { cwd, ui, lastInlineShellCommand }) {
-  const inlineShell = parseInlineShellInput(trimmed, lastInlineShellCommand);
-  if (inlineShell.type === "error") {
-    ui.writeln(`Error: ${inlineShell.message}`);
-    return { type: "error" };
-  }
-  if (inlineShell.type === "command") {
-    runInlineShellCommand(inlineShell.command, { cwd, ui });
-    return { type: "handled", lastInlineShellCommand: inlineShell.command };
-  }
-  return { type: "none" };
-}
-
-async function runReplTurn({ prompt, args, runner, memoryStore, currentProject, ui, refreshStatusBar, setTurnRunning, modeState = null }) {
-  memoryStore.beginTurn();
-  const carryoverAlreadyRendered = runner.engine.hasRenderedPendingAssistantRecallHints?.() ?? false;
-  const carryoverRecallHints = runner.engine.takePendingAssistantRecallHints?.() ?? [];
-  const userRecallHints = memoryStore.recallForUser(prompt, { currentProject, excludedIds: runner.engine.getRecentRecallMemoryIds?.() ?? [] });
-  const recallBlock = formatRecallHints("user", userRecallHints);
-  const carryoverRecallBlock = formatRecallHints("assistant", carryoverRecallHints);
-  const shellHints = formatShellHints(runner.shellRuntime);
-  const modePrompt = appendModeReminder(prompt, modeState?.get?.());
-  const fullPrompt = appendPromptBlocks(modePrompt, recallBlock, carryoverRecallBlock, shellHints);
-  try {
-    ui.writeln(formatUserDisplayMessage(prompt));
-    ui.memoryHint?.({ source: "user", hints: userRecallHints });
-    if (carryoverRecallHints.length > 0 && !carryoverAlreadyRendered) ui.memoryHint?.({ source: "assistant", hints: carryoverRecallHints });
-    setTurnRunning(true);
-    refreshStatusBar.startWorking?.();
-    await runner.runTurn(fullPrompt, prompt, { userRecallHints, currentProject });
-    renderPendingAssistantRecallPreview({ runner, ui });
-    ui.writeln("");
-  } catch (err) {
-    ui.writeln(`Error: ${err.message}`);
-  } finally {
-    setTurnRunning(false);
-    refreshStatusBar.stopWorking?.();
-    memoryStore.endTurn();
-    refreshStatusBar();
-  }
-}
-
-export function formatUserDisplayMessage(prompt) {
-  return `${inverse(" USER ")} ${formatMessageAttachmentsForDisplay(prompt)}`;
-}
-
-function appendPromptBlocks(prompt, ...blocks) {
-  return [prompt, ...blocks.filter(Boolean)].join("\n\n");
-}
-
-function renderPendingAssistantRecallPreview({ runner, ui }) {
-  if (runner.engine.hasRenderedPendingAssistantRecallHints?.()) return;
-  const hints = runner.engine.peekPendingAssistantRecallHints?.() ?? [];
-  if (hints.length === 0) return;
-  ui.memoryHint?.({ source: "assistant", hints });
-  runner.engine.markPendingAssistantRecallHintsRendered?.();
-}
+import { brightBlack, inverse } from "./tui/ui-theme.mjs";
+import { handleSlashCommand } from "./slash-commands.mjs";
+import { appendModeReminder } from "./input/mode-state.mjs";
+import { expandPromptTemplate } from "./input/prompt-templates.mjs";
+import { parseInlineShellInput, runInlineShellCommand } from "./repl-commands.mjs";
+import { formatRecallHints } from "../memory/markdown-store.mjs";
+import { formatMessageAttachmentsForDisplay } from "../session/attachment-display.mjs";
+import { formatShellHints } from "../shell/hints.mjs";
+
+export async function runSingleShotPrompt({
+  prompt,
+  runner,
+  memoryStore,
+  currentProject,
+  ui,
+  sessionState,
+  refreshStatusBar,
+  modeState = null,
+}) {
+  memoryStore.beginTurn();
+  const carryoverAlreadyRendered = runner.engine.hasRenderedPendingAssistantRecallHints?.() ?? false;
+  const carryoverRecallHints = runner.engine.takePendingAssistantRecallHints?.() ?? [];
+  const userRecallHints = memoryStore.recallForUser(prompt, { currentProject, excludedIds: runner.engine.getRecentRecallMemoryIds?.() ?? [] });
+  const recallBlock = formatRecallHints("user", userRecallHints);
+  const carryoverRecallBlock = formatRecallHints("assistant", carryoverRecallHints);
+  const shellHints = formatShellHints(runner.shellRuntime);
+  const modePrompt = appendModeReminder(prompt, modeState?.get?.());
+  const fullPrompt = appendPromptBlocks(modePrompt, recallBlock, carryoverRecallBlock, shellHints);
+  ui.writeln(formatUserDisplayMessage(prompt));
+  ui.memoryHint?.({ source: "user", hints: userRecallHints });
+  if (carryoverRecallHints.length > 0 && !carryoverAlreadyRendered) ui.memoryHint?.({ source: "assistant", hints: carryoverRecallHints });
+  refreshStatusBar.startWorking?.();
+  try {
+    await runner.runTurn(fullPrompt, prompt, { userRecallHints, currentProject });
+    renderPendingAssistantRecallPreview({ runner, ui });
+  } finally {
+    refreshStatusBar.stopWorking?.();
+    memoryStore.endTurn();
+  }
+  refreshStatusBar();
+}
+
+export async function runInteractiveRepl({
+  cwd,
+  args,
+  ui,
+  runner,
+  memoryStore,
+  currentProject,
+  sessionState,
+  sessionsRoot,
+  projectMarchDir,
+  sessionSource,
+  extensionPaths,
+  keybindingConfig,
+  promptTemplateConfig,
+  renderStartupBanner = null,
+  refreshStatusBar,
+  setTurnRunning,
+  modeState = null,
+  configHomeDir,
+}) {
+  let lastInlineShellCommand = "";
+
+  for (;;) {
+    const line = await ui.readline("> ");
+    if (line === null) break;
+    let trimmed = line.trim();
+    if (!trimmed) continue;
+
+    const handledInline = handleInlineCommand(trimmed, { cwd, ui, lastInlineShellCommand });
+    if (handledInline.type === "handled") {
+      lastInlineShellCommand = handledInline.lastInlineShellCommand;
+      continue;
+    }
+    if (handledInline.type === "error") continue;
+
+    const slashResult = await handleSlashCommand(trimmed, {
+      ui,
+      runner,
+      sessionState,
+      sessionsRoot,
+      projectMarchDir,
+      sessionSource,
+      extensionPaths,
+      keybindings: keybindingConfig.keybindings,
+      keybindingDiagnostics: keybindingConfig.diagnostics,
+      promptTemplates: promptTemplateConfig.templates,
+      promptTemplateDiagnostics: promptTemplateConfig.diagnostics,
+      renderStartupBanner,
+      configHomeDir,
+    });
+    if (slashResult.exit) break;
+    if (slashResult.handled) {
+      refreshStatusBar(contextTokenRefreshOptions(slashResult, runner));
+      continue;
+    }
+
+    const templateResult = expandPromptTemplate(trimmed, promptTemplateConfig.templates);
+    if (templateResult.type === "template") {
+      ui.writeln(brightBlack(`● template: ${templateResult.name}`));
+      trimmed = templateResult.prompt;
+    }
+
+    await runReplTurn({
+      prompt: trimmed,
+      args,
+      runner,
+      memoryStore,
+      currentProject,
+      ui,
+      refreshStatusBar,
+      setTurnRunning,
+      modeState,
+    });
+  }
+}
+
+export function contextTokenRefreshOptions(slashResult, runner) {
+  if (!slashResult?.refreshContextTokens) return undefined;
+  if (typeof runner.estimateContextTokens !== "function") return undefined;
+  const contextTokens = runner.estimateContextTokens("");
+  if (contextTokens && typeof contextTokens.then === "function") return undefined;
+  return { contextTokens };
+}
+
+function handleInlineCommand(trimmed, { cwd, ui, lastInlineShellCommand }) {
+  const inlineShell = parseInlineShellInput(trimmed, lastInlineShellCommand);
+  if (inlineShell.type === "error") {
+    ui.writeln(`Error: ${inlineShell.message}`);
+    return { type: "error" };
+  }
+  if (inlineShell.type === "command") {
+    runInlineShellCommand(inlineShell.command, { cwd, ui });
+    return { type: "handled", lastInlineShellCommand: inlineShell.command };
+  }
+  return { type: "none" };
+}
+
+async function runReplTurn({ prompt, args, runner, memoryStore, currentProject, ui, refreshStatusBar, setTurnRunning, modeState = null }) {
+  memoryStore.beginTurn();
+  const carryoverAlreadyRendered = runner.engine.hasRenderedPendingAssistantRecallHints?.() ?? false;
+  const carryoverRecallHints = runner.engine.takePendingAssistantRecallHints?.() ?? [];
+  const userRecallHints = memoryStore.recallForUser(prompt, { currentProject, excludedIds: runner.engine.getRecentRecallMemoryIds?.() ?? [] });
+  const recallBlock = formatRecallHints("user", userRecallHints);
+  const carryoverRecallBlock = formatRecallHints("assistant", carryoverRecallHints);
+  const shellHints = formatShellHints(runner.shellRuntime);
+  const modePrompt = appendModeReminder(prompt, modeState?.get?.());
+  const fullPrompt = appendPromptBlocks(modePrompt, recallBlock, carryoverRecallBlock, shellHints);
+  try {
+    ui.writeln(formatUserDisplayMessage(prompt));
+    ui.memoryHint?.({ source: "user", hints: userRecallHints });
+    if (carryoverRecallHints.length > 0 && !carryoverAlreadyRendered) ui.memoryHint?.({ source: "assistant", hints: carryoverRecallHints });
+    setTurnRunning(true);
+    refreshStatusBar.startWorking?.();
+    await runner.runTurn(fullPrompt, prompt, { userRecallHints, currentProject });
+    renderPendingAssistantRecallPreview({ runner, ui });
+    ui.writeln("");
+  } catch (err) {
+    ui.writeln(`Error: ${err.message}`);
+  } finally {
+    setTurnRunning(false);
+    refreshStatusBar.stopWorking?.();
+    memoryStore.endTurn();
+    refreshStatusBar();
+  }
+}
+
+export function formatUserDisplayMessage(prompt) {
+  return `${inverse(" USER ")} ${formatMessageAttachmentsForDisplay(prompt)}`;
+}
+
+function appendPromptBlocks(prompt, ...blocks) {
+  return [prompt, ...blocks.filter(Boolean)].join("\n\n");
+}
+
+function renderPendingAssistantRecallPreview({ runner, ui }) {
+  if (runner.engine.hasRenderedPendingAssistantRecallHints?.()) return;
+  const hints = runner.engine.peekPendingAssistantRecallHints?.() ?? [];
+  if (hints.length === 0) return;
+  ui.memoryHint?.({ source: "assistant", hints });
+  runner.engine.markPendingAssistantRecallHintsRendered?.();
+}

package/src/cli/selector-list.mjs

@@ -1,21 +1,21 @@
-export function formatSelectorList({
-  items = [],
-  currentIndex = -1,
-  emptyMessage = "(no items)",
-  instruction,
-  linePrefix = "",
-  formatItem = (item) => String(item),
-}) {
-  if (!items.length) return [emptyMessage];
-  const lines = items.map((item, index) => {
-    const mark = index === currentIndex ? "*" : " ";
-    return `${linePrefix}${mark} ${index + 1}. ${formatItem(item)}`;
-  });
-  if (instruction) lines.push(instruction);
-  return lines;
-}
-
-export function findCurrentIndex(items, predicate) {
-  if (!Array.isArray(items) || typeof predicate !== "function") return -1;
-  return items.findIndex(predicate);
-}
+export function formatSelectorList({
+  items = [],
+  currentIndex = -1,
+  emptyMessage = "(no items)",
+  instruction,
+  linePrefix = "",
+  formatItem = (item) => String(item),
+}) {
+  if (!items.length) return [emptyMessage];
+  const lines = items.map((item, index) => {
+    const mark = index === currentIndex ? "*" : " ";
+    return `${linePrefix}${mark} ${index + 1}. ${formatItem(item)}`;
+  });
+  if (instruction) lines.push(instruction);
+  return lines;
+}
+
+export function findCurrentIndex(items, predicate) {
+  if (!Array.isArray(items) || typeof predicate !== "function") return -1;
+  return items.findIndex(predicate);
+}

package/src/cli/session/pi-session-switch-command.mjs

@@ -1,41 +1,41 @@
-import { loadPiSessionSidecar } from "../../session/sidecar.mjs";
-
-export async function resumePiSessionById(id, { runner, sessions, projectMarchDir }) {
-  if (!runner.canSwitchPiSession?.()) {
-    return ["Error: pi session resume requires the pi runtime host"];
-  }
-
-  const matches = sessions.filter((session) => session.id.startsWith(id));
-  if (matches.length === 0) return [`Error: pi session not found: ${id}`];
-  if (matches.length > 1) {
-    return [`Error: pi session id is ambiguous: ${id} (${matches.map((session) => session.id).join(", ")})`];
-  }
-
-  const session = matches[0];
-  let sidecar;
-  try {
-    sidecar = loadPiSessionSidecar({ projectMarchDir, sessionRef: session.path });
-  } catch (err) {
-    return [`Error: pi session sidecar is invalid for ${session.id}: ${err.message}`];
-  }
-  if (!sidecar) {
-    return [`Error: pi session sidecar not found for ${session.id}; refusing partial resume`];
-  }
-  if (sidecar.state.cwd && sidecar.state.cwd !== runner.engine.cwd) {
-    return [`Error: pi session sidecar cwd mismatch for ${session.id}: ${sidecar.state.cwd}`];
-  }
-
-  let result;
-  const restoreState = toContextSessionState(sidecar.state);
-  try {
-    result = await runner.switchPiSession(session.path, restoreState);
-  } catch (err) {
-    return [`Error: failed to switch pi session ${session.id}: ${err.message}`];
-  }
-  if (result?.cancelled) return [`Resume pi session cancelled: ${session.id}`];
-  return [`Resumed pi session: ${session.id}`];
-}
-
-function toContextSessionState(sidecarState) {
-  return { ...sidecarState };
-}
+import { loadPiSessionSidecar } from "../../session/sidecar.mjs";
+
+export async function resumePiSessionById(id, { runner, sessions, projectMarchDir }) {
+  if (!runner.canSwitchPiSession?.()) {
+    return ["Error: pi session resume requires the pi runtime host"];
+  }
+
+  const matches = sessions.filter((session) => session.id.startsWith(id));
+  if (matches.length === 0) return [`Error: pi session not found: ${id}`];
+  if (matches.length > 1) {
+    return [`Error: pi session id is ambiguous: ${id} (${matches.map((session) => session.id).join(", ")})`];
+  }
+
+  const session = matches[0];
+  let sidecar;
+  try {
+    sidecar = loadPiSessionSidecar({ projectMarchDir, sessionRef: session.path });
+  } catch (err) {
+    return [`Error: pi session sidecar is invalid for ${session.id}: ${err.message}`];
+  }
+  if (!sidecar) {
+    return [`Error: pi session sidecar not found for ${session.id}; refusing partial resume`];
+  }
+  if (sidecar.state.cwd && sidecar.state.cwd !== runner.engine.cwd) {
+    return [`Error: pi session sidecar cwd mismatch for ${session.id}: ${sidecar.state.cwd}`];
+  }
+
+  let result;
+  const restoreState = toContextSessionState(sidecar.state);
+  try {
+    result = await runner.switchPiSession(session.path, restoreState);
+  } catch (err) {
+    return [`Error: failed to switch pi session ${session.id}: ${err.message}`];
+  }
+  if (result?.cancelled) return [`Resume pi session cancelled: ${session.id}`];
+  return [`Resumed pi session: ${session.id}`];
+}
+
+function toContextSessionState(sidecarState) {
+  return { ...sidecarState };
+}

package/src/cli/session/session-command.mjs

@@ -1,23 +1,23 @@
-export function formatSessionStats(stats) {
-  const lines = [
-    `session: ${stats.sessionId}`,
-    `messages: ${stats.userMessages}u + ${stats.assistantMessages}a + ${stats.toolCalls}t = ${stats.totalMessages} total`,
-    `tokens: ${stats.tokens.input} in / ${stats.tokens.output} out (${stats.tokens.cacheRead} cache read, ${stats.tokens.cacheWrite} cache write)`,
-    `cost: $${stats.cost.toFixed(4)}`,
-  ];
-  if (typeof stats.persisted === "boolean") {
-    const mode = stats.persisted ? "pi-jsonl" : "in-memory";
-    const suffix = stats.sessionFile ? ` (${stats.sessionFile})` : "";
-    lines.splice(1, 0, `persistence: ${mode}${suffix}`);
-  }
-  if (typeof stats.runtimeHost === "boolean") {
-    const mode = stats.runtimeHost ? "pi-runtime-host" : "direct-agent-session";
-    const insertAt = typeof stats.persisted === "boolean" ? 2 : 1;
-    lines.splice(insertAt, 0, `runtime: ${mode}`);
-  }
-  return lines;
-}
-
-export function listSessionStats({ runner }) {
-  return formatSessionStats(runner.getSessionStats());
-}
+export function formatSessionStats(stats) {
+  const lines = [
+    `session: ${stats.sessionId}`,
+    `messages: ${stats.userMessages}u + ${stats.assistantMessages}a + ${stats.toolCalls}t = ${stats.totalMessages} total`,
+    `tokens: ${stats.tokens.input} in / ${stats.tokens.output} out (${stats.tokens.cacheRead} cache read, ${stats.tokens.cacheWrite} cache write)`,
+    `cost: $${stats.cost.toFixed(4)}`,
+  ];
+  if (typeof stats.persisted === "boolean") {
+    const mode = stats.persisted ? "pi-jsonl" : "in-memory";
+    const suffix = stats.sessionFile ? ` (${stats.sessionFile})` : "";
+    lines.splice(1, 0, `persistence: ${mode}${suffix}`);
+  }
+  if (typeof stats.runtimeHost === "boolean") {
+    const mode = stats.runtimeHost ? "pi-runtime-host" : "direct-agent-session";
+    const insertAt = typeof stats.persisted === "boolean" ? 2 : 1;
+    lines.splice(insertAt, 0, `runtime: ${mode}`);
+  }
+  return lines;
+}
+
+export function listSessionStats({ runner }) {
+  return formatSessionStats(runner.getSessionStats());
+}