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,15 +11,18 @@ 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 ,
1820 PROJECT_ID ,
1921 installFakeEnvironment ,
22+ threadWithHistory ,
2023 type FakeDriver ,
2124} from "../../test/fakeEnvironment" ;
22- import { render } from "../../test/render" ;
25+ import { act , render } from "../../test/render" ;
2326
2427// The socket is the only fake layer; see test/appScenarios.renders.tsx.
2528vi . mock ( "../../../../packages/client-runtime/src/connection/driver.ts" , async ( importOriginal ) => {
@@ -65,3 +68,67 @@ it("a new draft does not load its reserved thread before the server lists it", a
6568 // A 404 here marks the thread deleted, and the view never loads it once the send creates it.
6669 expect ( threadRequests ) . toEqual ( [ ] ) ;
6770} ) ;
71+
72+ it ( "retains each thread's diff selection when returning from another thread or Settings" , async ( ) => {
73+ const a = threadWithHistory ( "diff-selection-a" , 1 ) ;
74+ const b = threadWithHistory ( "diff-selection-b" , 1 ) ;
75+ using _environment = installFakeEnvironment ( [ a , b ] ) ;
76+ __setClientSettingsForTests ( {
77+ ...DEFAULT_CLIENT_SETTINGS ,
78+ onboardingCompletedAt : "2026-01-01T00:00:00.000Z" ,
79+ } ) ;
80+ const aRef = scopeThreadRef ( ENVIRONMENT_ID , a . id ) ;
81+ const bRef = scopeThreadRef ( ENVIRONMENT_ID , b . id ) ;
82+ useRightPanelStore . getState ( ) . open ( aRef , "diff" ) ;
83+ useRightPanelStore . getState ( ) . open ( bRef , "diff" ) ;
84+ useDiffPanelStore . getState ( ) . selectBranchBaseRef ( bRef , "origin/release" ) ;
85+ const router = getRouter ( createMemoryHistory ( { initialEntries : [ `/${ ENVIRONMENT_ID } /${ a . id } ` ] } ) ) ;
86+ await router . load ( ) ;
87+ await using _app = await render ( < AppRoot router = { router } /> , {
88+ // AppRoot brings its own router.
89+ router : false ,
90+ } ) ;
91+ await expect . element ( page . getByText ( `Answer 0 for ${ a . id } .` ) ) . toBeVisible ( ) ;
92+ await act ( ( ) => useDiffPanelStore . getState ( ) . selectGitScope ( aRef , "unstaged" ) ) ;
93+
94+ await act ( ( ) =>
95+ router . navigate ( {
96+ to : "/$environmentId/$threadId" ,
97+ params : { environmentId : ENVIRONMENT_ID , threadId : b . id } ,
98+ } ) ,
99+ ) ;
100+ await expect . element ( page . getByText ( `Answer 0 for ${ b . id } .` ) ) . toBeVisible ( ) ;
101+ expect ( selectThreadDiffPanelSelection ( useDiffPanelStore . getState ( ) . byThreadKey , bRef ) ) . toEqual ( {
102+ kind : "branch" ,
103+ baseRef : "origin/release" ,
104+ } ) ;
105+ await act ( ( ) =>
106+ router . navigate ( {
107+ to : "/$environmentId/$threadId" ,
108+ params : { environmentId : ENVIRONMENT_ID , threadId : a . id } ,
109+ } ) ,
110+ ) ;
111+ await expect . element ( page . getByText ( `Answer 0 for ${ a . id } .` ) ) . toBeVisible ( ) ;
112+ expect ( selectThreadDiffPanelSelection ( useDiffPanelStore . getState ( ) . byThreadKey , aRef ) ) . toEqual ( {
113+ kind : "unstaged" ,
114+ } ) ;
115+
116+ await act ( ( ) => useDiffPanelStore . getState ( ) . selectTurn ( aRef , a . runs [ 0 ] ! . id ) ) ;
117+ await act ( ( ) => router . navigate ( { to : "/settings/general" } ) ) ;
118+ await expect
119+ . element ( page . getByRole ( "heading" , { name : "Time format" , exact : true } ) )
120+ . toBeVisible ( ) ;
121+ await act ( ( ) =>
122+ router . navigate ( {
123+ to : "/$environmentId/$threadId" ,
124+ params : { environmentId : ENVIRONMENT_ID , threadId : a . id } ,
125+ } ) ,
126+ ) ;
127+ await expect . element ( page . getByText ( `Answer 0 for ${ a . id } .` ) ) . toBeVisible ( ) ;
128+ expect (
129+ selectThreadDiffPanelSelection ( useDiffPanelStore . getState ( ) . byThreadKey , aRef ) ,
130+ ) . toMatchObject ( {
131+ kind : "turn" ,
132+ turnId : a . runs [ 0 ] ! . id ,
133+ } ) ;
134+ } ) ;
0 commit comments