@autohq/cli 0.1.108 → 0.1.110

package/dist/agent-bridge.js

@@ -26206,7 +26206,7 @@ Object.assign(lookup, {
 // package.json
 var package_default = {
   name: "@autohq/cli",
-  version: "0.1.108",
+  version: "0.1.110",
   license: "SEE LICENSE IN README.md",
   publishConfig: {
     access: "public"

package/dist/index.js

@@ -18512,7 +18512,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@autohq/cli",
-      version: "0.1.108",
+      version: "0.1.110",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -18654,40 +18654,24 @@ var init_path = __esm({
 import { chmodSync, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
 import { dirname as dirname3 } from "path";
 function readConfig(path2 = defaultConfigPath()) {
-  const raw = readRawConfigFile(path2);
-  if (isProfilePath(path2) || !raw.currentProfile) return raw.config;
-  return readRawConfigFile(profileFilePath(path2, raw.currentProfile)).config;
+  const profilePath = activeProfilePath(path2);
+  return profilePath ? readProfileFile(profilePath) : {};
 }
 function currentProfileName(path2 = defaultConfigPath()) {
   if (isProfilePath(path2)) return profileNameFromPath(path2);
-  return readRawConfigFile(path2).currentProfile;
+  return readPointerFile(path2);
 }
 function writeConfig(config2, path2 = defaultConfigPath()) {
-  if (isProfilePath(path2)) {
-    writeConfigFile(config2, path2);
-    return;
+  const profilePath = activeProfilePath(path2);
+  if (!profilePath) {
+    throw new Error("Not logged in. Run `auto auth login` first.");
   }
-  const raw = readRawConfigFile(path2);
-  if (raw.currentProfile) {
-    const targetPath = profileFilePath(path2, raw.currentProfile);
-    const target = readRawConfigFile(targetPath).config;
-    if (hasAccountIdentity(config2) && !sameAccount(config2, target)) {
-      setCurrentProfile(saveProfile({ config: config2, configPath: path2 }), path2);
-      return;
-    }
-    writeConfigFile(config2, targetPath);
-    return;
-  }
-  if (hasAccountIdentity(config2)) {
-    setCurrentProfile(saveProfile({ config: config2, configPath: path2 }), path2);
-    return;
-  }
-  writeConfigFile(config2, path2);
+  writeProfileFile(config2, profilePath);
 }
 function saveProfile(input) {
   const configPath = input.configPath ?? defaultConfigPath();
   const name = resolveProfileName(input);
-  writeConfigFile(input.config, profileFilePath(configPath, name));
+  writeProfileFile(input.config, profileFilePath(configPath, name));
   return name;
 }
 function setCurrentProfile(name, path2 = defaultConfigPath()) {
@@ -18707,6 +18691,11 @@ function clearCurrentProfile(path2 = defaultConfigPath()) {
   }
   writeFile2("", path2);
 }
+function activeProfilePath(path2) {
+  if (isProfilePath(path2)) return path2;
+  const currentProfile = readPointerFile(path2);
+  return currentProfile ? profileFilePath(path2, currentProfile) : void 0;
+}
 function resolveProfileName(input) {
   if (input.name !== void 0) return assertValidProfileName(input.name);
   if (!input.config.userEmail || !input.config.serverUrl) {
@@ -18719,39 +18708,31 @@ function resolveProfileName(input) {
     serverUrl: input.config.serverUrl
   });
 }
-function hasAccountIdentity(config2) {
-  return Boolean(config2.userEmail && config2.serverUrl);
+function readPointerFile(path2) {
+  for (const [key, value] of readKeyValueLines(path2)) {
+    if (key === CURRENT_PROFILE_KEY) return value || void 0;
+  }
+  return void 0;
 }
-function sameAccount(next, current) {
-  if (!current.userEmail) return true;
-  if (next.serverUrl !== current.serverUrl) return false;
-  if (next.userId && current.userId) return next.userId === current.userId;
-  return next.userEmail?.toLowerCase() === current.userEmail.toLowerCase();
+function readProfileFile(path2) {
+  const config2 = {};
+  for (const [key, value] of readKeyValueLines(path2)) {
+    const known = CONFIG_KEYS.find((candidate) => candidate === key);
+    if (known) config2[known] = value;
+  }
+  return config2;
 }
-function readRawConfigFile(path2) {
+function readKeyValueLines(path2) {
+  let text;
   try {
-    const text = readFileSync2(path2, "utf8");
-    const config2 = {};
-    let currentProfile;
-    for (const line of text.split(/\r?\n/)) {
-      const match = /^([A-Za-z0-9_]+):\s*(.*)$/.exec(line.trim());
-      if (!match) continue;
-      if (match[1] === CURRENT_PROFILE_KEY) {
-        currentProfile = match[2] || void 0;
-        continue;
-      }
-      const key = CONFIG_KEYS.find((candidate) => candidate === match[1]);
-      if (key) config2[key] = match[2] ?? "";
-    }
-    return { config: config2, currentProfile };
+    text = readFileSync2(path2, "utf8");
   } catch (err) {
-    if (err.code === "ENOENT") {
-      return { config: {} };
-    }
+    if (err.code === "ENOENT") return [];
     throw err;
   }
+  return text.split(/\r?\n/).map((line) => /^([A-Za-z0-9_]+):\s*(.*)$/.exec(line.trim())).filter((match) => match !== null).map((match) => [match[1] ?? "", match[2] ?? ""]);
 }
-function writeConfigFile(config2, path2) {
+function writeProfileFile(config2, path2) {
   const lines = CONFIG_KEYS.filter((key) => config2[key]).map(
     (key) => `${key}: ${config2[key]}`
   );
@@ -21855,17 +21836,15 @@ async function exchangeAuthorizationCode(input) {
 }
 async function finishLogin(input) {
   const { token: token2, serverUrl } = input;
-  const previous = readConfig(input.configPath);
   const profile = token2.user ? findAccountProfile({
     configPath: input.configPath,
     serverUrl,
     userId: token2.user.id,
     userEmail: token2.user.email
   }) : void 0;
-  const selectionSource = profile ?? previous;
-  const selection = selectionSource.organizationId && selectionSource.projectId ? {
-    organizationId: selectionSource.organizationId,
-    projectId: selectionSource.projectId
+  const selection = profile?.organizationId && profile.projectId ? {
+    organizationId: profile.organizationId,
+    projectId: profile.projectId
   } : void 0;
   let config2 = {
     serverUrl,
@@ -21912,10 +21891,6 @@ async function finishLogin(input) {
   );
 }
 function persistLogin(config2, input) {
-  if (!input.token.user) {
-    writeConfig(config2, input.configPath);
-    return;
-  }
   const pinned = input.configPath !== void 0 && isProfilePath(input.configPath);
   const name = saveProfile({
     config: config2,
@@ -29266,18 +29241,20 @@ async function handleWhoami(context) {
   context.io.writeResult(whoami, formatWhoamiText);
 }
 function logout(context) {
-  const config2 = readConfig(context.configPath);
-  writeConfig(
-    {
-      ...config2,
-      refreshToken: void 0,
-      accessToken: void 0,
-      accessTokenExpiresAt: void 0,
-      accessTokenOrganizationId: void 0,
-      accessTokenProjectId: void 0
-    },
-    context.configPath
-  );
+  if (currentProfileName(context.configPath) !== void 0) {
+    const config2 = readConfig(context.configPath);
+    writeConfig(
+      {
+        ...config2,
+        refreshToken: void 0,
+        accessToken: void 0,
+        accessTokenExpiresAt: void 0,
+        accessTokenOrganizationId: void 0,
+        accessTokenProjectId: void 0
+      },
+      context.configPath
+    );
+  }
   context.writeOutput(context.io.style.success("Logged out."));
 }
 function listAccounts(context) {
@@ -29287,7 +29264,11 @@ function listAccounts(context) {
   }
   for (const profile of profiles) {
     context.writeOutput(
-      accountLine(profile, activeProfileName(context), context.io.style)
+      accountLine(
+        profile,
+        currentProfileName(context.configPath),
+        context.io.style
+      )
     );
   }
 }
@@ -29360,15 +29341,6 @@ function removeProfile(context, name) {
   rmSync(path2);
   context.writeOutput(context.io.style.success(`Removed profile "${name}".`));
 }
-function activeProfileName(context) {
-  const name = currentProfileName(context.configPath);
-  if (name) return name;
-  const active = readConfig(context.configPath);
-  if (!active.userEmail) return void 0;
-  return listProfiles(context.configPath).find(
-    (profile) => profile.config.userEmail === active.userEmail && profile.config.serverUrl === active.serverUrl
-  )?.name;
-}
 function accountLine(profile, activeName, style) {
   return [
     profile.name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autohq/cli",
-  "version": "0.1.108",
+  "version": "0.1.110",
   "license": "SEE LICENSE IN README.md",
   "publishConfig": {
     "access": "public"