@githolon/dsl 0.108.0 → 0.108.1

package/src/codegen_dart_application.ts

@@ -7,7 +7,11 @@ import type { z } from "zod";
 
 import type { AggregateHandle } from "./aggregate.js";
 import type { Directive } from "./directive.js";
-import { isGitObjectIdSchema, isSha256DigestSchema, type Field } from "./fields.js";
+import {
+  isGitObjectIdSchema,
+  isSha256DigestSchema,
+  type Field,
+} from "./fields.js";
 import type { QueryDecl } from "./query.js";
 import type { DomainModule } from "./codegen_dart.js";
 import {
@@ -22,7 +26,11 @@ import {
   collectDartEnums,
   dartEnumTypeForField,
 } from "./codegen_dart.js";
-import { dartClientClassName } from "./codegen_dart_client.js";
+import {
+  dartClientClassName,
+  dartInternalSourceTrustMethod,
+  dartInternalWorkspaceSharingReceiptMethod,
+} from "./codegen_dart_client.js";
 import { finishCount } from "./count.js";
 import { finishSum } from "./sum.js";
 import {
@@ -114,7 +122,7 @@ function keyParam(key: string): string {
 function keyType(
   aggregate: AggregateHandle | undefined,
   key: string,
-  enumDartTypes: ReadonlyMap<string, string>,
+  enumDartTypes: ReadonlyMap<string, string>
 ): string {
   const first = key.includes(".") ? key.split(".")[0]! : key;
   const field = aggregate?.fields[first] as Field | undefined;
@@ -194,39 +202,44 @@ function sharingReceiptCondition(
 function sharingReceiptPayload(
   policy: WorkspaceSharingPolicy,
   receipt: WorkspaceSharingReceipt,
-  refused: boolean
+  refused: boolean,
+  enumDartTypes: ReadonlyMap<string, string>,
 ): string[] {
   const fields = introspectPayload(
     receipt.records.payloadSchema as z.ZodTypeAny,
-    new Map()
+    new Map(enumDartTypes)
   );
   return fields.flatMap((target) => {
     if (target.name === "failureReason") {
       return refused
         ? [
-            `          'failureReason': share.message ?? 'shareDeliveryRefused',`,
+            `            failureReason: share.message ?? 'shareDeliveryRefused',`,
           ]
         : target.optional
-        ? []
+        ? [`            ${member(target.name)}: null,`]
         : (() => {
             throw new Error(
               `workspaceSharing(${policy.orders.id}): delivered receipt '${receipt.records.id}' requires failureReason`
             );
           })();
     }
-    if (target.name === "deliveryHead" && target.optional) return [];
+    if (target.name === "deliveryHead" && target.optional) {
+      return [`            ${member(target.name)}: null,`];
+    }
     const sourceName = receipt.payload?.[target.name] ?? target.name;
     const source = policy.orders.fields[sourceName];
     if (source === undefined) {
-      if (target.optional) return [];
+      if (target.optional) return [`            ${member(target.name)}: null,`];
       throw new Error(
         `workspaceSharing(${policy.orders.id}): receipt '${receipt.records.id}' requires '${target.name}', ` +
           `but the durable order does not record '${sourceName}'`
       );
     }
     const raw = sharingOrderValue(policy, sourceName);
-    const expression = source.kind === "enum" ? `${raw}.wire` : raw;
-    return [`          ${JSON.stringify(target.name)}: ${expression},`];
+    const expression = source.kind === "enum"
+      ? `${target.dartType}.fromWire(${raw}.wire)`
+      : raw;
+    return [`            ${member(target.name)}: ${expression},`];
   });
 }
 
@@ -324,7 +337,7 @@ function dartConflictPublicClassNames(mod: DomainModule): string[] {
       names.add(
         `${aggregateName}${cap(
           camel(binding.field)
-        )}ConflictModelUpdateRequired`
+        )}ConflictEvolutionRequired`
       );
     }
   }
@@ -385,6 +398,8 @@ export interface DartApplicationOptions {
   /// Multi-domain package children remain stateful business handles, but only
   /// the generated package application may mount or expose application status.
   readonly tenantRoot?: boolean;
+  /** Relative compiler-generated framework-call implementation for this exact application closure. */
+  readonly applicationFrameworkCallsImportUri?: string;
 }
 
 /**
@@ -405,7 +420,7 @@ export function generateDartApplication(
     mod.directives,
     domain,
     mod.valueObjects ?? [],
-    mod.deriveds ?? [],
+    mod.deriveds ?? []
   ).dartTypes;
   const application = dartApplicationClassName(domain);
   const activity = dartApplicationActivityClassName(domain);
@@ -437,6 +452,7 @@ export function generateDartApplication(
   let usesAffectedReferences = false;
   let usesAffectedReferenceOrNull = false;
   const actionResultDeclarations: string[] = [];
+  const internalFrameworkActionDeclarations: string[] = [];
   const conflictDeclarations: string[] = [];
   const resolverBindings: readonly SurfacedResolverBinding[] =
     mod.surfacedResolvers ?? [];
@@ -480,7 +496,7 @@ export function generateDartApplication(
       new Map()
     )) {
       if (
-        spec.toJson !== "versionedRef" ||
+        spec.shape !== "versionedRef" ||
         spec.versionedRefTarget === undefined ||
         spec.versionedRefSeries === undefined ||
         spec.versionedRefTargetInput === undefined ||
@@ -606,45 +622,46 @@ export function generateDartApplication(
       )
     );
     const targetBinding = directive.targetBinding;
-    const targetChecks = targetBinding === undefined
-      ? []
-      : [
-          `    _nmsRequireReference(target, ${JSON.stringify(
-            targetBinding.aggregateId
-          )}, _client.session?.workspace ?? '');`,
-        ];
+    const targetChecks =
+      targetBinding === undefined
+        ? []
+        : [
+            `    _nmsRequireReference(target, ${JSON.stringify(
+              targetBinding.aggregateId
+            )}, _client.session?.workspace ?? '');`,
+          ];
     return [
       ...targetChecks,
       ...specs
-      .filter(
-        (spec) =>
-          (spec.toJson === "ref" || spec.toJson === "addressRef") &&
-          spec.name !== targetBinding?.field &&
-          !recordInputIds.has(spec.name)
-      )
-      .map((spec) => {
-        const targetClass =
-          spec.dartType.match(/^NomosRef<(.*)>$/)?.[1] ?? "Object?";
-        const targetWire =
-          spec.referenceType ??
-          [...aggregates.values()].find(
-            (aggregate) => concreteClassName(aggregate.id) === targetClass
-          )?.id ??
-          targetClass;
-        const expectedWorkspace =
-          spec.toJson === "addressRef" || foreignReferenceIds.has(spec.name)
-          ? "''"
-          : "_client.session?.workspace ?? ''";
-        const value = `facts.${member(spec.name)}`;
-        const check = `_nmsRequireReference(${value}, ${JSON.stringify(
-          targetWire
-        )}, ${expectedWorkspace});`;
-        return spec.optional
-          ? `    ${value}.when(absent: () {}, present: (reference) => _nmsRequireReference(reference, ${JSON.stringify(
-              targetWire
-            )}, ${expectedWorkspace}));`
-          : `    ${check}`;
-      }),
+        .filter(
+          (spec) =>
+            (spec.shape === "ref" || spec.shape === "addressRef") &&
+            spec.name !== targetBinding?.field &&
+            !recordInputIds.has(spec.name)
+        )
+        .map((spec) => {
+          const targetClass =
+            spec.dartType.match(/^NomosRef<(.*)>$/)?.[1] ?? "Object?";
+          const targetWire =
+            spec.referenceType ??
+            [...aggregates.values()].find(
+              (aggregate) => concreteClassName(aggregate.id) === targetClass
+            )?.id ??
+            targetClass;
+          const expectedWorkspace =
+            spec.shape === "addressRef" || foreignReferenceIds.has(spec.name)
+              ? "''"
+              : "_client.session?.workspace ?? ''";
+          const value = `facts.${member(spec.name)}`;
+          const check = `_nmsRequireReference(${value}, ${JSON.stringify(
+            targetWire
+          )}, ${expectedWorkspace});`;
+          return spec.optional
+            ? `    ${value}.when(absent: () {}, present: (reference) => _nmsRequireReference(reference, ${JSON.stringify(
+                targetWire
+              )}, ${expectedWorkspace}));`
+            : `    ${check}`;
+        }),
     ];
   };
 
@@ -659,167 +676,13 @@ export function generateDartApplication(
     collectionMembers.set(aggregate.id, new Set());
   }
 
-  // Conflicts are business decisions, so the application facade keeps the useful chain while the
-  // heterogeneous index, immutable proof snapshot and offer result remain implementation details.
+  // The compiler-generated client already owns the exact USDA decoders and typed
+  // merge decisions. The application facade aliases that one surface instead of
+  // rebuilding a second, inevitably drifting conflict type system.
   if (resolverBindings.length > 0) {
     const conflictsClass = `${cap(camel(domain))}Conflicts`;
-    const summaryClass = `${cap(camel(domain))}ConflictSummary`;
-    const rowClass = `_${cap(camel(domain))}PendingConflictRow`;
-    const byAggregate = new Map<string, SurfacedResolverBinding[]>();
-    for (const binding of resolverBindings) {
-      byAggregate.set(binding.aggregateId, [
-        ...(byAggregate.get(binding.aggregateId) ?? []),
-        binding,
-      ]);
-    }
     claimApplicationMember("conflicts", "the generated conflict policy");
     appLines.push(`  final ${conflictsClass} conflicts;`);
-
-    conflictDeclarations.push(
-      `/// Pending business decisions across this application.`,
-      `final class ${summaryClass} {`,
-      `  final int total;`,
-      `  final int ready;`,
-      `  final int modelUpdatesRequired;`,
-      `  final Map<String, int> byAggregate;`,
-      `  const ${summaryClass}({required this.total, required this.ready, required this.modelUpdatesRequired, required this.byAggregate});`,
-      `}`,
-      ``,
-      `/// Summary -> aggregate -> typed conflict -> merge.`,
-      `final class ${conflictsClass} {`,
-      `  final ${client} _client;`,
-      `  const ${conflictsClass}._(this._client);`,
-      ``,
-      `  Future<${summaryClass}> summary() async {`,
-      `    final summary = await _client.bridge.pendingConflictSummary();`,
-      `    final byAggregate = (summary['byAggregate'] as Map? ?? const {}).map(`,
-      `        (key, value) => MapEntry(key.toString(), (value as num).toInt()));`,
-      `    return ${summaryClass}(`,
-      `      total: (summary['total'] as num? ?? 0).toInt(),`,
-      `      ready: (summary['ready'] as num? ?? 0).toInt(),`,
-      `      modelUpdatesRequired: (summary['evolutionRequired'] as num? ?? 0).toInt(),`,
-      `      byAggregate: Map.unmodifiable(byAggregate),`,
-      `    );`,
-      `  }`,
-      ...[...byAggregate.keys()].map(
-        (aggregateId) =>
-          `  ${aggregateConflictsClassName(domain, aggregateId)} get ${member(
-            concreteClassName(aggregateId)
-          )} => ${aggregateConflictsClassName(domain, aggregateId)}._(_client);`
-      ),
-      `}`,
-      ``
-    );
-
-    for (const [aggregateId, bindings] of byAggregate) {
-      const aggregate = aggregates.get(aggregateId);
-      if (aggregate === undefined) {
-        throw new Error(
-          `generated conflict policy refers to unknown aggregate '${aggregateId}' in domain '${domain}'`
-        );
-      }
-      const runtimeAggregateType = isNamespacedAggregate(aggregate)
-        ? qualifyReadProjectionType(domain, aggregateId)
-        : aggregateId;
-      const aggregateName = cap(camel(concreteClassName(aggregateId)));
-      const pendingClass = `${aggregateName}PendingConflict`;
-      const aggregateClass = aggregateConflictsClassName(domain, aggregateId);
-      conflictDeclarations.push(
-        `sealed class ${pendingClass} {`,
-        `  const ${pendingClass}();`,
-        `  String get aggregateId;`,
-        `  String get field;`,
-        `}`,
-        ``
-      );
-      for (const binding of bindings) {
-        if (
-          binding.valuePayloadField === undefined ||
-          binding.idPayloadField === undefined
-        )
-          continue;
-        const fieldKind = aggregate.fields[binding.field]?.kind;
-        const mergedType =
-          fieldKind === "string" || fieldKind === "ref" || fieldKind === "enum"
-            ? "String"
-            : fieldKind === "int"
-            ? "int"
-            : fieldKind === "bool"
-            ? "bool"
-            : "Object?";
-        const typeName = `${aggregateName}${cap(camel(binding.field))}Conflict`;
-        const evolutionTypeName = `${typeName}ModelUpdateRequired`;
-        const helper = `_merge${aggregateName}${cap(camel(binding.field))}`;
-        conflictDeclarations.push(
-          `/// Merge every observed business version into one result.`,
-          `final class ${typeName} extends ${pendingClass} {`,
-          `  final ${rowClass} _details;`,
-          `  final ${client} _client;`,
-          `  const ${typeName}._(this._details, this._client);`,
-          `  @override String get aggregateId => _details.aggregateId;`,
-          `  @override String get field => _details.field;`,
-          `  List<SurfacedObservation<${mergedType}>> get versions => List.unmodifiable(`,
-          `      _details.observations.map((item) => SurfacedObservation<${mergedType}>(`,
-          `          value: item.value as ${mergedType}, occurredAt: item.occurredAt, author: item.author)));`,
-          `  Future<void> merge(`,
-          `      ${mergedType} Function(List<SurfacedObservation<${mergedType}>> versions) reconcile,`,
-          `      {Map<String, Object?> rest = const {}}) async {`,
-          `    await _client.${helper}(_details, reconcile(versions), rest: rest);`,
-          `  }`,
-          `}`,
-          ``,
-          `/// This disagreement remains pending because the business model cannot yet compare every`,
-          `/// retained version. Unrelated work continues; update the model's evolution policy to unlock it.`,
-          `final class ${evolutionTypeName} extends ${pendingClass} {`,
-          `  final ${rowClass} _details;`,
-          `  const ${evolutionTypeName}._(this._details);`,
-          `  @override String get aggregateId => _details.aggregateId;`,
-          `  @override String get field => _details.field;`,
-          `  String get reason => _details.evolution?['reason']?.toString() ??`,
-          `      'The business model cannot yet compare every retained version. Update its evolution policy; unrelated work can continue.';`,
-          `}`,
-          ``
-        );
-      }
-      conflictDeclarations.push(
-        `final class ${aggregateClass} {`,
-        `  final ${client} _client;`,
-        `  const ${aggregateClass}._(this._client);`,
-        `  Future<List<${pendingClass}>> pending() async {`,
-        `    final rows = await _client._pendingConflictRows(${JSON.stringify(
-          runtimeAggregateType
-        )});`,
-        `    final decisions = <${pendingClass}>[];`,
-        `    for (final row in rows) {`,
-        `      switch (row.field) {`,
-        ...bindings.flatMap((binding) => {
-          if (
-            binding.valuePayloadField === undefined ||
-            binding.idPayloadField === undefined
-          )
-            return [];
-          const typeName = `${aggregateName}${cap(
-            camel(binding.field)
-          )}Conflict`;
-          return [
-            `        case ${JSON.stringify(binding.field)}:`,
-            `          if (row.status == 'ready') {`,
-            `            decisions.add(${typeName}._(row, _client));`,
-            `          } else if (row.status == 'evolutionRequired') {`,
-            `            decisions.add(${typeName}ModelUpdateRequired._(row));`,
-            `          } else {`,
-            `            throw StateError('Nomos returned an unknown conflict status: \${row.status}');`,
-            `          }`,
-          ];
-        }),
-        `      }`,
-        `    }`,
-        `    return List.unmodifiable(decisions);`,
-        `  }`,
-        `}`,
-        ``
-      );
-    }
   }
 
   const addCollectionMember = (
@@ -850,10 +713,7 @@ export function generateDartApplication(
       path
         .split(".")
         .reduce((expr, part) => `${expr}.${member(part)}`, "facts");
-    const foreignInputs = dartForeignReferenceInputs(
-      directive,
-      mod.aggregates
-    );
+    const foreignInputs = dartForeignReferenceInputs(directive, mod.aggregates);
     // A generated input collapses a foreign `(workspace, id)` pair into one
     // NomosRef. Source-trust orchestration must follow that public shape too:
     // deriving the locator from the typed reference, rather than reaching for
@@ -880,33 +740,67 @@ export function generateDartApplication(
     };
     const trust = directive.businessSourceTrust;
     const method = member(directive.id);
-    const call = directive.targetBinding === undefined
-      ? `_client.${method}(facts)`
-      : `_client.${method}(target, facts)`;
+    const call =
+      directive.targetBinding === undefined
+        ? `_client.${method}(facts)`
+        : `_client.${method}(target, facts)`;
     if (trust === undefined) {
       return { prelude: [], call };
     }
-    const copied = Object.entries(trust.copy)
+    const copiedEntries = Object.entries(trust.copy)
       .sort(([a], [b]) => a.localeCompare(b))
-      .map(
-        ([target, field]) =>
-          `      ${JSON.stringify(target)}: ${factValue(field)},`
+    const copied = copiedEntries.map(
+        ([target, field]) => `        ${member(target)}: ${factValue(field)},`
+      );
+    const trustDirective = (mod.directives as AnyDirective[]).find(
+      (candidate) => candidate.id === trust.viaDirectiveId
+    );
+    if (trustDirective === undefined) {
+      throw new Error(
+        `Dart source-trust codegen: '${directive.id}' names missing trust directive '${trust.viaDirectiveId}'`
+      );
+    }
+    const trustFields = introspectPayload(
+      trustDirective.payloadSchema as z.ZodTypeAny,
+      enumDartTypes
+    );
+    const supplied = new Set([
+      ...copiedEntries.map(([target]) => target),
+      trust.genesisField,
+      trust.keyHashesField,
+    ]);
+    const missingRequired = trustFields.filter(
+      (field) => !supplied.has(field.name) && !field.optional
+    );
+    if (missingRequired.length > 0) {
+      throw new Error(
+        `Dart source-trust codegen: '${directive.id}' cannot construct '${trust.viaDirectiveId}'; ` +
+          `missing required typed field(s): ${missingRequired.map((field) => field.name).join(", ")}`
       );
+    }
+    const omittedOptionals = trustFields
+      .filter((field) => !supplied.has(field.name) && field.optional)
+      .map((field) => `        ${member(field.name)}: null,`);
+    const keyHashesType = trustFields.find(
+      (field) => field.name === trust.keyHashesField
+    )?.dartType;
+    const keyElementType = keyHashesType?.match(/^List<(.+)>$/)?.[1] ?? "Never";
     return {
       prelude: [
         `    final sourceGenesis = await _client.bridge.nomosWorkspaceGenesis(${factValue(
           trust.fromPayload
         )});`,
-        `    await _client._offer(`,
-        `      ${JSON.stringify(trust.viaDirectiveId)},`,
-        `      {`,
+        `    await _client.${dartInternalSourceTrustMethod(
+          trust.viaDirectiveId
+        )}((`,
         ...copied,
-        `        ${JSON.stringify(trust.genesisField)}: sourceGenesis,`,
-        `        ${JSON.stringify(trust.keyHashesField)}: [${JSON.stringify(
-          "0".repeat(64)
-        )}],`,
-        `      },`,
-        `    );`,
+        ...omittedOptionals,
+        `        ${member(trust.genesisField)}: sourceGenesis,`,
+        // Custody-native v2 proves the sibling by genesis + authenticated Git position and has no
+        // signing key. Never fabricate a v1 attestor identity; an operator must explicitly enroll
+        // real keys before a signed v1 read can pass.
+        `        ${member(trust.keyHashesField)}: const <${keyElementType}>[],`,
+        `      ));`,
       ],
       call,
     };
@@ -929,6 +823,7 @@ export function generateDartApplication(
       `  Future<void> redeemInvitation(String link) =>`,
       `      NmsInternalApplicationHost.redeemInvitation<User>(`,
       `        _client.bridge,`,
+      `        frameworkCalls: nomosInternalApplicationFrameworkCalls,`,
       `        link: link,`,
       `        identity: _client.actor,`,
       `        policies: [`,
@@ -965,7 +860,7 @@ export function generateDartApplication(
           ? `${keyType(
               pendingAggregate,
               pendingKey,
-              enumDartTypes,
+              enumDartTypes
             )}.fromWire(${JSON.stringify(policy.pendingValue)})`
           : JSON.stringify(policy.pendingValue);
       const person = sharingOrderValue(policy, policy.person, "wire");
@@ -977,12 +872,11 @@ export function generateDartApplication(
       ): string[] => {
         const condition = sharingReceiptCondition(policy, receipt);
         const body = [
-          `        await _client._offer(`,
-          `          ${JSON.stringify(receipt.records.id)},`,
-          `          <String, Object?>{`,
-          ...sharingReceiptPayload(policy, receipt, refused),
-          `          },`,
-          `        );`,
+          `        await _client.${dartInternalWorkspaceSharingReceiptMethod(
+            receipt.records.id
+          )}((`,
+          ...sharingReceiptPayload(policy, receipt, refused, enumDartTypes),
+          `        ));`,
           `        continue;`,
         ];
         // A receipt with no `when` is the policy's exhaustive fallback. Emitting `if (true)` makes both
@@ -1210,7 +1104,9 @@ export function generateDartApplication(
           `  /// Open the workspace named by a typed ${rootType} custody reference.`,
           `  /// The reference supplies identity and routing only; normal authority checks still apply.`,
           `  Future<${targetApplication}> openReference(NomosRef<${rootType}> reference) {`,
-          `    _nmsRequireReference(reference, ${JSON.stringify(birth.aggregateId)}, '');`,
+          `    _nmsRequireReference(reference, ${JSON.stringify(
+            birth.aggregateId
+          )}, '');`,
           `    return _nmsOpenReference(reference);`,
           `  }`,
           ``,
@@ -1368,24 +1264,57 @@ export function generateDartApplication(
       }
       continue;
     }
-    // Lowered cross-workspace governance births are framework implementation, never tenant actions.
-    if ((directive as { birthsChild?: boolean }).birthsChild === true) continue;
+    // Lowered cross-workspace governance births are framework implementation,
+    // never tenant actions. Generated framework tests and ceremonies still
+    // need one nominal path to their compiler-authored USDA encoder; otherwise
+    // they are forced back through a generic payload map. Keep that path out of
+    // the application object and package barrel, and make its framework-only
+    // status explicit in the generated symbol name.
+    if ((directive as { birthsChild?: boolean }).birthsChild === true) {
+      const method = member(directive.id);
+      internalFrameworkActionDeclarations.push(
+        `/// Framework-only typed entry point for the law-declared ${directive.id} birth effect.`,
+        `/// Generated infrastructure may use this; tenant applications do not receive it as an application member.`,
+        `Future<NomosOfferOutcome> nomosInternal${cap(camel(domain))}${cap(
+          camel(directive.id)
+        )}(`,
+        `    ${application} application, ${dartActionInputClassName(
+          directive
+        )} facts) =>`,
+        `    application._client.${method}(facts);`,
+        ``
+      );
+      continue;
+    }
 
     const method = member(directive.id);
     const payload = dartActionInputClassName(directive);
-    const targetOnly = directive.targetBinding !== undefined &&
-      introspectPayload(directive.payloadSchema as z.ZodTypeAny, new Map()).every(
+    const payloadSpecs = introspectPayload(
+      directive.payloadSchema as z.ZodTypeAny,
+      new Map(),
+    );
+    const emptyPayload = directive.targetBinding === undefined && payloadSpecs.length === 0;
+    const targetOnly =
+      directive.targetBinding !== undefined &&
+      payloadSpecs.every(
         (spec) =>
           spec.name === directive.targetBinding?.field ||
-          spec.name === directive.businessPrincipalField,
+          spec.name === directive.businessPrincipalField
       ) &&
       (directive.businessRecordInputs?.length ?? 0) === 0;
-    const targetParameter = directive.targetBinding === undefined
-      ? `${payload} facts`
-      : targetOnly
-      ? `NomosRef<${concreteClassName(directive.targetBinding.aggregateId)}> target`
-      : `NomosRef<${concreteClassName(directive.targetBinding.aggregateId)}> target, ${payload} facts`;
-    const factsPrelude = targetOnly ? [`    const facts = ${payload}();`] : [];
+    const targetParameter =
+      emptyPayload
+        ? ""
+        : directive.targetBinding === undefined
+        ? `${payload} facts`
+        : targetOnly
+        ? `NomosRef<${concreteClassName(
+            directive.targetBinding.aggregateId
+          )}> target`
+        : `NomosRef<${concreteClassName(
+            directive.targetBinding.aggregateId
+          )}> target, ${payload} facts`;
+    const factsPrelude = targetOnly || emptyPayload ? [`    const facts = ${payload}();`] : [];
     const referenceChecks = actionReferenceChecks(directive);
     const outputs = dartActionOutputs(directive, mod.aggregates);
     const resultClass = dartActionResultClassName(directive.id);
@@ -1520,7 +1449,10 @@ export function generateDartApplication(
     const model = readModelClassName(query.returns);
     const aggregate = aggregates.get(query.returns);
     const params = query.key
-      .map((key) => `required ${keyType(aggregate, key, enumDartTypes)} ${keyParam(key)}`)
+      .map(
+        (key) =>
+          `required ${keyType(aggregate, key, enumDartTypes)} ${keyParam(key)}`
+      )
       .join(", ");
     const args = query.key
       .map((key) => `${keyParam(key)}: ${keyParam(key)}`)
@@ -2026,9 +1958,7 @@ export function generateDartApplication(
     "_client = client",
     ...(tenantRoot ? ["currentUser = currentUser"] : []),
     `activity = ${activity}._(client)`,
-    ...(resolverBindings.length > 0
-      ? [`conflicts = ${cap(camel(domain))}Conflicts._(client)`]
-      : []),
+    ...(resolverBindings.length > 0 ? [`conflicts = client.conflicts`] : []),
     ...initializers,
   ];
   return [
@@ -2062,7 +1992,9 @@ export function generateDartApplication(
               ]
             : []),
           `import 'package:nomos_flutter/src/generated_application_host.dart' show ${
-            tenantRoot ? "ApplicationModelChange, NomosApplicationStartupState, " : ""
+            tenantRoot
+              ? "ApplicationModelChange, NomosApplicationStartupState, "
+              : ""
           }NmsInternalApplicationUserBinding${
             opts.flutterHost === true || sharingPolicies.length > 0
               ? ", NmsInternalApplicationHost"
@@ -2073,8 +2005,15 @@ export function generateDartApplication(
         ]
       : []),
     `import '${typesImport}';`,
+    ...(opts.applicationFrameworkCallsImportUri !== undefined
+      ? [
+          `import '${opts.applicationFrameworkCallsImportUri}' show nomosInternalApplicationFrameworkCalls;`,
+        ]
+      : []),
     ...[...explicitTypeImportUris].sort().map((uri) => `import '${uri}';`),
-    `import '${mod.name}.client.dart' show ${client};`,
+    `import '${mod.name}.client.dart' show ${client}${
+      resolverBindings.length > 0 ? `, ${cap(camel(domain))}Conflicts` : ""
+    };`,
     ...imports,
     ``,
     ...(tenantRoot
@@ -2155,6 +2094,9 @@ export function generateDartApplication(
           `    Duration startupTimeout = const Duration(minutes: 3),`,
           `  }) => NmsInternalApplicationHost.home<${application}>(`,
           `    key: key, cloud: cloud, application: application, signIn: signIn,`,
+          ...(opts.applicationFrameworkCallsImportUri === undefined
+            ? []
+            : [`    frameworkCalls: nomosInternalApplicationFrameworkCalls,`]),
           `    bind: nomosInternalBind${application}, builder: builder,`,
           `    loadingBuilder: loadingBuilder, errorBuilder: errorBuilder,`,
           `    onModelChange: onModelChange,`,
@@ -2165,6 +2107,7 @@ export function generateDartApplication(
       : []),
     `}`,
     ``,
+    ...internalFrameworkActionDeclarations,
     `/// The verified recent business activity of this application, newest first.`,
     `final class ${activity} {`,
     `  final ${client} _client;`,