@remotedraw/cli 0.2.1 → 0.3.0

package/dist/update.js

@@ -1,6 +1,7 @@
 import path from "node:path";
 import { globalConfigPath } from "./cloud.js";
 import { t } from "./i18n.js";
+import { packageManagerCommands, packageManagerFromUserAgent, } from "./packageManagers.js";
 export const CLI_PACKAGE_NAME = "@remotedraw/cli";
 const DEFAULT_REGISTRY_URL = "https://registry.npmjs.org";
 const CHECK_INTERVAL_MS = 24 * 60 * 60 * 1000;
@@ -75,45 +76,71 @@ export function compareVersions(a, b) {
     }
     return comparePrerelease(left.prerelease, right.prerelease);
 }
+/** Splits a table entry like "pnpm dlx" into something spawnable. */
+function commandLine(text, ...extra) {
+    const [command, ...args] = text.split(" ");
+    return { command: command, args: [...args, ...extra] };
+}
+/**
+ * Where each manager parks a package it is running once and throwing away.
+ * Matching the wrong one is not cosmetic: telling someone who ran `pnpm dlx`
+ * to `pnpm add --global` installs a copy they never asked for.
+ */
+const EPHEMERAL_PATHS = [
+    ["npm", /\/(_npx|\.npm\/_npx)\//],
+    ["bun", /\/\.bun\/install\/cache\//],
+    ["pnpm", /\/pnpm\/dlx\//],
+    // Berry's `yarn dlx` builds a throwaway project directory named dlx-<pid>.
+    ["yarn", /\/dlx-\d+\//],
+];
+/** Where each manager parks a package it installed to stay. */
+const INSTALLED_PATHS = [
+    ["bun", /\/\.bun\//],
+    ["pnpm", /\/(\.pnpm|pnpm)\//],
+    ["yarn", /\/(\.yarn|[Yy]arn)\//],
+];
 /**
- * Derives the update command from where the running binary lives. Guessing
- * wrong only prints the wrong suggestion, so the fallback is plain npm.
+ * Yarn Berry removed global installs, so `yarn global add` is not a command
+ * that exists for it; a Berry user has the CLI as a project dependency, and
+ * `yarn up` is what moves it. Classic (v1) still has the global store.
  */
-export function detectInstallMethod(binPath) {
+function yarnIsBerry(normalizedBinPath) {
+    return /(\.yarn\/(berry|cache|unplugged|__virtual__)|\.pnp)/.test(normalizedBinPath);
+}
+/**
+ * Derives the update command from where the running binary lives, falling back
+ * to the manager that invoked us. Guessing wrong only prints the wrong
+ * suggestion, so the last fallback is plain npm.
+ */
+export function detectInstallMethod(binPath, env = {}) {
     const normalized = binPath.replace(/\\/g, "/");
     const update = `${CLI_PACKAGE_NAME}@latest`;
-    if (/\/(_npx|\.npm\/_npx|\.bun\/install\/cache)\//.test(normalized)) {
-        return { manager: "npm", ephemeral: true, command: "npx", args: [update] };
-    }
-    if (/\/\.bun\//.test(normalized)) {
-        return {
-            manager: "bun",
-            ephemeral: false,
-            command: "bun",
-            args: ["add", "--global", update],
-        };
-    }
-    if (/\/(\.pnpm|pnpm)\//.test(normalized)) {
-        return {
-            manager: "pnpm",
-            ephemeral: false,
-            command: "pnpm",
-            args: ["add", "--global", update],
-        };
+    for (const [manager, pattern] of EPHEMERAL_PATHS) {
+        if (pattern.test(normalized)) {
+            return {
+                manager,
+                ephemeral: true,
+                ...commandLine(packageManagerCommands[manager].dlx, update),
+            };
+        }
     }
-    if (/\/(\.yarn|Yarn)\//.test(normalized)) {
+    // The path says who owns the binary; the user agent only says who launched
+    // this run, which can be a project's npm script over a pnpm-installed CLI.
+    const manager = INSTALLED_PATHS.find(([, pattern]) => pattern.test(normalized))?.[0] ??
+        packageManagerFromUserAgent(env) ??
+        "npm";
+    if (manager === "yarn") {
         return {
-            manager: "yarn",
+            manager,
             ephemeral: false,
-            command: "yarn",
-            args: ["global", "add", update],
+            ...commandLine(yarnIsBerry(normalized) ? "yarn up" : "yarn global add", update),
         };
     }
+    const addGlobal = packageManagerCommands[manager].addGlobal;
     return {
-        manager: "npm",
+        manager,
         ephemeral: false,
-        command: "npm",
-        args: ["install", "--global", update],
+        ...commandLine(addGlobal ?? packageManagerCommands[manager].dlx, update),
     };
 }
 export function installMethodDisplay(method) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotedraw/cli",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Command-line tools for creating and inspecting RemoteDraw integrations.",
   "type": "module",
   "bin": {