fix(web): filter sidebar threads by environment

apps/web/src/components/Sidebar.logic.test.ts

@@ -6,10 +6,12 @@ import {
   buildBulkTitleRegenerationContextMenuItem,
   buildMultiSelectThreadContextMenuItems,
   createThreadJumpHintVisibilityController,
+  filterSidebarProjectGroupsByEnvironment,
   filterSidebarProjectScopeItems,
   getSidebarThreadIdsToPrewarm,
   getVisibleSidebarThreadIds,
   resolveAdjacentThreadId,
+  resolveSidebarEnvironmentScopeId,
   reduceSidebarProjectScopeMenuState,
   getFallbackThreadIdAfterDelete,
   getVisibleThreadsForProject,
@@ -25,6 +27,7 @@ import {
   resolveThreadStatusPill,
   resolveWorkingStartedAt,
   searchSidebarThreadsByTitle,
+  sidebarEntryMatchesScope,
   formatWorkingDurationLabel,
   shouldNavigateAfterProjectRemoval,
   shouldClearThreadSelectionOnMouseDown,
@@ -55,6 +58,7 @@ import {
 } from "../types";
 
 const localEnvironmentId = EnvironmentId.make("environment-local");
+const remoteEnvironmentId = EnvironmentId.make("environment-remote");
 
 describe("animatePinnedLayoutChanges", () => {
   const baseArgs: Parameters<AnimateLayoutChanges>[0] = {
@@ -779,6 +783,81 @@ describe("filterSidebarProjectScopeItems", () => {
   });
 });
 
+describe("sidebar environment scope", () => {
+  it("only keeps a selected environment while multiple environments remain available", () => {
+    expect(
+      resolveSidebarEnvironmentScopeId({
+        selectedEnvironmentId: remoteEnvironmentId,
+        availableEnvironmentIds: new Set([localEnvironmentId, remoteEnvironmentId]),
+      }),
+    ).toBe(remoteEnvironmentId);
+    expect(
+      resolveSidebarEnvironmentScopeId({
+        selectedEnvironmentId: remoteEnvironmentId,
+        availableEnvironmentIds: new Set([localEnvironmentId]),
+      }),
+    ).toBeNull();
+  });
+
+  it("drops a selection that is no longer in the environment catalog", () => {
+    expect(
+      resolveSidebarEnvironmentScopeId({
+        selectedEnvironmentId: EnvironmentId.make("environment-missing"),
+        availableEnvironmentIds: new Set([localEnvironmentId, remoteEnvironmentId]),
+      }),
+    ).toBeNull();
+  });
+
+  it("composes environment and project scopes", () => {
+    const projectScope = new Set([`${remoteEnvironmentId}:project-a`]);
+    expect(
+      sidebarEntryMatchesScope({
+        environmentId: remoteEnvironmentId,
+        projectId: "project-a",
+        selectedEnvironmentId: remoteEnvironmentId,
+        scopedProjectKeys: projectScope,
+      }),
+    ).toBe(true);
+    expect(
+      sidebarEntryMatchesScope({
+        environmentId: localEnvironmentId,
+        projectId: "project-a",
+        selectedEnvironmentId: remoteEnvironmentId,
+        scopedProjectKeys: projectScope,
+      }),
+    ).toBe(false);
+    expect(
+      sidebarEntryMatchesScope({
+        environmentId: remoteEnvironmentId,
+        projectId: "project-b",
+        selectedEnvironmentId: remoteEnvironmentId,
+        scopedProjectKeys: projectScope,
+      }),
+    ).toBe(false);
+  });
+
+  it("only offers project groups present in the selected environment", () => {
+    const localOnly = {
+      key: "local",
+      memberProjectRefs: [{ environmentId: localEnvironmentId }],
+    };
+    const shared = {
+      key: "shared",
+      memberProjectRefs: [
+        { environmentId: localEnvironmentId },
+        { environmentId: remoteEnvironmentId },
+      ],
+    };
+    expect(
+      filterSidebarProjectGroupsByEnvironment([localOnly, shared], remoteEnvironmentId),
+    ).toEqual([shared]);
+    expect(filterSidebarProjectGroupsByEnvironment([localOnly, shared], null)).toEqual([
+      localOnly,
+      shared,
+    ]);
+  });
+});
+
 describe("reduceSidebarProjectScopeMenuState", () => {
   const queriedOpenState = { open: true, query: "alpha" };
 

apps/web/src/components/Sidebar.logic.ts

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { defaultAnimateLayoutChanges, type AnimateLayoutChanges } from "@dnd-kit/sortable";
-import type { ContextMenuItem } from "@t3tools/contracts";
+import type { ContextMenuItem, EnvironmentId } from "@t3tools/contracts";
 import type { SidebarProjectSortOrder, SidebarThreadSortOrder } from "@t3tools/contracts/settings";
 import {
   activeThreadAnchorTimestampMs,
@@ -997,3 +997,43 @@ export function sortScopedProjectsForSidebar<
       left.id.localeCompare(right.id),
   );
 }
+
+export function resolveSidebarEnvironmentScopeId(input: {
+  selectedEnvironmentId: EnvironmentId | null;
+  availableEnvironmentIds: ReadonlySet<EnvironmentId>;
+}): EnvironmentId | null {
+  if (input.availableEnvironmentIds.size <= 1 || input.selectedEnvironmentId === null) {
+    return null;
+  }
+  return input.availableEnvironmentIds.has(input.selectedEnvironmentId)
+    ? input.selectedEnvironmentId
+    : null;
+}
+
+export function sidebarEntryMatchesScope(input: {
+  environmentId: EnvironmentId;
+  projectId: string;
+  selectedEnvironmentId: EnvironmentId | null;
+  scopedProjectKeys: ReadonlySet<string> | null;
+}): boolean {
+  if (input.selectedEnvironmentId !== null && input.environmentId !== input.selectedEnvironmentId) {
+    return false;
+  }
+  return (
+    input.scopedProjectKeys === null ||
+    input.scopedProjectKeys.has(`${input.environmentId}:${input.projectId}`)
+  );
+}
+
+export function filterSidebarProjectGroupsByEnvironment<
+  TGroup extends {
+    readonly memberProjectRefs: ReadonlyArray<{ readonly environmentId: EnvironmentId }>;
+  },
+>(groups: readonly TGroup[], selectedEnvironmentId: EnvironmentId | null): readonly TGroup[] {
+  if (selectedEnvironmentId === null) return groups;
+  return groups.filter((group) =>
+    group.memberProjectRefs.some(
+      (projectRef) => projectRef.environmentId === selectedEnvironmentId,
+    ),
+  );
+}