@githolon/dsl 0.110.1 → 0.111.0

package/dart/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.66.7
+
+- Recover sync after loss of the upstream bookmark by fetching provider history and allowing the kernel to verify a shared ancestor. Preserve pending local work and reject unrelated history through the existing admission gate.
+- Wait for a sealed initial sync base before sending a first suffix, and expose provider/local heads in sync diagnostics.
+
 ## 0.66.6
 
 - Let reception close promptly when presentation stream listeners are paused.

package/dart/lib/src/runner/node-entry.mjs

@@ -23913,7 +23913,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();
@@ -24124,38 +24123,13 @@ var WorkspaceSyncWork = class {
     }), { 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;
@@ -24170,26 +24144,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(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;
   }
@@ -24341,7 +24298,6 @@ var WorkspaceSyncWork = class {
     if (!this.#desiredHead) return this.#transportFailure("resident peer returned no admitted frontier", false);
     this.#candidateDurable = admission.sealedMain === this.#desiredHead;
     if (state.phase === WorkspaceSyncPhase.Probe && this.#desiredHead !== this.#localHead) {
-      if (!this.#establishBase(this.#desiredHead)) return this.#noCommonBaseResult();
       if (this.#alreadyJudged(this.#desiredHead)) {
         return this.#finish(create(SyncWorkspaceResponseSchema, {
           workspace: this.#mount.workspace,
@@ -24353,6 +24309,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(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, {
@@ -24398,7 +24370,7 @@ 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);
   }
@@ -24621,7 +24593,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;
@@ -27076,13 +27048,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: 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 ? {

package/dart/pubspec.yaml

@@ -7,7 +7,7 @@ repository: https://github.com/Captain-App/nomos2
 description: >-
   Nomos 2 Dart client — generated domain values, intent payloads and application
   lifecycle types over the typed Nomos kernel protocol and USDA custody model.
-version: 0.66.6
+version: 0.66.7
 
 environment:
   sdk: ^3.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@githolon/dsl",
-  "version": "0.110.1",
+  "version": "0.111.0",
   "type": "module",
   "sideEffects": false,
   "description": "Nomos 2 domain-authoring DSL: aggregates + directives in TS, executed and encoded to the Rust kernel's wire shapes.",
@@ -72,7 +72,7 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@githolon/runtime": "^0.110.1",
+    "@githolon/runtime": "^0.111.0",
     "@bufbuild/protobuf": "^2.13.0",
     "@bufbuild/protoc-gen-es": "^2.13.0",
     "esbuild": "0.24.2",

package/src/compile_package_main.ts

@@ -2544,8 +2544,8 @@ const NOMOS_TYPES_DEP = "^0.11.2";
 // 0.48.x: session-bound clients (XClient.bind/NomosClientInterface/DomainClientSessionMismatch/
 //         DomainNotInstalledForSession, engine.follow, pendingConflicts lanes) — the generated client
 //         REQUIRES this surface. 0.48.1 fixes NomosSession.watchPendingConflicts delegation.
-const NOMOS_CLIENT_DEP = "^0.66.6";
-const NOMOS_FLUTTER_DEP = "^0.65.8";
+const NOMOS_CLIENT_DEP = "^0.66.7";
+const NOMOS_FLUTTER_DEP = "^0.65.9";
 // DRIFT TRIPWIRE: pubspec_pins.test.ts asserts these equal the CURRENT versions in the Dart and Flutter
 // package pubspecs — a release without this bump fails the suite, so tenants never
 // land back in dependency_overrides (the exact co2 report this closes, third occurrence).