Skip to content

Commit b3441a2

Browse files
committed
feat(web): show project location in new thread picker
1 parent cebac35 commit b3441a2

3 files changed

Lines changed: 66 additions & 12 deletions

File tree

‎apps/web/src/components/CommandPalette.logic.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,14 +150,15 @@ export function buildProjectActionItems(input: {
150150
icon: (project: Project) => ReactNode;
151151
runProject: (project: Project) => Promise<void>;
152152
searchTerms?: (project: Project) => ReadonlyArray<string>;
153+
renderDescription?: (project: Project) => ReactNode;
153154
shortcutCommand?: KeybindingCommand;
154155
}): CommandPaletteActionItem[] {
155156
return input.projects.map((project) => ({
156157
kind: "action",
157158
value: `${input.valuePrefix}:${project.environmentId}:${project.id}`,
158159
searchTerms: [project.title, project.workspaceRoot, ...(input.searchTerms?.(project) ?? [])],
159160
title: project.title,
160-
description: project.workspaceRoot,
161+
description: input.renderDescription?.(project) ?? project.workspaceRoot,
161162
icon: input.icon(project),
162163
...(input.shortcutCommand !== undefined ? { shortcutCommand: input.shortcutCommand } : {}),
163164
run: async () => {

‎apps/web/src/components/CommandPalette.tsx‎

Lines changed: 56 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import {
4141
LinkIcon,
4242
MessageSquareIcon,
4343
PaletteIcon,
44+
ServerIcon,
4445
SettingsIcon,
4546
SquarePenIcon,
4647
TextSearchIcon,
@@ -131,7 +132,11 @@ import { ProjectFavicon } from "./ProjectFavicon";
131132
import { ProjectFilePicker } from "./files/ProjectFilePicker";
132133
import { ProjectContentSearchDialog } from "./search/ProjectContentSearchDialog";
133134
import { toggleThemeEditorForTheme } from "./settings/themeEditorStore";
134-
import { ThreadCommandSubtitle } from "./ThreadCommandSubtitle";
135+
import {
136+
COMMAND_PALETTE_META_ICON_CLASS,
137+
CommandPaletteMetaDot,
138+
ThreadCommandSubtitle,
139+
} from "./ThreadCommandSubtitle";
135140
import { ThreadRowLeadingStatus, ThreadRowTrailingStatus } from "./ThreadStatusIndicators";
136141
import { primaryServerKeybindingsAtom, primaryServerProvidersAtom } from "../state/server";
137142
import {
@@ -657,6 +662,27 @@ function OpenCommandPaletteDialog(props: {
657662
),
658663
[environments],
659664
);
665+
const projectEnvironmentLocationById = useMemo(
666+
() =>
667+
new Map(
668+
environments.map((environment) => {
669+
const isPrimary = environment.entry.target._tag === "PrimaryConnectionTarget";
670+
const isLocal = isPrimary || isDesktopLocalConnectionTarget(environment.entry.target);
671+
return [
672+
environment.environmentId,
673+
{
674+
kind: isLocal ? "local" : "remote",
675+
label: isPrimary
676+
? "Local"
677+
: isLocal
678+
? `${environment.label} (Local)`
679+
: environment.label,
680+
},
681+
] as const;
682+
}),
683+
),
684+
[environments],
685+
);
660686
const orderedProjects = useMemo(
661687
() =>
662688
orderItemsByPreferredIds({
@@ -1011,8 +1037,29 @@ function OpenCommandPaletteDialog(props: {
10111037
valuePrefix: "new-thread-in",
10121038
searchTerms: (project) => {
10131039
const group = projectGroupByTargetKey.get(`${project.environmentId}:${project.id}`);
1040+
const location = projectEnvironmentLocationById.get(project.environmentId);
1041+
return [
1042+
...(group?.memberProjects.flatMap((member) => [member.title, member.workspaceRoot]) ??
1043+
[]),
1044+
...(location ? [location.label] : []),
1045+
];
1046+
},
1047+
renderDescription: (project) => {
1048+
const location = projectEnvironmentLocationById.get(project.environmentId) ?? {
1049+
kind: "remote",
1050+
label: "Remote",
1051+
};
10141052
return (
1015-
group?.memberProjects.flatMap((member) => [member.title, member.workspaceRoot]) ?? []
1053+
<span className="flex min-w-0 items-center gap-1">
1054+
<span className="inline-flex min-w-0 items-center gap-1">
1055+
{location.kind === "remote" ? (
1056+
<ServerIcon aria-hidden className={COMMAND_PALETTE_META_ICON_CLASS} />
1057+
) : null}
1058+
<span className="truncate">{location.label}</span>
1059+
</span>
1060+
<CommandPaletteMetaDot />
1061+
<span className="truncate">{project.workspaceRoot}</span>
1062+
</span>
10161063
);
10171064
},
10181065
icon: projectFavicon,
@@ -1033,7 +1080,13 @@ function OpenCommandPaletteDialog(props: {
10331080
},
10341081
}),
10351082
),
1036-
[contextualProjectRef, handleNewThread, pickerProjects, projectGroupByTargetKey],
1083+
[
1084+
contextualProjectRef,
1085+
handleNewThread,
1086+
pickerProjects,
1087+
projectEnvironmentLocationById,
1088+
projectGroupByTargetKey,
1089+
],
10371090
);
10381091

10391092
const allThreadItems = useMemo(

‎apps/web/src/components/ThreadCommandSubtitle.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@ export type ThreadCommandSubtitleVariant =
1818
export const THREAD_COMMAND_SUBTITLE_VARIANT: ThreadCommandSubtitleVariant =
1919
"favicon-workspace-harness";
2020

21-
const META_ICON_CLASS = "size-3 shrink-0 text-muted-foreground/70";
21+
export const COMMAND_PALETTE_META_ICON_CLASS = "size-3 shrink-0 text-muted-foreground/70";
2222

23-
function Dot() {
23+
export function CommandPaletteMetaDot() {
2424
return <span className="shrink-0 text-muted-foreground/50">·</span>;
2525
}
2626

2727
function WorkspaceIcon(props: { variant: ThreadCommandSubtitleVariant; isWorktree: boolean }) {
2828
if (props.isWorktree) {
29-
return <FolderGit2Icon className={META_ICON_CLASS} aria-hidden />;
29+
return <FolderGit2Icon className={COMMAND_PALETTE_META_ICON_CLASS} aria-hidden />;
3030
}
3131
if (props.variant === "favicon-branch-harness") {
32-
return <GitBranchIcon className={META_ICON_CLASS} aria-hidden />;
32+
return <GitBranchIcon className={COMMAND_PALETTE_META_ICON_CLASS} aria-hidden />;
3333
}
34-
return <FolderIcon className={META_ICON_CLASS} aria-hidden />;
34+
return <FolderIcon className={COMMAND_PALETTE_META_ICON_CLASS} aria-hidden />;
3535
}
3636

3737
export function ThreadCommandSubtitle(props: {
@@ -82,7 +82,7 @@ export function ThreadCommandSubtitle(props: {
8282

8383
{branchLabel ? (
8484
<>
85-
{projectLabel ? <Dot /> : null}
85+
{projectLabel ? <CommandPaletteMetaDot /> : null}
8686
<span className="inline-flex min-w-0 items-center gap-1">
8787
<WorkspaceIcon variant={variant} isWorktree={isWorktree} />
8888
<span className="min-w-0 truncate">{branchLabel}</span>
@@ -92,7 +92,7 @@ export function ThreadCommandSubtitle(props: {
9292

9393
{showHarness && props.driverKind ? (
9494
<>
95-
{projectLabel || branchLabel ? <Dot /> : null}
95+
{projectLabel || branchLabel ? <CommandPaletteMetaDot /> : null}
9696
<ProviderInstanceIcon
9797
driverKind={props.driverKind}
9898
displayName={props.providerDisplayName ?? props.driverKind}
@@ -103,7 +103,7 @@ export function ThreadCommandSubtitle(props: {
103103

104104
{props.isCurrent ? (
105105
<>
106-
{projectLabel || branchLabel || showHarness ? <Dot /> : null}
106+
{projectLabel || branchLabel || showHarness ? <CommandPaletteMetaDot /> : null}
107107
<span className="shrink-0">Current thread</span>
108108
</>
109109
) : null}

0 commit comments

Comments
 (0)