@cardelli/ambit 0.4.1 → 0.4.2

package/esm/cli/commands/auth.js

@@ -85,13 +85,19 @@ ${bold("EXAMPLES")}
         flyEmail = email;
     }
     else {
+        // Adopt from ~/.fly/config.yml if it has a different token than the store
         const storedToken = await credentials.getFlyToken();
-        const storedEmail = storedToken
-            ? await tryFlyWhoami(storedToken)
-            : null;
-        if (storedEmail) {
-            out.ok(`Already Authenticated as ${storedEmail}`);
-            flyEmail = storedEmail;
+        const configToken = await readFlyConfigToken();
+        const bestToken = configToken && configToken !== storedToken
+            ? configToken
+            : storedToken;
+        if (bestToken && bestToken !== storedToken) {
+            await credentials.setFlyToken(bestToken);
+        }
+        const bestEmail = bestToken ? await tryFlyWhoami(bestToken) : null;
+        if (bestEmail) {
+            out.ok(`Already Authenticated as ${bestEmail}`);
+            flyEmail = bestEmail;
         }
         else {
             if (args.json) {

package/esm/deno.js

@@ -1,6 +1,6 @@
 export default {
     "name": "@cardelli/ambit",
-    "version": "0.4.1",
+    "version": "0.4.2",
     "description": "Deploy apps to the cloud that only you and your AI agents can reach",
     "license": "MIT",
     "tasks": {

package/esm/util/credentials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../../src/util/credentials.ts"],"names":[],"mappings":"AA4BA,MAAM,WAAW,eAAe;IAC9B,kBAAkB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC7C,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACtC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AA+BD,eAAO,MAAM,2BAA2B,QAAO,eAiC9C,CAAC;AAMF,eAAO,MAAM,kBAAkB,QAAO,eA8BrC,CAAC;AAMF;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB,GAC5B,KAAK;IAAE,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAAC,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAA;CAAE,KAC1D,OAAO,CAAC;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAoD3D,CAAC"}
+{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../../src/util/credentials.ts"],"names":[],"mappings":"AA4BA,MAAM,WAAW,eAAe;IAC9B,kBAAkB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC7C,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACtC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AA+BD,eAAO,MAAM,2BAA2B,QAAO,eAiC9C,CAAC;AAMF,eAAO,MAAM,kBAAkB,QAAO,eA8BrC,CAAC;AAMF;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB,GAC5B,KAAK;IAAE,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAAC,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAA;CAAE,KAC1D,OAAO,CAAC;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAkC3D,CAAC"}

package/esm/util/credentials.js

@@ -115,26 +115,7 @@ export const checkDependencies = async (out) => {
     if (!key) {
         errors.push("Tailscale API Key Required. Run 'ambit auth login' or set TAILSCALE_API_KEY");
     }
-    let flyToken = await credentials.getFlyToken();
-    if (!flyToken) {
-        // Adopt token from flyctl's own config if available
-        const home = dntShim.Deno.env.get("HOME") || dntShim.Deno.env.get("USERPROFILE") || "";
-        const configPath = `${home}/.fly/config.yml`;
-        if (await fileExists(configPath)) {
-            try {
-                const content = await dntShim.Deno.readTextFile(configPath);
-                const match = content.match(/access_token:\s*(.+)/);
-                if (match?.[1]) {
-                    const adopted = match[1].trim();
-                    await credentials.setFlyToken(adopted);
-                    flyToken = adopted;
-                }
-            }
-            catch {
-                // Ignore read errors
-            }
-        }
-    }
+    const flyToken = await credentials.getFlyToken();
     if (!flyToken) {
         errors.push("Fly.io Token Required. Run 'ambit auth login' or set FLY_API_TOKEN");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardelli/ambit",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Deploy apps to the cloud that only you and your AI agents can reach",
   "license": "MIT",
   "scripts": {},