agentic-relay 3.8.4 → 3.8.5

package/bin/install.mjs

@@ -29,7 +29,7 @@
  *   deeplink         Print URL the agent registers (tome://, raycast://) — user clicks Install
  */
 
-import { readFileSync, writeFileSync, mkdirSync, existsSync } from "fs";
+import { readFileSync, writeFileSync, mkdirSync, existsSync, realpathSync } from "fs";
 import { homedir } from "os";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
@@ -610,15 +610,58 @@ function getExistingKey() {
 
 /**
  * Link a bare global `agentrelay` command so users skip `npx` after install.
- * No-ops only when the resolved `agentrelay` already matches this package's
- * version — a stale global install gets upgraded, not skipped. Prefers a
- * registry install (`agentic-relay@<version>`) over the local path: when this
- * runs via npx, the local path is an ephemeral cache dir that npm would
- * link/copy from. Falls back to the path for unpublished checkouts. Surfaces
- * npm's actual error (EACCES etc.) instead of swallowing it, and verifies the
- * command resolves afterwards so a PATH mismatch is reported, not discovered
- * later as `command not found`.
+ * No-ops only when a GENUINE install of `agentrelay` already matches this
+ * package's version — a stale global install gets upgraded, not skipped.
+ *
+ * npx trap: `npx agentic-relay` prepends its ephemeral cache's .bin to this
+ * process's PATH, so `agentrelay` ALWAYS resolves here (to the very copy being
+ * run) and disappears when npx exits. A naive "already on your PATH" check
+ * therefore never links anything and the user gets `command not found` in
+ * their next shell. We resolve the command's real location and ignore it when
+ * it lives in an npx/npm-exec cache or inside this package itself.
+ *
+ * Prefers a registry install (`agentic-relay@<version>`) over the local path
+ * (the npx cache dir is ephemeral; npm would link/copy from it). Falls back to
+ * the path for unpublished checkouts. Surfaces npm's actual error (EACCES
+ * etc.) instead of swallowing it, and verifies the command resolves afterwards
+ * so a PATH mismatch is reported, not discovered later as `command not found`.
  */
+function resolveCommandPath(cmd) {
+  try {
+    const probe = process.platform === "win32" ? `where ${cmd}` : `command -v ${cmd}`;
+    const out = execSync(probe, { encoding: "utf-8", stdio: ["ignore", "pipe", "ignore"] });
+    return out.split("\n")[0].trim() || null;
+  } catch {
+    return null;
+  }
+}
+
+/** True when a resolved bin path is an ephemeral npx/npm-exec shim (or this package's own copy), not a real install. */
+function isEphemeralBin(binPath, pkgRoot) {
+  if (!binPath) return false;
+  let real = binPath;
+  try {
+    real = realpathSync(binPath);
+  } catch {
+    // dangling symlink — definitely not a usable install
+    return true;
+  }
+  const sep = process.platform === "win32" ? "\\" : "/";
+  return (
+    real.includes(`${sep}_npx${sep}`) ||
+    binPath.includes(`${sep}_npx${sep}`) ||
+    real.startsWith(realpathSafe(pkgRoot))
+  );
+}
+
+function realpathSafe(p) {
+  try {
+    return realpathSync(p);
+  } catch {
+    return p;
+  }
+}
+
 function linkGlobalCli() {
   const pkgRoot = join(__dirname, "..");
   let version = null;
@@ -628,16 +671,19 @@ function linkGlobalCli() {
     // unknown version — fall through to the path install
   }
 
-  try {
-    const out = execSync("agentrelay version", { encoding: "utf-8", stdio: ["ignore", "pipe", "ignore"] });
-    const installed = (out.trim().split(/\s+/).pop() || "").trim();
-    if (version && installed === version) {
-      success(`\`agentrelay\` ${version} already on your PATH`);
-      return;
+  const binPath = resolveCommandPath("agentrelay");
+  if (binPath && !isEphemeralBin(binPath, pkgRoot)) {
+    try {
+      const out = execSync("agentrelay version", { encoding: "utf-8", stdio: ["ignore", "pipe", "ignore"] });
+      const installed = (out.trim().split(/\s+/).pop() || "").trim();
+      if (version && installed === version) {
+        success(`\`agentrelay\` ${version} already on your PATH`);
+        return;
+      }
+      log(`global \`agentrelay\` is ${installed || "an unknown version"} — updating to ${version}…`);
+    } catch {
+      // resolves but doesn't run — reinstall it
     }
-    log(`global \`agentrelay\` is ${installed || "an unknown version"} — updating to ${version}…`);
-  } catch {
-    // not linked yet — proceed to install it
   }
 
   const attempts = version ? [`agentic-relay@${version}`, `"${pkgRoot}"`] : [`"${pkgRoot}"`];
@@ -664,18 +710,25 @@ function linkGlobalCli() {
     return;
   }
 
-  // Verify it actually resolves — npm's global bin dir may not be on this shell's PATH.
+  // Verify the global bin actually landed. Don't probe the bare command here:
+  // in this process it resolves to the ephemeral npx shim (which shadows the
+  // global install), so check the file in npm's global prefix directly.
+  let binDir = null;
+  let globalBin = null;
   try {
-    execSync("agentrelay version", { stdio: "ignore" });
-    success(`linked global \`agentrelay\` CLI (${installedFrom})`);
+    const prefix = execSync("npm prefix -g", { encoding: "utf-8", stdio: ["ignore", "pipe", "ignore"] }).trim();
+    binDir = process.platform === "win32" ? prefix : join(prefix, "bin");
+    const cand = join(binDir, process.platform === "win32" ? "agentrelay.cmd" : "agentrelay");
+    if (existsSync(cand)) globalBin = cand;
   } catch {
-    let binDir = "npm's global bin directory";
-    try {
-      binDir = execSync("npm prefix -g", { encoding: "utf-8" }).trim() + "/bin";
-    } catch {
-      // keep the generic phrasing
-    }
-    warn(`installed, but \`agentrelay\` doesn't resolve — add ${binDir} to your PATH`);
+    // can't resolve the prefix — fall through to the warn
+  }
+  if (globalBin) {
+    success(`linked global \`agentrelay\` CLI (${installedFrom})`);
+    const onPath = (process.env.PATH || "").split(process.platform === "win32" ? ";" : ":").includes(binDir);
+    if (!onPath) warn(`note: ${binDir} doesn't appear to be on your PATH — add it to use \`agentrelay\` directly`);
+  } else {
+    warn(`installed, but no global \`agentrelay\` found in ${binDir || "npm's global bin directory"} — run once:  npm i -g agentic-relay`);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentic-relay",
-  "version": "3.8.4",
+  "version": "3.8.5",
   "description": "Install Agent Relay AI search across 17+ agents — Claude Code, Codex, Cursor, Gemini CLI, Goose, Windsurf, Cline, BoltAI, Claude Desktop, VS Code, Amazon Q, Roo Code, Witsy, LibreChat, OpenClaw, Tome, Raycast — plus the `agentrelay` CLI for token-cheap parallel agent consulting",
   "bin": {
     "agentrelay": "bin/cli.mjs"