@githolon/dsl 0.103.16 → 0.103.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@githolon/dsl",
-  "version": "0.103.16",
+  "version": "0.103.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

@@ -1704,9 +1704,12 @@ export function generateDartBridgeClient(
       `    }`,
       `    final evolve = (report?['evolve'] as Map?)?.cast<String, Object?>();`,
       `    // A field/aggregate the candidate genuinely removed is a #58 disposition decision, not a`,
-      `    // dead end: retry with the SAME accept/dispositions seam once the source history is proven`,
-      `    // sound (sourceVerified + complete) so the tenant's own policy can supply dispositions.retired.`,
-      `    if (stage == 'preflight' && report != null && report['sourceVerified'] == true && report['complete'] == true && evolve?['ok'] != true) {`,
+      `    // dead end: retry with the SAME accept/dispositions seam so the tenant's own policy can`,
+      `    // supply dispositions.retired. Every prior stage (promoted/staging-required/acceptance) is`,
+      `    // already handled above; 'identity' (needs sign-in) is the one remaining stage this must NOT`,
+      `    // paper over, so it is the sole exclusion rather than requiring an exact 'preflight' match or`,
+      `    // exact boolean report fields, which may not round-trip identically across every bridge.`,
+      `    if (stage != 'identity') {`,
       `      return NomosModelAdoption.needsDecision(`,
       `        summary: 'This model cannot yet interpret every existing value without a declared disposition. Review the differences and record why that is intended.',`,
       `        review: review, accept: (reason, {dispositions}) => _adoptGeneratedModel(reason, dispositions));`,
@@ -2398,9 +2401,7 @@ export function generateDartBridgeClient(
     `    final candidate = ${className}(session, actor: actor${
       manualEncryptionPresent ? ", keyStore: keyStore" : ""
     });`,
-    `    Future<void> adoptGeneratedModel() async {`,
-    `      final adoption = await candidate._adoptGeneratedModel();`,
-    `      if (adoption.status == NomosModelAdoptionStatus.adopted) return;`,
+    `    Never throwForAdoption(NomosModelAdoption adoption) {`,
     `      throw DomainClientModelAdoptionRequired(`,
     `        expectedDomainKey: interface.domain,`,
     `        expectedDomainHash: interface.expectedDomainHash,`,
@@ -2434,13 +2435,23 @@ export function generateDartBridgeClient(
     `        accept: adoption.status == NomosModelAdoptionStatus.needsDecision`,
     `            ? (reason, {dispositions}) async {`,
     `                final accepted = await adoption.accept(reason, dispositions: dispositions);`,
+    `                // A retry that still isn't adopted (a transient business-outcome/history race,`,
+    `                // e.g. concurrent writes landing between the bare preflight and this accept) must`,
+    `                // NOT be swallowed as a terminal StateError: re-throw the SAME typed exception so`,
+    `                // the caller's governed-steps retry loop gets another decide()/accept() attempt`,
+    `                // instead of failing outright on the first race it hits.`,
     `                if (accepted.status != NomosModelAdoptionStatus.adopted) {`,
-    `                  throw StateError(accepted.summary);`,
+    `                  throwForAdoption(accepted);`,
     `                }`,
     `              }`,
     `            : null,`,
     `      );`,
     `    }`,
+    `    Future<void> adoptGeneratedModel() async {`,
+    `      final adoption = await candidate._adoptGeneratedModel();`,
+    `      if (adoption.status == NomosModelAdoptionStatus.adopted) return;`,
+    `      throwForAdoption(adoption);`,
+    `    }`,
     `    try {`,
     `      await session.assertCompatible(interface);`,
     `    } on DomainClientSessionMismatch catch (mismatch) {`,

package/src/compile_package_main.ts

@@ -1653,7 +1653,7 @@ const NOMOS_TYPES_DEP = "^0.8.4";
 //         DomainNotInstalledForSession, engine.follow, pendingConflicts lanes) — the generated client
 //         REQUIRES this surface. 0.48.1 fixes NomosSession.watchPendingConflicts delegation.
 const NOMOS_CLIENT_DEP = "^0.64.14";
-const NOMOS_FLUTTER_DEP = "^0.63.20";
+const NOMOS_FLUTTER_DEP = "^0.63.22";
 // 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).