aegis-desktop 1.0.5 → 1.0.7

package/lib/account-key.js

@@ -8,15 +8,7 @@
  * Pure: Electron, the store and the provisioner are injected.
  */
 
-function provisionFailureText(result) {
-  const err = result && result.error;
-  if (!err) return 'the server returned no account key';
-  if (err.status === 429) return 'too many sign-ups from this network — try again later';
-  if (!err.status || err.status === 408 || err.status >= 500) return 'could not reach aegiscloud.org';
-  return `the server refused the request (HTTP ${err.status})`;
-}
-
-function createAccountKey({ aegis, credentials, persistKey, provision, onChange }) {
+function createAccountKey({ aegis, credentials, persistKey, provision, describeFailure, onChange }) {
   let failure = null;
   let inFlight = null;
 
@@ -26,7 +18,7 @@ function createAccountKey({ aegis, credentials, persistKey, provision, onChange
   }
 
   function recordStartup(result) {
-    failure = (result.key || aegis.apiKey) ? null : provisionFailureText(result);
+    failure = (result.key || aegis.apiKey) ? null : describeFailure(result);
     onChange(status());
   }
 
@@ -39,7 +31,7 @@ function createAccountKey({ aegis, credentials, persistKey, provision, onChange
             persistKey(result.key);
             failure = null;
           } else {
-            failure = provisionFailureText(result);
+            failure = describeFailure(result);
           }
           const state = status();
           onChange(state);
@@ -55,4 +47,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, 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');
@@ -3330,10 +3330,12 @@ function bootstrap() {
     aegis,
     credentials,
     persistKey: (key) => settings.setAegisKey(key),
-    provision: autoProvision.autoProvisionApiKey,
+    provision: (client, creds) => autoProvision.autoProvisionApiKey(client, creds, { app: 'desktop' }),
+    describeFailure: autoProvision.provisionFailureText,
     onChange: (state) => broadcastAccountStatus(state),
   });
-  const earlyKeyProvision = autoProvision.autoProvisionApiKey(aegis, credentials).then((result) => {
+  const keyPresentAtStart = Boolean(aegis.apiKey);
+  const earlyKeyProvision = autoProvision.autoProvisionApiKey(aegis, credentials, { app: 'desktop' }).then((result) => {
     accountKey.recordStartup(result);
     if (!result.key && !aegis.apiKey) {
       const reason =
@@ -3910,13 +3912,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.7",
   "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/vendor/aegis.js

@@ -855,10 +855,11 @@ function createClient(opts = {}) {
    * zero balance. Re-registering an already-known fingerprint does NOT
    * re-grant it; the pool balance gate still applies once the allowance is
    * spent or the 30 days lapse. Sends no API key of its own — there isn't
-   * one yet.
+   * one yet. `opts.app` names the host ('cli' | 'desktop' | 'mcp') so the
+   * server files this machine under its real name, not 'other'.
    */
   async function registerDevice(fingerprint, opts) {
-    return apiPost('/api/v1/auth/register-device', { fingerprint }, undefined, opts);
+    return apiPost('/api/v1/auth/register-device', { fingerprint, app: opts && opts.app }, undefined, opts);
   }
 
   /** Build the OpenAI-style messages array from either a full history or the

package/vendor/auto-provision.js

@@ -43,30 +43,47 @@ function isTransientRegisterError(err) {
   return !status || status === 408 || status >= 500;
 }
 
+// Why automatic registration gave up, in words a host can show the user.
+function provisionFailureText(result) {
+  const err = result && result.error;
+  if (!err) return 'the server returned no account key';
+  if (err.status === 429) return 'too many sign-ups from this network — try again later';
+  if (err.status >= 500) return `aegiscloud.org failed to register this device: ${err.message}`;
+  if (isTransientRegisterError(err)) return 'could not reach aegiscloud.org';
+  return `the server refused the request (HTTP ${err.status})`;
+}
+
 /**
  * @param {object} aegisClient A client from client/aegis.js (createClient()).
  * @param {object} credentials client/credentials.js (or a compatible double).
- * @param {number[]} [retryDelaysMs] Wait before each retry of a transient failure.
- * @returns {Promise<{ok: boolean, key: string, error?: Error}>}
+ * @param {{app?: string, retryDelaysMs?: number[]}} [options] `app` names the host
+ *   for the server's presence panel; `retryDelaysMs` waits before each retry of a
+ *   transient failure.
+ * @returns {Promise<{ok: boolean, key: string, trialGranted?: boolean, error?: Error}>}
  *   `ok` is true only when a usable key was obtained AND persisted to the
  *   shared store; `aegisClient.setApiKey()` has already been called on
  *   success, so the caller's client is immediately usable either way it
- *   inspects `ok`.
+ *   inspects `ok`. `trialGranted` is false when the server withheld the
+ *   welcome trial (the account and key are still valid).
  */
-async function autoProvisionApiKey(aegisClient, credentials, retryDelaysMs = DEVICE_REGISTER_RETRY_DELAYS_MS) {
+async function autoProvisionApiKey(aegisClient, credentials, options = {}) {
+  if (Array.isArray(options)) {
+    throw new TypeError('autoProvisionApiKey takes { app, retryDelaysMs }; a bare retry array is no longer accepted');
+  }
   if (aegisClient.apiKey) return { ok: true, key: aegisClient.apiKey };
+  const { app, retryDelaysMs = DEVICE_REGISTER_RETRY_DELAYS_MS } = options;
   let lastError = null;
   for (let attempt = 0; attempt <= retryDelaysMs.length; attempt++) {
     if (attempt > 0) await new Promise((resolve) => setTimeout(resolve, retryDelaysMs[attempt - 1]));
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), DEVICE_REGISTER_TIMEOUT_MS);
     try {
-      const data = await aegisClient.registerDevice(machineFingerprint(), { signal: controller.signal });
+      const data = await aegisClient.registerDevice(machineFingerprint(), { app, signal: controller.signal });
       const key = data && typeof data.api_key === 'string' ? data.api_key.trim() : '';
       if (!key) return { ok: false, key: '' };
       const saved = credentials.saveApiKey(key);
       aegisClient.setApiKey(key);
-      return { ok: !!saved.ok, key };
+      return { ok: !!saved.ok, key, trialGranted: data.trial_granted };
     } catch (err) {
       lastError = err;
       if (!isTransientRegisterError(err)) break;
@@ -77,4 +94,4 @@ async function autoProvisionApiKey(aegisClient, credentials, retryDelaysMs = DEV
   return { ok: false, key: '', error: lastError };
 }
 
-module.exports = { autoProvisionApiKey, DEVICE_REGISTER_TIMEOUT_MS, DEVICE_REGISTER_RETRY_DELAYS_MS };
+module.exports = { autoProvisionApiKey, provisionFailureText, DEVICE_REGISTER_TIMEOUT_MS, DEVICE_REGISTER_RETRY_DELAYS_MS };

package/vendor/device-fingerprint.js

@@ -111,8 +111,7 @@ function persistedInstallId() {
  *   4. `hostname:platform:arch` — last resort, kept only so this never throws.
  *
  * Only step 4 is guessable by a third party; steps 2 and 3 are both per-host
- * unique. `machineIdentityKind()` reports which one was used, so aegis1-side
- * abuse review can tell a genuine re-registration from a forged one.
+ * unique.
  *
  * @param {string} [overrideId] - test-only override for the raw machine identity.
  */
@@ -136,15 +135,9 @@ function machineIdentity(overrideId) {
   };
 }
 
-/** Which identity class the fingerprint on THIS host is derived from. */
-function machineIdentityKind() {
-  return machineIdentity().kind;
-}
-
 module.exports = {
   machineFingerprint,
   machineIdentity,
-  machineIdentityKind,
   readMachineId,
   persistedInstallId,
 };