@jentrix/cli 0.5.6 → 0.5.7

package/dist/main.js

@@ -6418,7 +6418,7 @@ var require_compile = __commonJS({
       const schOrFunc = root.refs[ref];
       if (schOrFunc)
         return schOrFunc;
-      let _sch = resolve4.call(this, root, ref);
+      let _sch = resolve5.call(this, root, ref);
       if (_sch === void 0) {
         const schema = (_a3 = root.localRefs) === null || _a3 === void 0 ? void 0 : _a3[ref];
         const { schemaId } = this.opts;
@@ -6445,7 +6445,7 @@ var require_compile = __commonJS({
     function sameSchemaEnv(s1, s2) {
       return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
     }
-    function resolve4(root, ref) {
+    function resolve5(root, ref) {
       let sch;
       while (typeof (sch = this.refs[ref]) == "string")
         ref = sch;
@@ -7076,7 +7076,7 @@ var require_fast_uri = __commonJS({
       }
       return uri;
     }
-    function resolve4(baseURI, relativeURI, options) {
+    function resolve5(baseURI, relativeURI, options) {
       const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
       const resolved = resolveComponent(parse3(baseURI, schemelessOptions), parse3(relativeURI, schemelessOptions), schemelessOptions, true);
       schemelessOptions.skipEscape = true;
@@ -7334,7 +7334,7 @@ var require_fast_uri = __commonJS({
     var fastUri = {
       SCHEMES,
       normalize,
-      resolve: resolve4,
+      resolve: resolve5,
       resolveComponent,
       equal,
       serialize,
@@ -10337,7 +10337,7 @@ import {
   statSync as statSync3
 } from "node:fs";
 import { homedir } from "node:os";
-import { basename as basename2, dirname as dirname4, join as join6 } from "node:path";
+import { basename as basename2, delimiter as delimiter2, dirname as dirname4, join as join6, resolve as resolve4 } from "node:path";
 import { fileURLToPath } from "node:url";
 
 // node_modules/.pnpm/commander@14.0.3/node_modules/commander/esm.mjs
@@ -17873,7 +17873,7 @@ var Protocol = class {
           return;
         }
         const pollInterval = task2.pollInterval ?? this._options?.defaultTaskPollInterval ?? 1e3;
-        await new Promise((resolve4) => setTimeout(resolve4, pollInterval));
+        await new Promise((resolve5) => setTimeout(resolve5, pollInterval));
         options?.signal?.throwIfAborted();
       }
     } catch (error2) {
@@ -17890,7 +17890,7 @@ var Protocol = class {
    */
   request(request, resultSchema, options) {
     const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options ?? {};
-    return new Promise((resolve4, reject) => {
+    return new Promise((resolve5, reject) => {
       const earlyReject = (error2) => {
         reject(error2);
       };
@@ -17968,7 +17968,7 @@ var Protocol = class {
           if (!parseResult.success) {
             reject(parseResult.error);
           } else {
-            resolve4(parseResult.data);
+            resolve5(parseResult.data);
           }
         } catch (error2) {
           reject(error2);
@@ -18229,12 +18229,12 @@ var Protocol = class {
       }
     } catch {
     }
-    return new Promise((resolve4, reject) => {
+    return new Promise((resolve5, reject) => {
       if (signal.aborted) {
         reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
         return;
       }
-      const timeoutId = setTimeout(resolve4, interval);
+      const timeoutId = setTimeout(resolve5, interval);
       signal.addEventListener("abort", () => {
         clearTimeout(timeoutId);
         reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
@@ -20962,7 +20962,7 @@ function refreshAccessToken(input) {
 
 // src/client.ts
 var CLI_NAME = "stacks-cli";
-var CLI_VERSION = "0.5.6";
+var CLI_VERSION = "0.5.7";
 var DEAD_TOKEN_MESSAGE = "authentication failed (HTTP 401): the token is dead or expired \u2014 mint a new PAT at /account/tokens on your Jentrix server and update STACKS_TOKEN (or --token / the config file).";
 var RELOGIN_MESSAGE = "OAuth session expired and could not be refreshed \u2014 run `jentrix login` to sign in again.";
 function originOf2(url2) {
@@ -21130,7 +21130,7 @@ function escapeHtml(s) {
   );
 }
 function tryBindPort(port, timeoutMs = CALLBACK_TIMEOUT_MS) {
-  return new Promise((resolve4) => {
+  return new Promise((resolve5) => {
     let settleCode = null;
     let rejectCode = null;
     let timer = null;
@@ -21155,9 +21155,9 @@ function tryBindPort(port, timeoutMs = CALLBACK_TIMEOUT_MS) {
         rejectCode?.(new Error("callback had no authorization code"));
       else settleCode?.({ code, state: url2.searchParams.get("state") });
     });
-    server.once("error", () => resolve4(null));
+    server.once("error", () => resolve5(null));
     server.listen(port, LOOPBACK_HOST, () => {
-      resolve4({
+      resolve5({
         port,
         waitForCode: () => new Promise((res, rej) => {
           settleCode = res;
@@ -21184,17 +21184,17 @@ async function bindLoopback(ports, timeoutMs = CALLBACK_TIMEOUT_MS) {
   return null;
 }
 function openBrowser(url2) {
-  return new Promise((resolve4) => {
+  return new Promise((resolve5) => {
     const os = platform();
     const cmd = os === "darwin" ? "open" : os === "win32" ? "cmd" : "xdg-open";
     const args = os === "win32" ? ["/c", "start", "", url2] : [url2];
     try {
       const child = spawn(cmd, args, { stdio: "ignore", detached: true });
-      child.on("error", () => resolve4());
+      child.on("error", () => resolve5());
       child.unref();
     } catch {
     }
-    resolve4();
+    resolve5();
   });
 }
 
@@ -21747,13 +21747,13 @@ function normalizeRemoteRepo(url2) {
   if (trimmed.length < 2) return null;
   return `${trimmed[0]}/${trimmed[1]}`.toLowerCase();
 }
-var defaultGitRunner = (args, cwd) => new Promise((resolve4) => {
+var defaultGitRunner = (args, cwd) => new Promise((resolve5) => {
   execFile(
     "git",
     args,
     { cwd, timeout: 1e4, maxBuffer: 4 * 1024 * 1024, windowsHide: true },
     (error2, stdout) => {
-      resolve4({
+      resolve5({
         code: error2 === null ? 0 : typeof error2.code === "number" ? Number(error2.code) : 1,
         stdout: String(stdout)
       });
@@ -27905,9 +27905,12 @@ function say(deps2, text = "") {
 }
 async function installToolchain(deps2) {
   const npm = await deps2.resolveNpm();
-  const existing = await deps2.resolveJentrix();
-  if (existing) {
-    say(deps2, `jentrix ${CLI_VERSION} is already installed (${existing}).`);
+  let global = await deps2.globalInstall();
+  if (global.cliDir) {
+    say(
+      deps2,
+      `jentrix ${CLI_VERSION} is already installed (${global.cliDir}).`
+    );
     say(deps2, "  Upgrade it any time with: npm update -g @jentrix/cli");
   } else {
     if (!npm) {
@@ -27934,15 +27937,16 @@ async function installToolchain(deps2) {
       );
       return EXIT_CODES.INTERNAL;
     }
-    if (!await deps2.resolveJentrix()) {
+    global = await deps2.globalInstall();
+    if (!global.cliDir) {
       deps2.writeErr(
-        "TOOLCHAIN_NOT_ON_PATH: the packages installed but `jentrix` is not resolvable \u2014 add npm's global bin directory (`npm prefix -g`) to PATH, then retry."
+        "TOOLCHAIN_INSTALL_FAILED: npm reported success but @jentrix/cli is not under `npm root -g` \u2014 check npm's global prefix, then retry."
       );
       return EXIT_CODES.INTERNAL;
     }
     say(deps2, "Installed the CLI and the session runner.");
   }
-  if (!await deps2.resolveRunner()) {
+  if (!global.runnerDir) {
     if (!npm) {
       deps2.writeErr(
         `RUNNER_NOT_INSTALLED: connected sessions need the runner and npm was not found to install it \u2014 npm install -g ${RUNNER_SPEC2}, then retry.`
@@ -27956,41 +27960,56 @@ async function installToolchain(deps2) {
       void 0,
       NPM_INSTALL_TIMEOUT_MS2
     );
-    if (runner.code !== 0 || !await deps2.resolveRunner()) {
+    global = await deps2.globalInstall();
+    if (runner.code !== 0 || !global.runnerDir) {
       deps2.writeErr(
-        `RUNNER_NOT_INSTALLED: \`npm install -g ${RUNNER_SPEC2}\` did not leave a resolvable runner \u2014 install it by hand, then retry.`
+        `RUNNER_NOT_INSTALLED: \`npm install -g ${RUNNER_SPEC2}\` did not leave the runner under \`npm root -g\` \u2014 install it by hand, then retry.`
       );
       return EXIT_CODES.INTERNAL;
     }
   }
-  return EXIT_CODES.OK;
-}
-async function installRuntimes(deps2) {
-  if (await deps2.resolveClaude()) {
-    await deps2.installPlugin("claude");
-  } else {
-    say(deps2, "note: the `claude` CLI is not installed \u2014 skipped its plugin.");
+  if (global.binDir && !global.binDirOnPath) {
+    say(deps2, "");
+    say(deps2, "note: npm's global bin directory is NOT on your PATH \u2014");
+    say(deps2, `        ${global.binDir}`);
     say(
       deps2,
-      "      Install Claude Code (https://claude.com/claude-code), then run: jentrix plugin install"
+      "      The toolchain is installed, but `jentrix` will not be found in a new"
     );
-  }
-  if (await deps2.resolveCodex()) {
-    if (await deps2.installPlugin("codex") !== EXIT_CODES.OK) {
-      say(
-        deps2,
-        "note: `jentrix plugin install codex` did not complete \u2014 retry it after `jentrix login`."
-      );
-    }
-  } else {
     say(
       deps2,
-      "note: the `codex` CLI is not installed \u2014 skipped its plugin and MCP server."
+      "      terminal until you add that directory to PATH and reopen your shell."
     );
-    say(
-      deps2,
+  }
+  return EXIT_CODES.OK;
+}
+var RUNTIMES = [
+  {
+    provider: "claude",
+    resolve: (deps2) => deps2.resolveClaude(),
+    absent: [
+      "note: the `claude` CLI is not installed \u2014 skipped its plugin.",
+      "      Install Claude Code (https://claude.com/claude-code), then run: jentrix plugin install"
+    ]
+  },
+  {
+    provider: "codex",
+    resolve: (deps2) => deps2.resolveCodex(),
+    absent: [
+      "note: the `codex` CLI is not installed \u2014 skipped its plugin and MCP server.",
       "      Install Codex (https://developers.openai.com/codex/cli), then re-run this command."
-    );
+    ]
+  }
+];
+async function installRuntimes(deps2, pending) {
+  for (const runtime of RUNTIMES) {
+    if (!await runtime.resolve(deps2)) {
+      for (const line of runtime.absent) say(deps2, line);
+      continue;
+    }
+    if (await deps2.installPlugin(runtime.provider) !== EXIT_CODES.OK) {
+      pending.failedPlugins.push(runtime.provider);
+    }
   }
 }
 async function registerCodexMcp(deps2, codex, pending) {
@@ -28118,7 +28137,8 @@ async function runSetupCommand(flags, deps2) {
   }
   const toolchain = await installToolchain(deps2);
   if (toolchain !== EXIT_CODES.OK) return toolchain;
-  await installRuntimes(deps2);
+  const pending = { failedPlugins: [] };
+  await installRuntimes(deps2, pending);
   if (!deps2.hasCredential()) {
     if (deps2.isInteractive) {
       say(deps2, "");
@@ -28136,13 +28156,25 @@ async function runSetupCommand(flags, deps2) {
       );
     }
   }
-  const pending = {};
   const codex = await deps2.resolveCodex();
   if (codex) await registerCodexMcp(deps2, codex, pending);
   if (flags.git !== false && deps2.isInteractive && deps2.cwd() !== deps2.homeDir()) {
     await bootstrapRepository(deps2);
   }
   say(deps2, "");
+  if (pending.failedPlugins.length) {
+    for (const provider of pending.failedPlugins) {
+      say(
+        deps2,
+        `note: the ${provider} plugin did NOT install \u2014 its commands will be missing.`
+      );
+      say(
+        deps2,
+        `      Run \`jentrix plugin install ${provider}\` on its own to see why.`
+      );
+    }
+    say(deps2, "");
+  }
   say(deps2, "Done. Verify with: jentrix whoami");
   if (pending.codexLoginUrl) {
     say(deps2, "");
@@ -28185,7 +28217,7 @@ async function runSetupCommand(flags, deps2) {
     deps2,
     "(Bind a folder to a different server any time with: jentrix login --local)"
   );
-  return EXIT_CODES.OK;
+  return pending.failedPlugins.length ? EXIT_CODES.INTERNAL : EXIT_CODES.OK;
 }
 function registerSetupCommand(program3, deps2, onExit2) {
   return program3.command("setup").description(
@@ -28539,12 +28571,12 @@ function surfaceFileMtime() {
   }
 }
 function readStdin() {
-  return new Promise((resolve4, reject) => {
+  return new Promise((resolve5, reject) => {
     const chunks = [];
     process.stdin.on("data", (chunk) => chunks.push(chunk));
     process.stdin.on(
       "end",
-      () => resolve4(Buffer.concat(chunks).toString("utf8"))
+      () => resolve5(Buffer.concat(chunks).toString("utf8"))
     );
     process.stdin.on("error", reject);
   });
@@ -28555,14 +28587,14 @@ function configFile() {
   return readConfigFile(CONFIG_PATH);
 }
 function readLine(prompt) {
-  return new Promise((resolve4) => {
+  return new Promise((resolve5) => {
     const rl = createInterface({
       input: process.stdin,
       output: process.stdout
     });
     rl.question(prompt, (answer) => {
       rl.close();
-      resolve4(answer);
+      resolve5(answer);
     });
   });
 }
@@ -28620,7 +28652,7 @@ var deps = {
 `),
   writeErr: (text) => process.stderr.write(`${text}
 `),
-  sleep: (ms) => new Promise((resolve4) => setTimeout(resolve4, ms)),
+  sleep: (ms) => new Promise((resolve5) => setTimeout(resolve5, ms)),
   now: () => Date.now()
 };
 var loginDeps = {
@@ -28810,7 +28842,36 @@ registerSetupCommand(
   program2,
   {
     ...pluginDeps,
-    resolveJentrix: () => resolveExecutableOnPath(platformExecutableNames("jentrix"), process.env),
+    // npm's global prefix, read from npm itself — never a PATH probe. Under
+    // `npx @jentrix/cli setup` the _npx cache is prepended to PATH and holds a
+    // `jentrix` shim, so a PATH answer is always yes and always meaningless.
+    globalInstall: async () => {
+      const npm = await resolveExecutableOnPath(
+        platformExecutableNames("npm"),
+        process.env
+      );
+      const ask = async (args) => {
+        if (!npm) return null;
+        const out = (await invokeRunnerProcess(npm, args)).stdout.trim();
+        return out || null;
+      };
+      const root = await ask(["root", "-g"]);
+      const prefix = await ask(["prefix", "-g"]);
+      const binDir = prefix ? process.platform === "win32" ? prefix : join6(prefix, "bin") : null;
+      const dir = (name) => {
+        if (!root) return null;
+        const candidate = join6(root, "@jentrix", name);
+        return existsSync6(join6(candidate, "package.json")) ? candidate : null;
+      };
+      return {
+        cliDir: dir("cli"),
+        runnerDir: dir("runner"),
+        binDir,
+        binDirOnPath: Boolean(
+          binDir && (process.env.PATH ?? "").split(delimiter2).some((entry) => entry && resolve4(entry) === resolve4(binDir))
+        )
+      };
+    },
     resolveGit: () => resolveExecutableOnPath(platformExecutableNames("git"), process.env),
     // Register the plugin from whichever copy of the package PERSISTS. Under
     // `npx @jentrix/cli setup` the running module lives in npm's _npx cache,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jentrix/cli",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "description": "Command-line client for the Jentrix MCP surface (jentrix tool <name>, generated noun-verb commands).",
   "keywords": [
     "jentrix",