@@ -56,9 +56,10 @@ import { useEnvironmentQuery } from "../state/query";
5656import { sourceControlEnvironment } from "../state/sourceControl" ;
5757import { useAtomCommand } from "../state/use-atom-command" ;
5858import { useAtomQueryRunner } from "../state/use-atom-query-runner" ;
59- import { useEnvironments , usePrimaryEnvironment } from "../state/environments" ;
59+ import { useEnvironments , usePrimaryEnvironmentId } from "../state/environments" ;
6060import { useProjects , useThreadShells } from "../state/entities" ;
6161import {
62+ resolveThreadActionProjectRef ,
6263 startNewThreadInProjectFromContext ,
6364 startNewThreadFromContext ,
6465} from "../lib/chatThreadActions" ;
@@ -79,7 +80,7 @@ import {
7980} from "../lib/projectPaths" ;
8081import { onOpenCommandPalette } from "../commandPaletteBus" ;
8182import { isTerminalFocused } from "../lib/terminalFocus" ;
82- import { getLatestThreadForProject } from "../lib/threadSort" ;
83+ import { getLatestThreadForProject , sortThreads } from "../lib/threadSort" ;
8384import { cn , isMacPlatform , isWindowsPlatform , newProjectId } from "../lib/utils" ;
8485import { selectThreadTerminalUiState , useTerminalUiStateStore } from "../terminalUiStateStore" ;
8586import { buildThreadRouteParams , resolveThreadRouteTarget } from "../threadRoutes" ;
@@ -106,6 +107,7 @@ import {
106107 ITEM_ICON_CLASS ,
107108 RECENT_THREAD_LIMIT ,
108109} from "./CommandPalette.logic" ;
110+ import { orderItemsByPreferredIds , sortLogicalProjectsForSidebar } from "./Sidebar.logic" ;
109111import { resolveEnvironmentOptionLabel } from "./BranchToolbar.logic" ;
110112import { CommandPaletteResults } from "./CommandPaletteResults" ;
111113import { AzureDevOpsIcon , BitbucketIcon , GitHubIcon , GitLabIcon } from "./Icons" ;
@@ -128,6 +130,12 @@ import { stackedThreadToast, toastManager } from "./ui/toast";
128130import { Tooltip , TooltipPopup , TooltipTrigger } from "./ui/tooltip" ;
129131import { ComposerHandleContext , useComposerHandleContext } from "../composerHandleContext" ;
130132import type { ChatComposerHandle } from "./chat/ChatComposer" ;
133+ import { getProjectOrderKey , selectProjectGroupingSettings } from "../logicalProject" ;
134+ import { legacyProjectCwdPreferenceKey , useUiStateStore } from "../uiStateStore" ;
135+ import {
136+ buildSidebarProjectPickerEntries ,
137+ buildSidebarProjectSnapshots ,
138+ } from "../sidebarProjectGrouping" ;
131139
132140const EMPTY_BROWSE_ENTRIES : FilesystemBrowseResult [ "entries" ] = [ ] ;
133141
@@ -487,10 +495,11 @@ function OpenCommandPaletteDialog(props: {
487495 } ) ;
488496 const { environments } = useEnvironments ( ) ;
489497 const desktopLocalBootstraps = useDesktopLocalBootstraps ( ) ;
490- const primaryEnvironment = usePrimaryEnvironment ( ) ;
498+ const primaryEnvironmentId = usePrimaryEnvironmentId ( ) ;
491499 const { activeDraftThread, activeThread, defaultProjectRef, handleNewThread } =
492500 useHandleNewThread ( ) ;
493501 const projects = useProjects ( ) ;
502+ const projectOrder = useUiStateStore ( ( store ) => store . projectOrder ) ;
494503 const threads = useThreadShells ( ) ;
495504 const keybindings = useAtomValue ( primaryServerKeybindingsAtom ) ;
496505 const providers = useAtomValue ( primaryServerProvidersAtom ) ;
@@ -504,7 +513,93 @@ function OpenCommandPaletteDialog(props: {
504513 const [ addProjectCloneFlow , setAddProjectCloneFlow ] = useState < AddProjectCloneFlow | null > ( null ) ;
505514 const [ isRemoteProjectLookingUp , setIsRemoteProjectLookingUp ] = useState ( false ) ;
506515 const [ isRemoteProjectCloning , setIsRemoteProjectCloning ] = useState ( false ) ;
507- const primaryEnvironmentId = primaryEnvironment ?. environmentId ?? null ;
516+ const projectGroupingSettings = useMemo (
517+ ( ) => selectProjectGroupingSettings ( clientSettings ) ,
518+ [ clientSettings ] ,
519+ ) ;
520+
521+ const environmentLabelById = useMemo (
522+ ( ) =>
523+ new Map (
524+ environments . map ( ( environment ) => [ environment . environmentId , environment . label ] as const ) ,
525+ ) ,
526+ [ environments ] ,
527+ ) ;
528+ const orderedProjects = useMemo (
529+ ( ) =>
530+ orderItemsByPreferredIds ( {
531+ items : projects ,
532+ preferredIds : projectOrder ,
533+ getId : getProjectOrderKey ,
534+ getPreferenceIds : ( project ) => [
535+ getProjectOrderKey ( project ) ,
536+ legacyProjectCwdPreferenceKey ( project . workspaceRoot ) ,
537+ ] ,
538+ } ) ,
539+ [ projectOrder , projects ] ,
540+ ) ;
541+ const unsortedProjectGroups = useMemo (
542+ ( ) =>
543+ buildSidebarProjectSnapshots ( {
544+ projects : clientSettings . sidebarProjectSortOrder === "manual" ? orderedProjects : projects ,
545+ settings : projectGroupingSettings ,
546+ primaryEnvironmentId,
547+ resolveEnvironmentLabel : ( environmentId ) => environmentLabelById . get ( environmentId ) ?? null ,
548+ } ) ,
549+ [
550+ clientSettings . sidebarProjectSortOrder ,
551+ environmentLabelById ,
552+ orderedProjects ,
553+ primaryEnvironmentId ,
554+ projectGroupingSettings ,
555+ projects ,
556+ ] ,
557+ ) ;
558+ const projectGroups = useMemo (
559+ ( ) =>
560+ sortLogicalProjectsForSidebar (
561+ unsortedProjectGroups ,
562+ threads ,
563+ clientSettings . sidebarProjectSortOrder ,
564+ ) ,
565+ [ clientSettings . sidebarProjectSortOrder , threads , unsortedProjectGroups ] ,
566+ ) ;
567+ const contextualProjectRef = useMemo (
568+ ( ) =>
569+ resolveThreadActionProjectRef ( {
570+ activeDraftThread,
571+ activeThread : activeThread ?? undefined ,
572+ defaultProjectRef,
573+ handleNewThread,
574+ } ) ,
575+ [ activeDraftThread , activeThread , defaultProjectRef , handleNewThread ] ,
576+ ) ;
577+ const projectPickerEntries = useMemo (
578+ ( ) =>
579+ buildSidebarProjectPickerEntries ( {
580+ groups : projectGroups ,
581+ preferredProjectRef : contextualProjectRef ,
582+ } ) ,
583+ [ contextualProjectRef , projectGroups ] ,
584+ ) ;
585+ const pickerProjects = useMemo (
586+ ( ) =>
587+ projectPickerEntries . map ( ( { group, targetProject } ) => ( {
588+ ...targetProject ,
589+ title : group . displayName ,
590+ } ) ) ,
591+ [ projectPickerEntries ] ,
592+ ) ;
593+ const projectGroupByTargetKey = useMemo (
594+ ( ) =>
595+ new Map (
596+ projectPickerEntries . map ( ( { group, targetProject } ) => [
597+ `${ targetProject . environmentId } :${ targetProject . id } ` ,
598+ group ,
599+ ] ) ,
600+ ) ,
601+ [ projectPickerEntries ] ,
602+ ) ;
508603
509604 const addProjectEnvironmentOptions = useMemo ( ( ) => {
510605 const options = environments . map ( ( environment ) : AddProjectEnvironmentOption => {
@@ -648,11 +743,28 @@ function OpenCommandPaletteDialog(props: {
648743
649744 const openProjectFromSearch = useMemo (
650745 ( ) => async ( project : ( typeof projects ) [ number ] ) => {
651- const latestThread = getLatestThreadForProject (
652- threads . filter ( ( thread ) => thread . environmentId === project . environmentId ) ,
653- project . id ,
654- clientSettings . sidebarThreadSortOrder ,
655- ) ;
746+ const group = projectGroupByTargetKey . get ( `${ project . environmentId } :${ project . id } ` ) ;
747+ const groupedProjectKeys = group
748+ ? new Set (
749+ group . memberProjectRefs . map (
750+ ( projectRef ) => `${ projectRef . environmentId } :${ projectRef . projectId } ` ,
751+ ) ,
752+ )
753+ : null ;
754+ const latestThread = groupedProjectKeys
755+ ? ( sortThreads (
756+ threads . filter (
757+ ( thread ) =>
758+ thread . archivedAt === null &&
759+ groupedProjectKeys . has ( `${ thread . environmentId } :${ thread . projectId } ` ) ,
760+ ) ,
761+ clientSettings . sidebarThreadSortOrder ,
762+ ) [ 0 ] ?? null )
763+ : getLatestThreadForProject (
764+ threads . filter ( ( thread ) => thread . environmentId === project . environmentId ) ,
765+ project . id ,
766+ clientSettings . sidebarThreadSortOrder ,
767+ ) ;
656768 if ( latestThread ) {
657769 await navigate ( {
658770 to : "/$environmentId/$threadId" ,
@@ -665,14 +777,26 @@ function OpenCommandPaletteDialog(props: {
665777
666778 await handleNewThread ( scopeProjectRef ( project . environmentId , project . id ) ) ;
667779 } ,
668- [ handleNewThread , navigate , clientSettings . sidebarThreadSortOrder , threads ] ,
780+ [
781+ clientSettings . sidebarThreadSortOrder ,
782+ handleNewThread ,
783+ navigate ,
784+ projectGroupByTargetKey ,
785+ threads ,
786+ ] ,
669787 ) ;
670788
671789 const projectSearchItems = useMemo (
672790 ( ) =>
673791 buildProjectActionItems ( {
674- projects,
792+ projects : pickerProjects ,
675793 valuePrefix : "project" ,
794+ searchTerms : ( project ) => {
795+ const group = projectGroupByTargetKey . get ( `${ project . environmentId } :${ project . id } ` ) ;
796+ return (
797+ group ?. memberProjects . flatMap ( ( member ) => [ member . title , member . workspaceRoot ] ) ?? [ ]
798+ ) ;
799+ } ,
676800 icon : ( project ) => (
677801 < ProjectFavicon
678802 environmentId = { project . environmentId }
@@ -682,15 +806,21 @@ function OpenCommandPaletteDialog(props: {
682806 ) ,
683807 runProject : openProjectFromSearch ,
684808 } ) ,
685- [ openProjectFromSearch , projects ] ,
809+ [ openProjectFromSearch , pickerProjects , projectGroupByTargetKey ] ,
686810 ) ;
687811
688812 const projectThreadItems = useMemo (
689813 ( ) =>
690814 enumerateCommandPaletteItems (
691815 buildProjectActionItems ( {
692- projects,
816+ projects : pickerProjects ,
693817 valuePrefix : "new-thread-in" ,
818+ searchTerms : ( project ) => {
819+ const group = projectGroupByTargetKey . get ( `${ project . environmentId } :${ project . id } ` ) ;
820+ return (
821+ group ?. memberProjects . flatMap ( ( member ) => [ member . title , member . workspaceRoot ] ) ?? [ ]
822+ ) ;
823+ } ,
694824 icon : ( project ) => (
695825 < ProjectFavicon
696826 environmentId = { project . environmentId }
@@ -699,19 +829,37 @@ function OpenCommandPaletteDialog(props: {
699829 />
700830 ) ,
701831 runProject : async ( project ) => {
832+ const group = projectGroupByTargetKey . get ( `${ project . environmentId } :${ project . id } ` ) ;
833+ const contextualRefBelongsToGroup =
834+ contextualProjectRef !== null &&
835+ group ?. memberProjectRefs . some (
836+ ( projectRef ) =>
837+ projectRef . environmentId === contextualProjectRef . environmentId &&
838+ projectRef . projectId === contextualProjectRef . projectId ,
839+ ) ;
702840 await startNewThreadInProjectFromContext (
703841 {
704842 activeDraftThread,
705843 activeThread : activeThread ?? undefined ,
706844 defaultProjectRef,
707845 handleNewThread,
708846 } ,
709- scopeProjectRef ( project . environmentId , project . id ) ,
847+ contextualRefBelongsToGroup
848+ ? contextualProjectRef
849+ : scopeProjectRef ( project . environmentId , project . id ) ,
710850 ) ;
711851 } ,
712852 } ) ,
713853 ) ,
714- [ activeDraftThread , activeThread , defaultProjectRef , handleNewThread , projects ] ,
854+ [
855+ activeDraftThread ,
856+ activeThread ,
857+ contextualProjectRef ,
858+ defaultProjectRef ,
859+ handleNewThread ,
860+ pickerProjects ,
861+ projectGroupByTargetKey ,
862+ ] ,
715863 ) ;
716864
717865 const allThreadItems = useMemo (
@@ -1018,9 +1166,9 @@ function OpenCommandPaletteDialog(props: {
10181166 const actionItems : Array < CommandPaletteActionItem | CommandPaletteSubmenuItem > = [ ] ;
10191167
10201168 if ( projects . length > 0 ) {
1021- const activeProjectTitle = currentProjectId
1022- ? ( projectTitleById . get ( currentProjectId ) ?? null )
1023- : null ;
1169+ const activeProjectTitle =
1170+ projectPickerEntries . find ( ( entry ) => entry . isPreferred ) ?. group . displayName ??
1171+ ( currentProjectId ? ( projectTitleById . get ( currentProjectId ) ?? null ) : null ) ;
10241172
10251173 if ( activeProjectTitle ) {
10261174 actionItems . push ( {
0 commit comments