11import { createMemoryHistory } from "@tanstack/react-router" ;
2- import { scopeProjectRef } from "@t3tools/client-runtime/environment" ;
2+ import { scopeProjectRef , scopeThreadRef } from "@t3tools/client-runtime/environment" ;
33import { ThreadId } from "@t3tools/contracts" ;
44import { DEFAULT_CLIENT_SETTINGS } from "@t3tools/contracts/settings" ;
55import type * as Context from "effect/Context" ;
@@ -11,7 +11,9 @@ import { AppRoot } from "~/AppRoot";
1111// takes 6-11s; importing it here keeps that out of the test's timeout.
1212import "~/components/ChatView" ;
1313import { DraftId , useComposerDraftStore } from "~/composerDraftStore" ;
14+ import { selectThreadDiffPanelSelection , useDiffPanelStore } from "~/diffPanelStore" ;
1415import { __setClientSettingsForTests } from "~/hooks/useSettings" ;
16+ import { useRightPanelStore } from "~/rightPanelStore" ;
1517import { getRouter } from "~/router" ;
1618import {
1719 ENVIRONMENT_ID ,
@@ -20,7 +22,7 @@ import {
2022 threadWithHistory ,
2123 type FakeDriver ,
2224} from "../../test/fakeEnvironment" ;
23- import { render } from "../../test/render" ;
25+ import { act , render } from "../../test/render" ;
2426
2527// The socket is the only fake layer; see test/appScenarios.renders.tsx.
2628vi . mock ( "../../../../packages/client-runtime/src/connection/driver.ts" , async ( importOriginal ) => {
@@ -91,3 +93,67 @@ it("opens the thread actions menu for an older settled thread the shell leaves o
9193 . element ( page . getByRole ( "menuitem" , { name : "Rename thread" } ) , { timeout : 5_000 } )
9294 . toBeVisible ( ) ;
9395} ) ;
96+
97+ it ( "retains each thread's diff selection when returning from another thread or Settings" , async ( ) => {
98+ const a = threadWithHistory ( "diff-selection-a" , 1 ) ;
99+ const b = threadWithHistory ( "diff-selection-b" , 1 ) ;
100+ using _environment = installFakeEnvironment ( [ a , b ] ) ;
101+ __setClientSettingsForTests ( {
102+ ...DEFAULT_CLIENT_SETTINGS ,
103+ onboardingCompletedAt : "2026-01-01T00:00:00.000Z" ,
104+ } ) ;
105+ const aRef = scopeThreadRef ( ENVIRONMENT_ID , a . id ) ;
106+ const bRef = scopeThreadRef ( ENVIRONMENT_ID , b . id ) ;
107+ useRightPanelStore . getState ( ) . open ( aRef , "diff" ) ;
108+ useRightPanelStore . getState ( ) . open ( bRef , "diff" ) ;
109+ useDiffPanelStore . getState ( ) . selectBranchBaseRef ( bRef , "origin/release" ) ;
110+ const router = getRouter ( createMemoryHistory ( { initialEntries : [ `/${ ENVIRONMENT_ID } /${ a . id } ` ] } ) ) ;
111+ await router . load ( ) ;
112+ await using _app = await render ( < AppRoot router = { router } /> , {
113+ // AppRoot brings its own router.
114+ router : false ,
115+ } ) ;
116+ await expect . element ( page . getByText ( `Answer 0 for ${ a . id } .` ) ) . toBeVisible ( ) ;
117+ await act ( ( ) => useDiffPanelStore . getState ( ) . selectGitScope ( aRef , "unstaged" ) ) ;
118+
119+ await act ( ( ) =>
120+ router . navigate ( {
121+ to : "/$environmentId/$threadId" ,
122+ params : { environmentId : ENVIRONMENT_ID , threadId : b . id } ,
123+ } ) ,
124+ ) ;
125+ await expect . element ( page . getByText ( `Answer 0 for ${ b . id } .` ) ) . toBeVisible ( ) ;
126+ expect ( selectThreadDiffPanelSelection ( useDiffPanelStore . getState ( ) . byThreadKey , bRef ) ) . toEqual ( {
127+ kind : "branch" ,
128+ baseRef : "origin/release" ,
129+ } ) ;
130+ await act ( ( ) =>
131+ router . navigate ( {
132+ to : "/$environmentId/$threadId" ,
133+ params : { environmentId : ENVIRONMENT_ID , threadId : a . id } ,
134+ } ) ,
135+ ) ;
136+ await expect . element ( page . getByText ( `Answer 0 for ${ a . id } .` ) ) . toBeVisible ( ) ;
137+ expect ( selectThreadDiffPanelSelection ( useDiffPanelStore . getState ( ) . byThreadKey , aRef ) ) . toEqual ( {
138+ kind : "unstaged" ,
139+ } ) ;
140+
141+ await act ( ( ) => useDiffPanelStore . getState ( ) . selectTurn ( aRef , a . runs [ 0 ] ! . id ) ) ;
142+ await act ( ( ) => router . navigate ( { to : "/settings/general" } ) ) ;
143+ await expect
144+ . element ( page . getByRole ( "heading" , { name : "Time format" , exact : true } ) )
145+ . toBeVisible ( ) ;
146+ await act ( ( ) =>
147+ router . navigate ( {
148+ to : "/$environmentId/$threadId" ,
149+ params : { environmentId : ENVIRONMENT_ID , threadId : a . id } ,
150+ } ) ,
151+ ) ;
152+ await expect . element ( page . getByText ( `Answer 0 for ${ a . id } .` ) ) . toBeVisible ( ) ;
153+ expect (
154+ selectThreadDiffPanelSelection ( useDiffPanelStore . getState ( ) . byThreadKey , aRef ) ,
155+ ) . toMatchObject ( {
156+ kind : "turn" ,
157+ turnId : a . runs [ 0 ] ! . id ,
158+ } ) ;
159+ } ) ;
0 commit comments