@phnx-labs/agents-cli 1.22.0 → 1.22.1

package/dist/lib/versions.js

@@ -1267,34 +1267,23 @@ export function isVersionIsolated(agent, version) {
     return fs.existsSync(getIsolatedMarkerPath(agent, version));
 }
 /**
- * Grok's official installer writes into ~/.grok/downloads, which (because we
- * symlink ~/.grok to the active version home) resolves to the PREVIOUS default
- * home during `agents add grok@<new>`. Move the freshly-downloaded binary and
- * its generic platform copy into the target version's isolated home so
- * `listInstalledVersions` and the shim resolve the right binary.
+ * Move any `grok-<installedVersion>-...` binary (and its generic platform
+ * copy) found directly under `sourceDownloads` into `targetDownloads`.
+ * Returns true if the versioned binary was moved.
  */
-function relocateGrokBinaryToVersionHome(installedVersion) {
-    const hostGrokLink = path.join(getHomeDir(), agentConfigDirName('grok'));
-    let sourceDownloads;
-    try {
-        sourceDownloads = path.join(fs.readlinkSync(hostGrokLink), 'downloads');
-    }
-    catch {
-        sourceDownloads = path.join(hostGrokLink, 'downloads');
-    }
-    const targetDownloads = path.join(getVersionHomePath('grok', installedVersion), agentConfigDirName('grok'), 'downloads');
+function tryMoveGrokDownloads(sourceDownloads, targetDownloads, installedVersion) {
     if (!fs.existsSync(sourceDownloads))
-        return;
+        return false;
     if (path.resolve(sourceDownloads) === path.resolve(targetDownloads))
-        return;
+        return false;
     const entries = fs.readdirSync(sourceDownloads).filter((e) => e.startsWith('grok-'));
     if (entries.length === 0)
-        return;
-    fs.mkdirSync(targetDownloads, { recursive: true });
+        return false;
     const escapedVersion = installedVersion.replace(/\./g, '\\.');
     const versionedPattern = new RegExp(`^grok-${escapedVersion}-`);
     const movedPaths = [];
-    // Move the versioned binary first.
+    // Move the versioned binary first — only create the target dir once we
+    // know there is something to move into it.
     for (const entry of entries) {
         if (!versionedPattern.test(entry))
             continue;
@@ -1303,6 +1292,7 @@ function relocateGrokBinaryToVersionHome(installedVersion) {
         if (fs.existsSync(dst))
             continue;
         try {
+            fs.mkdirSync(targetDownloads, { recursive: true });
             fs.renameSync(src, dst);
             movedPaths.push(dst);
         }
@@ -1311,7 +1301,7 @@ function relocateGrokBinaryToVersionHome(installedVersion) {
         }
     }
     if (movedPaths.length === 0)
-        return;
+        return false;
     // The installer also creates a generic platform binary (e.g. grok-macos-aarch64)
     // that is a copy of the versioned binary. Move it too if its size matches.
     const movedSize = fs.statSync(movedPaths[0]).size;
@@ -1331,6 +1321,42 @@ function relocateGrokBinaryToVersionHome(installedVersion) {
             /* ignore per-file failures */
         }
     }
+    return true;
+}
+/**
+ * Grok's official installer writes into ~/.grok/downloads, which (because we
+ * symlink ~/.grok to the active version home) resolves to the PREVIOUS default
+ * home during `agents add grok@<new>`. Move the freshly-downloaded binary and
+ * its generic platform copy into the target version's isolated home so
+ * `listInstalledVersions` and the shim resolve the right binary.
+ *
+ * Self-healing: if `~/.grok`'s current target has nothing matching (e.g. a
+ * PAST install mislabeled `installedVersion` as the literal string 'latest',
+ * whose regex never matched the real filename, stranding the binary in
+ * whatever version was default at the time), sweep every other installed
+ * grok version home for the missing file before giving up.
+ */
+function relocateGrokBinaryToVersionHome(installedVersion) {
+    const hostGrokLink = path.join(getHomeDir(), agentConfigDirName('grok'));
+    let sourceDownloads;
+    try {
+        sourceDownloads = path.join(fs.readlinkSync(hostGrokLink), 'downloads');
+    }
+    catch {
+        sourceDownloads = path.join(hostGrokLink, 'downloads');
+    }
+    const targetDownloads = path.join(getVersionHomePath('grok', installedVersion), agentConfigDirName('grok'), 'downloads');
+    if (tryMoveGrokDownloads(sourceDownloads, targetDownloads, installedVersion))
+        return;
+    for (const version of listInstalledVersions('grok')) {
+        if (version === installedVersion)
+            continue;
+        const candidate = path.join(getVersionHomePath('grok', version), agentConfigDirName('grok'), 'downloads');
+        if (path.resolve(candidate) === path.resolve(sourceDownloads))
+            continue; // already tried
+        if (tryMoveGrokDownloads(candidate, targetDownloads, installedVersion))
+            return;
+    }
 }
 /**
  * Install a specific version of an agent.
@@ -1376,7 +1402,28 @@ export async function installVersion(agent, version, onProgress, opts) {
                 await execAsync(script, { timeout: 120000 });
             }
             if (version === 'latest') {
-                installedVersion = await getCliVersionFromPath(agent) || version;
+                // A freshly-installed self-updating binary (grok, …) can take a
+                // moment to become resolvable on PATH right after the installer
+                // exits — retry briefly rather than silently falling back to the
+                // literal string 'latest'. That fallback used to corrupt version
+                // bookkeeping downstream: it creates a bogus `versions/<agent>/latest/`
+                // dir, and for grok specifically defeats relocateGrokBinaryToVersionHome
+                // (its exact-filename regex can never match `grok-latest-...`), which
+                // permanently strands the real downloaded binary in the PREVIOUS
+                // default's downloads dir.
+                let probed = await getCliVersionFromPath(agent);
+                for (let attempt = 0; !probed && attempt < 2; attempt++) {
+                    await new Promise((resolve) => setTimeout(resolve, 1000));
+                    probed = await getCliVersionFromPath(agent);
+                }
+                if (!probed) {
+                    return {
+                        success: false,
+                        installedVersion: version,
+                        error: `${agentConfig.name} installed but its version could not be determined after several attempts.`,
+                    };
+                }
+                installedVersion = probed;
                 // Fold any stale literal `latest` dir from an earlier probe-failed
                 // install into the real version so it stops shadowing `agents view`.
                 await reconcileStaleLatestDir(agent, installedVersion);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phnx-labs/agents-cli",
-  "version": "1.22.0",
+  "version": "1.22.1",
   "description": "One CLI for all your AI coding agents - versions, config, cloud dispatch, sessions, and teams (now with first-class Grok Build CLI support)",
   "type": "module",
   "main": "dist/index.js",