march-cli 0.1.21 → 0.1.22

package/src/cli/slash-commands.mjs

@@ -1,192 +1,192 @@
-import { listExtensionPathsCommand } from "./commands/extensions-command.mjs";
-import { handleExportCommand, parseExportCommand } from "./commands/export-command.mjs";
-import { handleModelCommand, listModels, parseModelCommand } from "./commands/model-command.mjs";
-import { formatHotkeysPanel } from "./repl-commands.mjs";
-import { copyLastAssistantMessage } from "./commands/copy-command.mjs";
-import { handleSessionSourceCommand } from "./session/session-source-command.mjs";
-import { statusCommand } from "./commands/status-command.mjs";
-import { handleThinkingCommand, parseThinkingCommand } from "./commands/thinking-command.mjs";
-import { formatPromptTemplateLines } from "./input/prompt-templates.mjs";
-import { handleSettingsCommand, parseSettingsCommand } from "../config/settings-command.mjs";
-import { handleSessionNameCommand, parseSessionNameCommand } from "./session/session-name-command.mjs";
-import { handleShellCommand, parseShellCommand } from "./shell/shell-command.mjs";
-import { handleProviderCommand, parseProviderCommand } from "./commands/provider-command.mjs";
-import { formatHelpLines } from "./commands/help-command.mjs";
-
-export async function handleSlashCommand(trimmed, {
-  ui,
-  runner,
-  sessionState,
-  sessionsRoot,
-  projectMarchDir,
-  sessionSource = "pi",
-  extensionPaths = [],
-  keybindings,
-  keybindingDiagnostics = [],
-  promptTemplates = [],
-  promptTemplateDiagnostics = [],
-  renderStartupBanner = null,
-  settingsHomeDir,
-  configHomeDir = settingsHomeDir,
-  writeClipboard,
-}) {
-  if (trimmed === "/exit" || trimmed === "/quit") {
-    await handleSessionSourceCommand("/save", { ui, runner, sessionState, sessionSource });
-    return { handled: true, exit: true };
-  }
-
-  if (trimmed === "/new") {
-    if (!runner.canSwitchPiSession?.()) {
-      ui.writeln("Error: pi runtime host is not enabled");
-      return { handled: true };
-    }
-    let refreshContextTokens = false;
-    try {
-      const result = await runner.startNewSession();
-      if (result?.cancelled) {
-        ui.writeln("New session cancelled");
-      } else {
-        refreshContextTokens = true;
-        ui.clearOutput?.();
-        const bannerLines = typeof renderStartupBanner === "function" ? renderStartupBanner() : [];
-        if (bannerLines.length > 0) {
-          for (const line of bannerLines) ui.writeln(line);
-        } else {
-          ui.writeln(`Started new session: ${result.sessionId}`);
-        }
-      }
-    } catch (err) {
-      ui.writeln(`Error: ${err.message}`);
-    }
-    return { handled: true, refreshContextTokens };
-  }
-
-  if (trimmed === "/help") {
-    for (const line of formatHelpLines()) ui.writeln(line);
-    return { handled: true };
-  }
-
-  if (trimmed === "/hotkeys") {
-    for (const line of formatHotkeysPanel(keybindings, keybindingDiagnostics)) ui.writeln(line);
-    return { handled: true };
-  }
-
-  if (trimmed === "/templates") {
-    for (const line of formatPromptTemplateLines(promptTemplates, promptTemplateDiagnostics)) ui.writeln(line);
-    return { handled: true };
-  }
-
-  const exportCommand = parseExportCommand(trimmed);
-  if (exportCommand.type !== "none") {
-    for (const line of await handleExportCommand(exportCommand, { runner, sessionState, sessionSource, projectMarchDir })) ui.writeln(line);
-    return { handled: true };
-  }
-
-  const settingsCommand = parseSettingsCommand(trimmed);
-  if (settingsCommand.type !== "none") {
-    for (const line of handleSettingsCommand(settingsCommand, { cwd: runner.engine.cwd, homeDir: settingsHomeDir })) {
-      ui.writeln(line);
-    }
-    return { handled: true };
-  }
-
-  if (trimmed === "/extensions") {
-    for (const line of listExtensionPathsCommand(
-      extensionPaths,
-      runner.getExtensionDiagnostics?.(),
-      runner.getExtensionLifecycleState?.(),
-    )) ui.writeln(line);
-    return { handled: true };
-  }
-
-  const thinkingCommand = parseThinkingCommand(trimmed);
-  if (thinkingCommand.type !== "none") {
-    for (const line of await handleThinkingCommand(thinkingCommand, { runner, ui })) ui.writeln(line);
-    return { handled: true };
-  }
-
-  if (trimmed === "/mouse") {
-    const on = ui.toggleMouse();
-    ui.writeln(on ? "Mouse tracking: ON (wheel scroll and TUI selection copy enabled)" : "Mouse tracking: OFF (native terminal selection enabled)");
-    return { handled: true };
-  }
-
-  if (trimmed === "/status") {
-    for (const line of statusCommand({
-      runner,
-      sessionState,
-      sessionSource,
-      extensionDiagnostics: runner.getExtensionDiagnostics?.() ?? [],
-      lifecycleState: runner.getExtensionLifecycleState?.() ?? null,
-    })) ui.writeln(line);
-    return { handled: true };
-  }
-
-  if (trimmed === "/notify") {
-    const result = await runner.notifyTest?.();
-    ui.writeln(formatNotificationResult(result));
-    return { handled: true };
-  }
-
-  const shellCommand = parseShellCommand(trimmed);
-  if (shellCommand.type !== "none") {
-    for (const line of handleShellCommand(shellCommand, { shellRuntime: runner.shellRuntime })) ui.writeln(line);
-    return { handled: true };
-  }
-
-  const nameCommand = parseSessionNameCommand(trimmed);
-  if (nameCommand.type !== "none") {
-    for (const line of handleSessionNameCommand(nameCommand, { runner, sessionState, sessionSource })) ui.writeln(line);
-    return { handled: true };
-  }
-
-  if (trimmed === "/copy") {
-    for (const line of copyLastAssistantMessage({ engine: runner.engine, writeClipboard })) ui.writeln(line);
-    return { handled: true };
-  }
-
-  const sessionSourceCommand = await handleSessionSourceCommand(trimmed, {
-    ui,
-    runner,
-    sessionState,
-    sessionsRoot,
-    projectMarchDir,
-    sessionSource,
-  });
-  if (sessionSourceCommand.handled) return sessionSourceCommand;
-
-  const providerCommand = parseProviderCommand(trimmed);
-  if (providerCommand.type !== "none") {
-    try {
-      ui.writeln(await handleProviderCommand(providerCommand, { ui, runner }));
-    } catch (err) {
-      ui.writeln(`Error: ${err.message}`);
-    }
-    return { handled: true };
-  }
-
-  const modelCommand = parseModelCommand(trimmed);
-  if (modelCommand.type !== "none") {
-    try {
-      ui.writeln(await handleModelCommand(modelCommand, { runner, ui, configHomeDir }));
-    } catch (err) {
-      ui.writeln(`Error: ${err.message}`);
-    }
-    return { handled: true };
-  }
-
-  if (trimmed === "/models") {
-    for (const line of listModels({ runner })) ui.writeln(line);
-    return { handled: true };
-  }
-
-  return { handled: false };
-}
-
-function formatNotificationResult(result) {
-  if (!result) return "notification: unavailable";
-  const channels = (result.results ?? [])
-    .map((entry) => `${entry.channel}:${entry.ok ? "ok" : entry.reason ?? "failed"}`)
-    .join(", ");
-  return `notification: ${result.ok ? "ok" : result.reason ?? "failed"}${channels ? ` (${channels})` : ""}`;
-}
+import { listExtensionPathsCommand } from "./commands/extensions-command.mjs";
+import { handleExportCommand, parseExportCommand } from "./commands/export-command.mjs";
+import { handleModelCommand, listModels, parseModelCommand } from "./commands/model-command.mjs";
+import { formatHotkeysPanel } from "./repl-commands.mjs";
+import { copyLastAssistantMessage } from "./commands/copy-command.mjs";
+import { handleSessionSourceCommand } from "./session/session-source-command.mjs";
+import { statusCommand } from "./commands/status-command.mjs";
+import { handleThinkingCommand, parseThinkingCommand } from "./commands/thinking-command.mjs";
+import { formatPromptTemplateLines } from "./input/prompt-templates.mjs";
+import { handleSettingsCommand, parseSettingsCommand } from "../config/settings-command.mjs";
+import { handleSessionNameCommand, parseSessionNameCommand } from "./session/session-name-command.mjs";
+import { handleShellCommand, parseShellCommand } from "./shell/shell-command.mjs";
+import { handleProviderCommand, parseProviderCommand } from "./commands/provider-command.mjs";
+import { formatHelpLines } from "./commands/help-command.mjs";
+
+export async function handleSlashCommand(trimmed, {
+  ui,
+  runner,
+  sessionState,
+  sessionsRoot,
+  projectMarchDir,
+  sessionSource = "pi",
+  extensionPaths = [],
+  keybindings,
+  keybindingDiagnostics = [],
+  promptTemplates = [],
+  promptTemplateDiagnostics = [],
+  renderStartupBanner = null,
+  settingsHomeDir,
+  configHomeDir = settingsHomeDir,
+  writeClipboard,
+}) {
+  if (trimmed === "/exit" || trimmed === "/quit") {
+    await handleSessionSourceCommand("/save", { ui, runner, sessionState, sessionSource });
+    return { handled: true, exit: true };
+  }
+
+  if (trimmed === "/new") {
+    if (!runner.canSwitchPiSession?.()) {
+      ui.writeln("Error: pi runtime host is not enabled");
+      return { handled: true };
+    }
+    let refreshContextTokens = false;
+    try {
+      const result = await runner.startNewSession();
+      if (result?.cancelled) {
+        ui.writeln("New session cancelled");
+      } else {
+        refreshContextTokens = true;
+        ui.clearOutput?.();
+        const bannerLines = typeof renderStartupBanner === "function" ? renderStartupBanner() : [];
+        if (bannerLines.length > 0) {
+          for (const line of bannerLines) ui.writeln(line);
+        } else {
+          ui.writeln(`Started new session: ${result.sessionId}`);
+        }
+      }
+    } catch (err) {
+      ui.writeln(`Error: ${err.message}`);
+    }
+    return { handled: true, refreshContextTokens };
+  }
+
+  if (trimmed === "/help") {
+    for (const line of formatHelpLines()) ui.writeln(line);
+    return { handled: true };
+  }
+
+  if (trimmed === "/hotkeys") {
+    for (const line of formatHotkeysPanel(keybindings, keybindingDiagnostics)) ui.writeln(line);
+    return { handled: true };
+  }
+
+  if (trimmed === "/templates") {
+    for (const line of formatPromptTemplateLines(promptTemplates, promptTemplateDiagnostics)) ui.writeln(line);
+    return { handled: true };
+  }
+
+  const exportCommand = parseExportCommand(trimmed);
+  if (exportCommand.type !== "none") {
+    for (const line of await handleExportCommand(exportCommand, { runner, sessionState, sessionSource, projectMarchDir })) ui.writeln(line);
+    return { handled: true };
+  }
+
+  const settingsCommand = parseSettingsCommand(trimmed);
+  if (settingsCommand.type !== "none") {
+    for (const line of handleSettingsCommand(settingsCommand, { cwd: runner.engine.cwd, homeDir: settingsHomeDir })) {
+      ui.writeln(line);
+    }
+    return { handled: true };
+  }
+
+  if (trimmed === "/extensions") {
+    for (const line of listExtensionPathsCommand(
+      extensionPaths,
+      runner.getExtensionDiagnostics?.(),
+      runner.getExtensionLifecycleState?.(),
+    )) ui.writeln(line);
+    return { handled: true };
+  }
+
+  const thinkingCommand = parseThinkingCommand(trimmed);
+  if (thinkingCommand.type !== "none") {
+    for (const line of await handleThinkingCommand(thinkingCommand, { runner, ui })) ui.writeln(line);
+    return { handled: true };
+  }
+
+  if (trimmed === "/mouse") {
+    const on = ui.toggleMouse();
+    ui.writeln(on ? "Mouse tracking: ON (wheel scroll and TUI selection copy enabled)" : "Mouse tracking: OFF (native terminal selection enabled)");
+    return { handled: true };
+  }
+
+  if (trimmed === "/status") {
+    for (const line of statusCommand({
+      runner,
+      sessionState,
+      sessionSource,
+      extensionDiagnostics: runner.getExtensionDiagnostics?.() ?? [],
+      lifecycleState: runner.getExtensionLifecycleState?.() ?? null,
+    })) ui.writeln(line);
+    return { handled: true };
+  }
+
+  if (trimmed === "/notify") {
+    const result = await runner.notifyTest?.();
+    ui.writeln(formatNotificationResult(result));
+    return { handled: true };
+  }
+
+  const shellCommand = parseShellCommand(trimmed);
+  if (shellCommand.type !== "none") {
+    for (const line of handleShellCommand(shellCommand, { shellRuntime: runner.shellRuntime })) ui.writeln(line);
+    return { handled: true };
+  }
+
+  const nameCommand = parseSessionNameCommand(trimmed);
+  if (nameCommand.type !== "none") {
+    for (const line of handleSessionNameCommand(nameCommand, { runner, sessionState, sessionSource })) ui.writeln(line);
+    return { handled: true };
+  }
+
+  if (trimmed === "/copy") {
+    for (const line of copyLastAssistantMessage({ engine: runner.engine, writeClipboard })) ui.writeln(line);
+    return { handled: true };
+  }
+
+  const sessionSourceCommand = await handleSessionSourceCommand(trimmed, {
+    ui,
+    runner,
+    sessionState,
+    sessionsRoot,
+    projectMarchDir,
+    sessionSource,
+  });
+  if (sessionSourceCommand.handled) return sessionSourceCommand;
+
+  const providerCommand = parseProviderCommand(trimmed);
+  if (providerCommand.type !== "none") {
+    try {
+      ui.writeln(await handleProviderCommand(providerCommand, { ui, runner }));
+    } catch (err) {
+      ui.writeln(`Error: ${err.message}`);
+    }
+    return { handled: true };
+  }
+
+  const modelCommand = parseModelCommand(trimmed);
+  if (modelCommand.type !== "none") {
+    try {
+      ui.writeln(await handleModelCommand(modelCommand, { runner, ui, configHomeDir }));
+    } catch (err) {
+      ui.writeln(`Error: ${err.message}`);
+    }
+    return { handled: true };
+  }
+
+  if (trimmed === "/models") {
+    for (const line of listModels({ runner })) ui.writeln(line);
+    return { handled: true };
+  }
+
+  return { handled: false };
+}
+
+function formatNotificationResult(result) {
+  if (!result) return "notification: unavailable";
+  const channels = (result.results ?? [])
+    .map((entry) => `${entry.channel}:${entry.ok ? "ok" : entry.reason ?? "failed"}`)
+    .join(", ");
+  return `notification: ${result.ok ? "ok" : result.reason ?? "failed"}${channels ? ` (${channels})` : ""}`;
+}

package/src/cli/startup/create-runtime-runner.mjs

@@ -1,61 +1,61 @@
-import { createRunner } from "../../agent/runner.mjs";
-import { createRunnerProcessClient } from "../../agent/runtime/runner-process-client.mjs";
-import { resolvePiSessionManager } from "../../session/pi-manager.mjs";
-
-export async function createRuntimeRunner({
-  useRuntimeProcess = false,
-  runnerOptions,
-  ui,
-  memoryStore,
-  memoryTools,
-  shellRuntime,
-  mcpTools,
-  mcpInjections,
-  mcpClientManager,
-  webTools,
-  usePiSessions,
-  usePiRuntimeHost,
-  authStorage,
-  permissionController,
-  modelContextDumper,
-  turnNotifier,
-  logger,
-  refreshStatusBar,
-} = {}) {
-  const onModelPayload = ({ estimatedTokens }) => {
-    refreshStatusBar?.({ contextTokens: estimatedTokens });
-  };
-
-  const runner = useRuntimeProcess
-    ? (await createRunnerProcessClient({ runnerOptions, ui, onModelPayload })).runner
-    : await createRunner({
-      ...runnerOptions,
-      ui,
-      memoryStore,
-      memoryTools,
-      shellRuntime,
-      mcpTools,
-      mcpInjections,
-      mcpClientManager,
-      webTools,
-      sessionManager: resolvePiSessionManager({
-        cwd: runnerOptions.cwd,
-        projectMarchDir: runnerOptions.projectMarchDir,
-        enabled: usePiSessions,
-      }),
-      useRuntimeHost: usePiRuntimeHost,
-      syncPiSidecar: usePiSessions || usePiRuntimeHost,
-      authStorage,
-      maxTurns: runnerOptions.config?.maxTurns ?? undefined,
-      trimBatch: runnerOptions.config?.trimBatch ?? undefined,
-      hostedTools: runnerOptions.config?.hostedTools,
-      permissionController,
-      modelContextDumper,
-      turnNotifier,
-      logger,
-      onModelPayload,
-    });
-
-  runner.shellRuntime ??= shellRuntime;
-  return runner;
-}
+import { createRunner } from "../../agent/runner.mjs";
+import { createRunnerProcessClient } from "../../agent/runtime/runner-process-client.mjs";
+import { resolvePiSessionManager } from "../../session/pi-manager.mjs";
+
+export async function createRuntimeRunner({
+  useRuntimeProcess = false,
+  runnerOptions,
+  ui,
+  memoryStore,
+  memoryTools,
+  shellRuntime,
+  mcpTools,
+  mcpInjections,
+  mcpClientManager,
+  webTools,
+  usePiSessions,
+  usePiRuntimeHost,
+  authStorage,
+  permissionController,
+  modelContextDumper,
+  turnNotifier,
+  logger,
+  refreshStatusBar,
+} = {}) {
+  const onModelPayload = ({ estimatedTokens }) => {
+    refreshStatusBar?.({ contextTokens: estimatedTokens });
+  };
+
+  const runner = useRuntimeProcess
+    ? (await createRunnerProcessClient({ runnerOptions, ui, onModelPayload })).runner
+    : await createRunner({
+      ...runnerOptions,
+      ui,
+      memoryStore,
+      memoryTools,
+      shellRuntime,
+      mcpTools,
+      mcpInjections,
+      mcpClientManager,
+      webTools,
+      sessionManager: resolvePiSessionManager({
+        cwd: runnerOptions.cwd,
+        projectMarchDir: runnerOptions.projectMarchDir,
+        enabled: usePiSessions,
+      }),
+      useRuntimeHost: usePiRuntimeHost,
+      syncPiSidecar: usePiSessions || usePiRuntimeHost,
+      authStorage,
+      maxTurns: runnerOptions.config?.maxTurns ?? undefined,
+      trimBatch: runnerOptions.config?.trimBatch ?? undefined,
+      hostedTools: runnerOptions.config?.hostedTools,
+      permissionController,
+      modelContextDumper,
+      turnNotifier,
+      logger,
+      onModelPayload,
+    });
+
+  runner.shellRuntime ??= shellRuntime;
+  return runner;
+}

package/src/cli/startup/runtime-close.mjs

@@ -1,23 +1,23 @@
-export async function closeMarchRuntime({ runner, memoryStore, ui, logger = null, blankLine = false }) {
-  let firstError = null;
-  try {
-    await runner.dispose();
-  } catch (err) {
-    firstError ??= err;
-  }
-  try {
-    memoryStore.close();
-  } catch (err) {
-    firstError ??= err;
-  }
-  try {
-    if (blankLine) ui.writeln("");
-    await ui.close();
-  } catch (err) {
-    firstError ??= err;
-  }
-  if (firstError) {
-    logger?.error("process.close.error", { error: firstError });
-    throw firstError;
-  }
-}
+export async function closeMarchRuntime({ runner, memoryStore, ui, logger = null, blankLine = false }) {
+  let firstError = null;
+  try {
+    await runner.dispose();
+  } catch (err) {
+    firstError ??= err;
+  }
+  try {
+    memoryStore.close();
+  } catch (err) {
+    firstError ??= err;
+  }
+  try {
+    if (blankLine) ui.writeln("");
+    await ui.close();
+  } catch (err) {
+    firstError ??= err;
+  }
+  if (firstError) {
+    logger?.error("process.close.error", { error: firstError });
+    throw firstError;
+  }
+}