Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

Stabilize project grouping settings selector (#2629)

cursor[bot]447236d51f4d
diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index 6b84aa11c..a7567d6b4 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -119,7 +119,10 @@ import { getProviderModelCapabilities, resolveSelectableProvider } from "../prov
import { useSettings } from "../hooks/useSettings";
import { resolveAppModelSelectionForInstance } from "../modelSelection";
import { isTerminalFocused } from "../lib/terminalFocus";
-import { deriveLogicalProjectKeyFromSettings } from "../logicalProject";
+import {
+ deriveLogicalProjectKeyFromSettings,
+ selectProjectGroupingSettings,
+} from "../logicalProject";
import {
reconnectSavedEnvironment,
useSavedEnvironmentRegistryStore,
@@ -942,10 +945,7 @@ export default function ChatView(props: ChatViewProps) {
},
[],
);
- const projectGroupingSettings = useSettings((settings) => ({
- sidebarProjectGroupingMode: settings.sidebarProjectGroupingMode,
- sidebarProjectGroupingOverrides: settings.sidebarProjectGroupingOverrides,
- }));
+ const projectGroupingSettings = useSettings(selectProjectGroupingSettings);
const logicalProjectEnvironments = useMemo(() => {
if (!activeProject) return [];
const logicalKey = deriveLogicalProjectKeyFromSettings(activeProject, projectGroupingSettings);
diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsx
index 3d0ccd3ab..e8c5bbe0b 100644
--- a/apps/web/src/components/Sidebar.tsx
+++ b/apps/web/src/components/Sidebar.tsx
@@ -183,6 +183,7 @@ import {
derivePhysicalProjectKey,
deriveProjectGroupingOverrideKey,
getProjectOrderKey,
+ selectProjectGroupingSettings,
} from "../logicalProject";
import {
useSavedEnvironmentRegistryStore,
@@ -940,10 +941,7 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
const defaultThreadEnvMode = useSettings<ThreadEnvMode>(
(settings) => settings.defaultThreadEnvMode,
);
- const projectGroupingSettings = useSettings((settings) => ({
- sidebarProjectGroupingMode: settings.sidebarProjectGroupingMode,
- sidebarProjectGroupingOverrides: settings.sidebarProjectGroupingOverrides,
- }));
+ const projectGroupingSettings = useSettings(selectProjectGroupingSettings);
const { updateSettings } = useUpdateSettings();
const sidebarThreadPreviewCount = useSettings<SidebarThreadPreviewCount>(
(settings) => settings.sidebarThreadPreviewCount,
@@ -2800,10 +2798,7 @@ export default function Sidebar() {
const sidebarThreadSortOrder = useSettings((s) => s.sidebarThreadSortOrder);
const sidebarProjectSortOrder = useSettings((s) => s.sidebarProjectSortOrder);
const sidebarProjectGroupingMode = useSettings((s) => s.sidebarProjectGroupingMode);
- const projectGroupingSettings = useSettings((settings) => ({
- sidebarProjectGroupingMode: settings.sidebarProjectGroupingMode,
- sidebarProjectGroupingOverrides: settings.sidebarProjectGroupingOverrides,
- }));
+ const projectGroupingSettings = useSettings(selectProjectGroupingSettings);
const sidebarThreadPreviewCount = useSettings((s) => s.sidebarThreadPreviewCount);
const { updateSettings } = useUpdateSettings();
const { handleNewThread } = useNewThreadHandler();
diff --git a/apps/web/src/hooks/useHandleNewThread.ts b/apps/web/src/hooks/useHandleNewThread.ts
index 3630171bf..e440497ba 100644
--- a/apps/web/src/hooks/useHandleNewThread.ts
+++ b/apps/web/src/hooks/useHandleNewThread.ts
@@ -10,7 +10,11 @@ import {
} from "../composerDraftStore";
import { newDraftId, newThreadId } from "../lib/utils";
import { orderItemsByPreferredIds } from "../components/Sidebar.logic";
-import { deriveLogicalProjectKeyFromSettings, getProjectOrderKey } from "../logicalProject";
+import {
+ deriveLogicalProjectKeyFromSettings,
+ getProjectOrderKey,
+ selectProjectGroupingSettings,
+} from "../logicalProject";
import { selectProjectsAcrossEnvironments, useStore } from "../store";
import { createThreadSelectorByRef } from "../storeSelectors";
import { resolveThreadRouteTarget } from "../threadRoutes";
@@ -19,10 +23,7 @@ import { useSettings } from "./useSettings";
function useNewThreadState() {
const projects = useStore(useShallow((store) => selectProjectsAcrossEnvironments(store)));
- const projectGroupingSettings = useSettings((settings) => ({
- sidebarProjectGroupingMode: settings.sidebarProjectGroupingMode,
- sidebarProjectGroupingOverrides: settings.sidebarProjectGroupingOverrides,
- }));
+ const projectGroupingSettings = useSettings(selectProjectGroupingSettings);
const router = useRouter();
const getCurrentRouteTarget = useCallback(() => {
const currentRouteParams = router.state.matches[router.state.matches.length - 1]?.params ?? {};
diff --git a/apps/web/src/logicalProject.ts b/apps/web/src/logicalProject.ts
index f19b64ac8..72415d57d 100644
--- a/apps/web/src/logicalProject.ts
+++ b/apps/web/src/logicalProject.ts
@@ -1,5 +1,6 @@
import { scopedProjectKey, scopeProjectRef } from "@t3tools/client-runtime";
import type { ScopedProjectRef, SidebarProjectGroupingMode } from "@t3tools/contracts";
+import type { UnifiedSettings } from "@t3tools/contracts/settings";
import { normalizeProjectPathForComparison } from "./lib/projectPaths";
import type { Project } from "./types";
@@ -10,6 +11,13 @@ export interface ProjectGroupingSettings {
export type ProjectGroupingMode = SidebarProjectGroupingMode;
+export function selectProjectGroupingSettings(settings: UnifiedSettings): ProjectGroupingSettings {
+ return {
+ sidebarProjectGroupingMode: settings.sidebarProjectGroupingMode,
+ sidebarProjectGroupingOverrides: settings.sidebarProjectGroupingOverrides,
+ };
+}
+
function uniqueNonEmptyValues(values: ReadonlyArray<string | null | undefined>): string[] {
const seen = new Set<string>();
const unique: string[] = [];
diff --git a/apps/web/src/routes/__root.tsx b/apps/web/src/routes/__root.tsx
index 8c63003cd..ec525fa23 100644
--- a/apps/web/src/routes/__root.tsx
+++ b/apps/web/src/routes/__root.tsx
@@ -33,6 +33,7 @@ import { useSettings } from "../hooks/useSettings";
import {
deriveLogicalProjectKeyFromSettings,
derivePhysicalProjectKeyFromPath,
+ selectProjectGroupingSettings,
} from "../logicalProject";
import {
getServerConfigUpdatedNotification,
@@ -281,10 +282,7 @@ function EventRouter() {
const setActiveEnvironmentId = useStore((store) => store.setActiveEnvironmentId);
const navigate = useNavigate();
const pathname = useLocation({ select: (loc) => loc.pathname });
- const projectGroupingSettings = useSettings((settings) => ({
- sidebarProjectGroupingMode: settings.sidebarProjectGroupingMode,
- sidebarProjectGroupingOverrides: settings.sidebarProjectGroupingOverrides,
- }));
+ const projectGroupingSettings = useSettings(selectProjectGroupingSettings);
const readPathname = useEffectEvent(() => pathname);
const handledBootstrapThreadIdRef = useRef<string | null>(null);
const seenServerConfigUpdateIdRef = useRef(getServerConfigUpdatedNotification()?.id ?? 0);