march-cli 0.1.24 → 0.1.25

package/src/session/transcript.mjs

@@ -1,83 +1,83 @@
-import { readFileSync } from "node:fs";
-
-export const DEFAULT_TRANSCRIPT_TURN_LIMIT = 20;
-
-export function loadPiSessionTranscriptTurns(sessionPath, { limit = DEFAULT_TRANSCRIPT_TURN_LIMIT } = {}) {
-  const entries = readPiSessionEntries(sessionPath);
-  const turns = [];
-  let current = null;
-
-  for (const entry of entries) {
-    if (entry?.type !== "message") continue;
-    const message = entry.message;
-    if (message?.role === "user") {
-      current = { userMessage: extractMessageText(message), assistantMessage: "" };
-      turns.push(current);
-      continue;
-    }
-    if (message?.role === "assistant") {
-      const text = extractMessageText(message);
-      if (!current) {
-        current = { userMessage: "", assistantMessage: text };
-        turns.push(current);
-      } else if (current.assistantMessage) {
-        current.assistantMessage += `\n\n${text}`;
-      } else {
-        current.assistantMessage = text;
-      }
-    }
-  }
-
-  const normalized = turns
-    .filter((turn) => turn.userMessage || turn.assistantMessage)
-    .map((turn, index) => ({ index: index + 1, ...turn }));
-  return normalized.slice(-Math.max(0, limit));
-}
-
-export function writeTranscriptToOutput(output, turns) {
-  if (!Array.isArray(turns) || turns.length === 0) return;
-  for (const turn of turns) {
-    if (turn.userMessage) {
-      output.writeln("You");
-      for (const line of String(turn.userMessage).split(/\r?\n/)) output.writeln(line);
-    }
-    if (turn.assistantMessage) {
-      output.writeln("");
-      output.writeln("March");
-      output.writeMarkdown(String(turn.assistantMessage));
-      output.ensureNewline();
-      output.sealCurrentText();
-    }
-    output.writeln("");
-  }
-}
-
-function readPiSessionEntries(sessionPath) {
-  const text = readFileSync(sessionPath, "utf8");
-  const entries = [];
-  for (const line of text.split(/\r?\n/)) {
-    if (!line.trim()) continue;
-    try {
-      entries.push(JSON.parse(line));
-    } catch {
-      // Ignore partial or malformed JSONL entries; transcript restore is best effort.
-    }
-  }
-  return entries;
-}
-
-function extractMessageText(message) {
-  const content = message?.content;
-  if (typeof content === "string") return content;
-  if (Array.isArray(content)) {
-    return content
-      .map((part) => {
-        if (typeof part === "string") return part;
-        if (part?.type === "text" || part?.type === "input_text") return part.text ?? "";
-        return "";
-      })
-      .filter(Boolean)
-      .join("\n");
-  }
-  return "";
-}
+import { readFileSync } from "node:fs";
+
+export const DEFAULT_TRANSCRIPT_TURN_LIMIT = 20;
+
+export function loadPiSessionTranscriptTurns(sessionPath, { limit = DEFAULT_TRANSCRIPT_TURN_LIMIT } = {}) {
+  const entries = readPiSessionEntries(sessionPath);
+  const turns = [];
+  let current = null;
+
+  for (const entry of entries) {
+    if (entry?.type !== "message") continue;
+    const message = entry.message;
+    if (message?.role === "user") {
+      current = { userMessage: extractMessageText(message), assistantMessage: "" };
+      turns.push(current);
+      continue;
+    }
+    if (message?.role === "assistant") {
+      const text = extractMessageText(message);
+      if (!current) {
+        current = { userMessage: "", assistantMessage: text };
+        turns.push(current);
+      } else if (current.assistantMessage) {
+        current.assistantMessage += `\n\n${text}`;
+      } else {
+        current.assistantMessage = text;
+      }
+    }
+  }
+
+  const normalized = turns
+    .filter((turn) => turn.userMessage || turn.assistantMessage)
+    .map((turn, index) => ({ index: index + 1, ...turn }));
+  return normalized.slice(-Math.max(0, limit));
+}
+
+export function writeTranscriptToOutput(output, turns) {
+  if (!Array.isArray(turns) || turns.length === 0) return;
+  for (const turn of turns) {
+    if (turn.userMessage) {
+      output.writeln("You");
+      for (const line of String(turn.userMessage).split(/\r?\n/)) output.writeln(line);
+    }
+    if (turn.assistantMessage) {
+      output.writeln("");
+      output.writeln("March");
+      output.writeMarkdown(String(turn.assistantMessage));
+      output.ensureNewline();
+      output.sealCurrentText();
+    }
+    output.writeln("");
+  }
+}
+
+function readPiSessionEntries(sessionPath) {
+  const text = readFileSync(sessionPath, "utf8");
+  const entries = [];
+  for (const line of text.split(/\r?\n/)) {
+    if (!line.trim()) continue;
+    try {
+      entries.push(JSON.parse(line));
+    } catch {
+      // Ignore partial or malformed JSONL entries; transcript restore is best effort.
+    }
+  }
+  return entries;
+}
+
+function extractMessageText(message) {
+  const content = message?.content;
+  if (typeof content === "string") return content;
+  if (Array.isArray(content)) {
+    return content
+      .map((part) => {
+        if (typeof part === "string") return part;
+        if (part?.type === "text" || part?.type === "input_text") return part.text ?? "";
+        return "";
+      })
+      .filter(Boolean)
+      .join("\n");
+  }
+  return "";
+}

package/src/session/tree.mjs

@@ -1,42 +1,42 @@
-export function buildSessionTree(sessions) {
-  const nodes = new Map();
-  for (const session of sessions) {
-    nodes.set(session.id, { ...session, children: [] });
-  }
-
-  const roots = [];
-  for (const node of nodes.values()) {
-    const parent = node.parentSessionId ? nodes.get(node.parentSessionId) : 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);
-  return roots;
-}
-
-export function formatSessionTree(sessions, currentSessionId = null) {
-  const roots = buildSessionTree(sessions);
-  if (roots.length === 0) return ["(no saved sessions)"];
-
-  const lines = [];
-  const visit = (node, depth) => {
-    const marker = node.id === currentSessionId ? "*" : "-";
-    const savedAt = node.savedAt?.slice(0, 19) ?? "?";
-    const indent = "  ".repeat(depth);
-    lines.push(`${indent}${marker} ${node.id}  ${node.turnCount ?? 0}t  ${savedAt}`);
-    for (const child of node.children) visit(child, depth + 1);
-  };
-
-  for (const root of roots) visit(root, 0);
-  lines.push("(* = current session)");
-  return lines;
-}
+export function buildSessionTree(sessions) {
+  const nodes = new Map();
+  for (const session of sessions) {
+    nodes.set(session.id, { ...session, children: [] });
+  }
+
+  const roots = [];
+  for (const node of nodes.values()) {
+    const parent = node.parentSessionId ? nodes.get(node.parentSessionId) : 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);
+  return roots;
+}
+
+export function formatSessionTree(sessions, currentSessionId = null) {
+  const roots = buildSessionTree(sessions);
+  if (roots.length === 0) return ["(no saved sessions)"];
+
+  const lines = [];
+  const visit = (node, depth) => {
+    const marker = node.id === currentSessionId ? "*" : "-";
+    const savedAt = node.savedAt?.slice(0, 19) ?? "?";
+    const indent = "  ".repeat(depth);
+    lines.push(`${indent}${marker} ${node.id}  ${node.turnCount ?? 0}t  ${savedAt}`);
+    for (const child of node.children) visit(child, depth + 1);
+  };
+
+  for (const root of roots) visit(root, 0);
+  lines.push("(* = current session)");
+  return lines;
+}

package/src/shell/cli-runtime.mjs

@@ -1,11 +1,11 @@
-import { createShellRuntime } from "./runtime.mjs";
-import { createNodePtyAdapterFactory } from "./node-pty-adapter.mjs";
-
-export function createCliShellRuntime({ cwd = process.cwd(), env = process.env } = {}) {
-  return createShellRuntime({
-    createPty: createNodePtyAdapterFactory({
-      defaultCwd: cwd,
-      defaultEnv: env,
-    }),
-  });
-}
+import { createShellRuntime } from "./runtime.mjs";
+import { createNodePtyAdapterFactory } from "./node-pty-adapter.mjs";
+
+export function createCliShellRuntime({ cwd = process.cwd(), env = process.env } = {}) {
+  return createShellRuntime({
+    createPty: createNodePtyAdapterFactory({
+      defaultCwd: cwd,
+      defaultEnv: env,
+    }),
+  });
+}

package/src/shell/hints.mjs

@@ -1,12 +1,12 @@
-export function formatShellHints(shellRuntime, { limit = 5 } = {}) {
-  const shells = (shellRuntime?.listShells?.() ?? []).filter((shell) => shell.status !== "killed").slice(0, limit);
-  if (shells.length === 0) return "";
-  const lines = ["[shell_hints]"];
-  for (const shell of shells) {
-    const args = shell.args?.length ? ` ${shell.args.join(" ")}` : "";
-    const count = shell.scrollbackLineCount ?? shell.lineCount ?? 0;
-    lines.push(`- ${shell.id} ${shell.name} ${shell.status} command: ${shell.command}${args} cwd: ${shell.cwd} lines: ${count}`);
-  }
-  lines.push("Use terminal_read or terminal_snapshot to inspect shell output.");
-  return lines.join("\n");
-}
+export function formatShellHints(shellRuntime, { limit = 5 } = {}) {
+  const shells = (shellRuntime?.listShells?.() ?? []).filter((shell) => shell.status !== "killed").slice(0, limit);
+  if (shells.length === 0) return "";
+  const lines = ["[shell_hints]"];
+  for (const shell of shells) {
+    const args = shell.args?.length ? ` ${shell.args.join(" ")}` : "";
+    const count = shell.scrollbackLineCount ?? shell.lineCount ?? 0;
+    lines.push(`- ${shell.id} ${shell.name} ${shell.status} command: ${shell.command}${args} cwd: ${shell.cwd} lines: ${count}`);
+  }
+  lines.push("Use terminal_read or terminal_snapshot to inspect shell output.");
+  return lines.join("\n");
+}

package/src/shell/node-pty-adapter.mjs

@@ -1,81 +1,81 @@
-import pty from "node-pty";
-
-export function createNodePtyAdapterFactory({
-  ptyModule = pty,
-  defaultCwd = process.cwd(),
-  defaultEnv = process.env,
-  platform = process.platform,
-} = {}) {
-  return function createNodePtyAdapter({
-    command,
-    args = [],
-    cwd = defaultCwd,
-    env = defaultEnv,
-    cols = 80,
-    rows = 24,
-    onData,
-    onExit,
-    onError,
-  }) {
-    const resolved = resolveShellCommand({ command, args, platform });
-    let term;
-    try {
-      term = ptyModule.spawn(resolved.command, resolved.args, {
-        name: "xterm-color",
-        cols,
-        rows,
-        cwd,
-        env,
-      });
-    } catch (error) {
-      onError?.(error);
-      throw error;
-    }
-
-    let disposed = false;
-    const disposeTerminal = () => {
-      if (disposed) return;
-      disposed = true;
-      // node-pty's Windows kill path can emit noisy AttachConsole failures after
-      // a natural exit. Closing the backing socket releases Node handles without
-      // forcing the PTY helper down the kill path.
-      if (typeof term._socket?.destroy === "function") {
-        term._socket.destroy();
-      } else if (typeof term.destroy === "function") {
-        term.destroy();
-      } else if (typeof term.kill === "function") {
-        term.kill();
-      }
-    };
-
-    term.onData?.((chunk) => onData?.(chunk));
-    term.onExit?.((event) => {
-      onExit?.(event);
-      disposeTerminal();
-    });
-
-    return {
-      write: (text) => term.write(String(text ?? "")),
-      resize: (nextCols, nextRows) => term.resize?.(nextCols, nextRows),
-      kill: () => disposeTerminal(),
-      dispose: () => disposeTerminal(),
-    };
-  };
-}
-
-export function resolveShellCommand({ command, args = [], platform = process.platform }) {
-  if (command) return { command: normalizeWindowsShellCommand(command, platform), args: [...args] };
-  if (platform === "win32") {
-    return { command: "powershell.exe", args: ["-NoLogo", "-NoProfile"] };
-  }
-  return { command: process.env.SHELL || "sh", args: [] };
-}
-
-function normalizeWindowsShellCommand(command, platform) {
-  if (platform !== "win32") return command;
-  const normalized = String(command).trim().toLowerCase();
-  if (normalized === "powershell") return "powershell.exe";
-  if (normalized === "pwsh") return "pwsh.exe";
-  if (normalized === "cmd") return "cmd.exe";
-  return command;
-}
+import pty from "node-pty";
+
+export function createNodePtyAdapterFactory({
+  ptyModule = pty,
+  defaultCwd = process.cwd(),
+  defaultEnv = process.env,
+  platform = process.platform,
+} = {}) {
+  return function createNodePtyAdapter({
+    command,
+    args = [],
+    cwd = defaultCwd,
+    env = defaultEnv,
+    cols = 80,
+    rows = 24,
+    onData,
+    onExit,
+    onError,
+  }) {
+    const resolved = resolveShellCommand({ command, args, platform });
+    let term;
+    try {
+      term = ptyModule.spawn(resolved.command, resolved.args, {
+        name: "xterm-color",
+        cols,
+        rows,
+        cwd,
+        env,
+      });
+    } catch (error) {
+      onError?.(error);
+      throw error;
+    }
+
+    let disposed = false;
+    const disposeTerminal = () => {
+      if (disposed) return;
+      disposed = true;
+      // node-pty's Windows kill path can emit noisy AttachConsole failures after
+      // a natural exit. Closing the backing socket releases Node handles without
+      // forcing the PTY helper down the kill path.
+      if (typeof term._socket?.destroy === "function") {
+        term._socket.destroy();
+      } else if (typeof term.destroy === "function") {
+        term.destroy();
+      } else if (typeof term.kill === "function") {
+        term.kill();
+      }
+    };
+
+    term.onData?.((chunk) => onData?.(chunk));
+    term.onExit?.((event) => {
+      onExit?.(event);
+      disposeTerminal();
+    });
+
+    return {
+      write: (text) => term.write(String(text ?? "")),
+      resize: (nextCols, nextRows) => term.resize?.(nextCols, nextRows),
+      kill: () => disposeTerminal(),
+      dispose: () => disposeTerminal(),
+    };
+  };
+}
+
+export function resolveShellCommand({ command, args = [], platform = process.platform }) {
+  if (command) return { command: normalizeWindowsShellCommand(command, platform), args: [...args] };
+  if (platform === "win32") {
+    return { command: "powershell.exe", args: ["-NoLogo", "-NoProfile"] };
+  }
+  return { command: process.env.SHELL || "sh", args: [] };
+}
+
+function normalizeWindowsShellCommand(command, platform) {
+  if (platform !== "win32") return command;
+  const normalized = String(command).trim().toLowerCase();
+  if (normalized === "powershell") return "powershell.exe";
+  if (normalized === "pwsh") return "pwsh.exe";
+  if (normalized === "cmd") return "cmd.exe";
+  return command;
+}