mateooo93-cortex 0.25.25 → 0.25.29

package/README.md

@@ -6,8 +6,16 @@ npm wrapper that downloads the native `cortex` binary for your OS on `postinstal
 
 ## Install
 
+**Recommended when npm auth fails:** use the install script (downloads the native binary, no registry token):
+
+```bash
+curl -fsSL https://raw.githubusercontent.com/Mateooo93/cortex-cli/main/script/install.sh | bash
+```
+
+**npm** (GitHub Packages):
+
 ```bash
-npm install -g @mateooo93/cortex --registry=https://npm.pkg.github.com
+npm install -g @mateooo93/cortex@latest --registry=https://npm.pkg.github.com
 ```
 
 Or set the scope once in `~/.npmrc`:
@@ -19,7 +27,13 @@ Or set the scope once in `~/.npmrc`:
 Then:
 
 ```bash
-npm install -g @mateooo93/cortex
+npm install -g @mateooo93/cortex@latest
+```
+
+If you see `E401 Unauthorized`, the package may still be private — use the install script, or add a GitHub token with `read:packages`:
+
+```
+//npm.pkg.github.com/:_authToken=YOUR_GITHUB_TOKEN
 ```
 
 The global `cortex` command must point at `.../node_modules/@mateooo93/cortex/shims/cortex.js` (or your package manager's global bin shim).
@@ -29,13 +43,13 @@ The global `cortex` command must point at `.../node_modules/@mateooo93/cortex/sh
 **GitHub Packages** (default — uses `GITHUB_TOKEN` in Actions):
 
 ```bash
-./script/publish-npm.sh v0.25.19 --yes
+./script/publish-npm.sh v0.25.25 --yes
 ```
 
 **npmjs.org** (optional legacy `mateooo93-cortex` — requires npm Automation token):
 
 ```bash
-./script/publish-npm.sh v0.25.19 --yes --registry npmjs
+./script/publish-npm.sh v0.25.25 --yes --registry npmjs
 ```
 
 After the first GitHub Packages publish, set the package visibility to **Public** under the repo's **Packages** tab so anyone can install without a token.

package/lib/install.js

@@ -7,42 +7,46 @@ const { downloadBinary } = require("./download");
 const { warnIfShadowed } = require("./path-check");
 const { resolveAsset } = require("./platform");
 const { cacheDir, readPackageVersion, releaseBase } = require("./paths");
+const { updateCurrentSymlink } = require("./symlink");
+const { readBinaryVersion, versionsMatch } = require("./version");
 
 async function ensureBinary() {
   if (process.env.CORTEX_SKIP_POSTINSTALL === "1") {
     return null;
   }
 
-  const version = `v${readPackageVersion()}`;
+  const pkgVersion = readPackageVersion();
+  const version = `v${pkgVersion}`;
   const { asset, binaryName } = resolveAsset();
-  const destPath = cacheDir(version.slice(1), asset);
+  const destPath = cacheDir(pkgVersion, asset);
 
-  if (fs.existsSync(destPath)) {
-    return destPath;
-  }
-
-  await downloadBinary({
-    releaseBase: releaseBase(),
-    version,
-    asset,
-    destPath,
-  });
+  let needsDownload =
+    process.env.CORTEX_FORCE_REINSTALL === "1" || !fs.existsSync(destPath);
 
-  // Convenience symlink: ~/.cortex/npm/current/<binaryName>
-  const currentDir = path.join(path.dirname(path.dirname(destPath)), "current");
-  await fs.promises.mkdir(currentDir, { recursive: true });
-  const linkPath = path.join(currentDir, binaryName);
-  try {
-    await fs.promises.unlink(linkPath);
-  } catch (err) {
-    if (err.code !== "ENOENT") throw err;
+  if (!needsDownload) {
+    const binaryVersion = await readBinaryVersion(destPath);
+    if (!versionsMatch(binaryVersion, pkgVersion)) {
+      console.warn(
+        `cortex-cli: cached binary is ${binaryVersion || "unknown"}, package requires ${pkgVersion}; re-downloading…`
+      );
+      needsDownload = true;
+    }
   }
-  try {
-    await fs.promises.symlink(destPath, linkPath);
-  } catch {
-    // Windows may require elevated symlink rights; ignore.
+
+  if (needsDownload) {
+    if (fs.existsSync(destPath)) {
+      await fs.promises.unlink(destPath);
+    }
+    await downloadBinary({
+      releaseBase: releaseBase(),
+      version,
+      asset,
+      destPath,
+    });
   }
 
+  await updateCurrentSymlink(destPath, binaryName);
+
   return destPath;
 }
 
@@ -50,7 +54,11 @@ async function main() {
   try {
     const dest = await ensureBinary();
     if (dest) {
-      console.log(`cortex-cli: installed native binary to ${dest}`);
+      const binaryVersion = await readBinaryVersion(dest);
+      console.log(
+        `cortex-cli: installed native binary to ${dest}` +
+          (binaryVersion ? ` (${binaryVersion})` : "")
+      );
     }
     warnIfShadowed();
   } catch (err) {

package/lib/path-check.js

@@ -45,29 +45,36 @@ function resolveCortexOnPath() {
   return null;
 }
 
-function looksLikeCognitiveScale(target) {
+function isOurInstall(target) {
   if (!target) {
     return false;
   }
   const normalized = target.replace(/\\/g, "/");
-  if (CONFLICT_MARKERS.some((marker) => normalized.includes(marker))) {
-    return true;
-  }
   if (normalized.endsWith("/shims/cortex.js")) {
-    return false;
+    return true;
   }
   if (normalized.includes("/mateooo93-cortex/") || normalized.includes("/@mateooo93/cortex/")) {
-    return false;
+    return true;
   }
   if (normalized.includes("/.cortex/npm/")) {
+    return true;
+  }
+  return false;
+}
+
+function looksLikeCognitiveScale(target) {
+  if (!target) {
+    return false;
+  }
+  const normalized = target.replace(/\\/g, "/");
+  if (CONFLICT_MARKERS.some((marker) => normalized.includes(marker))) {
+    return true;
+  }
+  if (isOurInstall(target)) {
     return false;
   }
   // Heuristic: CognitiveScale ships a cortex.js launcher, not our shim layout.
-  if (
-    normalized.endsWith("/cortex.js") &&
-    !normalized.includes("mateooo93-cortex") &&
-    !normalized.includes("@mateooo93/cortex")
-  ) {
+  if (normalized.endsWith("/cortex.js")) {
     return true;
   }
   return false;
@@ -88,7 +95,7 @@ function warnIfShadowed() {
     same = shimPath === firstOnPath;
   }
 
-  if (same || !looksLikeCognitiveScale(firstOnPath)) {
+  if (same || isOurInstall(firstOnPath)) {
     return;
   }
 
@@ -97,9 +104,14 @@ function warnIfShadowed() {
   console.warn(`  ${firstOnPath}`);
   console.warn(`@mateooo93/cortex shim: ${shimPath}`);
   console.warn("");
-  console.warn("Remove the conflicting CognitiveScale CLI, then open a new terminal:");
-  console.warn("  npm uninstall -g cortex-cli");
-  console.warn("  bun remove -g cortex-cli   # if installed via bun");
+  if (looksLikeCognitiveScale(firstOnPath)) {
+    console.warn("Remove the conflicting CognitiveScale CLI, then open a new terminal:");
+    console.warn("  npm uninstall -g cortex-cli");
+    console.warn("  bun remove -g cortex-cli   # if installed via bun");
+  } else {
+    console.warn("Remove or move the other binary (often ~/.local/bin/cortex from a prior /update),");
+    console.warn("ensure the npm global bin directory is before ~/.local/bin on PATH, then open a new shell.");
+  }
   console.warn("");
   console.warn("Or run this package directly until PATH is fixed:");
   console.warn(`  ${shimPath}`);

package/lib/symlink.js

@@ -0,0 +1,22 @@
+"use strict";
+
+const fs = require("fs");
+const path = require("path");
+
+async function updateCurrentSymlink(destPath, binaryName) {
+  const currentDir = path.join(path.dirname(path.dirname(destPath)), "current");
+  await fs.promises.mkdir(currentDir, { recursive: true });
+  const linkPath = path.join(currentDir, binaryName);
+  try {
+    await fs.promises.unlink(linkPath);
+  } catch (err) {
+    if (err.code !== "ENOENT") throw err;
+  }
+  try {
+    await fs.promises.symlink(destPath, linkPath);
+  } catch {
+    // Windows may require elevated symlink rights; ignore.
+  }
+}
+
+module.exports = { updateCurrentSymlink };

package/lib/version.js

@@ -0,0 +1,31 @@
+"use strict";
+
+const { execFile } = require("child_process");
+const { promisify } = require("util");
+
+const execFileAsync = promisify(execFile);
+
+function normalizeVersion(v) {
+  if (!v) return "";
+  return String(v).trim().replace(/^v/i, "");
+}
+
+function versionsMatch(binaryVersion, packageVersion) {
+  return normalizeVersion(binaryVersion) === normalizeVersion(packageVersion);
+}
+
+async function readBinaryVersion(binaryPath) {
+  try {
+    const { stdout } = await execFileAsync(binaryPath, ["--version"], {
+      timeout: 15_000,
+      windowsHide: true,
+    });
+    const line = String(stdout).trim().split(/\r?\n/)[0] || "";
+    const match = line.match(/\bv?(\d+\.\d+\.\d+(?:[-+][\w.-]+)?)\b/i);
+    return match ? match[1] : null;
+  } catch {
+    return null;
+  }
+}
+
+module.exports = { normalizeVersion, versionsMatch, readBinaryVersion };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mateooo93-cortex",
-  "version": "0.25.25",
+  "version": "0.25.29",
   "description": "Fast AI coding agent with a polished terminal UI (npm wrapper — downloads the native binary for your OS)",
   "license": "AGPL-3.0-or-later",
   "repository": {
@@ -37,7 +37,8 @@
   "files": [
     "shims",
     "lib",
-    "README.md"
+    "README.md",
+    ".npmrc"
   ],
   "scripts": {
     "postinstall": "node lib/install.js"