march-cli 0.1.15 → 0.1.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "march-cli",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "March CLI — terminal-native coding agent with context reconstruction",
   "type": "module",
   "main": "./src/main.mjs",

package/src/agent/runner.mjs

@@ -5,8 +5,7 @@ import { createMarchLifecycleAdapter } from "../extensions/lifecycle-adapter.mjs
 import { syncPiSessionSidecar } from "../session/sidecar-sync.mjs";
 import { LspService } from "../lsp/service.mjs";
 import { formatLspServiceEvent } from "../lsp/status-message.mjs";
-import { formatRecallHints } from "../memory/markdown-store.mjs";
-import { appendProviderUserMessage, estimateProviderPayloadTokens, installModelPayloadDumper, replaceProviderContextMessages } from "./model-payload-dumper.mjs";
+import { estimateProviderPayloadTokens, installModelPayloadDumper, replaceProviderContextMessages } from "./model-payload-dumper.mjs";
 import { resolveInitialModel, resolveRunnerSessionManager } from "./runner/runner-init.mjs";
 import { runRunnerCleanup } from "./runner/runner-cleanup.mjs";
 import { createRunnerRuntimeHost } from "./runtime/runner-runtime-host.mjs";
@@ -55,7 +54,6 @@ export async function createRunner({ cwd, modelId = null, provider = null, provi
   let currentModelCallKind = "model", currentTurnId = null, currentPromptForContext = "";
   let currentTurnContextMode = "rebuild";
   let nextTurnContextMode = "rebuild";
-  let pendingMidTurnRecallHints = [];
   let lastNotificationResult = null, runtimeHost = null, lifecycleAdapter = null;
   let _currentFastEntry = null;
   if (useRuntimeHost) {
@@ -111,7 +109,6 @@ export async function createRunner({ cwd, modelId = null, provider = null, provi
       const contextMode = nextTurnContextMode;
       currentTurnContextMode = contextMode;
       nextTurnContextMode = "rebuild";
-      pendingMidTurnRecallHints = [];
       const turnStartedAt = Date.now();
       const turnLog = beginLoggedTurn({ logger, engine, modelId, provider, contextMode, userMessage, userRecallHints, startedAt: turnStartedAt }); currentTurnId = turnLog.turnId;
       try {
@@ -121,7 +118,6 @@ export async function createRunner({ cwd, modelId = null, provider = null, provi
           setModelCallKind: (kind) => { currentModelCallKind = kind; },
           logger: turnLog.logger,
           setPhase: turnLog.setPhase,
-          onMidTurnRecallHints: (hints) => { pendingMidTurnRecallHints.push(...hints); },
           syncCurrentPiSidecar,
           autoNameSession,
           contextMode,
@@ -289,10 +285,6 @@ export async function createRunner({ cwd, modelId = null, provider = null, provi
       : replaceProviderContextMessages(payload, engine.buildProviderContext(currentPromptForContext));
     nextPayload = injectHostedTools(nextPayload, model, hostedTools);
     if (_currentFastEntry) nextPayload = { ...nextPayload, service_tier: "priority" };
-    if (pendingMidTurnRecallHints.length > 0) {
-      nextPayload = appendProviderUserMessage(nextPayload, formatRecallHints("assistant", pendingMidTurnRecallHints));
-      pendingMidTurnRecallHints = [];
-    }
     return nextPayload;
   }
 }

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

@@ -1,93 +1,11 @@
-import { join } from "node:path";
-import { createRunner } from "../runner.mjs";
 import { createProcessRuntimeIpcPeer } from "./ipc/process-ipc-transport.mjs";
-import { createRemoteRuntimeUiClient } from "./remote-ui-client.mjs";
 import { createRunnerIpcTarget } from "./runner-ipc-target.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 { createIsolatedRunner } from "./runner-process-factory.mjs";
 
 const peer = createProcessRuntimeIpcPeer({
-  target: createRunnerIpcTarget({ createRunnerImpl: createIsolatedRunner }),
+  target: createRunnerIpcTarget({
+    createRunnerImpl: (options) => createIsolatedRunner(options, { peer }),
+  }),
 });
 
 process.once("disconnect", () => peer.dispose());
-
-async function createIsolatedRunner(options = {}) {
-  const ui = createRemoteRuntimeUiClient(peer);
-  const memoryStore = new MarkdownMemoryStore({ root: options.memoryRoot });
-  const memoryTools = createMarkdownMemoryTools(memoryStore);
-  const shellRuntime = options.shellRuntime ? createCliShellRuntime({ cwd: options.cwd }) : null;
-  const mcpInit = await initializeMcp({ projectDir: options.cwd });
-  const logger = createLogger({ logDir: options.logDir ?? (options.stateRoot ? join(options.stateRoot, "logs") : undefined) });
-  installProcessLogHandlers(logger);
-
-  const runner = await 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: createWebToolsFromConfig(options.config ?? {}),
-    namespace: options.namespace,
-    projectMarchDir: options.projectMarchDir,
-    extensionPaths: options.extensionPaths ?? [],
-    sessionManager: resolvePiSessionManager({
-      cwd: options.cwd,
-      projectMarchDir: options.projectMarchDir,
-      enabled: true,
-    }),
-    useRuntimeHost: true,
-    syncPiSidecar: true,
-    lifecycleHooks: options.lifecycleHooks ?? [],
-    lifecycleDiagnostics: options.lifecycleDiagnostics ?? [],
-    authStorage: 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: createPermissionController({ mode: options.permissionMode }),
-    modelContextDumper: createModelContextDumper(options.modelContextDumper ?? { enabled: false }),
-    turnNotifier: createDesktopTurnNotifier({
-      enabled: Boolean(options.config?.notifications?.turnEnd),
-      config: options.config?.notifications,
-    }),
-    logger,
-    onModelPayload: (event) => 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 };
-}

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

@@ -0,0 +1,108 @@
+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 };
+}

package/src/agent/turn/turn-runner.mjs

@@ -1,3 +1,4 @@
+import { formatRecallHints } from "../../memory/markdown-store.mjs";
 import { resolveImageAttachmentReferences } from "../../session/attachment-references.mjs";
 import { closeAssistantReply, compactAssistantContext, createTurnEventState, handleRunnerSessionEvent } from "./turn-events.mjs";
 
@@ -13,7 +14,6 @@ export async function runRunnerTurn({
   setModelCallKind,
   logger = null,
   setPhase = null,
-  onMidTurnRecallHints,
   syncCurrentPiSidecar,
   autoNameSession,
   contextMode = "rebuild",
@@ -41,7 +41,7 @@ export async function runRunnerTurn({
       const hints = flushAssistantRecall({ memoryStore, engine, turnState, currentProject });
       if (hints.length > 0) {
         midTurnRecallHints.push(...hints);
-        onMidTurnRecallHints?.(hints);
+        queueMidTurnRecallHints(activeSession, hints, logger);
         ui.memoryHint?.({ source: "assistant", hints });
       }
     }
@@ -89,6 +89,20 @@ export async function runRunnerTurn({
   }
 }
 
+function queueMidTurnRecallHints(session, hints, logger) {
+  const content = formatRecallHints("assistant", hints);
+  if (!content) return;
+  const injected = session.sendCustomMessage?.({
+    customType: "march.memory_hint",
+    content,
+    display: false,
+    details: { source: "assistant" },
+  }, { deliverAs: "steer" });
+  void injected?.catch?.((err) => {
+    logger?.debug("memory.mid_turn_recall.inject_failed", { errorMessage: err?.message ?? String(err) });
+  });
+}
+
 function logSessionEvent(logger, event) {
   if (!logger) return;
   if (event.type === "message_update") {