@coderook/cli 0.42.5 → 0.42.6

package/.claude-plugin/plugin.json

@@ -2,7 +2,7 @@
   "name": "coderook",
   "displayName": "CodeRook",
   "description": "Save, browse and restore whole-snapshot versions of a project on CodeRook, with cbx or plain git, from Claude Code.",
-  "version": "0.42.5",
+  "version": "0.42.6",
   "author": {
     "name": "ACCA Gaming Productions",
     "url": "https://coderook.com"

package/dist/cli/src/cli.js

@@ -1541,12 +1541,26 @@ async function commandGet(parsed) {
               would bury the only copy.
             */
             if (resuming) {
+                /*
+                  Only a file this fetch rewrites can be buried by finishing it: one
+                  whose incoming copy differs from what was placed here. An edit to a
+                  file the version left alone is kept, exactly as an ordinary fetch
+                  keeps it, so it is no reason to stop. It used to be: completing in
+                  "replace" mode rewrote every file, so any edit at all, anywhere,
+                  refused the resume (2026-11-06, two page edits blocked a catch-up).
+                */
                 const notYetArrived = await (0, worktree_js_1.changedFiles)(folder, rules, incoming);
                 const changedInTheGap = notYetArrived.filter((file) => !file.deleted &&
                     incoming.has(file.path) &&
+                    incoming.get(file.path) !== link.local[file.path] &&
                     edited.some((one) => one.path === file.path));
                 if (!changedInTheGap.length) {
-                    return fetchInto(link.repositoryId, folder, link.slug, link.local ?? null, "replace", await (0, track_commands_js_1.trackFor)(folder));
+                    /*
+                      Reconciling finishes the job: every file the version changed is
+                      placed (the half the interrupted run already placed are placed
+                      again, harmlessly), and what it left alone stays as it is.
+                    */
+                    return fetchInto(link.repositoryId, folder, link.slug, link.local ?? null, "reconcile", await (0, track_commands_js_1.trackFor)(folder));
                 }
                 console.error(red(`${changedInTheGap.length} file${changedInTheGap.length === 1 ? "" : "s"} ` +
                     `changed while the interrupted fetch was stopped:`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coderook/cli",
-  "version": "0.42.5",
+  "version": "0.42.6",
   "description": "The command line for CodeRook (coderook.com): version control and project hosting for projects of any size. Every save is a compressed snapshot, private or public, never used to train AI.",
   "license": "Apache-2.0",
   "homepage": "https://coderook.com",