@vendian/cli 0.0.11 → 0.0.12

package/cli-wrapper.mjs

@@ -36304,6 +36304,38 @@ function activeCloudAuthStatus({ env: env3 = process.env, platform: platform2 =
     profiles
   };
 }
+function activateCloudProfile({ backend, apiUrl, env: env3 = process.env, platform: platform2 = process.platform } = {}) {
+  const targetApiUrl = resolveApiUrl({ backend, apiUrl, env: env3 });
+  const config = loadCloudConfig(env3, platform2);
+  const profiles = config.profiles && typeof config.profiles === "object" ? config.profiles : {};
+  const profile = profiles[targetApiUrl];
+  if (!profile || typeof profile !== "object" || !profile.access_token) {
+    return {
+      apiUrl: targetApiUrl,
+      activeApiUrl: typeof config.active_api_url === "string" ? config.active_api_url : void 0,
+      authenticated: false,
+      activated: false,
+      profiles
+    };
+  }
+  const next = {
+    ...config,
+    version: config.version || 2,
+    profiles,
+    active_api_url: targetApiUrl
+  };
+  writeCloudConfig(next, { env: env3, platform: platform2 });
+  return {
+    apiUrl: targetApiUrl,
+    activeApiUrl: targetApiUrl,
+    profile,
+    authenticated: true,
+    activated: true,
+    email: typeof profile.email === "string" ? profile.email : void 0,
+    expiresAt: typeof profile.expires_at === "string" ? profile.expires_at : void 0,
+    profiles
+  };
+}
 async function getOAuthConfig(apiUrl, redirectUri) {
   const url = new URL(`${apiUrl}/api/v1/cli/auth/oauth/config`);
   url.searchParams.set("redirectUri", redirectUri);
@@ -36452,18 +36484,18 @@ function cloudConfigPath(env3 = process.env, platform2 = process.platform) {
   return path5.posix.join(root, "vendian", "cloud-auth.json");
 }
 function saveCloudToken(token, { env: env3 = process.env, platform: platform2 = process.platform } = {}) {
-  const file = cloudConfigPath(env3, platform2);
+  const tokenApiUrl = String(token.apiUrl || "").replace(/\/$/, "");
   let raw = { version: 2, profiles: {}, active_api_url: token.apiUrl };
   try {
-    const existing = JSON.parse(fs6.readFileSync(file, "utf8"));
+    const existing = loadCloudConfig(env3, platform2);
     if (existing && typeof existing === "object" && existing.profiles && typeof existing.profiles === "object") {
       raw.profiles = existing.profiles;
     }
   } catch {
   }
-  raw.active_api_url = token.apiUrl;
-  raw.profiles[token.apiUrl] = {
-    api_url: token.apiUrl,
+  raw.active_api_url = tokenApiUrl;
+  raw.profiles[tokenApiUrl] = {
+    api_url: tokenApiUrl,
     access_token: token.accessToken,
     user_id: token.userId,
     email: token.email,
@@ -36471,6 +36503,10 @@ function saveCloudToken(token, { env: env3 = process.env, platform: platform2 =
     scopes: token.scopes,
     tooling_eligible: token.toolingEligible
   };
+  return writeCloudConfig(raw, { env: env3, platform: platform2 });
+}
+function writeCloudConfig(raw, { env: env3 = process.env, platform: platform2 = process.platform } = {}) {
+  const file = cloudConfigPath(env3, platform2);
   fs6.mkdirSync(path5.dirname(file), { recursive: true });
   fs6.writeFileSync(file, `${JSON.stringify(raw, null, 2)}
 `, { encoding: "utf8", mode: 384 });
@@ -36519,6 +36555,7 @@ async function setup({
       savePackageCredentials(next, packageCredentials, { platform: platform2 });
     }
   } else if (auth.authenticated) {
+    activateCloudProfile({ backend, apiUrl, env: env3, platform: platform2 });
     console.log(`Cloud authentication already saved for ${auth.apiUrl}${auth.email ? ` (${auth.email})` : ""}.`);
     const refreshed = await refreshPackageAccessFromCloudAuth({ config: next, auth, env: env3, platform: platform2 });
     Object.assign(next, refreshed.config);
@@ -36742,7 +36779,7 @@ import fs12 from "node:fs";
 import readlinePromises from "node:readline/promises";
 
 // src/version.js
-var CLI_VERSION = true ? "0.0.11" : process.env.npm_package_version || "0.0.0-dev";
+var CLI_VERSION = true ? "0.0.12" : process.env.npm_package_version || "0.0.0-dev";
 
 // src/npm-update.js
 var NPM_CHECK_INTERVAL_MS = 30 * 60 * 1e3;
@@ -37930,6 +37967,35 @@ function endpointRows({ env: env3 = process.env, platform: platform2 = process.p
     };
   });
 }
+async function switchOrLoginEndpoint({
+  backend,
+  apiUrl,
+  env: env3 = process.env,
+  platform: platform2 = process.platform,
+  setupFn = setup,
+  activateFn = activateCloudProfile
+} = {}) {
+  const status = cloudAuthStatus({ backend, apiUrl, env: env3, platform: platform2 });
+  if (status.authenticated) {
+    const activated = activateFn({ backend, apiUrl, env: env3, platform: platform2 });
+    return { apiUrl: status.apiUrl, reused: true, activated: Boolean(activated?.activated) };
+  }
+  await setupFn({ backend, apiUrl, forceAuth: true, env: env3, platform: platform2 });
+  return { apiUrl: status.apiUrl, reused: false, activated: true };
+}
+function endpointErrorStatus(error) {
+  const message = error && typeof error.message === "string" ? error.message : String(error || "Connection failed");
+  return `${fig.cross} ${message}`;
+}
+function endpointStatusColor(status) {
+  if (status.includes(fig.check)) {
+    return colors.success;
+  }
+  if (status.includes(fig.cross)) {
+    return colors.error;
+  }
+  return colors.muted;
+}
 function runtimeSummary({ env: env3 = process.env, platform: platform2 = process.platform, now = Date.now() } = {}) {
   const config = loadConfig(env3, platform2);
   const venvPath = managedVenvPath(env3, platform2);
@@ -38169,8 +38235,12 @@ function ConnectScreen({ env: env3, platform: platform2, onBack }) {
       return;
     }
     setStatus(`Connecting to ${value}...`);
-    await setup({ backend: value, forceAuth: true, env: env3, platform: platform2 });
-    setStatus(`${fig.check} Connected`);
+    try {
+      await switchOrLoginEndpoint({ backend: value, env: env3, platform: platform2 });
+      setStatus(`${fig.check} Connected`);
+    } catch (error) {
+      setStatus(endpointErrorStatus(error));
+    }
   }
   if (mode === "custom") {
     return h(
@@ -38185,11 +38255,15 @@ function ConnectScreen({ env: env3, platform: platform2, onBack }) {
         onSubmit: async (value) => {
           if (!value) return;
           setStatus("Connecting...");
-          await setup({ apiUrl: value, forceAuth: true, env: env3, platform: platform2 });
-          setStatus(`${fig.check} Connected`);
+          try {
+            await switchOrLoginEndpoint({ apiUrl: value, env: env3, platform: platform2 });
+            setStatus(`${fig.check} Connected`);
+          } catch (error) {
+            setStatus(endpointErrorStatus(error));
+          }
         }
       }),
-      status && h(Text2, { color: status.includes(fig.check) ? colors.success : colors.muted }, `  ${status}`),
+      status && h(Text2, { color: endpointStatusColor(status) }, `  ${status}`),
       h(Text2, null, ""),
       h(FooterBar, { items: [{ key: "\u23CE", label: "Submit" }, { key: "esc", label: "Back" }] }),
       h(BackHint, { onBack })
@@ -38201,7 +38275,7 @@ function ConnectScreen({ env: env3, platform: platform2, onBack }) {
     h(Text2, { bold: true }, "  Select environment:"),
     h(Text2, null, ""),
     h(SelectInput2, { items, onSelect: (item) => connect(item.value) }),
-    status && h(Text2, { color: status.includes(fig.check) ? colors.success : colors.muted }, `  ${status}`),
+    status && h(Text2, { color: endpointStatusColor(status) }, `  ${status}`),
     h(Text2, null, ""),
     h(FooterBar, { items: [{ key: "\u2191\u2193", label: "Navigate" }, { key: "\u23CE", label: "Select" }, { key: "esc", label: "Back" }] })
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vendian/cli",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "Public Vendian CLI bootstrapper and launcher",
   "license": "UNLICENSED",
   "private": false,