aegis-desktop 1.0.4 → 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.4",
+  "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",

package/renderer/app.js

@@ -76,6 +76,8 @@ const ELEMENT_IDS = {
   accountBanner: 'account-banner',
   accountBannerText: 'account-banner-text',
   accountRetryBtn: 'account-retry-btn',
+  keysAccount: 'keys-account',
+  keysAccountRetry: 'keys-account-retry',
   connDot: 'conn-dot',
   connText: 'conn-text',
   app: 'st-app',
@@ -1143,17 +1145,35 @@ function renderUpdateBanner(state) {
   els.updateBanner.hidden = false;
 }
 
+/** Why the last account registration failed; null while the account is set up. */
+let accountFailureReason = null;
+
 function renderAccountBanner(state) {
+  accountFailureReason = state && state.status === 'no-key' ? state.reason : null;
+  renderKeysPopup();
   if (!els.accountBanner) return;
-  if (!state || state.status !== 'no-key') {
+  if (!accountFailureReason) {
     els.accountBanner.hidden = true;
     return;
   }
-  els.accountBannerText.textContent =
-    `No AEGIS account key on this machine: ${state.reason}.`;
+  els.accountBannerText.textContent = `No AEGIS account key on this machine: ${accountFailureReason}.`;
   els.accountBanner.hidden = false;
 }
 
+/** Retry registration from either surface; a success re-reads status so the sheet and key rows update. */
+function retryAccountSetup(button) {
+  button.disabled = true;
+  aegis.registerAccount()
+    .then((state) => {
+      renderAccountBanner(state);
+      if (!state) return refreshAfterKeyChange();
+    })
+    .catch((err) => renderAccountBanner({ status: 'no-key', reason: String((err && err.message) || err) }))
+    .finally(() => {
+      button.disabled = false;
+    });
+}
+
 async function loadAccountInfo() {
   try {
     const verify = await aegis.verifyApiKey();
@@ -2889,6 +2909,13 @@ function renderKeysPopup() {
   if (els.keysRowAegis) els.keysRowAegis.classList.toggle('set', aegisSet);
   if (els.keysRowByok) els.keysRowByok.classList.toggle('set', byokSet);
   if (els.keysCount) els.keysCount.textContent = `${(aegisSet ? 1 : 0) + (byokSet ? 1 : 0)} / 2`;
+  if (els.keysAccount) {
+    els.keysAccount.hidden = !accountFailureReason;
+    els.keysAccount.textContent = accountFailureReason
+      ? `The AEGIS account key could not be set up: ${accountFailureReason}.`
+      : '';
+  }
+  if (els.keysAccountRetry) els.keysAccountRetry.hidden = !accountFailureReason;
   if (els.keysHint) {
     els.keysHint.textContent =
       aegisSet && byokSet
@@ -5720,15 +5747,10 @@ async function init() {
   if (els.accountBanner && aegis.onAccountStatus) {
     aegis.onAccountStatus(renderAccountBanner);
     aegis.accountStatus().then(renderAccountBanner).catch((err) => console.warn('account status unavailable', err));
-    els.accountRetryBtn.addEventListener('click', () => {
-      els.accountRetryBtn.disabled = true;
-      aegis.registerAccount()
-        .then(renderAccountBanner)
-        .catch((err) => renderAccountBanner({ status: 'no-key', reason: String((err && err.message) || err) }))
-        .finally(() => {
-          els.accountRetryBtn.disabled = false;
-        });
-    });
+    els.accountRetryBtn.addEventListener('click', () => retryAccountSetup(els.accountRetryBtn));
+    if (els.keysAccountRetry) {
+      els.keysAccountRetry.addEventListener('click', () => retryAccountSetup(els.keysAccountRetry));
+    }
   }
 
   if (els.updateBanner && aegis.onUpdateStatus) {

package/renderer/index.html

@@ -839,9 +839,13 @@
         </div>
       </div>
 
+      <p class="hint" id="keys-account" role="alert" hidden></p>
       <p class="hint" id="keys-hint"></p>
 
       <div class="keys-actions">
+        <button type="button" id="keys-account-retry" class="ghost-btn" hidden>
+          Retry account setup
+        </button>
         <a
           class="ghost-btn"
           id="keys-get"