Skip to content

refactor(web): scoped settings stay cached without "use memo" #20767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusmarminge merged 1 commit into from
Oct 17, 2026
+7 −10
Merged

refactor(web): scoped settings stay cached without "use memo" #20767

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions apps/web/src/components/settings/useScopedSettings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import * as Cause from "effect/Cause";
import { AsyncResult } from "effect/reactivity";
import {
DEFAULT_SERVER_SETTINGS,
type ClientSettings,
type ProjectScopedServerSettingKey,
type ServerSettings,
type UnifiedSettings,
Expand All @@ -36,20 +35,18 @@ import {
type ScopedSettingsPatch,
} from "./scopedSettings";

// Callers often pass an inline selector; a separate hook keeps the merge cached across those.
function useMergedSettings(serverSettings: ServerSettings, clientSettings: ClientSettings) {
"use memo";
return mergeEnvironmentSettings(serverSettings, clientSettings);
// Returns the merged object alone so the selector, often inline, cannot widen its cache key.
function useScopedMergedSettings(): UnifiedSettings {
const { target } = useSettingsScope();
const clientSettings = useClientSettings();
useMigrateModelPreferences(target?.environmentId ?? null, target?.settings ?? null);
return mergeEnvironmentSettings(target?.settings ?? DEFAULT_SERVER_SETTINGS, clientSettings);
}

export function useScopedSettings<T = UnifiedSettings>(
selector?: (settings: UnifiedSettings) => T,
): T {
const { target } = useSettingsScope();
const clientSettings = useClientSettings();
const serverSettings = target?.settings ?? DEFAULT_SERVER_SETTINGS;
useMigrateModelPreferences(target?.environmentId ?? null, target?.settings ?? null);
const settings = useMergedSettings(serverSettings, clientSettings);
const settings = useScopedMergedSettings();
return selector ? selector(settings) : (settings as T);
}

Expand Down
Loading