@assethub/cli 0.1.37 → 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/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.37",
+  "version": "0.1.38",
   "description": "Command line interface for AssetHub.",
   "type": "module",
   "bin": {