@coderook/cli 0.38.1 → 0.38.2

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.38.1",
+  "version": "0.38.2",
   "author": {
     "name": "ACCA Gaming Productions",
     "url": "https://coderook.com"

package/dist/cbx/src/core/upload.js

@@ -30,6 +30,7 @@ const solid_js_1 = require("./solid.js");
 const retry_js_1 = require("./retry.js");
 const staging_js_1 = require("./staging.js");
 const transfer_progress_js_1 = require("./transfer_progress.js");
+const upload_completion_js_1 = require("./upload_completion.js");
 const delta_js_1 = require("../shared/delta.js");
 const telemetry_js_1 = require("../shared/telemetry.js");
 /** Above this the API insists on a multipart session. */
@@ -230,6 +231,7 @@ class Uploader {
             // waiting rather than serve out its backoff first.
             this.check();
             try {
+                init.onAttempt?.(attempt);
                 return await this.attempt(route, init);
             }
             catch (error) {
@@ -243,6 +245,7 @@ class Uploader {
                 if (attempt >= retry_js_1.RETRY_ATTEMPTS || !(0, retry_js_1.worthRetrying)(error))
                     throw error;
                 this.telemetry.retry();
+                init.onRetry?.(attempt + 1, wait);
                 await this.pause(wait);
                 wait *= 2;
             }
@@ -928,27 +931,22 @@ class Uploader {
             (details ? ` Details: ${details}` : ""));
     }
     async publishVersion(at) {
+        const initial = {
+            stage: "publish", files: at.declarations.length, totalFiles: at.declarations.length,
+            bytes: at.progress.sentBytes, totalBytes: at.totalBytes, percent: 96,
+            bytesPerSecond: 0, path: "Preparing the file manifest",
+            completion: { phase: "preparing", elapsedSeconds: 0 },
+        };
+        return (0, upload_completion_js_1.withCompletionProgress)(initial, at.report, (report) => this.recordVersion({ ...at, report }));
+    }
+    async recordVersion(at) {
         const { request, repositoryId, declarations, uploaded, reused, prior, everything, ticked, deletions, readFailures, vanished, totalBytes, progress, report, } = at;
         // 4. Name the version, which is what makes the upload visible.
         this.check();
-        report({
-            stage: "publish",
-            files: declarations.length,
-            totalFiles: declarations.length,
-            bytes: progress.sentBytes,
-            totalBytes,
-            /*
-              A save, not a version.
-      
-              Sending produces a commit; it becomes a version when somebody names
-              it, which happens later and on purpose. This line said "Recording the
-              version" while doing neither — it was the last wording left over from
-              before the two were separate, and it sat on the one screen a person
-              watches to the end.
-            */
-            path: "Writing down what was sent",
-            percent: 96,
-            bytesPerSecond: progress.rate(),
+        const completing = (phase, path) => report({
+            stage: "publish", files: declarations.length, totalFiles: declarations.length,
+            bytes: progress.sentBytes, totalBytes, percent: 96, bytesPerSecond: 0,
+            path, completion: { phase, elapsedSeconds: 0 },
         });
         // The version names everything the project holds: what was just sent,
         // plus every file that kept the object the last version pointed at.
@@ -1081,53 +1079,61 @@ class Uploader {
                 },
             }
             : null;
-        const send = (asChanges) => (0, profile_js_1.timed)("publish the version", () => this.call(`/v1/repositories/${repositoryId}/versions`, {
-            method: "POST",
-            contentType: "application/json",
-            body: JSON.stringify({
-                message: request.message.trim() || "Saved from the CodeRook desktop app",
-                ...(request.baseVersionId === undefined
-                    ? {}
-                    : {
-                        ancestryMode: "required",
-                        baseVersionId: request.baseVersionId,
+        const send = (asChanges) => {
+            completing("confirming", "Files uploaded · waiting for CodeRook to confirm the save");
+            return (0, profile_js_1.timed)("publish the version", () => this.call(`/v1/repositories/${repositoryId}/versions`, {
+                method: "POST",
+                contentType: "application/json",
+                onAttempt: (attempt) => {
+                    if (attempt > 1)
+                        completing("confirming", `Retry ${attempt} · waiting for CodeRook to confirm the save`);
+                },
+                onRetry: (attempt, waitMs) => completing("retrying", `Confirmation interrupted · retry ${attempt} in ${Math.ceil(waitMs / 1000)} s · uploaded files are reused`),
+                body: JSON.stringify({
+                    message: request.message.trim() || "Saved from the CodeRook desktop app",
+                    ...(request.baseVersionId === undefined
+                        ? {}
+                        : {
+                            ancestryMode: "required",
+                            baseVersionId: request.baseVersionId,
+                        }),
+                    ...(request.expectedHeadVersionId === undefined
+                        ? {}
+                        : { expectedHeadVersionId: request.expectedHeadVersionId }),
+                    ...(request.track ? { track: request.track } : {}),
+                    ...(request.allowIgnored ? { allowIgnored: true } : {}),
+                    ...(this.trackedByGit.length ? { trackedByGit: this.trackedByGit } : {}),
+                    ...(request.allowSecrets ? { allowSecrets: true } : {}),
+                    ...(linesAdded === undefined ? {} : { linesAdded }),
+                    ...(linesRemoved === undefined ? {} : { linesRemoved }),
+                    /*
+                      Names this attempt so a retry after a lost connection is answered
+                      with the version already made, rather than making a second one.
+                    */
+                    idempotencyKey: (0, publish_name_js_1.publishAttemptName)({
+                        repositoryId,
+                        expectedHeadVersionId: request.expectedHeadVersionId,
+                        message: request.message,
+                        /*
+                          Named by what each file is. A whole file is its object; a chunked
+                          one is the digest of its contents — so retrying the same publish
+                          produces the same key either way, which is the point of it.
+                        */
+                        files: contents.map((item) => ({
+                            path: item.path,
+                            objectId: item.objectId ?? item.sha256 ?? "",
+                        })),
                     }),
-                ...(request.expectedHeadVersionId === undefined
-                    ? {}
-                    : { expectedHeadVersionId: request.expectedHeadVersionId }),
-                ...(request.track ? { track: request.track } : {}),
-                ...(request.allowIgnored ? { allowIgnored: true } : {}),
-                ...(this.trackedByGit.length ? { trackedByGit: this.trackedByGit } : {}),
-                ...(request.allowSecrets ? { allowSecrets: true } : {}),
-                ...(linesAdded === undefined ? {} : { linesAdded }),
-                ...(linesRemoved === undefined ? {} : { linesRemoved }),
-                /*
-                  Names this attempt so a retry after a lost connection is answered
-                  with the version already made, rather than making a second one.
-                */
-                idempotencyKey: (0, publish_name_js_1.publishAttemptName)({
-                    repositoryId,
-                    expectedHeadVersionId: request.expectedHeadVersionId,
-                    message: request.message,
+                    sourceSize: sourceBytes,
+                    storedSize: storedBytes,
                     /*
-                      Named by what each file is. A whole file is its object; a chunked
-                      one is the digest of its contents — so retrying the same publish
-                      produces the same key either way, which is the point of it.
+                      One shape or the other, never both — the service refuses a file that
+                      names an object and a chunk list, and so does its database.
                     */
-                    files: contents.map((item) => ({
-                        path: item.path,
-                        objectId: item.objectId ?? item.sha256 ?? "",
-                    })),
+                    ...(asChanges && changesOnly ? changesOnly : { files: wire }),
                 }),
-                sourceSize: sourceBytes,
-                storedSize: storedBytes,
-                /*
-                  One shape or the other, never both — the service refuses a file that
-                  names an object and a chunk list, and so does its database.
-                */
-                ...(asChanges && changesOnly ? changesOnly : { files: wire }),
-            }),
-        }));
+            }));
+        };
         /*
           A service that cannot build on the version named (it was taken down,
           say) answers files_from_*; the whole list is then sent instead, which
@@ -1147,6 +1153,7 @@ class Uploader {
           instead. A repeated attempt predates manifest echoing, so read that
           Version once rather than guessing.
         */
+        completing("local", "CodeRook confirmed the save · updating local records");
         let acceptedManifest = (0, publication_js_1.acceptedManifestDigests)(completed.manifest?.files);
         /*
           A service that lists version-delta-v1 also says when it combined this
@@ -1162,6 +1169,7 @@ class Uploader {
             !request.allowSecrets &&
             (await this.versionDeltaAllowed());
         if (!completed.mergeTrack && !landedAsSent && !Object.keys(acceptedManifest).length) {
+            completing("local", "CodeRook confirmed the save · reading the accepted file manifest");
             acceptedManifest = Object.fromEntries([...(await this.versionFiles(repositoryId, completed.version.id, request.localPath))].map(([file, descriptor]) => [file, descriptor.sha256]));
         }
         const manifest = Object.keys(acceptedManifest).length
@@ -1181,6 +1189,7 @@ class Uploader {
           file, which on a 47,000-file project was over a billion comparisons at
           the very end of a save.
         */
+        completing("local", "CodeRook confirmed the save · updating local file records");
         const sentDigest = new Map(declarations.map((declaration) => [declaration.path, declaration.sha256]));
         /*
           A file named from bytes already stored, at a path the last version did
@@ -1231,6 +1240,7 @@ class Uploader {
             if (rows.every((row) => typeof row.sha256 === "string" && row.sha256.length === 64)) {
                 const key = `${repositoryId}/${completed.version.id}`;
                 versionListings.set(key, Promise.resolve(rows));
+                completing("local", "CodeRook confirmed the save · caching the file listing for next time");
                 await writeListing(request.localPath, repositoryId, completed.version.id, rows);
             }
         }

package/dist/cbx/src/core/upload_completion.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withCompletionProgress = withCompletionProgress;
+/** Keep a pending completion visible without inventing server-side progress.
+ * Every phase change comes from the uploader; ticks only measure elapsed time.
+ */
+async function withCompletionProgress(initial, report, work) {
+    const started = performance.now();
+    let latest = initial;
+    let active = true;
+    const emit = (progress) => {
+        latest = progress;
+        if (progress.stage !== "publish")
+            active = false;
+        report(progress.stage === "publish" ? {
+            ...progress,
+            completion: {
+                phase: progress.completion?.phase ?? "preparing",
+                elapsedSeconds: Math.max(0, (performance.now() - started) / 1000),
+            },
+        } : progress);
+    };
+    emit(initial);
+    const timer = setInterval(() => { if (active)
+        emit(latest); }, 1000);
+    timer.unref?.();
+    try {
+        return await work(emit);
+    }
+    finally {
+        active = false;
+        clearInterval(timer);
+    }
+}

package/dist/cli/src/cli.js

@@ -27,6 +27,7 @@ const api_js_1 = require("./api.js");
 const registry_js_1 = require("./registry.js");
 const help_js_1 = require("./help.js");
 const progress_js_1 = require("./progress.js");
+const upload_progress_js_1 = require("./upload_progress.js");
 const publish_js_1 = require("./publish.js");
 const attach_command_js_1 = require("./attach_command.js");
 const build_command_js_1 = require("./build_command.js");
@@ -1071,6 +1072,7 @@ Pass ${accent("--allow-secrets")} if these are not real keys.`);
         console.log("");
     }
     const line = progressLine();
+    const uploadDisplay = new upload_progress_js_1.UploadDisplay();
     let uploader = new upload_js_1.Uploader(config_js_1.credentials);
     /*
       Built by the shared description, so this and the git remote helper cannot
@@ -1226,14 +1228,12 @@ Pass ${accent("--allow-secrets")} if these are not real keys.`);
                 console.log("Nothing was uploaded and no Version was created.");
                 return 0;
             }
-            result = await uploader.execute(uploadRequest, plan, (progress) => {
-                line(`  ${track(progress.percent)} ${String(progress.percent).padStart(3)}%  ` +
-                    `${progress.stage.padEnd(7)} ${progress.files}/${progress.totalFiles}  ` +
-                    dim(progress.path.slice(-40)));
-            });
+            result = await uploader.execute(uploadRequest, plan, (progress) => uploadDisplay.report(progress));
+            uploadDisplay.done();
             break;
         }
         catch (error) {
+            uploadDisplay.done();
             done(line);
             /*
               Classified by the shared description rather than by a private regular

package/dist/cli/src/local_commands.js

@@ -26,6 +26,7 @@ exports.localMerge = localMerge;
  */
 const node_path_1 = __importDefault(require("node:path"));
 const node_process_1 = __importDefault(require("node:process"));
+const upload_progress_js_1 = require("./upload_progress.js");
 const history_js_1 = require("../../cbx/src/local/history.js");
 const merge_js_1 = require("../../cbx/src/local/merge.js");
 const repository_js_1 = require("../../cbx/src/local/repository.js");
@@ -384,6 +385,7 @@ async function localPush(parsed, repository) {
                 return 1;
         }
         const interactive = node_process_1.default.stdout.isTTY;
+        const uploadDisplay = new upload_progress_js_1.UploadDisplay();
         const result = await (0, remote_js_1.push)(repository, {
             credentials: config_js_1.credentials,
             projectName: link?.slug ?? (chosen ? ("id" in chosen ? chosen.slug : chosen.name) : node_path_1.default.basename(repository.root)),
@@ -392,10 +394,13 @@ async function localPush(parsed, repository) {
             allowSecrets: has(parsed, "allow-secrets"),
             acknowledged: has(parsed, "yes", "y"),
             report: (event) => {
+                if (event.kind === "upload")
+                    uploadDisplay.report(event.progress);
                 if (event.kind === "save" && interactive) {
                     node_process_1.default.stdout.write(`\r${dim(`Sending ${event.index + 1} of ${event.total}: ${event.save.message.split("\n")[0].slice(0, 50)}`)}   `);
                 }
                 if (event.kind === "pushed" || event.kind === "unchanged") {
+                    uploadDisplay.done();
                     if (interactive)
                         node_process_1.default.stdout.write(`\r${" ".repeat(80)}\r`);
                     console.log(`  ${accent(short(event.save.id))}  ` +
@@ -403,7 +408,7 @@ async function localPush(parsed, repository) {
                         `  ${event.save.message.split("\n")[0]}`);
                 }
             },
-        });
+        }).finally(() => uploadDisplay.done());
         if (!result.pushed.length) {
             console.log(`Everything on ${accent(result.line)} is already on CodeRook.`);
             return 0;

package/dist/cli/src/upload_progress.js

@@ -0,0 +1,41 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UploadDisplay = void 0;
+const node_process_1 = __importDefault(require("node:process"));
+const progress_1 = require("./progress");
+/** The timer in the shared uploader keeps finalization visible in every client. */
+class UploadDisplay {
+    interactive;
+    write;
+    phase = "";
+    frame = 0;
+    constructor(interactive = Boolean(node_process_1.default.stdout.isTTY), write = (text) => { node_process_1.default.stdout.write(text); }) {
+        this.interactive = interactive;
+        this.write = write;
+    }
+    report(progress) {
+        const finishing = progress.stage === "publish";
+        const phase = finishing ? progress.path : progress.stage;
+        if (!this.interactive) {
+            if (finishing && phase !== this.phase)
+                this.write(`  ${phase}\n`);
+            this.phase = phase;
+            return;
+        }
+        this.phase = phase;
+        const seconds = Math.floor(progress.completion?.elapsedSeconds ?? 0);
+        const clock = `${Math.floor(seconds / 60)}:${String(seconds % 60).padStart(2, "0")}`;
+        const detail = finishing
+            ? `${["|", "/", "-", "\\"][this.frame++ % 4]} Finalizing save · ${clock} elapsed · ${progress.path}`
+            : `${(0, progress_1.bar)(progress.percent / 100, 18, (text) => text)} ${progress.percent}% ${progress.stage} ${progress.files}/${progress.totalFiles} ${progress.path}`;
+        // Keep status on one terminal row, including narrow windows.
+        const width = Math.max(1, (node_process_1.default.stdout.columns ?? 120) - 3);
+        this.write(`\r\x1b[2K  ${detail.replace(/[\x00-\x1f\x7f]/g, " ").slice(0, width)}`);
+    }
+    done() { if (this.interactive)
+        this.write("\r\x1b[2K"); }
+}
+exports.UploadDisplay = UploadDisplay;

package/package.json

@@ -1,66 +1,67 @@
-{
-  "name": "@coderook/cli",
-  "version": "0.38.1",
-  "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",
-  "bugs": {
-    "url": "https://github.com/AlexC1991/cbx/issues"
-  },
-  "keywords": [
-    "coderook",
-    "cbx",
-    "version-control",
-    "vcs",
-    "versioning",
-    "project-hosting",
-    "backup",
-    "snapshots",
-    "large-files",
-    "gamedev"
-  ],
-  "engines": {
-    "node": ">=22.15.0"
-  },
-  "bin": {
-    "cbx": "dist/cli/src/cli.js",
-    "coderook": "dist/cli/src/cli.js",
-    "git-remote-coderook": "dist/cli/src/git_remote_bin.js"
-  },
-  "files": [
-    ".claude-plugin",
-    "dist",
-    "skills",
-    "NOTICE"
-  ],
-  "scripts": {
-    "build": "tsc -p tsconfig.json && node scripts/copy-cbx-licence.mjs",
-    "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 sync:plugin && 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-track.mjs --allow-production && node test/get-protects-edits.mjs --allow-production && node test/upgrade-migration.mjs --allow-production && node test/fault-get.mjs --allow-production && node test/version-floor.mjs --allow-production && node test/fault-submit.mjs --allow-production && node test/race-attempts.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",
-    "test:faultget": "node test/fault-get.mjs",
-    "test:floor": "node test/version-floor.mjs",
-    "test:faultsubmit": "node test/fault-submit.mjs",
-    "test:race": "node test/race-attempts.mjs",
-    "test:runner": "node test/runner-live.mjs",
-    "sync:plugin": "node scripts/sync-plugin-version.mjs",
-    "test:track": "node test/get-track.mjs"
-  },
-  "devDependencies": {
-    "@types/node": "24.10.1",
-    "typescript": "5.9.3"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/AlexC1991/cbx.git",
-    "directory": "cli"
-  }
-}
+{
+  "name": "@coderook/cli",
+  "version": "0.38.2",
+  "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",
+  "bugs": {
+    "url": "https://github.com/AlexC1991/cbx/issues"
+  },
+  "keywords": [
+    "coderook",
+    "cbx",
+    "version-control",
+    "vcs",
+    "versioning",
+    "project-hosting",
+    "backup",
+    "snapshots",
+    "large-files",
+    "gamedev"
+  ],
+  "engines": {
+    "node": ">=22.15.0"
+  },
+  "bin": {
+    "cbx": "dist/cli/src/cli.js",
+    "coderook": "dist/cli/src/cli.js",
+    "git-remote-coderook": "dist/cli/src/git_remote_bin.js"
+  },
+  "files": [
+    ".claude-plugin",
+    "dist",
+    "skills",
+    "NOTICE"
+  ],
+  "scripts": {
+    "build": "tsc -p tsconfig.json && node scripts/copy-cbx-licence.mjs",
+    "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 sync:plugin && 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-track.mjs --allow-production && node test/get-protects-edits.mjs --allow-production && node test/upgrade-migration.mjs --allow-production && node test/fault-get.mjs --allow-production && node test/version-floor.mjs --allow-production && node test/fault-submit.mjs --allow-production && node test/race-attempts.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",
+    "test:faultget": "node test/fault-get.mjs",
+    "test:floor": "node test/version-floor.mjs",
+    "test:faultsubmit": "node test/fault-submit.mjs",
+    "test:race": "node test/race-attempts.mjs",
+    "test:runner": "node test/runner-live.mjs",
+    "sync:plugin": "node scripts/sync-plugin-version.mjs",
+    "test:track": "node test/get-track.mjs",
+    "package:remote": "node ../scripts/package-cli-release.mjs"
+  },
+  "devDependencies": {
+    "@types/node": "24.10.1",
+    "typescript": "5.9.3"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/AlexC1991/cbx.git",
+    "directory": "cli"
+  }
+}