@indigoai-us/hq-cli 5.50.1 → 5.50.2

package/src/utils/version-gate.ts

@@ -29,13 +29,17 @@
  */
 
 import { spawnSync } from "node:child_process";
+import { readFileSync } from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
 import chalk from "chalk";
-import { CLI_VERSION } from "../cli-version.js";
+import { CLI_NAME, CLI_VERSION } from "../cli-version.js";
 import { DEFAULT_VAULT_API_URL } from "./cognito-session.js";
 
 const CLIENT_ID = "hq-cli";
 const ENDPOINT_PATH = "/v1/client-version/check";
 const FETCH_TIMEOUT_MS = 3_000;
+const LATEST_PACKAGE_SPEC = `${CLI_NAME}@latest`;
 
 interface VersionCheckResponse {
   clientId: string;
@@ -53,6 +57,53 @@ function isOptedOut(): boolean {
   return process.env.HQ_NO_UPDATE_CHECK === "1";
 }
 
+function findRunningPackageRoot(): string | null {
+  let dir = path.dirname(fileURLToPath(import.meta.url));
+  while (true) {
+    try {
+      const pkg = JSON.parse(
+        readFileSync(path.join(dir, "package.json"), "utf-8"),
+      ) as { name?: unknown };
+      if (pkg.name === CLI_NAME) return dir;
+    } catch {
+      // Keep walking; compiled installs usually start under dist/.
+    }
+
+    const parent = path.dirname(dir);
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
+
+export function npmPrefixFromPackageDir(pkgDir: string): string | null {
+  const normalized = pkgDir.replace(/\\/g, "/").replace(/\/+$/, "");
+  const segments = normalized.split("/");
+  const nodeModulesIndex = segments.lastIndexOf("node_modules");
+  if (nodeModulesIndex === -1) return null;
+
+  const prefixEnd =
+    segments[nodeModulesIndex - 1] === "lib"
+      ? nodeModulesIndex - 1
+      : nodeModulesIndex;
+  const prefix = segments.slice(0, prefixEnd).join("/");
+  if (prefix === "" && normalized.startsWith("/")) return "/";
+  return prefix || null;
+}
+
+export function resolveRunningPrefix(): string | null {
+  try {
+    const pkgRoot = findRunningPackageRoot();
+    if (!pkgRoot) return null;
+    return npmPrefixFromPackageDir(pkgRoot);
+  } catch {
+    return null;
+  }
+}
+
+export function buildPrefixedInstallArgv(prefix: string): string[] {
+  return ["install", "-g", "--prefix", prefix, LATEST_PACKAGE_SPEC];
+}
+
 /**
  * Hit POST /v1/client-version/check. Returns the parsed body on 200, or
  * `null` on any failure (caller treats as "no gate"). Tight 3s timeout —
@@ -95,13 +146,10 @@ async function fetchVersionDecision(): Promise<VersionCheckResponse | null> {
  * forcing a re-invocation would run twice on the same process and feel
  * janky; instead we print a clear "rerun your command" message and exit.
  */
-function performUpdate(
-  command: string,
-): { ok: boolean; detail?: string } {
-  const parts = command.split(/\s+/).filter(Boolean);
-  if (parts.length === 0) return { ok: false, detail: "empty command" };
-  const cmd = parts[0]!;
-  const args = parts.slice(1);
+type UpdateResult = { ok: boolean; detail?: string };
+type UpdateRunner = (cmd: string, args: string[]) => UpdateResult;
+
+function runUpdateCommand(cmd: string, args: string[]): UpdateResult {
   try {
     const result = spawnSync(cmd, args, { stdio: "inherit" });
     if (result.status !== 0) {
@@ -116,6 +164,25 @@ function performUpdate(
   }
 }
 
+function performUpdateCommand(
+  cmd: string,
+  args: string[],
+  runner: UpdateRunner = runUpdateCommand,
+): UpdateResult {
+  return runner(cmd, args);
+}
+
+function performUpdate(
+  command: string,
+  runner: UpdateRunner = runUpdateCommand,
+): UpdateResult {
+  const parts = command.split(/\s+/).filter(Boolean);
+  if (parts.length === 0) return { ok: false, detail: "empty command" };
+  const cmd = parts[0]!;
+  const args = parts.slice(1);
+  return performUpdateCommand(cmd, args, runner);
+}
+
 /**
  * Soft notify when the server says we're below `latestVersion` but still ≥
  * `minVersion`. Single chalk-yellow line on stderr; never blocks.
@@ -140,7 +207,14 @@ function nudgeUpdateRecommended(decision: VersionCheckResponse): void {
  *   0 — update succeeded; user must rerun their command
  *   75 — update failed (EX_TEMPFAIL; common for sudo/EACCES on system npm)
  */
-function enforceUpdateRequired(decision: VersionCheckResponse): never {
+function enforceUpdateRequired(
+  decision: VersionCheckResponse,
+  deps: {
+    performUpdateString?: (command: string) => UpdateResult;
+    resolvePrefix?: () => string | null;
+    runner?: UpdateRunner;
+  } = {},
+): never {
   const banner = chalk.red.bold(
     `✗ hq-cli ${decision.currentVersion} is below the minimum required version (${decision.minVersion}).`,
   );
@@ -148,7 +222,8 @@ function enforceUpdateRequired(decision: VersionCheckResponse): never {
   if (decision.message) console.error(chalk.dim(`  ${decision.message}`));
 
   const command = decision.updateCommand;
-  if (!command) {
+  const prefix = (deps.resolvePrefix ?? resolveRunningPrefix)();
+  if (!command && !prefix) {
     console.error(
       chalk.red(
         "  No updateCommand provided by hq-pro — see https://hq.indigo.ai/docs/cli-update for manual steps.",
@@ -160,13 +235,28 @@ function enforceUpdateRequired(decision: VersionCheckResponse): never {
     process.exit(75);
   }
 
-  console.error(chalk.dim(`  Running: ${command}`));
-  const result = performUpdate(command);
+  const runner = deps.runner ?? runUpdateCommand;
+  const result = prefix
+    ? (() => {
+        const args = buildPrefixedInstallArgv(prefix);
+        console.error(chalk.dim(`  Installing into npm prefix: ${prefix}`));
+        console.error(chalk.dim(`  Running: npm ${args.join(" ")}`));
+        return performUpdateCommand("npm", args, runner);
+      })()
+    : (() => {
+        console.error(chalk.dim(`  Running: ${command}`));
+        return deps.performUpdateString
+          ? deps.performUpdateString(command!)
+          : performUpdate(command!, runner);
+      })();
   if (!result.ok) {
     console.error(
       chalk.red(`✗ Update failed${result.detail ? `: ${result.detail}` : ""}.`),
     );
-    console.error(chalk.dim(`  Try manually: ${command}`));
+    const manual = prefix
+      ? `npm ${buildPrefixedInstallArgv(prefix).join(" ")}`
+      : command!;
+    console.error(chalk.dim(`  Try manually: ${manual}`));
     process.exit(75);
   }
 
@@ -215,5 +305,11 @@ export const __test__ = {
   CLIENT_ID,
   ENDPOINT_PATH,
   FETCH_TIMEOUT_MS,
+  buildPrefixedInstallArgv,
+  enforceUpdateRequired,
+  npmPrefixFromPackageDir,
   performUpdate,
+  performUpdateCommand,
+  runUpdateCommand,
+  resolveRunningPrefix,
 };