Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 13 additions & 7 deletions src/lib/stores/settings-store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,18 @@ async function upsertSettings(payload: {
}
}

async function persistMigratedFeatureConfigs(featureConfigs: Record<FeatureTab, ProviderConfig>) {
const userId = await getUserId();
if (!userId) return;
const { error } = await supabase
.from('user_settings')
.update({ feature_configs: featureConfigs, updated_at: new Date().toISOString() })
.eq('user_id', userId);
if (error) {
console.warn('[SettingsStore] Failed to persist migrated settings:', error.message);
}
}

export const useSettingsStore = create<SettingsState>()(
persist(
(set, get) => ({
Expand Down Expand Up @@ -253,13 +265,7 @@ export const useSettingsStore = create<SettingsState>()(
wikiResearchEnabled: get().wikiResearchEnabled,
});
if (configsNeedMigration) {
await upsertSettings({
language,
output_language: outputLanguage,
theme,
feature_configs: mergedConfigs,
custom_system_prompt: customSystemPrompt ?? null,
});
await persistMigratedFeatureConfigs(mergedConfigs);
}
},
resetLocalData: () => {
Expand Down
14 changes: 8 additions & 6 deletions src/test/settings-store.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,18 +164,18 @@ describe("settings-store", () => {
expect(attack).toMatchObject({ provider: "openrouter", model: "z-ai/glm-5.3-flash", reasoningEffort: "low" });
expect(attack).not.toHaveProperty("apiKey");

const settingsWrite = supabaseMock.from.mock.results.find(({ value }) => value.upsert.mock.calls.length)?.value;
expect(settingsWrite.upsert).toHaveBeenCalledWith(
const settingsWrite = supabaseMock.from.mock.results.find(({ value }) => value.update.mock.calls.length)?.value;
expect(settingsWrite.update).toHaveBeenCalledWith(
expect.objectContaining({
feature_configs: expect.objectContaining({
generate: expect.objectContaining({ provider: "openrouter", model: "z-ai/glm-5.3-flash" }),
attack: expect.objectContaining({ provider: "openrouter", model: "z-ai/glm-5.3-flash" }),
}),
}),
{ onConflict: "user_id" },
);
expect(settingsWrite.upsert.mock.calls[0][0].feature_configs.generate).not.toHaveProperty("apiKey");
expect(settingsWrite.upsert.mock.calls[0][0].feature_configs.generate).not.toHaveProperty("baseUrl");
expect(settingsWrite.update.mock.calls[0][0].feature_configs.generate).not.toHaveProperty("apiKey");
expect(settingsWrite.update.mock.calls[0][0].feature_configs.generate).not.toHaveProperty("baseUrl");
expect(settingsWrite.update.mock.results[0].value.eq).toHaveBeenCalledWith("user_id", "user_1");
});

it("does not rewrite server feature configs that are already canonical", async () => {
Expand All @@ -192,7 +192,9 @@ describe("settings-store", () => {

await useSettingsStore.getState().hydrateFromServer();

const settingsWrites = supabaseMock.from.mock.results.filter(({ value }) => value.upsert.mock.calls.length);
const settingsWrites = supabaseMock.from.mock.results.filter(({ value }) =>
value.upsert.mock.calls.length || value.update.mock.calls.length
);
expect(settingsWrites).toHaveLength(0);
});

Expand Down
Loading