@githolon/runtime 0.110.0 → 0.111.0

package/dist/RUNTIME-SOURCES.sha256

@@ -34,6 +34,7 @@
 1963a804a9cfe7d44a76b2c476817639b939d7e93828da865cab40fe9ba536fa  adapter/custody-transport.ts
 1a5d9fd32360e2cec4adbee9e56221fb26def66bb9d122e0b5745cebc963d92e  node_modules/xml-naming/src/index.js
 1b27a1f4d58d6314cd4887d0f47493d1a98fc474e3364388f321c3aeb94a8ac3  adapter/workspace_effect_outcome.ts
+1b8eea8acf14374c28330cb21eea0e14f151fffb7c678f8e4a7f34722dc2eb22  peer-office/src/runtime/workspace_sync.ts
 1c0bba78daf8c28ac51f35d60b2b2fbca9c57bc7bcdb05a05a1f15a2ca657164  peer-office/src/reception/application_readiness_transport.ts
 1c364712aa61711ce0e654ed81e26fe821e8f7b6dac9c31fe6d49fc184dbacd2  node_modules/@bufbuild/protobuf/dist/esm/wire/size-delimited.js
 1d1f03bc86ea3788b57b43c7720de2c41a7b133d852262a7615b3b152777cdef  node_modules/@bufbuild/protobuf/dist/esm/reflect/nested-types.js
@@ -66,6 +67,7 @@
 33917d22c20458fce8ef7e3a4fca8f51af8ace4508e6a435870b3ad61ea2eab4  peer-office/src/git_read_lease.ts
 33e7d6bdd22396057d3f8db92384079f7ec2fda4b3582709de2d43fccacc4a9c  node_modules/@bufbuild/protobuf/dist/esm/codegenv2/extension.js
 34f8712de2bd30a2cb8366d8cfdcde466d979f1a28ac0d78f7547341b01f6c57  adapter/proto/nomos/kernel/v1/progress_pb.js
+357485877b38fa0a70a2741a46f49f57c784300a53d7301b140cb3aded6e46b5  peer-office/package/package.json
 3a90933569db7e42ec2ed3b77509c29d1ab75f6eb078f53fe5d1ac6d239d231e  peer-office/src/runtime/peer_background_scheduler.ts
 3c092b8d4185badd23ecf4552434d05aa541b0cd0d534781d687db55260d5da8  adapter/proto/nomos/runtime/v2/sealing_desk_pb.js
 3c98fa838c05abcfd8dfda1128f2d1fca9b196a371fe9751abbd8f4c3b9d04ec  node_modules/@bufbuild/protobuf/dist/esm/wkt/timestamp.js
@@ -93,7 +95,6 @@
 4de8a60302e6ab22ef5607ee88ab6dd6559221fb8620780fb874a1dcf3000d06  node_modules/is-unsafe/src/contexts/sql.js
 4f177e43f1ac36dc25b2b6a44970c97918091416bd15722b65ac938256bda687  node_modules/fast-xml-parser/src/xmlparser/OptionsBuilder.js
 4f7192626ff16f10e8845dccfce280cfde437dd6faa78d62700e3b21d589ca97  peer-office/src/reception/extremum_read.ts
-4f72a4a85c36309d7d40c387ac6e177ac3f72a7f1227a1a6b92a587dbba1169c  peer-office/src/runtime/replica_follow_controller.ts
 4ff429ac40686adccd2a9ad77e9d12402da95e5396971a9df6e0f3cfa23ff3e7  platform-shells/node/certification_seal.ts
 501bf6549e9c44a4dbdea0f7a89d567c9b7e7db145b25ec7c8a38e2b4b7a87f2  adapter/custody_retention_refs.ts
 50e504430270aecdea3794d30f17911099946f38eee258b5837967cb989abd93  node_modules/@bufbuild/protobuf/dist/esm/codegenv2/enum.js
@@ -101,7 +102,6 @@
 513a0ca639e4d5cbb6ecce90f9668ab63f5e8ce4df2468b1ad439112b903ef0a  platform-shells/node/local-development/kernel_work_recovery.ts
 519afa7759c5cce91b66cd6b1444014ead77df1f691d0eee356b14206d32d59e  peer-office/src/runtime/workspace_call_binding.ts
 5295c7fdcb8d70cadc057dcd7b1efda4535dfae93f1a601b304245fdf8adb5ab  peer-office/src/peer_office.ts
-5521fba42530e15bdba2f5a67e7e3c03d0e753c6d70c8834071a6b8832fda007  peer-office/src/runtime/correspondence_desk.ts
 56e2ac380c2d9be43647d88928727c17df70a3e734834a5be62c8bcb18616738  adapter/proto/nomos/runtime/v2/custody_desk_pb.js
 57677b7b20768a3bd6eb50fdff229852be7f9978e5988924d2c935ba934366d4  adapter/proto/nomos/discovery/v1/workspace_placement_pb.js
 587bee5d27b6dbc99d24f472ea93028659610c3496be7d667e72483483c3f3ba  node_modules/fast-xml-parser/src/fxp.js
@@ -124,7 +124,6 @@
 6eb1b52bfa2c7eb3e36b6817973defd7be18dbc7ce4b56ca576b1222dd5df4d7  node_modules/fast-xml-parser/src/xmlparser/DocTypeReader.js
 6ec9654705968f0c75cb0b184d4bb6629a932c05e3d27d603eb42a3cb9447f6f  node_modules/@bufbuild/protobuf/dist/esm/reflect/error.js
 6fc7191c83f8c3318f656463bab0700d9585aa42a7285c364ee73c9829b488d5  peer-office/src/runtime/live_correspondence_desk.ts
-709b5a7e68558438cdf1e4d11ea458b360e6190572c42219c5b9165533d4fb78  peer-office/src/runtime/workspace_sync.ts
 70f2527a9fde5075b760e0f2b36c5aced16a44d7ba3767f6f00b249fd81e91ec  peer-office/src/runtime/kernel_port.ts
 711039a2d590af0e112a32c7bc50eb77e5fac6336e56e8eb01cc74df23a2cd44  adapter/git_custody_desk.ts
 71de64c0b205eed7bcbbe11bd937a363c83cb5ab8e9977c4bb4b73b3c5353cf3  peer-office/src/runtime/placement_discovery_desk.ts
@@ -134,7 +133,6 @@
 72f4dbde9d104ea96276198f8fab8b32e1a296d7ae57b74f8f175472627c2546  peer-office/src/runtime/custody_return_delta.ts
 73e489001027c703bc0224ae73f78ecefe028e88284bd06952e8603c3d81472c  node_modules/@bufbuild/protobuf/dist/esm/wkt/gen/google/protobuf/api_pb.js
 74b1e9405ec5b38e957cf85fb9f73885ab485db853a8b0f95200afa42c5921f8  peer-office/src/runtime/model_adoption_desk.ts
-74f630102656bb2cb326296d4a19343ad5fdfa7949696be26110f318abf7b2ff  peer-office/package/package.json
 75ba818bf766331dc4abe3c488f65562968684934b57eb21e6e777c358c561ae  peer-office/package/src/remote_reception.ts
 77a917d8c6427a9b7d819d4941ec6aeecc079ccb9b1a05c0dc1190680b589f78  platform-shells/node/stdio/entry.ts
 799c15bd106543d60c5422eeda102396a055397f20866c27504598b68d1d288d  node_modules/@bufbuild/protobuf/dist/esm/wire/binary-encoding.js
@@ -172,17 +170,18 @@
 94a3cef0f355a9a177661748d24faae32206a5cc382c8601a34dcf005340107b  node_modules/fast-xml-parser/src/xmlparser/OrderedObjParser.js
 95ad7c933403a0c8f7fd3e2df6c4df3008c29911d3d5db063a90460a14144da2  peer-office/src/runtime/records_desk.ts
 95dbcb2580ed30cb11222c773163c6a906a7e363c5ec4263bd39c1f3a7a16cc2  node_modules/@bufbuild/protobuf/dist/esm/from-json.js
+9633e84964edf9d8e2f719766c002cabe341e5e805e729ae7ea8fa9ec4c95410  peer-office/src/runtime/correspondence_desk.ts
 96cb2eb563ccb18dc23fd9f8fb0f65193a1b90f39758a561eed747368ead00b3  node_modules/@bufbuild/protobuf/dist/esm/wkt/index.js
 96ec5d127a4e8cd77bdc678422f0d57c8ff9e37bcec999983da71a7b72ce9a0e  node_modules/@nodable/entities/src/entities.js
 98f5abf9a7fb522aab513ef3831dd9c5837cebcb38a960cb546ffd084926d746  node_modules/@bufbuild/protobuf/dist/esm/wkt/gen/google/protobuf/empty_pb.js
 98f70a85fe9d2578c977bbf26927910479cef472100b5ed7bebd4c390e79213c  peer-office/src/runtime/workspace_access_desk.ts
-99be7abab3e81c69c2c2919768779742f2ba5ec07befa4abf18a2907fa1c3d0a  peer-office/src/runtime/custody_offer.ts
 99ce0b71dc7acc73e48634ff609eeb3620cf24b524e89835e804d37fb6b51b2c  adapter/offer_transport_contract.ts
 9a3d4c2296b0139778c8f61319349eac6dc0cdb723688f41ebf3c135dca85702  peer-office/src/runtime/history_acquisition_state.ts
 9b1e46d587a9ad5d1531a5755ba4feccd2878de77749edce8a0086db3eb2217d  peer-office/src/runtime/admission_durability_desk.ts
 9c4c967ea6c149011acb8aabfbadb73651f84d572335c48391d627e5283c0cd0  node_modules/@bufbuild/protobuf/dist/esm/fields.js
 9e1bf39540fd14df32aa2307c44dd4d93a40a6024199f334ccf3db001f44a7f6  peer-office/src/runtime/local_copy_readability.ts
 9e82e1fc1bfd3e3573f64349dc42b4b624ed61d24e5c553f2bb4d041444f166c  node_modules/@bjorn3/browser_wasi_shim/dist/fd.js
+9efa0e5824cc0370ea3596b30cd57ea860df0bae95a0caccbbfe97d845a7a09b  peer-office/src/runtime/custody_offer.ts
 9f7a3b2bb0e2a2da849fd9101228bd9c9682b39d667e20900dd172d954b1a548  peer-office/src/runtime/observability_desk.ts
 a0eca2694871be026546039e99a71291822d01ba81943d44e69a14b2d766fd1a  peer-office/src/runtime/custody_desk.ts
 a0fcc6110f1154fd197a8ce056e2008dbc7d1750f8dd3ba77c3910af928ed3a1  node_modules/uri-js/dist/es5/uri.all.js
@@ -258,6 +257,7 @@ dd9f3f24fb154cfbfbde94e8f2647647c80c8ca050b98e981a407e760a4b9c1e  node_modules/@
 deaa25227d669aa3fbe99174275588dcc175de648ae6623fddf11d6ae69d7f67  platform-shells/node/local-development/peer_process.ts
 e20a132033f105a29db1cfdb3d85bbadbb7206b9a7e3336bcb030a63d66b4ab2  node_modules/is-unsafe/src/contexts/nosql.js
 e2133d7e0f0ce5491a3e9bd560e9e47db2243a6a9f762be89c82e027d99d278e  peer-office/src/runtime/credential_sessions.ts
+e24433e22af52db25858865dfff3c6ed1e6932f3257ae242a795acbedda70303  peer-office/src/runtime/replica_follow_controller.ts
 e2d341fc536c47a45d2e45fc1df232094b4afe67281b92eae91ed9b7698c32ff  platform-shells/browser/entry.ts
 e34016b82b6f6e4c4a1cc2dd44ccd14a348e8156a1f6c5aeeb2c7fc36a15b8f9  adapter/proto/nomos/kernel/v1/kernel_pb.js
 e34016b82b6f6e4c4a1cc2dd44ccd14a348e8156a1f6c5aeeb2c7fc36a15b8f9  peer-office/package/src/protocol/nomos/kernel/v1/kernel_pb.js

package/dist/nomos-native-runtime.js

@@ -14173,6 +14173,15 @@ var NomosRuntimeComponent = (() => {
       }
       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,
@@ -16051,6 +16060,34 @@ var NomosRuntimeComponent = (() => {
   // ../src/runtime/custody_offer.ts
   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,
@@ -16177,6 +16214,7 @@ var NomosRuntimeComponent = (() => {
   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",
@@ -16186,7 +16224,6 @@ var NomosRuntimeComponent = (() => {
     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();
@@ -16210,7 +16247,6 @@ var NomosRuntimeComponent = (() => {
     #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
@@ -16219,19 +16255,14 @@ var NomosRuntimeComponent = (() => {
     #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;
@@ -16326,7 +16357,7 @@ var NomosRuntimeComponent = (() => {
         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_REF3)) {
-        this.#phase = WorkspaceSyncPhase.Discover;
+        this.#state = { phase: WorkspaceSyncPhase.Discover };
         return this.#remember({
           case: "pending",
           value: create(CorrespondencePendingSchema, {
@@ -16346,13 +16377,13 @@ var NomosRuntimeComponent = (() => {
     #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) {
@@ -16373,13 +16404,13 @@ var NomosRuntimeComponent = (() => {
           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,
@@ -16390,51 +16421,26 @@ var NomosRuntimeComponent = (() => {
               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;
@@ -16449,26 +16455,9 @@ var NomosRuntimeComponent = (() => {
     get establishedBase() {
       return this.#establishedBase;
     }
-    #noCommonBase() {
+    #missingTrackedBase() {
       return this.#previousHead === void 0 && this.#localHead !== void 0 && this.#replaceLocalHead === void 0;
     }
-    #noCommonBaseResult() {
-      return this.#finish(create(SyncWorkspaceResponseSchema, {
-        workspace: this.#mount.workspace,
-        ...this.#localHead === void 0 ? {} : { currentHead: this.#localHead },
-        stillAhead: true,
-        ...this.#offerReceipt === void 0 ? {} : { offerReceipt: this.#offerReceipt },
-        pushError: create(RuntimeTransportFailureSchema, {
-          endpoint: this.#offerEndpoint(),
-          status: 409,
-          refused: true,
-          message: NO_COMMON_BASE
-        }),
-        timings: create(SyncPhaseTimingsSchema, {
-          convergeMillis: elapsedMillis(this.#clock, this.#started)
-        })
-      }));
-    }
     #holdsLocalWork() {
       return this.#command.admit && !!this.#localHead && this.#localHead !== this.#previousHead;
     }
@@ -16476,18 +16465,18 @@ var NomosRuntimeComponent = (() => {
     #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: create(CorrespondencePendingSchema, {
@@ -16516,35 +16505,38 @@ var NomosRuntimeComponent = (() => {
           `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({
@@ -16554,7 +16546,7 @@ var NomosRuntimeComponent = (() => {
           effect: {
             case: "http",
             value: create(PeerHttpEffectSchema, {
-              effectId: `${this.workId}:${this.#phase}`,
+              effectId: `${this.workId}:${phase}`,
               method: PeerHttpMethod.POST,
               url: this.#offerEndpoint(),
               contentType: CUSTODY_OFFER_MEDIA_TYPE,
@@ -16571,28 +16563,30 @@ var NomosRuntimeComponent = (() => {
         })
       });
     }
-    #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 = create(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 = create(RuntimeTransportFailureSchema, {
           endpoint: this.#offerEndpoint(),
-          status: response.status,
+          status: outcome.status,
           refused: false,
           message: `${outcome.value.code}: ${outcome.value.message}`
         });
@@ -16601,12 +16595,12 @@ var NomosRuntimeComponent = (() => {
       if (outcome.case === "blocked") {
         return this.#finishOfferOutcome(true);
       }
-      if (response.status < 200 || response.status >= 300) {
+      if (outcome.status < 200 || outcome.status >= 300) {
         this.#pushError = create(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);
       }
@@ -16614,8 +16608,7 @@ var NomosRuntimeComponent = (() => {
       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(create(SyncWorkspaceResponseSchema, {
             workspace: this.#mount.workspace,
@@ -16627,6 +16620,22 @@ var NomosRuntimeComponent = (() => {
             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(create(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(create(SyncWorkspaceResponseSchema, {
@@ -16672,11 +16681,11 @@ var NomosRuntimeComponent = (() => {
         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");
       }
@@ -16692,21 +16701,25 @@ var NomosRuntimeComponent = (() => {
       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
@@ -16726,8 +16739,7 @@ var NomosRuntimeComponent = (() => {
       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?.();
@@ -16751,9 +16763,11 @@ var NomosRuntimeComponent = (() => {
       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([
@@ -16784,7 +16798,7 @@ var NomosRuntimeComponent = (() => {
         })
       });
     }
-    #acceptFetch(receipt) {
+    #acceptFetch(receipt, state) {
       if (receipt.outcome.case !== "gitFetch") {
         throw new Error("platform returned the wrong receipt for a Git object fetch");
       }
@@ -16794,7 +16808,7 @@ var NomosRuntimeComponent = (() => {
       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(create(SyncWorkspaceResponseSchema, {
@@ -16890,7 +16904,7 @@ var NomosRuntimeComponent = (() => {
       }
     }
     #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;
@@ -17145,11 +17159,11 @@ var NomosRuntimeComponent = (() => {
           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(create(SyncWorkspaceResponseSchema, {
         workspace: this.#mount.workspace,
         previousHead: this.#previousHead,
@@ -17157,7 +17171,7 @@ var NomosRuntimeComponent = (() => {
         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,
@@ -17171,15 +17185,16 @@ var NomosRuntimeComponent = (() => {
       }));
     }
     #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 failure = create(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 = failure;
       }
       return this.#finish(create(SyncWorkspaceResponseSchema, {
@@ -17196,7 +17211,7 @@ var NomosRuntimeComponent = (() => {
           pushMillis: this.#pushMillis,
           pushBytes: this.#pushBytes,
           prefetchMillis: elapsedMillis(this.#clock, this.#started),
-          offerInPush: this.#offerRequestId !== void 0
+          offerInPush: this.#pushBytes > 0n
         })
       }));
     }
@@ -17206,7 +17221,7 @@ var NomosRuntimeComponent = (() => {
       return step;
     }
     #finish(value) {
-      this.#phase = WorkspaceSyncPhase.Done;
+      this.#state = { phase: WorkspaceSyncPhase.Done };
       this.#current = void 0;
       return this.#remember({ case: "synced", value });
     }
@@ -19335,13 +19350,21 @@ var NomosRuntimeComponent = (() => {
     }
     #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: 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 ? {