@rness/cli 0.5.0 → 0.5.1

package/dist/{chunk-WSGPDTPQ.js → chunk-C6HBGV5V.js}

@@ -774,6 +774,18 @@ async function probeRemote(url, timeoutMs = 6e4, credentials) {
 import { readFile as readFile3 } from "fs/promises";
 import { basename as basename2, join as join3 } from "path";
 var NAME = /^(?!\.{1,2}$)[a-z0-9._][a-z0-9._-]*$/;
+var CONTEXT_REPO = ".rness";
+var EXCLUDED_NAMES = /* @__PURE__ */ new Set([
+  CONTEXT_REPO,
+  ".git",
+  "node_modules"
+]);
+function isMemberRepo(repo) {
+  return !repo.archived && !EXCLUDED_NAMES.has(repo.name.toLowerCase());
+}
+function isWorkspaceClone(name) {
+  return NAME.test(name) && !EXCLUDED_NAMES.has(name);
+}
 var NAME_RULE = "lowercase letters, digits, '.', '_' and '-', not starting with '-'";
 var ORG_NAME = /^[A-Za-z0-9](?:[A-Za-z0-9]|-(?=[A-Za-z0-9])){0,38}$/;
 var KEYS = ["contract", "org", "repos", "scopes"];
@@ -1035,7 +1047,7 @@ function paint(tone, text, stream = process.stdout) {
   if (noColor()) return text;
   return styleText(FORMAT[tone], text, { stream, validateStream: true });
 }
-var IDLE = /* @__PURE__ */ new Set(["unchanged", "skipped", "not cloned"]);
+var IDLE = /* @__PURE__ */ new Set(["unchanged", "skipped", "not cloned", "current"]);
 var DONE = /* @__PURE__ */ new Set([
   "created",
   "cloned",
@@ -1067,11 +1079,20 @@ function bold(text, stream = process.stdout) {
   if (noColor()) return text;
   return styleText("bold", text, { stream, validateStream: true });
 }
-function badge(text, stream = process.stdout) {
+var BACKGROUND = {
+  intro: ["bgCyan", "black", "bold"],
+  done: ["bgGreen", "black", "bold"],
+  idle: ["bgCyan", "black", "bold"],
+  info: ["bgCyan", "black", "bold"],
+  warn: ["bgYellow", "black", "bold"],
+  error: ["bgRed", "white", "bold"]
+};
+function badge(text, tone = "intro", stream = process.stdout) {
+  const [t, s] = typeof tone === "string" ? [tone, stream] : ["intro", tone];
   if (noColor()) return text;
   const padded = ` ${text} `;
-  const painted = styleText(["bgCyan", "black", "bold"], padded, {
-    stream,
+  const painted = styleText(BACKGROUND[t], padded, {
+    stream: s,
     validateStream: true
   });
   return painted === padded ? text : painted;
@@ -1214,6 +1235,14 @@ var CHECKING = [
 function usingRest(access2, login) {
   return access2.ok ? `ssh (github.com as ${access2.login})` : `https (ssh to github.com unavailable: ${access2.reason}${loggedInAs(login)})`;
 }
+function agentHintLines(platform = process.platform) {
+  const mac = platform === "darwin";
+  return [
+    "your key works but is not loaded; ssh asks again in every child:",
+    `  ssh-add ${mac ? "--apple-use-keychain " : ""}~/.ssh/id_ed25519`,
+    `  ~/.ssh/config: AddKeysToAgent yes${mac ? ", UseKeychain yes" : ""}`
+  ];
+}
 function sshWorkspaceLines(reason3) {
   return [
     `this workspace clones over SSH (rness.json) but ssh to github.com fails: ${reason3}`,
@@ -1229,6 +1258,7 @@ function httpsFlagLine(spec) {
 }
 
 // src/core/workspace.ts
+import { readdir } from "fs/promises";
 import { dirname as dirname3, join as join5, parse, resolve as resolve2 } from "path";
 async function findWorkspace(startDir) {
   const start = resolve2(startDir);
@@ -1248,6 +1278,16 @@ async function findWorkspace(startDir) {
   }
   throw new Error(`no rness workspace found above ${startDir}`);
 }
+async function clonesIn(root) {
+  try {
+    const entries = await readdir(join5(root, "org"), { withFileTypes: true });
+    return new Set(
+      entries.filter((e) => e.isDirectory() && isWorkspaceClone(e.name)).map((e) => e.name)
+    );
+  } catch {
+    return /* @__PURE__ */ new Set();
+  }
+}
 
 // src/report.ts
 function reportError(e) {
@@ -1544,7 +1584,6 @@ async function ensureClaudeMd(dir) {
 }
 
 // src/commands/sync.ts
-import { readdir } from "fs/promises";
 import { join as join9 } from "path";
 
 // src/core/progress.ts
@@ -1642,12 +1681,17 @@ var plainUi = {
     return result;
   }
 };
+var IDLE_SYMBOL = "\xB7";
 function sessionUi(p) {
   const say = (verb, text) => {
     const tone = toneOf(verb);
-    if (tone === "done") p.log.step(text);
+    if (tone === "done") p.log.success(text);
     else if (tone === "warn") p.log.warn(text);
-    else if (tone === "idle") p.log.message(paint("idle", text));
+    else if (tone === "error") p.log.error(text);
+    else if (tone === "idle")
+      p.log.message(paint("idle", text), {
+        symbol: paint("idle", IDLE_SYMBOL)
+      });
     else p.log.info(text);
   };
   return {
@@ -1657,10 +1701,10 @@ function sessionUi(p) {
       p.intro(badge(title));
     },
     outro: (message, tone = "done") => {
-      p.outro(paint(tone, message));
+      p.outro(badge(message, tone));
     },
     line: (verb, rest, sentence) => {
-      say(verb, sentence ?? tidy(`${verb} ${rest}`));
+      say(verb, sentence ?? `${rest} ${verb}`);
     },
     warn: (text) => {
       p.log.warn(text);
@@ -1679,22 +1723,21 @@ function sessionUi(p) {
     },
     async step(options, work, done) {
       const label = options.sentence ?? tidy(options.doing);
-      const finish = (result) => {
-        const line = done?.(result) ?? null;
-        return line === null ? null : tidy(`${line[0]} ${line[1]}`);
-      };
+      const finish = (result) => done?.(result) ?? null;
+      const label_ = (line) => `${line[1]} ${line[0]}`;
       if (options.git === true && !this.gitIsSilent) {
         p.log.message(paint("idle", `${label}\u2026`));
         const result = await work();
-        const text = finish(result);
-        if (text !== null) p.log.step(text);
+        const line = finish(result);
+        if (line !== null) say(line[0], label_(line));
         return result;
       }
       const spin = p.spinner();
       spin.start(label);
       try {
         const result = await work();
-        spin.stop(finish(result) ?? label);
+        const line = finish(result);
+        spin.stop(line === null ? label : label_(line));
         return result;
       } catch (e) {
         spin.error(`${label} \u2014 failed`);
@@ -1738,16 +1781,6 @@ function targetsOf(manifest, root, only) {
   return targets;
 }
 var SELECT_ALL = "*";
-async function clonesIn(root) {
-  try {
-    const entries = await readdir(join9(root, "org"), { withFileTypes: true });
-    return new Set(
-      entries.filter((e) => e.isDirectory() && !e.name.startsWith(".")).map((e) => e.name)
-    );
-  } catch {
-    return /* @__PURE__ */ new Set();
-  }
-}
 async function askWhatToSync(input) {
   if (!input.terminal.isTty()) {
     process.stderr.write(
@@ -1978,7 +2011,7 @@ async function syncCommand(opts, deps = {}) {
 }
 
 // src/commands/add.ts
-import { join as join10 } from "path";
+import { basename as basename3, join as join10 } from "path";
 function printDeclared(ui, result, already) {
   for (const name of result.declared) {
     if (already.has(name)) continue;
@@ -2013,6 +2046,13 @@ async function addCommand(spec, opts, deps = {}) {
 `);
       return 2;
     }
+    if (parsed.name === CONTEXT_REPO) {
+      process.stderr.write(
+        `${CONTEXT_REPO} is the workspace context, not a member repository \u2014 it is already cloned at ${basename3(ws.root)}/${CONTEXT_REPO}
+`
+      );
+      return 2;
+    }
     const interactive = opts.yes !== true;
     const ownUi = deps.ui === void 0;
     if (interactive && !terminal.isTty()) {
@@ -2214,6 +2254,11 @@ async function readPinnedCli(rnessDir) {
     version: typeof pkg.version === "string" ? pkg.version : null
   };
 }
+async function pinnedBinPath(rnessDir) {
+  const pinned = await readPinnedCli(rnessDir);
+  if (pinned === null) return null;
+  return join11(pinned.dir, ...pinned.bin.split("/"));
+}
 async function findDelegate(cwd, ownVersion) {
   let root;
   let rnessDir;
@@ -2264,13 +2309,23 @@ 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);
 }
-async function installDependencies(pm, dir) {
+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, ["install"], { cwd: dir, maxBuffer: 16 * 1024 * 1024 });
+    await execFileP2(pm, args, { cwd: dir, maxBuffer: 16 * 1024 * 1024 });
   } catch (e) {
     const err = e;
     throw new Error(
-      `${pm} install failed in ${dir}: ${installErrorLine(err.stderr ?? err.message)}`,
+      `${pm} ${args.join(" ")} failed in ${dir}: ${installErrorLine(err.stderr ?? err.message)}`,
       { cause: e }
     );
   }
@@ -2279,7 +2334,7 @@ async function installDependencies(pm, dir) {
 // src/core/pinned.ts
 import { execFile as execFile3 } from "child_process";
 import { readFile as readFile7 } from "fs/promises";
-import { basename as basename3, join as join12 } from "path";
+import { basename as basename4, join as join12 } from "path";
 import { promisify as promisify3 } from "util";
 var execFileP3 = promisify3(execFile3);
 var PACKAGE = "@rness/cli";
@@ -2349,6 +2404,11 @@ async function workspacePackageManager(rnessDir) {
     if (await exists(join12(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;
+  return false;
+}
 async function pinDrift(rnessDir) {
   const pin = await readPin(rnessDir);
   if (pin === null || !EXACT_VERSION.test(pin.spec)) return null;
@@ -2369,9 +2429,38 @@ async function driftWarning(cwd) {
   if (drift === null) return null;
   const pm = await workspacePackageManager(rnessDir);
   return warn(
-    `${basename3(root)}/.rness pins @rness/cli ${drift.pin} but ${drift.installed ?? "nothing"} is installed \u2014 run ${pm} install in .rness`
+    `${basename4(root)}/.rness pins @rness/cli ${drift.pin} but ${drift.installed ?? "nothing"} is installed \u2014 run ${pm} install in .rness`
   );
 }
+var CHILD_DEADLINE_MS = 12e4;
+function childEnv(env = process.env) {
+  return {
+    ...env,
+    GIT_SSH_COMMAND: `${env["GIT_SSH_COMMAND"] ?? "ssh"} -o BatchMode=yes`,
+    GIT_TERMINAL_PROMPT: "0"
+  };
+}
+async function ensureInstalled(rnessDir, opts = {}) {
+  const drift = await pinDrift(rnessDir);
+  if (drift === null) return null;
+  const env = opts.env ?? process.env;
+  if (env["RNESS_NO_INSTALL"] === "1")
+    return { installed: false, pin: drift.pin, reason: "RNESS_NO_INSTALL=1" };
+  const pm = await workspacePackageManager(rnessDir);
+  const frozen = await hasLockfile(rnessDir, pm);
+  const install = opts.install ?? installDependencies;
+  opts.announce?.(drift.pin);
+  try {
+    await install(pm, rnessDir, { frozen });
+    return { installed: true, pin: drift.pin, reason: null };
+  } catch (e) {
+    return {
+      installed: false,
+      pin: drift.pin,
+      reason: e instanceof Error ? e.message : String(e)
+    };
+  }
+}
 async function runPinnedSync(root) {
   const installed = await readPinnedCli(join12(root, ".rness"));
   if (installed === null) return null;
@@ -2387,15 +2476,23 @@ async function runPinnedSync(root) {
     const { stdout, stderr } = await execFileP3(
       process.execPath,
       [pinned, "sync", "--yes"],
-      { cwd: root, maxBuffer: 16 * 1024 * 1024 }
+      {
+        cwd: root,
+        maxBuffer: 16 * 1024 * 1024,
+        env: childEnv(),
+        timeout: CHILD_DEADLINE_MS,
+        killSignal: "SIGKILL"
+      }
     );
     return { code: 0, stdout, stderr };
   } catch (e) {
     const err = e;
+    const deadline = err.killed === true ? `rness sync in .rness did not finish within ${CHILD_DEADLINE_MS / 1e3}s and was stopped
+` : "";
     return {
       code: typeof err.code === "number" ? err.code : 1,
       stdout: err.stdout ?? "",
-      stderr: err.stderr ?? ""
+      stderr: `${err.stderr ?? ""}${deadline}`
     };
   }
 }
@@ -2415,6 +2512,19 @@ function summariseSync(stdout) {
     others
   };
 }
+function syncOutcome(result, opts = {}) {
+  const { others } = summariseSync(result.stdout);
+  const wrote = /^(updated|unchanged|stale)\s/m.test(result.stdout);
+  const stderr = result.stderr.split("\n").map((l) => l.trimEnd()).filter((l) => l.trim() !== "");
+  const hints = wrote ? [...others, ...stderr] : others;
+  if (opts.sshWorks === true && /Permission denied \(publickey\)/.test(result.stderr))
+    hints.push(...agentHintLines());
+  return {
+    code: wrote ? 0 : result.code,
+    hints,
+    errors: wrote ? [] : stderr
+  };
+}
 async function syncPinned(root, shown, fallback) {
   const rnessDir = join12(root, ".rness");
   const installed = await readPinnedCli(rnessDir);
@@ -2438,7 +2548,13 @@ async function syncPinned(root, shown, fallback) {
     const { stdout, stderr } = await execFileP3(
       process.execPath,
       [pinned, "sync", "--yes"],
-      { cwd: root, maxBuffer: 16 * 1024 * 1024 }
+      {
+        cwd: root,
+        maxBuffer: 16 * 1024 * 1024,
+        env: childEnv(),
+        timeout: CHILD_DEADLINE_MS,
+        killSignal: "SIGKILL"
+      }
     );
     process.stdout.write(stdout);
     if (stderr !== "") process.stderr.write(stderr);
@@ -2467,6 +2583,7 @@ var SCAFFOLD_FILES = [
   "_gitignore",
   ".githooks/pre-commit",
   ".github/workflows/validate.yml",
+  ".github/dependabot.yml",
   "pnpm-workspace.yaml",
   "adr/0000-template.md",
   "standards/.gitkeep",
@@ -2511,7 +2628,7 @@ async function copyScaffold(dest, tokens) {
 }
 
 // src/version.ts
-var VERSION = "0.5.0";
+var VERSION = "0.5.1";
 
 // src/commands/login.ts
 import { spawn as spawn3 } from "child_process";
@@ -2668,7 +2785,7 @@ 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) {
+async function syncBlocks(ui, root, shown, inPlace, sshWorks) {
   if (!ui.session)
     return ui.step(
       { doing: "syncing  the blocks", git: true },
@@ -2689,10 +2806,10 @@ async function syncBlocks(ui, root, shown, inPlace) {
     );
     return 1;
   }
-  for (const line of summariseSync(result.stdout).others) ui.hint(line);
-  for (const line of result.stderr.split("\n"))
-    if (line.trim() !== "") ui.error(line);
-  return result.code;
+  const outcome = syncOutcome(result, { sshWorks: sshWorks === true });
+  for (const line of outcome.hints) ui.hint(line);
+  for (const line of outcome.errors) ui.error(line);
+  return outcome.code;
 }
 
 // src/commands/create.ts
@@ -2760,7 +2877,12 @@ async function pickRepositories(input) {
         quiet: true
       },
       () => provider.listRepositories(org),
-      (l) => ["listed", `${l.repositories.length} repositories of ${org}`]
+      // What the listing offers, not what GitHub returned: the count and the
+      // list below it must agree (spec 0009).
+      (l) => [
+        "listed",
+        `${l.repositories.filter(isMemberRepo).length} repositories of ${org}`
+      ]
     );
     listed = listing.repositories;
     if (listing.owner === "user")
@@ -2779,9 +2901,7 @@ async function pickRepositories(input) {
   }
   const inCatalogue = (name) => Object.hasOwn(input.catalogue, name);
   const byLabel = (a, b) => a.label.localeCompare(b.label, "en", { sensitivity: "base" });
-  const candidates = listed.filter(
-    (r) => !r.archived && !r.name.startsWith(".")
-  );
+  const candidates = listed.filter(isMemberRepo);
   const padlock = unicode();
   const hint = (isPrivate, catalogued) => [isPrivate && !padlock ? "private" : null, catalogued ? "in .rness" : null].filter((h) => h !== null).join(" \xB7 ") || null;
   const declarable = candidates.filter((r) => NAME.test(r.name.toLowerCase())).map((r) => {
@@ -2969,7 +3089,7 @@ async function createCommand(opts, deps = {}) {
     );
     return 2;
   }
-  const pm = opts.pm !== void 0 && isPackageManager(opts.pm) ? opts.pm : detectPackageManager();
+  let pm = opts.pm !== void 0 && isPackageManager(opts.pm) ? opts.pm : detectPackageManager();
   const interactive = opts.yes !== true && terminal.isTty();
   const ui = interactive ? await makeUi(terminal) : { ...plainUi };
   let sshTest;
@@ -2984,6 +3104,7 @@ async function createCommand(opts, deps = {}) {
     }
     return sshTest.access;
   };
+  const sshWorks = () => sshTest?.access.ok === true;
   const chooseHost = async () => {
     if (opts.host !== void 0 || opts.https === true) ui.gitIsSilent = true;
     if (opts.host !== void 0) return opts.host;
@@ -3151,12 +3272,13 @@ async function createCommand(opts, deps = {}) {
     const rnessDir = join15(root, ".rness");
     const install = async () => {
       if (opts.skipInstall === true) {
-        ui.line("skipped", "install (--skip-install)");
+        ui.line("skipped", `install with ${pm} (--skip-install)`);
         return;
       }
+      const frozen = await hasLockfile(rnessDir, pm);
       await ui.step(
         { doing: `installing dependencies with ${pm}` },
-        () => installDependencies(pm, rnessDir),
+        () => installDependencies(pm, rnessDir, { frozen }),
         () => ["installed", `dependencies with ${pm}`]
       );
     };
@@ -3169,11 +3291,7 @@ async function createCommand(opts, deps = {}) {
         gitProvider.credentialsFor(contextUrl)
       );
       ui.line("cloned", `${shown}/.rness (joined ${org})`);
-      const pin = (await readPin(rnessDir))?.spec;
-      if (pin !== void 0 && EXACT_VERSION.test(pin) && compareVersions(pin, VERSION) < 0)
-        ui.hint(
-          `${org}/.rness pins @rness/cli ${pin} \u2014 you run ${VERSION}; rness upgrade moves the workspace`
-        );
+      if (opts.pm === void 0) pm = await workspacePackageManager(rnessDir);
       await install();
       await mkdir3(join15(root, "org"), { recursive: true });
       const failures2 = await cloneSelection({
@@ -3190,14 +3308,28 @@ async function createCommand(opts, deps = {}) {
         ui,
         root,
         shown,
-        () => syncCommand({ yes: true, cwd: root })
+        () => syncCommand({ yes: true, cwd: root }),
+        sshWorks()
       );
       if (code2 !== 0) return code2;
-      if (failures2.length > 0)
-        ui.note(
-          "Next steps",
-          failures2.map((f) => `rness add ${f.spec}   # failed: ${f.message}`)
-        );
+      const cloned = await clonesIn(root);
+      const remaining = Object.keys(catalogue.repos).filter(
+        (name2) => !cloned.has(name2)
+      );
+      const next2 = [
+        `cd ${shown}`,
+        // The comment above its command, as the new-workspace note does: a
+        // line that wraps in a narrow terminal is a line nobody reads.
+        ...remaining.length > 0 ? [
+          `# clone the catalogue repositories you did not pick: ${remaining.join(", ")}`,
+          "rness sync --all"
+        ] : [],
+        ...failures2.map((f) => `rness add ${f.spec}   # failed: ${f.message}`)
+      ];
+      if (ui.session) ui.note("Next steps", next2);
+      else process.stdout.write(`
+${next2.map((l) => `  ${l}`).join("\n")}
+`);
       ui.outro(`You joined ${org} \u2014 your workspace is in ${shown}/`);
       return failures2.length > 0 ? 1 : 0;
     }
@@ -3248,7 +3380,8 @@ async function createCommand(opts, deps = {}) {
       ui,
       root,
       shown,
-      () => syncCommand({ yes: true, cwd: root })
+      () => syncCommand({ yes: true, cwd: root }),
+      sshWorks()
     );
     if (code !== 0) return code;
     const name = org;
@@ -3329,8 +3462,8 @@ async function logoutCommand() {
 
 // src/commands/upgrade.ts
 import { execFile as execFile5 } from "child_process";
-import { readFile as readFile9, readdir as readdir3 } from "fs/promises";
-import { basename as basename4, join as join16, relative as relative3 } from "path";
+import { mkdir as mkdir4, readFile as readFile9, readdir as readdir3 } from "fs/promises";
+import { basename as basename5, dirname as dirname7, join as join16, relative as relative3 } from "path";
 import { promisify as promisify5 } from "util";
 var execFileP5 = promisify5(execFile5);
 var NOTES = "https://github.com/rness-dev/rness/tree/main/packages/cli#readme";
@@ -3360,7 +3493,7 @@ async function upgradeCommand(version, opts, terminal = defaultTerminal) {
   }
   try {
     const ws = await findWorkspace(cwd);
-    const label = `${basename4(ws.root)}/.rness`;
+    const label = `${basename5(ws.root)}/.rness`;
     const pin = await readPin(ws.rnessDir);
     if (pin === null) {
       process.stderr.write(
@@ -3377,7 +3510,7 @@ async function upgradeCommand(version, opts, terminal = defaultTerminal) {
       return 2;
     }
     const ui = interactive ? await makeUi(terminal) : { ...plainUi };
-    ui.intro(`Upgrade workspace ${basename4(ws.root)}`);
+    ui.intro(`Upgrade workspace ${basename5(ws.root)}`);
     const target = version ?? await ui.step(
       { doing: "asking   the registry for the latest release", quiet: true },
       () => latestVersion(),
@@ -3453,6 +3586,20 @@ async function upgradeCommand(version, opts, terminal = defaultTerminal) {
         ui.warn(`${shown} names @rness/cli@${pin.spec}; update it by hand`);
       }
     }
+    const dependabot = join16(ws.rnessDir, ".github", "dependabot.yml");
+    if (await exists(dependabot)) {
+      ui.hint(".github/dependabot.yml is already there \u2014 left as it is");
+    } else {
+      await mkdir4(dirname7(dependabot), { recursive: true });
+      await writeFileAtomic(
+        dependabot,
+        await readFile9(join16(scaffoldDir(), ".github", "dependabot.yml"), "utf8")
+      );
+      ui.line(
+        "wrote",
+        ".rness/.github/dependabot.yml (@rness/cli now moves by pull request)"
+      );
+    }
     try {
       await ui.step(
         { doing: `installing dependencies with ${pm}` },
@@ -3480,12 +3627,12 @@ async function upgradeCommand(version, opts, terminal = defaultTerminal) {
       return 1;
     }
     ui.gitIsSilent = true;
-    const code = await syncBlocks(ui, ws.root, basename4(ws.root));
+    const code = await syncBlocks(ui, ws.root, basename5(ws.root));
     if (code !== 0) return code;
     const rel = relative3(cwd, ws.rnessDir) || ".";
     const next = [
       `git -C ${rel} add -A && git -C ${rel} commit -m "chore: rness ${target}"`,
-      `# teammates: git pull, then ${pm} install in .rness`
+      "# teammates: git pull \u2014 the next rness command installs it"
     ];
     if (ui.session) {
       ui.note("Next steps", next);
@@ -3509,15 +3656,23 @@ async function upgradeCommand(version, opts, terminal = defaultTerminal) {
 
 // src/core/blocks.ts
 import { join as join17 } from "path";
+var PROBLEM = /* @__PURE__ */ new Set(["stale", "malformed"]);
 async function checkBlocks({
   root,
   rnessDir,
   manifest,
   org
 }) {
-  const problems = [];
-  const warnings = [];
-  if (!await exists(join17(root, "org"))) return { problems, warnings };
+  const checks = [];
+  const note = (label, status2, message = null) => {
+    checks.push({ label, status: status2, message });
+  };
+  const derive = () => ({
+    problems: checks.filter((c) => PROBLEM.has(c.status) && c.message !== null).map((c) => c.message),
+    warnings: checks.filter((c) => !PROBLEM.has(c.status) && c.message !== null).map((c) => c.message),
+    checks
+  });
+  if (!await exists(join17(root, "org"))) return derive();
   const targets = [{ scope: null, dir: root, depth: 0, label: "AGENTS.md" }];
   for (const [name, entry] of Object.entries(manifest.scopes)) {
     const segments = entry.path.split("/");
@@ -3530,18 +3685,26 @@ async function checkBlocks({
   }
   for (const t of targets) {
     if (!await exists(t.dir)) {
-      warnings.push(`${t.label}: directory not present, block not checked`);
+      note(
+        t.label,
+        "missing-dir",
+        `${t.label}: directory not present, block not checked`
+      );
       continue;
     }
     const text = await readOrNull(join17(t.dir, "AGENTS.md"));
     const lines = text === null ? [] : text.split(/\r?\n/);
     const found = findBlock(lines);
     if (found.kind === "none") {
-      warnings.push(`${t.label}: no rness block yet (run rness sync)`);
+      note(
+        t.label,
+        "no-block",
+        `${t.label}: no rness block yet (run rness sync)`
+      );
       continue;
     }
     if (found.kind === "error") {
-      problems.push(`${t.label}: ${found.message}`);
+      note(t.label, "malformed", `${t.label}: ${found.message}`);
       continue;
     }
     const context = await assembleContext({
@@ -3555,11 +3718,12 @@ async function checkBlocks({
       depth: t.depth,
       context
     });
-    if (!isCurrentBlock(lines.slice(found.begin, found.end + 1), fresh2.hash)) {
-      problems.push(`${t.label}: stale rness block (run rness sync)`);
-    }
+    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)`);
   }
-  return { problems, warnings };
+  return derive();
 }
 
 // src/core/contract.ts
@@ -3619,7 +3783,7 @@ async function checkContract(rnessDir) {
 }
 
 // src/commands/validate.ts
-async function validateCommand(opts) {
+async function validateCommand(opts, deps = {}) {
   const cwd = opts.cwd ?? process.cwd();
   try {
     const ws = await findWorkspace(cwd);
@@ -3636,13 +3800,29 @@ async function validateCommand(opts) {
     });
     problems.push(...blocks.problems);
     warnings.push(...blocks.warnings);
-    for (const p of problems) process.stderr.write(`${p}
+    const ui = await makeUi(deps.terminal ?? defaultTerminal);
+    if (!ui.session) {
+      for (const p of problems) process.stderr.write(`${p}
 `);
-    for (const w of warnings) process.stderr.write(`${warn(w)}
+      for (const w of warnings) process.stderr.write(`${warn(w)}
 `);
-    if (problems.length > 0) return 1;
-    process.stdout.write("context ok\n");
-    return 0;
+      if (problems.length > 0) return 1;
+      process.stdout.write("context ok\n");
+      return 0;
+    }
+    ui.intro(`Validate ${org}`);
+    for (const c of blocks.checks)
+      if (c.message === null) ui.line("current", c.label);
+      else if (c.status === "stale" || c.status === "malformed")
+        ui.error(c.message);
+      else ui.warn(c.message);
+    for (const p of problems) if (!blocks.problems.includes(p)) ui.error(p);
+    for (const w of warnings) if (!blocks.warnings.includes(w)) ui.warn(w);
+    ui.outro(
+      problems.length > 0 ? "Context mismatch" : "Context OK",
+      problems.length > 0 ? "error" : "done"
+    );
+    return problems.length > 0 ? 1 : 0;
   } catch (e) {
     return reportError(e);
   }
@@ -3833,13 +4013,16 @@ export {
   addCommand,
   renderMarkdown,
   contextCommand,
+  pinnedBinPath,
   findDelegate,
   PACKAGE_MANAGERS,
   isPackageManager,
   detectPackageManager,
   packageManagerVersion,
   installDependencies,
+  pinDrift,
   driftWarning,
+  ensureInstalled,
   SCAFFOLD_FILES,
   scaffoldDir,
   copyScaffold,
@@ -3854,4 +4037,4 @@ export {
   validateCommand,
   run
 };
-//# sourceMappingURL=chunk-WSGPDTPQ.js.map
+//# sourceMappingURL=chunk-C6HBGV5V.js.map