@@ -104,6 +104,7 @@ import {
104104import { getProjectOrderKey , selectProjectGroupingSettings } from "../logicalProject" ;
105105import {
106106 buildSidebarProjectSnapshots ,
107+ projectGroupsSpanEnvironments ,
107108 type SidebarProjectSnapshot ,
108109} from "../sidebarProjectGrouping" ;
109110import { legacyProjectCwdPreferenceKey , useUiStateStore } from "../uiStateStore" ;
@@ -141,6 +142,7 @@ import type { SidebarThreadSummary } from "../types";
141142import type { EnvironmentProject } from "@t3tools/client-runtime/state/shell" ;
142143import { cn } from "~/lib/utils" ;
143144import { EnvironmentMachineIcon } from "./EnvironmentMachineIcon" ;
145+ import { ProjectEnvironmentBadge } from "./ProjectEnvironmentBadge" ;
144146import { buildThreadActionMenuItems } from "./threadActionMenu.logic" ;
145147import {
146148 animateSidebarLayoutChanges ,
@@ -2341,6 +2343,13 @@ export default function Sidebar() {
23412343 ] ,
23422344 [ projectGroups ] ,
23432345 ) ;
2346+ // Same-named projects on two machines are only told apart by where they
2347+ // live, so rows on another machine carry its icon once the catalog spans
2348+ // more than one environment; a single-machine catalog stays as it was.
2349+ const showProjectEnvironments = useMemo (
2350+ ( ) => projectGroupsSpanEnvironments ( projectGroups ) ,
2351+ [ projectGroups ] ,
2352+ ) ;
23442353 const projectGroupByScopeKey = useMemo (
23452354 ( ) => new Map ( projectGroups . map ( ( project ) => [ project . projectKey , project ] as const ) ) ,
23462355 [ projectGroups ] ,
@@ -4449,6 +4458,13 @@ export default function Sidebar() {
44494458 < span className = "min-w-0 flex-1 truncate" >
44504459 { scopedProjectGroup ?. displayName ?? "All projects" }
44514460 </ span >
4461+ { scopedProjectGroup && showProjectEnvironments ? (
4462+ < ProjectEnvironmentBadge
4463+ group = { scopedProjectGroup }
4464+ primaryEnvironmentId = { primaryEnvironmentId }
4465+ machineByEnvironmentId = { environmentMachineById }
4466+ />
4467+ ) : null }
44524468 < ChevronDownIcon className = "-mr-px size-4 shrink-0" />
44534469 </ ComboboxTrigger >
44544470 < ComboboxPopup
@@ -4504,6 +4520,13 @@ export default function Sidebar() {
45044520 < FolderIcon className = "size-4 shrink-0" />
45054521 ) }
45064522 < span className = "min-w-0 flex-1 truncate text-sm" > { item . label } </ span >
4523+ { project && showProjectEnvironments ? (
4524+ < ProjectEnvironmentBadge
4525+ group = { project }
4526+ primaryEnvironmentId = { primaryEnvironmentId }
4527+ machineByEnvironmentId = { environmentMachineById }
4528+ />
4529+ ) : null }
45074530 { project ? (
45084531 < Button
45094532 size = "icon-xs"
0 commit comments