march-cli 0.1.24 → 0.1.25

package/src/cli/startup/startup-banner.mjs

@@ -1,71 +1,71 @@
-import { createRequire } from "node:module";
-import { visibleWidth } from "@earendil-works/pi-tui";
-import { MODES, formatModeLabel } from "../input/mode-state.mjs";
-import { brightBlack, cyan, modeLabel, white } from "../tui/ui-theme.mjs";
-
-const CARD_WIDTH = 76;
-const ANSI_RE = /\x1b\[[0-?]*[ -/]*[@-~]/g;
-const { version: packageVersion = "0.1" } = createRequire(import.meta.url)("../../../package.json");
-
-export function formatStartupBanner({ cwd, modelId = "model?", thinkingLevel = "thinking?", mode = MODES.DO, dumpContextPath = null } = {}) {
-  const nextMode = mode === MODES.DISCUSS ? MODES.DO : MODES.DISCUSS;
-  const tip = dumpContextPath
-    ? `${brightBlack("Tip:")} ${cyan("dumps:")} ${brightBlack(dumpContextPath)}`
-    : `${brightBlack("Tip:")} ${brightBlack("Tab to")} ${formatModeTip(nextMode)} ${brightBlack("·")} ${cyan("/help")} ${brightBlack("for commands")}`;
-  return [
-    "",
-    ...renderStartupCard([
-      `${cyan("  █▙  ▟█")}   ${white("March")} ${brightBlack(`v${packageVersion}`)}`,
-      `${cyan("  █▜▙▟▛█")}   ${brightBlack("Describe a task to get started.")}`,
-      `${cyan("  ▀    ▀")}`,
-      "",
-      tip,
-      brightBlack("March uses AI. Check for mistakes."),
-    ]),
-    "",
-  ];
-}
-
-function formatModeTip(mode) {
-  const label = formatModeLabel(mode);
-  return (modeLabel[mode] ?? modeLabel.fallback)(label);
-}
-
-function renderStartupCard(contentLines, width = CARD_WIDTH) {
-  const safeWidth = Math.max(24, Math.trunc(width));
-  const innerWidth = safeWidth - 4;
-  return [
-    white(`╭${"─".repeat(safeWidth - 2)}╮`),
-    ...contentLines.map((line) => white("│ ") + padAnsi(line, innerWidth) + white(" │")),
-    white(`╰${"─".repeat(safeWidth - 2)}╯`),
-  ];
-}
-
-function padAnsi(text, width) {
-  const clipped = clipAnsi(text, width);
-  const padding = Math.max(0, width - visibleWidth(stripAnsi(clipped)));
-  return `${clipped}${" ".repeat(padding)}`;
-}
-
-function clipAnsi(text, width) {
-  let output = "";
-  let plainWidth = 0;
-  let inAnsi = false;
-  for (const ch of Array.from(String(text ?? ""))) {
-    if (ch === "\x1b") inAnsi = true;
-    if (inAnsi) {
-      output += ch;
-      if (/[@-~]/.test(ch)) inAnsi = false;
-      continue;
-    }
-    const charWidth = visibleWidth(ch);
-    if (plainWidth + charWidth > width) break;
-    output += ch;
-    plainWidth += charWidth;
-  }
-  return output;
-}
-
-function stripAnsi(text) {
-  return String(text ?? "").replace(ANSI_RE, "");
-}
+import { createRequire } from "node:module";
+import { visibleWidth } from "@earendil-works/pi-tui";
+import { MODES, formatModeLabel } from "../input/mode-state.mjs";
+import { brightBlack, cyan, modeLabel, white } from "../tui/ui-theme.mjs";
+
+const CARD_WIDTH = 76;
+const ANSI_RE = /\x1b\[[0-?]*[ -/]*[@-~]/g;
+const { version: packageVersion = "0.1" } = createRequire(import.meta.url)("../../../package.json");
+
+export function formatStartupBanner({ cwd, modelId = "model?", thinkingLevel = "thinking?", mode = MODES.DO, dumpContextPath = null } = {}) {
+  const nextMode = mode === MODES.DISCUSS ? MODES.DO : MODES.DISCUSS;
+  const tip = dumpContextPath
+    ? `${brightBlack("Tip:")} ${cyan("dumps:")} ${brightBlack(dumpContextPath)}`
+    : `${brightBlack("Tip:")} ${brightBlack("Tab to")} ${formatModeTip(nextMode)} ${brightBlack("·")} ${cyan("/help")} ${brightBlack("for commands")}`;
+  return [
+    "",
+    ...renderStartupCard([
+      `${cyan("  ▛▀▀▀▀▀▜")}   ${white("March")} ${brightBlack(`v${packageVersion}`)}`,
+      `${cyan("  ▌ █  █ ▐")}   ${brightBlack("Describe a task to get started.")}`,
+      `${cyan("  ▀▘  ▀  ▀▘")}`,
+      "",
+      tip,
+      brightBlack("March uses AI. Check for mistakes."),
+    ]),
+    "",
+  ];
+}
+
+function formatModeTip(mode) {
+  const label = formatModeLabel(mode);
+  return (modeLabel[mode] ?? modeLabel.fallback)(label);
+}
+
+function renderStartupCard(contentLines, width = CARD_WIDTH) {
+  const safeWidth = Math.max(24, Math.trunc(width));
+  const innerWidth = safeWidth - 4;
+  return [
+    white(`╭${"─".repeat(safeWidth - 2)}╮`),
+    ...contentLines.map((line) => white("│ ") + padAnsi(line, innerWidth) + white(" │")),
+    white(`╰${"─".repeat(safeWidth - 2)}╯`),
+  ];
+}
+
+function padAnsi(text, width) {
+  const clipped = clipAnsi(text, width);
+  const padding = Math.max(0, width - visibleWidth(stripAnsi(clipped)));
+  return `${clipped}${" ".repeat(padding)}`;
+}
+
+function clipAnsi(text, width) {
+  let output = "";
+  let plainWidth = 0;
+  let inAnsi = false;
+  for (const ch of Array.from(String(text ?? ""))) {
+    if (ch === "\x1b") inAnsi = true;
+    if (inAnsi) {
+      output += ch;
+      if (/[@-~]/.test(ch)) inAnsi = false;
+      continue;
+    }
+    const charWidth = visibleWidth(ch);
+    if (plainWidth + charWidth > width) break;
+    output += ch;
+    plainWidth += charWidth;
+  }
+  return output;
+}
+
+function stripAnsi(text) {
+  return String(text ?? "").replace(ANSI_RE, "");
+}

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

@@ -1,51 +1,51 @@
-import { randomUUID } from "node:crypto";
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { resolve } from "node:path";
-import { listPiSessionInfos } from "../../session/pi-manager.mjs";
-import { loadPiSessionTranscriptTurns } from "../../session/transcript.mjs";
-import { resumePiSessionById } from "../session/pi-session-switch-command.mjs";
-
-export function loadOrCreateProjectId(projectMarchDir) {
-  if (!existsSync(projectMarchDir)) mkdirSync(projectMarchDir, { recursive: true });
-  const idFile = resolve(projectMarchDir, "project-id");
-  if (existsSync(idFile)) {
-    return readFileSync(idFile, "utf8").trim();
-  }
-  const id = randomUUID();
-  writeFileSync(idFile, id, "utf8");
-  return id;
-}
-
-export async function resumeStartupSession({
-  resumeId,
-  runner,
-  sessionState,
-  projectMarchDir,
-  ui,
-  listPiSessions = listPiSessionInfos,
-}) {
-  if (!resumeId) return { source: "none", lines: [] };
-
-  const sessions = await listPiSessions({
-    cwd: runner.engine.cwd,
-    projectMarchDir,
-  });
-  const lines = await resumePiSessionById(resumeId, {
-    runner,
-    sessions,
-    projectMarchDir,
-  });
-  for (const line of lines) ui.status(line);
-  return { source: "pi", lines, transcriptTurns: loadResumeTranscriptTurns(resumeId, sessions, lines) };
-}
-
-function loadResumeTranscriptTurns(resumeId, sessions, lines) {
-  if (!Array.isArray(lines) || !lines.some((line) => String(line).startsWith("Resumed pi session:"))) return [];
-  const matches = sessions.filter((session) => session.id.startsWith(resumeId));
-  if (matches.length !== 1) return [];
-  try {
-    return loadPiSessionTranscriptTurns(matches[0].path);
-  } catch {
-    return [];
-  }
-}
+import { randomUUID } from "node:crypto";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { resolve } from "node:path";
+import { listPiSessionInfos } from "../../session/pi-manager.mjs";
+import { loadPiSessionTranscriptTurns } from "../../session/transcript.mjs";
+import { resumePiSessionById } from "../session/pi-session-switch-command.mjs";
+
+export function loadOrCreateProjectId(projectMarchDir) {
+  if (!existsSync(projectMarchDir)) mkdirSync(projectMarchDir, { recursive: true });
+  const idFile = resolve(projectMarchDir, "project-id");
+  if (existsSync(idFile)) {
+    return readFileSync(idFile, "utf8").trim();
+  }
+  const id = randomUUID();
+  writeFileSync(idFile, id, "utf8");
+  return id;
+}
+
+export async function resumeStartupSession({
+  resumeId,
+  runner,
+  sessionState,
+  projectMarchDir,
+  ui,
+  listPiSessions = listPiSessionInfos,
+}) {
+  if (!resumeId) return { source: "none", lines: [] };
+
+  const sessions = await listPiSessions({
+    cwd: runner.engine.cwd,
+    projectMarchDir,
+  });
+  const lines = await resumePiSessionById(resumeId, {
+    runner,
+    sessions,
+    projectMarchDir,
+  });
+  for (const line of lines) ui.status(line);
+  return { source: "pi", lines, transcriptTurns: loadResumeTranscriptTurns(resumeId, sessions, lines) };
+}
+
+function loadResumeTranscriptTurns(resumeId, sessions, lines) {
+  if (!Array.isArray(lines) || !lines.some((line) => String(line).startsWith("Resumed pi session:"))) return [];
+  const matches = sessions.filter((session) => session.id.startsWith(resumeId));
+  if (matches.length !== 1) return [];
+  try {
+    return loadPiSessionTranscriptTurns(matches[0].path);
+  } catch {
+    return [];
+  }
+}

package/src/cli/status-line-updater.mjs

@@ -1,75 +1,75 @@
-import { statusBarLine } from "./commands/status-command.mjs";
-
-const WORKING_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
-const WORKING_INTERVAL_MS = 120;
-
-export function createStatusLineUpdater({
-  ui,
-  runner,
-  sessionState,
-  sessionSource = "pi",
-  getMode = () => undefined,
-}) {
-  let contextTokens = null;
-  let activity = null;
-  let frameIndex = 0;
-  let timer = null;
-
-  const update = (options = {}) => {
-    if (typeof ui.setStatusBar !== "function") return null;
-    if (Object.hasOwn(options, "contextTokens")) contextTokens = options.contextTokens;
-    const line = statusBarLine({
-      runner,
-      sessionState,
-      sessionSource,
-      extensionDiagnostics: runner.getExtensionDiagnostics?.() ?? [],
-      lifecycleState: runner.getExtensionLifecycleState?.() ?? null,
-      mode: getMode(),
-      contextTokens,
-      activity: formatActivity(activity, frameIndex),
-      lspStatus: runner.getLspStatus?.() ?? null,
-    });
-    ui.setStatusBar(line);
-    return line;
-  };
-
-  update.startWorking = () => {
-    activity = "working";
-    frameIndex = 0;
-    const line = update();
-    if (!timer) {
-      timer = setInterval(() => {
-        frameIndex = (frameIndex + 1) % WORKING_FRAMES.length;
-        update();
-      }, WORKING_INTERVAL_MS);
-      timer.unref?.();
-    }
-    return line;
-  };
-
-  update.stopWorking = () => {
-    if (activity === "working") activity = null;
-    if (timer) {
-      clearInterval(timer);
-      timer = null;
-    }
-    return update();
-  };
-
-  update.markAborted = () => {
-    activity = "aborted";
-    if (timer) {
-      clearInterval(timer);
-      timer = null;
-    }
-    return update();
-  };
-
-  return update;
-}
-
-function formatActivity(activity, frameIndex) {
-  if (activity === "working") return { frame: WORKING_FRAMES[frameIndex], label: "Working" };
-  if (activity === "aborted") return { frame: "x", label: "Aborted" };
-  return null;
-}
+import { statusBarLine } from "./commands/status-command.mjs";
+
+const WORKING_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+const WORKING_INTERVAL_MS = 120;
+
+export function createStatusLineUpdater({
+  ui,
+  runner,
+  sessionState,
+  sessionSource = "pi",
+  getMode = () => undefined,
+}) {
+  let contextTokens = null;
+  let activity = null;
+  let frameIndex = 0;
+  let timer = null;
+
+  const update = (options = {}) => {
+    if (typeof ui.setStatusBar !== "function") return null;
+    if (Object.hasOwn(options, "contextTokens")) contextTokens = options.contextTokens;
+    const line = statusBarLine({
+      runner,
+      sessionState,
+      sessionSource,
+      extensionDiagnostics: runner.getExtensionDiagnostics?.() ?? [],
+      lifecycleState: runner.getExtensionLifecycleState?.() ?? null,
+      mode: getMode(),
+      contextTokens,
+      activity: formatActivity(activity, frameIndex),
+      lspStatus: runner.getLspStatus?.() ?? null,
+    });
+    ui.setStatusBar(line);
+    return line;
+  };
+
+  update.startWorking = () => {
+    activity = "working";
+    frameIndex = 0;
+    const line = update();
+    if (!timer) {
+      timer = setInterval(() => {
+        frameIndex = (frameIndex + 1) % WORKING_FRAMES.length;
+        update();
+      }, WORKING_INTERVAL_MS);
+      timer.unref?.();
+    }
+    return line;
+  };
+
+  update.stopWorking = () => {
+    if (activity === "working") activity = null;
+    if (timer) {
+      clearInterval(timer);
+      timer = null;
+    }
+    return update();
+  };
+
+  update.markAborted = () => {
+    activity = "aborted";
+    if (timer) {
+      clearInterval(timer);
+      timer = null;
+    }
+    return update();
+  };
+
+  return update;
+}
+
+function formatActivity(activity, frameIndex) {
+  if (activity === "working") return { frame: WORKING_FRAMES[frameIndex], label: "Working" };
+  if (activity === "aborted") return { frame: "x", label: "Aborted" };
+  return null;
+}

package/src/cli/tool-output.mjs

@@ -1,9 +1,9 @@
-export function extractToolOutput(result) {
-  try {
-    const content = result?.content;
-    if (Array.isArray(content)) {
-      return content.filter(c => c.type === "text").map(c => c.text).join("\n");
-    }
-  } catch {}
-  return "";
-}
+export function extractToolOutput(result) {
+  try {
+    const content = result?.content;
+    if (Array.isArray(content)) {
+      return content.filter(c => c.type === "text").map(c => c.text).join("\n");
+    }
+  } catch {}
+  return "";
+}

package/src/cli/tui/editor/external-editor-runner.mjs

@@ -1,24 +1,24 @@
-import { getExternalEditorCommand, openTextInExternalEditor } from "../../input/external-editor.mjs";
-import { yellow } from "../ui-theme.mjs";
-
-export function runTuiExternalEditor({ terminal, tui, editor, output, requestRender, mouseOn }) {
-  const editorCommand = getExternalEditorCommand();
-  if (!editorCommand) {
-    output.writeln(yellow(`● No editor configured. Set $VISUAL or $EDITOR.`));
-    requestRender();
-    return;
-  }
-  try {
-    terminal.write("\x1b[?1049l");
-    tui.stop();
-    if (mouseOn()) terminal.write("\x1b[?1002l\x1b[?1006l");
-    const result = openTextInExternalEditor({ text: editor.getText(), editorCommand });
-    if (result.ok) editor.setText(result.text);
-    else output.writeln(yellow(`● ${result.error}`));
-  } finally {
-    tui.start();
-    terminal.write("\x1b[?1049h");
-    if (mouseOn()) terminal.write("\x1b[?1002h\x1b[?1006h");
-    tui.requestRender(true);
-  }
-}
+import { getExternalEditorCommand, openTextInExternalEditor } from "../../input/external-editor.mjs";
+import { yellow } from "../ui-theme.mjs";
+
+export function runTuiExternalEditor({ terminal, tui, editor, output, requestRender, mouseOn }) {
+  const editorCommand = getExternalEditorCommand();
+  if (!editorCommand) {
+    output.writeln(yellow(`● No editor configured. Set $VISUAL or $EDITOR.`));
+    requestRender();
+    return;
+  }
+  try {
+    terminal.write("\x1b[?1049l");
+    tui.stop();
+    if (mouseOn()) terminal.write("\x1b[?1002l\x1b[?1006l");
+    const result = openTextInExternalEditor({ text: editor.getText(), editorCommand });
+    if (result.ok) editor.setText(result.text);
+    else output.writeln(yellow(`● ${result.error}`));
+  } finally {
+    tui.start();
+    terminal.write("\x1b[?1049h");
+    if (mouseOn()) terminal.write("\x1b[?1002h\x1b[?1006h");
+    tui.requestRender(true);
+  }
+}

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

@@ -1,91 +1,91 @@
-import { parseMouseEvent } from "./mouse-tracking.mjs";
-import { brightBlack } from "../ui-theme.mjs";
-
-const OUTPUT_WHEEL_SCROLL_LINES = 3;
-
-export function createMouseSelectionController({
-  terminal,
-  output,
-  shellDrawer,
-  shellDrawerControls,
-  selection,
-  writeClipboard,
-  requestRender,
-}) {
-  function copySelectionText(text) {
-    if (!text) return false;
-    let result;
-    try {
-      result = writeClipboard(text);
-    } catch (err) {
-      setCopyStatus({ ok: false, message: err.message }, text.length);
-      return false;
-    }
-    if (result?.then) {
-      output.setOverlayStatus([brightBlack(`● copying selection (${text.length} chars)`)]);
-      requestRender();
-      result.then(
-        (resolved) => setCopyStatus(resolved, text.length),
-        (err) => setCopyStatus({ ok: false, message: err.message }, text.length)
-      );
-      return true;
-    }
-    setCopyStatus(result, text.length);
-    return result?.ok !== false;
-  }
-
-  function setCopyStatus(result, length) {
-    output.setOverlayStatus([
-      result?.ok === false
-        ? brightBlack(`● selection copy failed: ${compactStatusMessage(result.message)}`)
-        : brightBlack(`● copied selection (${length} chars)`),
-    ]);
-    requestRender();
-  }
-
-  return {
-    handleMouseInput(data, mouseOn) {
-      if (!mouseOn) return undefined;
-      const mouse = parseMouseEvent(data);
-      if (mouse?.type === "scroll") {
-        if (shellDrawer.isVisible?.() && mouse.col > Math.floor((terminal.columns || 80) * 0.64)) {
-          shellDrawerControls.scroll(mouse.delta);
-        } else {
-          output.scroll(mouse.delta, { step: OUTPUT_WHEEL_SCROLL_LINES });
-        }
-        requestRender();
-        return { consume: true };
-      }
-      if (mouse?.type === "down" && mouse.button === 0) {
-        selection.start(mouse);
-        requestRender();
-        return { consume: true };
-      }
-      if (mouse?.type === "drag" && mouse.button === 0) {
-        selection.update(mouse);
-        requestRender();
-        return { consume: true };
-      }
-      if (mouse?.type === "up") {
-        selection.finish(mouse, { clear: false });
-        requestRender();
-        return { consume: true };
-      }
-      return undefined;
-    },
-
-    handleCopyKey(data) {
-      if (data !== "\x03") return undefined;
-      const text = selection.text();
-      if (!text) return undefined;
-      selection.clear();
-      copySelectionText(text);
-      return { consume: true };
-    },
-  };
-}
-
-function compactStatusMessage(message) {
-  const text = String(message || "unknown error").replace(/\s+/g, " ").trim();
-  return text.length > 80 ? `${text.slice(0, 79)}…` : text;
-}
+import { parseMouseEvent } from "./mouse-tracking.mjs";
+import { brightBlack } from "../ui-theme.mjs";
+
+const OUTPUT_WHEEL_SCROLL_LINES = 3;
+
+export function createMouseSelectionController({
+  terminal,
+  output,
+  shellDrawer,
+  shellDrawerControls,
+  selection,
+  writeClipboard,
+  requestRender,
+}) {
+  function copySelectionText(text) {
+    if (!text) return false;
+    let result;
+    try {
+      result = writeClipboard(text);
+    } catch (err) {
+      setCopyStatus({ ok: false, message: err.message }, text.length);
+      return false;
+    }
+    if (result?.then) {
+      output.setOverlayStatus([brightBlack(`● copying selection (${text.length} chars)`)]);
+      requestRender();
+      result.then(
+        (resolved) => setCopyStatus(resolved, text.length),
+        (err) => setCopyStatus({ ok: false, message: err.message }, text.length)
+      );
+      return true;
+    }
+    setCopyStatus(result, text.length);
+    return result?.ok !== false;
+  }
+
+  function setCopyStatus(result, length) {
+    output.setOverlayStatus([
+      result?.ok === false
+        ? brightBlack(`● selection copy failed: ${compactStatusMessage(result.message)}`)
+        : brightBlack(`● copied selection (${length} chars)`),
+    ]);
+    requestRender();
+  }
+
+  return {
+    handleMouseInput(data, mouseOn) {
+      if (!mouseOn) return undefined;
+      const mouse = parseMouseEvent(data);
+      if (mouse?.type === "scroll") {
+        if (shellDrawer.isVisible?.() && mouse.col > Math.floor((terminal.columns || 80) * 0.64)) {
+          shellDrawerControls.scroll(mouse.delta);
+        } else {
+          output.scroll(mouse.delta, { step: OUTPUT_WHEEL_SCROLL_LINES });
+        }
+        requestRender();
+        return { consume: true };
+      }
+      if (mouse?.type === "down" && mouse.button === 0) {
+        selection.start(mouse);
+        requestRender();
+        return { consume: true };
+      }
+      if (mouse?.type === "drag" && mouse.button === 0) {
+        selection.update(mouse);
+        requestRender();
+        return { consume: true };
+      }
+      if (mouse?.type === "up") {
+        selection.finish(mouse, { clear: false });
+        requestRender();
+        return { consume: true };
+      }
+      return undefined;
+    },
+
+    handleCopyKey(data) {
+      if (data !== "\x03") return undefined;
+      const text = selection.text();
+      if (!text) return undefined;
+      selection.clear();
+      copySelectionText(text);
+      return { consume: true };
+    },
+  };
+}
+
+function compactStatusMessage(message) {
+  const text = String(message || "unknown error").replace(/\s+/g, " ").trim();
+  return text.length > 80 ? `${text.slice(0, 79)}…` : text;
+}