arcane-cli 1.11.4 → 1.11.5

package/dist/assets/.arcane/image-prompts/adelaide-image-prompt.md

@@ -137,4 +137,4 @@ Do not select weapon-carrying animations (Gun, Rifle, Shoot, Reload, Grenade, Bo
 
 ### Master Reference
 
-See dark-matter-complex/docs/animation-spec.md for the full cross-character mapping.
+See the shared character animation specification for the full cross-character mapping.

package/dist/assets/.arcane/image-prompts/alexander-image-prompt.md

@@ -135,4 +135,4 @@ Do not select weapon-carrying animations (Gun, Rifle, Shoot, Reload, Grenade, Bo
 
 ### Master Reference
 
-See dark-matter-complex/docs/animation-spec.md for the full cross-character mapping.
+See the shared character animation specification for the full cross-character mapping.

package/dist/assets/.arcane/image-prompts/bess-image-prompt.md

@@ -136,4 +136,4 @@ Do not select weapon-carrying animations (Gun, Rifle, Shoot, Reload, Grenade, Bo
 
 ### Master Reference
 
-See dark-matter-complex/docs/animation-spec.md for the full cross-character mapping.
+See the shared character animation specification for the full cross-character mapping.

package/dist/assets/.arcane/image-prompts/circe-image-prompt.md

@@ -140,4 +140,4 @@ Do not select weapon-carrying animations (Gun, Rifle, Shoot, Reload, Grenade, Bo
 
 ### Master Reference
 
-See dark-matter-complex/docs/animation-spec.md for the full cross-character mapping.
+See the shared character animation specification for the full cross-character mapping.

package/dist/assets/.arcane/image-prompts/custodio-image-prompt.md

@@ -137,4 +137,4 @@ Do not select weapon-carrying animations (Gun, Rifle, Shoot, Reload, Grenade, Bo
 
 ### Master Reference
 
-See dark-matter-complex/docs/animation-spec.md for the full cross-character mapping.
+See the shared character animation specification for the full cross-character mapping.

package/dist/assets/.arcane/image-prompts/iris-image-prompt.md

@@ -136,4 +136,4 @@ Do not select weapon-carrying animations (Gun, Rifle, Shoot, Reload, Grenade, Bo
 
 ### Master Reference
 
-See dark-matter-complex/docs/animation-spec.md for the full cross-character mapping.
+See the shared character animation specification for the full cross-character mapping.

package/dist/assets/.arcane/image-prompts/kellar-image-prompt.md

@@ -138,4 +138,4 @@ Do not select weapon-carrying animations (Gun, Rifle, Shoot, Reload, Grenade, Bo
 
 ### Master Reference
 
-See dark-matter-complex/docs/animation-spec.md for the full cross-character mapping.
+See the shared character animation specification for the full cross-character mapping.

package/dist/assets/.arcane/image-prompts/lafayette-image-prompt.md

@@ -137,4 +137,4 @@ Do not select weapon-carrying animations (Gun, Rifle, Shoot, Reload, Grenade, Bo
 
 ### Master Reference
 
-See dark-matter-complex/docs/animation-spec.md for the full cross-character mapping.
+See the shared character animation specification for the full cross-character mapping.

package/dist/assets/.arcane/image-prompts/lince-image-prompt.md

@@ -139,4 +139,4 @@ Do not select weapon-carrying animations (Gun, Rifle, Shoot, Reload, Grenade, Bo
 
 ### Master Reference
 
-See dark-matter-complex/docs/animation-spec.md for the full cross-character mapping.
+See the shared character animation specification for the full cross-character mapping.

package/dist/assets/.arcane/image-prompts/mercurio-image-prompt.md

@@ -137,4 +137,4 @@ Do not select weapon-carrying animations (Gun, Rifle, Shoot, Reload, Grenade, Bo
 
 ### Master Reference
 
-See dark-matter-complex/docs/animation-spec.md for the full cross-character mapping.
+See the shared character animation specification for the full cross-character mapping.

package/dist/assets/.arcane/image-prompts/merlin-image-prompt.md

@@ -136,4 +136,4 @@ Do not select weapon-carrying animations (Gun, Rifle, Shoot, Reload, Grenade, Bo
 
 ### Master Reference
 
-See dark-matter-complex/docs/animation-spec.md for the full cross-character mapping.
+See the shared character animation specification for the full cross-character mapping.

package/dist/assets/.arcane/image-prompts/prospero-image-prompt.md

@@ -138,4 +138,4 @@ Do not select weapon-carrying animations (Gun, Rifle, Shoot, Reload, Grenade, Bo
 
 ### Master Reference
 
-See dark-matter-complex/docs/animation-spec.md for the full cross-character mapping.
+See the shared character animation specification for the full cross-character mapping.

package/dist/index.js

@@ -7715,21 +7715,25 @@ var ChunkedSecretStore = class {
 };
 
 // src/modules/identity-config.ts
+function defineIdentityEnvironment(config) {
+  return {
+    ...config,
+    discoveryUrl: `https://${config.signInHost}/${config.tenantId}/v2.0/.well-known/openid-configuration`
+  };
+}
 var IDENTITY_ENVIRONMENTS = {
-  production: {
+  production: defineIdentityEnvironment({
     environment: "production",
     tenantId: "9f8edbfb-291c-4c4a-b9cc-8820a04f8973",
     signInHost: "arcaneai.ciamlogin.com",
-    clientId: "7cd8f05d-9979-4458-8ca2-47c67748c41f",
-    discoveryUrl: "https://arcaneai.ciamlogin.com/9f8edbfb-291c-4c4a-b9cc-8820a04f8973/v2.0/.well-known/openid-configuration"
-  },
-  development: {
+    clientId: "7cd8f05d-9979-4458-8ca2-47c67748c41f"
+  }),
+  development: defineIdentityEnvironment({
     environment: "development",
     tenantId: "b365de0e-3026-4afe-bf5b-556fccb4ffcf",
     signInHost: "arcaneaidev.ciamlogin.com",
-    clientId: "651be720-83cc-452b-8346-abf20713ad12",
-    discoveryUrl: "https://arcaneaidev.ciamlogin.com/b365de0e-3026-4afe-bf5b-556fccb4ffcf/v2.0/.well-known/openid-configuration"
-  }
+    clientId: "651be720-83cc-452b-8346-abf20713ad12"
+  })
 };
 var SIGN_IN_SCOPES = ["openid", "profile", "email", "offline_access"];
 var ENVIRONMENT_VARIABLE = "ARCANE_ENVIRONMENT";
@@ -7866,9 +7870,11 @@ async function browserLogin(config, options) {
         expectedState: state,
         expectedNonce: nonce,
         idTokenExpected: true
-      }).then((response) => {
+      }).then(async (response) => {
+        const result = toTokenResult(response);
+        await options.onValidated?.(result);
         res.writeHead(200, { "content-type": "text/html; charset=utf-8" }).end(CLOSE_PAGE);
-        resolve5(toTokenResult(response));
+        resolve5(result);
       }).catch((error) => {
         res.writeHead(200, { "content-type": "text/html; charset=utf-8" }).end(FAILED_PAGE);
         reject(error);
@@ -7938,6 +7944,17 @@ function createKeychainBackend(service = KEYCHAIN_SERVICE) {
 
 // src/modules/session-store.ts
 var INSECURE_SESSION_FILE_NAME = "session-insecure.json";
+var SessionClearError = class extends Error {
+  constructor(keychainError, removed) {
+    super(keychainError.message);
+    this.keychainError = keychainError;
+    this.removed = removed;
+    this.name = "SessionClearError";
+    this.cause = keychainError;
+  }
+  keychainError;
+  removed;
+};
 function isIsoDate(value) {
   return typeof value === "string" && !Number.isNaN(Date.parse(value));
 }
@@ -8081,8 +8098,9 @@ function createSessionStorage(options = {}) {
       const removed = [];
       let keychainError;
       try {
-        if (keychain.load().state !== "signed-out") removed.push("keychain");
+        const hadKeychainSession = keychain.load().state !== "signed-out";
         keychain.clear();
+        if (hadKeychainSession) removed.push("keychain");
       } catch (error) {
         keychainError = error;
       }
@@ -8090,6 +8108,9 @@ function createSessionStorage(options = {}) {
         fileBackend.remove();
         removed.push("file");
       }
+      if (keychainError instanceof KeychainUnavailableError) {
+        throw new SessionClearError(keychainError, removed);
+      }
       if (keychainError) throw keychainError;
       return { removed };
     }
@@ -8157,51 +8178,49 @@ async function runLogin(options, deps = defaultLoginDeps()) {
     process.exit(1);
     return;
   }
-  let result;
+  let record;
+  const saveValidatedSession = (result) => {
+    const next = toSessionRecord(result, environment);
+    deps.storage.save(next, { insecure: Boolean(options.insecureStorage) });
+    record = next;
+  };
   try {
     if (options.deviceCode) {
-      result = await deps.deviceLogin(config, {
+      const result = await deps.deviceLogin(config, {
         scopes: SIGN_IN_SCOPES,
         prompt: (uri, code, seconds) => {
           printInfo(`Open ${uri} on any device and enter the code ${code}.`);
           printInfo(`Waiting up to ${Math.round(seconds / 60)} minutes for you to finish signing in.`);
         }
       });
+      saveValidatedSession(result);
     } else {
       printInfo("Opening your browser to sign in to Arcane. Come back here when it says you are signed in.");
-      result = await deps.browserLogin(config, {
+      await deps.browserLogin(config, {
         scopes: SIGN_IN_SCOPES,
         openUrl: deps.openUrl,
+        onValidated: saveValidatedSession,
         onCannotOpen: (url) => {
           printWarning("No browser could be opened. Open this address yourself, or run `spell login --device-code`:");
           printInfo(url);
         }
       });
+      if (!record) throw new Error("The browser sign-in ended without storing a session.");
     }
-  } catch (error) {
-    if (error instanceof LoginTimeoutError || error instanceof LoginDeniedError) {
-      console.error(`${error.message} Nothing was changed.`);
-    } else {
-      console.error(`The sign-in did not complete: ${safeErrorText(error)}. Nothing was changed.`);
-    }
-    process.exit(1);
-    return;
-  }
-  const record = toSessionRecord(result, environment);
-  try {
-    deps.storage.save(record, { insecure: Boolean(options.insecureStorage) });
   } catch (error) {
     if (error instanceof KeychainUnavailableError) {
       console.error(
         `${error.message} Nothing was stored. If this machine has no keychain, run \`spell login --insecure-storage\` to keep the session in a file instead (protected only by your account's file permissions).`
       );
-      process.exit(1);
-      return;
+    } else if (error instanceof LoginTimeoutError || error instanceof LoginDeniedError) {
+      console.error(`${error.message} Nothing was changed.`);
+    } else {
+      console.error(`The sign-in did not complete: ${safeErrorText(error)}. Nothing was changed.`);
     }
-    console.error(`The session could not be stored: ${safeErrorText(error)}`);
     process.exit(1);
     return;
   }
+  if (!record) throw new Error("The sign-in completed without a stored session.");
   printSuccess(`Signed in as ${describeAccount(record)}.`);
   if (options.insecureStorage) printWarning(INSECURE_STORAGE_WARNING);
 }
@@ -8212,6 +8231,14 @@ function runLogout(storage = createSessionStorage()) {
   try {
     removed = storage.clear().removed;
   } catch (error) {
+    if (error instanceof SessionClearError) {
+      const fileResult = error.removed.includes("file") ? "The insecure session file was removed. " : "";
+      console.error(
+        `${fileResult}${error.keychainError.message} Any session in the OS keychain could not be verified or removed.`
+      );
+      process.exit(1);
+      return;
+    }
     if (error instanceof KeychainUnavailableError) {
       console.error(`${error.message} The session could not be removed from it.`);
       process.exit(1);