@indigoai-us/hq-cli 5.345.156 → 5.345.160

package/dist/utils/team-upgrade.js

@@ -1,58 +1,56 @@
 import { isHeadless } from "./headless.js";
 import open from "open";
-import { ensureCognitoToken } from "./cognito-session.js";
-import { getCompanyUid, vaultApiFetch } from "./vault-api.js";
-const CHECKOUT_SUCCESS_URL = "https://hq.computer/billing?checkout=success";
-const CHECKOUT_CANCEL_URL = "https://hq.computer/billing?checkout=cancel";
-function ownerUpgradeError() {
-    return Object.assign(new Error("Only a company owner can upgrade. Ask a company owner to upgrade."), { expected: true });
+import { usageSwitchPageUrl } from "../lib/billing/plan-limit-upgrade-url.js";
+import { resolveProcessFlagCompanyContext } from "../lib/process-flag-company-context.js";
+/** The lines printed before the switch page link. Names no plan. */
+export function usageSwitchLines(url) {
+    return [
+        "The flat plans are closed to new subscribers. To move this company onto usage pricing, switch from its Billing page.",
+        "Usage pricing has no plan fee: you pay for what you use.",
+        "Add a card first with `hq billing checkout`, then switch here (company owners only):",
+        url,
+    ];
 }
+/** The fallback sentence when no console origin can be derived. */
+export const USAGE_SWITCH_NO_URL_MESSAGE = "Switch this company to usage pricing from its Billing page in the HQ Console.";
 /**
- * Start the owner-gated HQ Workforce Checkout flow. Stripe collects payment details
- * in its hosted browser page; the CLI never receives card data.
+ * Print (and open, unless told not to) the company's usage-pricing switch
+ * page. Returns the URL, or null when none could be built.
  */
-export async function upgradeToTeam(opts = {}) {
-    const token = await ensureCognitoToken();
-    const companyUid = opts.companyUid ?? await getCompanyUid(token, opts.company);
-    const response = await vaultApiFetch({
-        token,
-        path: "/v1/billing/checkout/team",
-        method: "POST",
-        body: {
-            companyUid,
-            entrySurface: "cli_limit",
-            successUrl: CHECKOUT_SUCCESS_URL,
-            cancelUrl: CHECKOUT_CANCEL_URL,
-        },
-    });
-    if (!response.ok) {
-        const body = (await response.json().catch(() => ({})));
-        if (response.status === 403 || /owner/i.test(`${body.error ?? ""} ${body.message ?? ""}`)) {
-            throw ownerUpgradeError();
+export async function openUsageSwitch(opts = {}) {
+    const write = opts.write ?? ((text) => process.stdout.write(text));
+    const slug = opts.companySlug?.trim() || resolveProcessFlagCompanyContext().companySlug || undefined;
+    const url = usageSwitchPageUrl(slug);
+    if (!url) {
+        if (opts.json) {
+            write(`${JSON.stringify({ url: null, message: USAGE_SWITCH_NO_URL_MESSAGE })}\n`);
         }
-        throw Object.assign(new Error(`Could not start HQ Workforce checkout: ${body.error ?? body.message ?? response.statusText}`), { expected: true });
-    }
-    const { url } = (await response.json());
-    if (typeof url !== "string" || !url) {
-        throw new Error("Checkout response did not include a hosted checkout URL.");
+        else {
+            write(`${USAGE_SWITCH_NO_URL_MESSAGE}\n`);
+        }
+        return null;
     }
-    const write = opts.write ?? ((text) => process.stdout.write(text));
     if (opts.json) {
-        write(`${JSON.stringify({ url })}\n`);
+        write(`${JSON.stringify({
+            url,
+            legacyPlansClosed: true,
+            message: usageSwitchLines(url).slice(0, 3).join(" "),
+        })}\n`);
         return url;
     }
-    write("Opening HQ Workforce checkout ($500/mo) in your browser — finish there and you're upgraded.\n");
+    for (const line of usageSwitchLines(url))
+        write(`${line}\n`);
     const skipBrowser = opts.noBrowser || (opts.headless ?? isHeadless());
-    if (skipBrowser) {
-        write(`Open this URL to continue: ${url}\n`);
-        return url;
-    }
+    if (!skipBrowser)
+        await openInBrowser(url, opts);
+    return url;
+}
+async function openInBrowser(url, opts) {
     try {
         await (opts.openUrl ?? open)(url);
     }
     catch (err) {
         (opts.error ?? ((text) => process.stderr.write(text)))(`Couldn't launch your browser (${err instanceof Error ? err.message : String(err)}). Open this URL to continue: ${url}\n`);
     }
-    return url;
 }
 //# sourceMappingURL=team-upgrade.js.map

package/dist/utils/version-gate.d.ts

@@ -499,7 +499,14 @@ interface EnforceUpdateDeps {
      */
     checkConvergence?: (targetVersion: string) => boolean | void;
     installNpmPackageStaged?: typeof import("./staged-npm-install.js").installNpmPackageStaged;
+    /** Global `hq` paths tried when the running copy is a local dependency. */
+    globalHqCandidates?: () => string[];
+    probeVersion?: (bin: string) => string | null;
+    realpath?: (p: string) => string | null;
+    execGlobalHq?: (bin: string, args: string[], env: NodeJS.ProcessEnv) => number | null;
 }
+/** Set on the child when the gate hands a command to a global `hq`. */
+export declare const GATE_GLOBAL_REEXEC_ENV = "HQ_GATE_REEXEC_GLOBAL";
 /**
  * Hard enforcement when the server says we're below `minVersion`. Print a
  * red banner, take the machine-wide update lock, attempt the update, then

package/dist/utils/version-gate.js

@@ -1692,6 +1692,66 @@ function installedHqEntryPoint(install) {
         return null;
     }
 }
+/** Set on the child when the gate hands a command to a global `hq`. */
+export const GATE_GLOBAL_REEXEC_ENV = "HQ_GATE_REEXEC_GLOBAL";
+const DEFAULT_GLOBAL_HQ_CANDIDATES = ["/usr/bin/hq", "/usr/local/bin/hq", "/opt/homebrew/bin/hq"];
+function realpathOrNull(p) {
+    try {
+        return realpathSync(p);
+    }
+    catch {
+        return null;
+    }
+}
+function spawnGlobalHq(bin, args, env) {
+    const result = spawnSync(bin, args, { stdio: "inherit", env });
+    if (result.error)
+        return null;
+    if (result.status !== null)
+        return result.status;
+    return 1;
+}
+/**
+ * When the running copy is a local dependency the gate cannot update it. If a
+ * global `hq` outside that copy reports a version at or above `minVersion`
+ * (and newer than this one), run the user's command with it and return its
+ * exit code. Returns null when there is no such binary, when the global run
+ * could not start, or when this process was itself started by this hand-off.
+ */
+function execNewerGlobalHq(decision, install, deps) {
+    if ((deps.platform ?? process.platform) === "win32")
+        return null;
+    if (process.env[GATE_GLOBAL_REEXEC_ENV] === "1")
+        return null;
+    const realpath = deps.realpath ?? realpathOrNull;
+    const probe = deps.probeVersion ?? probeCliVersion;
+    const runningRoot = install.packageRoot ? realpath(install.packageRoot) ?? install.packageRoot : null;
+    const candidates = deps.globalHqCandidates?.() ?? DEFAULT_GLOBAL_HQ_CANDIDATES;
+    for (const candidate of candidates) {
+        const resolved = realpath(candidate);
+        if (!resolved)
+            continue;
+        // A global shim that resolves into the running copy is the same old code.
+        if (runningRoot && (resolved === runningRoot || resolved.startsWith(`${runningRoot}${path.sep}`)))
+            continue;
+        const version = probe(candidate);
+        if (!version || !semver.valid(version))
+            continue;
+        if (!semver.gte(version, decision.minVersion) || !isNewerVersion(version, CLI_VERSION)) {
+            console.error(chalk.dim(`  Global ${candidate} is ${version}, also below ${decision.minVersion}; not using it.`));
+            continue;
+        }
+        console.error(chalk.dim(`  Running this command with the global ${candidate} (${version}) instead.`));
+        const code = (deps.execGlobalHq ?? spawnGlobalHq)(candidate, process.argv.slice(2), {
+            ...process.env,
+            [GATE_GLOBAL_REEXEC_ENV]: "1",
+        });
+        if (code !== null)
+            return code;
+        console.error(chalk.dim(`  Could not start ${candidate}.`));
+    }
+    return null;
+}
 /**
  * Hard enforcement when the server says we're below `minVersion`. Print a
  * red banner, take the machine-wide update lock, attempt the update, then
@@ -1730,6 +1790,12 @@ function enforceUpdateRequired(decision, deps = {}) {
     // Say what to fix and stop; do NOT spend an install.
     if (isLocalDependencyInstall(install)) {
         console.error(chalk.red(`  This copy is a local dependency, not a global install: ${install.packageRoot}`));
+        // A shadowing copy (a stale ~/.local/bin shim, a project dependency) must
+        // never run, but a newer global `hq` on the same machine can run the
+        // user's command instead of failing it.
+        const handedOff = execNewerGlobalHq(decision, install, deps);
+        if (handedOff !== null)
+            process.exit(handedOff);
         console.error(chalk.dim("  Self-update cannot replace it — an install would land where this copy is never loaded from, and the gate would fire again on the next run."));
         console.error(chalk.dim(`  Update the project that owns it (e.g. \`pnpm update ${CLI_NAME}\` in its root, or remove the stale dependency), or invoke the global \`hq\` instead.`));
         process.exit(75);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indigoai-us/hq-cli",
-  "version": "5.345.156",
+  "version": "5.345.160",
   "description": "HQ by Indigo management CLI — modules and cloud sync",
   "main": "dist/index.js",
   "bin": {
@@ -52,7 +52,7 @@
     "@aws-sdk/client-iot-data-plane": "^3.1096.0",
     "@aws-sdk/client-s3": "^3.1049.0",
     "@aws-sdk/dsql-signer": "^3.1146.0",
-    "@indigoai-us/hq-cloud": "~6.18.91",
+    "@indigoai-us/hq-cloud": "6.18.98",
     "@indigoai-us/hq-flags-client": "^0.1.2",
     "@modelcontextprotocol/sdk": "1.29.0",
     "@sentry/node": "^10.49.0",
@@ -114,11 +114,11 @@
     "*.{ts,tsx,mts,cts,js,jsx,mjs,cjs}": "eslint --cache --no-error-on-unmatched-pattern"
   },
   "optionalDependencies": {
-    "@indigoai-us/hq-hook-win32-x64": "5.345.156",
-    "@indigoai-us/hq-hook-win32-arm64": "5.345.156",
-    "@indigoai-us/hq-hook-darwin-x64": "5.345.156",
-    "@indigoai-us/hq-hook-darwin-arm64": "5.345.156",
-    "@indigoai-us/hq-hook-linux-x64": "5.345.156",
-    "@indigoai-us/hq-hook-linux-arm64": "5.345.156"
+    "@indigoai-us/hq-hook-win32-x64": "5.345.160",
+    "@indigoai-us/hq-hook-win32-arm64": "5.345.160",
+    "@indigoai-us/hq-hook-darwin-x64": "5.345.160",
+    "@indigoai-us/hq-hook-darwin-arm64": "5.345.160",
+    "@indigoai-us/hq-hook-linux-x64": "5.345.160",
+    "@indigoai-us/hq-hook-linux-arm64": "5.345.160"
   }
 }