Commit a8cd2ad2ebb32ad789e8e0ecd2fc713c2edc38f4 | the-knife

apps/desktop/src/settings/DesktopClientSettings.test.ts-1

...	@@ -13,7 +13,6 @@ import * as DesktopEnvironment from "../app/DesktopEnvironment.ts";	...	@@ -13,7 +13,6 @@ import * as DesktopEnvironment from "../app/DesktopEnvironment.ts";
13	import * as DesktopClientSettings from "./DesktopClientSettings.ts";	13	import * as DesktopClientSettings from "./DesktopClientSettings.ts";
14		14
15	const clientSettings: ClientSettings = {	15	const clientSettings: ClientSettings = {
16	autoOpenPlanSidebar: false,
17	confirmThreadArchive: true,	16	confirmThreadArchive: true,
18	confirmThreadDelete: false,	17	confirmThreadDelete: false,
19	dismissedProviderUpdateNotificationKeys: [],	18	dismissedProviderUpdateNotificationKeys: [],

apps/server/integration/OrchestrationEngineHarness.integration.ts+5-1

apps/server/src/orchestration/Layers/CheckpointReactor.test.ts+3

apps/server/src/orchestration/Layers/OrchestrationEngine.test.ts+5

apps/server/src/orchestration/Layers/ProjectionPipeline.test.ts+2

apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts+4

apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts+5

apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts+3

apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts+2

apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts+17

...	@@ -35,6 +35,7 @@ import { ProjectionTurnRepositoryLive } from "../../persistence/Layers/Projectio	...	@@ -35,6 +35,7 @@ import { ProjectionTurnRepositoryLive } from "../../persistence/Layers/Projectio
35	import { isGitRepository } from "../../git/Utils.ts";	35	import { isGitRepository } from "../../git/Utils.ts";
36	import { OrchestrationEngineService } from "../Services/OrchestrationEngine.ts";	36	import { OrchestrationEngineService } from "../Services/OrchestrationEngine.ts";
37	import { ThreadBackgroundLivenessService } from "../ThreadBackgroundLiveness.ts";	37	import { ThreadBackgroundLivenessService } from "../ThreadBackgroundLiveness.ts";
		38	import { ThreadPlanProgressService } from "../ThreadPlanProgress.ts";
38	import { ProjectionSnapshotQuery } from "../Services/ProjectionSnapshotQuery.ts";	39	import { ProjectionSnapshotQuery } from "../Services/ProjectionSnapshotQuery.ts";
39	import {	40	import {
40	ProviderRuntimeIngestionService,	41	ProviderRuntimeIngestionService,
...	@@ -867,6 +868,7 @@ export function runtimeEventToActivities(	...	@@ -867,6 +868,7 @@ export function runtimeEventToActivities(
867		868
868	const make = Effect.gen(function* () {	869	const make = Effect.gen(function* () {
869	const threadBackgroundLiveness = yield* ThreadBackgroundLivenessService;	870	const threadBackgroundLiveness = yield* ThreadBackgroundLivenessService;
		871	const threadPlanProgress = yield* ThreadPlanProgressService;
870	const crypto = yield* Crypto.Crypto;	872	const crypto = yield* Crypto.Crypto;
871	const orchestrationEngine = yield* OrchestrationEngineService;	873	const orchestrationEngine = yield* OrchestrationEngineService;
872	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;	874	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
...	@@ -1935,6 +1937,21 @@ const make = Effect.gen(function* () {	...	@@ -1935,6 +1937,21 @@ const make = Effect.gen(function* () {
1935	yield* rememberTaskDescription(thread.id, event.payload.taskId, description);	1937	yield* rememberTaskDescription(thread.id, event.payload.taskId, description);
1936	}	1938	}
1937	}	1939	}
		1940	// Working-indicator plan progress: current step while the turn runs,
		1941	// cleared on settle so a finished plan never lingers as stale UI.
		1942	// Events carrying a turn id that conflicts with the active turn are
		1943	// stale (superseded turn) and must neither overwrite nor clear the
		1944	// active turn's progress; session.exited always clears.
		1945	if (event.type === "session.exited") {
		1946	threadPlanProgress.clearThreadPlanProgress(thread.id);
		1947	} else if (!conflictsWithActiveTurn) {
		1948	if (event.type === "turn.plan.updated") {
		1949	threadPlanProgress.recordPlanProgress(thread.id, event.payload.plan);
		1950	} else if (event.type === "turn.completed" \|\| event.type === "turn.aborted") {
		1951	threadPlanProgress.clearThreadPlanProgress(thread.id);
		1952	}
		1953	}
		1954
1938	// Sidebar background liveness: fed from the same lifecycle stream,	1955	// Sidebar background liveness: fed from the same lifecycle stream,
1939	// read by the shell query at mapping time (no persistence).	1956	// read by the shell query at mapping time (no persistence).
1940	switch (event.type) {	1957	switch (event.type) {

apps/server/src/orchestration/ThreadPlanProgress.test.ts created+44

...	@@ -0,0 +1,44 @@
1	import { describe, expect, it } from "vite-plus/test";
2	import * as ThreadPlanProgress from "./ThreadPlanProgress.ts";
3
4	describe("ThreadPlanProgress", () => {
5	it("tracks the in-progress step and clears when the plan completes", () => {
6	const progress = ThreadPlanProgress.make();
7	const threadId = "t-plan-1";
8	progress.recordPlanProgress(threadId, [
9	{ step: "Audit failure paths", status: "completed" },
10	{ step: "Implement the fix", status: "inProgress" },
11	{ step: "Run targeted tests", status: "pending" },
12	]);
13	expect(progress.getThreadPlanProgress(threadId)).toEqual({
14	step: "Implement the fix",
15	completedSteps: 1,
16	totalSteps: 3,
17	});
18
19	progress.recordPlanProgress(threadId, [
20	{ step: "Audit failure paths", status: "completed" },
21	{ step: "Implement the fix", status: "completed" },
22	{ step: "Run targeted tests", status: "completed" },
23	]);
24	expect(progress.getThreadPlanProgress(threadId)).toBeNull();
25	});
26
27	it("falls back to the first non-completed step when nothing is in progress", () => {
28	const progress = ThreadPlanProgress.make();
29	const threadId = "t-plan-2";
30	progress.recordPlanProgress(threadId, [
31	{ step: "First", status: "pending" },
32	{ step: "Second", status: "pending" },
33	]);
34	expect(progress.getThreadPlanProgress(threadId)?.step).toBe("First");
35	});
36
37	it("clearThreadPlanProgress removes the entry (turn settled / session died)", () => {
38	const progress = ThreadPlanProgress.make();
39	const threadId = "t-plan-3";
40	progress.recordPlanProgress(threadId, [{ step: "Only step", status: "inProgress" }]);
41	progress.clearThreadPlanProgress(threadId);
42	expect(progress.getThreadPlanProgress(threadId)).toBeNull();
43	});
44	});

apps/server/src/orchestration/ThreadPlanProgress.ts created+76

...	@@ -0,0 +1,76 @@
1	/**
2	* ThreadPlanProgressService - in-memory per-thread plan progress for the
3	* Working indicators (sidebar rows, in-chat working line).
4	*
5	* Plans are a progress annotation, not a surface of their own: the useful
6	* kernel of a turn.plan.updated event is "which step is the agent on right
7	* now". Ingestion records the current step here and the shell query reads it
8	* at mapping time — no persistence, no migration (same pattern as
9	* ThreadBackgroundLivenessService). Cleared when the turn settles or the
10	* session dies, so a finished plan never lingers as stale UI.
11	*
12	* @module ThreadPlanProgressService
13	*/
14	import * as Context from "effect/Context";
15	import * as Effect from "effect/Effect";
16	import * as Layer from "effect/Layer";
17
18	export interface ThreadPlanProgress {
19	readonly step: string;
20	readonly completedSteps: number;
21	readonly totalSteps: number;
22	}
23
24	interface PlanStepInput {
25	readonly step: string;
26	readonly status: string;
27	}
28
29	export class ThreadPlanProgressService extends Context.Service<
30	ThreadPlanProgressService,
31	{
32	/**
33	* Feed one turn.plan.updated payload. An all-completed plan clears the
34	* entry (the turn is wrapping up; nothing is "in progress" anymore).
35	*/
36	readonly recordPlanProgress: (threadId: string, plan: ReadonlyArray<PlanStepInput>) => void;
37
38	/** Turn settled or session died: the working indicator reverts to plain. */
39	readonly clearThreadPlanProgress: (threadId: string) => void;
40
41	readonly getThreadPlanProgress: (threadId: string) => ThreadPlanProgress \| null;
42	}
43	>()("t3/orchestration/ThreadPlanProgress/ThreadPlanProgressService") {}
44
45	export function make(): ThreadPlanProgressService["Service"] {
46	const progressByThreadId = new Map<string, ThreadPlanProgress>();
47
48	return {
49	recordPlanProgress: (threadId, plan) => {
50	const totalSteps = plan.length;
51	const completedSteps = plan.filter((step) => step.status === "completed").length;
52	// Current step: the in-progress one, else the first pending one (a
53	// plan that was just written has no in-progress step yet).
54	const current =
55	plan.find((step) => step.status === "inProgress") ??
56	plan.find((step) => step.status !== "completed");
57	if (totalSteps === 0 \|\| completedSteps === totalSteps \|\| current === undefined) {
58	progressByThreadId.delete(threadId);
59	return;
60	}
61	progressByThreadId.set(threadId, {
62	step: current.step,
63	completedSteps,
64	totalSteps,
65	});
66	},
67
68	clearThreadPlanProgress: (threadId) => {
69	progressByThreadId.delete(threadId);
70	},
71
72	getThreadPlanProgress: (threadId) => progressByThreadId.get(threadId) ?? null,
73	};
74	}
75
76	export const layer = Layer.effect(ThreadPlanProgressService, Effect.sync(make));

apps/server/src/orchestration/runtimeLayer.ts+9-4

 @@ -6,6 +6,7 @@ import { OrchestrationEngineLive } from "./Layers/OrchestrationEngine.ts";
 import { OrchestrationProjectionPipelineLive } from "./Layers/ProjectionPipeline.ts";
 import { OrchestrationProjectionSnapshotQueryLive } from "./Layers/ProjectionSnapshotQuery.ts";
 import * as ThreadBackgroundLiveness from "./ThreadBackgroundLiveness.ts";
+import * as ThreadPlanProgress from "./ThreadPlanProgress.ts";
 export const OrchestrationEventInfrastructureLayerLive = Layer.mergeAll(
   OrchestrationEventStoreLive,
 @@ -20,10 +21,14 @@ export const OrchestrationInfrastructureLayerLive = Layer.mergeAll(
   OrchestrationProjectionSnapshotQueryLive,
   OrchestrationEventInfrastructureLayerLive,
   OrchestrationProjectionPipelineLayerLive,
-  // Shared background-liveness registry: written by runtime ingestion,
+  // Shared background-liveness and plan-progress registries: written by
-  // read by the snapshot query. provideMerge feeds the same instance to
+  // runtime ingestion, read by the snapshot query. provideMerge feeds the
-  // the snapshot query here and re-exports it for runtime ingestion.
+  // same instance to the snapshot query here and re-exports it for runtime
-).pipe(Layer.provideMerge(ThreadBackgroundLiveness.layer));
+  // ingestion.
+).pipe(
+  Layer.provideMerge(ThreadBackgroundLiveness.layer),
+  Layer.provideMerge(ThreadPlanProgress.layer),
+);
 export const OrchestrationLayerLive = Layer.mergeAll(
   OrchestrationInfrastructureLayerLive,

apps/web/src/components/ChatView.tsx+38-169

 @@ -85,7 +85,7 @@ import {
   deriveTimelineEntries,
   deriveActiveWorkStartedAt,
   deriveActivePlanState,
-  findSidebarProposedPlan,
+  deriveTurnPlans,
   findLatestProposedPlan,
   deriveWorkLogEntries,
   hasActionableProposedPlan,
 @@ -121,11 +121,6 @@ import { useTurnDiffSummaries } from "../hooks/useTurnDiffSummaries";
 import { isCommandPaletteOpen } from "../commandPaletteBus";
 import { buildTemporaryWorktreeBranchName } from "@t3tools/shared/git";
 import { useMediaQuery } from "../hooks/useMediaQuery";
-import {
-  clearPlanSidebarDismissal,
-  dismissPlanSidebarForTurn,
-  isPlanSidebarDismissedForTurn,
-} from "../planSidebarDismissal";
 import { RIGHT_PANEL_INLINE_LAYOUT_MEDIA_QUERY } from "../rightPanelLayout";
 import {
   selectActiveRightPanel,
 @@ -157,7 +152,6 @@ import {
 import { DiffWorkerPoolProvider } from "./DiffWorkerPoolProvider";
 import { BranchToolbar } from "./BranchToolbar";
 import { resolveShortcutCommand, shortcutLabelForCommand } from "../keybindings";
-import PlanSidebar from "./PlanSidebar";
 import ThreadTerminalDrawer from "./ThreadTerminalDrawer";
 import {
   AlarmClockIcon,
 @@ -234,7 +228,6 @@ import {
   useProject,
   useProjects,
   useThread,
-  useThreadProposedPlans,
   useThreadRefs,
   useThreadShell,
 } from "../state/entities";
 @@ -451,8 +444,6 @@ type EnvironmentUnavailableState = {
   readonly connection: EnvironmentConnectionPresentation;
 };
-type ThreadPlanCatalogEntry = Pick<Thread, "id" | "proposedPlans">;
 function eventPathContainsSelector(event: Event, selector: string): boolean {
   const path = event.composedPath();
   if (path.length === 0 && event.target) {
 @@ -1271,7 +1262,6 @@ function ChatViewContent(props: ChatViewProps) {
     (store) => store.setStickyModelSelection,
   );
   const timestampFormat = settings.timestampFormat;
-  const autoOpenPlanSidebar = settings.autoOpenPlanSidebar;
   const navigate = useNavigate();
   const { resolvedTheme } = useTheme();
   // Granular store selectors — avoid subscribing to prompt changes.
 @@ -1341,10 +1331,7 @@ function ChatViewContent(props: ChatViewProps) {
   >({});
   const [pendingUserInputQuestionIndexByRequestId, setPendingUserInputQuestionIndexByRequestId] =
     useState<Record<string, number>>({});
-  const shouldUsePlanSidebarSheet = useMediaQuery(RIGHT_PANEL_INLINE_LAYOUT_MEDIA_QUERY);
+  const shouldUseRightPanelSheet = useMediaQuery(RIGHT_PANEL_INLINE_LAYOUT_MEDIA_QUERY);
-  // When set, the thread-change reset effect will open the sidebar instead of closing it.
-  // Used by "Implement in a new thread" to carry the sidebar-open intent across navigation.
-  const planSidebarOpenOnNextThreadRef = useRef(false);
   const [terminalFocusRequestId, setTerminalFocusRequestId] = useState(0);
   const [pullRequestDialogState, setPullRequestDialogState] =
     useState<PullRequestDialogState | null>(null);
 @@ -1577,10 +1564,10 @@ function ChatViewContent(props: ChatViewProps) {
   );
   const previewPanelOpen = activeRightPanelKind === "preview" && isPreviewSupportedInRuntime();
   const rightPanelOpen = rightPanelState.isOpen;
-  const canMaximizeRightPanel = rightPanelOpen && !shouldUsePlanSidebarSheet;
+  const canMaximizeRightPanel = rightPanelOpen && !shouldUseRightPanelSheet;
   const rightPanelMaximized =
     canMaximizeRightPanel && maximizedRightPanelThreadKey === routeThreadKey;
-  const inlineRightPanelOwnsTitleBar = rightPanelOpen && !shouldUsePlanSidebarSheet;
+  const inlineRightPanelOwnsTitleBar = rightPanelOpen && !shouldUseRightPanelSheet;
   useEffect(() => {
     if (!activeThreadRef) return;
 @@ -1607,36 +1594,11 @@ function ChatViewContent(props: ChatViewProps) {
     previewPanelOpen,
   ]);
-  const planSidebarOpen = activeRightPanelKind === "plan";
   const existingOpenTerminalThreadKeys = useMemo(() => {
     const existingThreadKeys = new Set<string>([...serverThreadKeys, ...draftThreadKeys]);
     return openTerminalThreadKeys.filter((nextThreadKey) => existingThreadKeys.has(nextThreadKey));
   }, [draftThreadKeys, openTerminalThreadKeys, serverThreadKeys]);
   const activeLatestTurn = activeThread?.latestTurn ?? null;
-  const sourcePlanThreadRef = useMemo(() => {
-    const sourceThreadId = activeLatestTurn?.sourceProposedPlan?.threadId;
-    if (!activeThread || !sourceThreadId || sourceThreadId === activeThread.id) {
-      return null;
-    }
-    return scopeThreadRef(activeThread.environmentId, sourceThreadId);
-  }, [activeLatestTurn?.sourceProposedPlan?.threadId, activeThread]);
-  const sourceThreadProposedPlans = useThreadProposedPlans(sourcePlanThreadRef);
-  const threadPlanCatalog = useMemo<ThreadPlanCatalogEntry[]>(() => {
-    if (!activeThread) {
-      return [];
-    }
-    const entries: ThreadPlanCatalogEntry[] = [
-      { id: activeThread.id, proposedPlans: activeThread.proposedPlans },
-    ];
-    if (sourcePlanThreadRef) {
-      entries.push({
-        id: sourcePlanThreadRef.threadId,
-        proposedPlans: sourceThreadProposedPlans,
-      });
-    }
-    return entries;
-  }, [activeThread, sourcePlanThreadRef, sourceThreadProposedPlans]);
   useEffect(() => {
     setMountedTerminalThreadKeys((currentThreadIds) => {
       const nextThreadIds = reconcileMountedTerminalThreadIds({
 @@ -2086,6 +2048,7 @@ function ChatViewContent(props: ChatViewProps) {
   const phase = derivePhase(activeThread?.session ?? null);
   const threadActivities = activeThread?.activities ?? EMPTY_ACTIVITIES;
   const workLogEntries = useMemo(() => deriveWorkLogEntries(threadActivities), [threadActivities]);
+  const turnPlans = useMemo(() => deriveTurnPlans(threadActivities), [threadActivities]);
   // Native subagent fold: memoized by activity-list identity, shared by the
   // Agents surface, live strip, and workflow cards. v2Projection is null
   // until orchestration-v2 lands (source precedence lives in the derive).
 @@ -2148,21 +2111,25 @@ function ChatViewContent(props: ChatViewProps) {
       activeLatestTurn?.turnId ?? null,
     );
   }, [activeLatestTurn?.turnId, activeThread?.proposedPlans, latestTurnSettled]);
-  const sidebarProposedPlan = useMemo(
-    () =>
-      findSidebarProposedPlan({
-        threads: threadPlanCatalog,
-        latestTurn: activeLatestTurn,
-        latestTurnSettled,
-        threadId: activeThread?.id ?? null,
-      }),
-    [activeLatestTurn, activeThread?.id, latestTurnSettled, threadPlanCatalog],
-  );
   const activePlan = useMemo(
     () => deriveActivePlanState(threadActivities, activeLatestTurn?.turnId ?? undefined),
     [activeLatestTurn?.turnId, threadActivities],
   );
-  const planSidebarLabel = sidebarProposedPlan || interactionMode === "plan" ? "Plan" : "Tasks";
+  // Current step for the in-chat working row: only for the running turn's own
+  // plan (deriveActivePlanState falls back to older turns' plans, which must
+  // not label fresh work). Falls back to the first pending step so an
+  // all-pending freshly written plan labels the row, matching the chip and
+  // the server's planProgress.
+  const workingStepLabel = useMemo(() => {
+    if (!activePlan || activePlan.turnId !== (activeLatestTurn?.turnId ?? null)) {
+      return null;
+    }
+    return (
+      activePlan.steps.find((step) => step.status === "inProgress")?.step ??
+      activePlan.steps.find((step) => step.status === "pending")?.step ??
+      null
+    );
+  }, [activeLatestTurn?.turnId, activePlan]);
   const showPlanFollowUpPrompt =
     pendingUserInputs.length === 0 &&
     interactionMode === "plan" &&
 @@ -2431,8 +2398,13 @@ function ChatViewContent(props: ChatViewProps) {
   }, [attachmentPreviewHandoffByMessageId, displayServerMessages, optimisticUserMessages]);
   const timelineEntries = useMemo(
     () =>
-      deriveTimelineEntries(timelineMessages, activeThread?.proposedPlans ?? [], workLogEntries),
+      deriveTimelineEntries(
-    [activeThread?.proposedPlans, timelineMessages, workLogEntries],
+        timelineMessages,
+        activeThread?.proposedPlans ?? [],
+        workLogEntries,
+        turnPlans,
+      ),
+    [activeThread?.proposedPlans, timelineMessages, turnPlans, workLogEntries],
   );
   const [dockedDraftHeroThreadKey, setDockedDraftHeroThreadKey] = useState<string | null>(null);
   const draftHeroDockRequested =
 @@ -3142,47 +3114,15 @@ function ChatViewContent(props: ChatViewProps) {
   const toggleInteractionMode = useCallback(() => {
     handleInteractionModeChange(interactionMode === "plan" ? "default" : "plan");
   }, [handleInteractionModeChange, interactionMode]);
-  const dismissPlanSidebarForCurrentTurn = useCallback(() => {
-    if (!activeThreadKey) return;
-    dismissPlanSidebarForTurn(
-      activeThreadKey,
-      activePlan?.turnId ?? sidebarProposedPlan?.turnId ?? "__dismissed__",
-    );
-  }, [activeThreadKey, activePlan?.turnId, sidebarProposedPlan?.turnId]);
-  const togglePlanSidebar = useCallback(() => {
-    if (!activeThreadRef) return;
-    if (planSidebarOpen) {
-      dismissPlanSidebarForCurrentTurn();
-    } else if (activeThreadKey) {
-      clearPlanSidebarDismissal(activeThreadKey);
-    }
-    useRightPanelStore.getState().toggle(activeThreadRef, "plan");
-  }, [activeThreadKey, activeThreadRef, dismissPlanSidebarForCurrentTurn, planSidebarOpen]);
-  const closePlanSidebar = useCallback(() => {
-    if (!activeThreadRef) return;
-    setMaximizedRightPanelThreadKey(null);
-    useRightPanelStore.getState().close(activeThreadRef);
-    dismissPlanSidebarForCurrentTurn();
-  }, [activeThreadRef, dismissPlanSidebarForCurrentTurn]);
   const createBrowserSurface = useCallback(() => {
     if (!activeThreadRef) return;
     void addBrowserSurface({ threadRef: activeThreadRef, openPreview });
   }, [activeThreadRef, openPreview]);
   const addDiffSurface = useCallback(() => {
     if (!activeThreadRef || !isServerThread || !isGitRepo) return;
-    if (planSidebarOpen) {
-      dismissPlanSidebarForCurrentTurn();
-    }
     useRightPanelStore.getState().open(activeThreadRef, "diff");
     onDiffPanelOpen?.();
-  }, [
+  }, [activeThreadRef, isGitRepo, isServerThread, onDiffPanelOpen]);
-    activeThreadRef,
-    dismissPlanSidebarForCurrentTurn,
-    isGitRepo,
-    isServerThread,
-    onDiffPanelOpen,
-    planSidebarOpen,
-  ]);
   const addFilesSurface = useCallback(() => {
     if (!activeThreadRef || !activeProject) return;
     useRightPanelStore.getState().open(activeThreadRef, "files");
 @@ -3318,11 +3258,6 @@ function ChatViewContent(props: ChatViewProps) {
   const activateRightPanelSurface = useCallback(
     (surface: RightPanelSurface) => {
       if (!activeThreadRef) return;
-      if (surface.kind === "plan") {
-        clearPlanSidebarDismissal(scopedThreadKey(activeThreadRef));
-      } else if (planSidebarOpen) {
-        dismissPlanSidebarForCurrentTurn();
-      }
       useRightPanelStore.getState().activateSurface(activeThreadRef, surface.id);
       if (surface.kind === "preview" && surface.resourceId) {
         setActivePreviewTab(activeThreadRef, surface.resourceId);
 @@ -3334,20 +3269,16 @@ function ChatViewContent(props: ChatViewProps) {
         onDiffPanelOpen?.();
       }
     },
-    [activeThreadRef, diffOpen, dismissPlanSidebarForCurrentTurn, onDiffPanelOpen, planSidebarOpen],
+    [activeThreadRef, diffOpen, onDiffPanelOpen],
   );
   const toggleRightPanel = useCallback(() => {
     if (!activeThreadRef) return;
     if (rightPanelOpen) {
-      if (planSidebarOpen) {
+      closePreviewPanel();
-        closePlanSidebar();
-      } else {
-        closePreviewPanel();
-      }
       return;
     }
     useRightPanelStore.getState().toggleVisibility(activeThreadRef);
-  }, [activeThreadRef, closePlanSidebar, closePreviewPanel, planSidebarOpen, rightPanelOpen]);
+  }, [activeThreadRef, closePreviewPanel, rightPanelOpen]);
   const toggleRightPanelMaximized = useCallback(() => {
     if (!canMaximizeRightPanel) return;
     setMaximizedRightPanelThreadKey((threadKey) =>
 @@ -3357,10 +3288,6 @@ function ChatViewContent(props: ChatViewProps) {
   const cleanupRightPanelSurfaces = useCallback(
     (surfaces: readonly RightPanelSurface[]) => {
       if (!activeThreadRef) return;
-      if (surfaces.some((surface) => surface.kind === "plan")) {
-        dismissPlanSidebarForCurrentTurn();
-      }
       for (const surface of surfaces) {
         if (surface.kind === "preview" && surface.resourceId) {
           void closePreviewSession({
 @@ -3386,7 +3313,6 @@ function ChatViewContent(props: ChatViewProps) {
       activePreviewState.sessions,
       closePreview,
       closeTerminalMutation,
-      dismissPlanSidebarForCurrentTurn,
       storeCloseTerminal,
     ],
   );
 @@ -3976,37 +3902,9 @@ function ChatViewContent(props: ChatViewProps) {
     activeTimelineAnchorIndexRef.current = null;
     showScrollDebouncer.current.cancel();
     setShowScrollToBottom(false);
-    if (planSidebarOpenOnNextThreadRef.current) {
-      planSidebarOpenOnNextThreadRef.current = false;
-      if (activeThreadRef) {
-        clearPlanSidebarDismissal(scopedThreadKey(activeThreadRef));
-        useRightPanelStore.getState().open(activeThreadRef, "plan");
-      }
-    }
     // activeThreadRef resets transitively with the active thread.
   }, [activeThread?.id]);
-  // Auto-open the plan sidebar when plan/todo steps arrive for the current turn.
-  // Don't auto-open for plans carried over from a previous turn (the user can open manually).
-  useEffect(() => {
-    if (!autoOpenPlanSidebar) return;
-    if (!activePlan) return;
-    if (planSidebarOpen) return;
-    const latestTurnId = activeLatestTurn?.turnId ?? null;
-    if (latestTurnId && activePlan.turnId !== latestTurnId) return;
-    const turnKey = activePlan.turnId ?? sidebarProposedPlan?.turnId ?? "__dismissed__";
-    if (!activeThreadRef) return;
-    if (isPlanSidebarDismissedForTurn(scopedThreadKey(activeThreadRef), turnKey)) return;
-    useRightPanelStore.getState().open(activeThreadRef, "plan");
-  }, [
-    activePlan,
-    activeLatestTurn?.turnId,
-    activeThreadRef,
-    autoOpenPlanSidebar,
-    planSidebarOpen,
-    sidebarProposedPlan?.turnId,
-  ]);
   useEffect(() => {
     setIsRevertingCheckpoint(false);
   }, [activeThread?.id]);
 @@ -5556,15 +5454,6 @@ function ChatViewContent(props: ChatViewProps) {
       if (failure === null) {
         acknowledgeActiveThreadWoke();
-        // Optimistically open the plan sidebar when implementing (not refining).
-        // "default" mode here means the agent is executing the plan, which produces
-        // step-tracking activities that the sidebar will display.
-        if (nextInteractionMode === "default" && autoOpenPlanSidebar) {
-          if (activeThreadRef) {
-            clearPlanSidebarDismissal(scopedThreadKey(activeThreadRef));
-            useRightPanelStore.getState().open(activeThreadRef, "plan");
-          }
-        }
         sendInFlightRef.current = false;
         return;
       }
 @@ -5597,7 +5486,6 @@ function ChatViewContent(props: ChatViewProps) {
       setComposerDraftInteractionMode,
       setThreadError,
       startThreadTurn,
-      autoOpenPlanSidebar,
       environmentId,
       composerRef,
     ],
 @@ -5700,8 +5588,6 @@ function ChatViewContent(props: ChatViewProps) {
     }
     if (failure === null) {
-      // Signal that the plan sidebar should open on the new thread when enabled.
-      planSidebarOpenOnNextThreadRef.current = autoOpenPlanSidebar;
       const navigateResult = await settlePromise(() =>
         navigate({
           to: "/$environmentId/$threadId",
 @@ -5758,7 +5644,6 @@ function ChatViewContent(props: ChatViewProps) {
     resetLocalDispatch,
     runtimeMode,
     startThreadTurn,
-    autoOpenPlanSidebar,
     environmentId,
     composerRef,
   ]);
 @@ -5950,12 +5835,12 @@ function ChatViewContent(props: ChatViewProps) {
     <div
       className={cn(
         "workspace-titlebar-controls z-50 gap-1 [-webkit-app-region:no-drag]",
-        rightPanelOpen && !shouldUsePlanSidebarSheet
+        rightPanelOpen && !shouldUseRightPanelSheet
           ? "right-2 wco:right-[var(--workspace-controls-right)]"
           : "mr-px",
       )}
     >
-      {rightPanelOpen && !shouldUsePlanSidebarSheet ? (
+      {rightPanelOpen && !shouldUseRightPanelSheet ? (
         <RightPanelMaximizeControl
           maximized={rightPanelMaximized}
           onToggle={toggleRightPanelMaximized}
 @@ -6005,18 +5890,6 @@ function ChatViewContent(props: ChatViewProps) {
           initialGitScope={initialDiffPanelGitScope}
         />
       </Suspense>
-    ) : activeRightPanelSurface?.kind === "plan" ? (
-      <PlanSidebar
-        activePlan={activePlan}
-        activeProposedPlan={sidebarProposedPlan}
-        label={planSidebarLabel}
-        environmentId={environmentId}
-        threadRef={activeThreadRef}
-        markdownCwd={gitCwd ?? undefined}
-        workspaceRoot={activeWorkspaceRoot}
-        timestampFormat={timestampFormat}
-        mode="embedded"
-      />
     ) : activeRightPanelSurface?.kind === "agents" ? (
       <AgentsPanel
         model={agentPanelModel}
 @@ -6050,7 +5923,7 @@ function ChatViewContent(props: ChatViewProps) {
   return (
     <div className="relative flex min-h-0 min-w-0 flex-1 overflow-hidden bg-background">
-      {rightPanelOpen && !shouldUsePlanSidebarSheet ? panelLayoutControls : null}
+      {rightPanelOpen && !shouldUseRightPanelSheet ? panelLayoutControls : null}
       <div
         className={cn(
           "flex min-h-0 min-w-0 flex-col overflow-x-hidden",
 @@ -6122,6 +5995,7 @@ function ChatViewContent(props: ChatViewProps) {
                 onOpenAgents={addAgentsSurface}
                 key={activeThread.id}
                 isWorking={isWorking}
+                workingStepLabel={workingStepLabel}
                 activeTurnInProgress={isWorking || !latestTurnSettled}
                 activeTurnStartedAt={activeWorkStartedAt}
                 listRef={legendListRef}
 @@ -6264,10 +6138,6 @@ function ChatViewContent(props: ChatViewProps) {
                             respondingRequestIds={respondingRequestIds}
                             showPlanFollowUpPrompt={showPlanFollowUpPrompt}
                             activeProposedPlan={activeProposedPlan}
-                            activePlan={activePlan as { turnId?: TurnId } | null}
-                            sidebarProposedPlan={sidebarProposedPlan as { turnId?: TurnId } | null}
-                            planSidebarLabel={planSidebarLabel}
-                            planSidebarOpen={planSidebarOpen}
                             runtimeMode={runtimeMode}
                             interactionMode={interactionMode}
                             lockedProvider={lockedProvider}
 @@ -6305,7 +6175,6 @@ function ChatViewContent(props: ChatViewProps) {
                             toggleInteractionMode={toggleInteractionMode}
                             handleRuntimeModeChange={handleRuntimeModeChange}
                             handleInteractionModeChange={handleInteractionModeChange}
-                            togglePlanSidebar={togglePlanSidebar}
                             focusComposer={focusComposer}
                             scheduleComposerFocus={scheduleComposerFocus}
                             setThreadError={setThreadError}
 @@ -6440,7 +6309,7 @@ function ChatViewContent(props: ChatViewProps) {
         ))}
       </div>
-      {!shouldUsePlanSidebarSheet && rightPanelOpen && activeThreadRef ? (
+      {!shouldUseRightPanelSheet && rightPanelOpen && activeThreadRef ? (
         <RightPanelTabs
           mode="inline"
           maximized={rightPanelMaximized}
 @@ -6467,8 +6336,8 @@ function ChatViewContent(props: ChatViewProps) {
           {rightPanelContent}
         </RightPanelTabs>
       ) : null}
-      {shouldUsePlanSidebarSheet && rightPanelOpen && activeThreadRef ? (
+      {shouldUseRightPanelSheet && rightPanelOpen && activeThreadRef ? (
-        <RightPanelSheet open onClose={planSidebarOpen ? closePlanSidebar : closePreviewPanel}>
+        <RightPanelSheet open onClose={closePreviewPanel}>
           <RightPanelTabs
             mode="sheet"
             layoutControls={panelToggleControls}

apps/web/src/components/PlanSidebar.tsx deleted-284

...	@@ -1,284 +0,0 @@
1	import { memo, useState, useCallback } from "react";
2	import {
3	isAtomCommandInterrupted,
4	squashAtomCommandFailure,
5	} from "@t3tools/client-runtime/state/runtime";
6	import type { EnvironmentId, ScopedThreadRef } from "@t3tools/contracts";
7	import { type TimestampFormat } from "@t3tools/contracts/settings";
8	import { Badge } from "./ui/badge";
9	import { Button } from "./ui/button";
10	import { ScrollArea } from "./ui/scroll-area";
11	import ChatMarkdown from "./ChatMarkdown";
12	import {
13	CheckIcon,
14	ChevronDownIcon,
15	ChevronRightIcon,
16	EllipsisIcon,
17	LoaderIcon,
18	} from "lucide-react";
19	import { cn } from "~/lib/utils";
20	import type { ActivePlanState } from "../session-logic";
21	import type { LatestProposedPlanState } from "../session-logic";
22	import { formatTimestamp } from "../timestampFormat";
23	import {
24	proposedPlanTitle,
25	buildProposedPlanMarkdownFilename,
26	normalizePlanMarkdownForExport,
27	downloadPlanAsTextFile,
28	stripDisplayedPlanMarkdown,
29	} from "../proposedPlan";
30	import { Menu, MenuItem, MenuPopup, MenuTrigger } from "./ui/menu";
31	import { projectEnvironment } from "~/state/projects";
32	import { stackedThreadToast, toastManager } from "./ui/toast";
33	import { useCopyToClipboard } from "~/hooks/useCopyToClipboard";
34	import { useAtomCommand } from "~/state/use-atom-command";
35
36	function stepStatusIcon(status: string): React.ReactNode {
37	if (status === "completed") {
38	return (
39	<span className="flex size-5 shrink-0 items-center justify-center rounded-full bg-success/10 text-success-foreground">
40	<CheckIcon className="size-3" />
41	</span>
42	);
43	}
44	if (status === "inProgress") {
45	return (
46	<span className="flex size-5 shrink-0 items-center justify-center rounded-full bg-primary/10 text-primary">
47	<LoaderIcon className="size-3 animate-spin" />
48	</span>
49	);
50	}
51	return (
52	<span className="flex size-5 shrink-0 items-center justify-center rounded-full border border-border/60 bg-muted/30">
53	<span className="size-1.5 rounded-full bg-muted-foreground/30" />
54	</span>
55	);
56	}
57
58	interface PlanSidebarProps {
59	activePlan: ActivePlanState \| null;
60	activeProposedPlan: LatestProposedPlanState \| null;
61	label?: string;
62	environmentId: EnvironmentId;
63	threadRef?: ScopedThreadRef \| undefined;
64	markdownCwd: string \| undefined;
65	workspaceRoot: string \| undefined;
66	timestampFormat: TimestampFormat;
67	mode?: "sheet" \| "sidebar" \| "embedded";
68	}
69
70	const PlanSidebar = memo(function PlanSidebar({
71	activePlan,
72	activeProposedPlan,
73	label = "Plan",
74	environmentId,
75	threadRef,
76	markdownCwd,
77	workspaceRoot,
78	timestampFormat,
79	mode = "sidebar",
80	}: PlanSidebarProps) {
81	const [proposedPlanExpanded, setProposedPlanExpanded] = useState(false);
82	const [isSavingToWorkspace, setIsSavingToWorkspace] = useState(false);
83	const writeProjectFile = useAtomCommand(projectEnvironment.writeFile, {
84	reportFailure: false,
85	});
86	const { copyToClipboard, isCopied } = useCopyToClipboard({ target: "plan" });
87
88	const planMarkdown = activeProposedPlan?.planMarkdown ?? null;
89	const displayedPlanMarkdown = planMarkdown ? stripDisplayedPlanMarkdown(planMarkdown) : null;
90	const planTitle = planMarkdown ? proposedPlanTitle(planMarkdown) : null;
91
92	const handleCopyPlan = useCallback(() => {
93	if (!planMarkdown) return;
94	copyToClipboard(planMarkdown);
95	}, [planMarkdown, copyToClipboard]);
96
97	const handleDownload = useCallback(() => {
98	if (!planMarkdown) return;
99	const filename = buildProposedPlanMarkdownFilename(planMarkdown);
100	downloadPlanAsTextFile(filename, normalizePlanMarkdownForExport(planMarkdown));
101	}, [planMarkdown]);
102
103	const handleSaveToWorkspace = useCallback(() => {
104	if (!workspaceRoot \|\| !planMarkdown) return;
105	const filename = buildProposedPlanMarkdownFilename(planMarkdown);
106	setIsSavingToWorkspace(true);
107	void (async () => {
108	const result = await writeProjectFile({
109	environmentId,
110	input: {
111	cwd: workspaceRoot,
112	relativePath: filename,
113	contents: normalizePlanMarkdownForExport(planMarkdown),
114	},
115	});
116	setIsSavingToWorkspace(false);
117	if (result._tag === "Success") {
118	toastManager.add({
119	type: "success",
120	title: "Plan saved",
121	description: result.value.relativePath,
122	});
123	return;
124	}
125	if (!isAtomCommandInterrupted(result)) {
126	const error = squashAtomCommandFailure(result);
127	toastManager.add(
128	stackedThreadToast({
129	type: "error",
130	title: "Could not save plan",
131	description: error instanceof Error ? error.message : "An error occurred.",
132	}),
133	);
134	}
135	})();
136	}, [environmentId, planMarkdown, workspaceRoot, writeProjectFile]);
137
138	return (
139	<div
140	className={cn(
141	"flex min-h-0 flex-col bg-card/50",
142	mode === "sidebar"
143	? "h-full w-[340px] shrink-0 border-l border-border/70"
144	: "h-full w-full",
145	)}
146	>
147	{/* Header */}
148	<div className="flex h-12 shrink-0 items-center justify-between border-b border-border/60 px-3">
149	<div className="flex items-center gap-2">
150	<Badge
151	variant="info"
152	size="sm"
153	className="rounded-md px-1.5 py-0 font-semibold tracking-wide uppercase"
154	>
155	{label}
156	</Badge>
157	{activePlan ? (
158	<span className="text-[11px] text-muted-foreground/60 tabular-nums">
159	{formatTimestamp(activePlan.createdAt, timestampFormat)}
160	</span>
161	) : null}
162	</div>
163	<div className="flex items-center gap-1">
164	{planMarkdown ? (
165	<Menu>
166	<MenuTrigger
167	render={
168	<Button
169	size="icon-xs"
170	variant="ghost"
171	className="text-muted-foreground/50 hover:text-foreground/70"
172	aria-label="Plan actions"
173	/>
174	}
175	>
176	<EllipsisIcon className="size-3.5" />
177	</MenuTrigger>
178	<MenuPopup align="end">
179	<MenuItem onClick={handleCopyPlan}>
180	{isCopied ? "Copied!" : "Copy to clipboard"}
181	</MenuItem>
182	<MenuItem onClick={handleDownload}>Download as markdown</MenuItem>
183	<MenuItem
184	onClick={handleSaveToWorkspace}
185	disabled={!workspaceRoot \|\| isSavingToWorkspace}
186	>
187	Save to workspace
188	</MenuItem>
189	</MenuPopup>
190	</Menu>
191	) : null}
192	</div>
193	</div>
194
195	{/* Content */}
196	<ScrollArea className="min-h-0 flex-1">
197	<div className="p-3 space-y-4">
198	{/* Explanation */}
199	{activePlan?.explanation ? (
200	<p className="text-[13px] leading-relaxed text-muted-foreground/80">
201	{activePlan.explanation}
202	</p>
203	) : null}
204
205	{/* Plan Steps */}
206	{activePlan && activePlan.steps.length > 0 ? (
207	<div className="space-y-1">
208	<p className="mb-2 text-[10px] font-semibold tracking-widest text-muted-foreground/40 uppercase">
209	Steps
210	</p>
211	{activePlan.steps.map((step) => (
212	<div
213	key={`${step.status}:${step.step}`}
214	className={cn(
215	"flex items-center gap-2.5 rounded-lg px-2.5 py-2 transition-colors duration-200",
216	step.status === "inProgress" && "bg-blue-500/5",
217	step.status === "completed" && "bg-emerald-500/5",
218	)}
219	>
220	{stepStatusIcon(step.status)}
221	<p
222	className={cn(
223	"text-[13px] leading-snug",
224	step.status === "completed"
225	? "text-muted-foreground/50 line-through decoration-muted-foreground/20"
226	: step.status === "inProgress"
227	? "text-foreground/90"
228	: "text-muted-foreground/70",
229	)}
230	>
231	{step.step}
232	</p>
233	</div>
234	))}
235	</div>
236	) : null}
237
238	{/* Proposed Plan Markdown */}
239	{planMarkdown ? (
240	<div className="space-y-2">
241	<button
242	type="button"
243	className="group flex w-full items-center gap-1.5 text-left"
244	onClick={() => setProposedPlanExpanded((v) => !v)}
245	>
246	{proposedPlanExpanded ? (
247	<ChevronDownIcon className="size-3 shrink-0 text-muted-foreground/40 transition-transform" />
248	) : (
249	<ChevronRightIcon className="size-3 shrink-0 text-muted-foreground/40 transition-transform" />
250	)}
251	<span className="text-[10px] font-semibold tracking-widest text-muted-foreground/40 uppercase group-hover:text-muted-foreground/60">
252	{planTitle ?? "Full Plan"}
253	</span>
254	</button>
255	{proposedPlanExpanded ? (
256	<div className="rounded-lg border border-border/50 bg-background/50 p-3">
257	<ChatMarkdown
258	text={displayedPlanMarkdown ?? ""}
259	cwd={markdownCwd}
260	threadRef={threadRef}
261	isStreaming={false}
262	/>
263	</div>
264	) : null}
265	</div>
266	) : null}
267
268	{/* Empty state */}
269	{!activePlan && !planMarkdown ? (
270	<div className="flex flex-col items-center justify-center py-12 text-center">
271	<p className="text-[13px] text-muted-foreground/40">No active plan yet.</p>
272	<p className="mt-1 text-[11px] text-muted-foreground/30">
273	Plans will appear here when generated.
274	</p>
275	</div>
276	) : null}
277	</div>
278	</ScrollArea>
279	</div>
280	);
281	});
282
283	export default PlanSidebar;
284	export type { PlanSidebarProps };

apps/web/src/components/RightPanelTabs.tsx+1-5

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	import type { ContextMenuItem, PreviewSessionSnapshot } from "@t3tools/contracts";	1	import type { ContextMenuItem, PreviewSessionSnapshot } from "@t3tools/contracts";
2	import { getTerminalLabel } from "@t3tools/shared/terminalLabels";	2	import { getTerminalLabel } from "@t3tools/shared/terminalLabels";
3	import { Bot, ClipboardList, FileDiff, Files, Globe2, Plus, TerminalSquare, X } from "lucide-react";	3	import { Bot, FileDiff, Files, Globe2, Plus, TerminalSquare, X } from "lucide-react";
4	import {	4	import {
5	type MouseEvent as ReactMouseEvent,	5	type MouseEvent as ReactMouseEvent,
6	type ReactElement,	6	type ReactElement,
...	@@ -213,8 +213,6 @@ function surfaceTitle(	...	@@ -213,8 +213,6 @@ function surfaceTitle(
213	terminalLabelsById.get(surface.activeTerminalId) ??	213	terminalLabelsById.get(surface.activeTerminalId) ??
214	getTerminalLabel(surface.activeTerminalId)	214	getTerminalLabel(surface.activeTerminalId)
215	);	215	);
216	case "plan":
217	return "Plan";
218	case "agents":	216	case "agents":
219	return "Agents";	217	return "Agents";
220	case "preview": {	218	case "preview": {
...	@@ -276,8 +274,6 @@ function SurfaceIcon({	...	@@ -276,8 +274,6 @@ function SurfaceIcon({
276	);	274	);
277	case "terminal":	275	case "terminal":
278	return <TerminalSquare className="size-3 shrink-0" />;	276	return <TerminalSquare className="size-3 shrink-0" />;
279	case "plan":
280	return <ClipboardList className="size-3 shrink-0" />;
281	case "agents":	277	case "agents":
282	return <Bot className="size-3 shrink-0" />;	278	return <Bot className="size-3 shrink-0" />;
283	}	279	}

apps/web/src/components/SidebarV2.tsx+12-1

...	@@ -1098,7 +1098,18 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {	...	@@ -1098,7 +1098,18 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
1098	) : null}	1098	) : null}
1099	</div>	1099	</div>
1100	<div className="mt-0.5 flex min-w-0 items-center gap-1.5 text-xs text-muted-foreground/75">	1100	<div className="mt-0.5 flex min-w-0 items-center gap-1.5 text-xs text-muted-foreground/75">
1101	{thread.branch ? (	1101	{/* While working, the current plan step outranks the branch:
		1102	it's the one line that says what the thread is doing. */}
		1103	{status === "working" && thread.planProgress ? (
		1104	<span className="min-w-0 flex-1 truncate whitespace-nowrap">
		1105	{thread.planProgress.step}
		1106	{/* Completed count, matching the transcript chip's n/m. */}
		1107	<span className="text-muted-foreground/50 tabular-nums">
		1108	{" "}
		1109	{thread.planProgress.completedSteps}/{thread.planProgress.totalSteps}
		1110	</span>
		1111	</span>
		1112	) : thread.branch ? (
1102	<span className="min-w-0 flex-1 truncate whitespace-nowrap">{thread.branch}</span>	1113	<span className="min-w-0 flex-1 truncate whitespace-nowrap">{thread.branch}</span>
1103	) : (	1114	) : (
1104	<span className="flex-1" />	1115	<span className="flex-1" />

apps/web/src/components/chat/ChatComposer.tsx-58

 @@ -10,7 +10,6 @@ import type {
   ScopedThreadRef,
   ServerProvider,
   ThreadId,
-  TurnId,
 } from "@t3tools/contracts";
 import {
   ProviderDriverKind,
 @@ -195,7 +194,6 @@ import { toastManager } from "../ui/toast";
 import {
   BotIcon,
   CircleAlertIcon,
-  ListTodoIcon,
   PencilRulerIcon,
   type LucideIcon,
   LockIcon,
 @@ -300,12 +298,8 @@ const ComposerFooterModeControls = memo(function ComposerFooterModeControls(prop
   showInteractionModeToggle: boolean;
   interactionMode: ProviderInteractionMode;
   runtimeMode: RuntimeMode;
-  showPlanToggle: boolean;
-  planSidebarLabel: string;
-  planSidebarOpen: boolean;
   onToggleInteractionMode: () => void;
   onRuntimeModeChange: (mode: RuntimeMode) => void;
-  onTogglePlanSidebar: () => void;
 }) {
   const runtimeModeOption = runtimeModeConfig[props.runtimeMode];
   const RuntimeModeIcon = runtimeModeOption.icon;
 @@ -313,9 +307,6 @@ const ComposerFooterModeControls = memo(function ComposerFooterModeControls(prop
     props.interactionMode === "plan"
       ? "Plan mode — click to return to normal build mode"
       : "Default mode — click to enter plan mode";
-  const planSidebarTooltip = props.planSidebarOpen
-    ? `Hide ${props.planSidebarLabel.toLowerCase()} sidebar`
-    : `Show ${props.planSidebarLabel.toLowerCase()} sidebar`;
   const interactionModeToggle = props.showInteractionModeToggle ? (
     <>
 @@ -391,36 +382,6 @@ const ComposerFooterModeControls = memo(function ComposerFooterModeControls(prop
       </Tooltip>
       {interactionModeToggle}
-      {props.showPlanToggle ? (
-        <>
-          <Separator orientation="vertical" className="mx-0.5 hidden h-4 sm:block" />
-          <Tooltip>
-            <TooltipTrigger
-              render={
-                <ComposerControl
-                  className={cn(
-                    "shrink-0 whitespace-nowrap",
-                    props.planSidebarOpen
-                      ? "bg-blue-500/10 text-blue-400 hover:bg-blue-500/15 hover:text-blue-300"
-                      : "text-muted-foreground/70 hover:text-foreground/80",
-                  )}
-                  type="button"
-                  onClick={props.onTogglePlanSidebar}
-                  aria-label={planSidebarTooltip}
-                />
-              }
-            >
-              <ComposerControlIcon
-                icon={ListTodoIcon}
-                className={props.planSidebarOpen ? "text-current opacity-100" : undefined}
-              />
-              <span className="sr-only sm:not-sr-only">{props.planSidebarLabel}</span>
-            </TooltipTrigger>
-            <TooltipPopup side="top">{planSidebarTooltip}</TooltipPopup>
-          </Tooltip>
-        </>
-      ) : null}
     </>
   );
 });
 @@ -576,10 +537,6 @@ export interface ChatComposerProps {
   // Plan
   showPlanFollowUpPrompt: boolean;
   activeProposedPlan: Thread["proposedPlans"][number] | null;
-  activePlan: { turnId?: TurnId } | null;
-  sidebarProposedPlan: { turnId?: TurnId } | null;
-  planSidebarLabel: string;
-  planSidebarOpen: boolean;
   // Mode
   runtimeMode: RuntimeMode;
 @@ -632,7 +589,6 @@ export interface ChatComposerProps {
   toggleInteractionMode: () => void;
   handleRuntimeModeChange: (mode: RuntimeMode) => void;
   handleInteractionModeChange: (mode: ProviderInteractionMode) => void;
-  togglePlanSidebar: () => void;
   focusComposer: () => void;
   scheduleComposerFocus: () => void;
 @@ -675,10 +631,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     respondingRequestIds,
     showPlanFollowUpPrompt,
     activeProposedPlan,
-    activePlan,
-    sidebarProposedPlan,
-    planSidebarLabel,
-    planSidebarOpen,
     runtimeMode,
     interactionMode,
     lockedProvider,
 @@ -709,7 +661,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     toggleInteractionMode,
     handleRuntimeModeChange,
     handleInteractionModeChange,
-    togglePlanSidebar,
     focusComposer,
     scheduleComposerFocus,
     setThreadError,
 @@ -1180,7 +1131,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     isComposerCollapsedMobile && !isComposerApprovalState && pendingUserInputs.length === 0;
   const composerFooterHasWideActions = showPlanFollowUpPrompt || activePendingProgress !== null;
-  const showPlanSidebarToggle = Boolean(activePlan || sidebarProposedPlan || planSidebarOpen);
   const composerFooterActionLayoutKey = useMemo(() => {
     if (activePendingProgress) {
       return `pending:${activePendingProgress.questionIndex}:${activePendingProgress.isLastQuestion}:${activePendingIsResponding}`;
 @@ -3187,15 +3137,11 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                 {isComposerFooterCompact ? (
                   <CompactComposerControlsMenu
-                    activePlan={showPlanSidebarToggle}
                     interactionMode={interactionMode}
-                    planSidebarLabel={planSidebarLabel}
-                    planSidebarOpen={planSidebarOpen}
                     runtimeMode={runtimeMode}
                     showInteractionModeToggle={composerProviderControls.showInteractionModeToggle}
                     traitsMenuContent={providerTraitsMenuContent}
                     onToggleInteractionMode={toggleInteractionMode}
-                    onTogglePlanSidebar={togglePlanSidebar}
                     onRuntimeModeChange={handleRuntimeModeChange}
                   />
                 ) : (
 @@ -3210,12 +3156,8 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                       showInteractionModeToggle={composerProviderControls.showInteractionModeToggle}
                       interactionMode={interactionMode}
                       runtimeMode={runtimeMode}
-                      showPlanToggle={showPlanSidebarToggle}
-                      planSidebarLabel={planSidebarLabel}
-                      planSidebarOpen={planSidebarOpen}
                       onToggleInteractionMode={toggleInteractionMode}
                       onRuntimeModeChange={handleRuntimeModeChange}
-                      onTogglePlanSidebar={togglePlanSidebar}
                     />
                   </>
                 )}

apps/web/src/components/chat/CompactComposerControlsMenu.tsx+1-17

 @@ -1,10 +1,9 @@
 import { ProviderInteractionMode, RuntimeMode } from "@t3tools/contracts";
 import { memo, type ReactNode } from "react";
-import { EllipsisIcon, ListTodoIcon } from "lucide-react";
+import { EllipsisIcon } from "lucide-react";
 import { Button } from "../ui/button";
 import {
   Menu,
-  MenuItem,
   MenuPopup,
   MenuRadioGroup,
   MenuRadioItem,
 @@ -13,15 +12,11 @@ import {
 } from "../ui/menu";
 export const CompactComposerControlsMenu = memo(function CompactComposerControlsMenu(props: {
-  activePlan: boolean;
   interactionMode: ProviderInteractionMode;
-  planSidebarLabel: string;
-  planSidebarOpen: boolean;
   runtimeMode: RuntimeMode;
   showInteractionModeToggle: boolean;
   traitsMenuContent?: ReactNode;
   onToggleInteractionMode: () => void;
-  onTogglePlanSidebar: () => void;
   onRuntimeModeChange: (mode: RuntimeMode) => void;
 }) {
   return (
 @@ -74,17 +69,6 @@ export const CompactComposerControlsMenu = memo(function CompactComposerControls
           <MenuRadioItem value="auto">Auto</MenuRadioItem>
           <MenuRadioItem value="full-access">Full access</MenuRadioItem>
         </MenuRadioGroup>
-        {props.activePlan ? (
-          <>
-            <MenuDivider />
-            <MenuItem onClick={props.onTogglePlanSidebar}>
-              <ListTodoIcon className="size-4 shrink-0" />
-              {props.planSidebarOpen
-                ? `Hide ${props.planSidebarLabel.toLowerCase()} sidebar`
-                : `Show ${props.planSidebarLabel.toLowerCase()} sidebar`}
-            </MenuItem>
-          </>
-        ) : null}
       </MenuPopup>
     </Menu>
   );

apps/web/src/components/chat/MessagesTimeline.logic.ts+24

...	@@ -4,6 +4,7 @@ import {	...	@@ -4,6 +4,7 @@ import {
4	workEntryIndicatesToolNeutralStatus,	4	workEntryIndicatesToolNeutralStatus,
5	workLogEntryIsToolLike,	5	workLogEntryIsToolLike,
6	type TimelineEntry,	6	type TimelineEntry,
		7	type TurnPlanEntry,
7	type WorkLogEntry,	8	type WorkLogEntry,
8	} from "../../session-logic";	9	} from "../../session-logic";
9	import { type ChatMessage, type ProposedPlan, type TurnDiffSummary } from "../../types";	10	import { type ChatMessage, type ProposedPlan, type TurnDiffSummary } from "../../types";
...	@@ -201,6 +202,12 @@ export type MessagesTimelineRow =	...	@@ -201,6 +202,12 @@ export type MessagesTimelineRow =
201	createdAt: string;	202	createdAt: string;
202	proposedPlan: ProposedPlan;	203	proposedPlan: ProposedPlan;
203	}	204	}
		205	\| {
		206	kind: "turn-plan";
		207	id: string;
		208	createdAt: string;
		209	turnPlan: TurnPlanEntry;
		210	}
204	\| { kind: "working"; id: string; createdAt: string \| null };	211	\| { kind: "working"; id: string; createdAt: string \| null };
205		212
206	export interface StableMessagesTimelineRowsState {	213	export interface StableMessagesTimelineRowsState {
...	@@ -576,6 +583,16 @@ export function deriveMessagesTimelineRows(input: {	...	@@ -576,6 +583,16 @@ export function deriveMessagesTimelineRows(input: {
576	continue;	583	continue;
577	}	584	}
578		585
		586	if (timelineEntry.kind === "turn-plan") {
		587	nextRows.push({
		588	kind: "turn-plan",
		589	id: timelineEntry.id,
		590	createdAt: timelineEntry.createdAt,
		591	turnPlan: timelineEntry.turnPlan,
		592	});
		593	continue;
		594	}
		595
579	const assistantTurnStillInProgress =	596	const assistantTurnStillInProgress =
580	timelineEntry.message.role === "assistant" &&	597	timelineEntry.message.role === "assistant" &&
581	unsettledTurnId !== null &&	598	unsettledTurnId !== null &&
...	@@ -659,6 +676,13 @@ function isRowUnchanged(a: MessagesTimelineRow, b: MessagesTimelineRow): boolean	...	@@ -659,6 +676,13 @@ function isRowUnchanged(a: MessagesTimelineRow, b: MessagesTimelineRow): boolean
659	case "proposed-plan":	676	case "proposed-plan":
660	return a.proposedPlan === (b as typeof a).proposedPlan;	677	return a.proposedPlan === (b as typeof a).proposedPlan;
661		678
		679	case "turn-plan": {
		680	const bp = b as typeof a;
		681	// Plans rewrite in place: compare the snapshot's identity fields so an
		682	// unchanged plan keeps its row reference (virtualization stability).
		683	return a.createdAt === bp.createdAt && a.turnPlan.plan === bp.turnPlan.plan;
		684	}
		685
662	case "work":	686	case "work":
663	return Equal.equals(a.groupedEntries, (b as typeof a).groupedEntries);	687	return Equal.equals(a.groupedEntries, (b as typeof a).groupedEntries);
664		688

apps/web/src/components/chat/MessagesTimeline.tsx+115-4

...	@@ -152,6 +152,8 @@ interface TimelineRowActivityState {	...	@@ -152,6 +152,8 @@ interface TimelineRowActivityState {
152	isRevertingCheckpoint: boolean;	152	isRevertingCheckpoint: boolean;
153	activeTurnInProgress: boolean;	153	activeTurnInProgress: boolean;
154	latestTurnId: TurnId \| null;	154	latestTurnId: TurnId \| null;
		155	/** Current plan step label for the working row, when the turn has a plan. */
		156	workingStepLabel: string \| null;
155	}	157	}
156		158
157	const TimelineRowCtx = createContext<TimelineRowSharedState>(null!);	159	const TimelineRowCtx = createContext<TimelineRowSharedState>(null!);
...	@@ -196,6 +198,7 @@ interface MessagesTimelineProps {	...	@@ -196,6 +198,7 @@ interface MessagesTimelineProps {
196	agentPanelModel?: AgentPanelModel;	198	agentPanelModel?: AgentPanelModel;
197	onOpenAgents?: () => void;	199	onOpenAgents?: () => void;
198	isWorking: boolean;	200	isWorking: boolean;
		201	workingStepLabel?: string \| null;
199	activeTurnInProgress: boolean;	202	activeTurnInProgress: boolean;
200	activeTurnStartedAt: string \| null;	203	activeTurnStartedAt: string \| null;
201	listRef: React.RefObject<LegendListRef \| null>;	204	listRef: React.RefObject<LegendListRef \| null>;
...	@@ -240,6 +243,7 @@ interface MessagesTimelineProps {	...	@@ -240,6 +243,7 @@ interface MessagesTimelineProps {
240		243
241	export const MessagesTimeline = memo(function MessagesTimeline({	244	export const MessagesTimeline = memo(function MessagesTimeline({
242	isWorking,	245	isWorking,
		246	workingStepLabel = null,
243	activeTurnInProgress,	247	activeTurnInProgress,
244	activeTurnStartedAt,	248	activeTurnStartedAt,
245	agentPanelModel = EMPTY_AGENT_PANEL_MODEL,	249	agentPanelModel = EMPTY_AGENT_PANEL_MODEL,
...	@@ -508,8 +512,9 @@ export const MessagesTimeline = memo(function MessagesTimeline({	...	@@ -508,8 +512,9 @@ export const MessagesTimeline = memo(function MessagesTimeline({
508	isRevertingCheckpoint,	512	isRevertingCheckpoint,
509	activeTurnInProgress,	513	activeTurnInProgress,
510	latestTurnId: latestTurn?.turnId ?? null,	514	latestTurnId: latestTurn?.turnId ?? null,
		515	workingStepLabel,
511	}),	516	}),
512	[activeTurnInProgress, isRevertingCheckpoint, isWorking, latestTurn?.turnId],	517	[activeTurnInProgress, isRevertingCheckpoint, isWorking, latestTurn?.turnId, workingStepLabel],
513	);	518	);
514		519
515	// Stable renderItem — no closure deps. Row components read shared state	520	// Stable renderItem — no closure deps. Row components read shared state
...	@@ -911,7 +916,8 @@ const TimelineRowContent = memo(function TimelineRowContent({ row }: { row: Time	...	@@ -911,7 +916,8 @@ const TimelineRowContent = memo(function TimelineRowContent({ row }: { row: Time
911	// they sit closer to the work that follows them.	916	// they sit closer to the work that follows them.
912	(row.kind === "message" && row.message.role === "assistant" && !row.showAssistantMeta) \|\|	917	(row.kind === "message" && row.message.role === "assistant" && !row.showAssistantMeta) \|\|
913	row.kind === "work" \|\|	918	row.kind === "work" \|\|
914	row.kind === "work-toggle"	919	row.kind === "work-toggle" \|\|
		920	row.kind === "turn-plan"
915	? "pb-2"	921	? "pb-2"
916	: "pb-4",	922	: "pb-4",
917	row.kind === "message" && row.message.role === "assistant" ? "group/assistant" : null,	923	row.kind === "message" && row.message.role === "assistant" ? "group/assistant" : null,
...	@@ -929,6 +935,7 @@ const TimelineRowContent = memo(function TimelineRowContent({ row }: { row: Time	...	@@ -929,6 +935,7 @@ const TimelineRowContent = memo(function TimelineRowContent({ row }: { row: Time
929	<AssistantTimelineRow row={row} />	935	<AssistantTimelineRow row={row} />
930	) : null}	936	) : null}
931	{row.kind === "proposed-plan" ? <ProposedPlanTimelineRow row={row} /> : null}	937	{row.kind === "proposed-plan" ? <ProposedPlanTimelineRow row={row} /> : null}
		938	{row.kind === "turn-plan" ? <TurnPlanTimelineRow row={row} /> : null}
932	{row.kind === "working" ? <WorkingTimelineRow row={row} /> : null}	939	{row.kind === "working" ? <WorkingTimelineRow row={row} /> : null}
933	</div>	940	</div>
934	);	941	);
...	@@ -1159,16 +1166,117 @@ function ProposedPlanTimelineRow({	...	@@ -1159,16 +1166,117 @@ function ProposedPlanTimelineRow({
1159	);	1166	);
1160	}	1167	}
1161		1168
		1169	/**
		1170	* Inline folded plan chip: one row per turn that produced plan/todo steps.
		1171	* Collapsed by default — a segment bar plus the in-progress step label —
		1172	* and expands in place to the full step list. Replaces the old plan sidebar.
		1173	*/
		1174	const TurnPlanTimelineRow = memo(function TurnPlanTimelineRow({
		1175	row,
		1176	}: {
		1177	row: Extract<TimelineRow, { kind: "turn-plan" }>;
		1178	}) {
		1179	const [expanded, setExpanded] = useState(false);
		1180	const { steps } = row.turnPlan.plan;
		1181	const completedCount = steps.filter((step) => step.status === "completed").length;
		1182	const allDone = completedCount === steps.length;
		1183	// Label priority: the in-progress step, else the next pending step (plan
		1184	// just created), else the last step (plan finished, rendered muted).
		1185	const label =
		1186	steps.find((step) => step.status === "inProgress")?.step ??
		1187	steps.find((step) => step.status === "pending")?.step ??
		1188	steps.at(-1)?.step ??
		1189	"Plan";
		1190	const Chevron = expanded ? ChevronDownIcon : ChevronRightIcon;
		1191
		1192	return (
		1193	<div className="min-w-0 px-1 py-0.5">
		1194	<button
		1195	type="button"
		1196	className="flex w-full min-w-0 cursor-pointer items-center gap-2 rounded-md px-0.5 py-0.5 text-left text-[12px] leading-5 transition-colors duration-150 hover:bg-accent/20 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring/70"
		1197	aria-expanded={expanded}
		1198	onClick={() => setExpanded((value) => !value)}
		1199	>
		1200	<Chevron className="size-3.5 shrink-0 text-muted-foreground/65" />
		1201	{steps.length > 1 ? (
		1202	<span aria-hidden className="flex shrink-0 items-center gap-0.5">
		1203	{steps.map((step) => (
		1204	<span
		1205	key={step.step}
		1206	className={cn(
		1207	"h-[3px] w-2.5 rounded-full",
		1208	step.status === "completed"
		1209	? "bg-success"
		1210	: step.status === "inProgress"
		1211	? "bg-primary"
		1212	: "bg-muted-foreground/25",
		1213	)}
		1214	/>
		1215	))}
		1216	</span>
		1217	) : null}
		1218	<span
		1219	className={cn(
		1220	"min-w-0 truncate",
		1221	allDone ? "text-muted-foreground/65" : "font-medium text-foreground/85",
		1222	)}
		1223	>
		1224	{label}
		1225	</span>
		1226	{steps.length > 1 ? (
		1227	<span className="shrink-0 text-muted-foreground/50 tabular-nums">
		1228	{completedCount}/{steps.length}
		1229	</span>
		1230	) : null}
		1231	</button>
		1232	{expanded ? (
		1233	<div className="mt-0.5 space-y-px pl-6">
		1234	{steps.map((step) => (
		1235	<div key={step.step} className="flex items-baseline gap-2 text-[12px] leading-5">
		1236	<span
		1237	className={cn(
		1238	"w-3 shrink-0 text-center font-mono text-[10px]",
		1239	step.status === "completed"
		1240	? "text-success"
		1241	: step.status === "inProgress"
		1242	? "text-primary"
		1243	: "text-muted-foreground/40",
		1244	)}
		1245	aria-hidden
		1246	>
		1247	{step.status === "completed" ? "✓" : step.status === "inProgress" ? "●" : "○"}
		1248	</span>
		1249	<span
		1250	className={cn(
		1251	"min-w-0",
		1252	step.status === "completed"
		1253	? "text-muted-foreground/55"
		1254	: step.status === "inProgress"
		1255	? "text-foreground/90"
		1256	: "text-muted-foreground/70",
		1257	)}
		1258	>
		1259	{step.step}
		1260	</span>
		1261	</div>
		1262	))}
		1263	</div>
		1264	) : null}
		1265	</div>
		1266	);
		1267	});
		1268
1162	function WorkingTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "working" }> }) {	1269	function WorkingTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "working" }> }) {
		1270	const { workingStepLabel } = use(TimelineRowActivityCtx);
1163	return (	1271	return (
1164	<div className="py-0.5 pl-1.5">	1272	<div className="py-0.5 pl-1.5">
1165	<div className="flex items-center gap-2 pt-1 text-[11px] text-muted-foreground/70 tabular-nums">	1273	<div className="flex min-w-0 items-center gap-2 pt-1 text-[11px] text-muted-foreground/70 tabular-nums">
1166	<span className="inline-flex items-center gap-[3px]">	1274	<span className="inline-flex items-center gap-[3px]">
1167	<span className="h-1 w-1 rounded-full bg-muted-foreground/30 animate-status-pulse" />	1275	<span className="h-1 w-1 rounded-full bg-muted-foreground/30 animate-status-pulse" />
1168	<span className="h-1 w-1 rounded-full bg-muted-foreground/30 animate-status-pulse [animation-delay:200ms]" />	1276	<span className="h-1 w-1 rounded-full bg-muted-foreground/30 animate-status-pulse [animation-delay:200ms]" />
1169	<span className="h-1 w-1 rounded-full bg-muted-foreground/30 animate-status-pulse [animation-delay:400ms]" />	1277	<span className="h-1 w-1 rounded-full bg-muted-foreground/30 animate-status-pulse [animation-delay:400ms]" />
1170	</span>	1278	</span>
1171	<span>	1279	<span className="shrink-0">
1172	{row.createdAt ? (	1280	{row.createdAt ? (
1173	<>	1281	<>
1174	Working for <WorkingTimer createdAt={row.createdAt} />	1282	Working for <WorkingTimer createdAt={row.createdAt} />
...	@@ -1177,6 +1285,9 @@ function WorkingTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "workin	...	@@ -1177,6 +1285,9 @@ function WorkingTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "workin
1177	"Working..."	1285	"Working..."
1178	)}	1286	)}
1179	</span>	1287	</span>
		1288	{workingStepLabel ? (
		1289	<span className="min-w-0 truncate text-muted-foreground/55">· {workingStepLabel}</span>
		1290	) : null}
1180	</div>	1291	</div>
1181	</div>	1292	</div>
1182	);	1293	);

apps/web/src/components/settings/SettingsPanels.tsx-31

...	@@ -623,9 +623,6 @@ export function useSettingsRestore(onRestored?: () => void) {	...	@@ -623,9 +623,6 @@ export function useSettingsRestore(onRestored?: () => void) {
623	...(settings.diffIgnoreWhitespace !== DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace	623	...(settings.diffIgnoreWhitespace !== DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace
624	? ["Diff whitespace changes"]	624	? ["Diff whitespace changes"]
625	: []),	625	: []),
626	...(settings.autoOpenPlanSidebar !== DEFAULT_UNIFIED_SETTINGS.autoOpenPlanSidebar
627	? ["Auto-open task panel"]
628	: []),
629	...(settings.enableAssistantStreaming !== DEFAULT_UNIFIED_SETTINGS.enableAssistantStreaming	626	...(settings.enableAssistantStreaming !== DEFAULT_UNIFIED_SETTINGS.enableAssistantStreaming
630	? ["Assistant output"]	627	? ["Assistant output"]
631	: []),	628	: []),
...	@@ -655,7 +652,6 @@ export function useSettingsRestore(onRestored?: () => void) {	...	@@ -655,7 +652,6 @@ export function useSettingsRestore(onRestored?: () => void) {
655	[	652	[
656	isTextGenerationModelDirty,	653	isTextGenerationModelDirty,
657	isBackgroundActivityDirty,	654	isBackgroundActivityDirty,
658	settings.autoOpenPlanSidebar,
659	settings.confirmThreadArchive,	655	settings.confirmThreadArchive,
660	settings.confirmThreadDelete,	656	settings.confirmThreadDelete,
661	settings.addProjectBaseDirectory,	657	settings.addProjectBaseDirectory,
...	@@ -701,7 +697,6 @@ export function useSettingsRestore(onRestored?: () => void) {	...	@@ -701,7 +697,6 @@ export function useSettingsRestore(onRestored?: () => void) {
701	glassOpacity: DEFAULT_UNIFIED_SETTINGS.glassOpacity,	697	glassOpacity: DEFAULT_UNIFIED_SETTINGS.glassOpacity,
702	sidebarThreadPreviewCount: DEFAULT_UNIFIED_SETTINGS.sidebarThreadPreviewCount,	698	sidebarThreadPreviewCount: DEFAULT_UNIFIED_SETTINGS.sidebarThreadPreviewCount,
703	sidebarProjectGroupingMode: DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode,	699	sidebarProjectGroupingMode: DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode,
704	autoOpenPlanSidebar: DEFAULT_UNIFIED_SETTINGS.autoOpenPlanSidebar,
705	enableAssistantStreaming: DEFAULT_UNIFIED_SETTINGS.enableAssistantStreaming,	700	enableAssistantStreaming: DEFAULT_UNIFIED_SETTINGS.enableAssistantStreaming,
706	enableProviderUpdateChecks: DEFAULT_UNIFIED_SETTINGS.enableProviderUpdateChecks,	701	enableProviderUpdateChecks: DEFAULT_UNIFIED_SETTINGS.enableProviderUpdateChecks,
707	backgroundActivity: DEFAULT_UNIFIED_SETTINGS.backgroundActivity,	702	backgroundActivity: DEFAULT_UNIFIED_SETTINGS.backgroundActivity,
...	@@ -1897,32 +1892,6 @@ export function GeneralSettingsPanel() {	...	@@ -1897,32 +1892,6 @@ export function GeneralSettingsPanel() {
1897	}	1892	}
1898	/>	1893	/>
1899		1894
1900	<SettingsRow
1901	{...searchableSetting("auto-open-task-panel")}
1902	description="Open the right-side plan and task panel automatically when steps appear."
1903	resetAction={
1904	settings.autoOpenPlanSidebar !== DEFAULT_UNIFIED_SETTINGS.autoOpenPlanSidebar ? (
1905	<SettingResetButton
1906	label="auto-open task panel"
1907	onClick={() =>
1908	updateSettings({
1909	autoOpenPlanSidebar: DEFAULT_UNIFIED_SETTINGS.autoOpenPlanSidebar,
1910	})
1911	}
1912	/>
1913	) : null
1914	}
1915	control={
1916	<Switch
1917	checked={settings.autoOpenPlanSidebar}
1918	onCheckedChange={(checked) =>
1919	updateSettings({ autoOpenPlanSidebar: Boolean(checked) })
1920	}
1921	aria-label="Open the task panel automatically"
1922	/>
1923	}
1924	/>
1925
1926	<SettingsRow	1895	<SettingsRow
1927	{...searchableSetting("new-threads")}	1896	{...searchableSetting("new-threads")}
1928	description="Pick the default workspace mode for newly created draft threads."	1897	description="Pick the default workspace mode for newly created draft threads."

apps/web/src/components/settings/settingsSearch.ts-5

 @@ -110,11 +110,6 @@ export const SETTINGS_SEARCH_ITEMS = [
     title: "Provider update checks",
     to: "/settings/general",
   },
-  {
-    id: "auto-open-task-panel",
-    title: "Auto-open task panel",
-    to: "/settings/general",
-  },
   {
     id: "new-threads",
     title: "New threads",

apps/web/src/planSidebarDismissal.ts deleted-21

...	@@ -1,21 +0,0 @@
1	/**
2	* Tracks which turn's plan sidebar the user explicitly dismissed, per thread.
3	*
4	* Kept outside React state so a dismissal survives leaving and re-entering a
5	* thread (ChatView resets its per-thread refs on navigation). Dismissals are
6	* keyed by turn, so when a new turn produces fresh plan steps the sidebar
7	* still auto-opens.
8	*/
9	const dismissedTurnByThreadKey = new Map<string, string>();
10
11	export function dismissPlanSidebarForTurn(threadKey: string, turnKey: string): void {
12	dismissedTurnByThreadKey.set(threadKey, turnKey);
13	}
14
15	export function clearPlanSidebarDismissal(threadKey: string): void {
16	dismissedTurnByThreadKey.delete(threadKey);
17	}
18
19	export function isPlanSidebarDismissedForTurn(threadKey: string, turnKey: string): boolean {
20	return dismissedTurnByThreadKey.get(threadKey) === turnKey;
21	}

apps/web/src/rightPanelStore.test.ts+47-12

 @@ -102,6 +102,41 @@ describe("rightPanelStore", () => {
     });
   });
+  it("drops persisted plan surfaces and does not reopen an empty panel", () => {
+    expect(
+      migratePersistedRightPanelState({
+        byThreadKey: {
+          "env-1:thread-A": {
+            isOpen: true,
+            activeSurfaceId: "plan",
+            surfaces: [{ id: "plan", kind: "plan" }],
+          },
+          "env-1:thread-B": {
+            isOpen: true,
+            activeSurfaceId: "plan",
+            surfaces: [
+              { id: "plan", kind: "plan" },
+              { id: "diff", kind: "diff" },
+            ],
+          },
+        },
+      }),
+    ).toEqual({
+      byThreadKey: {
+        "env-1:thread-A": {
+          isOpen: false,
+          activeSurfaceId: null,
+          surfaces: [],
+        },
+        "env-1:thread-B": {
+          isOpen: true,
+          activeSurfaceId: "diff",
+          surfaces: [{ id: "diff", kind: "diff" }],
+        },
+      },
+    });
+  });
   it("open sets the active panel for a thread", () => {
     useRightPanelStore.getState().open(refA, "preview");
     expect(selectActiveRightPanel(useRightPanelStore.getState().byThreadKey, refA)).toBe("preview");
 @@ -109,7 +144,7 @@ describe("rightPanelStore", () => {
   });
   it("opening a different kind keeps both surfaces and activates the new one", () => {
-    useRightPanelStore.getState().open(refA, "plan");
+    useRightPanelStore.getState().open(refA, "agents");
     useRightPanelStore.getState().open(refA, "preview");
     expect(selectActiveRightPanel(useRightPanelStore.getState().byThreadKey, refA)).toBe("preview");
     expect(
 @@ -119,7 +154,7 @@ describe("rightPanelStore", () => {
   it("reopening an inactive singleton activates its existing surface", () => {
     useRightPanelStore.getState().open(refA, "diff");
-    useRightPanelStore.getState().open(refA, "plan");
+    useRightPanelStore.getState().open(refA, "agents");
     useRightPanelStore.getState().open(refA, "diff");
     expect(selectThreadRightPanelState(useRightPanelStore.getState().byThreadKey, refA)).toEqual({
 @@ -127,7 +162,7 @@ describe("rightPanelStore", () => {
       activeSurfaceId: "diff",
       surfaces: [
         { id: "diff", kind: "diff" },
-        { id: "plan", kind: "plan" },
+        { id: "agents", kind: "agents" },
       ],
     });
   });
 @@ -207,15 +242,15 @@ describe("rightPanelStore", () => {
   it("removes persisted file surfaces when their workspace no longer exists", () => {
     useRightPanelStore.getState().openFile(refA, "src/index.ts");
-    useRightPanelStore.getState().open(refA, "plan");
+    useRightPanelStore.getState().open(refA, "agents");
     useRightPanelStore.getState().openFile(refA, "README.md");
     useRightPanelStore.getState().reconcileFileSurfaces(refA, false);
     expect(selectThreadRightPanelState(useRightPanelStore.getState().byThreadKey, refA)).toEqual({
       isOpen: true,
-      activeSurfaceId: "plan",
+      activeSurfaceId: "agents",
-      surfaces: [{ id: "plan", kind: "plan" }],
+      surfaces: [{ id: "agents", kind: "agents" }],
     });
     useRightPanelStore.getState().openFile(refB, "conductor.json");
 @@ -228,13 +263,13 @@ describe("rightPanelStore", () => {
   });
   it("close hides the panel without clearing its selected surface", () => {
-    useRightPanelStore.getState().open(refA, "plan");
+    useRightPanelStore.getState().open(refA, "agents");
     useRightPanelStore.getState().close(refA);
     expect(selectActiveRightPanel(useRightPanelStore.getState().byThreadKey, refA)).toBeNull();
     expect(selectThreadRightPanelState(useRightPanelStore.getState().byThreadKey, refA)).toEqual({
       isOpen: false,
-      activeSurfaceId: "plan",
+      activeSurfaceId: "agents",
-      surfaces: [{ id: "plan", kind: "plan" }],
+      surfaces: [{ id: "agents", kind: "agents" }],
     });
   });
 @@ -264,12 +299,12 @@ describe("rightPanelStore", () => {
   it("toggle to a different kind switches active", () => {
     useRightPanelStore.getState().toggle(refA, "preview");
-    useRightPanelStore.getState().toggle(refA, "plan");
+    useRightPanelStore.getState().toggle(refA, "agents");
-    expect(selectActiveRightPanel(useRightPanelStore.getState().byThreadKey, refA)).toBe("plan");
+    expect(selectActiveRightPanel(useRightPanelStore.getState().byThreadKey, refA)).toBe("agents");
   });
   it("removeThread clears persisted state", () => {
-    useRightPanelStore.getState().open(refA, "plan");
+    useRightPanelStore.getState().open(refA, "agents");
     useRightPanelStore.getState().removeThread(refA);
     expect(selectActiveRightPanel(useRightPanelStore.getState().byThreadKey, refA)).toBeNull();
   });

apps/web/src/rightPanelStore.ts+17-9

 @@ -5,7 +5,7 @@
  * surface descriptors and the active surface, while each feature continues to
  * own its durable resource state. Browser surfaces point at preview tab ids,
  * terminal surfaces point at terminal session ids, file surfaces point at
- * workspace paths, and diff/plan/files remain singleton surfaces.
+ * workspace paths, and diff/files remain singleton surfaces.
  */
 import { scopedThreadKey } from "@t3tools/client-runtime/environment";
 import type { ScopedThreadRef } from "@t3tools/contracts";
 @@ -15,7 +15,6 @@ import { createJSONStorage, persist } from "zustand/middleware";
 import { resolveStorage } from "./lib/storage";
 export const RIGHT_PANEL_KINDS = [
-  "plan",
   "diff",
   "files",
   "file",
 @@ -45,11 +44,11 @@ export type RightPanelSurface =
       revealLine: number | null;
       revealRequestId: number;
     }
-  | { id: "plan"; kind: "plan" }
   | { id: "agents"; kind: "agents" };
 const RIGHT_PANEL_STORAGE_KEY = "t3code:right-panel-state:v2";
-const RIGHT_PANEL_STORAGE_VERSION = 8;
+// v9 removed the "plan" surface kind (plans render inline in the transcript).
+const RIGHT_PANEL_STORAGE_VERSION = 9;
 export interface ThreadRightPanelState {
   isOpen: boolean;
 @@ -99,8 +98,6 @@ const singletonSurface = (
       return { id: "diff", kind };
     case "files":
       return { id: "files", kind };
-    case "plan":
-      return { id: "plan", kind };
     case "agents":
       return { id: "agents", kind };
   }
 @@ -181,6 +178,9 @@ export function migratePersistedRightPanelState(persistedState: unknown): {
                 threadState && typeof threadState === "object" ? threadState : null;
               const surfaces = Array.isArray(validThreadState?.surfaces)
                 ? validThreadState.surfaces.flatMap<RightPanelSurface>((surface) => {
+                    // Dropped surface kind: plans now render inline in the
+                    // transcript (v9).
+                    if ((surface as { kind?: string }).kind === "plan") return [];
                     if (surface.kind === "file") {
                       const revealLine =
                         typeof surface.revealLine === "number" &&
 @@ -229,15 +229,23 @@ export function migratePersistedRightPanelState(persistedState: unknown): {
                     ];
                   })
                 : [];
-              const activeSurfaceId = surfaces.some(
+              const persistedActiveSurfaceId = surfaces.some(
                 (surface) => surface.id === validThreadState?.activeSurfaceId,
               )
                 ? (validThreadState?.activeSurfaceId ?? null)
                 : null;
+              // A migration that dropped every surface (e.g. plan-only panels
+              // in v9) must not reopen an empty panel.
               const isOpen =
-                typeof validThreadState?.isOpen === "boolean"
+                surfaces.length > 0 &&
+                (typeof validThreadState?.isOpen === "boolean"
                   ? validThreadState.isOpen
-                  : activeSurfaceId !== null;
+                  : persistedActiveSurfaceId !== null);
+              // An open panel needs an active surface: if migration dropped
+              // the persisted one (e.g. plan was active), fall back to the
+              // first survivor instead of rendering an open empty panel.
+              const activeSurfaceId =
+                persistedActiveSurfaceId ?? (isOpen ? (surfaces[0]?.id ?? null) : null);
               return [threadKey, { isOpen, surfaces, activeSurfaceId }];
             },
           ),

apps/web/src/session-logic.test.ts+90-98

 @@ -11,12 +11,12 @@ import { describe, expect, it } from "vite-plus/test";
 import {
   deriveActiveWorkStartedAt,
   deriveActivePlanState,
+  deriveTurnPlans,
   derivePendingApprovals,
   derivePendingUserInputs,
   deriveTimelineEntries,
   deriveWorkLogEntries,
   findLatestProposedPlan,
-  findSidebarProposedPlan,
   hasActionableProposedPlan,
   isLatestTurnSettled,
   workEntryIndicatesToolFailure,
 @@ -410,6 +410,95 @@ describe("deriveActivePlanState", () => {
   });
 });
+describe("deriveTurnPlans", () => {
+  it("keeps one entry per turn, anchored at the first snapshot with the latest steps", () => {
+    const activities: OrchestrationThreadActivity[] = [
+      makeActivity({
+        id: "plan-1a",
+        createdAt: "2026-02-23T00:00:01.000Z",
+        kind: "turn.plan.updated",
+        summary: "Plan updated",
+        tone: "info",
+        turnId: "turn-1",
+        payload: {
+          plan: [{ step: "Inspect code", status: "inProgress" }],
+        },
+      }),
+      makeActivity({
+        id: "plan-1b",
+        createdAt: "2026-02-23T00:00:05.000Z",
+        kind: "turn.plan.updated",
+        summary: "Plan updated",
+        tone: "info",
+        turnId: "turn-1",
+        payload: {
+          plan: [{ step: "Inspect code", status: "completed" }],
+        },
+      }),
+      makeActivity({
+        id: "plan-2a",
+        createdAt: "2026-02-23T00:01:00.000Z",
+        kind: "turn.plan.updated",
+        summary: "Plan updated",
+        tone: "info",
+        turnId: "turn-2",
+        payload: {
+          plan: [{ step: "Ship it", status: "pending" }],
+        },
+      }),
+    ];
+    const turnPlans = deriveTurnPlans(activities);
+    expect(turnPlans).toHaveLength(2);
+    expect(turnPlans[0]).toMatchObject({
+      id: "turn-plan:turn-1",
+      createdAt: "2026-02-23T00:00:01.000Z",
+      turnId: "turn-1",
+    });
+    expect(turnPlans[0]?.plan.steps).toEqual([{ step: "Inspect code", status: "completed" }]);
+    expect(turnPlans[1]?.plan.steps).toEqual([{ step: "Ship it", status: "pending" }]);
+  });
+  it("skips activities without parseable steps", () => {
+    const activities: OrchestrationThreadActivity[] = [
+      makeActivity({
+        id: "plan-bad",
+        createdAt: "2026-02-23T00:00:01.000Z",
+        kind: "turn.plan.updated",
+        summary: "Plan updated",
+        tone: "info",
+        turnId: "turn-1",
+        payload: { plan: [] },
+      }),
+    ];
+    expect(deriveTurnPlans(activities)).toEqual([]);
+  });
+  it("drops a turn's chip when a later snapshot clears the plan", () => {
+    const activities: OrchestrationThreadActivity[] = [
+      makeActivity({
+        id: "plan-set",
+        createdAt: "2026-02-23T00:00:01.000Z",
+        kind: "turn.plan.updated",
+        summary: "Plan updated",
+        tone: "info",
+        turnId: "turn-1",
+        payload: { plan: [{ step: "Inspect code", status: "inProgress" }] },
+      }),
+      makeActivity({
+        id: "plan-clear",
+        createdAt: "2026-02-23T00:00:02.000Z",
+        kind: "turn.plan.updated",
+        summary: "Plan updated",
+        tone: "info",
+        turnId: "turn-1",
+        payload: { plan: [] },
+      }),
+    ];
+    expect(deriveTurnPlans(activities)).toEqual([]);
+  });
+});
 describe("findLatestProposedPlan", () => {
   it("prefers the latest proposed plan for the active turn", () => {
     expect(
 @@ -515,103 +604,6 @@ describe("hasActionableProposedPlan", () => {
   });
 });
-describe("findSidebarProposedPlan", () => {
-  it("prefers the running turn source proposed plan when available on the same thread", () => {
-    expect(
-      findSidebarProposedPlan({
-        threads: [
-          {
-            id: ThreadId.make("thread-1"),
-            proposedPlans: [
-              {
-                id: "plan-1",
-                turnId: TurnId.make("turn-plan"),
-                planMarkdown: "# Source plan",
-                implementedAt: "2026-02-23T00:00:03.000Z",
-                implementationThreadId: ThreadId.make("thread-2"),
-                createdAt: "2026-02-23T00:00:01.000Z",
-                updatedAt: "2026-02-23T00:00:02.000Z",
-              },
-            ],
-          },
-          {
-            id: ThreadId.make("thread-2"),
-            proposedPlans: [
-              {
-                id: "plan-2",
-                turnId: TurnId.make("turn-other"),
-                planMarkdown: "# Latest elsewhere",
-                implementedAt: null,
-                implementationThreadId: null,
-                createdAt: "2026-02-23T00:00:04.000Z",
-                updatedAt: "2026-02-23T00:00:05.000Z",
-              },
-            ],
-          },
-        ],
-        latestTurn: {
-          turnId: TurnId.make("turn-implementation"),
-          sourceProposedPlan: {
-            threadId: ThreadId.make("thread-1"),
-            planId: "plan-1",
-          },
-        },
-        latestTurnSettled: false,
-        threadId: ThreadId.make("thread-1"),
-      }),
-    ).toEqual({
-      id: "plan-1",
-      turnId: "turn-plan",
-      planMarkdown: "# Source plan",
-      implementedAt: "2026-02-23T00:00:03.000Z",
-      implementationThreadId: "thread-2",
-      createdAt: "2026-02-23T00:00:01.000Z",
-      updatedAt: "2026-02-23T00:00:02.000Z",
-    });
-  });
-  it("falls back to the latest proposed plan once the turn is settled", () => {
-    expect(
-      findSidebarProposedPlan({
-        threads: [
-          {
-            id: ThreadId.make("thread-1"),
-            proposedPlans: [
-              {
-                id: "plan-1",
-                turnId: TurnId.make("turn-plan"),
-                planMarkdown: "# Older",
-                implementedAt: null,
-                implementationThreadId: null,
-                createdAt: "2026-02-23T00:00:01.000Z",
-                updatedAt: "2026-02-23T00:00:02.000Z",
-              },
-              {
-                id: "plan-2",
-                turnId: TurnId.make("turn-latest"),
-                planMarkdown: "# Latest",
-                implementedAt: null,
-                implementationThreadId: null,
-                createdAt: "2026-02-23T00:00:03.000Z",
-                updatedAt: "2026-02-23T00:00:04.000Z",
-              },
-            ],
-          },
-        ],
-        latestTurn: {
-          turnId: TurnId.make("turn-implementation"),
-          sourceProposedPlan: {
-            threadId: ThreadId.make("thread-1"),
-            planId: "plan-1",
-          },
-        },
-        latestTurnSettled: true,
-        threadId: ThreadId.make("thread-1"),
-      })?.planMarkdown,
-    ).toBe("# Latest");
-  });
-});
 describe("workEntryIndicatesToolFailure", () => {
   const base = {
     id: "w1",

apps/web/src/session-logic.ts+85-46

 @@ -151,6 +151,12 @@ export type TimelineEntry =
       createdAt: string;
       proposedPlan: ProposedPlan;
     }
+  | {
+      id: string;
+      kind: "turn-plan";
+      createdAt: string;
+      turnPlan: TurnPlanEntry;
+    }
   | {
       id: string;
       kind: "work";
 @@ -532,26 +538,10 @@ export function derivePendingUserInputs(
   );
 }
-export function deriveActivePlanState(
+function planStateFromActivity(activity: OrchestrationThreadActivity): ActivePlanState | null {
-  activities: ReadonlyArray<OrchestrationThreadActivity>,
-  latestTurnId: TurnId | undefined,
-): ActivePlanState | null {
-  const ordered = [...activities].toSorted(compareActivitiesByOrder);
-  const allPlanActivities = ordered.filter((activity) => activity.kind === "turn.plan.updated");
-  // Prefer plan from the current turn; fall back to the most recent plan from any turn
-  // so that TodoWrite tasks persist across follow-up messages.
-  const latest = Option.firstSomeOf([
-    ...(latestTurnId
-      ? Arr.findLast(allPlanActivities, (activity) => activity.turnId === latestTurnId)
-      : Option.none()),
-    Arr.last(allPlanActivities),
-  ]).pipe(Option.getOrNull);
-  if (!latest) {
-    return null;
-  }
   const payload =
-    latest.payload && typeof latest.payload === "object"
+    activity.payload && typeof activity.payload === "object"
-      ? (latest.payload as Record<string, unknown>)
+      ? (activity.payload as Record<string, unknown>)
       : null;
   const rawPlan = payload?.plan;
   if (!Array.isArray(rawPlan)) {
 @@ -580,8 +570,8 @@ export function deriveActivePlanState(
     return null;
   }
   return {
-    createdAt: latest.createdAt,
+    createdAt: activity.createdAt,
-    turnId: latest.turnId,
+    turnId: activity.turnId,
     ...(payload && "explanation" in payload
       ? { explanation: payload.explanation as string | null }
       : {}),
 @@ -589,6 +579,72 @@ export function deriveActivePlanState(
   };
 }
+export function deriveActivePlanState(
+  activities: ReadonlyArray<OrchestrationThreadActivity>,
+  latestTurnId: TurnId | undefined,
+): ActivePlanState | null {
+  const ordered = [...activities].toSorted(compareActivitiesByOrder);
+  const allPlanActivities = ordered.filter((activity) => activity.kind === "turn.plan.updated");
+  // Prefer plan from the current turn; fall back to the most recent plan from any turn
+  // so that TodoWrite tasks persist across follow-up messages.
+  const latest = Option.firstSomeOf([
+    ...(latestTurnId
+      ? Arr.findLast(allPlanActivities, (activity) => activity.turnId === latestTurnId)
+      : Option.none()),
+    Arr.last(allPlanActivities),
+  ]).pipe(Option.getOrNull);
+  if (!latest) {
+    return null;
+  }
+  return planStateFromActivity(latest);
+}
+export interface TurnPlanEntry {
+  /** Stable per-turn row id (plans rewrite constantly; the row must not churn). */
+  id: string;
+  /** Anchor timestamp: the turn's FIRST plan activity, so the chip renders where planning began. */
+  createdAt: string;
+  turnId: TurnId | null;
+  plan: ActivePlanState;
+}
+/**
+ * One inline plan chip per turn that produced plan/todo steps: the latest
+ * snapshot for the turn, anchored at the first snapshot's timestamp. Turn-less
+ * plan activities collapse into a single chip keyed by thread order.
+ */
+export function deriveTurnPlans(
+  activities: ReadonlyArray<OrchestrationThreadActivity>,
+): TurnPlanEntry[] {
+  const ordered = [...activities].toSorted(compareActivitiesByOrder);
+  const byTurn = new Map<string, TurnPlanEntry>();
+  for (const activity of ordered) {
+    if (activity.kind !== "turn.plan.updated") {
+      continue;
+    }
+    const plan = planStateFromActivity(activity);
+    const key = activity.turnId ?? "no-turn";
+    if (!plan) {
+      // A later snapshot with no steps clears the turn's plan; keeping the
+      // stale entry would freeze the chip on a withdrawn plan.
+      byTurn.delete(key);
+      continue;
+    }
+    const existing = byTurn.get(key);
+    if (existing) {
+      existing.plan = plan;
+    } else {
+      byTurn.set(key, {
+        id: `turn-plan:${key}`,
+        createdAt: activity.createdAt,
+        turnId: activity.turnId,
+        plan,
+      });
+    }
+  }
+  return [...byTurn.values()];
+}
 export function findLatestProposedPlan(
   proposedPlans: ReadonlyArray<ProposedPlan>,
   latestTurnId: TurnId | string | null | undefined,
 @@ -619,30 +675,6 @@ export function findLatestProposedPlan(
   return toLatestProposedPlanState(latestPlan);
 }
-export function findSidebarProposedPlan(input: {
-  threads: ReadonlyArray<Pick<Thread, "id" | "proposedPlans">>;
-  latestTurn: Pick<OrchestrationLatestTurn, "turnId" | "sourceProposedPlan"> | null;
-  latestTurnSettled: boolean;
-  threadId: ThreadId | string | null | undefined;
-}): LatestProposedPlanState | null {
-  const activeThreadPlans =
-    input.threads.find((thread) => thread.id === input.threadId)?.proposedPlans ?? [];
-  if (!input.latestTurnSettled) {
-    const sourceProposedPlan = input.latestTurn?.sourceProposedPlan;
-    if (sourceProposedPlan) {
-      const sourcePlan = input.threads
-        .find((thread) => thread.id === sourceProposedPlan.threadId)
-        ?.proposedPlans.find((plan) => plan.id === sourceProposedPlan.planId);
-      if (sourcePlan) {
-        return toLatestProposedPlanState(sourcePlan);
-      }
-    }
-  }
-  return findLatestProposedPlan(activeThreadPlans, input.latestTurn?.turnId ?? null);
-}
 export function hasActionableProposedPlan(
   proposedPlan: LatestProposedPlanState | Pick<ProposedPlan, "implementedAt"> | null,
 ): boolean {
 @@ -1542,6 +1574,7 @@ export function deriveTimelineEntries(
   messages: ReadonlyArray<ChatMessage>,
   proposedPlans: ReadonlyArray<ProposedPlan>,
   workEntries: ReadonlyArray<WorkLogEntry>,
+  turnPlans: ReadonlyArray<TurnPlanEntry> = [],
 ): TimelineEntry[] {
   const messageRows: TimelineEntry[] = messages.map((message) => ({
     id: message.id,
 @@ -1555,13 +1588,19 @@ export function deriveTimelineEntries(
     createdAt: proposedPlan.createdAt,
     proposedPlan,
   }));
+  const turnPlanRows: TimelineEntry[] = turnPlans.map((turnPlan) => ({
+    id: turnPlan.id,
+    kind: "turn-plan",
+    createdAt: turnPlan.createdAt,
+    turnPlan,
+  }));
   const workRows: TimelineEntry[] = workEntries.map((entry) => ({
     id: entry.id,
     kind: "work",
     createdAt: entry.createdAt,
     entry,
   }));
-  return [...messageRows, ...proposedPlanRows, ...workRows].toSorted((a, b) =>
+  return [...messageRows, ...proposedPlanRows, ...turnPlanRows, ...workRows].toSorted((a, b) =>
     a.createdAt.localeCompare(b.createdAt),
   );
 }

packages/contracts/src/orchestration.ts+14

...	@@ -446,6 +446,20 @@ export const OrchestrationThreadShell = Schema.Struct({	...	@@ -446,6 +446,20 @@ export const OrchestrationThreadShell = Schema.Struct({
446	* live work. Optional so old servers/clients interop; absent = none.	446	* live work. Optional so old servers/clients interop; absent = none.
447	*/	447	*/
448	backgroundLiveness: Schema.optional(Schema.NullOr(Schema.Literals(["working", "monitoring"]))),	448	backgroundLiveness: Schema.optional(Schema.NullOr(Schema.Literals(["working", "monitoring"]))),
		449	/**
		450	* Current plan step while a turn runs, for the Working indicators
		451	* (sidebar row, in-chat working line). Cleared when the turn settles —
		452	* never persists as stale UI. Optional so old servers/clients interop.
		453	*/
		454	planProgress: Schema.optional(
		455	Schema.NullOr(
		456	Schema.Struct({
		457	step: TrimmedNonEmptyString,
		458	completedSteps: NonNegativeInt,
		459	totalSteps: NonNegativeInt,
		460	}),
		461	),
		462	),
449	});	463	});
450	export type OrchestrationThreadShell = typeof OrchestrationThreadShell.Type;	464	export type OrchestrationThreadShell = typeof OrchestrationThreadShell.Type;
451		465

packages/contracts/src/settings.ts-2

...	@@ -111,7 +111,6 @@ export const FontFamilyPreference = Schema.String.check(Schema.isMaxLength(200))	...	@@ -111,7 +111,6 @@ export const FontFamilyPreference = Schema.String.check(Schema.isMaxLength(200))
111	export type FontFamilyPreference = typeof FontFamilyPreference.Type;	111	export type FontFamilyPreference = typeof FontFamilyPreference.Type;
112		112
113	export const ClientSettingsSchema = Schema.Struct({	113	export const ClientSettingsSchema = Schema.Struct({
114	autoOpenPlanSidebar: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
115	confirmThreadArchive: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),	114	confirmThreadArchive: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
116	confirmThreadDelete: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),	115	confirmThreadDelete: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
117	dismissedProviderUpdateNotificationKeys: Schema.Array(TrimmedNonEmptyString).pipe(	116	dismissedProviderUpdateNotificationKeys: Schema.Array(TrimmedNonEmptyString).pipe(
...	@@ -747,7 +746,6 @@ export const ServerSettingsPatch = Schema.Struct({	...	@@ -747,7 +746,6 @@ export const ServerSettingsPatch = Schema.Struct({
747	export type ServerSettingsPatch = typeof ServerSettingsPatch.Type;	746	export type ServerSettingsPatch = typeof ServerSettingsPatch.Type;
748		747
749	export const ClientSettingsPatch = Schema.Struct({	748	export const ClientSettingsPatch = Schema.Struct({
750	autoOpenPlanSidebar: Schema.optionalKey(Schema.Boolean),
751	confirmThreadArchive: Schema.optionalKey(Schema.Boolean),	749	confirmThreadArchive: Schema.optionalKey(Schema.Boolean),
752	confirmThreadDelete: Schema.optionalKey(Schema.Boolean),	750	confirmThreadDelete: Schema.optionalKey(Schema.Boolean),
753	diffIgnoreWhitespace: Schema.optionalKey(Schema.Boolean),	751	diffIgnoreWhitespace: Schema.optionalKey(Schema.Boolean),

author	Theo Browne <me@t3.gg> 2026-08-07 03:16:14-04:00
committer	GitHub <noreply@github.com> 2026-08-07 00:16:14-07:00
log	a8cd2ad2ebb32ad789e8e0ecd2fc713c2edc38f4
tree	e5409886e55b9316364096126ee4f7a9efdb4979
parent	4a07c1ca9d9033ef35161a1ffbea44d0418ca2bf
signature	Signed by PGP key B5690EEEBB952194

...	@@ -51,6 +51,7 @@ import { OrchestrationEngineLive } from "../src/orchestration/Layers/Orchestrati	...	@@ -51,6 +51,7 @@ import { OrchestrationEngineLive } from "../src/orchestration/Layers/Orchestrati
51	import { OrchestrationProjectionPipelineLive } from "../src/orchestration/Layers/ProjectionPipeline.ts";	51	import { OrchestrationProjectionPipelineLive } from "../src/orchestration/Layers/ProjectionPipeline.ts";
52	import { OrchestrationProjectionSnapshotQueryLive } from "../src/orchestration/Layers/ProjectionSnapshotQuery.ts";	52	import { OrchestrationProjectionSnapshotQueryLive } from "../src/orchestration/Layers/ProjectionSnapshotQuery.ts";
53	import * as ThreadBackgroundLiveness from "../src/orchestration/ThreadBackgroundLiveness.ts";	53	import * as ThreadBackgroundLiveness from "../src/orchestration/ThreadBackgroundLiveness.ts";
		54	import * as ThreadPlanProgress from "../src/orchestration/ThreadPlanProgress.ts";
54	import { RuntimeReceiptBusTest } from "../src/orchestration/Layers/RuntimeReceiptBus.ts";	55	import { RuntimeReceiptBusTest } from "../src/orchestration/Layers/RuntimeReceiptBus.ts";
55	import { OrchestrationReactorLive } from "../src/orchestration/Layers/OrchestrationReactor.ts";	56	import { OrchestrationReactorLive } from "../src/orchestration/Layers/OrchestrationReactor.ts";
56	import { ProviderCommandReactorLive } from "../src/orchestration/Layers/ProviderCommandReactor.ts";	57	import { ProviderCommandReactorLive } from "../src/orchestration/Layers/ProviderCommandReactor.ts";
...	@@ -310,7 +311,10 @@ export const makeOrchestrationIntegrationHarness = (	...	@@ -310,7 +311,10 @@ export const makeOrchestrationIntegrationHarness = (
310	checkpointStoreLayer,	311	checkpointStoreLayer,
311	providerLayer,	312	providerLayer,
312	RuntimeReceiptBusTest,	313	RuntimeReceiptBusTest,
313	).pipe(Layer.provideMerge(ThreadBackgroundLiveness.layer));	314	).pipe(
		315	Layer.provideMerge(ThreadBackgroundLiveness.layer),
		316	Layer.provideMerge(ThreadPlanProgress.layer),
		317	);
314	const serverSettingsLayer = ServerSettingsService.layerTest();	318	const serverSettingsLayer = ServerSettingsService.layerTest();
315	const runtimeIngestionLayer = ProviderRuntimeIngestionLive.pipe(	319	const runtimeIngestionLayer = ProviderRuntimeIngestionLive.pipe(
316	Layer.provideMerge(runtimeServicesLayer),	320	Layer.provideMerge(runtimeServicesLayer),

...	@@ -40,6 +40,7 @@ import { OrchestrationEngineLive } from "./OrchestrationEngine.ts";	...	@@ -40,6 +40,7 @@ import { OrchestrationEngineLive } from "./OrchestrationEngine.ts";
40	import { OrchestrationProjectionPipelineLive } from "./ProjectionPipeline.ts";	40	import { OrchestrationProjectionPipelineLive } from "./ProjectionPipeline.ts";
41	import { OrchestrationProjectionSnapshotQueryLive } from "./ProjectionSnapshotQuery.ts";	41	import { OrchestrationProjectionSnapshotQueryLive } from "./ProjectionSnapshotQuery.ts";
42	import * as ThreadBackgroundLiveness from "../ThreadBackgroundLiveness.ts";	42	import * as ThreadBackgroundLiveness from "../ThreadBackgroundLiveness.ts";
		43	import * as ThreadPlanProgress from "../ThreadPlanProgress.ts";
43	import { RuntimeReceiptBusLive } from "./RuntimeReceiptBus.ts";	44	import { RuntimeReceiptBusLive } from "./RuntimeReceiptBus.ts";
44	import { OrchestrationEventStoreLive } from "../../persistence/Layers/OrchestrationEventStore.ts";	45	import { OrchestrationEventStoreLive } from "../../persistence/Layers/OrchestrationEventStore.ts";
45	import { OrchestrationCommandReceiptRepositoryLive } from "../../persistence/Layers/OrchestrationCommandReceipts.ts";	46	import { OrchestrationCommandReceiptRepositoryLive } from "../../persistence/Layers/OrchestrationCommandReceipts.ts";
...	@@ -296,6 +297,7 @@ describe("CheckpointReactor", () => {	...	@@ -296,6 +297,7 @@ describe("CheckpointReactor", () => {
296	const orchestrationLayer = OrchestrationEngineLive.pipe(	297	const orchestrationLayer = OrchestrationEngineLive.pipe(
297	Layer.provide(OrchestrationProjectionSnapshotQueryLive),	298	Layer.provide(OrchestrationProjectionSnapshotQueryLive),
298	Layer.provide(ThreadBackgroundLiveness.layer),	299	Layer.provide(ThreadBackgroundLiveness.layer),
		300	Layer.provide(ThreadPlanProgress.layer),
299	Layer.provide(OrchestrationProjectionPipelineLive),	301	Layer.provide(OrchestrationProjectionPipelineLive),
300	Layer.provide(OrchestrationEventStoreLive),	302	Layer.provide(OrchestrationEventStoreLive),
301	Layer.provide(OrchestrationCommandReceiptRepositoryLive),	303	Layer.provide(OrchestrationCommandReceiptRepositoryLive),
...	@@ -304,6 +306,7 @@ describe("CheckpointReactor", () => {	...	@@ -304,6 +306,7 @@ describe("CheckpointReactor", () => {
304	);	306	);
305	const projectionSnapshotLayer = OrchestrationProjectionSnapshotQueryLive.pipe(	307	const projectionSnapshotLayer = OrchestrationProjectionSnapshotQueryLive.pipe(
306	Layer.provide(ThreadBackgroundLiveness.layer),	308	Layer.provide(ThreadBackgroundLiveness.layer),
		309	Layer.provide(ThreadPlanProgress.layer),
307	Layer.provide(RepositoryIdentityResolver.layer),	310	Layer.provide(RepositoryIdentityResolver.layer),
308	Layer.provide(SqlitePersistenceMemory),	311	Layer.provide(SqlitePersistenceMemory),
309	);	312	);

...	@@ -32,6 +32,7 @@ import { OrchestrationEngineLive } from "./OrchestrationEngine.ts";	...	@@ -32,6 +32,7 @@ import { OrchestrationEngineLive } from "./OrchestrationEngine.ts";
32	import { OrchestrationProjectionPipelineLive } from "./ProjectionPipeline.ts";	32	import { OrchestrationProjectionPipelineLive } from "./ProjectionPipeline.ts";
33	import { OrchestrationProjectionSnapshotQueryLive } from "./ProjectionSnapshotQuery.ts";	33	import { OrchestrationProjectionSnapshotQueryLive } from "./ProjectionSnapshotQuery.ts";
34	import * as ThreadBackgroundLiveness from "../ThreadBackgroundLiveness.ts";	34	import * as ThreadBackgroundLiveness from "../ThreadBackgroundLiveness.ts";
		35	import * as ThreadPlanProgress from "../ThreadPlanProgress.ts";
35	import { OrchestrationEngineService } from "../Services/OrchestrationEngine.ts";	36	import { OrchestrationEngineService } from "../Services/OrchestrationEngine.ts";
36	import {	37	import {
37	OrchestrationProjectionPipeline,	38	OrchestrationProjectionPipeline,
...	@@ -57,6 +58,7 @@ async function createOrchestrationSystem() {	...	@@ -57,6 +58,7 @@ async function createOrchestrationSystem() {
57	OrchestrationProjectionSnapshotQueryLive,	58	OrchestrationProjectionSnapshotQueryLive,
58	).pipe(	59	).pipe(
59	Layer.provide(ThreadBackgroundLiveness.layer),	60	Layer.provide(ThreadBackgroundLiveness.layer),
		61	Layer.provide(ThreadPlanProgress.layer),
60	Layer.provide(OrchestrationEventStoreLive),	62	Layer.provide(OrchestrationEventStoreLive),
61	Layer.provide(OrchestrationCommandReceiptRepositoryLive),	63	Layer.provide(OrchestrationCommandReceiptRepositoryLive),
62	Layer.provide(RepositoryIdentityResolver.layer),	64	Layer.provide(RepositoryIdentityResolver.layer),
...	@@ -820,6 +822,7 @@ describe("OrchestrationEngine", () => {	...	@@ -820,6 +822,7 @@ describe("OrchestrationEngine", () => {
820	OrchestrationEngineLive.pipe(	822	OrchestrationEngineLive.pipe(
821	Layer.provide(OrchestrationProjectionSnapshotQueryLive),	823	Layer.provide(OrchestrationProjectionSnapshotQueryLive),
822	Layer.provide(ThreadBackgroundLiveness.layer),	824	Layer.provide(ThreadBackgroundLiveness.layer),
		825	Layer.provide(ThreadPlanProgress.layer),
823	Layer.provide(OrchestrationProjectionPipelineLive),	826	Layer.provide(OrchestrationProjectionPipelineLive),
824	Layer.provide(Layer.succeed(OrchestrationEventStore, flakyStore)),	827	Layer.provide(Layer.succeed(OrchestrationEventStore, flakyStore)),
825	Layer.provide(OrchestrationCommandReceiptRepositoryLive),	828	Layer.provide(OrchestrationCommandReceiptRepositoryLive),
...	@@ -926,6 +929,7 @@ describe("OrchestrationEngine", () => {	...	@@ -926,6 +929,7 @@ describe("OrchestrationEngine", () => {
926	OrchestrationEngineLive.pipe(	929	OrchestrationEngineLive.pipe(
927	Layer.provide(OrchestrationProjectionSnapshotQueryLive),	930	Layer.provide(OrchestrationProjectionSnapshotQueryLive),
928	Layer.provide(ThreadBackgroundLiveness.layer),	931	Layer.provide(ThreadBackgroundLiveness.layer),
		932	Layer.provide(ThreadPlanProgress.layer),
929	Layer.provide(Layer.succeed(OrchestrationProjectionPipeline, flakyProjectionPipeline)),	933	Layer.provide(Layer.succeed(OrchestrationProjectionPipeline, flakyProjectionPipeline)),
930	Layer.provide(OrchestrationEventStoreLive),	934	Layer.provide(OrchestrationEventStoreLive),
931	Layer.provide(OrchestrationCommandReceiptRepositoryLive),	935	Layer.provide(OrchestrationCommandReceiptRepositoryLive),
...	@@ -1070,6 +1074,7 @@ describe("OrchestrationEngine", () => {	...	@@ -1070,6 +1074,7 @@ describe("OrchestrationEngine", () => {
1070	OrchestrationEngineLive.pipe(	1074	OrchestrationEngineLive.pipe(
1071	Layer.provide(OrchestrationProjectionSnapshotQueryLive),	1075	Layer.provide(OrchestrationProjectionSnapshotQueryLive),
1072	Layer.provide(ThreadBackgroundLiveness.layer),	1076	Layer.provide(ThreadBackgroundLiveness.layer),
		1077	Layer.provide(ThreadPlanProgress.layer),
1073	Layer.provide(Layer.succeed(OrchestrationProjectionPipeline, flakyProjectionPipeline)),	1078	Layer.provide(Layer.succeed(OrchestrationProjectionPipeline, flakyProjectionPipeline)),
1074	Layer.provide(Layer.succeed(OrchestrationEventStore, nonTransactionalStore)),	1079	Layer.provide(Layer.succeed(OrchestrationEventStore, nonTransactionalStore)),
1075	Layer.provide(OrchestrationCommandReceiptRepositoryLive),	1080	Layer.provide(OrchestrationCommandReceiptRepositoryLive),

...	@@ -32,6 +32,7 @@ import {	...	@@ -32,6 +32,7 @@ import {
32	} from "./ProjectionPipeline.ts";	32	} from "./ProjectionPipeline.ts";
33	import { OrchestrationProjectionSnapshotQueryLive } from "./ProjectionSnapshotQuery.ts";	33	import { OrchestrationProjectionSnapshotQueryLive } from "./ProjectionSnapshotQuery.ts";
34	import * as ThreadBackgroundLiveness from "../ThreadBackgroundLiveness.ts";	34	import * as ThreadBackgroundLiveness from "../ThreadBackgroundLiveness.ts";
		35	import * as ThreadPlanProgress from "../ThreadPlanProgress.ts";
35	import { OrchestrationEngineService } from "../Services/OrchestrationEngine.ts";	36	import { OrchestrationEngineService } from "../Services/OrchestrationEngine.ts";
36	import { OrchestrationProjectionPipeline } from "../Services/ProjectionPipeline.ts";	37	import { OrchestrationProjectionPipeline } from "../Services/ProjectionPipeline.ts";
37	import { ServerConfig } from "../../config.ts";	38	import { ServerConfig } from "../../config.ts";
...	@@ -2673,6 +2674,7 @@ const engineLayer = it.layer(	...	@@ -2673,6 +2674,7 @@ const engineLayer = it.layer(
2673	OrchestrationEngineLive.pipe(	2674	OrchestrationEngineLive.pipe(
2674	Layer.provide(OrchestrationProjectionSnapshotQueryLive),	2675	Layer.provide(OrchestrationProjectionSnapshotQueryLive),
2675	Layer.provide(ThreadBackgroundLiveness.layer),	2676	Layer.provide(ThreadBackgroundLiveness.layer),
		2677	Layer.provide(ThreadPlanProgress.layer),
2676	Layer.provide(OrchestrationProjectionPipelineLive),	2678	Layer.provide(OrchestrationProjectionPipelineLive),
2677	Layer.provide(OrchestrationEventStoreLive),	2679	Layer.provide(OrchestrationEventStoreLive),
2678	Layer.provide(OrchestrationCommandReceiptRepositoryLive),	2680	Layer.provide(OrchestrationCommandReceiptRepositoryLive),

...	@@ -18,6 +18,7 @@ import * as RepositoryIdentityResolver from "../../project/RepositoryIdentityRes	...	@@ -18,6 +18,7 @@ import * as RepositoryIdentityResolver from "../../project/RepositoryIdentityRes
18	import { ORCHESTRATION_PROJECTOR_NAMES } from "./ProjectionPipeline.ts";	18	import { ORCHESTRATION_PROJECTOR_NAMES } from "./ProjectionPipeline.ts";
19	import { OrchestrationProjectionSnapshotQueryLive } from "./ProjectionSnapshotQuery.ts";	19	import { OrchestrationProjectionSnapshotQueryLive } from "./ProjectionSnapshotQuery.ts";
20	import * as ThreadBackgroundLiveness from "../ThreadBackgroundLiveness.ts";	20	import * as ThreadBackgroundLiveness from "../ThreadBackgroundLiveness.ts";
		21	import * as ThreadPlanProgress from "../ThreadPlanProgress.ts";
21	import { ProjectionSnapshotQuery } from "../Services/ProjectionSnapshotQuery.ts";	22	import { ProjectionSnapshotQuery } from "../Services/ProjectionSnapshotQuery.ts";
22	import { encodeThreadDetailPageCursor } from "../threadDetailCursor.ts";	23	import { encodeThreadDetailPageCursor } from "../threadDetailCursor.ts";
23		24
...	@@ -30,6 +31,7 @@ const asCheckpointRef = (value: string): CheckpointRef => CheckpointRef.make(val	...	@@ -30,6 +31,7 @@ const asCheckpointRef = (value: string): CheckpointRef => CheckpointRef.make(val
30	const projectionSnapshotLayer = it.layer(	31	const projectionSnapshotLayer = it.layer(
31	OrchestrationProjectionSnapshotQueryLive.pipe(	32	OrchestrationProjectionSnapshotQueryLive.pipe(
32	Layer.provide(ThreadBackgroundLiveness.layer),	33	Layer.provide(ThreadBackgroundLiveness.layer),
		34	Layer.provide(ThreadPlanProgress.layer),
33	Layer.provideMerge(RepositoryIdentityResolver.layer),	35	Layer.provideMerge(RepositoryIdentityResolver.layer),
34	Layer.provideMerge(SqlitePersistenceMemory),	36	Layer.provideMerge(SqlitePersistenceMemory),
35	Layer.provideMerge(NodeServices.layer),	37	Layer.provideMerge(NodeServices.layer),
...	@@ -447,6 +449,7 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {	...	@@ -447,6 +449,7 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
447	hasPendingUserInput: false,	449	hasPendingUserInput: false,
448	hasActionableProposedPlan: false,	450	hasActionableProposedPlan: false,
449	backgroundLiveness: null,	451	backgroundLiveness: null,
		452	planProgress: null,
450	},	453	},
451	]);	454	]);
452		455
...	@@ -1830,6 +1833,7 @@ it.effect(	...	@@ -1830,6 +1833,7 @@ it.effect(
1830	const resolveCalls: string[] = [];	1833	const resolveCalls: string[] = [];
1831	const layer = OrchestrationProjectionSnapshotQueryLive.pipe(	1834	const layer = OrchestrationProjectionSnapshotQueryLive.pipe(
1832	Layer.provide(ThreadBackgroundLiveness.layer),	1835	Layer.provide(ThreadBackgroundLiveness.layer),
		1836	Layer.provide(ThreadPlanProgress.layer),
1833	Layer.provideMerge(	1837	Layer.provideMerge(
1834	Layer.succeed(RepositoryIdentityResolver.RepositoryIdentityResolver, {	1838	Layer.succeed(RepositoryIdentityResolver.RepositoryIdentityResolver, {
1835	resolve: (cwd: string) =>	1839	resolve: (cwd: string) =>

...	@@ -44,6 +44,7 @@ import {	...	@@ -44,6 +44,7 @@ import {
44	} from "../../persistence/Errors.ts";	44	} from "../../persistence/Errors.ts";
45	import { ProjectionCheckpoint } from "../../persistence/Services/ProjectionCheckpoints.ts";	45	import { ProjectionCheckpoint } from "../../persistence/Services/ProjectionCheckpoints.ts";
46	import { ThreadBackgroundLivenessService } from "../ThreadBackgroundLiveness.ts";	46	import { ThreadBackgroundLivenessService } from "../ThreadBackgroundLiveness.ts";
		47	import { ThreadPlanProgressService } from "../ThreadPlanProgress.ts";
47	import { ProjectionProject } from "../../persistence/Services/ProjectionProjects.ts";	48	import { ProjectionProject } from "../../persistence/Services/ProjectionProjects.ts";
48	import { ProjectionState } from "../../persistence/Services/ProjectionState.ts";	49	import { ProjectionState } from "../../persistence/Services/ProjectionState.ts";
49	import { ProjectionThreadActivity } from "../../persistence/Services/ProjectionThreadActivities.ts";	50	import { ProjectionThreadActivity } from "../../persistence/Services/ProjectionThreadActivities.ts";
...	@@ -344,6 +345,7 @@ function toPersistenceSqlOrDecodeError(sqlOperation: string, decodeOperation: st	...	@@ -344,6 +345,7 @@ function toPersistenceSqlOrDecodeError(sqlOperation: string, decodeOperation: st
344		345
345	const makeProjectionSnapshotQuery = Effect.gen(function* () {	346	const makeProjectionSnapshotQuery = Effect.gen(function* () {
346	const threadBackgroundLiveness = yield* ThreadBackgroundLivenessService;	347	const threadBackgroundLiveness = yield* ThreadBackgroundLivenessService;
		348	const threadPlanProgress = yield* ThreadPlanProgressService;
347	const sql = yield* SqlClient.SqlClient;	349	const sql = yield* SqlClient.SqlClient;
348	const repositoryIdentityResolver = yield* RepositoryIdentityResolver.RepositoryIdentityResolver;	350	const repositoryIdentityResolver = yield* RepositoryIdentityResolver.RepositoryIdentityResolver;
349	const repositoryIdentityResolutionConcurrency = 4;	351	const repositoryIdentityResolutionConcurrency = 4;
...	@@ -1908,6 +1910,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {	...	@@ -1908,6 +1910,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
1908	backgroundLiveness: threadBackgroundLiveness.getThreadBackgroundLiveness(	1910	backgroundLiveness: threadBackgroundLiveness.getThreadBackgroundLiveness(
1909	row.threadId,	1911	row.threadId,
1910	),	1912	),
		1913	planProgress: threadPlanProgress.getThreadPlanProgress(row.threadId),
1911	} satisfies OrchestrationThreadShell)	1914	} satisfies OrchestrationThreadShell)
1912	: Result.failVoid,	1915	: Result.failVoid,
1913	),	1916	),
...	@@ -2051,6 +2054,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {	...	@@ -2051,6 +2054,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
2051	backgroundLiveness: threadBackgroundLiveness.getThreadBackgroundLiveness(	2054	backgroundLiveness: threadBackgroundLiveness.getThreadBackgroundLiveness(
2052	row.threadId,	2055	row.threadId,
2053	),	2056	),
		2057	planProgress: threadPlanProgress.getThreadPlanProgress(row.threadId),
2054	}),	2058	}),
2055	),	2059	),
2056	updatedAt: updatedAt ?? "1970-01-01T00:00:00.000Z",	2060	updatedAt: updatedAt ?? "1970-01-01T00:00:00.000Z",
...	@@ -2326,6 +2330,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {	...	@@ -2326,6 +2330,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
2326	backgroundLiveness: threadBackgroundLiveness.getThreadBackgroundLiveness(	2330	backgroundLiveness: threadBackgroundLiveness.getThreadBackgroundLiveness(
2327	threadRow.value.threadId,	2331	threadRow.value.threadId,
2328	),	2332	),
		2333	planProgress: threadPlanProgress.getThreadPlanProgress(threadRow.value.threadId),
2329	} satisfies OrchestrationThreadShell);	2334	} satisfies OrchestrationThreadShell);
2330	});	2335	});
2331		2336

...	@@ -49,6 +49,7 @@ import { OrchestrationEngineLive } from "./OrchestrationEngine.ts";	...	@@ -49,6 +49,7 @@ import { OrchestrationEngineLive } from "./OrchestrationEngine.ts";
49	import { OrchestrationProjectionPipelineLive } from "./ProjectionPipeline.ts";	49	import { OrchestrationProjectionPipelineLive } from "./ProjectionPipeline.ts";
50	import { OrchestrationProjectionSnapshotQueryLive } from "./ProjectionSnapshotQuery.ts";	50	import { OrchestrationProjectionSnapshotQueryLive } from "./ProjectionSnapshotQuery.ts";
51	import * as ThreadBackgroundLiveness from "../ThreadBackgroundLiveness.ts";	51	import * as ThreadBackgroundLiveness from "../ThreadBackgroundLiveness.ts";
		52	import * as ThreadPlanProgress from "../ThreadPlanProgress.ts";
52	import {	53	import {
53	providerErrorLabel,	54	providerErrorLabel,
54	providerErrorLabelFromInstanceHint,	55	providerErrorLabelFromInstanceHint,
...	@@ -347,6 +348,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -347,6 +348,7 @@ describe("ProviderCommandReactor", () => {
347	const orchestrationLayer = OrchestrationEngineLive.pipe(	348	const orchestrationLayer = OrchestrationEngineLive.pipe(
348	Layer.provide(OrchestrationProjectionSnapshotQueryLive),	349	Layer.provide(OrchestrationProjectionSnapshotQueryLive),
349	Layer.provide(ThreadBackgroundLiveness.layer),	350	Layer.provide(ThreadBackgroundLiveness.layer),
		351	Layer.provide(ThreadPlanProgress.layer),
350	Layer.provide(OrchestrationProjectionPipelineLive),	352	Layer.provide(OrchestrationProjectionPipelineLive),
351	Layer.provide(OrchestrationEventStoreLive),	353	Layer.provide(OrchestrationEventStoreLive),
352	Layer.provide(OrchestrationCommandReceiptRepositoryLive),	354	Layer.provide(OrchestrationCommandReceiptRepositoryLive),
...	@@ -355,6 +357,7 @@ describe("ProviderCommandReactor", () => {	...	@@ -355,6 +357,7 @@ describe("ProviderCommandReactor", () => {
355	);	357	);
356	const projectionSnapshotLayer = OrchestrationProjectionSnapshotQueryLive.pipe(	358	const projectionSnapshotLayer = OrchestrationProjectionSnapshotQueryLive.pipe(
357	Layer.provide(ThreadBackgroundLiveness.layer),	359	Layer.provide(ThreadBackgroundLiveness.layer),
		360	Layer.provide(ThreadPlanProgress.layer),
358	Layer.provide(RepositoryIdentityResolver.layer),	361	Layer.provide(RepositoryIdentityResolver.layer),
359	Layer.provide(SqlitePersistenceMemory),	362	Layer.provide(SqlitePersistenceMemory),
360	);	363	);

...	@@ -45,6 +45,7 @@ import { OrchestrationEngineLive } from "./OrchestrationEngine.ts";	...	@@ -45,6 +45,7 @@ import { OrchestrationEngineLive } from "./OrchestrationEngine.ts";
45	import { OrchestrationProjectionPipelineLive } from "./ProjectionPipeline.ts";	45	import { OrchestrationProjectionPipelineLive } from "./ProjectionPipeline.ts";
46	import { OrchestrationProjectionSnapshotQueryLive } from "./ProjectionSnapshotQuery.ts";	46	import { OrchestrationProjectionSnapshotQueryLive } from "./ProjectionSnapshotQuery.ts";
47	import * as ThreadBackgroundLiveness from "../ThreadBackgroundLiveness.ts";	47	import * as ThreadBackgroundLiveness from "../ThreadBackgroundLiveness.ts";
		48	import * as ThreadPlanProgress from "../ThreadPlanProgress.ts";
48	import { ProviderRuntimeIngestionLive } from "./ProviderRuntimeIngestion.ts";	49	import { ProviderRuntimeIngestionLive } from "./ProviderRuntimeIngestion.ts";
49	import { OrchestrationEngineService } from "../Services/OrchestrationEngine.ts";	50	import { OrchestrationEngineService } from "../Services/OrchestrationEngine.ts";
50	import { ProviderRuntimeIngestionService } from "../Services/ProviderRuntimeIngestion.ts";	51	import { ProviderRuntimeIngestionService } from "../Services/ProviderRuntimeIngestion.ts";
...	@@ -241,6 +242,7 @@ describe("ProviderRuntimeIngestion", () => {	...	@@ -241,6 +242,7 @@ describe("ProviderRuntimeIngestion", () => {
241	// Single shared liveness instance across ingestion (writer), the	242	// Single shared liveness instance across ingestion (writer), the
242	// engine, and the snapshot query (reader).	243	// engine, and the snapshot query (reader).
243	Layer.provideMerge(ThreadBackgroundLiveness.layer),	244	Layer.provideMerge(ThreadBackgroundLiveness.layer),
		245	Layer.provideMerge(ThreadPlanProgress.layer),
244	Layer.provideMerge(SqlitePersistenceMemory),	246	Layer.provideMerge(SqlitePersistenceMemory),
245	Layer.provideMerge(Layer.succeed(ProviderService, provider.service)),	247	Layer.provideMerge(Layer.succeed(ProviderService, provider.service)),
246	Layer.provideMerge(makeTestServerSettingsLayer(options?.serverSettings)),	248	Layer.provideMerge(makeTestServerSettingsLayer(options?.serverSettings)),

fix(web): plans stop hijacking the UI, fold into chat instead (#5558)