@rness/cli 0.9.0 → 0.9.1

package/README.md

@@ -93,13 +93,14 @@ decided:
   written.
 - With `claude` in `agents`, `sync` registers it in each clone:
   `.mcp.json` gets `mcpServers.rness`, which runs the pinned copy
-  (`node ../../.rness/node_modules/@rness/cli/dist/bin/rness.js mcp`), and
-  `.claude/settings.json` lists `rness` in `enabledMcpjsonServers`. A
+  (`node ../../.rness/node_modules/@rness/cli/dist/bin/rness.js mcp`). A
   team's own `rness` entry is left as it is.
+- Each developer approves the server once, in Claude Code's own dialog.
+  rness does not pre-approve it: `enabledMcpjsonServers` in a committed
+  settings file would let any change to the `rness` entry of `.mcp.json` run
+  unasked. Review such a change like code.
 - Verified with Claude Code 2.1.284 on 2026-09-29: the server starts from the
-  repository and its tools answer. Not verified yet: that
-  `enabledMcpjsonServers` spares the approval prompt in an interactive
-  session.
+  repository and its tools answer.
 - Another agent can run the same command from a clone; rness writes no
   configuration for it.
 
@@ -177,8 +178,9 @@ dependency does this: `util.styleText`, and a banner kept as a constant.
 
 The version is written in one place, `.rness/package.json`. `upgrade` pins it
 there (exact, the rest of the file untouched), installs with the workspace's
-package manager, then syncs through the new copy; a failed install restores
-the file. Commit `.rness`. Teammates pull, and the next `rness` command in that
+package manager, syncs through the new copy, then commits `.rness`
+(`chore: rness <version>`); a failed install restores the file. Push
+`.rness`. Teammates pull, and the next `rness` command in that
 workspace installs the new pin itself — frozen, so the working tree stays
 clean — and carries on: nothing to remember, nothing to run.
 `RNESS_NO_INSTALL=1` turns that off and restores the warning, for CI, a
@@ -216,8 +218,10 @@ now names; `rness validate` warns while it is behind.
   scaffold did not change; overlapping lines conflict, and `upgrade` stops
   before installing — resolve with git (`git checkout --ours <file>` keeps
   yours, `--theirs` takes the scaffold's), commit, run `upgrade` again.
-- `.rness` must be a clean git repository. The merge is staged, not
-  committed: the next steps end in one commit.
+- `.rness` must be a clean git repository with no merge in progress.
+  `upgrade` commits the merge itself, through the repository's hooks. When a
+  hook refuses, everything stays staged, what it said is shown, and
+  `upgrade` exits 1 with the commit to make.
 - A workspace with no scaffold commit (made by hand, or older than
   `create`) is adopted: identical files merge silently, a differing one
   conflicts once.
@@ -231,13 +235,32 @@ pin merges the scaffold of the copy installed in `.rness`. A global below
 `npx` form, or the pinned copy from inside `.rness`. A workspace pinned below 0.5.0, whose copy has no such
 command, starts with the `npx` form.
 
-An upgrade touches `.rness` only: a generated block is current when its hash
-is, whatever wrote it, so no `AGENTS.md` of the organization changes unless
-its content does.
+An upgrade commits `.rness` only. Its sync rewrites a block only when the
+block's content changed — a block is current when its hash is, whatever
+wrote it — and writes the agent files a release adds. The next steps list,
+per repository, the files to commit there.
 
 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.9.1 — upgrade ends in its commit; the MCP server approved per developer
+
+- `rness upgrade` commits `.rness` itself (`chore: rness <version>`), with
+  the repository's hooks; a refusal leaves everything staged and exits 1.
+  The next steps say what is left: push, and per repository the files the
+  sync changed.
+- `upgrade` syncs every time, the Dependabot case included (pin and install
+  already at the target). In 0.9.0 it skipped the sync there, so the values
+  0.9.0 added to the agent files were missing and the scaffold's
+  pre-commit hook refused the commit.
+- `upgrade` refuses a `.rness` with a merge in progress.
+- `validate` counts a merge in progress: the commit recording a scaffold
+  merge no longer warns that the scaffold is not merged.
+- The Claude target no longer writes `enabledMcpjsonServers`: each developer
+  approves the MCP server once. After syncing with 0.9.0, remove `rness`
+  from `enabledMcpjsonServers` in each `.claude/settings.json` by hand —
+  rness never removes a value.
+
 ## 0.9.0 — the context on demand: `rness mcp`
 
 - `rness mcp`: a local, read-only MCP server with four tools —

package/dist/bin/rness.js

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

package/dist/{chunk-DL72BCPT.js → chunk-N3F6N6GA.js}

@@ -743,6 +743,21 @@ async function isClean(dir, ignore = []) {
     dir
   )).trim() === "";
 }
+async function changedPaths(dir, paths) {
+  if (paths.length === 0) return [];
+  const entries = (await git(
+    ["status", "--porcelain", "-z", "--untracked-files=all", "--", ...paths],
+    dir
+  )).split("\0");
+  const changed = [];
+  for (let i = 0; i < entries.length; i++) {
+    const entry = entries[i] ?? "";
+    if (entry.length < 4) continue;
+    changed.push(entry.slice(3));
+    if (entry[0] === "R" || entry[0] === "C") i++;
+  }
+  return changed;
+}
 async function pullFastForward(dir, credentials) {
   await git(["pull", "--ff-only", "--quiet"], dir, credentials);
 }
@@ -1390,7 +1405,7 @@ function reportError(e) {
 }
 
 // src/version.ts
-var VERSION = "0.9.0";
+var VERSION = "0.9.1";
 
 // src/core/block.ts
 import { createHash } from "crypto";
@@ -1705,16 +1720,17 @@ var TARGETS = {
           {
             path: ["permissions", "additionalDirectories"],
             contains: "../../.rness"
-          },
-          // Start the rness MCP server of .mcp.json without asking.
-          { path: ["enabledMcpjsonServers"], contains: "rness" }
+          }
         ]
       },
       {
         file: ".mcp.json",
         guarantees: [
           // The pinned copy, by a path relative to the repository — the
-          // directory Claude Code starts the server in (spec 0014 §6).
+          // directory Claude Code starts the server in (spec 0014 §6). Not
+          // pre-approved in settings: each developer approves it once, since
+          // a repository approving its own command would run any change to
+          // it unasked (spec 0014 §3, 0.9.1).
           {
             path: ["mcpServers", "rness"],
             value: {
@@ -1856,6 +1872,13 @@ function declared(manifest) {
     (name) => Object.hasOwn(TARGETS, name) ? [TARGETS[name]] : []
   );
 }
+var BLOCK_FILES = ["AGENTS.md", "CLAUDE.md"];
+function writtenFiles(manifest) {
+  return [
+    ...BLOCK_FILES,
+    ...declared(manifest).flatMap((t) => t.files.map((f) => f.file))
+  ];
+}
 async function agentTargets(root, manifest, opts) {
   const outcomes = [];
   for (const { guarantees, file, label } of await filesOf(
@@ -2104,7 +2127,6 @@ async function makeUi(terminal) {
 }
 
 // src/commands/sync.ts
-var MANAGED_FILES = ["AGENTS.md", "CLAUDE.md"];
 function targetsOf(manifest, root, only) {
   const targets = [];
   if (only === void 0)
@@ -2294,13 +2316,7 @@ async function syncCommand(opts, deps = {}) {
           }
         } else if (opts.pull === true && !check) {
           try {
-            const written = [
-              ...MANAGED_FILES,
-              ...(manifest.agents ?? []).flatMap(
-                (a) => Object.hasOwn(TARGETS, a) ? TARGETS[a].files.map((f) => f.file) : []
-              )
-            ];
-            if (!await isClean(dir, written)) {
+            if (!await isClean(dir, writtenFiles(manifest))) {
               lines.push(["skipped", `${label} (working tree not clean)`]);
               continue;
             }
@@ -2343,7 +2359,7 @@ async function syncCommand(opts, deps = {}) {
             continue;
           }
           const [agentsLinked, claudeLinked] = await Promise.all(
-            MANAGED_FILES.map((f) => isSymlink(join10(t.dir, f)))
+            BLOCK_FILES.map((f) => isSymlink(join10(t.dir, f)))
           );
           const atRoot = t.scope === null;
           if (!atRoot && (agentsLinked === true || claudeLinked === true)) {
@@ -3211,12 +3227,33 @@ function scaffoldMessage(subject, version) {
 
 ${SCAFFOLD_TRAILER}: ${version}`;
 }
+async function commitUpgrade(rnessDir, message) {
+  const add = await run(rnessDir, ["add", "-A"]);
+  if (add.code !== 0) return { kind: "refused", output: add.stderr.trim() };
+  const staged = await run(rnessDir, ["diff", "--cached", "--quiet"]);
+  if (staged.code === 0 && !await mergeInProgress(rnessDir))
+    return { kind: "nothing" };
+  const commit = await run(rnessDir, ["commit", "-q", "-m", message]);
+  if (commit.code !== 0)
+    return {
+      kind: "refused",
+      output: `${commit.stdout}
+${commit.stderr}`.trim()
+    };
+  return { kind: "committed" };
+}
+async function mergeInProgress(dir) {
+  const r = await run(dir, ["rev-parse", "-q", "--verify", "MERGE_HEAD"]);
+  return r.code === 0;
+}
 async function findScaffoldBase(rnessDir) {
+  const merging = await mergeInProgress(rnessDir);
   const log = await run(rnessDir, [
     "log",
     "--topo-order",
     `--format=%H%x1f%P%x1f%s%x1f%(trailers:key=${SCAFFOLD_TRAILER},valueonly,separator=%x2C)%x1e`,
-    "HEAD"
+    "HEAD",
+    ...merging ? ["MERGE_HEAD"] : []
   ]);
   if (log.code !== 0) return null;
   const commits = log.stdout.split("").map((r) => r.trim()).filter((r) => r !== "").map((r) => {
@@ -4355,14 +4392,36 @@ async function declaredManager(rnessDir, pm) {
   }
   return `${pm}@${await packageManagerVersion(pm)}`;
 }
-function finish(ui, cwd, rnessDir, label, target) {
+async function clonesToCommit(root, cwd, manifest) {
+  const files = writtenFiles(manifest);
+  const clones = [];
+  for (const repo of Object.keys(manifest.repos)) {
+    const dir = join21(root, "org", repo);
+    if (!await exists(dir)) continue;
+    try {
+      const paths = await changedPaths(dir, files);
+      if (paths.length > 0)
+        clones.push({ dir: relative5(cwd, dir) || ".", paths });
+    } catch {
+    }
+  }
+  return clones;
+}
+function finish(ui, cwd, rnessDir, label, target, ending) {
   const rel = relative5(cwd, rnessDir) || ".";
-  const next = [
-    `git -C ${rel} add -A && git -C ${rel} commit -m "chore: rness ${target}"`,
-    "# teammates: git pull \u2014 the next rness command installs it"
-  ];
+  const message = `chore: rness ${target}`;
+  const next = [];
+  if (ending.commit === "committed") next.push(`git -C ${rel} push`);
+  if (ending.commit === "refused")
+    next.push(`git -C ${rel} commit -m "${message}"`);
+  for (const c of ending.clones)
+    next.push(
+      `git -C ${c.dir} add ${c.paths.join(" ")} && git -C ${c.dir} commit -m "${message}"`
+    );
+  if (ending.commit !== "nothing")
+    next.push("# teammates: git pull \u2014 the next rness command installs it");
   if (ui.session) {
-    ui.note("Next steps", next);
+    if (next.length > 0) ui.note("Next steps", next);
     ui.outro(`${label} runs @rness/cli ${target}`);
   } else
     process.stdout.write(
@@ -4370,12 +4429,10 @@ function finish(ui, cwd, rnessDir, label, target) {
         "",
         status("upgraded", `${label} to @rness/cli ${target}`),
         "",
-        "Next:",
-        ...next.map((line2) => `  ${line2}`),
-        ""
+        ...next.length > 0 ? ["Next:", ...next.map((line2) => `  ${line2}`), ""] : []
       ].join("\n")
     );
-  return 0;
+  return ending.commit === "refused" ? 1 : 0;
 }
 async function upgradeCommand(version, opts, terminal = defaultTerminal, deps = {}) {
   const cwd = opts.cwd ?? process.cwd();
@@ -4424,6 +4481,13 @@ async function upgradeCommand(version, opts, terminal = defaultTerminal, deps =
 `);
       return 1;
     }
+    if (await mergeInProgress(ws.rnessDir)) {
+      process.stderr.write(
+        `${label} has a merge in progress; commit it, or abort it with git -C ${relative5(cwd, ws.rnessDir) || "."} merge --abort, then ${rnessCommand()} upgrade
+`
+      );
+      return 1;
+    }
     if (!await isClean(ws.rnessDir)) {
       process.stderr.write(
         `${label} has uncommitted changes; commit or stash them, then ${rnessCommand()} upgrade
@@ -4532,48 +4596,71 @@ async function upgradeCommand(version, opts, terminal = defaultTerminal, deps =
     const moved = await readPin(ws.rnessDir);
     if (moved !== null && moved.spec !== target)
       await writePin(ws.rnessDir, moved.spec, target);
-    if (pin.spec === target && installed === target)
-      return finish(ui, cwd, ws.rnessDir, label, target);
-    try {
-      await ui.step(
-        { doing: `installing dependencies with ${pm}` },
-        () => installDependencies(pm, ws.rnessDir),
-        () => ["installed", `dependencies with ${pm}`]
-      );
-    } catch (e) {
-      const message = e instanceof Error ? e.message : String(e);
-      ui.error(message);
-      if (!merged) {
-        for (const [file, text] of restore) await writeFileAtomic(file, text);
-        ui.hint(
-          `restored ${relative5(cwd, packageFile) || packageFile}`,
-          "stderr"
+    const mustInstall = !(pin.spec === target && installed === target);
+    if (mustInstall) {
+      try {
+        await ui.step(
+          { doing: `installing dependencies with ${pm}` },
+          () => installDependencies(pm, ws.rnessDir),
+          () => ["installed", `dependencies with ${pm}`]
         );
+      } catch (e) {
+        const message2 = e instanceof Error ? e.message : String(e);
+        ui.error(message2);
+        if (!merged) {
+          for (const [file, text] of restore) await writeFileAtomic(file, text);
+          ui.hint(
+            `restored ${relative5(cwd, packageFile) || packageFile}`,
+            "stderr"
+          );
+        }
+        if (merged)
+          ui.hint(
+            `the scaffold merge is still staged; undo it with: git -C ${relative5(cwd, ws.rnessDir) || "."} merge --abort`,
+            "stderr"
+          );
+        if (/minimum.?release.?age|NO_MATURE/i.test(message2))
+          ui.hint(
+            "pnpm refuses versions published less than 24 h ago: add '@rness/cli' under minimumReleaseAgeExclude in .rness/pnpm-workspace.yaml",
+            "stderr"
+          );
+        return 1;
       }
-      if (merged)
-        ui.hint(
-          `the scaffold merge is still staged; undo it with: git -C ${relative5(cwd, ws.rnessDir) || "."} merge --abort`,
-          "stderr"
-        );
-      if (/minimum.?release.?age|NO_MATURE/i.test(message))
-        ui.hint(
-          "pnpm refuses versions published less than 24 h ago: add '@rness/cli' under minimumReleaseAgeExclude in .rness/pnpm-workspace.yaml",
-          "stderr"
-        );
-      return 1;
-    }
-    const now = (await readPinnedCli(ws.rnessDir))?.version ?? null;
-    if (now !== target) {
-      process.stderr.write(
-        `${pm} install left @rness/cli ${now ?? "not installed"} in ${label}, not ${target}
+      const now = (await readPinnedCli(ws.rnessDir))?.version ?? null;
+      if (now !== target) {
+        process.stderr.write(
+          `${pm} install left @rness/cli ${now ?? "not installed"} in ${label}, not ${target}
 `
-      );
-      return 1;
+        );
+        return 1;
+      }
     }
     ui.gitIsSilent = true;
     const code = await syncBlocks(ui, ws.root, basename5(ws.root));
     if (code !== 0) return code;
-    return finish(ui, cwd, ws.rnessDir, label, target);
+    const message = `chore: rness ${target}`;
+    const committed = await commitUpgrade(ws.rnessDir, message);
+    if (committed.kind === "committed")
+      ui.line(
+        "committed",
+        `${label} \u2014 ${message}`,
+        `Committed ${label}: ${message}`
+      );
+    if (committed.kind === "refused") {
+      ui.error(
+        `the commit of ${label} was refused; everything is staged \u2014 deal with what git said, then commit`
+      );
+      for (const line2 of committed.output.split("\n"))
+        if (line2.trim() !== "") ui.hint(line2, "stderr");
+    }
+    return finish(ui, cwd, ws.rnessDir, label, target, {
+      commit: committed.kind,
+      clones: await clonesToCommit(
+        ws.root,
+        cwd,
+        await loadManifest(ws.rnessDir)
+      )
+    });
   } catch (e) {
     return reportError(e);
   }
@@ -5416,4 +5503,4 @@ export {
   OWN_COMMANDS,
   catchUp
 };
-//# sourceMappingURL=chunk-DL72BCPT.js.map
+//# sourceMappingURL=chunk-N3F6N6GA.js.map