@run402/sdk 4.51.0 → 4.53.0

package/dist/node/gitvault-publication.js

@@ -37,6 +37,7 @@ import { mkdtempSync, readdirSync, readFileSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { LocalError, isRun402Error } from "../errors.js";
+import { fetchGitvaultObjectBytes } from "./gitvault-edge-fetch.js";
 import { GITVAULT_FORMAT, GITVAULT_GENESIS_EPOCH, GITVAULT_GENESIS_GENERATION, GITVAULT_HEX16_RE, GITVAULT_OID40_RE, GITVAULT_SUITE, attemptKeyCommitment, bytesToHex, checkFreshEpochKeyAgainstPriorKeys, checkHPartition, computeRotationId, computeTargetPartitionDigest, deriveDigestKey, deriveObjectKey, ekFingerprint, epochRotationKeyCommitment, formatGitvaultTimestamp, fromBase64url, hexToBytes, jcs, keyEnvelopeLedgerId, keyedCommitment, newGitvaultId, newHex32, nextEpoch, objectsetContent, openBindingPreimage, openEpochRotationForRecipient, openFrame, parseGitvaultStrict, parseRotateEpochPayload, pinManifestLedgerId, randomBytes, sealFrame, sealKeyEnvelope, sha256Hex, signGitvaultObject, storedBytes, storedBytesSha256, toBase64url, verifyGitvaultObject, } from "../namespaces/gitvault.crypto.js";
 import { GITVAULT_ZERO_SHA256_SENTINEL } from "../namespaces/gitvault.types.js";
 import { crossProfileGitvaultHint } from "./gitvault-profile-scan.js";
@@ -173,7 +174,22 @@ export async function evaluateRefTransaction(current, transaction, options) {
             dropped.push({ ref: u.ref, oid: cur, reason: "force_displaced" });
     }
     if (failures.length > 0) {
-        fail("REF_EXPECTED_OLD_MISMATCH", `${failures.length} update(s) refused: ${failures.map((f) => `${f.ref} (${f.reason})`).join(", ")}`, "evaluating ref transaction", { failures }, [{ action: "refetch, reapply the transaction to the winner's map, retry" }]);
+        const nextActions = [{ action: "refetch, reapply the transaction to the winner's map, retry" }];
+        // The force-with-lease inversion (gitvault-force-spelling-and-pin-fold):
+        // git's remote-helper protocol carries force only as a `+` refspec
+        // prefix, which `--force-with-lease` never sets — the lease cannot cross
+        // the helper boundary, so a rebased tip arrives as a NON-force update
+        // and lands here as `non_fast_forward`. Plain `--force` through this
+        // helper is with-lease-safe by construction (expected-old is mandatory
+        // and CASed against the freshly materialized base), so the refusal
+        // names the spelling that works.
+        if (failures.some((f) => f.reason === "non_fast_forward")) {
+            nextActions.push({
+                action: "git push --force",
+                why: "history was rewritten; this remote enforces expected-old server-side, so --force here carries force-with-lease safety — --force-with-lease itself cannot cross git's remote-helper boundary and arrives as a non-force push",
+            });
+        }
+        fail("REF_EXPECTED_OLD_MISMATCH", `${failures.length} update(s) refused: ${failures.map((f) => `${f.ref} (${f.reason})`).join(", ")}`, "evaluating ref transaction", { failures }, nextActions);
     }
     assertRefMapCardinality(next);
     return { refs: next, dropped };
@@ -724,7 +740,7 @@ export function createGitvaultHttpTransport(client, options = {}) {
         const target = presigned.reads[0];
         if (!target)
             return null;
-        const r = await client.fetch(target.url, { method: "GET" });
+        const r = await fetchGitvaultObjectBytes(client, target);
         if (r.status === 404)
             return null;
         if (!r.ok)
@@ -766,7 +782,7 @@ export function createGitvaultHttpTransport(client, options = {}) {
         return mapBounded(targets, GITVAULT_TRANSPORT_CONCURRENCY, async (target, i) => {
             if (!target)
                 return null;
-            const r = await client.fetch(target.url, { method: "GET" });
+            const r = await fetchGitvaultObjectBytes(client, target);
             if (r.status === 404)
                 return null;
             if (!r.ok)
@@ -774,11 +790,11 @@ export function createGitvaultHttpTransport(client, options = {}) {
             return new Uint8Array(await r.arrayBuffer());
         });
     }
-    /** Resolve ONE `GET …/state` carrier arm to raw bytes — inline decode, or a plain GET on the presigned URL, `null` on a 404 (mirrors {@link getObjectBytes}'s absent reading; both arms indistinguishable after this). */
+    /** Resolve ONE `GET …/state` carrier arm to raw bytes — inline decode, or a plain GET on the presigned URL (preferring its `edge_url` companion, gitvault-read-edge-cache design D5), `null` on a 404 (mirrors {@link getObjectBytes}'s absent reading; both arms indistinguishable after this). */
     async function resolveVaultStateCarrier(carrier) {
         if ("inline" in carrier)
             return fromBase64url(carrier.inline, "carriers.inline");
-        const r = await client.fetch(carrier.presigned_url, { method: "GET" });
+        const r = await fetchGitvaultObjectBytes(client, { url: carrier.presigned_url, edge_url: carrier.edge_url });
         if (r.status === 404)
             return null;
         if (!r.ok)