march-cli 0.1.21 → 0.1.23

package/src/auth/storage.mjs

@@ -1,34 +1,34 @@
-import { homedir } from "node:os";
-import { resolve } from "node:path";
-import { AuthStorage } from "@earendil-works/pi-coding-agent";
-
-export function getMarchAuthPath(homeDir = homedir()) {
-  return resolve(homeDir, ".march", "auth.json");
-}
-
-export function createMarchAuthStorage({
-  providers = {},
-  homeDir = homedir(),
-  authStorage = null,
-} = {}) {
-  const resolvedAuthStorage = authStorage ?? AuthStorage.create(getMarchAuthPath(homeDir));
-
-  for (const [id, profile] of Object.entries(providers ?? {})) {
-    if (!profile || typeof profile !== "object") continue;
-    const type = profile.type ?? profile.provider;
-    const providerKey = type === "openai-compatible" ? id : type;
-    const profileKey = profile.auth?.method === "apiKey" ? profile.auth?.apiKey : null;
-    if (providerKey && profileKey) resolvedAuthStorage.setRuntimeApiKey(providerKey, profileKey);
-  }
-  const hasStoredAuth = Boolean(resolvedAuthStorage.list?.().length);
-  const hasConfiguredProvider = Object.values(providers ?? {}).some((profile) => {
-    if (!profile || typeof profile !== "object") return false;
-    return Boolean(profile.auth?.apiKey);
-  });
-  return {
-    authStorage: resolvedAuthStorage,
-    authPath: getMarchAuthPath(homeDir),
-    hasAuth: hasStoredAuth || hasConfiguredProvider,
-    diagnostics: [],
-  };
-}
+import { homedir } from "node:os";
+import { resolve } from "node:path";
+import { AuthStorage } from "@earendil-works/pi-coding-agent";
+
+export function getMarchAuthPath(homeDir = homedir()) {
+  return resolve(homeDir, ".march", "auth.json");
+}
+
+export function createMarchAuthStorage({
+  providers = {},
+  homeDir = homedir(),
+  authStorage = null,
+} = {}) {
+  const resolvedAuthStorage = authStorage ?? AuthStorage.create(getMarchAuthPath(homeDir));
+
+  for (const [id, profile] of Object.entries(providers ?? {})) {
+    if (!profile || typeof profile !== "object") continue;
+    const type = profile.type ?? profile.provider;
+    const providerKey = type === "openai-compatible" ? id : type;
+    const profileKey = profile.auth?.method === "apiKey" ? profile.auth?.apiKey : null;
+    if (providerKey && profileKey) resolvedAuthStorage.setRuntimeApiKey(providerKey, profileKey);
+  }
+  const hasStoredAuth = Boolean(resolvedAuthStorage.list?.().length);
+  const hasConfiguredProvider = Object.values(providers ?? {}).some((profile) => {
+    if (!profile || typeof profile !== "object") return false;
+    return Boolean(profile.auth?.apiKey);
+  });
+  return {
+    authStorage: resolvedAuthStorage,
+    authPath: getMarchAuthPath(homeDir),
+    hasAuth: hasStoredAuth || hasConfiguredProvider,
+    diagnostics: [],
+  };
+}

package/src/cli/args.mjs

@@ -1,79 +1,79 @@
-import { parseArgs } from "node:util";
-
-export function parseCliArgs(argv) {
-  const { values, positionals } = parseArgs({
-    args: argv,
-    options: {
-      model: { type: "string", short: "m" },
-      provider: { type: "string" },
-      resume: { type: "string" },
-      json: { type: "boolean" },
-      extension: { type: "string", short: "e", multiple: true },
-      extension: { type: "string", short: "e", multiple: true },
-      config: { type: "boolean" },
-      "include-key": { type: "boolean" },
-      "profile-only": { type: "boolean" },
-      "dump-context": { type: "boolean" },
-      "pi-sessions": { type: "boolean" },
-      "pi-runtime-host": { type: "boolean" },
-      "shell-runtime": { type: "boolean" },
-      "no-shell-runtime": { type: "boolean" },
-      "permission-mode": { type: "string" },
-      help: { type: "boolean", short: "h" },
-    },
-    allowPositionals: true,
-  });
-
-  const commandName = ["login", "provider", "websearch"].includes(positionals[0]) ? positionals[0] : null;
-
-  return {
-    command: commandName ? { name: commandName, args: positionals.slice(1) } : null,
-    model: values.model ?? null,
-    provider: values.provider,
-    resume: values.resume,
-    json: values.json ?? false,
-    extensions: values.extension ?? [],
-    dumpContext: values["dump-context"] ?? false,
-    providerConfig: values.config ?? false,
-    includeKey: values["include-key"] ?? false,
-    profileOnly: values["profile-only"] ?? false,
-    piSessions: values["pi-sessions"] ?? false,
-    piRuntimeHost: values["pi-runtime-host"] ?? false,
-    shellRuntime: values["no-shell-runtime"] ? false : true,
-    permissionMode: values["permission-mode"] ?? "bypassPermissions",
-    help: values.help ?? false,
-    prompt: commandName ? "" : positionals.join(" "),
-  };
-}
-
-export function showHelp() {
-  process.stdout.write(`march — terminal-native coding agent
-
-Usage:
-  march [options] [prompt]
-  march [options]            (starts REPL)
-  march login [provider]     Login to an OAuth provider
-  march provider --config    Configure provider credentials
-  march provider share [id]  Share a provider profile
-  march provider accept <token>
-  march websearch --config  Configure web search credentials
-
-Options:
-  -m, --model <id>     Initial model ID override
-  --provider <name>    Initial provider override
-  --resume <id>        Resume a pi session by default
-  --json               JSON output mode (no TUI)
-  --config             With provider/websearch command, open configuration
-  --include-key        With provider share, include API key
-  --profile-only       With provider share, omit API key
-  --dump-context       Write every prompt sent to the model under .march/context-dumps/
-  --pi-sessions        Force pi JSONL SessionManager persistence
-  --pi-runtime-host    Force pi AgentSessionRuntime host path
-  --shell-runtime      Enable interactive PTY shell tools (default)
-  --no-shell-runtime   Disable interactive PTY shell tools and shell pane
-  --permission-mode <mode>  Permission mode: default, bypassPermissions, dontAsk (default: bypassPermissions)
-  -e, --extension <path>
-                       Load a pi extension path in the default runtime host (repeatable)
-  -h, --help           Show this help
-`);
-}
+import { parseArgs } from "node:util";
+
+export function parseCliArgs(argv) {
+  const { values, positionals } = parseArgs({
+    args: argv,
+    options: {
+      model: { type: "string", short: "m" },
+      provider: { type: "string" },
+      resume: { type: "string" },
+      json: { type: "boolean" },
+      extension: { type: "string", short: "e", multiple: true },
+      extension: { type: "string", short: "e", multiple: true },
+      config: { type: "boolean" },
+      "include-key": { type: "boolean" },
+      "profile-only": { type: "boolean" },
+      "dump-context": { type: "boolean" },
+      "pi-sessions": { type: "boolean" },
+      "pi-runtime-host": { type: "boolean" },
+      "shell-runtime": { type: "boolean" },
+      "no-shell-runtime": { type: "boolean" },
+      "permission-mode": { type: "string" },
+      help: { type: "boolean", short: "h" },
+    },
+    allowPositionals: true,
+  });
+
+  const commandName = ["login", "provider", "websearch"].includes(positionals[0]) ? positionals[0] : null;
+
+  return {
+    command: commandName ? { name: commandName, args: positionals.slice(1) } : null,
+    model: values.model ?? null,
+    provider: values.provider,
+    resume: values.resume,
+    json: values.json ?? false,
+    extensions: values.extension ?? [],
+    dumpContext: values["dump-context"] ?? false,
+    providerConfig: values.config ?? false,
+    includeKey: values["include-key"] ?? false,
+    profileOnly: values["profile-only"] ?? false,
+    piSessions: values["pi-sessions"] ?? false,
+    piRuntimeHost: values["pi-runtime-host"] ?? false,
+    shellRuntime: values["no-shell-runtime"] ? false : true,
+    permissionMode: values["permission-mode"] ?? "bypassPermissions",
+    help: values.help ?? false,
+    prompt: commandName ? "" : positionals.join(" "),
+  };
+}
+
+export function showHelp() {
+  process.stdout.write(`march — terminal-native coding agent
+
+Usage:
+  march [options] [prompt]
+  march [options]            (starts REPL)
+  march login [provider]     Login to an OAuth provider
+  march provider --config    Configure provider credentials
+  march provider share [id]  Share a provider profile
+  march provider accept <token>
+  march websearch --config  Configure web search credentials
+
+Options:
+  -m, --model <id>     Initial model ID override
+  --provider <name>    Initial provider override
+  --resume <id>        Resume a pi session by default
+  --json               JSON output mode (no TUI)
+  --config             With provider/websearch command, open configuration
+  --include-key        With provider share, include API key
+  --profile-only       With provider share, omit API key
+  --dump-context       Write every prompt sent to the model under .march/context-dumps/
+  --pi-sessions        Force pi JSONL SessionManager persistence
+  --pi-runtime-host    Force pi AgentSessionRuntime host path
+  --shell-runtime      Enable interactive PTY shell tools (default)
+  --no-shell-runtime   Disable interactive PTY shell tools and shell pane
+  --permission-mode <mode>  Permission mode: default, bypassPermissions, dontAsk (default: bypassPermissions)
+  -e, --extension <path>
+                       Load a pi extension path in the default runtime host (repeatable)
+  -h, --help           Show this help
+`);
+}

package/src/cli/commands/copy-command.mjs

@@ -1,87 +1,87 @@
-import { spawn, spawnSync } from "node:child_process";
-
-export function copyLastAssistantMessage({ engine, writeClipboard = writeSystemClipboard } = {}) {
-  const message = findLastAssistantMessage(engine);
-  if (!message) return ["Error: no assistant response to copy"];
-  const result = writeClipboard(message);
-  if (result?.ok === false) return [`Error: ${result.message}`];
-  return [`Copied last assistant response (${message.length} chars)`];
-}
-
-export function findLastAssistantMessage(engine) {
-  const turns = engine?.turns ?? [];
-  for (let i = turns.length - 1; i >= 0; i -= 1) {
-    const text = turns[i]?.assistantMessage;
-    if (typeof text === "string" && text.trim()) return text;
-  }
-  return "";
-}
-
-export function writeSystemClipboard(text, { platform = process.platform } = {}) {
-  const command = clipboardCommand(platform);
-  if (!command) return { ok: false, message: `clipboard is not supported on ${platform}` };
-  const result = spawnSync(command.bin, command.args, {
-    input: text,
-    encoding: "utf8",
-    windowsHide: true,
-  });
-  if (result.error) return { ok: false, message: result.error.message };
-  if (result.status !== 0) {
-    const stderr = (result.stderr || "").trim();
-    return { ok: false, message: stderr || `${command.bin} exited ${result.status}` };
-  }
-  return { ok: true };
-}
-
-export function writeSystemClipboardAsync(text, { platform = process.platform } = {}) {
-  const command = clipboardCommand(platform);
-  if (!command) return Promise.resolve({ ok: false, message: `clipboard is not supported on ${platform}` });
-  return new Promise((resolve) => {
-    let settled = false;
-    let stderr = "";
-    const done = (result) => {
-      if (settled) return;
-      settled = true;
-      resolve(result);
-    };
-
-    const child = spawn(command.bin, command.args, {
-      windowsHide: true,
-      stdio: ["pipe", "ignore", "pipe"],
-    });
-    child.stderr?.setEncoding?.("utf8");
-    child.stderr?.on("data", (chunk) => { stderr += chunk; });
-    child.on("error", (err) => done({ ok: false, message: err.message }));
-    child.on("close", (status) => {
-      if (status === 0) done({ ok: true });
-      else done({ ok: false, message: stderr.trim() || `${command.bin} exited ${status}` });
-    });
-    child.stdin?.on("error", (err) => done({ ok: false, message: err.message }));
-    child.stdin?.end(text, "utf8");
-  });
-}
-
-export function clipboardCommand(platform) {
-  if (platform === "win32") {
-    return {
-      bin: "powershell.exe",
-      args: ["-NoProfile", "-EncodedCommand", encodePowerShellCommand(readUtf8StdinToClipboardScript())],
-    };
-  }
-  if (platform === "darwin") return { bin: "pbcopy", args: [] };
-  return { bin: "sh", args: ["-lc", "command -v wl-copy >/dev/null && wl-copy || xclip -selection clipboard || xsel --clipboard --input"] };
-}
-
-function readUtf8StdinToClipboardScript() {
-  return [
-    "$stdin = [Console]::OpenStandardInput()",
-    "$memory = New-Object System.IO.MemoryStream",
-    "$stdin.CopyTo($memory)",
-    "$text = [System.Text.Encoding]::UTF8.GetString($memory.ToArray())",
-    "Set-Clipboard -Value $text",
-  ].join("; ");
-}
-
-function encodePowerShellCommand(script) {
-  return Buffer.from(script, "utf16le").toString("base64");
-}
+import { spawn, spawnSync } from "node:child_process";
+
+export function copyLastAssistantMessage({ engine, writeClipboard = writeSystemClipboard } = {}) {
+  const message = findLastAssistantMessage(engine);
+  if (!message) return ["Error: no assistant response to copy"];
+  const result = writeClipboard(message);
+  if (result?.ok === false) return [`Error: ${result.message}`];
+  return [`Copied last assistant response (${message.length} chars)`];
+}
+
+export function findLastAssistantMessage(engine) {
+  const turns = engine?.turns ?? [];
+  for (let i = turns.length - 1; i >= 0; i -= 1) {
+    const text = turns[i]?.assistantMessage;
+    if (typeof text === "string" && text.trim()) return text;
+  }
+  return "";
+}
+
+export function writeSystemClipboard(text, { platform = process.platform } = {}) {
+  const command = clipboardCommand(platform);
+  if (!command) return { ok: false, message: `clipboard is not supported on ${platform}` };
+  const result = spawnSync(command.bin, command.args, {
+    input: text,
+    encoding: "utf8",
+    windowsHide: true,
+  });
+  if (result.error) return { ok: false, message: result.error.message };
+  if (result.status !== 0) {
+    const stderr = (result.stderr || "").trim();
+    return { ok: false, message: stderr || `${command.bin} exited ${result.status}` };
+  }
+  return { ok: true };
+}
+
+export function writeSystemClipboardAsync(text, { platform = process.platform } = {}) {
+  const command = clipboardCommand(platform);
+  if (!command) return Promise.resolve({ ok: false, message: `clipboard is not supported on ${platform}` });
+  return new Promise((resolve) => {
+    let settled = false;
+    let stderr = "";
+    const done = (result) => {
+      if (settled) return;
+      settled = true;
+      resolve(result);
+    };
+
+    const child = spawn(command.bin, command.args, {
+      windowsHide: true,
+      stdio: ["pipe", "ignore", "pipe"],
+    });
+    child.stderr?.setEncoding?.("utf8");
+    child.stderr?.on("data", (chunk) => { stderr += chunk; });
+    child.on("error", (err) => done({ ok: false, message: err.message }));
+    child.on("close", (status) => {
+      if (status === 0) done({ ok: true });
+      else done({ ok: false, message: stderr.trim() || `${command.bin} exited ${status}` });
+    });
+    child.stdin?.on("error", (err) => done({ ok: false, message: err.message }));
+    child.stdin?.end(text, "utf8");
+  });
+}
+
+export function clipboardCommand(platform) {
+  if (platform === "win32") {
+    return {
+      bin: "powershell.exe",
+      args: ["-NoProfile", "-EncodedCommand", encodePowerShellCommand(readUtf8StdinToClipboardScript())],
+    };
+  }
+  if (platform === "darwin") return { bin: "pbcopy", args: [] };
+  return { bin: "sh", args: ["-lc", "command -v wl-copy >/dev/null && wl-copy || xclip -selection clipboard || xsel --clipboard --input"] };
+}
+
+function readUtf8StdinToClipboardScript() {
+  return [
+    "$stdin = [Console]::OpenStandardInput()",
+    "$memory = New-Object System.IO.MemoryStream",
+    "$stdin.CopyTo($memory)",
+    "$text = [System.Text.Encoding]::UTF8.GetString($memory.ToArray())",
+    "Set-Clipboard -Value $text",
+  ].join("; ");
+}
+
+function encodePowerShellCommand(script) {
+  return Buffer.from(script, "utf16le").toString("base64");
+}