@rness/cli 0.18.0 → 0.18.1

package/README.md

@@ -133,7 +133,8 @@ the files a given agent needs, for the agents the team declares in
   by `rness doc new <collection>` — the second pre-approved line of each
   skill, so that every runtime and a bare terminal get the same number;
   `rness validate` refuses two documents with one number, the case a merge
-  of two branches can still produce. Each skill records its session: it adds
+  of two branches can still produce, and a document named without one
+  (`NNNN-<slug>.md`, never a date). Each skill records its session: it adds
   `{ id: <session id>, agent: <model> }` to `sessions:` in the front matter
   of what it writes or closes. The agent is the model it runs as, as Claude
   Code names it (`Claude Opus 5.5`): no variable gives it to a skill. An
@@ -603,6 +604,28 @@ 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.18.1 — a document without a number is caught; small fixes
+
+- `rness validate` and the edit hook name a document of `adr/`, `specs/` or
+  `plans/` whose file name has no number, with the next one:
+  `plans/2026-10-02-x.md: not numbered; name it 0002-<slug>.md, the next
+number of plans`. A plan another agent's skill wrote with a dated name
+  is the usual case; rename it, or let the agent do it when the hook
+  tells it. A workspace with such a file fails `validate` (and its CI)
+  after the upgrade until it is renamed. The scaffold's `CONVENTIONS.md`
+  states the rule, and `upgrade` merges it in.
+- A dated file name is no longer read as a number: `rness doc new` after
+  `2026-10-02-x.md` gave `2027`, and two dated plans of one year were
+  reported as one number twice.
+- `rness doc new` racing another one at the same number says `<file>
+exists; nothing written` (exit 1) instead of a raw `EEXIST`.
+- `1 repository`, not `1 repositories`, in `create` and `sync`.
+- When the SSH test passes only by asking for the key's passphrase,
+  `create`, `add` and `sync` say once how to load it into an agent
+  (`ssh-add`), since every clone would ask again.
+- Ctrl+C while `create` waits for an organization's approval is a cancel
+  in the plain look too: `cancelled`, nothing written, exit 0 (it was 130).
+
 ## 0.18.0 — the wizard asks where first and waits for the approval; the skills on one grammar; Node 22.17
 
 - The published CLI runs on **Node 22.17 or later** (ADR 0010); the guard

package/dist/bin/rness.js

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

package/dist/{chunk-VGBS7HDY.js → chunk-JHU2G7K7.js}

@@ -508,7 +508,7 @@ function parseRepoSpec(spec, org, host) {
 }
 
 // src/version.ts
-var VERSION = "0.18.0";
+var VERSION = "0.18.1";
 
 // src/core/pm.ts
 import { execFile as execFile2 } from "child_process";
@@ -744,7 +744,13 @@ import { join as join5 } from "path";
 
 // src/core/documents.ts
 import { posix as posix2 } from "path";
+function documentDate(rel) {
+  return /^((?:19|20)\d{2}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[12]\d|3[01]))-/.exec(
+    posix2.basename(rel)
+  )?.[1] ?? null;
+}
 function documentNumber(rel) {
+  if (documentDate(rel) !== null) return null;
   return /^(\d{4})-/.exec(posix2.basename(rel))?.[1] ?? null;
 }
 function documentTitle(heading, number) {
@@ -788,9 +794,16 @@ async function checkContract(rnessDir) {
           `${where}: the number ${number} is also that of ${files.filter((f) => f !== where).join(", ")}`
         );
     }
+    const next = String(
+      Math.max(0, ...[...byNumber.keys()].map(Number)) + 1
+    ).padStart(4, "0");
     for (const item of items) {
       const where = `${name}/${item.rel}`;
       if (SKIP.has(where)) continue;
+      if (allowed !== void 0 && documentNumber(item.rel) === null)
+        problems.push(
+          `${where}: not numbered; name it ${next}-<slug>.md, the next number of ${name}`
+        );
       if (item.fieldsError !== null) {
         problems.push(`${where}: invalid front matter (${item.fieldsError})`);
         continue;
@@ -1127,8 +1140,8 @@ function sessionsOf(item) {
 }
 function rowOf(dir, item) {
   const base = posix3.basename(item.rel, ".md");
-  const date = /^(\d{4}-\d{2}-\d{2})-/.exec(base)?.[1] ?? null;
-  const number = date === null ? documentNumber(item.rel) : null;
+  const date = documentDate(item.rel);
+  const number = documentNumber(item.rel);
   const sessions = sessionsOf(item);
   return {
     id: date ?? number ?? base,
@@ -3948,6 +3961,9 @@ function inverse(text, stream = process.stdout) {
   const painted = styleText("inverse", text, { stream, validateStream: true });
   return painted === text ? plain : painted;
 }
+function count(n, [one, many]) {
+  return `${n} ${n === 1 ? one : many}`;
+}
 function grey(text, stream = process.stdout) {
   if (noColor()) return text;
   return styleText("gray", text, { stream, validateStream: true });
@@ -4021,12 +4037,12 @@ async function detectGithubSsh(opts) {
     child.stderr?.setEncoding("utf8");
     child.stderr?.on("data", (chunk) => chunks.push(chunk));
     let settled = false;
-    const settle = (access3) => {
+    const settle = (access2) => {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
       child.stderr?.destroy();
-      resolve8(access3);
+      resolve8(access2);
     };
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
@@ -4071,8 +4087,8 @@ async function testGithubSsh(transport, interactive, announce) {
   };
 }
 var loggedInAs = (login) => login === void 0 || login === null ? "" : `, logged in as ${login}`;
-function usingSentence(access3, login) {
-  return access3.ok ? `SSH works for github.com (as ${access3.login}) \u2014 repositories are cloned over SSH` : `No SSH access to github.com (${access3.reason}) \u2014 repositories are cloned over HTTPS${loggedInAs(login)}`;
+function usingSentence(access2, login) {
+  return access2.ok ? `SSH works for github.com (as ${access2.login}) \u2014 repositories are cloned over SSH` : `No SSH access to github.com (${access2.reason}) \u2014 repositories are cloned over HTTPS${loggedInAs(login)}`;
 }
 function isSshUrl(url, hosts) {
   return url.startsWith(hosts.ssh);
@@ -4083,8 +4099,8 @@ var CHECKING = [
   "ssh access to github.com\u2026",
   "Checking SSH access to github.com \u2014 ssh may ask for your passphrase"
 ];
-function usingRest(access3, login) {
-  return access3.ok ? `ssh (github.com as ${access3.login})` : `https (ssh to github.com unavailable: ${access3.reason}${loggedInAs(login)})`;
+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";
@@ -4094,6 +4110,12 @@ function agentHintLines(platform = process.platform) {
     `  ~/.ssh/config: AddKeysToAgent yes${mac ? ", UseKeychain yes" : ""}`
   ];
 }
+function passphraseHint(platform = process.platform) {
+  return [
+    "ssh asked for your passphrase, and asks again for every repository unless an agent holds the key:",
+    ...agentHintLines(platform).slice(1)
+  ].join("\n");
+}
 function sshWorkspaceLines(reason3) {
   return [
     `this workspace clones over SSH (rness.json) but ssh to github.com fails: ${reason3}`,
@@ -5509,7 +5531,7 @@ async function askWhatToSync(input) {
         {
           value: SELECT_ALL,
           label: "Select all",
-          hint: `${input.missing.length} repositories from rness.json`
+          hint: `${count(input.missing.length, ["repository", "repositories"])} from rness.json`
         },
         ...input.missing.map((name) => ({ value: name, label: name }))
       ],
@@ -5610,15 +5632,16 @@ async function syncCommand(opts, deps = {}) {
     if (!overSsh) ui.gitIsSilent = true;
     if (overSsh) {
       const interactive = opts.yes !== true && terminal.isTty();
-      const { access: access3, unattended } = await testGithubSsh(
+      const { access: access2, unattended } = await testGithubSsh(
         transport,
         interactive,
         () => ui.line(...CHECKING)
       );
       if (unattended) ui.gitIsSilent = true;
-      if (!access3.ok) {
+      else if (access2.ok) ui.hint(passphraseHint(), "stderr");
+      if (!access2.ok) {
         process.stderr.write(
-          `${[...sshWorkspaceLines(access3.reason), ...INSTEAD_OF_LINES].join("\n")}
+          `${[...sshWorkspaceLines(access2.reason), ...INSTEAD_OF_LINES].join("\n")}
 `
         );
         return 1;
@@ -5847,20 +5870,21 @@ async function addCommand(spec, opts, deps = {}) {
     if (host === void 0 && opts.https === true) host = transport.hosts.https;
     if (host === void 0 && FULL_URL2.test(spec)) host = transport.hosts.https;
     if (host === void 0) {
-      const { access: access3, unattended } = await testGithubSsh(
+      const { access: access2, unattended } = await testGithubSsh(
         transport,
         interactive,
         () => ui.line(...CHECKING)
       );
-      if (unattended || !access3.ok) ui.gitIsSilent = true;
+      if (unattended || !access2.ok) ui.gitIsSilent = true;
+      else ui.hint(passphraseHint(), "stderr");
       const overSsh = Object.values(manifest.repos).some(
         (r) => isSshUrl(r.url, transport.hosts)
       );
-      if (access3.ok || !overSsh) {
-        ui.line("using", usingRest(access3), usingSentence(access3));
-        host = access3.ok ? transport.hosts.ssh : transport.hosts.https;
+      if (access2.ok || !overSsh) {
+        ui.line("using", usingRest(access2), usingSentence(access2));
+        host = access2.ok ? transport.hosts.ssh : transport.hosts.https;
       } else {
-        const lines = sshWorkspaceLines(access3.reason);
+        const lines = sshWorkspaceLines(access2.reason);
         if (!interactive) {
           process.stderr.write(
             `${[...lines, httpsFlagLine(spec)].join("\n")}
@@ -6262,12 +6286,12 @@ async function checkAccess(input) {
   const login = (await provider.identity())?.login;
   const as = login === void 0 ? "" : ` (as ${login})`;
   const member = () => ui.line("member", `${org}${as}`, `You are a member of ${org}${as}`);
-  const access3 = await provider.organizationAccess(org);
-  if (access3 === "member") {
+  const access2 = await provider.organizationAccess(org);
+  if (access2 === "member") {
     member();
-    return access3;
+    return access2;
   }
-  if (access3 !== "restricted") return access3;
+  if (access2 !== "restricted") return access2;
   const url = provider.approvalUrl();
   ui.warn(
     `${org} has not approved rness, so its private repositories are hidden`
@@ -6296,23 +6320,42 @@ async function checkAccess(input) {
   const who = input.canGrant === true ? org : `an owner of ${org}`;
   const waiting = `for ${who} to approve rness on github.com`;
   if (!ui.session) ui.line("waiting", `${waiting}\u2026`);
-  const outcome = await ui.step(
-    {
-      doing: `waiting  ${waiting}`,
-      sentence: `Waiting ${waiting}`,
-      quiet: true
-    },
-    async () => {
-      const deadline = now() + APPROVAL_WAIT_MS;
-      for (; ; ) {
-        await sleep(APPROVAL_INTERVAL_MS);
-        const again = await provider.organizationAccess(org);
-        if (again === "member" || again === "not-member") return again;
-        if (now() >= deadline) return "timeout";
-      }
-    },
-    (r) => r === "member" ? ["member", `${org}${as}`] : null
-  );
+  let interrupted = false;
+  let wake = () => void 0;
+  const interrupt = () => {
+    interrupted = true;
+    wake();
+  };
+  if (!ui.session) process.once("SIGINT", interrupt);
+  let outcome;
+  try {
+    outcome = await ui.step(
+      {
+        doing: `waiting  ${waiting}`,
+        sentence: `Waiting ${waiting}`,
+        quiet: true
+      },
+      async () => {
+        const deadline = now() + APPROVAL_WAIT_MS;
+        for (; ; ) {
+          await Promise.race([
+            sleep(APPROVAL_INTERVAL_MS),
+            new Promise((resolve8) => {
+              wake = resolve8;
+            })
+          ]);
+          if (interrupted) return "cancelled";
+          const again = await provider.organizationAccess(org);
+          if (again === "member" || again === "not-member") return again;
+          if (now() >= deadline) return "timeout";
+        }
+      },
+      (r) => r === "member" ? ["member", `${org}${as}`] : null
+    );
+  } finally {
+    process.off("SIGINT", interrupt);
+  }
+  if (outcome === "cancelled") return outcome;
   if (outcome === "member") {
     if (!ui.session) member();
     return outcome;
@@ -6804,7 +6847,7 @@ async function pickRepositories(input) {
       // list below it must agree (spec 0009).
       (l) => [
         "listed",
-        `${l.repositories.filter(isMemberRepo).length} repositories of ${org}`
+        `${count(l.repositories.filter(isMemberRepo).length, ["repository", "repositories"])} of ${org}`
       ]
     );
     listed = listing.repositories;
@@ -7085,6 +7128,7 @@ async function createCommand(opts, deps = {}) {
         () => ui.line(...CHECKING)
       );
       if (sshTest.unattended) ui.gitIsSilent = true;
+      else if (sshTest.access.ok) ui.hint(passphraseHint(), "stderr");
     }
     return sshTest.access;
   };
@@ -7094,12 +7138,12 @@ async function createCommand(opts, deps = {}) {
     if (opts.host !== void 0) return opts.host;
     if (opts.ssh === true) return transport.hosts.ssh;
     if (opts.https === true) return transport.hosts.https;
-    const access3 = await testSsh();
-    const github = access3.ok ? null : await getProvider();
+    const access2 = await testSsh();
+    const github = access2.ok ? null : await getProvider();
     const login = github?.authenticated ? (await github.identity())?.login : void 0;
-    ui.line("using", usingRest(access3, login), usingSentence(access3, login));
-    if (!access3.ok) ui.gitIsSilent = true;
-    return access3.ok ? transport.hosts.ssh : transport.hosts.https;
+    ui.line("using", usingRest(access2, login), usingSentence(access2, login));
+    if (!access2.ok) ui.gitIsSilent = true;
+    return access2.ok ? transport.hosts.ssh : transport.hosts.https;
   };
   let loaded;
   const prompts = async () => loaded ??= await terminal.prompts();
@@ -7273,10 +7317,10 @@ async function createCommand(opts, deps = {}) {
         (r) => isSshUrl(r.url, transport.hosts)
       );
       if (overSsh && opts.ssh !== true && opts.host === void 0) {
-        const access3 = await testSsh();
-        if (!access3.ok) {
+        const access2 = await testSsh();
+        if (!access2.ok) {
           process.stderr.write(
-            `${[...sshWorkspaceLines(access3.reason), ...INSTEAD_OF_LINES].join("\n")}
+            `${[...sshWorkspaceLines(access2.reason), ...INSTEAD_OF_LINES].join("\n")}
 `
           );
           return 1;
@@ -8008,7 +8052,7 @@ async function validateCommand(opts, deps = {}) {
 import { Command, CommanderError, Option } from "commander";
 
 // src/commands/doc.ts
-import { access as access2, mkdir as mkdir7, readFile as readFile11, writeFile as writeFile4 } from "fs/promises";
+import { mkdir as mkdir7, readFile as readFile11, writeFile as writeFile4 } from "fs/promises";
 import { join as join25 } from "path";
 var NUMBERED = Object.keys(STATUSES);
 var SECTIONS = {
@@ -8044,6 +8088,19 @@ async function adrSections(rnessDir) {
   }
   return ["Context", "Decision", "Alternatives Considered", "Consequences"];
 }
+async function writeDocument(file, text) {
+  try {
+    await writeFile4(file, text, { flag: "wx" });
+  } catch (e) {
+    if (e.code !== "EEXIST") throw e;
+    process.stderr.write(`${file} exists; nothing written
+`);
+    return 1;
+  }
+  process.stdout.write(`${file}
+`);
+  return 0;
+}
 async function docNewCommand(collection, opts) {
   if (!NUMBERED.includes(collection)) {
     process.stderr.write(
@@ -8083,20 +8140,8 @@ async function docNewCommand(collection, opts) {
       ...name === "plans" ? [] : ["", "---"],
       ...sections.flatMap((s) => ["", `## ${s}`])
     ];
-    try {
-      await access2(file);
-      process.stderr.write(`${file} exists; nothing written
-`);
-      return 1;
-    } catch {
-    }
-    await writeFile4(file, `${[...front, "", ...body].join("\n")}
-`, {
-      flag: "wx"
-    });
-    process.stdout.write(`${file}
+    return await writeDocument(file, `${[...front, "", ...body].join("\n")}
 `);
-    return 0;
   } catch (e) {
     return reportError(e);
   }
@@ -8482,9 +8527,6 @@ function cwdOf(input, env) {
   return env["CLAUDE_PROJECT_DIR"] ?? process.cwd();
 }
 var toPosix2 = (p) => p.split(sep5).join(posix8.sep);
-function count(n, [one, many]) {
-  return `${n} ${n === 1 ? one : many}`;
-}
 async function safetyNet(ws, manifest) {
   const notes = [];
   const drift = await pinDrift(ws.rnessDir);
@@ -9876,4 +9918,4 @@ export {
   OWN_COMMANDS,
   catchUp
 };
-//# sourceMappingURL=chunk-VGBS7HDY.js.map
+//# sourceMappingURL=chunk-JHU2G7K7.js.map