@githolon/dsl 0.101.6 → 0.102.1

package/dart/test/cluster_attested_test.dart

@@ -9,8 +9,8 @@
 //   • NEGATIVE arm: offering `importListing` with that envelope BEFORE enrolling the catalogue refuses
 //     `AttestedReadUntrustedSource` — surfaced to Dart as a NomosBridgeError carrying that name.
 //   • HAPPY arm: enrol the source genesis + attestor key, offer `importListing` carrying the signed
-//     envelope, and read the imported row back through the TYPED EstateClient bound to `harness.session
-//     ('estate')` — proving a NomosSession satisfies the generated client's `NomosBridge` constructor.
+//     envelope, and read the imported row back through the generated EstateApplication bound to
+//     `harness.session('estate')`.
 @TestOn('vm')
 library;
 
@@ -18,23 +18,30 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:crypto/crypto.dart';
-import 'package:nomos_client/nomos_headless.dart';
+import 'package:nomos_client/src/nms_conformance_runtime.dart';
+import 'package:nomos_client/src/nms_generated_runtime.dart';
 import 'package:test/test.dart';
 
-// estate.client.dart re-exports estate.dart (payloads/read-models) AND the nomos_client symbols it needs
-// (NomosBridgeError, NomosBridge, …), so this one import carries the whole typed surface.
-import '../../../bench/scale/fixtures/catalogue-reader/build/dart/src/generated/estate.client.dart';
+// Framework acceptance tests may bind a generated application to an already-mounted harness session. The
+// raw client is a private `part` and is deliberately not importable, even here.
+import '../../../bench/scale/fixtures/catalogue-reader/build/dart/src/generated/estate.application.dart';
 
 String get _root => '${Directory.current.path}/../..';
 String get _repoEntry => '$_root/cloud/web-client/runner/node-entry.ts';
-String get _catDeploy => '$_root/bench/scale/fixtures/catalogue-src/build/cat.deploy.json';
-String get _estateDeploy => '$_root/bench/scale/fixtures/catalogue-reader/build/estate.deploy.json';
+String get _catDeploy =>
+    '$_root/bench/scale/fixtures/catalogue-src/build/cat.deploy.json';
+String get _estateDeploy =>
+    '$_root/bench/scale/fixtures/catalogue-reader/build/estate.deploy.json';
 String get _estateClientDart =>
-    '$_root/bench/scale/fixtures/catalogue-reader/build/dart/src/generated/estate.client.dart';
-String get _runtimeDir => '${Platform.environment['HOME'] ?? ''}/.holon/runtime';
+    '$_root/bench/scale/fixtures/catalogue-reader/build/dart/src/generated/estate.application.dart';
+String get _runtimeDir =>
+    Platform.environment['NOMOS_DART_RUNTIME'] ??
+    Platform.environment['NOMOS_OFFLINE_RUNTIME'] ??
+    '${Platform.environment['HOME'] ?? ''}/.holon/runtime';
 
 String? _missingPrereq() {
-  if (!File(_repoEntry).existsSync()) return 'in-repo runner not found at $_repoEntry';
+  if (!File(_repoEntry).existsSync())
+    return 'in-repo runner not found at $_repoEntry';
   for (final p in [_catDeploy, _estateDeploy, _estateClientDart]) {
     if (!File(p).existsSync()) {
       return 'compile the catalogue fixtures with dart output: '
@@ -55,7 +62,8 @@ String _keyHashOf(String base64Public) =>
     sha256.convert(base64Decode(base64Public)).toString();
 
 void main() {
-  test('cluster attested reads: colocated source served + signed → enrolled → typed import read back',
+  test(
+      'cluster attested reads: colocated source served + signed → enrolled → typed import read back',
       () async {
     final skip = _missingPrereq();
     if (skip != null) {
@@ -120,19 +128,21 @@ void main() {
       expect(sourceGenesis.length, greaterThanOrEqualTo(40),
           reason: 'the source genesis oid resolves off the signed envelope');
       expect(signingKey, harness.devicePublicKey('catalogue'),
-          reason: 'the read is signed by the source session device key the resolver will use');
+          reason:
+              'the read is signed by the source session device key the resolver will use');
 
       // The one importListing offer, offered TWICE (unenrolled then enrolled). ZERO injection: the payload
       // names `catalogueWs`, and the runner's colocation resolver serves+signs the foreign read IN-PROCESS —
       // NO `attestations` param. The gate judges the served envelope's genesis against the reader's allow-list.
-      Future<NomosOfferOutcome> importOnce(String importedAt) => estate.offerCreates(
+      Future<NomosOfferOutcome> importRawForFrameworkTest(String importedAt) =>
+          estate.offerCreates(
             domain: 'estate',
             directiveId: 'importListing',
-            payload: ImportListingPayload(
-              listingId: 'L-100',
-              catalogueWs: 'catalogue',
-              importedAt: importedAt,
-            ).toPayloadJson(),
+            payload: {
+              'listingId': 'L-100',
+              'catalogueWs': 'catalogue',
+              'importedAt': importedAt,
+            },
             actor: 'user:estate-owner',
           );
 
@@ -140,7 +150,9 @@ void main() {
       //    (the resolver still serves+signs; the gate refuses on the untrusted genesis).
       Object? negError;
       try {
-        await importOnce('2026-07-03T12:00:00Z');
+        // Deliberately raw: this framework test needs the refused kernel outcome itself. This is framework
+        // test instrumentation, not public API; tenant code gets only the generated application.
+        await importRawForFrameworkTest('2026-07-03T12:00:00Z');
       } catch (e) {
         negError = e;
       }
@@ -151,29 +163,34 @@ void main() {
 
       // 4. ENROL the catalogue: its genesis + the source device keyHash become folded law-state in the
       //    reader's own chain (typed write — the reader's own directive, no attestation).
-      final app = EstateClient(estate, actor: 'user:estate-owner');
-      final enrolled = await app.enrollCatalogue(EnrollCataloguePayload(
+      final app =
+          await nomosInternalBindEstateApplication(estate, 'user:estate-owner');
+      final enrolled =
+          await app.trustedCatalogues.enrollCatalogue(EnrollCataloguePayload(
         sourceGenesis: sourceGenesis,
         keyHashes: [keyHash],
         label: 'Acme Catalogue',
         enrolledAt: '2026-07-03T10:00:00Z',
       ));
-      expect(enrolled.head, isNotEmpty);
+      expect(NmsInternalNomosRefs.workspace(enrolled.trustedCatalogue), 'estate');
 
       // 5. HAPPY — the SAME zero-injection offer now admits: the resolver serves+signs, the gate judges the
       //    genesis against the folded allow-list, and the catalogue title lands on EstateListing.
-      final imported = await importOnce('2026-07-03T12:05:00Z');
-      expect(imported.head, isNotEmpty);
-      expect(imported.created, isNotEmpty,
-          reason: 'the importListing plan minted the EstateListing');
-      final createdId = imported.created.first.id;
-
-      // 6. TYPED read-back through the EstateClient bound to the estate SESSION (by the minted id).
-      final rows = await app.estateListingById(createdId);
-      expect(rows, isNotEmpty,
-          reason: 'the imported EstateListing reads back on the estate session');
-      final row = rows.first;
-      expect(row.title, 'Oak dresser',
+      final imported = await app.estateListings.importListing(
+        const ImportListingPayload(
+          listingId: 'L-100',
+          catalogueWs: 'catalogue',
+          importedAt: '2026-07-03T12:05:00Z',
+        ),
+      );
+      expect(NmsInternalNomosRefs.workspace(imported.estateListing), 'estate');
+
+      // 6. TYPED read-back through the generated application bound to the estate session.
+      final row = await app.estateListings.find(imported.estateListing);
+      expect(row, isNotNull,
+          reason:
+              'the imported EstateListing reads back on the estate session');
+      expect(row!.title, 'Oak dresser',
           reason: 'the imported title was read through the policy edge, typed');
       expect(row.catalogue, 'catalogue');
       expect(row.listingRef, 'L-100');

package/dart/test/cluster_births_test.dart

@@ -23,14 +23,17 @@ library;
 
 import 'dart:io';
 
-import 'package:nomos_client/nomos_headless.dart';
+import 'package:nomos_client/src/nms_conformance_runtime.dart';
 import 'package:test/test.dart';
 
 String get _root => '${Directory.current.path}/../..';
 String get _repoEntry => '$_root/cloud/web-client/runner/node-entry.ts';
 String get _birthDeploy =>
     '$_root/bench/scale/fixtures/estate-birth/build/estate-birth.deploy.json';
-String get _runtimeDir => '${Platform.environment['HOME'] ?? ''}/.holon/runtime';
+String get _runtimeDir =>
+    Platform.environment['NOMOS_DART_RUNTIME'] ??
+    Platform.environment['NOMOS_OFFLINE_RUNTIME'] ??
+    '${Platform.environment['HOME'] ?? ''}/.holon/runtime';
 
 String? _missingPrereq() {
   if (!File(_repoEntry).existsSync()) return 'in-repo runner not found at $_repoEntry';

package/dart/test/cluster_device_keyed_acceptance_test.dart

@@ -13,14 +13,17 @@ library;
 
 import 'dart:io';
 
-import 'package:nomos_client/nomos_headless.dart';
+import 'package:nomos_client/src/nms_conformance_runtime.dart';
 import 'package:test/test.dart';
 
 String get _root => '${Directory.current.path}/../..';
 String get _repoEntry => '$_root/cloud/web-client/runner/node-entry.ts';
 String get _catDeploy => '$_root/bench/scale/fixtures/catalogue-src/build/cat.deploy.json';
 String get _estateDeploy => '$_root/bench/scale/fixtures/catalogue-reader/build/estate.deploy.json';
-String get _runtimeDir => '${Platform.environment['HOME'] ?? ''}/.holon/runtime';
+String get _runtimeDir =>
+    Platform.environment['NOMOS_DART_RUNTIME'] ??
+    Platform.environment['NOMOS_OFFLINE_RUNTIME'] ??
+    '${Platform.environment['HOME'] ?? ''}/.holon/runtime';
 
 String? _missingPrereq() {
   if (!File(_repoEntry).existsSync()) return 'in-repo runner not found at $_repoEntry';

package/dart/test/cluster_local_autosync_test.dart

@@ -11,13 +11,16 @@ library;
 
 import 'dart:io';
 
-import 'package:nomos_client/nomos_headless.dart';
+import 'package:nomos_client/src/nms_conformance_runtime.dart';
 import 'package:test/test.dart';
 
 String get _root => '${Directory.current.path}/../..';
 String get _repoEntry => '$_root/cloud/web-client/runner/node-entry.ts';
 String get _guestbookDeploy => '$_root/examples/guestbook/build/guestbook.deploy.json';
-String get _runtimeDir => '${Platform.environment['HOME'] ?? ''}/.holon/runtime';
+String get _runtimeDir =>
+    Platform.environment['NOMOS_DART_RUNTIME'] ??
+    Platform.environment['NOMOS_OFFLINE_RUNTIME'] ??
+    '${Platform.environment['HOME'] ?? ''}/.holon/runtime';
 
 String? _missingPrereq() {
   if (!File(_repoEntry).existsSync()) return 'in-repo runner not found at $_repoEntry';

package/dart/test/cluster_scale_test.dart

@@ -11,13 +11,16 @@ library;
 
 import 'dart:io';
 
-import 'package:nomos_client/nomos_headless.dart';
+import 'package:nomos_client/src/nms_conformance_runtime.dart';
 import 'package:test/test.dart';
 
 String get _root => '${Directory.current.path}/../..';
 String get _repoEntry => '$_root/cloud/web-client/runner/node-entry.ts';
 String get _guestbookDeploy => '$_root/examples/guestbook/build/guestbook.deploy.json';
-String get _runtimeDir => '${Platform.environment['HOME'] ?? ''}/.holon/runtime';
+String get _runtimeDir =>
+    Platform.environment['NOMOS_DART_RUNTIME'] ??
+    Platform.environment['NOMOS_OFFLINE_RUNTIME'] ??
+    '${Platform.environment['HOME'] ?? ''}/.holon/runtime';
 
 /// How many colocated workspaces to open on the one plane. Dozens (CI-friendly), tunable via env for a
 /// heavier local soak (`NOMOS_SCALE_N=100 dart test test/cluster_scale_test.dart`).

package/dart/test/compat_test.dart

@@ -1,6 +1,6 @@
 // COMPAT SUPERPOWER (#72b) — the Dart mirror of `holon.compat`. NomosCompat.fromJson round-trips
 // the bridge's plain verdict snapshot; has() is the dark-launch feature flag over the per-member map.
-import 'package:nomos_client/nomos_client.dart';
+import 'package:nomos_client/src/nms_generated_runtime.dart';
 import 'package:test/test.dart';
 
 Map<String, Object?> verdict({

package/dart/test/dlq_session_surface_test.dart

@@ -15,7 +15,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:nomos_client/nomos_headless.dart';
+import 'package:nomos_client/src/nms_conformance_runtime.dart';
 import 'package:test/test.dart';
 
 String get _root => '${Directory.current.path}/../..';
@@ -24,6 +24,7 @@ String get _geoDeploy => '$_root/bench/scale/fixtures/estate-geo/build/estate-ge
 String get _docsDeploy => '$_root/bench/scale/fixtures/surfaced/build/surfaced.deploy.json';
 String get _runtimeDir =>
     Platform.environment['NOMOS_DART_RUNTIME'] ??
+    Platform.environment['NOMOS_OFFLINE_RUNTIME'] ??
     '${Platform.environment['HOME'] ?? ''}/.holon/runtime';
 
 String? _missingPrereq() {

package/dart/test/errors_test.dart

@@ -1,7 +1,7 @@
 // NOMOS — TYPED ERROR MINTING (§7 structured runtime error DX). `nomosErrorFromInfo` routes a structured
 // `NomosErrorInfo` to the MOST SPECIFIC typed class by stable code prefix, so an app's `errorBuilder` branches
 // on `is` and reads structured fields (not scraped prose). Every typed error still extends `NomosBridgeError`.
-import 'package:nomos_client/nomos_client.dart';
+import 'package:nomos_client/src/nms_generated_runtime.dart';
 import 'package:test/test.dart';
 
 NomosErrorInfo info(String code,

package/dart/test/first_app_gauntlet_test.dart

@@ -1,12 +1,13 @@
-// THE FIRST-FIVE-MINUTES GAUNTLET — one sequential journey through EVERYTHING the test harness +
-// session-bound client surface promises a NEW app developer, using ONLY the public API (the way a
-// tenant would). Every lifecycle bug co2 found in their first minutes (session watch delegation,
+// THE LOCAL-RUNTIME GAUNTLET — one sequential journey through the internal test harness and runtime
+// lifecycle beneath the generated application. Tenant DX is compiled and exercised separately by
+// dsl/src/dart_packages.test.ts through the generated application/scenario barrels; this file must not
+// pretend that framework-conformance setup is tenant API. Every lifecycle bug co2 found (session watch delegation,
 // local autoSync deadlock, the keyed-reconnect lane, …) has a leg here, so the NEXT one is found
 // by CI, not by a tenant.
 //
 // Structure: ONE test, numbered legs, fail-fast — a failure names its leg, so CI output reads as
-// a checklist. Its first act uses the one-business-birth CO2 example: the same tenant source and
-// generated client a real Flutter app consumes, never a harness-only birth recipe.
+// a checklist. Its first act drives the compiled CO2 law through the internal runtime lane solely to
+// establish the child workspace used by the remaining runtime checks.
 //
 // Prereqs (fixtures compiled + a warm ~/.holon/runtime): locally the test SKIPS with the recipe
 // when they are missing; in CI the job sets NOMOS_GAUNTLET_REQUIRED=1 so a missing prereq is a
@@ -16,11 +17,10 @@ library;
 
 import 'dart:io';
 
-import 'package:nomos_client/nomos_headless.dart';
+import 'package:nomos_client/src/nms_conformance_runtime.dart';
+import 'package:nomos_types/src/nomos_ref.dart' show NmsInternalNomosRefs;
 import 'package:test/test.dart';
 
-import '../../../examples/co2-birth/build/dart/src/generated/co2.client.dart';
-
 String get _root => '${Directory.current.path}/../..';
 String get _repoEntry => '$_root/cloud/web-client/runner/node-entry.ts';
 String get _homeDeploy => '$_root/examples/co2-birth/build/co2.deploy.json';
@@ -32,11 +32,16 @@ String get _readerDeploy =>
     '$_root/bench/scale/fixtures/catalogue-reader/build/estate.deploy.json';
 String get _runtimeDir =>
     Platform.environment['NOMOS_DART_RUNTIME'] ??
+    Platform.environment['NOMOS_OFFLINE_RUNTIME'] ??
     '${Platform.environment['HOME'] ?? ''}/.holon/runtime';
 
 const _owner = 'user:gauntlet-owner';
 const _keyed = 'catalogue';
 
+/// Phantom test-only aggregate type for the internal runtime locator below. Tenant code gets the real
+/// generated `NomosRef<Estate>` from its application package.
+final class _GauntletEstate {}
+
 String? _missingPrereq() {
   if (!File(_repoEntry).existsSync())
     return 'in-repo runner not found at $_repoEntry';
@@ -78,7 +83,7 @@ Future<T> _leg<T>(String name, Future<T> Function() body) async {
 
 void main() {
   test(
-      'THE FIRST-FIVE-MINUTES GAUNTLET: harness → blessed shape → local posture → '
+      'THE LOCAL-RUNTIME GAUNTLET: harness → law setup → local posture → '
       'acquire → reactive reads → attested read → diagnostics → disposal',
       () async {
     final required = Platform.environment['NOMOS_GAUNTLET_REQUIRED'] == '1';
@@ -137,61 +142,82 @@ void main() {
     });
 
     try {
-      // ── LEG 2: the blessed session-bound shape — one business birth, then Estate → Site → Asset
-      //    through the generated Dart client. Zero routing/security strings. ──
+      // ── LEG 2: internal conformance setup — establish Estate → Site → Asset directly against the
+      //    compiled law. The generated, business-only surface has its own compile-and-run proof. ──
       final home = harness.session('home');
       final bornEstate = await _leg(
-          'leg 2: generated business shape (Estate → Site → Asset)',
-          () async {
-        final homeClient = await Co2Client.bind(home, actor: _owner);
-        expect(homeClient.session!.workspace, home.workspace,
-            reason: 'inspectable session context');
-        final ref = await homeClient.birth(
-          NomosBirthEstatePayload(
-            reference: 'E-001',
-            name: 'Foundry',
-            country: 'GB',
-            baselineTonnesCo2e: 4200,
-          ),
+          'leg 2: internal CO2 law setup (Estate → Site → Asset)', () async {
+        final birth = await home.offerOutcome(
+          domain: 'co2',
+          directiveId: 'nomosBirthEstate',
+          payload: {
+            'reference': 'E-001',
+            'name': 'Foundry',
+            'country': 'GB',
+            'baselineTonnesCo2e': 4200,
+            'principal': _owner,
+            'bornAt': DateTime.now().toUtc().toIso8601String(),
+          },
+          actor: _owner,
+        );
+        expect(birth.born, hasLength(1));
+        final ref = NmsInternalNomosRefs.create<_GauntletEstate>(
+          workspace: birth.born.single,
+          type: 'Estate',
+          id: 'estate:self',
         );
-        expect(ref.workspace, startsWith('estate-'));
-        expect(ref.type, 'Estate');
+        expect(NmsInternalNomosRefs.workspace(ref), startsWith('estate-'));
+        expect(NmsInternalNomosRefs.type(ref), 'Estate');
 
         final estateSession = await harness.bridge.follow(
           ref,
           authorSecret: harness.deviceSecret(home.workspace),
         );
-        expect(estateSession.workspace, ref.workspace);
+        expect(estateSession.workspace, NmsInternalNomosRefs.workspace(ref));
 
-        final estateClient = await Co2Client.bind(estateSession, actor: _owner);
-        final rows = await estateClient.estateById(ref.id);
-        expect(rows, hasLength(1),
-            reason: 'the born business root reads back typed');
-        expect(rows.single.reference, 'E-001');
-        expect(rows.single.name, 'Foundry');
+        final rows =
+            await estateSession.queryById(NmsInternalNomosRefs.id(ref));
+        expect(rows, hasLength(1), reason: 'the born business root reads back');
+        final estateData = (rows.single['data'] as Map).cast<String, Object?>();
+        expect(estateData['reference'], 'E-001');
+        expect(estateData['name'], 'Foundry');
 
-        final siteOutcome = await estateClient.addSite(
-          AddSitePayload(estateId: ref.id, name: 'Trafford Depot'),
+        final siteOutcome = await estateSession.offerOutcome(
+          domain: 'co2',
+          directiveId: 'addSite',
+          payload: {'name': 'Trafford Depot'},
+          actor: _owner,
         );
-        final siteRef = siteOutcome.created.single.ref;
-        expect(siteRef.type, 'co2.Site');
-        final sites = await estateClient.sitesByEstate(estateId: ref.id);
+        final site = siteOutcome.created.single;
+        expect(site.type, 'co2.Site');
+        // An estate is the workspace boundary, so its Site records need no copied
+        // estateId foreign key. This framework test uses the primitive type read;
+        // tenant code gets estate.sites from the generated application.
+        final sites = await estateSession
+            .query('aggregatesByType', {'__type': 'co2.Site'});
         expect(sites, hasLength(1));
-        expect(sites.single.name, 'Trafford Depot');
+        final siteData = (sites.single['data'] as Map).cast<String, Object?>();
+        expect(siteData['name'], 'Trafford Depot');
 
-        final assetOutcome = await estateClient.addAsset(
-          AddAssetPayload(
-            siteId: siteRef.id,
-            name: 'Main electricity meter',
-            operationalStatus: 'commissioned',
-          ),
+        final assetOutcome = await estateSession.offerOutcome(
+          domain: 'co2',
+          directiveId: 'commissionAsset',
+          payload: {
+            'siteId': site.id,
+            'name': 'Main electricity meter',
+            'rfidQrIdentity': 'E20034120123456789012345',
+          },
+          actor: _owner,
         );
-        final assetRef = assetOutcome.created.single.ref;
-        expect(assetRef.type, 'co2.Asset');
-        final assets = await estateClient.assetsBySite(siteId: siteRef.id);
+        final asset = assetOutcome.created.single;
+        expect(asset.type, 'co2.Asset');
+        final assets =
+            await estateSession.query('assetsBySite', {'siteId': site.id});
         expect(assets, hasLength(1));
-        expect(assets.single.name, 'Main electricity meter');
-        expect(assets.single.operationalStatus?.valueOrNull, 'commissioned');
+        final assetData =
+            (assets.single['data'] as Map).cast<String, Object?>();
+        expect(assetData['name'], 'Main electricity meter');
+        expect(assetData['operationalStatus'], 'commissioned');
         return (session: estateSession, ref: ref);
       });
       final estate = bornEstate.session;
@@ -239,7 +265,8 @@ void main() {
       //    all deliver a FIRST SNAPSHOT (the 0.48.x dead-delegation class). ──
       await _leg('leg 5: session reactive reads emit their first snapshot',
           () async {
-        final raw = await estate.queryById(bornEstate.ref.id);
+        final raw =
+            await estate.queryById(NmsInternalNomosRefs.id(bornEstate.ref));
         final aggId = ((raw.single as Map)['id'] ?? '').toString();
         expect(aggId, isNotEmpty);
         final byId = await estate.watchById(aggId).first.timeout(
@@ -305,7 +332,7 @@ void main() {
           'leg 7: harness diagnostics (assertDomainInstalled / reset / seed)',
           () async {
         await harness.assertDomainInstalled(
-            workspace: estate.workspace, domain: Co2Client.interface.domain);
+            workspace: estate.workspace, domain: 'co2');
         // The negative arm names the active domains.
         await expectLater(
             harness.assertDomainInstalled(

package/dart/test/four_layer_nested_topology_test.dart

@@ -25,7 +25,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:crypto/crypto.dart' show sha256;
-import 'package:nomos_client/nomos_headless.dart';
+import 'package:nomos_client/src/nms_conformance_runtime.dart';
 import 'package:test/test.dart';
 
 String get _root => '${Directory.current.path}/../..';

package/dart/test/harness_phase_timeout_test.dart

@@ -9,7 +9,7 @@ library;
 
 import 'dart:io';
 
-import 'package:nomos_client/nomos_headless.dart';
+import 'package:nomos_client/src/nms_conformance_runtime.dart';
 import 'package:test/test.dart';
 
 String get _fixtures => '${Directory.current.path}/test/fixtures/wedge';

package/dart/test/home_parity_test.dart

@@ -1,9 +1,13 @@
-import 'package:nomos_client/nomos_client.dart';
+import 'package:nomos_client/src/nms_generated_runtime.dart';
 import 'package:test/test.dart';
+
 void main() {
-  test('homeNameOf matches the JS/law formula', () {
-    expect(homeNameOf('user:abc-123'), 'home-5094641143043f9281b6b9146cc345a254a5d3af');
-    expect(homeNameOf('user:abc-123').startsWith('home-'), isTrue);
-    expect(homeNameOf('user:abc-123').length, 45); // 'home-' + 40 hex
+  test('the private receiving-group address matches the JS/law formula', () {
+    expect(nmsInternalReceivingGroupNameOf('user:abc-123'),
+        'nomos-rg-5094641143043f9281b6b9146cc345a254a5d3af');
+    expect(
+        nmsInternalReceivingGroupNameOf('user:abc-123').startsWith('nomos-rg-'),
+        isTrue);
+    expect(nmsInternalReceivingGroupNameOf('user:abc-123').length, 49);
   });
 }

package/dart/test/local_sync_inert_test.dart

@@ -7,10 +7,10 @@ library;
 
 import 'dart:io';
 
-import 'package:nomos_client/nomos_headless.dart';
+import 'package:nomos_client/src/nms_conformance_runtime.dart';
 import 'package:test/test.dart';
 
-import '../../../bench/scale/fixtures/estate-birth/build/dart/src/generated/home.client.dart';
+import '../../../bench/scale/fixtures/estate-birth/build/dart/src/generated/home.application.dart';
 
 String get _root => '${Directory.current.path}/../..';
 String get _repoEntry => '$_root/cloud/web-client/runner/node-entry.ts';
@@ -18,6 +18,7 @@ String get _deployJson =>
     '$_root/bench/scale/fixtures/estate-birth/build/estate-birth.deploy.json';
 String get _runtimeDir =>
     Platform.environment['NOMOS_DART_RUNTIME'] ??
+    Platform.environment['NOMOS_OFFLINE_RUNTIME'] ??
     '${Platform.environment['HOME'] ?? ''}/.holon/runtime';
 
 const _workspace = 'estate-birth';
@@ -53,23 +54,30 @@ void main() {
     );
     try {
       final session = harness.session(_workspace);
-      final client = await HomeClient.bind(session, actor: _owner);
+      // This is a nomos_client runtime regression test, so the raw offer below is
+      // deliberate infrastructure setup. Tenant code imports the generated package
+      // application; it cannot import the private generated client implementation.
+      await nomosInternalBindHomeApplication(session, _owner);
 
       // 1-2. offer a write on the snapshot-opened local session.
-      final birth = await client.birthEstateWorkspace(
-        payload: BirthEstateWorkspacePayload(
-          owner: _owner,
-          frameworkHash: harness.frameworkHash!,
-          lawHash: harness.lawHashes(_workspace).first,
-          bornAt: DateTime.now().toUtc().toIso8601String(),
-        ),
+      final facts = BirthEstateWorkspacePayload(
+        owner: _owner,
+        frameworkHash: harness.frameworkHash!,
+        lawHash: harness.lawHashes(_workspace).first,
+        bornAt: DateTime.now().toUtc().toIso8601String(),
+      );
+      final birth = await session.offerOutcome(
+        domain: 'home',
+        directiveId: 'birthEstateWorkspace',
+        payload: facts.nmsInternalToPayloadJson(),
+        actor: _owner,
       );
       expect(birth.born, hasLength(1));
 
       // 3. Infrastructure assertion: inspect Nomos's private birth record through the raw harness session.
       // Generated tenant clients deliberately do not expose this framework query.
-      final before = await session
-          .query('birthRecordsByPrincipal', {'principal': _owner});
+      final before =
+          await session.query('birthRecordsByPrincipal', {'principal': _owner});
       expect(before, hasLength(1),
           reason: 'the offer must be readable BEFORE sync');
       final statusBefore = await session.custodyStatus();
@@ -86,8 +94,8 @@ void main() {
       expect(statusAfter.pendingLocalIntents, statusBefore.pendingLocalIntents,
           reason:
               'local-only sync must not consume/move pending local intents');
-      final after = await session
-          .query('birthRecordsByPrincipal', {'principal': _owner});
+      final after =
+          await session.query('birthRecordsByPrincipal', {'principal': _owner});
       expect(after, hasLength(1),
           reason:
               'local-only sync must be observationally inert — the row must still read');

package/dart/test/node_runner_transport_test.dart

@@ -6,8 +6,8 @@ library;
 
 import 'dart:io';
 
-import 'package:nomos_client/nomos_client.dart';
-import 'package:nomos_client/nomos_headless.dart';
+import 'package:nomos_client/src/nms_generated_runtime.dart';
+import 'package:nomos_client/src/nms_conformance_runtime.dart';
 import 'package:test/test.dart';
 
 String _repoEntry() {
@@ -25,7 +25,11 @@ void main() {
   late NomosBridge bridge;
 
   setUp(() async {
-    transport = await NodeRunnerTransport.start(entry: _repoEntry());
+    transport = await NodeRunnerTransport.start(
+      entry: _repoEntry(),
+      // An explicit packaged entry is self-contained; a stale discovery root must not become its cwd.
+      resolveFrom: '${Directory.systemTemp.path}/nomos-does-not-exist',
+    );
     bridge = NomosBridge(transport);
   });
 
@@ -41,8 +45,8 @@ void main() {
     await bridge.ready.timeout(const Duration(seconds: 15));
     await expectLater(
       bridge.head(),
-      throwsA(isA<NomosBridgeError>().having((e) => e.message, 'message',
-          contains('not connected'))),
+      throwsA(isA<NomosBridgeError>()
+          .having((e) => e.message, 'message', contains('not connected'))),
     );
   });
 

package/dart/test/null_slot_test.dart

@@ -1,4 +1,4 @@
-import 'package:nomos_client/nomos_client.dart';
+import 'package:nomos_client/src/nms_generated_runtime.dart';
 import 'package:test/test.dart';
 
 void main() {