@@ -61,6 +61,7 @@ import type { HomeListFilterMenuEnvironment } from "./home-list-filter-menu";
6161import {
6262 buildHomeListLayout ,
6363 DEFAULT_GROUP_DISPLAY_STATE ,
64+ EMPTY_HOME_LIST_LAYOUT ,
6465 homeListItemsAreEqual ,
6566 nextGroupDisplayState ,
6667 type HomeGroupDisplayAction ,
@@ -339,48 +340,57 @@ export function HomeScreen(props: HomeScreenProps) {
339340 ) ;
340341 const scopedProjects = useMemo (
341342 ( ) =>
342- selectedProjectRefKeys === null
343- ? props . projects
344- : props . projects . filter ( ( project ) =>
345- selectedProjectRefKeys . has ( scopedProjectKey ( project . environmentId , project . id ) ) ,
346- ) ,
347- [ props . projects , selectedProjectRefKeys ] ,
343+ threadListV2Enabled
344+ ? [ ]
345+ : selectedProjectRefKeys === null
346+ ? props . projects
347+ : props . projects . filter ( ( project ) =>
348+ selectedProjectRefKeys . has ( scopedProjectKey ( project . environmentId , project . id ) ) ,
349+ ) ,
350+ [ threadListV2Enabled , props . projects , selectedProjectRefKeys ] ,
348351 ) ;
349352 const scopedThreads = useMemo (
350353 ( ) =>
351- selectedProjectRefKeys === null
352- ? props . threads
353- : props . threads . filter ( ( thread ) =>
354- selectedProjectRefKeys . has ( scopedProjectKey ( thread . environmentId , thread . projectId ) ) ,
355- ) ,
356- [ props . threads , selectedProjectRefKeys ] ,
354+ threadListV2Enabled
355+ ? [ ]
356+ : selectedProjectRefKeys === null
357+ ? props . threads
358+ : props . threads . filter ( ( thread ) =>
359+ selectedProjectRefKeys . has ( scopedProjectKey ( thread . environmentId , thread . projectId ) ) ,
360+ ) ,
361+ [ threadListV2Enabled , props . threads , selectedProjectRefKeys ] ,
357362 ) ;
358363 const scopedPendingTasks = useMemo (
359364 ( ) =>
360- selectedProjectRefKeys === null
361- ? props . pendingTasks
362- : props . pendingTasks . filter ( ( pendingTask ) =>
363- selectedProjectRefKeys . has (
364- scopedProjectKey ( pendingTask . message . environmentId , pendingTask . creation . projectId ) ,
365+ threadListV2Enabled
366+ ? [ ]
367+ : selectedProjectRefKeys === null
368+ ? props . pendingTasks
369+ : props . pendingTasks . filter ( ( pendingTask ) =>
370+ selectedProjectRefKeys . has (
371+ scopedProjectKey ( pendingTask . message . environmentId , pendingTask . creation . projectId ) ,
372+ ) ,
365373 ) ,
366- ) ,
367- [ props . pendingTasks , selectedProjectRefKeys ] ,
374+ [ threadListV2Enabled , props . pendingTasks , selectedProjectRefKeys ] ,
368375 ) ;
369376
370377 const projectGroups = useMemo (
371378 ( ) =>
372- buildHomeThreadGroups ( {
373- projects : scopedProjects ,
374- threads : scopedThreads ,
375- pendingTasks : scopedPendingTasks ,
376- environmentId : props . selectedEnvironmentId ,
377- searchQuery : props . searchQuery ,
378- matchedThreadKeys,
379- projectSortOrder : props . projectSortOrder ,
380- threadSortOrder : props . threadSortOrder ,
381- projectGroupingMode : props . projectGroupingMode ,
382- } ) ,
379+ threadListV2Enabled
380+ ? [ ]
381+ : buildHomeThreadGroups ( {
382+ projects : scopedProjects ,
383+ threads : scopedThreads ,
384+ pendingTasks : scopedPendingTasks ,
385+ environmentId : props . selectedEnvironmentId ,
386+ searchQuery : props . searchQuery ,
387+ matchedThreadKeys,
388+ projectSortOrder : props . projectSortOrder ,
389+ threadSortOrder : props . threadSortOrder ,
390+ projectGroupingMode : props . projectGroupingMode ,
391+ } ) ,
383392 [
393+ threadListV2Enabled ,
384394 props . projectGroupingMode ,
385395 props . projectSortOrder ,
386396 props . searchQuery ,
@@ -396,12 +406,14 @@ export function HomeScreen(props: HomeScreenProps) {
396406 const hasSearchQuery = props . searchQuery . trim ( ) . length > 0 ;
397407 const listLayout = useMemo (
398408 ( ) =>
399- buildHomeListLayout ( {
400- groups : projectGroups ,
401- displayStates : effectiveGroupDisplayStates ,
402- showAllThreads : hasSearchQuery ,
403- } ) ,
404- [ projectGroups , effectiveGroupDisplayStates , hasSearchQuery ] ,
409+ threadListV2Enabled
410+ ? EMPTY_HOME_LIST_LAYOUT
411+ : buildHomeListLayout ( {
412+ groups : projectGroups ,
413+ displayStates : effectiveGroupDisplayStates ,
414+ showAllThreads : hasSearchQuery ,
415+ } ) ,
416+ [ threadListV2Enabled , projectGroups , effectiveGroupDisplayStates , hasSearchQuery ] ,
405417 ) ;
406418
407419 const projectCwdByKey = useMemo ( ( ) => {
@@ -1033,7 +1045,7 @@ export function HomeScreen(props: HomeScreenProps) {
10331045 // so the v1 check already covers v2.
10341046 const hasAnyThreads =
10351047 props . threads . some ( ( thread ) => thread . archivedAt === null ) || props . pendingTasks . length > 0 ;
1036- const hasResults = projectGroups . length > 0 ;
1048+ const hasResults = threadListV2Enabled ? threadListV2Items . length > 0 : projectGroups . length > 0 ;
10371049 const selectedEnvironmentLabel =
10381050 props . selectedEnvironmentId === null
10391051 ? null
@@ -1097,10 +1109,8 @@ export function HomeScreen(props: HomeScreenProps) {
10971109 < EmptyState title = "No threads yet" detail = "Create a task to start a new coding session." />
10981110 )
10991111 ) : null ;
1100- // Self-contained: v1's listEmpty keys off projectGroups, which ignores the
1101- // v2 project scope, so it can be null (results elsewhere) while this list
1102- // is empty. Snoozed threads need no special empty state: their shelf header
1103- // is a list row even while collapsed.
1112+ // Use the v2 project scope for its empty state. Snoozed threads need no
1113+ // special empty state: their shelf header is a list row even while collapsed.
11041114 const v2ListEmpty =
11051115 hasSearchQuery && threadSearch . isPending ? null : hasSearchQuery ? (
11061116 < EmptyState title = "No results" detail = { `No threads matching "${ props . searchQuery } ".` } />
0 commit comments