@rness/cli 0.5.2 → 0.5.3

package/dist/{chunk-P4YG6P7I.js → chunk-CQ6YD63L.js}

@@ -2331,12 +2331,227 @@ async function installDependencies(pm, dir, opts = {}) {
   }
 }
 
-// src/core/pinned.ts
+// src/core/scaffold.ts
+import { statSync } from "fs";
+import { dirname as dirname4, join as join12 } from "path";
+import { fileURLToPath } from "url";
+var SCAFFOLD_FILES = [
+  "AGENTS.md",
+  "CONVENTIONS.md",
+  "README.md",
+  "WORKSPACE.md",
+  "rness.json",
+  "package.json",
+  "_gitignore",
+  ".githooks/pre-commit",
+  ".github/workflows/validate.yml",
+  ".github/dependabot.yml",
+  "pnpm-workspace.yaml",
+  "adr/0000-template.md",
+  "standards/.gitkeep",
+  "specs/.gitkeep",
+  "plans/.gitkeep",
+  "skills/.gitkeep",
+  "docs/.gitkeep"
+];
+function scaffoldDir() {
+  let dir = dirname4(fileURLToPath(import.meta.url));
+  for (let i = 0; i < 4; i += 1) {
+    const candidate = join12(dir, "scaffold");
+    try {
+      if (statSync(join12(candidate, "rness.json")).isFile()) return candidate;
+    } catch {
+    }
+    dir = dirname4(dir);
+  }
+  throw new Error("scaffold directory not found next to the @rness/cli package");
+}
+
+// src/core/scaffold-copy.ts
+import { chmod as chmod2, mkdir as mkdir2, readFile as readFile7, stat as stat2, writeFile as writeFile2 } from "fs/promises";
+import { dirname as dirname5, join as join13 } from "path";
+var TOKENISED = /* @__PURE__ */ new Set(["package.json"]);
+async function copyScaffold(dest, tokens) {
+  const source = scaffoldDir();
+  for (const rel of SCAFFOLD_FILES) {
+    if (rel === "rness.json") continue;
+    const from = join13(source, ...rel.split("/"));
+    const targetRel = rel === "_gitignore" ? ".gitignore" : rel;
+    const to = join13(dest, ...targetRel.split("/"));
+    await mkdir2(dirname5(to), { recursive: true });
+    let content = await readFile7(from, "utf8");
+    if (TOKENISED.has(rel)) {
+      content = content.replaceAll("__RNESS_VERSION__", tokens.version).replaceAll("__RNESS_PM__", tokens.packageManager);
+    }
+    await writeFile2(to, content, "utf8");
+    const mode = (await stat2(from)).mode & 511;
+    if (mode & 73) await chmod2(to, mode);
+  }
+}
+
+// src/version.ts
+var VERSION = "0.5.3";
+
+// src/commands/login.ts
+import { spawn as spawn3 } from "child_process";
+import { realpath } from "fs/promises";
+
+// src/core/setup-git.ts
 import { execFile as execFile3 } from "child_process";
-import { readFile as readFile7 } from "fs/promises";
-import { basename as basename4, join as join12 } from "path";
 import { promisify as promisify3 } from "util";
 var execFileP3 = promisify3(execFile3);
+var KEY = "credential.https://github.com.helper";
+function helperValue(node, bin) {
+  return `!'${node}' '${bin}' git-credential`;
+}
+var isOurs = (value) => /^!'[^']+' '[^']*rness[^']*' git-credential$/.test(value);
+async function config(args) {
+  const { stdout } = await execFileP3("git", ["config", "--global", ...args]);
+  return stdout;
+}
+async function values() {
+  try {
+    const out = await config(["--get-all", KEY]);
+    return out.replace(/\n$/, "").split("\n");
+  } catch {
+    return [];
+  }
+}
+function isStableInstall(bin) {
+  return !/[\\/]_npx[\\/]/.test(bin);
+}
+async function setupGit(node, bin) {
+  const ours = helperValue(node, bin);
+  if ((await values()).includes(ours)) return false;
+  await removeGitSetup();
+  await config(["--add", KEY, ""]);
+  await config(["--add", KEY, ours]);
+  return true;
+}
+async function removeGitSetup() {
+  const current = await values();
+  if (!current.some(isOurs)) return false;
+  const kept = current.filter(
+    (value, i) => !isOurs(value) && !(value === "" && isOurs(current[i + 1] ?? ""))
+  );
+  await config(["--unset-all", KEY]);
+  for (const value of kept) await config(["--add", KEY, value]);
+  return true;
+}
+
+// src/commands/login.ts
+function openInBrowser(url) {
+  const [command, args] = process.platform === "darwin" ? ["open", [url]] : process.platform === "win32" ? ["cmd", ["/c", "start", "", url]] : ["xdg-open", [url]];
+  try {
+    const child = spawn3(command, args, { stdio: "ignore", detached: true });
+    child.on("error", () => void 0);
+    child.unref();
+  } catch {
+  }
+}
+async function offerSetupGit(opts, terminal, bin, ui) {
+  if (opts.setupGit === false) return;
+  if (!isStableInstall(bin)) {
+    ui.hint(
+      "install rness globally to let git use your login: npm i -g @rness/cli"
+    );
+    return;
+  }
+  if (opts.setupGit !== true) {
+    if (!terminal.isTty()) return;
+    const p = await terminal.prompts();
+    const ok = await p.confirm({
+      message: "Use rness to authenticate git over HTTPS for github.com?",
+      initialValue: true
+    });
+    if (p.isCancel(ok) || ok !== true) return;
+  }
+  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)"
+  );
+}
+async function loginCommand(opts, deps = {}) {
+  const terminal = deps.terminal ?? defaultTerminal;
+  const own = deps.ui === void 0;
+  const ui = deps.ui ?? await makeUi(terminal);
+  if (own) ui.intro("Log in to GitHub");
+  try {
+    const bin = deps.bin ?? await realpath(process.argv[1] ?? "").catch(() => "");
+    const env = envToken();
+    if (env !== null)
+      ui.hint(`${env.source} is set and wins over a stored login`);
+    const stored = await readAuth();
+    if (stored !== null && await resolveToken() !== null) {
+      ui.line(
+        "logged in",
+        `as ${stored.login} (github.com); rness logout to switch`
+      );
+      await offerSetupGit(opts, terminal, bin, ui);
+      if (own) ui.outro("Nothing to do", "idle");
+      return 0;
+    }
+    const code = await requestDeviceCode();
+    if (ui.session)
+      ui.line(
+        "open",
+        code.verificationUri,
+        `Open ${code.verificationUri} and enter the code ${code.userCode}`
+      );
+    else {
+      ui.line("open", code.verificationUri);
+      ui.line("code", code.userCode);
+    }
+    if (terminal.isTty() && process.env["SSH_CONNECTION"] === void 0)
+      (deps.open ?? openInBrowser)(code.verificationUri);
+    if (!ui.session)
+      ui.line("waiting", "for you to approve rness on github.com\u2026");
+    const login = await ui.step(
+      {
+        doing: "waiting  for you to approve rness on github.com",
+        sentence: "Waiting for your approval on github.com",
+        quiet: true
+      },
+      async () => {
+        const tokens = await pollForToken(code, deps);
+        const user = await getUser({
+          token: tokens.accessToken,
+          apiBase: opts.githubApi ?? DEFAULT_GITHUB_API
+        });
+        await writeAuth({ login: user.login, tokens });
+        return user.login;
+      },
+      (name) => ["logged in", `as ${name} (github.com)`]
+    );
+    if (!ui.session) ui.line("logged in", `as ${login} (github.com)`);
+    await offerSetupGit(opts, terminal, bin, ui);
+    if (own) ui.outro(`You are logged in as ${login}`);
+    return 0;
+  } catch (e) {
+    if (e instanceof LoginError) {
+      ui.error(e.message);
+      return 1;
+    }
+    return reportError(e);
+  }
+}
+function revokeUrl() {
+  return `https://github.com/settings/connections/applications/${clientId()}`;
+}
+
+// src/commands/create.ts
+import { mkdir as mkdir3, mkdtemp, readdir as readdir2, rename as rename2, rm as rm4, stat as stat3 } from "fs/promises";
+import { tmpdir } from "os";
+import { dirname as dirname6, join as join15, relative as relative2, resolve as resolve3 } from "path";
+
+// src/core/pinned.ts
+import { execFile as execFile4 } from "child_process";
+import { readFile as readFile8 } from "fs/promises";
+import { basename as basename4, join as join14 } from "path";
+import { promisify as promisify4 } from "util";
+var execFileP4 = promisify4(execFile4);
 var PACKAGE = "@rness/cli";
 var EXACT_VERSION = /^\d+\.\d+\.\d+(-[0-9A-Za-z.-]+)?$/;
 function compareVersions(a, b) {
@@ -2359,7 +2574,7 @@ function compareVersions(a, b) {
 async function readPackageJson(rnessDir) {
   try {
     const parsed = JSON.parse(
-      await readFile7(join12(rnessDir, "package.json"), "utf8")
+      await readFile8(join14(rnessDir, "package.json"), "utf8")
     );
     return parsed !== null && typeof parsed === "object" ? parsed : null;
   } catch {
@@ -2378,8 +2593,8 @@ async function readPin(rnessDir) {
   return null;
 }
 async function writePin(rnessDir, from, to) {
-  const file = join12(rnessDir, "package.json");
-  const text = await readFile7(file, "utf8");
+  const file = join14(rnessDir, "package.json");
+  const text = await readFile8(file, "utf8");
   const entry = new RegExp(
     `("${PACKAGE}"\\s*:\\s*")${from.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}(")`
   );
@@ -2401,12 +2616,12 @@ async function workspacePackageManager(rnessDir) {
     if (isPackageManager(name)) return name;
   }
   for (const [lockfile, pm] of LOCKFILES)
-    if (await exists(join12(rnessDir, lockfile))) return pm;
+    if (await exists(join14(rnessDir, lockfile))) return pm;
   return "npm";
 }
 async function hasLockfile(rnessDir, pm) {
   for (const [lockfile, owner] of LOCKFILES)
-    if (owner === pm && await exists(join12(rnessDir, lockfile))) return true;
+    if (owner === pm && await exists(join14(rnessDir, lockfile))) return true;
   return false;
 }
 async function pinDrift(rnessDir) {
@@ -2462,9 +2677,9 @@ async function ensureInstalled(rnessDir, opts = {}) {
   }
 }
 async function runPinnedSync(root) {
-  const installed = await readPinnedCli(join12(root, ".rness"));
+  const installed = await readPinnedCli(join14(root, ".rness"));
   if (installed === null) return null;
-  const pinned = join12(installed.dir, ...installed.bin.split("/"));
+  const pinned = join14(installed.dir, ...installed.bin.split("/"));
   if (!await exists(pinned))
     return {
       code: 1,
@@ -2473,7 +2688,7 @@ async function runPinnedSync(root) {
 `
     };
   try {
-    const { stdout, stderr } = await execFileP3(
+    const { stdout, stderr } = await execFileP4(
       process.execPath,
       [pinned, "sync", "--yes"],
       {
@@ -2526,7 +2741,7 @@ function syncOutcome(result, opts = {}) {
   };
 }
 async function syncPinned(root, shown, fallback) {
-  const rnessDir = join12(root, ".rness");
+  const rnessDir = join14(root, ".rness");
   const installed = await readPinnedCli(rnessDir);
   if (installed === null) {
     if (fallback !== void 0) return fallback();
@@ -2536,7 +2751,7 @@ async function syncPinned(root, shown, fallback) {
     );
     return 1;
   }
-  const pinned = join12(installed.dir, ...installed.bin.split("/"));
+  const pinned = join14(installed.dir, ...installed.bin.split("/"));
   if (!await exists(pinned)) {
     process.stderr.write(
       `@rness/cli in ${shown}/.rness is not installed correctly (missing ${installed.bin}); reinstall in .rness/
@@ -2545,7 +2760,7 @@ async function syncPinned(root, shown, fallback) {
     return 1;
   }
   try {
-    const { stdout, stderr } = await execFileP3(
+    const { stdout, stderr } = await execFileP4(
       process.execPath,
       [pinned, "sync", "--yes"],
       {
@@ -2569,221 +2784,6 @@ async function syncPinned(root, shown, fallback) {
   }
 }
 
-// src/core/scaffold.ts
-import { statSync } from "fs";
-import { dirname as dirname4, join as join13 } from "path";
-import { fileURLToPath } from "url";
-var SCAFFOLD_FILES = [
-  "AGENTS.md",
-  "CONVENTIONS.md",
-  "README.md",
-  "WORKSPACE.md",
-  "rness.json",
-  "package.json",
-  "_gitignore",
-  ".githooks/pre-commit",
-  ".github/workflows/validate.yml",
-  ".github/dependabot.yml",
-  "pnpm-workspace.yaml",
-  "adr/0000-template.md",
-  "standards/.gitkeep",
-  "specs/.gitkeep",
-  "plans/.gitkeep",
-  "skills/.gitkeep",
-  "docs/.gitkeep"
-];
-function scaffoldDir() {
-  let dir = dirname4(fileURLToPath(import.meta.url));
-  for (let i = 0; i < 4; i += 1) {
-    const candidate = join13(dir, "scaffold");
-    try {
-      if (statSync(join13(candidate, "rness.json")).isFile()) return candidate;
-    } catch {
-    }
-    dir = dirname4(dir);
-  }
-  throw new Error("scaffold directory not found next to the @rness/cli package");
-}
-
-// src/core/scaffold-copy.ts
-import { chmod as chmod2, mkdir as mkdir2, readFile as readFile8, stat as stat2, writeFile as writeFile2 } from "fs/promises";
-import { dirname as dirname5, join as join14 } from "path";
-var TOKENISED = /* @__PURE__ */ new Set(["package.json"]);
-async function copyScaffold(dest, tokens) {
-  const source = scaffoldDir();
-  for (const rel of SCAFFOLD_FILES) {
-    if (rel === "rness.json") continue;
-    const from = join14(source, ...rel.split("/"));
-    const targetRel = rel === "_gitignore" ? ".gitignore" : rel;
-    const to = join14(dest, ...targetRel.split("/"));
-    await mkdir2(dirname5(to), { recursive: true });
-    let content = await readFile8(from, "utf8");
-    if (TOKENISED.has(rel)) {
-      content = content.replaceAll("__RNESS_VERSION__", tokens.version).replaceAll("__RNESS_PM__", tokens.packageManager);
-    }
-    await writeFile2(to, content, "utf8");
-    const mode = (await stat2(from)).mode & 511;
-    if (mode & 73) await chmod2(to, mode);
-  }
-}
-
-// src/version.ts
-var VERSION = "0.5.2";
-
-// src/commands/login.ts
-import { spawn as spawn3 } from "child_process";
-import { realpath } from "fs/promises";
-
-// src/core/setup-git.ts
-import { execFile as execFile4 } from "child_process";
-import { promisify as promisify4 } from "util";
-var execFileP4 = promisify4(execFile4);
-var KEY = "credential.https://github.com.helper";
-function helperValue(node, bin) {
-  return `!'${node}' '${bin}' git-credential`;
-}
-var isOurs = (value) => /^!'[^']+' '[^']*rness[^']*' git-credential$/.test(value);
-async function config(args) {
-  const { stdout } = await execFileP4("git", ["config", "--global", ...args]);
-  return stdout;
-}
-async function values() {
-  try {
-    const out = await config(["--get-all", KEY]);
-    return out.replace(/\n$/, "").split("\n");
-  } catch {
-    return [];
-  }
-}
-function isStableInstall(bin) {
-  return !/[\\/]_npx[\\/]/.test(bin);
-}
-async function setupGit(node, bin) {
-  const ours = helperValue(node, bin);
-  if ((await values()).includes(ours)) return false;
-  await removeGitSetup();
-  await config(["--add", KEY, ""]);
-  await config(["--add", KEY, ours]);
-  return true;
-}
-async function removeGitSetup() {
-  const current = await values();
-  if (!current.some(isOurs)) return false;
-  const kept = current.filter(
-    (value, i) => !isOurs(value) && !(value === "" && isOurs(current[i + 1] ?? ""))
-  );
-  await config(["--unset-all", KEY]);
-  for (const value of kept) await config(["--add", KEY, value]);
-  return true;
-}
-
-// src/commands/login.ts
-function openInBrowser(url) {
-  const [command, args] = process.platform === "darwin" ? ["open", [url]] : process.platform === "win32" ? ["cmd", ["/c", "start", "", url]] : ["xdg-open", [url]];
-  try {
-    const child = spawn3(command, args, { stdio: "ignore", detached: true });
-    child.on("error", () => void 0);
-    child.unref();
-  } catch {
-  }
-}
-async function offerSetupGit(opts, terminal, bin, ui) {
-  if (opts.setupGit === false) return;
-  if (!isStableInstall(bin)) {
-    ui.hint(
-      "install rness globally to let git use your login: npm i -g @rness/cli"
-    );
-    return;
-  }
-  if (opts.setupGit !== true) {
-    if (!terminal.isTty()) return;
-    const p = await terminal.prompts();
-    const ok = await p.confirm({
-      message: "Use rness to authenticate git over HTTPS for github.com?",
-      initialValue: true
-    });
-    if (p.isCancel(ok) || ok !== true) return;
-  }
-  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)"
-  );
-}
-async function loginCommand(opts, deps = {}) {
-  const terminal = deps.terminal ?? defaultTerminal;
-  const own = deps.ui === void 0;
-  const ui = deps.ui ?? await makeUi(terminal);
-  if (own) ui.intro("Log in to GitHub");
-  try {
-    const bin = deps.bin ?? await realpath(process.argv[1] ?? "").catch(() => "");
-    const env = envToken();
-    if (env !== null)
-      ui.hint(`${env.source} is set and wins over a stored login`);
-    const stored = await readAuth();
-    if (stored !== null && await resolveToken() !== null) {
-      ui.line(
-        "logged in",
-        `as ${stored.login} (github.com); rness logout to switch`
-      );
-      await offerSetupGit(opts, terminal, bin, ui);
-      if (own) ui.outro("Nothing to do", "idle");
-      return 0;
-    }
-    const code = await requestDeviceCode();
-    if (ui.session)
-      ui.line(
-        "open",
-        code.verificationUri,
-        `Open ${code.verificationUri} and enter the code ${code.userCode}`
-      );
-    else {
-      ui.line("open", code.verificationUri);
-      ui.line("code", code.userCode);
-    }
-    if (terminal.isTty() && process.env["SSH_CONNECTION"] === void 0)
-      (deps.open ?? openInBrowser)(code.verificationUri);
-    if (!ui.session)
-      ui.line("waiting", "for you to approve rness on github.com\u2026");
-    const login = await ui.step(
-      {
-        doing: "waiting  for you to approve rness on github.com",
-        sentence: "Waiting for your approval on github.com",
-        quiet: true
-      },
-      async () => {
-        const tokens = await pollForToken(code, deps);
-        const user = await getUser({
-          token: tokens.accessToken,
-          apiBase: opts.githubApi ?? DEFAULT_GITHUB_API
-        });
-        await writeAuth({ login: user.login, tokens });
-        return user.login;
-      },
-      (name) => ["logged in", `as ${name} (github.com)`]
-    );
-    if (!ui.session) ui.line("logged in", `as ${login} (github.com)`);
-    await offerSetupGit(opts, terminal, bin, ui);
-    if (own) ui.outro(`You are logged in as ${login}`);
-    return 0;
-  } catch (e) {
-    if (e instanceof LoginError) {
-      ui.error(e.message);
-      return 1;
-    }
-    return reportError(e);
-  }
-}
-function revokeUrl() {
-  return `https://github.com/settings/connections/applications/${clientId()}`;
-}
-
-// src/commands/create.ts
-import { mkdir as mkdir3, mkdtemp, readdir as readdir2, rename as rename2, rm as rm4, stat as stat3 } from "fs/promises";
-import { tmpdir } from "os";
-import { dirname as dirname6, join as join15, relative as relative2, resolve as resolve3 } from "path";
-
 // src/core/sync-blocks.ts
 async function syncBlocks(ui, root, shown, inPlace, sshWorks) {
   if (!ui.session)
@@ -3967,6 +3967,51 @@ async function run(argv) {
   return state.code;
 }
 
+// src/core/catch-up.ts
+import { spawnSync } from "child_process";
+var OWN_COMMANDS = [
+  "create",
+  "upgrade",
+  "update",
+  "login",
+  "logout",
+  "git-credential"
+];
+var CATCH_UP_DONE = "RNESS_CATCH_UP_DONE";
+async function catchUp(argv, deps = {}) {
+  const env = deps.env ?? process.env;
+  const cwd = deps.cwd ?? process.cwd();
+  const command = argv[0];
+  if (command === void 0 || command.startsWith("-") || OWN_COMMANDS.includes(command) || env["RNESS_NO_DELEGATE"] === "1" || env[CATCH_UP_DONE] === "1")
+    return null;
+  const ws = await findWorkspace(cwd).catch(() => null);
+  if (ws === null) return null;
+  env[CATCH_UP_DONE] = "1";
+  const stderr = deps.stderr ?? ((text) => void process.stderr.write(text));
+  const outcome = await ensureInstalled(ws.rnessDir, {
+    env,
+    announce: (pin) => stderr(`installing @rness/cli ${pin} in .rness\u2026
+`),
+    ...deps.install === void 0 ? {} : { install: deps.install }
+  });
+  if (outcome === null) return null;
+  if (!outcome.installed) {
+    const warning = await driftWarning(cwd);
+    if (warning !== null) stderr(`${warning}
+`);
+    return null;
+  }
+  if (await pinDrift(ws.rnessDir) !== null) return null;
+  const bin = await pinnedBinPath(ws.rnessDir);
+  if (bin === null) return null;
+  const spawn4 = deps.spawn ?? ((file, args, dir) => spawnSync(process.execPath, [file, ...args], {
+    cwd: dir,
+    env,
+    stdio: "inherit"
+  }).status ?? 1);
+  return spawn4(bin, argv, cwd);
+}
+
 export {
   exists,
   readOrNull,
@@ -4013,16 +4058,12 @@ export {
   addCommand,
   renderMarkdown,
   contextCommand,
-  pinnedBinPath,
   findDelegate,
   PACKAGE_MANAGERS,
   isPackageManager,
   detectPackageManager,
   packageManagerVersion,
   installDependencies,
-  pinDrift,
-  driftWarning,
-  ensureInstalled,
   SCAFFOLD_FILES,
   scaffoldDir,
   copyScaffold,
@@ -4035,6 +4076,8 @@ export {
   STATUSES,
   checkContract,
   validateCommand,
-  run
+  run,
+  OWN_COMMANDS,
+  catchUp
 };
-//# sourceMappingURL=chunk-P4YG6P7I.js.map
+//# sourceMappingURL=chunk-CQ6YD63L.js.map