@githolon/runtime 0.110.0 → 0.111.0

package/dist/nomos-runner.js

@@ -19623,6 +19623,15 @@
       }
       if (result.stillAhead || result.pushFailed || result.directOfferDeferred || result.reconnectRequired) {
         if (result.directOfferDeferred) {
+          if (!result.reconnectRequired) {
+            __privateGet(this, _desk).transition(result.workspace, {
+              case: ReplicaFollowEventKind.Failed,
+              nowUnixMillis,
+              failure: "remote workspace opening; retrying",
+              retryWithinMillis: 5e3
+            });
+            return delayUntilDue(__privateGet(this, _desk).get(result.workspace), nowUnixMillis);
+          }
           __privateGet(this, _desk).transition(result.workspace, {
             case: ReplicaFollowEventKind.DependencyDeferred,
             nowUnixMillis,
@@ -21619,6 +21628,34 @@
   init_shims();
   var CUSTODY_OFFER_MEDIA_TYPE = "application/vnd.nomos.custody-offer-batch+protobuf";
   var CUSTODY_OFFER_RESULT_MEDIA_TYPE = "application/vnd.nomos.custody-offer-result+protobuf";
+  function settleCustodyOfferExchange(awaiting, response) {
+    if (response.status === 202 && response.contentType?.includes("application/json")) {
+      try {
+        const pending = JSON.parse(new TextDecoder().decode(response.body));
+        if (pending?.retryable === true && typeof pending.preparing === "string") {
+          return { case: "maintenance", kind: pending.preparing };
+        }
+      } catch {
+      }
+    }
+    if (!response.contentType?.includes(CUSTODY_OFFER_RESULT_MEDIA_TYPE)) {
+      return {
+        case: "unexpected",
+        status: response.status,
+        ...response.contentType === void 0 ? {} : { contentType: response.contentType }
+      };
+    }
+    const verdict = decodeCustodyOffer(response.body, awaiting.requestId);
+    const receipt = custodyOfferReceipt(awaiting.requestId, verdict);
+    switch (verdict.case) {
+      case "admission":
+        return { case: "admission", value: verdict.value, receipt, status: response.status };
+      case "failure":
+        return { case: "failure", value: verdict.value, receipt, status: response.status };
+      case "blocked":
+        return { case: "blocked", value: verdict.value, receipt, status: response.status };
+    }
+  }
   function encodeInlineCustodyOffer(args) {
     return toBinary(CustodyOfferBatchRequestSchema, create(CustodyOfferBatchRequestSchema, {
       protocolVersion: 2,
@@ -21745,6 +21782,7 @@
   var PLACEMENT_REF3 = "refs/nomos/placement";
   var LAW_PRODUCTS_MEDIA_TYPE = "application/vnd.nomos.export-law-products-response+protobuf";
   var WorkspaceSyncPhase = Object.freeze({
+    Idle: "idle",
     Probe: "probe",
     Offer: "offer",
     Lease: "lease",
@@ -21754,7 +21792,6 @@
     Done: "done"
   });
   var trackedMain = "refs/remotes/nomos/main";
-  var NO_COMMON_BASE = "this replica holds local history with no frontier its upstream ever confirmed; convergence needs a common admitted base \u2014 drop the local copy to refetch it, or re-discover a provider holding this lineage";
   var deferredRemote = "refs/remotes/nomos/deferred";
   var deferredLocal = "refs/nomos/sync-deferred-local";
   var judgedThisLifetime = /* @__PURE__ */ new Map();
@@ -21766,7 +21803,7 @@
     const finished = clock.monotonicNanoseconds();
     return finished >= started ? Number(finished - started) / 1e6 : 0;
   };
-  var _kernel16, _credentials4, _clock13, _mount, _binding, _route2, _rediscover, _reroute, _placementFetch, _discoveredFrontier, _observePlacement, _recheckPlacement, _directoryAnswered, _placementFetched, _afterPlacement, _leased, _lease, _command2, _requestId4, _started, _phase2, _localHead, _offerHead, _previousHead, _fetchStarted, _offerStarted, _offerRequestId, _pushMillis, _pushBytes, _desiredHead, _returnedPackHead, _candidateDurable, _admissionSummary, _offerReceipt, _pushError, _current3, _lastReceiptEffectId2, _lastStep2, _probeOnly, _establishedBase, _receiveState, _completeHistory, _lawProductsImported, _shallowMounted, _fetchedLawProducts, _beforeConverge, _needsReconciliation, _offerAfterConverge, _rebaseFrom, _rebases, _parkedLocal, _replaceLocalHead, _repairMissingCommit, _WorkspaceSyncWork_instances, openRound_fn, offerOrReconcile_fn, establishBase_fn, noCommonBase_fn, noCommonBaseResult_fn, holdsLocalWork_fn, pullBeforeOffer_fn, leaseEffect_fn, beginOffer_fn, acceptOffer_fn, acceptLease_fn, placementFrontier_fn, placementOnly_fn, acceptDiscovery_fn, providerCustody_fn, beginMainFetch_fn, acceptFetch_fn, mountFetched_fn, lawProductsAlongside_fn, acceptLawProducts_fn, providerCustodyMounted_fn, importLawProducts_fn, converge_fn2, unrelatedLineageRefusal_fn, replaceLocal_fn, converged_fn, offerAfterRebase_fn, preservedCopy_fn, alreadyJudged_fn, rememberJudgment_fn, forgetJudgment_fn, present_fn, finishOfferOutcome_fn, transportFailure_fn, remember_fn4, finish_fn2, cloudBase_fn, offerEndpoint_fn, workspaceEndpoint_fn, authToken_fn;
+  var _kernel16, _credentials4, _clock13, _mount, _binding, _route2, _rediscover, _reroute, _discoveredFrontier, _observePlacement, _recheckPlacement, _directoryAnswered, _placementFetched, _leased, _command2, _requestId4, _started, _state, _localHead, _offerHead, _previousHead, _pushMillis, _pushBytes, _desiredHead, _returnedPackHead, _candidateDurable, _admissionSummary, _offerReceipt, _pushError, _current3, _lastReceiptEffectId2, _lastStep2, _probeOnly, _establishedBase, _receiveState, _completeHistory, _lawProductsImported, _shallowMounted, _fetchedLawProducts, _beforeConverge, _needsReconciliation, _offerAfterConverge, _rebaseFrom, _rebases, _parkedLocal, _replaceLocalHead, _repairMissingCommit, _WorkspaceSyncWork_instances, openRound_fn, offerOrReconcile_fn, establishBase_fn, missingTrackedBase_fn, holdsLocalWork_fn, pullBeforeOffer_fn, leaseEffect_fn, beginOffer_fn, acceptOffer_fn, acceptLease_fn, placementFrontier_fn, placementOnly_fn, acceptDiscovery_fn, providerCustody_fn, beginMainFetch_fn, acceptFetch_fn, mountFetched_fn, lawProductsAlongside_fn, acceptLawProducts_fn, providerCustodyMounted_fn, importLawProducts_fn, converge_fn2, unrelatedLineageRefusal_fn, replaceLocal_fn, converged_fn, offerAfterRebase_fn, preservedCopy_fn, alreadyJudged_fn, rememberJudgment_fn, forgetJudgment_fn, present_fn, finishOfferOutcome_fn, transportFailure_fn, remember_fn4, finish_fn2, cloudBase_fn, offerEndpoint_fn, workspaceEndpoint_fn, authToken_fn;
   var WorkspaceSyncWork = class {
     constructor(args) {
       __privateAdd(this, _WorkspaceSyncWork_instances);
@@ -21781,7 +21818,6 @@
       __privateAdd(this, _rediscover);
       /** The route the directory's answer yields, recomputed once that answer is observed. */
       __privateAdd(this, _reroute);
-      __privateAdd(this, _placementFetch);
       __privateAdd(this, _discoveredFrontier);
       __privateAdd(this, _observePlacement);
       /** Ask the directory for the provider's current placement frontier this round although a
@@ -21790,19 +21826,14 @@
       __privateAdd(this, _directoryAnswered);
       __privateAdd(this, _placementFetched);
       /** A round which converged without leasing, finishing once placement alone is fetched. */
-      __privateAdd(this, _afterPlacement);
       __privateAdd(this, _leased, false);
-      __privateAdd(this, _lease);
       __privateAdd(this, _command2);
       __privateAdd(this, _requestId4);
       __privateAdd(this, _started);
-      __privateAdd(this, _phase2, WorkspaceSyncPhase.Lease);
+      __privateAdd(this, _state, { phase: WorkspaceSyncPhase.Idle });
       __privateAdd(this, _localHead);
       __privateAdd(this, _offerHead);
       __privateAdd(this, _previousHead);
-      __privateAdd(this, _fetchStarted);
-      __privateAdd(this, _offerStarted);
-      __privateAdd(this, _offerRequestId);
       __privateAdd(this, _pushMillis, 0);
       __privateAdd(this, _pushBytes, 0n);
       __privateAdd(this, _desiredHead);
@@ -21896,7 +21927,7 @@
         throw new Error(`replica '${__privateGet(this, _binding).replicaId}' has no custody remote`);
       }
       if (__privateGet(this, _rediscover) || __privateGet(this, _recheckPlacement) || !__privateGet(this, _route2)?.placementObserved && !__privateGet(this, _route2)?.placementFrontier && !__privateGet(this, _kernel16).resolveRef(__privateGet(this, _mount), __privateGet(this, _requestId4), PLACEMENT_REF3)) {
-        __privateSet(this, _phase2, WorkspaceSyncPhase.Discover);
+        __privateSet(this, _state, { phase: WorkspaceSyncPhase.Discover });
         return __privateMethod(this, _WorkspaceSyncWork_instances, remember_fn4).call(this, {
           case: "pending",
           value: create(CorrespondencePendingSchema, {
@@ -21930,24 +21961,26 @@
           `workspace sync '${this.workId}' expected effect '${expected}', received '${receipt.effectId}'`
         );
       }
+      const state = __privateGet(this, _state);
       const previousReceipt = __privateGet(this, _lastReceiptEffectId2);
       __privateSet(this, _lastReceiptEffectId2, receipt.effectId);
       try {
         if (receipt.outcome.case === "failure") {
-          if (__privateGet(this, _phase2) === WorkspaceSyncPhase.Discover) return __privateMethod(this, _WorkspaceSyncWork_instances, openRound_fn).call(this);
+          if (state.phase === WorkspaceSyncPhase.Discover) return __privateMethod(this, _WorkspaceSyncWork_instances, openRound_fn).call(this);
           return __privateMethod(this, _WorkspaceSyncWork_instances, transportFailure_fn).call(this, receipt.outcome.value.message, receipt.outcome.value.reason === PeerEffectFailureReason.OFFLINE);
         }
-        if (__privateGet(this, _phase2) === WorkspaceSyncPhase.Offer || __privateGet(this, _phase2) === WorkspaceSyncPhase.Probe) return __privateMethod(this, _WorkspaceSyncWork_instances, acceptOffer_fn).call(this, receipt);
-        if (__privateGet(this, _phase2) === WorkspaceSyncPhase.Lease) return __privateMethod(this, _WorkspaceSyncWork_instances, acceptLease_fn).call(this, receipt);
-        if (__privateGet(this, _phase2) === WorkspaceSyncPhase.Discover) return __privateMethod(this, _WorkspaceSyncWork_instances, acceptDiscovery_fn).call(this, receipt);
-        if (__privateGet(this, _phase2) === WorkspaceSyncPhase.Placement) {
-          if (!__privateGet(this, _placementFetch) || !__privateGet(this, _lease)) throw new Error("placement transfer lost its lease");
-          __privateGet(this, _placementFetch).accept(receipt);
+        if (state.phase === WorkspaceSyncPhase.Offer || state.phase === WorkspaceSyncPhase.Probe) {
+          return __privateMethod(this, _WorkspaceSyncWork_instances, acceptOffer_fn).call(this, receipt, state);
+        }
+        if (state.phase === WorkspaceSyncPhase.Lease) return __privateMethod(this, _WorkspaceSyncWork_instances, acceptLease_fn).call(this, receipt, state);
+        if (state.phase === WorkspaceSyncPhase.Discover) return __privateMethod(this, _WorkspaceSyncWork_instances, acceptDiscovery_fn).call(this, receipt);
+        if (state.phase === WorkspaceSyncPhase.Placement) {
+          state.transfer.accept(receipt);
           (_a = __privateGet(this, _placementFetched)) == null ? void 0 : _a.call(this);
-          if (__privateGet(this, _afterPlacement)) return __privateMethod(this, _WorkspaceSyncWork_instances, finish_fn2).call(this, __privateGet(this, _afterPlacement));
-          return __privateMethod(this, _WorkspaceSyncWork_instances, beginMainFetch_fn).call(this, __privateGet(this, _lease));
+          if (state.afterPlacement) return __privateMethod(this, _WorkspaceSyncWork_instances, finish_fn2).call(this, state.afterPlacement);
+          return __privateMethod(this, _WorkspaceSyncWork_instances, beginMainFetch_fn).call(this, state.lease);
         }
-        if (__privateGet(this, _phase2) === WorkspaceSyncPhase.Fetch) return __privateMethod(this, _WorkspaceSyncWork_instances, acceptFetch_fn).call(this, receipt);
+        if (state.phase === WorkspaceSyncPhase.Fetch) return __privateMethod(this, _WorkspaceSyncWork_instances, acceptFetch_fn).call(this, receipt, state);
         throw new Error(`workspace sync '${this.workId}' is already complete`);
       } catch (error) {
         __privateSet(this, _lastReceiptEffectId2, previousReceipt);
@@ -21963,25 +21996,19 @@
   _route2 = new WeakMap();
   _rediscover = new WeakMap();
   _reroute = new WeakMap();
-  _placementFetch = new WeakMap();
   _discoveredFrontier = new WeakMap();
   _observePlacement = new WeakMap();
   _recheckPlacement = new WeakMap();
   _directoryAnswered = new WeakMap();
   _placementFetched = new WeakMap();
-  _afterPlacement = new WeakMap();
   _leased = new WeakMap();
-  _lease = new WeakMap();
   _command2 = new WeakMap();
   _requestId4 = new WeakMap();
   _started = new WeakMap();
-  _phase2 = new WeakMap();
+  _state = new WeakMap();
   _localHead = new WeakMap();
   _offerHead = new WeakMap();
   _previousHead = new WeakMap();
-  _fetchStarted = new WeakMap();
-  _offerStarted = new WeakMap();
-  _offerRequestId = new WeakMap();
   _pushMillis = new WeakMap();
   _pushBytes = new WeakMap();
   _desiredHead = new WeakMap();
@@ -22012,13 +22039,13 @@
   openRound_fn = function() {
     if (__privateGet(this, _receiveState) || __privateGet(this, _replaceLocalHead) !== void 0) return __privateMethod(this, _WorkspaceSyncWork_instances, leaseEffect_fn).call(this);
     if (!__privateGet(this, _localHead)) return __privateMethod(this, _WorkspaceSyncWork_instances, leaseEffect_fn).call(this);
-    __privateSet(this, _offerRequestId, `${__privateGet(this, _binding).replicaId}:${__privateGet(this, _requestId4)}:${this.workId}:frontier`);
+    const requestId = `${__privateGet(this, _binding).replicaId}:${__privateGet(this, _requestId4)}:${this.workId}:frontier`;
     return __privateMethod(this, _WorkspaceSyncWork_instances, beginOffer_fn).call(this, encodeInlineCustodyOffer({
       session: __privateGet(this, _binding).replicaId,
-      requestId: __privateGet(this, _offerRequestId),
+      requestId,
       observedHead: __privateGet(this, _localHead),
       intents: []
-    }), true);
+    }), { case: "awaiting", requestId }, true);
   };
   offerOrReconcile_fn = function() {
     if (__privateGet(this, _command2).admit && __privateGet(this, _localHead) && __privateGet(this, _localHead) !== __privateGet(this, _previousHead)) {
@@ -22039,13 +22066,13 @@
         throw new Error(`kernel did not classify transport for intent '${unspecified.intentId}'`);
       }
       if (suffix.length > 0) {
-        __privateSet(this, _offerStarted, __privateGet(this, _clock13).monotonicNanoseconds());
-        __privateSet(this, _offerRequestId, `${__privateGet(this, _binding).replicaId}:${__privateGet(this, _requestId4)}:${this.workId}`);
+        const requestId2 = `${__privateGet(this, _binding).replicaId}:${__privateGet(this, _requestId4)}:${this.workId}`;
+        const startedAt = __privateGet(this, _clock13).monotonicNanoseconds();
         __privateSet(this, _offerAfterConverge, true);
         __privateSet(this, _rebaseFrom, __privateGet(this, _previousHead));
         return __privateMethod(this, _WorkspaceSyncWork_instances, beginOffer_fn).call(this, encodeInlineCustodyOffer({
           session: __privateGet(this, _binding).replicaId,
-          requestId: __privateGet(this, _offerRequestId),
+          requestId: requestId2,
           ...__privateGet(this, _previousHead) === void 0 ? {} : { baseHead: __privateGet(this, _previousHead) },
           observedHead: __privateGet(this, _localHead),
           intents: suffix,
@@ -22056,51 +22083,26 @@
             __privateGet(this, _previousHead)
           ) : void 0,
           fastForwardOnly: true
-        }));
+        }), { case: "awaiting", requestId: requestId2, startedAt });
       }
     }
-    __privateSet(this, _offerRequestId, `${__privateGet(this, _binding).replicaId}:${__privateGet(this, _requestId4)}:${this.workId}:reconcile`);
+    const requestId = `${__privateGet(this, _binding).replicaId}:${__privateGet(this, _requestId4)}:${this.workId}:reconcile`;
     return __privateMethod(this, _WorkspaceSyncWork_instances, beginOffer_fn).call(this, encodeInlineCustodyOffer({
       session: __privateGet(this, _binding).replicaId,
-      requestId: __privateGet(this, _offerRequestId),
+      requestId,
       baseHead: __privateGet(this, _previousHead),
       observedHead: __privateGet(this, _localHead),
       intents: []
-    }));
+    }), { case: "awaiting", requestId });
   };
   /**
-   * NO COMMON BASE — a round that cannot converge, and must not pay for history to find out.
-   *
-   * This replica holds a non-empty ledger but has never recorded a frontier its upstream
-   * confirmed (`refs/remotes/nomos/main` is absent). The kernel refuses convergence in that
-   * state ("a non-empty live ledger requires a common admitted base"), so every step after the
-   * O(1) frontier probe is wasted work — and it is not cheap waste: the fetch negotiates with
-   * no `have` (a full-history pack), and the dependency planner decodes EVERY intent from
-   * genesis and inspects every change, once per round. That is O(history) per follow round,
-   * repeated at every retry, for a round that can only end in a refusal.
-   *
-   * The one base this round can establish costs nothing and is established before this is
-   * asked: an upstream holding exactly this replica's head (the probe's answer) converges it
-   * and records the tracking frontier. Anything else needs the local copy to be dropped and
-   * refetched (an application decision, which preserves the copy), or a re-discovery that
-   * names a provider holding this lineage. Both are reported, at O(1), as this failure.
-   */
-  /**
-   * Establish this round's base when none is tracked, without walking any history it can avoid.
-   *
-   * The upstream just named its own frontier. If that commit is in THIS replica's lineage, it is
-   * a common admitted base by definition — both sides hold it — and adopting it turns the round
-   * into an ordinary fast-forward: the offer carries only the suffix above it, the fetch can name
-   * it as a truthful `have`, and convergence has the base the kernel requires. One commit walk
-   * (no change decoding, no pack, no network) decides it.
-   *
-   * If it is not in this replica's lineage, no base exists to establish and the round is refused
-   * (#noCommonBase) before it leases, fetches or plans anything.
-   *
-   * A kernel without the commit walk cannot be asked, so it keeps the previous behaviour.
+   * Establish a cheap base when the provider's current tip is in our local chain.
+   * A negative answer means the base is unknown: both sides may have advanced from
+   * an earlier shared commit. Acquire the candidate and let the kernel discover
+   * and judge that history. A tracking bookmark is not an admission prerequisite.
    */
   establishBase_fn = function(upstreamHead) {
-    if (!__privateMethod(this, _WorkspaceSyncWork_instances, noCommonBase_fn).call(this) || !__privateGet(this, _kernel16).historySummary) return true;
+    if (!__privateMethod(this, _WorkspaceSyncWork_instances, missingTrackedBase_fn).call(this) || !__privateGet(this, _kernel16).historySummary) return true;
     const summary = __privateGet(this, _kernel16).historySummary(__privateGet(this, _mount), __privateGet(this, _requestId4), upstreamHead, __privateGet(this, _localHead));
     if (!summary.reachedBase) return false;
     __privateSet(this, _previousHead, upstreamHead);
@@ -22110,26 +22112,9 @@
     }
     return true;
   };
-  noCommonBase_fn = function() {
+  missingTrackedBase_fn = function() {
     return __privateGet(this, _previousHead) === void 0 && __privateGet(this, _localHead) !== void 0 && __privateGet(this, _replaceLocalHead) === void 0;
   };
-  noCommonBaseResult_fn = function() {
-    return __privateMethod(this, _WorkspaceSyncWork_instances, finish_fn2).call(this, create(SyncWorkspaceResponseSchema, {
-      workspace: __privateGet(this, _mount).workspace,
-      ...__privateGet(this, _localHead) === void 0 ? {} : { currentHead: __privateGet(this, _localHead) },
-      stillAhead: true,
-      ...__privateGet(this, _offerReceipt) === void 0 ? {} : { offerReceipt: __privateGet(this, _offerReceipt) },
-      pushError: create(RuntimeTransportFailureSchema, {
-        endpoint: __privateMethod(this, _WorkspaceSyncWork_instances, offerEndpoint_fn).call(this),
-        status: 409,
-        refused: true,
-        message: NO_COMMON_BASE
-      }),
-      timings: create(SyncPhaseTimingsSchema, {
-        convergeMillis: elapsedMillis(__privateGet(this, _clock13), __privateGet(this, _started))
-      })
-    }));
-  };
   holdsLocalWork_fn = function() {
     return __privateGet(this, _command2).admit && !!__privateGet(this, _localHead) && __privateGet(this, _localHead) !== __privateGet(this, _previousHead);
   };
@@ -22137,18 +22122,18 @@
   pullBeforeOffer_fn = function() {
     __privateSet(this, _offerAfterConverge, true);
     __privateSet(this, _rebaseFrom, __privateGet(this, _previousHead));
-    __privateSet(this, _offerRequestId, `${__privateGet(this, _binding).replicaId}:${__privateGet(this, _requestId4)}:${this.workId}:pull-${__privateGet(this, _rebases)}`);
+    const requestId = `${__privateGet(this, _binding).replicaId}:${__privateGet(this, _requestId4)}:${this.workId}:pull-${__privateGet(this, _rebases)}`;
     return __privateMethod(this, _WorkspaceSyncWork_instances, beginOffer_fn).call(this, encodeInlineCustodyOffer({
       session: __privateGet(this, _binding).replicaId,
-      requestId: __privateGet(this, _offerRequestId),
+      requestId,
       ...__privateGet(this, _previousHead) === void 0 ? {} : { baseHead: __privateGet(this, _previousHead) },
       observedHead: __privateGet(this, _localHead),
       intents: []
-    }));
+    }), { case: "awaiting", requestId });
   };
-  leaseEffect_fn = function() {
+  leaseEffect_fn = function(afterPlacement) {
     const token = __privateMethod(this, _WorkspaceSyncWork_instances, authToken_fn).call(this);
-    __privateSet(this, _phase2, WorkspaceSyncPhase.Lease);
+    __privateSet(this, _state, { phase: WorkspaceSyncPhase.Lease, ...afterPlacement ? { afterPlacement } : {} });
     return __privateMethod(this, _WorkspaceSyncWork_instances, remember_fn4).call(this, {
       case: "pending",
       value: create(CorrespondencePendingSchema, {
@@ -22166,8 +22151,9 @@
       })
     });
   };
-  beginOffer_fn = function(body, probe = false) {
-    __privateSet(this, _phase2, probe ? WorkspaceSyncPhase.Probe : WorkspaceSyncPhase.Offer);
+  beginOffer_fn = function(body, exchange, probe = false) {
+    const phase = probe ? WorkspaceSyncPhase.Probe : WorkspaceSyncPhase.Offer;
+    __privateSet(this, _state, { phase, exchange });
     const token = __privateMethod(this, _WorkspaceSyncWork_instances, authToken_fn).call(this);
     __privateSet(this, _pushBytes, __privateGet(this, _pushBytes) + BigInt(body.byteLength));
     return __privateMethod(this, _WorkspaceSyncWork_instances, remember_fn4).call(this, {
@@ -22177,7 +22163,7 @@
         effect: {
           case: "http",
           value: create(PeerHttpEffectSchema, {
-            effectId: `${this.workId}:${__privateGet(this, _phase2)}`,
+            effectId: `${this.workId}:${phase}`,
             method: PeerHttpMethod.POST,
             url: __privateMethod(this, _WorkspaceSyncWork_instances, offerEndpoint_fn).call(this),
             contentType: CUSTODY_OFFER_MEDIA_TYPE,
@@ -22194,28 +22180,30 @@
       })
     });
   };
-  acceptOffer_fn = function(receipt) {
-    __privateSet(this, _pushMillis, __privateGet(this, _offerStarted) === void 0 ? 0 : elapsedMillis(__privateGet(this, _clock13), __privateGet(this, _offerStarted)));
+  acceptOffer_fn = function(receipt, state) {
+    const exchange = state.exchange;
+    __privateSet(this, _pushMillis, exchange.startedAt === void 0 ? 0 : elapsedMillis(__privateGet(this, _clock13), exchange.startedAt));
     if (receipt.outcome.case !== "response") {
       throw new Error("platform returned the wrong receipt for a custody offer");
     }
-    const response = receipt.outcome.value;
-    if (!response.contentType?.includes(CUSTODY_OFFER_RESULT_MEDIA_TYPE)) {
+    const outcome = settleCustodyOfferExchange(exchange, receipt.outcome.value);
+    if (outcome.case === "maintenance") {
+      return __privateMethod(this, _WorkspaceSyncWork_instances, finishOfferOutcome_fn).call(this, true, false);
+    }
+    if (outcome.case === "unexpected") {
       __privateSet(this, _pushError, create(RuntimeTransportFailureSchema, {
         endpoint: __privateMethod(this, _WorkspaceSyncWork_instances, offerEndpoint_fn).call(this),
-        status: response.status,
+        status: outcome.status,
         refused: false,
-        message: `Sync received an unexpected server response (HTTP ${response.status}; ${response.contentType || "no content type"}). No custody receipt was returned.`
+        message: `Sync received an unexpected server response (HTTP ${outcome.status}; ${outcome.contentType || "no content type"}). No custody receipt was returned.`
       }));
       return __privateMethod(this, _WorkspaceSyncWork_instances, finishOfferOutcome_fn).call(this, false);
     }
-    if (!__privateGet(this, _offerRequestId)) throw new Error("custody offer has no request identity");
-    const outcome = decodeCustodyOffer(response.body, __privateGet(this, _offerRequestId));
-    __privateSet(this, _offerReceipt, custodyOfferReceipt(__privateGet(this, _offerRequestId), outcome));
+    __privateSet(this, _offerReceipt, outcome.receipt);
     if (outcome.case === "failure") {
       __privateSet(this, _pushError, create(RuntimeTransportFailureSchema, {
         endpoint: __privateMethod(this, _WorkspaceSyncWork_instances, offerEndpoint_fn).call(this),
-        status: response.status,
+        status: outcome.status,
         refused: false,
         message: `${outcome.value.code}: ${outcome.value.message}`
       }));
@@ -22224,12 +22212,12 @@
     if (outcome.case === "blocked") {
       return __privateMethod(this, _WorkspaceSyncWork_instances, finishOfferOutcome_fn).call(this, true);
     }
-    if (response.status < 200 || response.status >= 300) {
+    if (outcome.status < 200 || outcome.status >= 300) {
       __privateSet(this, _pushError, create(RuntimeTransportFailureSchema, {
         endpoint: __privateMethod(this, _WorkspaceSyncWork_instances, offerEndpoint_fn).call(this),
-        status: response.status,
-        refused: response.status === 422,
-        message: `custody offer returned an admission verdict with HTTP ${response.status}`
+        status: outcome.status,
+        refused: outcome.status === 422,
+        message: `custody offer returned an admission verdict with HTTP ${outcome.status}`
       }));
       return __privateMethod(this, _WorkspaceSyncWork_instances, finishOfferOutcome_fn).call(this, false);
     }
@@ -22237,8 +22225,7 @@
     __privateSet(this, _desiredHead, admission.main || void 0);
     if (!__privateGet(this, _desiredHead)) return __privateMethod(this, _WorkspaceSyncWork_instances, transportFailure_fn).call(this, "resident peer returned no admitted frontier", false);
     __privateSet(this, _candidateDurable, admission.sealedMain === __privateGet(this, _desiredHead));
-    if (__privateGet(this, _phase2) === WorkspaceSyncPhase.Probe && __privateGet(this, _desiredHead) !== __privateGet(this, _localHead)) {
-      if (!__privateMethod(this, _WorkspaceSyncWork_instances, establishBase_fn).call(this, __privateGet(this, _desiredHead))) return __privateMethod(this, _WorkspaceSyncWork_instances, noCommonBaseResult_fn).call(this);
+    if (state.phase === WorkspaceSyncPhase.Probe && __privateGet(this, _desiredHead) !== __privateGet(this, _localHead)) {
       if (__privateMethod(this, _WorkspaceSyncWork_instances, alreadyJudged_fn).call(this, __privateGet(this, _desiredHead))) {
         return __privateMethod(this, _WorkspaceSyncWork_instances, finish_fn2).call(this, create(SyncWorkspaceResponseSchema, {
           workspace: __privateGet(this, _mount).workspace,
@@ -22250,6 +22237,22 @@
           offerReceipt: __privateGet(this, _offerReceipt)
         }));
       }
+      if (!__privateMethod(this, _WorkspaceSyncWork_instances, establishBase_fn).call(this, __privateGet(this, _desiredHead))) {
+        __privateSet(this, _offerAfterConverge, __privateGet(this, _command2).admit);
+        __privateSet(this, _rebaseFrom, void 0);
+        return __privateMethod(this, _WorkspaceSyncWork_instances, leaseEffect_fn).call(this);
+      }
+      if (__privateGet(this, _establishedBase) && !__privateGet(this, _candidateDurable) && __privateGet(this, _kernel16).resolveRef(__privateGet(this, _mount), __privateGet(this, _requestId4), trackedMain) === void 0) {
+        return __privateMethod(this, _WorkspaceSyncWork_instances, finish_fn2).call(this, create(SyncWorkspaceResponseSchema, {
+          workspace: __privateGet(this, _mount).workspace,
+          currentHead: __privateGet(this, _localHead),
+          previousHead: __privateGet(this, _previousHead),
+          stillAhead: true,
+          directOfferDeferred: true,
+          reconnectRequired: false,
+          offerReceipt: __privateGet(this, _offerReceipt)
+        }));
+      }
       if (__privateGet(this, _probeOnly)) {
         __privateSet(this, _needsReconciliation, true);
         return __privateMethod(this, _WorkspaceSyncWork_instances, finish_fn2).call(this, create(SyncWorkspaceResponseSchema, {
@@ -22295,11 +22298,11 @@
       return __privateMethod(this, _WorkspaceSyncWork_instances, converge_fn2).call(this, __privateGet(this, _desiredHead), admission.resultPack.byteLength, 0);
     }
     if (__privateGet(this, _desiredHead) === __privateGet(this, _previousHead)) return __privateMethod(this, _WorkspaceSyncWork_instances, converge_fn2).call(this, __privateGet(this, _desiredHead), 0, 0);
-    if (!__privateMethod(this, _WorkspaceSyncWork_instances, establishBase_fn).call(this, __privateGet(this, _desiredHead))) return __privateMethod(this, _WorkspaceSyncWork_instances, noCommonBaseResult_fn).call(this);
+    __privateMethod(this, _WorkspaceSyncWork_instances, establishBase_fn).call(this, __privateGet(this, _desiredHead));
     if (admission.recoveryRequired !== false) return __privateMethod(this, _WorkspaceSyncWork_instances, leaseEffect_fn).call(this);
     return __privateMethod(this, _WorkspaceSyncWork_instances, transportFailure_fn).call(this, "resident peer supplied neither the missing delta nor a history gap", false);
   };
-  acceptLease_fn = function(receipt) {
+  acceptLease_fn = function(receipt, state) {
     if (receipt.outcome.case !== "response") {
       throw new Error("platform returned the wrong receipt for a Git read lease");
     }
@@ -22311,21 +22314,25 @@
     __privateSet(this, _leased, true);
     const frontier = __privateMethod(this, _WorkspaceSyncWork_instances, placementFrontier_fn).call(this);
     if (frontier) {
-      __privateSet(this, _placementFetch, new PlacementFetch(
+      const transfer = new PlacementFetch(
         __privateGet(this, _kernel16),
         __privateGet(this, _mount),
         __privateGet(this, _requestId4),
         this.workId,
         frontier
-      ));
-      const pending = __privateGet(this, _placementFetch).start(lease);
+      );
+      const pending = transfer.start(lease);
       if (pending) {
-        __privateSet(this, _phase2, WorkspaceSyncPhase.Placement);
-        __privateSet(this, _lease, lease);
+        __privateSet(this, _state, {
+          phase: WorkspaceSyncPhase.Placement,
+          transfer,
+          lease,
+          ...state.afterPlacement ? { afterPlacement: state.afterPlacement } : {}
+        });
         return __privateMethod(this, _WorkspaceSyncWork_instances, remember_fn4).call(this, { case: "pending", value: pending });
       }
     }
-    if (__privateGet(this, _afterPlacement)) return __privateMethod(this, _WorkspaceSyncWork_instances, finish_fn2).call(this, __privateGet(this, _afterPlacement));
+    if (state.afterPlacement) return __privateMethod(this, _WorkspaceSyncWork_instances, finish_fn2).call(this, state.afterPlacement);
     return __privateMethod(this, _WorkspaceSyncWork_instances, beginMainFetch_fn).call(this, lease);
   };
   /** The provider's placement frontier as this round knows it: what the directory named in this
@@ -22345,8 +22352,7 @@
     if (!new PlacementFetch(__privateGet(this, _kernel16), __privateGet(this, _mount), __privateGet(this, _requestId4), this.workId, frontier).wanted()) {
       return void 0;
     }
-    __privateSet(this, _afterPlacement, presented);
-    return __privateMethod(this, _WorkspaceSyncWork_instances, leaseEffect_fn).call(this);
+    return __privateMethod(this, _WorkspaceSyncWork_instances, leaseEffect_fn).call(this, presented);
   };
   acceptDiscovery_fn = function(receipt) {
     var _a, _b;
@@ -22371,9 +22377,11 @@
     return __privateGet(this, _replaceLocalHead) !== void 0 || __privateGet(this, _localHead) === void 0 && __privateGet(this, _previousHead) === void 0;
   };
   beginMainFetch_fn = function(lease) {
-    __privateSet(this, _phase2, WorkspaceSyncPhase.Fetch);
     const lawProducts = __privateMethod(this, _WorkspaceSyncWork_instances, lawProductsAlongside_fn).call(this);
-    __privateSet(this, _fetchStarted, __privateGet(this, _clock13).monotonicNanoseconds());
+    __privateSet(this, _state, {
+      phase: WorkspaceSyncPhase.Fetch,
+      startedAt: __privateGet(this, _clock13).monotonicNanoseconds()
+    });
     const haves = __privateGet(this, _replaceLocalHead) !== void 0 ? __privateGet(this, _repairMissingCommit) ? [] : [__privateGet(this, _kernel16).resolveRef(__privateGet(this, _mount), __privateGet(this, _requestId4), deferredRemote)].filter(
       (head) => !!head
     ) : [...new Set([
@@ -22404,7 +22412,7 @@
       })
     });
   };
-  acceptFetch_fn = function(receipt) {
+  acceptFetch_fn = function(receipt, state) {
     if (receipt.outcome.case !== "gitFetch") {
       throw new Error("platform returned the wrong receipt for a Git object fetch");
     }
@@ -22414,7 +22422,7 @@
     if (fetched.pack.byteLength > 0) {
       __privateGet(this, _kernel16).applyPack(__privateGet(this, _mount), __privateGet(this, _requestId4), fetched.pack, fetched.head, fetched.shallow);
     }
-    const prefetchMillis = __privateGet(this, _fetchStarted) === void 0 ? 0 : elapsedMillis(__privateGet(this, _clock13), __privateGet(this, _fetchStarted));
+    const prefetchMillis = elapsedMillis(__privateGet(this, _clock13), state.startedAt);
     const candidateHead = __privateGet(this, _receiveState) ? __privateGet(this, _kernel16).resolveStatePosition?.(__privateGet(this, _mount), __privateGet(this, _requestId4), fetched.head, __privateGet(this, _receiveState)) : fetched.head;
     if (!candidateHead) {
       return __privateMethod(this, _WorkspaceSyncWork_instances, finish_fn2).call(this, create(SyncWorkspaceResponseSchema, {
@@ -22504,7 +22512,7 @@
   };
   converge_fn2 = function(candidateHead, receivedBytes, prefetchMillis) {
     var _a;
-    if (!__privateMethod(this, _WorkspaceSyncWork_instances, establishBase_fn).call(this, candidateHead)) return __privateMethod(this, _WorkspaceSyncWork_instances, noCommonBaseResult_fn).call(this);
+    __privateMethod(this, _WorkspaceSyncWork_instances, establishBase_fn).call(this, candidateHead);
     (_a = __privateGet(this, _beforeConverge)) == null ? void 0 : _a.call(this, candidateHead, __privateGet(this, _previousHead));
     const convergeStarted = __privateGet(this, _clock13).monotonicNanoseconds();
     let judged;
@@ -22739,11 +22747,11 @@
         pushBytes: __privateGet(this, _pushBytes),
         pullBytes: BigInt(receivedBytes),
         serverMillis: __privateGet(this, _admissionSummary)?.serverMillis ?? 0,
-        offerInPush: __privateGet(this, _offerRequestId) !== void 0
+        offerInPush: __privateGet(this, _pushBytes) > 0n
       })
     });
   };
-  finishOfferOutcome_fn = function(blocked) {
+  finishOfferOutcome_fn = function(blocked, reconnectRequired = true) {
     return __privateMethod(this, _WorkspaceSyncWork_instances, finish_fn2).call(this, create(SyncWorkspaceResponseSchema, {
       workspace: __privateGet(this, _mount).workspace,
       previousHead: __privateGet(this, _previousHead),
@@ -22751,7 +22759,7 @@
       admitted: BigInt(__privateGet(this, _admissionSummary)?.admittedIntentIds.length ?? 0),
       refused: BigInt((__privateGet(this, _admissionSummary)?.refusedMessages.length ?? 0) + __privateGet(this, _parkedLocal)),
       deferred: BigInt(__privateGet(this, _admissionSummary) ? __privateGet(this, _admissionSummary).blockedMessages.length + __privateGet(this, _admissionSummary).deadLetteredMessages.length + __privateGet(this, _admissionSummary).quarantinedMessages.length + __privateGet(this, _admissionSummary).deferredMessages.length : blocked ? 1 : 0),
-      reconnectRequired: true,
+      reconnectRequired,
       stillAhead: __privateGet(this, _localHead) !== __privateGet(this, _previousHead),
       directOfferDeferred: blocked,
       offerReceipt: __privateGet(this, _offerReceipt),
@@ -22765,15 +22773,16 @@
     }));
   };
   transportFailure_fn = function(message, offline, status = -1) {
-    const pushFailed = __privateGet(this, _phase2) === WorkspaceSyncPhase.Offer;
+    const state = __privateGet(this, _state);
+    const pushFailed = state.phase === WorkspaceSyncPhase.Offer;
     const failedEndpoint = __privateMethod(this, _WorkspaceSyncWork_instances, offerEndpoint_fn).call(this);
     const failure = create(RuntimeTransportFailureSchema, {
       endpoint: pushFailed ? failedEndpoint : __privateGet(this, _binding).cloud ?? "",
       status,
       message
     });
-    if (pushFailed) {
-      __privateSet(this, _pushMillis, __privateGet(this, _offerStarted) === void 0 ? 0 : elapsedMillis(__privateGet(this, _clock13), __privateGet(this, _offerStarted)));
+    if (state.phase === WorkspaceSyncPhase.Offer) {
+      __privateSet(this, _pushMillis, state.exchange.startedAt === void 0 ? 0 : elapsedMillis(__privateGet(this, _clock13), state.exchange.startedAt));
       __privateSet(this, _pushError, failure);
     }
     return __privateMethod(this, _WorkspaceSyncWork_instances, finish_fn2).call(this, create(SyncWorkspaceResponseSchema, {
@@ -22790,7 +22799,7 @@
         pushMillis: __privateGet(this, _pushMillis),
         pushBytes: __privateGet(this, _pushBytes),
         prefetchMillis: elapsedMillis(__privateGet(this, _clock13), __privateGet(this, _started)),
-        offerInPush: __privateGet(this, _offerRequestId) !== void 0
+        offerInPush: __privateGet(this, _pushBytes) > 0n
       })
     }));
   };
@@ -22800,7 +22809,7 @@
     return step;
   };
   finish_fn2 = function(value) {
-    __privateSet(this, _phase2, WorkspaceSyncPhase.Done);
+    __privateSet(this, _state, { phase: WorkspaceSyncPhase.Done });
     __privateSet(this, _current3, void 0);
     return __privateMethod(this, _WorkspaceSyncWork_instances, remember_fn4).call(this, { case: "synced", value });
   };
@@ -23226,7 +23235,7 @@
     millis: 150,
     quanta: 64
   });
-  var _command3, _source3, _target2, _checkpointSecret, _clock15, _kernel17, _requestId5, _phase3, _offers, _attempted2, _delivered, _refused, _retryable, _lastRetry, _recipientRefused, _activeOffer, _nextDueAtMillis, _appliedThisTurn, _preparationPending, _targetHead, _sourceOutcomeRecorded, _budget, _turnStartedMillis, _quanta, _WorkspaceEffectDelivery_instances, retry_fn2, outboxCall_fn, acceptOutbox_fn, acceptApply_fn, nextApplyOrDone_fn;
+  var _command3, _source3, _target2, _checkpointSecret, _clock15, _kernel17, _requestId5, _phase2, _offers, _attempted2, _delivered, _refused, _retryable, _lastRetry, _recipientRefused, _activeOffer, _nextDueAtMillis, _appliedThisTurn, _preparationPending, _targetHead, _sourceOutcomeRecorded, _budget, _turnStartedMillis, _quanta, _WorkspaceEffectDelivery_instances, retry_fn2, outboxCall_fn, acceptOutbox_fn, acceptApply_fn, nextApplyOrDone_fn;
   var WorkspaceEffectDelivery = class {
     constructor(args) {
       __privateAdd(this, _WorkspaceEffectDelivery_instances);
@@ -23237,7 +23246,7 @@
       __privateAdd(this, _clock15);
       __privateAdd(this, _kernel17);
       __privateAdd(this, _requestId5);
-      __privateAdd(this, _phase3, WorkspaceEffectDeliveryPhase.Start);
+      __privateAdd(this, _phase2, WorkspaceEffectDeliveryPhase.Start);
       __privateAdd(this, _offers, []);
       __privateAdd(this, _attempted2, 0n);
       __privateAdd(this, _delivered, 0n);
@@ -23272,17 +23281,17 @@
       return __privateGet(this, _recipientRefused);
     }
     next(response, settlement) {
-      if (__privateGet(this, _phase3) === WorkspaceEffectDeliveryPhase.Start) {
+      if (__privateGet(this, _phase2) === WorkspaceEffectDeliveryPhase.Start) {
         if (response !== void 0) throw new Error("delivery received a response before its outbox call");
         __privateSet(this, _turnStartedMillis, __privateGet(this, _clock15).currentMillis());
         return __privateMethod(this, _WorkspaceEffectDelivery_instances, outboxCall_fn).call(this);
       }
-      if (__privateGet(this, _phase3) === WorkspaceEffectDeliveryPhase.Outbox) {
+      if (__privateGet(this, _phase2) === WorkspaceEffectDeliveryPhase.Outbox) {
         if (!response) throw new Error("delivery requires the source outbox response");
         if (__privateMethod(this, _WorkspaceEffectDelivery_instances, acceptOutbox_fn).call(this, response)) return __privateMethod(this, _WorkspaceEffectDelivery_instances, outboxCall_fn).call(this);
         return __privateMethod(this, _WorkspaceEffectDelivery_instances, nextApplyOrDone_fn).call(this);
       }
-      if (__privateGet(this, _phase3) === WorkspaceEffectDeliveryPhase.Apply) {
+      if (__privateGet(this, _phase2) === WorkspaceEffectDeliveryPhase.Apply) {
         if (!response) throw new Error("delivery requires the target admission response");
         __privateMethod(this, _WorkspaceEffectDelivery_instances, acceptApply_fn).call(this, response, settlement);
         return __privateMethod(this, _WorkspaceEffectDelivery_instances, nextApplyOrDone_fn).call(this);
@@ -23297,7 +23306,7 @@
   _clock15 = new WeakMap();
   _kernel17 = new WeakMap();
   _requestId5 = new WeakMap();
-  _phase3 = new WeakMap();
+  _phase2 = new WeakMap();
   _offers = new WeakMap();
   _attempted2 = new WeakMap();
   _delivered = new WeakMap();
@@ -23320,7 +23329,7 @@
     __privateSet(this, _lastRetry, { reason, detail: detail.slice(0, RETRY_DETAIL_CHARACTERS) });
   };
   outboxCall_fn = function() {
-    __privateSet(this, _phase3, WorkspaceEffectDeliveryPhase.Outbox);
+    __privateSet(this, _phase2, WorkspaceEffectDeliveryPhase.Outbox);
     return {
       case: "call",
       value: {
@@ -23362,13 +23371,13 @@
       }
       __privateSet(this, _nextDueAtMillis, now);
       __privateSet(this, _preparationPending, true);
-      __privateSet(this, _phase3, WorkspaceEffectDeliveryPhase.Apply);
+      __privateSet(this, _phase2, WorkspaceEffectDeliveryPhase.Apply);
       return false;
     }
     __privateSet(this, _offers, response.outcome.value.offers.filter(
       (offer) => offer.route.case === "workspaceRoute" && offer.route.value.workspace === __privateGet(this, _target2).workspace && (__privateGet(this, _command3).sourceCommit === void 0 || offer.sourceCommit === __privateGet(this, _command3).sourceCommit)
     ));
-    __privateSet(this, _phase3, WorkspaceEffectDeliveryPhase.Apply);
+    __privateSet(this, _phase2, WorkspaceEffectDeliveryPhase.Apply);
     return false;
   };
   acceptApply_fn = function(response, settlement) {
@@ -23460,7 +23469,7 @@
         }
       };
     }
-    __privateSet(this, _phase3, WorkspaceEffectDeliveryPhase.Done);
+    __privateSet(this, _phase2, WorkspaceEffectDeliveryPhase.Done);
     return {
       case: "done",
       value: create(WorkspaceEffectsDeliveredSchema, {
@@ -25068,13 +25077,21 @@
   };
   observeSyncResult_fn = function(requestId, workId2, result) {
     const timings = result.timings;
+    const receipt = result.offerReceipt?.outcome;
+    const admission = receipt?.case === "admission" ? receipt.value : void 0;
     __privateGet(this, _events4).instant("peer.follow.sync-result", {
       request: create(RuntimeRequestSchema, { protocolVersion: 2, requestId }),
       workspace: result.workspace
     }, {
       "sync.workId": workId2,
       ...result.currentHead ? { "sync.head": result.currentHead } : {},
+      ...result.previousHead ? { "sync.previousHead": result.previousHead } : {},
+      ...admission?.main ? { "sync.providerHead": admission.main } : {},
+      ...admission?.sealedMain ? { "sync.sealedHead": admission.sealedMain } : {},
       "sync.stillAhead": result.stillAhead,
+      "sync.reconnectRequired": result.reconnectRequired,
+      "sync.refused": result.refused,
+      "sync.deferred": result.deferred,
       "sync.directOfferDeferred": result.directOfferDeferred,
       "sync.offline": result.offline,
       ...timings ? {