march-cli 0.1.23 → 0.1.25

package/src/agent/runtime/runner-ipc-target.mjs

@@ -1,125 +1,125 @@
-export function createRunnerIpcTarget({ createRunnerImpl, runnerOptions = {} } = {}) {
-  if (typeof createRunnerImpl !== "function") throw new Error("createRunnerImpl is required");
-
-  let runner = null;
-
-  return {
-    async init(options = {}) {
-      if (runner) return getRunnerState(runner);
-      runner = await createRunnerImpl({ ...runnerOptions, ...options });
-      return getRunnerState(runner);
-    },
-    async runTurn(prompt, userMessage, options = {}) {
-      return getRunner().runTurn(prompt, userMessage, options);
-    },
-    abort() {
-      return getRunner().abort();
-    },
-    async cycleModel() {
-      const result = await getRunner().cycleModel();
-      return { result, state: getRunnerState(runner) };
-    },
-    async setModel(model) {
-      const result = await getRunner().setModel(model);
-      return { result, state: getRunnerState(runner) };
-    },
-    getCurrentModel() {
-      return getRunner().getCurrentModel();
-    },
-    getScopedModels() {
-      return getRunner().getScopedModels();
-    },
-    getConfiguredProviders() {
-      return getRunner().getConfiguredProviders();
-    },
-    getSessionStats() {
-      return getRunner().getSessionStats();
-    },
-    getState() {
-      return getRunnerState(getRunner());
-    },
-    getLastNotificationResult() {
-      return getRunner().getLastNotificationResult();
-    },
-    notifyTest(options) {
-      return getRunner().notifyTest(options);
-    },
-    estimateContextTokens(userMessage = "") {
-      return getRunner().estimateContextTokens(userMessage);
-    },
-    setSessionName(name) {
-      const result = getRunner().setSessionName(name);
-      return { result, state: getRunnerState(runner) };
-    },
-    canSwitchPiSession() {
-      return getRunner().canSwitchPiSession();
-    },
-    async startNewSession() {
-      const result = await getRunner().startNewSession();
-      return { result, state: getRunnerState(runner) };
-    },
-    getExtensionDiagnostics() {
-      return getRunner().getExtensionDiagnostics();
-    },
-    getExtensionLifecycleState() {
-      return getRunner().getExtensionLifecycleState();
-    },
-    getLspStatus() {
-      return getRunner().getLspStatus();
-    },
-    async switchPiSession(sessionPath, restoreState = null) {
-      const result = await getRunner().switchPiSession(sessionPath, restoreState);
-      return { result, state: getRunnerState(runner) };
-    },
-    cycleThinkingLevel() {
-      const result = getRunner().cycleThinkingLevel();
-      return { result, state: getRunnerState(runner) };
-    },
-    getThinkingLevel() {
-      return getRunner().getThinkingLevel();
-    },
-    setThinkingLevel(level) {
-      const result = getRunner().setThinkingLevel(level);
-      return { result, state: getRunnerState(runner) };
-    },
-    getAvailableThinkingLevels() {
-      return getRunner().getAvailableThinkingLevels();
-    },
-    async dispose() {
-      if (!runner) return;
-      const active = runner;
-      runner = null;
-      await active.dispose();
-    },
-  };
-
-  function getRunner() {
-    if (!runner) throw new Error("runtime runner is not initialized");
-    return runner;
-  }
-}
-
-export function getRunnerState(runner) {
-  const currentModel = runner.getCurrentModel?.() ?? null;
-  const scopedModels = runner.getScopedModels?.() ?? [];
-  const thinkingLevel = runner.getThinkingLevel?.() ?? runner.engine?.thinkingLevel ?? null;
-  return {
-    engine: {
-      cwd: runner.engine?.cwd ?? null,
-      modelId: runner.engine?.modelId ?? currentModel?.id ?? null,
-      provider: runner.engine?.provider ?? currentModel?.provider ?? null,
-      thinkingLevel,
-      sessionName: runner.engine?.sessionName ?? "",
-      turns: runner.engine?.turns ?? [],
-    },
-    currentModel,
-    scopedModels,
-    configuredProviders: runner.getConfiguredProviders?.() ?? [],
-    availableThinkingLevels: runner.getAvailableThinkingLevels?.() ?? [],
-    canSwitchPiSession: runner.canSwitchPiSession?.() ?? false,
-    sessionStats: runner.getSessionStats?.() ?? null,
-    lspStatus: runner.getLspStatus?.() ?? null,
-    extensionDiagnostics: runner.getExtensionDiagnostics?.() ?? [],
-    extensionLifecycleState: runner.getExtensionLifecycleState?.() ?? null,
-  };
-}
+export function createRunnerIpcTarget({ createRunnerImpl, runnerOptions = {} } = {}) {
+  if (typeof createRunnerImpl !== "function") throw new Error("createRunnerImpl is required");
+
+  let runner = null;
+
+  return {
+    async init(options = {}) {
+      if (runner) return getRunnerState(runner);
+      runner = await createRunnerImpl({ ...runnerOptions, ...options });
+      return getRunnerState(runner);
+    },
+    async runTurn(prompt, userMessage, options = {}) {
+      return getRunner().runTurn(prompt, userMessage, options);
+    },
+    abort() {
+      return getRunner().abort();
+    },
+    async cycleModel() {
+      const result = await getRunner().cycleModel();
+      return { result, state: getRunnerState(runner) };
+    },
+    async setModel(model) {
+      const result = await getRunner().setModel(model);
+      return { result, state: getRunnerState(runner) };
+    },
+    getCurrentModel() {
+      return getRunner().getCurrentModel();
+    },
+    getScopedModels() {
+      return getRunner().getScopedModels();
+    },
+    getConfiguredProviders() {
+      return getRunner().getConfiguredProviders();
+    },
+    getSessionStats() {
+      return getRunner().getSessionStats();
+    },
+    getState() {
+      return getRunnerState(getRunner());
+    },
+    getLastNotificationResult() {
+      return getRunner().getLastNotificationResult();
+    },
+    notifyTest(options) {
+      return getRunner().notifyTest(options);
+    },
+    estimateContextTokens(userMessage = "") {
+      return getRunner().estimateContextTokens(userMessage);
+    },
+    setSessionName(name) {
+      const result = getRunner().setSessionName(name);
+      return { result, state: getRunnerState(runner) };
+    },
+    canSwitchPiSession() {
+      return getRunner().canSwitchPiSession();
+    },
+    async startNewSession() {
+      const result = await getRunner().startNewSession();
+      return { result, state: getRunnerState(runner) };
+    },
+    getExtensionDiagnostics() {
+      return getRunner().getExtensionDiagnostics();
+    },
+    getExtensionLifecycleState() {
+      return getRunner().getExtensionLifecycleState();
+    },
+    getLspStatus() {
+      return getRunner().getLspStatus();
+    },
+    async switchPiSession(sessionPath, restoreState = null) {
+      const result = await getRunner().switchPiSession(sessionPath, restoreState);
+      return { result, state: getRunnerState(runner) };
+    },
+    cycleThinkingLevel() {
+      const result = getRunner().cycleThinkingLevel();
+      return { result, state: getRunnerState(runner) };
+    },
+    getThinkingLevel() {
+      return getRunner().getThinkingLevel();
+    },
+    setThinkingLevel(level) {
+      const result = getRunner().setThinkingLevel(level);
+      return { result, state: getRunnerState(runner) };
+    },
+    getAvailableThinkingLevels() {
+      return getRunner().getAvailableThinkingLevels();
+    },
+    async dispose() {
+      if (!runner) return;
+      const active = runner;
+      runner = null;
+      await active.dispose();
+    },
+  };
+
+  function getRunner() {
+    if (!runner) throw new Error("runtime runner is not initialized");
+    return runner;
+  }
+}
+
+export function getRunnerState(runner) {
+  const currentModel = runner.getCurrentModel?.() ?? null;
+  const scopedModels = runner.getScopedModels?.() ?? [];
+  const thinkingLevel = runner.getThinkingLevel?.() ?? runner.engine?.thinkingLevel ?? null;
+  return {
+    engine: {
+      cwd: runner.engine?.cwd ?? null,
+      modelId: runner.engine?.modelId ?? currentModel?.id ?? null,
+      provider: runner.engine?.provider ?? currentModel?.provider ?? null,
+      thinkingLevel,
+      sessionName: runner.engine?.sessionName ?? "",
+      turns: runner.engine?.turns ?? [],
+    },
+    currentModel,
+    scopedModels,
+    configuredProviders: runner.getConfiguredProviders?.() ?? [],
+    availableThinkingLevels: runner.getAvailableThinkingLevels?.() ?? [],
+    canSwitchPiSession: runner.canSwitchPiSession?.() ?? false,
+    sessionStats: runner.getSessionStats?.() ?? null,
+    lspStatus: runner.getLspStatus?.() ?? null,
+    extensionDiagnostics: runner.getExtensionDiagnostics?.() ?? [],
+    extensionLifecycleState: runner.getExtensionLifecycleState?.() ?? null,
+  };
+}

package/src/agent/runtime/runner-process-client.mjs

@@ -1,47 +1,47 @@
-import { fork } from "node:child_process";
-import { fileURLToPath } from "node:url";
-import { createProcessRuntimeIpcPeer } from "./ipc/process-ipc-transport.mjs";
-import { createRemoteRunnerClient } from "./remote-runner-client.mjs";
-import { createRuntimeUiEventTarget } from "./ui-event-bridge.mjs";
-
-const DEFAULT_ENTRY = new URL("./runner-process-entry.mjs", import.meta.url);
-
-export async function createRunnerProcessClient({
-  runnerOptions,
-  ui,
-  onModelPayload = null,
-  entry = fileURLToPath(DEFAULT_ENTRY),
-  forkImpl = fork,
-  timeoutMs = 0,
-} = {}) {
-  const child = forkImpl(entry, [], {
-    stdio: ["ignore", "inherit", "inherit", "ipc"],
-  });
-  const peer = createProcessRuntimeIpcPeer({
-    processLike: child,
-    target: {
-      ...createRuntimeUiEventTarget(ui),
-      modelPayload: (event) => onModelPayload?.(event),
-    },
-    timeoutMs,
-  });
-  const runner = createRemoteRunnerClient(peer);
-  try {
-    await runner.init(runnerOptions);
-  } catch (error) {
-    peer.dispose();
-    child.kill?.();
-    throw error;
-  }
-
-  const remoteDispose = runner.dispose;
-  const dispose = async () => {
-    try {
-      await remoteDispose.call(runner);
-    } finally {
-      child.kill?.();
-    }
-  };
-  runner.dispose = dispose;
-  return { runner, child, dispose };
-}
+import { fork } from "node:child_process";
+import { fileURLToPath } from "node:url";
+import { createProcessRuntimeIpcPeer } from "./ipc/process-ipc-transport.mjs";
+import { createRemoteRunnerClient } from "./remote-runner-client.mjs";
+import { createRuntimeUiEventTarget } from "./ui-event-bridge.mjs";
+
+const DEFAULT_ENTRY = new URL("./runner-process-entry.mjs", import.meta.url);
+
+export async function createRunnerProcessClient({
+  runnerOptions,
+  ui,
+  onModelPayload = null,
+  entry = fileURLToPath(DEFAULT_ENTRY),
+  forkImpl = fork,
+  timeoutMs = 0,
+} = {}) {
+  const child = forkImpl(entry, [], {
+    stdio: ["ignore", "inherit", "inherit", "ipc"],
+  });
+  const peer = createProcessRuntimeIpcPeer({
+    processLike: child,
+    target: {
+      ...createRuntimeUiEventTarget(ui),
+      modelPayload: (event) => onModelPayload?.(event),
+    },
+    timeoutMs,
+  });
+  const runner = createRemoteRunnerClient(peer);
+  try {
+    await runner.init(runnerOptions);
+  } catch (error) {
+    peer.dispose();
+    child.kill?.();
+    throw error;
+  }
+
+  const remoteDispose = runner.dispose;
+  const dispose = async () => {
+    try {
+      await remoteDispose.call(runner);
+    } finally {
+      child.kill?.();
+    }
+  };
+  runner.dispose = dispose;
+  return { runner, child, dispose };
+}

package/src/agent/runtime/runner-process-entry.mjs

@@ -1,11 +1,11 @@
-import { createProcessRuntimeIpcPeer } from "./ipc/process-ipc-transport.mjs";
-import { createRunnerIpcTarget } from "./runner-ipc-target.mjs";
-import { createIsolatedRunner } from "./runner-process-factory.mjs";
-
-const peer = createProcessRuntimeIpcPeer({
-  target: createRunnerIpcTarget({
-    createRunnerImpl: (options) => createIsolatedRunner(options, { peer }),
-  }),
-});
-
-process.once("disconnect", () => peer.dispose());
+import { createProcessRuntimeIpcPeer } from "./ipc/process-ipc-transport.mjs";
+import { createRunnerIpcTarget } from "./runner-ipc-target.mjs";
+import { createIsolatedRunner } from "./runner-process-factory.mjs";
+
+const peer = createProcessRuntimeIpcPeer({
+  target: createRunnerIpcTarget({
+    createRunnerImpl: (options) => createIsolatedRunner(options, { peer }),
+  }),
+});
+
+process.once("disconnect", () => peer.dispose());

package/src/agent/runtime/runner-process-factory.mjs

@@ -1,108 +1,111 @@
-import { join } from "node:path";
-import { createRunner } from "../runner.mjs";
-import { createRemoteRuntimeUiClient } from "./remote-ui-client.mjs";
-import { createMarchAuthStorage } from "../../auth/storage.mjs";
-import { createCliShellRuntime } from "../../shell/cli-runtime.mjs";
-import { MarkdownMemoryStore } from "../../memory/markdown-store.mjs";
-import { createMarkdownMemoryTools } from "../../memory/markdown-tools.mjs";
-import { initializeMcp } from "../../mcp/index.mjs";
-import { createWebToolsFromConfig } from "../../web/tools.mjs";
-import { createPermissionController } from "../../cli/permissions.mjs";
-import { resolvePiSessionManager } from "../../session/pi-manager.mjs";
-import { createModelContextDumper } from "../../debug/model-context-dumper.mjs";
-import { createLogger, installProcessLogHandlers } from "../../debug/logger.mjs";
-import { createDesktopTurnNotifier } from "../../notification/desktop-notifier.mjs";
-import { installNetworkEnvironment } from "../../network/environment.mjs";
-
-const DEFAULT_DEPS = {
-  createRunner,
-  createRemoteRuntimeUiClient,
-  createCliShellRuntime,
-  MarkdownMemoryStore,
-  createMarkdownMemoryTools,
-  initializeMcp,
-  createWebToolsFromConfig,
-  createPermissionController,
-  resolvePiSessionManager,
-  createModelContextDumper,
-  createMarchAuthStorage,
-  createLogger,
-  installProcessLogHandlers,
-  createDesktopTurnNotifier,
-  installNetworkEnvironment,
-};
-
-export async function createIsolatedRunner(options = {}, deps = {}) {
-  const d = { ...DEFAULT_DEPS, ...deps };
-  d.installNetworkEnvironment(options.config?.network);
-
-  const ui = d.createRemoteRuntimeUiClient(d.peer);
-  const memoryStore = new d.MarkdownMemoryStore({ root: options.memoryRoot });
-  const memoryTools = d.createMarkdownMemoryTools(memoryStore);
-  const shellRuntime = options.shellRuntime ? d.createCliShellRuntime({ cwd: options.cwd }) : null;
-  const mcpInit = await d.initializeMcp({ projectDir: options.cwd });
-  const logDir = options.logDir ?? (options.stateRoot ? join(options.stateRoot, "logs") : undefined);
-  const logger = d.createLogger({ logDir });
-  d.installProcessLogHandlers(logger);
-
-  const runner = await d.createRunner({
-    cwd: options.cwd,
-    modelId: options.modelId,
-    provider: options.provider,
-    serviceTier: options.serviceTier,
-    providers: options.providers,
-    stateRoot: options.stateRoot,
-    ui,
-    memoryRoot: options.memoryRoot,
-    profilePaths: options.profilePaths,
-    memoryStore,
-    memoryTools,
-    shellRuntime,
-    mcpTools: mcpInit.mcpTools,
-    mcpInjections: mcpInit.mcpInjections,
-    mcpClientManager: mcpInit.clientManager,
-    webTools: d.createWebToolsFromConfig(options.config ?? {}),
-    namespace: options.namespace,
-    projectMarchDir: options.projectMarchDir,
-    extensionPaths: options.extensionPaths ?? [],
-    sessionManager: d.resolvePiSessionManager({
-      cwd: options.cwd,
-      projectMarchDir: options.projectMarchDir,
-      enabled: true,
-    }),
-    useRuntimeHost: true,
-    syncPiSidecar: true,
-    lifecycleHooks: options.lifecycleHooks ?? [],
-    lifecycleDiagnostics: options.lifecycleDiagnostics ?? [],
-    authStorage: d.createMarchAuthStorage({
-      provider: options.provider ?? "deepseek",
-      providers: options.providers,
-      cwd: options.cwd,
-    }).authStorage,
-    maxTurns: options.config?.maxTurns ?? undefined,
-    trimBatch: options.config?.trimBatch ?? undefined,
-    hostedTools: options.config?.hostedTools,
-    permissionController: d.createPermissionController({ mode: options.permissionMode }),
-    modelContextDumper: d.createModelContextDumper(options.modelContextDumper ?? { enabled: false }),
-    turnNotifier: d.createDesktopTurnNotifier({
-      enabled: Boolean(options.config?.notifications?.turnEnd),
-      config: options.config?.notifications,
-    }),
-    logger,
-    onModelPayload: (event) => d.peer.notify("modelPayload", pickModelPayloadEvent(event)),
-  });
-
-  const originalDispose = runner.dispose;
-  runner.dispose = async () => {
-    try {
-      await originalDispose.call(runner);
-    } finally {
-      memoryStore.close?.();
-    }
-  };
-  return runner;
-}
-
-function pickModelPayloadEvent({ estimatedTokens, provider, model, kind, turnId } = {}) {
-  return { estimatedTokens, provider, model, kind, turnId };
-}
+import { join } from "node:path";
+import { createRunner } from "../runner.mjs";
+import { createRemoteRuntimeUiClient } from "./remote-ui-client.mjs";
+import { createMarchAuthStorage } from "../../auth/storage.mjs";
+import { createCliShellRuntime } from "../../shell/cli-runtime.mjs";
+import { MarkdownMemoryStore } from "../../memory/markdown-store.mjs";
+import { createMarkdownMemoryTools } from "../../memory/markdown-tools.mjs";
+import { normalizeRemoteMemorySources } from "../../memory/remote/config.mjs";
+import { initializeMcp } from "../../mcp/index.mjs";
+import { createWebToolsFromConfig } from "../../web/tools.mjs";
+import { createPermissionController } from "../../cli/permissions.mjs";
+import { resolvePiSessionManager } from "../../session/pi-manager.mjs";
+import { createModelContextDumper } from "../../debug/model-context-dumper.mjs";
+import { createLogger, installProcessLogHandlers } from "../../debug/logger.mjs";
+import { createDesktopTurnNotifier } from "../../notification/desktop-notifier.mjs";
+import { installNetworkEnvironment } from "../../network/environment.mjs";
+
+const DEFAULT_DEPS = {
+  createRunner,
+  createRemoteRuntimeUiClient,
+  createCliShellRuntime,
+  MarkdownMemoryStore,
+  createMarkdownMemoryTools,
+  initializeMcp,
+  createWebToolsFromConfig,
+  createPermissionController,
+  resolvePiSessionManager,
+  createModelContextDumper,
+  createMarchAuthStorage,
+  createLogger,
+  installProcessLogHandlers,
+  createDesktopTurnNotifier,
+  installNetworkEnvironment,
+};
+
+export async function createIsolatedRunner(options = {}, deps = {}) {
+  const d = { ...DEFAULT_DEPS, ...deps };
+  d.installNetworkEnvironment(options.config?.network);
+
+  const ui = d.createRemoteRuntimeUiClient(d.peer);
+  const memoryStore = new d.MarkdownMemoryStore({ root: options.memoryRoot });
+  const remoteMemorySources = normalizeRemoteMemorySources({ remoteMemories: options.remoteMemorySources ?? options.config?.remoteMemories ?? [] });
+  const memoryTools = d.createMarkdownMemoryTools(memoryStore, { remoteSources: remoteMemorySources });
+  const shellRuntime = options.shellRuntime ? d.createCliShellRuntime({ cwd: options.cwd }) : null;
+  const mcpInit = await d.initializeMcp({ projectDir: options.cwd });
+  const logDir = options.logDir ?? (options.stateRoot ? join(options.stateRoot, "logs") : undefined);
+  const logger = d.createLogger({ logDir });
+  d.installProcessLogHandlers(logger);
+
+  const runner = await d.createRunner({
+    cwd: options.cwd,
+    modelId: options.modelId,
+    provider: options.provider,
+    serviceTier: options.serviceTier,
+    providers: options.providers,
+    stateRoot: options.stateRoot,
+    ui,
+    memoryRoot: options.memoryRoot,
+    profilePaths: options.profilePaths,
+    memoryStore,
+    memoryTools,
+    remoteMemorySources,
+    shellRuntime,
+    mcpTools: mcpInit.mcpTools,
+    mcpInjections: mcpInit.mcpInjections,
+    mcpClientManager: mcpInit.clientManager,
+    webTools: d.createWebToolsFromConfig(options.config ?? {}),
+    namespace: options.namespace,
+    projectMarchDir: options.projectMarchDir,
+    extensionPaths: options.extensionPaths ?? [],
+    sessionManager: d.resolvePiSessionManager({
+      cwd: options.cwd,
+      projectMarchDir: options.projectMarchDir,
+      enabled: true,
+    }),
+    useRuntimeHost: true,
+    syncPiSidecar: true,
+    lifecycleHooks: options.lifecycleHooks ?? [],
+    lifecycleDiagnostics: options.lifecycleDiagnostics ?? [],
+    authStorage: d.createMarchAuthStorage({
+      provider: options.provider ?? "deepseek",
+      providers: options.providers,
+      cwd: options.cwd,
+    }).authStorage,
+    maxTurns: options.config?.maxTurns ?? undefined,
+    trimBatch: options.config?.trimBatch ?? undefined,
+    hostedTools: options.config?.hostedTools,
+    permissionController: d.createPermissionController({ mode: options.permissionMode }),
+    modelContextDumper: d.createModelContextDumper(options.modelContextDumper ?? { enabled: false }),
+    turnNotifier: d.createDesktopTurnNotifier({
+      enabled: Boolean(options.config?.notifications?.turnEnd),
+      config: options.config?.notifications,
+    }),
+    logger,
+    onModelPayload: (event) => d.peer.notify("modelPayload", pickModelPayloadEvent(event)),
+  });
+
+  const originalDispose = runner.dispose;
+  runner.dispose = async () => {
+    try {
+      await originalDispose.call(runner);
+    } finally {
+      memoryStore.close?.();
+    }
+  };
+  return runner;
+}
+
+function pickModelPayloadEvent({ estimatedTokens, provider, model, kind, turnId } = {}) {
+  return { estimatedTokens, provider, model, kind, turnId };
+}