@@ -124,9 +124,14 @@ import { ProjectFavicon } from "./ProjectFavicon";
124124import { ProjectFilePicker } from "./files/ProjectFilePicker" ;
125125import { ProjectContentSearchDialog } from "./search/ProjectContentSearchDialog" ;
126126import { toggleThemeEditorForTheme } from "./settings/themeEditorStore" ;
127+ import { ThreadCommandSubtitle } from "./ThreadCommandSubtitle" ;
127128import { ThreadRowLeadingStatus , ThreadRowTrailingStatus } from "./ThreadStatusIndicators" ;
128129import { primaryServerKeybindingsAtom , primaryServerProvidersAtom } from "../state/server" ;
129- import { resolveDefaultProviderModelSelection } from "../providerInstances" ;
130+ import {
131+ deriveProviderInstanceEntries ,
132+ resolveDefaultProviderModelSelection ,
133+ type ProviderInstanceEntry ,
134+ } from "../providerInstances" ;
130135import { resolveShortcutCommand , threadJumpIndexFromCommand } from "../keybindings" ;
131136import { CommandDialog , CommandDialogPopup } from "./ui/command" ;
132137import { Button } from "./ui/button" ;
@@ -584,6 +589,18 @@ function OpenCommandPaletteDialog(props: {
584589 const keybindings = useAtomValue ( primaryServerKeybindingsAtom ) ;
585590 const { theme, themeHalves, resolvedTheme } = useTheme ( ) ;
586591 const providers = useAtomValue ( primaryServerProvidersAtom ) ;
592+ const providerEntryByEnvironmentAndInstanceId = useMemo ( ( ) => {
593+ const map = new Map < string , ProviderInstanceEntry > ( ) ;
594+ for ( const environment of environments ) {
595+ const environmentProviders =
596+ environment . serverConfig ?. providers ??
597+ ( environment . environmentId === primaryEnvironmentId ? providers : [ ] ) ;
598+ for ( const entry of deriveProviderInstanceEntries ( environmentProviders ) ) {
599+ map . set ( `${ environment . environmentId } :${ entry . instanceId } ` , entry ) ;
600+ }
601+ }
602+ return map ;
603+ } , [ environments , primaryEnvironmentId , providers ] ) ;
587604 const [ viewStack , setViewStack ] = useState < CommandPaletteView [ ] > ( [ ] ) ;
588605 const currentView = viewStack . at ( - 1 ) ?? null ;
589606 const environmentIds = useMemo (
@@ -816,6 +833,10 @@ function OpenCommandPaletteDialog(props: {
816833 new Map < ProjectId , string > ( projects . map ( ( project ) => [ project . id , project . workspaceRoot ] ) ) ,
817834 [ projects ] ,
818835 ) ;
836+ const projectFaviconPathById = useMemo (
837+ ( ) => new Map ( projects . map ( ( project ) => [ project . id , project . faviconPath ?? null ] as const ) ) ,
838+ [ projects ] ,
839+ ) ;
819840 const projectTitleById = useMemo (
820841 ( ) => new Map < ProjectId , string > ( projects . map ( ( project ) => [ project . id , project . title ] ) ) ,
821842 [ projects ] ,
@@ -1000,6 +1021,29 @@ function OpenCommandPaletteDialog(props: {
10001021 icon : < MessageSquareIcon className = { ITEM_ICON_CLASS } /> ,
10011022 renderLeadingContent : ( thread ) => < ThreadRowLeadingStatus thread = { thread } /> ,
10021023 renderTrailingContent : ( thread ) => < ThreadRowTrailingStatus thread = { thread } /> ,
1024+ renderDescription : ( thread , { projectTitle } ) => {
1025+ const modelInstanceId =
1026+ thread . session ?. providerInstanceId ?? thread . modelSelection . instanceId ;
1027+ const providerEntry =
1028+ providerEntryByEnvironmentAndInstanceId . get (
1029+ `${ thread . environmentId } :${ modelInstanceId } ` ,
1030+ ) ?? null ;
1031+ return (
1032+ < ThreadCommandSubtitle
1033+ environmentId = { thread . environmentId }
1034+ projectCwd = { projectCwdById . get ( thread . projectId ) ?? null }
1035+ projectFaviconPath = { projectFaviconPathById . get ( thread . projectId ) ?? null }
1036+ projectTitle = { projectTitle ?? null }
1037+ branch = { thread . branch }
1038+ worktreePath = { thread . worktreePath }
1039+ isCurrent = { thread . id === activeThreadId }
1040+ driverKind = { providerEntry ?. driverKind ?? null }
1041+ providerDisplayName = {
1042+ thread . session ?. providerName ?? providerEntry ?. displayName ?? modelInstanceId
1043+ }
1044+ />
1045+ ) ;
1046+ } ,
10031047 getContentMatch : ( thread ) => {
10041048 const match = threadContentMatchByKey . get (
10051049 threadSearchMatchKey ( {
@@ -1026,7 +1070,10 @@ function OpenCommandPaletteDialog(props: {
10261070 activeThreadId ,
10271071 clientSettings . sidebarThreadSortOrder ,
10281072 navigate ,
1073+ projectCwdById ,
1074+ projectFaviconPathById ,
10291075 projectTitleById ,
1076+ providerEntryByEnvironmentAndInstanceId ,
10301077 threadContentMatchByKey ,
10311078 threadSearchQuery ,
10321079 threads ,
0 commit comments