@assethub/cli 0.1.36 → 0.1.38

package/dist/hooks/install.js

@@ -42,9 +42,9 @@ export const sessionSaveDisclosure = (scope, client = 'claude') => {
         ? `\`assethub hooks uninstall --client ${client}\` from that folder`
         : `\`assethub hooks uninstall --client ${client} --global\``;
     return (`Session saving adds SessionStart, Stop, PreCompact and SessionEnd hooks to ${where} ` +
-        'is then copied to ~/.assethub/sessions/ when it ends ' +
+        'is then copied to ~/.assethub/sessions/ while you work and when it ends ' +
         '(the conversation only: your prompts, the agent\'s replies and tool calls, with recognised secrets masked, readable only by you; copies older than 30 days are deleted), ' +
-        'and uploaded to AssetHub as a coding-agent session only you can read (internal accounts only for now): the masked transcript, ' +
+        'and uploaded to AssetHub, every 8 minutes while you work (ASSETHUB_SESSION_UPLOAD_INTERVAL_MIN) and when it ends, as a coding-agent session only you can read (internal accounts only for now): the masked transcript, ' +
         'your prompts, the agent\'s replies, its tool calls and images from the project. Uploads that fail are retried in the background ' +
         'when a later session starts or ends. Secret masking is best effort. ' +
         'Opt a project out with .assethub/no-session-save, or turn it off with ASSETHUB_SESSION_SAVE=off / ASSETHUB_SESSION_UPLOAD=off; ' +

package/dist/hooks/save.d.ts

@@ -56,6 +56,14 @@ export declare const SWEEP_LIMIT = 3;
  * only be uploaded once abandoned (ABANDONED_AFTER_MS quiet, then a new session).
  */
 export declare const WORKING_UPLOAD_INTERVAL_MS: number;
+/** The shortest interval ASSETHUB_SESSION_UPLOAD_INTERVAL_MIN may set. */
+export declare const MIN_WORKING_UPLOAD_INTERVAL_MS: number;
+/**
+ * ASSETHUB_SESSION_UPLOAD_INTERVAL_MIN, in minutes, else WORKING_UPLOAD_INTERVAL_MS.
+ * Each upload sends a new snapshot of the whole transcript, so it is never
+ * shorter than a minute; a value that is not a positive number is ignored.
+ */
+export declare const workingUploadIntervalMs: (env: NodeJS.ProcessEnv) => number;
 /**
  * Copy + redact the transcript Claude Code keeps at `meta.transcriptPath`, and
  * collect its images. Runs once per SessionEnd and before an upload, never per

package/dist/hooks/save.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"save.d.ts","sourceRoot":"","sources":["../../src/hooks/save.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAC,UAAU,EAAE,SAAS,EAAgB,WAAW,EAAC,MAAM,YAAY,CAAA;AAChF,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,aAAa,CAAA;AAE9C,eAAO,MAAM,UAAU,KAAK,CAAA;AAC5B,eAAO,MAAM,eAAe,QAAmB,CAAA;AAC/C,eAAO,MAAM,sBAAsB,KAAK,CAAA;AASxC,MAAM,MAAM,kBAAkB,GAAG;IAC/B,wCAAwC;IACxC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,oCAAoC;IACpC,KAAK,CAAC,EAAE,SAAS,CAAA;IACjB,+EAA+E;IAC/E,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,IAAI,CAAA;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;IACvB,MAAM,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,CAAA;IACvC;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;IAC5D,uEAAuE;IACvE,UAAU,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;IACvC;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;CACpE,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,SAAS,GAAG,UAAU,CAAA;CACjC,CAAA;AAYD,wFAAwF;AACxF,eAAO,MAAM,mBAAmB,GAAI,YAAY,MAAM,EAAE,UAAU,MAAM,KAAG,IACgC,CAAA;AAE3G,qEAAqE;AACrE,eAAO,MAAM,0BAA0B,GAAI,YAAY,MAAM,EAAE,UAAU,MAAM,KAAG,IACP,CAAA;AAE3E,8DAA8D;AAC9D,eAAO,MAAM,kBAAkB,GAAI,UAAU,MAAM,KAAG,IAC+B,CAAA;AAErF,eAAO,MAAM,aAAa,GAAI,KAAK,MAAM,CAAC,UAAU,KAAG,MAAM,GAAG,IAM/D,CAAA;AAED,4FAA4F;AAC5F,eAAO,MAAM,aAAa,GACxB,MAAM,MAAM,EACZ,KAAK,IAAI,EACT,MAAM,MAAM,EACZ,MAAM,MAAM,KACX,OAAO,CAAC,MAAM,CAwBhB,CAAA;AAgFD,qGAAqG;AACrG,eAAO,MAAM,kBAAkB,QAAqB,CAAA;AACpD,wEAAwE;AACxE,eAAO,MAAM,WAAW,IAAI,CAAA;AAE5B;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,QAAiB,CAAA;AAMxD;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAC7B,YAAY,MAAM,EAClB,UAAS;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAA;CAAM,KAC/D,OAAO,CAAC,WAAW,GAAG,IAAI,CA6C5B,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,GAChC,MAAM,MAAM,EACZ,KAAK,IAAI,EACT,mBAAmB,MAAM,KACxB,OAAO,CAAC,MAAM,CAmBhB,CAAA;AAED,eAAO,MAAM,WAAW,GAAU,UAAS,kBAAuB,KAAG,OAAO,CAAC,iBAAiB,CAgG7F,CAAA"}
+{"version":3,"file":"save.d.ts","sourceRoot":"","sources":["../../src/hooks/save.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAC,UAAU,EAAE,SAAS,EAAgB,WAAW,EAAC,MAAM,YAAY,CAAA;AAChF,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,aAAa,CAAA;AAE9C,eAAO,MAAM,UAAU,KAAK,CAAA;AAC5B,eAAO,MAAM,eAAe,QAAmB,CAAA;AAC/C,eAAO,MAAM,sBAAsB,KAAK,CAAA;AASxC,MAAM,MAAM,kBAAkB,GAAG;IAC/B,wCAAwC;IACxC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,oCAAoC;IACpC,KAAK,CAAC,EAAE,SAAS,CAAA;IACjB,+EAA+E;IAC/E,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,IAAI,CAAA;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;IACvB,MAAM,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,CAAA;IACvC;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;IAC5D,uEAAuE;IACvE,UAAU,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;IACvC;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;CACpE,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,SAAS,GAAG,UAAU,CAAA;CACjC,CAAA;AAYD,wFAAwF;AACxF,eAAO,MAAM,mBAAmB,GAAI,YAAY,MAAM,EAAE,UAAU,MAAM,KAAG,IACgC,CAAA;AAE3G,qEAAqE;AACrE,eAAO,MAAM,0BAA0B,GAAI,YAAY,MAAM,EAAE,UAAU,MAAM,KAAG,IACP,CAAA;AAE3E,8DAA8D;AAC9D,eAAO,MAAM,kBAAkB,GAAI,UAAU,MAAM,KAAG,IAC+B,CAAA;AAErF,eAAO,MAAM,aAAa,GAAI,KAAK,MAAM,CAAC,UAAU,KAAG,MAAM,GAAG,IAM/D,CAAA;AAED,4FAA4F;AAC5F,eAAO,MAAM,aAAa,GACxB,MAAM,MAAM,EACZ,KAAK,IAAI,EACT,MAAM,MAAM,EACZ,MAAM,MAAM,KACX,OAAO,CAAC,MAAM,CAwBhB,CAAA;AAgFD,qGAAqG;AACrG,eAAO,MAAM,kBAAkB,QAAqB,CAAA;AACpD,wEAAwE;AACxE,eAAO,MAAM,WAAW,IAAI,CAAA;AAE5B;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,QAAgB,CAAA;AACvD,0EAA0E;AAC1E,eAAO,MAAM,8BAA8B,QAAY,CAAA;AAEvD;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,GAAI,KAAK,MAAM,CAAC,UAAU,KAAG,MAOhE,CAAA;AAMD;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAC7B,YAAY,MAAM,EAClB,UAAS;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAA;CAAM,KAC/D,OAAO,CAAC,WAAW,GAAG,IAAI,CA6C5B,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,GAChC,MAAM,MAAM,EACZ,KAAK,IAAI,EACT,mBAAmB,MAAM,KACxB,OAAO,CAAC,MAAM,CAmBhB,CAAA;AAED,eAAO,MAAM,WAAW,GAAU,UAAS,kBAAuB,KAAG,OAAO,CAAC,iBAAiB,CAwG7F,CAAA"}

package/dist/hooks/save.js

@@ -162,7 +162,24 @@ export const SWEEP_LIMIT = 3;
  * stay open for days and rarely reach SessionEnd, so without this they would
  * only be uploaded once abandoned (ABANDONED_AFTER_MS quiet, then a new session).
  */
-export const WORKING_UPLOAD_INTERVAL_MS = 20 * 60 * 1000;
+export const WORKING_UPLOAD_INTERVAL_MS = 8 * 60 * 1000;
+/** The shortest interval ASSETHUB_SESSION_UPLOAD_INTERVAL_MIN may set. */
+export const MIN_WORKING_UPLOAD_INTERVAL_MS = 60 * 1000;
+/**
+ * ASSETHUB_SESSION_UPLOAD_INTERVAL_MIN, in minutes, else WORKING_UPLOAD_INTERVAL_MS.
+ * Each upload sends a new snapshot of the whole transcript, so it is never
+ * shorter than a minute; a value that is not a positive number is ignored.
+ */
+export const workingUploadIntervalMs = (env) => {
+    const raw = env.ASSETHUB_SESSION_UPLOAD_INTERVAL_MIN?.trim();
+    if (!raw)
+        return WORKING_UPLOAD_INTERVAL_MS;
+    const ms = Number(raw) * 60 * 1000;
+    // Finite after scaling too: a huge value would otherwise stop uploads for good.
+    if (!Number.isFinite(ms) || ms <= 0)
+        return WORKING_UPLOAD_INTERVAL_MS;
+    return Math.max(ms, MIN_WORKING_UPLOAD_INTERVAL_MS);
+};
 const WORKING_UPLOAD_EVENTS = new Set(['Stop', 'PreCompact']);
 /** Events that copy and redact the transcript now; the rest only mark it changed. */
 const FULL_SAVE_EVENTS = new Set(['SessionEnd', 'Manual']);
@@ -323,11 +340,20 @@ export const saveSession = async (options = {}) => {
         const result = { sessionDir, event };
         if (uploadOn && options.startWorkingUpload && WORKING_UPLOAD_EVENTS.has(event)) {
             const latest = await readMeta(sessionDir);
-            // Counts uploads any path started (an earlier Stop, SessionEnd, a sweep).
-            const lastStart = Math.max(Date.parse(latest?.lastWorkingUploadAt ?? '') || 0, Date.parse(latest?.lastUploadAttemptAt ?? '') || 0);
-            if (latest && now.getTime() - lastStart >= WORKING_UPLOAD_INTERVAL_MS) {
-                // Stamped before spawning, so the next few turns do not start more.
-                await updateMeta(sessionDir, latest, current => ({ ...current, lastWorkingUploadAt: now.toISOString() }));
+            const interval = workingUploadIntervalMs(env);
+            let claimed = false;
+            // Checked and stamped under the meta lock, before spawning, so neither the
+            // next few turns nor a hook running beside this one start another.
+            if (latest)
+                await updateMeta(sessionDir, latest, current => {
+                    // Counts uploads any path started (an earlier Stop, SessionEnd, a sweep).
+                    const lastStart = Math.max(Date.parse(current.lastWorkingUploadAt ?? '') || 0, Date.parse(current.lastUploadAttemptAt ?? '') || 0);
+                    if (now.getTime() - lastStart < interval)
+                        return current;
+                    claimed = true;
+                    return { ...current, lastWorkingUploadAt: now.toISOString() };
+                });
+            if (claimed) {
                 options.startWorkingUpload(sessionDir, options.upload?.profile);
                 result.uploadStarted = true;
             }

package/dist/hooks/upload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../src/hooks/upload.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAc,aAAa,EAAC,MAAM,YAAY,CAAA;AAG1D,eAAO,MAAM,+BAA+B,kCAAkC,CAAA;AAQ9E,eAAO,MAAM,iBAAiB,QAAS,CAAA;AACvC,2EAA2E;AAC3E,eAAO,MAAM,oBAAoB,QAAc,CAAA;AAC/C,uFAAuF;AACvF,eAAO,MAAM,wBAAwB,QAAS,CAAA;AAE9C,MAAM,MAAM,UAAU,GAAG;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAC,CAAA;AAEhF,MAAM,MAAM,aAAa,GAAG;IAC1B,wEAAwE;IACxE,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;IACvB,SAAS,CAAC,EAAE,OAAO,KAAK,CAAA;IACxB,IAAI,CAAC,EAAE,UAAU,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,IAAI,CAAA;IAChB,wEAAwE;IACxE,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAC5B,SAAS,IAAI,CAAC,aAAa,EAAE,SAAS,GAAG,MAAM,GAAG,KAAK,CAAC,KACvD,OAAO,CAAC,UAAU,GAAG,IAAI,CA2B3B,CAAA;AAED,iFAAiF;AACjF,eAAO,MAAM,YAAY,GAAI,gBAAgB,MAAM,KAAG,MACmB,CAAA;AAmBzE;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,GAC5B,MAAM,UAAU,EAChB,YAAW,OAAO,KAAyC,KAC1D,OAAO,CAAC,OAAO,CAgBjB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,aAAa,GACxB,YAAY,MAAM,EAClB,UAAS,aAAkB,KAC1B,OAAO,CAAC,aAAa,CAmBvB,CAAA;AAoHD;;;;GAIG;AACH,eAAO,MAAM,aAAa,GACxB,UAAS,aAAa,GAAG;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAM,KAC/D,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,aAAa,CAAA;CAAC,EAAE,CAkBrD,CAAA"}
+{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../src/hooks/upload.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAc,aAAa,EAAC,MAAM,YAAY,CAAA;AAG1D,eAAO,MAAM,+BAA+B,kCAAkC,CAAA;AAc9E,eAAO,MAAM,iBAAiB,QAAS,CAAA;AACvC,2EAA2E;AAC3E,eAAO,MAAM,oBAAoB,QAAc,CAAA;AAC/C,uFAAuF;AACvF,eAAO,MAAM,wBAAwB,QAAS,CAAA;AAE9C,MAAM,MAAM,UAAU,GAAG;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAC,CAAA;AAEhF,MAAM,MAAM,aAAa,GAAG;IAC1B,wEAAwE;IACxE,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;IACvB,SAAS,CAAC,EAAE,OAAO,KAAK,CAAA;IACxB,IAAI,CAAC,EAAE,UAAU,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,IAAI,CAAA;IAChB,wEAAwE;IACxE,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAC5B,SAAS,IAAI,CAAC,aAAa,EAAE,SAAS,GAAG,MAAM,GAAG,KAAK,CAAC,KACvD,OAAO,CAAC,UAAU,GAAG,IAAI,CA2B3B,CAAA;AAED,iFAAiF;AACjF,eAAO,MAAM,YAAY,GAAI,gBAAgB,MAAM,KAAG,MACmB,CAAA;AAmBzE;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,GAC5B,MAAM,UAAU,EAChB,YAAW,OAAO,KAAyC,KAC1D,OAAO,CAAC,OAAO,CAgBjB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,aAAa,GACxB,YAAY,MAAM,EAClB,UAAS,aAAkB,KAC1B,OAAO,CAAC,aAAa,CAmBvB,CAAA;AAqID;;;;GAIG;AACH,eAAO,MAAM,aAAa,GACxB,UAAS,aAAa,GAAG;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAM,KAC/D,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,aAAa,CAAA;CAAC,EAAE,CAkBrD,CAAA"}

package/dist/hooks/upload.js

@@ -6,7 +6,7 @@
 import { readFile, utimes } from 'node:fs/promises';
 import { basename, join } from 'node:path';
 import { buildRunUploadPlan } from '../runsUpload/buildRunUpload.js';
-import { controlRunUploadUrls } from '../runsUpload/controlEndpoints.js';
+import { CONTROL_ERROR_CODES, controlRunUploadUrls } from '../runsUpload/controlEndpoints.js';
 import { readGraphFolder } from '../runsUpload/graphFolder.js';
 import { uploadRun } from '../runsUpload/uploadRun.js';
 import { RunUploadError } from '../runsUpload/runUploadError.js';
@@ -23,6 +23,12 @@ const canvasIdOf = (value) => {
     return Number.isSafeInteger(id) && id > 0 ? id : null;
 };
 const DAY_MS = 24 * 60 * 60 * 1000;
+/**
+ * Tries per upload to get past revisions the server already holds that this
+ * machine has no record of (its ~/.assethub was reset, or another copy of the
+ * session uploaded). Each try jumps twice as far, so 8 cover 255 revisions.
+ */
+const MAX_REV_RECOVERIES = 8;
 export const UPLOAD_TIMEOUT_MS = 20_000;
 /** A session's upload lock older than this belongs to a crashed upload. */
 export const UPLOAD_LOCK_STALE_MS = 15 * 60_000;
@@ -171,6 +177,9 @@ const uploadSessionUnlocked = async (sessionDir, options) => {
     if (meta.dirty || meta.transcriptFormat !== TRANSCRIPT_FORMAT)
         meta = (await materializeSession(sessionDir, { env: options.env })) ?? meta;
     let level = meta.compactLevel ?? 0;
+    // The next rev is above this too: revs the server turned away in this upload.
+    let revFloor = -1;
+    let recoveries = 0;
     try {
         const baseFetch = options.fetchImpl ?? globalThis.fetch.bind(globalThis);
         const timeoutMs = options.timeoutMs ?? UPLOAD_TIMEOUT_MS;
@@ -182,7 +191,7 @@ const uploadSessionUnlocked = async (sessionDir, options) => {
             // been published, and re-sending its rev with new content is a permanent
             // conflict. The server accepts gaps, so skipping an unsent rev is harmless.
             const latest = (await readMeta(sessionDir)) ?? meta;
-            const rev = Math.max(latest.uploadedRev ?? -1, latest.attemptedRev ?? -1) + 1;
+            const rev = Math.max(latest.uploadedRev ?? -1, latest.attemptedRev ?? -1, revFloor) + 1;
             let plan;
             try {
                 const folder = await readGraphFolder(await buildSessionGraphFolder(sessionDir, { compactLevel: level }));
@@ -204,17 +213,34 @@ const uploadSessionUnlocked = async (sessionDir, options) => {
                 throw error;
             }
             await record({ attemptedRev: rev, compactLevel: level });
-            const result = await uploadRun({
-                plan,
-                baseUrl: auth.baseUrl,
-                apiKey: auth.apiKey,
-                workspaceId: auth.workspaceId,
-                fetchImpl,
-                urls: controlRunUploadUrls(auth.baseUrl, CODING_AGENT_SESSION_API_PREFIX),
-                registrationExtra: {
-                    session: { client: meta.client, sessionId: meta.sessionId, canvasId: canvasIdOf(meta.canvasId) },
-                },
-            });
+            let result;
+            try {
+                result = await uploadRun({
+                    plan,
+                    baseUrl: auth.baseUrl,
+                    apiKey: auth.apiKey,
+                    workspaceId: auth.workspaceId,
+                    fetchImpl,
+                    urls: controlRunUploadUrls(auth.baseUrl, CODING_AGENT_SESSION_API_PREFIX),
+                    registrationExtra: {
+                        session: { client: meta.client, sessionId: meta.sessionId, canvasId: canvasIdOf(meta.canvasId) },
+                    },
+                });
+            }
+            catch (error) {
+                if (!(error instanceof RunUploadError && error.code === CONTROL_ERROR_CODES.snapshotConflict))
+                    throw error;
+                result = null;
+            }
+            // The server holds this rev with other content (conflict) or a newer one
+            // (stale), so this snapshot was not stored: jump past it and send again.
+            if (!result || result.status === 'stale') {
+                if (recoveries >= MAX_REV_RECOVERIES)
+                    throw new Error(`The server already holds revision ${rev} or later of this session.`);
+                revFloor = rev + 2 ** recoveries - 1;
+                recoveries += 1;
+                continue;
+            }
             await record({
                 status: 'uploaded',
                 graphId: result.graphId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assethub/cli",
-  "version": "0.1.36",
+  "version": "0.1.38",
   "description": "Command line interface for AssetHub.",
   "type": "module",
   "bin": {