march-cli 0.1.36 → 0.1.38

package/package.json

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

package/src/agent/code-search/tool.mjs

@@ -13,7 +13,7 @@ export function createCodeSearchTool({ engine, stateRoot = null }) {
   return defineTool({
     name: "code_search",
     label: "Code Search",
-    description: "Native code-aware search over the workspace. Use it to locate relevant code snippets before reading full files; use grep for exact string confirmation.",
+    description: "Native semantic/symbol code search over the workspace. Use it first for unknown entry points, cross-module flows, responsibility boundaries, and related implementations. Use grep/read afterward for exact confirmation before editing or making claims.",
     parameters: Type.Object({
       query: Type.Optional(Type.String({ description: "Natural-language or symbol query" })),
       path: Type.Optional(Type.String({ description: "Relative or absolute workspace path to search; default current workspace" })),

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

@@ -1,3 +1,13 @@
+import { installCodexTransportCompression } from "./codex-transport-compression.mjs";
+import { installCodexWebSocketEventDebug } from "./codex-websocket-event-debug.mjs";
+import { installCodexLargeContextGuard } from "./codex-large-context-guard.mjs";
+
+export function installRunnerProcessGuards() {
+  installCodexLargeContextGuard();
+  installCodexTransportCompression();
+  installCodexWebSocketEventDebug();
+}
+
 export function providerContextToPayload(providerContext) {
   return {
     messages: [
@@ -22,3 +32,13 @@ export function notifyTurnEndDetached(turnNotifier, event, onResult = () => {})
   pending.then(onResult, () => {});
   return pending;
 }
+
+
+export function buildNotificationActivation({ notificationContext, sessionStats }) {
+  if (!notificationContext?.projectId) return null;
+  return {
+    type: "workspace-session",
+    projectId: notificationContext.projectId,
+    sessionId: sessionStats?.sessionId ?? null,
+  };
+}

package/src/agent/runner.mjs

@@ -11,11 +11,9 @@ import { runRunnerCleanup } from "./runner/runner-cleanup.mjs";
 import { createRunnerRuntimeHost } from "./runtime/runner-runtime-host.mjs";
 import { createRuntimeUiBridge } from "./runtime/ui-event-bridge.mjs";
 import { getRunnerSessionStats, syncEngineSessionState } from "./runner/runner-session-state.mjs";
-import { notifyTurnEndBestEffort, notifyTurnEndDetached, providerContextToPayload } from "./runner/runner-utils.mjs";
+import { buildNotificationActivation, installRunnerProcessGuards, notifyTurnEndBestEffort, notifyTurnEndDetached, providerContextToPayload } from "./runner/runner-utils.mjs";
 import { dumpCodexTransportDebug, getCodexTransportDebugSnapshot } from "./runner/codex-transport-debug.mjs";
-import { installCodexWebSocketEventDebug } from "./runner/codex-websocket-event-debug.mjs";
-import { installCodexTransportCompression } from "./runner/codex-transport-compression.mjs";
-import { applyCodexLargeContextGuardToPayload, installCodexLargeContextGuard } from "./runner/codex-large-context-guard.mjs";
+import { applyCodexLargeContextGuardToPayload } from "./runner/codex-large-context-guard.mjs";
 import { resolveRunnerSessionOptions } from "./session/session-options.mjs";
 import { createSessionBinding } from "./session/session-binding.mjs";
 import { maybeAutoNameSession } from "./session/session-auto-name.mjs";
@@ -28,19 +26,14 @@ import { registerCustomProviders } from "../provider/custom-provider.mjs";
 import { injectHostedTools } from "../provider/hosted-tools.mjs";
 import { createRunnerLifecycle } from "./lifecycle/runner-lifecycle.mjs";
 import { createRunnerProviderQuotaRuntime } from "./runner/provider-quota-runtime.mjs";
+import { appendRunnerTurnHistory, createRunnerHistoryStore } from "../history/runner.mjs";
 export { MARCH_BASE_TOOL_NAMES, installModelPayloadDumper };
 export { createDefaultSessionManager, resolveRunnerSessionManager } from "./runner/runner-init.mjs";
 export { getRunnerSessionStats, syncEngineSessionState } from "./runner/runner-session-state.mjs";
-export async function createRunner({ cwd, modelId = null, provider = null, providers = {}, stateRoot, ui, memoryRoot = null, profilePaths = null, memoryStore = null, memoryTools = [], remoteMemorySources = [], shellRuntime = null, mcpTools = [], mcpInjections = [], mcpClientManager = null, webTools = [], namespace = "", sessionManager = null, useRuntimeHost = false, projectMarchDir = null, syncPiSidecar = false, extensionPaths = [], lifecycleHooks = [], lifecycleDiagnostics = [], authStorage = null, permissionController = null, modelContextDumper = null, turnNotifier = null, logger = null, onModelPayload = null, createAgentSessionImpl = createAgentSession, createAgentSessionRuntimeImpl, createRuntimeServices, createRuntimeSessionFromServices, maxTurns, trimBatch, serviceTier = null, hostedTools = {} }) {
-  installCodexLargeContextGuard();
-  installCodexTransportCompression();
-  installCodexWebSocketEventDebug();
-  if (!useRuntimeHost && extensionPaths.length > 0) {
-    throw new Error("--extension requires the default pi runtime host path");
-  }
-  const authConfig = authStorage
-    ? { authStorage, hasAuth: true }
-    : createMarchAuthStorage({ provider: provider ?? "deepseek", providers, cwd });
+export async function createRunner({ cwd, modelId = null, provider = null, providers = {}, stateRoot, ui, memoryRoot = null, profilePaths = null, memoryStore = null, memoryTools = [], remoteMemorySources = [], shellRuntime = null, mcpTools = [], mcpInjections = [], mcpClientManager = null, webTools = [], namespace = "", sessionManager = null, useRuntimeHost = false, projectMarchDir = null, syncPiSidecar = false, extensionPaths = [], lifecycleHooks = [], lifecycleDiagnostics = [], authStorage = null, modelContextDumper = null, turnNotifier = null, logger = null, onModelPayload = null, onLspStatusChange = null, createAgentSessionImpl = createAgentSession, createAgentSessionRuntimeImpl, createRuntimeServices, createRuntimeSessionFromServices, maxTurns, trimBatch, serviceTier = null, hostedTools = {}, notificationContext = null }) {
+  installRunnerProcessGuards();
+  if (!useRuntimeHost && extensionPaths.length > 0) throw new Error("--extension requires the default pi runtime host path");
+  const authConfig = authStorage ? { authStorage, hasAuth: true } : createMarchAuthStorage({ provider: provider ?? "deepseek", providers, cwd });
   if (!authConfig.hasAuth) throw new Error("No providers configured. Run: march provider --config");
   const resolvedAuth = authConfig.authStorage;
   const modelRegistry = ModelRegistry.create(resolvedAuth);
@@ -55,8 +48,9 @@ export async function createRunner({ cwd, modelId = null, provider = null, provi
     retry: { enabled: true, maxRetries: 3, baseDelayMs: 2000 },
   });
   const { ui: runtimeUi, eventBus: runtimeUiEvents, detach: detachRuntimeUi } = createRuntimeUiBridge(ui);
-  const lspService = new LspService({ cwd, onEvent: (event) => runtimeUi.status?.(formatLspServiceEvent(event)) });
+  const lspService = new LspService({ cwd, onEvent: (event) => runtimeUi.status?.(formatLspServiceEvent(event)), onStatusChange: (event) => onLspStatusChange?.(event) });
   const engine = new ContextEngine({ cwd, modelId, provider, namespace, memoryRoot, profilePaths, remoteMemorySources, shellRuntime, lspService, injections: mcpInjections, maxTurns, trimBatch });
+  const historyStore = createRunnerHistoryStore({ stateRoot, cwd });
   const resolvedSessionManager = resolveRunnerSessionManager(cwd, sessionManager);
   const sessionBinding = createSessionBinding(null);
   let currentModelCallKind = "model", currentTurnId = null, currentPromptForContext = "";
@@ -72,8 +66,8 @@ export async function createRunner({ cwd, modelId = null, provider = null, provi
       providers,
       sessionManager: resolvedSessionManager, sessionBinding, engine, ui: runtimeUi,
       projectMarchDir,
-      memoryTools, memoryStore, shellRuntime, lspService, mcpTools, webTools,
-      lifecycle, permissionController, extensionPaths, hostedTools,
+      memoryTools, memoryStore, historyStore, shellRuntime, lspService, mcpTools, webTools,
+      lifecycle, extensionPaths, hostedTools,
       onRebind: (session) => {
         installModelPayloadDumper(session, modelContextDumper, () => currentModelCallKind, onLoggedModelPayload, injectMarchSystemContext);
         syncEngineSessionState(engine, session);
@@ -85,7 +79,7 @@ export async function createRunner({ cwd, modelId = null, provider = null, provi
   } else {
     const sessionOptions = resolveRunnerSessionOptions({
       cwd, stateRoot, provider, modelId, modelRegistry, engine, ui: runtimeUi,
-      memoryTools, shellRuntime, lspService, mcpTools, webTools, lifecycle, permissionController,
+      memoryTools, historyStore, shellRuntime, lspService, mcpTools, webTools, lifecycle,
       authStorage: resolvedAuth, projectMarchDir,
       getCurrentModel: () => sessionBinding.get()?.model ?? selectedModel,
     });
@@ -134,12 +128,14 @@ export async function createRunner({ cwd, modelId = null, provider = null, provi
           syncCurrentPiSidecar,
           autoNameSession,
           contextMode,
+          recordHistory: (turn) => appendRunnerTurnHistory({ store: historyStore, turn, sessionStats: getRunnerSessionStats(sessionBinding.get(), runtimeHost), modelId: engine.modelId, provider: engine.provider }),
         });
         notifyTurnEndDetached(turnNotifier, {
           status: "success",
           sessionName: engine.sessionName,
           draft: result?.draft ?? "",
           durationMs: Date.now() - turnStartedAt,
+          activation: buildNotificationActivation({ notificationContext, sessionStats: getRunnerSessionStats(sessionBinding.get(), runtimeHost) }),
         }, (notificationResult) => { lastNotificationResult = notificationResult; });
         const lifecycleAction = lifecycle.takePendingAction();
         if (lifecycleAction) result.lifecycleAction = lifecycleAction;
@@ -151,6 +147,7 @@ export async function createRunner({ cwd, modelId = null, provider = null, provi
           sessionName: engine.sessionName,
           errorMessage: err?.message ?? String(err),
           durationMs: Date.now() - turnStartedAt,
+          activation: buildNotificationActivation({ notificationContext, sessionStats: getRunnerSessionStats(sessionBinding.get(), runtimeHost) }),
         }, (notificationResult) => { lastNotificationResult = notificationResult; });
         turnLog.endError(err);
         throw err;
@@ -258,6 +255,7 @@ export async function createRunner({ cwd, modelId = null, provider = null, provi
       ]);
     },
   };
+  return runner;
   function syncCurrentPiSidecar() {
     return syncPiSessionSidecar({
       enabled: syncPiSidecar, projectMarchDir, engine,

package/src/agent/runtime/remote-ui-client.mjs

@@ -15,6 +15,5 @@ export function createRemoteRuntimeUiClient(peer) {
     debugLines: (lines) => peer.notify("uiEvent", { type: "debug_lines", lines }),
     recall: ({ source, hints }) => peer.notify("uiEvent", { type: "recall", source, hints }),
     editDiff: (path, diffLines) => peer.notify("uiEvent", { type: "edit_diff", path, diffLines }),
-    requestPermission: (request) => peer.call("uiRequest", { type: "permission_request", ...request }),
   };
 }

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

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

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

@@ -8,7 +8,6 @@ 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";
@@ -23,7 +22,6 @@ const DEFAULT_DEPS = {
   createMarkdownMemoryTools,
   initializeMcp,
   createWebToolsFromConfig,
-  createPermissionController,
   resolvePiSessionManager,
   createModelContextDumper,
   createMarchAuthStorage,
@@ -85,14 +83,16 @@ export async function createIsolatedRunner(options = {}, deps = {}) {
     maxTurns: options.config?.maxTurns ?? undefined,
     trimBatch: options.config?.trimBatch ?? undefined,
     hostedTools: options.config?.hostedTools,
-    permissionController: d.createPermissionController({ mode: options.permissionMode }),
+    notificationContext: options.notificationContext,
     modelContextDumper: d.createModelContextDumper(options.modelContextDumper ?? { enabled: false }),
     turnNotifier: d.createDesktopTurnNotifier({
       enabled: Boolean(options.config?.notifications?.turnEnd),
       config: options.config?.notifications,
+      onActivation: (activation) => d.peer.notify("notificationActivation", activation),
     }),
     logger,
     onModelPayload: (event) => d.peer.notify("modelPayload", pickModelPayloadEvent(event)),
+    onLspStatusChange: (event) => d.peer.notify("lspStatusChange", pickLspStatusEvent(event)),
   });
 
   const originalDispose = runner.dispose;
@@ -109,3 +109,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,12 +20,12 @@ export async function createRunnerRuntimeHost({
   ui,
   projectMarchDir = null,
   memoryTools = [],
+  historyStore = null,
   shellRuntime = null,
   lspService = null,
   mcpTools = [],
   webTools = [],
   lifecycle = null,
-  permissionController = null,
   extensionPaths = [],
   hostedTools = {},
   onRebind = null,
@@ -56,12 +56,12 @@ export async function createRunnerRuntimeHost({
         engine,
         ui,
         memoryTools,
+        historyStore,
         shellRuntime,
         lspService,
         mcpTools,
         webTools,
         lifecycle,
-        permissionController,
         authStorage,
         projectMarchDir,
         hostedTools,

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

@@ -53,7 +53,6 @@ export function createRuntimeUiClient(eventBus) {
     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 }),
   };
 }
 
@@ -75,7 +74,6 @@ export function dispatchRuntimeUiEvent(ui, event) {
     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,12 +10,12 @@ export function resolveRunnerSessionOptions({
   engine,
   ui,
   memoryTools = [],
+  historyStore = null,
   shellRuntime = null,
   lspService = null,
   mcpTools = [],
   webTools = [],
   lifecycle = null,
-  permissionController = null,
   authStorage = null,
   projectMarchDir = null,
   stateRoot = null,
@@ -31,7 +31,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, 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

@@ -7,17 +7,18 @@ import { createReadImageTool } from "./file-tools/read-image-tool.mjs";
 import { createSendBinaryTool } from "./output/send-binary-tool.mjs";
 import { createScreenTool } from "./screen-tools/screen-tool.mjs";
 import { createListWindowsTool } from "./screen-tools/list-windows-tool.mjs";
-import { toolText } from "./tool-result.mjs";
 import { createShellTools } from "../shell/tools.mjs";
 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, 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 });
@@ -36,6 +37,7 @@ export function createMarchCustomTools({ cwd, engine, ui, memoryTools = [], shel
     commandExecTool,
     editFileTool,
     ...createShellTools(shellRuntime),
+    ...(historySearchTool ? [historySearchTool] : []),
     ...memoryTools,
     ...mcpTools,
     ...webTools,
@@ -44,25 +46,5 @@ export function createMarchCustomTools({ cwd, engine, ui, memoryTools = [], shel
     ...(authStorage ? [createSuperGrokTool({ authStorage, projectMarchDir })] : []),
     ...(authStorage ? initImageGen({ authStorage, projectMarchDir }) : []),
   ];
-
-  if (!permissionController) return tools;
-
-  return tools.map((tool) => {
-    const execute = tool.execute;
-    if (!execute) return tool;
-    const wrapped = async (toolCallId, params, signal, onUpdate) => {
-      const decision = await permissionController.requestApproval(
-        tool.name,
-        params,
-        ui.requestPermission
-          ? (ctx) => ui.requestPermission(ctx)
-          : null,
-      );
-      if (decision.behavior === "deny") {
-        return toolText(`Permission denied: ${decision.message}`, { error: true, permissionDenied: true });
-      }
-      return execute(toolCallId, params, signal, onUpdate);
-    };
-    return { ...tool, execute: wrapped };
-  });
+  return tools;
 }

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/args.mjs

@@ -17,7 +17,6 @@ export function parseCliArgs(argv) {
       "pi-runtime-host": { type: "boolean" },
       "shell-runtime": { type: "boolean" },
       "no-shell-runtime": { type: "boolean" },
-      "permission-mode": { type: "string" },
       host: { type: "string" },
       port: { type: "string" },
       "api-port": { type: "string" },
@@ -47,7 +46,6 @@ export function parseCliArgs(argv) {
     piSessions: values["pi-sessions"] ?? false,
     piRuntimeHost: values["pi-runtime-host"] ?? false,
     shellRuntime: values["no-shell-runtime"] ? false : true,
-    permissionMode: values["permission-mode"] ?? "bypassPermissions",
     host: values.host ?? null,
     port: values.port ?? null,
     apiPort: values["api-port"] ?? null,
@@ -97,7 +95,6 @@ Options:
   --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)
   --host <host>        With memory serve/web, bind host (default: 127.0.0.1)

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

@@ -12,6 +12,7 @@ import { handleSessionNameCommand, parseSessionNameCommand } from "../../session
 import { handleShellCommand, parseShellCommand } from "../../shell/shell-command.mjs";
 import { handleProviderCommand, parseProviderCommand } from "../provider-command.mjs";
 import { handleModeCommand, parseModeCommand } from "../mode-command.mjs";
+import { WORKSPACE_SLASH_COMMANDS } from "../../workspace/command.mjs";
 
 export const SLASH_COMMANDS = [
   exactCommand({
@@ -94,6 +95,7 @@ export const SLASH_COMMANDS = [
     parse: parseThinkingCommand,
     run: async (ctx, command) => writeLines(ctx.ui, await handleThinkingCommand(command, { runner: ctx.runner, ui: ctx.ui })),
   }),
+  ...WORKSPACE_SLASH_COMMANDS,
   exactCommand({
     name: "status",
     description: "Show runtime status",

package/src/cli/fallback-ui.mjs

@@ -48,7 +48,6 @@ export function createJsonUI() {
     editDiff: (path, diffLines) => {
       stdout.write(JSON.stringify({ type: "edit_diff", path, diff: diffLines }) + "\n");
     },
-    requestPermission: async () => true,
     setEscapeHandler: () => {},
     setCtrlCHandler: () => {},
     setShiftTabHandler: () => {},
@@ -137,7 +136,6 @@ export function createPlainUI() {
         else stdout.write(`${dim(`      ${d.text}`)}\n`);
       }
     },
-    requestPermission: async () => true,
     setEscapeHandler: () => {},
     setCtrlCHandler: () => {},
     setShiftTabHandler: () => {},

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/input/mode-state.mjs

@@ -34,7 +34,7 @@ export function formatModeReminder(mode = MODES.DO) {
       "</mode>";
   }
   return "<mode>\n" +
-    "You are in do mode. You may implement changes when the user asks for execution, following normal permissions and project rules.\n" +
+    "You are in do mode. You may implement changes when the user asks for execution, following normal project rules.\n" +
     "</mode>";
 }