diff options
Diffstat (limited to 'packages/app/src/context/global-sync/bootstrap.ts')
| -rw-r--r-- | packages/app/src/context/global-sync/bootstrap.ts | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/app/src/context/global-sync/bootstrap.ts b/packages/app/src/context/global-sync/bootstrap.ts index 66f4a3b15..a83030fad 100644 --- a/packages/app/src/context/global-sync/bootstrap.ts +++ b/packages/app/src/context/global-sync/bootstrap.ts @@ -78,7 +78,7 @@ export async function bootstrapGlobal(input: { () => retry(() => input.globalSDK.global.config.get().then((x) => { - input.setGlobalStore("config", x.data!) + input.setGlobalStore("config", reconcile(x.data!, { merge: false })) }), ), ] @@ -245,7 +245,7 @@ export async function bootstrapDirectory(input: { input.setStore("provider", input.global.provider) } if (Object.keys(input.store.config).length === 0 && Object.keys(input.global.config).length > 0) { - input.setStore("config", input.global.config) + input.setStore("config", reconcile(input.global.config, { merge: false })) } if (loading || input.store.provider.all.length === 0) { input.setStore("provider_ready", false) @@ -265,7 +265,8 @@ export async function bootstrapDirectory(input: { input.queryClient.ensureQueryData( loadAgentsQuery(input.directory, input.sdk, (x) => input.setStore("agent", normalizeAgentList(x.data))), ), - () => retry(() => input.sdk.config.get().then((x) => input.setStore("config", x.data!))), + () => + retry(() => input.sdk.config.get().then((x) => input.setStore("config", reconcile(x.data!, { merge: false })))), () => retry(() => input.sdk.session.status().then((x) => input.setStore("session_status", x.data!))), !seededProject && (() => retry(() => input.sdk.project.current()).then((x) => input.setStore("project", x.data!.id))), |