@remotedraw/cli 0.2.2 → 0.3.0

package/dist/scan.js

@@ -14,6 +14,7 @@
  */
 import { readdir, readFile, stat } from "node:fs/promises";
 import path from "node:path";
+import { detectPackageManager, packageManagerCommands, } from "./packageManagers.js";
 const SKIPPED_DIRECTORIES = new Set([
     "node_modules",
     ".git",
@@ -355,11 +356,23 @@ export async function scanProject(root, runtime) {
         keyBoundary.warning =
             "No server-side code was found. POST /v1/sessions needs an rd_sk_ key, which must never ship in a browser or app bundle — ask the user where their backend (or a serverless function) lives before scaffolding anything.";
     }
+    const detected = await detectPackageManager(root, { env: runtime.env ?? {}, exists: runtime.exists, readFile: runtime.readFile }, { pathModule: path });
+    const managerCommands = packageManagerCommands[detected.manager];
     return {
         ok: true,
         command: "scan",
         schemaVersion: 1,
         root,
+        packageManager: {
+            id: detected.manager,
+            reason: detected.reason,
+            commands: {
+                install: managerCommands.install,
+                add: managerCommands.add,
+                dlx: managerCommands.dlx,
+                run: managerCommands.run,
+            },
+        },
         projects,
         remotedraw: {
             configured: configFiles.length > 0 || remotedrawPackages.size > 0 || swiftPackage,
@@ -461,8 +474,9 @@ function buildRecommendations(input) {
 }
 function productQuestions(input) {
     const questions = [
-        "What should people draw on — a blank sketch surface, a photo, a PDF, a map, a form field, or a shared screen? This picks target.kind and the preset.",
-        "Where in the product does the drawing live? Name the existing screen or route the receiver goes on; RemoteDraw does not get its own page unless the user asks for a demo.",
+        "Which screen in the product already shows the thing people will draw on, and what device is that screen on? RemoteDraw needs two devices: that screen is the receiver, and a phone is the pen. If the only screen involved is the phone's own, this is not a RemoteDraw flow.",
+        "What is on that screen — a blank sketch surface, a photo your app already shows, a PDF page it renders, a map it owns, a form field, or a shared screen? This picks target.kind and the preset. Your app renders it; the phone never supplies it.",
+        "Where does the receiver go? Name the existing screen or route; RemoteDraw does not get its own page unless the user asks for a demo.",
         "Who holds the phone — the same signed-in user (direct sender, no QR), or anyone who scans (QR join)?",
         "What happens to the drawing when the phone taps Submit — saved to which record, shown where, exported how?",
         "Is this a minimal demo to evaluate RemoteDraw, or the real feature? A demo is one page; the feature is the answers above.",
@@ -476,10 +490,14 @@ function productQuestions(input) {
     return questions;
 }
 export const INTEGRATION_RULES = [
+    "RemoteDraw needs two devices: the receiver is a screen the user is already looking at (desktop, laptop, large display) showing your content, and the sender is a phone. A phone that photographs something and annotates it on its own screen is not a RemoteDraw flow — say so and propose PencilKit or a canvas instead.",
+    "The phone supplies a hand, not content. Your app renders the photo, the PDF page, the map, the form; the iOS sender opens no camera and no file picker.",
     "Ask before installing anything (packages, CLI, Swift package) — name what and why, then wait.",
     "rd_sk_ keys live only in server-side code found by this scan; never in Vite/Next client source, Swift, or an app bundle.",
     "iOS senders use RemoteDrawSenderKit's full-screen surface (`.remoteDrawSurface` / `RemoteDrawTakeover`). Do not write a UIViewRepresentable canvas, and do not put a small canvas inside a sheet.",
     "Web senders use the hosted /join page unless the user explicitly wants an in-page sender.",
+    "Bluetooth and local-network pairing are not implemented anywhere in the product — the radios only advertise, nothing scans. Do not offer them; QR and direct sender are the real methods. There is no native Android SDK and no desktop sender either.",
+    "Use the ready-made components: PairingCode / RemoteDrawConnect / RemoteDrawLaunchButton for pairing, RemoteDrawReceiver (or RemoteDrawMapReceiver over a map) for ink, RemoteDrawSessionControls for state. Do not hand-roll a connect button, an SVG receiver, or a polling loop.",
     "Timestamps (`occurredAt`, point `t`) are integer milliseconds; the SDKs handle this, hand-written clients often do not.",
     "Session creation is billable and not idempotent: guard React StrictMode double effects, and persist the receiverToken if the receiver outlives a page load.",
     "One API key serves every tenant: scope sessions with externalId and verify it before attaching a sender or ending a session.",
@@ -488,7 +506,8 @@ export const INTEGRATION_RULES = [
 export function renderScanText(report) {
     const lines = [];
     lines.push("RemoteDraw scan", "");
-    lines.push(`Root: ${report.root}`, "");
+    lines.push(`Root: ${report.root}`);
+    lines.push(`Package manager: ${report.packageManager.id} (${report.packageManager.reason})`, "");
     lines.push("Projects:");
     if (report.projects.length === 0)
         lines.push("  (none detected)");

package/dist/update.d.ts

@@ -1,4 +1,5 @@
 import { type CloudRuntime } from "./cloud.js";
+import { type PackageManagerId } from "./packageManagers.js";
 export declare const CLI_PACKAGE_NAME = "@remotedraw/cli";
 export type UpdateRuntime = CloudRuntime & {
     /**
@@ -12,8 +13,12 @@ export type UpdateRuntime = CloudRuntime & {
 };
 export type InstallMethod = {
     /** Package manager the binary appears to have been installed with. */
-    manager: "npm" | "pnpm" | "yarn" | "bun";
-    /** True when the binary was resolved by npx/bunx, which never needs updating. */
+    manager: PackageManagerId;
+    /**
+     * True when the binary was resolved by a throwaway runner (npx, pnpm dlx,
+     * yarn dlx, bunx). Nothing survives the command, so there is nothing to
+     * update: the next run fetches the latest by itself.
+     */
     ephemeral: boolean;
     command: string;
     args: string[];
@@ -29,10 +34,11 @@ export declare function parseVersion(value: string): {
 };
 export declare function compareVersions(a: string, b: string): 1 | 0 | -1;
 /**
- * Derives the update command from where the running binary lives. Guessing
- * wrong only prints the wrong suggestion, so the fallback is plain npm.
+ * 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 declare function detectInstallMethod(binPath: string): InstallMethod;
+export declare function detectInstallMethod(binPath: string, env?: Record<string, string | undefined>): InstallMethod;
 export declare function installMethodDisplay(method: InstallMethod): string;
 export declare function updateCachePath(runtime: UpdateRuntime): string;
 export declare function latestPublishedVersion(runtime: UpdateRuntime, timeoutMs?: number): Promise<string | undefined>;

package/dist/update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../src/update.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAGjE,eAAO,MAAM,gBAAgB,oBAAoB,CAAC;AAOlD,MAAM,MAAM,aAAa,GAAG,YAAY,GAAG;IACzC;;;;OAIG;IACH,YAAY,CAAC,EAAE,CACb,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,KACX,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,sEAAsE;IACtE,OAAO,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC;IACzC,iFAAiF;IACjF,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AAiBF,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM;;;EAczC;AA2BD,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,cASnD;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,CAoClE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,UAEzD;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,aAAa,UAErD;AAgDD,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,aAAa,EACtB,SAAS,SAAmB,+BAoC7B;AAED,+EAA+E;AAC/E,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,WAO3E;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,aAAa,EACtB,cAAc,EAAE,MAAM,EACtB,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAO,GAC9C,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CA2BlC;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,UAWrE;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa;;;;;;GAM7E"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../src/update.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAEjE,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,sBAAsB,CAAC;AAE9B,eAAO,MAAM,gBAAgB,oBAAoB,CAAC;AAOlD,MAAM,MAAM,aAAa,GAAG,YAAY,GAAG;IACzC;;;;OAIG;IACH,YAAY,CAAC,EAAE,CACb,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,KACX,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,sEAAsE;IACtE,OAAO,EAAE,gBAAgB,CAAC;IAC1B;;;;OAIG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AAiBF,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM;;;EAczC;AA2BD,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,cASnD;AAuCD;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,MAAM,EACf,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAM,GAC3C,aAAa,CAsCf;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,UAEzD;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,aAAa,UAErD;AAgDD,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,aAAa,EACtB,SAAS,SAAmB,+BAoC7B;AAED,+EAA+E;AAC/E,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,WAO3E;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,aAAa,EACtB,cAAc,EAAE,MAAM,EACtB,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAO,GAC9C,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CA2BlC;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,UAWrE;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa;;;;;;GAM7E"}

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.2",
+  "version": "0.3.0",
   "description": "Command-line tools for creating and inspecting RemoteDraw integrations.",
   "type": "module",
   "bin": {