march-cli 0.1.37 → 0.1.38

package/package.json

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

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";
@@ -32,10 +30,8 @@ import { appendRunnerTurnHistory, createRunnerHistoryStore } from "../history/ru
 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, onLspStatusChange = null, createAgentSessionImpl = createAgentSession, createAgentSessionRuntimeImpl, createRuntimeServices, createRuntimeSessionFromServices, maxTurns, trimBatch, serviceTier = null, hostedTools = {} }) {
-  installCodexLargeContextGuard();
-  installCodexTransportCompression();
-  installCodexWebSocketEventDebug();
+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");
@@ -71,7 +67,7 @@ export async function createRunner({ cwd, modelId = null, provider = null, provi
       sessionManager: resolvedSessionManager, sessionBinding, engine, ui: runtimeUi,
       projectMarchDir,
       memoryTools, memoryStore, historyStore, shellRuntime, lspService, mcpTools, webTools,
-      lifecycle, permissionController, extensionPaths, hostedTools,
+      lifecycle, extensionPaths, hostedTools,
       onRebind: (session) => {
         installModelPayloadDumper(session, modelContextDumper, () => currentModelCallKind, onLoggedModelPayload, injectMarchSystemContext);
         syncEngineSessionState(engine, session);
@@ -83,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, historyStore, shellRuntime, lspService, mcpTools, webTools, lifecycle, permissionController,
+      memoryTools, historyStore, shellRuntime, lspService, mcpTools, webTools, lifecycle,
       authStorage: resolvedAuth, projectMarchDir,
       getCurrentModel: () => sessionBinding.get()?.model ?? selectedModel,
     });
@@ -139,6 +135,7 @@ export async function createRunner({ cwd, modelId = null, provider = null, provi
           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;
@@ -150,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;
@@ -257,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

@@ -11,6 +11,7 @@ export async function createRunnerProcessClient({
   ui,
   onModelPayload = null,
   onLspStatusChange = null,
+  onNotificationActivation = null,
   entry = fileURLToPath(DEFAULT_ENTRY),
   forkImpl = fork,
   timeoutMs = 0,
@@ -51,6 +52,7 @@ export async function createRunnerProcessClient({
           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,11 +83,12 @@ 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)),

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

@@ -26,7 +26,6 @@ export async function createRunnerRuntimeHost({
   mcpTools = [],
   webTools = [],
   lifecycle = null,
-  permissionController = null,
   extensionPaths = [],
   hostedTools = {},
   onRebind = null,
@@ -63,7 +62,6 @@ export async function createRunnerRuntimeHost({
         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

@@ -16,7 +16,6 @@ export function resolveRunnerSessionOptions({
   mcpTools = [],
   webTools = [],
   lifecycle = null,
-  permissionController = null,
   authStorage = null,
   projectMarchDir = null,
   stateRoot = null,
@@ -32,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, historyStore, 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,7 +7,6 @@ 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";
@@ -15,7 +14,7 @@ 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 = [], historyStore = null, 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 });
@@ -47,25 +46,5 @@ export function createMarchCustomTools({ cwd, engine, ui, memoryTools = [], hist
     ...(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/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/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>";
 }
 

package/src/cli/repl-loop.mjs

@@ -37,6 +37,10 @@ export async function runInteractiveRepl({
   runner,
   memoryStore,
   currentProject,
+  currentProjectInfo = null,
+  workspaceSupervisor = null,
+  workspaceOutputRouter = null,
+  stateRoot = null,
   sessionState,
   sessionsRoot,
   projectMarchDir,
@@ -58,7 +62,8 @@ export async function runInteractiveRepl({
     let trimmed = line.trim();
     if (!trimmed) continue;
 
-    const handledInline = handleInlineCommand(trimmed, { cwd, ui, lastInlineShellCommand });
+    const active = getActiveRuntime({ workspaceSupervisor, cwd, runner, memoryStore, currentProject, currentProjectInfo, sessionState, sessionsRoot, projectMarchDir, extensionPaths, keybindingConfig, promptTemplateConfig });
+    const handledInline = handleInlineCommand(trimmed, { cwd: active.cwd, ui, lastInlineShellCommand });
     if (handledInline.type === "handled") {
       lastInlineShellCommand = handledInline.lastInlineShellCommand;
       continue;
@@ -67,45 +72,70 @@ export async function runInteractiveRepl({
 
     const slashResult = await handleSlashCommand(trimmed, {
       ui,
-      runner,
-      sessionState,
-      sessionsRoot,
-      projectMarchDir,
+      runner: active.runner,
+      workspaceSupervisor,
+      workspaceOutputRouter,
+      sessionState: active.sessionState,
+      sessionsRoot: active.sessionsRoot,
+      projectMarchDir: active.projectMarchDir,
       sessionSource,
-      extensionPaths,
-      keybindings: keybindingConfig.keybindings,
-      keybindingDiagnostics: keybindingConfig.diagnostics,
-      promptTemplates: promptTemplateConfig.templates,
-      promptTemplateDiagnostics: promptTemplateConfig.diagnostics,
+      extensionPaths: active.extensionPaths,
+      keybindings: active.keybindingConfig.keybindings,
+      keybindingDiagnostics: active.keybindingConfig.diagnostics,
+      promptTemplates: active.promptTemplateConfig.templates,
+      promptTemplateDiagnostics: active.promptTemplateConfig.diagnostics,
       modeState,
       renderStartupBanner,
       configHomeDir,
+      stateRoot,
+      currentProjectId: active.project?.projectId ?? null,
     });
     if (slashResult.exit) break;
     if (slashResult.handled) {
-      refreshStatusBar(contextTokenRefreshOptions(slashResult, runner));
+      const refreshedActive = getActiveRuntime({ workspaceSupervisor, cwd, runner, memoryStore, currentProject, currentProjectInfo, sessionState, sessionsRoot, projectMarchDir, extensionPaths, keybindingConfig, promptTemplateConfig });
+      refreshStatusBar(contextTokenRefreshOptions(slashResult, refreshedActive.runner));
       continue;
     }
 
-    const templateResult = expandPromptTemplate(trimmed, promptTemplateConfig.templates);
+    const turnActive = getActiveRuntime({ workspaceSupervisor, cwd, runner, memoryStore, currentProject, currentProjectInfo, sessionState, sessionsRoot, projectMarchDir, extensionPaths, keybindingConfig, promptTemplateConfig });
+    const templateResult = expandPromptTemplate(trimmed, turnActive.promptTemplateConfig.templates);
     if (templateResult.type === "template") {
       ui.writeln(brightBlack(`● template: ${templateResult.name}`));
       trimmed = templateResult.prompt;
     }
 
-    await runReplTurn({
+    if (turnActive.turnTask) {
+      ui.writeln("This session is still running. Use /switch to start or inspect another session.");
+      continue;
+    }
+
+    startReplTurn({
+      runtime: turnActive,
       prompt: trimmed,
-      runner,
-      memoryStore,
-      currentProject,
       ui,
       refreshStatusBar,
       setTurnRunning,
+      workspaceSupervisor,
       modeState,
     });
   }
 }
 
+export function getActiveRuntime({ workspaceSupervisor, cwd, runner, memoryStore, currentProject, currentProjectInfo, sessionState, sessionsRoot, projectMarchDir, extensionPaths, keybindingConfig, promptTemplateConfig }) {
+  return workspaceSupervisor?.getActive?.() ?? {
+    project: currentProjectInfo,
+    cwd,
+    runner,
+    memoryStore,
+    currentProject,
+    sessionState,
+    sessionsRoot,
+    projectMarchDir,
+    extensionPaths,
+    keybindingConfig,
+    promptTemplateConfig,
+  };
+}
 export function contextTokenRefreshOptions(slashResult, runner) {
   if (!slashResult?.refreshContextTokens) return undefined;
   if (typeof runner.estimateContextTokens !== "function") return undefined;
@@ -127,6 +157,27 @@ function handleInlineCommand(trimmed, { cwd, ui, lastInlineShellCommand }) {
   return { type: "none" };
 }
 
+function startReplTurn({ runtime, prompt, ui, refreshStatusBar, setTurnRunning, workspaceSupervisor = null, modeState = null }) {
+  const turnUi = runtime.ui ?? ui;
+  const task = runReplTurn({
+    prompt,
+    runner: runtime.runner,
+    memoryStore: runtime.memoryStore,
+    currentProject: runtime.currentProject,
+    ui: turnUi,
+    refreshStatusBar,
+    setTurnRunning,
+    modeState,
+  }).finally(() => {
+    if (runtime.turnTask === task) runtime.turnTask = null;
+    const hasRunningTurn = Boolean(workspaceSupervisor?.hasRunningTurn?.());
+    setTurnRunning(hasRunningTurn);
+    if (!hasRunningTurn) refreshStatusBar.stopWorking?.();
+    refreshStatusBar();
+  });
+  runtime.turnTask = task;
+}
+
 async function runReplTurn({ prompt, runner, memoryStore, currentProject, ui, refreshStatusBar, setTurnRunning, modeState = null }) {
   memoryStore.beginTurn();
   try {
@@ -143,10 +194,7 @@ async function runReplTurn({ prompt, runner, memoryStore, currentProject, ui, re
   } catch (err) {
     ui.writeln(`Error: ${err.message}`);
   } finally {
-    setTurnRunning(false);
-    refreshStatusBar.stopWorking?.();
     memoryStore.endTurn();
-    refreshStatusBar();
   }
 }
 

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

@@ -19,6 +19,11 @@ import { defaultProfilePaths, ensureProfileFiles } from "../../context/profiles.
 import { normalizeRemoteMemorySources } from "../../memory/remote/config.mjs";
 import { resolveMemoryRoot } from "../../memory/root.mjs";
 import { ensureBrowserDaemon } from "../../browser/client/lifecycle.mjs";
+import { registerProject } from "../../workspace/project-registry.mjs";
+import { listWorkspaceSessions } from "../../workspace/session-index.mjs";
+import { createWorkspaceSessionSupervisor } from "../../workspace/supervisor.mjs";
+import { createWorkspaceProjectRuntime } from "../workspace/project-runtime.mjs";
+import { createWorkspaceOutputRouter } from "../workspace/output-router.mjs";
 
 export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot } = {}) {
   if (!existsSync(stateRoot)) mkdirSync(stateRoot, { recursive: true });
@@ -56,6 +61,7 @@ export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot }
   const inputHistoryStore = createInputHistoryStore({ path: join(projectMarchDir, "input-history.json") });
   const modeState = createModeState();
   const namespace = loadOrCreateProjectId(projectMarchDir);
+  const currentProjectInfo = registerProject({ stateRoot, rootPath: cwd });
   const memoryRoot = resolveMemoryRoot(config.memoryRoot, stateRoot);
   const profilePaths = defaultProfilePaths();
   ensureProfileFiles(profilePaths);
@@ -64,7 +70,6 @@ export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot }
   const currentProject = basename(cwd);
   const shellRuntime = args.shellRuntime ? createCliShellRuntime({ cwd }) : null;
 
-  const permissionMode = args.permissionMode;
   const sessionSource = "pi";
   const sessionsRoot = join(projectMarchDir, "sessions");
   const sessionState = {
@@ -82,7 +87,8 @@ export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot }
     shellRuntime,
     historyStore: inputHistoryStore,
   });
-
+  const outputRouter = createWorkspaceOutputRouter({ ui, activeProjectId: currentProjectInfo.projectId, activeSessionId: sessionState.sessionId });
+  const runtimeUi = outputRouter.createProjectUi(currentProjectInfo.projectId, () => sessionState.sessionId);
   let turnRunning = false;
   let refreshStatusBar = null;
   const runnerOptions = {
@@ -98,21 +104,26 @@ export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot }
     namespace,
     projectMarchDir,
     extensionPaths,
-    permissionMode,
     shellRuntime: Boolean(shellRuntime),
     lifecycleHooks: lifecycleManifests.hooks,
     lifecycleDiagnostics: lifecycleManifests.diagnostics,
     modelContextDumper: { enabled: args.dumpContext, rootDir: contextDumpRoot },
     remoteMemorySources,
+    notificationContext: { projectId: currentProjectInfo.projectId },
   };
 
   let runner;
+  let workspaceSupervisor = null;
+  const onNotificationActivation = (activation) => {
+    handleNotificationActivation({ activation, stateRoot, workspaceSupervisor, outputRouter, ui }).catch((err) => ui.writeln(`Notification activation failed: ${err.message}`));
+  };
   try {
     runner = await createRuntimeRunner({
       runnerOptions,
-      ui,
+      ui: runtimeUi,
       shellRuntime,
       refreshStatusBar: (...args) => refreshStatusBar?.(...args),
+      onNotificationActivation,
     });
   } catch (err) {
     process.stderr.write(`Error: ${err.message}\n`);
@@ -121,6 +132,42 @@ export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot }
     return { ok: false, code: 1, logger };
   }
 
+  const initialRuntime = {
+    project: currentProjectInfo,
+    cwd,
+    currentProject,
+    runner,
+    ui: runtimeUi,
+    memoryStore,
+    sessionState,
+    sessionsRoot,
+    projectMarchDir,
+    extensionPaths,
+    keybindingConfig,
+    promptTemplateConfig,
+  };
+  workspaceSupervisor = createWorkspaceSessionSupervisor({
+    initialRuntime,
+    createProjectRuntime: (project) => createWorkspaceProjectRuntime({
+      project,
+      args,
+      config,
+      stateRoot,
+      memoryRoot,
+      profilePaths,
+      createMemoryStore: () => new MarkdownMemoryStore({ root: memoryRoot }),
+      provider,
+      serviceTier,
+      model,
+      remoteMemorySources,
+      createUi: (runtimeSessionState) => outputRouter.createProjectUi(project.projectId, () => runtimeSessionState.sessionId),
+      refreshStatusBar: (...args) => refreshStatusBar?.(...args),
+      onNotificationActivation,
+    }),
+    onActivate: ({ projectId, sessionId }) => outputRouter.setActiveSession(projectId, sessionId),
+  });
+  runner = workspaceSupervisor.runner;
+
   refreshStatusBar = createStatusLineUpdater({
     ui,
     runner,
@@ -150,6 +197,8 @@ export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot }
     projectMarchDir,
     ui,
   });
+  workspaceSupervisor.refreshActiveRuntime();
+  outputRouter.setActiveSession(currentProjectInfo.projectId, sessionState.sessionId);
   refreshStatusBar();
 
   return {
@@ -158,8 +207,11 @@ export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot }
     cwd,
     ui,
     runner,
+    workspaceSupervisor,
+    workspaceOutputRouter: outputRouter,
     memoryStore,
     currentProject,
+    currentProjectInfo,
     sessionState,
     sessionsRoot,
     projectMarchDir,
@@ -175,3 +227,16 @@ export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot }
     setTurnRunning(value) { turnRunning = value; },
   };
 }
+
+async function handleNotificationActivation({ activation, stateRoot, workspaceSupervisor, outputRouter, ui }) {
+  if (activation?.type !== "workspace-session" || !activation.projectId) return;
+  if (!workspaceSupervisor) throw new Error("workspace supervisor is not ready");
+  const projects = await listWorkspaceSessions({ stateRoot, currentProjectId: workspaceSupervisor.getActive?.()?.project?.projectId ?? null });
+  const runtime = await workspaceSupervisor.activateWorkspaceSessionById({
+    projects,
+    projectId: activation.projectId,
+    sessionId: activation.sessionId,
+  });
+  outputRouter?.replayBufferedCalls?.(activation.projectId, activation.sessionId);
+  ui.writeln(`Activated session from notification: ${runtime.project.displayName}`);
+}

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

@@ -5,6 +5,7 @@ export async function createRuntimeRunner({
   ui,
   shellRuntime,
   refreshStatusBar,
+  onNotificationActivation = null,
 } = {}) {
   const onModelPayload = ({ estimatedTokens }) => {
     refreshStatusBar?.({ contextTokens: estimatedTokens });
@@ -13,7 +14,7 @@ export async function createRuntimeRunner({
     refreshStatusBar?.();
   };
 
-  const { runner } = await createRunnerProcessClient({ runnerOptions, ui, onModelPayload, onLspStatusChange });
+  const { runner } = await createRunnerProcessClient({ runnerOptions, ui, onModelPayload, onLspStatusChange, onNotificationActivation });
   runner.shellRuntime ??= shellRuntime;
   return runner;
 }

package/src/cli/startup/startup-session.mjs

@@ -1,20 +1,10 @@
-import { randomUUID } from "node:crypto";
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { resolve } from "node:path";
+import { loadOrCreateProjectId } from "../../workspace/project-id.mjs";
 import { listPiSessionInfos } from "../../session/pi-manager.mjs";
+
 import { loadPiSessionTranscriptTurns } from "../../session/transcript.mjs";
 import { resumePiSessionById } from "../session/pi-session-switch-command.mjs";
 
-export function loadOrCreateProjectId(projectMarchDir) {
-  if (!existsSync(projectMarchDir)) mkdirSync(projectMarchDir, { recursive: true });
-  const idFile = resolve(projectMarchDir, "project-id");
-  if (existsSync(idFile)) {
-    return readFileSync(idFile, "utf8").trim();
-  }
-  const id = randomUUID();
-  writeFileSync(idFile, id, "utf8");
-  return id;
-}
+export { loadOrCreateProjectId };
 
 export async function resumeStartupSession({
   resumeId,