fix(desktop): canonicalize the apex origin in setOrigin, not just on load

Author: Sg312

apps/desktop/src/main/config.test.ts

@@ -145,6 +145,20 @@ describe('createConfigStore', () => {
     expect(reloaded.getOrigin()).toBe('https://self-hosted.example')
   })
 
+  it('canonicalizes the apex production origin on setOrigin, not just on load', () => {
+    // Entering https://sim.ai mid-session must not persist the apex: the
+    // running session would use the wrong cookie partition and misclassify
+    // social login until the next launch's load-time rewrite repaired it.
+    const filePath = tempSettingsPath()
+    const store = createConfigStore(filePath, {})
+    const result = store.setOrigin('https://sim.ai')
+    expect(result).toEqual({ ok: true, origin: 'https://www.sim.ai' })
+    expect(store.getOrigin()).toBe('https://www.sim.ai')
+
+    const reloaded = createConfigStore(filePath, {})
+    expect(reloaded.getOrigin()).toBe('https://www.sim.ai')
+  })
+
   it('recovers from a corrupted settings file', () => {
     const filePath = tempSettingsPath()
     writeFileSync(filePath, '{not json')

apps/desktop/src/main/config.ts

@@ -328,14 +328,22 @@ export function createConfigStore(
     },
     setOrigin(raw: string) {
       const validated = validateOriginInput(raw)
-      if (validated.ok) {
-        settings.origin = validated.origin
-        // Not debounced: changing the origin tears the session down and
-        // reloads, so a pending write could be lost on the way out — and this
-        // is the one setting whose loss strands the app on the wrong server.
-        writeNow()
+      if (!validated.ok) {
+        return validated
       }
-      return validated
+      // Same canonicalization the load path applies (ORIGIN_REWRITES).
+      // Without it, entering the apex origin mid-session persists it and
+      // immediately drives the wrong cookie partition and social-login
+      // classification for the rest of the session — the load-time rewrite
+      // only repairs it on the next launch. The canonical origin is also
+      // returned so the caller sees what was actually stored.
+      const origin = canonicalOrigin(validated.origin)
+      settings.origin = origin
+      // Not debounced: changing the origin tears the session down and
+      // reloads, so a pending write could be lost on the way out — and this
+      // is the one setting whose loss strands the app on the wrong server.
+      writeNow()
+      return { ok: true, origin }
     },
     get(key) {
       return settings[key]