@rness/cli 0.8.0 → 0.8.1

package/README.md

@@ -138,7 +138,7 @@ dependency does this: `util.styleText`, and a banner kept as a constant.
 ### Upgrade
 
     rness upgrade            # the latest release; `rness upgrade 0.5.0` for another
-    npx @rness/cli@latest upgrade     # your global rness is older than the pin, or the pin is below 0.5.0
+    npx @rness/cli@latest upgrade     # your global rness is below 0.8.0, or the pin is below 0.5.0
     pnpm rness upgrade       # inside .rness: the pinned copy merges its own scaffold
 
 The version is written in one place, `.rness/package.json`. `upgrade` pins it
@@ -191,9 +191,10 @@ now names; `rness validate` warns while it is behind.
   drops the scaffold commit, and the next upgrade falls back to an older base.
 
 `upgrade` is never delegated to the pinned copy, which is what it replaces
-— so it runs the copy you typed. A global `rness` older than the pin answers
-"already at" and merges no scaffold: use the `npx` form, or the pinned copy
-from inside `.rness`. A workspace pinned below 0.5.0, whose copy has no such
+— so it runs the copy you typed. From 0.8.0, a global `rness` older than the
+pin merges the scaffold of the copy installed in `.rness`. A global below
+0.8.0 knows no scaffold: it answers "already at" and merges nothing — use the
+`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
@@ -203,6 +204,16 @@ 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.8.1 — adoption without placeholders
+
+- Adopting the scaffold no longer adds a `.gitkeep` to a directory that
+  already holds files (`specs/`, `plans/` of a workspace older than
+  `create`).
+- In a terminal, `upgrade` says "Merging the @rness/cli 0.8.0 scaffold"
+  instead of "the @rness/cli 0.8.0 scaffold merging".
+- A test now pins what 0.8.0 already did: a global `rness` older than the pin
+  merges the scaffold of the copy installed in `.rness`.
+
 ## 0.8.0 — upgrade merges the scaffold
 
 - `rness upgrade` merges the target version's scaffold into `.rness` with

package/dist/bin/rness.js

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

package/dist/{chunk-VQMX52HT.js → chunk-ONLF4VFA.js}

@@ -1390,7 +1390,7 @@ function reportError(e) {
 }
 
 // src/version.ts
-var VERSION = "0.8.0";
+var VERSION = "0.8.1";
 
 // src/core/block.ts
 import { createHash } from "crypto";
@@ -3291,6 +3291,24 @@ async function isRepository2(rnessDir) {
   const real = (p) => realpath2(p).catch(() => resolve3(p));
   return await real(r.stdout.trim()) === await real(rnessDir);
 }
+async function withoutRedundantKeeps(rnessDir, files) {
+  const kept = [];
+  for (const file of files) {
+    if (file.path.endsWith("/.gitkeep")) {
+      const dir = file.path.slice(0, -"/.gitkeep".length);
+      const listed = await run(rnessDir, [
+        "ls-tree",
+        "--name-only",
+        "HEAD",
+        "--",
+        `${dir}/`
+      ]);
+      if (listed.code === 0 && listed.stdout.trim() !== "") continue;
+    }
+    kept.push(file);
+  }
+  return kept;
+}
 
 // src/core/new-workspace.ts
 async function isEmptyDir(dir) {
@@ -4341,7 +4359,11 @@ async function upgradeCommand(version, opts, terminal = defaultTerminal, deps =
     }
     const pm = await workspacePackageManager(ws.rnessDir);
     if (pin.spec === target && installed === target)
-      ui.line("scaffold", `@rness/cli ${target} \u2014 merging it into ${label}`);
+      ui.line(
+        "scaffold",
+        `@rness/cli ${target} \u2014 merging it into ${label}`,
+        `Merging the @rness/cli ${target} scaffold into ${label}`
+      );
     else if (pin.spec === target)
       ui.line(
         "install",
@@ -4378,13 +4400,19 @@ async function upgradeCommand(version, opts, terminal = defaultTerminal, deps =
         if (base === null)
           ui.line(
             "adopting",
-            `the @rness/cli ${target} scaffold (no scaffold commit in ${label} yet)`
+            `the @rness/cli ${target} scaffold (no scaffold commit in ${label} yet)`,
+            `Adopting the @rness/cli ${target} scaffold \u2014 ${label} has no scaffold commit yet`
+          );
+        else
+          ui.line(
+            "merging",
+            `the @rness/cli ${target} scaffold`,
+            `Merging the @rness/cli ${target} scaffold`
           );
-        else ui.line("merging", `the @rness/cli ${target} scaffold`);
         const commit = await buildScaffoldCommit(
           ws.rnessDir,
           base?.commit ?? null,
-          files,
+          base === null ? await withoutRedundantKeeps(ws.rnessDir, files) : files,
           target
         );
         const result = await mergeScaffold(
@@ -4946,4 +4974,4 @@ export {
   OWN_COMMANDS,
   catchUp
 };
-//# sourceMappingURL=chunk-VQMX52HT.js.map
+//# sourceMappingURL=chunk-ONLF4VFA.js.map