@mediamonks/canopy-cli 0.2.0 → 0.3.0

package/dist/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as version } from "./package-OcWG7JAW.mjs";
+import { t as version } from "./package-DyEUYkEq.mjs";
 import { i as runRefresh, r as notifyOfUpdate } from "./version-check-CoWgQs2h.mjs";
 import { defineCommand, runMain } from "citty";
 //#region src/index.ts
@@ -54,8 +54,8 @@ const main = defineCommand({
 		db: () => import("./db-CtUG4vfG.mjs").then((m) => m.dbCommand),
 		open: () => import("./open-xLiGUz_W.mjs").then((m) => m.openCommand),
 		docs: () => import("./docs-C3aOAx_A.mjs").then((m) => m.docsCommand),
-		skill: () => import("./skill-jbmERP1X.mjs").then((m) => m.skillCommand),
-		upgrade: () => import("./upgrade-Y8ejvoeg.mjs").then((m) => m.upgradeCommand),
+		skill: () => import("./skill-nN0e59rO.mjs").then((m) => m.skillCommand),
+		upgrade: () => import("./upgrade-C5IoUEZg.mjs").then((m) => m.upgradeCommand),
 		logs: planned("logs", "Tail worker logs", "2")
 	}
 });

package/dist/{package-OcWG7JAW.mjs → package-DyEUYkEq.mjs}

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "0.2.0";
+var version = "0.3.0";
 //#endregion
 export { version as t };

package/dist/{skill-jbmERP1X.mjs → skill-nN0e59rO.mjs}

@@ -1,4 +1,4 @@
-import { t as version } from "./package-OcWG7JAW.mjs";
+import { t as version } from "./package-DyEUYkEq.mjs";
 import { n as reportErrors } from "./ui-C8VuPzGp.mjs";
 import { defineCommand } from "citty";
 import { cpSync, existsSync, mkdirSync, rmSync, symlinkSync, writeFileSync } from "node:fs";

package/dist/{upgrade-Y8ejvoeg.mjs → upgrade-C5IoUEZg.mjs}

@@ -2,26 +2,58 @@ import { t as PACKAGE_NAME } from "./version-check-CoWgQs2h.mjs";
 import { n as reportErrors } from "./ui-C8VuPzGp.mjs";
 import { defineCommand } from "citty";
 import { spawn } from "node:child_process";
+import { fileURLToPath } from "node:url";
 //#region src/upgrade.ts
 /**
 * canopy upgrade — install the latest published CLI globally.
 *
-* We shell out to whichever package manager we can detect (npm/pnpm/yarn/bun),
-* defaulting to npm, and let it do the actual install so global prefixes,
-* permissions and lockfiles stay the manager's concern. `--pm` overrides the
-* guess; `--version` pins a specific release.
+* We shell out to whichever installer we can detect (Vite+, npm, pnpm, yarn or
+* bun), defaulting to npm, and let it do the actual install so global prefixes,
+* permissions and lockfiles stay its concern. `--pm` overrides the guess;
+* `--version` pins a specific release.
+*
+* Detecting Vite+ matters: `vp install -g` keeps its own global store under
+* $VP_HOME and puts its bins first on PATH, so a plain `npm install -g` would
+* install into npm's separate prefix and leave the active `canopy` untouched.
+*/
+const VALID_PMS = [
+	"viteplus",
+	"npm",
+	"pnpm",
+	"yarn",
+	"bun"
+];
+/** Where this CLI's own code lives — the surest hint at how it was installed. */
+function installLocation() {
+	try {
+		return fileURLToPath(import.meta.url);
+	} catch {
+		return process.argv[1] ?? process.execPath;
+	}
+}
+/**
+* Map the location of an installed binary to the installer that owns it — each
+* keeps its global store in a recognisable place (Vite+ under $VP_HOME/packages,
+* then …/pnpm/…, …/.bun/…, …/Yarn/…). Defaults to npm. Exported for testing.
 */
-/** Best-effort guess of the package manager that installed this CLI. */
+function installerForPath(path) {
+	if (/[\\/]\.vite-plus[\\/]packages[\\/]/.test(path)) return "viteplus";
+	if (/[\\/](?:pnpm|\.pnpm)[\\/]/.test(path)) return "pnpm";
+	if (/[\\/]\.bun[\\/]/.test(path)) return "bun";
+	if (/[\\/](?:Yarn|\.yarn)[\\/]/i.test(path)) return "yarn";
+	return "npm";
+}
+/** Best-effort guess of the installer that put this CLI on the machine. */
 function detectPackageManager() {
 	const ua = process.env["npm_config_user_agent"] ?? "";
 	if (ua.startsWith("pnpm")) return "pnpm";
 	if (ua.startsWith("yarn")) return "yarn";
 	if (ua.startsWith("bun")) return "bun";
-	const path = process.argv[1] ?? process.execPath;
-	if (/[\\/](?:pnpm|\.pnpm)[\\/]/.test(path)) return "pnpm";
-	if (/[\\/]\.bun[\\/]/.test(path)) return "bun";
-	if (/[\\/](?:Yarn|\.yarn)[\\/]/i.test(path)) return "yarn";
-	return "npm";
+	return installerForPath(installLocation());
+}
+/** The executable to invoke for `pm` (Vite+ drives installs through `vp`). */
+function pmCommand(pm) {
+	return pm === "viteplus" ? "vp" : pm;
 }
 /** The global-install argv for `pm`, targeting `spec` (e.g. name@latest). */
 function installArgs(pm, spec) {
@@ -70,23 +102,20 @@ const upgradeCommand = defineCommand({
 		},
 		pm: {
 			type: "string",
-			description: "Package manager to use: npm, pnpm, yarn or bun (auto-detected by default)"
+			description: "Installer to use: vp, npm, pnpm, yarn or bun (auto-detected by default)"
 		}
 	},
 	run: reportErrors("upgrade", async ({ args }) => {
-		const chosen = args.pm;
-		if (chosen && ![
-			"npm",
-			"pnpm",
-			"yarn",
-			"bun"
-		].includes(chosen)) throw new Error(`Unknown --pm "${chosen}" — use npm, pnpm, yarn or bun.`);
+		const chosen = args.pm === "vp" ? "viteplus" : args.pm;
+		if (chosen && !VALID_PMS.includes(chosen)) throw new Error(`Unknown --pm "${args.pm}" — use vp, npm, pnpm, yarn or bun.`);
 		const pm = chosen ?? detectPackageManager();
-		const cmd = installArgs(pm, `${PACKAGE_NAME}@${args.version ?? "latest"}`);
-		console.log(`Upgrading via ${pm}: ${pm} ${cmd.join(" ")}`);
-		await run(pm, cmd);
+		const spec = `${PACKAGE_NAME}@${args.version ?? "latest"}`;
+		const command = pmCommand(pm);
+		const cmd = installArgs(pm, spec);
+		console.log(`Upgrading via ${command}: ${command} ${cmd.join(" ")}`);
+		await run(command, cmd);
 		console.log(`\nDone. Run \`canopy --version\` to confirm.`);
-		const { skillInstalled } = await import("./skill-jbmERP1X.mjs");
+		const { skillInstalled } = await import("./skill-nN0e59rO.mjs");
 		if (skillInstalled(process.cwd())) {
 			console.log("Refreshing the Canopy agent skill in this repo…");
 			await run("canopy", ["skill", "install"]).catch((err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mediamonks/canopy-cli",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Canopy CLI — create, develop and deploy Canopy projects.",
   "bin": {
     "canopy": "./dist/index.mjs"
@@ -19,8 +19,8 @@
     "hono": "^4.8.0",
     "miniflare": "^4.20260714.0",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.2.5",
-    "@mediamonks/canopy-data-plane": "0.0.1",
-    "@mediamonks/canopy": "0.0.1"
+    "@mediamonks/canopy": "0.0.1",
+    "@mediamonks/canopy-data-plane": "0.0.1"
   },
   "devDependencies": {
     "@types/node": "^26.1.1",