@githolon/dsl 0.105.17 → 0.105.18

package/dart/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.64.33
+
+- Converge arbitrary historical generated-model backlogs while failing a genuinely repeated immutable lifecycle step with a typed stall error.
+
 ## 0.64.32
 
 - Prove a restored generated-application device is enrolled before exposing business APIs, including recovery from an interrupted bootstrap journal.

package/dart/lib/src/session_bound.dart

@@ -240,6 +240,73 @@ class DomainClientModelAdoptionRequired implements Exception {
       '"$expectedDomainKey" ($expectedDomainHash) is $status. $summary';
 }
 
+/// A generated model step repeated without converging after several retries.
+///
+/// The limit is per immutable lifecycle step, not a cap on how many historical
+/// model generations a long-lived workspace may lawfully adopt. That distinction
+/// lets an old workspace catch up across an arbitrary backlog while still making
+/// a genuinely stuck stage/accept loop fail loudly and with useful context.
+final class DomainClientModelLifecycleStalled implements Exception {
+  const DomainClientModelLifecycleStalled({
+    required this.domain,
+    required this.candidateHash,
+    required this.status,
+    required this.attempts,
+  });
+
+  final String domain;
+  final String candidateHash;
+  final String status;
+  final int attempts;
+
+  @override
+  String toString() => 'DomainClientModelLifecycleStalled: generated model for '
+      '"$domain" ($candidateHash) remained $status after $attempts governed '
+      'attempts without progress.';
+}
+
+/// Converge every pending generated-model generation, bounded by repeated work.
+///
+/// A workspace can legitimately be more than a fixed number of generations
+/// behind. Each distinct domain/hash/status tuple is evidence of progress, so it
+/// gets its own retry budget. Only repetition of the same immutable step is a
+/// stall.
+Future<T> nmsInternalConvergeGeneratedModel<T>({
+  required Future<T> Function() attempt,
+  required Future<void> Function(DomainClientModelAdoptionRequired change)
+      handle,
+}) async {
+  const maxAttemptsPerStep = 12;
+  final attemptsByStep = <String, int>{};
+  while (true) {
+    try {
+      return await attempt();
+    } on DomainClientModelAdoptionRequired catch (change) {
+      final step = '${change.expectedDomainKey}\u0000'
+          '${change.expectedDomainHash}\u0000'
+          '${change.status}\u0000'
+          '${change.canStage}\u0000${change.canAccept}';
+      final attempts = (attemptsByStep[step] ?? 0) + 1;
+      attemptsByStep[step] = attempts;
+      if (attempts > maxAttemptsPerStep) {
+        throw DomainClientModelLifecycleStalled(
+          domain: change.expectedDomainKey,
+          candidateHash: change.expectedDomainHash,
+          status: change.status,
+          attempts: attempts,
+        );
+      }
+      try {
+        await handle(change);
+      } on DomainClientModelAdoptionRequired {
+        // A transient preflight/acceptance race re-enters the same typed step.
+        // The per-step budget above prevents a genuine loop without limiting
+        // how many distinct historical generations may converge.
+      }
+    }
+  }
+}
+
 /// The context-rich replacement for the kernel's generic
 /// `no active installed law declares domain 'x' … deploy the domain package first` refusal —
 /// thrown wherever that error used to surface (bridge dispatch, birth lanes) so an app dev sees

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.64.32
+version: 0.64.33
 
 environment:
   sdk: ^3.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@githolon/dsl",
-  "version": "0.105.17",
+  "version": "0.105.18",
   "type": "module",
   "sideEffects": false,
   "description": "Nomos 2 domain-authoring DSL: aggregates + directives in TS, executed and encoded to the Rust kernel's wire shapes.",

package/src/codegen_dart_client.ts

@@ -2507,16 +2507,12 @@ export function generateDartBridgeClient(
           `      );`,
           `    }`,
         ]),
-    `    for (var modelStep = 0; modelStep < 12; modelStep += 1) {`,
-    `      try {`,
-    `        return await bind(session, actor: actor${
+    `    return nmsInternalConvergeGeneratedModel<${className}>(`,
+    `      attempt: () => bind(session, actor: actor${
       manualEncryptionPresent ? ", keyStore: keyStore" : ""
-    });`,
-    `      } on DomainClientModelAdoptionRequired catch (change) {`,
-    `        await session.nomosInternalHandleModelChange(change);`,
-    `      }`,
-    `    }`,
-    `    throw StateError('Generated model lifecycle did not settle after twelve governed steps.');`,
+    }),`,
+    `      handle: session.nomosInternalHandleModelChange,`,
+    `    );`,
     `  }`,
     ``,
     `  /// The session workspace this client is bound to (from the [NomosSession] handle, when constructed with`,

package/src/compile_package_main.ts

@@ -1664,8 +1664,8 @@ const NOMOS_TYPES_DEP = "^0.8.7";
 // 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.64.32";
-const NOMOS_FLUTTER_DEP = "^0.63.56";
+const NOMOS_CLIENT_DEP = "^0.64.33";
+const NOMOS_FLUTTER_DEP = "^0.63.57";
 // DRIFT TRIPWIRE: pubspec_pins.test.ts asserts these equal the CURRENT versions in dsl/dart/pubspec.yaml
 // and dsl/dart_types/pubspec.yaml — a Dart release without this bump fails the suite, so tenants never
 // land back in dependency_overrides (the exact co2 report this closes, third occurrence).