githolon 0.110.0 → 0.111.0

package/dist/dev-server.mjs

@@ -12175,6 +12175,15 @@ var ReplicaFollowController = class {
     }
     if (result.stillAhead || result.pushFailed || result.directOfferDeferred || result.reconnectRequired) {
       if (result.directOfferDeferred) {
+        if (!result.reconnectRequired) {
+          this.#desk.transition(result.workspace, {
+            case: ReplicaFollowEventKind.Failed,
+            nowUnixMillis,
+            failure: "remote workspace opening; retrying",
+            retryWithinMillis: 5e3
+          });
+          return delayUntilDue(this.#desk.get(result.workspace), nowUnixMillis);
+        }
         this.#desk.transition(result.workspace, {
           case: ReplicaFollowEventKind.DependencyDeferred,
           nowUnixMillis,
@@ -14076,6 +14085,34 @@ function resolveCustodyDisagreement(kernel, mount, requestId, policy, verdict) {
 import { create as create58, fromBinary as fromBinary23, toBinary as toBinary22 } from "@bufbuild/protobuf";
 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 toBinary22(CustodyOfferBatchRequestSchema, create58(CustodyOfferBatchRequestSchema, {
     protocolVersion: 2,
@@ -14202,6 +14239,7 @@ function summarizeCustodyAdmission(admission) {
 var PLACEMENT_REF4 = "refs/nomos/placement";
 var LAW_PRODUCTS_MEDIA_TYPE2 = "application/vnd.nomos.export-law-products-response+protobuf";
 var WorkspaceSyncPhase = Object.freeze({
+  Idle: "idle",
   Probe: "probe",
   Offer: "offer",
   Lease: "lease",
@@ -14211,7 +14249,6 @@ var WorkspaceSyncPhase = Object.freeze({
   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();
@@ -14235,7 +14272,6 @@ var WorkspaceSyncWork = class {
   #rediscover;
   /** The route the directory's answer yields, recomputed once that answer is observed. */
   #reroute;
-  #placementFetch;
   #discoveredFrontier;
   #observePlacement;
   /** Ask the directory for the provider's current placement frontier this round although a
@@ -14244,19 +14280,14 @@ var WorkspaceSyncWork = class {
   #directoryAnswered;
   #placementFetched;
   /** A round which converged without leasing, finishing once placement alone is fetched. */
-  #afterPlacement;
   #leased = false;
-  #lease;
   #command;
   #requestId;
   #started;
-  #phase = WorkspaceSyncPhase.Lease;
+  #state = { phase: WorkspaceSyncPhase.Idle };
   #localHead;
   #offerHead;
   #previousHead;
-  #fetchStarted;
-  #offerStarted;
-  #offerRequestId;
   #pushMillis = 0;
   #pushBytes = 0n;
   #desiredHead;
@@ -14351,7 +14382,7 @@ var WorkspaceSyncWork = class {
       throw new Error(`replica '${this.#binding.replicaId}' has no custody remote`);
     }
     if (this.#rediscover || this.#recheckPlacement || !this.#route?.placementObserved && !this.#route?.placementFrontier && !this.#kernel.resolveRef(this.#mount, this.#requestId, PLACEMENT_REF4)) {
-      this.#phase = WorkspaceSyncPhase.Discover;
+      this.#state = { phase: WorkspaceSyncPhase.Discover };
       return this.#remember({
         case: "pending",
         value: create59(CorrespondencePendingSchema, {
@@ -14371,13 +14402,13 @@ var WorkspaceSyncWork = class {
   #openRound() {
     if (this.#receiveState || this.#replaceLocalHead !== void 0) return this.#leaseEffect();
     if (!this.#localHead) return this.#leaseEffect();
-    this.#offerRequestId = `${this.#binding.replicaId}:${this.#requestId}:${this.workId}:frontier`;
+    const requestId = `${this.#binding.replicaId}:${this.#requestId}:${this.workId}:frontier`;
     return this.#beginOffer(encodeInlineCustodyOffer({
       session: this.#binding.replicaId,
-      requestId: this.#offerRequestId,
+      requestId,
       observedHead: this.#localHead,
       intents: []
-    }), true);
+    }), { case: "awaiting", requestId }, true);
   }
   #offerOrReconcile() {
     if (this.#command.admit && this.#localHead && this.#localHead !== this.#previousHead) {
@@ -14398,13 +14429,13 @@ var WorkspaceSyncWork = class {
         throw new Error(`kernel did not classify transport for intent '${unspecified.intentId}'`);
       }
       if (suffix.length > 0) {
-        this.#offerStarted = this.#clock.monotonicNanoseconds();
-        this.#offerRequestId = `${this.#binding.replicaId}:${this.#requestId}:${this.workId}`;
+        const requestId2 = `${this.#binding.replicaId}:${this.#requestId}:${this.workId}`;
+        const startedAt = this.#clock.monotonicNanoseconds();
         this.#offerAfterConverge = true;
         this.#rebaseFrom = this.#previousHead;
         return this.#beginOffer(encodeInlineCustodyOffer({
           session: this.#binding.replicaId,
-          requestId: this.#offerRequestId,
+          requestId: requestId2,
           ...this.#previousHead === void 0 ? {} : { baseHead: this.#previousHead },
           observedHead: this.#localHead,
           intents: suffix,
@@ -14415,51 +14446,26 @@ var WorkspaceSyncWork = class {
             this.#previousHead
           ) : void 0,
           fastForwardOnly: true
-        }));
+        }), { case: "awaiting", requestId: requestId2, startedAt });
       }
     }
-    this.#offerRequestId = `${this.#binding.replicaId}:${this.#requestId}:${this.workId}:reconcile`;
+    const requestId = `${this.#binding.replicaId}:${this.#requestId}:${this.workId}:reconcile`;
     return this.#beginOffer(encodeInlineCustodyOffer({
       session: this.#binding.replicaId,
-      requestId: this.#offerRequestId,
+      requestId,
       baseHead: this.#previousHead,
       observedHead: 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(upstreamHead) {
-    if (!this.#noCommonBase() || !this.#kernel.historySummary) return true;
+    if (!this.#missingTrackedBase() || !this.#kernel.historySummary) return true;
     const summary = this.#kernel.historySummary(this.#mount, this.#requestId, upstreamHead, this.#localHead);
     if (!summary.reachedBase) return false;
     this.#previousHead = upstreamHead;
@@ -14474,26 +14480,9 @@ var WorkspaceSyncWork = class {
   get establishedBase() {
     return this.#establishedBase;
   }
-  #noCommonBase() {
+  #missingTrackedBase() {
     return this.#previousHead === void 0 && this.#localHead !== void 0 && this.#replaceLocalHead === void 0;
   }
-  #noCommonBaseResult() {
-    return this.#finish(create59(SyncWorkspaceResponseSchema, {
-      workspace: this.#mount.workspace,
-      ...this.#localHead === void 0 ? {} : { currentHead: this.#localHead },
-      stillAhead: true,
-      ...this.#offerReceipt === void 0 ? {} : { offerReceipt: this.#offerReceipt },
-      pushError: create59(RuntimeTransportFailureSchema, {
-        endpoint: this.#offerEndpoint(),
-        status: 409,
-        refused: true,
-        message: NO_COMMON_BASE
-      }),
-      timings: create59(SyncPhaseTimingsSchema, {
-        convergeMillis: elapsedMillis(this.#clock, this.#started)
-      })
-    }));
-  }
   #holdsLocalWork() {
     return this.#command.admit && !!this.#localHead && this.#localHead !== this.#previousHead;
   }
@@ -14501,18 +14490,18 @@ var WorkspaceSyncWork = class {
   #pullBeforeOffer() {
     this.#offerAfterConverge = true;
     this.#rebaseFrom = this.#previousHead;
-    this.#offerRequestId = `${this.#binding.replicaId}:${this.#requestId}:${this.workId}:pull-${this.#rebases}`;
+    const requestId = `${this.#binding.replicaId}:${this.#requestId}:${this.workId}:pull-${this.#rebases}`;
     return this.#beginOffer(encodeInlineCustodyOffer({
       session: this.#binding.replicaId,
-      requestId: this.#offerRequestId,
+      requestId,
       ...this.#previousHead === void 0 ? {} : { baseHead: this.#previousHead },
       observedHead: this.#localHead,
       intents: []
-    }));
+    }), { case: "awaiting", requestId });
   }
-  #leaseEffect() {
+  #leaseEffect(afterPlacement) {
     const token = this.#authToken();
-    this.#phase = WorkspaceSyncPhase.Lease;
+    this.#state = { phase: WorkspaceSyncPhase.Lease, ...afterPlacement ? { afterPlacement } : {} };
     return this.#remember({
       case: "pending",
       value: create59(CorrespondencePendingSchema, {
@@ -14541,35 +14530,38 @@ var WorkspaceSyncWork = class {
         `workspace sync '${this.workId}' expected effect '${expected}', received '${receipt.effectId}'`
       );
     }
+    const state = this.#state;
     const previousReceipt = this.#lastReceiptEffectId;
     this.#lastReceiptEffectId = receipt.effectId;
     try {
       if (receipt.outcome.case === "failure") {
-        if (this.#phase === WorkspaceSyncPhase.Discover) return this.#openRound();
+        if (state.phase === WorkspaceSyncPhase.Discover) return this.#openRound();
         return this.#transportFailure(
           receipt.outcome.value.message,
           receipt.outcome.value.reason === PeerEffectFailureReason.OFFLINE
         );
       }
-      if (this.#phase === WorkspaceSyncPhase.Offer || this.#phase === WorkspaceSyncPhase.Probe) return this.#acceptOffer(receipt);
-      if (this.#phase === WorkspaceSyncPhase.Lease) return this.#acceptLease(receipt);
-      if (this.#phase === WorkspaceSyncPhase.Discover) return this.#acceptDiscovery(receipt);
-      if (this.#phase === WorkspaceSyncPhase.Placement) {
-        if (!this.#placementFetch || !this.#lease) throw new Error("placement transfer lost its lease");
-        this.#placementFetch.accept(receipt);
+      if (state.phase === WorkspaceSyncPhase.Offer || state.phase === WorkspaceSyncPhase.Probe) {
+        return this.#acceptOffer(receipt, state);
+      }
+      if (state.phase === WorkspaceSyncPhase.Lease) return this.#acceptLease(receipt, state);
+      if (state.phase === WorkspaceSyncPhase.Discover) return this.#acceptDiscovery(receipt);
+      if (state.phase === WorkspaceSyncPhase.Placement) {
+        state.transfer.accept(receipt);
         this.#placementFetched?.();
-        if (this.#afterPlacement) return this.#finish(this.#afterPlacement);
-        return this.#beginMainFetch(this.#lease);
+        if (state.afterPlacement) return this.#finish(state.afterPlacement);
+        return this.#beginMainFetch(state.lease);
       }
-      if (this.#phase === WorkspaceSyncPhase.Fetch) return this.#acceptFetch(receipt);
+      if (state.phase === WorkspaceSyncPhase.Fetch) return this.#acceptFetch(receipt, state);
       throw new Error(`workspace sync '${this.workId}' is already complete`);
     } catch (error) {
       this.#lastReceiptEffectId = previousReceipt;
       throw error;
     }
   }
-  #beginOffer(body, probe = false) {
-    this.#phase = probe ? WorkspaceSyncPhase.Probe : WorkspaceSyncPhase.Offer;
+  #beginOffer(body, exchange, probe = false) {
+    const phase = probe ? WorkspaceSyncPhase.Probe : WorkspaceSyncPhase.Offer;
+    this.#state = { phase, exchange };
     const token = this.#authToken();
     this.#pushBytes += BigInt(body.byteLength);
     return this.#remember({
@@ -14579,7 +14571,7 @@ var WorkspaceSyncWork = class {
         effect: {
           case: "http",
           value: create59(PeerHttpEffectSchema, {
-            effectId: `${this.workId}:${this.#phase}`,
+            effectId: `${this.workId}:${phase}`,
             method: PeerHttpMethod.POST,
             url: this.#offerEndpoint(),
             contentType: CUSTODY_OFFER_MEDIA_TYPE,
@@ -14596,28 +14588,30 @@ var WorkspaceSyncWork = class {
       })
     });
   }
-  #acceptOffer(receipt) {
-    this.#pushMillis = this.#offerStarted === void 0 ? 0 : elapsedMillis(this.#clock, this.#offerStarted);
+  #acceptOffer(receipt, state) {
+    const exchange = state.exchange;
+    this.#pushMillis = exchange.startedAt === void 0 ? 0 : elapsedMillis(this.#clock, 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 this.#finishOfferOutcome(true, false);
+    }
+    if (outcome.case === "unexpected") {
       this.#pushError = create59(RuntimeTransportFailureSchema, {
         endpoint: this.#offerEndpoint(),
-        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 this.#finishOfferOutcome(false);
     }
-    if (!this.#offerRequestId) throw new Error("custody offer has no request identity");
-    const outcome = decodeCustodyOffer(response.body, this.#offerRequestId);
-    this.#offerReceipt = custodyOfferReceipt(this.#offerRequestId, outcome);
+    this.#offerReceipt = outcome.receipt;
     if (outcome.case === "failure") {
       this.#pushError = create59(RuntimeTransportFailureSchema, {
         endpoint: this.#offerEndpoint(),
-        status: response.status,
+        status: outcome.status,
         refused: false,
         message: `${outcome.value.code}: ${outcome.value.message}`
       });
@@ -14626,12 +14620,12 @@ var WorkspaceSyncWork = class {
     if (outcome.case === "blocked") {
       return this.#finishOfferOutcome(true);
     }
-    if (response.status < 200 || response.status >= 300) {
+    if (outcome.status < 200 || outcome.status >= 300) {
       this.#pushError = create59(RuntimeTransportFailureSchema, {
         endpoint: this.#offerEndpoint(),
-        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 this.#finishOfferOutcome(false);
     }
@@ -14639,8 +14633,7 @@ var WorkspaceSyncWork = class {
     this.#desiredHead = admission.main || void 0;
     if (!this.#desiredHead) return this.#transportFailure("resident peer returned no admitted frontier", false);
     this.#candidateDurable = admission.sealedMain === this.#desiredHead;
-    if (this.#phase === WorkspaceSyncPhase.Probe && this.#desiredHead !== this.#localHead) {
-      if (!this.#establishBase(this.#desiredHead)) return this.#noCommonBaseResult();
+    if (state.phase === WorkspaceSyncPhase.Probe && this.#desiredHead !== this.#localHead) {
       if (this.#alreadyJudged(this.#desiredHead)) {
         return this.#finish(create59(SyncWorkspaceResponseSchema, {
           workspace: this.#mount.workspace,
@@ -14652,6 +14645,22 @@ var WorkspaceSyncWork = class {
           offerReceipt: this.#offerReceipt
         }));
       }
+      if (!this.#establishBase(this.#desiredHead)) {
+        this.#offerAfterConverge = this.#command.admit;
+        this.#rebaseFrom = void 0;
+        return this.#leaseEffect();
+      }
+      if (this.#establishedBase && !this.#candidateDurable && this.#kernel.resolveRef(this.#mount, this.#requestId, trackedMain) === void 0) {
+        return this.#finish(create59(SyncWorkspaceResponseSchema, {
+          workspace: this.#mount.workspace,
+          currentHead: this.#localHead,
+          previousHead: this.#previousHead,
+          stillAhead: true,
+          directOfferDeferred: true,
+          reconnectRequired: false,
+          offerReceipt: this.#offerReceipt
+        }));
+      }
       if (this.#probeOnly) {
         this.#needsReconciliation = true;
         return this.#finish(create59(SyncWorkspaceResponseSchema, {
@@ -14697,11 +14706,11 @@ var WorkspaceSyncWork = class {
       return this.#converge(this.#desiredHead, admission.resultPack.byteLength, 0);
     }
     if (this.#desiredHead === this.#previousHead) return this.#converge(this.#desiredHead, 0, 0);
-    if (!this.#establishBase(this.#desiredHead)) return this.#noCommonBaseResult();
+    this.#establishBase(this.#desiredHead);
     if (admission.recoveryRequired !== false) return this.#leaseEffect();
     return this.#transportFailure("resident peer supplied neither the missing delta nor a history gap", false);
   }
-  #acceptLease(receipt) {
+  #acceptLease(receipt, state) {
     if (receipt.outcome.case !== "response") {
       throw new Error("platform returned the wrong receipt for a Git read lease");
     }
@@ -14717,21 +14726,25 @@ var WorkspaceSyncWork = class {
     this.#leased = true;
     const frontier = this.#placementFrontier();
     if (frontier) {
-      this.#placementFetch = new PlacementFetch(
+      const transfer = new PlacementFetch(
         this.#kernel,
         this.#mount,
         this.#requestId,
         this.workId,
         frontier
       );
-      const pending = this.#placementFetch.start(lease);
+      const pending = transfer.start(lease);
       if (pending) {
-        this.#phase = WorkspaceSyncPhase.Placement;
-        this.#lease = lease;
+        this.#state = {
+          phase: WorkspaceSyncPhase.Placement,
+          transfer,
+          lease,
+          ...state.afterPlacement ? { afterPlacement: state.afterPlacement } : {}
+        };
         return this.#remember({ case: "pending", value: pending });
       }
     }
-    if (this.#afterPlacement) return this.#finish(this.#afterPlacement);
+    if (state.afterPlacement) return this.#finish(state.afterPlacement);
     return this.#beginMainFetch(lease);
   }
   /** The provider's placement frontier as this round knows it: what the directory named in this
@@ -14751,8 +14764,7 @@ var WorkspaceSyncWork = class {
     if (!new PlacementFetch(this.#kernel, this.#mount, this.#requestId, this.workId, frontier).wanted()) {
       return void 0;
     }
-    this.#afterPlacement = presented;
-    return this.#leaseEffect();
+    return this.#leaseEffect(presented);
   }
   #acceptDiscovery(receipt) {
     this.#directoryAnswered?.();
@@ -14776,9 +14788,11 @@ var WorkspaceSyncWork = class {
     return this.#replaceLocalHead !== void 0 || this.#localHead === void 0 && this.#previousHead === void 0;
   }
   #beginMainFetch(lease) {
-    this.#phase = WorkspaceSyncPhase.Fetch;
     const lawProducts = this.#lawProductsAlongside();
-    this.#fetchStarted = this.#clock.monotonicNanoseconds();
+    this.#state = {
+      phase: WorkspaceSyncPhase.Fetch,
+      startedAt: this.#clock.monotonicNanoseconds()
+    };
     const haves = this.#replaceLocalHead !== void 0 ? this.#repairMissingCommit ? [] : [this.#kernel.resolveRef(this.#mount, this.#requestId, deferredRemote)].filter(
       (head) => !!head
     ) : [...new Set([
@@ -14809,7 +14823,7 @@ var WorkspaceSyncWork = class {
       })
     });
   }
-  #acceptFetch(receipt) {
+  #acceptFetch(receipt, state) {
     if (receipt.outcome.case !== "gitFetch") {
       throw new Error("platform returned the wrong receipt for a Git object fetch");
     }
@@ -14819,7 +14833,7 @@ var WorkspaceSyncWork = class {
     if (fetched.pack.byteLength > 0) {
       this.#kernel.applyPack(this.#mount, this.#requestId, fetched.pack, fetched.head, fetched.shallow);
     }
-    const prefetchMillis = this.#fetchStarted === void 0 ? 0 : elapsedMillis(this.#clock, this.#fetchStarted);
+    const prefetchMillis = elapsedMillis(this.#clock, state.startedAt);
     const candidateHead = this.#receiveState ? this.#kernel.resolveStatePosition?.(this.#mount, this.#requestId, fetched.head, this.#receiveState) : fetched.head;
     if (!candidateHead) {
       return this.#finish(create59(SyncWorkspaceResponseSchema, {
@@ -14915,7 +14929,7 @@ var WorkspaceSyncWork = class {
     }
   }
   #converge(candidateHead, receivedBytes, prefetchMillis) {
-    if (!this.#establishBase(candidateHead)) return this.#noCommonBaseResult();
+    this.#establishBase(candidateHead);
     this.#beforeConverge?.(candidateHead, this.#previousHead);
     const convergeStarted = this.#clock.monotonicNanoseconds();
     let judged;
@@ -15170,11 +15184,11 @@ var WorkspaceSyncWork = class {
         pushBytes: this.#pushBytes,
         pullBytes: BigInt(receivedBytes),
         serverMillis: this.#admissionSummary?.serverMillis ?? 0,
-        offerInPush: this.#offerRequestId !== void 0
+        offerInPush: this.#pushBytes > 0n
       })
     });
   }
-  #finishOfferOutcome(blocked) {
+  #finishOfferOutcome(blocked, reconnectRequired = true) {
     return this.#finish(create59(SyncWorkspaceResponseSchema, {
       workspace: this.#mount.workspace,
       previousHead: this.#previousHead,
@@ -15182,7 +15196,7 @@ var WorkspaceSyncWork = class {
       admitted: BigInt(this.#admissionSummary?.admittedIntentIds.length ?? 0),
       refused: BigInt((this.#admissionSummary?.refusedMessages.length ?? 0) + this.#parkedLocal),
       deferred: BigInt(this.#admissionSummary ? this.#admissionSummary.blockedMessages.length + this.#admissionSummary.deadLetteredMessages.length + this.#admissionSummary.quarantinedMessages.length + this.#admissionSummary.deferredMessages.length : blocked ? 1 : 0),
-      reconnectRequired: true,
+      reconnectRequired,
       stillAhead: this.#localHead !== this.#previousHead,
       directOfferDeferred: blocked,
       offerReceipt: this.#offerReceipt,
@@ -15196,15 +15210,16 @@ var WorkspaceSyncWork = class {
     }));
   }
   #transportFailure(message, offline, status = -1) {
-    const pushFailed = this.#phase === WorkspaceSyncPhase.Offer;
+    const state = this.#state;
+    const pushFailed = state.phase === WorkspaceSyncPhase.Offer;
     const failedEndpoint = this.#offerEndpoint();
     const failure2 = create59(RuntimeTransportFailureSchema, {
       endpoint: pushFailed ? failedEndpoint : this.#binding.cloud ?? "",
       status,
       message
     });
-    if (pushFailed) {
-      this.#pushMillis = this.#offerStarted === void 0 ? 0 : elapsedMillis(this.#clock, this.#offerStarted);
+    if (state.phase === WorkspaceSyncPhase.Offer) {
+      this.#pushMillis = state.exchange.startedAt === void 0 ? 0 : elapsedMillis(this.#clock, state.exchange.startedAt);
       this.#pushError = failure2;
     }
     return this.#finish(create59(SyncWorkspaceResponseSchema, {
@@ -15221,7 +15236,7 @@ var WorkspaceSyncWork = class {
         pushMillis: this.#pushMillis,
         pushBytes: this.#pushBytes,
         prefetchMillis: elapsedMillis(this.#clock, this.#started),
-        offerInPush: this.#offerRequestId !== void 0
+        offerInPush: this.#pushBytes > 0n
       })
     }));
   }
@@ -15231,7 +15246,7 @@ var WorkspaceSyncWork = class {
     return step;
   }
   #finish(value) {
-    this.#phase = WorkspaceSyncPhase.Done;
+    this.#state = { phase: WorkspaceSyncPhase.Done };
     this.#current = void 0;
     return this.#remember({ case: "synced", value });
   }
@@ -17359,13 +17374,21 @@ var CorrespondenceDesk = class {
   }
   #observeSyncResult(requestId, workId2, result) {
     const timings = result.timings;
+    const receipt = result.offerReceipt?.outcome;
+    const admission = receipt?.case === "admission" ? receipt.value : void 0;
     this.#events.instant("peer.follow.sync-result", {
       request: create64(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 ? {