@rness/cli 0.6.0 → 0.6.1

package/README.md

@@ -147,6 +147,18 @@ its content does.
 Exit codes: 0 success, 1 failure, 2 usage — or a refusal without a TTY.
 `RNESS_DEBUG=1` adds stack traces; `RNESS_NO_DELEGATE=1` skips the delegation.
 
+## 0.6.1 — hints you can type
+
+- Every hint that names a command to run (`not cloned: …`, `run … sync`,
+  `run … login`, `… upgrade <version>`) spells rness the way it was
+  launched: `npx @rness/cli`, `pnpm dlx @rness/cli`, `yarn dlx @rness/cli`
+  (npx on Yarn 1), `bunx @rness/cli`, or `rness` when it was typed directly.
+  The next steps of `create` follow the same rule; `--pm`, which chooses what
+  `.rness/` installs with, no longer decides them.
+- Under `rness-dev` (`RNESS_NO_DELEGATE=1`), `create` writes its first blocks
+  from the sources rather than through the copy it just installed.
+- Blocks are unchanged: no `rness sync` is needed after upgrading.
+
 ## 0.6.0 — a workspace without GitHub
 
 - `rness create <name> --blank` writes `<name>/.rness/` (a `rness.json`
@@ -317,12 +329,16 @@ To reach it from a workspace elsewhere on the machine, link it once:
     ln -s "$PWD/scripts/dev.mjs" ~/.local/bin/rness-dev   # from the repository root
     cd ~/somewhere/acme && rness-dev validate
 
-`create` is never delegated, so it always runs these sources — and it refuses
-to run inside a workspace, so call it from an empty directory.
+`create` is never delegated, so it always runs these sources — the blocks it
+writes at the end included, even once it has installed the pinned copy — and
+it refuses to run inside a workspace, so call it from an empty directory.
 
 `pnpm verdaccio` is the other loop: a local registry that serves this build as
 a real package, for what only shows up through an install (`npm create rness`,
-the pinned copy, a version bump). It is slower, and its caches have to be
-forgotten on every redeploy, which `deploy` now does.
+the pinned copy, a version bump). Each `pnpm verdaccio deploy` publishes a
+version of its own — `0.6.1-dev.<time>` for sources at 0.6.0 — so a new
+workspace pins exactly that build and no cache serves an older one under its
+number. To try it in a workspace that exists, run `rness upgrade <version>`
+inside it; the deploy prints the line.
 
 Node ≥ 24. MIT.

package/dist/bin/rness.js

@@ -6,7 +6,7 @@ import {
   findDelegate,
   reportError,
   run
-} from "../chunk-NY3WV7X5.js";
+} from "../chunk-YAIZOFYV.js";
 
 // src/bin/rness.ts
 import { pathToFileURL } from "url";

package/dist/{chunk-NY3WV7X5.js → chunk-YAIZOFYV.js}

@@ -45,6 +45,75 @@ async function writeFileAtomic(p, text) {
   }
 }
 
+// src/core/pm.ts
+import { execFile } from "child_process";
+import { promisify } from "util";
+var execFileP = promisify(execFile);
+var PACKAGE_MANAGERS = [
+  "npm",
+  "pnpm",
+  "yarn",
+  "bun"
+];
+function isPackageManager(value) {
+  return PACKAGE_MANAGERS.includes(value);
+}
+function detectPackageManager(userAgent = process.env["npm_config_user_agent"] ?? "") {
+  const name = userAgent.split("/")[0] ?? "";
+  return isPackageManager(name) ? name : "npm";
+}
+function firstLine(text) {
+  return text.split("\n").find((l) => l.trim() !== "")?.trim() ?? "unknown error";
+}
+async function packageManagerVersion(pm) {
+  try {
+    const { stdout } = await execFileP(pm, ["--version"]);
+    return stdout.trim();
+  } catch (e) {
+    throw new Error(`${pm} is not available on PATH`, { cause: e });
+  }
+}
+function rnessRunner(pm, version) {
+  if (pm === "pnpm") return "pnpm dlx @rness/cli";
+  if (pm === "bun") return "bunx @rness/cli";
+  if (pm === "yarn" && Number(version?.split(".")[0]) >= 2)
+    return "yarn dlx @rness/cli";
+  return "npx @rness/cli";
+}
+function rnessCommand(env = process.env) {
+  const agent = env["npm_config_user_agent"] ?? "";
+  if (agent === "") return "rness";
+  const pm = detectPackageManager(agent);
+  const [name, version] = (agent.split(" ")[0] ?? "").split("/");
+  return rnessRunner(pm, name === pm ? version ?? null : null);
+}
+var BARE_NPM_CODE = /^npm (error|ERR!) code \S+$/;
+function installErrorLine(stderr) {
+  const lines = stderr.split("\n").map((l) => l.trim()).filter((l) => l !== "");
+  return lines.find((l) => !BARE_NPM_CODE.test(l)) ?? firstLine(stderr);
+}
+var FROZEN = {
+  npm: ["ci"],
+  pnpm: ["install", "--frozen-lockfile"],
+  yarn: ["install", "--immutable"],
+  bun: ["install", "--frozen-lockfile"]
+};
+function frozenArgs(pm) {
+  return [...FROZEN[pm]];
+}
+async function installDependencies(pm, dir, opts = {}) {
+  const args = opts.frozen === true ? frozenArgs(pm) : ["install"];
+  try {
+    await execFileP(pm, args, { cwd: dir, maxBuffer: 16 * 1024 * 1024 });
+  } catch (e) {
+    const err = e;
+    throw new Error(
+      `${pm} ${args.join(" ")} failed in ${dir}: ${installErrorLine(err.stderr ?? err.message)}`,
+      { cause: e }
+    );
+  }
+}
+
 // src/core/auth.ts
 import { chmod, mkdir, open, readFile as readFile2, rm as rm2, stat } from "fs/promises";
 import { homedir } from "os";
@@ -298,7 +367,7 @@ async function resolveToken(deps = {}) {
         await clearAuth();
         (deps.notify ?? ((l) => process.stderr.write(`${l}
 `)))(
-          "your GitHub login expired; run rness login"
+          `your GitHub login expired; run ${rnessCommand()} login`
         );
         return null;
       }
@@ -313,7 +382,7 @@ async function resolveToken(deps = {}) {
 var DEFAULT_GITHUB_API = "https://api.github.com";
 var MAX_PAGES = 50;
 var PER_PAGE = 100;
-var ADD_LATER = "; add repositories later with rness add <repo>";
+var addLater = () => `; add repositories later with ${rnessCommand()} add <repo>`;
 var NEXT = /<[^>]*>\s*;\s*rel="next"/;
 function isRepository(value) {
   if (value === null || typeof value !== "object") return false;
@@ -357,12 +426,12 @@ function httpError(page, path) {
     return new Error("GitHub rejected the token (401)", { cause });
   if (page.status === 429 || page.status === 403 && (page.headers.get("x-ratelimit-remaining") === "0" || page.headers.has("retry-after"))) {
     return new Error(
-      "GitHub API rate limit reached; set GITHUB_TOKEN or add repositories later with rness add",
+      `GitHub API rate limit reached; set GITHUB_TOKEN or add repositories later with ${rnessCommand()} add`,
       { cause }
     );
   }
   return new Error(
-    `GitHub API answered ${page.status} for ${path}${ADD_LATER}`,
+    `GitHub API answered ${page.status} for ${path}${addLater()}`,
     { cause }
   );
 }
@@ -403,7 +472,7 @@ async function listRepositories(owner, options) {
       page = await getPage(url(kind, n), headers, timeoutMs);
       if (page.status === 404) {
         throw new Error(
-          `GitHub has no organization or user named "${owner}" (or it is not visible to you)${ADD_LATER}`,
+          `GitHub has no organization or user named "${owner}" (or it is not visible to you)${addLater()}`,
           { cause: { status: 404, path: kind.path } }
         );
       }
@@ -599,10 +668,10 @@ async function githubProvider(apiBase) {
 import { spawn } from "child_process";
 
 // src/core/git.ts
-import { execFile } from "child_process";
+import { execFile as execFile2 } from "child_process";
 import { dirname as dirname2, resolve } from "path";
-import { promisify } from "util";
-var execFileP = promisify(execFile);
+import { promisify as promisify2 } from "util";
+var execFileP2 = promisify2(execFile2);
 var ENV_HELPER = '!f() { test "$1" = get && printf "username=%s\\npassword=%s\\n" "$RNESS_GIT_USERNAME" "$RNESS_GIT_TOKEN"; }; f';
 function withCredentials(credentials) {
   if (credentials === null || credentials === void 0)
@@ -618,7 +687,7 @@ function withCredentials(credentials) {
 async function git(args, cwd, credentials) {
   const auth = withCredentials(credentials);
   try {
-    const { stdout } = await execFileP("git", [...auth.args, ...args], {
+    const { stdout } = await execFileP2("git", [...auth.args, ...args], {
       ...cwd === void 0 ? {} : { cwd },
       env: {
         ...process.env,
@@ -709,7 +778,7 @@ var NOT_FOUND = [
   /repository .*not found/i,
   /does not appear to be a git repository/i
 ];
-function firstLine(text) {
+function firstLine2(text) {
   return text.split("\n").find((l) => l.trim() !== "")?.trim() ?? "unknown error";
 }
 function classifyProbe(url, exitCode, stderr) {
@@ -717,10 +786,10 @@ function classifyProbe(url, exitCode, stderr) {
   if (AUTH.some((r) => r.test(stderr)))
     return {
       kind: "error",
-      message: `cannot access ${url}: ${firstLine(stderr)}`
+      message: `cannot access ${url}: ${firstLine2(stderr)}`
     };
   if (NOT_FOUND.some((r) => r.test(stderr))) return { kind: "not-found" };
-  return { kind: "error", message: `cannot reach ${url}: ${firstLine(stderr)}` };
+  return { kind: "error", message: `cannot reach ${url}: ${firstLine2(stderr)}` };
 }
 var STDERR_FLUSH_MS = 200;
 async function probeRemote(url, timeoutMs = 6e4, credentials) {
@@ -1149,7 +1218,7 @@ var GREETING = /^Hi ([^!\s]+)! You've successfully authenticated/m;
 function parseSshGreeting(stderr) {
   return GREETING.exec(stderr)?.[1] ?? null;
 }
-function firstLine2(text) {
+function firstLine3(text) {
   return text.split("\n").find((l) => l.trim() !== "")?.trim() ?? null;
 }
 var STDERR_FLUSH_MS2 = 200;
@@ -1189,7 +1258,7 @@ async function detectGithubSsh(opts) {
         settle(
           login !== null ? { ok: true, login } : {
             ok: false,
-            reason: firstLine2(stderr2) ?? `ssh exited with code ${code ?? "?"}`
+            reason: firstLine3(stderr2) ?? `ssh exited with code ${code ?? "?"}`
           }
         );
       };
@@ -1254,7 +1323,7 @@ var INSTEAD_OF_LINES = [
   '  git config --global url."https://github.com/".insteadOf git@github.com:'
 ];
 function httpsFlagLine(spec) {
-  return `or clone this repository over HTTPS: rness add ${spec} --https`;
+  return `or clone this repository over HTTPS: ${rnessCommand()} add ${spec} --https`;
 }
 
 // src/core/workspace.ts
@@ -1916,7 +1985,7 @@ async function syncCommand(opts, deps = {}) {
       }
       if (notCloned.size > 0)
         lines.push(
-          `not cloned: ${[...notCloned].join(", ")} (rness add <name>, or rness sync --all)`
+          `not cloned: ${[...notCloned].join(", ")} (${rnessCommand()} add <name>, or ${rnessCommand()} sync --all)`
         );
       const scoped = new Set(
         Object.values(manifest.scopes).map((s) => s.path.split("/")[1])
@@ -1926,7 +1995,7 @@ async function syncCommand(opts, deps = {}) {
       );
       if (undeclared.length > 0)
         lines.push(
-          `not in rness.json: ${undeclared.join(", ")} (rness add <name> declares it)`
+          `not in rness.json: ${undeclared.join(", ")} (${rnessCommand()} add <name> declares it)`
         );
       if (!await exists(join9(ws.root, "org"))) {
         lines.push(["skipped", "blocks (no org/ directory here)"]);
@@ -1990,7 +2059,9 @@ async function syncCommand(opts, deps = {}) {
           lines.push(["updated", `${t.label}`]);
         }
         if (check && differences > 0)
-          problems.push(`${differences} block(s) out of date \u2014 run rness sync`);
+          problems.push(
+            `${differences} block(s) out of date \u2014 run ${rnessCommand()} sync`
+          );
       }
       return problems.length > 0 ? 1 : 0;
     } finally {
@@ -2230,7 +2301,7 @@ async function contextCommand(opts) {
 }
 
 // src/version.ts
-var VERSION = "0.6.0";
+var VERSION = "0.6.1";
 
 // src/core/delegate.ts
 import { readFile as readFile6 } from "fs/promises";
@@ -2279,72 +2350,6 @@ async function findDelegate(cwd, ownVersion) {
   return { entry: join11(pinned.dir, "dist", "index.js"), version, root };
 }
 
-// src/core/pm.ts
-import { execFile as execFile2 } from "child_process";
-import { promisify as promisify2 } from "util";
-var execFileP2 = promisify2(execFile2);
-var PACKAGE_MANAGERS = [
-  "npm",
-  "pnpm",
-  "yarn",
-  "bun"
-];
-function isPackageManager(value) {
-  return PACKAGE_MANAGERS.includes(value);
-}
-function detectPackageManager(userAgent = process.env["npm_config_user_agent"] ?? "") {
-  const name = userAgent.split("/")[0] ?? "";
-  return isPackageManager(name) ? name : "npm";
-}
-function firstLine3(text) {
-  return text.split("\n").find((l) => l.trim() !== "")?.trim() ?? "unknown error";
-}
-async function packageManagerVersion(pm) {
-  try {
-    const { stdout } = await execFileP2(pm, ["--version"]);
-    return stdout.trim();
-  } catch (e) {
-    throw new Error(`${pm} is not available on PATH`, { cause: e });
-  }
-}
-function rnessRunner(pm, version) {
-  if (pm === "pnpm") return "pnpm dlx @rness/cli";
-  if (pm === "bun") return "bunx @rness/cli";
-  if (pm === "yarn" && Number(version?.split(".")[0]) >= 2)
-    return "yarn dlx @rness/cli";
-  return "npx @rness/cli";
-}
-async function rnessRunnerFor(pm) {
-  const version = pm === "yarn" ? await packageManagerVersion(pm).catch(() => null) : null;
-  return rnessRunner(pm, version);
-}
-var BARE_NPM_CODE = /^npm (error|ERR!) code \S+$/;
-function installErrorLine(stderr) {
-  const lines = stderr.split("\n").map((l) => l.trim()).filter((l) => l !== "");
-  return lines.find((l) => !BARE_NPM_CODE.test(l)) ?? firstLine3(stderr);
-}
-var FROZEN = {
-  npm: ["ci"],
-  pnpm: ["install", "--frozen-lockfile"],
-  yarn: ["install", "--immutable"],
-  bun: ["install", "--frozen-lockfile"]
-};
-function frozenArgs(pm) {
-  return [...FROZEN[pm]];
-}
-async function installDependencies(pm, dir, opts = {}) {
-  const args = opts.frozen === true ? frozenArgs(pm) : ["install"];
-  try {
-    await execFileP2(pm, args, { cwd: dir, maxBuffer: 16 * 1024 * 1024 });
-  } catch (e) {
-    const err = e;
-    throw new Error(
-      `${pm} ${args.join(" ")} failed in ${dir}: ${installErrorLine(err.stderr ?? err.message)}`,
-      { cause: e }
-    );
-  }
-}
-
 // src/core/scaffold.ts
 import { statSync } from "fs";
 import { dirname as dirname4, join as join12 } from "path";
@@ -2480,8 +2485,8 @@ async function offerSetupGit(opts, terminal, bin, ui) {
   const changed = await setupGit(process.execPath, bin);
   ui.line(
     changed ? "updated" : "unchanged",
-    "git: rness answers for https://github.com (rness logout undoes it)",
-    "git now asks rness for your github.com login over HTTPS (rness logout undoes it)"
+    `git: rness answers for https://github.com (${rnessCommand()} logout undoes it)`,
+    `git now asks rness for your github.com login over HTTPS (${rnessCommand()} logout undoes it)`
   );
 }
 async function loginCommand(opts, deps = {}) {
@@ -2498,7 +2503,7 @@ async function loginCommand(opts, deps = {}) {
     if (stored !== null && await resolveToken() !== null) {
       ui.line(
         "logged in",
-        `as ${stored.login} (github.com); rness logout to switch`
+        `as ${stored.login} (github.com); ${rnessCommand()} logout to switch`
       );
       await offerSetupGit(opts, terminal, bin, ui);
       if (own) ui.outro("Nothing to do", "idle");
@@ -2761,7 +2766,7 @@ async function syncPinned(root, shown, fallback) {
   if (installed === null) {
     if (fallback !== void 0) return fallback();
     process.stderr.write(
-      `@rness/cli is not installed in ${shown}/.rness; install in .rness/, then rness sync
+      `@rness/cli is not installed in ${shown}/.rness; install in .rness/, then ${rnessCommand()} sync
 `
     );
     return 1;
@@ -2818,8 +2823,8 @@ async function targetProblem(cwd, root, pm) {
   if (!await exists(root)) return null;
   if (await exists(join15(root, ".rness", "rness.json"))) {
     if (!await exists(join15(root, ".rness", "node_modules")))
-      return `${shown} holds an rness workspace whose dependencies are not installed; cd ${shown}/.rness && ${pm} install, then rness sync`;
-    return `${shown} already holds an rness workspace (.rness/); run rness add inside it to add repositories`;
+      return `${shown} holds an rness workspace whose dependencies are not installed; cd ${shown}/.rness && ${pm} install, then ${rnessCommand()} sync`;
+    return `${shown} already holds an rness workspace (.rness/); run ${rnessCommand()} add inside it to add repositories`;
   }
   if (!(await stat3(root)).isDirectory()) return `${shown} is not a directory`;
   if (!await isEmptyDir(root)) return `${shown} is not empty`;
@@ -2879,6 +2884,8 @@ async function commitContext(input) {
 
 // src/core/sync-blocks.ts
 async function syncBlocks(ui, root, shown, inPlace, sshWorks) {
+  if (process.env["RNESS_NO_DELEGATE"] === "1" && inPlace !== void 0)
+    return inPlace();
   if (!ui.session)
     return ui.step(
       { doing: "syncing  the blocks", git: true },
@@ -2895,7 +2902,7 @@ async function syncBlocks(ui, root, shown, inPlace, sshWorks) {
   if (result === null) {
     if (inPlace !== void 0) return inPlace();
     ui.error(
-      `@rness/cli is not installed in ${shown}/.rness; install in .rness/, then rness sync`
+      `@rness/cli is not installed in ${shown}/.rness; install in .rness/, then ${rnessCommand()} sync`
     );
     return 1;
   }
@@ -2985,7 +2992,7 @@ async function createBlank(input) {
   const next = [
     `cd ${shown}`,
     "# bring a repository in: <owner>/<repo> on GitHub, or any git URL",
-    `${await rnessRunnerFor(pm)} add <owner>/<repo>`,
+    `${rnessCommand()} add <owner>/<repo>`,
     '# to share it: set "org" in .rness/rness.json, then push .rness to github.com/<org>/.rness'
   ];
   if (ui.session) {
@@ -3055,11 +3062,11 @@ async function pickRepositories(input) {
     listed = listing.repositories;
     if (listing.owner === "user")
       ui.hint(
-        `only public repositories of ${org} are listed; add private ones later with rness add <repo>`
+        `only public repositories of ${org} are listed; add private ones later with ${rnessCommand()} add <repo>`
       );
     else if (!provider.authenticated)
       ui.hint(
-        "only public repositories are listed; rness login lists the private ones you can access"
+        `only public repositories are listed; ${rnessCommand()} login lists the private ones you can access`
       );
     if (listing.truncated)
       ui.hint(`listed the first ${MAX_PAGES * PER_PAGE} repositories of ${org}`);
@@ -3290,7 +3297,6 @@ async function createCommand(opts, deps = {}) {
     return 2;
   }
   let pm = opts.pm !== void 0 && isPackageManager(opts.pm) ? opts.pm : detectPackageManager();
-  const launchedWith = pm;
   const interactive = opts.yes !== true && terminal.isTty();
   const ui = interactive ? await makeUi(terminal) : { ...plainUi };
   let sshTest;
@@ -3523,7 +3529,7 @@ async function createCommand(opts, deps = {}) {
       const remaining = Object.keys(catalogue.repos).filter(
         (name2) => !cloned.has(name2)
       );
-      const rness2 = await rnessRunnerFor(launchedWith);
+      const rness2 = rnessCommand();
       const next2 = [
         `cd ${shown}`,
         // The comment above its command, as the new-workspace note does: a
@@ -3583,7 +3589,7 @@ ${next2.map((l) => `  ${l}`).join("\n")}
       url: contextUrl
     }) : false;
     if (published === null) return cancelled(ui);
-    const rness = await rnessRunnerFor(launchedWith);
+    const rness = rnessCommand();
     const next = [
       `cd ${shown}/.rness`,
       // What was asked for and did not happen, as the command that retries
@@ -3597,7 +3603,9 @@ ${next2.map((l) => `  ${l}`).join("\n")}
         "# or, with the GitHub CLI (gh) installed, in one step:",
         `gh repo create ${org}/.rness --private --source . --push`
       ],
-      `# then, for every teammate: ${launchedWith} create rness ${org}`
+      // How this command was launched (npm when rness was typed directly),
+      // whatever --pm installed with.
+      `# then, for every teammate: ${detectPackageManager()} create rness ${org}`
     ];
     if (ui.session) {
       ui.note("Next steps", next);
@@ -3687,7 +3695,7 @@ async function upgradeCommand(version, opts, terminal = defaultTerminal) {
     const pin = await readPin(ws.rnessDir);
     if (pin === null) {
       process.stderr.write(
-        `no @rness/cli entry in ${label}/package.json; add it to devDependencies, then run rness upgrade
+        `no @rness/cli entry in ${label}/package.json; add it to devDependencies, then run ${rnessCommand()} upgrade
 `
       );
       return 1;
@@ -3708,7 +3716,8 @@ async function upgradeCommand(version, opts, terminal = defaultTerminal) {
     );
     if (target === null) {
       process.stderr.write(
-        "cannot reach the registry; name the version: rness upgrade <version>\n"
+        `cannot reach the registry; name the version: ${rnessCommand()} upgrade <version>
+`
       );
       return 1;
     }
@@ -3722,7 +3731,7 @@ async function upgradeCommand(version, opts, terminal = defaultTerminal) {
     const downgrading = EXACT_VERSION.test(pin.spec) && compareVersions(target, pin.spec) < 0;
     if (downgrading && version === void 0) {
       process.stderr.write(
-        `${label} pins @rness/cli ${pin.spec}, newer than the latest release ${target}; to downgrade: rness upgrade ${target}
+        `${label} pins @rness/cli ${pin.spec}, newer than the latest release ${target}; to downgrade: ${rnessCommand()} upgrade ${target}
 `
       );
       return 1;
@@ -3889,7 +3898,7 @@ async function checkBlocks({
       note(
         t.label,
         "no-block",
-        `${t.label}: no rness block yet (run rness sync)`
+        `${t.label}: no rness block yet (run ${rnessCommand()} sync)`
       );
       continue;
     }
@@ -3911,7 +3920,11 @@ async function checkBlocks({
     if (isCurrentBlock(lines.slice(found.begin, found.end + 1), fresh2.hash))
       note(t.label, "current");
     else
-      note(t.label, "stale", `${t.label}: stale rness block (run rness sync)`);
+      note(
+        t.label,
+        "stale",
+        `${t.label}: stale rness block (run ${rnessCommand()} sync)`
+      );
   }
   return derive();
 }
@@ -4215,6 +4228,11 @@ export {
   exists,
   readOrNull,
   writeFileAtomic,
+  PACKAGE_MANAGERS,
+  isPackageManager,
+  detectPackageManager,
+  packageManagerVersion,
+  installDependencies,
   GitHubOAuthProvider,
   githubProvider,
   DEFAULT_HOST,
@@ -4259,11 +4277,6 @@ export {
   contextCommand,
   VERSION,
   findDelegate,
-  PACKAGE_MANAGERS,
-  isPackageManager,
-  detectPackageManager,
-  packageManagerVersion,
-  installDependencies,
   SCAFFOLD_FILES,
   scaffoldDir,
   copyScaffold,
@@ -4279,4 +4292,4 @@ export {
   OWN_COMMANDS,
   catchUp
 };
-//# sourceMappingURL=chunk-NY3WV7X5.js.map
+//# sourceMappingURL=chunk-YAIZOFYV.js.map