1- import { DEFAULT_CLIENT_SETTINGS , EnvironmentId , ProjectId } from "@t3tools/contracts" ;
1+ import { scopeProjectRef } from "@t3tools/client-runtime/environment" ;
2+ import { DEFAULT_CLIENT_SETTINGS , EnvironmentId , ProjectId , ThreadId } from "@t3tools/contracts" ;
23import { describe , expect , it , vi } from "vite-plus/test" ;
34import { userEvent } from "vite-plus/test/browser" ;
45
5- import { render } from "../../test/render" ;
6+ import { act , render } from "../../test/render" ;
67import { openCommandPalette } from "../commandPaletteBus" ;
8+ import { DraftId , useComposerDraftStore } from "../composerDraftStore" ;
79import { useHandleNewThread } from "../hooks/useHandleNewThread" ;
10+ import { useThreadRouteTarget } from "../hooks/useThreadRouteTarget" ;
811import { __setClientSettingsForTests , getClientSettings } from "../hooks/useSettings" ;
912import { useProjects } from "../state/entities" ;
1013import type { Project } from "../types" ;
@@ -13,10 +16,21 @@ import { SidebarProvider } from "./ui/sidebar";
1316
1417vi . mock ( "../state/entities" , { spy : true } ) ;
1518vi . mock ( "../hooks/useHandleNewThread" , { spy : true } ) ;
19+ vi . mock ( "../hooks/useThreadRouteTarget" , { spy : true } ) ;
1620vi . mock ( "../commandPaletteBus" , ( ) => ( {
1721 openCommandPalette : vi . fn ( ) ,
1822 isCommandPaletteOpen : ( ) => false ,
1923} ) ) ;
24+ vi . mock ( import ( "../state/server" ) , async ( original ) => {
25+ const { Atom } = await import ( "effect/reactivity" ) ;
26+ const { compileResolvedKeybindingsConfig } = await import ( "@t3tools/shared/keybindings" ) ;
27+ // The default jumps are desktop-only; the test runs in a browser.
28+ const keybindings = compileResolvedKeybindingsConfig ( [
29+ { key : "mod+1" , command : "thread.jump.1" } ,
30+ { key : "mod+2" , command : "thread.jump.2" } ,
31+ ] ) ;
32+ return { ...( await original ( ) ) , primaryServerKeybindingsAtom : Atom . make ( keybindings ) } ;
33+ } ) ;
2034vi . mock ( "./sidebar/SidebarChrome" , ( ) => ( {
2135 SidebarChromeHeader : ( ) => null ,
2236 SidebarChromeFooter : ( ) => null ,
@@ -86,3 +100,73 @@ describe("sidebar header new thread", () => {
86100 }
87101 } ) ;
88102} ) ;
103+
104+ // regression: unsent drafts were listed above threads but skipped by mod+1..9.
105+ describe ( "sidebar numbered jumps" , ( ) => {
106+ it ( "number unsent drafts from the top, keep the open draft's number, and open them" , async ( ) => {
107+ const initial = useComposerDraftStore . getState ( ) ;
108+ using stack = new DisposableStack ( ) ;
109+ stack . defer ( ( ) => useComposerDraftStore . setState ( initial , true ) ) ;
110+ const previousSettings = getClientSettings ( ) ;
111+ stack . defer ( ( ) => __setClientSettingsForTests ( previousSettings ) ) ;
112+ __setClientSettingsForTests ( DEFAULT_CLIENT_SETTINGS ) ;
113+ using _platform = vi . spyOn ( navigator , "platform" , "get" ) . mockReturnValue ( "Linux x86_64" ) ;
114+ const web = project ( "web" ) ;
115+ vi . mocked ( useProjects ) . mockReturnValue ( [ web ] ) ;
116+ vi . mocked ( useHandleNewThread ) . mockReturnValue ( {
117+ activeDraftThread : null ,
118+ activeThread : null ,
119+ defaultProjectRef : null ,
120+ handleNewThread : vi . fn ( ) ,
121+ routeDraftId : null ,
122+ routeThreadRef : null ,
123+ } ) ;
124+ const projectRef = scopeProjectRef ( web . environmentId , web . id ) ;
125+ const older = DraftId . make ( "older-draft" ) ;
126+ const newer = DraftId . make ( "newer-draft" ) ;
127+ // The newer draft is open; the test router has no draft route to read it from.
128+ vi . mocked ( useThreadRouteTarget ) . mockReturnValue ( { kind : "draft" , draftId : newer } ) ;
129+ stack . defer ( ( ) => vi . mocked ( useThreadRouteTarget ) . mockRestore ( ) ) ;
130+ useComposerDraftStore . setState ( {
131+ draftsByThreadKey : { } ,
132+ draftThreadsByThreadKey : { } ,
133+ logicalProjectDraftThreadKeyByLogicalProjectKey : { } ,
134+ } ) ;
135+ for ( const [ draftId , createdAt ] of [
136+ [ older , "2026-01-01T00:00:00.000Z" ] ,
137+ [ newer , "2026-01-02T00:00:00.000Z" ] ,
138+ ] as const ) {
139+ initial . setProjectDraftThreadId ( projectRef , draftId , {
140+ threadId : ThreadId . make ( `${ draftId } -thread` ) ,
141+ createdAt,
142+ } ) ;
143+ initial . setPrompt ( draftId , `${ draftId } prompt` ) ;
144+ }
145+
146+ await using screen = await render (
147+ < SidebarProvider >
148+ < Sidebar routeReveal = { { observedKey : null , pendingKey : null } } />
149+ </ SidebarProvider > ,
150+ ) ;
151+ const rows = screen . getByTestId ( "sidebar-draft-row" ) ;
152+ await expect . element ( rows . nth ( 1 ) ) . toHaveAccessibleName ( "older-draft prompt, Unsent draft, web" ) ;
153+ await userEvent . keyboard ( "{Control>}" ) ;
154+ await expect . element ( rows . nth ( 0 ) . getByText ( "Ctrl+1" ) ) . toBeVisible ( ) ;
155+ await expect . element ( rows . nth ( 1 ) . getByText ( "Ctrl+2" ) ) . toBeVisible ( ) ;
156+ await userEvent . keyboard ( "{/Control}" ) ;
157+
158+ // Clearing the open draft keeps its row and number, even after search hides the list.
159+ await act ( ( ) => initial . setPrompt ( newer , "" ) ) ;
160+ const search = screen . getByRole ( "combobox" , { name : "Search threads" } ) ;
161+ await userEvent . fill ( search , "older" ) ;
162+ await expect . element ( rows . first ( ) ) . not . toBeInTheDocument ( ) ;
163+ await userEvent . clear ( search ) ;
164+ await expect . element ( rows . nth ( 0 ) ) . toHaveAccessibleName ( "newer-draft prompt, Unsent draft, web" ) ;
165+ await userEvent . keyboard ( "{Control>}" ) ;
166+ await expect . element ( rows . nth ( 0 ) . getByText ( "Ctrl+1" ) ) . toBeVisible ( ) ;
167+ await expect . element ( rows . nth ( 1 ) . getByText ( "Ctrl+2" ) ) . toBeVisible ( ) ;
168+ await userEvent . keyboard ( "2{/Control}" ) ;
169+
170+ await vi . waitFor ( ( ) => expect ( screen . router ! . state . location . pathname ) . toBe ( `/draft/${ older } ` ) ) ;
171+ } ) ;
172+ } ) ;
0 commit comments