march-cli 0.1.38 → 0.1.40

package/src/session/state/march-session-ui-state.mjs

@@ -0,0 +1,89 @@
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { getMarchSessionStatePath, loadMarchSessionState, normalizeSessionId } from "./march-session-state.mjs";
+
+export const TUI_SESSION_TIMELINE_VERSION = 1;
+
+export function getTuiSessionUiStateRoot(projectMarchDir) {
+  return join(projectMarchDir, "ui", "tui", "sessions");
+}
+
+export function getTuiSessionTimelinePath(projectMarchDir, sessionId) {
+  return join(getTuiSessionUiStateRoot(projectMarchDir), normalizeSessionId(sessionId), "timeline.json");
+}
+
+export function loadMarchSessionRenderTimeline({ projectMarchDir, sessionId }) {
+  const tuiTimeline = loadTuiRenderTimeline({ projectMarchDir, sessionId });
+  if (tuiTimeline) return tuiTimeline;
+
+  const legacyTimeline = loadLegacyCoreRenderTimeline({ projectMarchDir, sessionId });
+  if (legacyTimeline) return legacyTimeline;
+
+  const stored = loadMarchSessionState({ projectMarchDir, sessionId });
+  if (!stored) return null;
+  return {
+    path: stored.path,
+    renderTimeline: renderTimelineFromTurns(stored.state.turns ?? []),
+    source: "core-turns",
+  };
+}
+
+export function saveMarchSessionRenderTimeline({ projectMarchDir, sessionId, renderTimeline }) {
+  if (!sessionId) throw new Error("March session id is required");
+  const state = {
+    version: TUI_SESSION_TIMELINE_VERSION,
+    savedAt: new Date().toISOString(),
+    sessionId,
+    renderTimeline: normalizeSessionRenderTimeline(renderTimeline),
+  };
+  const path = getTuiSessionTimelinePath(projectMarchDir, sessionId);
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(path, JSON.stringify(state, null, 2), "utf8");
+  return { path, renderTimeline: state.renderTimeline, state };
+}
+
+export function normalizeSessionRenderTimeline(events) {
+  if (!Array.isArray(events)) return [];
+  return events
+    .filter((event) => typeof event?.method === "string" && Array.isArray(event.args))
+    .map((event) => ({ method: event.method, args: event.args, at: event.at ?? null }));
+}
+
+function loadTuiRenderTimeline({ projectMarchDir, sessionId }) {
+  try {
+    const path = getTuiSessionTimelinePath(projectMarchDir, sessionId);
+    if (!existsSync(path)) return null;
+    const state = JSON.parse(readFileSync(path, "utf8"));
+    if (state?.version !== TUI_SESSION_TIMELINE_VERSION) return null;
+    return { path, renderTimeline: normalizeSessionRenderTimeline(state.renderTimeline), source: "tui" };
+  } catch {
+    return null;
+  }
+}
+
+function loadLegacyCoreRenderTimeline({ projectMarchDir, sessionId }) {
+  try {
+    const path = getMarchSessionStatePath(projectMarchDir, sessionId);
+    if (!existsSync(path)) return null;
+    const raw = JSON.parse(readFileSync(path, "utf8"));
+    const rawTimeline = normalizeSessionRenderTimeline(raw.renderTimeline);
+    if (!raw.renderTimelineUpdatedAt && rawTimeline.length === 0) return null;
+    return { path, renderTimeline: rawTimeline, source: "legacy-core-render" };
+  } catch {
+    return null;
+  }
+}
+
+function renderTimelineFromTurns(turns) {
+  return turns.flatMap((turn) => {
+    const events = [];
+    if (turn.userMessage) events.push({ method: "writeln", args: [turn.userMessage], at: null });
+    if (turn.assistantMessage) {
+      events.push({ method: "turnStart", args: [], at: null });
+      events.push({ method: "textDelta", args: [turn.assistantMessage], at: null });
+      events.push({ method: "assistantReplyEnd", args: [], at: null });
+      events.push({ method: "turnEnd", args: [], at: null });
+    }
+    return events;
+  });
+}

package/src/workspace/session-index.mjs

@@ -1,5 +1,6 @@
 import { resolve } from "node:path";
 import { listPiSessionInfos } from "../session/pi-manager.mjs";
+import { listMarchSessionStates } from "../session/state/march-session-state.mjs";
 import { listRegisteredProjects } from "./project-registry.mjs";
 
 export async function listWorkspaceSessions({ stateRoot, currentProjectId = null, listSessions = listPiSessionInfos }) {
@@ -10,6 +11,7 @@ export async function listWorkspaceSessions({ stateRoot, currentProjectId = null
     let sessions = [];
     try {
       sessions = await listSessions({ cwd: project.rootPath, projectMarchDir });
+      sessions = mergeMarchSessionStates({ projectMarchDir, backendSessions: sessions });
     } catch {
       sessions = [];
     }
@@ -73,3 +75,28 @@ function formatWorkspaceSessionTime(value) {
   if (!value) return "no saved time";
   return String(value).slice(0, 16).replace("T", " ");
 }
+
+function mergeMarchSessionStates({ projectMarchDir, backendSessions }) {
+  const backendById = new Map(backendSessions.map((session) => [session.id, session]));
+  const backendByPath = new Map(backendSessions.map((session) => [session.path, session]));
+  const marchSessions = listMarchSessionStates({ projectMarchDir }).map(({ state }) => {
+    const backend = state.backend?.type === "pi"
+      ? backendById.get(state.backend.sessionId) ?? backendByPath.get(state.backend.sessionFile)
+      : null;
+    return {
+      id: state.sessionId,
+      path: state.backend?.sessionFile ?? backend?.path ?? null,
+      savedAt: state.savedAt,
+      createdAt: backend?.createdAt ?? "",
+      cwd: state.cwd,
+      name: state.sessionName || backend?.name || "",
+      turnCount: state.turns?.length ?? backend?.turnCount ?? 0,
+      firstMessage: state.turns?.[0]?.userMessage ?? backend?.firstMessage ?? "",
+      parentSessionPath: backend?.parentSessionPath ?? null,
+      backend,
+    };
+  });
+  const seenBackendIds = new Set(marchSessions.map((session) => session.backend?.id).filter(Boolean));
+  const legacyBackendSessions = backendSessions.filter((session) => !seenBackendIds.has(session.id));
+  return [...marchSessions, ...legacyBackendSessions];
+}

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,16 +96,18 @@ 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);
 
-    if (session?.path && getRuntimeSessionId(runtime) !== session.id) {
-      const restoreState = loadWorkspacePiSessionState({ runtime, session });
+    const targetSessionId = session?.id ?? null;
+    let restoreState = null;
+    if (session?.path && getRuntimeSessionId(runtime) !== targetSessionId) {
+      restoreState = loadWorkspaceMarchSessionState({ runtime, session });
       await runtime.runner.switchPiSession(session.path, restoreState);
-      syncSessionState(runtime, session.id);
     }
+    if (targetSessionId) syncSessionState(runtime, targetSessionId);
 
     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,17 +144,21 @@ 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 };
+  return stored.state;
 }
 
 function getRuntimeSessionId(runtime) {
-  return runtime.runner.getSessionStats?.()?.sessionId ?? runtime.sessionState?.sessionId ?? null;
+  return runtime.sessionState?.sessionId ?? runtime.runner.getSessionStats?.()?.sessionId ?? null;
 }
 
 function syncSessionState(runtime, sessionId) {

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.