march-cli 0.1.35 → 0.1.37

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

@@ -10,6 +10,7 @@ export async function createRunnerProcessClient({
   runnerOptions,
   ui,
   onModelPayload = null,
+  onLspStatusChange = null,
   entry = fileURLToPath(DEFAULT_ENTRY),
   forkImpl = fork,
   timeoutMs = 0,
@@ -46,6 +47,10 @@ export async function createRunnerProcessClient({
       target: {
         ...createRuntimeUiEventTarget(ui),
         modelPayload: (event) => onModelPayload?.(event),
+        lspStatusChange: async (event) => {
+          await active?.runner?.refreshState?.();
+          onLspStatusChange?.(event);
+        },
       },
       timeoutMs,
     });

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

@@ -93,6 +93,7 @@ export async function createIsolatedRunner(options = {}, deps = {}) {
     }),
     logger,
     onModelPayload: (event) => d.peer.notify("modelPayload", pickModelPayloadEvent(event)),
+    onLspStatusChange: (event) => d.peer.notify("lspStatusChange", pickLspStatusEvent(event)),
   });
 
   const originalDispose = runner.dispose;
@@ -109,3 +110,7 @@ export async function createIsolatedRunner(options = {}, deps = {}) {
 function pickModelPayloadEvent({ estimatedTokens, provider, model, kind, turnId } = {}) {
   return { estimatedTokens, provider, model, kind, turnId };
 }
+
+function pickLspStatusEvent({ id, root, status, reason, managed } = {}) {
+  return { id, root, status, reason, managed };
+}

package/src/agent/runtime/runner-runtime-host.mjs

@@ -20,6 +20,7 @@ export async function createRunnerRuntimeHost({
   ui,
   projectMarchDir = null,
   memoryTools = [],
+  historyStore = null,
   shellRuntime = null,
   lspService = null,
   mcpTools = [],
@@ -56,6 +57,7 @@ export async function createRunnerRuntimeHost({
         engine,
         ui,
         memoryTools,
+        historyStore,
         shellRuntime,
         lspService,
         mcpTools,

package/src/agent/runtime/state/runner-state.mjs

@@ -22,6 +22,7 @@ export function createRunnerStateSnapshot(runner) {
     availableThinkingLevels: runner.getAvailableThinkingLevels?.() ?? [],
     canSwitchPiSession: runner.canSwitchPiSession?.() ?? false,
     sessionStats: runner.getSessionStats?.() ?? null,
+    providerQuota: runner.getCachedProviderQuotaSnapshot?.() ?? null,
     lspStatus: runner.getLspStatus?.() ?? null,
     extensionDiagnostics: runner.getExtensionDiagnostics?.() ?? [],
     extensionLifecycleState: runner.getExtensionLifecycleState?.() ?? null,

package/src/agent/runtime/ui-event-bridge.mjs

@@ -51,6 +51,7 @@ export function createRuntimeUiClient(eventBus) {
     status: (text) => eventBus.emit({ type: "status", text }),
     debugLines: (lines) => eventBus.emit({ type: "debug_lines", lines }),
     recall: ({ source, hints }) => eventBus.emit({ type: "recall", source, hints }),
+    providerQuotaSnapshot: (snapshot) => eventBus.emit({ type: "provider_quota_snapshot", snapshot }),
     editDiff: (path, diffLines) => eventBus.emit({ type: "edit_diff", path, diffLines }),
     requestPermission: (request) => eventBus.request({ type: "permission_request", ...request }),
   };
@@ -72,6 +73,7 @@ export function dispatchRuntimeUiEvent(ui, event) {
     case "status": return ui.status?.(event.text);
     case "debug_lines": return writeDebugLines(ui, event.lines);
     case "recall": return ui.recall?.({ source: event.source, hints: event.hints });
+    case "provider_quota_snapshot": return ui.providerQuotaSnapshot?.(event.snapshot);
     case "edit_diff": return ui.editDiff?.(event.path, event.diffLines);
     case "permission_request": return ui.requestPermission?.({ toolName: event.toolName, params: event.params, category: event.category });
     default: return undefined;

package/src/agent/session/session-options.mjs

@@ -10,6 +10,7 @@ export function resolveRunnerSessionOptions({
   engine,
   ui,
   memoryTools = [],
+  historyStore = null,
   shellRuntime = null,
   lspService = null,
   mcpTools = [],
@@ -31,7 +32,7 @@ export function resolveRunnerSessionOptions({
     ?? (provider && modelId ? getModel(provider, modelId) : null);
   if (!model) throw new Error(`Model not found: ${provider}/${modelId}`);
 
-  const customTools = createMarchCustomTools({ cwd, engine, ui, memoryTools, shellRuntime, lspService, mcpTools, webTools, lifecycle, permissionController, authStorage, projectMarchDir, stateRoot, getCurrentModel: () => getCurrentModel?.() ?? model });
+  const customTools = createMarchCustomTools({ cwd, engine, ui, memoryTools, historyStore, shellRuntime, lspService, mcpTools, webTools, lifecycle, permissionController, authStorage, projectMarchDir, stateRoot, getCurrentModel: () => getCurrentModel?.() ?? model });
   const customToolNames = customTools.map((tool) => tool.name);
   const tools = [
     ...customToolNames.filter((name) => name === "read"),

package/src/agent/tools.mjs

@@ -1,4 +1,5 @@
 import { createCommandExecTool } from "./command-exec-tool.mjs";
+import { createCodeSearchTool } from "./code-search/tool.mjs";
 import { createContextStatsTool } from "./context-stats-tool.mjs";
 import { createEditFileTool } from "./file-edit-tool.mjs";
 import { createReadFileTool } from "./file-tools/read-file-tool.mjs";
@@ -12,10 +13,13 @@ import { initImageGen } from "../image-gen/index.mjs";
 import { createSuperGrokTool } from "../supergrok/tool.mjs";
 import { createBrowserTools } from "../browser/tools/index.mjs";
 import { createRuntimeRestartTool } from "./lifecycle/runtime-restart-tool.mjs";
+import { createHistorySearchTool } from "../history/tool.mjs";
 
-export function createMarchCustomTools({ cwd, engine, ui, memoryTools = [], shellRuntime = null, lspService = null, mcpTools = [], webTools = [], lifecycle = null, permissionController = null, authStorage = null, projectMarchDir = null, stateRoot = null, getCurrentModel = null }) {
+export function createMarchCustomTools({ cwd, engine, ui, memoryTools = [], historyStore = null, shellRuntime = null, lspService = null, mcpTools = [], webTools = [], lifecycle = null, permissionController = null, authStorage = null, projectMarchDir = null, stateRoot = null, getCurrentModel = null }) {
   const commandExecTool = createCommandExecTool({ cwd });
+  const codeSearchTool = createCodeSearchTool({ engine, stateRoot });
   const contextStatsTool = createContextStatsTool({ engine });
+  const historySearchTool = createHistorySearchTool({ store: historyStore });
   const editFileTool = createEditFileTool({ engine, ui, lspService });
   const readFileTool = createReadFileTool({ engine });
   const readImageTool = createReadImageTool({ engine, getCurrentModel });
@@ -30,9 +34,11 @@ export function createMarchCustomTools({ cwd, engine, ui, memoryTools = [], shel
     screenTool,
     listWindowsTool,
     contextStatsTool,
+    codeSearchTool,
     commandExecTool,
     editFileTool,
     ...createShellTools(shellRuntime),
+    ...(historySearchTool ? [historySearchTool] : []),
     ...memoryTools,
     ...mcpTools,
     ...webTools,

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

@@ -1,5 +1,7 @@
 import { formatToolStartLine, formatToolSuccessSummary } from "../tool-summary.mjs";
 
+const TOOL_ERROR_EXCERPT_LIMIT = 4000;
+
 export function createTurnEventState() {
   return {
     draft: "",
@@ -9,6 +11,7 @@ export function createTurnEventState() {
     assistantReplyOpen: false,
     assistantContextParts: [],
     activeToolContextPart: null,
+    toolCalls: [],
   };
 }
 
@@ -19,10 +22,12 @@ export function handleRunnerSessionEvent(event, { ui, engine, state }) {
   if (event.type === "tool_execution_start") {
     closeAssistantReply({ ui, state });
     appendToolStartContext(state, event.toolName, event.args);
+    recordToolStart(state, event.toolName, event.args);
     ui.toolStart(event.toolName, event.args);
   }
   if (event.type === "tool_execution_end") {
     updateToolEndContext(state, event.toolName, event.isError, event.result);
+    recordToolEnd(state, event.toolName, event.isError, event.result);
     ui.toolEnd(event.toolName, event.isError, event.result);
   }
   if (event.type === "auto_retry_start") {
@@ -109,3 +114,39 @@ function updateToolEndContext(state, name, isError, result) {
   if (summary && summary !== "done") part.text = `${part.text.trimEnd()} (${summary})\n`;
   state.activeToolContextPart = null;
 }
+
+function recordToolStart(state, name, args) {
+  state.toolCalls.push({ name, args: cloneJson(args), status: "running" });
+}
+
+function recordToolEnd(state, name, isError, result) {
+  const call = [...state.toolCalls].reverse().find((item) => item.name === name && item.status === "running");
+  if (!call) return;
+  call.status = isError ? "failed" : "success";
+  if (!isError) return;
+  const output = extractToolOutput(result);
+  call.error = {
+    message: output.split(/\r?\n/).find(Boolean) ?? "Tool call failed",
+    details: cloneJson(result?.details ?? null),
+    excerpt: truncate(output, TOOL_ERROR_EXCERPT_LIMIT),
+  };
+}
+
+function extractToolOutput(result) {
+  const content = result?.content;
+  if (!Array.isArray(content)) return typeof result === "string" ? result : "";
+  return content.filter((item) => item?.type === "text").map((item) => item.text ?? "").join("\n");
+}
+
+function cloneJson(value) {
+  try {
+    return JSON.parse(JSON.stringify(value ?? null));
+  } catch {
+    return null;
+  }
+}
+
+function truncate(text, limit) {
+  const value = String(text ?? "");
+  return value.length > limit ? `${value.slice(0, limit)}\n[truncated]` : value;
+}

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

@@ -17,6 +17,7 @@ export async function runRunnerTurn({
   syncCurrentPiSidecar,
   autoNameSession,
   contextMode = "rebuild",
+  recordHistory = null,
 }) {
   const {
     userRecallHints = [],
@@ -80,6 +81,7 @@ export async function runRunnerTurn({
       midTurnRecallHints,
       syncCurrentPiSidecar,
       autoNameSession,
+      recordHistory,
     });
     return { draft: turnState.draft };
   } finally {
@@ -127,19 +129,20 @@ function logSessionEvent(logger, event) {
   });
 }
 
-function finalizeTurn({ prompt, userMessage, userRecallHints, currentProject, memoryStore, engine, ui, turnState, midTurnRecallHints, syncCurrentPiSidecar, autoNameSession }) {
+function finalizeTurn({ prompt, userMessage, userRecallHints, currentProject, memoryStore, engine, ui, turnState, midTurnRecallHints, syncCurrentPiSidecar, autoNameSession, recordHistory }) {
   closeAssistantReply({ ui, state: turnState });
   const assistantRecallHints = flushAssistantRecall({ memoryStore, engine, turnState, currentProject });
   engine.setPendingAssistantRecallHints?.(assistantRecallHints);
   const recordedAssistantRecallHints = uniqueHints([...midTurnRecallHints, ...assistantRecallHints]);
 
-  engine.recordTurn({
+  const turn = engine.recordTurn({
     userMessage: userMessage ?? prompt.slice(0, 300),
     assistantMessage: turnState.draft,
     assistantContext: compactAssistantContext(turnState),
     userRecallHints,
     assistantRecallHints: recordedAssistantRecallHints,
   });
+  recordHistory?.({ ...turn, thinking: assistantThinkingText(turnState), toolCalls: turnState.toolCalls });
 
   autoNameSession?.();
   syncCurrentPiSidecar();

package/src/cli/commands/registry/slash-command-registry.mjs

@@ -97,13 +97,16 @@ export const SLASH_COMMANDS = [
   exactCommand({
     name: "status",
     description: "Show runtime status",
-    run: async ({ ui, runner, sessionState, sessionSource }) => writeLines(ui, statusCommand({
-      runner,
-      sessionState,
-      sessionSource,
-      extensionDiagnostics: runner.getExtensionDiagnostics?.() ?? [],
-      lifecycleState: runner.getExtensionLifecycleState?.() ?? null,
-    })),
+    run: async ({ ui, runner, sessionState, sessionSource }) => {
+      await runner.getProviderQuotaSnapshot?.({ emit: true }).catch(() => null);
+      return writeLines(ui, statusCommand({
+        runner,
+        sessionState,
+        sessionSource,
+        extensionDiagnostics: runner.getExtensionDiagnostics?.() ?? [],
+        lifecycleState: runner.getExtensionLifecycleState?.() ?? null,
+      }));
+    },
   }),
   exactCommand({
     name: "notify",

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

@@ -10,15 +10,20 @@ export function statusCommand({
   lifecycleState = null,
   gitBranch = getGitBranch(runner.engine.cwd),
 }) {
-  return [formatStatusLine({
-    engine: runner.engine,
-    sessionState,
-    sessionStats: runner.getSessionStats?.() ?? null,
-    sessionSource,
-    extensionDiagnostics,
-    lifecycleState,
-    gitBranch,
-  })];
+  const providerQuota = runner.getCachedProviderQuotaSnapshot?.() ?? null;
+  const lines = [
+    ...formatStatusLines({
+      engine: runner.engine,
+      sessionState,
+      sessionStats: runner.getSessionStats?.() ?? null,
+      sessionSource,
+      extensionDiagnostics,
+      lifecycleState,
+      gitBranch,
+    }),
+    ...formatProviderQuotaLines(providerQuota),
+  ];
+  return lines.length > 0 ? lines : ["No provider quota available."];
 }
 
 export function statusBarLine({
@@ -37,35 +42,48 @@ export function statusBarLine({
   });
 }
 
-export function formatStatusLine({
-  engine,
-  sessionState,
-  sessionStats = null,
-  sessionSource = "pi",
+export function formatStatusLine(options) {
+  return formatStatusLines(options).join("  ");
+}
+
+export function formatStatusLines({
   extensionDiagnostics = [],
   lifecycleState = null,
-  gitBranch = null,
 }) {
-  const statsSessionId = sessionStats?.sessionId ?? sessionState?.sessionId ?? "unknown";
-  const tokens = sessionStats?.tokens
-    ? `${sessionStats.tokens.input ?? 0}in/${sessionStats.tokens.output ?? 0}out`
-    : "n/a";
-  const parts = [
-    `git:${gitBranch || "none"}`,
-    `session:${statsSessionId}`,
-    `source:${sessionSource}`,
-  ];
-  if (engine.sessionName) parts.push(`name:${engine.sessionName}`);
-  const remoteMemories = engine.remoteMemorySources ?? [];
-  if (remoteMemories.length > 0) parts.push(`remote-memory:${remoteMemories.map((source) => source.name).join(",")}`);
-  parts.push(
-    `model:${engine.modelId}`,
-    `provider:${engine.provider}`,
-    `thinking:${engine.thinkingLevel ?? "unknown"}`,
-    `tokens:${tokens}`,
-    `ext:${formatExtensionDiagnosticSummary(extensionDiagnostics, lifecycleState)}`,
-  );
-  return parts.join("  ");
+  const diagnosticSummary = formatExtensionDiagnosticSummary(extensionDiagnostics, lifecycleState);
+  return shouldShowDiagnostics(diagnosticSummary) ? [`Extensions: ${diagnosticSummary}`] : [];
+}
+
+export function formatProviderQuotaLines(providerQuota, { width = 20 } = {}) {
+  const windows = providerQuota?.limits?.flatMap((limit) => limit.windows ?? []) ?? [];
+  return windows.slice(0, 2).map((window) => formatProviderQuotaLine(window, { width }));
+}
+
+export function formatProviderQuotaLine(window, { width = 20 } = {}) {
+  const label = window.label === "weekly" ? "Weekly limit:" : `${window.label} limit:`;
+  const left = formatPercent(window.remainingPercent);
+  return `${label.padEnd(28)} ${formatQuotaBar(window.remainingPercent, width)} ${left}% left (${formatQuotaReset(window.resetsAt)})`;
+}
+
+export function formatQuotaBar(percent, width = 20) {
+  const value = Math.max(0, Math.min(100, Number(percent) || 0));
+  const filled = Math.round((value / 100) * width);
+  return `[${"█".repeat(filled)}${"░".repeat(width - filled)}]`;
+}
+
+export function formatQuotaReset(resetsAt) {
+  if (!resetsAt) return "reset unknown";
+  const date = new Date(resetsAt);
+  if (Number.isNaN(date.getTime())) return "reset unknown";
+  return `resets ${formatResetDate(date)}`;
+}
+
+function formatResetDate(date) {
+  const hours = String(date.getHours()).padStart(2, "0");
+  const minutes = String(date.getMinutes()).padStart(2, "0");
+  const day = date.getDate();
+  const month = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"][date.getMonth()];
+  return `${hours}:${minutes} on ${day} ${month}`;
 }
 
 export function formatStatusBarLine({
@@ -154,6 +172,10 @@ export function formatCompactTokenCount(tokens) {
   return `${formatOneDecimal(value / 1000000)}M`;
 }
 
+function shouldShowDiagnostics(summary) {
+  return summary !== "ok" && summary.split(",").some((part) => !part.endsWith("info"));
+}
+
 export function formatExtensionDiagnosticSummary(extensionDiagnostics = [], lifecycleState = null) {
   const diagnostics = [...extensionDiagnostics, ...(lifecycleState?.diagnostics ?? [])];
   if (diagnostics.length === 0) return "ok";
@@ -194,3 +216,7 @@ function formatOneDecimal(value) {
   const rounded = Math.round(value * 10) / 10;
   return Number.isInteger(rounded) ? String(rounded) : rounded.toFixed(1);
 }
+
+function formatPercent(value) {
+  return Math.round(Math.max(0, Math.min(100, Number(value) || 0)));
+}

package/src/cli/input/history-store.mjs

@@ -1,8 +1,10 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { closeSync, existsSync, mkdirSync, openSync, readFileSync, renameSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
 
 const HISTORY_VERSION = 1;
 const MAX_HISTORY_ITEMS = 100;
+const LOCK_WAIT_MS = 2000;
+const LOCK_STALE_MS = 5000;
 
 export function createInputHistoryStore({ path, maxItems = MAX_HISTORY_ITEMS } = {}) {
   return {
@@ -20,8 +22,10 @@ export function createInputHistoryStore({ path, maxItems = MAX_HISTORY_ITEMS } =
     save(items) {
       if (!path) return;
       const normalized = normalizeItems(items, maxItems);
-      mkdirSync(dirname(path), { recursive: true });
-      writeFileSync(path, `${JSON.stringify({ version: HISTORY_VERSION, items: normalized }, null, 2)}\n`, "utf8");
+      withHistoryLock(path, () => {
+        const merged = mergeItems(normalized, this.load(), maxItems);
+        writeHistoryFile(path, merged);
+      });
     },
   };
 }
@@ -33,3 +37,61 @@ function normalizeItems(items, maxItems) {
     .filter(Boolean)
     .slice(0, maxItems);
 }
+
+function mergeItems(primaryItems, existingItems, maxItems) {
+  const merged = [];
+  const seen = new Set();
+  for (const item of [...primaryItems, ...existingItems]) {
+    if (seen.has(item)) continue;
+    seen.add(item);
+    merged.push(item);
+    if (merged.length >= maxItems) break;
+  }
+  return merged;
+}
+
+function writeHistoryFile(path, items) {
+  mkdirSync(dirname(path), { recursive: true });
+  const tmpPath = `${path}.${process.pid}.${Date.now()}.tmp`;
+  const payload = `${JSON.stringify({ version: HISTORY_VERSION, items }, null, 2)}\n`;
+  writeFileSync(tmpPath, payload, "utf8");
+  renameSync(tmpPath, path);
+}
+
+function withHistoryLock(path, fn) {
+  mkdirSync(dirname(path), { recursive: true });
+  const lockPath = `${path}.lock`;
+  const fd = acquireLock(lockPath);
+  try {
+    return fn();
+  } finally {
+    closeSync(fd);
+    try { unlinkSync(lockPath); } catch {}
+  }
+}
+
+function acquireLock(lockPath) {
+  const start = Date.now();
+  while (true) {
+    try {
+      const fd = openSync(lockPath, "wx");
+      writeFileSync(fd, `${process.pid}\n`, "utf8");
+      return fd;
+    } catch (err) {
+      if (err?.code !== "EEXIST") throw err;
+      removeStaleLock(lockPath);
+      if (Date.now() - start >= LOCK_WAIT_MS) throw err;
+      sleepSync(25);
+    }
+  }
+}
+
+function removeStaleLock(lockPath) {
+  try {
+    if (Date.now() - statSync(lockPath).mtimeMs > LOCK_STALE_MS) unlinkSync(lockPath);
+  } catch {}
+}
+
+function sleepSync(ms) {
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}

package/src/cli/repl-loop.mjs

@@ -14,12 +14,13 @@ export async function runSingleShotPrompt({
   refreshStatusBar,
   modeState = null,
 }) {
-  const turnInput = prepareTurnInput({ prompt, runner, memoryStore, currentProject, modeState });
-  ui.writeln(turnInput.displayMessage);
-  ui.recall?.({ source: "user", hints: turnInput.userRecallHints });
-  if (turnInput.shouldRenderCarryoverRecall) ui.recall?.({ source: "assistant", hints: turnInput.carryoverRecallHints });
-  refreshStatusBar.startWorking?.();
+  memoryStore.beginTurn();
   try {
+    const turnInput = prepareTurnInput({ prompt, runner, memoryStore, currentProject, modeState });
+    ui.writeln(turnInput.displayMessage);
+    ui.recall?.({ source: "user", hints: turnInput.userRecallHints });
+    if (turnInput.shouldRenderCarryoverRecall) ui.recall?.({ source: "assistant", hints: turnInput.carryoverRecallHints });
+    refreshStatusBar.startWorking?.();
     const result = await runner.runTurn(turnInput.fullPrompt, turnInput.userMessage, turnInput.runOptions);
     renderPendingAssistantRecallPreview({ runner, ui });
     await handleTurnLifecycleAction(result?.lifecycleAction, { runner, ui });
@@ -127,8 +128,9 @@ function handleInlineCommand(trimmed, { cwd, ui, lastInlineShellCommand }) {
 }
 
 async function runReplTurn({ prompt, runner, memoryStore, currentProject, ui, refreshStatusBar, setTurnRunning, modeState = null }) {
-  const turnInput = prepareTurnInput({ prompt, runner, memoryStore, currentProject, modeState });
+  memoryStore.beginTurn();
   try {
+    const turnInput = prepareTurnInput({ prompt, runner, memoryStore, currentProject, modeState });
     ui.writeln(turnInput.displayMessage);
     ui.recall?.({ source: "user", hints: turnInput.userRecallHints });
     if (turnInput.shouldRenderCarryoverRecall) ui.recall?.({ source: "assistant", hints: turnInput.carryoverRecallHints });

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

@@ -1,7 +1,6 @@
 import { basename, join, resolve } from "node:path";
 import { existsSync, mkdirSync } from "node:fs";
 import { createUI } from "../ui.mjs";
-import { createPermissionController, MODE } from "../permissions.mjs";
 import { loadKeybindings } from "../input/keybindings.mjs";
 import { createInputHistoryStore } from "../input/history-store.mjs";
 import { createModeState } from "../input/mode-state.mjs";
@@ -12,21 +11,16 @@ import { createMarchAuthStorage } from "../../auth/storage.mjs";
 import { createRuntimeRunner } from "./create-runtime-runner.mjs";
 import { createCliShellRuntime } from "../../shell/cli-runtime.mjs";
 import { MarkdownMemoryStore } from "../../memory/markdown-store.mjs";
-import { createMarkdownMemoryTools } from "../../memory/markdown-tools.mjs";
 import { discoverProjectExtensionPaths } from "../../extensions/discovery.mjs";
 import { loadProjectLifecycleHookManifests } from "../../extensions/lifecycle-manifest.mjs";
 import { loadOrCreateProjectId, resumeStartupSession } from "./startup-session.mjs";
-import { initializeMcp } from "../../mcp/index.mjs";
-import { createWebToolsFromConfig } from "../../web/tools.mjs";
-import { createModelContextDumper } from "../../debug/model-context-dumper.mjs";
 import { createLogger, installProcessLogHandlers } from "../../debug/logger.mjs";
 import { defaultProfilePaths, ensureProfileFiles } from "../../context/profiles.mjs";
-import { createDesktopTurnNotifier } from "../../notification/desktop-notifier.mjs";
 import { normalizeRemoteMemorySources } from "../../memory/remote/config.mjs";
 import { resolveMemoryRoot } from "../../memory/root.mjs";
 import { ensureBrowserDaemon } from "../../browser/client/lifecycle.mjs";
 
-export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot, useRuntimeProcess } = {}) {
+export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot } = {}) {
   if (!existsSync(stateRoot)) mkdirSync(stateRoot, { recursive: true });
   await ensureBrowserDaemon({ stateRoot }).catch(() => {});
 
@@ -67,23 +61,10 @@ export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot,
   ensureProfileFiles(profilePaths);
   const memoryStore = new MarkdownMemoryStore({ root: memoryRoot });
   const remoteMemorySources = normalizeRemoteMemorySources(config);
-  const memoryTools = createMarkdownMemoryTools(memoryStore, { remoteSources: remoteMemorySources });
   const currentProject = basename(cwd);
   const shellRuntime = args.shellRuntime ? createCliShellRuntime({ cwd }) : null;
 
-  const mcpInit = useRuntimeProcess
-    ? { clientManager: null, mcpTools: [], mcpInjections: [], errors: [] }
-    : await initializeMcp({ projectDir: cwd });
-  for (const { server, error } of mcpInit.errors) {
-    if (!args.json) process.stderr.write(`[mcp] ${server}: ${error}\n`);
-  }
-
-  const webTools = createWebToolsFromConfig(config);
-  const turnNotifier = createDesktopTurnNotifier({ enabled: Boolean(config.notifications?.turnEnd), config: config.notifications });
-  const permissionMode = args.permissionMode ?? MODE.BYPASS;
-  const permissionController = createPermissionController({ mode: permissionMode });
-  const usePiSessions = true;
-  const usePiRuntimeHost = true;
+  const permissionMode = args.permissionMode;
   const sessionSource = "pi";
   const sessionsRoot = join(projectMarchDir, "sessions");
   const sessionState = {
@@ -92,10 +73,6 @@ export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot,
   };
   sessionState.sessionDir = join(sessionsRoot, sessionState.sessionId);
   const contextDumpRoot = resolve(projectMarchDir, "context-dumps", sessionState.sessionId);
-  const modelContextDumper = createModelContextDumper({
-    enabled: args.dumpContext,
-    rootDir: contextDumpRoot,
-  });
 
   const ui = createUI({
     json: args.json,
@@ -132,10 +109,9 @@ export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot,
   let runner;
   try {
     runner = await createRuntimeRunner({
-      useRuntimeProcess, runnerOptions, ui, memoryStore, memoryTools, shellRuntime,
-      mcpTools: mcpInit.mcpTools, mcpInjections: mcpInit.mcpInjections, mcpClientManager: mcpInit.clientManager, webTools,
-      usePiSessions, usePiRuntimeHost, authStorage: authConfig.authStorage,
-      permissionController, modelContextDumper, turnNotifier, logger,
+      runnerOptions,
+      ui,
+      shellRuntime,
       refreshStatusBar: (...args) => refreshStatusBar?.(...args),
     });
   } catch (err) {

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

@@ -1,61 +1,19 @@
-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 onLspStatusChange = () => {
+    refreshStatusBar?.();
+  };
 
-  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,
-    });
-
+  const { runner } = await createRunnerProcessClient({ runnerOptions, ui, onModelPayload, onLspStatusChange });
   runner.shellRuntime ??= shellRuntime;
   return runner;
 }