aegis-desktop 1.0.5 → 1.0.6

package/lib/account-key.js

@@ -55,4 +55,9 @@ function createAccountKey({ aegis, credentials, persistKey, provision, onChange
   return { status, recordStartup, registerAccount };
 }
 
-module.exports = { createAccountKey, provisionFailureText };
+// A key this host saved on purpose outranks one minted for a fresh device at startup.
+function startupKeyOverride({ mintedKey, hostKey }) {
+  return mintedKey && hostKey && hostKey !== mintedKey ? hostKey : null;
+}
+
+module.exports = { createAccountKey, provisionFailureText, startupKeyOverride };

package/main.js

@@ -152,7 +152,7 @@ try {
 // backed by transport-only modules in desktop/lib/. No brain logic enters here.
 const os = require('node:os');
 const { createLocalEngine } = require('./lib/local/engine.js');
-const { createAccountKey } = require('./lib/account-key.js');
+const { createAccountKey, startupKeyOverride } = require('./lib/account-key.js');
 const { createSettingsStore, isReservedNamespace } = require('./lib/settings.js');
 const sessionStore = require('./lib/sync/sessions.js');
 const memoryQueue = require('./lib/sync/memory-queue.js');
@@ -3333,6 +3333,7 @@ function bootstrap() {
     provision: autoProvision.autoProvisionApiKey,
     onChange: (state) => broadcastAccountStatus(state),
   });
+  const keyPresentAtStart = Boolean(aegis.apiKey);
   const earlyKeyProvision = autoProvision.autoProvisionApiKey(aegis, credentials).then((result) => {
     accountKey.recordStartup(result);
     if (!result.key && !aegis.apiKey) {
@@ -3910,13 +3911,25 @@ function bootstrap() {
       // registration attempt, and earlyKeyProvision's own .then() already
       // warns on failure, so there is nothing further to report if it
       // didn't land.
-      await earlyKeyProvision;
-      const chosen = credentials.preferNewest(settings.aegisRawKey(), settings.aegisKeySavedAt());
-      if (chosen.key) {
-        aegis.setApiKey(chosen.key);
-        // The shared store is the newer write: bring this host's encrypted copy
-        // up to date so a CLI rotation does not have to be redone in Settings.
-        if (chosen.source === 'shared') settings.setAegisKey(chosen.key);
+      const early = await earlyKeyProvision;
+      // A key minted just now only means "no key was saved yet" — a key the user
+      // saved in Settings before the shared store mirrored it would otherwise be
+      // overwritten by the device's fresh account on this first start.
+      const override = startupKeyOverride({
+        mintedKey: keyPresentAtStart ? '' : early.key,
+        hostKey: credentials.normalizeApiKey(settings.aegisRawKey()),
+      });
+      if (override) {
+        credentials.saveApiKey(override);
+        aegis.setApiKey(override);
+      } else {
+        const chosen = credentials.preferNewest(settings.aegisRawKey(), settings.aegisKeySavedAt());
+        if (chosen.key) {
+          aegis.setApiKey(chosen.key);
+          // The shared store is the newer write: bring this host's encrypted copy
+          // up to date so a CLI rotation does not have to be redone in Settings.
+          if (chosen.source === 'shared') settings.setAegisKey(chosen.key);
+        }
       }
     }
     // ── presence beacon ───────────────────────────────────────────────────

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "aegis-desktop",
   "productName": "AEGIS Desktop",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Thin Electron host for AEGIS — a local chat UI over the shared client/aegis.js transport. Ships transport + UI only; engine logic stays server-side.",
   "author": {
     "name": "AEGIS Code",