agendex-cli 0.15.0 → 0.16.0

package/dist/cli.js

@@ -1058,10 +1058,10 @@ var init_cleanup = __esm(() => {
 });
 
 // src/cli.ts
-import { spawn as spawn3 } from "node:child_process";
+import { spawn as spawn4 } from "node:child_process";
 import { existsSync as existsSync11, statSync as statSync2, writeSync } from "node:fs";
-import { resolve as resolve7 } from "node:path";
-import { fileURLToPath as fileURLToPath2 } from "node:url";
+import { resolve as resolve8 } from "node:path";
+import { fileURLToPath as fileURLToPath3 } from "node:url";
 
 // ../shared/src/adapters/catalog.ts
 import { homedir as homedir7 } from "node:os";
@@ -3946,6 +3946,7 @@ async function refreshToken(currentToken, convexUrl) {
     return null;
   return { token: body.token, expiresAt: body.expiresAt ?? 0 };
 }
+var REQUEST_TIMEOUT_MS2 = Number.parseInt(process.env.AGENDEX_HTTP_TIMEOUT_MS ?? "", 10) || 1e4;
 function requestText(urlString, options) {
   const url = new URL(urlString);
   const request = url.protocol === "https:" ? httpsRequest : httpRequest;
@@ -3957,7 +3958,8 @@ function requestText(urlString, options) {
     const req = request(url, {
       agent: false,
       headers,
-      method: options.method
+      method: options.method,
+      timeout: REQUEST_TIMEOUT_MS2
     }, (res) => {
       let body = "";
       res.setEncoding("utf8");
@@ -3973,6 +3975,9 @@ function requestText(urlString, options) {
       res.on("error", reject);
     });
     req.on("error", reject);
+    req.on("timeout", () => {
+      req.destroy(new Error(`Request to ${url.host} timed out after ${REQUEST_TIMEOUT_MS2}ms`));
+    });
     if (options.body) {
       req.write(options.body);
     }
@@ -4780,6 +4785,12 @@ async function syncAll(force = false) {
   console.log(`[agendex] Sync complete: ${synced} synced${lowValueSuffix}, ${skipped} unchanged, ${failed} failed`);
 }
 
+// src/upgrade.ts
+import { spawn as spawn3, spawnSync } from "node:child_process";
+import { realpathSync as realpathSync2 } from "node:fs";
+import { dirname as dirname4, resolve as resolve7, sep as sep4 } from "node:path";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
+
 // src/version.ts
 import { existsSync as existsSync10, readFileSync as readFileSync7, writeFileSync as writeFileSync5 } from "node:fs";
 import { tmpdir } from "node:os";
@@ -4787,7 +4798,7 @@ import { join as join14 } from "node:path";
 // package.json
 var package_default = {
   name: "agendex-cli",
-  version: "0.15.0",
+  version: "0.16.0",
   description: "Agendex CLI for login, sync, and daemon workflows",
   homepage: "https://github.com/Tyru5/Agendex#readme",
   repository: {
@@ -4851,11 +4862,13 @@ function writeCache(result) {
     writeFileSync5(CACHE_FILE, JSON.stringify({ result, ts: Date.now() }));
   } catch {}
 }
-async function checkForUpdate() {
+async function checkForUpdate(options = {}) {
   const current = CLI_VERSION;
-  const cached = readCache(current);
-  if (cached)
-    return cached;
+  if (!options.forceRefresh) {
+    const cached = readCache(current);
+    if (cached)
+      return cached;
+  }
   try {
     const controller = new AbortController;
     const timeout = setTimeout(() => controller.abort(), 3000);
@@ -4863,21 +4876,27 @@ async function checkForUpdate() {
       signal: controller.signal
     }).finally(() => clearTimeout(timeout));
     if (!res.ok) {
-      return { updateAvailable: false, current, latest: current };
+      return { checked: false, updateAvailable: false, current, latest: current };
     }
     const data = await res.json();
     const latest = data.version;
-    const result = { updateAvailable: isNewer(latest, current), current, latest };
+    const result = {
+      checked: true,
+      updateAvailable: isNewer(latest, current),
+      current,
+      latest
+    };
     writeCache(result);
     return result;
   } catch {
-    return { updateAvailable: false, current, latest: current };
+    return { checked: false, updateAvailable: false, current, latest: current };
   }
 }
 function normalizeResult(result, current) {
   if (typeof result.latest !== "string")
     return null;
   return {
+    checked: true,
     updateAvailable: isNewer(result.latest, current),
     current,
     latest: result.latest
@@ -4897,6 +4916,195 @@ function isNewer(latest, current) {
   return false;
 }
 
+// src/upgrade.ts
+var PACKAGE_NAME = "agendex-cli";
+var moduleDir = dirname4(fileURLToPath2(import.meta.url));
+function getPackageRoot() {
+  try {
+    return realpathSync2(resolve7(moduleDir, ".."));
+  } catch {
+    return resolve7(moduleDir, "..");
+  }
+}
+function detectPackageManager(packageRoot) {
+  const userAgent = process.env.npm_config_user_agent ?? "";
+  const execpath = process.env.npm_execpath ?? "";
+  if (userAgent.startsWith("bun/") || execpath.includes("bun"))
+    return "bun";
+  if (userAgent.startsWith("pnpm/") || execpath.includes("pnpm"))
+    return "pnpm";
+  if (userAgent.startsWith("yarn/") || execpath.includes("yarn"))
+    return "yarn";
+  const lower = packageRoot.toLowerCase();
+  if (lower.includes(`${sep4}.bun${sep4}`) || lower.includes("/.bun/"))
+    return "bun";
+  if (lower.includes(`${sep4}pnpm${sep4}`) || lower.includes("/pnpm/"))
+    return "pnpm";
+  if (lower.includes(`${sep4}yarn${sep4}`) || lower.includes("/yarn/"))
+    return "yarn";
+  if (typeof globalThis.Bun !== "undefined" || process.versions.bun) {
+    return "bun";
+  }
+  return "npm";
+}
+function readYarnVersion() {
+  const result = spawnSync("yarn", ["--version"], {
+    encoding: "utf8",
+    shell: process.platform === "win32"
+  });
+  if (result.error || result.status !== 0)
+    return null;
+  return result.stdout.trim() || null;
+}
+function parseMajorVersion(version) {
+  const match = version.match(/^(\d+)/);
+  if (!match)
+    return null;
+  const major = Number(match[1]);
+  return Number.isFinite(major) ? major : null;
+}
+function buildGlobalInstallCommand(pm) {
+  const pkgSpec = `${PACKAGE_NAME}@latest`;
+  switch (pm) {
+    case "bun":
+      return {
+        supported: true,
+        command: { bin: "bun", args: ["add", "-g", pkgSpec], display: `bun add -g ${pkgSpec}` }
+      };
+    case "pnpm":
+      return {
+        supported: true,
+        command: {
+          bin: "pnpm",
+          args: ["add", "-g", pkgSpec],
+          display: `pnpm add -g ${pkgSpec}`
+        }
+      };
+    case "yarn": {
+      const yarnVersion = readYarnVersion();
+      const yarnMajorVersion = yarnVersion ? parseMajorVersion(yarnVersion) : null;
+      if (yarnMajorVersion !== null && yarnMajorVersion >= 2) {
+        return {
+          supported: false,
+          reason: `automatic upgrade with Yarn only supports Yarn Classic (v1); detected Yarn v${yarnVersion}.`,
+          manualCommand: `npm install -g ${pkgSpec}`
+        };
+      }
+      return {
+        supported: true,
+        command: {
+          bin: "yarn",
+          args: ["global", "add", pkgSpec],
+          display: `yarn global add ${pkgSpec}`
+        }
+      };
+    }
+    default:
+      return {
+        supported: true,
+        command: {
+          bin: "npm",
+          args: ["install", "-g", pkgSpec],
+          display: `npm install -g ${pkgSpec}`
+        }
+      };
+  }
+}
+function isLikelyGlobalInstall(packageRoot) {
+  const normalized = packageRoot.replace(/\\/g, "/");
+  if (!normalized.includes("/node_modules/")) {
+    return false;
+  }
+  const globalMarkers = [
+    "/lib/node_modules/",
+    "/pnpm/global/",
+    "/yarn/global/",
+    "/.bun/install/global/",
+    "/.bun/install/",
+    "/.config/yarn/global/",
+    "/AppData/Roaming/npm/",
+    "/AppData/Local/Yarn/",
+    "/AppData/Local/pnpm/"
+  ];
+  return globalMarkers.some((marker) => normalized.includes(marker));
+}
+async function runUpgrade(opts) {
+  const packageRoot = getPackageRoot();
+  const pm = detectPackageManager(packageRoot);
+  const isGlobal = isLikelyGlobalInstall(packageRoot);
+  if (!isGlobal) {
+    process.stderr.write(`[agendex] this CLI appears to be running from a local checkout or linked install:
+` + `[agendex]   ${packageRoot}
+` + `[agendex] automatic upgrade only supports global installs.
+` + `[agendex] reinstall globally (e.g. \`npm install -g ${PACKAGE_NAME}@latest\`) or update the source repo manually.
+`);
+    return 1;
+  }
+  const { checked, updateAvailable, current, latest } = await checkForUpdate({
+    forceRefresh: true
+  });
+  if (checked && !updateAvailable && !opts.force) {
+    process.stdout.write(`[agendex] already up to date (v${current})
+`);
+    return 0;
+  }
+  if (!checked) {
+    process.stderr.write(`[agendex] could not verify the latest version; attempting upgrade anyway...
+`);
+  }
+  const commandResult = buildGlobalInstallCommand(pm);
+  if (!commandResult.supported) {
+    process.stderr.write(`[agendex] ${commandResult.reason}
+`);
+    process.stderr.write(`[agendex] install the latest CLI manually, e.g. \`${commandResult.manualCommand}\`.
+`);
+    return 1;
+  }
+  const cmd = commandResult.command;
+  if (checked && updateAvailable) {
+    process.stdout.write(`[agendex] upgrading: v${current} → v${latest}
+`);
+  } else if (opts.force) {
+    process.stdout.write(`[agendex] reinstalling v${CLI_VERSION} (forced)
+`);
+  }
+  process.stdout.write(`[agendex] running: ${cmd.display}
+`);
+  return await new Promise((resolveExit) => {
+    const child = spawn3(cmd.bin, cmd.args, {
+      stdio: "inherit",
+      shell: process.platform === "win32",
+      env: process.env
+    });
+    let didError = false;
+    child.on("error", (err) => {
+      didError = true;
+      process.stderr.write(`[agendex] failed to run ${cmd.bin}: ${err instanceof Error ? err.message : String(err)}
+`);
+      process.stderr.write(`[agendex] you can run it manually: ${cmd.display}
+`);
+      resolveExit(1);
+    });
+    child.on("close", (code) => {
+      if (didError)
+        return;
+      if (code === 0) {
+        process.stdout.write(`[agendex] upgrade complete.
+`);
+        process.stdout.write(`[agendex] note: if the daemon is running, restart it: \`agendex stop && agendex start\`
+`);
+        resolveExit(0);
+        return;
+      }
+      process.stderr.write(`[agendex] upgrade failed with exit code ${code ?? "unknown"}
+`);
+      process.stderr.write(`[agendex] you can run it manually: ${cmd.display}
+`);
+      resolveExit(code ?? 1);
+    });
+  });
+}
+
 // src/web.ts
 async function openAgendexWeb(siteUrlOverride) {
   const base = siteUrlOverride ?? getDefaultSiteUrl();
@@ -4934,7 +5142,7 @@ function firstCommandToken(argv) {
   return;
 }
 var command = firstCommandToken(args) ?? "start";
-var cliEntry = resolve7(process.argv[1] ?? fileURLToPath2(import.meta.url));
+var cliEntry = resolve8(process.argv[1] ?? fileURLToPath3(import.meta.url));
 async function main() {
   const isInternal = args.includes("--daemon") || args.includes("--worker");
   if (command === "--version" || command === "-v") {
@@ -4952,16 +5160,16 @@ async function main() {
     "add-dir",
     "remove-dir",
     "list-dirs",
+    "upgrade",
     "help",
     "--help",
     "-h"
   ].includes(command);
   if (!isInternal && !isPassthrough) {
-    const { updateAvailable, current, latest } = await checkForUpdate();
-    if (updateAvailable) {
-      writeStderr(`[agendex] update required: v${current} → v${latest}`);
-      writeStderr(`[agendex] run: npm i -g agendex-cli`);
-      return 1;
+    const { checked, updateAvailable, current, latest } = await checkForUpdate();
+    if (checked && updateAvailable) {
+      writeStderr(`[agendex] update available: v${current} → v${latest}`);
+      writeStderr(`[agendex] run: agendex upgrade`);
     }
   }
   switch (command) {
@@ -5000,7 +5208,7 @@ async function main() {
       const daemonArgs = [cliEntry, "start", "--daemon"];
       if (devFlag)
         daemonArgs.push("--dev");
-      const child = spawn3(process.execPath, daemonArgs, {
+      const child = spawn4(process.execPath, daemonArgs, {
         detached: true,
         stdio: "ignore",
         env: { ...process.env, ...devFlag ? { AGENDEX_DEV: "1" } : {} }
@@ -5153,7 +5361,7 @@ async function main() {
         const { request } = await import("node:http");
         const body = JSON.stringify({ path: resolved });
         try {
-          const res = await new Promise((resolve8, reject) => {
+          const res = await new Promise((resolve9, reject) => {
             const req = request(`http://localhost:${port}/api/v1/plan-sources`, {
               method: "POST",
               headers: {
@@ -5167,7 +5375,7 @@ async function main() {
               res2.on("data", (chunk) => {
                 data += chunk;
               });
-              res2.on("end", () => resolve8({ status: res2.statusCode ?? 0, body: data }));
+              res2.on("end", () => resolve9({ status: res2.statusCode ?? 0, body: data }));
               res2.on("error", reject);
             });
             req.on("error", reject);
@@ -5295,6 +5503,9 @@ async function main() {
       }
       return 0;
     }
+    case "upgrade": {
+      return await runUpgrade({ force: args.includes("--force") });
+    }
     case "help":
     case "--help":
     case "-h": {
@@ -5321,6 +5532,8 @@ Usage:
   agendex cleanup      Interactively remove cloud daemons
   agendex cleanup --stale  Auto-remove all stale daemons
   agendex status       Show current config state + daemon status
+  agendex upgrade      Upgrade the globally installed CLI to the latest version
+  agendex upgrade --force  Reinstall latest even if already up to date
   agendex help         Show this help message
   agendex --version    Print CLI version
   agendex -v           Print CLI version
@@ -5349,13 +5562,13 @@ function flushStream(stream) {
   if (stream.destroyed || !stream.writable) {
     return Promise.resolve();
   }
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve9, reject) => {
     stream.write("", (error) => {
       if (error) {
         reject(error);
         return;
       }
-      resolve8();
+      resolve9();
     });
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agendex-cli",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "Agendex CLI for login, sync, and daemon workflows",
   "homepage": "https://github.com/Tyru5/Agendex#readme",
   "repository": {