@jelou/cli 1.17.1 → 1.18.0

package/bin/jelou

@@ -1,44 +1,37 @@
 #!/usr/bin/env node
 
 const { execFileSync } = require("child_process");
-const { join } = require("path");
+const {
+  PLATFORMS,
+  platformKey,
+  platformPackage,
+  platformBinaryPath,
+} = require("../lib/platform");
 
-const PLATFORMS = {
-  "darwin-arm64": "@jelou/cli-darwin-arm64",
-  "darwin-x64": "@jelou/cli-darwin-x64",
-  "linux-x64": "@jelou/cli-linux-x64",
-  "linux-arm64": "@jelou/cli-linux-arm64",
-  "win32-x64": "@jelou/cli-win32-x64",
-};
-
-const key = `${process.platform}-${process.arch}`;
-const pkg = PLATFORMS[key];
+const key = platformKey();
+const pkg = platformPackage();
 
 if (!pkg) {
   console.error(
     `@jelou/cli: unsupported platform ${key}\n` +
-    `Supported: ${Object.keys(PLATFORMS).join(", ")}\n` +
-    `Download manually from https://github.com/JelouLatam/jelou-cli/releases`
+      `Supported: ${Object.keys(PLATFORMS).join(", ")}\n` +
+      `Download manually from https://github.com/JelouLatam/jelou-cli/releases`,
   );
   process.exit(1);
 }
 
-let binPath;
-try {
-  const pkgJson = require.resolve(`${pkg}/package.json`);
-  const ext = process.platform === "win32" ? ".exe" : "";
-  binPath = join(pkgJson, "..", "bin", `jelou${ext}`);
-} catch {
+const binPath = platformBinaryPath();
+if (!binPath) {
   console.error(
     `@jelou/cli: platform package ${pkg} is not installed.\n\n` +
-    `An in-place \`npm install -g @jelou/cli\` upgrade can leave the wrapper\n` +
-    `without its platform dependency (npm sees the wrapper as up-to-date and\n` +
-    `skips re-resolving optional deps). The cleanest fix is to uninstall first:\n\n` +
-    `  npm uninstall -g @jelou/cli\n` +
-    `  npm install -g @jelou/cli\n\n` +
-    `If that still fails, check that npm isn't configured to skip optional\n` +
-    `dependencies (look for \`omit=optional\` in ~/.npmrc, or a global\n` +
-    `\`--no-optional\` flag).\n`
+      `An in-place \`npm install -g @jelou/cli\` upgrade can leave the wrapper\n` +
+      `without its platform dependency (npm sees the wrapper as up-to-date and\n` +
+      `skips re-resolving optional deps). The cleanest fix is to uninstall first:\n\n` +
+      `  npm uninstall -g @jelou/cli\n` +
+      `  npm install -g @jelou/cli\n\n` +
+      `If that still fails, check that npm isn't configured to skip optional\n` +
+      `dependencies (look for \`omit=optional\` in ~/.npmrc, or a global\n` +
+      `\`--no-optional\` flag).\n`,
   );
   process.exit(1);
 }

package/bin/postinstall.js

@@ -1,38 +1,98 @@
 #!/usr/bin/env node
 
-// Runs after npm has resolved optionalDependencies. If we're on a supported
-// platform but the matching platform package didn't land on disk (npm's known
-// silent-skip on in-place upgrades), fail the install loudly instead of leaving
-// a broken wrapper that only surfaces the problem at runtime.
-
-const PLATFORMS = {
-  "darwin-arm64": "@jelou/cli-darwin-arm64",
-  "darwin-x64": "@jelou/cli-darwin-x64",
-  "linux-x64": "@jelou/cli-linux-x64",
-  "linux-arm64": "@jelou/cli-linux-arm64",
-  "win32-x64": "@jelou/cli-win32-x64",
-};
-
-const key = `${process.platform}-${process.arch}`;
-const pkg = PLATFORMS[key];
+// Two responsibilities, in order:
+// 1. Verify the matching `@jelou/cli-<platform>` optional dep actually
+//    landed on disk (npm silent-skips optional deps on some in-place
+//    upgrades). Fail loudly here so users see the install break instead
+//    of a runtime "platform package not installed" later.
+// 2. Replace the wrapper's `bin/jelou` (a node shim that adds ~20ms of
+//    cold-start) with a relative symlink to the platform binary itself.
+//    When npm wires `<global>/bin/jelou` -> `<wrapper>/bin/jelou`, the
+//    chain now resolves straight to the native binary, no node hop.
+
+const fs = require("fs");
+const path = require("path");
+const {
+  PLATFORMS,
+  platformKey,
+  platformPackage,
+  platformBinaryPath,
+} = require("../lib/platform");
+
+const key = platformKey();
+const pkg = platformPackage();
 
 if (!pkg) {
-  // Unsupported platform — wrapper's bin script handles its own error path.
+  // Unsupported platform. Wrapper's bin script handles its own error path.
   process.exit(0);
 }
 
-try {
-  require.resolve(`${pkg}/package.json`);
-  process.exit(0);
-} catch {
+const binPath = platformBinaryPath();
+if (!binPath) {
   console.error(
     `\n@jelou/cli: optional dependency ${pkg} did not install.\n\n` +
-    `npm sometimes silently skips optional deps on in-place upgrades. Fix\n` +
-    `with a clean reinstall:\n\n` +
-    `  npm uninstall -g @jelou/cli\n` +
-    `  npm install -g @jelou/cli\n\n` +
-    `If that still fails, check for \`omit=optional\` in ~/.npmrc or a\n` +
-    `\`--no-optional\` flag.\n`
+      `npm sometimes silently skips optional deps on in-place upgrades. Fix\n` +
+      `with a clean reinstall:\n\n` +
+      `  npm uninstall -g @jelou/cli\n` +
+      `  npm install -g @jelou/cli\n\n` +
+      `If that still fails, check for \`omit=optional\` in ~/.npmrc or a\n` +
+      `\`--no-optional\` flag.\n`,
+  );
+  process.exit(1);
+}
+
+if (!fs.existsSync(binPath)) {
+  // Resolved the package, but the binary file isn't on disk. Same recovery.
+  console.error(
+    `\n@jelou/cli: ${pkg} resolved but its binary is missing at ${binPath}.\n` +
+      `Try: npm uninstall -g @jelou/cli && npm install -g @jelou/cli\n`,
   );
   process.exit(1);
 }
+
+// --- fast-shim rewrite (Unix only for now) ---
+// On Windows npm generates `.cmd` and `.ps1` shims that hardcode
+// `node "<wrapper>/bin/jelou"`; replacing the wrapper script doesn't
+// remove the node hop because the .cmd file in the global bin still
+// invokes node first. A Windows fast path would need a separate native
+// launcher (tracked separately as Tier 3). On Unix npm creates symlinks,
+// so a symlink chain skips the node boot entirely.
+if (process.platform === "win32") {
+  process.exit(0);
+}
+
+const wrapperBin = path.dirname(__filename); // <wrapper>/bin/
+const shimPath = path.join(wrapperBin, "jelou");
+const relativeTarget = path.relative(wrapperBin, binPath);
+
+// Idempotence: if the shim already points at the right binary, no-op.
+// Postinstall fires on every install / upgrade; re-creating the symlink
+// each time would churn the inode and break editor watchers.
+try {
+  const stat = fs.lstatSync(shimPath);
+  if (stat.isSymbolicLink() && fs.readlinkSync(shimPath) === relativeTarget) {
+    process.exit(0);
+  }
+} catch (_) {
+  // shim not present yet — fine, we'll create it.
+}
+
+try {
+  fs.rmSync(shimPath, { force: true });
+} catch (_) {
+  // nothing to remove
+}
+
+try {
+  fs.symlinkSync(relativeTarget, shimPath);
+  process.exit(0);
+} catch (err) {
+  // EPERM (Windows w/o developer mode), EXDEV (cross-device install),
+  // EROFS (read-only FS in some sandboxes). Fall back to a tiny shell
+  // wrapper. Adds ~1-3ms vs ~0ms for symlink, but still much better than
+  // the 20ms node-boot hop the wrapper script costs.
+  const safeTarget = relativeTarget.replace(/(["\\$`])/g, "\\$1");
+  const shell = `#!/bin/sh\nexec "$(dirname "$0")/${safeTarget}" "$@"\n`;
+  fs.writeFileSync(shimPath, shell, { mode: 0o755 });
+  process.exit(0);
+}

package/lib/platform.js

@@ -0,0 +1,47 @@
+"use strict";
+
+// Shared platform detection used by `bin/jelou` (the runtime shim) and
+// `bin/postinstall.js` (the install-time verifier + fast-shim writer).
+// Keeping this in one place prevents the two from drifting out of sync.
+
+const path = require("path");
+
+const PLATFORMS = {
+  "darwin-arm64": "@jelou/cli-darwin-arm64",
+  "darwin-x64": "@jelou/cli-darwin-x64",
+  "linux-x64": "@jelou/cli-linux-x64",
+  "linux-arm64": "@jelou/cli-linux-arm64",
+  "win32-x64": "@jelou/cli-win32-x64",
+};
+
+function platformKey() {
+  return `${process.platform}-${process.arch}`;
+}
+
+function platformPackage() {
+  return PLATFORMS[platformKey()] || null;
+}
+
+// Resolves the platform binary path through Node's normal module resolution.
+// Returns null when the platform is unsupported OR the optional dep didn't
+// install (npm's silent-skip on in-place upgrades). Callers handle each case
+// with their own error message.
+function platformBinaryPath() {
+  const pkg = platformPackage();
+  if (!pkg) return null;
+  let pkgJson;
+  try {
+    pkgJson = require.resolve(`${pkg}/package.json`);
+  } catch {
+    return null;
+  }
+  const ext = process.platform === "win32" ? ".exe" : "";
+  return path.join(pkgJson, "..", "bin", `jelou${ext}`);
+}
+
+module.exports = {
+  PLATFORMS,
+  platformKey,
+  platformPackage,
+  platformBinaryPath,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jelou/cli",
-  "version": "1.17.1",
+  "version": "1.18.0",
   "description": "Build AI agents on the Jelou platform — from your terminal or your AI editor.",
   "author": "Jelou Inc. (https://jelou.ai)",
   "license": "SEE LICENSE IN LICENSE",
@@ -17,16 +17,17 @@
   },
   "files": [
     "bin/",
+    "lib/",
     "README.md",
     "LICENSE",
     "THIRD_PARTY_NOTICES.md"
   ],
   "optionalDependencies": {
-    "@jelou/cli-darwin-arm64": "1.17.1",
-    "@jelou/cli-darwin-x64": "1.17.1",
-    "@jelou/cli-linux-x64": "1.17.1",
-    "@jelou/cli-linux-arm64": "1.17.1",
-    "@jelou/cli-win32-x64": "1.17.1"
+    "@jelou/cli-darwin-arm64": "1.18.0",
+    "@jelou/cli-darwin-x64": "1.18.0",
+    "@jelou/cli-linux-x64": "1.18.0",
+    "@jelou/cli-linux-arm64": "1.18.0",
+    "@jelou/cli-win32-x64": "1.18.0"
   },
   "keywords": [
     "jelou",