BUG: Isolate derived plan session state

Background events from the resumable planning session could continue updating the newly active implementation transcript, status, retry state, permissions, and process output. Mutating titles with a planned suffix also made lineage ambiguous and accumulated unstable labels.

Scope UI callbacks and process output to their originating session while still refreshing the session index for inactive updates. Render planned and implementation badges from structured derivation metadata outside title truncation, and clear process output when navigating. Stopping source background processes was rejected because the source session must remain resumable and persist its eventual completion.

Verified with repository checks, the 324-test CLI suite, the 354-test core suite with one platform skip, and the 57-test VS Code suite.

Co-authored-by: Codex <noreply@openai.com>

Author: yifan-wang-second-foundation-eu

packages/cli/src/tests/exec-runner.test.ts

@@ -147,7 +147,7 @@ function createHarness(scenario: ManagerScenario = {}) {
             },
             true
           );
-          options.onProcessStdout?.(123, "process output\n");
+          options.onProcessStdout?.(123, "process output\n", activeId);
           scenario.duringPrompt?.();
           entry = createEntry(activeId, scenario.finalStatus ?? "completed", {
             assistantReply: scenario.finalReply === undefined ? "final answer" : scenario.finalReply,

packages/cli/src/tests/session-list.test.ts

@@ -1,6 +1,6 @@
 import { test } from "node:test";
 import assert from "node:assert/strict";
-import { formatSessionTitle, filterSessions, formatSessionStatus } from "../ui";
+import { formatSessionTitle, filterSessions, formatSessionStatus, getSessionBadges, isActiveSessionEvent } from "../ui";
 import type { SessionEntry } from "@vegamo/deepcode-core";
 
 test("formatSessionTitle replaces newlines with spaces", () => {
@@ -11,6 +11,31 @@ test("formatSessionTitle truncates after normalizing whitespace", () => {
   assert.equal(formatSessionTitle("one\n two   three", 10), "one two th…");
 });
 
+test("plan derivation badges remain separate from long truncated titles", () => {
+  const [source, implementation, fork] = buildSessions([
+    { id: "source", summary: "A very long plan title that must be independently truncated" },
+    {
+      id: "implementation",
+      summary: "A very long plan title that must be independently truncated",
+      derivedFrom: { kind: "plan-implementation", sessionId: "source", messageId: "plan-message" },
+    },
+    { id: "fork", forkedFrom: { sessionId: "source", messageId: "plan-message" } },
+  ]);
+
+  assert.equal(formatSessionTitle(source!.summary!, 20), "A very long plan tit…");
+  assert.deepEqual(getSessionBadges(source!, [source!, implementation!, fork!]), ["planned"]);
+  assert.deepEqual(getSessionBadges(implementation!, [source!, implementation!, fork!]), ["implementation"]);
+  assert.deepEqual(getSessionBadges(fork!, [source!, implementation!, fork!]), []);
+});
+
+test("session callbacks ignore events from inactive sessions", () => {
+  assert.equal(isActiveSessionEvent("implementation", "source"), false);
+  assert.equal(isActiveSessionEvent("implementation", "implementation"), true);
+  assert.equal(isActiveSessionEvent("implementation", undefined), true);
+  assert.equal(isActiveSessionEvent(null, "source"), false);
+  assert.equal(isActiveSessionEvent(null, "source", true), true);
+});
+
 test("formatSessionStatus maps status values to display labels", () => {
   assert.equal(formatSessionStatus("completed"), "done");
   assert.equal(formatSessionStatus("processing"), "running");
@@ -101,7 +126,7 @@ test("filterSessions handles sessions with null fields", () => {
 
 function buildSessions(overrides: Array<Partial<SessionEntry>>): SessionEntry[] {
   return overrides.map((override, i) => ({
-    id: `session-${i}`,
+    id: override.id ?? `session-${i}`,
     summary: override.summary ?? null,
     assistantReply: override.assistantReply ?? null,
     assistantThinking: null,
@@ -115,5 +140,7 @@ function buildSessions(overrides: Array<Partial<SessionEntry>>): SessionEntry[]
     createTime: new Date().toISOString(),
     updateTime: new Date().toISOString(),
     processes: null,
+    forkedFrom: override.forkedFrom,
+    derivedFrom: override.derivedFrom,
   }));
 }

packages/cli/src/ui/index.ts

@@ -14,6 +14,7 @@ export {
   resolvePromptTerminalCursorPosition,
 } from "./hooks/cursor";
 export { default as AppContainer } from "./views/AppContainer";
+export { isActiveSessionEvent } from "./views/App";
 export { AskUserQuestionPrompt, applyOtherAnswerEdit } from "./views/AskUserQuestionPrompt";
 export {
   PlanImplementationPrompt,
@@ -39,7 +40,13 @@ export {
   type PromptSubmission,
   type PromptDraft,
 } from "./views/PromptInput";
-export { SessionList, formatSessionTitle, filterSessions, formatSessionStatus } from "./views/SessionList";
+export {
+  SessionList,
+  formatSessionTitle,
+  filterSessions,
+  formatSessionStatus,
+  getSessionBadges,
+} from "./views/SessionList";
 export { ThemedGradient } from "./views/ThemedGradient";
 export { UpdatePrompt, type UpdatePromptChoice } from "./views/UpdatePrompt";
 export { WelcomeScreen, formatHomeRelativePath, buildWelcomeTips } from "./views/WelcomeScreen";

packages/cli/src/ui/views/App.tsx

@@ -69,6 +69,18 @@ type AppProps = {
   onRestart?: () => void;
 };
 
+export function isActiveSessionEvent(
+  activeSessionId: string | null,
+  eventSessionId?: string,
+  allowWhenNoActive = false
+): boolean {
+  return (
+    eventSessionId === undefined ||
+    eventSessionId === activeSessionId ||
+    (activeSessionId === null && allowWhenNoActive)
+  );
+}
+
 const StatusLine = React.memo(function StatusLine({
   busy,
   text,
@@ -111,6 +123,7 @@ function App({ projectRoot, initialPrompt, resumeSessionId, forkSessionId, onRes
   const resumeSessionIdRef = useRef(false);
   const startupDoneRef = useRef(false);
   const processStdoutRef = useRef<Map<number, string>>(new Map());
+  const busyRef = useRef(false);
   const rawModeRef = useRef<RawMode>(mode);
   const writeRef = useRef(write);
   const lastRenderedColumnsRef = useRef<number | null>(null);
@@ -155,19 +168,29 @@ function App({ projectRoot, initialPrompt, resumeSessionId, forkSessionId, onRes
       getResolvedSettings: () => resolveCurrentSettings(projectRoot),
       renderMarkdown: (text) => text,
       onAssistantMessage: (message: SessionMessage) => {
+        if (!isActiveSessionEvent(sessionManager.getActiveSessionId(), message.sessionId, busyRef.current)) {
+          return;
+        }
         setMessages((prev) => [...prev, message]);
         if (rawModeRef.current === RawMode.Raw) {
           writeStdoutLine("\n");
           writeStdoutLine(renderMessageToStdout(message, rawModeRef.current) + "\n\n");
         }
       },
       onSessionEntryUpdated: (entry) => {
+        setSessions(sessionManager.listSessions());
+        if (!isActiveSessionEvent(sessionManager.getActiveSessionId(), entry.id, busyRef.current)) {
+          return;
+        }
         setStatusLine(buildStatusLine(entry, resolveCurrentSettings(projectRoot)));
         setRunningProcesses(entry.processes);
         setActiveStatus(entry.status);
         setActiveAskPermissions(entry.askPermissions);
       },
       onLlmStreamProgress: (progress) => {
+        if (!isActiveSessionEvent(sessionManager.getActiveSessionId(), progress.sessionId, busyRef.current)) {
+          return;
+        }
         setRetryEvent(null);
         if (progress.phase === "end") {
           setStreamProgress(null);
@@ -176,13 +199,19 @@ function App({ projectRoot, initialPrompt, resumeSessionId, forkSessionId, onRes
         setStreamProgress(progress);
       },
       onLlmRetry: (event) => {
+        if (!isActiveSessionEvent(sessionManager.getActiveSessionId(), event.sessionId, busyRef.current)) {
+          return;
+        }
         setRetryEvent(event);
       },
       onMcpStatusChanged: () => {
         // 当 MCP 状态变更时，如果当前正在查看 MCP 状态页面，则更新显示
         setMcpStatuses(sessionManager.getMcpStatus());
       },
-      onProcessStdout: (pid, chunk) => {
+      onProcessStdout: (pid, chunk, sessionId) => {
+        if (!isActiveSessionEvent(sessionManager.getActiveSessionId(), sessionId)) {
+          return;
+        }
         const buf = processStdoutRef.current;
         const current = buf.get(pid) ?? "";
         // Cap at 1 MB per process to avoid unbounded memory growth
@@ -371,6 +400,7 @@ function App({ projectRoot, initialPrompt, resumeSessionId, forkSessionId, onRes
         try {
           const sessionId = sessionManager.forkSession(sourceSessionId);
           sessionManager.setActiveSessionId(sessionId);
+          processStdoutRef.current.clear();
           await resetStaticView(loadVisibleMessages(sessionManager, sessionId), { clearScreen: true });
           const session = sessionManager.getSession(sessionId);
           setStatusLine(session ? buildStatusLine(session, resolveCurrentSettings(projectRoot)) : "");
@@ -446,6 +476,7 @@ function App({ projectRoot, initialPrompt, resumeSessionId, forkSessionId, onRes
       }
 
       setBusy(true);
+      busyRef.current = true;
       setErrorLine(null);
       setRetryEvent(null);
       const activeProcesses = activeSessionId ? (sessionManager.getSession(activeSessionId)?.processes ?? null) : null;
@@ -472,6 +503,7 @@ function App({ projectRoot, initialPrompt, resumeSessionId, forkSessionId, onRes
         setErrorLine(message);
       } finally {
         setBusy(false);
+        busyRef.current = false;
         setStreamProgress(null);
         setRetryEvent(null);
         const finalActiveSessionId = sessionManager.getActiveSessionId();
@@ -665,6 +697,7 @@ function App({ projectRoot, initialPrompt, resumeSessionId, forkSessionId, onRes
   const handleSelectSession = useCallback(
     async (sessionId: string) => {
       sessionManager.setActiveSessionId(sessionId);
+      processStdoutRef.current.clear();
       // Clear first so <Static> resets its index to 0.
       await resetStaticView(loadVisibleMessages(sessionManager, sessionId), { clearScreen: true });
       const session = sessionManager.getSession(sessionId);

packages/cli/src/ui/views/SessionList.tsx

@@ -312,6 +312,7 @@ export function SessionList({ sessions, onSelect, onCancel, onDelete, onRename }
               const isSelected = actualIndex === safeIndex;
               const isConfirming = confirmDeleteSessionId === session.id;
               const isRenaming = renameSessionId === session.id;
+              const badges = getSessionBadges(session, sessions);
               return (
                 <Box key={session.id} height={2} marginBottom={1}>
                   <Box>
@@ -330,6 +331,13 @@ export function SessionList({ sessions, onSelect, onCancel, onDelete, onRename }
                           {formatSessionTitle(session.summary || "Untitled")}
                         </Text>
                       )}
+                      {!isRenaming
+                        ? badges.map((badge) => (
+                            <Text key={badge} color={badge === "implementation" ? "cyan" : "yellow"}>
+                              {` [${badge}]`}
+                            </Text>
+                          ))
+                        : null}
                       {isConfirming ? (
                         <Text color="yellow"> [Delete? Enter=yes, Esc=no]</Text>
                       ) : isRenaming ? null : (
@@ -413,6 +421,22 @@ export function formatSessionTitle(value: string, max = 70): string {
   return truncate(value.replace(/\r?\n/g, " ").replace(/\s+/g, " ").trim(), max);
 }
 
+export function getSessionBadges(session: SessionEntry, sessions: SessionEntry[]): Array<"planned" | "implementation"> {
+  const badges: Array<"planned" | "implementation"> = [];
+  if (
+    sessions.some(
+      (candidate) =>
+        candidate.derivedFrom?.kind === "plan-implementation" && candidate.derivedFrom.sessionId === session.id
+    )
+  ) {
+    badges.push("planned");
+  }
+  if (session.derivedFrom?.kind === "plan-implementation") {
+    badges.push("implementation");
+  }
+  return badges;
+}
+
 export function formatSessionStatus(status: SessionStatus): string {
   switch (status) {
     case "completed":