march-cli 0.1.38 → 0.1.39

package/src/workspace/supervisor.mjs

@@ -1,5 +1,5 @@
 import { join } from "node:path";
-import { loadPiSessionSidecar } from "../session/sidecar.mjs";
+import { loadMarchSessionStateForPiBackend } from "../session/state/march-session-state.mjs";
 
 export function createWorkspaceSessionSupervisor({ initialRuntime, createProjectRuntime, viewSessionState = initialRuntime?.sessionState, onActivate = null }) {
   if (!initialRuntime?.project?.projectId) throw new Error("initial workspace runtime is missing project metadata");
@@ -85,7 +85,7 @@ export function createWorkspaceSessionSupervisor({ initialRuntime, createProject
     if (!result?.cancelled && result?.sessionId) syncSessionState(active, result.sessionId);
     rememberRuntime(active);
     mirrorSessionState(viewSessionState, active.sessionState);
-    onActivate?.({ projectId: active.project.projectId, sessionId: getRuntimeSessionId(active), runtime: active });
+    onActivate?.({ projectId: active.project.projectId, sessionId: getRuntimeSessionId(active), runtime: active, restoreState: null });
     return { runtime: active, result };
   }
 
@@ -96,8 +96,9 @@ export function createWorkspaceSessionSupervisor({ initialRuntime, createProject
     let runtime = session?.id ? runtimes.get(runtimeKey(project.projectId, session.id)) : findIdleRuntime(project.projectId);
     if (!runtime) runtime = await createProjectRuntime(project);
 
+    let restoreState = null;
     if (session?.path && getRuntimeSessionId(runtime) !== session.id) {
-      const restoreState = loadWorkspacePiSessionState({ runtime, session });
+      restoreState = loadWorkspaceMarchSessionState({ runtime, session });
       await runtime.runner.switchPiSession(session.path, restoreState);
       syncSessionState(runtime, session.id);
     }
@@ -105,7 +106,7 @@ export function createWorkspaceSessionSupervisor({ initialRuntime, createProject
     active = runtime;
     rememberRuntime(runtime);
     mirrorSessionState(viewSessionState, runtime.sessionState);
-    onActivate?.({ projectId: runtime.project.projectId, sessionId: getRuntimeSessionId(runtime), runtime });
+    onActivate?.({ projectId: runtime.project.projectId, sessionId: getRuntimeSessionId(runtime), runtime, restoreState });
     return active;
   }
 
@@ -142,13 +143,18 @@ export function createWorkspaceSessionSupervisor({ initialRuntime, createProject
   }
 }
 
-function loadWorkspacePiSessionState({ runtime, session }) {
-  const sidecar = loadPiSessionSidecar({ projectMarchDir: runtime.projectMarchDir, sessionRef: session.path });
-  if (!sidecar) throw new Error(`pi session sidecar not found for ${session.id}; refusing partial resume`);
-  if (sidecar.state.cwd && sidecar.state.cwd !== runtime.runner.engine.cwd) {
-    throw new Error(`pi session sidecar cwd mismatch for ${session.id}: ${sidecar.state.cwd}`);
+function loadWorkspaceMarchSessionState({ runtime, session }) {
+  const stored = loadMarchSessionStateForPiBackend({
+    projectMarchDir: runtime.projectMarchDir,
+    sessionId: session.id,
+    sessionRef: session.path,
+  });
+  if (!stored) throw new Error(`March session state not found for ${session.id}; refusing partial resume`);
+  if (stored.state.cwd && stored.state.cwd !== runtime.runner.engine.cwd) {
+    throw new Error(`March session state cwd mismatch for ${session.id}: ${stored.state.cwd}`);
   }
-  return { ...sidecar.state };
+  const { renderTimeline: _renderTimeline, ...contextState } = stored.state;
+  return contextState;
 }
 
 function getRuntimeSessionId(runtime) {

package/src/agent/pi-session/pi-session-sidecar-failure.mjs

@@ -1,10 +0,0 @@
-export async function createSidecarWriteFailure({ runtimeHost, sourceSessionFile, action, cause }) {
-  const causeMessage = cause?.message ?? String(cause);
-  const baseMessage = `failed to write pi session sidecar after ${action}: ${causeMessage}`;
-  try {
-    await runtimeHost.switchSession(sourceSessionFile);
-    return new Error(`${baseMessage}; rolled back to source session`);
-  } catch (rollbackErr) {
-    return new Error(`${baseMessage}; rollback failed: ${rollbackErr.message}`);
-  }
-}

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

@@ -1 +0,0 @@
-// Legacy session switch command removed. Use /session to restore previous pi sessions.

package/src/session/persist.mjs

@@ -1 +0,0 @@
-// Legacy session persistence removed. All sessions use pi JSONL format.