codexuse-cli 6.0.0 → 6.0.1

package/dist/index.js

@@ -5661,10 +5661,15 @@ function resolveProfileCodexHomeDir(profileHomeId) {
   const currentExists = (0, import_node_fs3.existsSync)(current);
   const legacyExists = (0, import_node_fs3.existsSync)(legacy);
   if (currentExists && legacyExists) {
-    throw new Error("profile-home-location-conflict");
+    return current;
   }
   return legacyExists ? legacy : current;
 }
+function findProfileCodexHomeLocationConflict(profileHomeId) {
+  const current = resolveCurrentProfileCodexHomeDir(profileHomeId);
+  const legacy = import_node_path5.default.join(resolveLegacyProfileCodexHomesRoot(), profileHomeId);
+  return (0, import_node_fs3.existsSync)(current) && (0, import_node_fs3.existsSync)(legacy) ? { current, legacy } : null;
+}
 function resolveProfileCodexHomesRoot() {
   return import_node_path5.default.join(resolveHomeDir(), ".codexuse", "p");
 }
@@ -5688,7 +5693,7 @@ async function migrateProfileCodexHomeDir(profileHomeId) {
   const currentExists = (0, import_node_fs3.existsSync)(current);
   const legacyExists = (0, import_node_fs3.existsSync)(legacy);
   if (currentExists && legacyExists) {
-    throw new Error("profile-home-location-conflict");
+    return current;
   }
   if (currentExists || !legacyExists) {
     return current;
@@ -36330,6 +36335,7 @@ var ProfileManager = class {
   }
   async migrateCredentialsToProfileHomes() {
     const source = await this.readProfilesStateSource();
+    await this.reconcileProfileHomeLocationConflicts(source);
     const homeIdsByProfileName = /* @__PURE__ */ new Map();
     const profileNamesByHomeId = /* @__PURE__ */ new Map();
     for (const [profileName, raw] of Object.entries(source)) {
@@ -36471,6 +36477,74 @@ var ProfileManager = class {
       );
     }
   }
+  async reconcileProfileHomeLocationConflicts(source) {
+    for (const [profileName, raw] of Object.entries(source)) {
+      const record2 = this.fromStateRecord(profileName, raw);
+      if (!record2) {
+        continue;
+      }
+      const conflict = findProfileCodexHomeLocationConflict(record2.homeId);
+      if (!conflict) {
+        continue;
+      }
+      const currentAuthPath = (0, import_path2.join)(conflict.current, "auth.json");
+      const legacyAuthPath = (0, import_path2.join)(conflict.legacy, "auth.json");
+      try {
+        await this.withProfileAuthFileLock(currentAuthPath, async (currentRaw) => {
+          await this.withProfileAuthFileLock(legacyAuthPath, async (legacyRaw) => {
+            if (!legacyRaw?.trim()) {
+              return;
+            }
+            let legacyAuth;
+            try {
+              legacyAuth = JSON.parse(legacyRaw);
+            } catch (error) {
+              throw errorWithCause("Legacy profile auth is invalid.", error);
+            }
+            if (!this.activeAuthMatchesRecord(legacyAuth, record2)) {
+              throw new Error("Legacy profile auth has a different identity.");
+            }
+            if (!currentRaw?.trim()) {
+              await this.replaceProfileAuthPathIfCurrent(
+                currentAuthPath,
+                currentRaw,
+                legacyRaw
+              );
+              return;
+            }
+            let currentAuth;
+            try {
+              currentAuth = JSON.parse(currentRaw);
+            } catch (error) {
+              throw errorWithCause("Current profile auth is invalid.", error);
+            }
+            if (!this.activeAuthMatchesRecord(currentAuth, record2)) {
+              throw new Error("Current profile auth has a different identity.");
+            }
+            const currentRecency = this.getProfileTokenRecencyMs(
+              this.normalizeProfileData(currentAuth)
+            );
+            const legacyRecency = this.getProfileTokenRecencyMs(
+              this.normalizeProfileData(legacyAuth)
+            );
+            if (typeof legacyRecency !== "number" || typeof currentRecency === "number" && legacyRecency <= currentRecency) {
+              return;
+            }
+            await this.replaceProfileAuthPathIfCurrent(
+              currentAuthPath,
+              currentRaw,
+              legacyRaw
+            );
+          });
+        });
+      } catch (error) {
+        logWarn(
+          `Could not reconcile the upgrade profile home for '${profileName}':`,
+          error
+        );
+      }
+    }
+  }
   enqueueAuthSwap(task) {
     const run2 = globalAuthSwapLock.then(task, task);
     globalAuthSwapLock = run2.then(
@@ -37107,7 +37181,13 @@ var ProfileManager = class {
     if (migrationError) {
       return { record: record2, cacheable: false };
     }
-    const authPath = import_path.default.join(this.getProfileHomePath(record2.homeId), "auth.json");
+    let authPath;
+    try {
+      authPath = import_path.default.join(this.getProfileHomePath(record2.homeId), "auth.json");
+    } catch (error) {
+      logWarn(`Failed to resolve profile home for '${record2.name}':`, error);
+      return { record: record2, cacheable: false };
+    }
     let authRaw;
     try {
       const recovered = await this.readProfileAuthFile(authPath);
@@ -44640,7 +44720,7 @@ async function ensureCliStorageReady() {
 }
 
 // src/app/main.ts
-var VERSION = true ? "6.0.0" : "0.0.0";
+var VERSION = true ? "6.0.1" : "0.0.0";
 async function runCli() {
   const args2 = process.argv.slice(2);
   if (args2.length === 0) {