@githolon/dsl 0.103.7 → 0.103.8

package/dart/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.64.7
+
+- Bound generated application startup and referenced-workspace opens, preserving typed custody failures and
+  retryable custody while keeping law adoption inside the generated lifecycle.
+- Preserve compound action output contracts through generated clients.
+
 ## 0.64.6
 
 - Publish the complete generated-application runtime already present in the coordinated source release,

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // <define:__NOMOS_KERNEL_RELEASE__>
-var define_NOMOS_KERNEL_RELEASE_default = { production: { hash: "79df1f00d23ed0f5dbcbf24071edf6e1667137d844248a40b456e13f4a85d176", version: "kernel-79df1f00", features: ["compoundKeys", "capturedReads", "invariantGate", "surfacedMerge", "fieldProvenance", "nullSemantics", "attestedReads", "conflictSnapshots", "ownedAudience"], protocol: 1 }, testMint: { hash: "9eac1a5907116c8c7adbd89799d513e4463ef2f127cb14367e05576096fcc228", version: "kernel-9eac1a59", features: ["compoundKeys", "capturedReads", "invariantGate", "surfacedMerge", "fieldProvenance", "nullSemantics", "attestedReads", "conflictSnapshots", "ownedAudience"], protocol: 1 } };
+var define_NOMOS_KERNEL_RELEASE_default = { production: { hash: "171bd538ffccfbf248b2b25962d44676cf78466d5da2dfa32c8618ba5f38bf45", version: "kernel-171bd538", features: ["compoundKeys", "capturedReads", "invariantGate", "surfacedMerge", "fieldProvenance", "nullSemantics", "attestedReads", "conflictSnapshots", "ownedAudience"], protocol: 1 }, testMint: { hash: "8b521aba87dd4dd54a81db9c3571c79ec5d0c600f84ca3796379fc5ba098068b", version: "kernel-8b521aba", features: ["compoundKeys", "capturedReads", "invariantGate", "surfacedMerge", "fieldProvenance", "nullSemantics", "attestedReads", "conflictSnapshots", "ownedAudience"], protocol: 1 } };
 
 // runner/node-entry.ts
 import { createInterface } from "node:readline";
@@ -2345,7 +2345,7 @@ function recommendedActionSentence(action) {
     case "recompileClient":
       return "recompile the client (githolon compile / npx nomos-compile) against the deployed law";
     case "redeployLaw":
-      return "redeploy the package (POST /v2/workspaces/<ws>/domains) so the workspace runs the client's law";
+      return "let the generated application prove, stage and govern adoption of its packaged law";
     case "reauth":
       return "re-authenticate (acquire a fresh auth-provider token) and reconnect";
     case "quarantineLocalSnapshotAndReclone":
@@ -8498,7 +8498,7 @@ function lawStatusOf(installed, clientHash) {
 function lawDriftMessage({ what, workspace, clientHash, installed }) {
   const short = (h) => `${String(h).slice(0, 12)}\u2026`;
   const runs = installed.length ? `runs law ${installed.slice(0, 6).map(short).join(", ")}${installed.length > 6 ? ` (+${installed.length - 6} more)` : ""}` : "has NO active law installed";
-  return `${what}: this client was generated under law ${short(clientHash)}, but workspace '${workspace}' ${runs} \u2014 the client and the workspace have drifted (or this domain was never deployed here). Recompile (githolon compile / npx nomos-compile) and redeploy the package (POST /v2/workspaces/${workspace}/domains), or regenerate the client against the deployed law (GET /v2/workspaces/${workspace}/domains names the hashes it runs). [law-drift]`;
+  return `${what}: this client was generated under law ${short(clientHash)}, but workspace '${workspace}' ${runs} \u2014 the client and the workspace have drifted (or this domain was never installed here). The generated application will now prove, stage and govern adoption of its packaged model; if adoption is refused it surfaces a typed model decision instead of requiring application code to deploy law. [law-drift]`;
 }
 function birthOutcomeFailure(birthOutcomes) {
   if (!Array.isArray(birthOutcomes)) return null;
@@ -8736,7 +8736,12 @@ ${String(commit).toLowerCase()}`;
     remoteMain = await resolveBranchHead().catch(() => null);
   } else {
     await writeSkeleton();
-    remoteMain = await fetchRemoteHead();
+    const _remoteStatus = span("receive", "boot: fetch remote status", "cloud-status");
+    try {
+      remoteMain = await fetchRemoteHead();
+    } finally {
+      _remoteStatus.end();
+    }
     if (!remoteMain) {
       _bootLedger.end();
       if (!allowUnborn) throw new Error(`workspace '${workspace}' has no ledger main \u2014 create it first (POST /v2/workspaces/${workspace})`);
@@ -8759,6 +8764,10 @@ ${String(commit).toLowerCase()}`;
   let cloudLedgerCache = null;
   const watchTicks = /* @__PURE__ */ new Set();
   const watchStops = /* @__PURE__ */ new Set();
+  let installedLawRowsCache;
+  const invalidateInstalledLawRows = () => {
+    installedLawRowsCache = void 0;
+  };
   let _disposed = false;
   const nudgeWatches = () => {
     try {
@@ -9025,25 +9034,29 @@ ${String(commit).toLowerCase()}`;
     }
   };
   const installRowsInner = () => {
+    if (installedLawRowsCache !== void 0) return installedLawRowsCache;
     try {
       const answer = JSON.parse(call("query", { queryBytes: qBytes({ op: "installedLaw" }) }));
-      if (Array.isArray(answer?.domains)) return answer.domains.map((domain) => ({
-        id: domain.installationId,
-        data: {
-          "spec.domainHash": domain.domainHash,
-          "spec.packageHash": domain.packageHash,
-          "spec.policyAggregate": domain.policyId,
-          "spec.installedBy": domain.installedBy,
-          "spec.authorityScope": domain.authorityScope,
-          "spec.supersedes": domain.supersedes,
-          "spec.lawClosureIdentity": domain.lawClosureIdentity,
-          "spec.dependencies": Array.isArray(domain.dependencies) ? domain.dependencies : [],
-          "spec.domainKeys": Array.isArray(domain.domainKeys) ? domain.domainKeys : [],
-          "status.phase": domain.phase,
-          "status.supersededBy": domain.supersededBy,
-          "metadata.generation": domain.generation
-        }
-      }));
+      if (Array.isArray(answer?.domains)) {
+        installedLawRowsCache = answer.domains.map((domain) => ({
+          id: domain.installationId,
+          data: {
+            "spec.domainHash": domain.domainHash,
+            "spec.packageHash": domain.packageHash,
+            "spec.policyAggregate": domain.policyId,
+            "spec.installedBy": domain.installedBy,
+            "spec.authorityScope": domain.authorityScope,
+            "spec.supersedes": domain.supersedes,
+            "spec.lawClosureIdentity": domain.lawClosureIdentity,
+            "spec.dependencies": Array.isArray(domain.dependencies) ? domain.dependencies : [],
+            "spec.domainKeys": Array.isArray(domain.domainKeys) ? domain.domainKeys : [],
+            "status.phase": domain.phase,
+            "status.supersededBy": domain.supersededBy,
+            "metadata.generation": domain.generation
+          }
+        }));
+        return installedLawRowsCache;
+      }
       if (typeof process !== "undefined" && process.env?.NOMOS_DEBUG_RAW) {
         console.error("[nomos] installedLaw meta-read returned no domains; using legacy projection fallback", answer);
       }
@@ -9053,10 +9066,11 @@ ${String(commit).toLowerCase()}`;
       }
     }
     try {
-      return JSON.parse(call("query", { queryBytes: qBytes({ kind: "query", queryId: "aggregatesByType", paramsJson: JSON.stringify({ __type: "DomainInstallation" }) }) })) || [];
+      installedLawRowsCache = JSON.parse(call("query", { queryBytes: qBytes({ kind: "query", queryId: "aggregatesByType", paramsJson: JSON.stringify({ __type: "DomainInstallation" }) }) })) || [];
     } catch {
-      return null;
+      installedLawRowsCache = null;
     }
+    return installedLawRowsCache;
   };
   const installedLawInner = () => {
     const rows = installRowsInner();
@@ -9226,6 +9240,7 @@ ${String(commit).toLowerCase()}`;
         }
       }
     }
+    invalidateInstalledLawRows();
     nudgeWatches();
     return {
       upToDate: false,
@@ -9857,6 +9872,9 @@ ${String(commit).toLowerCase()}`;
         created = Array.isArray(res.created) ? res.created : [];
         affected = Array.isArray(res.affected) ? res.affected : [];
       }
+      if ((domain === "nomos" || domain === "bootstrap") && ["installDomain", "stageDomain", "promoteDomain", "rollbackDomain"].includes(directiveId)) {
+        invalidateInstalledLawRows();
+      }
       scheduleMaintenanceSoon();
       nudgeWatchesSoon();
       const bornFailure = birthOutcomeFailure(res.birthOutcomes);
@@ -9880,7 +9898,7 @@ ${String(commit).toLowerCase()}`;
     if (!domain.trim() || !candidateHash.trim()) {
       return { ok: false, stage: "preflight", error: "the generated model identity is missing" };
     }
-    const candidateInstallation = installRowsInner().find(
+    const candidateInstallation = (installRowsInner() ?? []).find(
       (row) => row?.id === `domain-installation:${candidateHash}`
     );
     const candidatePhase = String(candidateInstallation?.data?.["status.phase"] ?? "");

package/dart/lib/src/runner/offline-install.mjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 };
 
 // <define:__NOMOS_KERNEL_RELEASE__>
-var define_NOMOS_KERNEL_RELEASE_default = { production: { hash: "79df1f00d23ed0f5dbcbf24071edf6e1667137d844248a40b456e13f4a85d176", version: "kernel-79df1f00", features: ["compoundKeys", "capturedReads", "invariantGate", "surfacedMerge", "fieldProvenance", "nullSemantics", "attestedReads", "conflictSnapshots", "ownedAudience"], protocol: 1 }, testMint: { hash: "9eac1a5907116c8c7adbd89799d513e4463ef2f127cb14367e05576096fcc228", version: "kernel-9eac1a59", features: ["compoundKeys", "capturedReads", "invariantGate", "surfacedMerge", "fieldProvenance", "nullSemantics", "attestedReads", "conflictSnapshots", "ownedAudience"], protocol: 1 } };
+var define_NOMOS_KERNEL_RELEASE_default = { production: { hash: "171bd538ffccfbf248b2b25962d44676cf78466d5da2dfa32c8618ba5f38bf45", version: "kernel-171bd538", features: ["compoundKeys", "capturedReads", "invariantGate", "surfacedMerge", "fieldProvenance", "nullSemantics", "attestedReads", "conflictSnapshots", "ownedAudience"], protocol: 1 }, testMint: { hash: "8b521aba87dd4dd54a81db9c3571c79ec5d0c600f84ca3796379fc5ba098068b", version: "kernel-8b521aba", features: ["compoundKeys", "capturedReads", "invariantGate", "surfacedMerge", "fieldProvenance", "nullSemantics", "attestedReads", "conflictSnapshots", "ownedAudience"], protocol: 1 } };
 
 // runner/offline-install.ts
 import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, existsSync } from "node:fs";

package/dart/pubspec.lock

@@ -191,7 +191,7 @@ packages:
       path: "../dart_types"
       relative: true
     source: path
-    version: "0.8.3"
+    version: "0.8.4"
   package_config:
     dependency: "direct main"
     description:

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.6
+version: 0.64.7
 
 environment:
   sdk: ^3.5.0
@@ -16,7 +16,7 @@ dependencies:
   # The pure-data core (wire types, offer codec, NomosReads, schema validation, error
   # info). nomos_client depends on and re-exports it, so existing imports are unchanged.
   # For local monorepo dev, pubspec_overrides.yaml points this at ../dart_types.
-  nomos_types: ^0.8.3
+  nomos_types: ^0.8.4
   json_schema: ^5.2.2
   crypto: ^3.0.0
   package_config: ^2.1.0

package/dart/test/errors_test.dart

@@ -92,6 +92,16 @@ void main() {
     expect(a.recommendedAction, NomosRecommendedAction.reauth);
   });
 
+  test('law adoption advice keeps cloud deployment inside generated runtime',
+      () {
+    final advice =
+        NomosRecommendedAction.sentence(NomosRecommendedAction.redeployLaw);
+    expect(advice, contains('generated application'));
+    expect(advice, contains('govern adoption'));
+    expect(advice, isNot(contains('POST')));
+    expect(advice, isNot(contains('/v2/workspaces')));
+  });
+
   test('load.* mints LoadError carrying the artifact + source URL', () {
     final e = nomosErrorFromInfo(info('nomos.load.wasm_fetch_failed', attrs: {
       'nomos.load.artifact': 'holon.wasm',

package/dart_types/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.8.4
+
+- Expose bounded generated-startup and referenced-workspace custody failures as typed data so applications
+  can render and retry the exact kernel refusal instead of remaining on an indefinite loading surface.
+
 ## 0.8.3
 
 - Add the typed `GitObjectId` value used to identify immutable custody objects without falling back to

package/dart_types/lib/src/errors.dart

@@ -51,7 +51,9 @@ class NomosRecommendedAction {
   /// Regenerate the typed client against the deployed law (`githolon compile` / `npx nomos-compile`).
   static const recompileClient = 'recompileClient';
 
-  /// Redeploy the client's law package to the workspace (`POST /v2/workspaces/<ws>/domains`).
+  /// Ask the generated application to govern adoption of its packaged law.
+  /// The stable value retains its original spelling for wire compatibility;
+  /// application code must not implement deployment itself.
   static const redeployLaw = 'redeployLaw';
 
   /// Re-acquire a fresh auth-provider token and reconnect.
@@ -98,7 +100,7 @@ class NomosRecommendedAction {
       case recompileClient:
         return 'recompile the client (githolon compile / npx nomos-compile) against the deployed law';
       case redeployLaw:
-        return 'redeploy the package (POST /v2/workspaces/<ws>/domains) so the workspace runs the client\'s law';
+        return 'let the generated application prove, stage and govern adoption of its packaged law';
       case reauth:
         return 're-authenticate (acquire a fresh auth-provider token) and reconnect';
       case quarantineLocalSnapshotAndReclone:

package/dart_types/pubspec.yaml

@@ -7,9 +7,9 @@ name: nomos_types
 repository: https://github.com/Captain-App/nomos2
 description: >-
   Pure kernel wire/data types for Nomos Dart frontends — no transport, no bridge,
-  no runtime. The hand-written serde-JSON-compatible types plus the offer codec,
+  no runtime. Typed protobuf and USDA boundary values plus the offer codec,
   reactive read engine, schema validation, and data-only error/trace types.
-version: 0.8.3
+version: 0.8.4
 
 environment:
   sdk: ^3.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@githolon/dsl",
-  "version": "0.103.7",
+  "version": "0.103.8",
   "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/runtime/generated-application-host.js

@@ -1404,7 +1404,7 @@ function recommendedActionSentence(action) {
     case "recompileClient":
       return "recompile the client (githolon compile / npx nomos-compile) against the deployed law";
     case "redeployLaw":
-      return "redeploy the package (POST /v2/workspaces/<ws>/domains) so the workspace runs the client's law";
+      return "let the generated application prove, stage and govern adoption of its packaged law";
     case "reauth":
       return "re-authenticate (acquire a fresh auth-provider token) and reconnect";
     case "quarantineLocalSnapshotAndReclone":
@@ -7557,7 +7557,7 @@ function lawStatusOf(installed, clientHash) {
 function lawDriftMessage({ what, workspace, clientHash, installed }) {
   const short = (h) => `${String(h).slice(0, 12)}\u2026`;
   const runs = installed.length ? `runs law ${installed.slice(0, 6).map(short).join(", ")}${installed.length > 6 ? ` (+${installed.length - 6} more)` : ""}` : "has NO active law installed";
-  return `${what}: this client was generated under law ${short(clientHash)}, but workspace '${workspace}' ${runs} \u2014 the client and the workspace have drifted (or this domain was never deployed here). Recompile (githolon compile / npx nomos-compile) and redeploy the package (POST /v2/workspaces/${workspace}/domains), or regenerate the client against the deployed law (GET /v2/workspaces/${workspace}/domains names the hashes it runs). [law-drift]`;
+  return `${what}: this client was generated under law ${short(clientHash)}, but workspace '${workspace}' ${runs} \u2014 the client and the workspace have drifted (or this domain was never installed here). The generated application will now prove, stage and govern adoption of its packaged model; if adoption is refused it surfaces a typed model decision instead of requiring application code to deploy law. [law-drift]`;
 }
 function birthOutcomeFailure(birthOutcomes) {
   if (!Array.isArray(birthOutcomes)) return null;
@@ -7795,7 +7795,12 @@ ${String(commit).toLowerCase()}`;
     remoteMain = await resolveBranchHead().catch(() => null);
   } else {
     await writeSkeleton();
-    remoteMain = await fetchRemoteHead();
+    const _remoteStatus = span("receive", "boot: fetch remote status", "cloud-status");
+    try {
+      remoteMain = await fetchRemoteHead();
+    } finally {
+      _remoteStatus.end();
+    }
     if (!remoteMain) {
       _bootLedger.end();
       if (!allowUnborn) throw new Error(`workspace '${workspace}' has no ledger main \u2014 create it first (POST /v2/workspaces/${workspace})`);
@@ -7818,6 +7823,10 @@ ${String(commit).toLowerCase()}`;
   let cloudLedgerCache = null;
   const watchTicks = /* @__PURE__ */ new Set();
   const watchStops = /* @__PURE__ */ new Set();
+  let installedLawRowsCache;
+  const invalidateInstalledLawRows = () => {
+    installedLawRowsCache = void 0;
+  };
   let _disposed = false;
   const nudgeWatches = () => {
     try {
@@ -8084,25 +8093,29 @@ ${String(commit).toLowerCase()}`;
     }
   };
   const installRowsInner = () => {
+    if (installedLawRowsCache !== void 0) return installedLawRowsCache;
     try {
       const answer = JSON.parse(call("query", { queryBytes: qBytes({ op: "installedLaw" }) }));
-      if (Array.isArray(answer?.domains)) return answer.domains.map((domain) => ({
-        id: domain.installationId,
-        data: {
-          "spec.domainHash": domain.domainHash,
-          "spec.packageHash": domain.packageHash,
-          "spec.policyAggregate": domain.policyId,
-          "spec.installedBy": domain.installedBy,
-          "spec.authorityScope": domain.authorityScope,
-          "spec.supersedes": domain.supersedes,
-          "spec.lawClosureIdentity": domain.lawClosureIdentity,
-          "spec.dependencies": Array.isArray(domain.dependencies) ? domain.dependencies : [],
-          "spec.domainKeys": Array.isArray(domain.domainKeys) ? domain.domainKeys : [],
-          "status.phase": domain.phase,
-          "status.supersededBy": domain.supersededBy,
-          "metadata.generation": domain.generation
-        }
-      }));
+      if (Array.isArray(answer?.domains)) {
+        installedLawRowsCache = answer.domains.map((domain) => ({
+          id: domain.installationId,
+          data: {
+            "spec.domainHash": domain.domainHash,
+            "spec.packageHash": domain.packageHash,
+            "spec.policyAggregate": domain.policyId,
+            "spec.installedBy": domain.installedBy,
+            "spec.authorityScope": domain.authorityScope,
+            "spec.supersedes": domain.supersedes,
+            "spec.lawClosureIdentity": domain.lawClosureIdentity,
+            "spec.dependencies": Array.isArray(domain.dependencies) ? domain.dependencies : [],
+            "spec.domainKeys": Array.isArray(domain.domainKeys) ? domain.domainKeys : [],
+            "status.phase": domain.phase,
+            "status.supersededBy": domain.supersededBy,
+            "metadata.generation": domain.generation
+          }
+        }));
+        return installedLawRowsCache;
+      }
       if (typeof process !== "undefined" && process.env?.NOMOS_DEBUG_RAW) {
         console.error("[nomos] installedLaw meta-read returned no domains; using legacy projection fallback", answer);
       }
@@ -8112,10 +8125,11 @@ ${String(commit).toLowerCase()}`;
       }
     }
     try {
-      return JSON.parse(call("query", { queryBytes: qBytes({ kind: "query", queryId: "aggregatesByType", paramsJson: JSON.stringify({ __type: "DomainInstallation" }) }) })) || [];
+      installedLawRowsCache = JSON.parse(call("query", { queryBytes: qBytes({ kind: "query", queryId: "aggregatesByType", paramsJson: JSON.stringify({ __type: "DomainInstallation" }) }) })) || [];
     } catch {
-      return null;
+      installedLawRowsCache = null;
     }
+    return installedLawRowsCache;
   };
   const installedLawInner = () => {
     const rows = installRowsInner();
@@ -8285,6 +8299,7 @@ ${String(commit).toLowerCase()}`;
         }
       }
     }
+    invalidateInstalledLawRows();
     nudgeWatches();
     return {
       upToDate: false,
@@ -8916,6 +8931,9 @@ ${String(commit).toLowerCase()}`;
         created = Array.isArray(res.created) ? res.created : [];
         affected = Array.isArray(res.affected) ? res.affected : [];
       }
+      if ((domain === "nomos" || domain === "bootstrap") && ["installDomain", "stageDomain", "promoteDomain", "rollbackDomain"].includes(directiveId)) {
+        invalidateInstalledLawRows();
+      }
       scheduleMaintenanceSoon();
       nudgeWatchesSoon();
       const bornFailure = birthOutcomeFailure(res.birthOutcomes);
@@ -8939,7 +8957,7 @@ ${String(commit).toLowerCase()}`;
     if (!domain.trim() || !candidateHash.trim()) {
       return { ok: false, stage: "preflight", error: "the generated model identity is missing" };
     }
-    const candidateInstallation = installRowsInner().find(
+    const candidateInstallation = (installRowsInner() ?? []).find(
       (row) => row?.id === `domain-installation:${candidateHash}`
     );
     const candidatePhase = String(candidateInstallation?.data?.["status.phase"] ?? "");

package/src/codegen_dart_application.ts

@@ -284,7 +284,7 @@ function dartActionOutputs(
   const fields = new Set<string>();
   return outputs.map((output) => {
     const dartType = concreteClassName(output.aggregateId);
-    const field = member(dartType);
+    const field = member(output.many ? plural(dartType) : dartType);
     if (fields.has(field)) {
       throw new Error(
         `Dart application result for '${directive.id}' has two aggregate consequences named '${field}'; ` +
@@ -1140,7 +1140,11 @@ export function generateDartApplication(
           `  Future<${targetApplication}> _nmsOpenReference(NomosRef<${rootType}> reference) {`,
           `    final workspace = NmsInternalNomosRefs.workspace(reference);`,
           `    final existing = _nmsApplications[workspace];`,
-          `    if (existing != null) return existing;`,
+          `    if (existing != null) {`,
+          `      return NmsInternalApplicationHost.nmsInternalAwaitReferencedApplication(`,
+          `        workspace: workspace, opening: existing,`,
+          `      );`,
+          `    }`,
           `    late final Future<${targetApplication}> opened;`,
           `    opened = (() async {`,
           `      try {`,
@@ -1153,7 +1157,9 @@ export function generateDartApplication(
           `      }`,
           `    })();`,
           `    _nmsApplications[workspace] = opened;`,
-          `    return opened;`,
+          `    return NmsInternalApplicationHost.nmsInternalAwaitReferencedApplication(`,
+          `      workspace: workspace, opening: opened,`,
+          `    );`,
           `  }`,
           ``,
           `  /// Open the workspace named by a typed ${rootType} custody reference.`,
@@ -2080,7 +2086,7 @@ export function generateDartApplication(
           `    Widget Function(BuildContext context, Object error, VoidCallback retry)? errorBuilder,`,
           `    ApplicationModelChange? onModelChange,`,
           `    ValueChanged<NomosApplicationStartupState>? onStartupStateChanged,`,
-          `    Duration startupTimeout = const Duration(seconds: 45),`,
+          `    Duration startupTimeout = const Duration(minutes: 3),`,
           `  }) => NmsInternalApplicationHost.home<${application}>(`,
           `    key: key, cloud: cloud, application: application, signIn: signIn,`,
           `    bind: nomosInternalBind${application}, builder: builder,`,

package/src/compile_package_main.ts

@@ -1642,12 +1642,12 @@ const dartTypesImportFor = (generatedSource: string): string => {
  *  just the floor generated code needs — a lagging pin forces tenants into dependency_overrides. */
 // 0.3.0: SurfacedValue<T>/SurfacedObservation/PendingConflictRow — generated Surfaced-field typing +
 //        the pendingConflicts read rows.
-const NOMOS_TYPES_DEP = "^0.8.3";
+const NOMOS_TYPES_DEP = "^0.8.4";
 // 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.6";
-const NOMOS_FLUTTER_DEP = "^0.63.9";
+const NOMOS_CLIENT_DEP = "^0.64.7";
+const NOMOS_FLUTTER_DEP = "^0.63.10";
 // 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).
@@ -1917,14 +1917,25 @@ function generatedPackageApplication(
     `  /// Prove, adopt or restore the package law against this workspace's exact history.`,
     `  ${rootMember.prefix}.NomosModel get model => ${rootMember.member}.model;`,
     ``,
-    `  /// Current durability and convergence across this business application.`,
-    `  ApplicationStatus get currentStatus => NmsInternalApplicationHost.currentApplicationStatus(_nmsSession);`,
+    `  /// Current durability and convergence for the receiving-group workspace.`,
+    `  /// A slow or offline sibling never makes this workspace's readiness ambiguous.`,
+    `  ApplicationStatus get currentStatus => NmsInternalApplicationHost.currentStatus(_nmsSession);`,
     ``,
-    `  /// React whenever this application saves, receives work, goes offline or needs attention.`,
-    `  Stream<ApplicationStatus> watchStatus() => NmsInternalApplicationHost.watchApplicationStatus(_nmsSession);`,
+    `  /// React whenever this receiving group saves, receives work, goes offline or needs attention.`,
+    `  Stream<ApplicationStatus> watchStatus() => NmsInternalApplicationHost.watchStatus(_nmsSession);`,
     ``,
-    `  /// Wait until accepted local work is in shared custody and this application has caught up.`,
+    `  /// Wait until this receiving group's accepted work is in custody and caught up.`,
     `  Future<void> whenCurrent({Duration timeout = const Duration(minutes: 2)}) =>`,
+    `      NmsInternalApplicationHost.whenCurrent(_nmsSession, timeout: timeout);`,
+    ``,
+    `  /// Aggregate posture across every child currently owned by this generated application.`,
+    `  ApplicationStatus get applicationStatus => NmsInternalApplicationHost.currentApplicationStatus(_nmsSession);`,
+    ``,
+    `  /// React to aggregate posture across every generated child currently in this application plane.`,
+    `  Stream<ApplicationStatus> watchApplicationStatus() => NmsInternalApplicationHost.watchApplicationStatus(_nmsSession);`,
+    ``,
+    `  /// Explicitly wait for every generated child currently owned by this application.`,
+    `  Future<void> whenApplicationCurrent({Duration timeout = const Duration(minutes: 2)}) =>`,
     `      NmsInternalApplicationHost.whenApplicationCurrent(_nmsSession, timeout: timeout);`,
     ...(hasInvitations
       ? [
@@ -1973,7 +1984,7 @@ function generatedPackageApplication(
     `    Widget Function(BuildContext context, Object error, VoidCallback retry)? errorBuilder,`,
     `    ApplicationModelChange? onModelChange,`,
     `    ValueChanged<NomosApplicationStartupState>? onStartupStateChanged,`,
-    `    Duration startupTimeout = const Duration(seconds: 45),`,
+    `    Duration startupTimeout = const Duration(minutes: 3),`,
     `  }) => NmsInternalApplicationHost.home<${application}>(`,
     `    key: key, cloud: cloud, application: application, signIn: signIn,`,
     `    bind: nomosInternalBind${application}, builder: builder,`,
@@ -2544,7 +2555,8 @@ function emitDartPackages(
     "library;",
     "",
     `export 'package:${packages.types}/${genRel}/${businessSharedFile}';`,
-    `export 'package:nomos_flutter/src/generated_application_host.dart' show ApplicationModelApproval, ApplicationModelDecision, ApplicationModelPolicy, ApplicationModelReview;`,
+    `export 'package:nomos_flutter/src/generated_application_host.dart' show ApplicationModelApproval, ApplicationModelDecision, ApplicationModelPolicy, ApplicationModelReview, NomosApplicationStartupPhase, NomosApplicationStartupState, NomosApplicationStartupTimeout, NomosWorkspaceOpenTimeout;`,
+    `export 'package:nomos_types/nomos_types.dart' show CustodyError, CustodyPhase, CustodySource, NomosRecommendedAction;`,
     ...tenantTypesExportKeys
       .map((file) => {
         const names = tenantDartExportNames(typesSources.get(file) ?? "");

package/src/intent.ts

@@ -9,6 +9,7 @@
 import type { z } from "zod";
 
 import type {
+  BusinessSourceTrust,
   Directive,
   PreconditionDescriptor,
   ReferentialMarker,
@@ -233,11 +234,38 @@ function unsupportedKernelGate(directive: Directive<any>): string | undefined {
   if (directive.delegatedRoleGate !== undefined) return "delegated authority";
   if (directive.firstDeviceEnrollGate !== undefined) return "first-device enrollment";
   if (directive.certifiesEraGate !== undefined) return "era certification";
-  if (directive.businessSourceTrust !== undefined) return "source-trust preflight";
   if ((directive.businessRecordInputs?.length ?? 0) > 0) return "record-input binding";
   return undefined;
 }
 
+function remapBusinessSourceTrust<I>(
+  step: IntentStep<I, any>,
+  trust: BusinessSourceTrust,
+): BusinessSourceTrust {
+  const field = (privatePath: string): string => {
+    const mapped = remapStepPayloadPath(step, privatePath.split("."));
+    if (mapped === undefined || mapped.length === 0) {
+      throw new Error(
+        `compound intent cannot remap source-trust field '${privatePath}' from '${step.directive.id}'`,
+      );
+    }
+    return mapped.join(".");
+  };
+  return {
+    viaDirectiveId: trust.viaDirectiveId,
+    fromPayload: field(trust.fromPayload),
+    queryId: trust.queryId,
+    queryArgs: Object.fromEntries(
+      Object.entries(trust.queryArgs).map(([target, source]) => [target, field(source)]),
+    ),
+    copy: Object.fromEntries(
+      Object.entries(trust.copy).map(([target, source]) => [target, field(source)]),
+    ),
+    genesisField: trust.genesisField,
+    keyHashesField: trust.keyHashesField,
+  };
+}
+
 const dedupeBy = <T>(values: readonly T[], key: (value: T) => string): T[] => {
   const out: T[] = [];
   const seen = new Set<string>();
@@ -333,24 +361,44 @@ class IntentBuilder<I> {
 
     const primary = this.steps.find((step) => step.directive.birthsChild !== true)?.directive
       ?? this.steps[0]!.directive;
-    const outputs: SecondaryOutput[] = [];
-    for (const [index, step] of this.steps.entries()) {
+    const allOutputs: SecondaryOutput[] = [];
+    for (const step of this.steps) {
       const candidate = step.directive;
-      if (
-        candidate.birthsChild !== true &&
-        candidate !== primary &&
-        !(candidate.aggregateId === primary.aggregateId && candidate.marker === primary.marker)
-      ) {
-        outputs.push({ aggregateId: candidate.aggregateId, marker: candidate.marker });
+      if (candidate.birthsChild !== true) {
+        allOutputs.push({
+          aggregateId: candidate.aggregateId,
+          marker: candidate.marker,
+          ...(candidate.outputCardinality === "many" ? { many: true } : {}),
+          ...(candidate.outputCardinality === "optional" ? { optional: true } : {}),
+        });
+        allOutputs.push(...(candidate.secondaryOutputs ?? []));
       }
-      if (candidate.birthsChild !== true) outputs.push(...(candidate.secondaryOutputs ?? []));
     }
-    const secondaryOutputs = dedupeBy(
-      outputs.filter(
-        (output) => !(output.aggregateId === primary.aggregateId && output.marker === primary.marker),
-      ),
-      (output) => `${output.marker}\0${output.aggregateId}`,
+    const outputGroups = new Map<string, SecondaryOutput[]>();
+    for (const output of allOutputs) {
+      const key = `${output.marker}\0${output.aggregateId}`;
+      outputGroups.set(key, [...(outputGroups.get(key) ?? []), output]);
+    }
+    const composedOutput = (group: readonly SecondaryOutput[]): SecondaryOutput => ({
+      aggregateId: group[0]!.aggregateId,
+      marker: group[0]!.marker,
+      ...(group.length > 1 || group.some((output) => output.many === true)
+        ? { many: true }
+        : group[0]!.optional === true
+        ? { optional: true }
+        : {}),
+    });
+    const primaryOutput = composedOutput(
+      outputGroups.get(`${primary.marker}\0${primary.aggregateId}`) ?? [{
+        aggregateId: primary.aggregateId,
+        marker: primary.marker,
+      }],
     );
+    const secondaryOutputs = [...outputGroups.values()]
+      .map(composedOutput)
+      .filter(
+        (output) => !(output.aggregateId === primary.aggregateId && output.marker === primary.marker),
+      );
     const inferredReturns = [
       primary.aggregateId,
       ...secondaryOutputs.map((output) => output.aggregateId),
@@ -421,6 +469,16 @@ class IntentBuilder<I> {
       }
     }
     const relationGate = oneStaticRelationGate(this.steps);
+    const sourceTrusts = this.steps.flatMap((step) =>
+      step.directive.businessSourceTrust === undefined
+        ? []
+        : [remapBusinessSourceTrust(step, step.directive.businessSourceTrust)],
+    );
+    if (sourceTrusts.length > 1) {
+      throw new Error(
+        `intent('${this.id}') composes more than one source-trust preflight — split the business action by source`,
+      );
+    }
     const steps = [...this.steps];
     const plan = (facts: I, ctx: Ports): PlannedOp[] => {
       const returned: PlannedOp[] = [];
@@ -455,8 +513,10 @@ class IntentBuilder<I> {
       // engine cannot rebuild its aggregate registry entry and silently drops
       // compound intents that also birth a child.
       ...(primary.aggregate === undefined ? {} : { aggregate: primary.aggregate }),
-      ...(primary.outputCardinality !== undefined
-        ? { outputCardinality: primary.outputCardinality }
+      ...(primaryOutput.many === true
+        ? { outputCardinality: "many" as const }
+        : primaryOutput.optional === true
+        ? { outputCardinality: "optional" as const }
         : {}),
       ...(secondaryOutputs.length > 0 ? { secondaryOutputs } : {}),
       payloadSchema: (birthSteps[0]?.directive.payloadSchema ?? this.contractDeclaration.accepts) as unknown as z.ZodType<I>,
@@ -475,6 +535,9 @@ class IntentBuilder<I> {
       ].sort(),
       ...(preconditions.length > 0 ? { preconditions } : {}),
       ...(relationGate !== undefined ? { requiresRelationGate: relationGate } : {}),
+      ...(sourceTrusts[0] === undefined
+        ? {}
+        : { businessSourceTrust: sourceTrusts[0] }),
       ...(businessBirth === undefined
         ? {}
         : {