Commit 1ffba7093a83c99ef41dd486b10df75f2b9974e1 | the-knife

author	Theo Browne <me@t3.gg> 2026-08-06 05:37:27-04:00
committer	GitHub <noreply@github.com> 2026-08-06 02:37:27-07:00
log	1ffba7093a83c99ef41dd486b10df75f2b9974e1
tree	7d329ef53d5133b08a7ea20803e125c8aa41aa47
parent	3da315e7b5c4537cbc7280f33dadb3f5f0e3baf0
signature	Signed by PGP key B5690EEEBB952194

fix(web): closed plan sidebar stays closed when returning to a thread (#5484)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

2 files changed, 41 insertions(+), 15 deletions(-)

apps
- web
  - src
    components
    ChatView.tsx
    planSidebarDismissal.ts

apps/web/src/components/ChatView.tsx+20-15

 @@ -117,6 +117,11 @@ 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,
 @@ -1310,8 +1315,6 @@ function ChatViewContent(props: ChatViewProps) {
   const [pendingUserInputQuestionIndexByRequestId, setPendingUserInputQuestionIndexByRequestId] =
     useState<Record<string, number>>({});
   const shouldUsePlanSidebarSheet = useMediaQuery(RIGHT_PANEL_INLINE_LAYOUT_MEDIA_QUERY);
-  // Tracks whether the user explicitly dismissed the sidebar for the active turn.
-  const planSidebarDismissedForTurnRef = useRef<string | null>(null);
   // 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);
 @@ -3110,18 +3113,21 @@ function ChatViewContent(props: ChatViewProps) {
     handleInteractionModeChange(interactionMode === "plan" ? "default" : "plan");
   }, [handleInteractionModeChange, interactionMode]);
   const dismissPlanSidebarForCurrentTurn = useCallback(() => {
-    planSidebarDismissedForTurnRef.current =
+    if (!activeThreadKey) return;
-      activePlan?.turnId ?? sidebarProposedPlan?.turnId ?? "__dismissed__";
+    dismissPlanSidebarForTurn(
-  }, [activePlan?.turnId, sidebarProposedPlan?.turnId]);
+      activeThreadKey,
+      activePlan?.turnId ?? sidebarProposedPlan?.turnId ?? "__dismissed__",
+    );
+  }, [activeThreadKey, activePlan?.turnId, sidebarProposedPlan?.turnId]);
   const togglePlanSidebar = useCallback(() => {
     if (!activeThreadRef) return;
     if (planSidebarOpen) {
       dismissPlanSidebarForCurrentTurn();
-    } else {
+    } else if (activeThreadKey) {
-      planSidebarDismissedForTurnRef.current = null;
+      clearPlanSidebarDismissal(activeThreadKey);
     }
     useRightPanelStore.getState().toggle(activeThreadRef, "plan");
-  }, [activeThreadRef, dismissPlanSidebarForCurrentTurn, planSidebarOpen]);
+  }, [activeThreadKey, activeThreadRef, dismissPlanSidebarForCurrentTurn, planSidebarOpen]);
   const closePlanSidebar = useCallback(() => {
     if (!activeThreadRef) return;
     setMaximizedRightPanelThreadKey(null);
 @@ -3283,7 +3289,7 @@ function ChatViewContent(props: ChatViewProps) {
     (surface: RightPanelSurface) => {
       if (!activeThreadRef) return;
       if (surface.kind === "plan") {
-        planSidebarDismissedForTurnRef.current = null;
+        clearPlanSidebarDismissal(scopedThreadKey(activeThreadRef));
       } else if (planSidebarOpen) {
         dismissPlanSidebarForCurrentTurn();
       }
 @@ -3852,10 +3858,10 @@ function ChatViewContent(props: ChatViewProps) {
     if (planSidebarOpenOnNextThreadRef.current) {
       planSidebarOpenOnNextThreadRef.current = false;
       if (activeThreadRef) {
+        clearPlanSidebarDismissal(scopedThreadKey(activeThreadRef));
         useRightPanelStore.getState().open(activeThreadRef, "plan");
       }
     }
-    planSidebarDismissedForTurnRef.current = null;
     // activeThreadRef resets transitively with the active thread.
   }, [activeThread?.id]);
 @@ -3868,10 +3874,9 @@ function ChatViewContent(props: ChatViewProps) {
     const latestTurnId = activeLatestTurn?.turnId ?? null;
     if (latestTurnId && activePlan.turnId !== latestTurnId) return;
     const turnKey = activePlan.turnId ?? sidebarProposedPlan?.turnId ?? "__dismissed__";
-    if (planSidebarDismissedForTurnRef.current === turnKey) return;
+    if (!activeThreadRef) return;
-    if (activeThreadRef) {
+    if (isPlanSidebarDismissedForTurn(scopedThreadKey(activeThreadRef), turnKey)) return;
-      useRightPanelStore.getState().open(activeThreadRef, "plan");
+    useRightPanelStore.getState().open(activeThreadRef, "plan");
-    }
   }, [
     activePlan,
     activeLatestTurn?.turnId,
 @@ -5412,8 +5417,8 @@ function ChatViewContent(props: ChatViewProps) {
         // "default" mode here means the agent is executing the plan, which produces
         // step-tracking activities that the sidebar will display.
         if (nextInteractionMode === "default" && autoOpenPlanSidebar) {
-          planSidebarDismissedForTurnRef.current = null;
           if (activeThreadRef) {
+            clearPlanSidebarDismissal(scopedThreadKey(activeThreadRef));
             useRightPanelStore.getState().open(activeThreadRef, "plan");
           }
         }

apps/web/src/planSidebarDismissal.ts created+21

...	@@ -0,0 +1,21 @@
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	}