@superblocksteam/workspace-sync 2.0.178-next.2 → 2.0.179-next.0

package/dist/sigv4.js

@@ -0,0 +1,97 @@
+/**
+ * The SigV4 header signer for requests to an AgentCore session endpoint.
+ *
+ * Only the Superblocks server signs these requests: it holds the AWS
+ * credentials, and the live-edit pod asks it for each signature. The signer
+ * lives here so the server and the tests that check the pod's wire format
+ * share one implementation. Import it as
+ * `@superblocksteam/workspace-sync/sigv4`.
+ */
+import { Sha256 } from "@aws-crypto/sha256-js";
+import { SignatureV4 } from "@smithy/signature-v4";
+export const UNSIGNED_PAYLOAD = "UNSIGNED-PAYLOAD";
+/** True for headers the SigV4 signer covers: `host` and `x-amz-*`. */
+export function isSignedHeader(name) {
+    return name === "host" || name.startsWith("x-amz-");
+}
+/**
+ * Parses form-encoded query parameters as AgentCore does, preserving repeated keys.
+ */
+function parseQuery(search) {
+    const query = {};
+    for (const pair of search.replace(/^\?/, "").split("&")) {
+        if (!pair)
+            continue;
+        const eq = pair.indexOf("=");
+        const key = decodeComponent(eq === -1 ? pair : pair.slice(0, eq));
+        const value = eq === -1 ? "" : decodeComponent(pair.slice(eq + 1));
+        const existing = query[key];
+        if (existing === undefined)
+            query[key] = value;
+        else if (Array.isArray(existing))
+            existing.push(value);
+        else
+            query[key] = [existing, value];
+    }
+    return query;
+}
+function decodeComponent(value) {
+    const formDecoded = value.replace(/\+/g, " ");
+    try {
+        return decodeURIComponent(formDecoded);
+    }
+    catch {
+        return formDecoded;
+    }
+}
+/**
+ * A SigV4 header signer (default service `bedrock-agentcore`). It signs only
+ * `host` and `x-amz-*` headers with `x-amz-content-sha256: UNSIGNED-PAYLOAD`,
+ * so connection, upgrade, Sec-WebSocket-*, length and encoding headers stay
+ * free for intermediaries to rewrite. Returned headers are the input headers
+ * plus `authorization`, `x-amz-date`, `x-amz-content-sha256` and, with
+ * session credentials, `x-amz-security-token`.
+ */
+export function createSigV4Signer(options) {
+    const signer = new SignatureV4({
+        credentials: options.credentials,
+        region: options.region,
+        service: options.service ?? "bedrock-agentcore",
+        sha256: Sha256,
+        uriEscapePath: true,
+        applyChecksum: false,
+    });
+    const now = options.now ?? (() => new Date());
+    return {
+        async sign({ method, url, headers }) {
+            const signable = {};
+            for (const [name, value] of Object.entries(headers)) {
+                const lower = name.toLowerCase();
+                if (isSignedHeader(lower))
+                    signable[lower] = value;
+            }
+            // Always the URL's own host: a caller-chosen Host would sign for
+            // another endpoint than the one the URL names.
+            signable.host = url.host;
+            signable["x-amz-content-sha256"] = UNSIGNED_PAYLOAD;
+            const signed = await signer.sign({
+                method,
+                protocol: url.protocol,
+                hostname: url.hostname,
+                port: url.port ? Number(url.port) : undefined,
+                path: url.pathname,
+                query: parseQuery(url.search),
+                headers: signable,
+            }, { signingDate: now() });
+            const out = {};
+            for (const [name, value] of Object.entries(headers)) {
+                out[name.toLowerCase()] = value;
+            }
+            for (const [name, value] of Object.entries(signed.headers)) {
+                out[name.toLowerCase()] = value;
+            }
+            return out;
+        },
+    };
+}
+//# sourceMappingURL=sigv4.js.map

package/dist/sigv4.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sigv4.js","sourceRoot":"","sources":["../src/sigv4.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AA2BnD,MAAM,CAAC,MAAM,gBAAgB,GAAG,kBAAkB,CAAC;AAEnD,sEAAsE;AACtE,MAAM,UAAU,cAAc,CAAC,IAAY;IACzC,OAAO,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;AACtD,CAAC;AAED;;GAEG;AACH,SAAS,UAAU,CAAC,MAAc;IAChC,MAAM,KAAK,GAAsC,EAAE,CAAC;IACpD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACxD,IAAI,CAAC,IAAI;YAAE,SAAS;QACpB,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,GAAG,GAAG,eAAe,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAClE,MAAM,KAAK,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;QACnE,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,QAAQ,KAAK,SAAS;YAAE,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;aAC1C,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;YAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;;YAClD,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,eAAe,CAAC,KAAa;IACpC,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC9C,IAAI,CAAC;QACH,OAAO,kBAAkB,CAAC,WAAW,CAAC,CAAC;IACzC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,WAAW,CAAC;IACrB,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAA2B;IAC3D,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC;QAC7B,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,mBAAmB;QAC/C,MAAM,EAAE,MAAM;QACd,aAAa,EAAE,IAAI;QACnB,aAAa,EAAE,KAAK;KACrB,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IAE9C,OAAO;QACL,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE;YACjC,MAAM,QAAQ,GAA2B,EAAE,CAAC;YAC5C,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;gBACpD,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjC,IAAI,cAAc,CAAC,KAAK,CAAC;oBAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC;YACrD,CAAC;YACD,iEAAiE;YACjE,+CAA+C;YAC/C,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YACzB,QAAQ,CAAC,sBAAsB,CAAC,GAAG,gBAAgB,CAAC;YAEpD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAC9B;gBACE,MAAM;gBACN,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;gBAC7C,IAAI,EAAE,GAAG,CAAC,QAAQ;gBAClB,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC;gBAC7B,OAAO,EAAE,QAAQ;aAClB,EACD,EAAE,WAAW,EAAE,GAAG,EAAE,EAAE,CACvB,CAAC;YAEF,MAAM,GAAG,GAA2B,EAAE,CAAC;YACvC,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;gBACpD,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,GAAG,KAAK,CAAC;YAClC,CAAC;YACD,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC3D,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,GAAG,KAAK,CAAC;YAClC,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/snapshot/upload-snapshot.d.ts

@@ -12,6 +12,12 @@ export interface SnapshotUploadTarget {
     validateMany?: (items: PutManyItems) => Promise<void>;
     putMany: (items: PutManyItems) => Promise<void>;
 }
+/**
+ * The server's refusal of a listing or a root over hashes this application does not own. It also means the server
+ * no longer remembers an upload that this client's hash cache still counts as stored. Only that refusal carries
+ * the reason; a token bound to another app or branch gets the same message without it, and re-uploading cannot fix that.
+ */
+export declare function isUploadRefusal(error: unknown): boolean;
 /**
  * The putMany items that bring the server up to `directorySnapshot`, children
  * before the listings that reference them. Hashes the cache already knows are

package/dist/snapshot/upload-snapshot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upload-snapshot.d.ts","sourceRoot":"","sources":["../../src/snapshot/upload-snapshot.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,qBAAqB,EACtB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAIpD,MAAM,MAAM,YAAY,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;AAE1D,mDAAmD;AACnD,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,OAAO,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACjD;AAWD;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,iBAAiB,EAAE,iBAAiB,EACpC,SAAS,EAAE,SAAS,GACnB,YAAY,CAwDd;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,oBAAoB,EAC5B,aAAa,EAAE,YAAY,GAC1B,OAAO,CAAC,MAAM,CAAC,CAajB;AAED,wBAAsB,uBAAuB,CAC3C,SAAS,EAAE,mBAAmB,EAC9B,iBAAiB,EAAE,iBAAiB,EACpC,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,IAAI,CAAC,CAKf;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,mBAAmB,GAC7B,oBAAoB,CAiBtB"}
+{"version":3,"file":"upload-snapshot.d.ts","sourceRoot":"","sources":["../../src/snapshot/upload-snapshot.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAEV,qBAAqB,EACtB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAIpD,MAAM,MAAM,YAAY,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;AAE1D,mDAAmD;AACnD,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,OAAO,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACjD;AAWD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAOvD;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,iBAAiB,EAAE,iBAAiB,EACpC,SAAS,EAAE,SAAS,GACnB,YAAY,CAwDd;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,oBAAoB,EAC5B,aAAa,EAAE,YAAY,GAC1B,OAAO,CAAC,MAAM,CAAC,CAajB;AAED,wBAAsB,uBAAuB,CAC3C,SAAS,EAAE,mBAAmB,EAC9B,iBAAiB,EAAE,iBAAiB,EACpC,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,IAAI,CAAC,CAKf;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,mBAAmB,GAC7B,oBAAoB,CAiBtB"}

package/dist/snapshot/upload-snapshot.js

@@ -1,4 +1,4 @@
-import { unwrapResponseDto } from "@superblocksteam/shared";
+import { SYNC_OBJECT_NOT_OWNED_REASON, unwrapResponseDto, } from "@superblocksteam/shared";
 const BATCH_SIZE = 64;
 function isUnsupportedMethod(error) {
     return (typeof error === "object" &&
@@ -6,6 +6,17 @@ function isUnsupportedMethod(error) {
         "code" in error &&
         error.code === 2);
 }
+/**
+ * The server's refusal of a listing or a root over hashes this application does not own. It also means the server
+ * no longer remembers an upload that this client's hash cache still counts as stored. Only that refusal carries
+ * the reason; a token bound to another app or branch gets the same message without it, and re-uploading cannot fix that.
+ */
+export function isUploadRefusal(error) {
+    return (typeof error === "object" &&
+        error !== null &&
+        "reason" in error &&
+        error.reason === SYNC_OBJECT_NOT_OWNED_REASON);
+}
 /**
  * The putMany items that bring the server up to `directorySnapshot`, children
  * before the listings that reference them. Hashes the cache already knows are

package/dist/snapshot/upload-snapshot.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload-snapshot.js","sourceRoot":"","sources":["../../src/snapshot/upload-snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAU9E,MAAM,UAAU,GAAG,EAAE,CAAC;AActB,SAAS,mBAAmB,CAAC,KAAc;IACzC,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,MAAM,IAAI,KAAK;QACd,KAAqB,CAAC,IAAI,KAAK,CAAC,CAClC,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,0BAA0B,CACxC,iBAAoC,EACpC,SAAoB;IAEpB,MAAM,aAAa,GAAiB,EAAE,CAAC;IAEvC,MAAM,kBAAkB,GAAG,CAAC,iBAAoC,EAAE,EAAE;QAClE,IAAI,SAAS,CAAC,eAAe,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;YACtD,gFAAgF;YAChF,OAAO;QACT,CAAC;QACD,MAAM,iBAAiB,GAAqB,EAAE,CAAC;QAC/C,KAAK,MAAM,gBAAgB,IAAI,iBAAiB,CAAC,QAAQ,EAAE,CAAC;YAC1D,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC;YACnC,IAAI,KAAqB,CAAC;YAC1B,QAAQ,gBAAgB,CAAC,IAAI,EAAE,CAAC;gBAC9B,KAAK,GAAG,EAAE,CAAC;oBACT,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;wBACzD,4EAA4E;wBAC5E,aAAa,CAAC,IAAI,CAAC;4BACjB,IAAI,EAAE,cAAc;4BACpB,QAAQ,EAAE,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC;yBACvD,CAAC,CAAC;oBACL,CAAC;oBACD,KAAK,GAAG;wBACN,IAAI,EAAE,GAAG;wBACT,IAAI,EAAE,gBAAgB,CAAC,IAAI;wBAC3B,UAAU,EAAE,gBAAgB,CAAC,UAAU;wBACvC,IAAI;qBACL,CAAC;oBACF,MAAM;gBACR,CAAC;gBACD,KAAK,GAAG,EAAE,CAAC;oBACT,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;wBACtD,kBAAkB,CAAC;4BACjB,IAAI,EAAE,gBAAgB,CAAC,IAAI;4BAC3B,QAAQ,EAAE,gBAAgB,CAAC,QAAQ;yBACpC,CAAC,CAAC;oBACL,CAAC;oBACD,KAAK,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,gBAAgB,CAAC,IAAI,EAAE,CAAC;oBACzD,MAAM;gBACR,CAAC;gBACD,KAAK,GAAG,EAAE,CAAC;oBACT,KAAK,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,gBAAgB,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC;oBAC7D,MAAM;gBACR,CAAC;gBACD;oBACE,MAAM,IAAI,KAAK,CAAC,uBAAuB,gBAAgB,EAAE,CAAC,CAAC;YAC/D,CAAC;YACD,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC;QACD,aAAa,CAAC,IAAI,CAAC;YACjB,IAAI,EAAE,mBAAmB;YACzB,QAAQ,EAAE,iBAAiB;SAC5B,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;IACtC,OAAO,aAAa,CAAC;AACvB,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,MAA4B,EAC5B,aAA2B;IAE3B,MAAM,eAAe,GAAG,aAAa,CAAC,MAAM,CAC1C,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,mBAAmB,CAC5C,CAAC;IACF,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;QACxB,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,eAAe,CAAC,MAAM,EAAE,GAAG,IAAI,UAAU,EAAE,CAAC;YAClE,MAAM,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,GAAG,UAAU,CAAC,CAAC,CAAC;QAC1E,CAAC;IACH,CAAC;IACD,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,aAAa,CAAC,MAAM,EAAE,GAAG,IAAI,UAAU,EAAE,CAAC;QAChE,MAAM,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,GAAG,UAAU,CAAC,CAAC,CAAC;IACnE,CAAC;IACD,OAAO,aAAa,CAAC,MAAM,CAAC;AAC9B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,SAA8B,EAC9B,iBAAoC,EACpC,SAAoB;IAEpB,MAAM,mBAAmB,CACvB,0BAA0B,CAAC,SAAS,CAAC,EACrC,0BAA0B,CAAC,iBAAiB,EAAE,SAAS,CAAC,CACzD,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,0BAA0B,CACxC,SAA8B;IAE9B,IAAI,mBAAmB,GACrB,OAAO,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,KAAK,UAAU,CAAC;IAC5D,OAAO;QACL,YAAY,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YAC5B,IAAI,CAAC,mBAAmB;gBAAE,OAAO;YACjC,IAAI,CAAC;gBACH,MAAM,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YAC1E,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC;oBAAE,MAAM,KAAK,CAAC;gBAC7C,mBAAmB,GAAG,KAAK,CAAC;YAC9B,CAAC;QACH,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACvB,MAAM,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QACrE,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"upload-snapshot.js","sourceRoot":"","sources":["../../src/snapshot/upload-snapshot.ts"],"names":[],"mappings":"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"}

package/dist/socket-dbfs-transport.d.ts

@@ -23,7 +23,7 @@ export declare class SocketDbfsTransport implements DbfsTransport {
     putMany(items: PutManyItems): Promise<string[]>;
     getDirectory(hash: string): Promise<DirectoryEntry[]>;
     getContents(rootHash: string, files: DbfsFileRef[]): Promise<Buffer[]>;
-    getBlob(hash: string): Promise<Buffer>;
+    private getBlob;
     getServerHash(): Promise<string>;
     setHash({ hash, source }: SetHashRequest): Promise<SetHashResult>;
     setDraftState(hasDraft: boolean): Promise<void>;

package/dist/socket-dbfs-transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"socket-dbfs-transport.d.ts","sourceRoot":"","sources":["../src/socket-dbfs-transport.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACb,cAAc,EACd,aAAa,EACd,MAAM,qBAAqB,CAAC;AAG7B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EACL,KAAK,YAAY,EAElB,MAAM,+BAA+B,CAAC;AAKvC,MAAM,WAAW,0BAA0B;IACzC;;;OAGG;IACH,SAAS,EAAE,mBAAmB,GAAG,CAAC,MAAM,mBAAmB,CAAC,CAAC;IAC7D,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;CAChC;AAED;;;GAGG;AACH,qBAAa,mBAAoB,YAAW,aAAa;IAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO;IAApC,YAA6B,OAAO,EAAE,0BAA0B,EAAI;IAEpE,OAAO,KAAK,MAAM,GAGjB;IAEK,YAAY,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAErD;IAEK,OAAO,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAKpD;IAEK,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,CAK1D;IAEK,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA2B3E;IAEK,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAK3C;IAEK,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,CAQrC;IAEK,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAgBtE;IAEK,aAAa,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAQpD;YAEa,YAAY;CAoB3B"}
+{"version":3,"file":"socket-dbfs-transport.d.ts","sourceRoot":"","sources":["../src/socket-dbfs-transport.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACb,cAAc,EACd,aAAa,EACd,MAAM,qBAAqB,CAAC;AAG7B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EACL,KAAK,YAAY,EAElB,MAAM,+BAA+B,CAAC;AAKvC,MAAM,WAAW,0BAA0B;IACzC;;;OAGG;IACH,SAAS,EAAE,mBAAmB,GAAG,CAAC,MAAM,mBAAmB,CAAC,CAAC;IAC7D,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;CAChC;AAED;;;GAGG;AACH,qBAAa,mBAAoB,YAAW,aAAa;IAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO;IAApC,YAA6B,OAAO,EAAE,0BAA0B,EAAI;IAEpE,OAAO,KAAK,MAAM,GAGjB;IAEK,YAAY,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAErD;IAEK,OAAO,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAKpD;IAEK,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,CAK1D;IAEK,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA2B3E;YAEa,OAAO;IAOf,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,CAQrC;IAEK,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAoBtE;IAEK,aAAa,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAQpD;YAEa,YAAY;CAoB3B"}

package/dist/socket-dbfs-transport.js

@@ -75,6 +75,10 @@ export class SocketDbfsTransport {
         return {
             hash: response.hash ?? hash,
             ...(response.commitId ? { commitId: response.commitId } : {}),
+            ...(response.checkpointSkipped
+                ? { checkpointSkipped: response.checkpointSkipped }
+                : {}),
+            ...(response.heldPaths ? { heldPaths: response.heldPaths } : {}),
         };
     }
     async setDraftState(hasDraft) {

package/dist/socket-dbfs-transport.js.map

@@ -1 +1 @@
-{"version":3,"file":"socket-dbfs-transport.js","sourceRoot":"","sources":["../src/socket-dbfs-transport.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"socket-dbfs-transport.js","sourceRoot":"","sources":["../src/socket-dbfs-transport.ts"],"names":[],"mappings":"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"}

package/dist/sync-credential-provider.d.ts

@@ -5,8 +5,8 @@ export interface SyncCredential {
     expiresAt?: number;
 }
 /**
- * Supplies the current sync credential. The interim implementation is a narrow
- * server token the edge pushes before expiry; AR-1074 hardens or replaces it.
+ * Supplies the current sync credential: a narrow server token, bound to one
+ * application branch, that the edge pushes before expiry.
  */
 export interface SyncCredentialProvider {
     /** The latest credential, or undefined before the first one arrives. */

package/dist/sync-engine.d.ts

@@ -1,5 +1,5 @@
 import type { Meter, Tracer } from "@opentelemetry/api";
-import type { ApplicationHashChangeSource } from "@superblocksteam/shared";
+import type { ApplicationHashChangeSource, CheckpointSkipReason } from "@superblocksteam/shared";
 import { type BranchWriteGuard } from "./branch-write-guard.js";
 import type { DbfsTransport } from "./dbfs-transport.js";
 import { HashCache } from "./hash-cache.js";
@@ -42,14 +42,36 @@ export interface CommitOptions {
      * running; the journal then stays open. Defaults to true.
      */
     finalizeJournal?: boolean;
+    /**
+     * Send the hash even when it matches the stored one, and report the draft
+     * state even when it was already reported. The server records an accept or
+     * reject against its last checkpoint and drafts, not the branch hash: an
+     * accept of drafts the turn-end commit already uploaded must still reach it.
+     */
+    checkpoint?: boolean;
+    /**
+     * Settles the draft markers (accept, reject or clear) inside the commit
+     * queue, after the branch guard passes and the draft journal is dropped,
+     * and before the snapshot. No
+     * other commit can then reconcile the journal or report draft state between
+     * the markers changing and this commit.
+     */
+    settle?: () => Promise<void>;
 }
 export interface CommitResult {
     dbfsHash: string;
     commitId?: string;
+    /** Why the server made no checkpoint, when it skipped one by design. */
+    checkpointSkipped?: CheckpointSkipReason;
     /** False when the tree already matched the stored hash. */
     moved: boolean;
     /** Paths the journal reconcile found changed, when a journal is active. */
     journalChangedPaths?: string[];
+    /**
+     * Protected paths whose changes the server holds for a user's approval.
+     * The workspace then holds the server's tree, without those changes.
+     */
+    heldPaths?: string[];
 }
 export interface FlushResult {
     /** Hash of the tree whose blobs were uploaded. */
@@ -99,6 +121,17 @@ export interface WorkspaceSyncEngine {
     interimFlush(): Promise<FlushResult>;
     /** The turn-end commit. */
     commit(source: ApplicationHashChangeSource, options?: CommitOptions): Promise<CommitResult>;
+    /**
+     * Reports whether the tree holds drafts, even when that was already
+     * reported. For a draft change that moves no hash, such as clearing markers.
+     */
+    resendDraftState(options?: Pick<CommitOptions, "settle">): Promise<void>;
+    /**
+     * Loads the server's tree when the branch moved and this workspace has
+     * nothing unsaved, for example after a user approved a held change.
+     * Resolves true when it loaded a tree.
+     */
+    pull(): Promise<boolean>;
     /** True while the tree has changes the branch hash does not include. */
     readonly unsynced: boolean;
     /** The hash last committed or loaded, once known. */

package/dist/sync-engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync-engine.d.ts","sourceRoot":"","sources":["../src/sync-engine.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAExD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAE3E,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAEL,KAAK,aAAa,EAGnB,MAAM,kBAAkB,CAAC;AAgB1B,OAAO,KAAK,EAEV,mBAAmB,EACpB,MAAM,4BAA4B,CAAC;AAIpC;;;;GAIG;AACH,MAAM,MAAM,UAAU;AACpB,yEAAyE;AACvE,0BAA0B;AAC5B,wDAAwD;GACtD,sBAAsB;AACxB,uEAAuE;GACrE,wBAAwB,CAAC;AAE7B,MAAM,MAAM,WAAW,GAAG,OAAO,CAC/B,MAAM,CAAC,UAAU,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAC/C,CAAC;AAEF,MAAM,WAAW,0BAA0B;IACzC,4BAA4B;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,aAAa,CAAC;IACzB,KAAK,EAAE,mBAAmB,CAAC;IAC3B,oEAAoE;IACpE,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAC7B,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,sEAAsE;IACtE,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,4EAA4E;IAC5E,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;CACnC;AAED,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,2DAA2D;IAC3D,KAAK,EAAE,OAAO,CAAC;IACf,2EAA2E;IAC3E,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,WAAW;IAC1B,kDAAkD;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,iEAAiE;IACjE,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,SAAS,GAAG,UAAU,GAAG,UAAU,CAAC;AAI1E,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,aAAa,CAAC;IACvB,iDAAiD;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB,uDAAuD;IACvD,YAAY,EAAE,OAAO,CAAC;IACtB,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,2EAA2E;IAC3E,kBAAkB,CAAC,EAAE;QAAE,YAAY,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAChD,wEAAwE;IACxE,UAAU,EAAE,aAAa,CAAC;CAC3B;AAED,MAAM,WAAW,gBAAgB;IAC/B,gDAAgD;IAChD,YAAY,CAAC,EAAE,2BAA2B,CAAC;CAC5C;AAED,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACnD,kBAAkB,EAAE;QAAE,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC;CAC3C;AAED,MAAM,WAAW,mBAAmB;IAClC,yEAAyE;IACzE,SAAS,CAAC,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACjE,uEAAuE;IACvE,YAAY,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC;IACrC,2BAA2B;IAC3B,MAAM,CACJ,MAAM,EAAE,2BAA2B,EACnC,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,YAAY,CAAC,CAAC;IACzB,wEAAwE;IACxE,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,qDAAqD;IACrD,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,8DAA8D;IAC9D,SAAS,IAAI,IAAI,CAAC;IAClB,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,EAAE,CAAC,CAAC,SAAS,MAAM,mBAAmB,EACpC,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC,CAAC,KAAK,IAAI,GAClD,MAAM,IAAI,CAAC;CACf;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,0BAA0B,GAClC,mBAAmB,CAErB"}
+{"version":3,"file":"sync-engine.d.ts","sourceRoot":"","sources":["../src/sync-engine.ts"],"names":[],"mappings":"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"}

package/dist/sync-engine.js

@@ -1,11 +1,11 @@
 import * as fsp from "node:fs/promises";
 import { BranchWriteRejectedError, } from "./branch-write-guard.js";
-import { hasSwapFiles } from "./draft-helpers.js";
+import { hasDraftsFailClosed } from "./draft-helpers.js";
 import { HashCache } from "./hash-cache.js";
 import { hashLocalDirectory } from "./hash-dir-tree.js";
 import { downloadServerTree, flattenTree, readServerTree, } from "./server-tree.js";
 import { snapshotLocalDirectory, snapshotLocalDirectoryWithDrafts, } from "./snapshot/take-snapshot.js";
-import { collectSnapshotUploadItems, uploadSnapshotItems, } from "./snapshot/upload-snapshot.js";
+import { collectSnapshotUploadItems, isUploadRefusal, uploadSnapshotItems, } from "./snapshot/upload-snapshot.js";
 import { createSyncTelemetry, inSpan, } from "./sync-telemetry.js";
 const BLOB_BATCH = 64;
 const NOTHING_DOWNLOADED = { files: 0, bytes: 0 };
@@ -67,7 +67,41 @@ class SyncEngine {
         }));
     }
     commit(source, options = {}) {
-        return this.serialize(() => this.commitNow(source, options.finalizeJournal === false ? "keep" : "finalize"));
+        const { settle } = options;
+        return this.serialize(async () => {
+            if (settle)
+                await this.settleNow(settle);
+            return this.commitNow(source, settle
+                ? "skip"
+                : options.finalizeJournal === false
+                    ? "keep"
+                    : "finalize", options.checkpoint ?? false);
+        });
+    }
+    resendDraftState(options = {}) {
+        const { settle } = options;
+        return this.serialize(async () => {
+            if (settle)
+                await this.settleNow(settle);
+            await this.reportDraftState({
+                force: true,
+                beforeSend: () => this.assertOwnsBranch(),
+            });
+        });
+    }
+    pull() {
+        return this.serialize(async () => {
+            const serverHash = await this.options.transport.getServerHash();
+            const storedHash = (await this.options.state.read())?.dbfsHash;
+            if (serverHash === storedHash)
+                return false;
+            // Unsaved changes stay: the commit guard then reports the moved branch.
+            if ((await this.hashLocalTree())?.hash !== storedHash)
+                return false;
+            await this.loadServerTree(serverHash);
+            this.updateUnsynced();
+            return true;
+        });
     }
     rehydrate(options = {}) {
         return this.serialize(() => inSpan(this.telemetry.tracer, "workspace.rehydrate", async (span) => {
@@ -164,8 +198,16 @@ class SyncEngine {
             const reconciled = await journal.reconcile(false);
             if (reconciled) {
                 result.interruptedJournal = { changedPaths: reconciled.changedPaths };
+                // Without the branch the flag is not this workspace's to set; the
+                // next commit reports it once the guard passes.
                 if (reconciled.changedPaths.length > 0)
-                    await this.reportDraftState();
+                    await this.reportDraftState({
+                        only: true,
+                        beforeSend: () => this.assertOwnsBranch(),
+                    }).catch((error) => {
+                        if (!(error instanceof BranchWriteRejectedError))
+                            throw error;
+                    });
             }
         }
         if (result.outcome !== "replayed" || result.replayCommitted)
@@ -173,28 +215,51 @@ class SyncEngine {
         this.updateUnsynced();
         return result;
     }
-    async commitNow(source, journalMode) {
-        const { root, transport, state, journal, guard } = this.options;
+    async commitNow(source, journalMode, checkpoint = false) {
+        const { root, state, journal, guard } = this.options;
         const started = performance.now();
         let outcome = "error";
         try {
             return await inSpan(this.telemetry.tracer, "workspace.commit", async (span) => {
                 span.setAttribute("workspace.sync.source", source);
+                span.setAttribute("workspace.sync.checkpoint", checkpoint);
                 const writesAtStart = this.writes;
                 let journalChangedPaths;
                 if (journal && journalMode !== "skip") {
                     const reconciled = await journal.reconcile(journalMode === "finalize");
                     journalChangedPaths = reconciled?.changedPaths;
                 }
+                const baseHash = (await state.read())?.dbfsHash;
+                const assertCanCommit = async () => {
+                    try {
+                        await guard.assertCanCommit(baseHash);
+                    }
+                    catch (error) {
+                        if (error instanceof BranchWriteRejectedError) {
+                            outcome = "rejected";
+                            span.setAttribute("workspace.sync.rejection", error.reason);
+                        }
+                        throw error;
+                    }
+                };
+                // Drafts go before the hash: the server files an
+                // `ai:generate:post` as a draft only while it holds isDraft=true.
+                // Reported after, a turn's first drafts become a manual checkpoint,
+                // and the accept that follows finds nothing new to checkpoint. The
+                // guard runs first, so a workspace that lost the branch cannot
+                // flip the shared flag.
+                await this.reportDraftState({
+                    only: true,
+                    force: checkpoint,
+                    beforeSend: assertCanCommit,
+                });
                 await this.fault("after-write-before-flush");
                 const snapshot = await snapshotLocalDirectoryWithDrafts(root);
                 const hash = snapshot.hash;
                 this.localHash = hash;
-                const baseHash = (await state.read())?.dbfsHash;
-                if (hash === baseHash) {
+                if (hash === baseHash && !checkpoint) {
                     this.committedHash = baseHash;
                     await journal?.retireUploaded(hash);
-                    await this.reportDraftState();
                     this.committedWrites = writesAtStart;
                     this.updateUnsynced();
                     outcome = "unchanged";
@@ -208,34 +273,47 @@ class SyncEngine {
                 const uploadedItems = await this.upload(snapshot);
                 span.setAttribute("workspace.sync.uploaded_items", uploadedItems);
                 await this.fault("after-put-before-set");
-                try {
-                    await guard.assertCanCommit(baseHash);
-                }
-                catch (error) {
-                    if (error instanceof BranchWriteRejectedError) {
-                        outcome = "rejected";
-                        span.setAttribute("workspace.sync.rejection", error.reason);
-                    }
-                    throw error;
-                }
-                const result = await transport.setHash({ hash, baseHash, source });
+                await assertCanCommit();
+                const result = await this.setHashRecovering(snapshot, { hash, baseHash, source }, assertCanCommit);
+                if (result.checkpointSkipped)
+                    span.setAttribute("workspace.sync.checkpoint_skipped", result.checkpointSkipped);
                 await this.fault("after-set-before-state");
-                await state.write({ dbfsHash: hash });
-                this.committedHash = hash;
+                // The server stored another tree when it held protected changes.
+                // Apply what differs from the upload, so edits made since stay.
+                const committed = result.hash;
+                if (committed === hash) {
+                    await state.write({ dbfsHash: hash });
+                    this.committedHash = hash;
+                }
+                else
+                    await this.loadServerTree(committed, snapshot);
                 await journal?.retireUploaded(hash);
-                await this.reportDraftState();
                 this.committedWrites = writesAtStart;
                 this.updateUnsynced();
+                // Only an accept or reject checkpoint clears the flag, and only
+                // once the server has its hash. A plain commit never does: after a
+                // failed accept the markers are gone, and clearing then would make
+                // the AI tree publishable without its checkpoint.
+                if (checkpoint)
+                    await this.reportDraftState({
+                        only: false,
+                        force: true,
+                        beforeSend: () => this.assertOwnsBranch(),
+                    });
                 outcome = "committed";
                 span.setAttribute("workspace.sync.outcome", outcome);
                 this.emit("committed", {
-                    dbfsHash: hash,
+                    dbfsHash: committed,
                     ...(result.commitId && { commitId: result.commitId }),
                 });
                 return {
-                    dbfsHash: hash,
-                    moved: true,
+                    dbfsHash: committed,
+                    moved: committed !== baseHash,
+                    ...(result.heldPaths?.length && { heldPaths: result.heldPaths }),
                     ...(result.commitId && { commitId: result.commitId }),
+                    ...(result.checkpointSkipped && {
+                        checkpointSkipped: result.checkpointSkipped,
+                    }),
                     ...(journalChangedPaths && { journalChangedPaths }),
                 };
             });
@@ -244,15 +322,48 @@ class SyncEngine {
             this.telemetry.commitDuration.record((performance.now() - started) / 1000, { outcome });
         }
     }
+    /**
+     * Moves the branch to `snapshot`'s root. The server also refuses a root it does not remember this
+     * application uploading, which can happen when this engine's cache skipped uploading it. The
+     * recovery is the one `upload` uses: forget the cache, send the whole tree, check the branch guard again and ask once more.
+     */
+    async setHashRecovering(snapshot, request, assertCanCommit) {
+        const { transport } = this.options;
+        try {
+            return await transport.setHash(request);
+        }
+        catch (error) {
+            if (!isUploadRefusal(error))
+                throw error;
+            this.hashCache.empty();
+            await this.upload(snapshot);
+            // The re-upload takes time, and the client's branch check is the only compare-and-set on this move, so ask again.
+            await assertCanCommit();
+            return await transport.setHash(request);
+        }
+    }
     /** Puts what DBFS lacks for `snapshot`; returns the items sent. */
     async upload(snapshot) {
         const { transport } = this.options;
-        const sent = await uploadSnapshotItems({
+        const send = () => uploadSnapshotItems({
             validateMany: (items) => transport.validateMany(items),
             putMany: async (items) => {
                 await transport.putMany(items);
             },
         }, collectSnapshotUploadItems(snapshot, this.hashCache));
+        let sent;
+        try {
+            sent = await send();
+        }
+        catch (error) {
+            if (!isUploadRefusal(error))
+                throw error;
+            // The server only accepts a listing over objects it remembers this application uploading, and it forgets
+            // them after a while. This cache can still count such an object as stored, so forget the cache and send
+            // the whole tree again. A second refusal is a real one and surfaces to the caller.
+            this.hashCache.empty();
+            sent = await send();
+        }
         this.hashCache.add_directory_recursive(snapshot);
         return sent;
     }
@@ -267,6 +378,21 @@ class SyncEngine {
         const local = await hashLocalDirectory(this.options.root);
         return local.contents.length === 0 ? undefined : local;
     }
+    /**
+     * Writes the server's tree over the paths where it differs from `local`
+     * (by default the tree on disk now) and records its hash.
+     */
+    async loadServerTree(serverHash, local) {
+        const { root, transport } = this.options;
+        const tree = await readServerTree(transport, serverHash);
+        await downloadServerTree({
+            transport,
+            tree,
+            local: local ?? (await this.hashLocalTree()),
+            root,
+        });
+        await this.storeLoaded(serverHash, tree);
+    }
     async storeLoaded(hash, tree) {
         await this.options.state.write({ dbfsHash: hash });
         this.hashCache.add_directory_recursive(tree);
@@ -326,11 +452,44 @@ class SyncEngine {
             deleted,
         });
     }
-    async reportDraftState() {
+    /**
+     * Runs `settle` once the guard lets this workspace write the branch, so a
+     * refused settle leaves the markers and the server's draft flag as they
+     * were. A running journal (its turn-end reconcile failed) is reconciled
+     * first, so every marker is there to accept or restore. The journal is then
+     * dropped, since its next reconcile would rebuild the markers `settle`
+     * removes. Callers hold the queue.
+     */
+    async settleNow(settle) {
+        await this.assertOwnsBranch();
+        const { journal } = this.options;
+        if (journal && (await journal.phase()) === "running")
+            await journal.reconcile(false);
+        await journal?.clear();
+        await settle();
+    }
+    /**
+     * The server's draft flag is shared by the branch, so only the workspace
+     * the guard lets write the branch may change it: the lock holder, on the
+     * hash it last committed.
+     */
+    async assertOwnsBranch() {
+        await this.options.guard.assertCanCommit((await this.options.state.read())?.dbfsHash);
+    }
+    /**
+     * Sends the tree's draft state when it changed, or always with `force`.
+     * With `only`, sends it only when the tree's state is that value;
+     * `beforeSend` runs only when it is about to be sent.
+     */
+    async reportDraftState(options = {}) {
+        const { force = false, only, beforeSend } = options;
         const hasDraft = await (this.options.hasDraft?.() ??
-            hasSwapFiles(this.options.root));
-        if (hasDraft === this.reportedDraft)
+            hasDraftsFailClosed(this.options.root));
+        if (only !== undefined && hasDraft !== only)
+            return;
+        if (!force && hasDraft === this.reportedDraft)
             return;
+        await beforeSend?.();
         await this.options.transport.setDraftState(hasDraft);
         this.reportedDraft = hasDraft;
     }