@cartanova/qgrid-cli 2.3.9 → 2.4.0

package/dist/cli.js

@@ -1,9 +1,58 @@
 #!/usr/bin/env node
 import { execFileSync, execSync, spawnSync } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
-import { dirname, join } from "node:path";
+import { delimiter, dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { Command } from "commander";
+//#region src/self-update.ts
+function detectSelfUpdatePackageManager(qgridPath, userAgent = process.env.npm_config_user_agent) {
+	return userAgent?.includes("pnpm") || qgridPath.includes("pnpm") ? "pnpm" : "npm";
+}
+function parsePnpmGlobalBinDir(output) {
+	return output.match(/configured global bin directory "([^"]+)"/)?.[1] ?? output.match(/global bin directory "([^"]+)"/)?.[1] ?? null;
+}
+function pnpmGlobalBinDir() {
+	const result = spawnSync("pnpm", ["bin", "-g"], { encoding: "utf-8" });
+	if (result.status === 0) {
+		const value = result.stdout.trim();
+		return value.length > 0 ? value : null;
+	}
+	return parsePnpmGlobalBinDir(`${result.stdout}\n${result.stderr}`);
+}
+function withPrependedPath(env, pathEntry) {
+	if (!pathEntry) return env;
+	const parts = (env.PATH ?? "").split(delimiter).filter(Boolean);
+	if (parts.includes(pathEntry)) return env;
+	return {
+		...env,
+		PATH: [pathEntry, ...parts].join(delimiter)
+	};
+}
+function selfUpdateInstallCommand(packageManager, packageName, version) {
+	const exactPackage = `${packageName}@${version}`;
+	return packageManager === "pnpm" ? {
+		command: "pnpm",
+		args: [
+			"add",
+			"-g",
+			exactPackage,
+			"--save-exact"
+		]
+	} : {
+		command: "npm",
+		args: [
+			"i",
+			"-g",
+			exactPackage
+		]
+	};
+}
+function resolveQgridRestartCommand(packageManager, globalBinDir) {
+	if (packageManager !== "pnpm" || !globalBinDir) return "qgrid";
+	const candidate = join(globalBinDir, process.platform === "win32" ? "qgrid.cmd" : "qgrid");
+	return existsSync(candidate) ? candidate : "qgrid";
+}
+//#endregion
 //#region src/cli.ts
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const pkg = JSON.parse(readFileSync(join(__dirname, "..", "package.json"), "utf-8"));
@@ -18,10 +67,11 @@ const RUNTIME_CLI_DEPENDENCIES = [{
 	label: "Claude Code",
 	missingReason: "Anthropic tokens require Claude Code."
 }];
-function commandVersion(command) {
+function commandVersion(command, env = process.env) {
 	try {
 		return execFileSync(command, ["--version"], {
 			encoding: "utf-8",
+			env,
 			stdio: "pipe"
 		}).trim();
 	} catch {
@@ -41,6 +91,16 @@ function packageLatestVersion(packageName) {
 function parseVersion(output) {
 	return output?.match(/\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?/)?.[0] ?? null;
 }
+function commandPath(command) {
+	try {
+		return execFileSync("which", [command], {
+			encoding: "utf-8",
+			stdio: "pipe"
+		}).trim();
+	} catch {
+		return "";
+	}
+}
 function warnMissingRuntimeCliDependency(dep) {
 	console.warn(`Warning: ${dep.command} CLI not found. ${dep.missingReason}`);
 	console.warn(`Install: npm i -g ${dep.packageName}`);
@@ -97,11 +157,32 @@ program.name("qgrid").version(pkg.version).description("Qgrid — LLM subscripti
 	if (!opts.skipUpdate) {
 		const latest = packageLatestVersion("@cartanova/qgrid-cli");
 		if (latest !== pkg.version) {
-			const installCmd = process.env.npm_config_user_agent?.includes("pnpm") || execSync("which qgrid", { encoding: "utf-8" }).includes("pnpm") ? "pnpm add -g @cartanova/qgrid-cli@latest" : "npm i -g @cartanova/qgrid-cli@latest";
+			const packageManager = detectSelfUpdatePackageManager(commandPath("qgrid"));
+			const globalBinDir = packageManager === "pnpm" ? pnpmGlobalBinDir() : null;
+			const updateEnv = withPrependedPath(process.env, globalBinDir);
+			const installCmd = selfUpdateInstallCommand(packageManager, "@cartanova/qgrid-cli", latest);
 			console.log(`Updating qgrid-cli: ${pkg.version} → ${latest}`);
-			execSync(installCmd, { stdio: "inherit" });
+			const updated = spawnSync(installCmd.command, installCmd.args, {
+				env: updateEnv,
+				stdio: "inherit"
+			});
+			if (updated.status !== 0) {
+				console.error(`Failed to update qgrid-cli to ${latest}.`);
+				console.error(`Fix the global ${packageManager} installation and run qgrid again.`);
+				process.exit(updated.status ?? 1);
+			}
+			const restartCommand = resolveQgridRestartCommand(packageManager, globalBinDir);
+			const updatedVersion = parseVersion(commandVersion(restartCommand, updateEnv));
+			if (updatedVersion !== latest) {
+				console.error(`Failed to run updated qgrid-cli. Expected ${latest}, found ${updatedVersion ?? "unknown"}.`);
+				console.error(`Check PATH and global ${packageManager} bin configuration.`);
+				process.exit(1);
+			}
 			console.log("Updated. Restarting...\n");
-			const restarted = spawnSync("qgrid", process.argv.slice(2).concat("--skip-update"), { stdio: "inherit" });
+			const restarted = spawnSync(restartCommand, process.argv.slice(2).concat("--skip-update"), {
+				env: updateEnv,
+				stdio: "inherit"
+			});
 			process.exit(restarted.status ?? 0);
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cartanova/qgrid-cli",
-  "version": "2.3.9",
+  "version": "2.4.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/cartanova-ai/qgrid"

package/skills/qgrid/references/cli-env-and-server-boot.md

@@ -8,6 +8,8 @@ Use this reference for qgrid startup, configuration, and runtime-facing environm
 - `-p, --port <port>`: server port. Default `44900`. The CLI validates the port and refuses to start if it is already in use.
 - `--skip-update`: skip qgrid CLI self-update check.
 
+The self-update check is strict: when npm reports a newer `@cartanova/qgrid-cli`, including patch releases, the CLI installs that exact resolved version and restarts from the updated binary. Do not use a moving `@latest` install target for this path; exact versions avoid stale pnpm global project ranges.
+
 The CLI also ensures runtime CLIs are installed/current enough:
 
 - `codex` from `@openai/codex`, required for OpenAI tokens.