march-cli 0.1.38 → 0.1.39

package/package.json

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

package/src/agent/runner.mjs

@@ -2,7 +2,7 @@ import { createAgentSession, ModelRegistry, SettingsManager } from "@earendil-wo
 import { createMarchAuthStorage } from "../auth/storage.mjs";
 import { ContextEngine } from "../context/engine.mjs";
 import { createMarchLifecycleAdapter } from "../extensions/lifecycle-adapter.mjs";
-import { syncPiSessionSidecar } from "../session/sidecar-sync.mjs";
+import { syncMarchSessionState } from "../session/state/march-session-sync.mjs";
 import { LspService } from "../lsp/service.mjs";
 import { formatLspServiceEvent } from "../lsp/status-message.mjs";
 import { estimateProviderPayloadTokens, installModelPayloadDumper, replaceProviderContextMessages } from "./model-payload-dumper.mjs";
@@ -30,7 +30,7 @@ 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, modelContextDumper = null, turnNotifier = null, logger = null, onModelPayload = null, onLspStatusChange = null, createAgentSessionImpl = createAgentSession, createAgentSessionRuntimeImpl, createRuntimeServices, createRuntimeSessionFromServices, maxTurns, trimBatch, serviceTier = null, hostedTools = {}, notificationContext = null }) {
+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, syncMarchSessionState: syncMarchSessionStateEnabled = false, syncPiSidecar = syncMarchSessionStateEnabled, 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 });
@@ -125,7 +125,7 @@ export async function createRunner({ cwd, modelId = null, provider = null, provi
           setModelCallKind: (kind) => { currentModelCallKind = kind; },
           logger: turnLog.logger,
           setPhase: turnLog.setPhase,
-          syncCurrentPiSidecar,
+          syncCurrentMarchSessionState,
           autoNameSession,
           contextMode,
           recordHistory: (turn) => appendRunnerTurnHistory({ store: historyStore, turn, sessionStats: getRunnerSessionStats(sessionBinding.get(), runtimeHost), modelId: engine.modelId, provider: engine.provider }),
@@ -206,14 +206,14 @@ export async function createRunner({ cwd, modelId = null, provider = null, provi
       const activeSession = sessionBinding.get();
       activeSession.setSessionName?.(name);
       engine.setSessionName(name);
-      syncCurrentPiSidecar();
+      syncCurrentMarchSessionState();
       return engine.sessionName;
     },
     canSwitchPiSession() { return Boolean(runtimeHost); },
     async startNewSession() {
       if (!runtimeHost) throw new Error("pi runtime host is not enabled");
       nextTurnContextMode = "rebuild";
-      syncCurrentPiSidecar();
+      syncCurrentMarchSessionState();
       const result = await runtimeHost.newSession();
       if (result?.cancelled) return { cancelled: true };
       engine.restoreSession({}, [], { replace: true });
@@ -256,9 +256,9 @@ export async function createRunner({ cwd, modelId = null, provider = null, provi
     },
   };
   return runner;
-  function syncCurrentPiSidecar() {
-    return syncPiSessionSidecar({
-      enabled: syncPiSidecar, projectMarchDir, engine,
+  function syncCurrentMarchSessionState() {
+    return syncMarchSessionState({
+      enabled: syncPiSidecar || syncMarchSessionStateEnabled, projectMarchDir, engine,
       sessionStats: getRunnerSessionStats(sessionBinding.get(), runtimeHost),
     });
   }

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

@@ -72,7 +72,7 @@ export async function createIsolatedRunner(options = {}, deps = {}) {
       enabled: true,
     }),
     useRuntimeHost: true,
-    syncPiSidecar: true,
+    syncMarchSessionState: true,
     lifecycleHooks: options.lifecycleHooks ?? [],
     lifecycleDiagnostics: options.lifecycleDiagnostics ?? [],
     authStorage: d.createMarchAuthStorage({

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

@@ -14,7 +14,7 @@ export async function runRunnerTurn({
   setModelCallKind,
   logger = null,
   setPhase = null,
-  syncCurrentPiSidecar,
+  syncCurrentMarchSessionState,
   autoNameSession,
   contextMode = "rebuild",
   recordHistory = null,
@@ -79,7 +79,7 @@ export async function runRunnerTurn({
       ui,
       turnState,
       midTurnRecallHints,
-      syncCurrentPiSidecar,
+      syncCurrentMarchSessionState,
       autoNameSession,
       recordHistory,
     });
@@ -129,7 +129,7 @@ function logSessionEvent(logger, event) {
   });
 }
 
-function finalizeTurn({ prompt, userMessage, userRecallHints, currentProject, memoryStore, engine, ui, turnState, midTurnRecallHints, syncCurrentPiSidecar, autoNameSession, recordHistory }) {
+function finalizeTurn({ prompt, userMessage, userRecallHints, currentProject, memoryStore, engine, ui, turnState, midTurnRecallHints, syncCurrentMarchSessionState, autoNameSession, recordHistory }) {
   closeAssistantReply({ ui, state: turnState });
   const assistantRecallHints = flushAssistantRecall({ memoryStore, engine, turnState, currentProject });
   engine.setPendingAssistantRecallHints?.(assistantRecallHints);
@@ -145,7 +145,7 @@ function finalizeTurn({ prompt, userMessage, userRecallHints, currentProject, me
   recordHistory?.({ ...turn, thinking: assistantThinkingText(turnState), toolCalls: turnState.toolCalls });
 
   autoNameSession?.();
-  syncCurrentPiSidecar();
+  syncCurrentMarchSessionState();
 }
 
 function flushAssistantRecall({ memoryStore, engine, turnState, currentProject }) {

package/src/cli/args.mjs

@@ -26,6 +26,7 @@ export function parseCliArgs(argv) {
       workspace: { type: "string" },
       dev: { type: "boolean" },
       help: { type: "boolean", short: "h" },
+      version: { type: "boolean", short: "v" },
     },
     allowPositionals: true,
   });
@@ -55,6 +56,7 @@ export function parseCliArgs(argv) {
     workspace: values.workspace ?? null,
     dev: values.dev ?? false,
     help: values.help ?? false,
+    version: values.version ?? false,
     prompt: commandName ? "" : positionals.join(" "),
   };
 }
@@ -105,5 +107,6 @@ Options:
   --name <name>        With memory serve/add, remote memory source name
   --foreground         With memory serve, run server in current process
   -h, --help           Show this help
+  -v, --version        Show the March CLI version
 `);
 }

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

@@ -15,6 +15,7 @@ export function handleModeCommand(command, { modeState } = {}) {
 
   if (command.type === "set") {
     modeState.set(command.mode);
+    return [];
   }
 
   return [`Mode: ${formatModeLabel(modeState.get())}`];

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

@@ -227,10 +227,9 @@ function parsedCommand({ names, metadata, parse, run }) {
 function sessionSourceCommand() {
   return {
     metadata: [
-      { name: "session", description: "Open previous session selector" },
       { name: "save", description: "Show auto-save status" },
     ],
-    match: (trimmed) => (trimmed === "/session" || trimmed === "/save") ? { parsed: { trimmed } } : null,
+    match: (trimmed) => trimmed === "/save" ? { parsed: { trimmed } } : null,
     run: async (ctx, { trimmed }) => handleSessionSourceCommand(trimmed, ctx),
   };
 }
@@ -284,7 +283,7 @@ function writeLines(ui, lines) {
 export function formatHelpLines() {
   return [
     `Commands: ${getHelpCommandSyntaxes().join(", ")}`,
-    "Sessions: /session opens previous sessions and restores the selected one.",
+    "Sessions: /session opens the workspace session selector.",
     "Shortcuts: Tab = toggle Do/Discuss, Esc = abort turn, Ctrl+C = abort turn / press twice to exit when idle, Ctrl+O = toggle tool output, Alt+S = shell pane, Alt+N = next shell, Alt+K/J = shell scroll, PageUp/PageDown = output scroll, Ctrl+G = external editor, Shift+Tab = thinking selector, Ctrl+T = thinking selector, Ctrl+L = model selector",
   ];
 }

package/src/cli/repl-commands.mjs

@@ -57,7 +57,7 @@ export function formatHotkeysPanel(keybindings = DEFAULT_KEYBINDINGS, diagnostic
     ...formatKeybindingDiagnostics(diagnostics),
     "Input prefixes:",
     "  /          Slash command autocomplete",
-    "  /session   Restore a previous session",
+    "  /session   Open workspace session selector",
     "  /thinking  Choose or list/set thinking level",
     "  @          File path autocomplete",
     "  ! cmd      Run local shell command without sending to the model",

package/src/cli/repl-loop.mjs

@@ -105,7 +105,7 @@ export async function runInteractiveRepl({
     }
 
     if (turnActive.turnTask) {
-      ui.writeln("This session is still running. Use /switch to start or inspect another session.");
+      ui.writeln("This session is still running. Use /session to start or inspect another session.");
       continue;
     }
 

package/src/cli/session/pi-session-switch-command.mjs

@@ -1,4 +1,4 @@
-import { loadPiSessionSidecar } from "../../session/sidecar.mjs";
+import { loadMarchSessionStateForPiBackend } from "../../session/state/march-session-state.mjs";
 
 export async function resumePiSessionById(id, { runner, sessions, projectMarchDir }) {
   if (!runner.canSwitchPiSession?.()) {
@@ -12,21 +12,21 @@ export async function resumePiSessionById(id, { runner, sessions, projectMarchDi
   }
 
   const session = matches[0];
-  let sidecar;
+  let stored;
   try {
-    sidecar = loadPiSessionSidecar({ projectMarchDir, sessionRef: session.path });
+    stored = loadMarchSessionStateForPiBackend({ projectMarchDir, sessionId: session.id, sessionRef: session.path });
   } catch (err) {
-    return [`Error: pi session sidecar is invalid for ${session.id}: ${err.message}`];
+    return [`Error: March session state is invalid for ${session.id}: ${err.message}`];
   }
-  if (!sidecar) {
-    return [`Error: pi session sidecar not found for ${session.id}; refusing partial resume`];
+  if (!stored) {
+    return [`Error: March session state not found for ${session.id}; refusing partial resume`];
   }
-  if (sidecar.state.cwd && sidecar.state.cwd !== runner.engine.cwd) {
-    return [`Error: pi session sidecar cwd mismatch for ${session.id}: ${sidecar.state.cwd}`];
+  if (stored.state.cwd && stored.state.cwd !== runner.engine.cwd) {
+    return [`Error: March session state cwd mismatch for ${session.id}: ${stored.state.cwd}`];
   }
 
   let result;
-  const restoreState = toContextSessionState(sidecar.state);
+  const restoreState = toContextSessionState(stored.state);
   try {
     result = await runner.switchPiSession(session.path, restoreState);
   } catch (err) {
@@ -36,6 +36,6 @@ export async function resumePiSessionById(id, { runner, sessions, projectMarchDi
   return [`Resumed pi session: ${session.id}`];
 }
 
-function toContextSessionState(sidecarState) {
-  return { ...sidecarState };
+function toContextSessionState(sessionState) {
+  return { ...sessionState };
 }

package/src/cli/session/session-list-command.mjs

@@ -23,7 +23,7 @@ export function formatPiSessionList(sessions) {
     const savedAt = session.savedAt?.slice(0, 19) ?? "?";
     return `  ${session.id}  ${session.turnCount}m  ${savedAt}  ${label}`;
   });
-  lines.push("(pi JSONL session files; use /session to restore a previous session)");
+  lines.push("(pi JSONL session files)");
   return lines;
 }
 

package/src/cli/session/session-source-command.mjs

@@ -1,13 +1,7 @@
-import { listPiSessionInfos } from "../../session/pi-manager.mjs";
-import { loadPiSessionTranscriptTurns } from "../../session/transcript.mjs";
-import { resumePiSessionById } from "./pi-session-switch-command.mjs";
-
 export async function handleSessionSourceCommand(trimmed, {
   ui,
   runner,
   sessionState,
-  sessionsRoot,
-  projectMarchDir,
 }) {
   if (trimmed === "/save") {
     const stats = runner.getSessionStats?.();
@@ -15,75 +9,5 @@ export async function handleSessionSourceCommand(trimmed, {
     return { handled: true };
   }
 
-  if (trimmed === "/session") {
-    const sessions = await listPiSessionInfos({
-      cwd: runner.engine.cwd,
-      projectMarchDir,
-    });
-    if (sessions.length === 0) {
-      ui.writeln("No previous sessions.");
-      return { handled: true };
-    }
-    if (!ui.selectList) {
-      ui.writeln("Session selector is only available in TUI.");
-      return { handled: true };
-    }
-    const currentSessionId = runner.getSessionStats?.().sessionId ?? null;
-    const item = await ui.selectList({
-      items: buildSessionSelectItems(sessions, currentSessionId),
-      selectedIndex: Math.max(0, sessions.findIndex((session) => session.id === currentSessionId)),
-      width: 72,
-      suppressInitialConfirm: true,
-      searchable: true,
-      getSearchText: sessionSelectSearchText,
-    });
-    if (!item) {
-      ui.writeln("Session unchanged.");
-      return { handled: true };
-    }
-    const lines = await resumePiSessionById(item.session.id, { runner, sessions, projectMarchDir });
-    if (isResumeSuccess(lines)) restoreTranscriptFromSession(item.session, ui);
-    for (const line of lines) {
-      ui.writeln(line);
-    }
-    return { handled: true };
-  }
-
   return { handled: false };
 }
-
-export function buildSessionSelectItems(sessions, currentSessionId = null) {
-  return sessions.map((session) => {
-    const label = session.name || session.firstMessage || "(no messages)";
-    const savedAt = formatSessionSelectTime(session.savedAt);
-    return {
-      value: session.id,
-      label,
-      description: savedAt,
-      session,
-    };
-  });
-}
-
-function sessionSelectSearchText(item) {
-  const session = item?.session;
-  return `${item?.label ?? ""} ${item?.description ?? ""} ${session?.id ?? ""} ${session?.name ?? ""} ${session?.firstMessage ?? ""} ${session?.turnCount ?? ""}`;
-}
-
-function restoreTranscriptFromSession(session, ui) {
-  if (typeof ui.restoreTranscript !== "function") return;
-  try {
-    ui.restoreTranscript(loadPiSessionTranscriptTurns(session.path));
-  } catch (err) {
-    ui.writeln(`Warning: failed to restore session transcript: ${err.message}`);
-  }
-}
-
-function isResumeSuccess(lines) {
-  return Array.isArray(lines) && lines.some((line) => String(line).startsWith("Resumed pi session:"));
-}
-
-function formatSessionSelectTime(value) {
-  if (!value) return "?";
-  return String(value).slice(0, 16).replace("T", " ");
-}

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

@@ -24,6 +24,8 @@ 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";
+import { syncRuntimeSessionStateFromRunner } from "../workspace/runtime-session-state.mjs";
+import { loadMarchSessionRenderTimeline, saveMarchSessionRenderTimeline } from "../../session/state/march-session-ui-state.mjs";
 
 export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot } = {}) {
   if (!existsSync(stateRoot)) mkdirSync(stateRoot, { recursive: true });
@@ -62,6 +64,7 @@ export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot }
   const modeState = createModeState();
   const namespace = loadOrCreateProjectId(projectMarchDir);
   const currentProjectInfo = registerProject({ stateRoot, rootPath: cwd });
+  const projectMarchDirs = new Map([[currentProjectInfo.projectId, projectMarchDir]]);
   const memoryRoot = resolveMemoryRoot(config.memoryRoot, stateRoot);
   const profilePaths = defaultProfilePaths();
   ensureProfileFiles(profilePaths);
@@ -87,7 +90,12 @@ export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot }
     shellRuntime,
     historyStore: inputHistoryStore,
   });
-  const outputRouter = createWorkspaceOutputRouter({ ui, activeProjectId: currentProjectInfo.projectId, activeSessionId: sessionState.sessionId });
+  const outputRouter = createWorkspaceOutputRouter({
+    ui,
+    activeProjectId: currentProjectInfo.projectId,
+    activeSessionId: sessionState.sessionId,
+    onRenderTimelineChange: persistRenderTimeline,
+  });
   const runtimeUi = outputRouter.createProjectUi(currentProjectInfo.projectId, () => sessionState.sessionId);
   let turnRunning = false;
   let refreshStatusBar = null;
@@ -115,7 +123,7 @@ export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot }
   let runner;
   let workspaceSupervisor = null;
   const onNotificationActivation = (activation) => {
-    handleNotificationActivation({ activation, stateRoot, workspaceSupervisor, outputRouter, ui }).catch((err) => ui.writeln(`Notification activation failed: ${err.message}`));
+    handleNotificationActivation({ activation, stateRoot, workspaceSupervisor, ui }).catch((err) => ui.writeln(`Notification activation failed: ${err.message}`));
   };
   try {
     runner = await createRuntimeRunner({
@@ -131,6 +139,7 @@ export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot }
     memoryStore.close?.();
     return { ok: false, code: 1, logger };
   }
+  syncRuntimeSessionStateFromRunner(sessionState, runner, sessionsRoot);
 
   const initialRuntime = {
     project: currentProjectInfo,
@@ -148,23 +157,26 @@ export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot }
   };
   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),
+    createProjectRuntime: (project) => {
+      projectMarchDirs.set(project.projectId, resolve(project.rootPath, ".march"));
+      return 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, { renderTimeline: loadStoredRenderTimeline(projectMarchDirs.get(projectId), sessionId) }),
   });
   runner = workspaceSupervisor.runner;
 
@@ -198,9 +210,20 @@ export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot }
     ui,
   });
   workspaceSupervisor.refreshActiveRuntime();
-  outputRouter.setActiveSession(currentProjectInfo.projectId, sessionState.sessionId);
+  outputRouter.setActiveSession(currentProjectInfo.projectId, sessionState.sessionId, { renderTimeline: loadStoredRenderTimeline(projectMarchDir, sessionState.sessionId) });
   refreshStatusBar();
 
+  function persistRenderTimeline({ projectId, sessionId, events, event }) {
+    if (!sessionId || !shouldPersistRenderEvent(event?.method)) return;
+    const routeProjectMarchDir = projectMarchDirs.get(projectId);
+    if (!routeProjectMarchDir) return;
+    try {
+      saveMarchSessionRenderTimeline({ projectMarchDir: routeProjectMarchDir, sessionId, renderTimeline: events });
+    } catch {
+      // Render persistence is separate from model context; a UI write failure must not corrupt the turn.
+    }
+  }
+
   return {
     ok: true,
     args,
@@ -227,8 +250,20 @@ export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot }
     setTurnRunning(value) { turnRunning = value; },
   };
 }
+function loadStoredRenderTimeline(projectMarchDir, sessionId) {
+  if (!projectMarchDir || !sessionId) return null;
+  try {
+    return loadMarchSessionRenderTimeline({ projectMarchDir, sessionId })?.renderTimeline ?? null;
+  } catch {
+    return null;
+  }
+}
+
+function shouldPersistRenderEvent(method) {
+  return method === "turnEnd" || method === "assistantReplyEnd" || method === "toolEnd" || method === "writeln" || method === "clearOutput";
+}
 
-async function handleNotificationActivation({ activation, stateRoot, workspaceSupervisor, outputRouter, ui }) {
+async function handleNotificationActivation({ activation, stateRoot, workspaceSupervisor, 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 });
@@ -237,6 +272,5 @@ async function handleNotificationActivation({ activation, stateRoot, workspaceSu
     projectId: activation.projectId,
     sessionId: activation.sessionId,
   });
-  outputRouter?.replayBufferedCalls?.(activation.projectId, activation.sessionId);
   ui.writeln(`Activated session from notification: ${runtime.project.displayName}`);
 }

package/src/cli/workspace/command.mjs

@@ -3,8 +3,6 @@ import { resolve } from "node:path";
 import { brightBlack } from "../tui/ui-theme.mjs";
 import { registerProject, listRegisteredProjects } from "../../workspace/project-registry.mjs";
 import { buildWorkspaceSessionSelectItems, listWorkspaceSessions, workspaceSessionSearchText } from "../../workspace/session-index.mjs";
-import { resumePiSessionById } from "../session/pi-session-switch-command.mjs";
-import { loadPiSessionTranscriptTurns } from "../../session/transcript.mjs";
 
 export const WORKSPACE_SLASH_COMMANDS = [
   {
@@ -19,9 +17,9 @@ export const WORKSPACE_SLASH_COMMANDS = [
     run: async (ctx, command) => writeLines(ctx.ui, await handleProjectCommand(command, ctx)),
   },
   {
-    metadata: [{ name: "switch", description: "Open cross-project session switcher" }],
-    match: (trimmed) => trimmed === "/switch" ? { parsed: { type: "switch" } } : null,
-    run: handleSwitchCommand,
+    metadata: [{ name: "session", description: "Open workspace session selector" }],
+    match: (trimmed) => trimmed === "/session" ? { parsed: { type: "session" } } : null,
+    run: handleSessionCommand,
   },
 ];
 
@@ -45,9 +43,9 @@ export async function handleProjectCommand(command, { stateRoot }) {
   return ["Registered projects:", ...projects.map((project) => `- ${project.displayName}  ${brightBlack(project.rootPath)}`)];
 }
 
-export async function handleSwitchCommand({ stateRoot, currentProjectId, projectMarchDir, runner, workspaceSupervisor, workspaceOutputRouter, ui }) {
+export async function handleSessionCommand({ stateRoot, currentProjectId, runner, workspaceSupervisor, workspaceOutputRouter, ui }) {
   if (!stateRoot) {
-    ui.writeln("Session switcher is not available: workspace registry is missing.");
+    ui.writeln("Session selector is not available: workspace registry is missing.");
     return { handled: true };
   }
   const projects = await listWorkspaceSessions({ stateRoot, currentProjectId });
@@ -59,7 +57,7 @@ export async function handleSwitchCommand({ stateRoot, currentProjectId, project
     return { handled: true };
   }
   if (!ui.selectList) {
-    ui.writeln("Session switcher is only available in TUI.");
+    ui.writeln("Session selector is only available in TUI.");
     return { handled: true };
   }
   const selectedIndex = Math.max(0, items.findIndex((item) => item.project.current && item.session?.id === currentSessionId));
@@ -82,7 +80,6 @@ export async function handleSwitchCommand({ stateRoot, currentProjectId, project
     }
     try {
       const { result } = await workspaceSupervisor.startNewWorkspaceSession(item.project);
-      ui.restoreTranscript?.([]);
       ui.writeln(`Created session: ${item.project.displayName} / ${result?.sessionId ?? "new session"}`);
       return { handled: true, refreshContextTokens: true, activeChanged: true };
     } catch (err) {
@@ -93,25 +90,15 @@ export async function handleSwitchCommand({ stateRoot, currentProjectId, project
   if (workspaceSupervisor) {
     try {
       await workspaceSupervisor.activateWorkspaceSession({ project: item.project, session: item.session });
-      restoreTranscriptFromSession(item.session, ui);
-      const replayed = ctxReplayBufferedOutput({ workspaceOutputRouter, projectId: item.project.projectId, sessionId: item.session.id });
-      ui.writeln(`Switched to session: ${item.project.displayName} / ${item.session.name || item.session.id}${replayed ? ` (${replayed} buffered events replayed)` : ""}`);
+      ctxRenderActiveSession({ workspaceOutputRouter, projectId: item.project.projectId, sessionId: item.session.id });
       return { handled: true, refreshContextTokens: true, activeChanged: true };
     } catch (err) {
       ui.writeln(`Error: ${err.message}`);
       return { handled: true };
     }
   }
-  if (!item.project.current) {
-    ui.writeln(`Project switch target indexed: ${item.project.displayName}`);
-    ui.writeln(brightBlack("Cross-project attach requires the workspace supervisor."));
-    return { handled: true };
-  }
-  const sessions = projects.find((project) => project.current)?.sessions ?? [];
-  const lines = await resumePiSessionById(item.session.id, { runner, sessions, projectMarchDir });
-  if (isResumeSuccess(lines)) restoreTranscriptFromSession(item.session, ui);
-  for (const line of lines) ui.writeln(line);
-  return { handled: true, refreshContextTokens: isResumeSuccess(lines) };
+  ui.writeln("Workspace session activation requires the workspace supervisor.");
+  return { handled: true };
 }
 
 function annotateWorkspaceItems(items, runtimeSummaries) {
@@ -124,24 +111,11 @@ function annotateWorkspaceItems(items, runtimeSummaries) {
   });
 }
 
-function ctxReplayBufferedOutput({ workspaceOutputRouter, projectId, sessionId }) {
-  return workspaceOutputRouter?.replayBufferedCalls?.(projectId, sessionId) ?? 0;
-}
-
-function restoreTranscriptFromSession(session, ui) {
-  if (typeof ui.restoreTranscript !== "function") return;
-  try {
-    ui.restoreTranscript(loadPiSessionTranscriptTurns(session.path));
-  } catch (err) {
-    ui.writeln(`Warning: failed to restore session transcript: ${err.message}`);
-  }
+function ctxRenderActiveSession({ workspaceOutputRouter, projectId, sessionId }) {
+  return workspaceOutputRouter?.getRenderEventCount?.(projectId, sessionId) ?? 0;
 }
 
 function writeLines(ui, lines) {
   for (const line of lines) ui.writeln(line);
   return { handled: true };
 }
-
-function isResumeSuccess(lines) {
-  return Array.isArray(lines) && lines.some((line) => String(line).startsWith("Resumed pi session:"));
-}