march-cli 0.1.20 → 0.1.22

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

@@ -1,68 +1,68 @@
-import { formatSessionTree } from "../../session/tree.mjs";
-
-export function formatSessionList(sessions, currentSessionId = null) {
-  if (sessions.length === 0) return ["(no saved sessions)"];
-  const lines = sessions.map((session) => {
-    const marker = session.id === currentSessionId ? " *" : "  ";
-    const parent = session.parentSessionId ? `  fork:${session.parentSessionId}` : "";
-    return `${marker} ${session.id}  ${session.turnCount}t  ${session.cwd}  ${session.savedAt?.slice(0, 19) ?? "?"}${parent}`;
-  });
-  lines.push("(* = current session)");
-  return lines;
-}
-
-export function listSessionCommand({ sessions, currentSessionId, tree = false }) {
-  if (tree) return formatSessionTree(sessions, currentSessionId);
-  return formatSessionList(sessions, currentSessionId);
-}
-
-export function formatPiSessionList(sessions) {
-  if (sessions.length === 0) return ["(no pi sessions)"];
-  const lines = sessions.map((session) => {
-    const label = session.name || session.firstMessage || "(no messages)";
-    const savedAt = session.savedAt?.slice(0, 19) ?? "?";
-    return `  ${session.id}  ${session.turnCount}m  ${savedAt}  ${label}`;
-  });
-  lines.push("(pi JSONL session files; use /session to restore a previous session)");
-  return lines;
-}
-
-export function formatPiSessionTree(sessions, currentSessionId = null) {
-  if (sessions.length === 0) return ["(no pi sessions)"];
-
-  const nodes = new Map();
-  const byPath = new Map();
-  for (const session of sessions) {
-    const node = { ...session, children: [] };
-    nodes.set(session.id, node);
-    if (session.path) byPath.set(session.path, node);
-  }
-
-  const roots = [];
-  for (const node of nodes.values()) {
-    const parent = node.parentSessionPath ? byPath.get(node.parentSessionPath) : null;
-    if (parent) parent.children.push(node);
-    else roots.push(node);
-  }
-
-  const bySavedAtDesc = (a, b) => (b.savedAt ?? "").localeCompare(a.savedAt ?? "");
-  const sortDeep = (items) => {
-    items.sort(bySavedAtDesc);
-    for (const item of items) sortDeep(item.children);
-  };
-  sortDeep(roots);
-
-  const lines = [];
-  const visit = (node, depth) => {
-    const marker = node.id === currentSessionId ? "*" : "-";
-    const savedAt = node.savedAt?.slice(0, 19) ?? "?";
-    const label = node.name || node.firstMessage || "(no messages)";
-    const indent = "  ".repeat(depth);
-    lines.push(`${indent}${marker} ${node.id}  ${node.turnCount ?? 0}m  ${savedAt}  ${label}`);
-    for (const child of node.children) visit(child, depth + 1);
-  };
-
-  for (const root of roots) visit(root, 0);
-  lines.push("(* = current pi session; file-level tree uses pi JSONL parentSessionPath)");
-  return lines;
-}
+import { formatSessionTree } from "../../session/tree.mjs";
+
+export function formatSessionList(sessions, currentSessionId = null) {
+  if (sessions.length === 0) return ["(no saved sessions)"];
+  const lines = sessions.map((session) => {
+    const marker = session.id === currentSessionId ? " *" : "  ";
+    const parent = session.parentSessionId ? `  fork:${session.parentSessionId}` : "";
+    return `${marker} ${session.id}  ${session.turnCount}t  ${session.cwd}  ${session.savedAt?.slice(0, 19) ?? "?"}${parent}`;
+  });
+  lines.push("(* = current session)");
+  return lines;
+}
+
+export function listSessionCommand({ sessions, currentSessionId, tree = false }) {
+  if (tree) return formatSessionTree(sessions, currentSessionId);
+  return formatSessionList(sessions, currentSessionId);
+}
+
+export function formatPiSessionList(sessions) {
+  if (sessions.length === 0) return ["(no pi sessions)"];
+  const lines = sessions.map((session) => {
+    const label = session.name || session.firstMessage || "(no messages)";
+    const savedAt = session.savedAt?.slice(0, 19) ?? "?";
+    return `  ${session.id}  ${session.turnCount}m  ${savedAt}  ${label}`;
+  });
+  lines.push("(pi JSONL session files; use /session to restore a previous session)");
+  return lines;
+}
+
+export function formatPiSessionTree(sessions, currentSessionId = null) {
+  if (sessions.length === 0) return ["(no pi sessions)"];
+
+  const nodes = new Map();
+  const byPath = new Map();
+  for (const session of sessions) {
+    const node = { ...session, children: [] };
+    nodes.set(session.id, node);
+    if (session.path) byPath.set(session.path, node);
+  }
+
+  const roots = [];
+  for (const node of nodes.values()) {
+    const parent = node.parentSessionPath ? byPath.get(node.parentSessionPath) : null;
+    if (parent) parent.children.push(node);
+    else roots.push(node);
+  }
+
+  const bySavedAtDesc = (a, b) => (b.savedAt ?? "").localeCompare(a.savedAt ?? "");
+  const sortDeep = (items) => {
+    items.sort(bySavedAtDesc);
+    for (const item of items) sortDeep(item.children);
+  };
+  sortDeep(roots);
+
+  const lines = [];
+  const visit = (node, depth) => {
+    const marker = node.id === currentSessionId ? "*" : "-";
+    const savedAt = node.savedAt?.slice(0, 19) ?? "?";
+    const label = node.name || node.firstMessage || "(no messages)";
+    const indent = "  ".repeat(depth);
+    lines.push(`${indent}${marker} ${node.id}  ${node.turnCount ?? 0}m  ${savedAt}  ${label}`);
+    for (const child of node.children) visit(child, depth + 1);
+  };
+
+  for (const root of roots) visit(root, 0);
+  lines.push("(* = current pi session; file-level tree uses pi JSONL parentSessionPath)");
+  return lines;
+}

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

@@ -1,26 +1,26 @@
-export function parseSessionNameCommand(input) {
-  if (input !== "/name" && !input.startsWith("/name ")) return { type: "none" };
-  const name = input.slice("/name".length).trim();
-  if (!name) return { type: "show" };
-  if (name.length > 120) return { type: "error", message: "Session name must be 120 characters or less" };
-  return { type: "set", name };
-}
-
-export function handleSessionNameCommand(command, { runner } = {}) {
-  if (command.type === "error") return [`Error: ${command.message}`];
-  if (command.type === "show") return [`Session name: ${runner.engine.sessionName || "(unnamed)"}`];
-
-  const name = runner.setSessionName
-    ? runner.setSessionName(command.name)
-    : setEngineSessionName(runner.engine, command.name);
-  return [`Session named: ${name}`];
-}
-
-function setEngineSessionName(engine, name) {
-  if (typeof engine.setSessionName === "function") {
-    engine.setSessionName(name);
-  } else {
-    engine.sessionName = String(name || "").trim();
-  }
-  return engine.sessionName;
-}
+export function parseSessionNameCommand(input) {
+  if (input !== "/name" && !input.startsWith("/name ")) return { type: "none" };
+  const name = input.slice("/name".length).trim();
+  if (!name) return { type: "show" };
+  if (name.length > 120) return { type: "error", message: "Session name must be 120 characters or less" };
+  return { type: "set", name };
+}
+
+export function handleSessionNameCommand(command, { runner } = {}) {
+  if (command.type === "error") return [`Error: ${command.message}`];
+  if (command.type === "show") return [`Session name: ${runner.engine.sessionName || "(unnamed)"}`];
+
+  const name = runner.setSessionName
+    ? runner.setSessionName(command.name)
+    : setEngineSessionName(runner.engine, command.name);
+  return [`Session named: ${name}`];
+}
+
+function setEngineSessionName(engine, name) {
+  if (typeof engine.setSessionName === "function") {
+    engine.setSessionName(name);
+  } else {
+    engine.sessionName = String(name || "").trim();
+  }
+  return engine.sessionName;
+}

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

@@ -1,89 +1,89 @@
-import { listPiSessionInfos } from "../../session/pi-manager.mjs";
-import { loadPiSessionTranscriptTurns } from "../../session/transcript.mjs";
-import { resumePiSessionById } from "./pi-session-switch-command.mjs";
-
-export async function handleSessionSourceCommand(trimmed, {
-  ui,
-  runner,
-  sessionState,
-  sessionsRoot,
-  projectMarchDir,
-}) {
-  if (trimmed === "/save") {
-    const stats = runner.getSessionStats?.();
-    ui.writeln(`Pi session auto-saved: ${stats?.sessionId ?? sessionState.sessionId}`);
-    return { handled: true };
-  }
-
-  if (trimmed === "/session") {
-    const sessions = await listPiSessionInfos({
-      cwd: runner.engine.cwd,
-      projectMarchDir,
-    });
-    if (sessions.length === 0) {
-      ui.writeln("No previous sessions.");
-      return { handled: true };
-    }
-    if (!ui.selectList) {
-      ui.writeln("Session selector is only available in TUI.");
-      return { handled: true };
-    }
-    const currentSessionId = runner.getSessionStats?.().sessionId ?? null;
-    const item = await ui.selectList({
-      items: buildSessionSelectItems(sessions, currentSessionId),
-      selectedIndex: Math.max(0, sessions.findIndex((session) => session.id === currentSessionId)),
-      width: 72,
-      suppressInitialConfirm: true,
-      searchable: true,
-      getSearchText: sessionSelectSearchText,
-    });
-    if (!item) {
-      ui.writeln("Session unchanged.");
-      return { handled: true };
-    }
-    const lines = await resumePiSessionById(item.session.id, { runner, sessions, projectMarchDir });
-    if (isResumeSuccess(lines)) restoreTranscriptFromSession(item.session, ui);
-    for (const line of lines) {
-      ui.writeln(line);
-    }
-    return { handled: true };
-  }
-
-  return { handled: false };
-}
-
-export function buildSessionSelectItems(sessions, currentSessionId = null) {
-  return sessions.map((session) => {
-    const label = session.name || session.firstMessage || "(no messages)";
-    const savedAt = formatSessionSelectTime(session.savedAt);
-    return {
-      value: session.id,
-      label,
-      description: savedAt,
-      session,
-    };
-  });
-}
-
-function sessionSelectSearchText(item) {
-  const session = item?.session;
-  return `${item?.label ?? ""} ${item?.description ?? ""} ${session?.id ?? ""} ${session?.name ?? ""} ${session?.firstMessage ?? ""} ${session?.turnCount ?? ""}`;
-}
-
-function restoreTranscriptFromSession(session, ui) {
-  if (typeof ui.restoreTranscript !== "function") return;
-  try {
-    ui.restoreTranscript(loadPiSessionTranscriptTurns(session.path));
-  } catch (err) {
-    ui.writeln(`Warning: failed to restore session transcript: ${err.message}`);
-  }
-}
-
-function isResumeSuccess(lines) {
-  return Array.isArray(lines) && lines.some((line) => String(line).startsWith("Resumed pi session:"));
-}
-
-function formatSessionSelectTime(value) {
-  if (!value) return "?";
-  return String(value).slice(0, 16).replace("T", " ");
-}
+import { listPiSessionInfos } from "../../session/pi-manager.mjs";
+import { loadPiSessionTranscriptTurns } from "../../session/transcript.mjs";
+import { resumePiSessionById } from "./pi-session-switch-command.mjs";
+
+export async function handleSessionSourceCommand(trimmed, {
+  ui,
+  runner,
+  sessionState,
+  sessionsRoot,
+  projectMarchDir,
+}) {
+  if (trimmed === "/save") {
+    const stats = runner.getSessionStats?.();
+    ui.writeln(`Pi session auto-saved: ${stats?.sessionId ?? sessionState.sessionId}`);
+    return { handled: true };
+  }
+
+  if (trimmed === "/session") {
+    const sessions = await listPiSessionInfos({
+      cwd: runner.engine.cwd,
+      projectMarchDir,
+    });
+    if (sessions.length === 0) {
+      ui.writeln("No previous sessions.");
+      return { handled: true };
+    }
+    if (!ui.selectList) {
+      ui.writeln("Session selector is only available in TUI.");
+      return { handled: true };
+    }
+    const currentSessionId = runner.getSessionStats?.().sessionId ?? null;
+    const item = await ui.selectList({
+      items: buildSessionSelectItems(sessions, currentSessionId),
+      selectedIndex: Math.max(0, sessions.findIndex((session) => session.id === currentSessionId)),
+      width: 72,
+      suppressInitialConfirm: true,
+      searchable: true,
+      getSearchText: sessionSelectSearchText,
+    });
+    if (!item) {
+      ui.writeln("Session unchanged.");
+      return { handled: true };
+    }
+    const lines = await resumePiSessionById(item.session.id, { runner, sessions, projectMarchDir });
+    if (isResumeSuccess(lines)) restoreTranscriptFromSession(item.session, ui);
+    for (const line of lines) {
+      ui.writeln(line);
+    }
+    return { handled: true };
+  }
+
+  return { handled: false };
+}
+
+export function buildSessionSelectItems(sessions, currentSessionId = null) {
+  return sessions.map((session) => {
+    const label = session.name || session.firstMessage || "(no messages)";
+    const savedAt = formatSessionSelectTime(session.savedAt);
+    return {
+      value: session.id,
+      label,
+      description: savedAt,
+      session,
+    };
+  });
+}
+
+function sessionSelectSearchText(item) {
+  const session = item?.session;
+  return `${item?.label ?? ""} ${item?.description ?? ""} ${session?.id ?? ""} ${session?.name ?? ""} ${session?.firstMessage ?? ""} ${session?.turnCount ?? ""}`;
+}
+
+function restoreTranscriptFromSession(session, ui) {
+  if (typeof ui.restoreTranscript !== "function") return;
+  try {
+    ui.restoreTranscript(loadPiSessionTranscriptTurns(session.path));
+  } catch (err) {
+    ui.writeln(`Warning: failed to restore session transcript: ${err.message}`);
+  }
+}
+
+function isResumeSuccess(lines) {
+  return Array.isArray(lines) && lines.some((line) => String(line).startsWith("Resumed pi session:"));
+}
+
+function formatSessionSelectTime(value) {
+  if (!value) return "?";
+  return String(value).slice(0, 16).replace("T", " ");
+}

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

@@ -1 +1 @@
-// Legacy session switch command removed. Use /session to restore previous pi sessions.
+// Legacy session switch command removed. Use /session to restore previous pi sessions.

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

@@ -1,55 +1,55 @@
-export function parseShellCommand(input) {
-  if (input === "/shell") return { type: "list" };
-  if (input === "/shell spawn") return { type: "spawn", name: "" };
-  if (input.startsWith("/shell spawn ")) {
-    const name = input.slice("/shell spawn ".length).trim();
-    return name ? { type: "spawn", name } : { type: "spawn", name: "" };
-  }
-  if (input.startsWith("/shell ")) {
-    const idOrName = input.slice("/shell ".length).trim();
-    return idOrName ? { type: "show", idOrName } : { type: "list" };
-  }
-  return { type: "none" };
-}
-
-export function handleShellCommand(command, { shellRuntime = null } = {}) {
-  if (!shellRuntime) {
-    return ["Shell runtime is disabled. Restart without --no-shell-runtime to use /shell."];
-  }
-  if (command.type === "spawn") {
-    const shell = shellRuntime.spawnShell({ name: command.name || undefined });
-    return [
-      `Spawned shell: ${shell.id}  ${shell.name}  ${shell.status}`,
-      "Open the right-side shell pane with Alt+S, then type directly to send input.",
-    ];
-  }
-  if (command.type === "list") {
-    const shells = shellRuntime.listShells();
-    if (!shells.length) return ["No shells."];
-    return [
-      "Shells:",
-      ...shells.map(formatShellListItem),
-      "Use /shell <id-or-name> to inspect recent output, or /shell spawn [name] to start one.",
-    ];
-  }
-  if (command.type === "show") {
-    const shell = findShell(shellRuntime.listShells(), command.idOrName);
-    if (!shell) return [`Error: shell not found: ${command.idOrName}`];
-    const snapshot = shellRuntime.snapshotShell(shell.id);
-    return [
-      formatShellListItem(shell),
-      "Recent output:",
-      snapshot.screen?.plain || snapshot.plain || "(no output)",
-    ];
-  }
-  return [];
-}
-
-function findShell(shells, idOrName) {
-  return shells.find((shell) => shell.id === idOrName || shell.name === idOrName) ?? null;
-}
-
-function formatShellListItem(shell) {
-  const args = shell.args?.length ? ` ${shell.args.join(" ")}` : "";
-  return `${shell.id}  ${shell.name}  ${shell.status}  ${shell.command}${args}  ${shell.lineCount ?? 0} lines`;
-}
+export function parseShellCommand(input) {
+  if (input === "/shell") return { type: "list" };
+  if (input === "/shell spawn") return { type: "spawn", name: "" };
+  if (input.startsWith("/shell spawn ")) {
+    const name = input.slice("/shell spawn ".length).trim();
+    return name ? { type: "spawn", name } : { type: "spawn", name: "" };
+  }
+  if (input.startsWith("/shell ")) {
+    const idOrName = input.slice("/shell ".length).trim();
+    return idOrName ? { type: "show", idOrName } : { type: "list" };
+  }
+  return { type: "none" };
+}
+
+export function handleShellCommand(command, { shellRuntime = null } = {}) {
+  if (!shellRuntime) {
+    return ["Shell runtime is disabled. Restart without --no-shell-runtime to use /shell."];
+  }
+  if (command.type === "spawn") {
+    const shell = shellRuntime.spawnShell({ name: command.name || undefined });
+    return [
+      `Spawned shell: ${shell.id}  ${shell.name}  ${shell.status}`,
+      "Open the right-side shell pane with Alt+S, then type directly to send input.",
+    ];
+  }
+  if (command.type === "list") {
+    const shells = shellRuntime.listShells();
+    if (!shells.length) return ["No shells."];
+    return [
+      "Shells:",
+      ...shells.map(formatShellListItem),
+      "Use /shell <id-or-name> to inspect recent output, or /shell spawn [name] to start one.",
+    ];
+  }
+  if (command.type === "show") {
+    const shell = findShell(shellRuntime.listShells(), command.idOrName);
+    if (!shell) return [`Error: shell not found: ${command.idOrName}`];
+    const snapshot = shellRuntime.snapshotShell(shell.id);
+    return [
+      formatShellListItem(shell),
+      "Recent output:",
+      snapshot.screen?.plain || snapshot.plain || "(no output)",
+    ];
+  }
+  return [];
+}
+
+function findShell(shells, idOrName) {
+  return shells.find((shell) => shell.id === idOrName || shell.name === idOrName) ?? null;
+}
+
+function formatShellListItem(shell) {
+  const args = shell.args?.length ? ` ${shell.args.join(" ")}` : "";
+  return `${shell.id}  ${shell.name}  ${shell.status}  ${shell.command}${args}  ${shell.lineCount ?? 0} lines`;
+}

package/src/cli/shell/shell-drawer-controls.mjs

@@ -1,33 +1,33 @@
-import { brightBlack } from "../tui/ui-theme.mjs";
-
-export function createShellDrawerControls({ shellDrawer, output, requestRender, now = () => Date.now(), toggleDebounceMs = 150 }) {
-  let lastToggleAt = 0;
-
-  return {
-    toggle() {
-      const current = now();
-      if (current - lastToggleAt < toggleDebounceMs) {
-        return shellDrawer.isVisible();
-      }
-      lastToggleAt = current;
-      const visible = shellDrawer.toggle();
-      requestRender();
-      return visible;
-    },
-
-    selectNext() {
-      if (!shellDrawer.isVisible()) return false;
-      const shell = shellDrawer.selectNextShell();
-      if (shell) output.writeln(brightBlack(`● shell: ${shell.name} (${shell.id})`));
-      requestRender();
-      return shell;
-    },
-
-    scroll(delta) {
-      if (!shellDrawer.isVisible()) return false;
-      const state = shellDrawer.scroll(delta);
-      requestRender();
-      return state;
-    },
-  };
-}
+import { brightBlack } from "../tui/ui-theme.mjs";
+
+export function createShellDrawerControls({ shellDrawer, output, requestRender, now = () => Date.now(), toggleDebounceMs = 150 }) {
+  let lastToggleAt = 0;
+
+  return {
+    toggle() {
+      const current = now();
+      if (current - lastToggleAt < toggleDebounceMs) {
+        return shellDrawer.isVisible();
+      }
+      lastToggleAt = current;
+      const visible = shellDrawer.toggle();
+      requestRender();
+      return visible;
+    },
+
+    selectNext() {
+      if (!shellDrawer.isVisible()) return false;
+      const shell = shellDrawer.selectNextShell();
+      if (shell) output.writeln(brightBlack(`● shell: ${shell.name} (${shell.id})`));
+      requestRender();
+      return shell;
+    },
+
+    scroll(delta) {
+      if (!shellDrawer.isVisible()) return false;
+      const state = shellDrawer.scroll(delta);
+      requestRender();
+      return state;
+    },
+  };
+}