@coderook/cli 0.5.0 → 0.6.0

package/dist/cli/src/cli.js

@@ -270,9 +270,36 @@ async function commandStatus(parsed) {
 async function commandSubmit(parsed) {
     const folder = folderFor(parsed);
     const message = flagText(parsed, "m", "message") ?? "";
-    const { link, baseline } = await reconcile(folder);
+    const { link, baseline, behind } = await reconcile(folder);
     const rules = await (0, worktree_js_1.readRules)(folder);
     const files = await (0, worktree_js_1.changedFiles)(folder, rules, baseline);
+    /*
+      An upgraded folder with no materialisation record and something that
+      differs from its recorded version is ambiguous in the one way that
+      matters: the difference is either work to send, or a copy left behind by
+      somebody's merge. Sending the second reverts their change.
+  
+      While the folder is level with the project the question does not arise —
+      nothing can have merged underneath it — so only a folder that is behind
+      is stopped, and only until somebody says which it is.
+    */
+    if (link && !link.local && files.length && behind) {
+        if (await establishMaterialisation(folder, link)) {
+            link.local = { ...link.manifest };
+            await (0, config_js_1.writeLink)(folder, link);
+        }
+        else if (!hasFlag(parsed, "f", "force")) {
+            console.error(red("This folder was connected by an older version of CodeRook,"));
+            console.error("which did not record what it had received — and somebody");
+            console.error(`has saved since (the project is on v${behind.sequence}).\n`);
+            console.error(`${files.length} file${files.length === 1 ? " differs" : "s differ"} here:`);
+            for (const file of files.slice(0, 20))
+                console.error(`  ${file.path}`);
+            console.error(`\nIf that is your work, send it with ${accent("coderook submit --force")}.` +
+                `\nIf it is an old copy, take theirs with ${accent("coderook get --replace")}.`);
+            return 1;
+        }
+    }
     if (!files.length) {
         // Having nothing to send is not the same as holding the whole version:
         // a merge can leave this folder with an older copy of somebody else's
@@ -415,6 +442,20 @@ The connection failed: ${text}`));
         ` · version holds ${bytes(result.sourceBytes)}`);
     return 0;
 }
+/**
+ * Work out what an upgraded folder actually holds, or admit that it cannot.
+ *
+ * Returns the materialisation when the folder matches its recorded version
+ * exactly — which proves the manifest describes what is here — and null when
+ * anything differs, because a difference is either somebody's unsaved edit or
+ * a copy their merge left stale, and nothing on disk says which.
+ */
+async function establishMaterialisation(folder, link) {
+    const rules = await (0, worktree_js_1.readRules)(folder);
+    const against = new Map(Object.entries(link.manifest));
+    const differing = await (0, worktree_js_1.changedFiles)(folder, rules, against);
+    return differing.length ? null : { ...link.manifest };
+}
 async function commandGet(parsed) {
     const folder = folderFor(parsed);
     const { link } = await reconcile(folder);
@@ -434,6 +475,34 @@ async function commandGet(parsed) {
       version would actually change those files.
     */
     const replacing = hasFlag(parsed, "replace", "f", "force");
+    /*
+      A folder connected by a client older than the materialisation record has
+      only the Version manifest, which says what the project held — not what
+      was placed here. The two are the same only until somebody's merge makes
+      them differ, so assuming it would be the very guess that lost work in the
+      first place.
+  
+      It can be established rather than assumed: if the folder matches its own
+      recorded version exactly, then it demonstrably holds that version and the
+      manifest is the materialisation. If it does not match, an edit cannot be
+      told from a stale copy, and fetching is refused until somebody says which
+      it is.
+    */
+    if (!link.local) {
+        const settled = await establishMaterialisation(folder, link);
+        if (settled) {
+            link.local = settled;
+            await (0, config_js_1.writeLink)(folder, link);
+        }
+        else if (!replacing) {
+            console.error(red("This folder was connected by an older version of CodeRook,"));
+            console.error("which did not record what it had received, so changed files here");
+            console.error("cannot be told apart from copies left behind by a merge.\n");
+            console.error(`Save them with ${accent("coderook submit")} if they are your work, or ` +
+                `take the\nsaved version exactly with ${accent("coderook get --replace")}.`);
+            return 1;
+        }
+    }
     if (link.local && !replacing) {
         const rules = await (0, worktree_js_1.readRules)(folder);
         const edited = await (0, worktree_js_1.changedFiles)(folder, rules, new Map(Object.entries(link.local)));

package/package.json

@@ -1,42 +1,43 @@
-{
-  "name": "@coderook/cli",
-  "version": "0.5.0",
-  "description": "CodeRook from the command line, on any operating system",
-  "license": "SEE LICENSE IN LICENSE.txt",
-  "homepage": "https://coderook.com",
-  "bugs": {
-    "url": "https://coderook.com/contact"
-  },
-  "keywords": [
-    "coderook",
-    "versioning",
-    "backup",
-    "cbx"
-  ],
-  "engines": {
-    "node": ">=20.11.0"
-  },
-  "bin": {
-    "coderook": "dist/cli/src/cli.js"
-  },
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "check": "tsc -p tsconfig.json --noEmit",
-    "test": "tsc -p tsconfig.json && node --test --experimental-strip-types test/*.test.ts",
-    "start": "node dist/cli/src/cli.js",
-    "prepublishOnly": "npm run build",
-    "test:e2e": "node test/e2e.mjs",
-    "test:matrix": "node test/state-matrix.mjs",
-    "test:attempt": "node test/attempt-identity.mjs",
-    "test:get": "node test/get-safety.mjs",
-    "test:live": "node test/e2e.mjs --allow-production && node test/state-matrix.mjs --allow-production && node test/get-safety.mjs --allow-production && node test/get-protects-edits.mjs --allow-production && node test/attempt-identity.mjs --allow-production",
-    "test:getedits": "node test/get-protects-edits.mjs"
-  },
-  "devDependencies": {
-    "@types/node": "24.10.1",
-    "typescript": "5.9.3"
-  }
-}
+{
+  "name": "@coderook/cli",
+  "version": "0.6.0",
+  "description": "CodeRook from the command line, on any operating system",
+  "license": "SEE LICENSE IN LICENSE.txt",
+  "homepage": "https://coderook.com",
+  "bugs": {
+    "url": "https://coderook.com/contact"
+  },
+  "keywords": [
+    "coderook",
+    "versioning",
+    "backup",
+    "cbx"
+  ],
+  "engines": {
+    "node": ">=20.11.0"
+  },
+  "bin": {
+    "coderook": "dist/cli/src/cli.js"
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "check": "tsc -p tsconfig.json --noEmit",
+    "test": "tsc -p tsconfig.json && node --test --experimental-strip-types test/*.test.ts",
+    "start": "node dist/cli/src/cli.js",
+    "prepublishOnly": "npm run build",
+    "test:e2e": "node test/e2e.mjs",
+    "test:matrix": "node test/state-matrix.mjs",
+    "test:attempt": "node test/attempt-identity.mjs",
+    "test:get": "node test/get-safety.mjs",
+    "test:live": "node test/e2e.mjs --allow-production && node test/state-matrix.mjs --allow-production && node test/get-safety.mjs --allow-production && node test/get-protects-edits.mjs --allow-production && node test/upgrade-migration.mjs --allow-production && node test/attempt-identity.mjs --allow-production",
+    "test:getedits": "node test/get-protects-edits.mjs",
+    "test:upgrade": "node test/upgrade-migration.mjs"
+  },
+  "devDependencies": {
+    "@types/node": "24.10.1",
+    "typescript": "5.9.3"
+  }
+}