@coderook/cli 0.33.0 → 0.33.1

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, from Claude Code.",
-  "version": "0.33.0",
+  "version": "0.33.1",
   "author": {
     "name": "ACCA Gaming Productions",
     "url": "https://coderook.com"

package/dist/cli/src/cli.js

@@ -899,7 +899,7 @@ Pass ${accent("--allow-secrets")} if these are not real keys.`);
         console.log("");
     }
     const line = progressLine();
-    const uploader = new upload_js_1.Uploader(config_js_1.credentials);
+    let uploader = new upload_js_1.Uploader(config_js_1.credentials);
     /*
       Built by the shared description, so this and the git remote helper cannot
       drift. They already had: the helper listed deletions in `deletions` alone
@@ -1001,71 +1001,99 @@ Pass ${accent("--allow-secrets")} if these are not real keys.`);
         }
     }
     let result;
-    try {
-        const plan = await uploader.plan(uploadRequest, (progress) => {
-            line(`  ${track(progress.percent)} ${String(progress.percent).padStart(3)}%  ` +
-                `${"plan".padEnd(7)} ${progress.files}/${progress.totalFiles}  ` +
-                dim(progress.path.slice(-40)));
-        });
-        done(line);
-        console.log(`${accent("Upload plan")}  ${bytes(plan.sourceBytes)} selected → ` +
-            `${bytes(plan.compactedBytes)} compacted; ${bytes(plan.chargeableBytes)} new storage.`);
-        console.log(plan.allowance.exempt
-            ? dim("Annual plan: the monthly staged upload allowance does not apply.")
-            : dim(`Monthly stage ${plan.allowance.stage}: ${plan.allowance.unlockedPercent}% unlocked, ` +
-                `${bytes(plan.allowance.remainingBytes)} remains after this reservation.`));
-        if (dryRun) {
-            await uploader.cancelPlan(plan, true);
-            const going = files.filter((file) => !file.deleted);
-            const removing = files.filter((file) => file.deleted);
-            console.log(`${going.length} file${going.length === 1 ? "" : "s"} would be sent or reused:`);
-            for (const file of going)
-                console.log(`  ${file.path}`);
-            if (removing.length) {
-                console.log(`${removing.length} file${removing.length === 1 ? "" : "s"} would be removed from the save:`);
-                for (const file of removing)
-                    console.log(`  ${red("deleted")} ${file.path}`);
+    /*
+      How long to wait before picking a dropped upload up again by itself.
+  
+      Each request is already retried for a few seconds, but a Wi-Fi drop or a
+      router reconnecting outlasts that, and the upload ended with "run the same
+      command again" for somebody to notice and act on. Running it again was
+      always safe and cheap (pieces already stored are recognised and skipped,
+      and the save itself is named so it can never be made twice), so the
+      command now does it itself, a few times, before giving up.
+    */
+    const resumeAfter = [10, 30, 60];
+    for (let resumed = 0;; resumed += 1) {
+        try {
+            const plan = await uploader.plan(uploadRequest, (progress) => {
+                line(`  ${track(progress.percent)} ${String(progress.percent).padStart(3)}%  ` +
+                    `${"plan".padEnd(7)} ${progress.files}/${progress.totalFiles}  ` +
+                    dim(progress.path.slice(-40)));
+            });
+            done(line);
+            console.log(`${accent("Upload plan")}  ${bytes(plan.sourceBytes)} selected → ` +
+                `${bytes(plan.compactedBytes)} compacted; ${bytes(plan.chargeableBytes)} new storage.`);
+            console.log(plan.allowance.exempt
+                ? dim("Annual plan: the monthly staged upload allowance does not apply.")
+                : dim(`Monthly stage ${plan.allowance.stage}: ${plan.allowance.unlockedPercent}% unlocked, ` +
+                    `${bytes(plan.allowance.remainingBytes)} remains after this reservation.`));
+            if (dryRun) {
+                await uploader.cancelPlan(plan, true);
+                const going = files.filter((file) => !file.deleted);
+                const removing = files.filter((file) => file.deleted);
+                console.log(`${going.length} file${going.length === 1 ? "" : "s"} would be sent or reused:`);
+                for (const file of going)
+                    console.log(`  ${file.path}`);
+                if (removing.length) {
+                    console.log(`${removing.length} file${removing.length === 1 ? "" : "s"} would be removed from the save:`);
+                    for (const file of removing)
+                        console.log(`  ${red("deleted")} ${file.path}`);
+                }
+                noteKeptDeletions(folder, baseline, hasFlag(parsed, "sync"));
+                console.log("Nothing was uploaded and no Version was created.");
+                return 0;
             }
-            noteKeptDeletions(folder, baseline, hasFlag(parsed, "sync"));
-            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)));
-        });
-    }
-    catch (error) {
-        done(line);
-        /*
-          Classified by the shared description rather than by a private regular
-          expression, so a push and a submit disagree about nothing — including
-          what counts as "the connection failed" and what that means for whether
-          the work was saved.
-        */
-        const failure = (0, publish_js_1.classifyPublishFailure)(error);
-        const text = (0, network_js_1.describeError)(error);
-        if (failure?.kind === "interrupted") {
-            console.error(red(`
-The connection failed: ${text}`));
-            console.error(`Your work may already have been saved. Run the same command again —` +
-                ` it will not create a second version.`);
-            return 1;
+            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)));
+            });
+            break;
         }
-        if (failure?.kind === "conflict") {
+        catch (error) {
+            done(line);
             /*
-              Somebody else saved to this project first. Everything that did not
-              overlap has already been combined by the service; what is left is a
-              genuine decision, so the answer is to bring their work down and look
-              at it rather than to try again harder.
+              Classified by the shared description rather than by a private regular
+              expression, so a push and a submit disagree about nothing — including
+              what counts as "the connection failed" and what that means for whether
+              the work was saved.
             */
-            console.error(red(error instanceof Error ? error.message : String(error)));
-            console.error(`\nRun ${accent("cbx get")} to bring the latest version down, then` +
-                ` submit again. Nothing was changed on your account.`);
-            return 1;
+            const failure = (0, publish_js_1.classifyPublishFailure)(error);
+            const text = (0, network_js_1.describeError)(error);
+            if (failure?.kind === "interrupted" && !dryRun && resumed < resumeAfter.length) {
+                const wait = resumeAfter[resumed];
+                console.error(dim(`The connection dropped (${text})`));
+                console.error(dim(`Picking the upload up again in ${wait}s (try ${resumed + 2} of ${resumeAfter.length + 1}).` +
+                    ` Pieces already sent are kept; only the rest goes.`));
+                /*
+                  The failed attempt's other lanes are still retrying; stopped first, so
+                  they do not carry on sending beside the attempt that replaces them.
+                */
+                uploader.cancel();
+                await (0, network_js_1.pause)(wait * 1000);
+                uploader = new upload_js_1.Uploader(config_js_1.credentials);
+                continue;
+            }
+            if (failure?.kind === "interrupted") {
+                console.error(red(`
+The connection failed: ${text}`));
+                console.error(`Your work may already have been saved. Run the same command again —` +
+                    ` it will not create a second version.`);
+                return 1;
+            }
+            if (failure?.kind === "conflict") {
+                /*
+                  Somebody else saved to this project first. Everything that did not
+                  overlap has already been combined by the service; what is left is a
+                  genuine decision, so the answer is to bring their work down and look
+                  at it rather than to try again harder.
+                */
+                console.error(red(error instanceof Error ? error.message : String(error)));
+                console.error(`\nRun ${accent("cbx get")} to bring the latest version down, then` +
+                    ` submit again. Nothing was changed on your account.`);
+                return 1;
+            }
+            throw error;
         }
-        throw error;
     }
     done(line);
     if (result.mergeTrack) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coderook/cli",
-  "version": "0.33.0",
+  "version": "0.33.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",