|
1 | | -import { type EnvironmentId } from "@t3tools/contracts"; |
| 1 | +import { type EnvironmentId, type ScopedProjectRef } from "@t3tools/contracts"; |
2 | 2 | import { ThreadHoverCard, ThreadHoverCardPopup } from "./ThreadHoverCard"; |
3 | 3 | import { CollapsibleSectionHeader } from "./ui/collapsible-section-header"; |
4 | 4 | import { setThreadChangeRequestSnapshot } from "./ThreadStatusIndicators"; |
@@ -129,6 +129,8 @@ import { getProjectOrderKey, selectProjectGroupingSettings } from "../logicalPro |
129 | 129 | import { |
130 | 130 | buildSidebarProjectSnapshots, |
131 | 131 | projectGroupsSpanEnvironments, |
| 132 | + resolveSidebarProjectScopeKey, |
| 133 | + getSidebarProjectSettingsKey, |
132 | 134 | type SidebarProjectSnapshot, |
133 | 135 | } from "../sidebarProjectGrouping"; |
134 | 136 | import { legacyProjectCwdPreferenceKey, useUiStateStore } from "../uiStateStore"; |
@@ -158,6 +160,7 @@ import { |
158 | 160 | useThreadShells, |
159 | 161 | } from "../state/entities"; |
160 | 162 | import { environmentServerConfigsAtom, primaryServerKeybindingsAtom } from "../state/server"; |
| 163 | +import { environmentProjects } from "../state/projects"; |
161 | 164 | import { vcsEnvironment } from "../state/vcs"; |
162 | 165 | import { threadEnvironment } from "../state/threads"; |
163 | 166 | import { useEnvironmentQuery } from "../state/query"; |
@@ -2562,6 +2565,7 @@ export default function Sidebar() { |
2562 | 2565 | () => |
2563 | 2566 | buildSidebarProjectSnapshots({ |
2564 | 2567 | projects: sidebarProjectSortOrder === "manual" ? orderedProjects : projects, |
| 2568 | + groupScratchProjects: true, |
2565 | 2569 | settings: projectGroupingSettings, |
2566 | 2570 | primaryEnvironmentId, |
2567 | 2571 | resolveEnvironmentLabel: (environmentId) => environmentLabelById.get(environmentId) ?? null, |
@@ -2625,8 +2629,17 @@ export default function Sidebar() { |
2625 | 2629 | // The selection lives in the persisted UI store next to the other sidebar |
2626 | 2630 | // project preferences, so routes that unmount the sidebar (Settings) and |
2627 | 2631 | // app restarts keep it. |
2628 | | - const projectScopeKey = useUiStateStore((store) => store.sidebarProjectScopeKey); |
| 2632 | + const persistedProjectScopeKey = useUiStateStore((store) => store.sidebarProjectScopeKey); |
2629 | 2633 | const setProjectScopeKey = useUiStateStore((store) => store.setSidebarProjectScopeKey); |
| 2634 | + const projectScopeKey = useMemo( |
| 2635 | + () => |
| 2636 | + resolveSidebarProjectScopeKey({ |
| 2637 | + groups: projectGroups, |
| 2638 | + key: persistedProjectScopeKey, |
| 2639 | + settings: projectGroupingSettings, |
| 2640 | + }), |
| 2641 | + [persistedProjectScopeKey, projectGroups, projectGroupingSettings], |
| 2642 | + ); |
2630 | 2643 | // {value, label} items let Base UI drive the combobox selection contract |
2631 | 2644 | // while the popup search filters the same collection. |
2632 | 2645 | const projectScopeItems = useMemo( |
@@ -2709,15 +2722,28 @@ export default function Sidebar() { |
2709 | 2722 | ), |
2710 | 2723 | [scopedProjectGroup], |
2711 | 2724 | ); |
2712 | | - // A persisted scope whose project is gone falls back to all projects, but |
2713 | | - // only after every catalog environment has a live project snapshot. Cached |
2714 | | - // or disconnected environments cannot establish that the project is gone. |
| 2725 | + // Configs identify scratch projects, so both they and live project snapshots |
| 2726 | + // must arrive before a persisted scope can be considered missing. |
2715 | 2727 | const allProjectSnapshotsReady = useAllEnvironmentProjectSnapshotsReady(); |
| 2728 | + const allProjectConfigsReady = useAtomValue(environmentProjects.projectConfigsReadyAtom); |
2716 | 2729 | useEffect(() => { |
2717 | | - if (projectScopeKey !== null && allProjectSnapshotsReady && scopedProjectGroup === null) { |
2718 | | - setProjectScopeKey(null); |
| 2730 | + const nextKey = resolveSidebarProjectScopeKey({ |
| 2731 | + groups: projectGroups, |
| 2732 | + key: persistedProjectScopeKey, |
| 2733 | + settings: projectGroupingSettings, |
| 2734 | + canClearMissingScope: allProjectSnapshotsReady && allProjectConfigsReady, |
| 2735 | + }); |
| 2736 | + if (nextKey !== persistedProjectScopeKey) { |
| 2737 | + setProjectScopeKey(nextKey); |
2719 | 2738 | } |
2720 | | - }, [allProjectSnapshotsReady, projectScopeKey, scopedProjectGroup, setProjectScopeKey]); |
| 2739 | + }, [ |
| 2740 | + allProjectConfigsReady, |
| 2741 | + allProjectSnapshotsReady, |
| 2742 | + persistedProjectScopeKey, |
| 2743 | + projectGroups, |
| 2744 | + projectGroupingSettings, |
| 2745 | + setProjectScopeKey, |
| 2746 | + ]); |
2721 | 2747 | // Count-only subscription: the parent needs "are there draft rows" for the |
2722 | 2748 | // empty state, while SidebarDraftBlock owns the per-keystroke content |
2723 | 2749 | // subscription. Selecting a number keeps typing in a draft composer from |
@@ -2751,16 +2777,23 @@ export default function Sidebar() { |
2751 | 2777 | }, [clearSelection, projectScopeKey]); |
2752 | 2778 |
|
2753 | 2779 | const openProjectSettings = useCallback( |
2754 | | - (projectGroup: SidebarProjectSnapshot) => { |
| 2780 | + (projectGroup: SidebarProjectSnapshot, projectRef?: ScopedProjectRef) => { |
2755 | 2781 | if (isMobile) { |
2756 | 2782 | setOpenMobile(false); |
2757 | 2783 | } |
2758 | 2784 | void router.navigate({ |
2759 | 2785 | to: "/projects/$projectKey", |
2760 | | - params: { projectKey: projectGroup.projectKey }, |
| 2786 | + params: { |
| 2787 | + projectKey: getSidebarProjectSettingsKey( |
| 2788 | + projectGroup, |
| 2789 | + projectGroupingSettings, |
| 2790 | + projects, |
| 2791 | + projectRef, |
| 2792 | + ), |
| 2793 | + }, |
2761 | 2794 | }); |
2762 | 2795 | }, |
2763 | | - [isMobile, router, setOpenMobile], |
| 2796 | + [isMobile, projectGroupingSettings, projects, router, setOpenMobile], |
2764 | 2797 | ); |
2765 | 2798 | // Anchor for the scope popup: the header search field, not its icon trigger. |
2766 | 2799 | const headerSearchRef = useRef<HTMLDivElement | null>(null); |
@@ -4579,7 +4612,11 @@ export default function Sidebar() { |
4579 | 4612 | if (clicked._tag === "Failure") return; |
4580 | 4613 | switch (clicked.value) { |
4581 | 4614 | case "project-settings": |
4582 | | - if (projectGroup) openProjectSettings(projectGroup); |
| 4615 | + if (projectGroup) |
| 4616 | + openProjectSettings(projectGroup, { |
| 4617 | + environmentId: session.environmentId, |
| 4618 | + projectId: session.projectId, |
| 4619 | + }); |
4583 | 4620 | return; |
4584 | 4621 | case "copy-path": |
4585 | 4622 | if (workspacePath) copyPathToClipboard(workspacePath, { path: workspacePath }); |
@@ -4703,7 +4740,11 @@ export default function Sidebar() { |
4703 | 4740 | } |
4704 | 4741 | return; |
4705 | 4742 | case "project-settings": |
4706 | | - if (threadProjectGroup) openProjectSettings(threadProjectGroup); |
| 4743 | + if (threadProjectGroup) |
| 4744 | + openProjectSettings(threadProjectGroup, { |
| 4745 | + environmentId: threadRef.environmentId, |
| 4746 | + projectId: thread.projectId, |
| 4747 | + }); |
4707 | 4748 | return; |
4708 | 4749 | case "new-thread-on-branch": { |
4709 | 4750 | // Explicit branch carry-over: reuse the thread's worktree when it |
|
0 commit comments