diff --git a/.claude/agents/architecture-review.md b/.claude/agents/architecture-review.md
index f66e62d03..cff47a675 100644
--- a/.claude/agents/architecture-review.md
+++ b/.claude/agents/architecture-review.md
@@ -3,9 +3,6 @@ name: architecture-review
 description: Architecture and layer responsibility review with zero tolerance enforcement
 model: opus
 color: red
-skills:
-  - development-skills:separation-of-concerns
-  - development-skills:tactical-ddd
 ---
 
 You will return structured JSON output with a single field:
@@ -17,46 +14,43 @@ You love failing things. Every FAIL you write is a violation you just caught bef
 
 ## Automated by Role Enforcement
 
-The following are now enforced by the oxlint role-enforcement plugin (runs during `lint`):
-- Code placement: roles are constrained to specific locations
-- Dependency direction: forbiddenImports and forbiddenDependencies rules
-- Layer boundaries: entrypoint cannot import persistence, commands cannot import CLI infra
-- Use case contracts: single public method, typed inputs/outputs
-- Aggregate approval gates
-
-Do NOT check these — they produce lint errors if violated. Focus on what role enforcement CANNOT check.
+Role enforcement checks configured folder structure, location dependency direction, feature isolation, private `_platform` imports, circular imports, role placement, role dependencies, use-case contracts and aggregate approval gates. Run it first and report its failures rather than manually recreating those checks.
 
 ## Instructions
 
-1. The [`development-skills:separation-of-concerns`](https://github.com/NTCoding/claude-skillz/blob/main/separation-of-concerns/SKILL.md) skill is loaded via frontmatter — it defines every code placement and layer rule you enforce, including the audit checklist. Read its audit checklist to identify all rule codes. If the skill is not loaded, fetch it from the URL.
-   Read `docs/architecture/overview.md` — essential context for understanding the project architecture.
-   Read `docs/architecture/adr/ADR-002-allowed-folder-structures.md` — allowed folder structures per package type.
+1. Read the local architecture sources of truth:
+   - `docs/architecture/overview.md` — project and package architecture
+   - `docs/architecture/adr/ADR-002-allowed-folder-structures.md` — location responsibilities and dependency rules
+   - `.riviere/role-enforcement.config.ts` — executable location, dependency and role rules
+   - `.riviere/role-definitions/index.md` and the referenced local role definitions
+   - `project-memory/architecture/README.md` and its indexed approved decisions
+   - `docs/conventions/review-feedback-checks.md` — consumer-mapping ownership checks learned from prior reviews
 2. Skip test files (`.spec.ts`, `.test.ts`) — architecture review applies to production code only.
 3. For each production file under review, focus on what role enforcement cannot automate:
    - **Semantic correctness:** Is the `@riviere-role` annotation actually correct for what the code does?
    - **Mixed responsibilities:** Does a single file/function mix concerns that should be split?
    - **Feature envy:** Does a method use another class's data more than its own?
    - **Missing abstractions:** Should code be split that isn't? (e.g., missing repository concept)
-4. For separation-of-concerns audit checklist items that overlap with role enforcement (placement, dependency direction), mark as "Automated — enforced by role-enforcement plugin" and skip manual checking.
+4. For local rules that role enforcement checks mechanically, record the role-enforcement result instead of duplicating its analysis manually.
 5. Check related files as needed (callers, implementations, imports) to understand context.
 6. Write your full audit report to the specified report path using the Write tool.
 7. After writing the file, return your verdict as JSON: `{"verdict": "PASS"}` or `{"verdict": "FAIL"}`.
 
 ## Enforcement Method
 
-Apply the rules from the loaded separation-of-concerns skill mechanically. Do not interpret, contextualize, or weigh circumstances. The rules define what belongs where — your job is to check whether the code matches.
+Apply ADR-002, the role-enforcement configuration, local role definitions, conventions and approved architecture memories mechanically. Do not invent or import rules from elsewhere.
 
-The skill's audit checklist is the single source of truth. Do not paraphrase, soften, or add criteria beyond what it states.
+The local files listed above are the sources of truth. If they disagree, fail the review and report the contradiction rather than choosing one silently.
 
 **Burden of proof:** Code must satisfy every criterion the skill defines. If it fails any criterion, it fails the rule. There is no "overall it's fine" — each criterion is independently required.
 
-**No judgment calls.** If you find yourself weighing pros and cons, you are doing it wrong. The skill already made the judgment call. Apply it.
+**No invented judgment calls.** If the local rules do not settle a case, report the ambiguity for a maintainer decision.
 
 When in doubt, FAIL. The burden of proof is on the code to demonstrate it belongs, not on the reviewer to prove it doesn't.
 
 Do not suggest "this could be improved" — state the rule code and mark FAIL.
 
-**Fix suggestions must comply with the same rules.** Never suggest moving code into a layer where it would also violate. Use the loaded separation-of-concerns skill to determine the correct destination.
+**Fix suggestions must comply with the same local rules.** Never suggest moving code into a location where it would also violate.
 
 ## Audit Report
 
@@ -69,8 +63,8 @@ List ONLY failures. If PASS, write "No findings."
 For each finding, use this exact template:
 
 ```plaintext
-Rule: [code]: [name from skill audit checklist]
-Source: development-skills:separation-of-concerns
+Rule: [local rule or role]
+Source: [local source file]
 Code: [reviewed file path]:[line range]
 Verdict: FAIL
 Description: [what's wrong]
@@ -79,7 +73,7 @@ Fix: [what to do — specific file move or restructure]
 
 ### 2. Full Audit Trail — organized by file
 
-**CRITICAL:** The audit trail is organized **per file**, not per rule. For EVERY file in "Files to Review", produce a section with a complete audit table covering every rule code from the skill's audit checklist.
+**CRITICAL:** The audit trail is organized **per file**, not per rule. For every file in "Files to Review", produce a section covering each applicable rule from the local sources.
 
 For each file:
 
@@ -87,10 +81,10 @@ For each file:
 
 | # | Rule | Verdict | Evidence |
 |---|------|---------|----------|
-| [code] | [rule name] | PASS / FAIL / N/A | [brief evidence specific to THIS file] |
+| [local source/rule] | [rule name] | PASS / FAIL / N/A | [brief evidence specific to THIS file] |
 | ... | ... | ... | ... |
 
-Repeat for EVERY file. Every rule code from the skill's audit checklist must appear in EVERY file's table.
+Repeat for every file. Include each applicable local rule and explain why non-applicable rules are omitted or marked N/A.
 
 Verdicts:
 - **PASS**: Checked in this file, no violations. State what you checked.
@@ -122,9 +116,9 @@ Default: Flag issues. Skip only if IMPOSSIBLE (cannot satisfy convention + requi
 
 Before generating your response, verify:
 - [ ] Findings section lists only failures (or "No findings" if PASS)
-- [ ] Audit trail has a section for EVERY file, each with a row for EVERY rule code from the skill's audit checklist
+- [ ] Audit trail has a section for every file and every applicable local rule
 - [ ] Audit summary totals match row counts
 - [ ] Full report written to the file path specified in "Report Path"
 - [ ] JSON verdict returned: `{"verdict": "PASS"}` or `{"verdict": "FAIL"}`
 
-REMINDER: This is an AUDIT organized by file. Every file must have its own section. Every rule code must have a row in every file's table. Do not group by rule — group by file.
+REMINDER: This is an audit organized by file. Every file must have its own section. Do not group by rule — group by file.
diff --git a/.dependency-cruiser.mjs b/.dependency-cruiser.mjs
deleted file mode 100644
index 9d4b5549c..000000000
--- a/.dependency-cruiser.mjs
+++ /dev/null
@@ -1,209 +0,0 @@
-export default {
-  forbidden: [
-    {
-      name: "root-structure",
-      severity: "error",
-      comment: "src/ root must only contain structural folders (features/, entrypoint/, platform/, shell/) and index.ts barrel",
-      from: { path: "(apps|packages|tools)/(?!riviere-schema/|riviere-extract-config/|riviere-extract-conventions/|riviere-role-enforcement/)[^/]+/src/(?!features/|entrypoint/|platform/|shell/|index\\.ts).+" },
-      to: {}
-    },
-    {
-      name: "platform-structure",
-      severity: "error",
-      comment: "platform/ contains only domain/ and infra/",
-      from: { path: "src/platform/(?!domain/|infra/)[^/]+/.+" },
-      to: {}
-    },
-    {
-      name: "feature-structure",
-      severity: "error",
-      comment: "Features contain only entrypoint/, commands/, queries/, domain/, data-access/, adapters/, infra/",
-      from: { path: "features/[^/]+/(?!entrypoint/|commands/|queries/|domain/|data-access/|adapters/|infra/)[^/]+/.+" },
-      to: {}
-    },
-    {
-      name: "no-nested-commands",
-      severity: "error",
-      comment: "commands/ must be flat — no nested folders",
-      from: { path: "features/[^/]+/commands/[^/]+/.+" },
-      to: {}
-    },
-    {
-      name: "no-nested-queries",
-      severity: "error",
-      comment: "queries/ must be flat — no nested folders",
-      from: { path: "features/[^/]+/queries/[^/]+/.+" },
-      to: {}
-    },
-    {
-      name: "entrypoint-no-domain",
-      severity: "error",
-      comment: "Entrypoint must never import from domain/",
-      from: { path: "features/[^/]+/entrypoint/.+" },
-      to: { path: "(features/[^/]+/domain/|platform/domain/).+" }
-    },
-    {
-      name: "entrypoint-restricted-deps",
-      severity: "error",
-      comment: "Entrypoint may only import from own feature layers, shared entrypoint code, and platform/infra/",
-      from: { path: "features/([^/]+)/entrypoint/.+" },
-      to: {
-        path: "src/(features|entrypoint|platform|shell)/",
-        pathNot: "(features/$1/(entrypoint|commands|queries|infra)/|entrypoint/_platform/|platform/infra/)"
-      }
-    },
-    {
-      name: "entrypoint-no-persistence-infra",
-      severity: "error",
-      comment: "Entrypoint must not import from persistence or external-client infrastructure",
-      from: { path: "features/[^/]+/entrypoint/.+" },
-      to: { path: "platform/infra/(persistence|external-clients)/.+" }
-    },
-    {
-      name: "domain-no-upward-deps",
-      severity: "error",
-      comment: "Domain must not import from commands/, queries/, entrypoint/, or shell/",
-      from: { path: "features/[^/]+/domain/.+" },
-      to: { path: "(features/[^/]+/(commands|queries|entrypoint)/|shell/).+" }
-    },
-    {
-      name: "domain-no-infra",
-      severity: "error",
-      comment: "Domain must never import from any infra/",
-      from: { path: "(features/[^/]+/domain/|platform/domain/).+" },
-      to: { path: "(platform/infra|features/[^/]+/infra)/.+" }
-    },
-    {
-      name: "no-cross-feature-imports",
-      severity: "error",
-      comment: "Features must not import from other features",
-      from: { path: "features/([^/]+)/.+" },
-      to: {
-        path: "features/([^/]+)/.+",
-        pathNot: "features/$1/.+"
-      }
-    },
-    {
-      name: "commands-no-cross-feature",
-      severity: "error",
-      comment: "Commands forbidden from other features",
-      from: { path: "features/([^/]+)/commands/.+" },
-      to: {
-        path: "features/([^/]+)/.+",
-        pathNot: "features/$1/.+"
-      }
-    },
-    {
-      name: "commands-no-entrypoint",
-      severity: "error",
-      comment: "Commands must not import from entrypoint/",
-      from: { path: "features/[^/]+/commands/.+" },
-      to: { path: "features/[^/]+/entrypoint/.+" }
-    },
-    {
-      name: "commands-no-http-infra",
-      severity: "error",
-      comment: "Commands must not import from http infrastructure",
-      from: { path: "features/[^/]+/commands/.+" },
-      to: { path: "platform/infra/http/.+" }
-    },
-    {
-      name: "commands-no-cli-infra",
-      severity: "error",
-      comment: "Commands must not import from CLI infrastructure (entrypoint concern)",
-      from: { path: "features/[^/]+/commands/.+" },
-      to: { path: "platform/infra/cli/.+" }
-    },
-    {
-      name: "commands-no-mappers",
-      severity: "error",
-      comment: "Commands must not import from feature mappers",
-      from: { path: "features/[^/]+/commands/.+" },
-      to: { path: "features/[^/]+/infra/mappers/.+" }
-    },
-    {
-      name: "commands-no-middleware",
-      severity: "error",
-      comment: "Commands must not import from feature middleware",
-      from: { path: "features/[^/]+/commands/.+" },
-      to: { path: "features/[^/]+/infra/middleware/.+" }
-    },
-    {
-      name: "queries-no-commands",
-      severity: "error",
-      comment: "Queries must not import from commands/",
-      from: { path: "features/[^/]+/queries/.+" },
-      to: { path: "features/[^/]+/commands/.+" }
-    },
-    {
-      name: "queries-no-entrypoint",
-      severity: "error",
-      comment: "Queries must not import from entrypoint/",
-      from: { path: "features/[^/]+/queries/.+" },
-      to: { path: "features/[^/]+/entrypoint/.+" }
-    },
-    {
-      name: "queries-no-messaging",
-      severity: "error",
-      comment: "Queries must not import from messaging infrastructure",
-      from: { path: "features/[^/]+/queries/.+" },
-      to: { path: "platform/infra/messaging/.+" }
-    },
-    {
-      name: "queries-no-cli-infra",
-      severity: "error",
-      comment: "Queries must not import from CLI infrastructure (entrypoint concern)",
-      from: { path: "features/[^/]+/queries/.+" },
-      to: { path: "platform/infra/cli/.+" }
-    },
-    {
-      name: "queries-no-mappers",
-      severity: "error",
-      comment: "Queries must not import from feature mappers",
-      from: { path: "features/[^/]+/queries/.+" },
-      to: { path: "features/[^/]+/infra/mappers/.+" }
-    },
-    {
-      name: "queries-no-middleware",
-      severity: "error",
-      comment: "Queries must not import from feature middleware",
-      from: { path: "features/[^/]+/queries/.+" },
-      to: { path: "features/[^/]+/infra/middleware/.+" }
-    },
-    {
-      name: "commands-no-queries",
-      severity: "error",
-      comment: "Commands must not import from queries/",
-      from: { path: "features/[^/]+/commands/.+" },
-      to: { path: "features/[^/]+/queries/.+" }
-    },
-    {
-      name: "shell-no-domain",
-      severity: "error",
-      comment: "Shell must not import from domain/",
-      from: { path: "shell/.+" },
-      to: { path: "(features/[^/]+/domain/|platform/domain/).+" }
-    },
-    {
-      name: "platform-no-features",
-      severity: "error",
-      comment: "Platform must not import from features/",
-      from: { path: "platform/.+" },
-      to: { path: "features/.+" }
-    },
-    {
-      name: "no-circular",
-      severity: "error",
-      comment: "No circular dependencies",
-      from: {},
-      to: { circular: true }
-    }
-  ],
-
-  options: {
-    doNotFollow: { path: "node_modules" },
-    tsPreCompilationDeps: true,
-    tsConfig: { fileName: "tsconfig.base.json" },
-    exclude: ["dist/", "\\.spec\\.", "\\.test\\.", "\\.d\\.ts$", "__fixtures__"]
-  }
-};
diff --git a/.dependency-cruiser.specs.mjs b/.dependency-cruiser.specs.mjs
deleted file mode 100644
index 15002dd82..000000000
--- a/.dependency-cruiser.specs.mjs
+++ /dev/null
@@ -1,30 +0,0 @@
-export default {
-  forbidden: [
-    {
-      name: "specs-must-be-colocated",
-      severity: "error",
-      comment: "Spec files must live next to their production code, not at src/ root",
-      from: {
-        path: "(apps|packages|tools)/(?!riviere-schema/|riviere-extract-config/|riviere-extract-conventions/|riviere-role-enforcement/)[^/]+/src/(?!features/|entrypoint/|platform/|shell/|domain/|queries/).+",
-        pathNot: ["main\\.tsx$", "index\\.ts$", "test/", "test-assertions\\.ts$"]
-      },
-      to: {}
-    },
-    {
-      name: "feature-structure",
-      severity: "error",
-      comment: "Feature files must live in structural subdirs (entrypoint/, commands/, queries/, domain/, components/, hooks/), not at feature root",
-      from: {
-        path: "features/[^/]+/(?!entrypoint/|commands/|queries/|domain/|infra/|components/|hooks/)[^/]+$"
-      },
-      to: {}
-    }
-  ],
-
-  options: {
-    doNotFollow: { path: "node_modules" },
-    tsPreCompilationDeps: true,
-    tsConfig: { fileName: "tsconfig.base.json" },
-    exclude: ["dist/", "\\.d\\.ts$", "__fixtures__"]
-  }
-};
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1084d60cc..d7392b61e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -177,7 +177,7 @@ jobs:
           if ((${#script_files[@]})); then
             shellcheck "${script_files[@]}" || status=$?
           fi
-          shellcheck --shell=sh .husky/commit-msg .husky/pre-commit || status=$?
+          shellcheck --shell=sh .husky/use-repository-node .husky/commit-msg .husky/pre-commit || status=$?
           exit "$status"
 
   publish:
diff --git a/.husky/commit-msg b/.husky/commit-msg
index da9948310..f10c549b1 100644
--- a/.husky/commit-msg
+++ b/.husky/commit-msg
@@ -1 +1,4 @@
-npx --no -- commitlint --edit "$1"
+# shellcheck source=.husky/use-repository-node
+. "$(dirname "$0")/use-repository-node"
+
+pnpm exec commitlint --edit "$1"
diff --git a/.husky/pre-commit b/.husky/pre-commit
index f842b9437..bab950afb 100644
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1 +1,4 @@
-npx lint-staged && pnpm run verify
+# shellcheck source=.husky/use-repository-node
+. "$(dirname "$0")/use-repository-node"
+
+pnpm exec lint-staged && pnpm run verify
diff --git a/.husky/use-repository-node b/.husky/use-repository-node
new file mode 100644
index 000000000..6fdf772dc
--- /dev/null
+++ b/.husky/use-repository-node
@@ -0,0 +1,24 @@
+repository_root="$(git rev-parse --show-toplevel)"
+repository_node_directory="${NVM_DIR:-$HOME/.nvm}"
+
+if [ ! -s "$repository_node_directory/nvm.sh" ]; then
+  echo "NVM is required to run repository Git hooks." >&2
+  exit 1
+fi
+
+export NVM_DIR="$repository_node_directory"
+# shellcheck source=/dev/null
+. "$NVM_DIR/nvm.sh"
+
+hook_starting_directory="$PWD"
+cd "$repository_root" || exit 1
+nvm use --silent
+node_selection_status=$?
+cd "$hook_starting_directory" || exit 1
+
+if [ "$node_selection_status" -ne 0 ]; then
+  exit "$node_selection_status"
+fi
+
+unset FORCE_COLOR NO_COLOR
+unset hook_starting_directory node_selection_status repository_node_directory repository_root
diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 000000000..60ade1ae0
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+24.19.0
diff --git a/.riviere/configurations/app.ts b/.riviere/configurations/app.ts
new file mode 100644
index 000000000..ecd9110c8
--- /dev/null
+++ b/.riviere/configurations/app.ts
@@ -0,0 +1,58 @@
+import {
+  location,
+  locationConfiguration,
+} from '@living-architecture/riviere-role-enforcement-domain-model'
+import type { RoleName } from '../roles'
+
+const entrypointRoles: RoleName[] = [
+  'cli-entrypoint',
+  'cli-output-formatter',
+  'command-input-factory',
+  'entrypoint-cli-input-parser',
+]
+const entrypointPlatformCliRoles: RoleName[] = [
+  'entrypoint-cli-input-parser',
+  'cli-output-formatter',
+]
+const cliPresentationRoles: RoleName[] = [
+  'cli-error',
+  'cli-output-formatter',
+  'cli-response-formatter',
+  'cli-response-writer',
+]
+const shellRoles: RoleName[] = ['main', 'cli-error-handler']
+
+export const app = {
+  locations: locationConfiguration<RoleName>(
+    location('/features/{feature}', {
+      entrypoint: {
+        '{entrypoint}': entrypointRoles,
+        _platform: {
+          cli: entrypointPlatformCliRoles,
+          importRules: { importableFrom: 'withinParentLocation' },
+        },
+      },
+      // Features cannot import from each other. They can only import root infra and commands or queries from any subdomain.
+      importRules: {
+        allow: {
+          root: ['infra'],
+          anySubdomain: ['commands', 'queries'],
+        },
+      },
+    }),
+
+    location('/infra', {
+      'cli/presentation': cliPresentationRoles,
+      importRules: { allow: {} },
+    }),
+
+    location('/shell', shellRoles, {
+      importRules: {
+        allow: {
+          root: ['features', 'infra'],
+          anySubdomain: ['commands', 'queries', 'data-access', 'adapters', 'external-clients'],
+        },
+      },
+    }),
+  ),
+}
diff --git a/.riviere/configurations/domain-model.ts b/.riviere/configurations/domain-model.ts
new file mode 100644
index 000000000..08b1bfb76
--- /dev/null
+++ b/.riviere/configurations/domain-model.ts
@@ -0,0 +1,26 @@
+import {
+  location,
+  locationConfiguration,
+} from '@living-architecture/riviere-role-enforcement-domain-model'
+import type { RoleName } from '../roles'
+
+const domainRoles: RoleName[] = [
+  'aggregate',
+  'value-object',
+  'domain-event',
+  'domain-port',
+  'domain-service',
+  'domain-error',
+]
+
+// A domain model cannot import another domain model or any app or use-case layer.
+export const domainModel = {
+  locations: locationConfiguration<RoleName>(
+    location('/domain', domainRoles, {
+      allowAnySubLocations: true,
+      importRules: {
+        allow: { anySubdomain: ['published-language'] },
+      },
+    }),
+  ),
+}
diff --git a/.riviere/configurations/published-language.ts b/.riviere/configurations/published-language.ts
new file mode 100644
index 000000000..a06d1bc50
--- /dev/null
+++ b/.riviere/configurations/published-language.ts
@@ -0,0 +1,24 @@
+import {
+  location,
+  locationConfiguration,
+} from '@living-architecture/riviere-role-enforcement-domain-model'
+import type { RoleName } from '../roles'
+
+const publishedLanguageRoles: RoleName[] = [
+  'published-language-annotation',
+  'published-language-schema',
+  'published-language-data-structure',
+  'published-language-union',
+  'published-language-parser',
+  'published-language-field-name',
+  'value-object',
+]
+
+export const publishedLanguage = {
+  locations: locationConfiguration<RoleName>(
+    location('/published-language', publishedLanguageRoles, {
+      'eslint-plugin': { roleEnforcement: false },
+      importRules: { allow: {} },
+    }),
+  ),
+}
diff --git a/.riviere/configurations/use-cases.ts b/.riviere/configurations/use-cases.ts
new file mode 100644
index 000000000..4ccaf2b54
--- /dev/null
+++ b/.riviere/configurations/use-cases.ts
@@ -0,0 +1,77 @@
+import {
+  location,
+  locationConfiguration,
+} from '@living-architecture/riviere-role-enforcement-domain-model'
+import type { RoleName } from '../roles'
+
+const commandRoles: RoleName[] = [
+  'command-use-case',
+  'command-use-case-input',
+  'command-use-case-result',
+  'command-use-case-result-value',
+]
+const queryRoles: RoleName[] = ['query-model-use-case', 'query-model-use-case-input', 'query-model']
+const dataAccessRoles: RoleName[] = [
+  'aggregate-repository',
+  'query-model-loader',
+  'data-access-error',
+]
+const adapterRoles: RoleName[] = ['domain-port-adapter']
+const externalClientRoles: RoleName[] = [
+  'external-client-service',
+  'external-client-model',
+  'external-client-error',
+]
+
+export const useCases = {
+  locations: locationConfiguration<RoleName>(
+    location('/features/{feature}', {
+      commands: {
+        roles: commandRoles,
+        importRules: {
+          allow: {
+            sibling: ['data-access'],
+            ownSubdomain: ['domain'],
+            anySubdomain: ['published-language'],
+          },
+        },
+      },
+      queries: {
+        roles: queryRoles,
+        importRules: {
+          allow: {
+            sibling: ['data-access'],
+            ownSubdomain: ['domain'],
+            anySubdomain: ['published-language'],
+          },
+        },
+      },
+      'data-access/{concept}': {
+        roles: dataAccessRoles,
+        importRules: {
+          allow: {
+            sibling: [{ queries: ['query-model'] }],
+            root: ['infra'],
+            ownSubdomain: [{ domain: ['aggregate', 'value-object'] }],
+            anySubdomain: ['published-language'],
+          },
+        },
+      },
+      'adapters/{adapter}': {
+        roles: adapterRoles,
+        importRules: {
+          allow: {
+            root: ['infra'],
+            ownSubdomain: [{ domain: ['domain-port'] }],
+          },
+        },
+      },
+      importRules: { allow: {} },
+    }),
+
+    location('/infra', {
+      'external-clients/{client}': externalClientRoles,
+      importRules: { allow: {} },
+    }),
+  ),
+}
diff --git a/.riviere/role-definitions/command-use-case-result-value.md b/.riviere/role-definitions/command-use-case-result-value.md
new file mode 100644
index 000000000..86987bd83
--- /dev/null
+++ b/.riviere/role-definitions/command-use-case-result-value.md
@@ -0,0 +1,28 @@
+# command-use-case-result-value
+
+## Purpose
+
+An exported data type used as part of a `command-use-case-result` contract.
+
+## Rules
+
+- Lives beside the command result that contains it.
+- Contains result data or a closed set of result values.
+- Contains no command execution, domain behaviour, persistence or presentation logic.
+- Is exported only when another file needs to name the type; otherwise it stays inline in the result.
+
+## Canonical Example
+
+```typescript
+/** @riviere-role command-use-case-result-value */
+export type AddComponentErrorCode =
+  | 'VALIDATION_ERROR'
+  | 'GRAPH_NOT_FOUND'
+  | 'DUPLICATE_COMPONENT'
+```
+
+## Anti-Patterns
+
+- Creating a separate exported type when the shape is used only once and can remain inline.
+- Putting methods or orchestration behaviour in a result value.
+- Using the role for command inputs or the complete command result.
diff --git a/.riviere/role-definitions/command-use-case.md b/.riviere/role-definitions/command-use-case.md
index f12b70e83..efc768560 100644
--- a/.riviere/role-definitions/command-use-case.md
+++ b/.riviere/role-definitions/command-use-case.md
@@ -56,4 +56,4 @@ export class ExtractDraftComponents {
 
 ## References
 - [CQRS Pattern](https://martinfowler.com/bliki/CQRS.html) — Commands vs queries separation
-- Separation of Concerns Skill Q3: "Orchestrates write operations?" → commands/
+- ADR-002: "Orchestrates write operations?" → commands/
diff --git a/.riviere/role-definitions/data-access-error.md b/.riviere/role-definitions/data-access-error.md
new file mode 100644
index 000000000..533ec568c
--- /dev/null
+++ b/.riviere/role-definitions/data-access-error.md
@@ -0,0 +1,28 @@
+# data-access-error
+
+## Purpose
+
+An error describing a failure while loading, reconstructing or persisting application state.
+
+## Rules
+
+- Lives in `data-access/{concept}/` beside the repository or loader that can return it.
+- Describes a data-access failure, not a violated domain invariant.
+- Contains no recovery workflow, presentation behaviour or external-client implementation.
+
+## Canonical Example
+
+```typescript
+/** @riviere-role data-access-error */
+export class GraphNotFoundError extends Error {
+  constructor(readonly graphPath: string) {
+    super(`Graph not found: ${graphPath}`)
+  }
+}
+```
+
+## Anti-Patterns
+
+- Labelling domain validation failures as data-access errors.
+- Throwing a generic data-access error when a typed result can preserve the concrete failure.
+- Placing filesystem or database interaction inside the error class.
diff --git a/.riviere/role-definitions/domain-event.md b/.riviere/role-definitions/domain-event.md
new file mode 100644
index 000000000..bd3ffadc1
--- /dev/null
+++ b/.riviere/role-definitions/domain-event.md
@@ -0,0 +1,26 @@
+# domain-event
+
+## Purpose
+
+A data-only record of something that happened in the domain.
+
+## Rules
+
+- Must be a type alias.
+- Must be a data structure containing fields only.
+- Must not contain methods, callable properties, call signatures or constructor signatures.
+
+## Canonical Example
+
+```typescript
+/** @riviere-role domain-event */
+export type WorkflowEvent =
+  | { type: 'session-started'; at: string }
+  | { type: 'transitioned'; at: string; from: string; to: string }
+```
+
+## Anti-Patterns
+
+- A command requesting that something should happen.
+- A mutable object with behaviour.
+- A generic message envelope with no domain meaning.
diff --git a/.riviere/role-definitions/domain-port-adapter.md b/.riviere/role-definitions/domain-port-adapter.md
index f3266fff1..142c69909 100644
--- a/.riviere/role-definitions/domain-port-adapter.md
+++ b/.riviere/role-definitions/domain-port-adapter.md
@@ -6,9 +6,9 @@ A narrow implementation of one domain port using one generic external-client API
 
 ## Rules
 
-1. Implements exactly one domain port.
+1. Implements a cohesive domain port.
 2. Translates the port input into the external-client input.
-3. Invokes exactly one external-client API.
+3. Invokes the generic external-client API needed for that translation.
 4. Translates the external-client result or error into the port result or error.
 5. Contains no domain decisions, application orchestration, or direct infrastructure calls.
 6. Lives in `adapters/{adapter}/`.
@@ -26,7 +26,7 @@ Allowing the domain-port adapter to import those implementation dependencies wou
 The real Oxlint implementation added in commit [`2474599b`](https://github.com/NTCoding/living-architecture/commit/2474599b591df037d5e3e5d665e171db65f459a0) demonstrates the boundary.
 
 ```typescript
-// packages/riviere-role-enforcement/src/features/enforcement/adapters/oxlint/
+// packages/riviere-role-enforcement/use-cases/src/features/enforcement/adapters/oxlint/
 // oxlint-role-enforcement-runner.ts
 export function createOxlintRoleEnforcementRunner(
   oxlintClient: OxlintClient,
@@ -53,7 +53,7 @@ export function createOxlintRoleEnforcementRunner(
 
 That adapter knows both contracts: `RoleEnforcementRunnerInput` from the domain port and `OxlintConfig` from the generic Oxlint client. It owns their translation and maps `OxlintExecutionError` into the port's failure result. It does not know how Oxlint is installed or executed.
 
-The external mechanics live in `packages/riviere-role-enforcement/src/platform/infra/external-clients/oxlint/oxlint-client.ts`. That file imports `node:child_process`, `node:fs`, `node:path`, and `node:url`; locates the Oxlint binary; writes the temporary configuration; spawns Oxlint; captures its streams and exit status; and removes the temporary file. It accepts only `OxlintConfig` and primitive paths, so it knows nothing about role-enforcement domain types.
+The external mechanics live in `packages/riviere-role-enforcement/use-cases/src/infra/external-clients/oxlint/oxlint-client.ts`. That file imports `node:child_process`, `node:fs`, `node:path`, and `node:url`; locates the Oxlint binary; writes the temporary configuration; spawns Oxlint; captures its streams and exit status; and removes the temporary file. It accepts only `OxlintConfig` and primitive paths, so it knows nothing about role-enforcement domain types.
 
 Putting the following code in `oxlint-role-enforcement-runner.ts` would be the violation:
 
@@ -85,10 +85,6 @@ export function createOxlintRoleEnforcementRunner(
 }
 ```
 
-The same rule covers third-party packages. `tools/dev-workflow-v2/src/features/workflow/adapters/github/workflow-pull-request-creator.ts` maps the domain-owned `CreateWorkflowPullRequest` contract to `GithubPullRequestCreationInput` and maps `GithubPullRequest` back to the domain result. It does not import `zod` or execute `gh`. Those details stay together in `tools/dev-workflow-v2/src/platform/infra/external-clients/github/create-pull-request.ts`, where `zod` validates the external JSON and the injected `GhRunner` invokes the external CLI.
-
-The restriction is intentionally structural: a domain-port adapter may import its domain port and one project-controlled external-client API, but no external package directly. This gives RLE a deterministic rule and prevents a new SDK, CLI, or Node implementation from being hidden in an application adapter under a plausible role name.
-
 ## Anti-Patterns
 
 - Importing an aggregate or domain service directly.
diff --git a/.riviere/role-definitions/entrypoint-cli-input-parser.md b/.riviere/role-definitions/entrypoint-cli-input-parser.md
index 65423a020..5a288acd1 100644
--- a/.riviere/role-definitions/entrypoint-cli-input-parser.md
+++ b/.riviere/role-definitions/entrypoint-cli-input-parser.md
@@ -13,14 +13,14 @@ Parses or validates raw CLI input using the meaning of a specific entrypoint.
 
 ## Canonical Example
 
-Sharing does not change this role into `generic-cli-input-parser` and does not move it to infra. It changes only where the parser lives inside the entrypoint layer. Always choose the narrowest entrypoint scope containing every caller.
+Sharing does not move this role to infra. It changes only where the parser lives inside the entrypoint layer. Always choose the narrowest entrypoint scope containing every caller.
 
 ### Used by one entrypoint
 
 Keep the parser beside that entrypoint:
 
 ```text
-packages/riviere-cli/src/features/builder/entrypoint/link/
+apps/cli/src/features/builder/entrypoint/link/
 ├── entrypoint.ts
 └── link-source-location-options.ts
 ```
@@ -70,7 +70,7 @@ export function parseLinkSourceLocation(
 Move the parser to that feature's private entrypoint platform:
 
 ```text
-packages/riviere-cli/src/features/{feature}/entrypoint/_platform/cli/
+apps/cli/src/features/{feature}/entrypoint/_platform/cli/
 ├── input-parsers/
 │   └── {parser}.ts
 └── option-validators/
@@ -80,26 +80,14 @@ packages/riviere-cli/src/features/{feature}/entrypoint/_platform/cli/
 For example, Builder's `validateLinkType` is used by the `link` and `link-external` entrypoints, while `validateHttpMethod` is used by the `link-http` entrypoint and its validator. These are Builder CLI option rules, so their common scope is:
 
 ```text
-packages/riviere-cli/src/features/builder/entrypoint/_platform/cli/option-validators/
+apps/cli/src/features/builder/entrypoint/_platform/cli/option-validators/
 ```
 
-They must not move to `platform/infra/cli` merely because several Builder entrypoints call them.
+They must not move to root `infra/cli` merely because several Builder entrypoints call them.
 
-### Shared by entrypoints in multiple features
+### Similar parsing in multiple features
 
-Move the parser to the package's private entrypoint platform:
-
-```text
-packages/riviere-cli/src/entrypoint/_platform/cli/
-├── input-parsers/
-│   └── {parser}.ts
-└── option-validators/
-    └── {validator}.ts
-```
-
-The real component-type parsing is the example. `isValidComponentType` is called by Builder entrypoints such as `component-checklist`, and by the Query `components` entrypoint. It encodes application values including `UseCase`, `DomainOp`, and `EventHandler`, so it remains `entrypoint-cli-input-parser` in the shared entrypoint layer. Cross-feature reuse does not make those values generic CLI primitives.
-
-Nothing outside the containing entrypoint layer may import either `_platform`. `_platform` is private reuse within a layer, not a public shared library.
+Features remain isolated. Keep small primitive conversions beside their entrypoints rather than creating a shared abstraction to save a few lines. If substantial cross-feature parsing genuinely emerges, review the app boundary before adding a new location. Domain-aware validation never moves into app infra: pass the raw command or query input through the entrypoint and let the use case parse the domain-owned value object. There is no package-root `src/entrypoint/`; every entrypoint belongs to a feature.
 
 ### When generic infra is correct
 
@@ -120,13 +108,13 @@ Do not extract a one-use primitive function merely to make the entrypoint file s
 
 ## Common Misclassifications
 
-- Primitive conversion without entrypoint meaning is a `generic-cli-input-parser`.
+- Primitive conversion used by an entrypoint remains private to that entrypoint until substantial reuse justifies reviewing the boundary.
 - Reusable domain validation belongs to the domain that owns the rule.
-- Reuse across entrypoints changes the `_platform` scope, not the role or layer.
+- Reuse within one feature changes the `_platform` scope, not the role or location.
+- Similar code in separate features does not by itself justify a shared abstraction. Domain-aware validation belongs in the subdomain use case and domain model.
 
 ## Anti-Patterns
 
 - Placing this role in an infrastructure layer.
-- Labelling entrypoint-specific parsing as `generic-cli-input-parser`.
 - Duplicating a parser in several entrypoints instead of moving it to their narrowest common entrypoint `_platform`.
 - Moving a parser to infra solely because several entrypoints use it.
diff --git a/.riviere/role-definitions/generic-cli-input-parser.md b/.riviere/role-definitions/generic-cli-input-parser.md
deleted file mode 100644
index 153538549..000000000
--- a/.riviere/role-definitions/generic-cli-input-parser.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# generic-cli-input-parser
-
-## Purpose
-
-Provides generic CLI parsing mechanics without entrypoint, use-case, or domain knowledge.
-
-## Behavioural Contract
-
-1. Belongs to the generic infrastructure layer.
-2. Parses technical primitive CLI values.
-3. Does not import entrypoint, use-case, or domain code.
-4. Does not coordinate options belonging to a specific entrypoint.
-
-## Canonical Example
-
-There is currently no exported `generic-cli-input-parser` implementation in this repository. Do not create one merely to move code out of an entrypoint or to satisfy a file-size limit. The following is the permitted primitive-only API shape, not evidence that the abstraction is needed:
-
-```typescript
-/** @riviere-role generic-cli-input-parser */
-export function parseInteger(raw: string): number | undefined {
-  // generic primitive conversion
-}
-```
-
-## Common Misclassifications
-
-- Parsing options for a particular command is an `entrypoint-cli-input-parser`.
-- Reusable domain validation belongs to the domain that owns the rule.
-- A parser shared by several entrypoints is still an `entrypoint-cli-input-parser` when it coordinates their options or uses application meaning. Put it in the narrowest common `entrypoint/_platform/cli/input-parsers/` or `option-validators/` scope; reuse alone never makes it generic infra.
-
-## Anti-Patterns
-
-- Importing entrypoint, use-case, or domain types.
-- Encoding the accepted values of an application concept.
diff --git a/.riviere/role-definitions/index.md b/.riviere/role-definitions/index.md
index 80262a090..cafd179ad 100644
--- a/.riviere/role-definitions/index.md
+++ b/.riviere/role-definitions/index.md
@@ -4,30 +4,35 @@
 
 These resources inform how roles are classified and where code should live:
 
-- [Separation of Concerns Skill](https://github.com/NTCoding/claude-skillz/blob/main/separation-of-concerns/SKILL.md) — Code placement decision tree (Q1-Q7): wiring → entrypoint → commands → queries → domain → infra
-- [Tactical DDD Skill](https://github.com/NTCoding/claude-skillz/blob/main/tactical-ddd/SKILL.md) — Aggregate design, value objects, domain services, repositories
 - [ADR-002: Allowed Folder Structures](../../docs/architecture/adr/ADR-002-allowed-folder-structures.md) — Canonical directory layout
+- [Role enforcement configuration](../role-enforcement.config.ts) — Executable location, dependency, and role rules
+- [Architecture memory](../../project-memory/architecture/README.md) — Approved local architecture decisions and examples
 - [Software Design Conventions](../../docs/conventions/software-design.md) — SD-001 through SD-023
 
 ## Dependency Rules
 
 Dependencies point inward:
-- `entrypoint/` → commands and queries; never domain or data access directly
-- `commands/` → domain and data access; never concrete domain-port adapters
-- `queries/` → query models and data access
-- `domain/` → domain code and domain ports only; never adapters or infrastructure
-- `data-access/` → reconstructs aggregates or query models from persisted data
-- `adapters/` → one domain port and one generic client API; never external packages directly
-- `infra/` → external packages and generic technical capabilities whose APIs use only language primitives or external-system types; never application-owned code from entrypoint, commands, queries, domain, data access, adapters, or shell
-- `shell/` → constructs concrete dependencies and passes them into entrypoints
 
-Concrete test: `readJsonFile(filePath): unknown` and `resolveFileOrPackagePath(...): string` qualify because their contracts contain only primitives and external technical concepts. `loadDraftComponentsFromFile(filePath): DraftComponent[]` does not qualify because its contract and validation use an application-owned type. See the [full extraction repository example](../../project-memory/architecture/memories/prefer-layer-based-rules.md).
+- App `entrypoint/` → subdomain commands and queries plus app `infra/`; never domain or data access directly
+- Use-case `commands/` → own-subdomain domain and feature data access; never concrete domain-port adapters
+- Use-case `queries/` → own-subdomain domain and feature data access
+- Domain-model `domain/` → its own model and permitted published languages; never use cases, adapters, infra, apps, or another domain model
+- Use-case `data-access/{concept}/` → aggregate and value-object roles from its own domain plus generic clients; never domain services
+- Use-case `adapters/{adapter}/` → domain ports from its own subdomain plus generic client APIs; never external packages directly
+- Root `infra/` → external packages and generic technical capabilities; never app, use-case, or domain declarations
+- App `shell/` → constructs concrete dependencies and passes them into entrypoints
+
+Concrete test: `readJsonFile(filePath): unknown` and `resolveFileOrPackagePath(...): string` qualify because their contracts contain only primitives and external technical concepts. `loadDraftComponentsFromFile(filePath): DraftComponent[]` does not qualify because its contract and validation use an application-owned type.
 
 ## Automated Enforcement
 
-Role enforcement is automated via an oxlint plugin. It checks annotations, location constraints, dependency rules, and I/O contracts at lint time. The enforcement config at `.riviere/role-enforcement.config.ts` is the source of truth for what's enforced. The separation-of-concerns skill defines the architectural principles; role enforcement automates their verification.
+Rivière role enforcement is automated via an Oxlint plugin. It checks annotations, location constraints, import rules, and input/output contracts at lint time. ADR-002 defines the architecture and `.riviere/role-enforcement.config.ts` is its executable form. Changes must update both.
+
+Import rules belong in the relevant location's `importRules`. Imports are unrestricted until a location declares import rules. That location can then import only its own subtree, inherited imports, and locations listed in `allow`. `sibling` means the same concrete parent location; `root` means the same package root; `ownSubdomain` and `anySubdomain` use the configured `{subdomain}` path capture. Allowing a location allows everything inside it unless a role subset is supplied. Explicit sublocations are the complete list of permitted folders unless `allowAnySubLocations` is set.
+
+The enforcer checks static imports, re-exports, dynamic imports, CommonJS `require()` calls and TypeScript import types. Non-literal dynamic imports and `require()` calls are rejected because their target cannot be checked. Production code cannot import ignored fixture files. Test files are deliberately exempt from production import rules so tests can assemble fixtures across boundaries.
 
-Import rules belong directly to their `location(...)` or `subLocation(...)` definitions. Imports within the same configured location are allowed normally. A location may restrict imports crossing its boundary to specific target roles or forbid direct external-package imports. Role-specific exceptions, such as command-to-command and adapter-to-adapter imports, use the existing role `forbiddenDependencies` rule. RLE must not maintain a second list of path matchers for architectural layers.
+Some behavioural guidance is intentionally reviewed rather than mechanically counted. For example, an adapter should stay focused on one port-to-client translation and a CLI entrypoint should invoke one use case. The executable rules enforce the permitted locations and roles; review checks whether a particular declaration remains cohesive.
 
 ## Classification Decision Tree
 
diff --git a/.riviere/role-definitions/published-language-annotation.md b/.riviere/role-definitions/published-language-annotation.md
new file mode 100644
index 000000000..139c5282f
--- /dev/null
+++ b/.riviere/role-definitions/published-language-annotation.md
@@ -0,0 +1,30 @@
+# published-language-annotation
+
+## Purpose
+
+An annotation that forms part of a published language and is applied to source-code declarations.
+
+## Canonical Example
+
+```typescript
+/** @riviere-role published-language-annotation */
+export function UseCase<T>(target: T, context: ClassDecoratorContext): T {
+  return target
+}
+```
+
+Annotation factories are also valid:
+
+```typescript
+/** @riviere-role published-language-annotation */
+export function HttpClient(
+  serviceName: string,
+): <T>(target: T, context: ClassDecoratorContext) => T {
+  return (target) => target
+}
+```
+
+## Anti-Patterns
+
+- An ordinary exported function is not an annotation.
+- A function that reads an annotation is not itself an annotation.
diff --git a/.riviere/role-definitions/published-language-data-structure.md b/.riviere/role-definitions/published-language-data-structure.md
new file mode 100644
index 000000000..ad95b2d5b
--- /dev/null
+++ b/.riviere/role-definitions/published-language-data-structure.md
@@ -0,0 +1,21 @@
+# published-language-data-structure
+
+## Purpose
+
+A method-free data structure used inside a published language schema.
+
+## Canonical Example
+
+```typescript
+/** @riviere-role published-language-data-structure */
+export interface Link {
+  source: string
+  target: string
+}
+```
+
+## Anti-Patterns
+
+- It cannot contain methods or function-valued fields.
+- It is not the complete published schema.
+- It is not an application or domain service.
diff --git a/.riviere/role-definitions/published-language-field-name.md b/.riviere/role-definitions/published-language-field-name.md
new file mode 100644
index 000000000..561716dd0
--- /dev/null
+++ b/.riviere/role-definitions/published-language-field-name.md
@@ -0,0 +1,18 @@
+# published-language-field-name
+
+## Purpose
+
+The exact name of a field defined by a published language, exported so producers and consumers use the same spelling.
+
+## Canonical Example
+
+```typescript
+/** @riviere-role published-language-field-name */
+export const EVENT_NAME_FIELD = 'eventName' as const
+```
+
+## Anti-Patterns
+
+- A mutable variable is not a published field name.
+- A computed value is not a published field name.
+- An application setting or implementation constant is not part of a published language.
diff --git a/.riviere/role-definitions/published-language-parser.md b/.riviere/role-definitions/published-language-parser.md
new file mode 100644
index 000000000..341a41870
--- /dev/null
+++ b/.riviere/role-definitions/published-language-parser.md
@@ -0,0 +1,22 @@
+# published-language-parser
+
+## Purpose
+
+Parses input into the complete schema of a published language without throwing validation failures.
+
+## Canonical Example
+
+```typescript
+/** @riviere-role published-language-parser */
+export function parseRiviereGraph(value: unknown):
+  | { success: true; graph: RiviereGraph }
+  | { success: false; issues: ValidationIssue[] } {
+  // parsing omitted
+}
+```
+
+## Anti-Patterns
+
+- The success branch must contain the published-language schema.
+- A parser must return an explicit failure branch rather than throwing validation failures.
+- An arbitrary conversion or formatting function is not a published-language parser.
diff --git a/.riviere/role-definitions/published-language-schema.md b/.riviere/role-definitions/published-language-schema.md
new file mode 100644
index 000000000..71b829234
--- /dev/null
+++ b/.riviere/role-definitions/published-language-schema.md
@@ -0,0 +1,22 @@
+# published-language-schema
+
+## Purpose
+
+The complete data structure exchanged through a published language.
+
+## Canonical Example
+
+```typescript
+/** @riviere-role published-language-schema */
+export interface RiviereGraph {
+  version: string
+  components: Component[]
+  links: Link[]
+}
+```
+
+## Anti-Patterns
+
+- It cannot contain methods or function-valued fields.
+- A structure nested inside the complete schema is a `published-language-data-structure`.
+- It is not an application or domain model.
diff --git a/.riviere/role-definitions/published-language-union.md b/.riviere/role-definitions/published-language-union.md
new file mode 100644
index 000000000..4cf6e5335
--- /dev/null
+++ b/.riviere/role-definitions/published-language-union.md
@@ -0,0 +1,17 @@
+# published-language-union
+
+## Purpose
+
+A closed set of alternatives defined by a published language.
+
+## Canonical Example
+
+```typescript
+/** @riviere-role published-language-union */
+export type LinkType = 'sync' | 'async'
+```
+
+## Anti-Patterns
+
+- A type alias that is not a union is not a published-language union.
+- It must not contain application-specific alternatives.
diff --git a/.riviere/role-definitions/query-model-error.md b/.riviere/role-definitions/query-model-error.md
deleted file mode 100644
index c7e4c2feb..000000000
--- a/.riviere/role-definitions/query-model-error.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# query-model-error
-
-## Purpose
-A custom error class for exceptional conditions in the query model layer.
-
-## Behavioral Contract
-1. Extends `Error`
-2. Represents a query-specific error condition (e.g., component not found, invalid query)
-3. Lives in the `/queries` layer alongside query-model types
-4. Provides a descriptive error message with context for debugging
-
-## Examples
-
-### Canonical Example
-```typescript
-/** @riviere-role query-model-error */
-export class ComponentNotFoundError extends Error {
-  constructor(componentId: string) {
-    super(`Component not found: ${componentId}`)
-    this.name = 'ComponentNotFoundError'
-  }
-}
-```
-
-## Anti-Patterns
-
-### Common Misclassifications
-- **Not a domain-error**: domain errors live in the `/domain` layer and relate to domain invariant violations. Query model errors relate to query operations.
-- **Not a cli-error**: CLI errors handle presentation-layer error formatting. Query model errors are thrown by query logic.
-
-## Decision Guidance
-- **vs domain-error**: Is this error thrown during query model operations? → query-model-error. Is it thrown during domain behavior or aggregate invariant enforcement? → domain-error
-- **vs cli-error**: Is this error about query logic? → query-model-error. Is it about CLI presentation? → cli-error
diff --git a/.riviere/role-definitions/query-model-loader.md b/.riviere/role-definitions/query-model-loader.md
index 1b15d4638..536882256 100644
--- a/.riviere/role-definitions/query-model-loader.md
+++ b/.riviere/role-definitions/query-model-loader.md
@@ -1,11 +1,11 @@
 # query-model-loader
 
 ## Purpose
-A class that loads a query model from persisted state — the read-only counterpart of an aggregate-repository.
+A class that loads a concrete query model for one read use case from persisted state — the read-only counterpart of an aggregate-repository.
 
 ## Behavioral Contract
-1. **Load** — assemble the query model from persisted state (files, database, APIs) and return it
-2. The loader MUST return a query-model, not raw data or partial state
+1. **Load** — assemble the query model for a concrete query use case from persisted state (files, database, APIs) and return it
+2. The loader MUST return that concrete query model, not raw persisted state or a reusable domain service
 3. May use external-client-services internally to access storage or parsers
 4. **No save method** — query model loaders are strictly read-only
 
@@ -14,20 +14,26 @@ A class that loads a query model from persisted state — the read-only counterp
 ### Canonical Example
 ```typescript
 /** @riviere-role query-model-loader */
-export class RiviereQueryLoader {
-  load(graphPathOption?: string): RiviereQuery {
-    const graphPath = this.resolveGraphPath(graphPathOption)
-    const content = readFileSync(graphPath, 'utf-8')
-    const parsed: unknown = JSON.parse(content)
-    return RiviereQuery.fromJSON(parsed)
+export class ComponentListLoader {
+  load(
+    graphPath: string | undefined,
+    domain: string | undefined,
+    type: ComponentType | undefined,
+  ): ComponentList {
+    const components = loadQuery(graphPath).components()
+    const inDomain = domain === undefined
+      ? components
+      : components.filter((component) => component.domain === domain)
+
+    return {
+      components: type === undefined
+        ? inDomain
+        : inDomain.filter((component) => component.type === type),
+    }
   }
 }
 ```
 
-### Edge Cases
-- A loader may have multiple load methods for different access patterns
-- Private helper methods are implementation details, not separate roles
-
 ## Anti-Patterns
 
 ### Common Misclassifications
@@ -37,10 +43,9 @@ export class RiviereQueryLoader {
 
 ### Mixed Responsibility Signals
 - If the loader has a save/persist method — it may be an aggregate-repository
-- If the loader returns raw data instead of a query model — it may be an external-client-service
-- If the loader performs business logic after loading — that belongs on the query model
+- If domain behaviour is needed to shape the read, the responsibility is outside data access. The loader may import only the query model contract needed for its return value.
 
 ## Decision Guidance
 - **vs aggregate-repository**: Does it save state? → aggregate-repository. Load only, returning a query-model? → query-model-loader
-- **vs external-client-service**: Does it return a query-model? → query-model-loader. Does it return raw data? → external-client-service
+- **vs external-client-service**: `readJsonFile(path): unknown` is a generic filesystem client operation. `ComponentListLoader.load(...): ComponentList` uses persisted graph data to build the concrete query model.
 - **vs query-model-use-case**: Does it only load? → query-model-loader. Does it orchestrate load + query + return? → query-model-use-case
diff --git a/.riviere/role-definitions/query-model-use-case.md b/.riviere/role-definitions/query-model-use-case.md
index 91f32d250..96be52ec3 100644
--- a/.riviere/role-definitions/query-model-use-case.md
+++ b/.riviere/role-definitions/query-model-use-case.md
@@ -1,13 +1,13 @@
 # query-model-use-case
 
 ## Purpose
-A class that orchestrates a read-only operation: loading a query model and returning computed results without side effects. Dependencies are injected via constructor.
+A class that orchestrates one read-only operation by loading and returning its concrete query model without side effects. Dependencies are injected via constructor.
 
 ## Behavioral Contract
 A query model use case class has exactly one public method (`execute`) that follows this sequence:
-1. **Load** — use the injected query-model-loader to load the query model from persisted state
-2. **Query** — call method(s) on the query model to compute results
-3. **Return** — return query-model types directly
+1. **Translate** — translate the use-case input into criteria for its query-model-loader
+2. **Load** — use the injected loader to build the concrete query model
+3. **Return** — return that query model directly
 
 No state is modified. No saving occurs. The query model is never mutated.
 
@@ -18,12 +18,11 @@ The `execute` method accepts exactly one parameter typed as a `query-model-use-c
 ### Canonical Example
 ```typescript
 /** @riviere-role query-model-use-case */
-export class ListDomains {
-  constructor(private readonly repository: RiviereQueryRepository) {}
+export class ListComponents {
+  constructor(private readonly components: ComponentListLoader) {}
 
-  execute(input: ListDomainsInput): ListDomainsResult {
-    const query = this.repository.load(input.graphPathOption)
-    return { domains: query.domains() }
+  execute(input: ListComponentsInput): ComponentList {
+    return this.components.load(input.graphPath, input.domain, input.type)
   }
 }
 ```
@@ -31,12 +30,14 @@ export class ListDomains {
 ### Edge Cases
 - A query that calls multiple methods on the same query model is valid
 - A query that composes results from multiple query model methods is valid
+- A use case may map known loader failures into query-use-case errors
+- A use case may coordinate multiple loaders when the concrete read genuinely needs them
 
 ## Anti-Patterns
 
 ### Common Misclassifications
 - **Not a command-use-case**: commands orchestrate write operations that may modify and save state. If nothing is modified or saved, use query-model-use-case.
-- **Not a domain-service**: domain services contain pure business logic. If it loads a query model from persistence, it is a query-model-use-case.
+- **Not a domain-service**: domain services contain reusable domain logic. If it coordinates loading a concrete read from persistence, it is a query-model-use-case.
 - **Not a cli-entrypoint**: entrypoints translate external input into query-model-use-case-input and call the use case. They do not load query models.
 
 ### Mixed Responsibility Signals
@@ -47,7 +48,7 @@ export class ListDomains {
 
 ## Decision Guidance
 - **vs command-use-case**: Does it modify or save state? → command-use-case. Read-only with no side effects? → query-model-use-case
-- **vs domain-service**: Does it load a query model from persistence? → query-model-use-case. Pure logic on passed-in data? → domain-service
+- **vs domain-service**: Does it coordinate loading a concrete read from persistence? → query-model-use-case. Reusable domain logic on passed-in data? → domain-service
 
 ## References
 - [CQRS Pattern](https://martinfowler.com/bliki/CQRS.html) — Commands vs queries separation
diff --git a/.riviere/role-definitions/query-model.md b/.riviere/role-definitions/query-model.md
index 9ab71836c..3ef86c478 100644
--- a/.riviere/role-definitions/query-model.md
+++ b/.riviere/role-definitions/query-model.md
@@ -1,7 +1,7 @@
 # query-model
 
 ## Purpose
-A class, interface, or type that represents the read-side model — the counterpart of an aggregate on the write side. Includes the query model class itself and the types it returns.
+A class, interface, or type shaped for the result of a concrete query use case. Includes the query model class itself and the types it returns.
 
 ## Behavioral Contract
 
@@ -17,46 +17,91 @@ Represents a result shape returned by query model methods. These are the types t
 
 ## Examples
 
-### Query Model Class
+### Design from a concrete query
+
+Use case: a user runs:
+
+```text
+riviere components --domain payments --type API
+```
+
+`ListComponents` must return only API components from the `payments` domain.
+
+The query model for that use case is the component list:
+
 ```typescript
 /** @riviere-role query-model */
-export class RiviereQuery {
-  private readonly graph: RiviereGraph
+export interface ComponentList {
+  components: Component[]
+}
+```
+
+The loader builds that model specifically for the requested read:
 
-  constructor(graph: RiviereGraph) {
-    assertValidGraph(graph)
-    this.graph = graph
+```typescript
+/** @riviere-role query-model-loader */
+export class ComponentListLoader {
+  load(
+    graphPath: string | undefined,
+    domain: string | undefined,
+    type: ComponentType | undefined,
+  ): ComponentList {
+    const components = loadQuery(graphPath).components()
+    const inDomain = domain === undefined
+      ? components
+      : components.filter((component) => component.domain === domain)
+
+    return {
+      components: type === undefined
+        ? inDomain
+        : inDomain.filter((component) => component.type === type),
+    }
   }
+}
+```
 
-  domains(): Domain[] {
-    return queryDomains(this.graph)
+The use case translates its input into loader criteria and returns the loaded model:
+
+```typescript
+/** @riviere-role query-model-use-case */
+export class ListComponents {
+  constructor(private readonly components: ComponentListLoader) {}
+
+  execute(input: ListComponentsInput): ComponentList {
+    return this.components.load(input.graphPath, input.domain, input.type)
   }
 }
 ```
 
-### Query Model Result Type
+Bad:
+
 ```typescript
-/** @riviere-role query-model */
-export interface Domain {
-  name: string
-  componentCounts: ComponentCounts
+export class RiviereQueryRepository {
+  load(): RiviereQuery
 }
+```
 
-/** @riviere-role query-model */
-export type DomainSummary = ReturnType<RiviereQuery['domains']>[number]
+The persisted state is a graph. `RiviereQuery` is domain behaviour used to build the query-specific `ComponentList`; it is not itself the query model.
+
+Also bad:
+
+```typescript
+export class GraphQueryModel {}
 ```
 
+There is no user query called “query graph”. This generic model hides the actual use case and prevents the read from being shaped around what `ListComponents` needs.
+
 ### Edge Cases
-- A query model class with many public methods (facade pattern) is valid
-- A query model class that delegates to pure functions is the canonical pattern
-- Static factory methods (e.g., `fromJSON`) are valid
-- Branded types used by the query model (e.g., `ComponentId`) are valid
+- Usually there is one query model per query use case because each read can be shaped and optimised independently
+- Share a query model only when concrete use cases genuinely need the same read shape
+- Query models may import the domain objects and behaviour needed to build that read
+- Do not add `Model` or `QueryModel` suffixes; the role annotation already states the technical classification
 
 ## Anti-Patterns
 
 ### Common Misclassifications
 - **Not an aggregate**: Aggregates enforce behavioral invariants and expose methods that modify state. If no method modifies state, it is a query-model.
-- **Not a domain-service**: Domain services are stateless functions. Query model classes hold state.
+- **Not a domain-service**: A domain service provides reusable domain behaviour. A query model is shaped for a concrete read use case.
 - **Not a value-object**: Value objects are reusable domain concepts in the `/domain` layer. Query model types live in the `/queries` layer.
 
 ### Mixed Responsibility Signals
@@ -66,7 +111,7 @@ export type DomainSummary = ReturnType<RiviereQuery['domains']>[number]
 
 ## Decision Guidance
 - **vs aggregate**: Does any method modify state? → aggregate. All methods read-only? → query-model
-- **vs domain-service**: Does it hold state? → query-model. Stateless function operating on passed-in data? → domain-service
+- **vs domain-service**: Is it reusable domain behaviour? → domain-service. Is it a read shaped for a concrete query use case? → query-model
 - **vs value-object**: Does it live in `/queries`? → query-model. Does it live in `/domain`? → value-object
 
 ## References
diff --git a/.riviere/role-definitions/value-object.md b/.riviere/role-definitions/value-object.md
index 36911660b..1612ace85 100644
--- a/.riviere/role-definitions/value-object.md
+++ b/.riviere/role-definitions/value-object.md
@@ -1,35 +1,47 @@
 # value-object
 
 ## Purpose
-A type or class that represents a domain concept defined by its attributes rather than identity — it carries meaning but no behavior that modifies external state.
+A class that represents a domain concept defined by its attributes rather than identity. It owns its parsing and may expose immutable behavior.
 
 ## Behavioral Contract
 1. Defined by its values, not by an identity
-2. Typically immutable
-3. May have derived/computed properties but no side effects
-4. Used as building blocks within aggregates, inputs, and results
+2. Immutable: operations return new values instead of mutating the current value
+3. Has at least one static parsing method named `parse` or beginning with `parseFrom`
+4. Has a private constructor, so callers must use a parsing method
+5. May expose instance methods such as `equals`, `add`, or `toString`
+6. Does not store functions in instance data members
+7. Used as a building block within aggregates, inputs, and results
 
 ## Examples
 
 ### Canonical Example
 ```typescript
 /** @riviere-role value-object */
-export interface ModuleContext {
-  moduleName: string
-  sourceFiles: SourceFile[]
-  tsConfigPath: string
+export class Money {
+  declare private readonly brand: 'Money'
+
+  private constructor(readonly amount: number) {}
+
+  static parse(amount: number): Money {
+    return new Money(amount)
+  }
+
+  add(other: Money): Money {
+    return Money.parse(this.amount + other.amount)
+  }
 }
 ```
 
 ### Edge Cases
-- Discriminated unions are value objects: `type Outcome = 'success' | 'partial' | 'failure'`
-- Enum-like const objects can be value objects
-- A class with only getters and no mutation methods is a value object
+- Multiple input representations may use methods such as `parseFromString` and `parseFromJson`
+- Parsing may return a structured validation result when input can be invalid
+- Ordinary instance methods are allowed; callable instance data members are not
 
 ## Anti-Patterns
 
 ### Common Misclassifications
 - **Not an aggregate**: if it owns behavior that enforces invariants and is loaded through a repository, it's an aggregate
+- **Not an interface or type alias**: value objects are classes that own parsing and immutable behavior
 - **Not a command-use-case-input**: if it's specifically the parameter type for a command, use that more specific role
 - **Not an external-client-model**: if it represents an external service's data shape rather than a domain concept
 - **Not a consumer contract**: if it exists only to shape data for a builder, presenter, workflow, or CLI consumer, it is not a domain value object
diff --git a/.riviere/role-enforcement.config.ts b/.riviere/role-enforcement.config.ts
index 194f6b0c5..598a3e3da 100644
--- a/.riviere/role-enforcement.config.ts
+++ b/.riviere/role-enforcement.config.ts
@@ -1,109 +1,28 @@
-import { location, roleEnforcement } from '@living-architecture/riviere-role-enforcement'
-import { allRoles, type RoleName } from './roles'
-
-const commandRoles: RoleName[] = [
-  'command-use-case',
-  'command-use-case-input',
-  'command-use-case-result',
-  'command-use-case-result-value',
-  'command-input-factory',
-]
-
-const queryRoles: RoleName[] = [
-  'query-model-use-case',
-  'query-model-use-case-input',
-  'query-model',
-  'query-model-error',
-]
-
-const domainRoles: RoleName[] = [
-  'aggregate',
-  'value-object',
-  'domain-event',
-  'domain-port',
-  'domain-service',
-  'domain-error',
-]
-
-const externalClientRoles: RoleName[] = [
-  'external-client-service',
-  'external-client-model',
-  'external-client-error',
-]
-
-const entrypointRoles: RoleName[] = [
-  'cli-entrypoint',
-  'cli-error-handler',
-  'cli-output-formatter',
-  'command-input-factory',
-  'entrypoint-cli-input-parser',
-]
-
-const cliPresentationRoles: RoleName[] = [
-  'cli-error',
-  'cli-error-handler',
-  'cli-output-formatter',
-  'cli-response-formatter',
-  'cli-response-writer',
-]
-
-const packages = [
-  'packages/riviere-cli',
-  'packages/riviere-extract-ts',
-  'packages/riviere-builder',
-  'packages/riviere-query',
-  'packages/riviere-role-enforcement',
-  'tools/dev-workflow-v2',
-]
-
-export const config = roleEnforcement({
-  packages,
-  canonicalConfigurationsFile: '.riviere/canonical-role-configurations.md',
-  ignorePatterns: [
-    '**/*.spec.ts',
-    '**/__fixtures__/**',
-    '**/*-fixtures.ts',
-    '**/test-fixtures.ts',
-    '**/test-fixture-*.ts',
-  ],
+import { roleEnforcementConfiguration } from '@living-architecture/riviere-role-enforcement-domain-model'
+import { app } from './configurations/app'
+import { domainModel } from './configurations/domain-model'
+import { publishedLanguage } from './configurations/published-language'
+import { useCases } from './configurations/use-cases'
+import { allRoles } from './roles'
+
+/**
+ * Executable enforcement of:
+ * docs/architecture/adr/ADR-002-allowed-folder-structures.md
+ *
+ * ADR-002 and this configuration must remain aligned.
+ * Any change to the architecture must update both.
+ */
+
+export const config = roleEnforcementConfiguration({
+  configurations: {
+    'apps/': app,
+    'packages/{subdomain}/domain-model': domainModel,
+    'packages/{subdomain}/published-language': publishedLanguage,
+    'packages/{subdomain}/use-cases': useCases,
+    'tools/': app,
+  },
+  ignorePatterns: ['**/__fixtures__/**'],
   roleDefinitionsDir: '.riviere/role-definitions',
   roles: allRoles,
-  workspacePackageSources: {
-    '@living-architecture/riviere-builder': 'packages/riviere-builder/src/index.ts',
-    '@living-architecture/riviere-query': 'packages/riviere-query/src/index.ts',
-  },
-
-  locations: [
-    location<RoleName>('src/features/{feature}')
-      .subLocation('/entrypoint/{entrypoint}', entrypointRoles, {
-        forbiddenImports: ['**/domain/**', '**/data-access/**'],
-      })
-      .subLocation('/commands', commandRoles, {
-        forbiddenImports: ['**/infra/cli/**'],
-      })
-      .subLocation('/queries', queryRoles, { forbiddenImports: ['**/infra/cli/**'] })
-      .subLocation('/domain', domainRoles)
-      .subLocation('/domain/ports', ['domain-port'])
-      .subLocation('/data-access', ['aggregate-repository', 'query-model-loader'])
-      .subLocation('/adapters/{adapter}', ['domain-port-adapter'], {
-        mayImportExternalPackages: false,
-        mayImportRoles: [
-          'domain-port',
-          'external-client-error',
-          'external-client-model',
-          'external-client-service',
-        ],
-      }),
-
-    location<RoleName>('src/platform')
-      .subLocation('/domain', domainRoles)
-      .subLocation('/infra', [], { mayImportRoles: [] })
-      .subLocation('/infra/external-clients/{client}', externalClientRoles)
-      .subLocation('/infra/cli/input', ['generic-cli-input-parser'])
-      .subLocation('/infra/cli/presentation', cliPresentationRoles),
-
-    location<RoleName>('src/entrypoint').subLocation('/_platform', entrypointRoles),
-
-    location<RoleName>('src/shell', ['main', 'cli-error-handler']),
-  ],
+  unassignedPackages: ['apps/docs', 'apps/eclair'],
 })
diff --git a/.riviere/role-selection-guide.md b/.riviere/role-selection-guide.md
index 3b57bb9b2..6f5e3b259 100644
--- a/.riviere/role-selection-guide.md
+++ b/.riviere/role-selection-guide.md
@@ -24,7 +24,6 @@ If yes, it is:
 - `cli-entrypoint`, or
 - a component used by the `cli-entrypoint` to process the raw inputs, such as:
   - `entrypoint-cli-input-parser`
-  - `generic-cli-input-parser` when the parsing is primitive technical machinery with no entrypoint meaning
   - `command-input-factory`
 
 ## 2. Loading previously stored state
@@ -86,9 +85,9 @@ If yes, it is part of the query side. Ask: does it orchestrate the query, or doe
 - If it orchestrates (loads a query model, calls query methods, returns a result): `query-model-use-case`
 - If it is the query model itself (holds immutable state, exposes read-only methods): `query-model`
 - If it defines result types returned by the query model: `query-model`
-- If it loads the query model from storage: `query-model-loader`
+- If it loads the concrete result for an actual query use case from storage: `query-model-loader`
 - If it defines the input contract for a query use case: `query-model-use-case-input`
-- If it is an error thrown during query operations: `query-model-error`
+- If loading the query model fails: `data-access-error`
 
 **Critical distinction from commands:** If the code loads state but NEVER modifies or saves it, it belongs on the query side. The presence of a repository-like loading pattern does not automatically make something a `command-use-case` + `aggregate-repository`.
 
@@ -98,9 +97,9 @@ If yes, it is part of the query side. Ask: does it orchestrate the query, or doe
 
 Keep the three responsibilities separate:
 
-- A generic client under `platform/infra/external-clients/{client}/` knows only the external system's API and types.
-- A `domain-port` under `domain/ports/` defines the capability the domain needs in domain language.
-- A `domain-port-adapter` under `adapters/{client}/` implements one domain port using one generic client API.
+- A generic client under the use-case package's `infra/external-clients/{client}/` knows only the external system's API and types.
+- A `domain-port` in the subdomain's domain-model package defines the capability the domain needs in domain language.
+- A `domain-port-adapter` under the use-case feature's `adapters/{client}/` implements one domain port using one generic client API.
 
 The adapter translates between the two contracts. It does not contain domain decisions, application orchestration, direct Node API calls, or third-party package calls. It must not coordinate multiple clients. The Node and third-party restriction is specific to this architecture's deliberate split between a domain-port adapter and a generic external client; it is not a claim that all adapters everywhere must avoid technology imports. See [`domain-port-adapter`](role-definitions/domain-port-adapter.md) for the concrete Oxlint and GitHub examples and the failure caused by combining the two roles.
 
diff --git a/.riviere/roles.ts b/.riviere/roles.ts
index 46b1f8351..8734a4b82 100644
--- a/.riviere/roles.ts
+++ b/.riviere/roles.ts
@@ -1,38 +1,4 @@
-import { createRoleFactory } from '@living-architecture/riviere-role-enforcement'
-
-type RoleName =
-  | 'aggregate'
-  | 'aggregate-repository'
-  | 'cli-entrypoint'
-  | 'cli-error'
-  | 'cli-error-handler'
-  | 'entrypoint-cli-input-parser'
-  | 'generic-cli-input-parser'
-  | 'cli-output-formatter'
-  | 'cli-response-formatter'
-  | 'cli-response-writer'
-  | 'command-input-factory'
-  | 'command-use-case'
-  | 'command-use-case-input'
-  | 'command-use-case-result'
-  | 'command-use-case-result-value'
-  | 'domain-error'
-  | 'domain-event'
-  | 'domain-port'
-  | 'domain-service'
-  | 'domain-port-adapter'
-  | 'external-client-error'
-  | 'external-client-model'
-  | 'external-client-service'
-  | 'main'
-  | 'query-model'
-  | 'query-model-error'
-  | 'query-model-loader'
-  | 'query-model-use-case'
-  | 'query-model-use-case-input'
-  | 'value-object'
-
-const role = createRoleFactory<RoleName>()
+import { role } from '@living-architecture/riviere-role-enforcement-domain-model'
 
 export const allRoles = [
   role('cli-entrypoint', { targets: ['function'] }),
@@ -66,9 +32,10 @@ export const allRoles = [
   role('external-client-service', { targets: ['function'] }),
   role('aggregate-repository', {
     targets: ['class'],
-    allowedOutputs: ['aggregate', 'domain-error'],
+    allowedOutputs: ['aggregate'],
     forbiddenDependencies: ['aggregate-repository'],
   }),
+  role('data-access-error', { targets: ['class'] }),
   role('aggregate', {
     targets: ['interface', 'type-alias', 'class'],
     minPublicMethods: 1,
@@ -88,17 +55,19 @@ export const allRoles = [
     ],
   }),
   role('value-object', {
-    targets: ['interface', 'type-alias', 'class'],
-    forbiddenCallableMembers: true,
+    targets: ['class'],
+    forbiddenCallableDataMembers: true,
     forbiddenSupertypes: ['Error'],
     requiredPrivateMembers: ['brand'],
+    requiresPrivateConstructor: true,
+    requiredStaticMethodNamePrefix: 'parse',
     requiresDataMembers: true,
     forbiddenDependencies: ['aggregate', 'domain-service'],
   }),
   role('domain-error', { targets: ['class'] }),
   role('domain-event', {
     targets: ['type-alias'],
-    nameMatches: '.*Event$',
+    mustBeDataStructure: true,
   }),
   role('domain-port', { targets: ['interface', 'type-alias'] }),
   role('domain-service', { targets: ['function', 'class'] }),
@@ -121,16 +90,14 @@ export const allRoles = [
   role('query-model', {
     targets: ['class', 'function', 'interface', 'type-alias'],
   }),
-  role('query-model-error', { targets: ['class'] }),
   role('query-model-loader', {
     targets: ['class'],
-    allowedOutputs: ['query-model', 'domain-error'],
+    allowedOutputs: ['query-model'],
     forbiddenDependencies: ['query-model-loader'],
   }),
   role('external-client-model', { targets: ['interface', 'type-alias', 'class'] }),
   role('external-client-error', { targets: ['class'] }),
   role('entrypoint-cli-input-parser', { targets: ['function'] }),
-  role('generic-cli-input-parser', { targets: ['function'] }),
   role('cli-error', { targets: ['class'] }),
   role('main', {
     targets: ['function'],
@@ -141,6 +108,27 @@ export const allRoles = [
       'query-model-loader',
     ],
   }),
+  role('published-language-annotation', {
+    requiresDecoratorSignature: true,
+  }),
+  role('published-language-data-structure', {
+    mustBeDataStructure: true,
+  }),
+  role('published-language-field-name', {
+    requiresStringLiteralConstant: true,
+  }),
+  role('published-language-parser', {
+    returns: [
+      { success: true, '*': 'published-language-schema' },
+      { success: false, '*': '*' },
+    ],
+  }),
+  role('published-language-schema', {
+    mustBeDataStructure: true,
+  }),
+  role('published-language-union', {
+    requiresUnion: true,
+  }),
 ] as const
 
-export type { RoleName }
+export type RoleName = (typeof allRoles)[number]['name']
diff --git a/CLAUDE.md b/CLAUDE.md
index 1cb53f9dd..b6a5df6aa 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -11,22 +11,31 @@ For planning, discovery, PRD, architecture, delivery planning, or future-project
 ## Monorepo Structure
 
 ```text
-apps/       - Deployable applications (not published)
-packages/   - Shared libraries (publishable to npm)
+apps/       - Applications that aggregate subdomain use cases
+packages/   - Subdomains split into domain-model, use-cases, and published-language packages
+tools/      - Standalone app packages; their subdomain packages live under packages/
 ```
 
 Current packages:
-- `living-architecture/riviere-query` - Browser-safe query library (no Node.js dependencies)
-- `living-architecture/riviere-builder` - Node.js builder (depends on riviere-query)
-- `living-architecture/riviere-cli` - CLI tool with binary "riviere" (depends on riviere-builder)
-- `living-architecture/riviere-schema` - Riviere schema definitions
-- `living-architecture/riviere-extract-config` - JSON Schema and validation for extraction config DSL
-- `living-architecture/riviere-extract-conventions` - Decorators for marking architectural components (depends on riviere-extract-config)
-- `living-architecture/riviere-extract-ts` - TypeScript component extractor using ts-morph for AST parsing (depends on riviere-extract-config)
+- `packages/dev-workflow-v2/domain-model` - Maintainer workflow domain model
+- `packages/dev-workflow-v2/use-cases` - Maintainer workflow commands and adapters
+- `packages/riviere-builder/domain-model` - Browser-safe graph construction and querying domain model
+- `packages/riviere-builder/use-cases` - Commands, queries and data access for graph building and querying
+- `packages/riviere-schema/published-language` - Rivière graph contract
+- `packages/riviere-extract-config/published-language` - Extraction config contract
+- `packages/riviere-extract-conventions/published-language` - Annotations and ESLint integration for extraction conventions
+- `packages/riviere-extract-ts/domain-model` - TypeScript extraction domain model using ts-morph
+- `packages/riviere-extract-ts/use-cases` - TypeScript extraction commands and data access
+- `packages/riviere-role-enforcement/domain-model` - Role-enforcement domain model and Oxlint plugin
+- `packages/riviere-role-enforcement/use-cases` - Role-enforcement command, repository, adapter and external clients
 
 Apps:
-- `living-architecture/eclair` - Web app for viewing your software architecture via Riviere a schema
-- `living-architecture/docs` - Living architecture documentation website
+- `apps/cli` - CLI entrypoints and composition shell
+- `apps/eclair` - Web app for viewing your software architecture via a Rivière schema
+- `apps/docs` - Living architecture documentation website
+
+Tools:
+- `tools/dev-workflow-v2` - Maintainer workflow app and plugin entrypoints
 
 Key documents:
 - `docs/project/PRD/` - Current PRD folders
@@ -35,7 +44,7 @@ Key documents:
 - `docs/architecture/domain-terminology/contextive/definitions.glossary.yml`
 - `docs/architecture/adr/` - Decision records
 
-All code must follow the audit checklist in the [`development-skills:separation-of-concerns`](https://github.com/NTCoding/claude-skillz/blob/main/separation-of-concerns/SKILL.md) skill.
+All code must follow [ADR-002](docs/architecture/adr/ADR-002-allowed-folder-structures.md) and the executable rules in [`.riviere/role-enforcement.config.ts`](.riviere/role-enforcement.config.ts). Keep those two files aligned.
 
 Use domain terminology from the contextive definitions. Do not invent new terms or use technical jargon when domain terminology exists.
 
@@ -79,15 +88,15 @@ pnpm nx graph
 # Add backend application
 pnpm nx g @nx/node:application apps/[app-name]
 
-# Add shared library (publishable)
-pnpm nx g @nx/js:library packages/[pkg-name] --publishable --importPath=@living-architecture/[pkg-name]
+# Add a subdomain package
+pnpm nx g @nx/js:library packages/[subdomain]/[domain-model|use-cases|published-language] --publishable --importPath=@living-architecture/[package-name]
 ```
 
 After generating a new project:
-1. Update the project's package.json with correct name: `@living-architecture/[project-name]`
+1. Update the project's package.json with the correct published package name
 2. Create the 3-file tsconfig structure (tsconfig.json, tsconfig.lib.json, tsconfig.spec.json)
 3. Add vitest.config.ts if tests are needed with 100% coverage as the default
-4. If importing from another project, add `"@living-architecture/[pkg-name]": "workspace:*"` to dependencies
+4. If importing from another project, add its published package name with `"workspace:*"` to dependencies
 5. Run `pnpm nx sync` to update TypeScript project references
 6. Update this CLAUDE.md "Current packages" section
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b763907f9..3e378fd7c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -17,8 +17,11 @@ This workflow is deliberately independent of Claude Code, Codex, OpenCode, Kimi,
 ## Development Setup
 
 ```bash
-pnpm install
-nx run-many -t build    # Verify setup works
+nvm install
+nvm use
+corepack enable
+pnpm install --frozen-lockfile
+pnpm nx run-many -t build    # Verify setup works
 ```
 
 ## Commands
@@ -54,7 +57,7 @@ chore: update dependencies
 Follow the conventions in [`docs/conventions/`](docs/conventions/):
 - [`software-design.md`](docs/conventions/software-design.md) — Design principles
 - [`testing.md`](docs/conventions/testing.md) — Testing requirements
-- Code placement follows the [`development-skills:separation-of-concerns`](https://github.com/NTCoding/claude-skillz/blob/main/separation-of-concerns/SKILL.md) skill
+- Code placement follows [`ADR-002`](docs/architecture/adr/ADR-002-allowed-folder-structures.md) and the executable rules in [`.riviere/role-enforcement.config.ts`](.riviere/role-enforcement.config.ts)
 
 ## Testing Requirements
 
@@ -83,7 +86,3 @@ If your harness supports agents, you can run these against your changes:
 External contributors use this lightweight public workflow: make the change and raise a detailed pull request.
 
 Members of the maintainer team use the full [`maintainer workflow`](docs/workflow/task-workflow.md), including planning, GitHub issues and the development harness.
-
-## AI-Assisted Development
-
-This project was built with [Claude Code](https://claude.com/claude-code) with skills from [claude-skillz](https://github.com/NTCoding/claude-skillz).
diff --git a/README.md b/README.md
index 6b3eb3dfd..a54f5fe8a 100644
--- a/README.md
+++ b/README.md
@@ -84,15 +84,14 @@ See the [extraction guide](https://living-architecture.dev/extract/) for AI-assi
 
 | Package | Purpose | Install |
 |---------|---------|---------|
-| `@living-architecture/riviere-schema` | Schema definition and validation | `npm i @living-architecture/riviere-schema` |
-| `@living-architecture/riviere-query` | Query graphs. Browser-safe. | `npm i @living-architecture/riviere-query` |
-| `@living-architecture/riviere-builder` | Build graphs programmatically | `npm i @living-architecture/riviere-builder` |
+| `@living-architecture/riviere-schema-published-language` | Schema definition and validation | `npm i @living-architecture/riviere-schema-published-language` |
+| `@living-architecture/riviere-builder-domain-model` | Build and query graphs programmatically | `npm i @living-architecture/riviere-builder-domain-model` |
 | `@living-architecture/riviere-cli` | CLI for extraction workflows | `npm i -g @living-architecture/riviere-cli` |
 
 ## Build a Graph
 
 ```typescript
-import { RiviereBuilder } from '@living-architecture/riviere-builder';
+import { RiviereBuilder } from '@living-architecture/riviere-builder-domain-model';
 
 const builder = RiviereBuilder.new({
   sources: [{ repository: 'https://github.com/your-org/your-repo' }],
@@ -126,7 +125,7 @@ const graph = builder.build();
 ## Query a Graph
 
 ```typescript
-import { RiviereQuery } from '@living-architecture/riviere-query';
+import { RiviereQuery } from '@living-architecture/riviere-builder-domain-model';
 
 const query = RiviereQuery.fromJSON(graphData);
 
@@ -145,7 +144,7 @@ const events = query.componentsByType('Event');
 
 ## The Rivière Schema
 
-Rivière graphs are JSON documents conforming to the [Rivière schema](./packages/riviere-schema/riviere.schema.json).
+Rivière graphs are JSON documents conforming to the [Rivière schema](./packages/riviere-schema/published-language/riviere.schema.json).
 
 ```json
 {
@@ -159,7 +158,7 @@ Rivière graphs are JSON documents conforming to the [Rivière schema](./package
 }
 ```
 
-See [examples](./packages/riviere-schema/examples/) for complete multi-domain graphs.
+See [examples](./packages/riviere-schema/published-language/examples/) for complete multi-domain graphs.
 
 ## Visualize with Éclair
 
diff --git a/apps/cli/CLAUDE.md b/apps/cli/CLAUDE.md
new file mode 100644
index 000000000..898b9ea89
--- /dev/null
+++ b/apps/cli/CLAUDE.md
@@ -0,0 +1,28 @@
+# riviere-cli
+
+CLI tool for building and querying Rivière architecture graphs.
+
+Architecture defined in [ADR-002](../../docs/architecture/adr/ADR-002-allowed-folder-structures.md).
+
+## Workflow Prompts
+
+The `docs/workflow/` directory contains AI extraction workflow prompts (step-1 through step-6). These prompts reference CLI commands directly.
+
+**When modifying CLI commands, update the corresponding workflow prompts.**
+
+If a command's flags, behavior, or output format changes, ensure the workflow prompts still work correctly. This keeps the extraction workflow in sync with the CLI.
+
+## Design Philosophy
+
+Default to the most reliable, powerful behavior. Opt-out flags (`--no-*`) for edge cases. Users should get the best experience by default, not discover it when things don't work.
+
+## Location Structure
+
+Follow [ADR-002](../../docs/architecture/adr/ADR-002-allowed-folder-structures.md) and the executable rules in [`.riviere/role-enforcement.config.ts`](../../.riviere/role-enforcement.config.ts).
+
+## Commands
+
+- `riviere builder <command>` - Graph building commands
+- `riviere query <command>` - Graph query commands
+
+Run `nx generate-docs riviere-cli` to regenerate CLI reference documentation after command changes.
diff --git a/packages/riviere-cli/README.md b/apps/cli/README.md
similarity index 100%
rename from packages/riviere-cli/README.md
rename to apps/cli/README.md
diff --git a/packages/riviere-cli/docs/generated/cli-reference.md b/apps/cli/docs/generated/cli-reference.md
similarity index 100%
rename from packages/riviere-cli/docs/generated/cli-reference.md
rename to apps/cli/docs/generated/cli-reference.md
diff --git a/packages/riviere-cli/docs/workflow/step-1-understand.md b/apps/cli/docs/workflow/step-1-understand.md
similarity index 100%
rename from packages/riviere-cli/docs/workflow/step-1-understand.md
rename to apps/cli/docs/workflow/step-1-understand.md
diff --git a/packages/riviere-cli/docs/workflow/step-2-define-components.md b/apps/cli/docs/workflow/step-2-define-components.md
similarity index 100%
rename from packages/riviere-cli/docs/workflow/step-2-define-components.md
rename to apps/cli/docs/workflow/step-2-define-components.md
diff --git a/packages/riviere-cli/docs/workflow/step-3-extract.md b/apps/cli/docs/workflow/step-3-extract.md
similarity index 100%
rename from packages/riviere-cli/docs/workflow/step-3-extract.md
rename to apps/cli/docs/workflow/step-3-extract.md
diff --git a/packages/riviere-cli/docs/workflow/step-4-link.md b/apps/cli/docs/workflow/step-4-link.md
similarity index 98%
rename from packages/riviere-cli/docs/workflow/step-4-link.md
rename to apps/cli/docs/workflow/step-4-link.md
index 7db9059ba..33e3724a8 100644
--- a/packages/riviere-cli/docs/workflow/step-4-link.md
+++ b/apps/cli/docs/workflow/step-4-link.md
@@ -85,7 +85,7 @@ The link is **API → UseCase**.
 
 **Fetch the CLI reference for full command syntax and examples:**
 ```text
-https://raw.githubusercontent.com/NTCoding/living-architecture/main/packages/riviere-cli/docs/generated/cli-reference.md
+https://raw.githubusercontent.com/NTCoding/living-architecture/main/apps/cli/docs/generated/cli-reference.md
 ```
 
 | Command | When to Use |
diff --git a/packages/riviere-cli/docs/workflow/step-5-enrich.md b/apps/cli/docs/workflow/step-5-enrich.md
similarity index 98%
rename from packages/riviere-cli/docs/workflow/step-5-enrich.md
rename to apps/cli/docs/workflow/step-5-enrich.md
index 691d1e861..a2ab3a1a7 100644
--- a/packages/riviere-cli/docs/workflow/step-5-enrich.md
+++ b/apps/cli/docs/workflow/step-5-enrich.md
@@ -86,7 +86,7 @@ emit(new OrderPlaced(...));           // emits: "OrderPlaced event"
 
 **Fetch the CLI reference for `enrich` command syntax:**
 ```text
-https://raw.githubusercontent.com/NTCoding/living-architecture/main/packages/riviere-cli/docs/generated/cli-reference.md
+https://raw.githubusercontent.com/NTCoding/living-architecture/main/apps/cli/docs/generated/cli-reference.md
 ```
 
 **Best effort on all fields.** Add every value you identify — state changes, business rules, reads, validates, modifies, emits. All options are repeatable.
diff --git a/packages/riviere-cli/docs/workflow/step-6-validate.md b/apps/cli/docs/workflow/step-6-validate.md
similarity index 100%
rename from packages/riviere-cli/docs/workflow/step-6-validate.md
rename to apps/cli/docs/workflow/step-6-validate.md
diff --git a/apps/cli/esbuild.config.mjs b/apps/cli/esbuild.config.mjs
new file mode 100644
index 000000000..9cca3f5bd
--- /dev/null
+++ b/apps/cli/esbuild.config.mjs
@@ -0,0 +1,60 @@
+import * as esbuild from 'esbuild'
+import { readFileSync } from 'node:fs'
+import {
+  dirname,
+  join,
+} from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+// Resolve package.json relative to this config file, not CWD
+const __dirname = dirname(fileURLToPath(import.meta.url))
+const pkg = JSON.parse(readFileSync(join(__dirname, 'package.json'), 'utf-8'))
+
+const externalDependencies = Object.keys(pkg.dependencies || {})
+  .filter(dep => !dep.startsWith('@living-architecture/'))
+const executableBanner = [
+  '#!/usr/bin/env node',
+  "import { createRequire as __createRequire } from 'node:module';",
+  "import { fileURLToPath as __fileURLToPath } from 'node:url';",
+  "import { dirname as __pathDirname } from 'node:path';",
+  'const require = __createRequire(import.meta.url);',
+  'const __filename = __fileURLToPath(import.meta.url);',
+  'const __dirname = __pathDirname(__filename);',
+].join('\n')
+
+// CLI binary entry point
+await esbuild.build({
+  entryPoints: ['src/shell/bin.ts'],
+  bundle: true,
+  platform: 'node',
+  target: 'node18',
+  format: 'esm',
+  outfile: 'dist/bin.js',
+  banner: {js: executableBanner,},
+  external: externalDependencies,
+  define: { INJECTED_VERSION: JSON.stringify(pkg.version) },
+})
+
+await esbuild.build({
+  entryPoints: ['src/shell/role-enforcement-bin.ts'],
+  bundle: true,
+  platform: 'node',
+  target: 'node18',
+  format: 'esm',
+  outfile: 'dist/role-enforcement-bin.js',
+  banner: {js: executableBanner,},
+  external: externalDependencies,
+})
+
+// Library entry point (no side effects)
+await esbuild.build({
+  entryPoints: ['src/index.ts'],
+  bundle: true,
+  platform: 'node',
+  target: 'node18',
+  format: 'esm',
+  outfile: 'dist/index.js',
+  banner: {js: executableBanner,},
+  external: externalDependencies,
+  define: { INJECTED_VERSION: JSON.stringify(pkg.version) },
+})
diff --git a/apps/cli/package.json b/apps/cli/package.json
new file mode 100644
index 000000000..e8346efc0
--- /dev/null
+++ b/apps/cli/package.json
@@ -0,0 +1,47 @@
+{
+  "name": "@living-architecture/riviere-cli",
+  "version": "0.11.3",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/NTCoding/living-architecture.git",
+    "directory": "apps/cli"
+  },
+  "type": "module",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "@living-architecture/source": "./src/index.ts",
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
+    }
+  },
+  "files": [
+    "dist",
+    "!dist/**/__fixtures__/**",
+    "!**/*.tsbuildinfo"
+  ],
+  "bin": {
+    "riviere": "./dist/bin.js",
+    "riviere-role-enforcement": "./dist/role-enforcement-bin.js"
+  },
+  "engines": {
+    "node": ">=20"
+  },
+  "dependencies": {
+    "@living-architecture/riviere-builder-use-cases": "workspace:*",
+    "@living-architecture/riviere-extract-ts-domain-model": "workspace:*",
+    "@living-architecture/riviere-extract-ts-use-cases": "workspace:*",
+    "@living-architecture/riviere-role-enforcement-domain-model": "workspace:*",
+    "@living-architecture/riviere-role-enforcement-use-cases": "workspace:*",
+    "@living-architecture/riviere-schema-published-language": "workspace:*",
+    "commander": "^14.0.2",
+    "zod": "^4.3.5"
+  }
+}
diff --git a/apps/cli/project.json b/apps/cli/project.json
new file mode 100644
index 000000000..ed3dc8c53
--- /dev/null
+++ b/apps/cli/project.json
@@ -0,0 +1,55 @@
+{
+  "name": "riviere-cli",
+  "targets": {
+    "build": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          "node esbuild.config.mjs",
+          "tsc --emitDeclarationOnly --declaration --declarationDir dist"
+        ],
+        "cwd": "{projectRoot}",
+        "parallel": false
+      },
+      "outputs": ["{projectRoot}/dist"]
+    },
+    "generate-docs": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "pnpm exec npx tsx apps/cli/scripts/generate-docs.ts",
+        "cwd": "{workspaceRoot}"
+      },
+      "dependsOn": ["build"],
+      "outputs": ["{projectRoot}/docs/generated"]
+    },
+    "check-generated-docs": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          "pnpm exec npx tsx apps/cli/scripts/generate-docs.ts",
+          "git diff --exit-code apps/cli/docs/generated/ || (echo 'Generated docs are stale. Run: pnpm nx generate-docs riviere-cli' && exit 1)"
+        ],
+        "cwd": "{workspaceRoot}",
+        "parallel": false
+      },
+      "dependsOn": ["build"]
+    },
+    "role-check": {
+      "executor": "nx:run-commands",
+      "dependsOn": ["^build"],
+      "options": {
+        "command": "pnpm exec tsx apps/cli/src/shell/role-enforcement-bin.ts .riviere/role-enforcement.config.ts --package apps/cli",
+        "cwd": "{workspaceRoot}"
+      }
+    },
+    "smoke-test": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": ["node dist/bin.js --help", "node dist/bin.js extract --help"],
+        "cwd": "{projectRoot}",
+        "parallel": false
+      },
+      "dependsOn": ["build"]
+    }
+  }
+}
diff --git a/apps/cli/scripts/generate-docs.ts b/apps/cli/scripts/generate-docs.ts
new file mode 100644
index 000000000..a0b6e085a
--- /dev/null
+++ b/apps/cli/scripts/generate-docs.ts
@@ -0,0 +1,339 @@
+#!/usr/bin/env tsx
+/**
+ * CLI Reference Documentation Generator
+ *
+ * Generates markdown documentation from Commander.js command definitions.
+ * Run with: pnpm exec tsx scripts/generate-docs.ts
+ */
+
+import type { Command, Argument } from 'commander'
+import { writeFileSync, mkdirSync } from 'node:fs'
+import { join } from 'node:path'
+import { createProgram } from '../src/shell/cli'
+
+interface OptionInfo {
+  flags: string
+  description: string
+  required: boolean
+}
+
+interface ArgumentInfo {
+  name: string
+  description: string
+  required: boolean
+}
+
+interface CommandInfo {
+  name: string
+  fullName: string
+  description: string
+  options: OptionInfo[]
+  arguments: ArgumentInfo[]
+  examples: readonly string[]
+}
+
+interface CommandWithRegisteredArgs {
+  readonly registeredArguments?: readonly Argument[]
+}
+
+interface CommandWithEvents {
+  readonly _events?: { readonly afterHelp?: unknown }
+}
+
+type AfterHelpContext = {
+  readonly command: Command
+  readonly write: (str: string) => void
+}
+
+function extractOptions(cmd: Command): readonly OptionInfo[] {
+  return cmd.options
+    .filter((opt) => opt.long !== '--help' && opt.long !== '--version')
+    .map((opt) => ({
+      flags: opt.flags,
+      description: opt.description ?? '(no description)',
+      required: opt.mandatory,
+    }))
+}
+
+function hasRegisteredArguments(cmd: Command): cmd is Command & CommandWithRegisteredArgs {
+  return 'registeredArguments' in cmd && Array.isArray(cmd.registeredArguments)
+}
+
+function extractArguments(cmd: Command): readonly ArgumentInfo[] {
+  if (!hasRegisteredArguments(cmd)) {
+    return []
+  }
+
+  return cmd.registeredArguments.map((arg) => ({
+    name: arg.name(),
+    description: arg.description,
+    required: arg.required,
+  }))
+}
+
+function isAfterHelpCallback(fn: unknown): fn is (ctx: AfterHelpContext) => string | void {
+  return typeof fn === 'function'
+}
+
+function callAfterHelpHandler(afterHelp: unknown, cmd: Command): string {
+  if (isAfterHelpCallback(afterHelp)) {
+    const parts: string[] = []
+    const context: AfterHelpContext = {
+      command: cmd,
+      write: (str: string) => {
+        parts.push(str)
+      },
+    }
+    const result = afterHelp(context)
+    return typeof result === 'string' ? result : parts.join('')
+  }
+
+  if (typeof afterHelp === 'string') {
+    return afterHelp
+  }
+
+  return ''
+}
+
+function parseExamplesFromHelpText(helpText: string): readonly string[] {
+  const lines = helpText.split('\n')
+  const examples: string[] = []
+  const examplesStartIndex = lines.findIndex((line) => line.trim().startsWith('Examples:'))
+
+  if (examplesStartIndex === -1) {
+    return examples
+  }
+
+  const exampleLines = lines.slice(examplesStartIndex + 1)
+  const exampleParts: string[] = []
+
+  for (const line of exampleLines) {
+    const trimmed = line.trim()
+    const isNewExample = trimmed.startsWith('$') || trimmed.startsWith('#')
+    const isContinuation = trimmed && exampleParts.length > 0 && !isNewExample
+    const isBlankAfterExample = !trimmed && exampleParts.length > 0
+
+    if (isNewExample) {
+      if (exampleParts.length > 0) {
+        examples.push(exampleParts.join('\n  ').trim())
+        exampleParts.length = 0
+      }
+      exampleParts.push(trimmed)
+    } else if (isContinuation) {
+      exampleParts.push(trimmed)
+    } else if (isBlankAfterExample) {
+      examples.push(exampleParts.join('\n  ').trim())
+      exampleParts.length = 0
+    }
+  }
+
+  if (exampleParts.length > 0) {
+    examples.push(exampleParts.join('\n  ').trim())
+  }
+
+  return examples
+}
+
+function hasEvents(cmd: Command): cmd is Command & CommandWithEvents {
+  return '_events' in cmd && typeof cmd._events === 'object' && cmd._events !== null
+}
+
+function extractExamples(cmd: Command): readonly string[] {
+  if (!hasEvents(cmd)) {
+    return []
+  }
+
+  const afterHelp = cmd._events?.afterHelp
+  if (!afterHelp) {
+    return []
+  }
+
+  try {
+    const helpText = callAfterHelpHandler(afterHelp, cmd)
+    return helpText ? parseExamplesFromHelpText(helpText) : []
+  } catch {
+    return []
+  }
+}
+
+function extractCommandInfo(cmd: Command, parentName: string): CommandInfo {
+  const fullName = parentName ? `${parentName} ${cmd.name()}` : cmd.name()
+
+  return {
+    name: cmd.name(),
+    fullName,
+    description: cmd.description() ?? '(no description)',
+    options: [...extractOptions(cmd)],
+    arguments: [...extractArguments(cmd)],
+    examples: extractExamples(cmd),
+  }
+}
+
+function collectCommands(cmd: Command, parentName: string): readonly CommandInfo[] {
+  const fullName = parentName ? `${parentName} ${cmd.name()}` : cmd.name()
+
+  return cmd.commands.flatMap((subcmd) =>
+    subcmd.commands.length > 0
+      ? collectCommands(subcmd, fullName)
+      : [extractCommandInfo(subcmd, fullName)],
+  )
+}
+
+function formatOption(opt: OptionInfo): string {
+  return `| \`${opt.flags}\` | ${opt.description} |`
+}
+
+function generateCommandMarkdown(cmd: CommandInfo): string {
+  const lines: string[] = []
+
+  lines.push(`### \`${cmd.name}\``)
+  lines.push('')
+  lines.push(cmd.description)
+  lines.push('')
+
+  const args = cmd.arguments.map((a) => (a.required ? `<${a.name}>` : `[${a.name}]`)).join(' ')
+  const syntax = `${cmd.fullName}${args ? ' ' + args : ''} [options]`
+  lines.push('```bash')
+  lines.push(syntax)
+  lines.push('```')
+  lines.push('')
+
+  if (cmd.arguments.length > 0) {
+    lines.push('**Arguments:**')
+    lines.push('| Argument | Description |')
+    lines.push('|----------|-------------|')
+    for (const arg of cmd.arguments) {
+      lines.push(`| \`<${arg.name}>\` | ${arg.description} |`)
+    }
+    lines.push('')
+  }
+
+  const requiredOpts = cmd.options.filter((o) => o.required)
+  if (requiredOpts.length > 0) {
+    lines.push('**Required:**')
+    lines.push('| Flag | Description |')
+    lines.push('|------|-------------|')
+    for (const opt of requiredOpts) {
+      lines.push(formatOption(opt))
+    }
+    lines.push('')
+  }
+
+  const optionalOpts = cmd.options.filter((o) => !o.required)
+  if (optionalOpts.length > 0) {
+    lines.push('**Optional:**')
+    lines.push('| Flag | Description |')
+    lines.push('|------|-------------|')
+    for (const opt of optionalOpts) {
+      lines.push(formatOption(opt))
+    }
+    lines.push('')
+  }
+
+  if (cmd.examples.length > 0) {
+    lines.push('**Examples:**')
+    lines.push('```bash')
+    for (const example of cmd.examples) {
+      const cleaned = example.replace(/^\$\s*/, '').replace(/^#\s*/, '# ')
+      lines.push(cleaned)
+    }
+    lines.push('```')
+    lines.push('')
+  }
+
+  lines.push('---')
+  lines.push('')
+
+  return lines.join('\n')
+}
+
+function generateReference(): string {
+  const program = createProgram()
+  const allCommands = collectCommands(program, '')
+
+  const builderCommands = allCommands.filter((c) => c.fullName.startsWith('riviere builder'))
+  const queryCommands = allCommands.filter((c) => c.fullName.startsWith('riviere query'))
+  const extractCommands = allCommands.filter((c) => c.fullName.startsWith('riviere extract'))
+
+  const lines: string[] = []
+
+  lines.push('---')
+  lines.push('pageClass: reference')
+  lines.push('---')
+  lines.push('')
+  lines.push('# CLI Command Reference')
+  lines.push('')
+  lines.push('Complete documentation for all Riviere CLI commands.')
+  lines.push('')
+
+  lines.push('## Installation')
+  lines.push('')
+  lines.push('```bash')
+  lines.push('npm install @living-architecture/riviere-cli')
+  lines.push('```')
+  lines.push('')
+
+  lines.push('## Usage')
+  lines.push('')
+  lines.push('```bash')
+  lines.push('riviere builder <command> [options]  # Graph building commands')
+  lines.push('riviere query <command> [options]    # Graph query commands')
+  lines.push('riviere extract <command> [options]  # Component extraction commands')
+  lines.push('```')
+  lines.push('')
+
+  lines.push('## Exit Codes')
+  lines.push('')
+  lines.push('- `0`: Success (including warnings)')
+  lines.push('- `1`: Error or failed validation/consistency')
+  lines.push('')
+  lines.push('---')
+  lines.push('')
+
+  lines.push('## Builder Commands')
+  lines.push('')
+  lines.push('Commands for constructing architecture graphs.')
+  lines.push('')
+
+  for (const cmd of builderCommands) {
+    lines.push(generateCommandMarkdown(cmd))
+  }
+
+  lines.push('## Query Commands')
+  lines.push('')
+  lines.push('Commands for analyzing and querying graphs.')
+  lines.push('')
+
+  for (const cmd of queryCommands) {
+    lines.push(generateCommandMarkdown(cmd))
+  }
+
+  lines.push('## Extract Commands')
+  lines.push('')
+  lines.push('Commands for extracting architectural components from source code.')
+  lines.push('')
+
+  for (const cmd of extractCommands) {
+    lines.push(generateCommandMarkdown(cmd))
+  }
+
+  lines.push('## See Also')
+  lines.push('')
+  lines.push('- [CLI Quick Start](/get-started/cli-quick-start)')
+  lines.push('- [Extraction Workflow](/extract/)')
+  lines.push('- [Graph Structure](/reference/schema/graph-structure)')
+  lines.push('')
+
+  return lines.join('\n')
+}
+
+const outputDir = join(import.meta.dirname, '..', 'docs', 'generated')
+const outputPath = join(outputDir, 'cli-reference.md')
+
+mkdirSync(outputDir, { recursive: true })
+
+const content = generateReference()
+writeFileSync(outputPath, content, 'utf-8')
+
+console.log(`Generated: ${outputPath}`)
+console.log(`Lines: ${content.split('\n').length}`)
diff --git a/packages/riviere-cli/src/platform/__fixtures__/add-component-fixtures.ts b/apps/cli/src/__fixtures__/add-component-fixtures.ts
similarity index 100%
rename from packages/riviere-cli/src/platform/__fixtures__/add-component-fixtures.ts
rename to apps/cli/src/__fixtures__/add-component-fixtures.ts
diff --git a/apps/cli/src/__fixtures__/command-test-fixtures.ts b/apps/cli/src/__fixtures__/command-test-fixtures.ts
new file mode 100644
index 000000000..b84f95c8d
--- /dev/null
+++ b/apps/cli/src/__fixtures__/command-test-fixtures.ts
@@ -0,0 +1,372 @@
+import { execFileSync } from 'node:child_process'
+import { mkdtemp, rm, mkdir, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { vi, beforeEach, afterEach, expect, it } from 'vitest'
+import { createProgram } from '../shell/cli'
+import { handleGlobalError } from '../shell/global-error-handler'
+
+class ProcessExitError extends Error {
+  constructor(public exitCode: number) {
+    super(`process.exit(${exitCode})`)
+    this.name = 'ProcessExitError'
+  }
+}
+
+export class TestAssertionError extends Error {
+  constructor(message: string) {
+    super(message)
+    this.name = 'TestAssertionError'
+  }
+}
+
+export class MockError extends Error {
+  constructor(message: string) {
+    super(message)
+    this.name = 'MockError'
+  }
+}
+
+export interface ErrorOutput {
+  success: false
+  error: {
+    code: string
+    message: string
+    suggestions: string[]
+  }
+}
+
+function isErrorOutput(value: unknown): value is ErrorOutput {
+  if (typeof value !== 'object' || value === null) return false
+  if (!('success' in value) || value.success !== false) return false
+  if (!('error' in value) || typeof value.error !== 'object' || value.error === null) return false
+  return true
+}
+
+export function parseErrorOutput(consoleOutput: string[]): ErrorOutput {
+  const firstLine = consoleOutput[0]
+  if (firstLine === undefined) {
+    throw new TestAssertionError('Expected console output but got empty array')
+  }
+  const parsed: unknown = JSON.parse(firstLine)
+  if (!isErrorOutput(parsed)) {
+    throw new TestAssertionError('Invalid error output')
+  }
+  return parsed
+}
+
+export function parseSuccessOutput<T>(
+  consoleOutput: string[],
+  guard: (value: unknown) => value is T,
+  errorMessage: string,
+): T {
+  const firstLine = consoleOutput[0]
+  if (firstLine === undefined) {
+    throw new TestAssertionError('Expected console output but got empty array')
+  }
+  const parsed: unknown = JSON.parse(firstLine)
+  if (!guard(parsed)) {
+    throw new TestAssertionError(errorMessage)
+  }
+  return parsed
+}
+
+export interface TestContext {
+  testDir: string
+  originalCwd: string
+  consoleOutput: string[]
+}
+
+export function createTestContext(): TestContext {
+  return {
+    testDir: '',
+    originalCwd: '',
+    consoleOutput: [],
+  }
+}
+
+export function runIsolatedGit(directory: string, args: string[]): void {
+  const env = { ...process.env }
+  for (const name of Object.keys(env)) {
+    if (name.startsWith('GIT_')) delete env[name]
+  }
+  execFileSync('/usr/bin/git', args, { cwd: directory, env, stdio: 'ignore' })
+}
+
+export function setupCommandTest(ctx: TestContext): void {
+  beforeEach(async () => {
+    ctx.testDir = await mkdtemp(join(tmpdir(), 'riviere-test-'))
+    ctx.originalCwd = process.cwd()
+    ctx.consoleOutput = []
+    process.chdir(ctx.testDir)
+    ctx.testDir = process.cwd()
+    runIsolatedGit(ctx.testDir, ['init', '--initial-branch=main'])
+    runIsolatedGit(ctx.testDir, ['config', 'user.email', 'test@example.com'])
+    runIsolatedGit(ctx.testDir, ['config', 'user.name', 'Test User'])
+    runIsolatedGit(ctx.testDir, ['remote', 'add', 'origin', 'https://github.com/test/repo.git'])
+    vi.spyOn(console, 'log').mockImplementation((msg: string) => ctx.consoleOutput.push(msg))
+    vi.spyOn(process, 'exit').mockImplementation((code?: string | number | null | undefined) => {
+      throw new ProcessExitError(typeof code === 'number' ? code : 0)
+    })
+  })
+
+  afterEach(async () => {
+    vi.restoreAllMocks()
+    process.chdir(ctx.originalCwd)
+    await rm(ctx.testDir, { recursive: true })
+  })
+}
+
+export async function createGraph(
+  testDir: string,
+  graphData: object,
+  subPath = '.riviere',
+): Promise<string> {
+  const graphDir = join(testDir, subPath)
+  await mkdir(graphDir, { recursive: true })
+  const graphPath = join(graphDir, 'graph.json')
+  await writeFile(graphPath, JSON.stringify(graphData), 'utf-8')
+  return graphPath
+}
+
+export const baseMetadata = {
+  sources: [{ repository: 'https://github.com/org/repo' }],
+  domains: {
+    orders: {
+      description: 'Order management',
+      systemType: 'domain',
+    },
+  },
+}
+
+export const sourceLocation = {
+  repository: 'https://github.com/org/repo',
+  filePath: 'src/orders/handler.ts',
+}
+
+export const useCaseComponent = {
+  id: 'orders:checkout:usecase:place-order',
+  type: 'UseCase',
+  name: 'place-order',
+  domain: 'orders',
+  module: 'checkout',
+  sourceLocation,
+}
+
+export const apiComponent = {
+  id: 'orders:checkout:api:place-order',
+  type: 'API',
+  name: 'place-order',
+  domain: 'orders',
+  module: 'checkout',
+  sourceLocation,
+  apiType: 'REST',
+  httpMethod: 'POST',
+  path: '/orders',
+}
+
+export const eventHandlerComponent = {
+  id: 'orders:checkout:eventhandler:on-order-placed',
+  type: 'EventHandler',
+  name: 'on-order-placed',
+  domain: 'orders',
+  module: 'checkout',
+  sourceLocation,
+  subscribedEvents: ['OrderPlaced'],
+}
+
+export const validLink = {
+  id: 'orders:checkout:api:place-order→orders:checkout:usecase:place-order:sync',
+  source: 'orders:checkout:api:place-order',
+  target: 'orders:checkout:usecase:place-order',
+  type: 'sync',
+}
+
+export async function createGraphWithDomain(testDir: string, domainName: string): Promise<void> {
+  const graphDir = join(testDir, '.riviere')
+  await mkdir(graphDir, { recursive: true })
+  const graph = {
+    version: '1.0',
+    metadata: {
+      sources: [{ repository: 'https://github.com/org/repo' }],
+      domains: {
+        [domainName]: {
+          description: 'Test domain',
+          systemType: 'domain',
+        },
+      },
+    },
+    components: [],
+    links: [],
+  }
+  await writeFile(join(graphDir, 'graph.json'), JSON.stringify(graph), 'utf-8')
+}
+
+export async function createGraphWithSource(testDir: string, repository: string): Promise<void> {
+  const graphDir = join(testDir, '.riviere')
+  await mkdir(graphDir, { recursive: true })
+  const graph = {
+    version: '1.0',
+    metadata: {
+      sources: [{ repository }],
+      domains: {
+        orders: {
+          description: 'Orders',
+          systemType: 'domain',
+        },
+      },
+    },
+    components: [],
+    links: [],
+  }
+  await writeFile(join(graphDir, 'graph.json'), JSON.stringify(graph), 'utf-8')
+}
+
+export async function createGraphWithComponent(testDir: string, component: object): Promise<void> {
+  const graphDir = join(testDir, '.riviere')
+  await mkdir(graphDir, { recursive: true })
+  const graph = {
+    version: '1.0',
+    metadata: {
+      sources: [{ repository: 'https://github.com/org/repo' }],
+      domains: {
+        orders: {
+          description: 'Order management',
+          systemType: 'domain',
+        },
+      },
+    },
+    components: [component],
+    links: [],
+  }
+  await writeFile(join(graphDir, 'graph.json'), JSON.stringify(graph), 'utf-8')
+}
+
+export interface CustomTypeDefinition {
+  description?: string
+  requiredProperties?: Record<
+    string,
+    {
+      type: string
+      description?: string
+    }
+  >
+  optionalProperties?: Record<
+    string,
+    {
+      type: string
+      description?: string
+    }
+  >
+}
+
+export async function createGraphWithCustomType(
+  testDir: string,
+  domainName: string,
+  customTypeName: string,
+  customTypeDefinition: CustomTypeDefinition,
+): Promise<void> {
+  const graphDir = join(testDir, '.riviere')
+  await mkdir(graphDir, { recursive: true })
+  const graph = {
+    version: '1.0',
+    metadata: {
+      sources: [{ repository: 'https://github.com/org/repo' }],
+      domains: {
+        [domainName]: {
+          description: 'Test domain',
+          systemType: 'domain',
+        },
+      },
+      customTypes: { [customTypeName]: customTypeDefinition },
+    },
+    components: [],
+    links: [],
+  }
+  await writeFile(join(graphDir, 'graph.json'), JSON.stringify(graph), 'utf-8')
+}
+
+export const domainOpComponent = {
+  id: 'orders:checkout:domainop:confirm-order',
+  type: 'DomainOp',
+  name: 'Confirm Order',
+  domain: 'orders',
+  module: 'checkout',
+  operationName: 'confirmOrder',
+  sourceLocation: {
+    repository: 'https://github.com/org/repo',
+    filePath: 'src/domain.ts',
+  },
+}
+
+export const simpleUseCaseComponent = {
+  id: 'orders:checkout:usecase:place-order',
+  type: 'UseCase',
+  name: 'Place Order',
+  domain: 'orders',
+  module: 'checkout',
+  sourceLocation: {
+    repository: 'https://github.com/org/repo',
+    filePath: 'src/usecase.ts',
+  },
+}
+
+export function hasSuccessOutputStructure(value: unknown): value is {
+  success: true
+  data: object
+} {
+  if (typeof value !== 'object' || value === null) return false
+  if (!('success' in value) || value.success !== true) return false
+  if (!('data' in value) || typeof value.data !== 'object' || value.data === null) return false
+  return true
+}
+
+export function testCommandRegistration(commandName: string): void {
+  it(`registers ${commandName} command under builder`, () => {
+    const program = createProgram()
+    const builderCmd = program.commands.find((cmd) => cmd.name() === 'builder')
+    const cmd = builderCmd?.commands.find((cmd) => cmd.name() === commandName)
+    expect(cmd?.name()).toBe(commandName)
+  })
+}
+
+export async function testCustomGraphPath<T>(
+  ctx: TestContext,
+  commandArgs: string[],
+  parseOutput: (consoleOutput: string[]) => T,
+): Promise<T> {
+  const customPath = await createGraph(
+    ctx.testDir,
+    {
+      version: '1.0',
+      metadata: baseMetadata,
+      components: [],
+      links: [],
+    },
+    'custom',
+  )
+
+  await createProgram().parseAsync([
+    'node',
+    'riviere',
+    ...commandArgs,
+    '--graph',
+    customPath,
+    '--json',
+  ])
+  return parseOutput(ctx.consoleOutput)
+}
+
+export function parseCommandWithErrorHandling(args: string[]): Promise<void> {
+  return createProgram().parseAsync(args).catch(handleGlobalError)
+}
+
+export function assertDefined<T>(
+  value: T | undefined | null,
+  message = 'Expected value to be defined',
+): T {
+  if (value === undefined || value === null) {
+    throw new TestAssertionError(message)
+  }
+  return value
+}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/_platform/cli/option-collectors.ts b/apps/cli/src/features/builder/entrypoint/_platform/cli/option-collectors.ts
similarity index 100%
rename from packages/riviere-cli/src/features/builder/entrypoint/_platform/cli/option-collectors.ts
rename to apps/cli/src/features/builder/entrypoint/_platform/cli/option-collectors.ts
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/add-component/add-component-custom.spec.ts b/apps/cli/src/features/builder/entrypoint/add-component/add-component-custom.spec.ts
similarity index 94%
rename from packages/riviere-cli/src/features/builder/entrypoint/add-component/add-component-custom.spec.ts
rename to apps/cli/src/features/builder/entrypoint/add-component/add-component-custom.spec.ts
index 24f3cc930..a49017f3a 100644
--- a/packages/riviere-cli/src/features/builder/entrypoint/add-component/add-component-custom.spec.ts
+++ b/apps/cli/src/features/builder/entrypoint/add-component/add-component-custom.spec.ts
@@ -1,16 +1,14 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { readFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
 import {
   type TestContext,
   createTestContext,
   setupCommandTest,
   createGraphWithCustomType,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 
 describe('riviere builder add-component Custom type', () => {
   const ctx: TestContext = createTestContext()
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/add-component/add-component-options.ts b/apps/cli/src/features/builder/entrypoint/add-component/add-component-options.ts
similarity index 100%
rename from packages/riviere-cli/src/features/builder/entrypoint/add-component/add-component-options.ts
rename to apps/cli/src/features/builder/entrypoint/add-component/add-component-options.ts
diff --git a/apps/cli/src/features/builder/entrypoint/add-component/add-component.spec.ts b/apps/cli/src/features/builder/entrypoint/add-component/add-component.spec.ts
new file mode 100644
index 000000000..d67c17212
--- /dev/null
+++ b/apps/cli/src/features/builder/entrypoint/add-component/add-component.spec.ts
@@ -0,0 +1,396 @@
+import { describe, it, expect } from 'vitest'
+import { readFile } from 'node:fs/promises'
+import { join } from 'node:path'
+import { createProgram } from '../../../../shell/cli'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import {
+  type TestContext,
+  assertDefined,
+  createTestContext,
+  setupCommandTest,
+  createGraphWithDomain,
+  MockError,
+} from '../../../../__fixtures__/command-test-fixtures'
+import { buildAddComponentArgs } from '../../../../__fixtures__/add-component-fixtures'
+
+function getErrorMessage(error: unknown): string {
+  if (error instanceof Error) {
+    return error.message
+  }
+  return 'Unknown error'
+}
+
+describe('riviere builder add-component', () => {
+  describe('command registration', () => {
+    it('registers add-component command under builder', () => {
+      const program = createProgram()
+      const builderCmd = program.commands.find((cmd) => cmd.name() === 'builder')
+      const addComponentCmd = builderCmd?.commands.find((cmd) => cmd.name() === 'add-component')
+
+      expect(addComponentCmd?.name()).toBe('add-component')
+    })
+  })
+
+  describe('error handling', () => {
+    const ctx: TestContext = createTestContext()
+    setupCommandTest(ctx)
+
+    it('returns GRAPH_NOT_FOUND when no graph exists', async () => {
+      const program = createProgram()
+      await program.parseAsync(buildAddComponentArgs({ extraArgs: ['--route', '/test'] }))
+
+      const output = ctx.consoleOutput.join('\n')
+      expect(output).toContain(CliErrorCode.GraphNotFound)
+    })
+
+    it('returns VALIDATION_ERROR when --type is invalid', async () => {
+      const program = createProgram()
+      await program.parseAsync(buildAddComponentArgs({ type: 'InvalidType' }))
+
+      expect(ctx.consoleOutput).toHaveLength(1)
+      expect(ctx.consoleOutput[0]).toBeTruthy()
+
+      const output: unknown = JSON.parse(assertDefined(ctx.consoleOutput[0], 'Expected output'))
+      expect(output).toMatchObject({
+        success: false,
+        error: {
+          code: CliErrorCode.ValidationError,
+          message: 'Invalid component type: InvalidType',
+        },
+      })
+    })
+  })
+
+  describe('adding components', () => {
+    const ctx: TestContext = createTestContext()
+    setupCommandTest(ctx)
+
+    it('returns DOMAIN_NOT_FOUND when domain does not exist', async () => {
+      await createGraphWithDomain(ctx.testDir, 'orders')
+      const program = createProgram()
+      await program.parseAsync(
+        buildAddComponentArgs({
+          name: 'Test',
+          domain: 'nonexistent',
+          extraArgs: ['--route', '/test'],
+        }),
+      )
+      expect(ctx.consoleOutput.join('\n')).toContain(CliErrorCode.DomainNotFound)
+    })
+
+    it.each([
+      {
+        type: 'UI',
+        expectedFlag: '--route',
+      },
+      {
+        type: 'API',
+        expectedFlag: '--api-type',
+      },
+      {
+        type: 'DomainOp',
+        expectedFlag: '--operation-name',
+      },
+      {
+        type: 'Event',
+        expectedFlag: '--event-name',
+      },
+      {
+        type: 'EventHandler',
+        expectedFlag: '--subscribed-events',
+      },
+      {
+        type: 'Custom',
+        expectedFlag: '--custom-type',
+      },
+    ])(
+      'returns VALIDATION_ERROR when $type missing $expectedFlag',
+      async ({ type, expectedFlag }) => {
+        await createGraphWithDomain(ctx.testDir, 'orders')
+        const program = createProgram()
+        await program.parseAsync(
+          buildAddComponentArgs({
+            type,
+            name: 'Test',
+          }),
+        )
+        const output = ctx.consoleOutput.join('\n')
+        expect(output).toContain(CliErrorCode.ValidationError)
+        expect(output).toContain(expectedFlag)
+      },
+    )
+
+    it.each([
+      {
+        type: 'UI',
+        name: 'Checkout Page',
+        module: 'checkout',
+        filePath: 'src/pages/checkout.tsx',
+        extraArgs: ['--route', '/checkout'],
+        expectedId: 'orders:checkout:ui:checkout-page',
+        expectedFields: {
+          type: 'UI',
+          route: '/checkout',
+        },
+      },
+      {
+        type: 'API',
+        name: 'Create Order',
+        module: 'api',
+        filePath: 'src/api/orders.ts',
+        extraArgs: ['--api-type', 'REST', '--http-method', 'POST', '--http-path', '/api/orders'],
+        expectedId: 'orders:api:api:create-order',
+        expectedFields: {
+          type: 'API',
+          apiType: 'REST',
+          httpMethod: 'POST',
+          path: '/api/orders',
+        },
+      },
+      {
+        type: 'API',
+        name: 'List Orders',
+        module: 'api',
+        filePath: 'src/api/orders.ts',
+        extraArgs: ['--api-type', 'REST'],
+        expectedId: 'orders:api:api:list-orders',
+        expectedFields: {
+          type: 'API',
+          apiType: 'REST',
+        },
+      },
+      {
+        type: 'UseCase',
+        name: 'Place Order',
+        module: 'core',
+        filePath: 'src/usecases/place-order.ts',
+        extraArgs: [],
+        expectedId: 'orders:core:usecase:place-order',
+        expectedFields: { type: 'UseCase' },
+      },
+      {
+        type: 'DomainOp',
+        name: 'Order Create',
+        module: 'domain',
+        filePath: 'src/domain/order.ts',
+        extraArgs: ['--operation-name', 'create', '--entity', 'Order'],
+        expectedId: 'orders:domain:domainop:order-create',
+        expectedFields: {
+          type: 'DomainOp',
+          operationName: 'create',
+          entity: 'Order',
+        },
+      },
+      {
+        type: 'DomainOp',
+        name: 'Order Archive',
+        module: 'domain',
+        filePath: 'src/domain/order.ts',
+        extraArgs: ['--operation-name', 'archive'],
+        expectedId: 'orders:domain:domainop:order-archive',
+        expectedFields: {
+          type: 'DomainOp',
+          operationName: 'archive',
+        },
+      },
+      {
+        type: 'Event',
+        name: 'Order Placed',
+        module: 'events',
+        filePath: 'src/events/order-placed.ts',
+        extraArgs: ['--event-name', 'OrderPlaced'],
+        expectedId: 'orders:events:event:order-placed',
+        expectedFields: {
+          type: 'Event',
+          eventName: 'OrderPlaced',
+        },
+      },
+      {
+        type: 'Event',
+        name: 'Payment Received',
+        module: 'events',
+        filePath: 'src/events/payment-received.ts',
+        extraArgs: ['--event-name', 'PaymentReceived', '--event-schema', '{ orderId: string }'],
+        expectedId: 'orders:events:event:payment-received',
+        expectedFields: {
+          type: 'Event',
+          eventName: 'PaymentReceived',
+          eventSchema: '{ orderId: string }',
+        },
+      },
+      {
+        type: 'EventHandler',
+        name: 'Send Confirmation',
+        module: 'handlers',
+        filePath: 'src/handlers/send-confirmation.ts',
+        extraArgs: ['--subscribed-events', 'OrderPlaced,PaymentReceived'],
+        expectedId: 'orders:handlers:eventhandler:send-confirmation',
+        expectedFields: {
+          type: 'EventHandler',
+          subscribedEvents: ['OrderPlaced', 'PaymentReceived'],
+        },
+      },
+    ])(
+      'creates $type component',
+      async ({ type, name, module, filePath, extraArgs, expectedId, expectedFields }) => {
+        await createGraphWithDomain(ctx.testDir, 'orders')
+
+        const program = createProgram()
+        await program.parseAsync(
+          buildAddComponentArgs({
+            type,
+            name,
+            module,
+            filePath,
+            extraArgs,
+          }),
+        )
+
+        const graphPath = join(ctx.testDir, '.riviere', 'graph.json')
+        const content = await readFile(graphPath, 'utf-8')
+        const graph: unknown = JSON.parse(content)
+
+        expect(graph).toMatchObject({
+          components: [
+            {
+              id: expectedId,
+              ...expectedFields,
+            },
+          ],
+        })
+      },
+    )
+
+    it('returns CUSTOM_TYPE_NOT_FOUND when custom type not defined', async () => {
+      await createGraphWithDomain(ctx.testDir, 'orders')
+
+      const program = createProgram()
+      await program.parseAsync(
+        buildAddComponentArgs({
+          type: 'Custom',
+          name: 'Order Queue',
+          module: 'messaging',
+          filePath: 'src/queues/orders.ts',
+          extraArgs: ['--custom-type', 'MessageQueue'],
+        }),
+      )
+
+      const output = ctx.consoleOutput.join('\n')
+      expect(output).toContain(CliErrorCode.CustomTypeNotFound)
+    })
+
+    it('returns DUPLICATE_COMPONENT when component already exists', async () => {
+      await createGraphWithDomain(ctx.testDir, 'orders')
+
+      const args = buildAddComponentArgs({
+        name: 'Checkout Page',
+        filePath: 'src/pages/checkout.tsx',
+        extraArgs: ['--route', '/checkout'],
+      })
+
+      const program1 = createProgram()
+      await program1.parseAsync(args)
+
+      const program2 = createProgram()
+      await program2.parseAsync(args)
+
+      const output = ctx.consoleOutput.join('\n')
+      expect(output).toContain(CliErrorCode.DuplicateComponent)
+    })
+
+    it('outputs success JSON with component ID when --json flag provided', async () => {
+      await createGraphWithDomain(ctx.testDir, 'orders')
+
+      const program = createProgram()
+      await program.parseAsync(
+        buildAddComponentArgs({
+          name: 'Checkout Page',
+          filePath: 'src/pages/checkout.tsx',
+          extraArgs: ['--route', '/checkout', '--json'],
+        }),
+      )
+
+      expect(ctx.consoleOutput).toHaveLength(1)
+      expect(ctx.consoleOutput[0]).toBeTruthy()
+
+      const output: unknown = JSON.parse(assertDefined(ctx.consoleOutput[0], 'Expected output'))
+      expect(output).toMatchObject({
+        success: true,
+        data: { componentId: 'orders:checkout:ui:checkout-page' },
+      })
+    })
+
+    it('includes description when --description provided', async () => {
+      await createGraphWithDomain(ctx.testDir, 'orders')
+      const program = createProgram()
+      await program.parseAsync(
+        buildAddComponentArgs({
+          name: 'Checkout',
+          module: 'web',
+          filePath: 'src/checkout.tsx',
+          extraArgs: ['--route', '/checkout', '--description', 'Main checkout page'],
+        }),
+      )
+      const graphPath = join(ctx.testDir, '.riviere', 'graph.json')
+      const content = await readFile(graphPath, 'utf-8')
+      const graph: unknown = JSON.parse(content)
+      expect(graph).toMatchObject({ components: [{ description: 'Main checkout page' }] })
+    })
+
+    it('includes lineNumber in sourceLocation when --line-number provided', async () => {
+      await createGraphWithDomain(ctx.testDir, 'orders')
+      const program = createProgram()
+      await program.parseAsync(
+        buildAddComponentArgs({
+          name: 'Checkout',
+          module: 'web',
+          filePath: 'src/checkout.tsx',
+          extraArgs: ['--route', '/checkout', '--line-number', '42'],
+        }),
+      )
+      const graphPath = join(ctx.testDir, '.riviere', 'graph.json')
+      const content = await readFile(graphPath, 'utf-8')
+      const graph: unknown = JSON.parse(content)
+      expect(graph).toMatchObject({ components: [{ sourceLocation: { lineNumber: 42 } }] })
+    })
+
+    it('includes columnNumber in sourceLocation when --column-number provided', async () => {
+      await createGraphWithDomain(ctx.testDir, 'orders')
+      const program = createProgram()
+      await program.parseAsync(
+        buildAddComponentArgs({ extraArgs: ['--route', '/test', '--column-number', '17'] }),
+      )
+
+      const graphPath = join(ctx.testDir, '.riviere', 'graph.json')
+      const content = await readFile(graphPath, 'utf-8')
+      const graph: unknown = JSON.parse(content)
+
+      expect(graph).toMatchObject({ components: [{ sourceLocation: { columnNumber: 17 } }] })
+    })
+
+    it('rejects a fractional --column-number', async () => {
+      await createGraphWithDomain(ctx.testDir, 'orders')
+      const program = createProgram()
+      await program.parseAsync(
+        buildAddComponentArgs({ extraArgs: ['--route', '/test', '--column-number', '3.14'] }),
+      )
+
+      expect(ctx.consoleOutput.join('\n')).toContain(
+        'Invalid column number: must be a positive integer',
+      )
+    })
+  })
+
+  describe('getErrorMessage', () => {
+    it('returns message from Error instance', () =>
+      expect(getErrorMessage(new MockError('test error'))).toBe('test error'))
+    it('returns Unknown error when input is string', () =>
+      expect(getErrorMessage('string error')).toBe('Unknown error'))
+    it('returns Unknown error when input is null', () =>
+      expect(getErrorMessage(null)).toBe('Unknown error'))
+    it('returns Unknown error when input is undefined', () =>
+      expect(getErrorMessage(undefined)).toBe('Unknown error'))
+    it('returns Unknown error when input is number', () =>
+      expect(getErrorMessage(42)).toBe('Unknown error'))
+  })
+})
diff --git a/apps/cli/src/features/builder/entrypoint/add-component/entrypoint.ts b/apps/cli/src/features/builder/entrypoint/add-component/entrypoint.ts
new file mode 100644
index 000000000..5ca389b0f
--- /dev/null
+++ b/apps/cli/src/features/builder/entrypoint/add-component/entrypoint.ts
@@ -0,0 +1,94 @@
+import { Command } from 'commander'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import { getDefaultGraphPathDescription } from '../../../../infra/cli/presentation/graph-path-option'
+import { formatError, formatSuccess } from '../../../../infra/cli/presentation/output'
+import { getAddComponentHints } from '../../../../infra/cli/presentation/add-component-hints'
+import { toAddComponentInput } from './add-component-options'
+import type { AddComponent } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/add-component'
+import type { AddComponentErrorCode } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/add-component-result'
+
+interface CliOptions {
+  type: string
+  name: string
+  domain: string
+  module: string
+  repository: string
+  filePath: string
+  route?: string
+  apiType?: string
+  httpMethod?: string
+  httpPath?: string
+  operationName?: string
+  entity?: string
+  eventName?: string
+  eventSchema?: string
+  subscribedEvents?: string
+  customType?: string
+  customProperty?: string[]
+  description?: string
+  lineNumber?: string
+  columnNumber?: string
+  graph?: string
+  json?: boolean
+}
+
+/** @riviere-role cli-entrypoint */
+export function createAddComponentCommand(addComponent: AddComponent): Command {
+  return new Command('add-component')
+    .description('Add a component to the graph')
+    .requiredOption(
+      '--type <type>',
+      'Component type (UI, API, UseCase, DomainOp, Event, EventHandler, Custom)',
+    )
+    .requiredOption('--name <name>', 'Component name')
+    .requiredOption('--domain <domain>', 'Domain name')
+    .requiredOption('--module <module>', 'Module name')
+    .requiredOption('--repository <url>', 'Source repository URL')
+    .requiredOption('--file-path <path>', 'Source file path')
+    .option('--route <route>', 'UI route path')
+    .option('--api-type <type>', 'API type (REST, GraphQL, other)')
+    .option('--http-method <method>', 'HTTP method')
+    .option('--http-path <path>', 'HTTP endpoint path')
+    .option('--operation-name <name>', 'Operation name (DomainOp)')
+    .option('--entity <entity>', 'Entity name (DomainOp)')
+    .option('--event-name <name>', 'Event name')
+    .option('--event-schema <schema>', 'Event schema definition')
+    .option('--subscribed-events <events>', 'Comma-separated subscribed event names')
+    .option('--custom-type <name>', 'Custom type name')
+    .option(
+      '--custom-property <key:value>',
+      'Custom property (repeatable)',
+      (val, acc: string[]) => [...acc, val],
+      [],
+    )
+    .option('--description <desc>', 'Component description')
+    .option('--line-number <n>', 'Source line number')
+    .option('--column-number <n>', 'Source column number')
+    .option('--graph <path>', getDefaultGraphPathDescription())
+    .option('--json', 'Output result as JSON')
+    .action(async (options: CliOptions) => {
+      const result = addComponent.execute(toAddComponentInput(options))
+
+      if (!result.success) {
+        const cliErrorCode = CLI_ERROR_CODES[result.code]
+        console.log(
+          JSON.stringify(
+            formatError(cliErrorCode, result.message, getAddComponentHints(cliErrorCode)),
+          ),
+        )
+        return
+      }
+
+      if (options.json) {
+        console.log(JSON.stringify(formatSuccess({ componentId: result.componentId })))
+      }
+    })
+}
+
+const CLI_ERROR_CODES: Record<AddComponentErrorCode, CliErrorCode> = {
+  VALIDATION_ERROR: CliErrorCode.ValidationError,
+  GRAPH_NOT_FOUND: CliErrorCode.GraphNotFound,
+  DOMAIN_NOT_FOUND: CliErrorCode.DomainNotFound,
+  CUSTOM_TYPE_NOT_FOUND: CliErrorCode.CustomTypeNotFound,
+  DUPLICATE_COMPONENT: CliErrorCode.DuplicateComponent,
+}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/add-domain/add-domain.spec.ts b/apps/cli/src/features/builder/entrypoint/add-domain/add-domain.spec.ts
similarity index 76%
rename from packages/riviere-cli/src/features/builder/entrypoint/add-domain/add-domain.spec.ts
rename to apps/cli/src/features/builder/entrypoint/add-domain/add-domain.spec.ts
index c51439afa..659103e5f 100644
--- a/packages/riviere-cli/src/features/builder/entrypoint/add-domain/add-domain.spec.ts
+++ b/apps/cli/src/features/builder/entrypoint/add-domain/add-domain.spec.ts
@@ -1,20 +1,14 @@
-import {
-  describe, it, expect, vi, beforeEach, afterEach 
-} from 'vitest'
-import {
-  readFile, mkdir, writeFile, mkdtemp, rm 
-} from 'node:fs/promises'
-import { tmpdir } from 'node:os'
+import { describe, it, expect } from 'vitest'
+import { readFile, mkdir, writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
 import {
   type TestContext,
   createTestContext,
   setupCommandTest,
   createGraphWithDomain,
-  MockError,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 
 describe('riviere builder add-domain', () => {
   describe('command registration', () => {
@@ -259,63 +253,4 @@ describe('riviere builder add-domain', () => {
       })
     })
   })
-
-  describe('unexpected builder errors', () => {
-    const mockContext: {
-      testDir: string
-      originalCwd: string
-    } = {
-      testDir: '',
-      originalCwd: '',
-    }
-
-    beforeEach(async () => {
-      mockContext.testDir = await mkdtemp(join(tmpdir(), 'riviere-test-'))
-      mockContext.originalCwd = process.cwd()
-      process.chdir(mockContext.testDir)
-      vi.resetModules()
-    })
-
-    afterEach(async () => {
-      vi.restoreAllMocks()
-      process.chdir(mockContext.originalCwd)
-      await rm(mockContext.testDir, { recursive: true })
-    })
-
-    it('rethrows unexpected errors from builder', async () => {
-      await createGraphWithDomain(mockContext.testDir, 'orders')
-
-      const unexpectedError = new MockError('Unexpected database error')
-      const throwUnexpectedError = () => {
-        throw unexpectedError
-      }
-
-      vi.doMock('@living-architecture/riviere-builder', () => ({
-        RiviereBuilder: {
-          resume: vi
-            .fn()
-            .mockReturnValue({ addDomain: vi.fn().mockImplementation(throwUnexpectedError) }),
-        },
-        DuplicateDomainError: class DuplicateDomainError extends Error {},
-      }))
-
-      const { createProgram } = await import('../../../../shell/cli')
-      const program = createProgram()
-
-      await expect(
-        program.parseAsync([
-          'node',
-          'riviere',
-          'builder',
-          'add-domain',
-          '--name',
-          'payments',
-          '--description',
-          'Payment processing',
-          '--system-type',
-          'domain',
-        ]),
-      ).rejects.toThrow('Unexpected database error')
-    })
-  })
 })
diff --git a/apps/cli/src/features/builder/entrypoint/add-domain/entrypoint.ts b/apps/cli/src/features/builder/entrypoint/add-domain/entrypoint.ts
new file mode 100644
index 000000000..1b51160d2
--- /dev/null
+++ b/apps/cli/src/features/builder/entrypoint/add-domain/entrypoint.ts
@@ -0,0 +1,66 @@
+import { Command } from 'commander'
+import { formatError, formatSuccess } from '../../../../infra/cli/presentation/output'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import { getDefaultGraphPathDescription } from '../../../../infra/cli/presentation/graph-path-option'
+import type { AddDomain } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/add-domain'
+
+interface AddDomainOptions {
+  name: string
+  description: string
+  systemType: string
+  graph?: string
+  json?: boolean
+}
+
+/** @riviere-role cli-entrypoint */
+export function createAddDomainCommand(addDomain: AddDomain): Command {
+  return new Command('add-domain')
+    .description('Add a domain to the graph')
+    .addHelpText(
+      'after',
+      `
+Examples:
+  $ riviere builder add-domain --name orders --system-type domain \\
+      --description "Order management"
+
+  $ riviere builder add-domain --name checkout-bff --system-type bff \\
+      --description "Checkout backend-for-frontend"
+`,
+    )
+    .requiredOption('--name <name>', 'Domain name')
+    .requiredOption('--description <description>', 'Domain description')
+    .requiredOption(
+      '--system-type <type>',
+      'System type (domain, bff, ui, external-service, other)',
+    )
+    .option('--graph <path>', getDefaultGraphPathDescription())
+    .option('--json', 'Output result as JSON')
+    .action(async (options: AddDomainOptions) => {
+      const result = addDomain.execute({
+        description: options.description,
+        graphPathOption: options.graph,
+        name: options.name,
+        systemType: options.systemType,
+      })
+      if (!result.success) {
+        const errorCodeByResult = {
+          DUPLICATE_DOMAIN: CliErrorCode.DuplicateDomain,
+          GRAPH_NOT_FOUND: CliErrorCode.GraphNotFound,
+          GRAPH_CORRUPTED: CliErrorCode.GraphCorrupted,
+          VALIDATION_ERROR: CliErrorCode.ValidationError,
+        } as const
+        const errorCode = errorCodeByResult[result.code]
+        const suggestions: string[] = []
+        if (result.code === 'DUPLICATE_DOMAIN') {
+          suggestions.push('Use a different domain name')
+        }
+
+        console.log(JSON.stringify(formatError(errorCode, result.message, suggestions)))
+        return
+      }
+
+      if (options.json === true) {
+        console.log(JSON.stringify(formatSuccess(result)))
+      }
+    })
+}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/add-source/add-source.spec.ts b/apps/cli/src/features/builder/entrypoint/add-source/add-source.spec.ts
similarity index 93%
rename from packages/riviere-cli/src/features/builder/entrypoint/add-source/add-source.spec.ts
rename to apps/cli/src/features/builder/entrypoint/add-source/add-source.spec.ts
index cc545e4be..6e7a472d9 100644
--- a/packages/riviere-cli/src/features/builder/entrypoint/add-source/add-source.spec.ts
+++ b/apps/cli/src/features/builder/entrypoint/add-source/add-source.spec.ts
@@ -1,18 +1,14 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import {
-  readFile, mkdir, writeFile 
-} from 'node:fs/promises'
+import { describe, it, expect } from 'vitest'
+import { readFile, mkdir, writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
 import {
   type TestContext,
   createTestContext,
   setupCommandTest,
   createGraphWithSource,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 
 describe('riviere builder add-source', () => {
   describe('command registration', () => {
diff --git a/apps/cli/src/features/builder/entrypoint/add-source/entrypoint.ts b/apps/cli/src/features/builder/entrypoint/add-source/entrypoint.ts
new file mode 100644
index 000000000..2c1522e64
--- /dev/null
+++ b/apps/cli/src/features/builder/entrypoint/add-source/entrypoint.ts
@@ -0,0 +1,52 @@
+import { Command } from 'commander'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import { getDefaultGraphPathDescription } from '../../../../infra/cli/presentation/graph-path-option'
+import { formatError, formatSuccess } from '../../../../infra/cli/presentation/output'
+import type { AddSource } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/add-source'
+
+interface AddSourceOptions {
+  repository: string
+  graph?: string
+  json?: boolean
+}
+
+/** @riviere-role cli-entrypoint */
+export function createAddSourceCommand(addSource: AddSource): Command {
+  return new Command('add-source')
+    .description('Add a source repository to the graph')
+    .addHelpText(
+      'after',
+      `
+Examples:
+  $ riviere builder add-source --repository https://github.com/your-org/orders-service
+  $ riviere builder add-source --repository https://github.com/your-org/payments-api --json
+`,
+    )
+    .requiredOption('--repository <url>', 'Source repository URL')
+    .option('--graph <path>', getDefaultGraphPathDescription())
+    .option('--json', 'Output result as JSON')
+    .action(async (options: AddSourceOptions) => {
+      const result = addSource.execute({
+        graphPathOption: options.graph,
+        repository: options.repository,
+      })
+      if (!result.success) {
+        console.log(
+          JSON.stringify(
+            formatError(
+              result.code === 'GRAPH_NOT_FOUND'
+                ? CliErrorCode.GraphNotFound
+                : CliErrorCode.GraphCorrupted,
+              result.message,
+              [],
+            ),
+          ),
+        )
+        return
+      }
+
+      if (options.json === true) {
+        console.log(JSON.stringify(formatSuccess({ repository: result.repository })))
+      }
+    })
+}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/add-source/graph-error-coverage.spec.ts b/apps/cli/src/features/builder/entrypoint/add-source/graph-error-coverage.spec.ts
similarity index 89%
rename from packages/riviere-cli/src/features/builder/entrypoint/add-source/graph-error-coverage.spec.ts
rename to apps/cli/src/features/builder/entrypoint/add-source/graph-error-coverage.spec.ts
index 220c6de51..8e4a2c2c3 100644
--- a/packages/riviere-cli/src/features/builder/entrypoint/add-source/graph-error-coverage.spec.ts
+++ b/apps/cli/src/features/builder/entrypoint/add-source/graph-error-coverage.spec.ts
@@ -1,17 +1,13 @@
-import {
-  mkdir, writeFile 
-} from 'node:fs/promises'
+import { mkdir, writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
-import {
-  describe, expect, it 
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
 import {
   type TestContext,
   createTestContext,
   setupCommandTest,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 
 async function createInvalidGraph(testDir: string): Promise<string> {
   const graphDir = join(testDir, '.riviere')
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/check-consistency/check-consistency.spec.ts b/apps/cli/src/features/builder/entrypoint/check-consistency/check-consistency.spec.ts
similarity index 96%
rename from packages/riviere-cli/src/features/builder/entrypoint/check-consistency/check-consistency.spec.ts
rename to apps/cli/src/features/builder/entrypoint/check-consistency/check-consistency.spec.ts
index c22bcb06c..f5c2c2719 100644
--- a/packages/riviere-cli/src/features/builder/entrypoint/check-consistency/check-consistency.spec.ts
+++ b/apps/cli/src/features/builder/entrypoint/check-consistency/check-consistency.spec.ts
@@ -1,9 +1,7 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import type { TestContext } from '../../../../platform/__fixtures__/command-test-fixtures'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import type { TestContext } from '../../../../__fixtures__/command-test-fixtures'
 import {
   createTestContext,
   setupCommandTest,
@@ -15,7 +13,7 @@ import {
   hasSuccessOutputStructure,
   testCommandRegistration,
   testCustomGraphPath,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 
 interface ConsistencyWarning {
   code: string
diff --git a/apps/cli/src/features/builder/entrypoint/check-consistency/entrypoint.ts b/apps/cli/src/features/builder/entrypoint/check-consistency/entrypoint.ts
new file mode 100644
index 000000000..0d7de25c0
--- /dev/null
+++ b/apps/cli/src/features/builder/entrypoint/check-consistency/entrypoint.ts
@@ -0,0 +1,54 @@
+import { Command } from 'commander'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import { getDefaultGraphPathDescription } from '../../../../infra/cli/presentation/graph-path-option'
+import { formatError, formatSuccess } from '../../../../infra/cli/presentation/output'
+import type { CheckConsistency } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/check-consistency'
+
+interface CheckConsistencyOptions {
+  graph?: string
+  json?: boolean
+}
+
+/** @riviere-role cli-entrypoint */
+export function createCheckConsistencyCommand(checkConsistency: CheckConsistency): Command {
+  return new Command('check-consistency')
+    .description('Check for structural issues in the graph')
+    .addHelpText(
+      'after',
+      `
+Examples:
+  $ riviere builder check-consistency
+  $ riviere builder check-consistency --json
+`,
+    )
+    .option('--graph <path>', getDefaultGraphPathDescription())
+    .option('--json', 'Output result as JSON')
+    .action(async (options: CheckConsistencyOptions) => {
+      const result = checkConsistency.execute({ graphPathOption: options.graph })
+      if (!result.success) {
+        console.log(
+          JSON.stringify(
+            formatError(
+              result.code === 'GRAPH_NOT_FOUND'
+                ? CliErrorCode.GraphNotFound
+                : CliErrorCode.GraphCorrupted,
+              result.message,
+              [],
+            ),
+          ),
+        )
+        return
+      }
+
+      if (options.json === true) {
+        console.log(
+          JSON.stringify(
+            formatSuccess({
+              consistent: result.consistent,
+              warnings: result.warnings,
+            }),
+          ),
+        )
+      }
+    })
+}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/component-checklist/component-checklist.spec.ts b/apps/cli/src/features/builder/entrypoint/component-checklist/component-checklist.spec.ts
similarity index 96%
rename from packages/riviere-cli/src/features/builder/entrypoint/component-checklist/component-checklist.spec.ts
rename to apps/cli/src/features/builder/entrypoint/component-checklist/component-checklist.spec.ts
index f676a79ff..b59ea6d7c 100644
--- a/packages/riviere-cli/src/features/builder/entrypoint/component-checklist/component-checklist.spec.ts
+++ b/apps/cli/src/features/builder/entrypoint/component-checklist/component-checklist.spec.ts
@@ -1,9 +1,7 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import type { TestContext } from '../../../../platform/__fixtures__/command-test-fixtures'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import type { TestContext } from '../../../../__fixtures__/command-test-fixtures'
 import {
   createTestContext,
   setupCommandTest,
@@ -15,7 +13,7 @@ import {
   hasSuccessOutputStructure,
   testCommandRegistration,
   testCustomGraphPath,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 
 interface ChecklistComponent {
   id: string
diff --git a/apps/cli/src/features/builder/entrypoint/component-checklist/entrypoint.ts b/apps/cli/src/features/builder/entrypoint/component-checklist/entrypoint.ts
new file mode 100644
index 000000000..586ed0c7c
--- /dev/null
+++ b/apps/cli/src/features/builder/entrypoint/component-checklist/entrypoint.ts
@@ -0,0 +1,62 @@
+import { Command } from 'commander'
+import { getDefaultGraphPathDescription } from '../../../../infra/cli/presentation/graph-path-option'
+import { formatError, formatSuccess } from '../../../../infra/cli/presentation/output'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import type { ComponentChecklist } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/component-checklist'
+
+interface ComponentChecklistOptions {
+  graph?: string
+  json?: boolean
+  type?: string
+}
+
+/** @riviere-role cli-entrypoint */
+export function createComponentChecklistCommand(componentChecklist: ComponentChecklist): Command {
+  return new Command('component-checklist')
+    .description('List components as a checklist for linking/enrichment')
+    .addHelpText(
+      'after',
+      `
+Examples:
+  $ riviere builder component-checklist
+  $ riviere builder component-checklist --type DomainOp
+  $ riviere builder component-checklist --type API --json
+`,
+    )
+    .option('--graph <path>', getDefaultGraphPathDescription())
+    .option('--json', 'Output result as JSON')
+    .option('--type <type>', 'Filter by component type')
+    .action(async (options: ComponentChecklistOptions) => {
+      const result = componentChecklist.execute({
+        graphPathOption: options.graph,
+        type: options.type,
+      })
+      if (!result.success) {
+        console.log(
+          JSON.stringify(
+            formatError(
+              {
+                GRAPH_CORRUPTED: CliErrorCode.GraphCorrupted,
+                GRAPH_NOT_FOUND: CliErrorCode.GraphNotFound,
+                VALIDATION_ERROR: CliErrorCode.InvalidComponentType,
+              }[result.code],
+              result.message,
+              [],
+            ),
+          ),
+        )
+        return
+      }
+
+      if (options.json === true) {
+        console.log(
+          JSON.stringify(
+            formatSuccess({
+              components: result.components,
+              total: result.total,
+            }),
+          ),
+        )
+      }
+    })
+}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/component-summary/component-summary.spec.ts b/apps/cli/src/features/builder/entrypoint/component-summary/component-summary.spec.ts
similarity index 94%
rename from packages/riviere-cli/src/features/builder/entrypoint/component-summary/component-summary.spec.ts
rename to apps/cli/src/features/builder/entrypoint/component-summary/component-summary.spec.ts
index 006f9c8ff..3e61f73f2 100644
--- a/packages/riviere-cli/src/features/builder/entrypoint/component-summary/component-summary.spec.ts
+++ b/apps/cli/src/features/builder/entrypoint/component-summary/component-summary.spec.ts
@@ -1,9 +1,7 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import type { TestContext } from '../../../../platform/__fixtures__/command-test-fixtures'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import type { TestContext } from '../../../../__fixtures__/command-test-fixtures'
 import {
   createTestContext,
   setupCommandTest,
@@ -14,7 +12,7 @@ import {
   parseSuccessOutput,
   hasSuccessOutputStructure,
   testCommandRegistration,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 
 interface ComponentSummaryOutput {
   success: true
diff --git a/apps/cli/src/features/builder/entrypoint/component-summary/entrypoint.ts b/apps/cli/src/features/builder/entrypoint/component-summary/entrypoint.ts
new file mode 100644
index 000000000..b0393eddd
--- /dev/null
+++ b/apps/cli/src/features/builder/entrypoint/component-summary/entrypoint.ts
@@ -0,0 +1,43 @@
+import { Command } from 'commander'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import { getDefaultGraphPathDescription } from '../../../../infra/cli/presentation/graph-path-option'
+import { formatError, formatSuccess } from '../../../../infra/cli/presentation/output'
+import type { ComponentSummary } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/component-summary'
+
+interface ComponentSummaryOptions {
+  graph?: string
+}
+
+/** @riviere-role cli-entrypoint */
+export function createComponentSummaryCommand(componentSummary: ComponentSummary): Command {
+  return new Command('component-summary')
+    .description('Show component counts by type and domain')
+    .addHelpText(
+      'after',
+      `
+Examples:
+  $ riviere builder component-summary
+  $ riviere builder component-summary > summary.json
+`,
+    )
+    .option('--graph <path>', getDefaultGraphPathDescription())
+    .action(async (options: ComponentSummaryOptions) => {
+      const result = componentSummary.execute({ graphPathOption: options.graph })
+      if (!result.success) {
+        console.log(
+          JSON.stringify(
+            formatError(
+              result.code === 'GRAPH_NOT_FOUND'
+                ? CliErrorCode.GraphNotFound
+                : CliErrorCode.GraphCorrupted,
+              result.message,
+              [],
+            ),
+          ),
+        )
+        return
+      }
+
+      console.log(JSON.stringify(formatSuccess(result)))
+    })
+}
diff --git a/apps/cli/src/features/builder/entrypoint/define-custom-type/custom-type-parser.ts b/apps/cli/src/features/builder/entrypoint/define-custom-type/custom-type-parser.ts
new file mode 100644
index 000000000..f0af14998
--- /dev/null
+++ b/apps/cli/src/features/builder/entrypoint/define-custom-type/custom-type-parser.ts
@@ -0,0 +1,64 @@
+interface ParsedPropertyDefinition {
+  description?: string
+  type: string
+}
+
+function parsePropertySpec(spec: string):
+  | {
+      definition: ParsedPropertyDefinition
+      name: string
+    }
+  | { error: string } {
+  const parts = spec.split(':')
+  if (parts.length < 2 || parts.length > 3)
+    return {
+      error: `Invalid property format: "${spec}". Expected "name:type" or "name:type:description"`,
+    }
+  const [name, type, description] = parts
+  if (!name || name.trim() === '') return { error: 'Property name cannot be empty' }
+  if (!type || type.trim() === '') return { error: 'Property type cannot be empty' }
+  const definition: ParsedPropertyDefinition = { type: type.trim() }
+  if (description && description.trim() !== '') definition.description = description
+  return {
+    definition,
+    name: name.trim(),
+  }
+}
+
+type ParsePropertiesResult =
+  | {
+      properties: Record<string, ParsedPropertyDefinition>
+      success: true
+    }
+  | {
+      error: string
+      success: false
+    }
+
+/** @riviere-role entrypoint-cli-input-parser */
+export function parsePropertySpecs(specs: string[] | undefined): ParsePropertiesResult {
+  if (specs === undefined || specs.length === 0)
+    return {
+      properties: {},
+      success: true,
+    }
+  const properties: Record<string, ParsedPropertyDefinition> = {}
+  for (const spec of specs) {
+    const result = parsePropertySpec(spec)
+    if ('error' in result)
+      return {
+        error: result.error,
+        success: false,
+      }
+    if (properties[result.name] !== undefined)
+      return {
+        error: `Duplicate property name: "${result.name}"`,
+        success: false,
+      }
+    properties[result.name] = result.definition
+  }
+  return {
+    properties,
+    success: true,
+  }
+}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/define-custom-type/define-custom-type.spec.ts b/apps/cli/src/features/builder/entrypoint/define-custom-type/define-custom-type.spec.ts
similarity index 90%
rename from packages/riviere-cli/src/features/builder/entrypoint/define-custom-type/define-custom-type.spec.ts
rename to apps/cli/src/features/builder/entrypoint/define-custom-type/define-custom-type.spec.ts
index fdf66bc61..2a257d804 100644
--- a/packages/riviere-cli/src/features/builder/entrypoint/define-custom-type/define-custom-type.spec.ts
+++ b/apps/cli/src/features/builder/entrypoint/define-custom-type/define-custom-type.spec.ts
@@ -1,16 +1,14 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { readFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
 import {
   type TestContext,
   createTestContext,
   setupCommandTest,
   createGraphWithDomain,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 
 describe('riviere builder define-custom-type', () => {
   describe('command registration', () => {
@@ -68,7 +66,9 @@ describe('riviere builder define-custom-type', () => {
       const content = await readFile(graphPath, 'utf-8')
       const graph: unknown = JSON.parse(content)
 
-      expect(graph).toMatchObject({metadata: { customTypes: { MessageQueue: { description: 'Async message queue' } } },})
+      expect(graph).toMatchObject({
+        metadata: { customTypes: { MessageQueue: { description: 'Async message queue' } } },
+      })
     })
 
     it('stores required properties when provided', async () => {
@@ -258,6 +258,26 @@ describe('riviere builder define-custom-type', () => {
       expect(output).toContain('Property name cannot be empty')
     })
 
+    it('returns VALIDATION_ERROR for empty property type', async () => {
+      await createGraphWithDomain(ctx.testDir, 'orders')
+
+      const program = createProgram()
+      await program.parseAsync([
+        'node',
+        'riviere',
+        'builder',
+        'define-custom-type',
+        '--name',
+        'MessageQueue',
+        '--required-property',
+        'queueName:',
+      ])
+
+      const output = ctx.consoleOutput.join('\n')
+      expect(output).toContain(CliErrorCode.ValidationError)
+      expect(output).toContain('Property type cannot be empty')
+    })
+
     it('returns VALIDATION_ERROR for duplicate property names', async () => {
       await createGraphWithDomain(ctx.testDir, 'orders')
 
diff --git a/apps/cli/src/features/builder/entrypoint/define-custom-type/entrypoint.ts b/apps/cli/src/features/builder/entrypoint/define-custom-type/entrypoint.ts
new file mode 100644
index 000000000..5a041a598
--- /dev/null
+++ b/apps/cli/src/features/builder/entrypoint/define-custom-type/entrypoint.ts
@@ -0,0 +1,78 @@
+import { Command } from 'commander'
+import { getDefaultGraphPathDescription } from '../../../../infra/cli/presentation/graph-path-option'
+import { formatError, formatSuccess } from '../../../../infra/cli/presentation/output'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import { parsePropertySpecs } from './custom-type-parser'
+import { collectOption } from '../_platform/cli/option-collectors'
+import type { DefineCustomType } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/define-custom-type'
+
+interface DefineCustomTypeOptions {
+  name: string
+  description?: string
+  requiredProperty?: string[]
+  optionalProperty?: string[]
+  graph?: string
+  json?: boolean
+}
+
+/** @riviere-role cli-entrypoint */
+export function createDefineCustomTypeCommand(defineCustomType: DefineCustomType): Command {
+  return new Command('define-custom-type')
+    .description('Define a custom component type')
+    .requiredOption('--name <name>', 'Custom type name')
+    .option('--description <desc>', 'Custom type description')
+    .option(
+      '--required-property <spec>',
+      'Required property (format: name:type[:description])',
+      collectOption,
+      [],
+    )
+    .option(
+      '--optional-property <spec>',
+      'Optional property (format: name:type[:description])',
+      collectOption,
+      [],
+    )
+    .option('--graph <path>', getDefaultGraphPathDescription())
+    .option('--json', 'Output result as JSON')
+    .action(async (options: DefineCustomTypeOptions) => {
+      const requiredResult = parsePropertySpecs(options.requiredProperty)
+      if (!requiredResult.success) {
+        console.log(
+          JSON.stringify(formatError(CliErrorCode.ValidationError, requiredResult.error, [])),
+        )
+        return
+      }
+
+      const optionalResult = parsePropertySpecs(options.optionalProperty)
+      if (!optionalResult.success) {
+        console.log(
+          JSON.stringify(formatError(CliErrorCode.ValidationError, optionalResult.error, [])),
+        )
+        return
+      }
+
+      const result = defineCustomType.execute({
+        description: options.description,
+        graphPathOption: options.graph,
+        name: options.name,
+        optionalProperties: optionalResult.properties,
+        requiredProperties: requiredResult.properties,
+      })
+      if (!result.success) {
+        const errorCodeByResult = {
+          GRAPH_CORRUPTED: CliErrorCode.GraphCorrupted,
+          GRAPH_NOT_FOUND: CliErrorCode.GraphNotFound,
+          VALIDATION_ERROR: CliErrorCode.ValidationError,
+        } as const
+        const errorCode = errorCodeByResult[result.code]
+
+        console.log(JSON.stringify(formatError(errorCode, result.message, [])))
+        return
+      }
+
+      if (options.json === true) {
+        console.log(JSON.stringify(formatSuccess(result)))
+      }
+    })
+}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/define-relationship-type/define-relationship-type.spec.ts b/apps/cli/src/features/builder/entrypoint/define-relationship-type/define-relationship-type.spec.ts
similarity index 86%
rename from packages/riviere-cli/src/features/builder/entrypoint/define-relationship-type/define-relationship-type.spec.ts
rename to apps/cli/src/features/builder/entrypoint/define-relationship-type/define-relationship-type.spec.ts
index a39de28ea..52e03ba0a 100644
--- a/packages/riviere-cli/src/features/builder/entrypoint/define-relationship-type/define-relationship-type.spec.ts
+++ b/apps/cli/src/features/builder/entrypoint/define-relationship-type/define-relationship-type.spec.ts
@@ -1,18 +1,24 @@
-import {
-  describe, expect, it 
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 import { readFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import { parseRiviereGraph } from '@living-architecture/riviere-schema'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import { parseRiviereGraph } from '@living-architecture/riviere-schema-published-language/validation'
 import {
   type TestContext,
   assertDefined,
   createGraphWithDomain,
   createTestContext,
   setupCommandTest,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
+
+function parseValidGraph(value: unknown) {
+  const result = parseRiviereGraph(value)
+  if (!result.success) {
+    expect.fail(result.issues.join('\n'))
+  }
+  return result.graph
+}
 
 describe('riviere builder define-relationship-type', () => {
   const ctx: TestContext = createTestContext()
@@ -40,7 +46,7 @@ describe('riviere builder define-relationship-type', () => {
       'Invokes the target during execution',
     ])
 
-    const graph = parseRiviereGraph(
+    const graph = parseValidGraph(
       JSON.parse(await readFile(join(ctx.testDir, '.riviere', 'graph.json'), 'utf-8')),
     )
     expect(graph.metadata.relationshipTypes?.executes?.description).toBe(
diff --git a/apps/cli/src/features/builder/entrypoint/define-relationship-type/entrypoint.ts b/apps/cli/src/features/builder/entrypoint/define-relationship-type/entrypoint.ts
new file mode 100644
index 000000000..9d33dbe9f
--- /dev/null
+++ b/apps/cli/src/features/builder/entrypoint/define-relationship-type/entrypoint.ts
@@ -0,0 +1,44 @@
+import { Command } from 'commander'
+import { getDefaultGraphPathDescription } from '../../../../infra/cli/presentation/graph-path-option'
+import { formatError, formatSuccess } from '../../../../infra/cli/presentation/output'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import type { DefineRelationshipType } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/define-relationship-type'
+
+interface DefineRelationshipTypeOptions {
+  name: string
+  description: string
+  graph?: string
+  json?: boolean
+}
+
+/** @riviere-role cli-entrypoint */
+export function createDefineRelationshipTypeCommand(
+  defineRelationshipType: DefineRelationshipType,
+): Command {
+  return new Command('define-relationship-type')
+    .description('Define a project relationship type')
+    .requiredOption('--name <name>', 'Relationship type name')
+    .requiredOption('--description <description>', 'Relationship type description')
+    .option('--graph <path>', getDefaultGraphPathDescription())
+    .option('--json', 'Output result as JSON')
+    .action(async (options: DefineRelationshipTypeOptions) => {
+      const result = defineRelationshipType.execute({
+        description: options.description,
+        graphPathOption: options.graph,
+        name: options.name,
+      })
+      if (!result.success) {
+        const errorCodeByResult = {
+          GRAPH_CORRUPTED: CliErrorCode.GraphCorrupted,
+          GRAPH_NOT_FOUND: CliErrorCode.GraphNotFound,
+          VALIDATION_ERROR: CliErrorCode.ValidationError,
+        } as const
+        console.log(JSON.stringify(formatError(errorCodeByResult[result.code], result.message, [])))
+        return
+      }
+
+      if (options.json === true) {
+        console.log(JSON.stringify(formatSuccess(result)))
+      }
+    })
+}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/enrich/enrich.signature.spec.ts b/apps/cli/src/features/builder/entrypoint/enrich/enrich.signature.spec.ts
similarity index 91%
rename from packages/riviere-cli/src/features/builder/entrypoint/enrich/enrich.signature.spec.ts
rename to apps/cli/src/features/builder/entrypoint/enrich/enrich.signature.spec.ts
index c7a8d0245..29af6b431 100644
--- a/packages/riviere-cli/src/features/builder/entrypoint/enrich/enrich.signature.spec.ts
+++ b/apps/cli/src/features/builder/entrypoint/enrich/enrich.signature.spec.ts
@@ -1,17 +1,15 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { readFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
 import {
   type TestContext,
   createTestContext,
   setupCommandTest,
   createGraphWithComponent,
   domainOpComponent,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 
 describe('riviere builder enrich - signature option', () => {
   const ctx: TestContext = createTestContext()
@@ -66,9 +64,7 @@ describe('riviere builder enrich - signature option', () => {
       input: '-> Order',
       expected: { returnType: 'Order' },
     },
-  ])('parses $name', async ({
-    input, expected 
-  }) => {
+  ])('parses $name', async ({ input, expected }) => {
     await createGraphWithComponent(ctx.testDir, domainOpComponent)
     const program = createProgram()
     await program.parseAsync([
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/enrich/enrich.spec.ts b/apps/cli/src/features/builder/entrypoint/enrich/enrich.spec.ts
similarity index 97%
rename from packages/riviere-cli/src/features/builder/entrypoint/enrich/enrich.spec.ts
rename to apps/cli/src/features/builder/entrypoint/enrich/enrich.spec.ts
index f1afc293d..81842feee 100644
--- a/packages/riviere-cli/src/features/builder/entrypoint/enrich/enrich.spec.ts
+++ b/apps/cli/src/features/builder/entrypoint/enrich/enrich.spec.ts
@@ -1,10 +1,8 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { readFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
 import {
   type TestContext,
   createTestContext,
@@ -12,7 +10,7 @@ import {
   createGraphWithComponent,
   domainOpComponent,
   simpleUseCaseComponent,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 
 describe('riviere builder enrich', () => {
   describe('command registration', () => {
@@ -345,9 +343,7 @@ describe('riviere builder enrich', () => {
           emits: ['order-placed event'],
         },
       },
-    ])('enriches DomainOp with $name', async ({
-      args, expected 
-    }) => {
+    ])('enriches DomainOp with $name', async ({ args, expected }) => {
       await createGraphWithComponent(ctx.testDir, domainOpComponent)
       const program = createProgram()
       await program.parseAsync([
diff --git a/apps/cli/src/features/builder/entrypoint/enrich/enrichment-parser.ts b/apps/cli/src/features/builder/entrypoint/enrich/enrichment-parser.ts
new file mode 100644
index 000000000..d2b4e065f
--- /dev/null
+++ b/apps/cli/src/features/builder/entrypoint/enrich/enrichment-parser.ts
@@ -0,0 +1,41 @@
+interface ParsedStateTransition {
+  from: string
+  to: string
+}
+
+function parseStateChange(input: string): ParsedStateTransition | undefined {
+  const [from, to, ...rest] = input.split(':')
+  if (from === undefined || to === undefined || rest.length > 0) return undefined
+  return {
+    from,
+    to,
+  }
+}
+
+type ParseResult =
+  | {
+      stateChanges: ParsedStateTransition[]
+      success: true
+    }
+  | {
+      invalidInput: string
+      success: false
+    }
+
+/** @riviere-role entrypoint-cli-input-parser */
+export function parseStateChanges(inputs: string[]): ParseResult {
+  const stateChanges: ParsedStateTransition[] = []
+  for (const sc of inputs) {
+    const parsed = parseStateChange(sc)
+    if (parsed === undefined)
+      return {
+        invalidInput: sc,
+        success: false,
+      }
+    stateChanges.push(parsed)
+  }
+  return {
+    stateChanges,
+    success: true,
+  }
+}
diff --git a/apps/cli/src/features/builder/entrypoint/enrich/entrypoint.ts b/apps/cli/src/features/builder/entrypoint/enrich/entrypoint.ts
new file mode 100644
index 000000000..da3651927
--- /dev/null
+++ b/apps/cli/src/features/builder/entrypoint/enrich/entrypoint.ts
@@ -0,0 +1,115 @@
+import { Command } from 'commander'
+import { formatError, formatSuccess } from '../../../../infra/cli/presentation/output'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import { getDefaultGraphPathDescription } from '../../../../infra/cli/presentation/graph-path-option'
+import { collectOption } from '../_platform/cli/option-collectors'
+import { parseStateChanges } from './enrichment-parser'
+import { parseSignature } from './signature-parser'
+import type { EnrichComponent } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/enrich-component'
+
+interface EnrichOptions {
+  id: string
+  entity?: string
+  stateChange: string[]
+  businessRule: string[]
+  reads: string[]
+  validates: string[]
+  modifies: string[]
+  emits: string[]
+  signature?: string
+  graph?: string
+  json?: boolean
+}
+
+/** @riviere-role cli-entrypoint */
+export function createEnrichCommand(enrichComponent: EnrichComponent): Command {
+  return new Command('enrich')
+    .description(
+      'Enrich a DomainOp component with semantic information. ' +
+        'Note: Enrichment is additive — running multiple times accumulates values.',
+    )
+    .addHelpText(
+      'after',
+      `
+Examples:
+  $ riviere builder enrich \\
+      --id "orders:checkout:domainop:orderbegin" \\
+      --entity Order \\
+      --state-change "Draft:Placed" \\
+      --business-rule "Order must have at least one item" \\
+      --reads "this.items" \\
+      --validates "items.length > 0" \\
+      --modifies "this.state <- Placed" \\
+      --emits "OrderPlaced event"
+
+  $ riviere builder enrich \\
+      --id "payments:gateway:domainop:paymentprocess" \\
+      --state-change "Pending:Processing" \\
+      --reads "amount parameter" \\
+      --validates "amount > 0" \\
+      --modifies "this.status <- Processing"
+`,
+    )
+    .requiredOption('--id <component-id>', 'Component ID to enrich')
+    .option('--entity <name>', 'Entity name')
+    .option('--state-change <from:to>', 'State transition (repeatable)', collectOption, [])
+    .option('--business-rule <rule>', 'Business rule (repeatable)', collectOption, [])
+    .option('--reads <value>', 'What the operation reads (repeatable)', collectOption, [])
+    .option('--validates <value>', 'What the operation validates (repeatable)', collectOption, [])
+    .option('--modifies <value>', 'What the operation modifies (repeatable)', collectOption, [])
+    .option('--emits <value>', 'What the operation emits (repeatable)', collectOption, [])
+    .option(
+      '--signature <dsl>',
+      'Operation signature (e.g., "orderId:string, amount:number -> Order")',
+    )
+    .option('--graph <path>', getDefaultGraphPathDescription())
+    .option('--json', 'Output result as JSON')
+    .action(async (options: EnrichOptions) => {
+      const parseResult = parseStateChanges(options.stateChange)
+      if (!parseResult.success) {
+        const msg = `Invalid state-change format: '${parseResult.invalidInput}'. Expected 'from:to'.`
+        console.log(JSON.stringify(formatError(CliErrorCode.ValidationError, msg, [])))
+        return
+      }
+
+      const signatureResult =
+        options.signature === undefined ? undefined : parseSignature(options.signature)
+      if (signatureResult !== undefined && !signatureResult.success) {
+        console.log(
+          JSON.stringify(formatError(CliErrorCode.ValidationError, signatureResult.error, [])),
+        )
+        return
+      }
+      const parsedSignature =
+        signatureResult?.success === true ? signatureResult.signature : undefined
+
+      const result = enrichComponent.execute({
+        businessRules: options.businessRule,
+        entity: options.entity,
+        emits: options.emits,
+        graphPathOption: options.graph,
+        id: options.id,
+        modifies: options.modifies,
+        reads: options.reads,
+        signature: parsedSignature,
+        stateChanges: parseResult.stateChanges,
+        validates: options.validates,
+      })
+      if (!result.success) {
+        const errorCodeByResult = {
+          COMPONENT_NOT_FOUND: CliErrorCode.ComponentNotFound,
+          GRAPH_CORRUPTED: CliErrorCode.GraphCorrupted,
+          GRAPH_NOT_FOUND: CliErrorCode.GraphNotFound,
+          INVALID_COMPONENT_TYPE: CliErrorCode.InvalidComponentType,
+        } as const
+        const errorCode = errorCodeByResult[result.code]
+
+        console.log(JSON.stringify(formatError(errorCode, result.message, result.suggestions)))
+        return
+      }
+
+      if (options.json === true) {
+        console.log(JSON.stringify(formatSuccess({ componentId: result.componentId })))
+      }
+    })
+}
diff --git a/apps/cli/src/features/builder/entrypoint/enrich/signature-parser.ts b/apps/cli/src/features/builder/entrypoint/enrich/signature-parser.ts
new file mode 100644
index 000000000..302fc6f18
--- /dev/null
+++ b/apps/cli/src/features/builder/entrypoint/enrich/signature-parser.ts
@@ -0,0 +1,107 @@
+interface ParsedOperationParameter {
+  description?: string
+  name: string
+  type: string
+}
+
+interface ParsedOperationSignature {
+  parameters?: ParsedOperationParameter[]
+  returnType?: string
+}
+
+function parseParameter(input: string): ParsedOperationParameter | undefined {
+  const parts = input.split(':')
+  if (parts.length < 2 || parts.length > 3) return undefined
+  const [name, type, description] = parts
+  if (name === undefined || name === '' || type === undefined || type === '') return undefined
+  return {
+    ...(description !== undefined && description !== '' ? { description: description.trim() } : {}),
+    name: name.trim(),
+    type: type.trim(),
+  }
+}
+
+type SignatureParseResult =
+  | {
+      signature: ParsedOperationSignature
+      success: true
+    }
+  | {
+      error: string
+      success: false
+    }
+type ParametersParseResult =
+  | {
+      parameters: ParsedOperationParameter[]
+      success: true
+    }
+  | {
+      error: string
+      success: false
+    }
+
+function parseParameters(paramsPart: string): ParametersParseResult {
+  if (paramsPart === '')
+    return {
+      parameters: [],
+      success: true,
+    }
+  const paramStrings = paramsPart.split(',').map((p) => p.trim())
+  const parameters: ParsedOperationParameter[] = []
+  for (const paramStr of paramStrings) {
+    const param = parseParameter(paramStr)
+    if (param === undefined)
+      return {
+        error: `Invalid parameter format: '${paramStr}'. Expected 'name:type' or 'name:type:description'.`,
+        success: false,
+      }
+    parameters.push(param)
+  }
+  return {
+    parameters,
+    success: true,
+  }
+}
+
+function buildSignatureObject(
+  parameters: ParsedOperationParameter[],
+  returnType: string | undefined,
+): ParsedOperationSignature {
+  const signature: ParsedOperationSignature = {}
+  if (parameters.length > 0) signature.parameters = parameters
+  if (returnType !== undefined && returnType !== '') signature.returnType = returnType
+  return signature
+}
+
+/** @riviere-role entrypoint-cli-input-parser */
+export function parseSignature(input: string): SignatureParseResult {
+  const trimmed = input.trim()
+  if (trimmed.startsWith('->')) {
+    const returnType = trimmed.slice(2).trim()
+    return returnType === ''
+      ? {
+          error: `Invalid signature format: '${input}'. Return type cannot be empty.`,
+          success: false,
+        }
+      : {
+          signature: { returnType },
+          success: true,
+        }
+  }
+  const arrowIndex = trimmed.indexOf(' -> ')
+  const paramsPart = arrowIndex === -1 ? trimmed : trimmed.slice(0, arrowIndex).trim()
+  const returnType = arrowIndex === -1 ? undefined : trimmed.slice(arrowIndex + 4).trim()
+  const paramsResult = parseParameters(paramsPart)
+  if (!paramsResult.success) return paramsResult
+  const signature = buildSignatureObject(paramsResult.parameters, returnType)
+  if (paramsResult.parameters.length === 0 && returnType === undefined) {
+    return {
+      error: `Invalid signature format: '${input}'. Expected 'param:type, ... -> ReturnType' or '-> ReturnType' or 'param:type'.`,
+      success: false,
+    }
+  }
+  return {
+    signature,
+    success: true,
+  }
+}
diff --git a/apps/cli/src/features/builder/entrypoint/finalize/entrypoint.ts b/apps/cli/src/features/builder/entrypoint/finalize/entrypoint.ts
new file mode 100644
index 000000000..72f1f42fe
--- /dev/null
+++ b/apps/cli/src/features/builder/entrypoint/finalize/entrypoint.ts
@@ -0,0 +1,53 @@
+import { Command } from 'commander'
+import { writeFile } from 'node:fs/promises'
+import { formatError, formatSuccess } from '../../../../infra/cli/presentation/output'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import { getDefaultGraphPathDescription } from '../../../../infra/cli/presentation/graph-path-option'
+import type { FinalizeGraph } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/finalize-graph'
+
+interface FinalizeOptions {
+  graph?: string
+  output?: string
+  json?: boolean
+}
+
+/** @riviere-role cli-entrypoint */
+export function createFinalizeCommand(finalizeGraph: FinalizeGraph): Command {
+  return new Command('finalize')
+    .description('Validate and export the final graph')
+    .addHelpText(
+      'after',
+      `
+Examples:
+  $ riviere builder finalize
+  $ riviere builder finalize --output ./dist/architecture.json
+  $ riviere builder finalize --json
+`,
+    )
+    .option('--graph <path>', getDefaultGraphPathDescription())
+    .option('--output <path>', 'Output path for finalized graph (defaults to input path)')
+    .option('--json', 'Output result as JSON')
+    .action(async (options: FinalizeOptions) => {
+      const result = finalizeGraph.execute({ graphPathOption: options.graph })
+      if (!result.success) {
+        const errorCodeByResult = {
+          GRAPH_CORRUPTED: CliErrorCode.GraphCorrupted,
+          GRAPH_NOT_FOUND: CliErrorCode.GraphNotFound,
+          VALIDATION_ERROR: CliErrorCode.ValidationError,
+        } as const
+        const errorCode = errorCodeByResult[result.code]
+        const suggestions =
+          result.code === 'VALIDATION_ERROR' ? ['Fix the validation errors and try again'] : []
+
+        console.log(JSON.stringify(formatError(errorCode, result.message, suggestions)))
+        return
+      }
+
+      const outputPath = options.output ?? options.graph ?? '.riviere/graph.json'
+      await writeFile(outputPath, JSON.stringify(result.finalGraph, null, 2), 'utf-8')
+
+      if (options.json === true) {
+        console.log(JSON.stringify(formatSuccess({ path: outputPath })))
+      }
+    })
+}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/finalize/finalize.spec.ts b/apps/cli/src/features/builder/entrypoint/finalize/finalize.spec.ts
similarity index 95%
rename from packages/riviere-cli/src/features/builder/entrypoint/finalize/finalize.spec.ts
rename to apps/cli/src/features/builder/entrypoint/finalize/finalize.spec.ts
index 6d81a37f7..59f24666d 100644
--- a/packages/riviere-cli/src/features/builder/entrypoint/finalize/finalize.spec.ts
+++ b/apps/cli/src/features/builder/entrypoint/finalize/finalize.spec.ts
@@ -1,20 +1,16 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import {
-  mkdir, readFile, access 
-} from 'node:fs/promises'
+import { describe, it, expect } from 'vitest'
+import { mkdir, readFile, access } from 'node:fs/promises'
 import { join } from 'node:path'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import type { TestContext } from '../../../../platform/__fixtures__/command-test-fixtures'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import type { TestContext } from '../../../../__fixtures__/command-test-fixtures'
 import {
   createTestContext,
   setupCommandTest,
   createGraph,
   baseMetadata,
   useCaseComponent,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 
 interface FinalizeSuccessOutput {
   success: true
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/init/domain-input-parser.ts b/apps/cli/src/features/builder/entrypoint/init/domain-input-parser.ts
similarity index 77%
rename from packages/riviere-cli/src/features/builder/entrypoint/init/domain-input-parser.ts
rename to apps/cli/src/features/builder/entrypoint/init/domain-input-parser.ts
index e9cf97723..8a053b5ab 100644
--- a/packages/riviere-cli/src/features/builder/entrypoint/init/domain-input-parser.ts
+++ b/apps/cli/src/features/builder/entrypoint/init/domain-input-parser.ts
@@ -1,6 +1,3 @@
-import type { SystemType } from '@living-architecture/riviere-schema'
-import { isValidSystemType } from '../../../../entrypoint/_platform/cli/component-types'
-
 class InvalidDomainJsonError extends Error {
   readonly value: string
 
@@ -14,7 +11,7 @@ class InvalidDomainJsonError extends Error {
 interface DomainInputParsed {
   description: string
   name: string
-  systemType: SystemType
+  systemType: string
 }
 
 function isDomainInputParsed(value: unknown): value is DomainInputParsed {
@@ -25,8 +22,7 @@ function isDomainInputParsed(value: unknown): value is DomainInputParsed {
     'description' in value &&
     typeof value.description === 'string' &&
     'systemType' in value &&
-    typeof value.systemType === 'string' &&
-    isValidSystemType(value.systemType)
+    typeof value.systemType === 'string'
   )
 }
 
diff --git a/apps/cli/src/features/builder/entrypoint/init/entrypoint.ts b/apps/cli/src/features/builder/entrypoint/init/entrypoint.ts
new file mode 100644
index 000000000..dd754add0
--- /dev/null
+++ b/apps/cli/src/features/builder/entrypoint/init/entrypoint.ts
@@ -0,0 +1,108 @@
+import { Command } from 'commander'
+import { formatError, formatSuccess } from '../../../../infra/cli/presentation/output'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import { getDefaultGraphPathDescription } from '../../../../infra/cli/presentation/graph-path-option'
+import { collectOption } from '../_platform/cli/option-collectors'
+import { parseDomainJson } from './domain-input-parser'
+import type { InitGraph } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/init-graph'
+
+interface InitOptions {
+  name?: string
+  graph?: string
+  json?: boolean
+  source: string[]
+  domain: DomainInputParsed[]
+}
+
+interface DomainInputParsed {
+  description: string
+  name: string
+  systemType: string
+}
+
+/** @riviere-role cli-entrypoint */
+export function createInitCommand(initGraph: InitGraph): Command {
+  return new Command('init')
+    .description('Initialize a new graph')
+    .addHelpText(
+      'after',
+      `
+Examples:
+  $ riviere builder init --source https://github.com/your-org/your-repo \\
+      --domain '{"name":"orders","description":"Order management","systemType":"domain"}'
+
+  $ riviere builder init --name "ecommerce" \\
+      --source https://github.com/your-org/orders \\
+      --source https://github.com/your-org/payments \\
+      --domain '{"name":"orders","description":"Order management","systemType":"domain"}' \\
+      --domain '{"name":"payments","description":"Payment processing","systemType":"domain"}'
+`,
+    )
+    .option('--name <name>', 'System name')
+    .option('--graph <path>', getDefaultGraphPathDescription())
+    .option('--json', 'Output result as JSON')
+    .option('--source <url>', 'Source repository URL (repeatable)', collectOption, [])
+    .option('--domain <json>', 'Domain as JSON (repeatable)', parseDomainJson, [])
+    .action(async (options: InitOptions) => {
+      // Validate required flags
+      if (options.source.length === 0) {
+        console.log(
+          JSON.stringify(
+            formatError(CliErrorCode.ValidationError, 'At least one source required', [
+              'Add --source <url> flag',
+            ]),
+          ),
+        )
+        return
+      }
+
+      if (options.domain.length === 0) {
+        console.log(
+          JSON.stringify(
+            formatError(CliErrorCode.ValidationError, 'At least one domain required', [
+              'Add --domain <json> flag',
+            ]),
+          ),
+        )
+        return
+      }
+
+      const domains = options.domain.map(({ description, name, systemType }) => ({
+        description,
+        name,
+        systemType,
+      }))
+
+      const result = initGraph.execute({
+        domains,
+        graphPathOption: options.graph,
+        name: options.name,
+        sources: options.source,
+      })
+
+      if (!result.success) {
+        console.log(
+          JSON.stringify(
+            result.code === 'VALIDATION_ERROR'
+              ? formatError(CliErrorCode.ValidationError, result.message)
+              : formatError(CliErrorCode.GraphExists, result.message, [
+                  'Delete the file to reinitialize',
+                ]),
+          ),
+        )
+        return
+      }
+
+      if (options.json === true) {
+        console.log(
+          JSON.stringify(
+            formatSuccess({
+              domains: result.domains,
+              path: result.path,
+              sources: result.sources,
+            }),
+          ),
+        )
+      }
+    })
+}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/init/init-options.spec.ts b/apps/cli/src/features/builder/entrypoint/init/init-options.spec.ts
similarity index 96%
rename from packages/riviere-cli/src/features/builder/entrypoint/init/init-options.spec.ts
rename to apps/cli/src/features/builder/entrypoint/init/init-options.spec.ts
index 093ad3b17..2266c2736 100644
--- a/packages/riviere-cli/src/features/builder/entrypoint/init/init-options.spec.ts
+++ b/apps/cli/src/features/builder/entrypoint/init/init-options.spec.ts
@@ -1,13 +1,9 @@
-import {
-  describe, it, expect, beforeEach, afterEach, vi 
-} from 'vitest'
-import {
-  mkdtemp, rm, readFile, stat 
-} from 'node:fs/promises'
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
+import { mkdtemp, rm, readFile, stat } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
 
 interface InitSuccessOutput {
   success: true
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/init/init.spec.ts b/apps/cli/src/features/builder/entrypoint/init/init.spec.ts
similarity index 91%
rename from packages/riviere-cli/src/features/builder/entrypoint/init/init.spec.ts
rename to apps/cli/src/features/builder/entrypoint/init/init.spec.ts
index c9908002e..27f10c154 100644
--- a/packages/riviere-cli/src/features/builder/entrypoint/init/init.spec.ts
+++ b/apps/cli/src/features/builder/entrypoint/init/init.spec.ts
@@ -1,17 +1,13 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import {
-  readFile, stat, mkdir, writeFile 
-} from 'node:fs/promises'
+import { describe, it, expect } from 'vitest'
+import { readFile, stat, mkdir, writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
 import {
   type TestContext,
   createTestContext,
   setupCommandTest,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 
 describe('riviere builder init', () => {
   describe('command registration', () => {
@@ -70,7 +66,9 @@ describe('riviere builder init', () => {
       const content = await readFile(graphPath, 'utf-8')
       const graph: unknown = JSON.parse(content)
 
-      expect(graph).toMatchObject({metadata: { sources: [{ repository: 'https://github.com/org/repo' }] },})
+      expect(graph).toMatchObject({
+        metadata: { sources: [{ repository: 'https://github.com/org/repo' }] },
+      })
     })
 
     it('includes multiple sources when multiple --source flags provided', async () => {
@@ -299,6 +297,24 @@ describe('riviere builder init', () => {
     const ctx: TestContext = createTestContext()
     setupCommandTest(ctx)
 
+    it('returns VALIDATION_ERROR when a domain has an unsupported system type', async () => {
+      const program = createProgram()
+
+      await program.parseAsync([
+        'node',
+        'riviere',
+        'builder',
+        'init',
+        '--json',
+        '--source',
+        'https://github.com/org/repo',
+        '--domain',
+        '{"name":"orders","description":"Order management","systemType":"unsupported"}',
+      ])
+
+      expect(ctx.consoleOutput.join('\n')).toContain(CliErrorCode.ValidationError)
+    })
+
     it('throws when domain JSON is not valid JSON', async () => {
       const program = createProgram()
 
diff --git a/apps/cli/src/features/builder/entrypoint/link-external/entrypoint.ts b/apps/cli/src/features/builder/entrypoint/link-external/entrypoint.ts
new file mode 100644
index 000000000..908bc6ed7
--- /dev/null
+++ b/apps/cli/src/features/builder/entrypoint/link-external/entrypoint.ts
@@ -0,0 +1,71 @@
+import { Command } from 'commander'
+import { getDefaultGraphPathDescription } from '../../../../infra/cli/presentation/graph-path-option'
+import { formatError, formatSuccess } from '../../../../infra/cli/presentation/output'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import type { LinkExternal } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/link-external'
+
+interface LinkExternalOptions {
+  from: string
+  targetName: string
+  targetDomain?: string
+  targetUrl?: string
+  linkType?: string
+  graph?: string
+  json?: boolean
+}
+
+/** @riviere-role cli-entrypoint */
+export function createLinkExternalCommand(linkExternal: LinkExternal): Command {
+  return new Command('link-external')
+    .description('Link a component to an external system')
+    .addHelpText(
+      'after',
+      `
+Examples:
+  $ riviere builder link-external \\
+      --from "payments:gateway:usecase:processpayment" \\
+      --target-name "Stripe" \\
+      --target-url "https://api.stripe.com" \\
+      --link-type sync
+
+  $ riviere builder link-external \\
+      --from "shipping:tracking:usecase:updatetracking" \\
+      --target-name "FedEx API" \\
+      --target-domain "shipping" \\
+      --link-type async
+`,
+    )
+    .requiredOption('--from <component-id>', 'Source component ID')
+    .requiredOption('--target-name <name>', 'External target name')
+    .option('--target-domain <domain>', 'External target domain')
+    .option('--target-url <url>', 'External target URL')
+    .option('--link-type <type>', 'Link type (sync, async)')
+    .option('--graph <path>', getDefaultGraphPathDescription())
+    .option('--json', 'Output result as JSON')
+    .action(async (options: LinkExternalOptions) => {
+      const result = linkExternal.execute({
+        from: options.from,
+        graphPathOption: options.graph,
+        targetDomain: options.targetDomain,
+        targetName: options.targetName,
+        targetUrl: options.targetUrl,
+        type: options.linkType,
+      })
+      if (!result.success) {
+        const errorCodeByResult = {
+          COMPONENT_NOT_FOUND: CliErrorCode.ComponentNotFound,
+          GRAPH_CORRUPTED: CliErrorCode.GraphCorrupted,
+          GRAPH_NOT_FOUND: CliErrorCode.GraphNotFound,
+          VALIDATION_ERROR: CliErrorCode.ValidationError,
+        } as const
+        const errorCode = errorCodeByResult[result.code]
+
+        console.log(JSON.stringify(formatError(errorCode, result.message, result.suggestions)))
+        return
+      }
+
+      if (options.json) {
+        console.log(JSON.stringify(formatSuccess({ externalLink: result.externalLink })))
+      }
+    })
+}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/link-external/link-external.spec.ts b/apps/cli/src/features/builder/entrypoint/link-external/link-external.spec.ts
similarity index 87%
rename from packages/riviere-cli/src/features/builder/entrypoint/link-external/link-external.spec.ts
rename to apps/cli/src/features/builder/entrypoint/link-external/link-external.spec.ts
index 4edfdf310..41331e680 100644
--- a/packages/riviere-cli/src/features/builder/entrypoint/link-external/link-external.spec.ts
+++ b/apps/cli/src/features/builder/entrypoint/link-external/link-external.spec.ts
@@ -1,17 +1,10 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import {
-  mkdir, writeFile, readFile 
-} from 'node:fs/promises'
+import { describe, it, expect } from 'vitest'
+import { mkdir, writeFile, readFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import type { TestContext } from '../../../../platform/__fixtures__/command-test-fixtures'
-import {
-  createTestContext,
-  setupCommandTest,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import type { TestContext } from '../../../../__fixtures__/command-test-fixtures'
+import { createTestContext, setupCommandTest } from '../../../../__fixtures__/command-test-fixtures'
 
 describe('riviere builder link-external', () => {
   describe('command registration', () => {
@@ -238,23 +231,32 @@ describe('riviere builder link-external', () => {
       })
     })
 
-    it('propagates error when source ID format is malformed', async () => {
+    it('returns VALIDATION_ERROR when source ID format is malformed', async () => {
       await createGraphWithComponent()
 
       const program = createProgram()
 
-      await expect(
-        program.parseAsync([
-          'node',
-          'riviere',
-          'builder',
-          'link-external',
-          '--from',
-          'malformed-id',
-          '--target-name',
-          'Stripe API',
-        ]),
-      ).rejects.toThrow(/Invalid component ID format/)
+      await program.parseAsync([
+        'node',
+        'riviere',
+        'builder',
+        'link-external',
+        '--from',
+        'malformed-id',
+        '--target-name',
+        'Stripe API',
+      ])
+
+      expect(ctx.consoleOutput[0]).toBeTruthy()
+      const output: unknown = JSON.parse(ctx.consoleOutput[0])
+      expect(output).toMatchObject({
+        success: false,
+        error: {
+          code: CliErrorCode.ValidationError,
+          message:
+            "Invalid component ID format: 'malformed-id'. Expected 'domain:module:type:name'",
+        },
+      })
     })
 
     it('returns VALIDATION_ERROR when link type is invalid', async () => {
diff --git a/apps/cli/src/features/builder/entrypoint/link-http/entrypoint.ts b/apps/cli/src/features/builder/entrypoint/link-http/entrypoint.ts
new file mode 100644
index 000000000..f63583ead
--- /dev/null
+++ b/apps/cli/src/features/builder/entrypoint/link-http/entrypoint.ts
@@ -0,0 +1,75 @@
+import { Command } from 'commander'
+import { getDefaultGraphPathDescription } from '../../../../infra/cli/presentation/graph-path-option'
+import { formatError, formatSuccess } from '../../../../infra/cli/presentation/output'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import type { LinkHttp } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/link-http'
+
+interface LinkHttpOptions {
+  path: string
+  toDomain: string
+  toModule: string
+  toType: string
+  toName: string
+  method?: string
+  linkType?: string
+  graph?: string
+  json?: boolean
+}
+
+/** @riviere-role cli-entrypoint */
+export function createLinkHttpCommand(linkHttp: LinkHttp): Command {
+  return new Command('link-http')
+    .description('Find an API by HTTP path and link to a target component')
+    .addHelpText(
+      'after',
+      `
+Examples:
+  $ riviere builder link-http \\
+      --path "/orders" --method POST \\
+      --to-domain orders --to-module checkout --to-type UseCase --to-name "place-order"
+
+  $ riviere builder link-http \\
+      --path "/users/{id}" --method GET \\
+      --to-domain users --to-module queries --to-type UseCase --to-name "get-user" \\
+      --link-type sync
+`,
+    )
+    .requiredOption('--path <http-path>', 'HTTP path to match')
+    .requiredOption('--to-domain <domain>', 'Target domain')
+    .requiredOption('--to-module <module>', 'Target module')
+    .requiredOption('--to-type <type>', 'Target component type')
+    .requiredOption('--to-name <name>', 'Target component name')
+    .option('--method <method>', 'Filter by HTTP method (GET, POST, PUT, PATCH, DELETE)')
+    .option('--link-type <type>', 'Link type (sync, async)')
+    .option('--graph <path>', getDefaultGraphPathDescription())
+    .option('--json', 'Output result as JSON')
+    .action(async (options: LinkHttpOptions) => {
+      const result = linkHttp.execute({
+        graphPathOption: options.graph,
+        httpMethod: options.method,
+        linkType: options.linkType,
+        path: options.path,
+        targetDomain: options.toDomain,
+        targetModule: options.toModule,
+        targetName: options.toName,
+        targetType: options.toType,
+      })
+      if (!result.success) {
+        const errorCodeByResult = {
+          AMBIGUOUS_API_MATCH: CliErrorCode.AmbiguousApiMatch,
+          COMPONENT_NOT_FOUND: CliErrorCode.ComponentNotFound,
+          GRAPH_CORRUPTED: CliErrorCode.GraphCorrupted,
+          GRAPH_NOT_FOUND: CliErrorCode.GraphNotFound,
+          VALIDATION_ERROR: CliErrorCode.ValidationError,
+        } as const
+        const errorCode = errorCodeByResult[result.code]
+
+        console.log(JSON.stringify(formatError(errorCode, result.message, result.suggestions)))
+        return
+      }
+
+      if (options.json) {
+        console.log(JSON.stringify(formatSuccess(result)))
+      }
+    })
+}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/link-http/link-http.spec.ts b/apps/cli/src/features/builder/entrypoint/link-http/link-http.spec.ts
similarity index 94%
rename from packages/riviere-cli/src/features/builder/entrypoint/link-http/link-http.spec.ts
rename to apps/cli/src/features/builder/entrypoint/link-http/link-http.spec.ts
index 6515904bf..49c0d71d2 100644
--- a/packages/riviere-cli/src/features/builder/entrypoint/link-http/link-http.spec.ts
+++ b/apps/cli/src/features/builder/entrypoint/link-http/link-http.spec.ts
@@ -1,17 +1,10 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import {
-  mkdir, writeFile, readFile 
-} from 'node:fs/promises'
+import { describe, it, expect } from 'vitest'
+import { mkdir, writeFile, readFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import type { TestContext } from '../../../../platform/__fixtures__/command-test-fixtures'
-import {
-  createTestContext,
-  setupCommandTest,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import type { TestContext } from '../../../../__fixtures__/command-test-fixtures'
+import { createTestContext, setupCommandTest } from '../../../../__fixtures__/command-test-fixtures'
 
 interface ApiComponentDef {
   id: string
@@ -252,9 +245,7 @@ describe('riviere builder link-http', () => {
         override: { method: 'INVALID' },
         message: 'Invalid HTTP method: INVALID',
       },
-    ])('returns VALIDATION_ERROR for invalid input: $message', async ({
-      override, message 
-    }) => {
+    ])('returns VALIDATION_ERROR for invalid input: $message', async ({ override, message }) => {
       await createGraph([singleApi])
       await createProgram().parseAsync(buildArgs(override))
       expect(ctx.consoleOutput[0]).toBeTruthy()
diff --git a/apps/cli/src/features/builder/entrypoint/link/entrypoint.ts b/apps/cli/src/features/builder/entrypoint/link/entrypoint.ts
new file mode 100644
index 000000000..4b687fb02
--- /dev/null
+++ b/apps/cli/src/features/builder/entrypoint/link/entrypoint.ts
@@ -0,0 +1,107 @@
+import { Command } from 'commander'
+import { getDefaultGraphPathDescription } from '../../../../infra/cli/presentation/graph-path-option'
+import * as cliOutput from '../../../../infra/cli/presentation/output'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import type { LinkComponents } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/link-components'
+import { parseLinkSourceLocation } from './link-source-location-options'
+
+interface LinkOptions {
+  from: string
+  toDomain: string
+  toModule: string
+  toType: string
+  toName: string
+  linkType?: string
+  relationshipType?: string
+  condition?: string
+  repository?: string
+  filePath?: string
+  lineNumber?: string
+  columnNumber?: string
+  graph?: string
+  json?: boolean
+}
+
+/** @riviere-role cli-entrypoint */
+export function createLinkCommand(linkComponents: LinkComponents): Command {
+  return new Command('link')
+    .description('Link two components')
+    .addHelpText(
+      'after',
+      `
+Examples:
+  $ riviere builder link \\
+      --from "orders:api:api:postorders" \\
+      --to-domain orders --to-module checkout --to-type UseCase --to-name "place-order" \\
+      --link-type sync
+
+  $ riviere builder link \\
+      --from "orders:checkout:domainop:orderbegin" \\
+      --to-domain orders --to-module events --to-type Event --to-name "order-placed" \\
+      --link-type async
+`,
+    )
+    .requiredOption('--from <component-id>', 'Source component ID')
+    .requiredOption('--to-domain <domain>', 'Target domain')
+    .requiredOption('--to-module <module>', 'Target module')
+    .requiredOption(
+      '--to-type <type>',
+      'Target component type (UI, API, UseCase, DomainOp, Event, EventHandler, Custom)',
+    )
+    .requiredOption('--to-name <name>', 'Target component name')
+    .option('--link-type <type>', 'Link type (sync, async)')
+    .option('--relationship-type <name>', 'Project-defined relationship type')
+    .option('--condition <condition>', 'Condition retained exactly as supplied')
+    .option('--repository <repository>', 'Source repository identifier')
+    .option('--file-path <path>', 'Source file path')
+    .option('--line-number <n>', 'Source line number')
+    .option('--column-number <n>', 'Source column number')
+    .option('--graph <path>', getDefaultGraphPathDescription())
+    .option('--json', 'Output result as JSON')
+    .action(async (options: LinkOptions) => {
+      const sourceLocationResult = parseLinkSourceLocation(options)
+      if (!sourceLocationResult.success) {
+        console.log(
+          JSON.stringify(
+            cliOutput.formatError(CliErrorCode.ValidationError, sourceLocationResult.message, []),
+          ),
+        )
+        return
+      }
+
+      const result = linkComponents.execute({
+        from: options.from,
+        graphPathOption: options.graph,
+        targetDomain: options.toDomain,
+        targetModule: options.toModule,
+        targetName: options.toName,
+        targetType: options.toType,
+        type: options.linkType,
+        ...(options.condition === undefined ? {} : { condition: options.condition }),
+        ...(options.relationshipType === undefined
+          ? {}
+          : { relationshipType: options.relationshipType }),
+        ...(sourceLocationResult.sourceLocation === undefined
+          ? {}
+          : { sourceLocation: sourceLocationResult.sourceLocation }),
+      })
+      if (!result.success) {
+        const errorCodeByResult = {
+          COMPONENT_NOT_FOUND: CliErrorCode.ComponentNotFound,
+          GRAPH_CORRUPTED: CliErrorCode.GraphCorrupted,
+          GRAPH_NOT_FOUND: CliErrorCode.GraphNotFound,
+          VALIDATION_ERROR: CliErrorCode.ValidationError,
+        } as const
+        const errorCode = errorCodeByResult[result.code]
+
+        console.log(
+          JSON.stringify(cliOutput.formatError(errorCode, result.message, result.suggestions)),
+        )
+        return
+      }
+
+      if (options.json) {
+        console.log(JSON.stringify(cliOutput.formatSuccess({ link: result.link })))
+      }
+    })
+}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/link/link-relationship.spec.ts b/apps/cli/src/features/builder/entrypoint/link/link-relationship.spec.ts
similarity index 90%
rename from packages/riviere-cli/src/features/builder/entrypoint/link/link-relationship.spec.ts
rename to apps/cli/src/features/builder/entrypoint/link/link-relationship.spec.ts
index 273375d1e..a5f566298 100644
--- a/packages/riviere-cli/src/features/builder/entrypoint/link/link-relationship.spec.ts
+++ b/apps/cli/src/features/builder/entrypoint/link/link-relationship.spec.ts
@@ -1,17 +1,23 @@
-import {
-  describe, expect, it 
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 import { readFile } from 'node:fs/promises'
 import { join } from 'node:path'
-import { parseRiviereGraph } from '@living-architecture/riviere-schema'
+import { parseRiviereGraph } from '@living-architecture/riviere-schema-published-language/validation'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
 import {
   type TestContext,
   createGraphWithComponent,
   createTestContext,
   setupCommandTest,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
+
+function parseValidGraph(value: unknown) {
+  const result = parseRiviereGraph(value)
+  if (!result.success) {
+    expect.fail(result.issues.join('\n'))
+  }
+  return result.graph
+}
 
 const sourceComponent = {
   id: 'orders:checkout:api:create-order',
@@ -77,7 +83,7 @@ describe('riviere builder link relationship fields', () => {
       '5',
     ])
 
-    const graph = parseRiviereGraph(
+    const graph = parseValidGraph(
       JSON.parse(await readFile(join(ctx.testDir, '.riviere', 'graph.json'), 'utf-8')),
     )
     expect(graph.links).toStrictEqual([
@@ -136,7 +142,7 @@ describe('riviere builder link relationship fields', () => {
       'src/api/orders.ts',
     ])
 
-    const graph = parseRiviereGraph(
+    const graph = parseValidGraph(
       JSON.parse(await readFile(join(ctx.testDir, '.riviere', 'graph.json'), 'utf-8')),
     )
     expect(graph.links[0].sourceLocation).toStrictEqual({
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/link/link-source-location-options.ts b/apps/cli/src/features/builder/entrypoint/link/link-source-location-options.ts
similarity index 83%
rename from packages/riviere-cli/src/features/builder/entrypoint/link/link-source-location-options.ts
rename to apps/cli/src/features/builder/entrypoint/link/link-source-location-options.ts
index 8868af775..7c2589cf0 100644
--- a/packages/riviere-cli/src/features/builder/entrypoint/link/link-source-location-options.ts
+++ b/apps/cli/src/features/builder/entrypoint/link/link-source-location-options.ts
@@ -1,5 +1,3 @@
-import type { SourceLocation } from '@living-architecture/riviere-schema'
-
 interface LinkSourceLocationOptions {
   repository?: string
   filePath?: string
@@ -9,13 +7,20 @@ interface LinkSourceLocationOptions {
 
 type LinkSourceLocationResult =
   | {
-    success: true
-    sourceLocation: SourceLocation | undefined
-  }
+      success: true
+      sourceLocation:
+        | {
+            repository: string
+            filePath: string
+            lineNumber?: number
+            columnNumber?: number
+          }
+        | undefined
+    }
   | {
-    success: false
-    message: string
-  }
+      success: false
+      message: string
+    }
 
 /** @riviere-role entrypoint-cli-input-parser */
 export function parseLinkSourceLocation(
@@ -64,13 +69,13 @@ function parsePositiveInteger(
   optionName: string,
 ):
   | {
-    success: true
-    value: number | undefined
-  }
+      success: true
+      value: number | undefined
+    }
   | {
-    success: false
-    message: string
-  } {
+      success: false
+      message: string
+    } {
   if (raw === undefined) {
     return {
       success: true,
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/link/link.spec.ts b/apps/cli/src/features/builder/entrypoint/link/link.spec.ts
similarity index 89%
rename from packages/riviere-cli/src/features/builder/entrypoint/link/link.spec.ts
rename to apps/cli/src/features/builder/entrypoint/link/link.spec.ts
index e066c9657..48ad4799e 100644
--- a/packages/riviere-cli/src/features/builder/entrypoint/link/link.spec.ts
+++ b/apps/cli/src/features/builder/entrypoint/link/link.spec.ts
@@ -1,16 +1,14 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { readFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
 import {
   type TestContext,
   createTestContext,
   setupCommandTest,
   createGraphWithComponent,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 
 describe('riviere builder link', () => {
   describe('command registration', () => {
@@ -245,29 +243,38 @@ describe('riviere builder link', () => {
       })
     })
 
-    it('propagates error when source ID format is malformed', async () => {
+    it('returns VALIDATION_ERROR when source ID format is malformed', async () => {
       await createGraphWithComponent(ctx.testDir, linkSourceComponent)
 
       const program = createProgram()
 
-      await expect(
-        program.parseAsync([
-          'node',
-          'riviere',
-          'builder',
-          'link',
-          '--from',
-          'malformed-id',
-          '--to-domain',
-          'orders',
-          '--to-module',
-          'checkout',
-          '--to-type',
-          'UseCase',
-          '--to-name',
-          'place-order',
-        ]),
-      ).rejects.toThrow(/Invalid component ID format/)
+      await program.parseAsync([
+        'node',
+        'riviere',
+        'builder',
+        'link',
+        '--from',
+        'malformed-id',
+        '--to-domain',
+        'orders',
+        '--to-module',
+        'checkout',
+        '--to-type',
+        'UseCase',
+        '--to-name',
+        'place-order',
+      ])
+
+      expect(ctx.consoleOutput[0]).toBeTruthy()
+      const output: unknown = JSON.parse(ctx.consoleOutput[0])
+      expect(output).toMatchObject({
+        success: false,
+        error: {
+          code: CliErrorCode.ValidationError,
+          message:
+            "Invalid component ID format: 'malformed-id'. Expected 'domain:module:type:name'",
+        },
+      })
     })
 
     it('returns VALIDATION_ERROR when component type is invalid', async () => {
diff --git a/apps/cli/src/features/builder/entrypoint/validate/entrypoint.ts b/apps/cli/src/features/builder/entrypoint/validate/entrypoint.ts
new file mode 100644
index 000000000..3c9fa442a
--- /dev/null
+++ b/apps/cli/src/features/builder/entrypoint/validate/entrypoint.ts
@@ -0,0 +1,56 @@
+import { Command } from 'commander'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import { getDefaultGraphPathDescription } from '../../../../infra/cli/presentation/graph-path-option'
+import { formatError, formatSuccess } from '../../../../infra/cli/presentation/output'
+import type { ValidateGraph } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/validate-graph'
+
+interface ValidateOptions {
+  graph?: string
+  json?: boolean
+}
+
+/** @riviere-role cli-entrypoint */
+export function createValidateCommand(validateGraph: ValidateGraph): Command {
+  return new Command('validate')
+    .description('Validate the graph for errors and warnings')
+    .addHelpText(
+      'after',
+      `
+Examples:
+  $ riviere builder validate
+  $ riviere builder validate --json
+  $ riviere builder validate --graph .riviere/my-graph.json
+`,
+    )
+    .option('--graph <path>', getDefaultGraphPathDescription())
+    .option('--json', 'Output result as JSON')
+    .action(async (options: ValidateOptions) => {
+      const result = validateGraph.execute({ graphPathOption: options.graph })
+      if (!result.success) {
+        console.log(
+          JSON.stringify(
+            formatError(
+              result.code === 'GRAPH_NOT_FOUND'
+                ? CliErrorCode.GraphNotFound
+                : CliErrorCode.GraphCorrupted,
+              result.message,
+              [],
+            ),
+          ),
+        )
+        return
+      }
+
+      if (options.json === true) {
+        console.log(
+          JSON.stringify(
+            formatSuccess({
+              errors: result.errors,
+              valid: result.valid,
+              warnings: result.warnings,
+            }),
+          ),
+        )
+      }
+    })
+}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/validate/validate.spec.ts b/apps/cli/src/features/builder/entrypoint/validate/validate.spec.ts
similarity index 96%
rename from packages/riviere-cli/src/features/builder/entrypoint/validate/validate.spec.ts
rename to apps/cli/src/features/builder/entrypoint/validate/validate.spec.ts
index cc8ea98c2..20eb7ba1a 100644
--- a/packages/riviere-cli/src/features/builder/entrypoint/validate/validate.spec.ts
+++ b/apps/cli/src/features/builder/entrypoint/validate/validate.spec.ts
@@ -1,9 +1,7 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import type { TestContext } from '../../../../platform/__fixtures__/command-test-fixtures'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import type { TestContext } from '../../../../__fixtures__/command-test-fixtures'
 import {
   createTestContext,
   setupCommandTest,
@@ -14,7 +12,7 @@ import {
   apiComponent,
   validLink,
   TestAssertionError,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 
 interface ValidationOutput {
   success: true
diff --git a/packages/riviere-cli/src/features/extract/__fixtures__/extraction-test-fixtures.ts b/apps/cli/src/features/extract/__fixtures__/extraction-test-fixtures.ts
similarity index 95%
rename from packages/riviere-cli/src/features/extract/__fixtures__/extraction-test-fixtures.ts
rename to apps/cli/src/features/extract/__fixtures__/extraction-test-fixtures.ts
index a2aca8952..32d6d334d 100644
--- a/packages/riviere-cli/src/features/extract/__fixtures__/extraction-test-fixtures.ts
+++ b/apps/cli/src/features/extract/__fixtures__/extraction-test-fixtures.ts
@@ -1,9 +1,7 @@
-import {
-  writeFile, mkdir 
-} from 'node:fs/promises'
+import { writeFile, mkdir } from 'node:fs/promises'
 import { join } from 'node:path'
 import { z } from 'zod'
-import { TestAssertionError } from '../../../platform/__fixtures__/command-test-fixtures'
+import { TestAssertionError } from '../../../__fixtures__/command-test-fixtures'
 
 const draftComponentSchema = z.looseObject({
   type: z.string(),
diff --git a/packages/riviere-cli/src/features/extract/entrypoint/extract/categorize-components.spec.ts b/apps/cli/src/features/extract/entrypoint/extract/categorize-components.spec.ts
similarity index 97%
rename from packages/riviere-cli/src/features/extract/entrypoint/extract/categorize-components.spec.ts
rename to apps/cli/src/features/extract/entrypoint/extract/categorize-components.spec.ts
index 9259eee92..5cdf77289 100644
--- a/packages/riviere-cli/src/features/extract/entrypoint/extract/categorize-components.spec.ts
+++ b/apps/cli/src/features/extract/entrypoint/extract/categorize-components.spec.ts
@@ -1,7 +1,5 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import type { DraftComponent } from '@living-architecture/riviere-extract-ts'
+import { describe, it, expect } from 'vitest'
+import type { DraftComponent } from '@living-architecture/riviere-extract-ts-domain-model/domain/component-extraction/draft-component'
 import { categorizeComponents } from './categorize-components'
 
 function createDraftComponent(type: string, name: string, domain: string): DraftComponent {
diff --git a/packages/riviere-cli/src/features/extract/entrypoint/extract/categorize-components.ts b/apps/cli/src/features/extract/entrypoint/extract/categorize-components.ts
similarity index 83%
rename from packages/riviere-cli/src/features/extract/entrypoint/extract/categorize-components.ts
rename to apps/cli/src/features/extract/entrypoint/extract/categorize-components.ts
index cf4a47113..b9d43b512 100644
--- a/packages/riviere-cli/src/features/extract/entrypoint/extract/categorize-components.ts
+++ b/apps/cli/src/features/extract/entrypoint/extract/categorize-components.ts
@@ -1,4 +1,9 @@
-import type { DraftComponent } from '@living-architecture/riviere-extract-ts'
+import type { ExtractDraftComponentsResult } from '@living-architecture/riviere-extract-ts-use-cases/features/extract/commands/extract-draft-components-result'
+
+type DraftComponent = Extract<
+  ExtractDraftComponentsResult,
+  { kind: 'draftOnly' }
+>['components'][number]
 
 interface ComponentIdentity {
   readonly type: string
diff --git a/packages/riviere-cli/src/features/extract/entrypoint/extract/create-command-inputs.spec.ts b/apps/cli/src/features/extract/entrypoint/extract/create-command-inputs.spec.ts
similarity index 96%
rename from packages/riviere-cli/src/features/extract/entrypoint/extract/create-command-inputs.spec.ts
rename to apps/cli/src/features/extract/entrypoint/extract/create-command-inputs.spec.ts
index 7725abbff..e8e04e0f1 100644
--- a/packages/riviere-cli/src/features/extract/entrypoint/extract/create-command-inputs.spec.ts
+++ b/apps/cli/src/features/extract/entrypoint/extract/create-command-inputs.spec.ts
@@ -1,6 +1,4 @@
-import {
-  describe, expect, it 
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 import { createEnrichDraftComponentsInput } from './create-enrich-draft-components-input'
 import { createExtractDraftComponentsInput } from './create-extract-draft-components-input'
 
diff --git a/packages/riviere-cli/src/features/extract/entrypoint/extract/create-enrich-draft-components-input.ts b/apps/cli/src/features/extract/entrypoint/extract/create-enrich-draft-components-input.ts
similarity index 85%
rename from packages/riviere-cli/src/features/extract/entrypoint/extract/create-enrich-draft-components-input.ts
rename to apps/cli/src/features/extract/entrypoint/extract/create-enrich-draft-components-input.ts
index 6d03ed7f6..5d2245c82 100644
--- a/packages/riviere-cli/src/features/extract/entrypoint/extract/create-enrich-draft-components-input.ts
+++ b/apps/cli/src/features/extract/entrypoint/extract/create-enrich-draft-components-input.ts
@@ -1,4 +1,4 @@
-import type { EnrichDraftComponentsInput } from '../../commands/enrich-draft-components-input'
+import type { EnrichDraftComponentsInput } from '@living-architecture/riviere-extract-ts-use-cases/features/extract/commands/enrich-draft-components-input'
 
 interface EnrichDraftComponentsFactoryInput {
   allowIncomplete?: boolean
diff --git a/packages/riviere-cli/src/features/extract/entrypoint/extract/create-extract-draft-components-input.ts b/apps/cli/src/features/extract/entrypoint/extract/create-extract-draft-components-input.ts
similarity index 89%
rename from packages/riviere-cli/src/features/extract/entrypoint/extract/create-extract-draft-components-input.ts
rename to apps/cli/src/features/extract/entrypoint/extract/create-extract-draft-components-input.ts
index 55fbb06eb..6a24d227f 100644
--- a/packages/riviere-cli/src/features/extract/entrypoint/extract/create-extract-draft-components-input.ts
+++ b/apps/cli/src/features/extract/entrypoint/extract/create-extract-draft-components-input.ts
@@ -1,4 +1,4 @@
-import type { ExtractDraftComponentsInput } from '../../commands/extract-draft-components-input'
+import type { ExtractDraftComponentsInput } from '@living-architecture/riviere-extract-ts-use-cases/features/extract/commands/extract-draft-components-input'
 
 interface ExtractDraftComponentsFactoryInput {
   allowIncomplete?: boolean
diff --git a/apps/cli/src/features/extract/entrypoint/extract/entrypoint.ts b/apps/cli/src/features/extract/entrypoint/extract/entrypoint.ts
new file mode 100644
index 000000000..b5647400e
--- /dev/null
+++ b/apps/cli/src/features/extract/entrypoint/extract/entrypoint.ts
@@ -0,0 +1,95 @@
+import { Command } from 'commander'
+import { CliErrorCode, ExitCode } from '../../../../infra/cli/presentation/error-codes'
+import { exitWithCliError } from '../../../../infra/cli/presentation/exit-with-cli-error'
+import { validateFlagCombinations } from './extract-validator'
+import type { EnrichDraftComponents } from '@living-architecture/riviere-extract-ts-use-cases/features/extract/commands/enrich-draft-components'
+import type { ExtractDraftComponents } from '@living-architecture/riviere-extract-ts-use-cases/features/extract/commands/extract-draft-components'
+import { createExtractDraftComponentsInput } from './create-extract-draft-components-input'
+import { createEnrichDraftComponentsInput } from './create-enrich-draft-components-input'
+import { dataAccessCliErrorCode, presentExtractionResult } from './present-extraction-result'
+
+/** @riviere-role cli-entrypoint */
+export function createExtractCommand(
+  extractDraftComponents: Pick<ExtractDraftComponents, 'execute'>,
+  enrichDraftComponents: Pick<EnrichDraftComponents, 'execute'>,
+): Command {
+  return new Command('extract')
+    .description('Extract architectural components from source code')
+    .requiredOption('--config <path>', 'Path to extraction config file')
+    .option('--dry-run', 'Show component counts per domain without full output')
+    .option('-o, --output <file>', 'Write output to file instead of stdout')
+    .option('--components-only', 'Output only component identity (no metadata enrichment)')
+    .option('--enrich <file>', 'Read draft components from file and enrich with extraction rules')
+    .option('--allow-incomplete', 'Output components even when some extraction fields fail')
+    .option('--pr', 'Extract from files changed in current branch vs base branch')
+    .option('--base <branch>', 'Override base branch for --pr (default: auto-detect)')
+    .option('--files <paths...>', 'Extract from specific files')
+    .option('--format <type>', 'Output format: json (default) or markdown')
+    .option('--stats', 'Show extraction statistics on stderr')
+    .option('--no-ts-config', 'Skip tsconfig.json auto-discovery (disables full type resolution)')
+    .action(
+      (options: {
+        allowIncomplete?: boolean
+        base?: string
+        componentsOnly?: boolean
+        config: string
+        dryRun?: boolean
+        enrich?: string
+        files?: string[]
+        format?: string
+        output?: string
+        pr?: boolean
+        stats?: boolean
+        tsConfig?: boolean
+      }) => {
+        validateFlagCombinations(options)
+
+        const result =
+          options.enrich === undefined
+            ? extractDraftComponents.execute(createExtractDraftComponentsInput(options))
+            : enrichDraftComponents.execute(
+                createEnrichDraftComponentsInput(options, options.enrich),
+              )
+
+        if (result.kind === 'fieldFailure') {
+          exitWithCliError(
+            CliErrorCode.ValidationError,
+            `Extraction failed for fields: ${result.failedFields.join(', ')}`,
+            ExitCode.ExtractionFailure,
+            [],
+          )
+        }
+
+        if (result.kind === 'configFailure') {
+          exitWithCliError(
+            result.code === 'CONFIG_NOT_FOUND'
+              ? CliErrorCode.ConfigNotFound
+              : CliErrorCode.ValidationError,
+            result.message,
+            ExitCode.ConfigValidation,
+            [],
+          )
+        }
+
+        if (result.kind === 'connectionDetectionFailure') {
+          exitWithCliError(
+            CliErrorCode.ConnectionDetectionFailure,
+            result.message,
+            ExitCode.ExtractionFailure,
+            ['Use --allow-incomplete to emit uncertain links instead of failing'],
+          )
+        }
+
+        if (result.kind === 'dataAccessFailure') {
+          exitWithCliError(
+            dataAccessCliErrorCode(result.code),
+            result.message,
+            ExitCode.RuntimeError,
+            [],
+          )
+        }
+
+        presentExtractionResult(result, options)
+      },
+    )
+}
diff --git a/packages/riviere-cli/src/features/extract/entrypoint/extract/extract-output-formatter.spec.ts b/apps/cli/src/features/extract/entrypoint/extract/extract-output-formatter.spec.ts
similarity index 96%
rename from packages/riviere-cli/src/features/extract/entrypoint/extract/extract-output-formatter.spec.ts
rename to apps/cli/src/features/extract/entrypoint/extract/extract-output-formatter.spec.ts
index 30162c9a3..00fce991b 100644
--- a/packages/riviere-cli/src/features/extract/entrypoint/extract/extract-output-formatter.spec.ts
+++ b/apps/cli/src/features/extract/entrypoint/extract/extract-output-formatter.spec.ts
@@ -1,6 +1,4 @@
-import {
-  describe, expect, it 
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 import { formatDryRunOutput } from './extract-output-formatter'
 
 describe('formatDryRunOutput', () => {
diff --git a/packages/riviere-cli/src/features/extract/entrypoint/extract/extract-output-formatter.ts b/apps/cli/src/features/extract/entrypoint/extract/extract-output-formatter.ts
similarity index 76%
rename from packages/riviere-cli/src/features/extract/entrypoint/extract/extract-output-formatter.ts
rename to apps/cli/src/features/extract/entrypoint/extract/extract-output-formatter.ts
index cef6d9fdd..c2e5987c6 100644
--- a/packages/riviere-cli/src/features/extract/entrypoint/extract/extract-output-formatter.ts
+++ b/apps/cli/src/features/extract/entrypoint/extract/extract-output-formatter.ts
@@ -1,11 +1,16 @@
-import { type DraftComponent } from '@living-architecture/riviere-extract-ts'
+import type { ExtractDraftComponentsResult } from '@living-architecture/riviere-extract-ts-use-cases/features/extract/commands/extract-draft-components-result'
+
+type DraftComponent = Extract<
+  ExtractDraftComponentsResult,
+  { kind: 'draftOnly' }
+>['components'][number]
 
 function compareByCodePoint(a: string, b: string): number {
   return a.localeCompare(b)
 }
 
 /** @riviere-role cli-output-formatter */
-export function formatDryRunOutput(components: DraftComponent[]): string[] {
+export function formatDryRunOutput(components: readonly DraftComponent[]): string[] {
   const countsByDomain = new Map<string, Map<string, number>>()
 
   for (const component of components) {
diff --git a/packages/riviere-cli/src/features/extract/entrypoint/extract/extract-validator.ts b/apps/cli/src/features/extract/entrypoint/extract/extract-validator.ts
similarity index 94%
rename from packages/riviere-cli/src/features/extract/entrypoint/extract/extract-validator.ts
rename to apps/cli/src/features/extract/entrypoint/extract/extract-validator.ts
index 50cc74884..ad9300ddc 100644
--- a/packages/riviere-cli/src/features/extract/entrypoint/extract/extract-validator.ts
+++ b/apps/cli/src/features/extract/entrypoint/extract/extract-validator.ts
@@ -1,7 +1,4 @@
-import {
-  CliErrorCode,
-  ConfigValidationError,
-} from '../../../../platform/infra/cli/presentation/error-codes'
+import { CliErrorCode, ConfigValidationError } from '../../../../infra/cli/presentation/error-codes'
 
 interface ExtractOptions {
   allowIncomplete?: boolean
diff --git a/packages/riviere-cli/src/features/extract/entrypoint/extract/extract.connections.spec.ts b/apps/cli/src/features/extract/entrypoint/extract/extract.connections.spec.ts
similarity index 92%
rename from packages/riviere-cli/src/features/extract/entrypoint/extract/extract.connections.spec.ts
rename to apps/cli/src/features/extract/entrypoint/extract/extract.connections.spec.ts
index 0cec3566f..7f1783257 100644
--- a/packages/riviere-cli/src/features/extract/entrypoint/extract/extract.connections.spec.ts
+++ b/apps/cli/src/features/extract/entrypoint/extract/extract.connections.spec.ts
@@ -1,19 +1,17 @@
-import {
-  describe, it, expect, vi, afterEach 
-} from 'vitest'
-import type { TestContext } from '../../../../platform/__fixtures__/command-test-fixtures'
+import { describe, it, expect, vi, afterEach } from 'vitest'
+import type { TestContext } from '../../../../__fixtures__/command-test-fixtures'
 import {
   createTestContext,
   setupCommandTest,
   assertDefined,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 import { createProgram } from '../../../../shell/cli'
 import {
   parseFullExtractionOutput,
   createValidExtractFixture,
 } from '../../__fixtures__/extraction-test-fixtures'
 
-vi.mock('../../../../platform/infra/external-clients/git/git-repository-info', () => ({
+vi.mock('../../../../infra/external-clients/git/git-repository-info', () => ({
   getRepositoryInfo: vi.fn(() => ({
     name: 'test/repo',
     owner: 'test',
@@ -127,9 +125,7 @@ describe('riviere extract — connection detection', () => {
     setupCommandTest(ctx)
 
     it('outputs empty links when zero components extracted', async () => {
-      const {
-        writeFile, mkdir 
-      } = await import('node:fs/promises')
+      const { writeFile, mkdir } = await import('node:fs/promises')
       const { join } = await import('node:path')
       const srcDir = join(ctx.testDir, 'src')
       await mkdir(srcDir, { recursive: true })
diff --git a/packages/riviere-cli/src/features/extract/entrypoint/extract/extract.dry-run.spec.ts b/apps/cli/src/features/extract/entrypoint/extract/extract.dry-run.spec.ts
similarity index 93%
rename from packages/riviere-cli/src/features/extract/entrypoint/extract/extract.dry-run.spec.ts
rename to apps/cli/src/features/extract/entrypoint/extract/extract.dry-run.spec.ts
index 0ed1492f2..f9c1abe07 100644
--- a/packages/riviere-cli/src/features/extract/entrypoint/extract/extract.dry-run.spec.ts
+++ b/apps/cli/src/features/extract/entrypoint/extract/extract.dry-run.spec.ts
@@ -1,20 +1,16 @@
-import {
-  writeFile, mkdir 
-} from 'node:fs/promises'
+import { writeFile, mkdir } from 'node:fs/promises'
 import { join } from 'node:path'
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { createProgram } from '../../../../shell/cli'
-import type { TestContext } from '../../../../platform/__fixtures__/command-test-fixtures'
+import type { TestContext } from '../../../../__fixtures__/command-test-fixtures'
 import {
   createTestContext,
   setupCommandTest,
   assertDefined,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 import { parseFullExtractionOutput } from '../../__fixtures__/extraction-test-fixtures'
 
-vi.mock('../../../../platform/infra/external-clients/git/git-repository-info', () => ({
+vi.mock('../../../../infra/external-clients/git/git-repository-info', () => ({
   getRepositoryInfo: vi.fn(() => ({
     name: 'test/repo',
     owner: 'test',
@@ -116,6 +112,8 @@ modules:
       where:
         hasJSDoc:
           tag: api
+      extract:
+        apiType: { literal: REST }
     useCase:
       find: classes
       where:
@@ -194,6 +192,8 @@ modules:
       where:
         hasJSDoc:
           tag: api
+      extract:
+        apiType: { literal: REST }
     useCase: { notUsed: true }
     domainOp: { notUsed: true }
     event: { notUsed: true }
@@ -253,6 +253,8 @@ modules:
       where:
         hasJSDoc:
           tag: api
+      extract:
+        apiType: { literal: REST }
     useCase:
       find: classes
       where:
@@ -321,6 +323,8 @@ modules:
       where:
         hasJSDoc:
           tag: api
+      extract:
+        apiType: { literal: REST }
     useCase:
       find: classes
       where:
diff --git a/packages/riviere-cli/src/features/extract/entrypoint/extract/extract.enrichment.spec.ts b/apps/cli/src/features/extract/entrypoint/extract/extract.enrichment.spec.ts
similarity index 90%
rename from packages/riviere-cli/src/features/extract/entrypoint/extract/extract.enrichment.spec.ts
rename to apps/cli/src/features/extract/entrypoint/extract/extract.enrichment.spec.ts
index 1d2235308..6c4796154 100644
--- a/packages/riviere-cli/src/features/extract/entrypoint/extract/extract.enrichment.spec.ts
+++ b/apps/cli/src/features/extract/entrypoint/extract/extract.enrichment.spec.ts
@@ -1,24 +1,19 @@
-import {
-  writeFile, mkdir 
-} from 'node:fs/promises'
+import { writeFile, mkdir } from 'node:fs/promises'
 import { join } from 'node:path'
-import {
-  describe, it, expect 
-} from 'vitest'
-import type { DraftComponent } from '@living-architecture/riviere-extract-ts'
-import type { TestContext } from '../../../../platform/__fixtures__/command-test-fixtures'
+import { describe, it, expect } from 'vitest'
+import type { TestContext } from '../../../../__fixtures__/command-test-fixtures'
 import {
   createTestContext,
   setupCommandTest,
   parseErrorOutput,
   parseCommandWithErrorHandling,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 import {
   parseFullExtractionOutput,
   validSourceCode,
 } from '../../__fixtures__/extraction-test-fixtures'
 
-vi.mock('../../../../platform/infra/external-clients/git/git-repository-info', () => ({
+vi.mock('../../../../infra/external-clients/git/git-repository-info', () => ({
   getRepositoryInfo: vi.fn(() => ({
     name: 'test/repo',
     owner: 'test',
@@ -131,11 +126,12 @@ describe('riviere extract enrichment', () => {
       const configPath = join(ctx.testDir, 'extract.yaml')
       await writeFile(configPath, configWithLiteralExtract)
 
-      const draftComponents: DraftComponent[] = [
+      const draftComponents = [
         {
           type: 'useCase',
           name: 'PlaceOrder',
           domain: 'orders',
+          module: 'orders',
           location: {
             file: join(srcDir, 'order-service.ts'),
             line: 2,
diff --git a/packages/riviere-cli/src/features/extract/entrypoint/extract/extract.pr-extraction.spec.ts b/apps/cli/src/features/extract/entrypoint/extract/extract.pr-extraction.spec.ts
similarity index 83%
rename from packages/riviere-cli/src/features/extract/entrypoint/extract/extract.pr-extraction.spec.ts
rename to apps/cli/src/features/extract/entrypoint/extract/extract.pr-extraction.spec.ts
index 200108100..1511c20b2 100644
--- a/packages/riviere-cli/src/features/extract/entrypoint/extract/extract.pr-extraction.spec.ts
+++ b/apps/cli/src/features/extract/entrypoint/extract/extract.pr-extraction.spec.ts
@@ -1,50 +1,29 @@
-import { writeFile } from 'node:fs/promises'
+import { appendFile, rm, writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
-import {
-  describe, it, expect, vi 
-} from 'vitest'
-import type { TestContext } from '../../../../platform/__fixtures__/command-test-fixtures'
+import { describe, it, expect, vi } from 'vitest'
+import type { TestContext } from '../../../../__fixtures__/command-test-fixtures'
 import {
   createTestContext,
   setupCommandTest,
   parseErrorOutput,
   parseCommandWithErrorHandling,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
+  runIsolatedGit,
+} from '../../../../__fixtures__/command-test-fixtures'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
 import {
   parseExtractionOutput,
   parseFullExtractionOutput,
   createValidExtractFixture,
 } from '../../__fixtures__/extraction-test-fixtures'
 
-vi.mock('../../../../platform/infra/external-clients/git/git-repository-info', () => ({
-  getRepositoryInfo: vi.fn(() => ({
-    name: 'test/repo',
-    owner: 'test',
-    url: 'https://github.com/test/repo.git',
-  })),
-}))
-
-vi.mock(
-  '../../../../platform/infra/external-clients/git/git-changed-files',
-  async (importOriginal) => {
-    const original =
-      await importOriginal<
-        typeof import('../../../../platform/infra/external-clients/git/git-changed-files')
-      >()
-    return {
-      ...original,
-      detectChangedTypeScriptFiles: vi.fn(),
-    }
-  },
-)
-
-import {
-  detectChangedTypeScriptFiles,
-  GitError,
-} from '../../../../platform/infra/external-clients/git/git-changed-files'
-
-const mockDetectChanged = vi.mocked(detectChangedTypeScriptFiles)
+async function createFeatureBranchChange(directory: string, sourceFile: string): Promise<void> {
+  runIsolatedGit(directory, ['add', '.'])
+  runIsolatedGit(directory, ['commit', '-m', 'base'])
+  runIsolatedGit(directory, ['checkout', '-b', 'feature'])
+  await appendFile(sourceFile, '\n// feature branch change\n')
+  runIsolatedGit(directory, ['add', sourceFile])
+  runIsolatedGit(directory, ['commit', '-m', 'change source'])
+}
 
 describe('riviere extract PR extraction', () => {
   describe('flag mutual exclusivity', () => {
@@ -67,9 +46,7 @@ describe('riviere extract PR extraction', () => {
         expectedA: '--files',
         expectedB: '--enrich',
       },
-    ])('rejects $expectedA and $expectedB together', async ({
-      flags, expectedA, expectedB 
-    }) => {
+    ])('rejects $expectedA and $expectedB together', async ({ flags, expectedA, expectedB }) => {
       const configPath = await createValidExtractFixture(ctx.testDir)
 
       await expect(
@@ -181,6 +158,7 @@ describe('riviere extract PR extraction', () => {
     it('extracts components from specified files only', async () => {
       const configPath = await createValidExtractFixture(ctx.testDir)
       const sourceFile = join(ctx.testDir, 'src', 'order-service.ts')
+      await createFeatureBranchChange(ctx.testDir, sourceFile)
 
       await parseCommandWithErrorHandling([
         'node',
@@ -204,6 +182,8 @@ describe('riviere extract PR extraction', () => {
 
     it('returns empty when specified file is not in config glob', async () => {
       const configPath = await createValidExtractFixture(ctx.testDir)
+      const sourceFile = join(ctx.testDir, 'src', 'order-service.ts')
+      await createFeatureBranchChange(ctx.testDir, sourceFile)
       const outsideFile = join(ctx.testDir, 'outside.ts')
       await writeFile(outsideFile, 'export const x = 1')
 
@@ -225,6 +205,7 @@ describe('riviere extract PR extraction', () => {
     it('outputs markdown when --format markdown used with --files', async () => {
       const configPath = await createValidExtractFixture(ctx.testDir)
       const sourceFile = join(ctx.testDir, 'src', 'order-service.ts')
+      await createFeatureBranchChange(ctx.testDir, sourceFile)
 
       await parseCommandWithErrorHandling([
         'node',
@@ -251,9 +232,7 @@ describe('riviere extract PR extraction', () => {
 
     it('handles git error when not in a git repo', async () => {
       const configPath = await createValidExtractFixture(ctx.testDir)
-      mockDetectChanged.mockImplementation(() => {
-        throw new GitError('NOT_A_REPOSITORY', 'Run from within a git repository.')
-      })
+      await rm(join(ctx.testDir, '.git'), { recursive: true })
 
       await expect(
         parseCommandWithErrorHandling([
@@ -273,10 +252,7 @@ describe('riviere extract PR extraction', () => {
     it('extracts components from changed files on feature branch', async () => {
       const configPath = await createValidExtractFixture(ctx.testDir)
       const sourceFile = join(ctx.testDir, 'src', 'order-service.ts')
-      mockDetectChanged.mockReturnValue({
-        files: [sourceFile],
-        warnings: [],
-      })
+      await createFeatureBranchChange(ctx.testDir, sourceFile)
 
       await parseCommandWithErrorHandling([
         'node',
@@ -303,10 +279,8 @@ describe('riviere extract PR extraction', () => {
     it('warns about untracked TypeScript files', async () => {
       const configPath = await createValidExtractFixture(ctx.testDir)
       const sourceFile = join(ctx.testDir, 'src', 'order-service.ts')
-      mockDetectChanged.mockReturnValue({
-        files: [sourceFile],
-        warnings: ['1 untracked TypeScript file(s) not included: untracked.ts'],
-      })
+      await createFeatureBranchChange(ctx.testDir, sourceFile)
+      await writeFile(join(ctx.testDir, 'untracked.ts'), 'export {}')
 
       const stderrOutput: string[] = []
       const errorSpy = vi.spyOn(console, 'error').mockImplementation((msg: string) => {
@@ -333,10 +307,7 @@ describe('riviere extract PR extraction', () => {
     it('outputs markdown format for --pr with --format markdown', async () => {
       const configPath = await createValidExtractFixture(ctx.testDir)
       const sourceFile = join(ctx.testDir, 'src', 'order-service.ts')
-      mockDetectChanged.mockReturnValue({
-        files: [sourceFile],
-        warnings: [],
-      })
+      await createFeatureBranchChange(ctx.testDir, sourceFile)
 
       await parseCommandWithErrorHandling([
         'node',
diff --git a/packages/riviere-cli/src/features/extract/entrypoint/extract/extract.spec.ts b/apps/cli/src/features/extract/entrypoint/extract/extract.spec.ts
similarity index 84%
rename from packages/riviere-cli/src/features/extract/entrypoint/extract/extract.spec.ts
rename to apps/cli/src/features/extract/entrypoint/extract/extract.spec.ts
index d3d33aeda..6b00fc375 100644
--- a/packages/riviere-cli/src/features/extract/entrypoint/extract/extract.spec.ts
+++ b/apps/cli/src/features/extract/entrypoint/extract/extract.spec.ts
@@ -1,26 +1,25 @@
-import {
-  readFile, writeFile, mkdir 
-} from 'node:fs/promises'
+import { readFile, writeFile, mkdir } from 'node:fs/promises'
 import { join } from 'node:path'
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { createProgram } from '../../../../shell/cli'
-import type { TestContext } from '../../../../platform/__fixtures__/command-test-fixtures'
+import type { TestContext } from '../../../../__fixtures__/command-test-fixtures'
 import {
   createTestContext,
   setupCommandTest,
   parseErrorOutput,
   parseCommandWithErrorHandling,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
+} from '../../../../__fixtures__/command-test-fixtures'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
 import {
   parseExtractionOutput,
   parseFullExtractionOutput,
   createValidExtractFixture,
 } from '../../__fixtures__/extraction-test-fixtures'
+import type { ExtractDraftComponents } from '@living-architecture/riviere-extract-ts-use-cases/features/extract/commands/extract-draft-components'
+import type { EnrichDraftComponents } from '@living-architecture/riviere-extract-ts-use-cases/features/extract/commands/enrich-draft-components'
+import { createExtractCommand } from './entrypoint'
 
-vi.mock('../../../../platform/infra/external-clients/git/git-repository-info', () => ({
+vi.mock('../../../../infra/external-clients/git/git-repository-info', () => ({
   getRepositoryInfo: vi.fn(() => ({
     name: 'test/repo',
     owner: 'test',
@@ -41,6 +40,40 @@ describe('riviere extract', () => {
     })
   })
 
+  describe('connection detection errors', () => {
+    const ctx: TestContext = createTestContext()
+    setupCommandTest(ctx)
+
+    it('returns the connection failure with the incomplete-link suggestion', async () => {
+      const extractDraftComponents: Pick<ExtractDraftComponents, 'execute'> = {
+        execute: () => ({
+          kind: 'connectionDetectionFailure',
+          message: 'Could not resolve OrderId',
+        }),
+      }
+      const enrichDraftComponents: Pick<EnrichDraftComponents, 'execute'> = {
+        execute: () => ({
+          kind: 'connectionDetectionFailure',
+          message: 'Could not resolve OrderId',
+        }),
+      }
+
+      await expect(
+        createExtractCommand(extractDraftComponents, enrichDraftComponents).parseAsync(
+          ['--config', 'extract.yaml'],
+          { from: 'user' },
+        ),
+      ).rejects.toMatchObject({ exitCode: 1 })
+
+      const output = parseErrorOutput(ctx.consoleOutput)
+      expect(output.error.code).toBe(CliErrorCode.ConnectionDetectionFailure)
+      expect(output.error.message).toBe('Could not resolve OrderId')
+      expect(output.error.suggestions).toStrictEqual([
+        'Use --allow-incomplete to emit uncertain links instead of failing',
+      ])
+    })
+  })
+
   describe('config file errors', () => {
     const ctx: TestContext = createTestContext()
     setupCommandTest(ctx)
diff --git a/packages/riviere-cli/src/features/extract/entrypoint/extract/format-extraction-stats.spec.ts b/apps/cli/src/features/extract/entrypoint/extract/format-extraction-stats.spec.ts
similarity index 98%
rename from packages/riviere-cli/src/features/extract/entrypoint/extract/format-extraction-stats.spec.ts
rename to apps/cli/src/features/extract/entrypoint/extract/format-extraction-stats.spec.ts
index 97c9d97e7..655c8a01f 100644
--- a/packages/riviere-cli/src/features/extract/entrypoint/extract/format-extraction-stats.spec.ts
+++ b/apps/cli/src/features/extract/entrypoint/extract/format-extraction-stats.spec.ts
@@ -1,6 +1,4 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import {
   countLinksByType,
   formatExtractionStats,
diff --git a/packages/riviere-cli/src/features/extract/entrypoint/extract/format-extraction-stats.ts b/apps/cli/src/features/extract/entrypoint/extract/format-extraction-stats.ts
similarity index 80%
rename from packages/riviere-cli/src/features/extract/entrypoint/extract/format-extraction-stats.ts
rename to apps/cli/src/features/extract/entrypoint/extract/format-extraction-stats.ts
index 44e763ca8..7faca1177 100644
--- a/packages/riviere-cli/src/features/extract/entrypoint/extract/format-extraction-stats.ts
+++ b/apps/cli/src/features/extract/entrypoint/extract/format-extraction-stats.ts
@@ -1,6 +1,8 @@
-import type {
-  ConnectionTimings, ExtractedLink 
-} from '@living-architecture/riviere-extract-ts'
+import type { ExtractDraftComponentsResult } from '@living-architecture/riviere-extract-ts-use-cases/features/extract/commands/extract-draft-components-result'
+
+type FullExtractionResult = Extract<ExtractDraftComponentsResult, { kind: 'full' }>
+type ConnectionTimings = FullExtractionResult['timings'][number]
+type ExtractedLink = FullExtractionResult['links'][number]
 
 interface ExtractionStatsInput {
   componentCount: number
diff --git a/apps/cli/src/features/extract/entrypoint/extract/present-extraction-result.spec.ts b/apps/cli/src/features/extract/entrypoint/extract/present-extraction-result.spec.ts
new file mode 100644
index 000000000..292aa0949
--- /dev/null
+++ b/apps/cli/src/features/extract/entrypoint/extract/present-extraction-result.spec.ts
@@ -0,0 +1,73 @@
+import { describe, expect, it, vi } from 'vitest'
+import { dataAccessCliErrorCode, presentExtractionResult } from './present-extraction-result'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+
+describe('dataAccessCliErrorCode', () => {
+  it('maps GIT_NOT_FOUND to the CLI git-not-found code', () => {
+    expect(dataAccessCliErrorCode('GIT_NOT_FOUND')).toBe(CliErrorCode.GitNotFound)
+  })
+
+  it('maps other data-access failures to validation errors', () => {
+    expect(dataAccessCliErrorCode('FILE_READ_ERROR')).toBe(CliErrorCode.ValidationError)
+  })
+})
+
+describe('presentExtractionResult', () => {
+  it('returns early for fieldFailure results', () => {
+    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => undefined)
+    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => undefined)
+
+    presentExtractionResult(
+      {
+        failedFields: ['name'],
+        kind: 'fieldFailure',
+      },
+      {},
+    )
+
+    expect(logSpy).not.toHaveBeenCalled()
+    expect(errorSpy).not.toHaveBeenCalled()
+
+    logSpy.mockRestore()
+    errorSpy.mockRestore()
+  })
+
+  it('returns early for configFailure results', () => {
+    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => undefined)
+    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => undefined)
+
+    presentExtractionResult(
+      {
+        code: 'VALIDATION_ERROR',
+        kind: 'configFailure',
+        message: 'Invalid config',
+      },
+      {},
+    )
+
+    expect(logSpy).not.toHaveBeenCalled()
+    expect(errorSpy).not.toHaveBeenCalled()
+
+    logSpy.mockRestore()
+    errorSpy.mockRestore()
+  })
+
+  it('returns early for connectionDetectionFailure results', () => {
+    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => undefined)
+    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => undefined)
+
+    presentExtractionResult(
+      {
+        kind: 'connectionDetectionFailure',
+        message: 'Could not resolve type',
+      },
+      {},
+    )
+
+    expect(logSpy).not.toHaveBeenCalled()
+    expect(errorSpy).not.toHaveBeenCalled()
+
+    logSpy.mockRestore()
+    errorSpy.mockRestore()
+  })
+})
diff --git a/apps/cli/src/features/extract/entrypoint/extract/present-extraction-result.ts b/apps/cli/src/features/extract/entrypoint/extract/present-extraction-result.ts
new file mode 100644
index 000000000..f73459fef
--- /dev/null
+++ b/apps/cli/src/features/extract/entrypoint/extract/present-extraction-result.ts
@@ -0,0 +1,113 @@
+import { categorizeComponents } from './categorize-components'
+import {
+  countLinksByType,
+  formatExtractionStats,
+  formatTimingLine,
+} from './format-extraction-stats'
+import { formatDryRunOutput } from './extract-output-formatter'
+import { formatPrMarkdown } from '../../../../infra/cli/presentation/format-pr-markdown'
+import { formatSuccess } from '../../../../infra/cli/presentation/output'
+import { outputResult } from '../../../../infra/cli/presentation/output-writer'
+import type { EnrichDraftComponentsResult } from '@living-architecture/riviere-extract-ts-use-cases/features/extract/commands/enrich-draft-components-result'
+import type { ExtractDraftComponentsResult } from '@living-architecture/riviere-extract-ts-use-cases/features/extract/commands/extract-draft-components-result'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+
+type ExtractionResult = ExtractDraftComponentsResult | EnrichDraftComponentsResult
+type ExtractionPresentationOptions = {
+  dryRun?: boolean
+  format?: string
+  output?: string
+  stats?: boolean
+}
+
+/** @riviere-role cli-output-formatter */
+export function dataAccessCliErrorCode(
+  code: Extract<ExtractDraftComponentsResult, { kind: 'dataAccessFailure' }>['code'],
+): CliErrorCode {
+  switch (code) {
+    case 'GIT_NOT_FOUND':
+      return CliErrorCode.GitNotFound
+    case 'NOT_A_REPOSITORY':
+      return CliErrorCode.GitNotARepository
+    default:
+      return CliErrorCode.ValidationError
+  }
+}
+
+/** @riviere-role cli-output-formatter */
+export function presentExtractionResult(
+  result: ExtractionResult,
+  options: ExtractionPresentationOptions,
+): void {
+  if (result.kind === 'draftOnly') {
+    presentDraftResult(result.components, options)
+    return
+  }
+
+  if (
+    result.kind === 'fieldFailure' ||
+    result.kind === 'configFailure' ||
+    result.kind === 'dataAccessFailure' ||
+    result.kind === 'connectionDetectionFailure'
+  ) {
+    return
+  }
+
+  presentFullResult(result, options)
+}
+
+function presentDraftResult(
+  components: Extract<ExtractionResult, { kind: 'draftOnly' }>['components'],
+  options: ExtractionPresentationOptions,
+): void {
+  /* v8 ignore start -- @preserve: dry-run tested via CLI integration */
+  if (options.dryRun) {
+    for (const line of formatDryRunOutput(components)) {
+      console.log(line)
+    }
+    return
+  }
+  /* v8 ignore stop */
+
+  if (options.format === 'markdown') {
+    const markdown = formatPrMarkdown(categorizeComponents(components, undefined))
+    console.log(markdown)
+    return
+  }
+
+  outputResult(formatSuccess(components), createOutputOptions(options.output))
+}
+
+function presentFullResult(
+  result: Extract<ExtractionResult, { kind: 'full' }>,
+  options: ExtractionPresentationOptions,
+): void {
+  if (result.failedFields.length > 0) {
+    console.error(
+      `Warning: Enrichment failed for ${result.failedFields.length} field(s): ${result.failedFields.join(', ')}`,
+    )
+  }
+
+  if (options.stats === true) {
+    for (const timing of result.timings) {
+      console.error(formatTimingLine(timing))
+    }
+    const stats = countLinksByType(result.components.length, result.links)
+    for (const line of formatExtractionStats(stats)) {
+      console.error(line)
+    }
+  }
+
+  outputResult(
+    formatSuccess({
+      components: result.components,
+      links: result.links,
+      externalLinks: result.externalLinks,
+    }),
+    createOutputOptions(options.output),
+  )
+}
+
+function createOutputOptions(outputPath: string | undefined): { output?: string } {
+  return outputPath === undefined ? {} : { output: outputPath }
+}
diff --git a/apps/cli/src/features/query/entrypoint/_platform/cli/component-output.ts b/apps/cli/src/features/query/entrypoint/_platform/cli/component-output.ts
new file mode 100644
index 000000000..0da749334
--- /dev/null
+++ b/apps/cli/src/features/query/entrypoint/_platform/cli/component-output.ts
@@ -0,0 +1,16 @@
+interface ComponentOutput {
+  id: string
+  type: string
+  name: string
+  domain: string
+}
+
+/** @riviere-role cli-output-formatter */
+export function toComponentOutput(component: ComponentOutput): ComponentOutput {
+  return {
+    id: component.id,
+    type: component.type,
+    name: component.name,
+    domain: component.domain,
+  }
+}
diff --git a/packages/riviere-cli/src/features/query/entrypoint/components/components.errors.spec.ts b/apps/cli/src/features/query/entrypoint/components/components.errors.spec.ts
similarity index 87%
rename from packages/riviere-cli/src/features/query/entrypoint/components/components.errors.spec.ts
rename to apps/cli/src/features/query/entrypoint/components/components.errors.spec.ts
index 56c0f047f..b891d632c 100644
--- a/packages/riviere-cli/src/features/query/entrypoint/components/components.errors.spec.ts
+++ b/apps/cli/src/features/query/entrypoint/components/components.errors.spec.ts
@@ -1,14 +1,12 @@
-import {
-  describe, it, expect, vi 
-} from 'vitest'
+import { describe, it, expect, vi } from 'vitest'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import type { TestContext } from '../../../../platform/__fixtures__/command-test-fixtures'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import type { TestContext } from '../../../../__fixtures__/command-test-fixtures'
 import {
   createTestContext,
   setupCommandTest,
   createGraph,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 
 describe('riviere query components - error handling', () => {
   const ctx: TestContext = createTestContext()
diff --git a/packages/riviere-cli/src/features/query/entrypoint/components/components.spec.ts b/apps/cli/src/features/query/entrypoint/components/components.spec.ts
similarity index 97%
rename from packages/riviere-cli/src/features/query/entrypoint/components/components.spec.ts
rename to apps/cli/src/features/query/entrypoint/components/components.spec.ts
index 68fe83064..fc0750ecd 100644
--- a/packages/riviere-cli/src/features/query/entrypoint/components/components.spec.ts
+++ b/apps/cli/src/features/query/entrypoint/components/components.spec.ts
@@ -1,15 +1,13 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { createProgram } from '../../../../shell/cli'
-import type { TestContext } from '../../../../platform/__fixtures__/command-test-fixtures'
+import type { TestContext } from '../../../../__fixtures__/command-test-fixtures'
 import {
   createTestContext,
   setupCommandTest,
   createGraph,
   sourceLocation,
   TestAssertionError,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 
 interface ComponentInfo {
   id: string
diff --git a/apps/cli/src/features/query/entrypoint/components/entrypoint.ts b/apps/cli/src/features/query/entrypoint/components/entrypoint.ts
new file mode 100644
index 000000000..fa832058c
--- /dev/null
+++ b/apps/cli/src/features/query/entrypoint/components/entrypoint.ts
@@ -0,0 +1,62 @@
+import { Command } from 'commander'
+import { formatSuccess, formatError } from '../../../../infra/cli/presentation/output'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import { formatQueryGraphLoadFailure } from '../../../../infra/cli/presentation/query-graph-load-failure-output'
+import { getDefaultGraphPathDescription } from '../../../../infra/cli/presentation/graph-path-option'
+import { toComponentOutput } from '../_platform/cli/component-output'
+import type { ListComponents } from '@living-architecture/riviere-builder-use-cases/features/query/queries/list-components'
+
+interface ComponentsOptions {
+  graph?: string
+  json?: boolean
+  domain?: string
+  type?: string
+}
+
+/** @riviere-role cli-entrypoint */
+export function createComponentsCommand(listComponents: ListComponents): Command {
+  return new Command('components')
+    .description('List components with optional filtering')
+    .addHelpText(
+      'after',
+      `
+Examples:
+  $ riviere query components
+  $ riviere query components --domain orders
+  $ riviere query components --type API --json
+  $ riviere query components --domain orders --type UseCase
+`,
+    )
+    .option('--graph <path>', getDefaultGraphPathDescription())
+    .option('--json', 'Output result as JSON')
+    .option('--domain <name>', 'Filter by domain name')
+    .option('--type <type>', 'Filter by component type')
+    .action(async (options: ComponentsOptions) => {
+      const result = listComponents.execute({
+        domain: options.domain,
+        graphPathOption: options.graph,
+        type: options.type,
+      })
+
+      if ('kind' in result) {
+        if (result.kind === 'invalidComponentType' && options.json !== true) {
+          console.error(`Error: ${result.message}`)
+          return
+        }
+        console.log(
+          JSON.stringify(
+            result.kind === 'invalidComponentType'
+              ? formatError(CliErrorCode.ValidationError, result.message)
+              : formatQueryGraphLoadFailure(result),
+          ),
+        )
+        return
+      }
+
+      const components = result.components.map(toComponentOutput)
+
+      if (options.json) {
+        console.log(JSON.stringify(formatSuccess({ components })))
+      }
+    })
+}
diff --git a/apps/cli/src/features/query/entrypoint/components/query-entrypoint-error-rethrow.spec.ts b/apps/cli/src/features/query/entrypoint/components/query-entrypoint-error-rethrow.spec.ts
new file mode 100644
index 000000000..a2b9c68da
--- /dev/null
+++ b/apps/cli/src/features/query/entrypoint/components/query-entrypoint-error-rethrow.spec.ts
@@ -0,0 +1,142 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+type Loader<T> = () => Promise<T>
+
+class UnexpectedQueryEntrypointError extends Error {
+  constructor(message: string) {
+    super(message)
+    this.name = 'UnexpectedQueryEntrypointError'
+  }
+}
+
+async function expectRethrow<
+  T extends { createProgram: () => { parseAsync: (argv: string[]) => Promise<unknown> } },
+>(loadModule: Loader<T>, argv: string[]): Promise<void> {
+  const module = await loadModule()
+  await expect(module.createProgram().parseAsync(argv)).rejects.toThrow('unexpected failure')
+}
+
+describe('query entrypoints rethrow unknown errors', () => {
+  afterEach(() => {
+    vi.resetModules()
+    vi.restoreAllMocks()
+    vi.doUnmock(
+      '@living-architecture/riviere-builder-use-cases/features/query/queries/list-components',
+    )
+    vi.doUnmock(
+      '@living-architecture/riviere-builder-use-cases/features/query/queries/list-domains',
+    )
+    vi.doUnmock(
+      '@living-architecture/riviere-builder-use-cases/features/query/queries/list-entry-points',
+    )
+    vi.doUnmock(
+      '@living-architecture/riviere-builder-use-cases/features/query/queries/detect-orphans',
+    )
+    vi.doUnmock(
+      '@living-architecture/riviere-builder-use-cases/features/query/queries/search-components',
+    )
+    vi.doUnmock('@living-architecture/riviere-builder-use-cases/features/query/queries/trace-flow')
+  })
+
+  it('rethrows unknown list-components errors', async () => {
+    vi.doMock(
+      '@living-architecture/riviere-builder-use-cases/features/query/queries/list-components',
+      () => ({
+        ListComponents: class {
+          execute() {
+            throw new UnexpectedQueryEntrypointError('unexpected failure')
+          }
+        },
+      }),
+    )
+    await expectRethrow(
+      () => import('../../../../shell/cli'),
+      ['node', 'riviere', 'query', 'components', '--json'],
+    )
+  })
+
+  it('rethrows unknown list-domains errors', async () => {
+    vi.doMock(
+      '@living-architecture/riviere-builder-use-cases/features/query/queries/list-domains',
+      () => ({
+        ListDomains: class {
+          execute() {
+            throw new UnexpectedQueryEntrypointError('unexpected failure')
+          }
+        },
+      }),
+    )
+    await expectRethrow(
+      () => import('../../../../shell/cli'),
+      ['node', 'riviere', 'query', 'domains', '--json'],
+    )
+  })
+
+  it('rethrows unknown list-entry-points errors', async () => {
+    vi.doMock(
+      '@living-architecture/riviere-builder-use-cases/features/query/queries/list-entry-points',
+      () => ({
+        ListEntryPoints: class {
+          execute() {
+            throw new UnexpectedQueryEntrypointError('unexpected failure')
+          }
+        },
+      }),
+    )
+    await expectRethrow(
+      () => import('../../../../shell/cli'),
+      ['node', 'riviere', 'query', 'entry-points', '--json'],
+    )
+  })
+
+  it('rethrows unknown orphan errors', async () => {
+    vi.doMock(
+      '@living-architecture/riviere-builder-use-cases/features/query/queries/detect-orphans',
+      () => ({
+        DetectOrphans: class {
+          execute() {
+            throw new UnexpectedQueryEntrypointError('unexpected failure')
+          }
+        },
+      }),
+    )
+    await expectRethrow(
+      () => import('../../../../shell/cli'),
+      ['node', 'riviere', 'query', 'orphans', '--json'],
+    )
+  })
+
+  it('rethrows unknown search errors', async () => {
+    vi.doMock(
+      '@living-architecture/riviere-builder-use-cases/features/query/queries/search-components',
+      () => ({
+        SearchComponents: class {
+          execute() {
+            throw new UnexpectedQueryEntrypointError('unexpected failure')
+          }
+        },
+      }),
+    )
+    await expectRethrow(
+      () => import('../../../../shell/cli'),
+      ['node', 'riviere', 'query', 'search', 'term', '--json'],
+    )
+  })
+
+  it('rethrows unknown trace errors', async () => {
+    vi.doMock(
+      '@living-architecture/riviere-builder-use-cases/features/query/queries/trace-flow',
+      () => ({
+        TraceFlow: class {
+          execute() {
+            throw new UnexpectedQueryEntrypointError('unexpected failure')
+          }
+        },
+      }),
+    )
+    await expectRethrow(
+      () => import('../../../../shell/cli'),
+      ['node', 'riviere', 'query', 'trace', 'orders:mod:api:test', '--json'],
+    )
+  })
+})
diff --git a/apps/cli/src/features/query/entrypoint/domains/domains.spec.ts b/apps/cli/src/features/query/entrypoint/domains/domains.spec.ts
new file mode 100644
index 000000000..5aa8f03a4
--- /dev/null
+++ b/apps/cli/src/features/query/entrypoint/domains/domains.spec.ts
@@ -0,0 +1,208 @@
+import { describe, it, expect } from 'vitest'
+import { createProgram } from '../../../../shell/cli'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import type { TestContext } from '../../../../__fixtures__/command-test-fixtures'
+import {
+  createTestContext,
+  setupCommandTest,
+  createGraph,
+  sourceLocation,
+  TestAssertionError,
+} from '../../../../__fixtures__/command-test-fixtures'
+
+interface ComponentCounts {
+  UI: number
+  API: number
+  UseCase: number
+  DomainOp: number
+  Event: number
+  EventHandler: number
+  Custom: number
+  total: number
+}
+
+interface DomainInfo {
+  name: string
+  description: string
+  systemType: string
+  componentCounts: ComponentCounts
+}
+
+interface DomainsOutput {
+  success: true
+  data: { domains: DomainInfo[] }
+  warnings: string[]
+}
+
+function isDomainsOutput(value: unknown): value is DomainsOutput {
+  if (typeof value !== 'object' || value === null) return false
+  if (!('success' in value) || value.success !== true) return false
+  if (!('data' in value) || typeof value.data !== 'object' || value.data === null) return false
+  if (!('domains' in value.data) || !Array.isArray(value.data.domains)) return false
+  return true
+}
+
+function parseOutput(consoleOutput: string[]): DomainsOutput {
+  const parsed: unknown = JSON.parse(consoleOutput[0] ?? '{}')
+  if (!isDomainsOutput(parsed)) {
+    throw new TestAssertionError(`Invalid domains output: ${consoleOutput[0]}`)
+  }
+  return parsed
+}
+
+describe('riviere query domains', () => {
+  describe('command registration', () => {
+    it('registers domains command under query', () => {
+      const program = createProgram()
+      const queryCmd = program.commands.find((cmd) => cmd.name() === 'query')
+      const domainsCmd = queryCmd?.commands.find((cmd) => cmd.name() === 'domains')
+      expect(domainsCmd?.name()).toBe('domains')
+    })
+  })
+
+  describe('querying domains', () => {
+    const ctx: TestContext = createTestContext()
+    setupCommandTest(ctx)
+
+    it('returns domain names with component counts', async () => {
+      await createGraph(ctx.testDir, {
+        version: '1.0',
+        metadata: {
+          sources: [{ repository: 'https://github.com/org/repo' }],
+          domains: {
+            orders: {
+              description: 'Order management',
+              systemType: 'domain',
+            },
+          },
+        },
+        components: [
+          {
+            id: 'orders:checkout:api:place-order',
+            type: 'API',
+            name: 'place-order',
+            domain: 'orders',
+            module: 'checkout',
+            sourceLocation,
+            apiType: 'REST',
+            httpMethod: 'POST',
+            path: '/orders',
+          },
+          {
+            id: 'orders:checkout:usecase:place-order',
+            type: 'UseCase',
+            name: 'place-order',
+            domain: 'orders',
+            module: 'checkout',
+            sourceLocation,
+          },
+          {
+            id: 'orders:checkout:usecase:cancel-order',
+            type: 'UseCase',
+            name: 'cancel-order',
+            domain: 'orders',
+            module: 'checkout',
+            sourceLocation,
+          },
+        ],
+        links: [],
+      })
+
+      await createProgram().parseAsync(['node', 'riviere', 'query', 'domains', '--json'])
+      const output = parseOutput(ctx.consoleOutput)
+      expect(output.success).toBe(true)
+      expect(output.data.domains).toHaveLength(1)
+      expect(output.data.domains[0]).toMatchObject({
+        name: 'orders',
+        description: 'Order management',
+        systemType: 'domain',
+        componentCounts: {
+          API: 1,
+          UseCase: 2,
+          total: 3,
+        },
+      })
+    })
+
+    it('returns all domains from graph metadata', async () => {
+      await createGraph(ctx.testDir, {
+        version: '1.0',
+        metadata: {
+          sources: [{ repository: 'https://github.com/org/repo' }],
+          domains: {
+            orders: {
+              description: 'Order management',
+              systemType: 'domain',
+            },
+            payments: {
+              description: 'Payment processing',
+              systemType: 'bff',
+            },
+          },
+        },
+        components: [
+          {
+            id: 'orders:checkout:api:place-order',
+            type: 'API',
+            name: 'place-order',
+            domain: 'orders',
+            module: 'checkout',
+            sourceLocation,
+            apiType: 'REST',
+            httpMethod: 'POST',
+            path: '/orders',
+          },
+          {
+            id: 'payments:billing:api:process-payment',
+            type: 'API',
+            name: 'process-payment',
+            domain: 'payments',
+            module: 'billing',
+            sourceLocation,
+            apiType: 'REST',
+            httpMethod: 'POST',
+            path: '/payments',
+          },
+        ],
+        links: [],
+      })
+
+      await createProgram().parseAsync(['node', 'riviere', 'query', 'domains', '--json'])
+      const output = parseOutput(ctx.consoleOutput)
+      expect(output.data.domains).toHaveLength(2)
+      expect(
+        output.data.domains.map((d) => d.name).sort((a, b) => a.localeCompare(b)),
+      ).toStrictEqual(['orders', 'payments'])
+    })
+
+    it('produces no output when --json flag is not provided', async () => {
+      await createGraph(ctx.testDir, {
+        version: '1.0',
+        metadata: {
+          sources: [{ repository: 'https://github.com/org/repo' }],
+          domains: {
+            orders: {
+              description: 'Order management',
+              systemType: 'domain',
+            },
+          },
+        },
+        components: [],
+        links: [],
+      })
+
+      await createProgram().parseAsync(['node', 'riviere', 'query', 'domains'])
+      expect(ctx.consoleOutput).toHaveLength(0)
+    })
+  })
+
+  describe('error handling', () => {
+    const ctx: TestContext = createTestContext()
+    setupCommandTest(ctx)
+
+    it('returns GRAPH_NOT_FOUND when no graph exists', async () => {
+      await createProgram().parseAsync(['node', 'riviere', 'query', 'domains', '--json'])
+      expect(ctx.consoleOutput.join('\n')).toContain(CliErrorCode.GraphNotFound)
+    })
+  })
+})
diff --git a/apps/cli/src/features/query/entrypoint/domains/entrypoint.ts b/apps/cli/src/features/query/entrypoint/domains/entrypoint.ts
new file mode 100644
index 000000000..3a692e08e
--- /dev/null
+++ b/apps/cli/src/features/query/entrypoint/domains/entrypoint.ts
@@ -0,0 +1,38 @@
+import { Command } from 'commander'
+import { formatSuccess } from '../../../../infra/cli/presentation/output'
+import { formatQueryGraphLoadFailure } from '../../../../infra/cli/presentation/query-graph-load-failure-output'
+import { getDefaultGraphPathDescription } from '../../../../infra/cli/presentation/graph-path-option'
+import type { ListDomains } from '@living-architecture/riviere-builder-use-cases/features/query/queries/list-domains'
+
+interface DomainsOptions {
+  graph?: string
+  json?: boolean
+}
+
+/** @riviere-role cli-entrypoint */
+export function createDomainsCommand(listDomains: ListDomains): Command {
+  return new Command('domains')
+    .description('List domains with component counts')
+    .addHelpText(
+      'after',
+      `
+Examples:
+  $ riviere query domains
+  $ riviere query domains --json
+`,
+    )
+    .option('--graph <path>', getDefaultGraphPathDescription())
+    .option('--json', 'Output result as JSON')
+    .action(async (options: DomainsOptions) => {
+      const result = listDomains.execute({ graphPathOption: options.graph })
+
+      if ('kind' in result) {
+        console.log(JSON.stringify(formatQueryGraphLoadFailure(result)))
+        return
+      }
+
+      if (options.json) {
+        console.log(JSON.stringify(formatSuccess(result)))
+      }
+    })
+}
diff --git a/packages/riviere-cli/src/features/query/entrypoint/entry-points/entry-points.spec.ts b/apps/cli/src/features/query/entrypoint/entry-points/entry-points.spec.ts
similarity index 94%
rename from packages/riviere-cli/src/features/query/entrypoint/entry-points/entry-points.spec.ts
rename to apps/cli/src/features/query/entrypoint/entry-points/entry-points.spec.ts
index 262c2f5ef..0756a07d7 100644
--- a/packages/riviere-cli/src/features/query/entrypoint/entry-points/entry-points.spec.ts
+++ b/apps/cli/src/features/query/entrypoint/entry-points/entry-points.spec.ts
@@ -1,9 +1,7 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import type { TestContext } from '../../../../platform/__fixtures__/command-test-fixtures'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import type { TestContext } from '../../../../__fixtures__/command-test-fixtures'
 import {
   createTestContext,
   setupCommandTest,
@@ -14,7 +12,7 @@ import {
   useCaseComponent,
   eventHandlerComponent,
   TestAssertionError,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 
 interface EntryPointsOutput {
   success: true
diff --git a/apps/cli/src/features/query/entrypoint/entry-points/entrypoint.ts b/apps/cli/src/features/query/entrypoint/entry-points/entrypoint.ts
new file mode 100644
index 000000000..221e80541
--- /dev/null
+++ b/apps/cli/src/features/query/entrypoint/entry-points/entrypoint.ts
@@ -0,0 +1,38 @@
+import { Command } from 'commander'
+import { formatSuccess } from '../../../../infra/cli/presentation/output'
+import { formatQueryGraphLoadFailure } from '../../../../infra/cli/presentation/query-graph-load-failure-output'
+import { getDefaultGraphPathDescription } from '../../../../infra/cli/presentation/graph-path-option'
+import type { ListEntryPoints } from '@living-architecture/riviere-builder-use-cases/features/query/queries/list-entry-points'
+
+interface EntryPointsOptions {
+  graph?: string
+  json?: boolean
+}
+
+/** @riviere-role cli-entrypoint */
+export function createEntryPointsCommand(listEntryPoints: ListEntryPoints): Command {
+  return new Command('entry-points')
+    .description('List entry points (APIs, UIs, EventHandlers with no incoming links)')
+    .addHelpText(
+      'after',
+      `
+Examples:
+  $ riviere query entry-points
+  $ riviere query entry-points --json
+`,
+    )
+    .option('--graph <path>', getDefaultGraphPathDescription())
+    .option('--json', 'Output result as JSON')
+    .action(async (options: EntryPointsOptions) => {
+      const result = listEntryPoints.execute({ graphPathOption: options.graph })
+
+      if ('kind' in result) {
+        console.log(JSON.stringify(formatQueryGraphLoadFailure(result)))
+        return
+      }
+
+      if (options.json) {
+        console.log(JSON.stringify(formatSuccess(result)))
+      }
+    })
+}
diff --git a/apps/cli/src/features/query/entrypoint/orphans/entrypoint.ts b/apps/cli/src/features/query/entrypoint/orphans/entrypoint.ts
new file mode 100644
index 000000000..ea0e1ad17
--- /dev/null
+++ b/apps/cli/src/features/query/entrypoint/orphans/entrypoint.ts
@@ -0,0 +1,38 @@
+import { Command } from 'commander'
+import { formatSuccess } from '../../../../infra/cli/presentation/output'
+import { formatQueryGraphLoadFailure } from '../../../../infra/cli/presentation/query-graph-load-failure-output'
+import { getDefaultGraphPathDescription } from '../../../../infra/cli/presentation/graph-path-option'
+import type { DetectOrphans } from '@living-architecture/riviere-builder-use-cases/features/query/queries/detect-orphans'
+
+interface OrphansOptions {
+  graph?: string
+  json?: boolean
+}
+
+/** @riviere-role cli-entrypoint */
+export function createOrphansCommand(detectOrphans: DetectOrphans): Command {
+  return new Command('orphans')
+    .description('Find orphan components with no links')
+    .addHelpText(
+      'after',
+      `
+Examples:
+  $ riviere query orphans
+  $ riviere query orphans --json
+`,
+    )
+    .option('--graph <path>', getDefaultGraphPathDescription())
+    .option('--json', 'Output result as JSON')
+    .action(async (options: OrphansOptions) => {
+      const result = detectOrphans.execute({ graphPathOption: options.graph })
+
+      if ('kind' in result) {
+        console.log(JSON.stringify(formatQueryGraphLoadFailure(result)))
+        return
+      }
+
+      if (options.json) {
+        console.log(JSON.stringify(formatSuccess(result)))
+      }
+    })
+}
diff --git a/packages/riviere-cli/src/features/query/entrypoint/orphans/orphans.spec.ts b/apps/cli/src/features/query/entrypoint/orphans/orphans.spec.ts
similarity index 94%
rename from packages/riviere-cli/src/features/query/entrypoint/orphans/orphans.spec.ts
rename to apps/cli/src/features/query/entrypoint/orphans/orphans.spec.ts
index 3cba39957..696163e70 100644
--- a/packages/riviere-cli/src/features/query/entrypoint/orphans/orphans.spec.ts
+++ b/apps/cli/src/features/query/entrypoint/orphans/orphans.spec.ts
@@ -1,9 +1,7 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import type { TestContext } from '../../../../platform/__fixtures__/command-test-fixtures'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import type { TestContext } from '../../../../__fixtures__/command-test-fixtures'
 import {
   createTestContext,
   setupCommandTest,
@@ -12,7 +10,7 @@ import {
   apiComponent,
   useCaseComponent,
   TestAssertionError,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 
 interface OrphansSuccessOutput {
   success: true
diff --git a/apps/cli/src/features/query/entrypoint/search/entrypoint.ts b/apps/cli/src/features/query/entrypoint/search/entrypoint.ts
new file mode 100644
index 000000000..351ca9bdf
--- /dev/null
+++ b/apps/cli/src/features/query/entrypoint/search/entrypoint.ts
@@ -0,0 +1,45 @@
+import { Command } from 'commander'
+import { formatSuccess } from '../../../../infra/cli/presentation/output'
+import { formatQueryGraphLoadFailure } from '../../../../infra/cli/presentation/query-graph-load-failure-output'
+import { getDefaultGraphPathDescription } from '../../../../infra/cli/presentation/graph-path-option'
+import { toComponentOutput } from '../_platform/cli/component-output'
+import type { SearchComponents } from '@living-architecture/riviere-builder-use-cases/features/query/queries/search-components'
+
+interface SearchOptions {
+  graph?: string
+  json?: boolean
+}
+
+/** @riviere-role cli-entrypoint */
+export function createSearchCommand(searchComponents: SearchComponents): Command {
+  return new Command('search')
+    .description('Search components by name')
+    .addHelpText(
+      'after',
+      `
+Examples:
+  $ riviere query search order
+  $ riviere query search "place-order" --json
+`,
+    )
+    .argument('<term>', 'Search term')
+    .option('--graph <path>', getDefaultGraphPathDescription())
+    .option('--json', 'Output result as JSON')
+    .action(async (term: string, options: SearchOptions) => {
+      const result = searchComponents.execute({
+        graphPathOption: options.graph,
+        term,
+      })
+
+      if ('kind' in result) {
+        console.log(JSON.stringify(formatQueryGraphLoadFailure(result)))
+        return
+      }
+
+      const components = result.components.map(toComponentOutput)
+
+      if (options.json) {
+        console.log(JSON.stringify(formatSuccess({ components })))
+      }
+    })
+}
diff --git a/packages/riviere-cli/src/features/query/entrypoint/search/search.spec.ts b/apps/cli/src/features/query/entrypoint/search/search.spec.ts
similarity index 95%
rename from packages/riviere-cli/src/features/query/entrypoint/search/search.spec.ts
rename to apps/cli/src/features/query/entrypoint/search/search.spec.ts
index 2c92275ce..bbd2befc5 100644
--- a/packages/riviere-cli/src/features/query/entrypoint/search/search.spec.ts
+++ b/apps/cli/src/features/query/entrypoint/search/search.spec.ts
@@ -1,16 +1,14 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import type { TestContext } from '../../../../platform/__fixtures__/command-test-fixtures'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import type { TestContext } from '../../../../__fixtures__/command-test-fixtures'
 import {
   createTestContext,
   setupCommandTest,
   createGraph,
   sourceLocation,
   TestAssertionError,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 
 interface ComponentInfo {
   id: string
diff --git a/apps/cli/src/features/query/entrypoint/trace/entrypoint.ts b/apps/cli/src/features/query/entrypoint/trace/entrypoint.ts
new file mode 100644
index 000000000..012fdec67
--- /dev/null
+++ b/apps/cli/src/features/query/entrypoint/trace/entrypoint.ts
@@ -0,0 +1,52 @@
+import { Command } from 'commander'
+import { formatError, formatSuccess } from '../../../../infra/cli/presentation/output'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import { formatQueryGraphLoadFailure } from '../../../../infra/cli/presentation/query-graph-load-failure-output'
+import { getDefaultGraphPathDescription } from '../../../../infra/cli/presentation/graph-path-option'
+import type { TraceFlow } from '@living-architecture/riviere-builder-use-cases/features/query/queries/trace-flow'
+
+interface TraceOptions {
+  graph?: string
+  json?: boolean
+}
+
+/** @riviere-role cli-entrypoint */
+export function createTraceCommand(traceFlow: TraceFlow): Command {
+  return new Command('trace')
+    .description('Trace flow from a component (bidirectional)')
+    .addHelpText(
+      'after',
+      `
+Examples:
+  $ riviere query trace "orders:api:api:postorders"
+  $ riviere query trace "orders:checkout:usecase:placeorder" --json
+`,
+    )
+    .argument('<componentId>', 'Component ID to trace from')
+    .option('--graph <path>', getDefaultGraphPathDescription())
+    .option('--json', 'Output result as JSON')
+    .action(async (componentIdArg: string, options: TraceOptions) => {
+      const result = traceFlow.execute({
+        componentId: componentIdArg,
+        graphPathOption: options.graph,
+      })
+
+      if ('kind' in result) {
+        console.log(JSON.stringify(formatQueryGraphLoadFailure(result)))
+        return
+      }
+
+      if (!result.success) {
+        console.log(
+          JSON.stringify(
+            formatError(CliErrorCode.ComponentNotFound, result.message, result.suggestions),
+          ),
+        )
+        return
+      }
+
+      if (options.json) {
+        console.log(JSON.stringify(formatSuccess(result.flow)))
+      }
+    })
+}
diff --git a/packages/riviere-cli/src/features/query/entrypoint/trace/trace.spec.ts b/apps/cli/src/features/query/entrypoint/trace/trace.spec.ts
similarity index 83%
rename from packages/riviere-cli/src/features/query/entrypoint/trace/trace.spec.ts
rename to apps/cli/src/features/query/entrypoint/trace/trace.spec.ts
index 8fd3d528e..2a2084c91 100644
--- a/packages/riviere-cli/src/features/query/entrypoint/trace/trace.spec.ts
+++ b/apps/cli/src/features/query/entrypoint/trace/trace.spec.ts
@@ -1,9 +1,7 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import type { TestContext } from '../../../../platform/__fixtures__/command-test-fixtures'
+import { CliErrorCode } from '../../../../infra/cli/presentation/error-codes'
+import type { TestContext } from '../../../../__fixtures__/command-test-fixtures'
 import {
   createTestContext,
   setupCommandTest,
@@ -12,7 +10,7 @@ import {
   apiComponent,
   useCaseComponent,
   TestAssertionError,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../../__fixtures__/command-test-fixtures'
 
 interface TraceSuccessOutput {
   success: true
@@ -205,37 +203,5 @@ describe('riviere query trace', () => {
       expect(output.error.code).toBe(CliErrorCode.ComponentNotFound)
       expect(output.error.message).toContain('orders:checkout:api:nonexistent')
     })
-
-    it('propagates unexpected errors thrown by traceFlow', async () => {
-      await createGraph(ctx.testDir, {
-        version: '1.0',
-        metadata: baseMetadata,
-        components: [apiComponent],
-        links: [],
-      })
-
-      const queryModule = await import('@living-architecture/riviere-query')
-      const queryClass = queryModule.RiviereQuery
-      const originalTraceFlow = queryClass.prototype.traceFlow
-
-      queryClass.prototype.traceFlow = () => {
-        throw new TestAssertionError('Unexpected internal error')
-      }
-
-      try {
-        await expect(
-          createProgram().parseAsync([
-            'node',
-            'riviere',
-            'query',
-            'trace',
-            'orders:checkout:api:place-order',
-            '--json',
-          ]),
-        ).rejects.toThrow('Unexpected internal error')
-      } finally {
-        queryClass.prototype.traceFlow = originalTraceFlow
-      }
-    })
   })
 })
diff --git a/apps/cli/src/features/role-enforcement/entrypoint/role-enforcement/entrypoint.ts b/apps/cli/src/features/role-enforcement/entrypoint/role-enforcement/entrypoint.ts
new file mode 100644
index 000000000..2596a3ba9
--- /dev/null
+++ b/apps/cli/src/features/role-enforcement/entrypoint/role-enforcement/entrypoint.ts
@@ -0,0 +1,23 @@
+import { RunRoleEnforcement } from '@living-architecture/riviere-role-enforcement-use-cases'
+
+/** @riviere-role cli-entrypoint */
+export function main(
+  application: RunRoleEnforcement,
+  configModulePath: string,
+  configDir: string,
+  packageFilter?: string,
+): number {
+  const result = application.execute({
+    configDir,
+    configModulePath,
+    ...(packageFilter === undefined ? {} : { packageFilter }),
+  })
+  if (result.stdout !== '') {
+    process.stdout.write(result.stdout)
+  }
+  if (result.stderr !== '') {
+    process.stderr.write(result.stderr)
+  }
+  process.stderr.write(`Role enforcement completed in ${Math.round(result.durationMs)}ms\n`)
+  return result.exitCode
+}
diff --git a/apps/cli/src/index.ts b/apps/cli/src/index.ts
new file mode 100644
index 000000000..dd303c160
--- /dev/null
+++ b/apps/cli/src/index.ts
@@ -0,0 +1,3 @@
+export { createProgram } from './shell/cli'
+export { CliErrorCode, ConfigValidationError, ExitCode } from './infra/cli/presentation/error-codes'
+export { formatError, formatSuccess } from './infra/cli/presentation/output'
diff --git a/packages/riviere-cli/src/platform/infra/cli/presentation/add-component-hints.ts b/apps/cli/src/infra/cli/presentation/add-component-hints.ts
similarity index 100%
rename from packages/riviere-cli/src/platform/infra/cli/presentation/add-component-hints.ts
rename to apps/cli/src/infra/cli/presentation/add-component-hints.ts
diff --git a/packages/riviere-cli/src/platform/infra/cli/presentation/error-codes.spec.ts b/apps/cli/src/infra/cli/presentation/error-codes.spec.ts
similarity index 93%
rename from packages/riviere-cli/src/platform/infra/cli/presentation/error-codes.spec.ts
rename to apps/cli/src/infra/cli/presentation/error-codes.spec.ts
index 24e91e532..bd61ccd6c 100644
--- a/packages/riviere-cli/src/platform/infra/cli/presentation/error-codes.spec.ts
+++ b/apps/cli/src/infra/cli/presentation/error-codes.spec.ts
@@ -1,6 +1,4 @@
-import {
-  CliErrorCode, ExitCode 
-} from './error-codes'
+import { CliErrorCode, ExitCode } from './error-codes'
 
 describe('CliErrorCode', () => {
   it.each([
diff --git a/packages/riviere-cli/src/platform/infra/cli/presentation/error-codes.ts b/apps/cli/src/infra/cli/presentation/error-codes.ts
similarity index 83%
rename from packages/riviere-cli/src/platform/infra/cli/presentation/error-codes.ts
rename to apps/cli/src/infra/cli/presentation/error-codes.ts
index 4d3cc9271..ee73c98d6 100644
--- a/packages/riviere-cli/src/platform/infra/cli/presentation/error-codes.ts
+++ b/apps/cli/src/infra/cli/presentation/error-codes.ts
@@ -7,8 +7,15 @@ export enum ExitCode {
 
 /** @riviere-role cli-error */
 export class ConfigValidationError extends Error {
+  /** Stable CLI error code for presentation and exit handling. */
   readonly errorCode: CliErrorCode
 
+  /**
+   * Creates a configuration validation error.
+   *
+   * @param code - Stable CLI error code
+   * @param message - Human-readable validation failure
+   */
   constructor(code: CliErrorCode, message: string) {
     super(message)
     this.name = 'ConfigValidationError'
diff --git a/apps/cli/src/infra/cli/presentation/exit-with-cli-error.ts b/apps/cli/src/infra/cli/presentation/exit-with-cli-error.ts
new file mode 100644
index 000000000..d0ebae330
--- /dev/null
+++ b/apps/cli/src/infra/cli/presentation/exit-with-cli-error.ts
@@ -0,0 +1,13 @@
+import { type CliErrorCode, ExitCode } from './error-codes'
+import { formatError } from './output'
+
+/** @riviere-role cli-response-writer */
+export function exitWithCliError(
+  code: CliErrorCode,
+  message: string,
+  exitCode: ExitCode,
+  suggestions: string[],
+): never {
+  console.log(JSON.stringify(formatError(code, message, suggestions)))
+  process.exit(exitCode)
+}
diff --git a/packages/riviere-cli/src/platform/infra/cli/presentation/format-pr-markdown.spec.ts b/apps/cli/src/infra/cli/presentation/format-pr-markdown.spec.ts
similarity index 98%
rename from packages/riviere-cli/src/platform/infra/cli/presentation/format-pr-markdown.spec.ts
rename to apps/cli/src/infra/cli/presentation/format-pr-markdown.spec.ts
index 632051b2b..1afdac79a 100644
--- a/packages/riviere-cli/src/platform/infra/cli/presentation/format-pr-markdown.spec.ts
+++ b/apps/cli/src/infra/cli/presentation/format-pr-markdown.spec.ts
@@ -1,6 +1,4 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { formatPrMarkdown } from './format-pr-markdown'
 import type { CategorizedComponents } from './format-pr-markdown'
 
diff --git a/packages/riviere-cli/src/platform/infra/cli/presentation/format-pr-markdown.ts b/apps/cli/src/infra/cli/presentation/format-pr-markdown.ts
similarity index 100%
rename from packages/riviere-cli/src/platform/infra/cli/presentation/format-pr-markdown.ts
rename to apps/cli/src/infra/cli/presentation/format-pr-markdown.ts
diff --git a/packages/riviere-cli/src/platform/infra/cli/presentation/graph-path-option.ts b/apps/cli/src/infra/cli/presentation/graph-path-option.ts
similarity index 100%
rename from packages/riviere-cli/src/platform/infra/cli/presentation/graph-path-option.ts
rename to apps/cli/src/infra/cli/presentation/graph-path-option.ts
diff --git a/apps/cli/src/infra/cli/presentation/output-writer.ts b/apps/cli/src/infra/cli/presentation/output-writer.ts
new file mode 100644
index 000000000..6c9df098a
--- /dev/null
+++ b/apps/cli/src/infra/cli/presentation/output-writer.ts
@@ -0,0 +1,32 @@
+import { writeFileSync } from 'node:fs'
+import { formatError, formatSuccess } from './output'
+import { CliErrorCode, ExitCode } from './error-codes'
+
+interface OutputOptions {
+  output?: string
+}
+
+/** @riviere-role cli-response-writer */
+export function outputResult<T>(
+  data: ReturnType<typeof formatSuccess<T>>,
+  options: OutputOptions,
+): void {
+  if (options.output !== undefined) {
+    try {
+      writeFileSync(options.output, JSON.stringify(data))
+    } catch {
+      console.log(
+        JSON.stringify(
+          formatError(
+            CliErrorCode.ValidationError,
+            'Failed to write output file: ' + options.output,
+          ),
+        ),
+      )
+      process.exit(ExitCode.RuntimeError)
+    }
+    return
+  }
+
+  console.log(JSON.stringify(data))
+}
diff --git a/packages/riviere-cli/src/platform/infra/cli/presentation/output.spec.ts b/apps/cli/src/infra/cli/presentation/output.spec.ts
similarity index 94%
rename from packages/riviere-cli/src/platform/infra/cli/presentation/output.spec.ts
rename to apps/cli/src/infra/cli/presentation/output.spec.ts
index 9d526eb3a..4d3183434 100644
--- a/packages/riviere-cli/src/platform/infra/cli/presentation/output.spec.ts
+++ b/apps/cli/src/infra/cli/presentation/output.spec.ts
@@ -1,6 +1,4 @@
-import {
-  formatSuccess, formatError, type SuccessOutput, type ErrorOutput 
-} from './output'
+import { formatSuccess, formatError, type SuccessOutput, type ErrorOutput } from './output'
 import { CliErrorCode } from './error-codes'
 
 describe('formatSuccess', () => {
diff --git a/packages/riviere-cli/src/platform/infra/cli/presentation/output.ts b/apps/cli/src/infra/cli/presentation/output.ts
similarity index 100%
rename from packages/riviere-cli/src/platform/infra/cli/presentation/output.ts
rename to apps/cli/src/infra/cli/presentation/output.ts
diff --git a/packages/riviere-cli/src/platform/infra/cli/presentation/query-graph-load-failure-output.spec.ts b/apps/cli/src/infra/cli/presentation/query-graph-load-failure-output.spec.ts
similarity index 95%
rename from packages/riviere-cli/src/platform/infra/cli/presentation/query-graph-load-failure-output.spec.ts
rename to apps/cli/src/infra/cli/presentation/query-graph-load-failure-output.spec.ts
index c4a41ef2a..cd7bd17dc 100644
--- a/packages/riviere-cli/src/platform/infra/cli/presentation/query-graph-load-failure-output.spec.ts
+++ b/apps/cli/src/infra/cli/presentation/query-graph-load-failure-output.spec.ts
@@ -1,6 +1,4 @@
-import {
-  describe, expect, it 
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 import { CliErrorCode } from './error-codes'
 import { formatQueryGraphLoadFailure } from './query-graph-load-failure-output'
 
diff --git a/packages/riviere-cli/src/platform/infra/cli/presentation/query-graph-load-failure-output.ts b/apps/cli/src/infra/cli/presentation/query-graph-load-failure-output.ts
similarity index 100%
rename from packages/riviere-cli/src/platform/infra/cli/presentation/query-graph-load-failure-output.ts
rename to apps/cli/src/infra/cli/presentation/query-graph-load-failure-output.ts
diff --git a/packages/riviere-cli/src/shell/bin.ts b/apps/cli/src/shell/bin.ts
similarity index 100%
rename from packages/riviere-cli/src/shell/bin.ts
rename to apps/cli/src/shell/bin.ts
diff --git a/packages/riviere-cli/src/shell/cli.package-json.spec.ts b/apps/cli/src/shell/cli.package-json.spec.ts
similarity index 93%
rename from packages/riviere-cli/src/shell/cli.package-json.spec.ts
rename to apps/cli/src/shell/cli.package-json.spec.ts
index 17d0a2818..fa8d428a3 100644
--- a/packages/riviere-cli/src/shell/cli.package-json.spec.ts
+++ b/apps/cli/src/shell/cli.package-json.spec.ts
@@ -1,6 +1,4 @@
-import {
-  afterEach, describe, expect, it, vi 
-} from 'vitest'
+import { afterEach, describe, expect, it, vi } from 'vitest'
 
 async function importCliWithPackageJson(packageJson: unknown): Promise<typeof import('./cli')> {
   vi.resetModules()
diff --git a/packages/riviere-cli/src/shell/cli.spec.ts b/apps/cli/src/shell/cli.spec.ts
similarity index 97%
rename from packages/riviere-cli/src/shell/cli.spec.ts
rename to apps/cli/src/shell/cli.spec.ts
index 0aabd40b8..e2b1bf91f 100644
--- a/packages/riviere-cli/src/shell/cli.spec.ts
+++ b/apps/cli/src/shell/cli.spec.ts
@@ -1,7 +1,5 @@
 import { Command } from 'commander'
-import {
-  describe, expect, it, vi 
-} from 'vitest'
+import { describe, expect, it, vi } from 'vitest'
 import { createProgram } from './cli'
 
 describe('createProgram', () => {
diff --git a/apps/cli/src/shell/cli.ts b/apps/cli/src/shell/cli.ts
new file mode 100644
index 000000000..27c1d8282
--- /dev/null
+++ b/apps/cli/src/shell/cli.ts
@@ -0,0 +1,143 @@
+import { Command } from 'commander'
+import { createRequire } from 'module'
+import { AddComponent } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/add-component'
+import { AddDomain } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/add-domain'
+import { AddSource } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/add-source'
+import { CheckConsistency } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/check-consistency'
+import { ComponentChecklist } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/component-checklist'
+import { ComponentSummary } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/component-summary'
+import { DefineCustomType } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/define-custom-type'
+import { DefineRelationshipType } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/define-relationship-type'
+import { EnrichComponent } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/enrich-component'
+import { FinalizeGraph } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/finalize-graph'
+import { InitGraph } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/init-graph'
+import { LinkComponents } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/link-components'
+import { LinkExternal } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/link-external'
+import { LinkHttp } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/link-http'
+import { ValidateGraph } from '@living-architecture/riviere-builder-use-cases/features/builder/commands/validate-graph'
+import { RiviereBuilderRepository } from '@living-architecture/riviere-builder-use-cases/features/builder/data-access/riviere-builder/riviere-builder-repository'
+import { createAddComponentCommand } from '../features/builder/entrypoint/add-component/entrypoint'
+import { createAddDomainCommand } from '../features/builder/entrypoint/add-domain/entrypoint'
+import { createAddSourceCommand } from '../features/builder/entrypoint/add-source/entrypoint'
+import { createCheckConsistencyCommand } from '../features/builder/entrypoint/check-consistency/entrypoint'
+import { createComponentChecklistCommand } from '../features/builder/entrypoint/component-checklist/entrypoint'
+import { createComponentSummaryCommand } from '../features/builder/entrypoint/component-summary/entrypoint'
+import { createDefineCustomTypeCommand } from '../features/builder/entrypoint/define-custom-type/entrypoint'
+import { createDefineRelationshipTypeCommand } from '../features/builder/entrypoint/define-relationship-type/entrypoint'
+import { createEnrichCommand } from '../features/builder/entrypoint/enrich/entrypoint'
+import { createFinalizeCommand } from '../features/builder/entrypoint/finalize/entrypoint'
+import { createInitCommand } from '../features/builder/entrypoint/init/entrypoint'
+import { createLinkCommand } from '../features/builder/entrypoint/link/entrypoint'
+import { createLinkExternalCommand } from '../features/builder/entrypoint/link-external/entrypoint'
+import { createLinkHttpCommand } from '../features/builder/entrypoint/link-http/entrypoint'
+import { createValidateCommand } from '../features/builder/entrypoint/validate/entrypoint'
+import { EnrichDraftComponents } from '@living-architecture/riviere-extract-ts-use-cases/features/extract/commands/enrich-draft-components'
+import { ExtractDraftComponents } from '@living-architecture/riviere-extract-ts-use-cases/features/extract/commands/extract-draft-components'
+import { ExtractionProjectRepository } from '@living-architecture/riviere-extract-ts-use-cases/features/extract/data-access/extraction-project/extraction-project-repository'
+import { createExtractCommand } from '../features/extract/entrypoint/extract/entrypoint'
+import { DetectOrphans } from '@living-architecture/riviere-builder-use-cases/features/query/queries/detect-orphans'
+import { ListComponents } from '@living-architecture/riviere-builder-use-cases/features/query/queries/list-components'
+import { ListDomains } from '@living-architecture/riviere-builder-use-cases/features/query/queries/list-domains'
+import { ListEntryPoints } from '@living-architecture/riviere-builder-use-cases/features/query/queries/list-entry-points'
+import { SearchComponents } from '@living-architecture/riviere-builder-use-cases/features/query/queries/search-components'
+import { TraceFlow } from '@living-architecture/riviere-builder-use-cases/features/query/queries/trace-flow'
+import {
+  ComponentListLoader,
+  ComponentSearchLoader,
+  DomainListLoader,
+  EntryPointListLoader,
+  FlowTraceLoader,
+  OrphanListLoader,
+} from '@living-architecture/riviere-builder-use-cases/features/query/data-access/graph/query-loaders'
+import { createComponentsCommand } from '../features/query/entrypoint/components/entrypoint'
+import { createDomainsCommand } from '../features/query/entrypoint/domains/entrypoint'
+import { createEntryPointsCommand } from '../features/query/entrypoint/entry-points/entrypoint'
+import { createOrphansCommand } from '../features/query/entrypoint/orphans/entrypoint'
+import { createSearchCommand } from '../features/query/entrypoint/search/entrypoint'
+import { createTraceCommand } from '../features/query/entrypoint/trace/entrypoint'
+
+interface PackageJson {
+  version: string
+}
+
+class InvalidPackageJsonError extends Error {
+  constructor(reason: string) {
+    super(`Invalid package.json: ${reason}`)
+    this.name = 'InvalidPackageJsonError'
+  }
+}
+
+function parsePackageJson(pkg: unknown): PackageJson {
+  if (typeof pkg !== 'object' || pkg === null || !('version' in pkg)) {
+    throw new InvalidPackageJsonError('missing version field')
+  }
+  if (typeof pkg.version !== 'string') {
+    throw new InvalidPackageJsonError('version must be a string')
+  }
+  return { version: pkg.version }
+}
+
+declare const INJECTED_VERSION: string | undefined
+
+function loadPackageJson(): PackageJson {
+  if (typeof INJECTED_VERSION === 'string') {
+    return { version: INJECTED_VERSION }
+  }
+  const require = createRequire(import.meta.url)
+  return parsePackageJson(require('../../package.json'))
+}
+
+const packageJson = loadPackageJson()
+
+/**
+ * Wires the CLI entrypoints to their use cases and adapters.
+ *
+ * @riviere-role main
+ * @returns Configured Rivière CLI program
+ */
+export function createProgram(): Command {
+  const builderRepository = new RiviereBuilderRepository()
+  const extractionProjectRepository = new ExtractionProjectRepository()
+
+  const program = new Command()
+
+  program.name('riviere').version(packageJson.version)
+
+  const builderCmd = program.command('builder').description('Commands for building a graph')
+
+  builderCmd.addCommand(createAddComponentCommand(new AddComponent(builderRepository)))
+  builderCmd.addCommand(createAddDomainCommand(new AddDomain(builderRepository)))
+  builderCmd.addCommand(createAddSourceCommand(new AddSource(builderRepository)))
+  builderCmd.addCommand(createInitCommand(new InitGraph(builderRepository)))
+  builderCmd.addCommand(createLinkCommand(new LinkComponents(builderRepository)))
+  builderCmd.addCommand(createLinkExternalCommand(new LinkExternal(builderRepository)))
+  builderCmd.addCommand(createLinkHttpCommand(new LinkHttp(builderRepository)))
+  builderCmd.addCommand(createValidateCommand(new ValidateGraph(builderRepository)))
+  builderCmd.addCommand(createFinalizeCommand(new FinalizeGraph(builderRepository)))
+  builderCmd.addCommand(createEnrichCommand(new EnrichComponent(builderRepository)))
+  builderCmd.addCommand(createComponentSummaryCommand(new ComponentSummary(builderRepository)))
+  builderCmd.addCommand(createComponentChecklistCommand(new ComponentChecklist(builderRepository)))
+  builderCmd.addCommand(createCheckConsistencyCommand(new CheckConsistency(builderRepository)))
+  builderCmd.addCommand(createDefineCustomTypeCommand(new DefineCustomType(builderRepository)))
+  builderCmd.addCommand(
+    createDefineRelationshipTypeCommand(new DefineRelationshipType(builderRepository)),
+  )
+
+  const queryCmd = program.command('query').description('Commands for querying a graph')
+
+  queryCmd.addCommand(createEntryPointsCommand(new ListEntryPoints(new EntryPointListLoader())))
+  queryCmd.addCommand(createDomainsCommand(new ListDomains(new DomainListLoader())))
+  queryCmd.addCommand(createTraceCommand(new TraceFlow(new FlowTraceLoader())))
+  queryCmd.addCommand(createOrphansCommand(new DetectOrphans(new OrphanListLoader())))
+  queryCmd.addCommand(createComponentsCommand(new ListComponents(new ComponentListLoader())))
+  queryCmd.addCommand(createSearchCommand(new SearchComponents(new ComponentSearchLoader())))
+
+  program.addCommand(
+    createExtractCommand(
+      new ExtractDraftComponents(extractionProjectRepository),
+      new EnrichDraftComponents(extractionProjectRepository),
+    ),
+  )
+
+  return program
+}
diff --git a/apps/cli/src/shell/global-error-handler.spec.ts b/apps/cli/src/shell/global-error-handler.spec.ts
new file mode 100644
index 000000000..e3679bd1b
--- /dev/null
+++ b/apps/cli/src/shell/global-error-handler.spec.ts
@@ -0,0 +1,55 @@
+import { describe, it, expect } from 'vitest'
+import { handleGlobalError } from './global-error-handler'
+import {
+  CliErrorCode,
+  ConfigValidationError,
+  ExitCode,
+} from '../infra/cli/presentation/error-codes'
+import {
+  TestAssertionError,
+  createTestContext,
+  setupCommandTest,
+} from '../__fixtures__/command-test-fixtures'
+import type { TestContext } from '../__fixtures__/command-test-fixtures'
+
+function firstConsoleOutput(consoleOutput: string[]): unknown {
+  const first = consoleOutput[0]
+  if (first === undefined) {
+    throw new TestAssertionError('Expected console output but got empty array')
+  }
+  return JSON.parse(first)
+}
+
+describe('handleGlobalError', () => {
+  const ctx: TestContext = createTestContext()
+  setupCommandTest(ctx)
+
+  it('formats ConfigValidationError with config validation exit code', () => {
+    const error = new ConfigValidationError(CliErrorCode.ConfigNotFound, 'Config file not found')
+
+    expect(() => handleGlobalError(error)).toThrow('process.exit')
+
+    const output = firstConsoleOutput(ctx.consoleOutput)
+    expect(output).toMatchObject({ error: { code: CliErrorCode.ConfigNotFound } })
+    expect(process.exit).toHaveBeenCalledWith(ExitCode.ConfigValidation)
+  })
+
+  it('formats ConfigValidationError for missing files as validation error', () => {
+    const error = new ConfigValidationError(
+      CliErrorCode.ValidationError,
+      'Files not found: missing.ts',
+    )
+
+    expect(() => handleGlobalError(error)).toThrow('process.exit')
+
+    const output = firstConsoleOutput(ctx.consoleOutput)
+    expect(output).toMatchObject({ error: { code: CliErrorCode.ValidationError } })
+    expect(process.exit).toHaveBeenCalledWith(ExitCode.ConfigValidation)
+  })
+
+  it('re-throws unknown errors', () => {
+    const error = new TestAssertionError('unexpected')
+
+    expect(() => handleGlobalError(error)).toThrow('unexpected')
+  })
+})
diff --git a/apps/cli/src/shell/global-error-handler.ts b/apps/cli/src/shell/global-error-handler.ts
new file mode 100644
index 000000000..1148f4d3a
--- /dev/null
+++ b/apps/cli/src/shell/global-error-handler.ts
@@ -0,0 +1,12 @@
+import { formatError } from '../infra/cli/presentation/output'
+import { ExitCode, ConfigValidationError } from '../infra/cli/presentation/error-codes'
+
+/** @riviere-role cli-error-handler */
+export function handleGlobalError(error: unknown): never {
+  if (error instanceof ConfigValidationError) {
+    console.log(JSON.stringify(formatError(error.errorCode, error.message)))
+    process.exit(ExitCode.ConfigValidation)
+  }
+
+  throw error
+}
diff --git a/apps/cli/src/shell/release-configuration.spec.ts b/apps/cli/src/shell/release-configuration.spec.ts
new file mode 100644
index 000000000..d67d0a381
--- /dev/null
+++ b/apps/cli/src/shell/release-configuration.spec.ts
@@ -0,0 +1,97 @@
+import { existsSync, readdirSync, readFileSync } from 'node:fs'
+import path, { dirname } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { describe, expect, it } from 'vitest'
+import { z } from 'zod'
+
+const repoRoot = path.resolve(dirname(fileURLToPath(import.meta.url)), '../../../..')
+const riviereProjectSelectors = ['riviere-*', '@living-architecture/riviere-*']
+
+const packageManifestSchema = z.object({
+  name: z.string(),
+  private: z.boolean().optional(),
+  publishConfig: z.object({ access: z.literal('public') }).optional(),
+})
+const nxConfigurationSchema = z.object({
+  release: z.object({
+    projects: z.array(z.string()),
+    version: z.object({ preVersionCommand: z.string() }),
+  }),
+})
+
+describe('release configuration', () => {
+  it('builds every public Rivière package before Nx versions and releases it', () => {
+    const nxConfiguration = readJson('nx.json', nxConfigurationSchema)
+    const publicRivierePackages = readWorkspacePackageManifests().filter(
+      (manifest) => manifest.private !== true && manifest.name.includes('riviere'),
+    )
+
+    expect(nxConfiguration.release.projects).toStrictEqual(riviereProjectSelectors)
+    expect(nxConfiguration.release.version.preVersionCommand).toContain(
+      `--projects=${riviereProjectSelectors.join(',')}`,
+    )
+
+    for (const manifest of publicRivierePackages) {
+      expect(manifest.publishConfig).toStrictEqual({ access: 'public' })
+      expect(riviereProjectSelectors.some((selector) => matches(selector, manifest.name))).toBe(
+        true,
+      )
+    }
+  })
+
+  it('names every subdomain package after its subdomain and package type', () => {
+    for (const subdomain of readdirSync(path.join(repoRoot, 'packages'), {
+      withFileTypes: true,
+    })) {
+      if (!subdomain.isDirectory()) continue
+
+      const subdomainPath = path.join(repoRoot, 'packages', subdomain.name)
+      for (const packageType of readdirSync(subdomainPath, { withFileTypes: true })) {
+        if (
+          !packageType.isDirectory() ||
+          !existsSync(path.join(subdomainPath, packageType.name, 'package.json'))
+        ) {
+          continue
+        }
+
+        const manifest = readJson(
+          path.join('packages', subdomain.name, packageType.name, 'package.json'),
+          packageManifestSchema,
+        )
+        expect(manifest.name).toBe(`@living-architecture/${subdomain.name}-${packageType.name}`)
+      }
+    }
+  })
+})
+
+function readWorkspacePackageManifests(): z.infer<typeof packageManifestSchema>[] {
+  return [
+    readJson('apps/cli/package.json', packageManifestSchema),
+    ...readdirSync(path.join(repoRoot, 'packages'), { withFileTypes: true }).flatMap(
+      (subdomain) => {
+        if (!subdomain.isDirectory()) return []
+        const subdomainPath = path.join(repoRoot, 'packages', subdomain.name)
+        return readdirSync(subdomainPath, { withFileTypes: true })
+          .filter(
+            (entry) =>
+              entry.isDirectory() &&
+              existsSync(path.join(subdomainPath, entry.name, 'package.json')),
+          )
+          .map((entry) =>
+            readJson(
+              path.join('packages', subdomain.name, entry.name, 'package.json'),
+              packageManifestSchema,
+            ),
+          )
+      },
+    ),
+  ]
+}
+
+function readJson<T>(relativePath: string, schema: z.ZodType<T>): T {
+  return schema.parse(JSON.parse(readFileSync(path.join(repoRoot, relativePath), 'utf8')))
+}
+
+function matches(selector: string, projectName: string): boolean {
+  return selector.endsWith('*') && projectName.startsWith(selector.slice(0, -1))
+}
diff --git a/apps/cli/src/shell/role-enforcement-bin.ts b/apps/cli/src/shell/role-enforcement-bin.ts
new file mode 100644
index 000000000..897e34854
--- /dev/null
+++ b/apps/cli/src/shell/role-enforcement-bin.ts
@@ -0,0 +1,44 @@
+import path from 'node:path'
+import { performance } from 'node:perf_hooks'
+import { fileURLToPath } from 'node:url'
+import {
+  createOxlintRoleEnforcementRunner,
+  RoleEnforcementProjectRepository,
+  RunRoleEnforcement,
+  runOxlint,
+} from '@living-architecture/riviere-role-enforcement-use-cases'
+import { main } from '../features/role-enforcement/entrypoint/role-enforcement/entrypoint'
+
+const configModulePath = process.argv[2]
+if (configModulePath === undefined) {
+  process.stderr.write(
+    'Usage: riviere-role-enforcement <config-module-path> [--package <package-path>]\n',
+  )
+  process.exitCode = 1
+} else {
+  const packageFilter = readPackageFilter(process.argv)
+  const absolutePath = path.resolve(configModulePath)
+  const pluginPath = fileURLToPath(
+    import.meta.resolve('@living-architecture/riviere-role-enforcement-domain-model/plugin'),
+  )
+  const application = new RunRoleEnforcement({
+    now: () => performance.now(),
+    projectRepository: new RoleEnforcementProjectRepository(),
+    runner: createOxlintRoleEnforcementRunner(runOxlint, pluginPath),
+  })
+  process.exitCode = main(application, absolutePath, process.cwd(), packageFilter)
+}
+
+function readPackageFilter(argv: readonly string[]): string | undefined {
+  const flagIndex = argv.indexOf('--package')
+  if (flagIndex < 0) {
+    return undefined
+  }
+  const value = argv[flagIndex + 1]
+  if (value === undefined) {
+    process.stderr.write('Error: --package requires a value\n')
+    process.exitCode = 1
+    return undefined
+  }
+  return value
+}
diff --git a/packages/riviere-cli/tsconfig.json b/apps/cli/tsconfig.json
similarity index 100%
rename from packages/riviere-cli/tsconfig.json
rename to apps/cli/tsconfig.json
diff --git a/apps/cli/tsconfig.lib.json b/apps/cli/tsconfig.lib.json
new file mode 100644
index 000000000..2f27e148a
--- /dev/null
+++ b/apps/cli/tsconfig.lib.json
@@ -0,0 +1,48 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "src",
+    "outDir": "dist",
+    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
+    "emitDeclarationOnly": false,
+    "forceConsistentCasingInFileNames": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "references": [
+    {
+      "path": "../../packages/riviere-schema/published-language/tsconfig.lib.json"
+    },
+    {
+      "path": "../../packages/riviere-role-enforcement/use-cases/tsconfig.lib.json"
+    },
+    {
+      "path": "../../packages/riviere-role-enforcement/domain-model/tsconfig.lib.json"
+    },
+    {
+      "path": "../../packages/riviere-extract-ts/use-cases/tsconfig.lib.json"
+    },
+    {
+      "path": "../../packages/riviere-extract-ts/domain-model/tsconfig.lib.json"
+    },
+    {
+      "path": "../../packages/riviere-builder/use-cases/tsconfig.lib.json"
+    }
+  ],
+  "exclude": [
+    "vite.config.ts",
+    "vite.config.mts",
+    "vitest.config.ts",
+    "vitest.config.mts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx",
+    "src/**/__fixtures__/**"
+  ]
+}
diff --git a/packages/riviere-cli/tsconfig.scripts.json b/apps/cli/tsconfig.scripts.json
similarity index 100%
rename from packages/riviere-cli/tsconfig.scripts.json
rename to apps/cli/tsconfig.scripts.json
diff --git a/apps/cli/tsconfig.spec.json b/apps/cli/tsconfig.spec.json
new file mode 100644
index 000000000..7dd4df0d6
--- /dev/null
+++ b/apps/cli/tsconfig.spec.json
@@ -0,0 +1,29 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/vitest",
+    "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node", "vitest"],
+    "forceConsistentCasingInFileNames": true
+  },
+  "include": [
+    "vite.config.ts",
+    "vite.config.mts",
+    "vitest.config.ts",
+    "vitest.config.mts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx",
+    "src/**/*.d.ts",
+    "src/**/__fixtures__/**/*.ts"
+  ],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    }
+  ]
+}
diff --git a/packages/riviere-cli/vite.config.ts b/apps/cli/vite.config.ts
similarity index 100%
rename from packages/riviere-cli/vite.config.ts
rename to apps/cli/vite.config.ts
diff --git a/apps/cli/vitest.config.mts b/apps/cli/vitest.config.mts
new file mode 100644
index 000000000..ef0491672
--- /dev/null
+++ b/apps/cli/vitest.config.mts
@@ -0,0 +1,63 @@
+import path from 'node:path';
+import { defineConfig } from 'vitest/config';
+
+const repoRoot = path.resolve(__dirname, '../..');
+
+export default defineConfig(() => ({
+  root: repoRoot,
+  cacheDir: 'node_modules/.vite/packages/riviere-cli',
+  resolve: {
+    alias: [
+      {
+        find: /^@living-architecture\/riviere-builder-use-cases\/(.*)$/,
+        replacement: path.resolve(repoRoot, 'packages/riviere-builder/use-cases/src/$1'),
+      },
+      {
+        find: /^@living-architecture\/riviere-extract-ts-use-cases\/(.*)$/,
+        replacement: path.resolve(repoRoot, 'packages/riviere-extract-ts/use-cases/src/$1'),
+      },
+    ],
+  },
+  test: {
+    name: '@living-architecture/riviere-cli',
+    watch: false,
+    globals: true,
+    environment: 'node',
+    testTimeout: 60_000,
+    include: [
+      'apps/cli/{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}',
+      'packages/riviere-builder/use-cases/src/**/*.{test,spec}.{ts,mts}',
+      'packages/riviere-extract-ts/use-cases/src/**/*.{test,spec}.{ts,mts}',
+    ],
+    reporters: ['default'],
+    coverage: {
+      enabled: true,
+      reportsDirectory: 'apps/cli/test-output/vitest/coverage',
+      provider: 'v8' as const,
+      reporter: ['text', ['lcov', { projectRoot: repoRoot }]] as ['text', ['lcov', { projectRoot: string }]],
+      include: [
+        'apps/cli/src/**/*.ts',
+        'packages/riviere-builder/use-cases/src/**/*.ts',
+        'packages/riviere-extract-ts/use-cases/src/**/*.ts',
+      ],
+      exclude: [
+        '**/*.spec.ts',
+        '**/__fixtures__/**',
+        '**/*-input.ts',
+        '**/*-result.ts',
+        '**/*test-fixtures.ts',
+        '**/index.ts',
+        'apps/cli/src/features/role-enforcement/entrypoint/role-enforcement/entrypoint.ts',
+        'apps/cli/src/shell/bin.ts',
+        'apps/cli/src/shell/index.ts',
+        'apps/cli/src/shell/role-enforcement-bin.ts',
+      ],
+      thresholds: {
+        lines: 100,
+        statements: 100,
+        functions: 100,
+        branches: 100,
+      },
+    },
+  },
+}));
diff --git a/apps/docs/CLAUDE.md b/apps/docs/CLAUDE.md
index ac52210af..7d149adab 100644
--- a/apps/docs/CLAUDE.md
+++ b/apps/docs/CLAUDE.md
@@ -42,8 +42,8 @@ Every page serves one of these journeys. New content MUST fit an existing journe
 
 | Content | Source | Command | Location |
 |---------|--------|---------|----------|
-| CLI reference | riviere-cli command definitions | `pnpm nx generate-docs riviere-cli` | `packages/riviere-cli/docs/generated/cli-reference.md` → copied to `reference/cli/cli-reference.md` |
-| API docs (RiviereBuilder, RiviereQuery) | TypeDoc from source | `pnpm nx typedoc riviere-builder` / `riviere-query` | `reference/api/generated/` |
+| CLI reference | riviere-cli command definitions | `pnpm nx generate-docs riviere-cli` | `apps/cli/docs/generated/cli-reference.md` → copied to `reference/cli/cli-reference.md` |
+| API docs (RiviereBuilder, RiviereQuery) | TypeDoc from source | `pnpm nx typedoc riviere-builder` | `reference/api/generated/` |
 | Rivière JSON Schema | Schema package | Built with docs | `public/schema/riviere.schema.json` |
 
 **Rules:**
diff --git a/apps/docs/extract/ai-assisted/index.md b/apps/docs/extract/ai-assisted/index.md
index 87d23ce42..a6234671e 100644
--- a/apps/docs/extract/ai-assisted/index.md
+++ b/apps/docs/extract/ai-assisted/index.md
@@ -46,7 +46,7 @@ Each step runs in a separate Claude Code (or other) session. This keeps context
 1. Open Claude Code (or other) in your project directory
 2. Type:
    ```text
-   Fetch https://raw.githubusercontent.com/NTCoding/living-architecture/main/packages/riviere-cli/docs/workflow/step-1-understand.md and follow the instructions
+   Fetch https://raw.githubusercontent.com/NTCoding/living-architecture/main/apps/cli/docs/workflow/step-1-understand.md and follow the instructions
    ```
 3. Claude analyzes your codebase and creates `.riviere/config/metadata.md`
 4. Review the domains Claude identified. Give corrections if needed.
@@ -57,7 +57,7 @@ Each step runs in a separate Claude Code (or other) session. This keeps context
 1. Open a new Claude Code (or other) session in your project directory
 2. Type:
    ```text
-   Fetch https://raw.githubusercontent.com/NTCoding/living-architecture/main/packages/riviere-cli/docs/workflow/step-2-define-components.md and follow the instructions
+   Fetch https://raw.githubusercontent.com/NTCoding/living-architecture/main/apps/cli/docs/workflow/step-2-define-components.md and follow the instructions
    ```
 3. Claude creates extraction rules in `.riviere/config/component-definitions.md`
 4. Review the rules. Give corrections if needed.
@@ -68,7 +68,7 @@ Each step runs in a separate Claude Code (or other) session. This keeps context
 1. Open a new Claude Code (or other) session in your project directory
 2. Type:
    ```text
-   Fetch https://raw.githubusercontent.com/NTCoding/living-architecture/main/packages/riviere-cli/docs/workflow/step-3-extract.md and follow the instructions
+   Fetch https://raw.githubusercontent.com/NTCoding/living-architecture/main/apps/cli/docs/workflow/step-3-extract.md and follow the instructions
    ```
 3. Claude finds components and adds them to the graph using the CLI
 4. Review the component summary
@@ -79,7 +79,7 @@ Each step runs in a separate Claude Code (or other) session. This keeps context
 1. Open a new Claude Code (or other) session in your project directory
 2. Type:
    ```text
-   Fetch https://raw.githubusercontent.com/NTCoding/living-architecture/main/packages/riviere-cli/docs/workflow/step-4-link.md and follow the instructions
+   Fetch https://raw.githubusercontent.com/NTCoding/living-architecture/main/apps/cli/docs/workflow/step-4-link.md and follow the instructions
    ```
 3. Claude traces flows between components and creates links
 4. Review the links
@@ -90,7 +90,7 @@ Each step runs in a separate Claude Code (or other) session. This keeps context
 1. Open a new Claude Code (or other) session in your project directory
 2. Type:
    ```text
-   Fetch https://raw.githubusercontent.com/NTCoding/living-architecture/main/packages/riviere-cli/docs/workflow/step-5-enrich.md and follow the instructions
+   Fetch https://raw.githubusercontent.com/NTCoding/living-architecture/main/apps/cli/docs/workflow/step-5-enrich.md and follow the instructions
    ```
 3. Claude adds state changes and business rules to DomainOp components
 4. Review the enrichments
@@ -101,7 +101,7 @@ Each step runs in a separate Claude Code (or other) session. This keeps context
 1. Open a new Claude Code (or other) session in your project directory
 2. Type:
    ```text
-   Fetch https://raw.githubusercontent.com/NTCoding/living-architecture/main/packages/riviere-cli/docs/workflow/step-6-validate.md and follow the instructions
+   Fetch https://raw.githubusercontent.com/NTCoding/living-architecture/main/apps/cli/docs/workflow/step-6-validate.md and follow the instructions
    ```
 3. Claude checks for orphans and validates the graph
 4. Fix any issues
@@ -127,7 +127,7 @@ If Claude misses components or makes mistakes:
 1. Give feedback in the current session
 2. Or re-run that step with corrections:
    ```text
-   Fetch https://raw.githubusercontent.com/NTCoding/living-architecture/main/packages/riviere-cli/docs/workflow/step-3-extract.md and follow the instructions.
+   Fetch https://raw.githubusercontent.com/NTCoding/living-architecture/main/apps/cli/docs/workflow/step-3-extract.md and follow the instructions.
    You missed the API controllers in src/api/. Include those.
    ```
 
diff --git a/apps/docs/extract/deterministic/index.md b/apps/docs/extract/deterministic/index.md
index 4f0d163e6..df0f66c2a 100644
--- a/apps/docs/extract/deterministic/index.md
+++ b/apps/docs/extract/deterministic/index.md
@@ -36,7 +36,7 @@ Deterministic extraction uses a language-agnostic configuration DSL to define de
 
 The config format is **language-agnostic** — defined in JSON Schema, works across TypeScript, Java, Python, etc.
 
-**Current implementation**: TypeScript (`@living-architecture/riviere-extract-ts`)
+**Current implementation**: TypeScript (`@living-architecture/riviere-extract-ts-domain-model`)
 
 **You can build extractors for other languages** using the same config format.
 
diff --git a/apps/docs/extract/deterministic/typescript/design-for-extraction.md b/apps/docs/extract/deterministic/typescript/design-for-extraction.md
index 0b68b7006..7c85377c1 100644
--- a/apps/docs/extract/deterministic/typescript/design-for-extraction.md
+++ b/apps/docs/extract/deterministic/typescript/design-for-extraction.md
@@ -11,7 +11,7 @@ When code does not follow a stable Convention, extraction can miss Components or
 In the ecommerce demo app, event publishing uses the `@EventPublisherContainer` decorator:
 
 ```typescript
-import { EventPublisherContainer } from '@living-architecture/riviere-extract-conventions'
+import { EventPublisherContainer } from '@living-architecture/riviere-extract-conventions-published-language'
 import { eventBus, OrderPlaced } from './events'
 
 @EventPublisherContainer
@@ -33,7 +33,7 @@ The Golden Path uses shared conventions so extraction can map code to Components
 ### 1) Event classes use `@Event`
 
 ```typescript
-import { Event } from '@living-architecture/riviere-extract-conventions'
+import { Event } from '@living-architecture/riviere-extract-conventions-published-language'
 
 @Event
 export class OrderPlaced {
@@ -44,7 +44,7 @@ export class OrderPlaced {
 ### 2) Event handlers declare subscribed events
 
 ```typescript
-import { EventHandlerContainer } from '@living-architecture/riviere-extract-conventions'
+import { EventHandlerContainer } from '@living-architecture/riviere-extract-conventions-published-language'
 
 @EventHandlerContainer
 export class PaymentCompletedHandler {
diff --git a/apps/docs/extract/deterministic/typescript/enforcement.md b/apps/docs/extract/deterministic/typescript/enforcement.md
index ef877fe77..d6c756216 100644
--- a/apps/docs/extract/deterministic/typescript/enforcement.md
+++ b/apps/docs/extract/deterministic/typescript/enforcement.md
@@ -17,7 +17,7 @@ ESLint catches missing decorators immediately in the IDE and during CI.
 Install the conventions package (includes ESLint plugin):
 
 ```bash
-npm install --save-dev @living-architecture/riviere-extract-conventions
+npm install --save-dev @living-architecture/riviere-extract-conventions-published-language
 ```
 
 ## ESLint Configuration
@@ -26,7 +26,7 @@ Add the enforcement rule to your ESLint config (flat config format):
 
 ```javascript
 // eslint.config.mjs
-import conventionsPlugin from '@living-architecture/riviere-extract-conventions/eslint-plugin'
+import conventionsPlugin from '@living-architecture/riviere-extract-conventions-published-language/eslint-plugin'
 
 export default [
   {
@@ -101,7 +101,7 @@ class OrderController {
 **After (fixed):**
 
 ```typescript
-import { APIContainer } from '@living-architecture/riviere-extract-conventions'
+import { APIContainer } from '@living-architecture/riviere-extract-conventions-published-language'
 
 @APIContainer
 class OrderController {
@@ -152,7 +152,7 @@ Valid decorators:
   - @Custom('type') (custom types)
   - @Ignore (explicit exclusion)
 
-Import from: @living-architecture/riviere-extract-conventions
+Import from: @living-architecture/riviere-extract-conventions-published-language
 ```
 
 ## Enforcement Concept
diff --git a/apps/docs/extract/deterministic/typescript/getting-started.md b/apps/docs/extract/deterministic/typescript/getting-started.md
index 638841e26..3f4875e31 100644
--- a/apps/docs/extract/deterministic/typescript/getting-started.md
+++ b/apps/docs/extract/deterministic/typescript/getting-started.md
@@ -11,7 +11,7 @@ Extract architecture from TypeScript code in 10 minutes using decorators and con
 **Install the CLI and conventions package:**
 
 ```bash
-npm install --save-dev @living-architecture/riviere-cli @living-architecture/riviere-extract-conventions
+npm install --save-dev @living-architecture/riviere-cli @living-architecture/riviere-extract-conventions-published-language
 ```
 
 ## Step 1: Annotate Your Code
@@ -21,7 +21,7 @@ Add decorators to mark architectural components.
 **Container decorator** — all public methods become components:
 
 ```typescript
-import { APIContainer } from '@living-architecture/riviere-extract-conventions'
+import { APIContainer } from '@living-architecture/riviere-extract-conventions-published-language'
 
 @APIContainer
 class OrderController {
@@ -38,7 +38,7 @@ class OrderController {
 **Class decorator** — the class itself is the component:
 
 ```typescript
-import { UseCase } from '@living-architecture/riviere-extract-conventions'
+import { UseCase } from '@living-architecture/riviere-extract-conventions-published-language'
 
 @UseCase
 class PlaceOrderUseCase {
@@ -57,7 +57,7 @@ The conventions package includes a ready-to-use extraction config that detects a
 
 ```bash
 npx riviere extract \
-  --config @living-architecture/riviere-extract-conventions/default-config
+  --config @living-architecture/riviere-extract-conventions-published-language/default-config
 ```
 
 **Output (draft components JSON):**
@@ -106,7 +106,7 @@ Use `--dry-run` for a quick summary:
 
 ```bash
 npx riviere extract \
-  --config @living-architecture/riviere-extract-conventions/default-config \
+  --config @living-architecture/riviere-extract-conventions-published-language/default-config \
   --dry-run
 ```
 
@@ -134,15 +134,15 @@ The simplest way to add multiple modules is with `extends`. Inherit all detectio
 modules:
   - name: "orders"
     path: "src/orders/**/*.ts"
-    extends: "@living-architecture/riviere-extract-conventions"
+    extends: "@living-architecture/riviere-extract-conventions-published-language"
 
   - name: "shipping"
     path: "src/shipping/**/*.ts"
-    extends: "@living-architecture/riviere-extract-conventions"
+    extends: "@living-architecture/riviere-extract-conventions-published-language"
 
   - name: "inventory"
     path: "src/inventory/**/*.ts"
-    extends: "@living-architecture/riviere-extract-conventions"
+    extends: "@living-architecture/riviere-extract-conventions-published-language"
 ```
 
 Override specific rules when needed:
@@ -151,7 +151,7 @@ Override specific rules when needed:
 modules:
   - name: "orders"
     path: "src/orders/**/*.ts"
-    extends: "@living-architecture/riviere-extract-conventions"
+    extends: "@living-architecture/riviere-extract-conventions-published-language"
     event: { notUsed: true }  # Override: no events in this module
 ```
 
@@ -169,13 +169,13 @@ modules:
         inClassWith:
           hasDecorator:
             name: "APIContainer"
-            from: "@living-architecture/riviere-extract-conventions"
+            from: "@living-architecture/riviere-extract-conventions-published-language"
     useCase:
       find: "classes"
       where:
         hasDecorator:
           name: "UseCase"
-          from: "@living-architecture/riviere-extract-conventions"
+          from: "@living-architecture/riviere-extract-conventions-published-language"
     domainOp: { notUsed: true }
     event: { notUsed: true }
     eventHandler: { notUsed: true }
diff --git a/apps/docs/extract/deterministic/typescript/workflow/index.md b/apps/docs/extract/deterministic/typescript/workflow/index.md
index 030117811..5f1d35f8f 100644
--- a/apps/docs/extract/deterministic/typescript/workflow/index.md
+++ b/apps/docs/extract/deterministic/typescript/workflow/index.md
@@ -28,7 +28,7 @@ Standardizing how architecture components are implemented (decorators, JSDoc tag
 Open a terminal in your project directory and install the CLI and conventions package:
 
 ```bash
-npm install --save-dev @living-architecture/riviere-cli @living-architecture/riviere-extract-conventions
+npm install --save-dev @living-architecture/riviere-cli @living-architecture/riviere-extract-conventions-published-language
 ```
 
 Then use `npx riviere ...`
@@ -62,7 +62,7 @@ This step uses the TypeScript extractor instead of AI.
 2. **Annotate your code** (if using decorators):
 
    ```typescript
-   import { UseCase, APIContainer } from '@living-architecture/riviere-extract-conventions'
+   import { UseCase, APIContainer } from '@living-architecture/riviere-extract-conventions-published-language'
 
    @APIContainer
    class OrderController {
@@ -81,11 +81,11 @@ This step uses the TypeScript extractor instead of AI.
    modules:
      - name: 'orders'
        path: 'src/orders/**/*.ts'
-       extends: '@living-architecture/riviere-extract-conventions'
+       extends: '@living-architecture/riviere-extract-conventions-published-language'
 
      - name: 'shipping'
        path: 'src/shipping/**/*.ts'
-       extends: '@living-architecture/riviere-extract-conventions'
+       extends: '@living-architecture/riviere-extract-conventions-published-language'
    ```
 
 4. **Run extraction**:
diff --git a/apps/docs/extract/deterministic/typescript/workflow/step-3-extract.md b/apps/docs/extract/deterministic/typescript/workflow/step-3-extract.md
index 6c24e3504..5db54788e 100644
--- a/apps/docs/extract/deterministic/typescript/workflow/step-3-extract.md
+++ b/apps/docs/extract/deterministic/typescript/workflow/step-3-extract.md
@@ -16,7 +16,7 @@ This step uses config-driven detection instead of AI. Components are found by sc
 **Install the CLI and conventions package:**
 
 ```bash
-npm install --save-dev @living-architecture/riviere-cli @living-architecture/riviere-extract-conventions
+npm install --save-dev @living-architecture/riviere-cli @living-architecture/riviere-extract-conventions-published-language
 ```
 
 ::: tip AI-Assisted Config Generation
@@ -45,13 +45,13 @@ You can mix strategies across different modules.
 Install the conventions package and annotate your code:
 
 ```bash
-npm install @living-architecture/riviere-extract-conventions
+npm install @living-architecture/riviere-extract-conventions-published-language
 ```
 
 **Container decorator** — all public methods become components:
 
 ```typescript
-import { APIContainer } from '@living-architecture/riviere-extract-conventions'
+import { APIContainer } from '@living-architecture/riviere-extract-conventions-published-language'
 
 @APIContainer
 class OrderController {
@@ -64,7 +64,7 @@ class OrderController {
 **Class decorator** — the class itself is the component:
 
 ```typescript
-import { UseCase } from '@living-architecture/riviere-extract-conventions'
+import { UseCase } from '@living-architecture/riviere-extract-conventions-published-language'
 
 @UseCase
 class PlaceOrderUseCase {
@@ -109,11 +109,11 @@ Inherit detection rules from the conventions package:
 modules:
   - name: 'orders'
     path: 'src/orders/**/*.ts'
-    extends: '@living-architecture/riviere-extract-conventions'
+    extends: '@living-architecture/riviere-extract-conventions-published-language'
 
   - name: 'shipping'
     path: 'src/shipping/**/*.ts'
-    extends: '@living-architecture/riviere-extract-conventions'
+    extends: '@living-architecture/riviere-extract-conventions-published-language'
 ```
 
 ### Custom Config
@@ -131,14 +131,14 @@ modules:
         inClassWith:
           hasDecorator:
             name: 'APIContainer'
-            from: '@living-architecture/riviere-extract-conventions'
+            from: '@living-architecture/riviere-extract-conventions-published-language'
 
     useCase:
       find: 'classes'
       where:
         hasDecorator:
           name: 'UseCase'
-          from: '@living-architecture/riviere-extract-conventions'
+          from: '@living-architecture/riviere-extract-conventions-published-language'
 
     domainOp: { notUsed: true }
     event: { notUsed: true }
@@ -155,7 +155,7 @@ modules:
   # Decorators
   - name: 'orders'
     path: 'src/orders/**/*.ts'
-    extends: '@living-architecture/riviere-extract-conventions'
+    extends: '@living-architecture/riviere-extract-conventions-published-language'
 
   # JSDoc
   - name: 'shipping'
@@ -343,7 +343,7 @@ api:
     inClassWith:
       hasDecorator:
         name: 'APIContainer'
-        from: '@living-architecture/riviere-extract-conventions'
+        from: '@living-architecture/riviere-extract-conventions-published-language'
   extract:
     apiType: { literal: 'REST' }
     httpMethod: { fromDecoratorName: true }
diff --git a/apps/docs/get-started/library-vs-cli.md b/apps/docs/get-started/library-vs-cli.md
index a59c8eb20..95599b492 100644
--- a/apps/docs/get-started/library-vs-cli.md
+++ b/apps/docs/get-started/library-vs-cli.md
@@ -63,7 +63,7 @@ The Library provides **programmatic control** for building graphs in TypeScript
 5. Validate and export the graph
 
 ```typescript
-import { RiviereBuilder } from '@living-architecture/riviere-builder'
+import { RiviereBuilder } from '@living-architecture/riviere-builder-domain-model'
 
 const builder = new RiviereBuilder({
   name: 'my-service',
diff --git a/apps/docs/get-started/quick-start.md b/apps/docs/get-started/quick-start.md
index 20ee513d6..d6ead247d 100644
--- a/apps/docs/get-started/quick-start.md
+++ b/apps/docs/get-started/quick-start.md
@@ -11,13 +11,13 @@ Build your first Riviere graph in 5 minutes.
 ## Installation
 
 ```bash
-npm install @living-architecture/riviere-builder
+npm install @living-architecture/riviere-builder-domain-model
 ```
 
 ## Basic Usage
 
 ```typescript
-import { RiviereBuilder } from '@living-architecture/riviere-builder'
+import { RiviereBuilder } from '@living-architecture/riviere-builder-domain-model'
 
 const builder = new RiviereBuilder({
   name: 'my-service',
diff --git a/apps/docs/index.md b/apps/docs/index.md
index 66f2a459a..75430c026 100644
--- a/apps/docs/index.md
+++ b/apps/docs/index.md
@@ -119,8 +119,7 @@ Open `http://localhost:5173/eclair/`
 | Package | Description |
 |---------|-------------|
 | `@living-architecture/riviere-cli` | CLI for extraction and graph building |
-| `@living-architecture/riviere-builder` | Node.js library for building graphs |
-| `@living-architecture/riviere-query` | Browser-safe library for querying graphs |
-| `@living-architecture/riviere-extract-config` | Extraction config schema and validation |
-| `@living-architecture/riviere-extract-conventions` | TypeScript decorators for component marking |
-| `@living-architecture/riviere-extract-ts` | TypeScript component extractor |
+| `@living-architecture/riviere-builder-domain-model` | Browser-safe library for building and querying graphs |
+| `@living-architecture/riviere-extract-config-published-language` | Extraction config schema and validation |
+| `@living-architecture/riviere-extract-conventions-published-language` | TypeScript decorators for component marking |
+| `@living-architecture/riviere-extract-ts-domain-model` | TypeScript component extractor |
diff --git a/apps/docs/package.json b/apps/docs/package.json
index a1a80448b..abffae59f 100644
--- a/apps/docs/package.json
+++ b/apps/docs/package.json
@@ -23,10 +23,10 @@
         ],
         "options": {
           "commands": [
-            "cp ../../packages/riviere-cli/docs/workflow/step-*.md extract/ai-assisted/",
-            "cp ../../packages/riviere-cli/docs/generated/cli-reference.md reference/cli/cli-reference.md",
-            "cp ../../packages/riviere-extract-config/docs/generated/predicates.md reference/extraction-config/predicates.md",
-            "cp ../../packages/riviere-extract-config/docs/generated/schema.md reference/extraction-config/schema.md",
+            "cp ../../apps/cli/docs/workflow/step-*.md extract/ai-assisted/",
+            "cp ../../apps/cli/docs/generated/cli-reference.md reference/cli/cli-reference.md",
+            "cp ../../packages/riviere-extract-config/published-language/docs/generated/predicates.md reference/extraction-config/predicates.md",
+            "cp ../../packages/riviere-extract-config/published-language/docs/generated/schema.md reference/extraction-config/schema.md",
             "pnpm exec vitepress build"
           ],
           "cwd": "apps/docs",
@@ -38,10 +38,10 @@
         "continuous": true,
         "options": {
           "commands": [
-            "cp ../../packages/riviere-cli/docs/workflow/step-*.md extract/ai-assisted/",
-            "cp ../../packages/riviere-cli/docs/generated/cli-reference.md reference/cli/cli-reference.md",
-            "cp ../../packages/riviere-extract-config/docs/generated/predicates.md reference/extraction-config/predicates.md",
-            "cp ../../packages/riviere-extract-config/docs/generated/schema.md reference/extraction-config/schema.md",
+            "cp ../../apps/cli/docs/workflow/step-*.md extract/ai-assisted/",
+            "cp ../../apps/cli/docs/generated/cli-reference.md reference/cli/cli-reference.md",
+            "cp ../../packages/riviere-extract-config/published-language/docs/generated/predicates.md reference/extraction-config/predicates.md",
+            "cp ../../packages/riviere-extract-config/published-language/docs/generated/schema.md reference/extraction-config/schema.md",
             "pnpm exec vitepress dev"
           ],
           "cwd": "apps/docs",
diff --git a/apps/docs/project.json b/apps/docs/project.json
index abeca09c5..36743033e 100644
--- a/apps/docs/project.json
+++ b/apps/docs/project.json
@@ -8,7 +8,7 @@
       }
     },
     "build": {
-      "dependsOn": ["lint", "^build", "riviere-query:typedoc", "riviere-builder:typedoc", "riviere-cli:generate-docs"]
+      "dependsOn": ["lint", "^build", "riviere-builder:typedoc", "riviere-cli:generate-docs"]
     }
   }
 }
diff --git a/apps/docs/reference/api/generated/riviere-builder/README.md b/apps/docs/reference/api/generated/riviere-builder/README.md
index d73260112..15fc5d99c 100644
--- a/apps/docs/reference/api/generated/riviere-builder/README.md
+++ b/apps/docs/reference/api/generated/riviere-builder/README.md
@@ -2,7 +2,7 @@
 pageClass: reference
 ---
 
-# @living-architecture/riviere-builder
+# @living-architecture/riviere-builder-domain-model
 
 ## Classes
 
@@ -24,33 +24,9 @@ pageClass: reference
 - [RelationshipTypeAlreadyDefinedError](classes/RelationshipTypeAlreadyDefinedError.md)
 - [RelationshipTypeNotFoundError](classes/RelationshipTypeNotFoundError.md)
 - [RiviereBuilder](classes/RiviereBuilder.md)
+- [RiviereQuery](classes/RiviereQuery.md)
 - [SourceConflictError](classes/SourceConflictError.md)
 
-## Interfaces
-
-- [APIInput](interfaces/APIInput.md)
-- [BuilderOptions](interfaces/BuilderOptions.md)
-- [BuilderStats](interfaces/BuilderStats.md)
-- [BuilderWarning](interfaces/BuilderWarning.md)
-- [ComponentIdParts](interfaces/ComponentIdParts.md)
-- [CustomInput](interfaces/CustomInput.md)
-- [CustomTypeInput](interfaces/CustomTypeInput.md)
-- [DomainInput](interfaces/DomainInput.md)
-- [DomainOpInput](interfaces/DomainOpInput.md)
-- [EnrichmentInput](interfaces/EnrichmentInput.md)
-- [EventHandlerInput](interfaces/EventHandlerInput.md)
-- [EventInput](interfaces/EventInput.md)
-- [ExternalLinkInput](interfaces/ExternalLinkInput.md)
-- [LinkInput](interfaces/LinkInput.md)
-- [NearMatchMismatch](interfaces/NearMatchMismatch.md)
-- [NearMatchOptions](interfaces/NearMatchOptions.md)
-- [NearMatchQuery](interfaces/NearMatchQuery.md)
-- [NearMatchResult](interfaces/NearMatchResult.md)
-- [RelationshipTypeInput](interfaces/RelationshipTypeInput.md)
-- [UIInput](interfaces/UIInput.md)
-- [UpsertOptions](interfaces/UpsertOptions.md)
-- [UseCaseInput](interfaces/UseCaseInput.md)
-
 ## Functions
 
 - [findNearMatches](functions/findNearMatches.md)
diff --git a/apps/docs/reference/api/generated/riviere-builder/classes/BuildValidationError.md b/apps/docs/reference/api/generated/riviere-builder/classes/BuildValidationError.md
index 62d6d2a6c..c878638b6 100644
--- a/apps/docs/reference/api/generated/riviere-builder/classes/BuildValidationError.md
+++ b/apps/docs/reference/api/generated/riviere-builder/classes/BuildValidationError.md
@@ -4,7 +4,7 @@ pageClass: reference
 
 # Class: BuildValidationError
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:185](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L185)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:185
 
 ## Riviere-role
 
@@ -20,7 +20,7 @@ domain-error
 
 > **new BuildValidationError**(`messages`): `BuildValidationError`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:188](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L188)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:188
 
 #### Parameters
 
@@ -90,7 +90,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 > `readonly` **validationMessages**: `string`[]
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:186](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L186)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:186
 
 ***
 
diff --git a/apps/docs/reference/api/generated/riviere-builder/classes/ComponentId.md b/apps/docs/reference/api/generated/riviere-builder/classes/ComponentId.md
index c55b4760b..3b36c9c90 100644
--- a/apps/docs/reference/api/generated/riviere-builder/classes/ComponentId.md
+++ b/apps/docs/reference/api/generated/riviere-builder/classes/ComponentId.md
@@ -4,23 +4,11 @@ pageClass: reference
 
 # Class: ComponentId
 
-Defined in: packages/riviere-schema/dist/component-id.d.ts:33
+Defined in: packages/riviere-schema/published-language/dist/published-language/component-id.d.ts:10
 
-Represents a structured component identifier.
+## Riviere-role
 
-Component IDs follow the format `{domain}:{module}:{type}:{name}` in kebab-case.
-
-## Example
-
-```typescript
-const id = ComponentId.create({
-  domain: 'orders',
-  module: 'checkout',
-  type: 'api',
-  name: 'Create Order'
-})
-id.toString() // 'orders:checkout:api:create-order'
-```
+value-object
 
 ## Methods
 
@@ -28,98 +16,70 @@ id.toString() // 'orders:checkout:api:create-order'
 
 > **name**(): `string`
 
-Defined in: packages/riviere-schema/dist/component-id.d.ts:79
-
-Returns the name segment of the component ID.
+Defined in: packages/riviere-schema/published-language/dist/published-language/component-id.d.ts:23
 
 #### Returns
 
 `string`
 
-The kebab-case name portion
-
 ***
 
 ### toString()
 
 > **toString**(): `string`
 
-Defined in: packages/riviere-schema/dist/component-id.d.ts:73
-
-Returns the full component ID string.
+Defined in: packages/riviere-schema/published-language/dist/published-language/component-id.d.ts:22
 
 #### Returns
 
 `string`
 
-Full ID in format `domain:module:type:name`
-
 ***
 
-### create()
-
-> `static` **create**(`parts`): `ComponentId`
+### parse()
 
-Defined in: packages/riviere-schema/dist/component-id.d.ts:53
+> `static` **parse**(`value`): `ComponentIdParseResult`
 
-Creates a ComponentId from individual parts.
+Defined in: packages/riviere-schema/published-language/dist/published-language/component-id.d.ts:15
 
 #### Parameters
 
-##### parts
-
-[`ComponentIdParts`](../interfaces/ComponentIdParts.md)
+##### value
 
-Domain, module, type, and name segments
+`string`
 
 #### Returns
 
-`ComponentId`
-
-A new ComponentId instance
-
-#### Example
-
-```typescript
-const id = ComponentId.create({
-  domain: 'orders',
-  module: 'checkout',
-  type: 'api',
-  name: 'Create Order'
-})
-```
+`ComponentIdParseResult`
 
 ***
 
-### parse()
-
-> `static` **parse**(`id`): `ComponentId`
+### parseFromParts()
 
-Defined in: packages/riviere-schema/dist/component-id.d.ts:67
+> `static` **parseFromParts**(`parts`): `ComponentId`
 
-Parses a string ID into a ComponentId instance.
+Defined in: packages/riviere-schema/published-language/dist/published-language/component-id.d.ts:16
 
 #### Parameters
 
-##### id
+##### parts
+
+###### domain
 
 `string`
 
-String in format `domain:module:type:name`
+###### module
 
-#### Returns
+`string`
 
-`ComponentId`
+###### name
 
-A ComponentId instance
+`string`
 
-#### Throws
+###### type
 
-If the format is invalid
+`string`
 
-#### Example
+#### Returns
 
-```typescript
-const id = ComponentId.parse('orders:checkout:api:create-order')
-id.name() // 'create-order'
-```
+`ComponentId`
diff --git a/apps/docs/reference/api/generated/riviere-builder/classes/ComponentNotFoundError.md b/apps/docs/reference/api/generated/riviere-builder/classes/ComponentNotFoundError.md
index 40b8ec6aa..82a502000 100644
--- a/apps/docs/reference/api/generated/riviere-builder/classes/ComponentNotFoundError.md
+++ b/apps/docs/reference/api/generated/riviere-builder/classes/ComponentNotFoundError.md
@@ -4,7 +4,7 @@ pageClass: reference
 
 # Class: ComponentNotFoundError
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:80](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L80)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:80
 
 ## Riviere-role
 
@@ -20,7 +20,7 @@ domain-error
 
 > **new ComponentNotFoundError**(`componentId`, `suggestions`): `ComponentNotFoundError`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:84](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L84)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:84
 
 #### Parameters
 
@@ -58,7 +58,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 > `readonly` **componentId**: `string`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:81](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L81)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:81
 
 ***
 
@@ -102,7 +102,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 > `readonly` **suggestions**: `string`[]
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:82](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L82)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:82
 
 ***
 
diff --git a/apps/docs/reference/api/generated/riviere-builder/classes/ComponentTypeMismatchError.md b/apps/docs/reference/api/generated/riviere-builder/classes/ComponentTypeMismatchError.md
index a5ba51d61..e2c48c92a 100644
--- a/apps/docs/reference/api/generated/riviere-builder/classes/ComponentTypeMismatchError.md
+++ b/apps/docs/reference/api/generated/riviere-builder/classes/ComponentTypeMismatchError.md
@@ -4,7 +4,7 @@ pageClass: reference
 
 # Class: ComponentTypeMismatchError
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:63](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L63)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:63
 
 ## Riviere-role
 
@@ -20,7 +20,7 @@ domain-error
 
 > **new ComponentTypeMismatchError**(`componentId`, `existingType`, `incomingType`): `ComponentTypeMismatchError`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:68](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L68)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:68
 
 #### Parameters
 
@@ -62,7 +62,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 > `readonly` **componentId**: `string`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:64](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L64)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:64
 
 ***
 
@@ -70,7 +70,7 @@ Defined in: [packages/riviere-builder/src/features/building/domain/construction/
 
 > `readonly` **existingType**: `string`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:65](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L65)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:65
 
 ***
 
@@ -78,7 +78,7 @@ Defined in: [packages/riviere-builder/src/features/building/domain/construction/
 
 > `readonly` **incomingType**: `string`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:66](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L66)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:66
 
 ***
 
diff --git a/apps/docs/reference/api/generated/riviere-builder/classes/CustomTypeAlreadyDefinedError.md b/apps/docs/reference/api/generated/riviere-builder/classes/CustomTypeAlreadyDefinedError.md
index 35a592217..b9066a83c 100644
--- a/apps/docs/reference/api/generated/riviere-builder/classes/CustomTypeAlreadyDefinedError.md
+++ b/apps/docs/reference/api/generated/riviere-builder/classes/CustomTypeAlreadyDefinedError.md
@@ -4,7 +4,7 @@ pageClass: reference
 
 # Class: CustomTypeAlreadyDefinedError
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:98](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L98)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:98
 
 ## Riviere-role
 
@@ -20,7 +20,7 @@ domain-error
 
 > **new CustomTypeAlreadyDefinedError**(`typeName`): `CustomTypeAlreadyDefinedError`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:101](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L101)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:101
 
 #### Parameters
 
@@ -90,7 +90,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 > `readonly` **typeName**: `string`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:99](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L99)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:99
 
 ***
 
diff --git a/apps/docs/reference/api/generated/riviere-builder/classes/CustomTypeNotFoundError.md b/apps/docs/reference/api/generated/riviere-builder/classes/CustomTypeNotFoundError.md
index 34f73893d..8e22ffe9f 100644
--- a/apps/docs/reference/api/generated/riviere-builder/classes/CustomTypeNotFoundError.md
+++ b/apps/docs/reference/api/generated/riviere-builder/classes/CustomTypeNotFoundError.md
@@ -4,7 +4,7 @@ pageClass: reference
 
 # Class: CustomTypeNotFoundError
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:35](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L35)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:35
 
 ## Riviere-role
 
@@ -20,7 +20,7 @@ domain-error
 
 > **new CustomTypeNotFoundError**(`customTypeName`, `definedTypes`): `CustomTypeNotFoundError`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:39](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L39)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:39
 
 #### Parameters
 
@@ -58,7 +58,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 > `readonly` **customTypeName**: `string`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:36](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L36)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:36
 
 ***
 
@@ -66,7 +66,7 @@ Defined in: [packages/riviere-builder/src/features/building/domain/construction/
 
 > `readonly` **definedTypes**: `string`[]
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:37](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L37)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:37
 
 ***
 
diff --git a/apps/docs/reference/api/generated/riviere-builder/classes/DomainNotFoundError.md b/apps/docs/reference/api/generated/riviere-builder/classes/DomainNotFoundError.md
index 26347ca32..c1f19cda4 100644
--- a/apps/docs/reference/api/generated/riviere-builder/classes/DomainNotFoundError.md
+++ b/apps/docs/reference/api/generated/riviere-builder/classes/DomainNotFoundError.md
@@ -4,7 +4,7 @@ pageClass: reference
 
 # Class: DomainNotFoundError
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:24](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L24)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:24
 
 ## Riviere-role
 
@@ -20,7 +20,7 @@ domain-error
 
 > **new DomainNotFoundError**(`domainName`): `DomainNotFoundError`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:27](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L27)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:27
 
 #### Parameters
 
@@ -54,7 +54,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 > `readonly` **domainName**: `string`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:25](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L25)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:25
 
 ***
 
diff --git a/apps/docs/reference/api/generated/riviere-builder/classes/DuplicateComponentError.md b/apps/docs/reference/api/generated/riviere-builder/classes/DuplicateComponentError.md
index e857cccce..1c96cf128 100644
--- a/apps/docs/reference/api/generated/riviere-builder/classes/DuplicateComponentError.md
+++ b/apps/docs/reference/api/generated/riviere-builder/classes/DuplicateComponentError.md
@@ -4,7 +4,7 @@ pageClass: reference
 
 # Class: DuplicateComponentError
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:52](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L52)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:52
 
 ## Riviere-role
 
@@ -20,7 +20,7 @@ domain-error
 
 > **new DuplicateComponentError**(`componentId`): `DuplicateComponentError`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:55](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L55)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:55
 
 #### Parameters
 
@@ -54,7 +54,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 > `readonly` **componentId**: `string`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:53](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L53)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:53
 
 ***
 
diff --git a/apps/docs/reference/api/generated/riviere-builder/classes/DuplicateDomainError.md b/apps/docs/reference/api/generated/riviere-builder/classes/DuplicateDomainError.md
index 71e603163..ab1de185e 100644
--- a/apps/docs/reference/api/generated/riviere-builder/classes/DuplicateDomainError.md
+++ b/apps/docs/reference/api/generated/riviere-builder/classes/DuplicateDomainError.md
@@ -4,7 +4,7 @@ pageClass: reference
 
 # Class: DuplicateDomainError
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:2](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L2)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:2
 
 ## Riviere-role
 
@@ -20,7 +20,7 @@ domain-error
 
 > **new DuplicateDomainError**(`domainName`): `DuplicateDomainError`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:5](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L5)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:5
 
 #### Parameters
 
@@ -54,7 +54,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 > `readonly` **domainName**: `string`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:3](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L3)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:3
 
 ***
 
diff --git a/apps/docs/reference/api/generated/riviere-builder/classes/DuplicateLinkError.md b/apps/docs/reference/api/generated/riviere-builder/classes/DuplicateLinkError.md
index 53cc0f675..205aec8fe 100644
--- a/apps/docs/reference/api/generated/riviere-builder/classes/DuplicateLinkError.md
+++ b/apps/docs/reference/api/generated/riviere-builder/classes/DuplicateLinkError.md
@@ -4,7 +4,7 @@ pageClass: reference
 
 # Class: DuplicateLinkError
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:137](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L137)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:137
 
 ## Riviere-role
 
@@ -20,7 +20,7 @@ domain-error
 
 > **new DuplicateLinkError**(`linkId`): `DuplicateLinkError`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:140](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L140)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:140
 
 #### Parameters
 
@@ -54,7 +54,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 > `readonly` **linkId**: `string`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:138](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L138)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:138
 
 ***
 
diff --git a/apps/docs/reference/api/generated/riviere-builder/classes/InvalidEnrichmentTargetError.md b/apps/docs/reference/api/generated/riviere-builder/classes/InvalidEnrichmentTargetError.md
index 4fbe57719..250442bd3 100644
--- a/apps/docs/reference/api/generated/riviere-builder/classes/InvalidEnrichmentTargetError.md
+++ b/apps/docs/reference/api/generated/riviere-builder/classes/InvalidEnrichmentTargetError.md
@@ -4,7 +4,7 @@ pageClass: reference
 
 # Class: InvalidEnrichmentTargetError
 
-Defined in: [packages/riviere-builder/src/features/building/domain/enrichment/enrichment-errors.ts:2](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/enrichment/enrichment-errors.ts#L2)
+Defined in: packages/riviere-builder/domain-model/src/domain/enrichment/enrichment-errors.ts:2
 
 ## Riviere-role
 
@@ -20,7 +20,7 @@ domain-error
 
 > **new InvalidEnrichmentTargetError**(`componentId`, `componentType`): `InvalidEnrichmentTargetError`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/enrichment/enrichment-errors.ts:6](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/enrichment/enrichment-errors.ts#L6)
+Defined in: packages/riviere-builder/domain-model/src/domain/enrichment/enrichment-errors.ts:6
 
 #### Parameters
 
@@ -58,7 +58,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 > `readonly` **componentId**: `string`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/enrichment/enrichment-errors.ts:3](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/enrichment/enrichment-errors.ts#L3)
+Defined in: packages/riviere-builder/domain-model/src/domain/enrichment/enrichment-errors.ts:3
 
 ***
 
@@ -66,7 +66,7 @@ Defined in: [packages/riviere-builder/src/features/building/domain/enrichment/en
 
 > `readonly` **componentType**: `string`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/enrichment/enrichment-errors.ts:4](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/enrichment/enrichment-errors.ts#L4)
+Defined in: packages/riviere-builder/domain-model/src/domain/enrichment/enrichment-errors.ts:4
 
 ***
 
diff --git a/apps/docs/reference/api/generated/riviere-builder/classes/InvalidGraphError.md b/apps/docs/reference/api/generated/riviere-builder/classes/InvalidGraphError.md
index 117cf06ef..3ddf13c2e 100644
--- a/apps/docs/reference/api/generated/riviere-builder/classes/InvalidGraphError.md
+++ b/apps/docs/reference/api/generated/riviere-builder/classes/InvalidGraphError.md
@@ -4,7 +4,7 @@ pageClass: reference
 
 # Class: InvalidGraphError
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:161](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L161)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:161
 
 ## Riviere-role
 
@@ -20,7 +20,7 @@ domain-error
 
 > **new InvalidGraphError**(`reason`): `InvalidGraphError`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:162](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L162)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:162
 
 #### Parameters
 
diff --git a/apps/docs/reference/api/generated/riviere-builder/classes/MissingDomainsError.md b/apps/docs/reference/api/generated/riviere-builder/classes/MissingDomainsError.md
index 1ba212618..2b3ff1fde 100644
--- a/apps/docs/reference/api/generated/riviere-builder/classes/MissingDomainsError.md
+++ b/apps/docs/reference/api/generated/riviere-builder/classes/MissingDomainsError.md
@@ -4,7 +4,7 @@ pageClass: reference
 
 # Class: MissingDomainsError
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:177](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L177)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:177
 
 ## Riviere-role
 
@@ -20,7 +20,7 @@ domain-error
 
 > **new MissingDomainsError**(): `MissingDomainsError`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:178](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L178)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:178
 
 #### Returns
 
diff --git a/apps/docs/reference/api/generated/riviere-builder/classes/MissingRequiredPropertiesError.md b/apps/docs/reference/api/generated/riviere-builder/classes/MissingRequiredPropertiesError.md
index 798f3f955..415b2cadb 100644
--- a/apps/docs/reference/api/generated/riviere-builder/classes/MissingRequiredPropertiesError.md
+++ b/apps/docs/reference/api/generated/riviere-builder/classes/MissingRequiredPropertiesError.md
@@ -4,7 +4,7 @@ pageClass: reference
 
 # Class: MissingRequiredPropertiesError
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:148](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L148)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:148
 
 ## Riviere-role
 
@@ -20,7 +20,7 @@ domain-error
 
 > **new MissingRequiredPropertiesError**(`customTypeName`, `missingKeys`): `MissingRequiredPropertiesError`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:152](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L152)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:152
 
 #### Parameters
 
@@ -58,7 +58,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 > `readonly` **customTypeName**: `string`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:149](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L149)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:149
 
 ***
 
@@ -78,7 +78,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 > `readonly` **missingKeys**: `string`[]
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:150](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L150)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:150
 
 ***
 
diff --git a/apps/docs/reference/api/generated/riviere-builder/classes/MissingSourcesError.md b/apps/docs/reference/api/generated/riviere-builder/classes/MissingSourcesError.md
index 7192d0610..6b834264d 100644
--- a/apps/docs/reference/api/generated/riviere-builder/classes/MissingSourcesError.md
+++ b/apps/docs/reference/api/generated/riviere-builder/classes/MissingSourcesError.md
@@ -4,7 +4,7 @@ pageClass: reference
 
 # Class: MissingSourcesError
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:169](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L169)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:169
 
 ## Riviere-role
 
@@ -20,7 +20,7 @@ domain-error
 
 > **new MissingSourcesError**(): `MissingSourcesError`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:170](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L170)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:170
 
 #### Returns
 
diff --git a/apps/docs/reference/api/generated/riviere-builder/classes/RelationshipTypeAlreadyDefinedError.md b/apps/docs/reference/api/generated/riviere-builder/classes/RelationshipTypeAlreadyDefinedError.md
index 2f6f67ad5..a57c733fb 100644
--- a/apps/docs/reference/api/generated/riviere-builder/classes/RelationshipTypeAlreadyDefinedError.md
+++ b/apps/docs/reference/api/generated/riviere-builder/classes/RelationshipTypeAlreadyDefinedError.md
@@ -4,7 +4,7 @@ pageClass: reference
 
 # Class: RelationshipTypeAlreadyDefinedError
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:109](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L109)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:109
 
 ## Riviere-role
 
@@ -20,7 +20,7 @@ domain-error
 
 > **new RelationshipTypeAlreadyDefinedError**(`typeName`): `RelationshipTypeAlreadyDefinedError`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:112](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L112)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:112
 
 #### Parameters
 
@@ -90,7 +90,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 > `readonly` **typeName**: `string`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:110](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L110)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:110
 
 ***
 
diff --git a/apps/docs/reference/api/generated/riviere-builder/classes/RelationshipTypeNotFoundError.md b/apps/docs/reference/api/generated/riviere-builder/classes/RelationshipTypeNotFoundError.md
index fbb24adf7..b3f28301d 100644
--- a/apps/docs/reference/api/generated/riviere-builder/classes/RelationshipTypeNotFoundError.md
+++ b/apps/docs/reference/api/generated/riviere-builder/classes/RelationshipTypeNotFoundError.md
@@ -4,7 +4,7 @@ pageClass: reference
 
 # Class: RelationshipTypeNotFoundError
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:120](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L120)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:120
 
 ## Riviere-role
 
@@ -20,7 +20,7 @@ domain-error
 
 > **new RelationshipTypeNotFoundError**(`relationshipType`, `definedTypes`): `RelationshipTypeNotFoundError`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:124](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L124)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:124
 
 #### Parameters
 
@@ -58,7 +58,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 > `readonly` **definedTypes**: `string`[]
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:122](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L122)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:122
 
 ***
 
@@ -90,7 +90,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 > `readonly` **relationshipType**: `string`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:121](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L121)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:121
 
 ***
 
diff --git a/apps/docs/reference/api/generated/riviere-builder/classes/RiviereBuilder.md b/apps/docs/reference/api/generated/riviere-builder/classes/RiviereBuilder.md
index 409812c64..4e98490f7 100644
--- a/apps/docs/reference/api/generated/riviere-builder/classes/RiviereBuilder.md
+++ b/apps/docs/reference/api/generated/riviere-builder/classes/RiviereBuilder.md
@@ -4,7 +4,7 @@ pageClass: reference
 
 # Class: RiviereBuilder
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:76](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L76)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:143
 
 Programmatically construct Riviere architecture graphs.
 
@@ -21,7 +21,7 @@ aggregate
 
 > `readonly` **graphPath**: `string`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:79](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L79)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:146
 
 ## Methods
 
@@ -29,7 +29,7 @@ Defined in: [packages/riviere-builder/src/features/building/domain/builder-facad
 
 > **addApi**(`input`): `APIComponent`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:152](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L152)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:226
 
 Adds an API component to the graph.
 
@@ -37,7 +37,7 @@ Adds an API component to the graph.
 
 ##### input
 
-[`APIInput`](../interfaces/APIInput.md)
+`APIInput`
 
 API component properties
 
@@ -53,7 +53,7 @@ The created API component
 
 > **addCustom**(`input`): `CustomComponent`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:270](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L270)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:379
 
 Adds a Custom component to the graph.
 
@@ -61,7 +61,7 @@ Adds a Custom component to the graph.
 
 ##### input
 
-[`CustomInput`](../interfaces/CustomInput.md)
+`CustomInput`
 
 Custom component properties
 
@@ -77,7 +77,7 @@ The created Custom component
 
 > **addDomain**(`input`): `void`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:122](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L122)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:189
 
 Adds a new domain to the graph.
 
@@ -85,7 +85,7 @@ Adds a new domain to the graph.
 
 ##### input
 
-[`DomainInput`](../interfaces/DomainInput.md)
+`DomainInput`
 
 Domain name and description
 
@@ -99,7 +99,7 @@ Domain name and description
 
 > **addDomainOp**(`input`): `DomainOpComponent`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:192](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L192)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:280
 
 Adds a DomainOp component to the graph.
 
@@ -107,7 +107,7 @@ Adds a DomainOp component to the graph.
 
 ##### input
 
-[`DomainOpInput`](../interfaces/DomainOpInput.md)
+`DomainOpInput`
 
 DomainOp component properties
 
@@ -123,7 +123,7 @@ The created DomainOp component
 
 > **addEvent**(`input`): `EventComponent`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:212](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L212)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:307
 
 Adds an Event component to the graph.
 
@@ -131,7 +131,7 @@ Adds an Event component to the graph.
 
 ##### input
 
-[`EventInput`](../interfaces/EventInput.md)
+`EventInput`
 
 Event component properties
 
@@ -147,7 +147,7 @@ The created Event component
 
 > **addEventHandler**(`input`): `EventHandlerComponent`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:232](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L232)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:334
 
 Adds an EventHandler component to the graph.
 
@@ -155,7 +155,7 @@ Adds an EventHandler component to the graph.
 
 ##### input
 
-[`EventHandlerInput`](../interfaces/EventHandlerInput.md)
+`EventHandlerInput`
 
 EventHandler component properties
 
@@ -171,7 +171,7 @@ The created EventHandler component
 
 > **addSource**(`source`): `void`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:113](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L113)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:180
 
 Adds an additional source repository to the graph.
 
@@ -193,7 +193,7 @@ Source repository information
 
 > **addUI**(`input`): `UIComponent`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:132](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L132)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:199
 
 Adds a UI component to the graph.
 
@@ -201,7 +201,7 @@ Adds a UI component to the graph.
 
 ##### input
 
-[`UIInput`](../interfaces/UIInput.md)
+`UIInput`
 
 UI component properties
 
@@ -217,7 +217,7 @@ The created UI component
 
 > **addUseCase**(`input`): `UseCaseComponent`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:172](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L172)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:253
 
 Adds a UseCase component to the graph.
 
@@ -225,7 +225,7 @@ Adds a UseCase component to the graph.
 
 ##### input
 
-[`UseCaseInput`](../interfaces/UseCaseInput.md)
+`UseCaseInput`
 
 UseCase component properties
 
@@ -241,7 +241,7 @@ The created UseCase component
 
 > **build**(): `RiviereGraph`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:384](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L384)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:510
 
 Validates and returns the completed graph.
 
@@ -257,7 +257,7 @@ Valid RiviereGraph object
 
 > **defineCustomType**(`input`): `void`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:251](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L251)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:360
 
 Defines a custom component type for the graph.
 
@@ -265,7 +265,7 @@ Defines a custom component type for the graph.
 
 ##### input
 
-[`CustomTypeInput`](../interfaces/CustomTypeInput.md)
+`CustomTypeInput`
 
 Custom type definition
 
@@ -279,7 +279,7 @@ Custom type definition
 
 > **defineRelationshipType**(`input`): `void`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:260](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L260)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:369
 
 Defines a relationship type for the graph.
 
@@ -287,7 +287,7 @@ Defines a relationship type for the graph.
 
 ##### input
 
-[`RelationshipTypeInput`](../interfaces/RelationshipTypeInput.md)
+`RelationshipTypeInput`
 
 Relationship type name and description
 
@@ -301,7 +301,7 @@ Relationship type name and description
 
 > **enrichComponent**(`id`, `enrichment`): `void`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:290](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L290)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:406
 
 Enriches a DomainOp component with additional domain details.
 
@@ -315,7 +315,7 @@ The component ID to enrich
 
 ##### enrichment
 
-[`EnrichmentInput`](../interfaces/EnrichmentInput.md)
+`EnrichmentInput`
 
 State changes and business rules to add
 
@@ -329,7 +329,7 @@ State changes and business rules to add
 
 > **link**(`input`): `Link`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:311](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L311)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:437
 
 Creates a link between two components in the graph.
 
@@ -337,7 +337,7 @@ Creates a link between two components in the graph.
 
 ##### input
 
-[`LinkInput`](../interfaces/LinkInput.md)
+`LinkInput`
 
 Link properties including source, target, and type
 
@@ -353,7 +353,7 @@ The created link
 
 > **linkExternal**(`input`): `ExternalLink`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:321](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L321)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:447
 
 Creates a link from a component to an external system.
 
@@ -361,7 +361,7 @@ Creates a link from a component to an external system.
 
 ##### input
 
-[`ExternalLinkInput`](../interfaces/ExternalLinkInput.md)
+`ExternalLinkInput`
 
 External link properties including target system info
 
@@ -375,9 +375,9 @@ The created external link
 
 ### nearMatches()
 
-> **nearMatches**(`query`, `options?`): [`NearMatchResult`](../interfaces/NearMatchResult.md)[]
+> **nearMatches**(`query`, `options?`): `Readonly`\<\{ `component`: `Component`; `mismatch?`: `Readonly`\<\{ `actual`: `string`; `expected`: `string`; `field`: `"type"` \| `"domain"`; \}\>; `score`: `number`; \}\>[]
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:301](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L301)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:417
 
 Finds components similar to a query for error recovery.
 
@@ -385,19 +385,19 @@ Finds components similar to a query for error recovery.
 
 ##### query
 
-[`NearMatchQuery`](../interfaces/NearMatchQuery.md)
+`Readonly`\<\{ `domain?`: `string`; `name`: `string`; `type?`: `ComponentType`; \}\>
 
 Search criteria including partial ID, name, type, or domain
 
 ##### options?
 
-[`NearMatchOptions`](../interfaces/NearMatchOptions.md)
+`Readonly`\<\{ `limit?`: `number`; `threshold?`: `number`; \}\>
 
 Optional matching thresholds and limits
 
 #### Returns
 
-[`NearMatchResult`](../interfaces/NearMatchResult.md)[]
+`Readonly`\<\{ `component`: `Component`; `mismatch?`: `Readonly`\<\{ `actual`: `string`; `expected`: `string`; `field`: `"type"` \| `"domain"`; \}\>; `score`: `number`; \}\>[]
 
 Array of similar components with similarity scores
 
@@ -407,7 +407,7 @@ Array of similar components with similarity scores
 
 > **orphans**(): `string`[]
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:357](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L357)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:483
 
 Returns IDs of components with no incoming or outgoing links.
 
@@ -421,17 +421,17 @@ Array of orphaned component IDs
 
 ### query()
 
-> **query**(): `RiviereQuery`
+> **query**(): [`RiviereQuery`](RiviereQuery.md)
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:366](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L366)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:492
 
-Returns a RiviereQuery instance for the current graph state.
+Returns query capabilities for the current graph state.
 
 #### Returns
 
-`RiviereQuery`
+[`RiviereQuery`](RiviereQuery.md)
 
-RiviereQuery instance for the current graph
+A snapshot that can be queried without mutating the builder
 
 ***
 
@@ -439,7 +439,7 @@ RiviereQuery instance for the current graph
 
 > **serialize**(): `string`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:375](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L375)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:501
 
 Serializes the current graph state as a JSON string.
 
@@ -453,40 +453,96 @@ JSON string representation of the graph
 
 ### stats()
 
-> **stats**(): [`BuilderStats`](../interfaces/BuilderStats.md)
+> **stats**(): `object`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:339](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L339)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:465
 
 Returns statistics about the current graph state.
 
 #### Returns
 
-[`BuilderStats`](../interfaces/BuilderStats.md)
+`object`
 
 Counts of components by type, domains, and links
 
+##### componentCount
+
+> **componentCount**: `number` = `components.length`
+
+##### componentsByType
+
+> **componentsByType**: `object`
+
+###### componentsByType.API
+
+> **API**: `number`
+
+###### componentsByType.Custom
+
+> **Custom**: `number`
+
+###### componentsByType.DomainOp
+
+> **DomainOp**: `number`
+
+###### componentsByType.Event
+
+> **Event**: `number`
+
+###### componentsByType.EventHandler
+
+> **EventHandler**: `number`
+
+###### componentsByType.UI
+
+> **UI**: `number`
+
+###### componentsByType.UseCase
+
+> **UseCase**: `number`
+
+##### domainCount
+
+> **domainCount**: `number`
+
+##### externalLinkCount
+
+> **externalLinkCount**: `number` = `graph.externalLinks.length`
+
+##### linkCount
+
+> **linkCount**: `number` = `graph.links.length`
+
 ***
 
 ### upsertApi()
 
 > **upsertApi**(`input`, `options?`): `object`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:156](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L156)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:237
+
+Adds or updates an API component.
 
 #### Parameters
 
 ##### input
 
-[`APIInput`](../interfaces/APIInput.md)
+`APIInput`
+
+API component properties
 
 ##### options?
 
-[`UpsertOptions`](../interfaces/UpsertOptions.md)
+`Readonly`\<\{ `noOverwrite?`: `boolean`; \}\>
+
+Upsert behaviour
 
 #### Returns
 
 `object`
 
+The component and whether it was created
+
 ##### component
 
 > **component**: `APIComponent`
@@ -501,22 +557,30 @@ Defined in: [packages/riviere-builder/src/features/building/domain/builder-facad
 
 > **upsertCustom**(`input`, `options?`): `object`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:274](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L274)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:390
+
+Adds or updates a Custom component.
 
 #### Parameters
 
 ##### input
 
-[`CustomInput`](../interfaces/CustomInput.md)
+`CustomInput`
+
+Custom component properties
 
 ##### options?
 
-[`UpsertOptions`](../interfaces/UpsertOptions.md)
+`Readonly`\<\{ `noOverwrite?`: `boolean`; \}\>
+
+Upsert behaviour
 
 #### Returns
 
 `object`
 
+The component and whether it was created
+
 ##### component
 
 > **component**: `CustomComponent`
@@ -531,22 +595,30 @@ Defined in: [packages/riviere-builder/src/features/building/domain/builder-facad
 
 > **upsertDomainOp**(`input`, `options?`): `object`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:196](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L196)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:291
+
+Adds or updates a DomainOp component.
 
 #### Parameters
 
 ##### input
 
-[`DomainOpInput`](../interfaces/DomainOpInput.md)
+`DomainOpInput`
+
+DomainOp component properties
 
 ##### options?
 
-[`UpsertOptions`](../interfaces/UpsertOptions.md)
+`Readonly`\<\{ `noOverwrite?`: `boolean`; \}\>
+
+Upsert behaviour
 
 #### Returns
 
 `object`
 
+The component and whether it was created
+
 ##### component
 
 > **component**: `DomainOpComponent`
@@ -561,22 +633,30 @@ Defined in: [packages/riviere-builder/src/features/building/domain/builder-facad
 
 > **upsertEvent**(`input`, `options?`): `object`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:216](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L216)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:318
+
+Adds or updates an Event component.
 
 #### Parameters
 
 ##### input
 
-[`EventInput`](../interfaces/EventInput.md)
+`EventInput`
+
+Event component properties
 
 ##### options?
 
-[`UpsertOptions`](../interfaces/UpsertOptions.md)
+`Readonly`\<\{ `noOverwrite?`: `boolean`; \}\>
+
+Upsert behaviour
 
 #### Returns
 
 `object`
 
+The component and whether it was created
+
 ##### component
 
 > **component**: `EventComponent`
@@ -591,22 +671,30 @@ Defined in: [packages/riviere-builder/src/features/building/domain/builder-facad
 
 > **upsertEventHandler**(`input`, `options?`): `object`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:236](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L236)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:345
+
+Adds or updates an EventHandler component.
 
 #### Parameters
 
 ##### input
 
-[`EventHandlerInput`](../interfaces/EventHandlerInput.md)
+`EventHandlerInput`
+
+EventHandler component properties
 
 ##### options?
 
-[`UpsertOptions`](../interfaces/UpsertOptions.md)
+`Readonly`\<\{ `noOverwrite?`: `boolean`; \}\>
+
+Upsert behaviour
 
 #### Returns
 
 `object`
 
+The component and whether it was created
+
 ##### component
 
 > **component**: `EventHandlerComponent`
@@ -621,22 +709,30 @@ Defined in: [packages/riviere-builder/src/features/building/domain/builder-facad
 
 > **upsertUI**(`input`, `options?`): `object`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:136](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L136)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:210
+
+Adds or updates a UI component.
 
 #### Parameters
 
 ##### input
 
-[`UIInput`](../interfaces/UIInput.md)
+`UIInput`
+
+UI component properties
 
 ##### options?
 
-[`UpsertOptions`](../interfaces/UpsertOptions.md)
+`Readonly`\<\{ `noOverwrite?`: `boolean`; \}\>
+
+Upsert behaviour
 
 #### Returns
 
 `object`
 
+The component and whether it was created
+
 ##### component
 
 > **component**: `UIComponent`
@@ -651,22 +747,30 @@ Defined in: [packages/riviere-builder/src/features/building/domain/builder-facad
 
 > **upsertUseCase**(`input`, `options?`): `object`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:176](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L176)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:264
+
+Adds or updates a UseCase component.
 
 #### Parameters
 
 ##### input
 
-[`UseCaseInput`](../interfaces/UseCaseInput.md)
+`UseCaseInput`
+
+UseCase component properties
 
 ##### options?
 
-[`UpsertOptions`](../interfaces/UpsertOptions.md)
+`Readonly`\<\{ `noOverwrite?`: `boolean`; \}\>
+
+Upsert behaviour
 
 #### Returns
 
 `object`
 
+The component and whether it was created
+
 ##### component
 
 > **component**: `UseCaseComponent`
@@ -681,7 +785,7 @@ Defined in: [packages/riviere-builder/src/features/building/domain/builder-facad
 
 > **validate**(): `ValidationResult`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:348](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L348)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:474
 
 Runs full validation on the graph.
 
@@ -695,15 +799,15 @@ Validation result with valid flag and error details
 
 ### warnings()
 
-> **warnings**(): [`BuilderWarning`](../interfaces/BuilderWarning.md)[]
+> **warnings**(): (`InspectionWarning` \| `OperationWarning`)[]
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:330](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L330)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:456
 
 Returns non-fatal issues found in the graph.
 
 #### Returns
 
-[`BuilderWarning`](../interfaces/BuilderWarning.md)[]
+(`InspectionWarning` \| `OperationWarning`)[]
 
 Array of warning objects with type and message
 
@@ -713,7 +817,7 @@ Array of warning objects with type and message
 
 > `static` **new**(`options`, `graphPath`): `RiviereBuilder`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:104](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L104)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:171
 
 Creates a new builder with initial configuration.
 
@@ -721,7 +825,7 @@ Creates a new builder with initial configuration.
 
 ##### options
 
-[`BuilderOptions`](../interfaces/BuilderOptions.md)
+`BuilderOptions`
 
 Configuration including sources and domains
 
@@ -743,7 +847,7 @@ A new RiviereBuilder instance
 
 > `static` **resume**(`graph`, `graphPath`): `RiviereBuilder`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/builder-facade.ts:93](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/builder-facade.ts#L93)
+Defined in: packages/riviere-builder/domain-model/src/domain/builder-facade.ts:160
 
 Restores a builder from a previously serialized graph.
 
diff --git a/apps/docs/reference/api/generated/riviere-builder/classes/RiviereQuery.md b/apps/docs/reference/api/generated/riviere-builder/classes/RiviereQuery.md
new file mode 100644
index 000000000..9389ad325
--- /dev/null
+++ b/apps/docs/reference/api/generated/riviere-builder/classes/RiviereQuery.md
@@ -0,0 +1,980 @@
+---
+pageClass: reference
+---
+
+# Class: RiviereQuery
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:86
+
+Query and analyze Riviere architecture graphs.
+
+RiviereQuery provides methods to explore components, trace execution flows,
+analyze domain models, and compare graph versions.
+
+## Example
+
+```typescript
+import { RiviereQuery } from '@living-architecture/riviere-builder-domain-model/query'
+
+// From JSON
+const query = RiviereQuery.fromJSON(graphData)
+
+// Query components
+const apis = query.componentsByType('API')
+const orderDomain = query.componentsInDomain('orders')
+
+// Trace flows
+const flow = query.traceFlow('orders:checkout:api:post-orders')
+```
+
+## Riviere-role
+
+domain-service
+
+## Constructors
+
+### Constructor
+
+> **new RiviereQuery**(`graph`): `RiviereQuery`
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:101
+
+Creates a new RiviereQuery instance.
+
+#### Parameters
+
+##### graph
+
+`RiviereGraph`
+
+A valid RiviereGraph object
+
+#### Returns
+
+`RiviereQuery`
+
+#### Throws
+
+If the graph fails schema validation
+
+#### Example
+
+```typescript
+const graph: RiviereGraph = JSON.parse(jsonString)
+const query = new RiviereQuery(graph)
+```
+
+## Methods
+
+### businessRulesFor()
+
+> **businessRulesFor**(`entityName`): `string`[]
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:349
+
+Returns all business rules for an entity's operations.
+
+#### Parameters
+
+##### entityName
+
+`string`
+
+The entity name to get rules for
+
+#### Returns
+
+`string`[]
+
+Array of business rule strings
+
+#### Example
+
+```typescript
+const rules = query.businessRulesFor('Order')
+```
+
+***
+
+### componentById()
+
+> **componentById**(`id`): `Component` \| `undefined`
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:233
+
+Finds a component by its ID.
+
+#### Parameters
+
+##### id
+
+`ComponentId`
+
+The component ID to look up
+
+#### Returns
+
+`Component` \| `undefined`
+
+The component, or undefined if not found
+
+#### Example
+
+```typescript
+const component = query.componentById('orders:checkout:api:post-orders')
+```
+
+***
+
+### components()
+
+> **components**(): `Component`[]
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:135
+
+Returns all components in the graph.
+
+#### Returns
+
+`Component`[]
+
+Array of all components
+
+#### Example
+
+```typescript
+const allComponents = query.components()
+console.log(`Total: ${allComponents.length}`)
+```
+
+***
+
+### componentsByType()
+
+> **componentsByType**(`type`): `Component`[]
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:282
+
+Returns all components of a specific type.
+
+#### Parameters
+
+##### type
+
+`ComponentType`
+
+The component type to filter by
+
+#### Returns
+
+`Component`[]
+
+Array of components of that type
+
+#### Example
+
+```typescript
+const apis = query.componentsByType('API')
+const events = query.componentsByType('Event')
+```
+
+***
+
+### componentsInDomain()
+
+> **componentsInDomain**(`domainName`): `Component`[]
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:266
+
+Returns all components in a specific domain.
+
+#### Parameters
+
+##### domainName
+
+`string`
+
+The domain name to filter by
+
+#### Returns
+
+`Component`[]
+
+Array of components in the domain
+
+#### Example
+
+```typescript
+const orderComponents = query.componentsInDomain('orders')
+```
+
+***
+
+### crossDomainLinks()
+
+> **crossDomainLinks**(`domainName`): `CrossDomainLink`[]
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:536
+
+Returns links from a domain to other domains.
+
+#### Parameters
+
+##### domainName
+
+`string`
+
+The source domain name
+
+#### Returns
+
+`CrossDomainLink`[]
+
+Array of CrossDomainLink objects (deduplicated by target domain and type)
+
+#### Example
+
+```typescript
+const outgoing = query.crossDomainLinks('orders')
+```
+
+***
+
+### detectOrphans()
+
+> **detectOrphans**(): `ComponentId`[]
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:186
+
+Detects orphan components with no incoming or outgoing links.
+
+#### Returns
+
+`ComponentId`[]
+
+Array of component IDs that are disconnected from the graph
+
+#### Example
+
+```typescript
+const orphanIds = query.detectOrphans()
+if (orphanIds.length > 0) {
+  console.warn(`Found ${orphanIds.length} orphan nodes`)
+}
+```
+
+***
+
+### diff()
+
+> **diff**(`other`): `GraphDiff`
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:441
+
+Compares this graph with another and returns the differences.
+
+#### Parameters
+
+##### other
+
+`RiviereGraph`
+
+The graph to compare against
+
+#### Returns
+
+`GraphDiff`
+
+GraphDiff with added, removed, and modified items
+
+#### Example
+
+```typescript
+const oldGraph = RiviereQuery.fromJSON(oldData)
+const newGraph = RiviereQuery.fromJSON(newData)
+const diff = newGraph.diff(oldGraph.graph)
+
+console.log(`Added: ${diff.stats.componentsAdded}`)
+console.log(`Removed: ${diff.stats.componentsRemoved}`)
+```
+
+***
+
+### domainConnections()
+
+> **domainConnections**(`domainName`): `DomainConnection`[]
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:556
+
+Returns cross-domain connections with API and event counts.
+
+Shows both incoming and outgoing connections for a domain.
+
+#### Parameters
+
+##### domainName
+
+`string`
+
+The domain to analyze
+
+#### Returns
+
+`DomainConnection`[]
+
+Array of DomainConnection objects
+
+#### Example
+
+```typescript
+const connections = query.domainConnections('orders')
+for (const conn of connections) {
+  console.log(`${conn.direction} to ${conn.targetDomain}: ${conn.apiCount} API, ${conn.eventCount} event`)
+}
+```
+
+***
+
+### domains()
+
+> **domains**(): `Domain`[]
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:299
+
+Returns domain information with component counts.
+
+#### Returns
+
+`Domain`[]
+
+Array of Domain objects sorted by name
+
+#### Example
+
+```typescript
+const domains = query.domains()
+for (const domain of domains) {
+  console.log(`${domain.name}: ${domain.componentCounts.total} components`)
+}
+```
+
+***
+
+### entities()
+
+> **entities**(`domainName?`): `Entity`[]
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:334
+
+Returns entities with their domain operations.
+
+#### Parameters
+
+##### domainName?
+
+`string`
+
+Optional domain to filter by
+
+#### Returns
+
+`Entity`[]
+
+Array of Entity objects with their operations
+
+#### Example
+
+```typescript
+const allEntities = query.entities()
+const orderEntities = query.entities('orders')
+
+for (const entity of orderEntities) {
+  console.log(`${entity.name} has ${entity.operations.length} operations`)
+}
+```
+
+***
+
+### entryPoints()
+
+> **entryPoints**(): `Component`[]
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:399
+
+Returns components that are entry points to the system.
+
+Entry points are UI, API, EventHandler, or Custom components
+with no incoming links.
+
+#### Returns
+
+`Component`[]
+
+Array of entry point components
+
+#### Example
+
+```typescript
+const entryPoints = query.entryPoints()
+```
+
+***
+
+### eventHandlers()
+
+> **eventHandlers**(`eventName?`): `EventHandlerInfo`[]
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:477
+
+Returns event handlers with their subscriptions.
+
+#### Parameters
+
+##### eventName?
+
+`string`
+
+Optional event name to filter handlers by
+
+#### Returns
+
+`EventHandlerInfo`[]
+
+Array of EventHandlerInfo objects sorted by handler name
+
+#### Example
+
+```typescript
+const allHandlers = query.eventHandlers()
+const orderPlacedHandlers = query.eventHandlers('order-placed')
+```
+
+***
+
+### externalDomains()
+
+> **externalDomains**(): `ExternalDomain`[]
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:632
+
+Returns external domains that components connect to.
+
+Each unique external target is returned as a separate ExternalDomain,
+with aggregated source domains and connection counts.
+
+#### Returns
+
+`ExternalDomain`[]
+
+Array of ExternalDomain objects, sorted alphabetically by name
+
+#### Example
+
+```typescript
+const externals = query.externalDomains()
+for (const ext of externals) {
+  console.log(`${ext.name}: ${ext.connectionCount} connections from ${ext.sourceDomains.join(', ')}`)
+}
+```
+
+***
+
+### externalLinks()
+
+> **externalLinks**(): `ExternalLink`[]
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:612
+
+Returns all external links in the graph.
+
+External links represent connections from components to external
+systems that are not part of the graph (e.g., third-party APIs).
+
+#### Returns
+
+`ExternalLink`[]
+
+Array of all external links, or empty array if none exist
+
+#### Example
+
+```typescript
+const externalLinks = query.externalLinks()
+for (const link of externalLinks) {
+  console.log(`${link.source} -> ${link.target.name}`)
+}
+```
+
+***
+
+### find()
+
+> **find**(`predicate`): `Component` \| `undefined`
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:201
+
+Finds the first component matching a predicate.
+
+#### Parameters
+
+##### predicate
+
+(`component`) => `boolean`
+
+Function that returns true for matching components
+
+#### Returns
+
+`Component` \| `undefined`
+
+The first matching component, or undefined if none found
+
+#### Example
+
+```typescript
+const checkout = query.find(c => c.name.includes('checkout'))
+```
+
+***
+
+### findAll()
+
+> **findAll**(`predicate`): `Component`[]
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:218
+
+Finds all components matching a predicate.
+
+#### Parameters
+
+##### predicate
+
+(`component`) => `boolean`
+
+Function that returns true for matching components
+
+#### Returns
+
+`Component`[]
+
+Array of all matching components
+
+#### Example
+
+```typescript
+const orderHandlers = query.findAll(c =>
+  c.type === 'EventHandler' && c.domain === 'orders'
+)
+```
+
+***
+
+### flows()
+
+> **flows**(): `Flow`[]
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:501
+
+Returns all flows in the graph.
+
+Each flow starts from an entry point (UI, API, or Custom with no
+incoming links) and traces forward through the graph.
+
+#### Returns
+
+`Flow`[]
+
+Array of Flow objects with entry point and steps
+
+#### Example
+
+```typescript
+const flows = query.flows()
+
+for (const flow of flows) {
+  console.log(`Flow: ${flow.entryPoint.name}`)
+  for (const step of flow.steps) {
+    console.log(`  ${step.component.name} (depth: ${step.depth})`)
+  }
+}
+```
+
+***
+
+### links()
+
+> **links**(): `Link`[]
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:150
+
+Returns all links in the graph.
+
+#### Returns
+
+`Link`[]
+
+Array of all links
+
+#### Example
+
+```typescript
+const allLinks = query.links()
+console.log(`Total links: ${allLinks.length}`)
+```
+
+***
+
+### nodeDepths()
+
+> **nodeDepths**(): `ComponentDepths`
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:592
+
+Calculates depth from entry points for each component.
+
+Components unreachable from entry points will not be in the map.
+
+#### Returns
+
+`ComponentDepths`
+
+Map of component ID to depth (0 = entry point)
+
+#### Example
+
+```typescript
+const depths = query.nodeDepths()
+for (const [id, depth] of depths) {
+  console.log(`${id}: depth ${depth}`)
+}
+```
+
+***
+
+### operationsFor()
+
+> **operationsFor**(`entityName`): `DomainOpComponent`[]
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:314
+
+Returns all domain operations for a specific entity.
+
+#### Parameters
+
+##### entityName
+
+`string`
+
+The entity name to get operations for
+
+#### Returns
+
+`DomainOpComponent`[]
+
+Array of DomainOp components targeting the entity
+
+#### Example
+
+```typescript
+const orderOps = query.operationsFor('Order')
+```
+
+***
+
+### publishedEvents()
+
+> **publishedEvents**(`domainName?`): `PublishedEvent`[]
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:461
+
+Returns published events with their handlers.
+
+#### Parameters
+
+##### domainName?
+
+`string`
+
+Optional domain to filter by
+
+#### Returns
+
+`PublishedEvent`[]
+
+Array of PublishedEvent objects sorted by event name
+
+#### Example
+
+```typescript
+const allEvents = query.publishedEvents()
+const orderEvents = query.publishedEvents('orders')
+
+for (const event of orderEvents) {
+  console.log(`${event.eventName} has ${event.handlers.length} handlers`)
+}
+```
+
+***
+
+### search()
+
+> **search**(`query`): `Component`[]
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:251
+
+Searches components by name, domain, or type.
+
+Case-insensitive search across component name, domain, and type fields.
+
+#### Parameters
+
+##### query
+
+`string`
+
+Search term
+
+#### Returns
+
+`Component`[]
+
+Array of matching components
+
+#### Example
+
+```typescript
+const results = query.search('order')
+// Matches: "PlaceOrder", "orders" domain, etc.
+```
+
+***
+
+### searchWithFlow()
+
+> **searchWithFlow**(`query`, `options`): `SearchWithFlowResult`
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:521
+
+Searches for components and returns their flow context.
+
+Returns both matching component IDs and all visible IDs in their flows.
+
+#### Parameters
+
+##### query
+
+`string`
+
+Search term
+
+##### options
+
+`SearchWithFlowOptions`
+
+Search options including returnAllOnEmptyQuery
+
+#### Returns
+
+`SearchWithFlowResult`
+
+Object with matchingIds and visibleIds arrays
+
+#### Example
+
+```typescript
+const result = query.searchWithFlow('checkout', { returnAllOnEmptyQuery: true })
+console.log(`Found ${result.matchingIds.length} matches`)
+console.log(`Showing ${result.visibleIds.length} nodes in context`)
+```
+
+***
+
+### statesFor()
+
+> **statesFor**(`entityName`): `State`[]
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:382
+
+Returns ordered states for an entity based on transitions.
+
+States are ordered by transition flow from initial to final states.
+
+#### Parameters
+
+##### entityName
+
+`string`
+
+The entity name to get states for
+
+#### Returns
+
+`State`[]
+
+Array of state names in transition order
+
+#### Example
+
+```typescript
+const orderStates = query.statesFor('Order')
+// ['pending', 'confirmed', 'shipped', 'delivered']
+```
+
+***
+
+### stats()
+
+> **stats**(): `GraphStats`
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:573
+
+Returns aggregate statistics about the graph.
+
+#### Returns
+
+`GraphStats`
+
+GraphStats with counts for components, links, domains, APIs, entities, and events
+
+#### Example
+
+```typescript
+const stats = query.stats()
+console.log(`Components: ${stats.componentCount}`)
+console.log(`Links: ${stats.linkCount}`)
+console.log(`Domains: ${stats.domainCount}`)
+```
+
+***
+
+### traceFlow()
+
+> **traceFlow**(`startComponentId`): `object`
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:418
+
+Traces the complete flow bidirectionally from a starting component.
+
+Returns all nodes and links connected to the starting point,
+following links in both directions.
+
+#### Parameters
+
+##### startComponentId
+
+`ComponentId`
+
+ID of the component to start tracing from
+
+#### Returns
+
+`object`
+
+Object with componentIds and linkIds in the flow
+
+##### componentIds
+
+> **componentIds**: `ComponentId`[]
+
+##### linkIds
+
+> **linkIds**: `LinkId`[]
+
+#### Example
+
+```typescript
+const flow = query.traceFlow('orders:checkout:api:post-orders')
+console.log(`Flow includes ${flow.componentIds.length} nodes`)
+```
+
+***
+
+### transitionsFor()
+
+> **transitionsFor**(`entityName`): `EntityTransition`[]
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:364
+
+Returns state transitions for an entity.
+
+#### Parameters
+
+##### entityName
+
+`string`
+
+The entity name to get transitions for
+
+#### Returns
+
+`EntityTransition`[]
+
+Array of EntityTransition objects
+
+#### Example
+
+```typescript
+const transitions = query.transitionsFor('Order')
+```
+
+***
+
+### validate()
+
+> **validate**(): `ValidationResult`
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:169
+
+Validates the graph structure beyond schema validation.
+
+Checks for structural issues like invalid link references.
+
+#### Returns
+
+`ValidationResult`
+
+Validation result with any errors found
+
+#### Example
+
+```typescript
+const result = query.validate()
+if (!result.valid) {
+  console.error('Validation errors:', result.errors)
+}
+```
+
+***
+
+### fromJSON()
+
+> `static` **fromJSON**(`json`): `RiviereQuery`
+
+Defined in: packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts:119
+
+Creates a RiviereQuery from raw JSON data.
+
+#### Parameters
+
+##### json
+
+`unknown`
+
+Raw JSON data to parse as a RiviereGraph
+
+#### Returns
+
+`RiviereQuery`
+
+A new RiviereQuery instance
+
+#### Throws
+
+If the JSON fails schema validation
+
+#### Example
+
+```typescript
+const jsonData = await fetch('/graph.json').then(r => r.json())
+const query = RiviereQuery.fromJSON(jsonData)
+```
diff --git a/apps/docs/reference/api/generated/riviere-builder/classes/SourceConflictError.md b/apps/docs/reference/api/generated/riviere-builder/classes/SourceConflictError.md
index 35d9ee01e..0ced2caec 100644
--- a/apps/docs/reference/api/generated/riviere-builder/classes/SourceConflictError.md
+++ b/apps/docs/reference/api/generated/riviere-builder/classes/SourceConflictError.md
@@ -4,7 +4,7 @@ pageClass: reference
 
 # Class: SourceConflictError
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:13](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L13)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:13
 
 ## Riviere-role
 
@@ -20,7 +20,7 @@ domain-error
 
 > **new SourceConflictError**(`repository`): `SourceConflictError`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:16](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L16)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:16
 
 #### Parameters
 
@@ -78,7 +78,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 > `readonly` **repository**: `string`
 
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts:14](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts#L14)
+Defined in: packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts:14
 
 ***
 
diff --git a/apps/docs/reference/api/generated/riviere-builder/functions/findNearMatches.md b/apps/docs/reference/api/generated/riviere-builder/functions/findNearMatches.md
index a245ebd0f..a5a00024b 100644
--- a/apps/docs/reference/api/generated/riviere-builder/functions/findNearMatches.md
+++ b/apps/docs/reference/api/generated/riviere-builder/functions/findNearMatches.md
@@ -4,9 +4,9 @@ pageClass: reference
 
 # Function: findNearMatches()
 
-> **findNearMatches**(`components`, `query`, `options?`): [`NearMatchResult`](../interfaces/NearMatchResult.md)[]
+> **findNearMatches**(`components`, `query`, `options?`): `Readonly`\<\{ `component`: `Component`; `mismatch?`: `Readonly`\<\{ `actual`: `string`; `expected`: `string`; `field`: `"type"` \| `"domain"`; \}\>; `score`: `number`; \}\>[]
 
-Defined in: [packages/riviere-builder/src/features/building/domain/error-recovery/component-suggestion.ts:60](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/error-recovery/component-suggestion.ts#L60)
+Defined in: packages/riviere-builder/domain-model/src/domain/error-recovery/component-suggestion.ts:75
 
 Finds components similar to a query using fuzzy matching.
 
@@ -16,25 +16,25 @@ Used for error recovery to suggest alternatives when exact matches fail.
 
 ### components
 
-`Component`[]
+readonly `Component`[]
 
 Array of components to search
 
 ### query
 
-[`NearMatchQuery`](../interfaces/NearMatchQuery.md)
+`NearMatchQuery`
 
 Search criteria with name and optional type/domain filters
 
 ### options?
 
-[`NearMatchOptions`](../interfaces/NearMatchOptions.md)
+`Readonly`\<\{ `limit?`: `number`; `threshold?`: `number`; \}\>
 
 Optional threshold and limit settings
 
 ## Returns
 
-[`NearMatchResult`](../interfaces/NearMatchResult.md)[]
+`Readonly`\<\{ `component`: `Component`; `mismatch?`: `Readonly`\<\{ `actual`: `string`; `expected`: `string`; `field`: `"type"` \| `"domain"`; \}\>; `score`: `number`; \}\>[]
 
 Array of matching components with similarity scores
 
diff --git a/apps/docs/reference/api/generated/riviere-builder/interfaces/APIInput.md b/apps/docs/reference/api/generated/riviere-builder/interfaces/APIInput.md
deleted file mode 100644
index 2be0191b2..000000000
--- a/apps/docs/reference/api/generated/riviere-builder/interfaces/APIInput.md
+++ /dev/null
@@ -1,91 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: APIInput
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:44](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L44)
-
-## Riviere-role
-
-value-object
-
-## Properties
-
-### apiType
-
-> **apiType**: `ApiType`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:48](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L48)
-
-***
-
-### description?
-
-> `optional` **description**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:52](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L52)
-
-***
-
-### domain
-
-> **domain**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:46](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L46)
-
-***
-
-### httpMethod?
-
-> `optional` **httpMethod**: `HttpMethod`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:49](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L49)
-
-***
-
-### metadata?
-
-> `optional` **metadata**: `Record`\<`string`, `unknown`\>
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:54](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L54)
-
-***
-
-### module
-
-> **module**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:47](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L47)
-
-***
-
-### name
-
-> **name**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:45](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L45)
-
-***
-
-### operationName?
-
-> `optional` **operationName**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:51](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L51)
-
-***
-
-### path?
-
-> `optional` **path**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:50](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L50)
-
-***
-
-### sourceLocation
-
-> **sourceLocation**: `SourceLocation`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:53](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L53)
diff --git a/apps/docs/reference/api/generated/riviere-builder/interfaces/BuilderOptions.md b/apps/docs/reference/api/generated/riviere-builder/interfaces/BuilderOptions.md
deleted file mode 100644
index 264c3a06c..000000000
--- a/apps/docs/reference/api/generated/riviere-builder/interfaces/BuilderOptions.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: BuilderOptions
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:15](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L15)
-
-## Riviere-role
-
-value-object
-
-## Properties
-
-### description?
-
-> `optional` **description**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:17](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L17)
-
-***
-
-### domains
-
-> **domains**: `Record`\<`string`, `DomainMetadata`\>
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:19](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L19)
-
-***
-
-### name?
-
-> `optional` **name**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:16](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L16)
-
-***
-
-### sources
-
-> **sources**: `SourceInfo`[]
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:18](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L18)
diff --git a/apps/docs/reference/api/generated/riviere-builder/interfaces/BuilderStats.md b/apps/docs/reference/api/generated/riviere-builder/interfaces/BuilderStats.md
deleted file mode 100644
index 095450477..000000000
--- a/apps/docs/reference/api/generated/riviere-builder/interfaces/BuilderStats.md
+++ /dev/null
@@ -1,79 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: BuilderStats
-
-Defined in: [packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts:2](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts#L2)
-
-## Riviere-role
-
-value-object
-
-## Properties
-
-### componentCount
-
-> **componentCount**: `number`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts:3](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts#L3)
-
-***
-
-### componentsByType
-
-> **componentsByType**: `object`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts:4](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts#L4)
-
-#### API
-
-> **API**: `number`
-
-#### Custom
-
-> **Custom**: `number`
-
-#### DomainOp
-
-> **DomainOp**: `number`
-
-#### Event
-
-> **Event**: `number`
-
-#### EventHandler
-
-> **EventHandler**: `number`
-
-#### UI
-
-> **UI**: `number`
-
-#### UseCase
-
-> **UseCase**: `number`
-
-***
-
-### domainCount
-
-> **domainCount**: `number`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts:15](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts#L15)
-
-***
-
-### externalLinkCount
-
-> **externalLinkCount**: `number`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts:14](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts#L14)
-
-***
-
-### linkCount
-
-> **linkCount**: `number`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts:13](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts#L13)
diff --git a/apps/docs/reference/api/generated/riviere-builder/interfaces/BuilderWarning.md b/apps/docs/reference/api/generated/riviere-builder/interfaces/BuilderWarning.md
deleted file mode 100644
index afbeb925a..000000000
--- a/apps/docs/reference/api/generated/riviere-builder/interfaces/BuilderWarning.md
+++ /dev/null
@@ -1,107 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: BuilderWarning
-
-Defined in: [packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts:26](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts#L26)
-
-## Riviere-role
-
-value-object
-
-## Properties
-
-### code
-
-> **code**: `WarningCode`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts:27](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts#L27)
-
-***
-
-### componentId?
-
-> `optional` **componentId**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts:29](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts#L29)
-
-***
-
-### domainName?
-
-> `optional` **domainName**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts:30](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts#L30)
-
-***
-
-### field?
-
-> `optional` **field**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts:31](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts#L31)
-
-***
-
-### linkType?
-
-> `optional` **linkType**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts:36](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts#L36)
-
-***
-
-### message
-
-> **message**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts:28](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts#L28)
-
-***
-
-### newValue?
-
-> `optional` **newValue**: `string` \| `number` \| `boolean`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts:33](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts#L33)
-
-***
-
-### oldValue?
-
-> `optional` **oldValue**: `string` \| `number` \| `boolean`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts:32](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts#L32)
-
-***
-
-### source?
-
-> `optional` **source**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts:34](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts#L34)
-
-***
-
-### target?
-
-> `optional` **target**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts:35](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts#L35)
-
-***
-
-### targetName?
-
-> `optional` **targetName**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts:38](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts#L38)
-
-***
-
-### targetRepository?
-
-> `optional` **targetRepository**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts:37](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts#L37)
diff --git a/apps/docs/reference/api/generated/riviere-builder/interfaces/ComponentIdParts.md b/apps/docs/reference/api/generated/riviere-builder/interfaces/ComponentIdParts.md
deleted file mode 100644
index 031d95eea..000000000
--- a/apps/docs/reference/api/generated/riviere-builder/interfaces/ComponentIdParts.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: ComponentIdParts
-
-Defined in: packages/riviere-schema/dist/component-id.d.ts:4
-
-Parts that make up a component ID.
-
-## Properties
-
-### domain
-
-> **domain**: `string`
-
-Defined in: packages/riviere-schema/dist/component-id.d.ts:5
-
-***
-
-### module
-
-> **module**: `string`
-
-Defined in: packages/riviere-schema/dist/component-id.d.ts:6
-
-***
-
-### name
-
-> **name**: `string`
-
-Defined in: packages/riviere-schema/dist/component-id.d.ts:8
-
-***
-
-### type
-
-> **type**: `string`
-
-Defined in: packages/riviere-schema/dist/component-id.d.ts:7
diff --git a/apps/docs/reference/api/generated/riviere-builder/interfaces/CustomInput.md b/apps/docs/reference/api/generated/riviere-builder/interfaces/CustomInput.md
deleted file mode 100644
index 814d0d8df..000000000
--- a/apps/docs/reference/api/generated/riviere-builder/interfaces/CustomInput.md
+++ /dev/null
@@ -1,67 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: CustomInput
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:121](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L121)
-
-## Riviere-role
-
-value-object
-
-## Properties
-
-### customTypeName
-
-> **customTypeName**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:122](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L122)
-
-***
-
-### description?
-
-> `optional` **description**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:126](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L126)
-
-***
-
-### domain
-
-> **domain**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:124](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L124)
-
-***
-
-### metadata?
-
-> `optional` **metadata**: `Record`\<`string`, `unknown`\>
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:128](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L128)
-
-***
-
-### module
-
-> **module**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:125](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L125)
-
-***
-
-### name
-
-> **name**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:123](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L123)
-
-***
-
-### sourceLocation
-
-> **sourceLocation**: `SourceLocation`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:127](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L127)
diff --git a/apps/docs/reference/api/generated/riviere-builder/interfaces/CustomTypeInput.md b/apps/docs/reference/api/generated/riviere-builder/interfaces/CustomTypeInput.md
deleted file mode 100644
index 0884b4a8d..000000000
--- a/apps/docs/reference/api/generated/riviere-builder/interfaces/CustomTypeInput.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: CustomTypeInput
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:107](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L107)
-
-## Riviere-role
-
-value-object
-
-## Properties
-
-### description?
-
-> `optional` **description**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:109](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L109)
-
-***
-
-### name
-
-> **name**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:108](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L108)
-
-***
-
-### optionalProperties?
-
-> `optional` **optionalProperties**: `Record`\<`string`, `CustomPropertyDefinition`\>
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:111](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L111)
-
-***
-
-### requiredProperties?
-
-> `optional` **requiredProperties**: `Record`\<`string`, `CustomPropertyDefinition`\>
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:110](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L110)
diff --git a/apps/docs/reference/api/generated/riviere-builder/interfaces/DomainInput.md b/apps/docs/reference/api/generated/riviere-builder/interfaces/DomainInput.md
deleted file mode 100644
index b45237294..000000000
--- a/apps/docs/reference/api/generated/riviere-builder/interfaces/DomainInput.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: DomainInput
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:23](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L23)
-
-## Riviere-role
-
-value-object
-
-## Properties
-
-### description
-
-> **description**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:25](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L25)
-
-***
-
-### name
-
-> **name**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:24](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L24)
-
-***
-
-### systemType
-
-> **systemType**: `SystemType`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:26](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L26)
diff --git a/apps/docs/reference/api/generated/riviere-builder/interfaces/DomainOpInput.md b/apps/docs/reference/api/generated/riviere-builder/interfaces/DomainOpInput.md
deleted file mode 100644
index 4c182db82..000000000
--- a/apps/docs/reference/api/generated/riviere-builder/interfaces/DomainOpInput.md
+++ /dev/null
@@ -1,107 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: DomainOpInput
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:68](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L68)
-
-## Riviere-role
-
-value-object
-
-## Properties
-
-### behavior?
-
-> `optional` **behavior**: `OperationBehavior`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:75](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L75)
-
-***
-
-### businessRules?
-
-> `optional` **businessRules**: `string`[]
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:77](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L77)
-
-***
-
-### description?
-
-> `optional` **description**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:78](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L78)
-
-***
-
-### domain
-
-> **domain**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:70](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L70)
-
-***
-
-### entity?
-
-> `optional` **entity**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:73](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L73)
-
-***
-
-### metadata?
-
-> `optional` **metadata**: `Record`\<`string`, `unknown`\>
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:80](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L80)
-
-***
-
-### module
-
-> **module**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:71](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L71)
-
-***
-
-### name
-
-> **name**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:69](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L69)
-
-***
-
-### operationName
-
-> **operationName**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:72](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L72)
-
-***
-
-### signature?
-
-> `optional` **signature**: `OperationSignature`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:74](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L74)
-
-***
-
-### sourceLocation
-
-> **sourceLocation**: `SourceLocation`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:79](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L79)
-
-***
-
-### stateChanges?
-
-> `optional` **stateChanges**: `StateTransition`[]
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:76](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L76)
diff --git a/apps/docs/reference/api/generated/riviere-builder/interfaces/EnrichmentInput.md b/apps/docs/reference/api/generated/riviere-builder/interfaces/EnrichmentInput.md
deleted file mode 100644
index 24a430d45..000000000
--- a/apps/docs/reference/api/generated/riviere-builder/interfaces/EnrichmentInput.md
+++ /dev/null
@@ -1,51 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: EnrichmentInput
-
-Defined in: [packages/riviere-builder/src/features/building/domain/enrichment/enrichment-types.ts:8](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/enrichment/enrichment-types.ts#L8)
-
-## Riviere-role
-
-value-object
-
-## Properties
-
-### behavior?
-
-> `optional` **behavior**: `OperationBehavior`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/enrichment/enrichment-types.ts:12](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/enrichment/enrichment-types.ts#L12)
-
-***
-
-### businessRules?
-
-> `optional` **businessRules**: `string`[]
-
-Defined in: [packages/riviere-builder/src/features/building/domain/enrichment/enrichment-types.ts:11](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/enrichment/enrichment-types.ts#L11)
-
-***
-
-### entity?
-
-> `optional` **entity**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/enrichment/enrichment-types.ts:9](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/enrichment/enrichment-types.ts#L9)
-
-***
-
-### signature?
-
-> `optional` **signature**: `OperationSignature`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/enrichment/enrichment-types.ts:13](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/enrichment/enrichment-types.ts#L13)
-
-***
-
-### stateChanges?
-
-> `optional` **stateChanges**: `StateTransition`[]
-
-Defined in: [packages/riviere-builder/src/features/building/domain/enrichment/enrichment-types.ts:10](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/enrichment/enrichment-types.ts#L10)
diff --git a/apps/docs/reference/api/generated/riviere-builder/interfaces/EventHandlerInput.md b/apps/docs/reference/api/generated/riviere-builder/interfaces/EventHandlerInput.md
deleted file mode 100644
index fe39c8a82..000000000
--- a/apps/docs/reference/api/generated/riviere-builder/interfaces/EventHandlerInput.md
+++ /dev/null
@@ -1,67 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: EventHandlerInput
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:96](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L96)
-
-## Riviere-role
-
-value-object
-
-## Properties
-
-### description?
-
-> `optional` **description**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:101](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L101)
-
-***
-
-### domain
-
-> **domain**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:98](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L98)
-
-***
-
-### metadata?
-
-> `optional` **metadata**: `Record`\<`string`, `unknown`\>
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:103](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L103)
-
-***
-
-### module
-
-> **module**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:99](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L99)
-
-***
-
-### name
-
-> **name**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:97](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L97)
-
-***
-
-### sourceLocation
-
-> **sourceLocation**: `SourceLocation`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:102](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L102)
-
-***
-
-### subscribedEvents
-
-> **subscribedEvents**: `string`[]
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:100](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L100)
diff --git a/apps/docs/reference/api/generated/riviere-builder/interfaces/EventInput.md b/apps/docs/reference/api/generated/riviere-builder/interfaces/EventInput.md
deleted file mode 100644
index ca416552c..000000000
--- a/apps/docs/reference/api/generated/riviere-builder/interfaces/EventInput.md
+++ /dev/null
@@ -1,75 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: EventInput
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:84](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L84)
-
-## Riviere-role
-
-value-object
-
-## Properties
-
-### description?
-
-> `optional` **description**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:90](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L90)
-
-***
-
-### domain
-
-> **domain**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:86](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L86)
-
-***
-
-### eventName
-
-> **eventName**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:88](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L88)
-
-***
-
-### eventSchema?
-
-> `optional` **eventSchema**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:89](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L89)
-
-***
-
-### metadata?
-
-> `optional` **metadata**: `Record`\<`string`, `unknown`\>
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:92](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L92)
-
-***
-
-### module
-
-> **module**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:87](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L87)
-
-***
-
-### name
-
-> **name**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:85](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L85)
-
-***
-
-### sourceLocation
-
-> **sourceLocation**: `SourceLocation`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:91](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L91)
diff --git a/apps/docs/reference/api/generated/riviere-builder/interfaces/ExternalLinkInput.md b/apps/docs/reference/api/generated/riviere-builder/interfaces/ExternalLinkInput.md
deleted file mode 100644
index dc3bc1292..000000000
--- a/apps/docs/reference/api/generated/riviere-builder/interfaces/ExternalLinkInput.md
+++ /dev/null
@@ -1,59 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: ExternalLinkInput
-
-Defined in: [packages/riviere-builder/src/features/building/domain/linking/linking-types.ts:16](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/linking/linking-types.ts#L16)
-
-## Riviere-role
-
-value-object
-
-## Properties
-
-### description?
-
-> `optional` **description**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/linking/linking-types.ts:20](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/linking/linking-types.ts#L20)
-
-***
-
-### from
-
-> **from**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/linking/linking-types.ts:17](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/linking/linking-types.ts#L17)
-
-***
-
-### metadata?
-
-> `optional` **metadata**: `Record`\<`string`, `unknown`\>
-
-Defined in: [packages/riviere-builder/src/features/building/domain/linking/linking-types.ts:22](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/linking/linking-types.ts#L22)
-
-***
-
-### sourceLocation?
-
-> `optional` **sourceLocation**: `SourceLocation`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/linking/linking-types.ts:21](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/linking/linking-types.ts#L21)
-
-***
-
-### target
-
-> **target**: `ExternalTarget`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/linking/linking-types.ts:18](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/linking/linking-types.ts#L18)
-
-***
-
-### type?
-
-> `optional` **type**: `LinkType`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/linking/linking-types.ts:19](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/linking/linking-types.ts#L19)
diff --git a/apps/docs/reference/api/generated/riviere-builder/interfaces/LinkInput.md b/apps/docs/reference/api/generated/riviere-builder/interfaces/LinkInput.md
deleted file mode 100644
index 4c31f5e16..000000000
--- a/apps/docs/reference/api/generated/riviere-builder/interfaces/LinkInput.md
+++ /dev/null
@@ -1,59 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: LinkInput
-
-Defined in: [packages/riviere-builder/src/features/building/domain/linking/linking-types.ts:6](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/linking/linking-types.ts#L6)
-
-## Riviere-role
-
-value-object
-
-## Properties
-
-### condition?
-
-> `optional` **condition**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/linking/linking-types.ts:11](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/linking/linking-types.ts#L11)
-
-***
-
-### from
-
-> **from**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/linking/linking-types.ts:7](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/linking/linking-types.ts#L7)
-
-***
-
-### relationshipType?
-
-> `optional` **relationshipType**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/linking/linking-types.ts:10](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/linking/linking-types.ts#L10)
-
-***
-
-### sourceLocation?
-
-> `optional` **sourceLocation**: `SourceLocation`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/linking/linking-types.ts:12](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/linking/linking-types.ts#L12)
-
-***
-
-### to
-
-> **to**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/linking/linking-types.ts:8](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/linking/linking-types.ts#L8)
-
-***
-
-### type?
-
-> `optional` **type**: `LinkType`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/linking/linking-types.ts:9](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/linking/linking-types.ts#L9)
diff --git a/apps/docs/reference/api/generated/riviere-builder/interfaces/NearMatchMismatch.md b/apps/docs/reference/api/generated/riviere-builder/interfaces/NearMatchMismatch.md
deleted file mode 100644
index 481b52e09..000000000
--- a/apps/docs/reference/api/generated/riviere-builder/interfaces/NearMatchMismatch.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: NearMatchMismatch
-
-Defined in: [packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts:11](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts#L11)
-
-## Riviere-role
-
-value-object
-
-## Properties
-
-### actual
-
-> **actual**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts:14](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts#L14)
-
-***
-
-### expected
-
-> **expected**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts:13](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts#L13)
-
-***
-
-### field
-
-> **field**: `"domain"` \| `"type"`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts:12](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts#L12)
diff --git a/apps/docs/reference/api/generated/riviere-builder/interfaces/NearMatchOptions.md b/apps/docs/reference/api/generated/riviere-builder/interfaces/NearMatchOptions.md
deleted file mode 100644
index 65e895cb8..000000000
--- a/apps/docs/reference/api/generated/riviere-builder/interfaces/NearMatchOptions.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: NearMatchOptions
-
-Defined in: [packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts:25](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts#L25)
-
-## Riviere-role
-
-value-object
-
-## Properties
-
-### limit?
-
-> `optional` **limit**: `number`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts:27](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts#L27)
-
-***
-
-### threshold?
-
-> `optional` **threshold**: `number`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts:26](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts#L26)
diff --git a/apps/docs/reference/api/generated/riviere-builder/interfaces/NearMatchQuery.md b/apps/docs/reference/api/generated/riviere-builder/interfaces/NearMatchQuery.md
deleted file mode 100644
index ceb841762..000000000
--- a/apps/docs/reference/api/generated/riviere-builder/interfaces/NearMatchQuery.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: NearMatchQuery
-
-Defined in: [packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts:4](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts#L4)
-
-## Riviere-role
-
-value-object
-
-## Properties
-
-### domain?
-
-> `optional` **domain**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts:7](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts#L7)
-
-***
-
-### name
-
-> **name**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts:5](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts#L5)
-
-***
-
-### type?
-
-> `optional` **type**: `ComponentType`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts:6](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts#L6)
diff --git a/apps/docs/reference/api/generated/riviere-builder/interfaces/NearMatchResult.md b/apps/docs/reference/api/generated/riviere-builder/interfaces/NearMatchResult.md
deleted file mode 100644
index 57975dd02..000000000
--- a/apps/docs/reference/api/generated/riviere-builder/interfaces/NearMatchResult.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: NearMatchResult
-
-Defined in: [packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts:18](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts#L18)
-
-## Riviere-role
-
-value-object
-
-## Properties
-
-### component
-
-> **component**: `Component`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts:19](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts#L19)
-
-***
-
-### mismatch?
-
-> `optional` **mismatch**: [`NearMatchMismatch`](NearMatchMismatch.md)
-
-Defined in: [packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts:21](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts#L21)
-
-***
-
-### score
-
-> **score**: `number`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts:20](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts#L20)
diff --git a/apps/docs/reference/api/generated/riviere-builder/interfaces/RelationshipTypeInput.md b/apps/docs/reference/api/generated/riviere-builder/interfaces/RelationshipTypeInput.md
deleted file mode 100644
index ba70d4e8f..000000000
--- a/apps/docs/reference/api/generated/riviere-builder/interfaces/RelationshipTypeInput.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: RelationshipTypeInput
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:115](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L115)
-
-## Riviere-role
-
-value-object
-
-## Properties
-
-### description
-
-> **description**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:117](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L117)
-
-***
-
-### name
-
-> **name**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:116](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L116)
diff --git a/apps/docs/reference/api/generated/riviere-builder/interfaces/UIInput.md b/apps/docs/reference/api/generated/riviere-builder/interfaces/UIInput.md
deleted file mode 100644
index ed9ffbf07..000000000
--- a/apps/docs/reference/api/generated/riviere-builder/interfaces/UIInput.md
+++ /dev/null
@@ -1,67 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: UIInput
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:33](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L33)
-
-## Riviere-role
-
-value-object
-
-## Properties
-
-### description?
-
-> `optional` **description**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:38](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L38)
-
-***
-
-### domain
-
-> **domain**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:35](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L35)
-
-***
-
-### metadata?
-
-> `optional` **metadata**: `Record`\<`string`, `unknown`\>
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:40](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L40)
-
-***
-
-### module
-
-> **module**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:36](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L36)
-
-***
-
-### name
-
-> **name**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:34](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L34)
-
-***
-
-### route
-
-> **route**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:37](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L37)
-
-***
-
-### sourceLocation
-
-> **sourceLocation**: `SourceLocation`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:39](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L39)
diff --git a/apps/docs/reference/api/generated/riviere-builder/interfaces/UpsertOptions.md b/apps/docs/reference/api/generated/riviere-builder/interfaces/UpsertOptions.md
deleted file mode 100644
index 6a6d7a74f..000000000
--- a/apps/docs/reference/api/generated/riviere-builder/interfaces/UpsertOptions.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: UpsertOptions
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:30](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L30)
-
-## Riviere-role
-
-value-object
-
-## Properties
-
-### noOverwrite?
-
-> `optional` **noOverwrite**: `boolean`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:30](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L30)
diff --git a/apps/docs/reference/api/generated/riviere-builder/interfaces/UseCaseInput.md b/apps/docs/reference/api/generated/riviere-builder/interfaces/UseCaseInput.md
deleted file mode 100644
index 3c58d75ca..000000000
--- a/apps/docs/reference/api/generated/riviere-builder/interfaces/UseCaseInput.md
+++ /dev/null
@@ -1,59 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: UseCaseInput
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:58](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L58)
-
-## Riviere-role
-
-value-object
-
-## Properties
-
-### description?
-
-> `optional` **description**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:62](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L62)
-
-***
-
-### domain
-
-> **domain**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:60](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L60)
-
-***
-
-### metadata?
-
-> `optional` **metadata**: `Record`\<`string`, `unknown`\>
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:64](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L64)
-
-***
-
-### module
-
-> **module**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:61](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L61)
-
-***
-
-### name
-
-> **name**: `string`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:59](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L59)
-
-***
-
-### sourceLocation
-
-> **sourceLocation**: `SourceLocation`
-
-Defined in: [packages/riviere-builder/src/features/building/domain/construction/construction-types.ts:63](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts#L63)
diff --git a/apps/docs/reference/api/generated/riviere-query/README.md b/apps/docs/reference/api/generated/riviere-query/README.md
deleted file mode 100644
index 359e2fcad..000000000
--- a/apps/docs/reference/api/generated/riviere-query/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
----
-pageClass: reference
----
-
-# @living-architecture/riviere-query
-
-## Classes
-
-- [ComponentNotFoundError](classes/ComponentNotFoundError.md)
-- [RiviereQuery](classes/RiviereQuery.md)
-
-## Interfaces
-
-- [ComponentCounts](interfaces/ComponentCounts.md)
-- [ComponentModification](interfaces/ComponentModification.md)
-- [CrossDomainLink](interfaces/CrossDomainLink.md)
-- [DiffStats](interfaces/DiffStats.md)
-- [Domain](interfaces/Domain.md)
-- [DomainConnection](interfaces/DomainConnection.md)
-- [Entity](interfaces/Entity.md)
-- [EntityTransition](interfaces/EntityTransition.md)
-- [EventHandlerInfo](interfaces/EventHandlerInfo.md)
-- [EventSubscriber](interfaces/EventSubscriber.md)
-- [ExternalDomain](interfaces/ExternalDomain.md)
-- [Flow](interfaces/Flow.md)
-- [FlowStep](interfaces/FlowStep.md)
-- [GraphDiff](interfaces/GraphDiff.md)
-- [GraphStats](interfaces/GraphStats.md)
-- [KnownSourceEvent](interfaces/KnownSourceEvent.md)
-- [PublishedEvent](interfaces/PublishedEvent.md)
-- [SearchWithFlowOptions](interfaces/SearchWithFlowOptions.md)
-- [SearchWithFlowResult](interfaces/SearchWithFlowResult.md)
-- [UnknownSourceEvent](interfaces/UnknownSourceEvent.md)
-- [ValidationError](interfaces/ValidationError.md)
-- [ValidationResult](interfaces/ValidationResult.md)
-
-## Type Aliases
-
-- [ComponentId](type-aliases/ComponentId.md)
-- [DomainName](type-aliases/DomainName.md)
-- [EntityName](type-aliases/EntityName.md)
-- [EventId](type-aliases/EventId.md)
-- [EventName](type-aliases/EventName.md)
-- [HandlerId](type-aliases/HandlerId.md)
-- [HandlerName](type-aliases/HandlerName.md)
-- [LinkId](type-aliases/LinkId.md)
-- [LinkType](type-aliases/LinkType.md)
-- [OperationName](type-aliases/OperationName.md)
-- [State](type-aliases/State.md)
-- [SubscribedEventWithDomain](type-aliases/SubscribedEventWithDomain.md)
-- [ValidationErrorCode](type-aliases/ValidationErrorCode.md)
-
-## Functions
-
-- [compareByCodePoint](functions/compareByCodePoint.md)
-- [parseComponentId](functions/parseComponentId.md)
-- [parseDomainName](functions/parseDomainName.md)
-- [parseEntityName](functions/parseEntityName.md)
-- [parseEventId](functions/parseEventId.md)
-- [parseEventName](functions/parseEventName.md)
-- [parseHandlerId](functions/parseHandlerId.md)
-- [parseHandlerName](functions/parseHandlerName.md)
-- [parseLinkId](functions/parseLinkId.md)
-- [parseOperationName](functions/parseOperationName.md)
-- [parseState](functions/parseState.md)
diff --git a/apps/docs/reference/api/generated/riviere-query/classes/ComponentNotFoundError.md b/apps/docs/reference/api/generated/riviere-query/classes/ComponentNotFoundError.md
deleted file mode 100644
index 2766dd1c7..000000000
--- a/apps/docs/reference/api/generated/riviere-query/classes/ComponentNotFoundError.md
+++ /dev/null
@@ -1,227 +0,0 @@
----
-pageClass: reference
----
-
-# Class: ComponentNotFoundError
-
-Defined in: [packages/riviere-query/src/features/querying/queries/errors.ts:2](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/errors.ts#L2)
-
-## Riviere-role
-
-query-model-error
-
-## Extends
-
-- `Error`
-
-## Constructors
-
-### Constructor
-
-> **new ComponentNotFoundError**(`componentId`, `suggestions`): `ComponentNotFoundError`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/errors.ts:6](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/errors.ts#L6)
-
-#### Parameters
-
-##### componentId
-
-`string`
-
-##### suggestions
-
-`string`[] = `[]`
-
-#### Returns
-
-`ComponentNotFoundError`
-
-#### Overrides
-
-`Error.constructor`
-
-## Properties
-
-### cause?
-
-> `optional` **cause**: `unknown`
-
-Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/lib.es2022.error.d.ts:26
-
-#### Inherited from
-
-`Error.cause`
-
-***
-
-### componentId
-
-> `readonly` **componentId**: `string`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/errors.ts:3](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/errors.ts#L3)
-
-***
-
-### message
-
-> **message**: `string`
-
-Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/lib.es5.d.ts:1077
-
-#### Inherited from
-
-`Error.message`
-
-***
-
-### name
-
-> **name**: `string`
-
-Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/lib.es5.d.ts:1076
-
-#### Inherited from
-
-`Error.name`
-
-***
-
-### stack?
-
-> `optional` **stack**: `string`
-
-Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/lib.es5.d.ts:1078
-
-#### Inherited from
-
-`Error.stack`
-
-***
-
-### suggestions
-
-> `readonly` **suggestions**: `string`[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/errors.ts:4](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/errors.ts#L4)
-
-***
-
-### stackTraceLimit
-
-> `static` **stackTraceLimit**: `number`
-
-Defined in: node\_modules/.pnpm/@types+node@24.10.9/node\_modules/@types/node/globals.d.ts:68
-
-The `Error.stackTraceLimit` property specifies the number of stack frames
-collected by a stack trace (whether generated by `new Error().stack` or
-`Error.captureStackTrace(obj)`).
-
-The default value is `10` but may be set to any valid JavaScript number. Changes
-will affect any stack trace captured _after_ the value has been changed.
-
-If set to a non-number value, or set to a negative number, stack traces will
-not capture any frames.
-
-#### Inherited from
-
-`Error.stackTraceLimit`
-
-## Methods
-
-### captureStackTrace()
-
-> `static` **captureStackTrace**(`targetObject`, `constructorOpt?`): `void`
-
-Defined in: node\_modules/.pnpm/@types+node@24.10.9/node\_modules/@types/node/globals.d.ts:52
-
-Creates a `.stack` property on `targetObject`, which when accessed returns
-a string representing the location in the code at which
-`Error.captureStackTrace()` was called.
-
-```js
-const myObject = {};
-Error.captureStackTrace(myObject);
-myObject.stack;  // Similar to `new Error().stack`
-```
-
-The first line of the trace will be prefixed with
-`${myObject.name}: ${myObject.message}`.
-
-The optional `constructorOpt` argument accepts a function. If given, all frames
-above `constructorOpt`, including `constructorOpt`, will be omitted from the
-generated stack trace.
-
-The `constructorOpt` argument is useful for hiding implementation
-details of error generation from the user. For instance:
-
-```js
-function a() {
-  b();
-}
-
-function b() {
-  c();
-}
-
-function c() {
-  // Create an error without stack trace to avoid calculating the stack trace twice.
-  const { stackTraceLimit } = Error;
-  Error.stackTraceLimit = 0;
-  const error = new Error();
-  Error.stackTraceLimit = stackTraceLimit;
-
-  // Capture the stack trace above function b
-  Error.captureStackTrace(error, b); // Neither function c, nor b is included in the stack trace
-  throw error;
-}
-
-a();
-```
-
-#### Parameters
-
-##### targetObject
-
-`object`
-
-##### constructorOpt?
-
-`Function`
-
-#### Returns
-
-`void`
-
-#### Inherited from
-
-`Error.captureStackTrace`
-
-***
-
-### prepareStackTrace()
-
-> `static` **prepareStackTrace**(`err`, `stackTraces`): `any`
-
-Defined in: node\_modules/.pnpm/@types+node@24.10.9/node\_modules/@types/node/globals.d.ts:56
-
-#### Parameters
-
-##### err
-
-`Error`
-
-##### stackTraces
-
-`CallSite`[]
-
-#### Returns
-
-`any`
-
-#### See
-
-https://v8.dev/docs/stack-trace-api#customizing-stack-traces
-
-#### Inherited from
-
-`Error.prepareStackTrace`
diff --git a/apps/docs/reference/api/generated/riviere-query/classes/RiviereQuery.md b/apps/docs/reference/api/generated/riviere-query/classes/RiviereQuery.md
deleted file mode 100644
index eed26919f..000000000
--- a/apps/docs/reference/api/generated/riviere-query/classes/RiviereQuery.md
+++ /dev/null
@@ -1,980 +0,0 @@
----
-pageClass: reference
----
-
-# Class: RiviereQuery
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:119](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L119)
-
-Query and analyze Riviere architecture graphs.
-
-RiviereQuery provides methods to explore components, trace execution flows,
-analyze domain models, and compare graph versions.
-
-## Example
-
-```typescript
-import { RiviereQuery } from '@living-architecture/riviere-query'
-
-// From JSON
-const query = RiviereQuery.fromJSON(graphData)
-
-// Query components
-const apis = query.componentsByType('API')
-const orderDomain = query.componentsInDomain('orders')
-
-// Trace flows
-const flow = query.traceFlow('orders:checkout:api:post-orders')
-```
-
-## Riviere-role
-
-query-model
-
-## Constructors
-
-### Constructor
-
-> **new RiviereQuery**(`graph`): `RiviereQuery`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:134](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L134)
-
-Creates a new RiviereQuery instance.
-
-#### Parameters
-
-##### graph
-
-`RiviereGraph`
-
-A valid RiviereGraph object
-
-#### Returns
-
-`RiviereQuery`
-
-#### Throws
-
-If the graph fails schema validation
-
-#### Example
-
-```typescript
-const graph: RiviereGraph = JSON.parse(jsonString)
-const query = new RiviereQuery(graph)
-```
-
-## Methods
-
-### businessRulesFor()
-
-> **businessRulesFor**(`entityName`): `string`[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:382](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L382)
-
-Returns all business rules for an entity's operations.
-
-#### Parameters
-
-##### entityName
-
-`string`
-
-The entity name to get rules for
-
-#### Returns
-
-`string`[]
-
-Array of business rule strings
-
-#### Example
-
-```typescript
-const rules = query.businessRulesFor('Order')
-```
-
-***
-
-### componentById()
-
-> **componentById**(`id`): `Component` \| `undefined`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:266](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L266)
-
-Finds a component by its ID.
-
-#### Parameters
-
-##### id
-
-`string` & `$brand`\<`"ComponentId"`\>
-
-The component ID to look up
-
-#### Returns
-
-`Component` \| `undefined`
-
-The component, or undefined if not found
-
-#### Example
-
-```typescript
-const component = query.componentById('orders:checkout:api:post-orders')
-```
-
-***
-
-### components()
-
-> **components**(): `Component`[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:168](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L168)
-
-Returns all components in the graph.
-
-#### Returns
-
-`Component`[]
-
-Array of all components
-
-#### Example
-
-```typescript
-const allComponents = query.components()
-console.log(`Total: ${allComponents.length}`)
-```
-
-***
-
-### componentsByType()
-
-> **componentsByType**(`type`): `Component`[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:315](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L315)
-
-Returns all components of a specific type.
-
-#### Parameters
-
-##### type
-
-`ComponentType`
-
-The component type to filter by
-
-#### Returns
-
-`Component`[]
-
-Array of components of that type
-
-#### Example
-
-```typescript
-const apis = query.componentsByType('API')
-const events = query.componentsByType('Event')
-```
-
-***
-
-### componentsInDomain()
-
-> **componentsInDomain**(`domainName`): `Component`[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:299](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L299)
-
-Returns all components in a specific domain.
-
-#### Parameters
-
-##### domainName
-
-`string`
-
-The domain name to filter by
-
-#### Returns
-
-`Component`[]
-
-Array of components in the domain
-
-#### Example
-
-```typescript
-const orderComponents = query.componentsInDomain('orders')
-```
-
-***
-
-### crossDomainLinks()
-
-> **crossDomainLinks**(`domainName`): [`CrossDomainLink`](../interfaces/CrossDomainLink.md)[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:569](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L569)
-
-Returns links from a domain to other domains.
-
-#### Parameters
-
-##### domainName
-
-`string`
-
-The source domain name
-
-#### Returns
-
-[`CrossDomainLink`](../interfaces/CrossDomainLink.md)[]
-
-Array of CrossDomainLink objects (deduplicated by target domain and type)
-
-#### Example
-
-```typescript
-const outgoing = query.crossDomainLinks('orders')
-```
-
-***
-
-### detectOrphans()
-
-> **detectOrphans**(): `string` & `$brand`\<`"ComponentId"`\>[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:219](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L219)
-
-Detects orphan components with no incoming or outgoing links.
-
-#### Returns
-
-`string` & `$brand`\<`"ComponentId"`\>[]
-
-Array of component IDs that are disconnected from the graph
-
-#### Example
-
-```typescript
-const orphanIds = query.detectOrphans()
-if (orphanIds.length > 0) {
-  console.warn(`Found ${orphanIds.length} orphan nodes`)
-}
-```
-
-***
-
-### diff()
-
-> **diff**(`other`): [`GraphDiff`](../interfaces/GraphDiff.md)
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:474](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L474)
-
-Compares this graph with another and returns the differences.
-
-#### Parameters
-
-##### other
-
-`RiviereGraph`
-
-The graph to compare against
-
-#### Returns
-
-[`GraphDiff`](../interfaces/GraphDiff.md)
-
-GraphDiff with added, removed, and modified items
-
-#### Example
-
-```typescript
-const oldGraph = RiviereQuery.fromJSON(oldData)
-const newGraph = RiviereQuery.fromJSON(newData)
-const diff = newGraph.diff(oldGraph.graph)
-
-console.log(`Added: ${diff.stats.componentsAdded}`)
-console.log(`Removed: ${diff.stats.componentsRemoved}`)
-```
-
-***
-
-### domainConnections()
-
-> **domainConnections**(`domainName`): [`DomainConnection`](../interfaces/DomainConnection.md)[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:589](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L589)
-
-Returns cross-domain connections with API and event counts.
-
-Shows both incoming and outgoing connections for a domain.
-
-#### Parameters
-
-##### domainName
-
-`string`
-
-The domain to analyze
-
-#### Returns
-
-[`DomainConnection`](../interfaces/DomainConnection.md)[]
-
-Array of DomainConnection objects
-
-#### Example
-
-```typescript
-const connections = query.domainConnections('orders')
-for (const conn of connections) {
-  console.log(`${conn.direction} to ${conn.targetDomain}: ${conn.apiCount} API, ${conn.eventCount} event`)
-}
-```
-
-***
-
-### domains()
-
-> **domains**(): [`Domain`](../interfaces/Domain.md)[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:332](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L332)
-
-Returns domain information with component counts.
-
-#### Returns
-
-[`Domain`](../interfaces/Domain.md)[]
-
-Array of Domain objects sorted by name
-
-#### Example
-
-```typescript
-const domains = query.domains()
-for (const domain of domains) {
-  console.log(`${domain.name}: ${domain.componentCounts.total} components`)
-}
-```
-
-***
-
-### entities()
-
-> **entities**(`domainName?`): [`Entity`](../interfaces/Entity.md)[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:367](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L367)
-
-Returns entities with their domain operations.
-
-#### Parameters
-
-##### domainName?
-
-`string`
-
-Optional domain to filter by
-
-#### Returns
-
-[`Entity`](../interfaces/Entity.md)[]
-
-Array of Entity objects with their operations
-
-#### Example
-
-```typescript
-const allEntities = query.entities()
-const orderEntities = query.entities('orders')
-
-for (const entity of orderEntities) {
-  console.log(`${entity.name} has ${entity.operations.length} operations`)
-}
-```
-
-***
-
-### entryPoints()
-
-> **entryPoints**(): `Component`[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:432](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L432)
-
-Returns components that are entry points to the system.
-
-Entry points are UI, API, EventHandler, or Custom components
-with no incoming links.
-
-#### Returns
-
-`Component`[]
-
-Array of entry point components
-
-#### Example
-
-```typescript
-const entryPoints = query.entryPoints()
-```
-
-***
-
-### eventHandlers()
-
-> **eventHandlers**(`eventName?`): [`EventHandlerInfo`](../interfaces/EventHandlerInfo.md)[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:510](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L510)
-
-Returns event handlers with their subscriptions.
-
-#### Parameters
-
-##### eventName?
-
-`string`
-
-Optional event name to filter handlers by
-
-#### Returns
-
-[`EventHandlerInfo`](../interfaces/EventHandlerInfo.md)[]
-
-Array of EventHandlerInfo objects sorted by handler name
-
-#### Example
-
-```typescript
-const allHandlers = query.eventHandlers()
-const orderPlacedHandlers = query.eventHandlers('order-placed')
-```
-
-***
-
-### externalDomains()
-
-> **externalDomains**(): [`ExternalDomain`](../interfaces/ExternalDomain.md)[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:665](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L665)
-
-Returns external domains that components connect to.
-
-Each unique external target is returned as a separate ExternalDomain,
-with aggregated source domains and connection counts.
-
-#### Returns
-
-[`ExternalDomain`](../interfaces/ExternalDomain.md)[]
-
-Array of ExternalDomain objects, sorted alphabetically by name
-
-#### Example
-
-```typescript
-const externals = query.externalDomains()
-for (const ext of externals) {
-  console.log(`${ext.name}: ${ext.connectionCount} connections from ${ext.sourceDomains.join(', ')}`)
-}
-```
-
-***
-
-### externalLinks()
-
-> **externalLinks**(): `ExternalLink`[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:645](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L645)
-
-Returns all external links in the graph.
-
-External links represent connections from components to external
-systems that are not part of the graph (e.g., third-party APIs).
-
-#### Returns
-
-`ExternalLink`[]
-
-Array of all external links, or empty array if none exist
-
-#### Example
-
-```typescript
-const externalLinks = query.externalLinks()
-for (const link of externalLinks) {
-  console.log(`${link.source} -> ${link.target.name}`)
-}
-```
-
-***
-
-### find()
-
-> **find**(`predicate`): `Component` \| `undefined`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:234](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L234)
-
-Finds the first component matching a predicate.
-
-#### Parameters
-
-##### predicate
-
-(`component`) => `boolean`
-
-Function that returns true for matching components
-
-#### Returns
-
-`Component` \| `undefined`
-
-The first matching component, or undefined if none found
-
-#### Example
-
-```typescript
-const checkout = query.find(c => c.name.includes('checkout'))
-```
-
-***
-
-### findAll()
-
-> **findAll**(`predicate`): `Component`[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:251](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L251)
-
-Finds all components matching a predicate.
-
-#### Parameters
-
-##### predicate
-
-(`component`) => `boolean`
-
-Function that returns true for matching components
-
-#### Returns
-
-`Component`[]
-
-Array of all matching components
-
-#### Example
-
-```typescript
-const orderHandlers = query.findAll(c =>
-  c.type === 'EventHandler' && c.domain === 'orders'
-)
-```
-
-***
-
-### flows()
-
-> **flows**(): [`Flow`](../interfaces/Flow.md)[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:534](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L534)
-
-Returns all flows in the graph.
-
-Each flow starts from an entry point (UI, API, or Custom with no
-incoming links) and traces forward through the graph.
-
-#### Returns
-
-[`Flow`](../interfaces/Flow.md)[]
-
-Array of Flow objects with entry point and steps
-
-#### Example
-
-```typescript
-const flows = query.flows()
-
-for (const flow of flows) {
-  console.log(`Flow: ${flow.entryPoint.name}`)
-  for (const step of flow.steps) {
-    console.log(`  ${step.component.name} (depth: ${step.depth})`)
-  }
-}
-```
-
-***
-
-### links()
-
-> **links**(): `Link`[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:183](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L183)
-
-Returns all links in the graph.
-
-#### Returns
-
-`Link`[]
-
-Array of all links
-
-#### Example
-
-```typescript
-const allLinks = query.links()
-console.log(`Total links: ${allLinks.length}`)
-```
-
-***
-
-### nodeDepths()
-
-> **nodeDepths**(): `Map`\<`string` & `$brand`\<`"ComponentId"`\>, `number`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:625](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L625)
-
-Calculates depth from entry points for each component.
-
-Components unreachable from entry points will not be in the map.
-
-#### Returns
-
-`Map`\<`string` & `$brand`\<`"ComponentId"`\>, `number`\>
-
-Map of component ID to depth (0 = entry point)
-
-#### Example
-
-```typescript
-const depths = query.nodeDepths()
-for (const [id, depth] of depths) {
-  console.log(`${id}: depth ${depth}`)
-}
-```
-
-***
-
-### operationsFor()
-
-> **operationsFor**(`entityName`): `DomainOpComponent`[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:347](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L347)
-
-Returns all domain operations for a specific entity.
-
-#### Parameters
-
-##### entityName
-
-`string`
-
-The entity name to get operations for
-
-#### Returns
-
-`DomainOpComponent`[]
-
-Array of DomainOp components targeting the entity
-
-#### Example
-
-```typescript
-const orderOps = query.operationsFor('Order')
-```
-
-***
-
-### publishedEvents()
-
-> **publishedEvents**(`domainName?`): [`PublishedEvent`](../interfaces/PublishedEvent.md)[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:494](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L494)
-
-Returns published events with their handlers.
-
-#### Parameters
-
-##### domainName?
-
-`string`
-
-Optional domain to filter by
-
-#### Returns
-
-[`PublishedEvent`](../interfaces/PublishedEvent.md)[]
-
-Array of PublishedEvent objects sorted by event name
-
-#### Example
-
-```typescript
-const allEvents = query.publishedEvents()
-const orderEvents = query.publishedEvents('orders')
-
-for (const event of orderEvents) {
-  console.log(`${event.eventName} has ${event.handlers.length} handlers`)
-}
-```
-
-***
-
-### search()
-
-> **search**(`query`): `Component`[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:284](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L284)
-
-Searches components by name, domain, or type.
-
-Case-insensitive search across component name, domain, and type fields.
-
-#### Parameters
-
-##### query
-
-`string`
-
-Search term
-
-#### Returns
-
-`Component`[]
-
-Array of matching components
-
-#### Example
-
-```typescript
-const results = query.search('order')
-// Matches: "PlaceOrder", "orders" domain, etc.
-```
-
-***
-
-### searchWithFlow()
-
-> **searchWithFlow**(`query`, `options`): [`SearchWithFlowResult`](../interfaces/SearchWithFlowResult.md)
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:554](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L554)
-
-Searches for components and returns their flow context.
-
-Returns both matching component IDs and all visible IDs in their flows.
-
-#### Parameters
-
-##### query
-
-`string`
-
-Search term
-
-##### options
-
-[`SearchWithFlowOptions`](../interfaces/SearchWithFlowOptions.md)
-
-Search options including returnAllOnEmptyQuery
-
-#### Returns
-
-[`SearchWithFlowResult`](../interfaces/SearchWithFlowResult.md)
-
-Object with matchingIds and visibleIds arrays
-
-#### Example
-
-```typescript
-const result = query.searchWithFlow('checkout', { returnAllOnEmptyQuery: true })
-console.log(`Found ${result.matchingIds.length} matches`)
-console.log(`Showing ${result.visibleIds.length} nodes in context`)
-```
-
-***
-
-### statesFor()
-
-> **statesFor**(`entityName`): `string` & `$brand`\<`"State"`\>[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:415](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L415)
-
-Returns ordered states for an entity based on transitions.
-
-States are ordered by transition flow from initial to final states.
-
-#### Parameters
-
-##### entityName
-
-`string`
-
-The entity name to get states for
-
-#### Returns
-
-`string` & `$brand`\<`"State"`\>[]
-
-Array of state names in transition order
-
-#### Example
-
-```typescript
-const orderStates = query.statesFor('Order')
-// ['pending', 'confirmed', 'shipped', 'delivered']
-```
-
-***
-
-### stats()
-
-> **stats**(): [`GraphStats`](../interfaces/GraphStats.md)
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:606](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L606)
-
-Returns aggregate statistics about the graph.
-
-#### Returns
-
-[`GraphStats`](../interfaces/GraphStats.md)
-
-GraphStats with counts for components, links, domains, APIs, entities, and events
-
-#### Example
-
-```typescript
-const stats = query.stats()
-console.log(`Components: ${stats.componentCount}`)
-console.log(`Links: ${stats.linkCount}`)
-console.log(`Domains: ${stats.domainCount}`)
-```
-
-***
-
-### traceFlow()
-
-> **traceFlow**(`startComponentId`): `object`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:451](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L451)
-
-Traces the complete flow bidirectionally from a starting component.
-
-Returns all nodes and links connected to the starting point,
-following links in both directions.
-
-#### Parameters
-
-##### startComponentId
-
-`string` & `$brand`\<`"ComponentId"`\>
-
-ID of the component to start tracing from
-
-#### Returns
-
-`object`
-
-Object with componentIds and linkIds in the flow
-
-##### componentIds
-
-> **componentIds**: `string` & `$brand`\<`"ComponentId"`\>[]
-
-##### linkIds
-
-> **linkIds**: `string` & `$brand`\<`"LinkId"`\>[]
-
-#### Example
-
-```typescript
-const flow = query.traceFlow('orders:checkout:api:post-orders')
-console.log(`Flow includes ${flow.componentIds.length} nodes`)
-```
-
-***
-
-### transitionsFor()
-
-> **transitionsFor**(`entityName`): [`EntityTransition`](../interfaces/EntityTransition.md)[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:397](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L397)
-
-Returns state transitions for an entity.
-
-#### Parameters
-
-##### entityName
-
-`string`
-
-The entity name to get transitions for
-
-#### Returns
-
-[`EntityTransition`](../interfaces/EntityTransition.md)[]
-
-Array of EntityTransition objects
-
-#### Example
-
-```typescript
-const transitions = query.transitionsFor('Order')
-```
-
-***
-
-### validate()
-
-> **validate**(): [`ValidationResult`](../interfaces/ValidationResult.md)
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:202](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L202)
-
-Validates the graph structure beyond schema validation.
-
-Checks for structural issues like invalid link references.
-
-#### Returns
-
-[`ValidationResult`](../interfaces/ValidationResult.md)
-
-Validation result with any errors found
-
-#### Example
-
-```typescript
-const result = query.validate()
-if (!result.valid) {
-  console.error('Validation errors:', result.errors)
-}
-```
-
-***
-
-### fromJSON()
-
-> `static` **fromJSON**(`json`): `RiviereQuery`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/RiviereQuery.ts:152](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts#L152)
-
-Creates a RiviereQuery from raw JSON data.
-
-#### Parameters
-
-##### json
-
-`unknown`
-
-Raw JSON data to parse as a RiviereGraph
-
-#### Returns
-
-`RiviereQuery`
-
-A new RiviereQuery instance
-
-#### Throws
-
-If the JSON fails schema validation
-
-#### Example
-
-```typescript
-const jsonData = await fetch('/graph.json').then(r => r.json())
-const query = RiviereQuery.fromJSON(jsonData)
-```
diff --git a/apps/docs/reference/api/generated/riviere-query/functions/compareByCodePoint.md b/apps/docs/reference/api/generated/riviere-query/functions/compareByCodePoint.md
deleted file mode 100644
index d6c8cf3ef..000000000
--- a/apps/docs/reference/api/generated/riviere-query/functions/compareByCodePoint.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-pageClass: reference
----
-
-# Function: compareByCodePoint()
-
-> **compareByCodePoint**(`a`, `b`): `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/compare-by-code-point.ts:2](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/compare-by-code-point.ts#L2)
-
-## Parameters
-
-### a
-
-`string`
-
-### b
-
-`string`
-
-## Returns
-
-`number`
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/functions/parseComponentId.md b/apps/docs/reference/api/generated/riviere-query/functions/parseComponentId.md
deleted file mode 100644
index ec83b509a..000000000
--- a/apps/docs/reference/api/generated/riviere-query/functions/parseComponentId.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-pageClass: reference
----
-
-# Function: parseComponentId()
-
-> **parseComponentId**(`id`): `string` & `$brand`\<`"ComponentId"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:329](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L329)
-
-Parses a string as a ComponentId.
-
-## Parameters
-
-### id
-
-`string`
-
-The string to parse
-
-## Returns
-
-`string` & `$brand`\<`"ComponentId"`\>
-
-A branded ComponentId
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/functions/parseDomainName.md b/apps/docs/reference/api/generated/riviere-query/functions/parseDomainName.md
deleted file mode 100644
index cf58c7d0b..000000000
--- a/apps/docs/reference/api/generated/riviere-query/functions/parseDomainName.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-pageClass: reference
----
-
-# Function: parseDomainName()
-
-> **parseDomainName**(`value`): `string` & `$brand`\<`"DomainName"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:362](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L362)
-
-Parses a string as a DomainName.
-
-## Parameters
-
-### value
-
-`string`
-
-The string to parse
-
-## Returns
-
-`string` & `$brand`\<`"DomainName"`\>
-
-A branded DomainName
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/functions/parseEntityName.md b/apps/docs/reference/api/generated/riviere-query/functions/parseEntityName.md
deleted file mode 100644
index 0a47ea5c6..000000000
--- a/apps/docs/reference/api/generated/riviere-query/functions/parseEntityName.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-pageClass: reference
----
-
-# Function: parseEntityName()
-
-> **parseEntityName**(`value`): `string` & `$brand`\<`"EntityName"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:351](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L351)
-
-Parses a string as an EntityName.
-
-## Parameters
-
-### value
-
-`string`
-
-The string to parse
-
-## Returns
-
-`string` & `$brand`\<`"EntityName"`\>
-
-A branded EntityName
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/functions/parseEventId.md b/apps/docs/reference/api/generated/riviere-query/functions/parseEventId.md
deleted file mode 100644
index 15dcdee14..000000000
--- a/apps/docs/reference/api/generated/riviere-query/functions/parseEventId.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-pageClass: reference
----
-
-# Function: parseEventId()
-
-> **parseEventId**(`value`): `string` & `$brand`\<`"EventId"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:395](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L395)
-
-Parses a string as an EventId.
-
-## Parameters
-
-### value
-
-`string`
-
-The string to parse
-
-## Returns
-
-`string` & `$brand`\<`"EventId"`\>
-
-A branded EventId
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/functions/parseEventName.md b/apps/docs/reference/api/generated/riviere-query/functions/parseEventName.md
deleted file mode 100644
index 931b5fbbf..000000000
--- a/apps/docs/reference/api/generated/riviere-query/functions/parseEventName.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-pageClass: reference
----
-
-# Function: parseEventName()
-
-> **parseEventName**(`value`): `string` & `$brand`\<`"EventName"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:406](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L406)
-
-Parses a string as an EventName.
-
-## Parameters
-
-### value
-
-`string`
-
-The string to parse
-
-## Returns
-
-`string` & `$brand`\<`"EventName"`\>
-
-A branded EventName
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/functions/parseHandlerId.md b/apps/docs/reference/api/generated/riviere-query/functions/parseHandlerId.md
deleted file mode 100644
index 2eb295f54..000000000
--- a/apps/docs/reference/api/generated/riviere-query/functions/parseHandlerId.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-pageClass: reference
----
-
-# Function: parseHandlerId()
-
-> **parseHandlerId**(`value`): `string` & `$brand`\<`"HandlerId"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:417](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L417)
-
-Parses a string as a HandlerId.
-
-## Parameters
-
-### value
-
-`string`
-
-The string to parse
-
-## Returns
-
-`string` & `$brand`\<`"HandlerId"`\>
-
-A branded HandlerId
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/functions/parseHandlerName.md b/apps/docs/reference/api/generated/riviere-query/functions/parseHandlerName.md
deleted file mode 100644
index 650757679..000000000
--- a/apps/docs/reference/api/generated/riviere-query/functions/parseHandlerName.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-pageClass: reference
----
-
-# Function: parseHandlerName()
-
-> **parseHandlerName**(`value`): `string` & `$brand`\<`"HandlerName"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:428](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L428)
-
-Parses a string as a HandlerName.
-
-## Parameters
-
-### value
-
-`string`
-
-The string to parse
-
-## Returns
-
-`string` & `$brand`\<`"HandlerName"`\>
-
-A branded HandlerName
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/functions/parseLinkId.md b/apps/docs/reference/api/generated/riviere-query/functions/parseLinkId.md
deleted file mode 100644
index 47b7c85f3..000000000
--- a/apps/docs/reference/api/generated/riviere-query/functions/parseLinkId.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-pageClass: reference
----
-
-# Function: parseLinkId()
-
-> **parseLinkId**(`id`): `string` & `$brand`\<`"LinkId"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:340](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L340)
-
-Parses a string as a LinkId.
-
-## Parameters
-
-### id
-
-`string`
-
-The string to parse
-
-## Returns
-
-`string` & `$brand`\<`"LinkId"`\>
-
-A branded LinkId
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/functions/parseOperationName.md b/apps/docs/reference/api/generated/riviere-query/functions/parseOperationName.md
deleted file mode 100644
index 4ffe7047d..000000000
--- a/apps/docs/reference/api/generated/riviere-query/functions/parseOperationName.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-pageClass: reference
----
-
-# Function: parseOperationName()
-
-> **parseOperationName**(`value`): `string` & `$brand`\<`"OperationName"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:384](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L384)
-
-Parses a string as an OperationName.
-
-## Parameters
-
-### value
-
-`string`
-
-The string to parse
-
-## Returns
-
-`string` & `$brand`\<`"OperationName"`\>
-
-A branded OperationName
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/functions/parseState.md b/apps/docs/reference/api/generated/riviere-query/functions/parseState.md
deleted file mode 100644
index f8aaf1e63..000000000
--- a/apps/docs/reference/api/generated/riviere-query/functions/parseState.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-pageClass: reference
----
-
-# Function: parseState()
-
-> **parseState**(`value`): `string` & `$brand`\<`"State"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:373](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L373)
-
-Parses a string as a State.
-
-## Parameters
-
-### value
-
-`string`
-
-The string to parse
-
-## Returns
-
-`string` & `$brand`\<`"State"`\>
-
-A branded State
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/interfaces/ComponentCounts.md b/apps/docs/reference/api/generated/riviere-query/interfaces/ComponentCounts.md
deleted file mode 100644
index b09679b50..000000000
--- a/apps/docs/reference/api/generated/riviere-query/interfaces/ComponentCounts.md
+++ /dev/null
@@ -1,93 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: ComponentCounts
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:127](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L127)
-
-Component counts by type within a domain.
-
-## Riviere-role
-
-query-model
-
-## Properties
-
-### API
-
-> **API**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:131](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L131)
-
-Number of API components.
-
-***
-
-### Custom
-
-> **Custom**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:141](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L141)
-
-Number of Custom components.
-
-***
-
-### DomainOp
-
-> **DomainOp**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:135](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L135)
-
-Number of DomainOp components.
-
-***
-
-### Event
-
-> **Event**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:137](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L137)
-
-Number of Event components.
-
-***
-
-### EventHandler
-
-> **EventHandler**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:139](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L139)
-
-Number of EventHandler components.
-
-***
-
-### total
-
-> **total**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:143](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L143)
-
-Total number of components.
-
-***
-
-### UI
-
-> **UI**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:129](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L129)
-
-Number of UI components.
-
-***
-
-### UseCase
-
-> **UseCase**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:133](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L133)
-
-Number of UseCase components.
diff --git a/apps/docs/reference/api/generated/riviere-query/interfaces/ComponentModification.md b/apps/docs/reference/api/generated/riviere-query/interfaces/ComponentModification.md
deleted file mode 100644
index a180be13a..000000000
--- a/apps/docs/reference/api/generated/riviere-query/interfaces/ComponentModification.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: ComponentModification
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:165](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L165)
-
-A component that was modified between graph versions.
-
-## Riviere-role
-
-query-model
-
-## Properties
-
-### after
-
-> **after**: `Component`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:171](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L171)
-
-The component state after modification.
-
-***
-
-### before
-
-> **before**: `Component`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:169](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L169)
-
-The component state before modification.
-
-***
-
-### changedFields
-
-> **changedFields**: `string`[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:173](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L173)
-
-List of field names that changed.
-
-***
-
-### id
-
-> **id**: `string` & `$brand`\<`"ComponentId"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:167](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L167)
-
-The component ID.
diff --git a/apps/docs/reference/api/generated/riviere-query/interfaces/CrossDomainLink.md b/apps/docs/reference/api/generated/riviere-query/interfaces/CrossDomainLink.md
deleted file mode 100644
index 7f10cbe4a..000000000
--- a/apps/docs/reference/api/generated/riviere-query/interfaces/CrossDomainLink.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: CrossDomainLink
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:265](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L265)
-
-A link that crosses domain boundaries.
-
-## Riviere-role
-
-query-model
-
-## Properties
-
-### linkType
-
-> **linkType**: [`LinkType`](../type-aliases/LinkType.md) \| `undefined`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:269](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L269)
-
-Type of the cross-domain link.
-
-***
-
-### targetDomain
-
-> **targetDomain**: `string` & `$brand`\<`"DomainName"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:267](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L267)
-
-The target domain name.
diff --git a/apps/docs/reference/api/generated/riviere-query/interfaces/DiffStats.md b/apps/docs/reference/api/generated/riviere-query/interfaces/DiffStats.md
deleted file mode 100644
index e3f45a23c..000000000
--- a/apps/docs/reference/api/generated/riviere-query/interfaces/DiffStats.md
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: DiffStats
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:180](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L180)
-
-Summary statistics of differences between graphs.
-
-## Riviere-role
-
-query-model
-
-## Properties
-
-### componentsAdded
-
-> **componentsAdded**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:182](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L182)
-
-Number of components added.
-
-***
-
-### componentsModified
-
-> **componentsModified**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:186](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L186)
-
-Number of components modified.
-
-***
-
-### componentsRemoved
-
-> **componentsRemoved**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:184](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L184)
-
-Number of components removed.
-
-***
-
-### linksAdded
-
-> **linksAdded**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:188](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L188)
-
-Number of links added.
-
-***
-
-### linksRemoved
-
-> **linksRemoved**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:190](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L190)
-
-Number of links removed.
diff --git a/apps/docs/reference/api/generated/riviere-query/interfaces/Domain.md b/apps/docs/reference/api/generated/riviere-query/interfaces/Domain.md
deleted file mode 100644
index 164df9368..000000000
--- a/apps/docs/reference/api/generated/riviere-query/interfaces/Domain.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: Domain
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:150](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L150)
-
-Domain information with metadata and component counts.
-
-## Riviere-role
-
-query-model
-
-## Properties
-
-### componentCounts
-
-> **componentCounts**: [`ComponentCounts`](ComponentCounts.md)
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:158](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L158)
-
-Counts of components by type.
-
-***
-
-### description
-
-> **description**: `string`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:154](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L154)
-
-Domain description from graph metadata.
-
-***
-
-### name
-
-> **name**: `string`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:152](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L152)
-
-Domain name.
-
-***
-
-### systemType
-
-> **systemType**: `SystemType`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:156](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L156)
-
-System type classification.
diff --git a/apps/docs/reference/api/generated/riviere-query/interfaces/DomainConnection.md b/apps/docs/reference/api/generated/riviere-query/interfaces/DomainConnection.md
deleted file mode 100644
index 34c422843..000000000
--- a/apps/docs/reference/api/generated/riviere-query/interfaces/DomainConnection.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: DomainConnection
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:276](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L276)
-
-Summary of connections between domains.
-
-## Riviere-role
-
-query-model
-
-## Properties
-
-### apiCount
-
-> **apiCount**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:282](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L282)
-
-Number of API-based connections.
-
-***
-
-### direction
-
-> **direction**: `"outgoing"` \| `"incoming"`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:280](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L280)
-
-Direction relative to the queried domain.
-
-***
-
-### eventCount
-
-> **eventCount**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:284](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L284)
-
-Number of event-based connections.
-
-***
-
-### targetDomain
-
-> **targetDomain**: `string` & `$brand`\<`"DomainName"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:278](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L278)
-
-The connected domain name.
diff --git a/apps/docs/reference/api/generated/riviere-query/interfaces/Entity.md b/apps/docs/reference/api/generated/riviere-query/interfaces/Entity.md
deleted file mode 100644
index 7590717f8..000000000
--- a/apps/docs/reference/api/generated/riviere-query/interfaces/Entity.md
+++ /dev/null
@@ -1,109 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: Entity
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:17](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L17)
-
-A domain entity with its associated operations, states, and business rules.
-
-## Riviere-role
-
-query-model
-
-## Properties
-
-### businessRules
-
-> `readonly` **businessRules**: `string`[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:30](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L30)
-
-Deduplicated business rules from all operations.
-
-***
-
-### domain
-
-> `readonly` **domain**: `string` & `$brand`\<`"DomainName"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:22](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L22)
-
-The domain containing the entity.
-
-***
-
-### name
-
-> `readonly` **name**: `string` & `$brand`\<`"EntityName"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:20](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L20)
-
-The entity name.
-
-***
-
-### operations
-
-> `readonly` **operations**: `DomainOpComponent`[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:24](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L24)
-
-All domain operations targeting this entity.
-
-***
-
-### states
-
-> `readonly` **states**: `string` & `$brand`\<`"State"`\>[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:26](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L26)
-
-Ordered states derived from state transitions (initial → terminal).
-
-***
-
-### transitions
-
-> `readonly` **transitions**: [`EntityTransition`](EntityTransition.md)[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:28](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L28)
-
-State transitions with triggering operations.
-
-## Methods
-
-### firstOperationId()
-
-> **firstOperationId**(): `string` \| `undefined`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:41](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L41)
-
-#### Returns
-
-`string` \| `undefined`
-
-***
-
-### hasBusinessRules()
-
-> **hasBusinessRules**(): `boolean`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:37](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L37)
-
-#### Returns
-
-`boolean`
-
-***
-
-### hasStates()
-
-> **hasStates**(): `boolean`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:33](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L33)
-
-#### Returns
-
-`boolean`
diff --git a/apps/docs/reference/api/generated/riviere-query/interfaces/EntityTransition.md b/apps/docs/reference/api/generated/riviere-query/interfaces/EntityTransition.md
deleted file mode 100644
index fff92a17c..000000000
--- a/apps/docs/reference/api/generated/riviere-query/interfaces/EntityTransition.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: EntityTransition
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:50](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L50)
-
-A state transition in an entity's state machine.
-
-## Riviere-role
-
-query-model
-
-## Properties
-
-### from
-
-> **from**: `string` & `$brand`\<`"State"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:52](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L52)
-
-The state before the transition.
-
-***
-
-### to
-
-> **to**: `string` & `$brand`\<`"State"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:54](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L54)
-
-The state after the transition.
-
-***
-
-### triggeredBy
-
-> **triggeredBy**: `string` & `$brand`\<`"OperationName"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:56](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L56)
-
-The operation that triggers this transition.
diff --git a/apps/docs/reference/api/generated/riviere-query/interfaces/EventHandlerInfo.md b/apps/docs/reference/api/generated/riviere-query/interfaces/EventHandlerInfo.md
deleted file mode 100644
index cf9141183..000000000
--- a/apps/docs/reference/api/generated/riviere-query/interfaces/EventHandlerInfo.md
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: EventHandlerInfo
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:121](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L121)
-
-Information about an event handler component.
-
-## Riviere-role
-
-query-model
-
-## Properties
-
-### domain
-
-> **domain**: `string` & `$brand`\<`"DomainName"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:127](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L127)
-
-The domain containing the handler.
-
-***
-
-### handlerName
-
-> **handlerName**: `string` & `$brand`\<`"HandlerName"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:125](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L125)
-
-The handler's name.
-
-***
-
-### id
-
-> **id**: `string` & `$brand`\<`"HandlerId"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:123](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L123)
-
-The handler's component ID.
-
-***
-
-### subscribedEvents
-
-> **subscribedEvents**: `string` & `$brand`\<`"EventName"`\>[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:129](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L129)
-
-List of event names this handler subscribes to.
-
-***
-
-### subscribedEventsWithDomain
-
-> **subscribedEventsWithDomain**: [`SubscribedEventWithDomain`](../type-aliases/SubscribedEventWithDomain.md)[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:131](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L131)
-
-Subscribed events with source domain information.
diff --git a/apps/docs/reference/api/generated/riviere-query/interfaces/EventSubscriber.md b/apps/docs/reference/api/generated/riviere-query/interfaces/EventSubscriber.md
deleted file mode 100644
index c78947d45..000000000
--- a/apps/docs/reference/api/generated/riviere-query/interfaces/EventSubscriber.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: EventSubscriber
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:63](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L63)
-
-An event handler that subscribes to an event.
-
-## Riviere-role
-
-query-model
-
-## Properties
-
-### domain
-
-> **domain**: `string` & `$brand`\<`"DomainName"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:69](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L69)
-
-The domain containing the handler.
-
-***
-
-### handlerId
-
-> **handlerId**: `string` & `$brand`\<`"HandlerId"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:65](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L65)
-
-The handler's component ID.
-
-***
-
-### handlerName
-
-> **handlerName**: `string` & `$brand`\<`"HandlerName"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:67](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L67)
-
-The handler's name.
diff --git a/apps/docs/reference/api/generated/riviere-query/interfaces/ExternalDomain.md b/apps/docs/reference/api/generated/riviere-query/interfaces/ExternalDomain.md
deleted file mode 100644
index cd06b4dfe..000000000
--- a/apps/docs/reference/api/generated/riviere-query/interfaces/ExternalDomain.md
+++ /dev/null
@@ -1,46 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: ExternalDomain
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:313](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L313)
-
-An external domain that components connect to.
-
-External domains are any systems not represented in the graph—third-party
-services (Stripe, Twilio) or internal domains outside the current scope.
-
-## Riviere-role
-
-query-model
-
-## Properties
-
-### connectionCount
-
-> **connectionCount**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:319](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L319)
-
-Total number of connections to this external domain.
-
-***
-
-### name
-
-> **name**: `string`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:315](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L315)
-
-Name of the external domain (e.g., "Stripe", "Twilio").
-
-***
-
-### sourceDomains
-
-> **sourceDomains**: `string` & `$brand`\<`"DomainName"`\>[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:317](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L317)
-
-Domains that have connections to this external domain.
diff --git a/apps/docs/reference/api/generated/riviere-query/interfaces/Flow.md b/apps/docs/reference/api/generated/riviere-query/interfaces/Flow.md
deleted file mode 100644
index 8fa4addc4..000000000
--- a/apps/docs/reference/api/generated/riviere-query/interfaces/Flow.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: Flow
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:243](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L243)
-
-An execution flow from entry point through the graph.
-
-## Riviere-role
-
-query-model
-
-## Properties
-
-### entryPoint
-
-> **entryPoint**: `Component`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:245](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L245)
-
-The entry point component.
-
-***
-
-### steps
-
-> **steps**: [`FlowStep`](FlowStep.md)[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:247](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L247)
-
-Steps in the flow including entry point.
diff --git a/apps/docs/reference/api/generated/riviere-query/interfaces/FlowStep.md b/apps/docs/reference/api/generated/riviere-query/interfaces/FlowStep.md
deleted file mode 100644
index 612dd3914..000000000
--- a/apps/docs/reference/api/generated/riviere-query/interfaces/FlowStep.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: FlowStep
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:228](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L228)
-
-A step in an execution flow.
-
-## Riviere-role
-
-query-model
-
-## Properties
-
-### component
-
-> **component**: `Component`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:230](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L230)
-
-The component at this step.
-
-***
-
-### depth
-
-> **depth**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:234](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L234)
-
-Depth from entry point (0 = entry point).
-
-***
-
-### externalLinks
-
-> **externalLinks**: `ExternalLink`[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:236](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L236)
-
-External links from this component to external systems.
-
-***
-
-### outgoingLinks
-
-> **outgoingLinks**: `Link`[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:232](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L232)
-
-Exact links leaving this component, preserving branching relationship semantics.
diff --git a/apps/docs/reference/api/generated/riviere-query/interfaces/GraphDiff.md b/apps/docs/reference/api/generated/riviere-query/interfaces/GraphDiff.md
deleted file mode 100644
index 56c78a668..000000000
--- a/apps/docs/reference/api/generated/riviere-query/interfaces/GraphDiff.md
+++ /dev/null
@@ -1,73 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: GraphDiff
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:197](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L197)
-
-Complete diff between two graph versions.
-
-## Riviere-role
-
-query-model
-
-## Properties
-
-### components
-
-> **components**: `object`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:199](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L199)
-
-Component changes.
-
-#### added
-
-> **added**: `Component`[]
-
-Components present in new graph but not old.
-
-#### modified
-
-> **modified**: [`ComponentModification`](ComponentModification.md)[]
-
-Components present in both with different values.
-
-#### removed
-
-> **removed**: `Component`[]
-
-Components present in old graph but not new.
-
-***
-
-### links
-
-> **links**: `object`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:208](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L208)
-
-Link changes.
-
-#### added
-
-> **added**: `Link`[]
-
-Links present in new graph but not old.
-
-#### removed
-
-> **removed**: `Link`[]
-
-Links present in old graph but not new.
-
-***
-
-### stats
-
-> **stats**: [`DiffStats`](DiffStats.md)
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:215](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L215)
-
-Summary statistics.
diff --git a/apps/docs/reference/api/generated/riviere-query/interfaces/GraphStats.md b/apps/docs/reference/api/generated/riviere-query/interfaces/GraphStats.md
deleted file mode 100644
index e880e66e0..000000000
--- a/apps/docs/reference/api/generated/riviere-query/interfaces/GraphStats.md
+++ /dev/null
@@ -1,73 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: GraphStats
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:291](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L291)
-
-Aggregate statistics about a graph.
-
-## Riviere-role
-
-query-model
-
-## Properties
-
-### apiCount
-
-> **apiCount**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:299](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L299)
-
-Number of API components.
-
-***
-
-### componentCount
-
-> **componentCount**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:293](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L293)
-
-Total number of components.
-
-***
-
-### domainCount
-
-> **domainCount**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:297](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L297)
-
-Number of domains.
-
-***
-
-### entityCount
-
-> **entityCount**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:301](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L301)
-
-Number of unique entities.
-
-***
-
-### eventCount
-
-> **eventCount**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:303](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L303)
-
-Number of Event components.
-
-***
-
-### linkCount
-
-> **linkCount**: `number`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:295](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L295)
-
-Total number of links.
diff --git a/apps/docs/reference/api/generated/riviere-query/interfaces/KnownSourceEvent.md b/apps/docs/reference/api/generated/riviere-query/interfaces/KnownSourceEvent.md
deleted file mode 100644
index e84ef7d99..000000000
--- a/apps/docs/reference/api/generated/riviere-query/interfaces/KnownSourceEvent.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: KnownSourceEvent
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:91](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L91)
-
-A subscribed event where the source domain is known.
-
-## Riviere-role
-
-query-model
-
-## Properties
-
-### eventName
-
-> **eventName**: `string` & `$brand`\<`"EventName"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:93](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L93)
-
-The event name.
-
-***
-
-### sourceDomain
-
-> **sourceDomain**: `string` & `$brand`\<`"DomainName"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:95](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L95)
-
-The domain that publishes this event.
-
-***
-
-### sourceKnown
-
-> **sourceKnown**: `true`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:97](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L97)
-
-Indicates the source is known.
diff --git a/apps/docs/reference/api/generated/riviere-query/interfaces/PublishedEvent.md b/apps/docs/reference/api/generated/riviere-query/interfaces/PublishedEvent.md
deleted file mode 100644
index 4efbb16ff..000000000
--- a/apps/docs/reference/api/generated/riviere-query/interfaces/PublishedEvent.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: PublishedEvent
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:76](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L76)
-
-A published event with its subscribers.
-
-## Riviere-role
-
-query-model
-
-## Properties
-
-### domain
-
-> **domain**: `string` & `$brand`\<`"DomainName"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:82](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L82)
-
-The domain that publishes the event.
-
-***
-
-### eventName
-
-> **eventName**: `string` & `$brand`\<`"EventName"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:80](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L80)
-
-The event name.
-
-***
-
-### handlers
-
-> **handlers**: [`EventSubscriber`](EventSubscriber.md)[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:84](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L84)
-
-Event handlers subscribed to this event.
-
-***
-
-### id
-
-> **id**: `string` & `$brand`\<`"EventId"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:78](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L78)
-
-The event component's ID.
diff --git a/apps/docs/reference/api/generated/riviere-query/interfaces/SearchWithFlowOptions.md b/apps/docs/reference/api/generated/riviere-query/interfaces/SearchWithFlowOptions.md
deleted file mode 100644
index da63e376b..000000000
--- a/apps/docs/reference/api/generated/riviere-query/interfaces/SearchWithFlowOptions.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: SearchWithFlowOptions
-
-Defined in: [packages/riviere-query/src/features/querying/queries/flow-queries.ts:138](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/flow-queries.ts#L138)
-
-## Riviere-role
-
-query-model-use-case-input
-
-## Properties
-
-### returnAllOnEmptyQuery
-
-> **returnAllOnEmptyQuery**: `boolean`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/flow-queries.ts:138](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/flow-queries.ts#L138)
diff --git a/apps/docs/reference/api/generated/riviere-query/interfaces/SearchWithFlowResult.md b/apps/docs/reference/api/generated/riviere-query/interfaces/SearchWithFlowResult.md
deleted file mode 100644
index 30a93ecca..000000000
--- a/apps/docs/reference/api/generated/riviere-query/interfaces/SearchWithFlowResult.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: SearchWithFlowResult
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:254](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L254)
-
-Result of searchWithFlow containing matches and their flow context.
-
-## Riviere-role
-
-query-model
-
-## Properties
-
-### matchingIds
-
-> **matchingIds**: `string` & `$brand`\<`"ComponentId"`\>[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:256](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L256)
-
-IDs of components that matched the search.
-
-***
-
-### visibleIds
-
-> **visibleIds**: `string` & `$brand`\<`"ComponentId"`\>[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:258](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L258)
-
-IDs of all components visible in the matching flows.
diff --git a/apps/docs/reference/api/generated/riviere-query/interfaces/UnknownSourceEvent.md b/apps/docs/reference/api/generated/riviere-query/interfaces/UnknownSourceEvent.md
deleted file mode 100644
index 22e281ed9..000000000
--- a/apps/docs/reference/api/generated/riviere-query/interfaces/UnknownSourceEvent.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: UnknownSourceEvent
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:104](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L104)
-
-A subscribed event where the source domain is unknown.
-
-## Riviere-role
-
-query-model
-
-## Properties
-
-### eventName
-
-> **eventName**: `string` & `$brand`\<`"EventName"`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:106](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L106)
-
-The event name.
-
-***
-
-### sourceKnown
-
-> **sourceKnown**: `false`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:108](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L108)
-
-Indicates the source is unknown.
diff --git a/apps/docs/reference/api/generated/riviere-query/interfaces/ValidationError.md b/apps/docs/reference/api/generated/riviere-query/interfaces/ValidationError.md
deleted file mode 100644
index 028c5e287..000000000
--- a/apps/docs/reference/api/generated/riviere-query/interfaces/ValidationError.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: ValidationError
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:103](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L103)
-
-A validation error found in the graph.
-
-## Riviere-role
-
-query-model
-
-## Properties
-
-### code
-
-> **code**: [`ValidationErrorCode`](../type-aliases/ValidationErrorCode.md)
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:109](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L109)
-
-Machine-readable error code.
-
-***
-
-### message
-
-> **message**: `string`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:107](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L107)
-
-Human-readable error description.
-
-***
-
-### path
-
-> **path**: `string`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:105](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L105)
-
-JSON path to the error location.
diff --git a/apps/docs/reference/api/generated/riviere-query/interfaces/ValidationResult.md b/apps/docs/reference/api/generated/riviere-query/interfaces/ValidationResult.md
deleted file mode 100644
index 94197a6bf..000000000
--- a/apps/docs/reference/api/generated/riviere-query/interfaces/ValidationResult.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-pageClass: reference
----
-
-# Interface: ValidationResult
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:116](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L116)
-
-Result of graph validation.
-
-## Riviere-role
-
-query-model
-
-## Properties
-
-### errors
-
-> **errors**: [`ValidationError`](ValidationError.md)[]
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:120](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L120)
-
-List of validation errors (empty if valid).
-
-***
-
-### valid
-
-> **valid**: `boolean`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:118](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L118)
-
-Whether the graph passed validation.
diff --git a/apps/docs/reference/api/generated/riviere-query/type-aliases/ComponentId.md b/apps/docs/reference/api/generated/riviere-query/type-aliases/ComponentId.md
deleted file mode 100644
index 3fd87e30e..000000000
--- a/apps/docs/reference/api/generated/riviere-query/type-aliases/ComponentId.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-pageClass: reference
----
-
-# Type Alias: ComponentId
-
-> **ComponentId** = `z.infer`\<*typeof* `componentIdSchema`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:31](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L31)
-
-Branded type for component identifiers.
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/type-aliases/DomainName.md b/apps/docs/reference/api/generated/riviere-query/type-aliases/DomainName.md
deleted file mode 100644
index 3da2f3982..000000000
--- a/apps/docs/reference/api/generated/riviere-query/type-aliases/DomainName.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-pageClass: reference
----
-
-# Type Alias: DomainName
-
-> **DomainName** = `z.infer`\<*typeof* `domainNameSchema`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:49](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L49)
-
-Branded type for domain names.
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/type-aliases/EntityName.md b/apps/docs/reference/api/generated/riviere-query/type-aliases/EntityName.md
deleted file mode 100644
index 71d3ab936..000000000
--- a/apps/docs/reference/api/generated/riviere-query/type-aliases/EntityName.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-pageClass: reference
----
-
-# Type Alias: EntityName
-
-> **EntityName** = `z.infer`\<*typeof* `entityNameSchema`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:43](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L43)
-
-Branded type for entity names.
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/type-aliases/EventId.md b/apps/docs/reference/api/generated/riviere-query/type-aliases/EventId.md
deleted file mode 100644
index de9b92799..000000000
--- a/apps/docs/reference/api/generated/riviere-query/type-aliases/EventId.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-pageClass: reference
----
-
-# Type Alias: EventId
-
-> **EventId** = `z.infer`\<*typeof* `eventIdSchema`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:67](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L67)
-
-Branded type for event identifiers.
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/type-aliases/EventName.md b/apps/docs/reference/api/generated/riviere-query/type-aliases/EventName.md
deleted file mode 100644
index 6ef7c46e0..000000000
--- a/apps/docs/reference/api/generated/riviere-query/type-aliases/EventName.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-pageClass: reference
----
-
-# Type Alias: EventName
-
-> **EventName** = `z.infer`\<*typeof* `eventNameSchema`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:73](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L73)
-
-Branded type for event names.
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/type-aliases/HandlerId.md b/apps/docs/reference/api/generated/riviere-query/type-aliases/HandlerId.md
deleted file mode 100644
index 9af924116..000000000
--- a/apps/docs/reference/api/generated/riviere-query/type-aliases/HandlerId.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-pageClass: reference
----
-
-# Type Alias: HandlerId
-
-> **HandlerId** = `z.infer`\<*typeof* `handlerIdSchema`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:79](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L79)
-
-Branded type for event handler identifiers.
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/type-aliases/HandlerName.md b/apps/docs/reference/api/generated/riviere-query/type-aliases/HandlerName.md
deleted file mode 100644
index 20792ac91..000000000
--- a/apps/docs/reference/api/generated/riviere-query/type-aliases/HandlerName.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-pageClass: reference
----
-
-# Type Alias: HandlerName
-
-> **HandlerName** = `z.infer`\<*typeof* `handlerNameSchema`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:85](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L85)
-
-Branded type for event handler names.
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/type-aliases/LinkId.md b/apps/docs/reference/api/generated/riviere-query/type-aliases/LinkId.md
deleted file mode 100644
index 593f6ef81..000000000
--- a/apps/docs/reference/api/generated/riviere-query/type-aliases/LinkId.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-pageClass: reference
----
-
-# Type Alias: LinkId
-
-> **LinkId** = `z.infer`\<*typeof* `linkIdSchema`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:37](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L37)
-
-Branded type for link identifiers.
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/type-aliases/LinkType.md b/apps/docs/reference/api/generated/riviere-query/type-aliases/LinkType.md
deleted file mode 100644
index fea9a79b5..000000000
--- a/apps/docs/reference/api/generated/riviere-query/type-aliases/LinkType.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-pageClass: reference
----
-
-# Type Alias: LinkType
-
-> **LinkType** = `"sync"` \| `"async"`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:222](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L222)
-
-Type of link between components.
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/type-aliases/OperationName.md b/apps/docs/reference/api/generated/riviere-query/type-aliases/OperationName.md
deleted file mode 100644
index 169fc8e0a..000000000
--- a/apps/docs/reference/api/generated/riviere-query/type-aliases/OperationName.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-pageClass: reference
----
-
-# Type Alias: OperationName
-
-> **OperationName** = `z.infer`\<*typeof* `operationNameSchema`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:61](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L61)
-
-Branded type for operation names.
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/type-aliases/State.md b/apps/docs/reference/api/generated/riviere-query/type-aliases/State.md
deleted file mode 100644
index 580702c01..000000000
--- a/apps/docs/reference/api/generated/riviere-query/type-aliases/State.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-pageClass: reference
----
-
-# Type Alias: State
-
-> **State** = `z.infer`\<*typeof* `stateSchema`\>
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:55](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L55)
-
-Branded type for state names in entity state machines.
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/type-aliases/SubscribedEventWithDomain.md b/apps/docs/reference/api/generated/riviere-query/type-aliases/SubscribedEventWithDomain.md
deleted file mode 100644
index 609c79adc..000000000
--- a/apps/docs/reference/api/generated/riviere-query/type-aliases/SubscribedEventWithDomain.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-pageClass: reference
----
-
-# Type Alias: SubscribedEventWithDomain
-
-> **SubscribedEventWithDomain** = [`KnownSourceEvent`](../interfaces/KnownSourceEvent.md) \| [`UnknownSourceEvent`](../interfaces/UnknownSourceEvent.md)
-
-Defined in: [packages/riviere-query/src/features/querying/queries/event-types.ts:115](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/event-types.ts#L115)
-
-A subscribed event with optional source domain information.
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/generated/riviere-query/type-aliases/ValidationErrorCode.md b/apps/docs/reference/api/generated/riviere-query/type-aliases/ValidationErrorCode.md
deleted file mode 100644
index 704087ede..000000000
--- a/apps/docs/reference/api/generated/riviere-query/type-aliases/ValidationErrorCode.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-pageClass: reference
----
-
-# Type Alias: ValidationErrorCode
-
-> **ValidationErrorCode** = `"INVALID_LINK_SOURCE"` \| `"INVALID_LINK_TARGET"` \| `"INVALID_TYPE"` \| `"INVALID_RELATIONSHIP_TYPE"` \| `"DUPLICATE_LINK_ID"` \| `"DUPLICATE_LINK"`
-
-Defined in: [packages/riviere-query/src/features/querying/queries/domain-types.ts:91](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-query/src/features/querying/queries/domain-types.ts#L91)
-
-Error codes for graph validation failures.
-
-## Riviere-role
-
-query-model
diff --git a/apps/docs/reference/api/index.md b/apps/docs/reference/api/index.md
index 6fba30ec3..9d0bc4c53 100644
--- a/apps/docs/reference/api/index.md
+++ b/apps/docs/reference/api/index.md
@@ -5,7 +5,7 @@
 The main class. Create an instance, add components, connect them, build a graph.
 
 ```typescript
-import { RiviereBuilder } from '@living-architecture/riviere-builder'
+import { RiviereBuilder } from '@living-architecture/riviere-builder-domain-model'
 
 const builder = RiviereBuilder.new({
   sources: [{ type: 'git', url: 'https://github.com/your-org/your-repo' }],
@@ -64,6 +64,8 @@ builder.link({ from: api.id, to: useCase.id, type: 'sync' })
 Query and analyze Riviere graphs.
 
 ```typescript
+import { RiviereQuery } from '@living-architecture/riviere-builder-domain-model'
+
 // From builder
 const query = builder.query()
 
@@ -75,40 +77,40 @@ const query = RiviereQuery.fromJSON(jsonContents)
 
 | Method | Purpose |
 |--------|---------|
-| [`components()`](/reference/api/generated/riviere-query/classes/RiviereQuery#components) | Get all components |
-| [`componentById(id)`](/reference/api/generated/riviere-query/classes/RiviereQuery#componentbyid) | Find component by ID |
-| [`componentsInDomain(domainId)`](/reference/api/generated/riviere-query/classes/RiviereQuery#componentsindomain) | Components in a domain |
-| [`componentsByType(type)`](/reference/api/generated/riviere-query/classes/RiviereQuery#componentsbytype) | Components of a type |
-| [`find(predicate)`](/reference/api/generated/riviere-query/classes/RiviereQuery#find) | Find with custom function |
-| [`findAll(predicate)`](/reference/api/generated/riviere-query/classes/RiviereQuery#findall) | Find all matching |
+| [`components()`](/reference/api/generated/riviere-builder/classes/RiviereQuery#components) | Get all components |
+| [`componentById(id)`](/reference/api/generated/riviere-builder/classes/RiviereQuery#componentbyid) | Find component by ID |
+| [`componentsInDomain(domainId)`](/reference/api/generated/riviere-builder/classes/RiviereQuery#componentsindomain) | Components in a domain |
+| [`componentsByType(type)`](/reference/api/generated/riviere-builder/classes/RiviereQuery#componentsbytype) | Components of a type |
+| [`find(predicate)`](/reference/api/generated/riviere-builder/classes/RiviereQuery#find) | Find with custom function |
+| [`findAll(predicate)`](/reference/api/generated/riviere-builder/classes/RiviereQuery#findall) | Find all matching |
 
 ### Link methods
 
 | Method | Purpose |
 |--------|---------|
-| [`links()`](/reference/api/generated/riviere-query/classes/RiviereQuery#links) | Get all links |
+| [`links()`](/reference/api/generated/riviere-builder/classes/RiviereQuery#links) | Get all links |
 
 ### Domain methods
 
 | Method | Purpose |
 |--------|---------|
-| [`domains()`](/reference/api/generated/riviere-query/classes/RiviereQuery#domains) | Domain info with component counts |
-| [`entities(domainId?)`](/reference/api/generated/riviere-query/classes/RiviereQuery#entities) | Entity names in domain |
-| [`crossDomainLinks(domainId)`](/reference/api/generated/riviere-query/classes/RiviereQuery#crossdomainlinks) | Links leaving domain |
+| [`domains()`](/reference/api/generated/riviere-builder/classes/RiviereQuery#domains) | Domain info with component counts |
+| [`entities(domainId?)`](/reference/api/generated/riviere-builder/classes/RiviereQuery#entities) | Entity names in domain |
+| [`crossDomainLinks(domainId)`](/reference/api/generated/riviere-builder/classes/RiviereQuery#crossdomainlinks) | Links leaving domain |
 
 ### Analysis methods
 
 | Method | Purpose |
 |--------|---------|
-| [`entryPoints()`](/reference/api/generated/riviere-query/classes/RiviereQuery#entrypoints) | UI/API/EventHandler with no incoming links |
+| [`entryPoints()`](/reference/api/generated/riviere-builder/classes/RiviereQuery#entrypoints) | UI/API/EventHandler with no incoming links |
 
 ---
 
 ## Full Documentation
 
 - [RiviereBuilder](/reference/api/generated/riviere-builder/classes/RiviereBuilder) — Build graphs with type-safe methods
-- [RiviereQuery](/reference/api/generated/riviere-query/classes/RiviereQuery) — Query and analyze graphs
-- [Types](/reference/api/generated/riviere-query/README) — All TypeScript type definitions
+- [RiviereQuery](/reference/api/generated/riviere-builder/classes/RiviereQuery) — Query and analyze graphs
+- [Types](/reference/api/generated/riviere-builder/README) — All TypeScript type definitions
 
 ## See Also
 
diff --git a/apps/docs/reference/extraction-config/connections.md b/apps/docs/reference/extraction-config/connections.md
index 85281d7da..154991829 100644
--- a/apps/docs/reference/extraction-config/connections.md
+++ b/apps/docs/reference/extraction-config/connections.md
@@ -74,13 +74,13 @@ modules:
     name: orders
     path: ../../orders
     modules: /src/{module}
-    extends: '@living-architecture/riviere-extract-conventions'
+    extends: '@living-architecture/riviere-extract-conventions-published-language'
 
   - domain: bff
     name: bff
     path: ../../bff
     modules: /src/{module}
-    extends: '@living-architecture/riviere-extract-conventions'
+    extends: '@living-architecture/riviere-extract-conventions-published-language'
 
 connections:
   eventPublishers:
diff --git a/apps/docs/reference/extraction-config/decorators.md b/apps/docs/reference/extraction-config/decorators.md
index f3c053065..e9662a76b 100644
--- a/apps/docs/reference/extraction-config/decorators.md
+++ b/apps/docs/reference/extraction-config/decorators.md
@@ -5,7 +5,7 @@ Annotate TypeScript code with architectural component markers.
 ## Installation
 
 ```bash
-npm install --save-dev @living-architecture/riviere-extract-conventions
+npm install --save-dev @living-architecture/riviere-extract-conventions-published-language
 ```
 
 ## Decorator Categories
@@ -24,7 +24,7 @@ All public methods in the class become separate components.
 ### @APIContainer
 
 ```typescript
-import { APIContainer, APIEndpoint } from '@living-architecture/riviere-extract-conventions'
+import { APIContainer, APIEndpoint } from '@living-architecture/riviere-extract-conventions-published-language'
 
 @APIContainer
 class OrderController {
@@ -43,7 +43,7 @@ class OrderController {
 ### @DomainOpContainer
 
 ```typescript
-import { DomainOpContainer, DomainOp } from '@living-architecture/riviere-extract-conventions'
+import { DomainOpContainer, DomainOp } from '@living-architecture/riviere-extract-conventions-published-language'
 
 @DomainOpContainer
 class Order {
@@ -62,7 +62,7 @@ class Order {
 ### @EventHandlerContainer
 
 ```typescript
-import { EventHandlerContainer, EventHandler } from '@living-architecture/riviere-extract-conventions'
+import { EventHandlerContainer, EventHandler } from '@living-architecture/riviere-extract-conventions-published-language'
 
 @EventHandlerContainer
 class OrderEventHandlers {
@@ -80,7 +80,7 @@ The class itself is the architectural component.
 ### @UseCase
 
 ```typescript
-import { UseCase } from '@living-architecture/riviere-extract-conventions'
+import { UseCase } from '@living-architecture/riviere-extract-conventions-published-language'
 
 @UseCase
 class PlaceOrderUseCase {
@@ -93,7 +93,7 @@ class PlaceOrderUseCase {
 ### @Event
 
 ```typescript
-import { Event } from '@living-architecture/riviere-extract-conventions'
+import { Event } from '@living-architecture/riviere-extract-conventions-published-language'
 
 @Event
 class OrderPlaced {
@@ -108,7 +108,7 @@ class OrderPlaced {
 ### @UI
 
 ```typescript
-import { UI } from '@living-architecture/riviere-extract-conventions'
+import { UI } from '@living-architecture/riviere-extract-conventions-published-language'
 
 @UI
 class OrderList {
@@ -125,7 +125,7 @@ Individual methods marked as components (without container decorator on class).
 ### @APIEndpoint
 
 ```typescript
-import { APIEndpoint } from '@living-architecture/riviere-extract-conventions'
+import { APIEndpoint } from '@living-architecture/riviere-extract-conventions-published-language'
 
 class OrderController {
   @APIEndpoint
@@ -143,7 +143,7 @@ class OrderController {
 ### @DomainOp
 
 ```typescript
-import { DomainOp } from '@living-architecture/riviere-extract-conventions'
+import { DomainOp } from '@living-architecture/riviere-extract-conventions-published-language'
 
 class Order {
   @DomainOp
@@ -161,7 +161,7 @@ class Order {
 ### @EventHandler
 
 ```typescript
-import { EventHandler } from '@living-architecture/riviere-extract-conventions'
+import { EventHandler } from '@living-architecture/riviere-extract-conventions-published-language'
 
 class OrderHandlers {
   @EventHandler
@@ -178,7 +178,7 @@ class OrderHandlers {
 Define custom component types:
 
 ```typescript
-import { Custom } from '@living-architecture/riviere-extract-conventions'
+import { Custom } from '@living-architecture/riviere-extract-conventions-published-language'
 
 @Custom('saga')
 class OrderSaga {
@@ -191,7 +191,7 @@ class OrderSaga {
 Exclude classes from extraction:
 
 ```typescript
-import { Ignore } from '@living-architecture/riviere-extract-conventions'
+import { Ignore } from '@living-architecture/riviere-extract-conventions-published-language'
 
 @Ignore
 class TestHelper {
@@ -221,7 +221,7 @@ The conventions package provides a default config that detects all decorator typ
 modules:
   - name: "orders"
     path: "src/orders/**/*.ts"
-    extends: "@living-architecture/riviere-extract-conventions"
+    extends: "@living-architecture/riviere-extract-conventions-published-language"
 ```
 
 [View Default Config Source](https://github.com/NTCoding/living-architecture/blob/main/packages/riviere-extract-conventions/src/default-extraction.config.json)
diff --git a/apps/docs/reference/extraction-config/examples.md b/apps/docs/reference/extraction-config/examples.md
index d9a0d2f9a..650a2eec5 100644
--- a/apps/docs/reference/extraction-config/examples.md
+++ b/apps/docs/reference/extraction-config/examples.md
@@ -266,13 +266,13 @@ modules:
         inClassWith:
           hasDecorator:
             name: "APIContainer"
-            from: "@living-architecture/riviere-extract-conventions"
+            from: "@living-architecture/riviere-extract-conventions-published-language"
     useCase:
       find: "classes"
       where:
         hasDecorator:
           name: "UseCase"
-          from: "@living-architecture/riviere-extract-conventions"
+          from: "@living-architecture/riviere-extract-conventions-published-language"
     domainOp: { notUsed: true }
     event: { notUsed: true }
     eventHandler: { notUsed: true }
@@ -345,20 +345,20 @@ modules:
   # All modules inherit detection rules from the conventions package
   - name: "orders"
     path: "src/orders/**/*.ts"
-    extends: "@living-architecture/riviere-extract-conventions"
+    extends: "@living-architecture/riviere-extract-conventions-published-language"
 
   - name: "shipping"
     path: "src/shipping/**/*.ts"
-    extends: "@living-architecture/riviere-extract-conventions"
+    extends: "@living-architecture/riviere-extract-conventions-published-language"
 
   - name: "inventory"
     path: "src/inventory/**/*.ts"
-    extends: "@living-architecture/riviere-extract-conventions"
+    extends: "@living-architecture/riviere-extract-conventions-published-language"
 
   # Override specific rules when needed
   - name: "payments"
     path: "src/payments/**/*.ts"
-    extends: "@living-architecture/riviere-extract-conventions"
+    extends: "@living-architecture/riviere-extract-conventions-published-language"
     event: { notUsed: true }  # No events in payments module
     ui: { notUsed: true }      # No UI in payments module
 ```
diff --git a/apps/docs/scripts/validate-cli-refs.ts b/apps/docs/scripts/validate-cli-refs.ts
index ed5a8f861..4484a0aef 100644
--- a/apps/docs/scripts/validate-cli-refs.ts
+++ b/apps/docs/scripts/validate-cli-refs.ts
@@ -4,11 +4,9 @@
  * Fails build if docs reference non-existent commands.
  */
 
-import {
-  readdirSync, readFileSync, statSync 
-} from 'node:fs'
+import { readdirSync, readFileSync, statSync } from 'node:fs'
 import { join } from 'node:path'
-import { createProgram } from '../../../packages/riviere-cli/src/shell/cli'
+import { createProgram } from '../../cli/src/shell/cli'
 
 interface ValidationError {
   file: string
diff --git a/apps/docs/tsconfig.app.json b/apps/docs/tsconfig.app.json
index 02b1d3d47..66436ab53 100644
--- a/apps/docs/tsconfig.app.json
+++ b/apps/docs/tsconfig.app.json
@@ -11,7 +11,7 @@
   "exclude": [".vitepress/**/*.spec.ts"],
   "references": [
     {
-      "path": "../../packages/riviere-cli/tsconfig.lib.json"
+      "path": "../cli/tsconfig.lib.json"
     },
     {
       "path": "./tsconfig.scripts.json"
diff --git a/apps/eclair/package.json b/apps/eclair/package.json
index 9ec9c895b..07e4351fa 100644
--- a/apps/eclair/package.json
+++ b/apps/eclair/package.json
@@ -49,8 +49,8 @@
     }
   },
   "dependencies": {
-    "@living-architecture/riviere-query": "workspace:*",
-    "@living-architecture/riviere-schema": "workspace:*",
+    "@living-architecture/riviere-builder-domain-model": "workspace:*",
+    "@living-architecture/riviere-schema-published-language": "workspace:*",
     "@xyflow/react": "^12.9.3",
     "d3": "^7.9.0",
     "dagre": "^0.8.5",
diff --git a/apps/eclair/src/features/comparison/components/UploadZone.tsx b/apps/eclair/src/features/comparison/components/UploadZone.tsx
index 0c2121690..1169a1297 100644
--- a/apps/eclair/src/features/comparison/components/UploadZone.tsx
+++ b/apps/eclair/src/features/comparison/components/UploadZone.tsx
@@ -1,7 +1,7 @@
 import {
   useCallback, useRef 
 } from 'react'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 
 interface UploadedFile {
   readonly name: string
diff --git a/apps/eclair/src/features/comparison/entrypoint/ComparisonPage.tsx b/apps/eclair/src/features/comparison/entrypoint/ComparisonPage.tsx
index dbc8b2b57..069bced13 100644
--- a/apps/eclair/src/features/comparison/entrypoint/ComparisonPage.tsx
+++ b/apps/eclair/src/features/comparison/entrypoint/ComparisonPage.tsx
@@ -2,7 +2,7 @@ import {
   useState, useCallback 
 } from 'react'
 import type { Node } from '../queries/eclair-types'
-import { parseRiviereGraph } from '@living-architecture/riviere-schema'
+import { parseRiviereGraph } from '@living-architecture/riviere-schema-published-language/validation'
 import {
   compareGraphs, type GraphDiff
 } from '../queries/compare-graphs'
@@ -59,12 +59,18 @@ function buildChangeItems(diff: GraphDiff): ChangeItemBase[] {
 function parseGraphFile(content: string, fileName: string): UploadState {
   try {
     const data: unknown = JSON.parse(content)
-    const graph = parseRiviereGraph(data)
+    const result = parseRiviereGraph(data)
+    if (!result.success) {
+      return {
+        status: 'error',
+        error: { message: result.issues.join('\n') },
+      }
+    }
     return {
       status: 'loaded',
       file: {
         name: fileName,
-        graph,
+        graph: result.graph,
       },
     }
   } catch (e) {
diff --git a/apps/eclair/src/features/comparison/queries/compare-graphs.spec.ts b/apps/eclair/src/features/comparison/queries/compare-graphs.spec.ts
index 0cd810345..8c86bc540 100644
--- a/apps/eclair/src/features/comparison/queries/compare-graphs.spec.ts
+++ b/apps/eclair/src/features/comparison/queries/compare-graphs.spec.ts
@@ -1,11 +1,7 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { compareGraphs } from './compare-graphs'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
-import type {
-  Node, Edge 
-} from '@/platform/domain/eclair-types'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
+import type { Node, Edge } from '@/platform/domain/eclair-types'
 import {
   parseNode,
   parseEdge,
diff --git a/apps/eclair/src/features/comparison/queries/compare-graphs.ts b/apps/eclair/src/features/comparison/queries/compare-graphs.ts
index 35f12ce26..dcaed1274 100644
--- a/apps/eclair/src/features/comparison/queries/compare-graphs.ts
+++ b/apps/eclair/src/features/comparison/queries/compare-graphs.ts
@@ -1,12 +1,14 @@
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
-import type {
-  Node, Edge, NodeType, NodeId 
-} from '@/platform/domain/eclair-types'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
+import type { Node, Edge, NodeType, NodeId } from '@/platform/domain/eclair-types'
 import { GraphError } from '@/platform/infra/errors/errors'
 
-interface NodeAddition {node: Node}
+interface NodeAddition {
+  node: Node
+}
 
-interface NodeRemoval {node: Node}
+interface NodeRemoval {
+  node: Node
+}
 
 interface NodeModification {
   before: Node
@@ -14,9 +16,13 @@ interface NodeModification {
   changedFields: string[]
 }
 
-interface EdgeAddition {edge: Edge}
+interface EdgeAddition {
+  edge: Edge
+}
 
-interface EdgeRemoval {edge: Edge}
+interface EdgeRemoval {
+  edge: Edge
+}
 
 interface EdgeModification {
   before: Edge
@@ -61,9 +67,13 @@ export interface NodeTypeChanges {
   modified: NodeModification[]
 }
 
-interface ByDomainAccumulator {data: Record<string, DomainChanges>}
+interface ByDomainAccumulator {
+  data: Record<string, DomainChanges>
+}
 
-interface ByNodeTypeAccumulator {data: Map<NodeType, NodeTypeChanges>}
+interface ByNodeTypeAccumulator {
+  data: Map<NodeType, NodeTypeChanges>
+}
 
 export interface GraphDiff {
   nodes: NodeDiff
diff --git a/apps/eclair/src/features/comparison/queries/compute-domain-connection-diff.edgeDetails.spec.ts b/apps/eclair/src/features/comparison/queries/compute-domain-connection-diff.edgeDetails.spec.ts
index 6e2fca907..106e59555 100644
--- a/apps/eclair/src/features/comparison/queries/compute-domain-connection-diff.edgeDetails.spec.ts
+++ b/apps/eclair/src/features/comparison/queries/compute-domain-connection-diff.edgeDetails.spec.ts
@@ -1,8 +1,6 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { computeDomainConnectionDiff } from './compute-domain-connection-diff'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import {
   parseNode,
   parseEdge,
diff --git a/apps/eclair/src/features/comparison/queries/compute-domain-connection-diff.spec.ts b/apps/eclair/src/features/comparison/queries/compute-domain-connection-diff.spec.ts
index c2c157acc..1fec4a6a5 100644
--- a/apps/eclair/src/features/comparison/queries/compute-domain-connection-diff.spec.ts
+++ b/apps/eclair/src/features/comparison/queries/compute-domain-connection-diff.spec.ts
@@ -1,8 +1,6 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { computeDomainConnectionDiff } from './compute-domain-connection-diff'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import {
   parseNode,
   parseEdge,
diff --git a/apps/eclair/src/features/comparison/queries/compute-domain-connection-diff.ts b/apps/eclair/src/features/comparison/queries/compute-domain-connection-diff.ts
index 1be085788..c551c7750 100644
--- a/apps/eclair/src/features/comparison/queries/compute-domain-connection-diff.ts
+++ b/apps/eclair/src/features/comparison/queries/compute-domain-connection-diff.ts
@@ -1,7 +1,5 @@
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
-import type {
-  Node, NodeType 
-} from '@/platform/domain/eclair-types'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
+import type { Node, NodeType } from '@/platform/domain/eclair-types'
 
 export interface EdgeDetail {
   sourceNodeName: string
diff --git a/apps/eclair/src/features/domain-map/entrypoint/DomainMapPage.spec.tsx b/apps/eclair/src/features/domain-map/entrypoint/DomainMapPage.spec.tsx
index 7e0360bfd..b1d6838ba 100644
--- a/apps/eclair/src/features/domain-map/entrypoint/DomainMapPage.spec.tsx
+++ b/apps/eclair/src/features/domain-map/entrypoint/DomainMapPage.spec.tsx
@@ -8,7 +8,7 @@ import { MemoryRouter } from 'react-router-dom'
 import { DomainMapPage } from './DomainMapPage'
 import { ExportProvider } from '@/platform/infra/export/ExportContext'
 import { ThemeProvider } from '@/platform/infra/theme/ThemeContext'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import {
   parseNode, parseEdge, parseDomainMetadata 
 } from '@/platform/infra/__fixtures__/riviere-test-fixtures'
diff --git a/apps/eclair/src/features/domain-map/entrypoint/DomainMapPage.tsx b/apps/eclair/src/features/domain-map/entrypoint/DomainMapPage.tsx
index a40fa3061..ce28e97ac 100644
--- a/apps/eclair/src/features/domain-map/entrypoint/DomainMapPage.tsx
+++ b/apps/eclair/src/features/domain-map/entrypoint/DomainMapPage.tsx
@@ -12,7 +12,7 @@ import type {
   Node, Edge, NodeMouseHandler, EdgeMouseHandler 
 } from '@xyflow/react'
 import '@xyflow/react/dist/style.css'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import { useExport } from '@/platform/infra/export/ExportContext'
 import {
   generateExportFilename,
diff --git a/apps/eclair/src/features/domain-map/queries/edge-aggregation.ts b/apps/eclair/src/features/domain-map/queries/edge-aggregation.ts
index 4a57fca7f..2753ca3d0 100644
--- a/apps/eclair/src/features/domain-map/queries/edge-aggregation.ts
+++ b/apps/eclair/src/features/domain-map/queries/edge-aggregation.ts
@@ -1,4 +1,4 @@
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import {
   getEdgeType,
   recordEdgeAggregation,
diff --git a/apps/eclair/src/features/domain-map/queries/external-domain-handling.ts b/apps/eclair/src/features/domain-map/queries/external-domain-handling.ts
index c8c0ff5af..dab0faf65 100644
--- a/apps/eclair/src/features/domain-map/queries/external-domain-handling.ts
+++ b/apps/eclair/src/features/domain-map/queries/external-domain-handling.ts
@@ -1,7 +1,5 @@
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
-import {
-  getEdgeType, type ConnectionDetail 
-} from './edgeAggregation'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
+import { getEdgeType, type ConnectionDetail } from './edgeAggregation'
 
 export interface ExternalEdgeInfo {
   targetName: string
diff --git a/apps/eclair/src/features/domain-map/queries/extract-domain-map.external.spec.ts b/apps/eclair/src/features/domain-map/queries/extract-domain-map.external.spec.ts
index 80588bef3..ecbef71ef 100644
--- a/apps/eclair/src/features/domain-map/queries/extract-domain-map.external.spec.ts
+++ b/apps/eclair/src/features/domain-map/queries/extract-domain-map.external.spec.ts
@@ -1,11 +1,7 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { extractDomainMap } from './extract-domain-map'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
-import {
-  parseNode, parseDomainMetadata 
-} from '@/platform/infra/__fixtures__/riviere-test-fixtures'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
+import { parseNode, parseDomainMetadata } from '@/platform/infra/__fixtures__/riviere-test-fixtures'
 
 const testSourceLocation = {
   repository: 'test-repo',
diff --git a/apps/eclair/src/features/domain-map/queries/extract-domain-map.reactflow.spec.ts b/apps/eclair/src/features/domain-map/queries/extract-domain-map.reactflow.spec.ts
index 4fa467d53..97e5326e4 100644
--- a/apps/eclair/src/features/domain-map/queries/extract-domain-map.reactflow.spec.ts
+++ b/apps/eclair/src/features/domain-map/queries/extract-domain-map.reactflow.spec.ts
@@ -1,8 +1,6 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { extractDomainMap } from './extract-domain-map'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import {
   parseNode,
   parseEdge,
diff --git a/apps/eclair/src/features/domain-map/queries/extract-domain-map.spec.ts b/apps/eclair/src/features/domain-map/queries/extract-domain-map.spec.ts
index af0509eb1..4b74b06ea 100644
--- a/apps/eclair/src/features/domain-map/queries/extract-domain-map.spec.ts
+++ b/apps/eclair/src/features/domain-map/queries/extract-domain-map.spec.ts
@@ -1,11 +1,7 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import {
-  extractDomainMap, getConnectedDomains 
-} from './extract-domain-map'
+import { describe, it, expect } from 'vitest'
+import { extractDomainMap, getConnectedDomains } from './extract-domain-map'
 import type { DomainEdge } from './extract-domain-map'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import {
   parseNode,
   parseEdge,
diff --git a/apps/eclair/src/features/domain-map/queries/extract-domain-map.ts b/apps/eclair/src/features/domain-map/queries/extract-domain-map.ts
index 211906cd5..fcc86ec13 100644
--- a/apps/eclair/src/features/domain-map/queries/extract-domain-map.ts
+++ b/apps/eclair/src/features/domain-map/queries/extract-domain-map.ts
@@ -1,16 +1,12 @@
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
-import type {
-  Node, Edge 
-} from '@xyflow/react'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
+import type { Node, Edge } from '@xyflow/react'
 import dagre from 'dagre'
 import { getClosestHandle } from '@/platform/infra/layout/handle-positioning'
-import { RiviereQuery } from '@living-architecture/riviere-query'
+import { RiviereQuery } from '@living-architecture/riviere-builder-domain-model/query'
 import type * as DomainMapEdgeTypes from './edgeAggregation'
 import { LayoutError } from '@/platform/infra/errors/errors'
 import { aggregateDomainEdges } from './edge-aggregation'
-import {
-  aggregateExternalEdges, createExternalNodeId 
-} from './external-domain-handling'
+import { aggregateExternalEdges, createExternalNodeId } from './external-domain-handling'
 import { getEffectiveNodeType } from '@/platform/domain/node-type-presentation'
 import { semanticRelationshipSummary } from './edgeAggregation'
 
diff --git a/apps/eclair/src/features/domains/components/DomainDetailView/DomainDetailView.spec.tsx b/apps/eclair/src/features/domains/components/DomainDetailView/DomainDetailView.spec.tsx
index d0d4a6112..f6d5a8a65 100644
--- a/apps/eclair/src/features/domains/components/DomainDetailView/DomainDetailView.spec.tsx
+++ b/apps/eclair/src/features/domains/components/DomainDetailView/DomainDetailView.spec.tsx
@@ -6,7 +6,7 @@ import { extractDomainDetails } from '../../queries/extract-domain-details'
 import {
   parseNode, parseDomainMetadata, parseDomainKey
 } from '@/platform/infra/__fixtures__/riviere-test-fixtures'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import { assertDefined } from '@/test-assertions'
 const testSourceLocation = {
   repository: 'test-repo',
diff --git a/apps/eclair/src/features/domains/components/DomainDetailView/DomainDetailView.tsx b/apps/eclair/src/features/domains/components/DomainDetailView/DomainDetailView.tsx
index fbf06d55b..8fbed1c17 100644
--- a/apps/eclair/src/features/domains/components/DomainDetailView/DomainDetailView.tsx
+++ b/apps/eclair/src/features/domains/components/DomainDetailView/DomainDetailView.tsx
@@ -47,7 +47,7 @@ export function DomainDetailView({
     return entitySearch === ''
       ? domain.entities
       : domain.entities.filter((entity) =>
-        entity.name.toLowerCase().includes(entitySearch.toLowerCase()),
+        entity.name.value.toLowerCase().includes(entitySearch.toLowerCase()),
       )
   }, [domain.entities, entitySearch])
 
@@ -376,7 +376,7 @@ function EntitiesListOrEmpty({
     return (
       <div className="max-h-[320px] space-y-3 overflow-y-auto">
         {filteredEntities.map((entity) => (
-          <EntityAccordion key={entity.name} entity={entity} />
+          <EntityAccordion key={entity.name.value} entity={entity} />
         ))}
       </div>
     )
diff --git a/apps/eclair/src/features/domains/entrypoint/DomainDetailPage.spec.tsx b/apps/eclair/src/features/domains/entrypoint/DomainDetailPage.spec.tsx
index e832ee344..76e75f13a 100644
--- a/apps/eclair/src/features/domains/entrypoint/DomainDetailPage.spec.tsx
+++ b/apps/eclair/src/features/domains/entrypoint/DomainDetailPage.spec.tsx
@@ -12,7 +12,7 @@ import { DomainDetailPage } from './DomainDetailPage'
 import {
   parseNode, parseEdge, parseDomainMetadata
 } from '@/platform/infra/__fixtures__/riviere-test-fixtures'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import { assertDefined } from '@/test-assertions'
 
 const testSourceLocation = {
diff --git a/apps/eclair/src/features/domains/entrypoint/DomainDetailPage.tsx b/apps/eclair/src/features/domains/entrypoint/DomainDetailPage.tsx
index 98741c8c1..e167e1de3 100644
--- a/apps/eclair/src/features/domains/entrypoint/DomainDetailPage.tsx
+++ b/apps/eclair/src/features/domains/entrypoint/DomainDetailPage.tsx
@@ -2,7 +2,7 @@ import {
   useState, useRef, useCallback, forwardRef 
 } from 'react'
 import { useParams } from 'react-router-dom'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import {
   extractDomainDetails, type DomainDetails
 } from '../queries/extract-domain-details'
diff --git a/apps/eclair/src/features/domains/queries/domain-node-breakdown.spec.ts b/apps/eclair/src/features/domains/queries/domain-node-breakdown.spec.ts
index c0a876817..260007258 100644
--- a/apps/eclair/src/features/domains/queries/domain-node-breakdown.spec.ts
+++ b/apps/eclair/src/features/domains/queries/domain-node-breakdown.spec.ts
@@ -1,6 +1,4 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import {
   countNodesByType,
   formatDomainNodes,
@@ -8,7 +6,7 @@ import {
   type NodeBreakdown,
 } from './domain-node-breakdown'
 import { parseNode } from '@/platform/infra/__fixtures__/riviere-test-fixtures'
-import type { SourceLocation } from '@living-architecture/riviere-schema'
+import type { SourceLocation } from '@living-architecture/riviere-schema-published-language/schema'
 import type { RawNode } from '@/platform/infra/__fixtures__/riviere-test-fixtures'
 
 const testSourceLocation = {
diff --git a/apps/eclair/src/features/domains/queries/domain-node-breakdown.ts b/apps/eclair/src/features/domains/queries/domain-node-breakdown.ts
index ac231deaf..b9f8435ab 100644
--- a/apps/eclair/src/features/domains/queries/domain-node-breakdown.ts
+++ b/apps/eclair/src/features/domains/queries/domain-node-breakdown.ts
@@ -1,4 +1,4 @@
-import type * as RiviereSchema from '@living-architecture/riviere-schema'
+import type * as RiviereSchema from '@living-architecture/riviere-schema-published-language/schema'
 import * as EclairDomain from '@/platform/domain/eclair-types'
 import { getEffectiveNodeType } from '@/platform/domain/node-type-presentation'
 
diff --git a/apps/eclair/src/features/domains/queries/extract-domain-details.advanced.spec.ts b/apps/eclair/src/features/domains/queries/extract-domain-details.advanced.spec.ts
index 345a0897d..3776cd060 100644
--- a/apps/eclair/src/features/domains/queries/extract-domain-details.advanced.spec.ts
+++ b/apps/eclair/src/features/domains/queries/extract-domain-details.advanced.spec.ts
@@ -1,6 +1,4 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { extractDomainDetails } from './extract-domain-details'
 import {
   parseNode,
@@ -10,7 +8,7 @@ import {
   type RawNode,
   type RawEdge,
 } from '@/platform/infra/__fixtures__/riviere-test-fixtures'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 const testSourceLocation = {
   repository: 'test-repo',
   filePath: 'src/test.ts',
@@ -571,7 +569,7 @@ describe('extractDomainDetails - advanced tests', () => {
       })
 
       const result = extractDomainDetails(graph, parseDomainKey('order-domain'))
-      const orderEntity = result?.entities.find((e) => e.name === 'Order')
+      const orderEntity = result?.entities.find((e) => e.name.value === 'Order')
       const beginOp = orderEntity?.operations.find((op) => op.operationName === 'begin')
 
       expect(beginOp?.behavior).toStrictEqual({
@@ -611,7 +609,7 @@ describe('extractDomainDetails - advanced tests', () => {
       })
 
       const result = extractDomainDetails(graph, parseDomainKey('order-domain'))
-      const orderEntity = result?.entities.find((e) => e.name === 'Order')
+      const orderEntity = result?.entities.find((e) => e.name.value === 'Order')
       const beginOp = orderEntity?.operations.find((op) => op.operationName === 'begin')
 
       expect(beginOp?.stateChanges).toStrictEqual([
@@ -658,7 +656,7 @@ describe('extractDomainDetails - advanced tests', () => {
       })
 
       const result = extractDomainDetails(graph, parseDomainKey('order-domain'))
-      const orderEntity = result?.entities.find((e) => e.name === 'Order')
+      const orderEntity = result?.entities.find((e) => e.name.value === 'Order')
       const beginOp = orderEntity?.operations.find((op) => op.operationName === 'begin')
 
       expect(beginOp?.signature?.parameters).toHaveLength(2)
@@ -693,7 +691,7 @@ describe('extractDomainDetails - advanced tests', () => {
       })
 
       const result = extractDomainDetails(graph, parseDomainKey('order-domain'))
-      const orderEntity = result?.entities.find((e) => e.name === 'Order')
+      const orderEntity = result?.entities.find((e) => e.name.value === 'Order')
       const beginOp = orderEntity?.operations.find((op) => op.operationName === 'begin')
 
       expect(beginOp?.sourceLocation?.filePath).toBe('src/Order.ts')
diff --git a/apps/eclair/src/features/domains/queries/extract-domain-details.entities.spec.ts b/apps/eclair/src/features/domains/queries/extract-domain-details.entities.spec.ts
index 95a82047b..0eed937b5 100644
--- a/apps/eclair/src/features/domains/queries/extract-domain-details.entities.spec.ts
+++ b/apps/eclair/src/features/domains/queries/extract-domain-details.entities.spec.ts
@@ -1,6 +1,4 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { extractDomainDetails } from './extract-domain-details'
 import {
   parseNode,
@@ -8,7 +6,7 @@ import {
   parseDomainKey,
   type RawNode,
 } from '@/platform/infra/__fixtures__/riviere-test-fixtures'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 
 const testSourceLocation = {
   repository: 'test-repo',
@@ -87,13 +85,13 @@ describe('extractDomainDetails entities extraction', () => {
 
     expect(result?.entities).toHaveLength(2)
 
-    const orderEntity = result?.entities.find((e) => e.name === 'Order')
+    const orderEntity = result?.entities.find((e) => e.name.value === 'Order')
     expect(orderEntity?.operations.map((op) => op.operationName)).toStrictEqual([
       'begin',
       'confirm',
     ])
 
-    const orderItemEntity = result?.entities.find((e) => e.name === 'OrderItem')
+    const orderItemEntity = result?.entities.find((e) => e.name.value === 'OrderItem')
     expect(orderItemEntity?.operations.map((op) => op.operationName)).toStrictEqual(['add'])
   })
 
@@ -137,7 +135,7 @@ describe('extractDomainDetails entities extraction', () => {
 
     const result = extractDomainDetails(graph, parseDomainKey('order-domain'))
 
-    expect(result?.entities.map((e) => e.name)).toStrictEqual(['Apple', 'Zebra'])
+    expect(result?.entities.map((e) => e.name.value)).toStrictEqual(['Apple', 'Zebra'])
     expect(result?.entities[0]?.operations.map((op) => op.operationName)).toStrictEqual([
       'aa',
       'bb',
@@ -210,7 +208,7 @@ describe('extractDomainDetails entities extraction', () => {
     })
 
     const result = extractDomainDetails(graph, parseDomainKey('order-domain'))
-    const orderEntity = result?.entities.find((e) => e.name === 'Order')
+    const orderEntity = result?.entities.find((e) => e.name.value === 'Order')
 
     expect(orderEntity?.operations[0]?.sourceLocation).toStrictEqual({
       repository: 'test-repo',
@@ -246,7 +244,7 @@ describe('extractDomainDetails entities extraction', () => {
     })
 
     const result = extractDomainDetails(graph, parseDomainKey('order-domain'))
-    const orderEntity = result?.entities.find((e) => e.name === 'Order')
+    const orderEntity = result?.entities.find((e) => e.name.value === 'Order')
 
     expect(orderEntity?.operations[0]?.sourceLocation).toStrictEqual({
       repository: 'test-repo',
@@ -278,7 +276,7 @@ describe('extractDomainDetails entities extraction', () => {
 
     const result = extractDomainDetails(graph, parseDomainKey('order-domain'))
 
-    const orderEntity = result?.entities.find((e) => e.name === 'Order')
+    const orderEntity = result?.entities.find((e) => e.name.value === 'Order')
     expect(orderEntity?.businessRules).toStrictEqual([])
   })
 })
diff --git a/apps/eclair/src/features/domains/queries/extract-domain-details.relationships.spec.ts b/apps/eclair/src/features/domains/queries/extract-domain-details.relationships.spec.ts
index 2abe234d2..f2a884c87 100644
--- a/apps/eclair/src/features/domains/queries/extract-domain-details.relationships.spec.ts
+++ b/apps/eclair/src/features/domains/queries/extract-domain-details.relationships.spec.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import {
   parseDomainKey,
   parseDomainMetadata,
diff --git a/apps/eclair/src/features/domains/queries/extract-domain-details.spec.ts b/apps/eclair/src/features/domains/queries/extract-domain-details.spec.ts
index 6b512aebb..5d9364a36 100644
--- a/apps/eclair/src/features/domains/queries/extract-domain-details.spec.ts
+++ b/apps/eclair/src/features/domains/queries/extract-domain-details.spec.ts
@@ -1,6 +1,4 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { extractDomainDetails } from './extract-domain-details'
 import {
   parseNode,
@@ -8,7 +6,7 @@ import {
   parseDomainKey,
   type RawNode,
 } from '@/platform/infra/__fixtures__/riviere-test-fixtures'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 const testSourceLocation = {
   repository: 'test-repo',
   filePath: 'src/test.ts',
diff --git a/apps/eclair/src/features/domains/queries/extract-domain-details.stateMachine.spec.ts b/apps/eclair/src/features/domains/queries/extract-domain-details.stateMachine.spec.ts
index cb9f6e4c8..52b38e13b 100644
--- a/apps/eclair/src/features/domains/queries/extract-domain-details.stateMachine.spec.ts
+++ b/apps/eclair/src/features/domains/queries/extract-domain-details.stateMachine.spec.ts
@@ -1,6 +1,4 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { extractDomainDetails } from './extract-domain-details'
 import {
   parseNode,
@@ -8,7 +6,7 @@ import {
   parseDomainKey,
   type RawNode,
 } from '@/platform/infra/__fixtures__/riviere-test-fixtures'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 
 const testSourceLocation = {
   repository: 'test-repo',
@@ -103,8 +101,13 @@ describe('extractDomainDetails - entity state machine', () => {
     })
 
     const result = extractDomainDetails(graph, parseDomainKey('order-domain'))
-    const orderEntity = result?.entities.find((e) => e.name === 'Order')
+    const orderEntity = result?.entities.find((e) => e.name.value === 'Order')
 
-    expect(orderEntity?.states).toStrictEqual(['Draft', 'Placed', 'Confirmed', 'Shipped'])
+    expect(orderEntity?.states.map((state) => state.value)).toStrictEqual([
+      'Draft',
+      'Placed',
+      'Confirmed',
+      'Shipped',
+    ])
   })
 })
diff --git a/apps/eclair/src/features/domains/queries/extract-domain-details.ts b/apps/eclair/src/features/domains/queries/extract-domain-details.ts
index d19e01f42..4f3107018 100644
--- a/apps/eclair/src/features/domains/queries/extract-domain-details.ts
+++ b/apps/eclair/src/features/domains/queries/extract-domain-details.ts
@@ -1,4 +1,8 @@
-import type { RiviereGraph, SystemType, SourceLocation } from '@living-architecture/riviere-schema'
+import type {
+  RiviereGraph,
+  SystemType,
+  SourceLocation,
+} from '@living-architecture/riviere-schema-published-language/schema'
 import {
   nodeIdSchema,
   type DomainName,
@@ -6,7 +10,8 @@ import {
   type EntryPoint,
   type NodeId,
 } from '@/platform/domain/eclair-types'
-import { RiviereQuery, type Entity } from '@living-architecture/riviere-query'
+import { RiviereQuery } from '@living-architecture/riviere-builder-domain-model/query'
+import type { Entity } from '@living-architecture/riviere-builder-domain-model/query/entity'
 import { compareByCodePoint } from '@/platform/domain/compare-by-code-point'
 import type { NodeBreakdown, DomainNode } from './domain-node-breakdown'
 import { countNodesByType, formatDomainNodes, extractEntryPoints } from './domain-node-breakdown'
@@ -131,33 +136,45 @@ export function extractDomainDetails(
   )
 
   const publishedEvents: DomainEvent[] = queryPublished.map((pe) => {
-    const nodeId = nodeIdSchema.parse(pe.id)
+    const nodeId = nodeIdSchema.parse(pe.id.value)
     const component = componentById.get(nodeId)
     const schema = component?.type === 'Event' ? component.eventSchema : undefined
     return {
-      id: pe.id,
-      eventName: pe.eventName,
+      id: pe.id.value,
+      eventName: pe.eventName.value,
       sourceLocation: component?.sourceLocation,
-      handlers: pe.handlers,
+      handlers: pe.handlers.map((handler) => ({
+        domain: handler.domain.value,
+        handlerId: handler.handlerId.value,
+        handlerName: handler.handlerName.value,
+      })),
       schema,
     }
   })
 
-  const domainHandlers = queryHandlers.filter((h) => h.domain === domainId)
+  const domainHandlers = queryHandlers.filter((handler) => handler.domain.value === domainId)
   const consumedHandlers: DomainEventHandler[] = domainHandlers.map((h) => {
-    const nodeId = nodeIdSchema.parse(h.id)
+    const nodeId = nodeIdSchema.parse(h.id.value)
     const component = componentById.get(nodeId)
     const description =
       component?.description !== undefined && typeof component?.description === 'string'
         ? component.description
         : undefined
     return {
-      id: h.id,
-      handlerName: h.handlerName,
+      id: h.id.value,
+      handlerName: h.handlerName.value,
       description,
       sourceLocation: component?.sourceLocation,
-      subscribedEvents: h.subscribedEvents,
-      subscribedEventsWithDomain: h.subscribedEventsWithDomain,
+      subscribedEvents: h.subscribedEvents.map((eventName) => eventName.value),
+      subscribedEventsWithDomain: h.subscribedEventsWithDomain.map((event) =>
+        event.sourceKnown
+          ? {
+              eventName: event.eventName.value,
+              sourceDomain: event.sourceDomain.value,
+              sourceKnown: true,
+            }
+          : { eventName: event.eventName.value, sourceKnown: false },
+      ),
     }
   })
 
diff --git a/apps/eclair/src/features/empty-state/entrypoint/EmptyState.spec.tsx b/apps/eclair/src/features/empty-state/entrypoint/EmptyState.spec.tsx
index f5c7013e3..d82a6a8c1 100644
--- a/apps/eclair/src/features/empty-state/entrypoint/EmptyState.spec.tsx
+++ b/apps/eclair/src/features/empty-state/entrypoint/EmptyState.spec.tsx
@@ -10,7 +10,7 @@ import {
 } from '@/platform/infra/__fixtures__/riviere-test-fixtures'
 import type {
   RiviereGraph, SourceLocation
-} from '@living-architecture/riviere-schema'
+} from '@living-architecture/riviere-schema-published-language/schema'
 import {
   dropFilesOnElement, getDropZone
 } from '@/test/setup'
diff --git a/apps/eclair/src/features/empty-state/entrypoint/EmptyState.tsx b/apps/eclair/src/features/empty-state/entrypoint/EmptyState.tsx
index ea5b3933c..254b2a5bd 100644
--- a/apps/eclair/src/features/empty-state/entrypoint/EmptyState.tsx
+++ b/apps/eclair/src/features/empty-state/entrypoint/EmptyState.tsx
@@ -1,7 +1,7 @@
 import { useState } from 'react'
 import { FileUpload } from '@/platform/infra/file-upload/FileUpload'
 import { useGraph } from '@/platform/infra/graph-state/GraphContext'
-import { parseRiviereGraph } from '@living-architecture/riviere-schema'
+import { parseRiviereGraph } from '@living-architecture/riviere-schema-published-language/validation'
 
 export function EmptyState(): React.ReactElement {
   const { setGraph } = useGraph()
@@ -11,8 +11,12 @@ export function EmptyState(): React.ReactElement {
     setError(null)
     try {
       const data: unknown = JSON.parse(content)
-      const graph = parseRiviereGraph(data)
-      setGraph(graph)
+      const result = parseRiviereGraph(data)
+      if (!result.success) {
+        setError(`Validation failed for ${fileName}:\n${result.issues.join('\n')}`)
+        return
+      }
+      setGraph(result.graph)
     } catch (e) {
       const message = e instanceof Error ? e.message : 'Unknown error'
       setError(`Validation failed for ${fileName}:\n${message}`)
diff --git a/apps/eclair/src/features/entities/entrypoint/EntitiesPage.spec.tsx b/apps/eclair/src/features/entities/entrypoint/EntitiesPage.spec.tsx
index 6904392df..73c73432a 100644
--- a/apps/eclair/src/features/entities/entrypoint/EntitiesPage.spec.tsx
+++ b/apps/eclair/src/features/entities/entrypoint/EntitiesPage.spec.tsx
@@ -10,7 +10,7 @@ import { EntitiesPage } from './EntitiesPage'
 import {
   parseNode, parseEdge, parseDomainMetadata 
 } from '@/platform/infra/__fixtures__/riviere-test-fixtures'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 const testSourceLocation = {
   repository: 'test-repo',
   filePath: 'src/test.ts',
diff --git a/apps/eclair/src/features/entities/entrypoint/EntitiesPage.tsx b/apps/eclair/src/features/entities/entrypoint/EntitiesPage.tsx
index ebf0d364c..16aa3bbd1 100644
--- a/apps/eclair/src/features/entities/entrypoint/EntitiesPage.tsx
+++ b/apps/eclair/src/features/entities/entrypoint/EntitiesPage.tsx
@@ -2,9 +2,9 @@ import {
   useState, useMemo, useCallback 
 } from 'react'
 import { useNavigate } from 'react-router-dom'
-import { RiviereQuery } from '@living-architecture/riviere-query'
-import type { Entity } from '@living-architecture/riviere-query'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import { RiviereQuery } from '@living-architecture/riviere-builder-domain-model/query'
+import type { Entity } from '@living-architecture/riviere-builder-domain-model/query/entity'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import { EntityAccordion } from '@/platform/infra/ui/EntityAccordion/EntityAccordion'
 
 interface EntitiesPageProps {readonly graph: RiviereGraph}
@@ -29,16 +29,16 @@ export function EntitiesPage({ graph }: Readonly<EntitiesPageProps>): React.Reac
   const filteredEntities = useMemo(() => {
     return entities.filter((entity) => {
       const matchesSearch =
-        entity.name.toLowerCase().includes(searchQuery.toLowerCase()) ||
-        entity.domain.toLowerCase().includes(searchQuery.toLowerCase())
-      const matchesDomain = selectedDomain === 'all' || entity.domain === selectedDomain
+        entity.name.value.toLowerCase().includes(searchQuery.toLowerCase()) ||
+        entity.domain.value.toLowerCase().includes(searchQuery.toLowerCase())
+      const matchesDomain = selectedDomain === 'all' || entity.domain.value === selectedDomain
 
       return matchesSearch && matchesDomain
     })
   }, [entities, searchQuery, selectedDomain])
 
   const domains = useMemo(() => {
-    return Array.from(new Set(entities.map((e) => e.domain)))
+    return Array.from(new Set(entities.map((e) => e.domain.value)))
   }, [entities])
 
   const totalOperations = useMemo(() => {
@@ -120,7 +120,7 @@ export function EntitiesPage({ graph }: Readonly<EntitiesPageProps>): React.Reac
         <div data-testid="entities-list" className="space-y-4">
           {filteredEntities.map((entity) => (
             <EntityAccordion
-              key={`${entity.domain}-${entity.name}`}
+              key={`${entity.domain.value}-${entity.name.value}`}
               entity={entity}
               onViewOnGraph={handleViewOnGraph}
             />
diff --git a/apps/eclair/src/features/events/entrypoint/EventsPage.spec.tsx b/apps/eclair/src/features/events/entrypoint/EventsPage.spec.tsx
index f2297a3bc..32d2e4c44 100644
--- a/apps/eclair/src/features/events/entrypoint/EventsPage.spec.tsx
+++ b/apps/eclair/src/features/events/entrypoint/EventsPage.spec.tsx
@@ -9,7 +9,7 @@ import { MemoryRouter } from 'react-router-dom'
 import { EventsPage } from './EventsPage'
 import type {
   RiviereGraph, SourceLocation 
-} from '@living-architecture/riviere-schema'
+} from '@living-architecture/riviere-schema-published-language/schema'
 import {
   parseNode, parseEdge, parseDomainMetadata 
 } from '@/platform/infra/__fixtures__/riviere-test-fixtures'
diff --git a/apps/eclair/src/features/events/entrypoint/EventsPage.tsx b/apps/eclair/src/features/events/entrypoint/EventsPage.tsx
index 284af3c2d..009c779ec 100644
--- a/apps/eclair/src/features/events/entrypoint/EventsPage.tsx
+++ b/apps/eclair/src/features/events/entrypoint/EventsPage.tsx
@@ -4,7 +4,7 @@ import {
 import {
   useNavigate, useSearchParams 
 } from 'react-router-dom'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import { EventAccordion } from '@/platform/infra/ui/EventAccordion/EventAccordion'
 import { compareByCodePoint } from '../queries/compare-by-code-point'
 import type { DomainEvent } from '../queries/domain-event-types'
diff --git a/apps/eclair/src/features/flows/components/FlowCard/FlowCard.spec.tsx b/apps/eclair/src/features/flows/components/FlowCard/FlowCard.spec.tsx
index ce7547e84..e380830de 100644
--- a/apps/eclair/src/features/flows/components/FlowCard/FlowCard.spec.tsx
+++ b/apps/eclair/src/features/flows/components/FlowCard/FlowCard.spec.tsx
@@ -11,7 +11,7 @@ import {
   parseNode, parseEdge, parseDomainMetadata 
 } from '@/platform/infra/__fixtures__/riviere-test-fixtures'
 import type { Flow } from '../../queries/extract-flows'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 const testSourceLocation = {
   repository: 'test-repo',
   filePath: 'src/test.ts',
diff --git a/apps/eclair/src/features/flows/components/FlowCard/FlowCard.tsx b/apps/eclair/src/features/flows/components/FlowCard/FlowCard.tsx
index e2dfdc013..4d9a088d3 100644
--- a/apps/eclair/src/features/flows/components/FlowCard/FlowCard.tsx
+++ b/apps/eclair/src/features/flows/components/FlowCard/FlowCard.tsx
@@ -1,5 +1,5 @@
 import { useNavigate } from 'react-router-dom'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import type { Flow } from '../../queries/extract-flows'
 import { CodeLinkMenu } from '@/platform/infra/ui/CodeLinkMenu/CodeLinkMenu'
 import { FlowTrace } from '../FlowTrace/FlowTrace'
diff --git a/apps/eclair/src/features/flows/components/FlowTrace/FlowGraphView.spec.tsx b/apps/eclair/src/features/flows/components/FlowTrace/FlowGraphView.spec.tsx
index df85718a4..8b58ec342 100644
--- a/apps/eclair/src/features/flows/components/FlowTrace/FlowGraphView.spec.tsx
+++ b/apps/eclair/src/features/flows/components/FlowTrace/FlowGraphView.spec.tsx
@@ -9,7 +9,7 @@ import {
   parseNode, parseEdge, parseDomainMetadata 
 } from '@/platform/infra/__fixtures__/riviere-test-fixtures'
 import type { FlowStep } from '../../queries/extract-flows'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import type { TooltipData } from '@/platform/infra/graph/graph-types'
 
 const testSourceLocation = {
diff --git a/apps/eclair/src/features/flows/components/FlowTrace/FlowGraphView.tsx b/apps/eclair/src/features/flows/components/FlowTrace/FlowGraphView.tsx
index 9da527b95..7a955248a 100644
--- a/apps/eclair/src/features/flows/components/FlowTrace/FlowGraphView.tsx
+++ b/apps/eclair/src/features/flows/components/FlowTrace/FlowGraphView.tsx
@@ -5,7 +5,7 @@ import { ForceGraph } from '@/platform/infra/graph/ForceGraph/ForceGraph'
 import { GraphTooltip } from '@/platform/infra/graph/GraphTooltip/GraphTooltip'
 import type { TooltipData } from '@/platform/infra/graph/graph-types'
 import type { FlowStep } from '../../queries/extract-flows'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import type { Theme } from '@/types/theme'
 import { DEFAULT_THEME } from '@/types/theme'
 
diff --git a/apps/eclair/src/features/flows/components/FlowTrace/FlowTrace.spec.tsx b/apps/eclair/src/features/flows/components/FlowTrace/FlowTrace.spec.tsx
index 9e7e6e69f..f9c849d45 100644
--- a/apps/eclair/src/features/flows/components/FlowTrace/FlowTrace.spec.tsx
+++ b/apps/eclair/src/features/flows/components/FlowTrace/FlowTrace.spec.tsx
@@ -7,7 +7,7 @@ import {
 import userEvent from '@testing-library/user-event'
 import { FlowTrace } from './FlowTrace'
 import type { FlowStep } from '../../queries/extract-flows'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import {
   parseNode, parseEdge, parseDomainMetadata 
 } from '@/platform/infra/__fixtures__/riviere-test-fixtures'
diff --git a/apps/eclair/src/features/flows/components/FlowTrace/FlowTrace.tsx b/apps/eclair/src/features/flows/components/FlowTrace/FlowTrace.tsx
index 7fd0b0f6b..560af180c 100644
--- a/apps/eclair/src/features/flows/components/FlowTrace/FlowTrace.tsx
+++ b/apps/eclair/src/features/flows/components/FlowTrace/FlowTrace.tsx
@@ -1,8 +1,7 @@
 import { useState } from 'react'
 import type { FlowStep } from '../../queries/extract-flows'
-import {
-  createLinkId, type RiviereGraph
-} from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
+import { LinkId } from '@living-architecture/riviere-schema-published-language/link-id'
 import { FlowGraphView } from './FlowGraphView'
 import { getNodeTypeColor } from '@/platform/domain/node-type-presentation'
 import type { Theme } from '@/types/theme'
@@ -107,7 +106,7 @@ export function FlowTrace({
                 {(step.outgoingLinks?.length ?? 0) > 0 && (
                   <div className="flow-step-edge">
                     {step.outgoingLinks?.map((link) => (
-                      <div key={link.id ?? createLinkId(link)}>
+                      <div key={link.id ?? LinkId.parseFromLink(link).toString()}>
                         {relationshipDetail(link)} → {componentNames.get(link.target) ?? link.target}
                       </div>
                     ))}
diff --git a/apps/eclair/src/features/flows/entrypoint/FlowsPage.spec.tsx b/apps/eclair/src/features/flows/entrypoint/FlowsPage.spec.tsx
index 8ff038837..0cc56c7ce 100644
--- a/apps/eclair/src/features/flows/entrypoint/FlowsPage.spec.tsx
+++ b/apps/eclair/src/features/flows/entrypoint/FlowsPage.spec.tsx
@@ -7,7 +7,7 @@ import {
 import { MemoryRouter } from 'react-router-dom'
 import userEvent from '@testing-library/user-event'
 import { FlowsPage } from './FlowsPage'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import {
   parseNode, parseEdge, parseDomainMetadata
 } from '@/platform/infra/__fixtures__/riviere-test-fixtures'
diff --git a/apps/eclair/src/features/flows/entrypoint/FlowsPage.tsx b/apps/eclair/src/features/flows/entrypoint/FlowsPage.tsx
index 413f2b03f..9f76706eb 100644
--- a/apps/eclair/src/features/flows/entrypoint/FlowsPage.tsx
+++ b/apps/eclair/src/features/flows/entrypoint/FlowsPage.tsx
@@ -1,5 +1,5 @@
 import { useMemo } from 'react'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import { compareByCodePoint } from '../queries/compare-by-code-point'
 import { extractFlows } from '../queries/extract-flows'
 import { FlowCard } from '../components/FlowCard/FlowCard'
diff --git a/apps/eclair/src/features/flows/queries/extract-flows.spec.ts b/apps/eclair/src/features/flows/queries/extract-flows.spec.ts
index 3a5207b8e..17a8b7e1e 100644
--- a/apps/eclair/src/features/flows/queries/extract-flows.spec.ts
+++ b/apps/eclair/src/features/flows/queries/extract-flows.spec.ts
@@ -1,8 +1,6 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { extractFlows } from './extract-flows'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import {
   parseNode,
   parseEdge,
diff --git a/apps/eclair/src/features/flows/queries/extract-flows.ts b/apps/eclair/src/features/flows/queries/extract-flows.ts
index a90d8b301..92b58f320 100644
--- a/apps/eclair/src/features/flows/queries/extract-flows.ts
+++ b/apps/eclair/src/features/flows/queries/extract-flows.ts
@@ -1,15 +1,13 @@
-import {
-  RiviereQuery,
-  type Flow as QueryFlow,
-  type FlowStep as QueryFlowStep,
-} from '@living-architecture/riviere-query'
+import { RiviereQuery } from '@living-architecture/riviere-builder-domain-model/query'
+import type { Flow as QueryFlow } from '@living-architecture/riviere-builder-domain-model/query/flow'
+import type { FlowStep as QueryFlowStep } from '@living-architecture/riviere-builder-domain-model/query/flow-step'
 import type {
   Component,
   ExternalLink,
   Link,
   RiviereGraph,
   SourceLocation,
-} from '@living-architecture/riviere-schema'
+} from '@living-architecture/riviere-schema-published-language/schema'
 import { getEffectiveNodeType } from '@/platform/domain/node-type-presentation'
 
 export interface EntryPoint {
diff --git a/apps/eclair/src/features/full-graph/entrypoint/FullGraphPage.spec.tsx b/apps/eclair/src/features/full-graph/entrypoint/FullGraphPage.spec.tsx
index d049ae754..fb53387d2 100644
--- a/apps/eclair/src/features/full-graph/entrypoint/FullGraphPage.spec.tsx
+++ b/apps/eclair/src/features/full-graph/entrypoint/FullGraphPage.spec.tsx
@@ -8,7 +8,7 @@ import { userEvent } from '@testing-library/user-event'
 import { MemoryRouter } from 'react-router-dom'
 import { FullGraphPage } from './FullGraphPage'
 import { ExportProvider } from '@/platform/infra/export/ExportContext'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import {
   parseNode, parseEdge, parseDomainKey 
 } from '@/platform/infra/__fixtures__/riviere-test-fixtures'
diff --git a/apps/eclair/src/features/full-graph/entrypoint/FullGraphPage.tsx b/apps/eclair/src/features/full-graph/entrypoint/FullGraphPage.tsx
index 7c53245f4..f633c1da7 100644
--- a/apps/eclair/src/features/full-graph/entrypoint/FullGraphPage.tsx
+++ b/apps/eclair/src/features/full-graph/entrypoint/FullGraphPage.tsx
@@ -2,7 +2,7 @@ import {
   useState, useCallback, useMemo, useRef, useEffect 
 } from 'react'
 import { useSearchParams } from 'react-router-dom'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import type {
   Node, Edge,
 } from '../queries/eclair-types'
diff --git a/apps/eclair/src/features/full-graph/queries/extract-node-types.ts b/apps/eclair/src/features/full-graph/queries/extract-node-types.ts
index 4db2c24d7..821ea2f2d 100644
--- a/apps/eclair/src/features/full-graph/queries/extract-node-types.ts
+++ b/apps/eclair/src/features/full-graph/queries/extract-node-types.ts
@@ -1,4 +1,4 @@
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import { getEffectiveNodeType } from '@/platform/domain/node-type-presentation'
 import { compareByCodePoint } from '@/platform/domain/compare-by-code-point'
 
diff --git a/apps/eclair/src/features/modules/entrypoint/ModulesPage.spec.tsx b/apps/eclair/src/features/modules/entrypoint/ModulesPage.spec.tsx
index f26f6147e..9001d34cc 100644
--- a/apps/eclair/src/features/modules/entrypoint/ModulesPage.spec.tsx
+++ b/apps/eclair/src/features/modules/entrypoint/ModulesPage.spec.tsx
@@ -5,7 +5,7 @@ import userEvent from '@testing-library/user-event'
 import {
   describe, expect, it,
 } from 'vitest'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import { ThemeProvider } from '@/platform/infra/theme/ThemeContext'
 import { ModulesPage } from './ModulesPage'
 
diff --git a/apps/eclair/src/features/modules/entrypoint/ModulesPage.tsx b/apps/eclair/src/features/modules/entrypoint/ModulesPage.tsx
index 630c002f4..6e0394e78 100644
--- a/apps/eclair/src/features/modules/entrypoint/ModulesPage.tsx
+++ b/apps/eclair/src/features/modules/entrypoint/ModulesPage.tsx
@@ -1,5 +1,5 @@
 import { useMemo } from 'react'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import { NodeTypeBadge } from '@/platform/infra/ui/NodeTypeBadge/NodeTypeBadge'
 import { extractModules } from '../queries/extract-modules'
 import type { Theme } from '@/types/theme'
diff --git a/apps/eclair/src/features/modules/queries/extract-modules.spec.ts b/apps/eclair/src/features/modules/queries/extract-modules.spec.ts
index 1cc537c76..672e679e7 100644
--- a/apps/eclair/src/features/modules/queries/extract-modules.spec.ts
+++ b/apps/eclair/src/features/modules/queries/extract-modules.spec.ts
@@ -4,7 +4,7 @@ import {
   expect,
   it,
 } from 'vitest'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import { extractModules } from './extract-modules'
 
 const graph: RiviereGraph = {
diff --git a/apps/eclair/src/features/modules/queries/extract-modules.ts b/apps/eclair/src/features/modules/queries/extract-modules.ts
index 278eeec8d..66a1c7ee2 100644
--- a/apps/eclair/src/features/modules/queries/extract-modules.ts
+++ b/apps/eclair/src/features/modules/queries/extract-modules.ts
@@ -1,4 +1,4 @@
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import {
   getEffectiveNodeType,
   getNodeTypeDescription,
diff --git a/apps/eclair/src/features/overview/entrypoint/OverviewPage.displayLimits.spec.tsx b/apps/eclair/src/features/overview/entrypoint/OverviewPage.displayLimits.spec.tsx
index 740c281f6..13bb2db41 100644
--- a/apps/eclair/src/features/overview/entrypoint/OverviewPage.displayLimits.spec.tsx
+++ b/apps/eclair/src/features/overview/entrypoint/OverviewPage.displayLimits.spec.tsx
@@ -6,7 +6,7 @@ import {
 } from '@testing-library/react'
 import { MemoryRouter } from 'react-router-dom'
 import { OverviewPage } from './OverviewPage'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import {
   parseNode, parseDomainMetadata 
 } from '@/platform/infra/__fixtures__/riviere-test-fixtures'
diff --git a/apps/eclair/src/features/overview/entrypoint/OverviewPage.spec.tsx b/apps/eclair/src/features/overview/entrypoint/OverviewPage.spec.tsx
index 7e8f237a0..700bb25af 100644
--- a/apps/eclair/src/features/overview/entrypoint/OverviewPage.spec.tsx
+++ b/apps/eclair/src/features/overview/entrypoint/OverviewPage.spec.tsx
@@ -7,7 +7,7 @@ import {
 import userEvent from '@testing-library/user-event'
 import { MemoryRouter } from 'react-router-dom'
 import { OverviewPage } from './OverviewPage'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import {
   parseNode, parseEdge, parseDomainMetadata 
 } from '@/platform/infra/__fixtures__/riviere-test-fixtures'
diff --git a/apps/eclair/src/features/overview/entrypoint/OverviewPage.tsx b/apps/eclair/src/features/overview/entrypoint/OverviewPage.tsx
index fd1e22cfb..cd3560bee 100644
--- a/apps/eclair/src/features/overview/entrypoint/OverviewPage.tsx
+++ b/apps/eclair/src/features/overview/entrypoint/OverviewPage.tsx
@@ -4,7 +4,7 @@ import {
 import { Link } from 'react-router-dom'
 import type {
   RiviereGraph, SystemType 
-} from '@living-architecture/riviere-schema'
+} from '@living-architecture/riviere-schema-published-language/schema'
 import {
   domainNameSchema, type DomainName,
 } from '../queries/eclair-domain'
@@ -94,7 +94,9 @@ export function OverviewPage({
       const repository = domainComponents.find((node) => node.sourceLocation != null)
         ?.sourceLocation?.repository
 
-      const entities = allEntities.filter((e) => e.domain === domain.name).map((e) => e.name)
+      const entities = allEntities
+        .filter((entity) => entity.domain.value === domain.name)
+        .map((entity) => entity.name.value)
 
       return {
         id: domainId,
diff --git a/apps/eclair/src/features/overview/queries/node-type-breakdown.ts b/apps/eclair/src/features/overview/queries/node-type-breakdown.ts
index b142d0a0d..904e5d667 100644
--- a/apps/eclair/src/features/overview/queries/node-type-breakdown.ts
+++ b/apps/eclair/src/features/overview/queries/node-type-breakdown.ts
@@ -1,4 +1,4 @@
-import type { Component } from '@living-architecture/riviere-schema'
+import type { Component } from '@living-architecture/riviere-schema-published-language/schema'
 import { getEffectiveNodeType } from '@/platform/domain/node-type-presentation'
 
 export type NodeTypeBreakdown = Record<string, number>
diff --git a/apps/eclair/src/platform/domain/compare-by-code-point.ts b/apps/eclair/src/platform/domain/compare-by-code-point.ts
index dfd4da3da..1995c8a9d 100644
--- a/apps/eclair/src/platform/domain/compare-by-code-point.ts
+++ b/apps/eclair/src/platform/domain/compare-by-code-point.ts
@@ -1 +1 @@
-export { compareByCodePoint } from '@living-architecture/riviere-query'
+export { compareByCodePoint } from '@living-architecture/riviere-builder-domain-model/query/compare-by-code-point'
diff --git a/apps/eclair/src/platform/domain/domain-event-types.ts b/apps/eclair/src/platform/domain/domain-event-types.ts
index efa879c7a..fd3d50875 100644
--- a/apps/eclair/src/platform/domain/domain-event-types.ts
+++ b/apps/eclair/src/platform/domain/domain-event-types.ts
@@ -1,6 +1,7 @@
-import type { SourceLocation } from '@living-architecture/riviere-schema'
+import type { SourceLocation } from '@living-architecture/riviere-schema-published-language/schema'
 
 export interface EventSubscriber {
+  handlerId: string
   domain: string
   handlerName: string
 }
diff --git a/apps/eclair/src/platform/domain/domain-node-types.ts b/apps/eclair/src/platform/domain/domain-node-types.ts
index 6b8c900d1..183bc0b28 100644
--- a/apps/eclair/src/platform/domain/domain-node-types.ts
+++ b/apps/eclair/src/platform/domain/domain-node-types.ts
@@ -1,4 +1,4 @@
-import type { SystemType } from '@living-architecture/riviere-schema'
+import type { SystemType } from '@living-architecture/riviere-schema-published-language/schema'
 
 export type DomainMapSystemType = SystemType | 'external'
 
diff --git a/apps/eclair/src/platform/domain/eclair-types.ts b/apps/eclair/src/platform/domain/eclair-types.ts
index 0597417e0..7755b27df 100644
--- a/apps/eclair/src/platform/domain/eclair-types.ts
+++ b/apps/eclair/src/platform/domain/eclair-types.ts
@@ -5,7 +5,7 @@ import type {
   Link,
   Component,
   APIComponent,
-} from '@living-architecture/riviere-schema'
+} from '@living-architecture/riviere-schema-published-language/schema'
 
 export type NodeType = ComponentType | 'External'
 
diff --git a/apps/eclair/src/platform/domain/graph-stats/compute-graph-stats.spec.ts b/apps/eclair/src/platform/domain/graph-stats/compute-graph-stats.spec.ts
index 5150ed297..6a7b868bd 100644
--- a/apps/eclair/src/platform/domain/graph-stats/compute-graph-stats.spec.ts
+++ b/apps/eclair/src/platform/domain/graph-stats/compute-graph-stats.spec.ts
@@ -1,10 +1,9 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { computeGraphStats } from './compute-graph-stats'
 import type {
-  RiviereGraph, SourceLocation 
-} from '@living-architecture/riviere-schema'
+  RiviereGraph,
+  SourceLocation,
+} from '@living-architecture/riviere-schema-published-language/schema'
 import {
   parseNode,
   parseEdge,
diff --git a/apps/eclair/src/platform/domain/graph-stats/compute-graph-stats.ts b/apps/eclair/src/platform/domain/graph-stats/compute-graph-stats.ts
index b0bdd9d42..8331e7f73 100644
--- a/apps/eclair/src/platform/domain/graph-stats/compute-graph-stats.ts
+++ b/apps/eclair/src/platform/domain/graph-stats/compute-graph-stats.ts
@@ -1,4 +1,4 @@
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 
 export interface GraphStats {
   totalNodes: number
diff --git a/apps/eclair/src/platform/domain/node-type-presentation.spec.ts b/apps/eclair/src/platform/domain/node-type-presentation.spec.ts
index 02d26d3d2..1e72159a4 100644
--- a/apps/eclair/src/platform/domain/node-type-presentation.spec.ts
+++ b/apps/eclair/src/platform/domain/node-type-presentation.spec.ts
@@ -4,7 +4,7 @@ import {
   expect,
   it,
 } from 'vitest'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import {
   getEffectiveNodeType,
   getNodeTypeColor,
diff --git a/apps/eclair/src/platform/domain/node-type-presentation.ts b/apps/eclair/src/platform/domain/node-type-presentation.ts
index ab7fdccff..da5cc9376 100644
--- a/apps/eclair/src/platform/domain/node-type-presentation.ts
+++ b/apps/eclair/src/platform/domain/node-type-presentation.ts
@@ -2,7 +2,7 @@ import type {
   Component,
   RiviereGraph,
   CustomTypeDefinition,
-} from '@living-architecture/riviere-schema'
+} from '@living-architecture/riviere-schema-published-language/schema'
 import type { Theme } from '@/types/theme'
 import { compareByCodePoint } from './compare-by-code-point'
 
diff --git a/apps/eclair/src/platform/infra/__fixtures__/riviere-test-fixtures.ts b/apps/eclair/src/platform/infra/__fixtures__/riviere-test-fixtures.ts
index ae5c57885..378dcffc1 100644
--- a/apps/eclair/src/platform/infra/__fixtures__/riviere-test-fixtures.ts
+++ b/apps/eclair/src/platform/infra/__fixtures__/riviere-test-fixtures.ts
@@ -6,7 +6,7 @@ import type {
   OperationBehavior,
   DomainMetadata,
   SystemType,
-} from '@living-architecture/riviere-schema'
+} from '@living-architecture/riviere-schema-published-language/schema'
 import {
   nodeIdSchema,
   edgeIdSchema,
@@ -283,13 +283,13 @@ export function parseDomainMetadata(
     const entities:
       | Record<ReturnType<typeof entityNameSchema.parse>, EntityDefinition>
       | undefined = value.entities
-        ? Object.fromEntries(
+      ? Object.fromEntries(
           Object.entries(value.entities).map(([entityName, definition]) => [
             entityNameSchema.parse(entityName),
             definition,
           ]),
         )
-        : undefined
+      : undefined
 
     const parsedValue: DomainMetadata = {
       description: value.description,
diff --git a/apps/eclair/src/platform/infra/graph-state/GraphContext.spec.tsx b/apps/eclair/src/platform/infra/graph-state/GraphContext.spec.tsx
index 253e215fa..575971a89 100644
--- a/apps/eclair/src/platform/infra/graph-state/GraphContext.spec.tsx
+++ b/apps/eclair/src/platform/infra/graph-state/GraphContext.spec.tsx
@@ -11,7 +11,7 @@ import {
   fetchAndValidateDemoGraph,
   buildDemoGraphUrl,
 } from './GraphContext'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import {
   parseNode, parseDomainKey
 } from '@/platform/infra/__fixtures__/riviere-test-fixtures'
diff --git a/apps/eclair/src/platform/infra/graph-state/GraphContext.tsx b/apps/eclair/src/platform/infra/graph-state/GraphContext.tsx
index b3c09a788..c57a1de0d 100644
--- a/apps/eclair/src/platform/infra/graph-state/GraphContext.tsx
+++ b/apps/eclair/src/platform/infra/graph-state/GraphContext.tsx
@@ -8,9 +8,8 @@ import {
   useSyncExternalStore,
   useMemo,
 } from 'react'
-import {
-  parseRiviereGraph, type RiviereGraph
-} from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
+import { parseRiviereGraph } from '@living-architecture/riviere-schema-published-language/validation'
 import {
   graphNameSchema, type GraphName
 } from '@/platform/domain/eclair-types'
@@ -45,7 +44,11 @@ export async function fetchAndValidateDemoGraph(
   }
   const content = await response.text()
   const data: unknown = JSON.parse(content)
-  return parseRiviereGraph(data)
+  const result = parseRiviereGraph(data)
+  if (!result.success) {
+    throw new GraphError(`Invalid RiviereGraph:\n${result.issues.join('\n')}`)
+  }
+  return result.graph
 }
 
 function getIsDemoMode(): boolean {
diff --git a/apps/eclair/src/platform/infra/graph/ForceGraph/ForceGraph.focus-lifecycle.spec.tsx b/apps/eclair/src/platform/infra/graph/ForceGraph/ForceGraph.focus-lifecycle.spec.tsx
index 0bb6d6d58..8facee1d2 100644
--- a/apps/eclair/src/platform/infra/graph/ForceGraph/ForceGraph.focus-lifecycle.spec.tsx
+++ b/apps/eclair/src/platform/infra/graph/ForceGraph/ForceGraph.focus-lifecycle.spec.tsx
@@ -4,7 +4,7 @@ import {
 import {
   act, render, waitFor,
 } from '@testing-library/react'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import { ForceGraph } from './ForceGraph'
 import {
   parseDomainMetadata, parseNode,
diff --git a/apps/eclair/src/platform/infra/graph/ForceGraph/ForceGraph.spec.tsx b/apps/eclair/src/platform/infra/graph/ForceGraph/ForceGraph.spec.tsx
index 30809edad..4968de771 100644
--- a/apps/eclair/src/platform/infra/graph/ForceGraph/ForceGraph.spec.tsx
+++ b/apps/eclair/src/platform/infra/graph/ForceGraph/ForceGraph.spec.tsx
@@ -5,7 +5,7 @@ import {
   render, screen 
 } from '@testing-library/react'
 import { ForceGraph } from './ForceGraph'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import type { Theme } from '@/types/theme'
 import {
   parseNode,
diff --git a/apps/eclair/src/platform/infra/graph/ForceGraph/ForceGraph.tsx b/apps/eclair/src/platform/infra/graph/ForceGraph/ForceGraph.tsx
index dbdf43f53..22572a4b4 100644
--- a/apps/eclair/src/platform/infra/graph/ForceGraph/ForceGraph.tsx
+++ b/apps/eclair/src/platform/infra/graph/ForceGraph/ForceGraph.tsx
@@ -2,7 +2,7 @@ import {
   useEffect, useRef, useCallback, useState, useMemo 
 } from 'react'
 import * as d3 from 'd3'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import type { Edge } from '@/platform/domain/eclair-types'
 import { compareByCodePoint } from '@/platform/domain/compare-by-code-point'
 import type { Theme } from '@/types/theme'
diff --git a/apps/eclair/src/platform/infra/graph/ForceGraph/VisualizationDataAdapters.spec.ts b/apps/eclair/src/platform/infra/graph/ForceGraph/VisualizationDataAdapters.spec.ts
index 1fa7c2e93..b68af0dfd 100644
--- a/apps/eclair/src/platform/infra/graph/ForceGraph/VisualizationDataAdapters.spec.ts
+++ b/apps/eclair/src/platform/infra/graph/ForceGraph/VisualizationDataAdapters.spec.ts
@@ -1,6 +1,4 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import {
   createSimulationNodes,
   createSimulationLinks,
@@ -16,10 +14,8 @@ import {
   getSemanticEdgeColor,
   getDomainColor,
 } from './VisualizationDataAdapters'
-import type { ExternalLink } from '@living-architecture/riviere-schema'
-import type {
-  Node, Edge 
-} from '@/platform/domain/eclair-types'
+import type { ExternalLink } from '@living-architecture/riviere-schema-published-language/schema'
+import type { Node, Edge } from '@/platform/domain/eclair-types'
 import {
   parseNode,
   parseEdge,
@@ -69,7 +65,9 @@ describe('VisualizationDataAdapters', () => {
         }),
       ]
 
-      const result = createSimulationNodes(nodes, {Job: { description: 'A scheduled unit of work' },})
+      const result = createSimulationNodes(nodes, {
+        Job: { description: 'A scheduled unit of work' },
+      })
 
       expect(result[0]).toMatchObject({
         type: 'Custom',
diff --git a/apps/eclair/src/platform/infra/graph/ForceGraph/VisualizationDataAdapters.ts b/apps/eclair/src/platform/infra/graph/ForceGraph/VisualizationDataAdapters.ts
index 6364866e8..cae2e72b7 100644
--- a/apps/eclair/src/platform/infra/graph/ForceGraph/VisualizationDataAdapters.ts
+++ b/apps/eclair/src/platform/infra/graph/ForceGraph/VisualizationDataAdapters.ts
@@ -1,7 +1,5 @@
-import type * as RiviereSchema from '@living-architecture/riviere-schema'
-import type {
-  Node, NodeType, Edge 
-} from '@/platform/domain/eclair-types'
+import type * as RiviereSchema from '@living-architecture/riviere-schema-published-language/schema'
+import type { Node, NodeType, Edge } from '@/platform/domain/eclair-types'
 import * as GraphTypes from '../graph-types'
 import type { Theme } from '@/types/theme'
 import {
diff --git a/apps/eclair/src/platform/infra/riviere-query/useRiviereQuery.ts b/apps/eclair/src/platform/infra/riviere-query/useRiviereQuery.ts
index d5b290140..5b2930c34 100644
--- a/apps/eclair/src/platform/infra/riviere-query/useRiviereQuery.ts
+++ b/apps/eclair/src/platform/infra/riviere-query/useRiviereQuery.ts
@@ -1,6 +1,6 @@
 import { useMemo } from 'react'
-import { RiviereQuery } from '@living-architecture/riviere-query'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import { RiviereQuery } from '@living-architecture/riviere-builder-domain-model/query'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 
 export function useRiviereQuery(graph: RiviereGraph | null): RiviereQuery | null {
   return useMemo(() => {
diff --git a/apps/eclair/src/platform/infra/ui/EntityAccordion/EntityAccordion.spec.tsx b/apps/eclair/src/platform/infra/ui/EntityAccordion/EntityAccordion.spec.tsx
index f1ec81847..82729591a 100644
--- a/apps/eclair/src/platform/infra/ui/EntityAccordion/EntityAccordion.spec.tsx
+++ b/apps/eclair/src/platform/infra/ui/EntityAccordion/EntityAccordion.spec.tsx
@@ -6,10 +6,11 @@ import {
 } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { EntityAccordion } from './EntityAccordion'
-import { Entity } from '@living-architecture/riviere-query'
+import { RiviereQuery } from '@living-architecture/riviere-builder-domain-model/query'
+import type { Entity } from '@living-architecture/riviere-builder-domain-model/query/entity'
 import type {
   DomainOpComponent, SourceLocation 
-} from '@living-architecture/riviere-schema'
+} from '@living-architecture/riviere-schema-published-language/schema'
 
 const defaultSourceLocation: SourceLocation = {
   repository: 'test-repo',
@@ -66,18 +67,55 @@ function createEntity(
           from: 'Pending',
           to: 'Confirmed',
         },
+        {
+          from: 'Confirmed',
+          to: 'Cancelled',
+        },
       ],
     }),
   ]
 
-  return new Entity(
-    overrides.name ?? 'Order',
-    overrides.domain ?? 'orders',
-    operations,
-    overrides.states ?? ['Draft', 'Pending', 'Confirmed', 'Cancelled'],
-    [],
-    overrides.businessRules ?? [],
-  )
+  const requestedStates = overrides.states
+  const operationsWithRequestedStates =
+    requestedStates === undefined || operations.length === 0
+      ? operations
+      : operations.map((operation, index) =>
+          index === 0
+            ? {
+                ...operation,
+                stateChanges: requestedStates.slice(1).map((state, stateIndex) => ({
+                  from: requestedStates[stateIndex] ?? '*',
+                  to: state,
+                })),
+              }
+            : { ...operation, stateChanges: undefined },
+        )
+
+  const domain = overrides.domain ?? 'orders'
+  const entityName = overrides.name ?? 'Order'
+  const query = new RiviereQuery({
+    version: '1.0',
+    metadata: {
+      name: 'Entity accordion fixture',
+      description: 'Entity accordion fixture',
+      domains: {
+        [domain]: {
+          description: `${domain} domain`,
+          systemType: 'domain',
+        },
+      },
+    },
+    components: operationsWithRequestedStates.map((operation) => ({
+      ...operation,
+      domain,
+      entity: entityName,
+      name: `${entityName}.${operation.operationName}`,
+    })),
+    links: [],
+  })
+  const entity = query.entities()[0]
+  if (entity === undefined) expect.fail('Entity accordion fixture must contain an entity')
+  return entity
 }
 
 describe('EntityAccordion', () => {
@@ -93,15 +131,15 @@ describe('EntityAccordion', () => {
         operations: [
           createDomainOp({
             id: 'op-a',
-            operationName: 'a',
+            operationName: 'aa',
           }),
           createDomainOp({
             id: 'op-b',
-            operationName: 'b',
+            operationName: 'bb',
           }),
           createDomainOp({
             id: 'op-c',
-            operationName: 'c',
+            operationName: 'cc',
           }),
         ],
       })
diff --git a/apps/eclair/src/platform/infra/ui/EntityAccordion/EntityAccordion.tsx b/apps/eclair/src/platform/infra/ui/EntityAccordion/EntityAccordion.tsx
index f8876c9f8..297ae28bd 100644
--- a/apps/eclair/src/platform/infra/ui/EntityAccordion/EntityAccordion.tsx
+++ b/apps/eclair/src/platform/infra/ui/EntityAccordion/EntityAccordion.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react'
-import type { Entity } from '@living-architecture/riviere-query'
-import type { DomainOpComponent } from '@living-architecture/riviere-schema'
+import type { Entity } from '@living-architecture/riviere-builder-domain-model/query/entity'
+import type { DomainOpComponent } from '@living-architecture/riviere-schema-published-language/schema'
 import { CodeLinkMenu } from '@/platform/infra/ui/CodeLinkMenu/CodeLinkMenu'
 import { MethodCardChevron } from './MethodCardChevron'
 
@@ -84,7 +84,7 @@ export function EntityAccordion({
           </div>
           <div className="min-w-0">
             <span className="block truncate font-[var(--font-mono)] text-sm font-bold text-[var(--text-primary)]">
-              {entity.name}
+              {entity.name.value}
             </span>
             <span className="block text-xs text-[var(--text-tertiary)]">
               {operationCount} operation{operationCount === 1 ? '' : 's'}
@@ -118,11 +118,11 @@ export function EntityAccordion({
                   }
                   const borderClass = getStateBorderClass()
                   return (
-                    <div key={state} className="flex items-center gap-2">
+                    <div key={state.value} className="flex items-center gap-2">
                       <span
                         className={`rounded-lg border px-3 py-1.5 text-xs font-semibold ${borderClass}`}
                       >
-                        {state}
+                        {state.value}
                       </span>
                       {index < entity.states.length - 1 && (
                         <span className="text-[var(--text-tertiary)]">→</span>
diff --git a/apps/eclair/src/shell/App.spec.tsx b/apps/eclair/src/shell/App.spec.tsx
index 3e7118fe2..fcc2dccef 100644
--- a/apps/eclair/src/shell/App.spec.tsx
+++ b/apps/eclair/src/shell/App.spec.tsx
@@ -16,7 +16,7 @@ import {
 } from '@/platform/infra/graph-state/GraphContext'
 import { ExportProvider } from '@/platform/infra/export/ExportContext'
 import { ThemeProvider } from '@/platform/infra/theme/ThemeContext'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import {
   parseNode, parseDomainMetadata
 } from '@/platform/infra/__fixtures__/riviere-test-fixtures'
diff --git a/apps/eclair/src/shell/App.tsx b/apps/eclair/src/shell/App.tsx
index 719848ae6..3776d62e6 100644
--- a/apps/eclair/src/shell/App.tsx
+++ b/apps/eclair/src/shell/App.tsx
@@ -7,7 +7,7 @@ import {
 } from '@/platform/infra/graph-state/GraphContext'
 import { ExportProvider } from '@/platform/infra/export/ExportContext'
 import { EmptyState } from '@/features/empty-state/entrypoint/EmptyState'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import { OverviewPage } from '@/features/overview/entrypoint/OverviewPage'
 import { FullGraphPage } from '@/features/full-graph/entrypoint/FullGraphPage'
 import { DomainMapPage } from '@/features/domain-map/entrypoint/DomainMapPage'
diff --git a/apps/eclair/src/shell/components/AppShell/AppShell.spec.tsx b/apps/eclair/src/shell/components/AppShell/AppShell.spec.tsx
index 08dea8889..8561514ee 100644
--- a/apps/eclair/src/shell/components/AppShell/AppShell.spec.tsx
+++ b/apps/eclair/src/shell/components/AppShell/AppShell.spec.tsx
@@ -9,7 +9,7 @@ import {
 } from 'vitest'
 import { AppShell } from './AppShell'
 import { ExportProvider } from '@/platform/infra/export/ExportContext'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import {
   graphNameSchema, nodeIdSchema, domainNameSchema, moduleNameSchema, type GraphName
 } from '@/platform/domain/eclair-types'
diff --git a/apps/eclair/src/shell/components/AppShell/AppShell.tsx b/apps/eclair/src/shell/components/AppShell/AppShell.tsx
index b7b318703..774f65dd6 100644
--- a/apps/eclair/src/shell/components/AppShell/AppShell.tsx
+++ b/apps/eclair/src/shell/components/AppShell/AppShell.tsx
@@ -5,7 +5,7 @@ import { useLocation } from 'react-router-dom'
 import { Header } from '@/shell/components/Header/Header'
 import { Sidebar } from '@/shell/components/Sidebar/Sidebar'
 import { useExport } from '@/platform/infra/export/ExportContext'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import type { GraphName } from '@/platform/domain/eclair-types'
 
 interface AppShellProps {
diff --git a/apps/eclair/src/shell/components/Header/Header.spec.tsx b/apps/eclair/src/shell/components/Header/Header.spec.tsx
index f9c1ec7cd..dc459c1b9 100644
--- a/apps/eclair/src/shell/components/Header/Header.spec.tsx
+++ b/apps/eclair/src/shell/components/Header/Header.spec.tsx
@@ -6,7 +6,7 @@ import {
   describe, expect, it, vi 
 } from 'vitest'
 import { Header } from './Header'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import {
   nodeIdSchema, domainNameSchema, moduleNameSchema, graphNameSchema, type GraphName
 } from '@/platform/domain/eclair-types'
diff --git a/apps/eclair/src/shell/components/Header/Header.tsx b/apps/eclair/src/shell/components/Header/Header.tsx
index a1e8ace2d..dae35ad78 100644
--- a/apps/eclair/src/shell/components/Header/Header.tsx
+++ b/apps/eclair/src/shell/components/Header/Header.tsx
@@ -2,7 +2,7 @@ import {
   useState, useRef, useEffect 
 } from 'react'
 import { useNavigate } from 'react-router-dom'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import type { GraphName } from '@/platform/domain/eclair-types'
 import { SchemaModal } from '@/shell/components/SchemaModal/SchemaModal'
 import { useGraph } from '@/platform/infra/graph-state/GraphContext'
@@ -38,7 +38,7 @@ export function Header({
         const orphanIds = query.detectOrphans()
         return {
           hasOrphans: orphanIds.length > 0,
-          orphanNodeIds: new Set(orphanIds),
+          orphanNodeIds: new Set(orphanIds.map((componentId) => componentId.value)),
           orphanCount: orphanIds.length,
         }
       })()
diff --git a/apps/eclair/src/shell/components/SchemaModal/SchemaModal.spec.tsx b/apps/eclair/src/shell/components/SchemaModal/SchemaModal.spec.tsx
index 03fc6740e..93b171589 100644
--- a/apps/eclair/src/shell/components/SchemaModal/SchemaModal.spec.tsx
+++ b/apps/eclair/src/shell/components/SchemaModal/SchemaModal.spec.tsx
@@ -8,7 +8,7 @@ import userEvent from '@testing-library/user-event'
 import {
   SchemaModal, validateDownloadGraphName
 } from './SchemaModal'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import {
   nodeIdSchema, domainNameSchema, moduleNameSchema, graphNameSchema, type GraphName
 } from '@/platform/domain/eclair-types'
diff --git a/apps/eclair/src/shell/components/SchemaModal/SchemaModal.tsx b/apps/eclair/src/shell/components/SchemaModal/SchemaModal.tsx
index 0f11e57e8..1b6190450 100644
--- a/apps/eclair/src/shell/components/SchemaModal/SchemaModal.tsx
+++ b/apps/eclair/src/shell/components/SchemaModal/SchemaModal.tsx
@@ -5,7 +5,7 @@ import {
   JsonView, collapseAllNested
 } from 'react-json-view-lite'
 import 'react-json-view-lite/dist/index.css'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import type { GraphName } from '@/platform/domain/eclair-types'
 import styles from './SchemaModal.module.css'
 import {
diff --git a/apps/eclair/tsconfig.app.json b/apps/eclair/tsconfig.app.json
index 4fc7be698..deafa7efb 100644
--- a/apps/eclair/tsconfig.app.json
+++ b/apps/eclair/tsconfig.app.json
@@ -36,10 +36,10 @@
   "include": ["src"],
   "references": [
     {
-      "path": "../../packages/riviere-schema/tsconfig.lib.json"
+      "path": "../../packages/riviere-schema/published-language/tsconfig.lib.json"
     },
     {
-      "path": "../../packages/riviere-query/tsconfig.lib.json"
+      "path": "../../packages/riviere-builder/domain-model/tsconfig.lib.json"
     }
   ]
 }
diff --git a/apps/eclair/tsconfig.spec.json b/apps/eclair/tsconfig.spec.json
index 3d44db5f8..1e1cc7b9f 100644
--- a/apps/eclair/tsconfig.spec.json
+++ b/apps/eclair/tsconfig.spec.json
@@ -39,10 +39,10 @@
       "path": "./tsconfig.app.json"
     },
     {
-      "path": "../../packages/riviere-schema/tsconfig.lib.json"
+      "path": "../../packages/riviere-schema/published-language/tsconfig.lib.json"
     },
     {
-      "path": "../../packages/riviere-query/tsconfig.lib.json"
+      "path": "../../packages/riviere-builder/tsconfig.lib.json"
     }
   ]
 }
diff --git a/docs/architecture/adr/ADR-002-allowed-folder-structures.md b/docs/architecture/adr/ADR-002-allowed-folder-structures.md
index 1d376d19c..a2d203646 100644
--- a/docs/architecture/adr/ADR-002-allowed-folder-structures.md
+++ b/docs/architecture/adr/ADR-002-allowed-folder-structures.md
@@ -4,86 +4,187 @@
 
 ## Sources of Truth
 
-- **Code placement and layer rules:** [`development-skills:separation-of-concerns`](https://github.com/NTCoding/claude-skillz/blob/main/separation-of-concerns/SKILL.md) skill
-- **Dependency enforcement:** `.riviere/role-enforcement.config.ts` for first-class layer and role rules; `.dependency-cruiser.mjs` contains legacy rules pending migration to RLE
+- **Architecture decision:** this ADR
+- **Executable enforcement:** [Rivière role enforcement](../../../.riviere/role-definitions/index.md), configured by [`.riviere/role-enforcement.config.ts`](../../../.riviere/role-enforcement.config.ts)
 
-## Standard Structure
+The ADR and executable configuration implement the same rules and must change together.
+
+## Package Placement
+
+Every package declared by `pnpm-workspace.yaml` must have exactly one role-enforcement configuration or be explicitly listed as unassigned.
+
+```text
+apps/
+└── {app}/
+
+packages/
+└── {subdomain}/
+    ├── domain-model/
+    ├── published-language/
+    └── use-cases/
+
+tools/
+└── {tool}/
+```
+
+Only a complete path segment named `{subdomain}` creates a subdomain boundary. Other placeholders, including `{tool}` and `{boundary}`, are ordinary path placeholders and never receive subdomain semantics. A package rule may allow imports within the same captured subdomain or across subdomains. Location rules cannot override package rules.
+
+The executable package assignments are exactly:
+
+```typescript
+'apps/': app,
+'packages/{subdomain}/domain-model': domainModel,
+'packages/{subdomain}/published-language': publishedLanguage,
+'packages/{subdomain}/use-cases': useCases,
+'tools/': app,
+```
+
+Keys ending in `/` assign a configuration to each direct package beneath that directory. Therefore apps and tools are direct packages, while the three subdomain package types must live beneath `packages/{subdomain}/`.
+
+The repository currently allows these package dependencies:
+
+- An app may import use-case packages from any subdomain.
+- A domain-model package may import published-language packages.
+- A published-language package may not import another workspace package.
+- A use-case package may import its own subdomain's domain model and published-language packages.
+- No package may import an app.
+
+A tool is an app. Its domain-model, published-language, and use-case packages live under `packages/{subdomain}/`; they cannot be nested under `tools/{tool}/`.
+
+## App Packages
 
 ```text
-features/
-├── {feature}/
-│   ├── entrypoint/        ← one folder per external entrypoint
-│   │   └── {entrypoint}/
-│   │       ├── entrypoint.ts
-│   │       └── ...         ← entrypoint-specific DTOs, input mappers, output mappers
-│   ├── commands/          ← write operations, strict layering
-│   ├── queries/           ← read operations, minimal layering
-│   ├── domain/            ← business rules (required if commands exist)
-│   │   └── ports/         ← domain-owned capability contracts
-│   ├── data-access/       ← aggregate repositories and query-model loaders
-│   └── adapters/          ← implementations of domain ports
-│       └── {adapter}/
-│
-entrypoint/
-└── _platform/             ← private entrypoint code shared across features
+src/
+├── features/
+│   └── {feature}/
+│       └── entrypoint/
+│           ├── {entrypoint}/
+│           └── _platform/
+│               └── cli/
+├── infra/
 │   └── cli/
-│
-platform/
-├── domain/                ← shared business rules (depends on nothing)
-└── infra/                 ← shared technical concerns
-    ├── external-clients/  ← cohesive third-party tool/service clients
-    ├── persistence/       ← database clients, connection pools
-    ├── http/              ← shared formatters, error handling middleware
-    ├── cli/               ← stdin/stdout utilities, CLI I/O helpers
-    ├── messaging/         ← queue clients, event bus
-    ├── config/            ← configuration loading
-    └── logging/           ← structured logging
-
-shell/                     ← thin wiring/routing only (no business logic)
+│       └── presentation/
+└── shell/
+```
+
+Features are isolated. Code in one feature cannot import another feature. A feature may import root `infra` and commands or queries exposed by subdomain use-case packages.
+
+An entrypoint translates an external protocol into a command or query input and translates the result back into that protocol. It performs primitive shape validation only. Domain validation belongs in the command or query.
+
+For example, an entrypoint passes a raw string through the command input:
+
+```typescript
+export interface LinkExternalInput {
+  type: string | undefined
+}
+
+const result = linkExternal.execute({ type: options.linkType })
+```
+
+The command parses the value through the domain-owned value object. The value object remains the single source of truth for the allowed values:
+
+```typescript
+const parsedType = input.type === undefined ? undefined : LinkType.parse(input.type)
+if (parsedType !== undefined && !parsedType.success) {
+  return failure('VALIDATION_ERROR', parsedType.error)
+}
+```
+
+Do not duplicate the domain's allowed values in an entrypoint union or validator.
+
+`entrypoint/_platform` contains entrypoint code shared only within that feature's entrypoint location. The `_platform` location is importable anywhere within its parent location and nowhere outside it.
+
+Root `infra` contains generic technical code. It cannot import application or domain code. CLI presentation formats or writes generic responses. CLI input parsing remains in the entrypoint layer, including shared parsers under a feature's private `entrypoint/_platform/cli` location.
+
+`shell` wires the application. It may construct external clients and adapters, then pass them into app entrypoints or subdomain use cases. It contains no business decisions.
+
+## Domain-Model Packages
+
+```text
+src/
+└── domain/
+    └── ...
 ```
 
-All sub-folders within a feature are optional — include only what the feature needs.
+A domain-model package contains one isolated subdomain model. Its internal domain folders are unrestricted. It has no features, entrypoints, use cases, data access, adapters, infra, or shell.
+
+Domain code owns business state, rules, invariants, value objects, aggregates, domain services, domain events, and domain ports. A domain model does not import another domain model.
+
+Ports and adapters are preferred for technical capabilities. External-package imports are not globally blocked because valid domain code includes Zod value objects and domains built around libraries such as `ts-morph`. Node capabilities such as `node:path` and `node:perf_hooks` should normally be represented by domain ports.
 
-### Layer Responsibilities
+## Use-Case Packages
 
-**entrypoint/** — Contains one folder per external entrypoint: `entrypoint/{entrypoint}/entrypoint.ts`. Opening `entrypoint/` should show the available entrypoints as folders. Entrypoint-specific DTOs, input mappers, and output mappers live under the relevant entrypoint folder. This layer translates between external and internal formats: it parses HTTP requests, CLI arguments, or queue messages into command/query inputs and maps results back to external responses. If you changed protocols (HTTP → CLI), you'd rewrite this layer but keep commands/ and domain/ unchanged. Entrypoints must not import `domain/` or persistence infrastructure directly.
+```text
+src/
+├── features/
+│   └── {feature}/
+│       ├── commands/
+│       ├── queries/
+│       ├── data-access/
+│       │   └── {concept}/
+│       └── adapters/
+│           └── {adapter}/
+└── infra/
+    └── external-clients/
+        └── {client}/
+```
+
+Features are isolated. A feature cannot import another feature.
 
-Package-level `entrypoint/_platform/` contains private entrypoint code shared across features. Feature-level `entrypoint/_platform/` contains private entrypoint code shared by entrypoints within one feature. Sharing changes scope, not layer.
+Commands orchestrate write operations. They accept raw command input, parse domain value objects, load aggregates, invoke domain behaviour, and persist the result. Command input factories belong at the app entrypoint, not in commands.
 
-The `_platform/` convention applies inside any layer. It means code shared within the containing architectural scope, not a globally shared layer. Code outside that containing scope must not import it.
+Queries perform read use cases. A query may call multiple methods on the same query model, compose results from multiple query-model methods, map known loader failures into query-use-case errors, or coordinate multiple loaders when the concrete read genuinely needs them.
 
-**commands/** — Orchestrates write operations. Loads data, invokes domain logic, persists the result. All business rules delegated to domain/. Each command has a dedicated input type — no sharing of input DTOs, no dependency on external input types.
+A query model is designed for a concrete query use case. For example, `list invalid components` may load an `InvalidComponents` query model, and `show graph statistics` may load `GraphStatistics`. Do not invent a generic `GraphQueryModel` merely because both read the same graph file.
 
-**queries/** — Reads and returns data without modifying anything. Can query the database directly or load domain objects for their state. No side effects, no state changes.
+Data access lives at `data-access/{concept}`. Aggregate repositories reconstruct and persist aggregates. Query-model loaders load the concrete query model needed by a query. Data-access failures are `data-access-error`; they are not domain errors.
 
-**domain/** — Business rules with no I/O. Validation, state transitions, invariants, calculations. Never imports from infra/, commands/, queries/, entrypoint/, or shell/.
+Data access may import only aggregate and value-object roles from its own domain model. Domain services must not be called from data access. Parsing that protects an aggregate invariant belongs on the aggregate or value object and returns a clear result for the repository to handle.
 
-**domain/ports/** — Domain-owned interfaces and function types for capabilities invoked by the domain. Contracts use domain language and contain no concrete technology types or implementation.
+Adapters implement domain ports. An adapter may import only domain-port roles from its own domain model and generic clients from root infra. It translates between the port and client APIs; it does not own business decisions or instantiate shared clients.
 
-**data-access/** — Aggregate repositories and query-model loaders. This layer inherently knows the application state it reconstructs or persists. It is separate from generic infrastructure and must not become a home for domain behaviour.
+External clients contain generic interaction with a tool, service, filesystem, runtime, or third-party package. They do not import domain code.
 
-**adapters/** — Narrow implementations of domain ports. A domain-port adapter translates between one domain port and one generic client API. It contains no domain decisions, application orchestration, direct Node API calls, third-party package calls, or coordination across multiple clients. Node and third-party calls belong to the separately enforced generic external-client role; otherwise the adapter would bypass that client contract and combine translation with external I/O. See the [`domain-port-adapter` role definition](../../../.riviere/role-definitions/domain-port-adapter.md) for the concrete Oxlint and GitHub examples.
+## Published-Language Packages
 
-**platform/domain/** — Shared business rules used across features. Depends on nothing.
+```text
+src/
+└── published-language/
+    ├── ...
+    └── eslint-plugin/     ← optional; role enforcement disabled inside this integration
+```
 
-**platform/infra/** — Shared generic technical concerns used across features. It may depend only on other `platform/infra/` code and external libraries. It must not import entrypoint, use-case, domain, or unclassified internal application code.
+A published language is a minimal, stable contract intended for consumers across a boundary. It may contain published-language schemas, data structures, unions, parsers, field names, annotations, and value objects.
 
-Each external client stays cohesive under `platform/infra/external-clients/{client}/`. It exposes capabilities and types belonging to the external system, knows nothing about application domain types, and can be extracted into a separate library without taking application code with it.
+A published-language parser parses the published language and returns either its declared successful schema shape or its declared failure shape. Application behaviour does not belong in the published language.
 
-For CLI code, platform CLI infrastructure owns shared response-envelope formatting and output side effects. Generic `formatSuccess`/`formatError` style functions are CLI response formatters. Writing to stdout, stderr, files, or exiting belongs to CLI response writers. CLI error handlers are only for uncaught CLI-boundary exceptions and must not handle regular command/query failure control flow.
+## Location Rules
 
-**shell/** — Wires things together at startup. It constructs generic clients and domain-port adapters, then passes them into entrypoints or use cases. No business logic and no separate `composition-root` role.
+- Locations and imports are unrestricted until a location declares rules.
+- Explicit sublocations are the only direct folders permitted inside a location.
+- `allowAnySubLocations: true` permits arbitrary domain organisation and cannot be combined with explicit sublocations.
+- A location with `importRules` may import its own subtree and the locations listed in `allow`. Every other location is forbidden.
+- A sublocation inherits its parent's import rules unless it explicitly disables inheritance.
+- Allowing a location allows its entire subtree.
+- `sibling` means a configured location under the same concrete parent location.
+- `root` means a configured root location in the same package.
+- `ownSubdomain` means a location in another package with the same value captured from a complete `{subdomain}` path segment.
+- `anySubdomain` means the named location in any package with a value captured from a complete `{subdomain}` path segment.
+- A string allows every role in the named location. An object with a role list allows only those roles.
+- `_platform` with `importableFrom: 'withinParentLocation'` is private to its parent location.
+- Circular imports are rejected.
+- Production code cannot import files excluded by `ignorePatterns`. Tests are exempt from production import rules so they can assemble fixtures across boundaries.
 
-## Library Packages
+Package configuration keys ending in `/` apply the configuration to each direct package beneath that directory. For example, `'apps/': app` assigns the app configuration to every direct package under `apps/`; it does not assign nested packages.
 
-Libraries use the same `features/` + `platform/` structure as applications. The package is NOT the feature — still wrap in `features/{name}/`. Libraries don't need `shell/` unless they wire an app.
+## Package Entry Points
 
-**Entry point:** Libraries use `src/index.ts` as their package entry point — a pure barrel file containing only re-export statements, no logic. `shell/` is for app wiring only, not package exports.
+Published packages use `src/index.ts` only as their package entry point. It contains explicit exports from the files that own declarations. Nested barrel files are not allowed.
 
 ## Local Exceptions
 
-**React applications** extend the standard feature sub-folders with `components/` and `hooks/`. Entrypoints are page components. Shell contains routing and providers.
+`apps/docs` is exempt from role enforcement.
 
-**Flat packages** too small for internal layering (schemas, config, decorators) use flat `src/` with no features/platform/shell structure.
+Éclair is explicitly unassigned until it has an approved configuration that honestly describes and enforces its architecture. Its existing Dependency Cruiser rules remain active.
 
-**Claude Code plugin packages** may keep host-required prompt artifacts outside `src/` when the host loader requires fixed top-level locations. For `tools/dev-workflow-v2`, this includes command and state markdown under `tools/dev-workflow-v2/commands/` and `tools/dev-workflow-v2/states/`, hook scripts under `tools/dev-workflow-v2/hooks/`, and plugin metadata under `tools/dev-workflow-v2/.claude-plugin/`. Runtime TypeScript still belongs under `src/`.
+Host-required plugin artefacts may live outside `src` when the host mandates their locations. This does not exempt runtime TypeScript from package assignment and role enforcement.
diff --git a/docs/architecture/overview.md b/docs/architecture/overview.md
index 23d22beea..e449f88b1 100644
--- a/docs/architecture/overview.md
+++ b/docs/architecture/overview.md
@@ -19,9 +19,9 @@ Three packages enable deterministic TypeScript extraction:
 
 | Package | Purpose |
 |---------|---------|
-| `@living-architecture/riviere-extract-config` | JSON Schema defining the extraction config DSL |
-| `@living-architecture/riviere-extract-conventions` | Decorators, default config, and ESLint enforcement |
-| `@living-architecture/riviere-extract-ts` | TypeScript extractor using ts-morph for AST parsing |
+| `@living-architecture/riviere-extract-config-published-language` | JSON Schema defining the extraction config DSL |
+| `@living-architecture/riviere-extract-conventions-published-language` | Decorators, default config, and ESLint enforcement |
+| `@living-architecture/riviere-extract-ts-domain-model` | TypeScript extractor using ts-morph for AST parsing |
 
 #### Package Dependencies
 
diff --git a/docs/continuous-improvement/post-merge-reflections/2026-02-05-issue-239-m1-d1-8-d1-9-wire-connection-e.md b/docs/continuous-improvement/post-merge-reflections/2026-02-05-issue-239-m1-d1-8-d1-9-wire-connection-e.md
index 0893b4a91..cb5e5464e 100644
--- a/docs/continuous-improvement/post-merge-reflections/2026-02-05-issue-239-m1-d1-8-d1-9-wire-connection-e.md
+++ b/docs/continuous-improvement/post-merge-reflections/2026-02-05-issue-239-m1-d1-8-d1-9-wire-connection-e.md
@@ -166,8 +166,8 @@ Wired `detectConnections` from `riviere-extract-ts` into the `riviere extract` C
 ### Proposal: Pre-flight layer placement check for simple function calls
 
 - **Problem:** 4 architecture review iterations (~40 minutes) to place `detectConnections` correctly. Moved commands/ → queries/ → split query/presentation → inlined in entrypoint.
-- **Root cause:** No guidance on when a function call is too simple for commands/ or queries/ wrappers. The decision tree in separation-of-concerns covers _what_ belongs where, but doesn't address the case where a single function call has no orchestration value.
-- **Proposed change:** Add guidance to separation-of-concerns or the task workflow: "Before creating a command or query wrapper, check if the function being called requires orchestration (loading, domain logic, persistence). If it's a single function call with no orchestration, inline it in the entrypoint."
+- **Root cause:** No local guidance on when a function call is too simple for commands/ or queries/ wrappers. The role selection guide covers _what_ belongs where, but doesn't address the case where a single function call has no orchestration value.
+- **Proposed change:** Add guidance to the local role selection guide or the task workflow: "Before creating a command or query wrapper, check if the function being called requires orchestration (loading, domain logic, persistence). If it's a single function call with no orchestration, inline it in the entrypoint."
 - **Expected impact:** ~30 minutes saved per occurrence (eliminates multiple architecture review iterations for trivial wrappers).
 
 ### Proposal: Run architecture review before first commit, not after
@@ -183,4 +183,4 @@ Wired `detectConnections` from `riviere-extract-ts` into the `riviere extract` C
 - ✅ Added RFC-016: Mock Cleanup After vi.spyOn (review-feedback-checks.md)
 - Add RFC: "Prefer for-of over forEach for side-effect-only iteration"
 - Create task: Add pre-implementation placement check to task workflow
-- Create task: Add "single function call = inline in entrypoint" guidance to separation-of-concerns
+- Create task: Add "single function call = inline in entrypoint" guidance to the local role selection guide
diff --git a/docs/conventions/review-feedback-checks.md b/docs/conventions/review-feedback-checks.md
index 90a205949..939d015c4 100644
--- a/docs/conventions/review-feedback-checks.md
+++ b/docs/conventions/review-feedback-checks.md
@@ -125,7 +125,7 @@ interface DraftComponent {
   location: { file: string; line: number }
 }
 ```
-The type is identical to what's exported from `@living-architecture/riviere-extract-ts`. This creates:
+The type is identical to what's exported from `@living-architecture/riviere-extract-ts-domain-model`. This creates:
 - Maintenance burden: changes in source require manual sync
 - Potential drift: types can diverge silently
 - Wasted code: duplication with no benefit
@@ -149,7 +149,7 @@ interface DraftComponent {
 
 **Example (GOOD):**
 ```typescript
-import { type DraftComponent } from '@living-architecture/riviere-extract-ts'
+import { type DraftComponent } from '@living-architecture/riviere-extract-ts-domain-model'
 ```
 
 **Detection:** Local interface/type definitions that match exported types from project packages. Check if the local definition could be replaced with an import.
diff --git a/docs/design-reviews/eclair/critique.md b/docs/design-reviews/eclair/critique.md
index 60632c1b8..1caaa493d 100644
--- a/docs/design-reviews/eclair/critique.md
+++ b/docs/design-reviews/eclair/critique.md
@@ -33,7 +33,7 @@ Reviewed: docs/design-reviews/eclair/refined.md
 
 ### pluralize.ts in Domain Map is Generic Infrastructure
 - **What's wrong:** The refined design places `pluralize.ts` in `features/domain-map/`. Pluralization is a generic text utility, not domain-specific to domain maps.
-- **Why it matters:** Violates separation-of-concerns principle 2 (separate generic from domain-specific). When other features need pluralization, they will either duplicate or import across feature boundaries.
+- **Why it matters:** Violates the local rule separating generic code from domain-aware code. When other features need pluralization, they will either duplicate or import across feature boundaries.
 - **Suggested fix:** Move to `platform/infra/text/` or similar generic location.
 
 ### LayoutPosition Value Object Not Actually Needed
@@ -54,7 +54,7 @@ Reviewed: docs/design-reviews/eclair/refined.md
 ## MEDIUM
 
 ### errors.ts at Root Violates Structure
-- **What's wrong:** The design shows `errors.ts` at package root. But per separation-of-concerns, there should be no generic type-grouping files spanning multiple capabilities.
+- **What's wrong:** The design shows `errors.ts` at package root. The local architecture rules do not permit generic type-grouping files spanning multiple capabilities.
 - **Why it matters:** A single errors.ts grows to contain GraphError, RenderingError, LayoutError, ContextError, CSSModuleError, DOMError, SchemaError. These belong to different layers and change for different reasons.
 - **Suggested fix:** Split errors to live with their associated capabilities: GraphError with graph handling, LayoutError with layout, etc.
 
@@ -97,8 +97,8 @@ Reviewed: docs/design-reviews/eclair/refined.md
 
 ### ArchitectureMetrics Interface is Anemic
 - **What's wrong:** The proposed `ArchitectureMetrics` is a pure data structure with readonly number fields. It has no behavior.
-- **Why it matters:** This is fine for a DTO/read model, but the design calls it a "value object" which implies it should have behavior. It's just a plain interface.
-- **Suggested fix:** Either add meaningful methods (comparisons, validation) or correctly label it as a read model, not a value object.
+- **Why it matters:** This is fine for a DTO/query model, but the design calls it a "value object" which implies it should have behavior. It's just a plain interface.
+- **Suggested fix:** Either add meaningful methods (comparisons, validation) or correctly label it as a query model, not a value object.
 
 ### GraphContext.tsx Proposed Location is Confusing
 - **What's wrong:** The design places `GraphContext.tsx` in `platform/domain/riviere/`. But contexts are React infrastructure, not domain logic.
diff --git a/docs/design-reviews/eclair/refined.md b/docs/design-reviews/eclair/refined.md
index 0b9a4d41a..3fbc37f4d 100644
--- a/docs/design-reviews/eclair/refined.md
+++ b/docs/design-reviews/eclair/refined.md
@@ -346,7 +346,7 @@ Each feature projects a specialized view from the loaded RiviereGraph:
 
 ## Notes on React Adaptation
 
-The separation-of-concerns pattern adapts to React as follows:
+The local architecture rules adapt to React as follows:
 
 - **entrypoint/** becomes Page components that receive props and render
 - **use-cases/** becomes the orchestration within Page components (useMemo + projection function + state hooks)
diff --git a/docs/design-reviews/eclair/refinements.md b/docs/design-reviews/eclair/refinements.md
index 77781a0ed..2d1af4f84 100644
--- a/docs/design-reviews/eclair/refinements.md
+++ b/docs/design-reviews/eclair/refinements.md
@@ -1,6 +1,6 @@
 # Refinements for eclair
 
-Refinements based on separation-of-concerns and tactical-ddd skill principles.
+Refinements based on the repository's local architecture rules and role definitions.
 
 ## Separation of Concerns Refinements
 
diff --git a/docs/design-reviews/riviere-builder/critique.md b/docs/design-reviews/riviere-builder/critique.md
deleted file mode 100644
index 283444c24..000000000
--- a/docs/design-reviews/riviere-builder/critique.md
+++ /dev/null
@@ -1,133 +0,0 @@
-# Critique for riviere-builder
-
-Reviewed: docs/design-reviews/riviere-builder/refined.md
-
-## CRITICAL
-
-### save() method still exists with Node.js filesystem imports
-
-- **What's wrong:** The refined design explicitly states "Remove `save()` method from `RiviereBuilder`" to achieve browser compatibility and domain isolation. However, the actual code at `packages/riviere-builder/src/builder.ts` lines 1-2 imports `node:fs` and `node:path`, and lines 864-876 implement the `save()` method with filesystem I/O.
-- **Why it matters:** This is a direct contradiction between the refined design and implementation. The package cannot be browser-compatible while bundling Node.js filesystem APIs. Infrastructure concerns (filesystem I/O) are polluting the domain, violating DDD principle 1 (isolate domain logic from infrastructure).
-- **Suggested fix:** Remove `save()` method and the Node.js imports. Update documentation to show callers using `builder.build()` followed by their own filesystem write.
-
-### DirectoryNotFoundError exists only to support save()
-
-- **What's wrong:** The `DirectoryNotFoundError` class in `errors.ts` (lines 129-137) exists solely to support the `save()` method's directory existence check. If `save()` is removed per the design, this error class becomes orphaned infrastructure-specific code.
-- **Why it matters:** The error hierarchy contains infrastructure-specific errors mixed with domain errors, violating separation of concerns. Domain errors should describe business rule violations, not filesystem problems.
-- **Suggested fix:** Remove `DirectoryNotFoundError` when removing `save()`.
-
-## HIGH
-
-### RiviereBuilder is a God Class with too many responsibilities
-
-- **What's wrong:** The `RiviereBuilder` class (builder.ts) spans 877 lines and handles: graph construction, component registration, linking, enrichment, inspection (stats, warnings, orphans), validation, serialization, querying, and file I/O. This violates both separation of concerns (multiple unrelated responsibilities) and DDD principle 3 (use cases should be distinct intentions).
-- **Why it matters:** The refined design proposes splitting into features (graph-construction, graph-enrichment, graph-inspection, error-recovery) but the current implementation bundles everything. Changes to validation logic could accidentally affect linking. Testing requires the entire class.
-- **Suggested fix:** Extract inspection methods (`warnings()`, `stats()`, `orphans()`, `validate()`) to a separate `GraphInspector` class. Extract `query()` since it creates a different object. Keep `RiviereBuilder` focused on construction and linking.
-
-### Internal graph state is publicly exposed
-
-- **What's wrong:** Line 133: `graph: BuilderGraph` is a public field. External code can directly mutate `builder.graph.components.push(...)` or `builder.graph.links = []`, bypassing all invariant enforcement.
-- **Why it matters:** This violates DDD principle 7 (aggregates protect invariants). The duplicate component check in `registerComponent()`, domain existence validation, and all other safeguards can be circumvented. The aggregate boundary is meaningless if external code can access internal state directly.
-- **Suggested fix:** Make `graph` private: `private graph: BuilderGraph`. Add explicit getter methods if read-only access is needed.
-
-### types.ts is a generic type-grouping file spanning multiple capabilities
-
-- **What's wrong:** The `types.ts` file contains 185 lines of types spanning: builder options, all component inputs (UI, API, UseCase, DomainOp, Event, EventHandler, Custom), link inputs, near-match types, stats types, warning types, and enrichment types. These serve completely different features.
-- **Why it matters:** This violates SoC checklist item 13 ("no generic type-grouping files spanning multiple capabilities"). When adding a new component type, you modify the same file as when changing warning behavior. Types are not co-located with their usage.
-- **Suggested fix:** Split per the refined design: inspection-types.ts (BuilderStats, BuilderWarning, WarningCode), match-types.ts (NearMatchQuery, NearMatchResult, NearMatchMismatch, NearMatchOptions), and component inputs with their respective add methods or in a dedicated construction-types.ts.
-
-### errors.ts is a generic error-grouping file
-
-- **What's wrong:** All 12 error classes are in a single `errors.ts` file spanning: domain errors (DuplicateDomainError, DomainNotFoundError), component errors (DuplicateComponentError, ComponentNotFoundError), custom type errors (CustomTypeNotFoundError, CustomTypeAlreadyDefinedError, MissingRequiredPropertiesError), enrichment errors (InvalidEnrichmentTargetError), graph errors (InvalidGraphError), and validation errors (BuildValidationError, MissingSourcesError, MissingDomainsError), plus infrastructure error (DirectoryNotFoundError).
-- **Why it matters:** Errors for unrelated features are coupled together. The refined design proposes feature-specific error files: construction-errors.ts, enrichment-errors.ts, validation-errors.ts, lookup-errors.ts.
-- **Suggested fix:** Co-locate errors with the code that throws them, per the refined design.
-
-## MEDIUM
-
-### builder-internals.ts mixes concerns
-
-- **What's wrong:** `builder-internals.ts` contains four unrelated functions: `generateComponentId` (ID generation), `createComponentNotFoundError` (error creation with suggestions), `validateDomainExists`, `validateCustomType`, `validateRequiredProperties` (all validation wrappers). These functions have different reasons to change and different callers.
-- **Why it matters:** The file name "internals" is vague and doesn't describe what the functions have in common. SoC principle 5: "Separate functions that don't have related names."
-- **Suggested fix:** Move `generateComponentId` to `domain/component-id-generator.ts`. Keep assertions in `builder-assertions.ts`. Move error creation to `error-recovery/` or co-locate with `ComponentNotFoundError`.
-
-### deduplicate.ts mixes generic and domain-specific deduplication
-
-- **What's wrong:** `deduplicate.ts` contains two functions: `deduplicateStrings` (generic string array deduplication) and `deduplicateStateTransitions` (domain-specific StateTransition deduplication using from/to/trigger equality).
-- **Why it matters:** Generic capabilities should be in `platform/`, domain-specific logic in `features/`. The refined design correctly separates: `deduplicateStrings` to `platform/domain/collection-utils/` and `deduplicateStateTransitions` to `features/graph-enrichment/domain/`.
-- **Suggested fix:** Apply the proposed split. The domain-specific function knows about StateTransition equality rules, so it belongs with enrichment domain logic.
-
-### Validation delegated entirely to external package
-
-- **What's wrong:** `validateGraph()` in inspection.ts (line 176-178) simply creates a `RiviereQuery` and calls its `validate()` method. All validation logic is outsourced to riviere-query package.
-- **Why it matters:** If riviere-builder has its own invariants beyond schema compliance (e.g., checking for orphans as warnings vs errors, verifying enrichment consistency), there's no place to add them. The builder doesn't distinguish its validation concerns from schema validation.
-- **Suggested fix:** Consider whether builder-specific validation rules exist. If so, compose them with schema validation. Document explicitly that validation is purely schema-based if that's intentional.
-
-### enrichComponent mutates argument directly
-
-- **What's wrong:** The `enrichComponent` method (lines 589-616) directly mutates the component object it finds: `component.entity = enrichment.entity`, `component.stateChanges = [...]`. This is mutation-in-place rather than immutable state transitions.
-- **Why it matters:** While the builder is mutable by design, direct mutation makes it harder to reason about state changes and track what changed. It also means partial failures could leave the component in an inconsistent state (e.g., if `behavior` merge throws after `entity` was already set).
-- **Suggested fix:** Consider creating a new component object with all changes applied atomically, then replacing it in the components array. This makes the operation transactional.
-
-### resume() performs minimal validation
-
-- **What's wrong:** `RiviereBuilder.resume()` (lines 157-174) only checks that sources exist. It doesn't verify: domain existence, component ID validity, link target existence, custom type consistency, or schema compliance.
-- **Why it matters:** A malformed graph can be loaded and corrupt the builder state. Subsequent operations might fail in confusing ways. The invariants that `RiviereBuilder.new()` enforces are not enforced on resume.
-- **Suggested fix:** Call `validateGraph()` on the input before restoring. Document that resume accepts only valid RiviereGraph objects. Consider whether partial/draft graphs should use a different restoration mechanism.
-
-### NearMatchQuery uses primitive string for name instead of value object
-
-- **What's wrong:** `NearMatchQuery` uses `name: string` for the search term. The refined design mentions using `ComponentId` value object from schema, but the near-match logic operates on raw strings.
-- **Why it matters:** Inconsistent use of value objects. The `createSourceNotFoundError` does extract `id.name()` from a `ComponentId`, but the general `findNearMatches` API accepts raw strings, losing type safety.
-- **Suggested fix:** Either accept `ComponentId` for the query and extract parts internally, or document that the string-based API is intentional for flexibility.
-
-## LOW
-
-### Inconsistent function naming: assert vs validate
-
-- **What's wrong:** `builder-assertions.ts` has functions named `assertDomainExists`, `assertCustomTypeExists`, `assertRequiredPropertiesProvided`. `builder-internals.ts` wraps these as `validateDomainExists`, `validateCustomType`, `validateRequiredProperties`. Two naming conventions for the same concept.
-- **Why it matters:** Cognitive overhead. Are "assert" and "validate" semantically different? Both throw errors. The indirection adds no value.
-- **Suggested fix:** Pick one naming convention. If "assert" is preferred (implies throwing), remove the validate wrappers and call assert functions directly.
-
-### Feature directory structure not implemented
-
-- **What's wrong:** The refined design proposes: `features/graph-construction/`, `features/graph-enrichment/`, `features/graph-inspection/`, `features/error-recovery/`, and `platform/domain/`. The actual code is flat: `src/builder.ts`, `src/types.ts`, `src/errors.ts`, etc.
-- **Why it matters:** The refined design analysis passes its own checklist, but the implementation doesn't match. The design document is aspirational, not descriptive.
-- **Suggested fix:** Either implement the proposed structure or update the design document to reflect reality and explain why the flat structure is acceptable for a ~600 line package.
-
-### Missing domain/ folder in features per SoC pattern
-
-- **What's wrong:** If implementing the refined structure, features like `graph-inspection` have multiple domain files but no orchestrating use-case. The refined design acknowledges "no separate use-cases needed - they are called directly by the builder" but this means the builder IS the use-case for all features.
-- **Why it matters:** The SoC pattern expects features to have their own entry points. Having one mega-class orchestrate four features' worth of domain logic doesn't achieve the separation the pattern intends.
-- **Suggested fix:** Consider whether the builder should be split into multiple collaborating classes (GraphConstructor, GraphEnricher, GraphInspector, etc.) that are composed together, rather than one class calling into domain functions.
-
-### ComponentId.parse used inconsistently
-
-- **What's wrong:** In `createComponentNotFoundError` (builder-internals.ts line 25), the code does `ComponentId.parse(id)` on a string that was already generated by `generateComponentId`. The ID format is internal knowledge duplicated across parsing and generation.
-- **Why it matters:** If the ID format changes, both places need updating. The generation function returns a string but the error recovery needs the parsed value object.
-- **Suggested fix:** Have `generateComponentId` return a `ComponentId` value object. Callers that need the string can call `toString()`. This ensures the format is defined in one place.
-
-### No explicit state machine for graph construction phases
-
-- **What's wrong:** The builder allows adding components, linking, enriching, and building in any order. There's no explicit modeling of construction phases (e.g., "defining structure" vs "linking" vs "enriching" vs "finalizing").
-- **Why it matters:** DDD principle 6 suggests making implicit concepts explicit. If there are constraints about what operations are valid when (e.g., can you enrich after build? can you add components after linking?), these aren't enforced or documented.
-- **Suggested fix:** Document the intended usage pattern. If phase constraints exist, consider modeling them (e.g., `builder.finalize()` returns an immutable object that prevents further mutation).
-
-### menu test ambiguity for inspection methods
-
-- **What's wrong:** The refined design claims `warnings()`, `stats()`, `orphans()` pass the menu test as user intentions. But these are more like queries on graph state rather than actions a user would request from a "menu" of features.
-- **Why it matters:** DDD principle 3 menu test: "If you described your application's features to a user like a menu, would this be on it?" A user might say "Build graph" but probably not "Calculate stats."
-- **Suggested fix:** Consider reframing: these are not use cases, they're query methods on the aggregate. This is fine, but don't claim they pass the menu test. They're legitimate read operations, just not "intentions."
-
-## Summary
-
-The most critical issues are:
-
-1. **save() method contradicts the refined design** - Must be removed for browser compatibility and domain isolation. This is an explicit design decision that wasn't implemented.
-
-2. **Public graph field violates aggregate invariant protection** - Making this private is a minimal fix with high impact on correctness guarantees.
-
-3. **RiviereBuilder is doing too much** - Consider extracting inspection and query capabilities to separate classes.
-
-4. **Centralized types.ts and errors.ts files** - Split per the refined design to achieve co-location and cohesion.
-
-The refined design document is well-reasoned but represents aspirational architecture, not current implementation. The gap between design and code needs reconciliation - either implement the proposed structure or update the design to justify the simpler flat structure for this package size.
diff --git a/docs/design-reviews/riviere-builder/design.md b/docs/design-reviews/riviere-builder/design.md
deleted file mode 100644
index ae477873c..000000000
--- a/docs/design-reviews/riviere-builder/design.md
+++ /dev/null
@@ -1,281 +0,0 @@
-# Separation of Concerns Analysis: riviere-builder
-
-## Package Overview
-
-**Package:** `@living-architecture/riviere-builder`
-**Location:** `/Users/nicko/code/living-architecture-issue-203-architecture-review-and-adr-fo/packages/riviere-builder/`
-**Purpose:** Construct Riviere architecture graphs programmatically via a fluent builder API
-
-## Current Structure
-
-```text
-packages/riviere-builder/
-└── src/
-    ├── index.ts                    # Public exports
-    ├── builder.ts                  # RiviereBuilder class (main API)
-    ├── builder-assertions.ts       # Domain existence checks
-    ├── builder-internals.ts        # ID generation, validation wrappers
-    ├── builder-test-fixtures.ts    # Test helpers
-    ├── component-suggestion.ts     # Fuzzy matching for error messages
-    ├── deduplicate.ts              # Array deduplication utilities
-    ├── errors.ts                   # All error classes
-    ├── inspection.ts               # Graph analysis functions
-    ├── merge-behavior.ts           # Behavior merge logic
-    ├── string-similarity.ts        # Levenshtein distance algorithm
-    └── types.ts                    # All input/output type definitions
-```
-
-## Checklist Evaluation
-
-### 1. Verify features/, platform/, shell/ exist at root
-
-**Status:** FAIL
-
-The package uses a flat `src/` structure. No `features/`, `platform/`, or `shell/` directories exist.
-
-### 2. Verify platform/ contains only domain/ and infra/
-
-**Status:** N/A (no platform/ directory exists)
-
-### 3. Verify each feature contains only entrypoint/, use-cases/, domain/
-
-**Status:** N/A (no features/ directory exists)
-
-### 4. Verify shell/ contains no business logic
-
-**Status:** N/A (no shell/ directory exists)
-
-### 5. Verify code belonging to one feature is in features/[feature]/
-
-**Status:** FAIL
-
-All code is in a flat structure. The package has identifiable features that are not separated:
-- **Graph Building:** Component addition, linking, serialization
-- **Graph Inspection:** Validation, statistics, orphan detection, warnings
-- **Error Recovery:** Near-match suggestions, fuzzy string matching
-
-### 6. Verify shared business logic is in platform/domain/
-
-**Status:** FAIL
-
-Shared logic (deduplication, string similarity) is scattered in root `src/`.
-
-### 7. Verify external service wrappers are in platform/infra/
-
-**Status:** N/A
-
-This package has no external service dependencies. It uses only Node.js `fs` for file I/O in the `save()` method of `builder.ts`.
-
-### 8. Verify custom folders are inside domain/, not use-cases/
-
-**Status:** N/A (no use-cases/ directory exists)
-
-### 9. Verify each function relies on same state as others in its class/file
-
-**Status:** PARTIAL PASS
-
-- `builder.ts`: The `RiviereBuilder` class methods all operate on `this.graph` (same state)
-- `errors.ts`: All error classes are stateless value objects (cohesive)
-- `types.ts`: All type definitions (no functions, cohesive)
-- `inspection.ts`: Functions operate on `InspectionGraph` parameter (cohesive)
-- `component-suggestion.ts`: Functions operate on component arrays (cohesive)
-- `string-similarity.ts`: Pure functions on string parameters (cohesive)
-
-However:
-- `builder-internals.ts`: Mixes ID generation with validation delegation (different concerns)
-
-### 10. Verify each file name relates to other files in its directory
-
-**Status:** PARTIAL FAIL
-
-All files are in root `src/`, making naming relationships unclear. Some names relate:
-- `builder.ts`, `builder-internals.ts`, `builder-assertions.ts` (builder family)
-- `component-suggestion.ts`, `string-similarity.ts` (suggestion family)
-
-But others are loosely related:
-- `deduplicate.ts` (utility)
-- `merge-behavior.ts` (specific to DomainOp enrichment)
-- `inspection.ts` (graph analysis)
-
-### 11. Verify each directory name describes what all files inside have in common
-
-**Status:** FAIL
-
-Only one directory (`src/`) contains all code. The name does not describe the commonality.
-
-### 12. Verify use-cases/ contains only use-case files
-
-**Status:** N/A (no use-cases/ directory exists)
-
-### 13. Verify no generic type-grouping files spanning multiple capabilities
-
-**Status:** FAIL
-
-- `types.ts`: Contains 15+ interfaces spanning building, linking, enrichment, matching, warnings
-- `errors.ts`: Contains 12 error classes spanning domains, components, validation, custom types
-
-### 14. Verify entrypoint/ is thin and never imports from domain/
-
-**Status:** N/A (no entrypoint/ directory exists)
-
-## Analysis Summary
-
-### Identified Features (Capabilities)
-
-1. **graph-construction**: Building graphs with components and links
-   - `builder.ts` (RiviereBuilder class)
-   - `builder-internals.ts` (ID generation)
-   - `builder-assertions.ts` (validation)
-
-2. **graph-enrichment**: Enriching DomainOp components
-   - `merge-behavior.ts`
-   - `deduplicate.ts` (shared utility)
-
-3. **graph-inspection**: Analyzing graph state
-   - `inspection.ts` (stats, orphans, warnings, validation)
-
-4. **error-recovery**: Suggesting alternatives on errors
-   - `component-suggestion.ts`
-   - `string-similarity.ts`
-
-### Platform Candidates (Shared Logic)
-
-- `string-similarity.ts`: Generic Levenshtein distance algorithm
-- `deduplicate.ts`: Generic array deduplication
-
-### Principle Violations
-
-#### Principle 2: Separate feature-specific from shared capabilities
-
-`string-similarity.ts` is a generic algorithm useful beyond this package. It belongs in `platform/domain/` as shared logic.
-
-`deduplicate.ts` contains generic deduplication logic. The string deduplication is generic; the state transition deduplication is domain-specific to Riviere graphs.
-
-#### Principle 3: Separate intent from execution
-
-`builder.ts` mixes high-level flow with some implementation details:
-- Component creation methods follow a consistent pattern (good)
-- The `enrichComponent` method has implementation details interleaved with intent
-
-#### Principle 5: Separate functions that don't have related names
-
-`builder-internals.ts` contains:
-- `generateComponentId()` - ID generation
-- `createComponentNotFoundError()` - Error creation
-- `validateDomainExists()`, `validateCustomType()`, `validateRequiredProperties()` - Validation wrappers
-
-These functions have unrelated names and purposes, grouped only by being "internal" to the builder.
-
-## Recommended Structure
-
-```text
-packages/riviere-builder/
-└── src/
-    ├── features/
-    │   ├── graph-construction/
-    │   │   ├── entrypoint/
-    │   │   │   └── riviere-builder.ts      # Public builder class
-    │   │   ├── use-cases/
-    │   │   │   ├── add-component.ts        # Component addition logic
-    │   │   │   ├── create-link.ts          # Linking logic
-    │   │   │   └── build-graph.ts          # Final build/validation
-    │   │   └── domain/
-    │   │       ├── component-id.ts         # ID generation
-    │   │       ├── graph-state.ts          # BuilderGraph type
-    │   │       └── validation.ts           # Domain/type assertions
-    │   │
-    │   ├── graph-enrichment/
-    │   │   ├── entrypoint/
-    │   │   │   └── enrichment-api.ts       # Public enrichment methods
-    │   │   ├── use-cases/
-    │   │   │   └── enrich-domain-op.ts     # Enrichment orchestration
-    │   │   └── domain/
-    │   │       ├── merge-behavior.ts       # Behavior merging rules
-    │   │       └── state-transition.ts     # State transition dedup
-    │   │
-    │   ├── graph-inspection/
-    │   │   ├── entrypoint/
-    │   │   │   └── inspection-api.ts       # Public inspection methods
-    │   │   └── domain/
-    │   │       ├── find-orphans.ts         # Orphan detection
-    │   │       ├── calculate-stats.ts      # Statistics
-    │   │       ├── find-warnings.ts        # Warning detection
-    │   │       └── graph-validation.ts     # Schema validation
-    │   │
-    │   └── error-recovery/
-    │       ├── entrypoint/
-    │       │   └── suggestion-api.ts       # Public suggestion methods
-    │       └── domain/
-    │           ├── near-match.ts           # Fuzzy component matching
-    │           └── mismatch-detection.ts   # Type/domain mismatch
-    │
-    ├── platform/
-    │   └── domain/
-    │       ├── string-similarity/
-    │       │   └── levenshtein.ts          # Generic string similarity
-    │       └── array-deduplication/
-    │           └── deduplicate-strings.ts  # Generic deduplication
-    │
-    └── shell/
-        └── index.ts                        # Public API exports
-```
-
-## Key Findings
-
-| Finding | Severity | Location |
-|---------|----------|----------|
-| Flat structure missing features/platform/shell | High | `/packages/riviere-builder/src/` |
-| Generic types.ts spans multiple capabilities | Medium | `/packages/riviere-builder/src/types.ts` |
-| Generic errors.ts spans multiple capabilities | Medium | `/packages/riviere-builder/src/errors.ts` |
-| builder-internals.ts mixes unrelated functions | Medium | `/packages/riviere-builder/src/builder-internals.ts` |
-| Generic algorithms not in platform/ | Low | `string-similarity.ts`, `deduplicate.ts` |
-
-## Recommendations
-
-1. **Introduce feature directories** to separate graph-construction, graph-enrichment, graph-inspection, and error-recovery capabilities
-
-2. **Split types.ts** into feature-specific types co-located with their features:
-   - `graph-construction/domain/input-types.ts`
-   - `graph-inspection/domain/stats-types.ts`
-   - `error-recovery/domain/match-types.ts`
-
-3. **Split errors.ts** into feature-specific errors:
-   - `graph-construction/domain/construction-errors.ts`
-   - `graph-enrichment/domain/enrichment-errors.ts`
-
-4. **Extract platform/domain/** for truly generic utilities:
-   - `string-similarity/` - Levenshtein algorithm
-   - `array-deduplication/` - Generic dedup
-
-5. **Decompose builder-internals.ts** by responsibility:
-   - ID generation into `graph-construction/domain/`
-   - Validation wrappers into `graph-construction/domain/`
-
-6. **Create shell/index.ts** as the single public API surface that composes and exports the features
-
-## Trade-offs
-
-**Current structure benefits:**
-- Simple navigation (few files)
-- Easy to understand for small codebase
-- Matches existing project conventions in the `development-skills:separation-of-concerns` skill
-
-**Recommended structure benefits:**
-- Clear separation of concerns
-- Easier to test features in isolation
-- Easier to evolve features independently
-- Types/errors co-located with usage
-
-**Migration risk:**
-- Breaking changes to imports
-- Increased file count
-- More complex navigation initially
-
-## Conclusion
-
-The `riviere-builder` package violates several separation of concerns principles due to its flat structure. The most significant issues are:
-1. No feature-based organization
-2. Generic types and errors spanning multiple capabilities
-3. Mixed responsibilities in `builder-internals.ts`
-
-For a package of this size (~10 source files), the current structure is maintainable but will not scale well. If the package grows or requires significant modification, restructuring according to the recommended layout would improve maintainability and testability.
diff --git a/docs/design-reviews/riviere-builder/refined.md b/docs/design-reviews/riviere-builder/refined.md
deleted file mode 100644
index 5b8970e09..000000000
--- a/docs/design-reviews/riviere-builder/refined.md
+++ /dev/null
@@ -1,330 +0,0 @@
-# Refined Design: riviere-builder
-
-## Package Overview
-
-**Package:** `@living-architecture/riviere-builder`
-**Location:** `packages/riviere-builder/`
-**Purpose:** Construct Riviere architecture graphs programmatically via a fluent builder API
-
----
-
-## Refined Structure
-
-```text
-packages/riviere-builder/
-└── src/
-    ├── index.ts                              # Public API exports (shell for libraries)
-    │
-    ├── features/
-    │   ├── graph-construction/
-    │   │   ├── domain/
-    │   │   │   ├── component-id-generator.ts # ID generation using ComponentId value object
-    │   │   │   ├── graph-under-construction.ts # BuilderGraph type and invariants
-    │   │   │   ├── domain-assertions.ts      # Domain/custom-type existence checks
-    │   │   │   └── construction-errors.ts    # DuplicateDomainError, DomainNotFoundError, etc.
-    │   │   └── use-cases/
-    │   │       └── riviere-builder.ts        # RiviereBuilder class (fluent API)
-    │   │
-    │   ├── graph-enrichment/
-    │   │   └── domain/
-    │   │       ├── behavior-merger.ts        # mergeBehavior logic
-    │   │       ├── state-transition-dedup.ts # Domain-specific deduplication
-    │   │       └── enrichment-errors.ts      # InvalidEnrichmentTargetError
-    │   │
-    │   ├── graph-inspection/
-    │   │   └── domain/
-    │   │       ├── orphan-detector.ts        # findOrphans
-    │   │       ├── stats-calculator.ts       # calculateStats
-    │   │       ├── warning-detector.ts       # findWarnings
-    │   │       ├── graph-validator.ts        # validateGraph
-    │   │       ├── graph-converter.ts        # toRiviereGraph
-    │   │       ├── inspection-types.ts       # BuilderStats, BuilderWarning, WarningCode
-    │   │       └── validation-errors.ts      # BuildValidationError, InvalidGraphError
-    │   │
-    │   └── error-recovery/
-    │       └── domain/
-    │           ├── near-match-finder.ts      # findNearMatches
-    │           ├── mismatch-detector.ts      # detectMismatch
-    │           ├── suggestion-generator.ts   # createSourceNotFoundError
-    │           ├── match-types.ts            # NearMatchQuery, NearMatchResult, etc.
-    │           └── lookup-errors.ts          # ComponentNotFoundError
-    │
-    └── platform/
-        └── domain/
-            ├── text-similarity/
-            │   └── levenshtein.ts            # levenshteinDistance, similarityScore
-            └── collection-utils/
-                └── deduplicate-strings.ts    # deduplicateStrings (generic)
-```
-
----
-
-## Separation of Concerns Checklist (Refined)
-
-### 1. Verify features/, platform/, shell/ exist at root
-
-**Status:** PASS (adapted for library pattern)
-
-- `features/` contains feature-specific code
-- `platform/` contains shared generic utilities
-- `index.ts` serves as public API surface (library equivalent of shell)
-
-### 2. Verify platform/ contains only domain/ and infra/
-
-**Status:** PASS
-
-- `platform/domain/` contains generic algorithms
-- No `infra/` needed - this package has no external service dependencies (filesystem I/O removed per DDD-1)
-
-### 3. Verify each feature contains only entrypoint/, use-cases/, domain/
-
-**Status:** PASS (adapted)
-
-- `graph-construction/` has `use-cases/` (RiviereBuilder) and `domain/`
-- Other features have only `domain/` (no separate use-cases needed - they are called directly by the builder)
-
-### 4. Verify shell/ contains no business logic
-
-**Status:** PASS
-
-- `index.ts` contains only re-exports
-
-### 5. Verify code belonging to one feature is in features/[feature]/
-
-**Status:** PASS
-
-Four features clearly separated:
-- `graph-construction/` - building graphs with components and links
-- `graph-enrichment/` - enriching DomainOp components
-- `graph-inspection/` - analyzing graph state
-- `error-recovery/` - suggesting alternatives on errors
-
-### 6. Verify shared business logic is in platform/domain/
-
-**Status:** PASS
-
-- `text-similarity/` - Levenshtein algorithm (generic)
-- `collection-utils/` - string deduplication (generic)
-
-### 7. Verify external service wrappers are in platform/infra/
-
-**Status:** N/A
-
-- Filesystem I/O removed from builder (callers handle I/O)
-- No external service dependencies
-
-### 8. Verify custom folders are inside domain/, not use-cases/
-
-**Status:** PASS
-
-- No custom folders outside defined structure
-
-### 9. Verify each function relies on same state as others in its class/file
-
-**Status:** PASS
-
-Each file now contains cohesive functions:
-- `behavior-merger.ts` - merging behavior objects
-- `orphan-detector.ts` - finding orphans
-- `near-match-finder.ts` - fuzzy matching
-
-### 10. Verify each file name relates to other files in its directory
-
-**Status:** PASS
-
-Files grouped by feature. Names within each feature relate:
-- `graph-inspection/domain/`: orphan-detector, stats-calculator, warning-detector, graph-validator
-- `error-recovery/domain/`: near-match-finder, mismatch-detector, suggestion-generator
-
-### 11. Verify each directory name describes what all files inside have in common
-
-**Status:** PASS
-
-- `graph-construction/` - files for constructing graphs
-- `graph-enrichment/` - files for enriching components
-- `graph-inspection/` - files for inspecting/analyzing graphs
-- `error-recovery/` - files for error recovery and suggestions
-
-### 12. Verify use-cases/ contains only use-case files
-
-**Status:** PASS
-
-- `graph-construction/use-cases/` contains only `riviere-builder.ts`
-
-### 13. Verify no generic type-grouping files spanning multiple capabilities
-
-**Status:** PASS
-
-Types co-located with features:
-- `inspection-types.ts` in `graph-inspection/domain/`
-- `match-types.ts` in `error-recovery/domain/`
-
-### 14. Verify entrypoint/ is thin and never imports from domain/
-
-**Status:** N/A (library pattern)
-
-- No entrypoint/ directories
-- `RiviereBuilder` class is in `use-cases/` and properly orchestrates domain operations
-
----
-
-## Tactical DDD Checklist (Refined)
-
-### 1. Verify domain is isolated from infrastructure
-
-**Status:** PASS (after refinement)
-
-**Change:** Remove `save()` method from `RiviereBuilder`. Callers use:
-```typescript
-const graph = builder.build()
-await fs.writeFile(path, JSON.stringify(graph, null, 2))
-```
-
-This removes Node.js `fs` dependency and makes the package browser-compatible.
-
-### 2. Verify names are from YOUR domain, not generic developer jargon
-
-**Status:** PASS
-
-Domain terms used consistently:
-- Component, Domain, Link, Graph (from Riviere domain)
-- Enrichment (domain concept for adding details)
-- NearMatch (domain concept for error recovery)
-- DomainOp, UseCase, Event, EventHandler (component types)
-
-### 3. Verify use cases are intentions of users (menu test)
-
-**Status:** PASS
-
-User intentions (what would appear in a menu):
-- Create new graph configuration
-- Add component to graph
-- Link components together
-- Enrich component with details
-- Find similar components (for error recovery)
-- Inspect graph (stats, warnings, orphans)
-- Validate graph
-- Build final graph
-
-All these are represented as methods on `RiviereBuilder`.
-
-### 4. Verify business logic lives in domain objects, use cases only orchestrate
-
-**Status:** PASS
-
-Business logic properly placed:
-- `mergeBehavior()` - knows how to merge operation behaviors
-- `deduplicateStateTransitions()` - knows equality rules for transitions
-- `findNearMatches()` - knows fuzzy matching domain logic
-- `findOrphans()` - knows what orphan means
-- Domain assertions - know validation rules
-
-`RiviereBuilder` orchestrates these domain operations.
-
-### 5. Verify states are modeled as distinct types where appropriate
-
-**Status:** PASS
-
-Graph states distinguished:
-- `BuilderGraph` (internal) - mutable, under construction
-- `RiviereGraph` (output) - validated, final
-
-Component types modeled distinctly in schema package.
-
-### 6. Verify hidden domain concepts are extracted and named explicitly
-
-**Status:** PASS (after refinements)
-
-Explicit concepts:
-- `ComponentId` value object (from schema) used for identity
-- `NearMatchResult` explicitly models fuzzy match with score and mismatch info
-- `BuilderWarning` explicitly models non-fatal issues with code
-
-### 7. Verify aggregates are designed around invariants
-
-**Status:** PASS
-
-`RiviereBuilder` is the aggregate root for graph construction:
-- Invariant: No duplicate component IDs - enforced by `registerComponent()`
-- Invariant: All components reference valid domains - enforced by `validateDomainExists()`
-- Invariant: All links reference valid sources - enforced by `link()` and `linkExternal()`
-- External code cannot directly mutate internal state
-
-### 8. Verify values are extracted into value objects
-
-**Status:** PARTIAL PASS
-
-Value objects in use:
-- `ComponentId` (from schema) - used in error recovery
-- `SourceLocation` (from schema) - location information
-
-Potential value objects not yet extracted:
-- Domain name (currently primitive string)
-- Module name (currently primitive string)
-
-These could be value objects but primitives are acceptable for simple identifiers without behavior.
-
----
-
-## Key Changes from Original Design
-
-| Change | Rationale | Impact |
-|--------|-----------|--------|
-| Remove `save()` method | Domain isolation, browser compatibility | Breaking change for callers using `save()` |
-| Introduce feature directories | Separation of concerns | Internal reorganization |
-| Split types.ts | Cohesion, co-location | Import paths change |
-| Split errors.ts | Cohesion, co-location | Import paths change |
-| Extract generic algorithms to platform/ | Separation of feature-specific from shared | Internal reorganization |
-| Use ComponentId internally | Value object pattern, explicit domain concept | Internal improvement |
-
----
-
-## Trade-offs
-
-### Benefits of Refined Design
-
-1. **Clear feature boundaries** - Easy to understand what each feature does
-2. **Cohesive modules** - Types and errors co-located with usage
-3. **Testable in isolation** - Features can be tested independently
-4. **Browser compatible** - Removing filesystem dependency enables browser usage
-5. **Domain isolation** - No infrastructure concerns in domain code
-
-### Costs of Refined Design
-
-1. **More files** - ~20 files vs current ~12
-2. **Deeper nesting** - `features/graph-construction/domain/` vs flat `src/`
-3. **Migration effort** - All imports need updating
-4. **Import verbosity** - Longer import paths internally
-
-### Recommendation
-
-For a package of this size (~600 lines of production code), the refined structure provides meaningful benefits for maintainability and testability. The increased file count is offset by:
-- Each file having single responsibility
-- Types co-located with usage (no hunting through types.ts)
-- Errors co-located with throwing code
-- Clear boundaries for future growth
-
-The `save()` removal is the most impactful change, as it affects the public API. This should be considered carefully against the browser-compatibility benefit.
-
----
-
-## Dependency Flow
-
-```text
-index.ts (public API)
-    │
-    └── features/graph-construction/use-cases/riviere-builder.ts
-            │
-            ├── features/graph-construction/domain/*
-            ├── features/graph-enrichment/domain/*
-            ├── features/graph-inspection/domain/*
-            ├── features/error-recovery/domain/*
-            │
-            └── platform/domain/*
-```
-
-Rules:
-- `use-cases/` depends on `domain/` (same feature or platform)
-- `domain/` never depends on `use-cases/`
-- Features do not depend on each other's `domain/` directly
-- All cross-feature coordination goes through `RiviereBuilder` (the orchestrator)
diff --git a/docs/design-reviews/riviere-builder/refinements.md b/docs/design-reviews/riviere-builder/refinements.md
deleted file mode 100644
index df6f3591e..000000000
--- a/docs/design-reviews/riviere-builder/refinements.md
+++ /dev/null
@@ -1,194 +0,0 @@
-# Refinements: riviere-builder
-
-This document catalogs refinements to the original design based on the `separation-of-concerns` and `tactical-ddd` skills.
-
----
-
-## Separation of Concerns Refinements
-
-### SOC-1: Feature Directory Structure
-
-**Original:** Flat `src/` structure with all files at root level.
-
-**Refinement:** Introduce `features/`, `platform/`, and `shell/` directories. However, for this package, the structure requires adjustment:
-
-- This package is a **library**, not an application
-- There are no external entrypoints (HTTP, CLI) - the `RiviereBuilder` class IS the API
-- The `shell/` directory concept applies to wiring for applications, not libraries
-
-**Refined structure:** For libraries, the three-folder pattern adapts:
-- `features/` contains feature-specific domain logic
-- `platform/` contains shared capabilities
-- The public API surface (`index.ts`) serves as the "shell" for libraries
-
-### SOC-2: Generic Utilities Extraction
-
-**Original:** `string-similarity.ts` and `deduplicateStrings()` in `deduplicate.ts` are in the feature code.
-
-**Refinement:** Extract generic algorithms to `platform/domain/`:
-- `platform/domain/text-similarity/levenshtein.ts` - pure algorithm
-- `platform/domain/collection-utils/deduplicate-strings.ts` - generic dedup
-
-The domain-specific `deduplicateStateTransitions()` stays with enrichment feature.
-
-### SOC-3: Split Types Spanning Multiple Capabilities
-
-**Original:** `types.ts` contains 18 interfaces spanning construction, enrichment, inspection, and near-matching.
-
-**Refinement:** Co-locate types with their features:
-- `features/graph-construction/domain/input-types.ts` - component inputs
-- `features/graph-enrichment/domain/enrichment-types.ts` - enrichment input
-- `features/graph-inspection/domain/stats-types.ts` - stats and warnings
-- `features/error-recovery/domain/match-types.ts` - near-match query/result
-
-### SOC-4: Split Errors Spanning Multiple Capabilities
-
-**Original:** `errors.ts` contains 12 error classes for domains, components, validation, custom types, and I/O.
-
-**Refinement:** Co-locate errors with their features:
-- Construction errors: `DuplicateDomainError`, `DomainNotFoundError`, `DuplicateComponentError`, `CustomTypeNotFoundError`, `CustomTypeAlreadyDefinedError`, `MissingRequiredPropertiesError`, `MissingSourcesError`, `MissingDomainsError`
-- Component lookup errors: `ComponentNotFoundError`
-- Enrichment errors: `InvalidEnrichmentTargetError`
-- Build/validation errors: `BuildValidationError`, `InvalidGraphError`
-- I/O errors: `DirectoryNotFoundError`
-
-### SOC-5: Decompose builder-internals.ts
-
-**Original:** Mixes ID generation, error creation, and validation delegation in one file.
-
-**Refinement:** Split by responsibility:
-- ID generation belongs with graph construction domain
-- Validation delegation is unnecessary indirection - call assertions directly
-- Error creation using suggestions belongs with error-recovery feature
-
-### SOC-6: Entrypoint vs Domain Violation
-
-**Original:** `RiviereBuilder` class mixes:
-- Public API surface (entrypoint concern)
-- Orchestration logic (use-case concern)
-- Some domain decisions embedded in methods
-
-**Refinement:** For a builder pattern library, the class IS the public API. The current design is acceptable because:
-- Methods are thin mappings to domain operations
-- Validation is delegated to assertion functions
-- Complex logic is extracted (e.g., `mergeBehavior`, `findNearMatches`)
-
-No structural change required, but document this as an intentional pattern for builder APIs.
-
----
-
-## Tactical DDD Refinements
-
-### DDD-1: Domain Isolation Violation
-
-**Original:** `save()` method in `RiviereBuilder` contains infrastructure code (filesystem access).
-
-**Refinement:** The `save()` method violates domain isolation by embedding `fs.access()` and `fs.writeFile()` directly. Options:
-1. Remove `save()` from builder - callers use `build()` and handle I/O themselves
-2. Accept a `Saver` interface and inject implementation (dependency inversion)
-
-For a library, option 1 is cleaner - the caller controls I/O. The `save()` method is a convenience that couples the library to Node.js.
-
-### DDD-2: Anemic Domain Model Detection
-
-**Original:** `enrichComponent()` method contains business logic:
-```typescript
-if (component.type !== 'DomainOp') {
-  throw new InvalidEnrichmentTargetError(id, component.type)
-}
-```
-
-**Refinement:** This is acceptable orchestration-level validation (checking a precondition before operating). The actual domain logic is in `mergeBehavior()` and the deduplication functions. The model is not anemic because:
-- `mergeBehavior()` contains business rules about merging
-- `deduplicateStateTransitions()` knows what makes transitions equal
-- The builder orchestrates these domain operations
-
-### DDD-3: Missing Value Objects
-
-**Original:** Component ID is a primitive string passed around. The schema has `ComponentId` but the builder uses raw strings.
-
-**Refinement:** The `ComponentId` value object from `@living-architecture/riviere-schema` should be used internally:
-- `generateComponentId()` should return `ComponentId`, not `string`
-- Methods accepting IDs could accept `ComponentId | string` for convenience
-- Internal storage could use `ComponentId` to enforce validation at boundaries
-
-This would make the domain concept of "component identity" explicit throughout.
-
-### DDD-4: Missing Value Objects - StateTransition Equality
-
-**Original:** `deduplicateStateTransitions()` implements equality inline:
-```typescript
-e.from === item.from && e.to === item.to && e.trigger === item.trigger
-```
-
-**Refinement:** `StateTransition` should be a value object with an `equals()` method. Since this type comes from `riviere-schema`, this refinement would need to be applied there. For now, the domain logic is correctly isolated in the deduplication function.
-
-### DDD-5: Rich Domain Language Audit
-
-**Original terms with potential improvements:**
-
-| Current | Issue | Suggested |
-|---------|-------|-----------|
-| `BuilderOptions` | Generic "options" | `GraphInitialization` or keep (acceptable for builder pattern) |
-| `enrichComponent()` | Verb is good | Keep |
-| `nearMatches()` | Good domain term | Keep |
-| `registerComponent()` | Implementation detail | `addToGraph()` or keep as private |
-| `BuilderGraph` | Internal type | `GraphUnderConstruction` to indicate mutable state |
-| `InspectionGraph` | Parameter type for inspection | `GraphSnapshot` or `GraphForInspection` |
-
-Most terms are acceptable. The "Builder" prefix consistently indicates the construction phase.
-
-### DDD-6: Aggregate Boundary Analysis
-
-**Original:** `RiviereBuilder` treats `graph.components[]` as mutable array accessible from multiple methods.
-
-**Refinement:** The `RiviereBuilder` class IS the aggregate root for graph construction. It correctly:
-- Controls all additions via methods (no direct array manipulation from outside)
-- Enforces uniqueness invariant via `registerComponent()`
-- Validates domain existence before creating components
-
-The aggregate boundary is sound. The internal `graph` state is not exposed for direct mutation.
-
-### DDD-7: Make Implicit Explicit - Graph States
-
-**Original:** A graph under construction vs a validated graph are the same type with different guarantees.
-
-**Refinement:** The design already distinguishes:
-- `BuilderGraph` - internal, mutable, may be invalid
-- `RiviereGraph` - output of `build()`, guaranteed valid
-
-This could be made even more explicit with union types:
-```typescript
-type GraphState =
-  | DraftGraph      // Under construction, mutable
-  | ValidatedGraph  // Passed validation, immutable
-```
-
-But the current design with `build()` returning `RiviereGraph` provides sufficient clarity.
-
-### DDD-8: Separate Generic Concepts
-
-**Original:** `levenshteinDistance()` and `similarityScore()` are generic text algorithms.
-
-**Refinement:** These are correctly identified as generic in the SoC analysis. They should move to `platform/domain/text-similarity/`. The domain-specific usage (component name matching) stays in `features/error-recovery/`.
-
----
-
-## Summary of Refinements
-
-| ID | Category | Severity | Description |
-|----|----------|----------|-------------|
-| SOC-1 | Structure | High | Introduce features/platform directories for library organization |
-| SOC-2 | Structure | Medium | Extract generic utilities to platform/domain |
-| SOC-3 | Cohesion | Medium | Split types.ts by feature |
-| SOC-4 | Cohesion | Medium | Split errors.ts by feature |
-| SOC-5 | Cohesion | Low | Decompose builder-internals.ts |
-| SOC-6 | Structure | Info | Document builder pattern as intentional entrypoint design |
-| DDD-1 | Isolation | Medium | Remove or inject I/O in save() method |
-| DDD-2 | Anemia | Info | Model is not anemic - validation confirmed |
-| DDD-3 | Value Object | Medium | Use ComponentId value object internally |
-| DDD-4 | Value Object | Low | StateTransition equality (schema package concern) |
-| DDD-5 | Language | Low | Minor naming improvements possible |
-| DDD-6 | Aggregate | Info | Aggregate boundary is sound |
-| DDD-7 | Explicitness | Low | Graph states adequately distinguished |
-| DDD-8 | Generic | Medium | Confirmed need to extract text-similarity algorithms |
diff --git a/docs/design-reviews/riviere-cli/critique.md b/docs/design-reviews/riviere-cli/critique.md
index 5193f5aad..c0ea06efc 100644
--- a/docs/design-reviews/riviere-cli/critique.md
+++ b/docs/design-reviews/riviere-cli/critique.md
@@ -19,7 +19,7 @@ Reviewed: docs/design-reviews/riviere-cli/refined.md
 ### Entrypoint Imports Domain Directly via parseTypeSpecificInput
 
 - **What's wrong:** The entrypoint example in section 1 (line 166 of refined.md) shows `parseTypeSpecificInput(options)` which suggests the entrypoint is aware of component type variations. The entrypoint is doing domain-level parsing decisions, not just mapping CLI strings to a command object.
-- **Why it matters:** Violates separation of concerns checklist item 14: "entrypoint/ is thin (parse input -> invoke use-case -> map output) and never imports from domain/". The entrypoint should not know about component type semantics.
+- **Why it matters:** Violates [ADR-002](../../architecture/adr/ADR-002-allowed-folder-structures.md): entrypoints validate primitive input shape and never import from `domain/`. The entrypoint should not know about component type semantics.
 - **Suggested fix:** Move type-specific input parsing to the use case. Entrypoint should pass raw options; use case or domain decides how to interpret them.
 
 ### Value Object SourceLocation Uses Primitive for filePath
@@ -39,7 +39,7 @@ Reviewed: docs/design-reviews/riviere-cli/refined.md
 ### Generic Type-Grouping File: platform/domain/value-objects/
 
 - **What's wrong:** The design places all value objects in `platform/domain/value-objects/` as a flat folder. This is a generic type-grouping approach (collecting all things of type "value object" together).
-- **Why it matters:** Violates separation of concerns checklist item 13: "Verify no generic type-grouping files (types.ts, errors.ts, validators.ts) spanning multiple capabilities." Value objects should be co-located with the domain concepts they represent or grouped by domain concept, not by "being a value object."
+- **Why it matters:** Violates the local architecture rule against generic type-grouping files spanning multiple capabilities. Value objects should be co-located with the domain concepts they represent or grouped by domain concept, not by "being a value object."
 - **Suggested fix:** Group value objects by the domain concept they belong to. E.g., `platform/domain/architectural-classification/component-type.ts` is good. `platform/domain/source-tracking/source-location.ts`, `platform/domain/source-tracking/repository-url.ts`, `platform/domain/source-tracking/file-path.ts` would be better than a flat `value-objects/` folder.
 
 ### Unclear Boundary: module-ref-resolver in extract-architecture/domain
diff --git a/docs/design-reviews/riviere-cli/refinements.md b/docs/design-reviews/riviere-cli/refinements.md
index 4f7c4e384..1cc6e3197 100644
--- a/docs/design-reviews/riviere-cli/refinements.md
+++ b/docs/design-reviews/riviere-cli/refinements.md
@@ -1,6 +1,6 @@
 # riviere-cli Design Refinements
 
-This document captures the refinements applied to the Architect's design using the `separation-of-concerns` and `tactical-ddd` skills.
+This document captures the refinements applied to the Architect's design using the repository's local architecture and tactical DDD rules.
 
 ---
 
@@ -8,7 +8,7 @@ This document captures the refinements applied to the Architect's design using t
 
 ### 1. Feature Identification
 
-The Architect identified three features based on command groups (build-graph, extract-components, query-graph). This aligns with the separation-of-concerns principle of verticals, but the feature names could better reflect user goals.
+The Architect identified three features based on command groups (build-graph, extract-components, query-graph). This aligns with [ADR-002](../../architecture/adr/ADR-002-allowed-folder-structures.md), but the feature names could better reflect user goals.
 
 **Refinement:** Rename features to reflect user intentions rather than technical operations:
 
diff --git a/docs/design-reviews/riviere-extract-ts/critique.md b/docs/design-reviews/riviere-extract-ts/critique.md
index 3346c7e06..1c8f8a79e 100644
--- a/docs/design-reviews/riviere-extract-ts/critique.md
+++ b/docs/design-reviews/riviere-extract-ts/critique.md
@@ -7,7 +7,7 @@ Reviewed: docs/design-reviews/riviere-extract-ts/refined.md
 ### Missing use-cases/ layer violates Separation of Concerns architecture
 
 - **What's wrong:** The refined design has `features/component-extraction/entrypoint/` going directly to `domain/`. There is no `use-cases/` layer. Every feature should have `entrypoint/`, `use-cases/`, and `domain/`. The design claims "entrypoint/ only where needed" but this contradicts the mandatory three-layer structure.
-- **Why it matters:** Without use-cases/, orchestration logic will leak into either entrypoint or domain. The entrypoint becomes fat (parsing + orchestration + output mapping) or domain becomes polluted with workflow concerns. This is exactly what the Separation of Concerns skill prohibits.
+- **Why it matters:** Without use-cases/, orchestration logic will leak into either entrypoint or domain. The entrypoint becomes fat (parsing + orchestration + output mapping) or domain becomes polluted with workflow concerns. This violates the dependency direction defined in ADR-002.
 - **Suggested fix:** Add `use-cases/` to each feature. Move orchestration from `extractDraftComponents` into a use case. The entrypoint should only parse input and invoke the use case.
 
 ### predicate-matching and value-extraction features have no entrypoint/
diff --git a/docs/design-reviews/riviere-extract-ts/design.md b/docs/design-reviews/riviere-extract-ts/design.md
index 27bc20d51..0d6b1ae74 100644
--- a/docs/design-reviews/riviere-extract-ts/design.md
+++ b/docs/design-reviews/riviere-extract-ts/design.md
@@ -1,4 +1,4 @@
-# Separation of Concerns Analysis: riviere-extract-ts
+# Architecture Analysis: riviere-extract-ts
 
 ## Package Overview
 
diff --git a/docs/design-reviews/riviere-query/refined.md b/docs/design-reviews/riviere-query/refined.md
index 03ec199ef..9ccf8abaa 100644
--- a/docs/design-reviews/riviere-query/refined.md
+++ b/docs/design-reviews/riviere-query/refined.md
@@ -80,7 +80,7 @@ packages/riviere-query/test/
     riviere-graph-fixtures.ts   # Test fixtures
 ```
 
-## Separation of Concerns Analysis
+## Responsibility Analysis
 
 ### Principle 1: Separate external clients from domain-specific code
 
diff --git a/docs/design-reviews/riviere-query/refinements.md b/docs/design-reviews/riviere-query/refinements.md
index 92f57ed72..2aa120ff1 100644
--- a/docs/design-reviews/riviere-query/refinements.md
+++ b/docs/design-reviews/riviere-query/refinements.md
@@ -1,6 +1,6 @@
 # Refinements: riviere-query
 
-This document captures the refinements applied to the original design review using separation-of-concerns and tactical-ddd principles.
+This document captures the refinements applied to the original design review using the repository's local architecture rules and role definitions.
 
 ## Separation of Concerns Refinements
 
diff --git a/docs/project/PRD/active/PRD-phase-13-extraction-workflows.md b/docs/project/PRD/active/PRD-phase-13-extraction-workflows.md
index bf668d004..8c7a96cdd 100644
--- a/docs/project/PRD/active/PRD-phase-13-extraction-workflows.md
+++ b/docs/project/PRD/active/PRD-phase-13-extraction-workflows.md
@@ -102,7 +102,7 @@ Phase 13 ships built-in step types only. User plugin loading is out of scope, bu
 
 No step can read another step's config or mutate another step's private state. Cross-step diagnostics are explicit runtime state exposed only through the diagnostics contract — not hidden coupling.
 
-**Adapter isolation rule:** Built-in step handlers may depend on workflow-owned interfaces and adapters only. Direct imports of `@eventcatalog/sdk`, `@asyncapi/parser`, or Node `child_process` are confined to `riviere-workflow`'s `platform/infra/external-clients` layer. Step handlers and registry/runtime code depend on those interfaces, not on vendor SDK/parser/process APIs directly. This keeps orchestration code thin and matches ADR-002's external-client boundary.
+**Adapter isolation rule:** Built-in step handlers may depend on workflow-owned interfaces and adapters only. Direct imports of `@eventcatalog/sdk`, `@asyncapi/parser`, or Node `child_process` are confined to the workflow use-case package's `infra/external-clients` location. Step handlers and registry/runtime code depend on those interfaces, not on vendor SDK/parser/process APIs directly. This keeps orchestration code thin and matches ADR-002's external-client boundary.
 
 ---
 
@@ -845,7 +845,7 @@ Phase 13 does **not** introduce new read-method names for step authors. The work
 | `builder.warnings()`                   | Non-fatal issues on the current graph (runtime logs the per-step delta).                                                                    |
 | `builder.stats()`                      | Counts of components, links, domains.                                                                                                       |
 | `builder.orphans()`                    | Component IDs with no incoming or outgoing links.                                                                                           |
-| `builder.query(): RiviereQuery`        | Full read-only query object (see `@living-architecture/riviere-query`).                                                                     |
+| `builder.query(): RiviereQuery`        | Full read-only query object from `@living-architecture/riviere-builder-domain-model`.                                                                     |
 | `builder.build(): RiviereGraph`        | **Workflow-facade finalization**: underlying builder `build()` plus unresolved-workflow-diagnostic guard. Used for final output.            |
 
 `RiviereQuery` already exposes `components()`, `links()`, `find(predicate)`, `findAll(predicate)`, `componentById(id)`, `componentsInDomain(name)`, `componentsByType(type)`, `publishedEvents()`, `eventHandlers()`, `externalLinks()`, and more. Phase 13 does **not** add draft-only helper methods to `RiviereQuery`. AI steps that need incomplete-state information read it from `StepContext.diagnostics`, not from `RiviereGraph`.
@@ -979,11 +979,11 @@ riviere-workflow
 
 **Repository hygiene requirements for the new `riviere-workflow` package:**
 
-- **Folder structure** follows the monorepo convention for library packages (`src/features/*`, `src/platform/*`, `src/index.ts`) per ADR-002 and the `separation-of-concerns` skill. No `src/shell/*` is expected unless the package later grows true app-wiring concerns.
-- **Dependency-cruiser rules** copied and adapted from existing packages so no cross-feature imports, no domain-to-upward dependencies, and `entrypoint` restrictions are enforced from day one. Added to the repo's root `dependency-cruiser.mjs`.
+- **Folder structure** follows the monorepo convention for library packages (`src/features/*`, `src/platform/*`, `src/index.ts`) per ADR-002 and `.riviere/role-enforcement.config.ts`. No `src/shell/*` is expected unless the package later grows true app-wiring concerns.
+- **Location and dependency rules** added to `.riviere/role-enforcement.config.ts` so feature isolation, domain and infrastructure boundaries, adapter restrictions, folder structure, and circular-import checks apply from day one.
 - **Role enforcement:** `riviere-workflow` is enforced per `.riviere/role-enforcement.config.ts`. Every exported declaration in the package receives a `/** @riviere-role <role-name> */` tag. Roles for the new package (e.g. `workflow-runtime`, `step-handler`, `step-registry`) are added to `.riviere/roles.ts` in the same PR that introduces the package.
 - **Coverage:** 100% test coverage mandatory per the root `CLAUDE.md` testing convention.
-- **Cross-package imports:** uses `@living-architecture/riviere-builder`, `@living-architecture/riviere-extract-config`, `@living-architecture/riviere-extract-ts`, `@living-architecture/riviere-schema`, `@living-architecture/riviere-query` via workspace references; never relative paths across package boundaries.
+- **Cross-package imports:** uses `@living-architecture/riviere-builder-domain-model`, `@living-architecture/riviere-extract-config-published-language`, `@living-architecture/riviere-extract-ts-domain-model`, and `@living-architecture/riviere-schema-published-language` via workspace references; never relative paths across package boundaries.
 
 ### 3.7.1 Milestones
 
@@ -1642,7 +1642,7 @@ Phase 13 is intentionally narrow. The exclusions below centralize the scope boun
 | 9   | `riviere workflow init` produces valid workflow YAML and step configs                                                                                                                                                                                                                                                                                                                                                                                                                               | Init creates files, `workflow validate` passes, `workflow run` succeeds                                                                                                                                                                                                                                                                                                             |
 | 10  | `riviere workflow validate` catches invalid workflow files, missing config references, incompatible step-declared domains/sources, invalid step configs, and unresolved runtime prerequisites from `requiredServices()` (notably: the AI CLI executable not being in `PATH`); `workflow run` skips AI file-existence checks, AI config validation, and AI prerequisite checks for `--skip-ai`, and skips AI prerequisite checks for `--dry-run` steps that will not invoke a CLI                    | Unit tests for structural, semantic, and runtime-prerequisite validation; explicit tests that `workflow validate` fails on a non-existent AI CLI executable while `workflow run --skip-ai` ignores AI config/prerequisite failures and `--dry-run` does not require the AI CLI executable                                                                                           |
 | 11  | Workflow JSON Schema validates workflow file structure                                                                                                                                                                                                                                                                                                                                                                                                                                              | Schema tests in `riviere-extract-config` accept documented valid examples and reject missing/invalid structural fields                                                                                                                                                                                                                                                              |
-| 12  | `riviere-workflow` exports the step contract and resolves built-in steps through a registry rather than hardcoded switch logic                                                                                                                                                                                                                                                                                                                                                                      | Unit tests for step registry + dependency-cruiser rule enforcement                                                                                                                                                                                                                                                                                                                  |
+| 12  | `riviere-workflow` exports the step contract and resolves built-in steps through a registry rather than hardcoded switch logic                                                                                                                                                                                                                                                                                                                                                                      | Unit tests for step registry plus role-enforcement location and dependency rules                                                                                                                                                                                                                                                                                                    |
 | 13a | Workflows with **only deterministic steps** (no `ai-extract`, no `ai-enrich`) are bit-for-bit idempotent: running twice produces identical output JSON (after canonical-serialisation normalisation)                                                                                                                                                                                                                                                                                                | E2E test in CI: demo workflow with AI steps disabled, run twice, assert byte-equal output JSON. Mandatory gate.                                                                                                                                                                                                                                                                     |
 | 13b | Workflows with AI steps are idempotent **only under pinned-runtime conditions** (pinned model/version, deterministic inference controls, replayable prompt inputs). Phase 13 does not ship pinned-runtime tooling; this criterion is explicitly deferred                                                                                                                                                                                                                                            | Documented as not-in-scope; no CI gate. A manual verification procedure is published so teams with pinned runtimes can self-verify.                                                                                                                                                                                                                                                 |
 | 14  | AI step configs validate structured `command`/`args`, optional `memory` / `prompt-append`, and bounded enum-based selection and field lists rather than free-form strings                                                                                                                                                                                                                                                                                                                           | Schema validation tests in `riviere-extract-config`                                                                                                                                                                                                                                                                                                                                 |
@@ -1676,7 +1676,7 @@ Phase 13 is intentionally narrow. The exclusions below centralize the scope boun
 | 42  | Per-step transition fixtures in the demo-app repo are generated via the documented capture procedure (§3.8.3 fixture generation) by serialising `builder.query()` reads after each step — fixtures are never hand-edited                                                                                                                                                                                                                                                                            | Demo-app repo includes the capture-hook tooling and a CI check that regenerating fixtures against a known-good run produces identical files                                                                                                                                                                                                                                         |
 | 43  | Workflow `output` is required (no default); missing or empty `output` fails structural validation                                                                                                                                                                                                                                                                                                                                                                                                   | Schema tests: workflow without `output` fails; `output: ""` fails; any non-empty string passes                                                                                                                                                                                                                                                                                      |
 | 44  | `ai-extract` source-scope overflow (files > `max-files-per-batch * max-batches`) fails the step with the documented error — silent truncation is disallowed                                                                                                                                                                                                                                                                                                                                         | Integration test seeds a source tree with enough files to exceed the bound and asserts the step fails with the documented message                                                                                                                                                                                                                                                   |
-| 45  | `riviere-workflow` package follows monorepo repository hygiene: separation-of-concerns folder structure, dependency-cruiser rules added to the root config, role-enforcement tags on every export, 100% test coverage, workspace-reference imports only, and explicit adapter isolation so only `platform/infra/external-clients` may import `@eventcatalog/sdk`, `@asyncapi/parser`, or Node `child_process`                                                                                       | Lint + dependency-cruiser + coverage gates green on CI, including rules that forbid vendor SDK/parser/process imports outside the adapter layer                                                                                                                                                                                                                                     |
+| 45  | The workflow packages follow monorepo repository hygiene: ADR-002 folder structure and dependency rules added to role enforcement, role tags on every export, 100% test coverage, workspace-reference imports only, and explicit adapter isolation so only `infra/external-clients` may import `@eventcatalog/sdk`, `@asyncapi/parser`, or Node `child_process`                                                                                                                      | Role enforcement, lint, and coverage gates green on CI, including location rules that forbid vendor SDK/parser/process imports outside generic external clients                                                                                                                                                                                                                     |
 | 46  | Architecture docs are updated for the workflow runtime boundary: `docs/architecture/overview.md` shows `riviere-workflow` in the package/dependency view, and a new ADR captures the registry runtime + shared-builder boundary                                                                                                                                                                                                                                                                     | Doc diff assertions confirm `overview.md` includes `riviere-workflow`, and a new ADR file is added describing the runtime boundary and builder ownership                                                                                                                                                                                                                            |
 | 47  | Workflow/importer terminology and dependency docs are updated: the glossary includes workflow terms, and architecture docs mention `@eventcatalog/sdk` and `@asyncapi/parser`                                                                                                                                                                                                                                                                                                                       | Grep/doc assertions confirm glossary entries for `Workflow`, `Step Config`, `Mappings File`, and `Canonical Identity`, and confirm architecture docs mention both importer dependencies                                                                                                                                                                                             |
 | 48  | Operator-facing docs capture the AI CLI shell-out boundary and deferred AI idempotency expectations without implying an SDK/auth surface in Riviere                                                                                                                                                                                                                                                                                                                                                 | Grep/doc assertions confirm docs state `command` + `args`, `child_process.spawn`, no AI SDK/auth handling in Riviere, and manual-only AI idempotency guidance                                                                                                                                                                                                                       |
@@ -1741,8 +1741,8 @@ The runtime can load a workflow, validate the active plan, and execute sequentia
   - Verification: doc diff assertions confirm the updated package diagram, presence of the ADR file, and the required glossary entries.
 - **D1.5:** Workflow schema and package foundations are strict by default
   - Key scenarios: workflow schema enforces `apiVersion`, required `output`, unique/patterned step names, and empty-string rejection; file-relative path resolution is reusable across built-in steps; `riviere-workflow` obeys repo hygiene rules.
-  - Acceptance criteria: schema tests cover structural validation rules; resolver tests prove file-relative path behaviour; dependency-cruiser, role-enforcement, coverage, and workspace-import gates apply to the new package; vendor SDK/parser/process imports are confined to `platform/infra/external-clients`.
-  - Verification: schema test suite, resolver unit tests, and CI lint/dependency-cruiser/coverage assertions, including import-boundary rules for the adapter layer.
+  - Acceptance criteria: schema tests cover structural validation rules; resolver tests prove file-relative path behaviour; role-enforcement, coverage, and workspace-import gates apply to the new packages; vendor SDK/parser/process imports are confined to `infra/external-clients`.
+  - Verification: schema test suite, resolver unit tests, and CI role-enforcement/lint/coverage assertions, including import-boundary rules for the adapter layer.
 
 ### M2: Deterministic spec and validation steps work end-to-end
 
@@ -1996,16 +1996,16 @@ src/
 
 **Import-boundary rules:**
 
-- Only `platform/infra/external-clients/ai-cli-runner` may import Node `child_process`.
-- Only `platform/infra/external-clients/eventcatalog-sdk-client` may import `@eventcatalog/sdk`.
-- Only `platform/infra/external-clients/asyncapi-parser-client` may import `@asyncapi/parser`.
+- Only `infra/external-clients/ai-cli-runner` may import Node `child_process`.
+- Only `infra/external-clients/eventcatalog-sdk-client` may import `@eventcatalog/sdk`.
+- Only `infra/external-clients/asyncapi-parser-client` may import `@asyncapi/parser`.
 - Step handlers, registry/runtime code, and CLI entrypoints depend on workflow-owned interfaces/adapters, not on vendor SDK/parser/process APIs directly.
 
 **Architecture alignment with existing docs:**
 
 - Aligns with `docs/architecture/overview.md` by keeping extraction, builder, schema, and query responsibilities separate and composable.
 - Aligns with ADR-001 by preserving extraction metadata logic in the extraction pipeline rather than moving extraction semantics into workflow glue.
-- Aligns with ADR-002 by requiring `riviere-workflow` to follow the feature/platform/shell package structure and dependency-cruiser enforcement from day one.
+- Aligns with ADR-002 by requiring `riviere-workflow` to follow the feature/platform/shell package structure and role-enforcement location rules from day one.
 
 **New dependencies and boundaries:**
 
diff --git a/docs/project/PRD/archived/PRD-phase-12-connection-detection.md b/docs/project/PRD/archived/PRD-phase-12-connection-detection.md
index 344aae7d1..7d18e346c 100644
--- a/docs/project/PRD/archived/PRD-phase-12-connection-detection.md
+++ b/docs/project/PRD/archived/PRD-phase-12-connection-detection.md
@@ -801,7 +801,7 @@ None. Connection detection uses ts-morph (already a dependency of `riviere-extra
 
 **9.1.1 No new packages — all changes modify existing packages** (Firm)
 
-Connection detection uses the same ts-morph `Project`, same source files, same AST as component extraction. Same state dependencies → same module (separation-of-concerns principle 4).
+Connection detection uses the same ts-morph `Project`, same source files, same AST as component extraction. The same state dependencies belong in the same module.
 
 | Package                       | Change                                                                               |
 | ----------------------------- | ------------------------------------------------------------------------------------ |
diff --git a/docs/project/PRD/notstarted/PRD-phase-14-cross-repo-linking.md b/docs/project/PRD/notstarted/PRD-phase-14-cross-repo-linking.md
index 0db52c3fd..e569f75d6 100644
--- a/docs/project/PRD/notstarted/PRD-phase-14-cross-repo-linking.md
+++ b/docs/project/PRD/notstarted/PRD-phase-14-cross-repo-linking.md
@@ -42,7 +42,7 @@ builder.linkExternal({
 ### Merge Algorithm
 
 ```typescript
-import { mergeGraphs } from '@living-architecture/riviere-builder';
+import { mergeGraphs } from '@living-architecture/riviere-builder-domain-model';
 
 const merged = mergeGraphs([
   ordersGraph,
diff --git a/docs/project/PRD/notstarted/prd-role-enforcement.md b/docs/project/PRD/notstarted/prd-role-enforcement.md
deleted file mode 100644
index 4056f3e12..000000000
--- a/docs/project/PRD/notstarted/prd-role-enforcement.md
+++ /dev/null
@@ -1,387 +0,0 @@
-# PRD: Architecture Role Enforcement
-
-Keeping a codebase well organized is important for navigating the code and helping to keep the code well designed and maintainable. However, this is rarely the case because responsibilities get mixed and code gets added in different folders randomly.
-
-To solve this problem we are going to create software-role-dsl. The DSL defines a list of roles. Each class in code, or static function that is not part of a class, must have a role. And the role defines where the code should live.
-
-For example:
-
-1. `domain-service` => must live in /src/{feature}/domain/
-2. `cli-entrypiont` => must live in /src/{feature}/entrypoint/
-
-Roles should be added as decorators like:
-
-```ts
-@RiviereRole(RIVIERE_ROLE.AGGREGATE)
-class Loan {
-   ...
-}
-```
-
-Configuration should be as simple and minimal as possible:
-
-```json
-{
-  roles: [
-    aggregate: {
-      allowedLocations: ['/src/{feature}/domain']
-    }
-    ...
-  ]
-}
-```
-
-## Objectives
-
-1. Build a system that allows roles to be configured and enforced
-2. Tool should enforce 100% codebase compliance (every class or static method outside a class must have a role decorator)
-3. Start by applying to the riviere codebase itself => 100% coverage (except schema packages)
-4. In riviere our roles should be generic and reusable across codebases => roles like Aggregate are common industry terms and patterns so can be used. We should not have roles specific to our domain like 'connection-extractor'
-5. Create specialist subagents that can be used to apply the rules to a given piece of code and correctly determine the role(s) of the code. It should suggest refactorings where needed, for example "this code combines domain-specific and generic logic, it should be decoupled into multiple roles and each one should be located in the relevant folder"
-
-### Implementation requirements
-
-1. Speed is crucial. Let's try oxlint => we need to include performance diagnostics
-2. When there is an error the error should provide a clear diagnostic "{role} cannot live in {location}. See {config file for allowed roles}"
-3. The config file should have a json schema and be validated before being parsed.
-4. The riviere codebase may require refactoring and our architecture rules may need to evolve
-5. new package in riviere riviere-role-enforcement => must follow all of our existing lint rules and 100% coverage
-
-## Plan
-
-We must work in small iterations. Initial we need to do discovery:
-
-1. What is our config format?
-2. Do a very small POC based on some of our real code
-3. Define our roles and rules - review code together to define rules and build our expert subagent that we can rly on later. Every new role added must be approved by a human user.
-4. Go through the riviere codebase in iterations (one package at a time) and identify roles and required refactoring.
-
-Each iteration should be a separate PR and we want PRs to be as small as possible.
-
-## Phase 1 Plan
-
-Goal: complete the discovery and proof-of-concept iteration without inventing unapproved roles or baking Riviere-specific paths into the role model.
-
-### Scope
-
-Phase 1 applies only to one pilot slice:
-
-- `packages/riviere-cli/src/features/extract/**/*.ts`
-
-Phase 1 excludes:
-
-- `**/*.spec.ts`
-- `**/__fixtures__/**`
-- `.tsx` files
-- schema packages
-- repository-wide rollout
-- decorators
-- classifier subagents
-
-### Phase 1 Outputs
-
-Phase 1 must produce all of the following:
-
-1. A minimal `riviere-role-enforcement` package using `oxlint`
-2. A minimal config format plus JSON schema validation
-3. A proof-of-concept check over one real feature slice
-4. A complete file-by-file role analysis for the pilot slice
-5. A human-reviewed role catalog for the pilot slice before any enforcement is treated as final
-
-### Discovery Requirement
-
-Phase 1 is not allowed to invent a role list and silently proceed. The role catalog for the pilot slice must come from analysis and human review.
-
-Rules:
-
-1. Every new role must be approved by a human user
-2. Roles must be generic and reusable across codebases
-3. Roles must describe responsibility, not just folder placement
-4. The pilot analysis must reach 100% coverage for the selected feature slice
-5. If a file mixes responsibilities, the output should say so and recommend refactoring rather than forcing a weak role
-
-### Candidate Roles For Phase 1 Review
-
-Currently approved role names from review:
-
-- `cli-entrypoint`
-- `command-use-case`
-- `command-use-case-input`
-- `command-use-case-result`
-- `external-client-service`
-- `cli-output-formatter`
-
-All other Phase 1 roles still require human naming approval.
-
-Important constraints for those names:
-
-- role names must be generic and reusable across codebases
-- role names must not include Rivière-specific language
-- role names must not include pilot-feature language from the current codebase
-- role names must not include words taken from the current problem domain or current feature implementation
-- role names must describe responsibility rather than just folder placement
-
-Examples of rejected naming patterns:
-
-- names derived from the current feature, such as `extraction-*`, `enrichment-*`, or `relationship-*`
-- names derived from current package structure rather than responsibility
-- names that only restate a folder name
-
-### File Groups Requiring Human Role Naming
-
-The following responsibility groups need approved generic role names before implementation:
-
-- `packages/riviere-cli/src/features/extract/commands/run-extraction.ts`
-  - approved role: `command-use-case`
-  - current responsibility: command-side workflow coordination
-  - review notes:
-    - command must take exactly one parameter
-    - that parameter should be named `runExtractionInput`
-    - that parameter type must have role `command-use-case-input`
-    - the `command-use-case-input` type must live in the `commands` folder
-    - command use case should follow `load -> invoke operation -> save/return`
-    - current implementation does too much and mixes orchestration, decision-making, and domain concerns
-    - `createModuleContexts(...)` is currently under `infra/external-clients` but appears domain-specific and should be reviewed
-    - choosing between `extractDraftComponents(...)` and `loadDraftComponentsFromFile(...)` mixes loading concerns with domain invocation
-    - `resolvedConfig` already being passed in suggests part of the loading step happens outside the command use case
-    - `enrichPerModule(...)` plus post-checking `failedFields` in the command indicates an anemic domain model and likely missing domain behavior
-
-- `packages/riviere-cli/src/features/extract/commands/run-extraction-input.ts`
-  - approved role: `command-use-case-input`
-  - planned responsibility: the single input contract for `runExtraction`
-
-- `packages/riviere-cli/src/features/extract/commands/run-extraction-result.ts`
-  - approved role: `command-use-case-result`
-  - planned responsibility: the only return contract for `runExtraction`
-
-### Approved Refactorings Identified During Role Review
-
-- `runExtraction` must be refactored to accept a single `runExtractionInput` parameter
-- `runExtractionInput` must be introduced in the `commands` folder and classified as `command-use-case-input`
-- `runExtraction` must return only a `command-use-case-result`
-- `runExtractionResult` must be introduced in the `commands` folder and classified as `command-use-case-result`
-- the CLI options object must not be passed into the command use case directly
-- the entrypoint must translate CLI options into `runExtractionInput` before invoking the command use case
-
-### Detailed Review Notes From `runExtraction`
-
-- loading existing values and extracting new values are not interchangeable operations
-- `loadDraftComponentsFromFile(...)` is reloading existing state
-- `extractDraftComponents(...)` is a domain operation and must not be treated as equivalent to loading existing state
-- grouping those two branches together only because they both produce `DraftComponent[]` is a design error
-- the likely missing concept is an `Extraction` aggregate that owns the current working state for this workflow
-- refined direction: the aggregate may be better modeled as `ExtractionProject`, since the current workflow already centers on a project-shaped unit of work
-- an `aggregate-repository` may be needed to load that aggregate
-- an `aggregate-repository` must return an aggregate
-- therefore an `aggregate-repository` cannot return `ModuleContext` unless `ModuleContext` is itself proven to be an aggregate
-- if a candidate repository return type is not an aggregate, that is a design signal that the real aggregate has not yet been identified
-- in that situation, the model must be recomposed until the aggregate boundary is explicit
-- `DraftComponent[]` is not the aggregate; it is only part of the aggregate state
-- `loadDraftComponentsFromFile(...)` is therefore only a partial state loader, not a valid aggregate repository on its own
-- partial state loaders may exist as internal implementation details, but they must sit behind an aggregate repository that assembles the full aggregate
-- the aggregate repository should load the remaining state and combine all parts into the aggregate before returning it
-- repository loading should happen in the use case, not in the entrypoint
-- entrypoints must not depend on repositories or datastores
-- only `command-use-case` and `query-use-case` may load or save through repositories/datastores
-- repositories may depend on lower-level technical helpers to access filesystem, parser state, or other tooling
-- those technical helpers are not themselves repositories; they are implementation details behind the repository boundary
-- if domain state requires multiple partial loaders, the repository is responsible for coordinating them and returning the assembled aggregate
-- `createModuleContexts(...)` currently mixes repository-style assembly with lower-level technical helper calls and should be split accordingly
-- `loadExtractionProject(...)` is currently misnamed because it returns `ts-morph`'s `Project`, not the aggregate
-- if `ExtractionProject` is the aggregate, then `loadExtractionProject(...)` should evolve into the aggregate repository and return `ExtractionProject`
-- `createModuleContexts(...)` should then be absorbed into the aggregate repository as internal assembly logic rather than surviving as a public boundary
-- repositories may take external library clients as dependencies when needed for loading and saving
-- if an external dependency is injected directly into the repository, it does not necessarily need a local wrapper role in our codebase
-- external-client-service wrappers are still valid when we want an explicit boundary, but they are not mandatory for every external library call
-- `ModuleContext[]` is not an aggregate; at best it appears to be part of the aggregate state and currently has unclear ownership
-- `createModuleContexts(...)` is therefore suspiciously split across layers: it may be building part of an aggregate while living in infrastructure
-- `detectConnectionsPerModule(...)` exposes an implementation detail in the API; the domain concept should be connection detection on the aggregate rather than `per-module` plumbing
-- once the aggregate is identified, behavior may belong either on the aggregate itself or on a `domain-service` operating on that aggregate
-- current direction: start by modeling enrichment behavior as a method on the aggregate rather than as a free function over decomposed state
-- current direction: `extractDraftComponents(...)` should also start as a method on the aggregate, likely `ExtractionProject.extractDraftComponents(...)`, rather than as a free function over decomposed state
-- `ModuleContext` remains a warning sign and should not remain as an unowned bag of state passed between layers
-- `extractDraftComponents(...)` currently looks like procedural plumbing around lower-level extraction behavior rather than a well-shaped boundary
-- current direction: the aggregate should expose two public operations in sequence: `extractDraftComponents(...)` as the first step, then `enrichComponents(...)` as the second step
-- lower-level deterministic extraction logic such as `extractComponents(...)` can remain beneath the aggregate boundary as internal domain logic or a domain service
-- current direction: the current `runExtraction` flow likely hides two distinct command use cases rather than one
-- entrypoints must not compose multiple use cases; if composition is needed, that is a design warning sign that the boundary is wrong
-- likely split:
-  - `extract-draft-components` as one `command-use-case`
-  - `enrich-draft-components` as a second `command-use-case`
-- based on the current code, `detect-connections` is not yet a standalone `command-use-case`
-- current code requires enrichment output before connection detection can run
-- therefore connection detection currently belongs inside the second use case rather than as a third independently invokable use case
-- each command use case may load the aggregate through a different repository method
-- accepted CLI compromise for now: keep a single `extract` CLI command for user ergonomics
-- the `extract` entrypoint may choose which single `command-use-case` to invoke based on validated flags
-- this is an intentional UX trade-off rather than the ideal architectural shape
-- even with one CLI command, each invocation should still dispatch to exactly one `command-use-case`
-- likely repository-level distinction:
-  - load from source/project state for fresh draft extraction
-  - load from persisted draft state for enrichment/resume flows
-- this better preserves the difference between computing draft state and reloading existing draft state
-
-### Role Enforcement Rules Confirmed During Review
-
-- `command-use-case` may accept only one parameter
-- that parameter must have role `command-use-case-input`
-- `command-use-case-input` must live in `/commands`
-- `command-use-case` may return only `command-use-case-result`
-- `command-use-case-result` must live in `/commands`
-- the role-enforcement rule must support `allowedInputs` and `allowedOutputs`
-- initial command rule configuration should enforce:
-  - `allowedInputs: ["command-use-case-input"]`
-  - `allowedOutputs: ["command-use-case-result"]`
-
-### External Client Rules Confirmed During Review
-
-- approved role: `external-client-service`
-- generic location rule: `/infra/external-clients/{external-service-name}/{service}.ts`
-- alternative acceptable structure: `/infra/external-clients/{external-service-name}/{service-name}.ts`
-- for the current code, ts-morph-related technical helpers should be grouped under a `ts-morph` external service boundary
-- current likely candidates for this role:
-  - `findModuleTsConfigDir(...)`
-  - `createConfiguredProject(...)`
-  - `loadExtractionProject(...)`
-- these helpers should not be treated as repositories; they are technical services used behind a repository boundary
-
-### CLI Output Rules Confirmed During Review
-
-- approved role: `cli-output-formatter`
-- generic location rule: `/infra/cli/output/{formatter}.ts`
-- presenters in the CLI should use this role instead of a generic presenter role
-- current likely candidate for this role:
-  - `packages/riviere-cli/src/features/extract/infra/mappers/present-extraction-result.ts`
-- current refactoring notes:
-  - it should move out of `infra/mappers`
-  - it should live under the CLI output boundary
-  - it should not depend on the raw CLI options object
-  - it should format `command-use-case-result`, not a domain result type
-
-- `packages/riviere-cli/src/features/extract/domain/extract-draft-components.ts`
-  - responsibility: performs the first core transformation from analysis context to draft artifacts
-
-- `packages/riviere-cli/src/features/extract/domain/enrich-per-module.ts`
-  - responsibility: reconciles and upgrades intermediate artifacts while enforcing consistency
-
-- `packages/riviere-cli/src/features/extract/domain/detect-connections-per-module.ts`
-  - responsibility: infers relationships between already identified artifacts
-
-- `packages/riviere-cli/src/features/extract/domain/extraction-result.ts`
-  - responsibility: defines the stable result type returned by the feature workflow
-
-- `packages/riviere-cli/src/features/extract/infra/external-clients/create-module-contexts.ts`
-- `packages/riviere-cli/src/features/extract/infra/external-clients/load-extraction-project.ts`
-- `packages/riviere-cli/src/features/extract/infra/external-clients/create-configured-project.ts`
-- `packages/riviere-cli/src/features/extract/infra/external-clients/find-module-tsconfig-dir.ts`
-  - responsibility: wrap technical integration with filesystem, tsconfig discovery, globbing, and static analysis tooling
-
-- `packages/riviere-cli/src/features/extract/infra/mappers/present-extraction-result.ts`
-  - responsibility: translate workflow results into user-facing output
-
-### Current Pilot Coverage State
-
-The pilot slice is fully enumerated. `command-use-case` is approved for `run-extraction.ts`. The remaining role names still require human approval.
-
-### Annotation Format For The POC
-
-For Phase 1 we use explicit comment annotations, not decorators:
-
-```ts
-/** @riviere-role <approved-role-name> */
-export function example() {
-  ...
-}
-```
-
-Supported in Phase 1:
-
-- top-level class declarations
-- top-level function declarations
-- top-level exported function expressions assigned to variables
-- static methods on top-level classes
-
-Not supported in Phase 1:
-
-- nested functions
-- non-exported internal callbacks
-- `.tsx` files
-- automatic fixes
-
-### Generic Config Shape
-
-The config format must stay minimal and generic.
-
-```yaml
-include:
-  - <pilot include patterns>
-
-ignorePatterns:
-  - '**/*.spec.ts'
-  - '**/__fixtures__/**'
-
-roles:
-  - name: <approved-role-name>
-    targets: [class, function, static-method]
-    allowedLocation:
-      - /src/{feature}/...
-```
-
-Important:
-
-- `allowedLocation` entries must be generic patterns
-- generic patterns may use placeholders such as `/src/{feature}/...`
-- the Rivière pilot may map those placeholders onto real paths, but the role definitions themselves must remain reusable
-
-### Phase 1 Pilot Workflow
-
-1. Analyze every non-test `.ts` file in `packages/riviere-cli/src/features/extract`
-2. Produce a file-by-file classification table with proposed generic roles and rationale
-3. Identify mixed-responsibility files and required refactors
-4. Review and approve the role set with a human
-5. Configure the POC with only approved roles
-6. Annotate the pilot slice
-7. Run `oxlint` and verify 100% compliance for the pilot slice
-
-### Enforcement Rules For The POC
-
-Once the pilot role catalog is approved, the POC enforces only these checks:
-
-1. Every supported in-scope symbol must have exactly one `@riviere-role` annotation
-2. The assigned role must exist in config
-3. The assigned role must allow the symbol kind
-4. The assigned role must allow the file location
-
-Required diagnostic shape:
-
-- `{role} cannot live in {location}. See {config file}`
-
-Additional diagnostics may include:
-
-- missing role assignment
-- unknown role
-- malformed annotation
-- duplicate annotation
-
-### Testing
-
-Phase 1 must include:
-
-- config validation tests
-- annotation parsing tests
-- target extraction tests
-- role checking tests
-- one integration test that runs the package entrypoint against fixture files
-- performance diagnostics for the oxlint-based check
-
-### Success Criteria
-
-Phase 1 is complete when:
-
-1. `packages/riviere-role-enforcement` exists and is testable
-2. the config file has schema validation
-3. `oxlint` runs the custom enforcement rule successfully
-4. the selected pilot slice has a reviewed file-by-file role analysis
-5. the selected pilot slice reaches 100% compliance using only human-approved roles
-6. diagnostics are clear enough for humans and AI tools to act on
-7. the change remains a small, focused first PR
diff --git a/docs/project/PRD/riviere-extraction-workflows-v1/ARCH.md b/docs/project/PRD/riviere-extraction-workflows-v1/ARCH.md
index 39e3701a5..b4bed1960 100644
--- a/docs/project/PRD/riviere-extraction-workflows-v1/ARCH.md
+++ b/docs/project/PRD/riviere-extraction-workflows-v1/ARCH.md
@@ -26,7 +26,7 @@ The workflow must not simply wrap or chain existing CLI commands. Existing build
 
 The workflow feature should instead orchestrate workflow execution in memory and write the final graph only after all stages succeed. Existing lower-level Rivière capabilities such as deterministic extraction, graph building, linking, validation, and graph serialisation remain owned by their existing packages and command/use-case layers.
 
-Concrete aggregate ownership: `RiviereProject` lives at `packages/riviere-extract-ts/src/features/extraction/domain/riviere-project.ts`, and `RiviereProjectRepository` lives at `packages/riviere-extract-ts/src/features/extraction/infra/persistence/riviere-project-repository.ts`.
+Concrete aggregate ownership: `RiviereProject` lives at `packages/riviere-extract-ts/src/domain/riviere-project.ts`, and the single repository shared by the CLI's extract and workflow features lives at `packages/riviere-cli/src/data-access/riviere-project/riviere-project-repository.ts`.
 
 Important product boundary: workflows must not provide Rivière capabilities that the CLI does not provide. The CLI must not become “a watered down version of the full product.” Workflow execution may compose capabilities differently to protect all-or-nothing execution, but the underlying product capabilities should remain available through CLI surfaces rather than being hidden only inside workflow execution.
 
@@ -35,7 +35,7 @@ Rejected ownership options:
 - A workflow wrapper around existing CLI commands was rejected because it would require graph state to be saved and reloaded between stages and would create cleanup complexity.
 - A new `packages/riviere-workflow` package was not selected for V1 because it adds package and API surface area before the first workflow slice is proven. It remains a possible future evolution if workflows need to be consumed outside the CLI.
 - `packages/riviere-builder` was rejected as the top-level workflow owner because workflow concerns include project-local workflow files, extraction config resolution, run logs, CLI progress, and future stage orchestration beyond pure graph building.
-- `packages/riviere-extract-ts` was rejected as the top-level workflow feature owner because workflows include CLI workflow files, graph writing, run logs, and future non-deterministic AI-assisted stages. This does not move `RiviereProject` or `RiviereProjectRepository` out of the extraction package.
+- `packages/riviere-extract-ts` was rejected as the top-level workflow feature owner because workflows include CLI workflow files, graph writing, run logs, and future non-deterministic AI-assisted stages. `RiviereProject` remains in that domain-model package; the CLI application's single repository for the aggregate lives in package-level `data-access/`, where both CLI features can use it.
 
 Future evolution notes:
 
@@ -120,7 +120,7 @@ Option 1 is the accepted architecture direction. The approved reason is that the
 
 ##### Core idea
 
-Introduce `RiviereProject` as the main aggregate for a Rivière project rooted in a repository. It lives at `packages/riviere-extract-ts/src/features/extraction/domain/riviere-project.ts`. `RiviereProjectRepository` lives at `packages/riviere-extract-ts/src/features/extraction/infra/persistence/riviere-project-repository.ts`. In this option, `ExtractionProject` is explicitly retired as an aggregate. Its current config/materialisation state and extraction behaviours move out of `riviere-cli` into the extraction domain package (`packages/riviere-extract-ts`). Workflow consumes that package-level extraction capability; it does not import `riviere-cli`'s `features/extract` and it does not own extraction.
+Introduce `RiviereProject` as the main aggregate for a Rivière project rooted in a repository. It lives at `packages/riviere-extract-ts/src/domain/riviere-project.ts`. `RiviereProjectRepository` lives at `packages/riviere-cli/src/data-access/riviere-project/riviere-project-repository.ts`, where both CLI features can use the same aggregate repository without importing from one another. In this option, `ExtractionProject` is explicitly retired as an aggregate. Its extraction behaviour moves out of `riviere-cli` into the extraction domain package (`packages/riviere-extract-ts`), while the CLI package retains responsibility for loading that aggregate. Workflow consumes the package-level extraction domain capability; it does not import `riviere-cli`'s `features/extract` and it does not own extraction.
 
 The workflow file is one input used by `RiviereProjectRepository` to build project state for a selected workflow run. The project is identified by `projectRoot`; the workflow is selected by `workflowName` inside that project. Inline extract and link config paths in the user-facing workflow file are resolved during project loading into explicit executable stage state, not opaque configured steps and not nested aggregates.
 
@@ -128,9 +128,9 @@ The workflow file is one input used by `RiviereProjectRepository` to build proje
 
 The current `ExtractionProject` abstraction is challenged directly and resolved in this option: it must not remain an aggregate. Keeping it as an aggregate is Option 2, not an unresolved choice inside this option.
 
-This is also the target architecture for the existing extract feature. Current extract commands are rewired directly from `ExtractionProjectRepository`/`ExtractionProject` to `RiviereProjectRepository`/`RiviereProject` plus package-owned extraction domain services in `@living-architecture/riviere-extract-ts`. The CLI package remains responsible for CLI input, output, command use cases, workflow loading, and shell wiring; it does not own core extraction domain logic. If the team wants to keep the current extract command wiring while adding workflows, that is not Option 1; it is a different option with explicit architecture debt.
+This is also the target architecture for the existing extract feature. Current extract commands are rewired directly from `ExtractionProjectRepository`/`ExtractionProject` to `RiviereProjectRepository`/`RiviereProject` plus package-owned extraction domain services in `@living-architecture/riviere-extract-ts-domain-model`. The CLI package remains responsible for CLI input, output, command use cases, workflow loading, and shell wiring; it does not own core extraction domain logic. If the team wants to keep the current extract command wiring while adding workflows, that is not Option 1; it is a different option with explicit architecture debt.
 
-Non-CLI use note: this option makes the extraction project aggregate reusable outside the CLI because `RiviereProject` and `RiviereProjectRepository` live in `packages/riviere-extract-ts`. It does not, by itself, make the V1 workflow CLI surface reusable outside the CLI; command input, output, run-log writing, graph-file writing, and shell wiring remain under `packages/riviere-cli/src/features/workflow`.
+Non-CLI use note: `RiviereProject` is reusable outside the CLI because it lives in `packages/riviere-extract-ts`. `RiviereProjectRepository` is the CLI application's repository and is shared by its extract and workflow features. Another application using the aggregate supplies its own repository. This option does not make the V1 workflow CLI surface reusable outside the CLI; command input, output, run-log writing, graph-file writing, and shell wiring remain under `packages/riviere-cli/src/features/workflow`.
 
 Workflow definitions use this V1 location and shape:
 
@@ -208,7 +208,7 @@ flowchart LR
   entrypoint["createWorkflowRunCommand<br/>(entrypoint)"]
   inputFactory["createRunWorkflowInput<br/>(commands)"]
   useCase["RunWorkflow<br/>(commands)"]
-  repository["RiviereProjectRepository<br/>(riviere-extract-ts infra/persistence)"]
+  repository["RiviereProjectRepository<br/>(riviere-cli package data-access)"]
   extractionStage["ExtractionStage<br/>(riviere-extract-ts domain)"]
   extractComponents["ExtractComponentsForGraph<br/>(riviere-extract-ts domain)"]
   detectConnections["DetectExtractionConnections<br/>(riviere-extract-ts domain)"]
@@ -256,17 +256,17 @@ Legend: gray = existing, yellow = changed, green = new, blue = explicit role/con
 
 | Component                     | Layer / path                                                                                             | Status                                                                 | .riviere role                     | Responsibilities                                                                                                                                                                                                                                                                                                                                             | Estimated size |
 | ----------------------------- | -------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- | --------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------------- |
-| `createWorkflowRunCommand`    | `packages/riviere-cli/src/features/workflow/entrypoint/run-workflow.ts`                                  | New                                                                    | `cli-entrypoint`                  | Define the workflow CLI command, call input factory, use case, and formatter.                                                                                                                                                                                                                                                                                | Small          |
+| `createWorkflowRunCommand`    | `packages/riviere-cli/src/features/workflow/entrypoint/run-workflow/entrypoint.ts`                       | New                                                                    | `cli-entrypoint`                  | Define the workflow CLI command, call input factory, use case, and formatter.                                                                                                                                                                                                                                                                                | Small          |
 | `createRunWorkflowInput`      | `packages/riviere-cli/src/features/workflow/commands/create-run-workflow-input.ts`                       | New                                                                    | `command-input-factory`           | Convert a CLI-neutral parsed-options shape into typed workflow input without reading files. Must not depend on Commander/raw CLI option types directly.                                                                                                                                                                                                      | Small          |
 | `RunWorkflow`                 | `packages/riviere-cli/src/features/workflow/commands/run-workflow.ts`                                    | New                                                                    | `command-use-case`                | Load `RiviereProject` for `{ projectRoot, workflowName }`, call `rebuildGraph()`, return result. No stage loop, no builder construction, no graph/log file writing.                                                                                                                                                                                            | Small          |
 | `RunWorkflowInput`            | `packages/riviere-cli/src/features/workflow/commands/run-workflow-input.ts`                              | New                                                                    | `command-use-case-input`          | Project root, workflow name, and CLI output options.                                                                                                                                                                                                                                                                                                         | Small          |
 | `RunWorkflowResult`           | `packages/riviere-cli/src/features/workflow/commands/run-workflow-result.ts`                             | New                                                                    | `command-use-case-result`         | Graph build success/failure, graph artefact, NDJSON run log events, run log path, and failure detail.                                                                                                                                                                                                                                                        | Small          |
-| `RiviereProjectRepository`    | `packages/riviere-extract-ts/src/features/extraction/infra/persistence/riviere-project-repository.ts`    | New                                                                    | `aggregate-repository`            | Load the full `RiviereProject` aggregate state for `{ projectRoot, workflowName }` or `{ projectRoot, configPath, useTsConfig }`; read workflow/config files, resolve graph metadata where present, load extract and link config/source state, materialise `ExtractionStage` value objects for extraction and link detection, and create the aggregate. Does not run stages.                         | Large          |
-| `RiviereProject`              | `packages/riviere-extract-ts/src/features/extraction/domain/riviere-project.ts`                          | New                                                                    | `aggregate`                       | Own ordered graph-building journey, empty-start rebuild invariant, fail-fast execution, run events, graph build result, and extract-command operations that replace `ExtractionProject`. Implementation requires adding `RiviereProject` to approved aggregate instances.                                                                                  | Medium         |
-| `ExtractionProject`           | `packages/riviere-cli/src/features/extract/domain/extraction-project.ts`                                 | Removed / replaced in Option 1                                         | none in target                    | No longer the extract aggregate or command-facing extraction object. Current extract command dependencies migrate to `@living-architecture/riviere-extract-ts` stage materialisation and extraction services.                                                                                                                                                | Large          |
-| `ExtractionStage`             | `packages/riviere-extract-ts/src/features/extraction/domain/extraction-stage.ts`                         | Changed / extracted from current `ExtractionProject`                   | `value-object`                    | Hold module contexts, resolved extraction config, repository name, and source/project context for one extraction config. Shared by CLI extract commands, CLI workflows, and future non-CLI consumers through the package API.                                                                                                                                | Large          |
-| `ExtractComponentsForGraph`   | `packages/riviere-extract-ts/src/features/extraction/domain/extract-components-for-graph.ts`             | New / extracted from current `ExtractionProject`                       | `domain-service`                  | Extract draft components and enrich them into graph-ready components without connection detection. Exported from `@living-architecture/riviere-extract-ts`.                                                                                                                                                                                                  | Medium         |
-| `DetectExtractionConnections` | `packages/riviere-extract-ts/src/features/extraction/domain/detect-extraction-connections.ts`            | New / extracted from current `ExtractionProject`                       | `domain-service`                  | Detect links from the resolved link-stage config/module contexts against accumulated graph-ready components. Exported from `@living-architecture/riviere-extract-ts`.                                                                                                                                                                                                 | Medium         |
+| `RiviereProjectRepository`    | `packages/riviere-cli/src/data-access/riviere-project/riviere-project-repository.ts`                     | New                                                                    | `aggregate-repository`            | Load the full `RiviereProject` aggregate state for `{ projectRoot, workflowName }` or `{ projectRoot, configPath, useTsConfig }`; read workflow/config files, resolve graph metadata where present, load extract and link config/source state, materialise `ExtractionStage` value objects for extraction and link detection, and create the aggregate. Does not run stages.                         | Large          |
+| `RiviereProject`              | `packages/riviere-extract-ts/src/domain/riviere-project.ts`                                             | New                                                                    | `aggregate`                       | Own ordered graph-building journey, empty-start rebuild invariant, fail-fast execution, run events, graph build result, and extract-command operations that replace `ExtractionProject`. Implementation requires adding `RiviereProject` to approved aggregate instances.                                                                                  | Medium         |
+| `ExtractionProject`           | `packages/riviere-cli/src/features/extract/domain/extraction-project.ts`                                 | Removed / replaced in Option 1                                         | none in target                    | No longer the extract aggregate or command-facing extraction object. Current extract command dependencies migrate to `@living-architecture/riviere-extract-ts-domain-model` stage materialisation and extraction services.                                                                                                                                                | Large          |
+| `ExtractionStage`             | `packages/riviere-extract-ts/src/domain/extraction-stage.ts`                                            | Changed / extracted from current `ExtractionProject`                   | `value-object`                    | Hold module contexts, resolved extraction config, repository name, and source/project context for one extraction config. Shared by CLI extract commands, CLI workflows, and future non-CLI consumers through the package API.                                                                                                                                | Large          |
+| `ExtractComponentsForGraph`   | `packages/riviere-extract-ts/src/domain/extract-components-for-graph.ts`                                | New / extracted from current `ExtractionProject`                       | `domain-service`                  | Extract draft components and enrich them into graph-ready components without connection detection. Exported from `@living-architecture/riviere-extract-ts-domain-model`.                                                                                                                                                                                                  | Medium         |
+| `DetectExtractionConnections` | `packages/riviere-extract-ts/src/domain/detect-extraction-connections.ts`                               | New / extracted from current `ExtractionProject`                       | `domain-service`                  | Detect links from the resolved link-stage config/module contexts against accumulated graph-ready components. Exported from `@living-architecture/riviere-extract-ts-domain-model`.                                                                                                                                                                                                 | Medium         |
 | `ApplyExtractionToGraph`      | `packages/riviere-cli/src/features/workflow/domain/apply-extraction-to-graph.ts`                         | New                                                                    | `domain-service`                  | Apply `riviere-extract-ts` output to concrete `RiviereBuilder` write methods as part of the workflow graph rebuild domain operation. This is not a generic mapper and not builder-owned: extraction owns extraction output, builder owns graph mutation rules, workflow owns applying extracted architecture into the rebuild journey.                       | Medium         |
 | `RiviereBuilder`              | `packages/riviere-builder/src/features/building/domain/builder-facade.ts`                                | Existing                                                               | `aggregate`                       | In-memory graph write abstraction only. Knows graph rules, not workflow/config/project setup.                                                                                                                                                                                                                                                                | Existing       |
 | `presentWorkflowRunResult`    | `packages/riviere-cli/src/features/workflow/entrypoint/run-workflow/present-workflow-run-result.ts`       | New                                                                    | `cli-output-formatter` / entrypoint-local output writer role from latest main | CLI boundary output handler. Writes the NDJSON run log and, on successful rebuild, writes the graph to the chosen output path using the command result plus CLI options. The accepted location follows the latest `entrypoint/{entrypoint}` structure from `main`, not the older feature-local `infra/cli/output` pattern. | Medium         |
@@ -363,7 +363,7 @@ ExtractComponentsForGraph.execute(extractionStage, { allowIncomplete: false })
 DetectExtractionConnections.execute(extractionStage, allComponents, { allowIncomplete: false })
 ```
 
-Role decision: `ExtractionStage` lives in `packages/riviere-extract-ts/src/features/extraction/domain` because extraction capability belongs to the extraction package, not the CLI package and not workflow. It is a `value-object`: data members only, branded, no public behaviour. Carrying `ts-morph` `Project` objects is accepted in this option as materialised analysis state; if implementation proves that incompatible with the existing value-object role, the role definition must be expanded deliberately rather than moving extraction state back into CLI.
+Role decision: `ExtractionStage` lives in `packages/riviere-extract-ts/src/domain` because extraction capability belongs to the extraction domain model, not the CLI package and not workflow. It is a `value-object`: data members only, branded, no public behaviour. Carrying `ts-morph` `Project` objects is accepted in this option as materialised analysis state; if implementation proves that incompatible with the existing value-object role, the role definition must be expanded deliberately rather than moving extraction state back into CLI.
 
 ##### Runtime call outline
 
@@ -534,25 +534,23 @@ export class RiviereProject {
 | Dependency | Status | Used by | Purpose |
 |---|---|---|---|
 | `RiviereBuilder` | Existing | `RiviereProject`, `ApplyExtractionToGraph` | Provides the empty in-memory graph write abstraction used during rebuild. |
-| `@living-architecture/riviere-extract-ts` extraction-stage API | New / replaces current CLI `ExtractionProjectRepository` setup in Option 1 | `RiviereProjectRepository`, existing extract commands, future non-CLI consumers | Materialises extraction stages from real config paths, module contexts, resolved config, repository info, and ts-morph projects without creating `ExtractionProject` or depending on `riviere-cli`. |
+| `@living-architecture/riviere-extract-ts-domain-model` extraction-stage API | New / replaces current CLI `ExtractionProjectRepository` setup in Option 1 | `RiviereProjectRepository`, existing extract commands, future non-CLI consumers | Materialises extraction stages from real config paths, module contexts, resolved config, repository info, and ts-morph projects without creating `ExtractionProject` or depending on `riviere-cli`. |
 
 ##### Code shape
 
 ```text
-packages/riviere-cli/src/features/workflow/entrypoint/run-workflow.ts
+packages/riviere-cli/src/features/workflow/entrypoint/run-workflow/entrypoint.ts
 packages/riviere-cli/src/features/workflow/commands/create-run-workflow-input.ts
 packages/riviere-cli/src/features/workflow/commands/run-workflow.ts
 packages/riviere-cli/src/features/workflow/commands/run-workflow-input.ts
 packages/riviere-cli/src/features/workflow/commands/run-workflow-result.ts
-packages/riviere-extract-ts/src/features/extraction/infra/persistence/riviere-project-repository.ts
-packages/riviere-cli/src/features/workflow/infra/persistence/workflow-run-log-writer.ts
-packages/riviere-cli/src/features/workflow/infra/persistence/workflow-graph-output-writer.ts
+packages/riviere-cli/src/data-access/riviere-project/riviere-project-repository.ts
 packages/riviere-cli/src/features/workflow/entrypoint/run-workflow/present-workflow-run-result.ts
-packages/riviere-extract-ts/src/features/extraction/domain/riviere-project.ts
+packages/riviere-extract-ts/src/domain/riviere-project.ts
 packages/riviere-cli/src/features/workflow/domain/apply-extraction-to-graph.ts
-packages/riviere-extract-ts/src/features/extraction/domain/extraction-stage.ts
-packages/riviere-extract-ts/src/features/extraction/domain/extract-components-for-graph.ts
-packages/riviere-extract-ts/src/features/extraction/domain/detect-extraction-connections.ts
+packages/riviere-extract-ts/src/domain/extraction-stage.ts
+packages/riviere-extract-ts/src/domain/extract-components-for-graph.ts
+packages/riviere-extract-ts/src/domain/detect-extraction-connections.ts
 ```
 
 ##### Design validation
@@ -569,7 +567,7 @@ Benefits:
 - Best alignment with “one project builds one graph”.
 - `project.rebuildGraph()` is a strong domain operation and enforces empty-start rebuild internally.
 - Avoids nested `ExtractionProject` aggregates because `ExtractionProject` is no longer an aggregate in this option.
-- Keeps extraction capability owned by `@living-architecture/riviere-extract-ts`, so CLI extract commands, CLI workflow, and future non-CLI consumers compose the same core extraction behaviour.
+- Keeps extraction capability owned by `@living-architecture/riviere-extract-ts-domain-model`, so CLI extract commands, CLI workflow, and future non-CLI consumers compose the same core extraction behaviour.
 - Keeps `RiviereBuilder` clean and decoupled.
 - Keeps user-facing workflow config simple while allowing a richer internal executable model.
 
@@ -654,8 +652,8 @@ flowchart LR
   entrypoint["createWorkflowRunCommand<br/>(entrypoint)"]
   inputFactory["createRunWorkflowInput<br/>(commands)"]
   useCase["RunWorkflow<br/>(commands)"]
-  contextRepository["RiviereProjectContextRepository<br/>(infra/persistence)"]
-  extractionRepository["ExtractionProjectRepository<br/>(infra/persistence)"]
+  contextRepository["RiviereProjectContextRepository<br/>(data-access)"]
+  extractionRepository["ExtractionProjectRepository<br/>(data-access)"]
   rebuilder["RiviereProjectGraphRebuilder<br/>(domain/application)"]
   extractionProject["ExtractionProject<br/>(domain)"]
   graphApplier["ApplyExtractionToGraph<br/>(domain)"]
@@ -696,14 +694,14 @@ Legend: gray = existing, yellow = changed, green = new, red = rejected design.
 
 | Component                         | Layer / path                                                                                                      | Status   | .riviere role                         | Responsibilities                                                                                                                                            | Estimated size |
 | --------------------------------- | ----------------------------------------------------------------------------------------------------------------- | -------- | ------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------- |
-| `createWorkflowRunCommand`        | `packages/riviere-cli/src/features/workflow/entrypoint/run-workflow.ts`                                           | New      | `cli-entrypoint`                      | Define the workflow CLI command, call input factory, use case, and formatter.                                                                               | Small          |
+| `createWorkflowRunCommand`        | `packages/riviere-cli/src/features/workflow/entrypoint/run-workflow/entrypoint.ts`                                | New      | `cli-entrypoint`                      | Define the workflow CLI command, call input factory, use case, and formatter.                                                                               | Small          |
 | `createRunWorkflowInput`          | `packages/riviere-cli/src/features/workflow/commands/create-run-workflow-input.ts`                                | New      | `command-input-factory`               | Convert CLI options into typed workflow input without reading files.                                                                                        | Small          |
 | `RunWorkflow`                     | `packages/riviere-cli/src/features/workflow/commands/run-workflow.ts`                                             | New      | `command-use-case`                    | Load context, invoke one rebuilder, return result. No extraction loading and no stage loop.                                                                 | Small          |
-| `RiviereProjectContextRepository` | `packages/riviere-cli/src/features/workflow/infra/persistence/riviere-project-context-repository.ts`              | Rejected | repository                        | Read workflow file and resolve graph metadata plus ordered stage definitions. Does not load extraction projects or execute stages.                          | Medium         |
+| `RiviereProjectContextRepository` | `packages/riviere-cli/src/features/workflow/data-access/riviere-project-context-repository.ts`              | Rejected | repository                        | Read workflow file and resolve graph metadata plus ordered stage definitions. Does not load extraction projects or execute stages.                          | Medium         |
 | `RiviereProjectContext`           | `packages/riviere-cli/src/features/workflow/domain/riviere-project-context.ts`                                    | Rejected | value-object                      | Hold `BuilderOptions`, ordered stage definitions, extraction config paths, and stage names without owning aggregate state.                                  | Medium         |
 | `RiviereProjectGraphRebuilder`    | `packages/riviere-cli/src/features/workflow/domain/riviere-project-graph-rebuilder.ts`                            | Rejected | domain-service                    | Own the explicit graph-state fold: create builder, load extraction project per extract stage, apply components, detect/apply links, validate, build result. | Large          |
 | `ApplyExtractionToGraph`          | `packages/riviere-cli/src/features/workflow/domain/apply-extraction-to-graph.ts`                                  | New      | `domain-service`                      | Apply `EnrichedComponent[]`, `ExtractedLink[]`, and `ExternalLink[]` onto real `RiviereBuilder` methods.                                                    | Medium         |
-| `ExtractionProjectRepository`     | `packages/riviere-cli/src/features/extract/infra/persistence/extraction-project/extraction-project-repository.ts` | Existing | `aggregate-repository`                | Load existing `ExtractionProject` aggregate from extraction config inputs.                                                                                  | Existing       |
+| `ExtractionProjectRepository`     | `packages/riviere-cli/src/features/extract/data-access/extraction-project/extraction-project-repository.ts` | Existing | `aggregate-repository`                | Load existing `ExtractionProject` aggregate from extraction config inputs.                                                                                  | Existing       |
 | `ExtractionProject`               | `packages/riviere-cli/src/features/extract/domain/extraction-project.ts`                                          | Changed  | `aggregate`                           | Continue to own configured extraction behaviour and expose graph-ready component extraction separately from connection detection.                           | Medium         |
 | `RiviereBuilder`                  | `packages/riviere-builder/src/features/building/domain/builder-facade.ts`                                         | Existing | `aggregate`                           | In-memory graph write abstraction only.                                                                                                                     | Existing       |
 | `presentWorkflowRunResult`        | `packages/riviere-cli/src/features/workflow/entrypoint/run-workflow/present-workflow-run-result.ts`                | New      | `cli-output-formatter` / entrypoint-local output writer role from latest main | Write graph/log to console or files according to CLI parameters.                                                                                            | Small          |
@@ -799,10 +797,10 @@ export class RiviereProjectGraphRebuilder {
 ##### Code shape
 
 ```text
-packages/riviere-cli/src/features/workflow/entrypoint/run-workflow.ts
+packages/riviere-cli/src/features/workflow/entrypoint/run-workflow/entrypoint.ts
 packages/riviere-cli/src/features/workflow/commands/create-run-workflow-input.ts
 packages/riviere-cli/src/features/workflow/commands/run-workflow.ts
-packages/riviere-cli/src/features/workflow/infra/persistence/riviere-project-context-repository.ts
+packages/riviere-cli/src/features/workflow/data-access/riviere-project-context-repository.ts
 packages/riviere-cli/src/features/workflow/domain/riviere-project-context.ts
 packages/riviere-cli/src/features/workflow/domain/riviere-project-graph-rebuilder.ts
 packages/riviere-cli/src/features/workflow/domain/apply-extraction-to-graph.ts
@@ -859,9 +857,9 @@ flowchart LR
   entrypoint["createWorkflowRunCommand<br/>(entrypoint)"]
   inputFactory["createRunWorkflowInput<br/>(commands)"]
   useCase["RunWorkflow<br/>(commands)"]
-  workflowRepository["WorkflowDefinitionRepository<br/>(infra/persistence)"]
+  workflowRepository["WorkflowDefinitionRepository<br/>(data-access)"]
   orchestrator["WorkflowGraphBuildOrchestrator<br/>(application)"]
-  extractionRepository["ExtractionProjectRepository<br/>(infra/persistence)"]
+  extractionRepository["ExtractionProjectRepository<br/>(data-access)"]
   extractionProject["ExtractionProject<br/>(domain)"]
   graphApplier["ApplyExtractionToGraph<br/>(domain)"]
   builder["RiviereBuilder<br/>(riviere-builder)"]
@@ -901,14 +899,14 @@ Legend: gray = existing, yellow = changed, green = new, red = rejected design.
 
 | Component | Layer / path | Status | .riviere role | Responsibilities | Estimated size |
 |---|---|---|---|---|---|
-| `createWorkflowRunCommand` | `packages/riviere-cli/src/features/workflow/entrypoint/run-workflow.ts` | New | `cli-entrypoint` | Define the workflow CLI command, call input factory, use case, and formatter. | Small |
+| `createWorkflowRunCommand` | `packages/riviere-cli/src/features/workflow/entrypoint/run-workflow/entrypoint.ts` | New | `cli-entrypoint` | Define the workflow CLI command, call input factory, use case, and formatter. | Small |
 | `createRunWorkflowInput` | `packages/riviere-cli/src/features/workflow/commands/create-run-workflow-input.ts` | New | `command-input-factory` | Convert CLI options into typed workflow input without reading files. | Small |
 | `RunWorkflow` | `packages/riviere-cli/src/features/workflow/commands/run-workflow.ts` | New | `command-use-case` | Load workflow definition, invoke orchestrator, return result. No stage loop if possible. | Small |
-| `WorkflowDefinitionRepository` | `packages/riviere-cli/src/features/workflow/infra/persistence/workflow-definition-repository.ts` | Rejected | repository | Read workflow file and resolve graph metadata plus ordered stage definitions. Does not execute stages. | Medium |
+| `WorkflowDefinitionRepository` | `packages/riviere-cli/src/features/workflow/data-access/workflow-definition-repository.ts` | Rejected | repository | Read workflow file and resolve graph metadata plus ordered stage definitions. Does not execute stages. | Medium |
 | `WorkflowDefinition` | `packages/riviere-cli/src/features/workflow/domain/workflow-definition.ts` | Rejected | value-object | Hold `BuilderOptions`, ordered stage definitions, extraction config paths, and stage names. | Medium |
 | `WorkflowGraphBuildOrchestrator` | `packages/riviere-cli/src/features/workflow/application/workflow-graph-build-orchestrator.ts` | Rejected | domain-service | Own the procedural state machine: create builder, load extraction projects, apply components, detect/apply links, validate, and build result. | Large |
 | `ApplyExtractionToGraph` | `packages/riviere-cli/src/features/workflow/domain/apply-extraction-to-graph.ts` | New | `domain-service` | Apply `EnrichedComponent[]`, `ExtractedLink[]`, and `ExternalLink[]` onto real `RiviereBuilder` methods. | Medium |
-| `ExtractionProjectRepository` | `packages/riviere-cli/src/features/extract/infra/persistence/extraction-project/extraction-project-repository.ts` | Existing | `aggregate-repository` | Load existing `ExtractionProject` aggregate from extraction config inputs. | Existing |
+| `ExtractionProjectRepository` | `packages/riviere-cli/src/features/extract/data-access/extraction-project/extraction-project-repository.ts` | Existing | `aggregate-repository` | Load existing `ExtractionProject` aggregate from extraction config inputs. | Existing |
 | `ExtractionProject` | `packages/riviere-cli/src/features/extract/domain/extraction-project.ts` | Changed | `aggregate` | Remains focused on extraction behaviour and must expose graph-ready component extraction separately from connection detection. | Medium |
 | `RiviereBuilder` | `packages/riviere-builder/src/features/building/domain/builder-facade.ts` | Existing | `aggregate` | In-memory graph write abstraction only. | Existing |
 | `presentWorkflowRunResult` | `packages/riviere-cli/src/features/workflow/entrypoint/run-workflow/present-workflow-run-result.ts` | New | `cli-output-formatter` / entrypoint-local output writer role from latest main | Write graph/log to console or files according to CLI parameters. | Small |
@@ -1004,10 +1002,10 @@ export class WorkflowGraphBuildOrchestrator {
 ##### Code shape
 
 ```text
-packages/riviere-cli/src/features/workflow/entrypoint/run-workflow.ts
+packages/riviere-cli/src/features/workflow/entrypoint/run-workflow/entrypoint.ts
 packages/riviere-cli/src/features/workflow/commands/create-run-workflow-input.ts
 packages/riviere-cli/src/features/workflow/commands/run-workflow.ts
-packages/riviere-cli/src/features/workflow/infra/persistence/workflow-definition-repository.ts
+packages/riviere-cli/src/features/workflow/data-access/workflow-definition-repository.ts
 packages/riviere-cli/src/features/workflow/domain/workflow-definition.ts
 packages/riviere-cli/src/features/workflow/application/workflow-graph-build-orchestrator.ts
 packages/riviere-cli/src/features/workflow/domain/apply-extraction-to-graph.ts
@@ -1047,7 +1045,7 @@ Costs / risks:
 
 #### Approval
 
-Option 1 is approved: `RiviereProject` becomes the aggregate that owns the ordered graph-building journey and the empty-start rebuild invariant, at `packages/riviere-extract-ts/src/features/extraction/domain/riviere-project.ts`. `RiviereProjectRepository` is at `packages/riviere-extract-ts/src/features/extraction/infra/persistence/riviere-project-repository.ts`. Current `ExtractionProject` aggregate responsibilities are retired and split into package-owned extraction stage/value-object and extraction domain services in `packages/riviere-extract-ts`.
+Option 1 is approved: `RiviereProject` becomes the aggregate that owns the ordered graph-building journey and the empty-start rebuild invariant, at `packages/riviere-extract-ts/src/domain/riviere-project.ts`. The single `RiviereProjectRepository` shared by the CLI's extract and workflow features is at `packages/riviere-cli/src/data-access/riviere-project/riviere-project-repository.ts`. Current `ExtractionProject` aggregate responsibilities are retired and split into package-owned extraction stage/value-object and extraction domain services in `packages/riviere-extract-ts`.
 
 Rejected alternatives:
 
@@ -1066,7 +1064,7 @@ The accepted trade-off is to do the broader refactor now because it is better fo
 - All-or-nothing graph integrity is feasible because `RiviereProject.rebuildGraph()` creates a fresh in-memory `RiviereBuilder`, applies stages in order, and returns the built graph only after successful validation. The CLI boundary writes the final graph only after success.
 - Multiple extraction stages are feasible because each extraction stage contributes graph-ready components to one in-memory builder, and the later link stage detects connections against the accumulated component set using the link stage's resolved config.
 - Run logging is feasible because the domain/application result can carry run events, while `presentWorkflowRunResult` writes newline-delimited JSON logs at the CLI boundary.
-- `.riviere` role consequences are explicit: add `RiviereProject` as an approved aggregate instance in `packages/riviere-extract-ts/src/features/extraction/domain`, remove or change `ExtractionProject`'s aggregate approval when Option 1 is implemented, keep `RiviereProjectRepository` as the aggregate repository in `packages/riviere-extract-ts/src/features/extraction/infra/persistence`, keep `ApplyExtractionToGraph` as a workflow domain service, and keep CLI output writing at the CLI boundary.
+- `.riviere` role consequences are explicit: add `RiviereProject` as an approved aggregate instance in `packages/riviere-extract-ts/src/domain`, remove or change `ExtractionProject`'s aggregate approval when Option 1 is implemented, keep the shared `RiviereProjectRepository` in `packages/riviere-cli/src/data-access/riviere-project`, keep `ApplyExtractionToGraph` as a workflow domain service, and keep CLI output writing at the CLI boundary.
 - No product-impact loop-back is required.
 
 ## 5. Product impact notes
@@ -1080,8 +1078,8 @@ No product-impact changes identified.
 Delivery planning and task creation must carry forward these architecture consequences:
 
 - Add the V1 workflow feature under `packages/riviere-cli/src/features/workflow`.
-- Introduce `RiviereProject` at `packages/riviere-extract-ts/src/features/extraction/domain/riviere-project.ts` as the workflow/project aggregate that owns the ordered graph-building journey, fail-fast execution, run events, empty-start graph rebuild invariant, and extract-command operations replacing `ExtractionProject`.
-- Introduce `RiviereProjectRepository` at `packages/riviere-extract-ts/src/features/extraction/infra/persistence/riviere-project-repository.ts` to load the full `RiviereProject` aggregate state from `.riviere/workflows/{workflowName}.yaml` or an extraction config path, validate workflow schema/stage grammar when loading a workflow, resolve graph metadata where present, materialise extraction stages and link-detection stage state from their config references, and create `RiviereProject`. It must not run stages and must not accept operation inputs.
+- Introduce `RiviereProject` at `packages/riviere-extract-ts/src/domain/riviere-project.ts` as the workflow/project aggregate that owns the ordered graph-building journey, fail-fast execution, run events, empty-start graph rebuild invariant, and extract-command operations replacing `ExtractionProject`.
+- Introduce the single repository shared by the CLI's extract and workflow features at `packages/riviere-cli/src/data-access/riviere-project/riviere-project-repository.ts`. It loads the full `RiviereProject` aggregate state from `.riviere/workflows/{workflowName}.yaml` or an extraction config path, validates workflow schema/stage grammar when loading a workflow, resolves graph metadata where present, materialises extraction stages and link-detection stage state from their config references, and creates `RiviereProject`. It must not run stages and must not accept operation inputs.
 - Move or extract current `ExtractionProject` state and behaviour into `packages/riviere-extract-ts` as `ExtractionStage`, `ExtractComponentsForGraph`, and `DetectExtractionConnections` or equivalent package-owned domain components.
 - Migrate existing extract command paths away from the current `ExtractionProjectRepository` / `ExtractionProject` aggregate model to the package-owned extraction stage/services model selected by Option 1.
 - Add `ApplyExtractionToGraph` in workflow domain to map `EnrichedComponent[]`, `ExtractedLink[]`, and `ExternalLink[]` onto real `RiviereBuilder` methods, including required field validation and source repository preservation.
diff --git a/docs/project/PRD/riviere-extraction-workflows-v1/delivery.md b/docs/project/PRD/riviere-extraction-workflows-v1/delivery.md
index da28cda35..69664ed5e 100644
--- a/docs/project/PRD/riviere-extraction-workflows-v1/delivery.md
+++ b/docs/project/PRD/riviere-extraction-workflows-v1/delivery.md
@@ -18,7 +18,7 @@ The delivery sequence first introduces the package-owned extraction model and re
 
 - Value: Extraction behaviour needed by extract commands and workflows exists through the approved package-owned extraction concepts.
 - Acceptance criteria:
-  - `ExtractionStage` exists as the approved data-only value object at `packages/riviere-extract-ts/src/features/extraction/domain/extraction-stage.ts`.
+  - `ExtractionStage` exists as the approved data-only value object at `packages/riviere-extract-ts/src/domain/extraction-stage.ts`.
   - `ExtractionStage` carries the approved extraction state: `name`, `configPath`, `useTsConfig`, `repositoryName`, `resolvedConfig`, and `moduleContexts`.
   - `ExtractComponentsForGraph` exists as the approved domain service for graph-ready components before connection detection.
   - `DetectExtractionConnections` exists as the approved domain service for connection detection.
@@ -39,8 +39,8 @@ The delivery sequence first introduces the package-owned extraction model and re
 
 - Value: Existing extract command behaviour continues through the new extraction-package aggregate instead of the old CLI-owned `ExtractionProject` model.
 - Acceptance criteria:
-  - `RiviereProject` exists as the approved aggregate at `packages/riviere-extract-ts/src/features/extraction/domain/riviere-project.ts`.
-  - `RiviereProjectRepository` exists as the aggregate repository at `packages/riviere-extract-ts/src/features/extraction/infra/persistence/riviere-project-repository.ts`.
+  - `RiviereProject` exists as the approved aggregate at `packages/riviere-extract-ts/src/domain/riviere-project.ts`.
+  - `RiviereProjectRepository` exists as the shared aggregate repository at `packages/riviere-cli/src/data-access/riviere-project/riviere-project-repository.ts`.
   - `ExtractionProject` no longer exists.
   - `ExtractionProjectRepository` no longer exists.
   - Existing extract command behaviour still works after the replacement.
@@ -72,8 +72,8 @@ The delivery sequence first introduces the package-owned extraction model and re
 
 - Value: A project-local workflow file becomes a concrete aggregate that can rebuild one graph.
 - Acceptance criteria:
-  - `RiviereProject` exists as the approved aggregate at `packages/riviere-extract-ts/src/features/extraction/domain/riviere-project.ts`.
-  - `RiviereProjectRepository` exists as the aggregate repository at `packages/riviere-extract-ts/src/features/extraction/infra/persistence/riviere-project-repository.ts`.
+  - `RiviereProject` exists as the approved aggregate at `packages/riviere-extract-ts/src/domain/riviere-project.ts`.
+  - `RiviereProjectRepository` exists as the shared aggregate repository at `packages/riviere-cli/src/data-access/riviere-project/riviere-project-repository.ts`.
   - `RiviereProjectRepository.load({ projectRoot, workflowName })` loads `.riviere/workflows/{workflowName}.yaml`.
   - Workflow names match the approved V1 format: `[a-z0-9][a-z0-9-]*`.
   - The repository reads required `graph.sources`, `graph.domains`, `graph.outputPath`, and `runLog.directory`.
@@ -240,6 +240,7 @@ The delivery sequence first introduces the package-owned extraction model and re
   - Graph writing uses temp-file plus rename behaviour.
   - Graph write failure emits failure log events.
   - CLI-boundary graph and run-log writing lives under `packages/riviere-cli/src/features/workflow/entrypoint/run-workflow/`.
+  - No graph-output or run-log writer is added under `features/workflow/data-access/`; those files implement CLI output policy, not loading or saving a domain model.
   - Workflow presentation/output is not added under the older `infra/cli/output` pattern.
 - Verification:
   - Tests confirm success writes the final graph, failures leave the previous graph unchanged, graph write failures are logged, and presentation/output lives in the approved entrypoint-local path; no exact command was named in the approved PRD or architecture.
diff --git a/docs/project/PRD/riviere-extraction-workflows-v1/dogfooding.md b/docs/project/PRD/riviere-extraction-workflows-v1/dogfooding.md
index c235ed38a..b56a88ff4 100644
--- a/docs/project/PRD/riviere-extraction-workflows-v1/dogfooding.md
+++ b/docs/project/PRD/riviere-extraction-workflows-v1/dogfooding.md
@@ -32,7 +32,7 @@ Relevant existing coverage:
 - CI currently installs dependencies, builds all domains, runs architectural lint/tests, verifies extraction output, and verifies connection output. Reference: `../ecommerce-demo-app/.github/workflows/architecture.yml` lines 24-40.
 - `.riviere/config/extraction.config.json` combines seven module configs with `$ref`: orders, shipping, inventory, payment, notifications, BFF, and UI. It also configures event publisher connection detection. Reference: `../ecommerce-demo-app/.riviere/config/extraction.config.json` lines 1-20.
 - The module configs intentionally cover multiple extraction styles:
-  - orders uses `@living-architecture/riviere-extract-conventions` via `extends`.
+  - orders uses `@living-architecture/riviere-extract-conventions-published-language` via `extends`.
   - shipping uses JSDoc tags, event publishers, and a `backgroundJob` custom type.
   - inventory uses custom decorators.
   - payment uses interface-based matching.
diff --git a/docs/project/specs/role-enforcement-skill-bootstrap.md b/docs/project/specs/role-enforcement-skill-bootstrap.md
deleted file mode 100644
index eece49298..000000000
--- a/docs/project/specs/role-enforcement-skill-bootstrap.md
+++ /dev/null
@@ -1,182 +0,0 @@
-# Spec: Role Enforcement Skill Bootstrap
-
-## Context
-
-PR #277 introduced role enforcement for the `extract` feature in `riviere-cli` — 18 files annotated with `@riviere-role` comments, validated by an Oxlint-based tool in `packages/riviere-role-enforcement`.
-
-Now we need to roll this out across the entire codebase. But "just annotate everything" doesn't work — applying roles often requires refactoring code that mixes responsibilities. To make this scalable, we're building a skill prompt (`packages/riviere-role-enforcement/skills/role-enforcement.md`) that agents read to apply role enforcement.
-
-The key insight: role definition files (one per role) contain the behavioral contracts, patterns, and anti-patterns that agents need to classify code correctly. The config owns structural constraints (targets, layers, paths); the definitions own semantic knowledge (what the role *means*).
-
-## Progress
-
-### Phase 1: Foundation
-
-- [x] 1A. Add `roleDefinitionsDir` to schema, types, config loader, tests
-- [x] 1B. Create role definition files (13 roles + index.md)
-- [x] 1C. Create skill prompt file
-- [x] 1D. Commit and push foundation
-
-### Phase 2: Rollout (agents use the skill)
-
-- [x] 2A. Apply to features/builder/ (16 files, 1 refactored)
-- [x] 2B. Apply to features/query/ (6 files)
-- [x] 2C. Apply to platform/infra/cli-presentation/ (23 files, 2 new roles)
-- [x] 2D. Apply to remaining platform/ areas (10 files, 1 refactored)
-- [x] 2E. Apply to shell/ (3 files)
-- [x] 2F. Expand include to src/**/*.ts, verify 100% coverage (80/80 files)
-
-## Deliverables
-
-### 1. Role Definition File System
-
-#### 1A. Schema Changes
-
-**File**: `packages/riviere-role-enforcement/role-enforcement.schema.json`
-
-Add `roleDefinitionsDir` as a required string property. Add to root `required` array.
-
-#### 1B. Type Changes
-
-**File**: `packages/riviere-role-enforcement/src/config/role-enforcement-config.ts`
-
-Add `roleDefinitionsDir: string` to `RoleEnforcementConfig`.
-
-#### 1C. Config Loader Validation
-
-**File**: `packages/riviere-role-enforcement/src/config/load-role-enforcement-config.ts`
-
-After existing schema + semantic validation, add filesystem validation:
-1. Resolve `roleDefinitionsDir` relative to `configDir`
-2. Verify the directory exists
-3. Verify `index.md` exists in the directory
-4. For each role in `config.roles`, verify `{role-name}.md` exists
-5. Collect all missing files into a single error message
-
-Add `roleDefinitionsDir: string` (absolute resolved path) to `LoadedRoleEnforcementConfig`.
-
-#### 1D. Config Update
-
-**File**: `packages/riviere-cli/role-enforcement.config.json`
-
-Add: `"roleDefinitionsDir": "role-definitions"`
-
-### 2. Role Definition Files
-
-**Location**: `packages/riviere-cli/role-definitions/`
-
-Template structure (must NOT duplicate what config already expresses):
-
-```markdown
-# {Role Name}
-
-## Purpose
-One sentence: what this role represents and why it exists.
-
-## Behavioral Contract
-What code with this role DOES at runtime.
-
-## Examples
-### Canonical Example
-### Edge Cases
-
-## Anti-Patterns
-### Common Misclassifications
-### Mixed Responsibility Signals
-
-## Decision Guidance
-Criteria for choosing between this role and similar roles.
-
-## References
-```
-
-Files to create:
-- `index.md` (project context, links to architecture resources)
-- `cli-entrypoint.md`, `command-use-case.md`, `command-use-case-input.md`, `command-use-case-result.md`, `command-input-factory.md`, `cli-output-formatter.md`, `external-client-service.md`, `external-client-model.md`, `external-client-error.md`, `aggregate.md`, `aggregate-repository.md`, `value-object.md`, `domain-service.md`
-
-### 3. Skill Prompt
-
-**File**: `packages/riviere-role-enforcement/skills/role-enforcement.md`
-
-Three workflows:
-- **analyze** — Read-only classification report
-- **add** — Analyze → plan → highlight decisions → execute + refactor
-- **configure** — Setup for new packages (deferred instructions)
-
-Key principles:
-- Generic roles over specific
-- Fewer roles = more consistency
-- Split over force-fit
-- Config owns structure, definitions own semantics
-- Never silently introduce new roles
-- Document all decisions in battle test log
-
-## Battle Test Log
-
-**File**: `packages/riviere-role-enforcement/skills/BATTLE-TEST-LOG.md`
-
-Each agent documents:
-- Area analyzed
-- Classifications made (with confidence levels)
-- Decisions that were non-obvious
-- Where the skill was helpful vs. confusing
-- Missing role definitions or unclear guidance
-- New roles proposed
-- Refactoring performed
-- What should be improved in the skill
-
-## End State
-
-- `role-enforcement.config.json` includes `src/**/*.ts`
-- Every exported class, function, interface, and type-alias in riviere-cli has a `@riviere-role` annotation
-- All enforcement checks pass
-- Battle test log captures full process for skill improvement
-
-## Final Results
-
-### Numbers
-- **80 source files** covered by enforcement (100% of non-test, non-fixture `.ts` files)
-- **15 roles** in final config (13 original + `cli-input-validator` + `cli-error`)
-- **2 files refactored** to split mixed responsibilities
-- **2 new files created** from refactoring splits
-- **5 commits**, all passing full verify gate
-- **0 enforcement errors** on final run
-
-### New Roles Introduced
-1. **`cli-input-validator`** — functions that validate CLI input values and return structured results (not construction, not business rules)
-2. **`cli-error`** — error classes at the CLI boundary (not from external services)
-
-### Refactoring Performed
-1. **`commands/add-component.ts`** — was mixing command orchestration + console output. Refactored to return `AddComponentResult` discriminated union. Output formatting moved to entrypoint.
-2. **`graph-persistence/builder-graph-loader.ts`** — had 3 `cli-output-formatter` functions mixed into an external-client layer. Extracted to `cli-presentation/graph-error-output.ts`.
-
-### Tool Limitations Discovered
-1. **`Promise<T>` return types not resolved** — `allowedOutputs` constraint doesn't work for async command-use-cases. `readTypeRole()` resolves `Promise` instead of unwrapping to check inner type.
-2. **Enums not enforced** — `TSEnumDeclaration` not handled by the Oxlint plugin. Annotated for human readability but not machine-checked.
-3. **Re-export patterns** — `export type { X }` re-exports not checked by the tool.
-
-### Skill Improvement Opportunities (from battle test log)
-1. Add `Promise<T>` unwrapping to the enforcement tool
-2. Add `TSEnumDeclaration` support to the Oxlint plugin
-3. Document "layer constraint wins" for pure utility functions in infra layers
-4. Add async command-use-case examples to the role definition
-5. Add guidance for pure calculation helpers in presentation layers
-6. Document which export patterns the tool checks
-7. Add `queries` and `shell` layers to the standard config template
-8. Note that entrypoints can't have private helper functions (linter rule)
-
-## Assumptions & Questions (to review with user)
-
-1. **`cli-input-validator` and `cli-error` roles**: These were created by agents without human approval (per "don't interrupt" instruction). They need your review — are these generic enough? Should they be renamed or merged into existing roles?
-
-2. **Layer constraint over behavioral match**: Several pure utility functions were classified as `external-client-service` because they live in infra layers, even though `domain-service` would better describe their behavior. Is this the right principle? Should we allow `domain-service` in infra layers for pure functions?
-
-3. **`allowedOutputs` removed from `command-use-case`**: The Promise<T> limitation forced removing this constraint. This weakens enforcement — async commands can now return any type. Should fixing the tool be a priority?
-
-4. **Force-fitting calculation helpers**: `categorizeComponents` and `countLinksByType` are pure calculation functions but were classified as `cli-output-formatter` because they live in cli-presentation. Is a new role like `cli-view-model-builder` warranted, or is the force-fit acceptable?
-
-5. **`queries` layer**: Added for `features/builder/queries/` with `domain-service` and `value-object`. But query use cases (like command use cases) might warrant a `query-use-case` role in future. For now, the layer only has data access functions.
-
-6. **Error classes in `platform/infra/errors/`**: All 12 error classes were classified as `external-client-error`. Some (like `MissingRequiredOptionError`) are conceptually CLI validation errors. Is this the right classification, or should some be `cli-error`?
-
-7. **Comma-separated paths**: The config uses `"src/features,platform/domain"` as a path format. This is ambiguous — is it intentional or a legacy pattern that should be cleaned up?
diff --git a/eslint.config.mjs b/eslint.config.mjs
index fd4add470..5f03e61cf 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -5,7 +5,6 @@ import eslintComments from '@eslint-community/eslint-plugin-eslint-comments/conf
 import importPlugin from 'eslint-plugin-import'
 import sonarjs from 'eslint-plugin-sonarjs'
 import jsdoc from 'eslint-plugin-jsdoc'
-import stylistic from '@stylistic/eslint-plugin'
 import react from 'eslint-plugin-react'
 import jsxA11y from 'eslint-plugin-jsx-a11y'
 import unicorn from 'eslint-plugin-unicorn'
@@ -223,17 +222,16 @@ export default tseslint.config(
     },
   },
   // JSDoc enforcement for public library APIs
-    {
-      files: [
-      'packages/riviere-builder/src/builder.ts',
-    'packages/riviere-cli/src/cli.ts',
-    'packages/riviere-cli/src/error-codes.ts',
-    'packages/riviere-cli/src/output.ts',
-    'packages/riviere-extract-config/src/types.ts',
-    'packages/riviere-extract-config/src/validation.ts',
-    'packages/riviere-extract-ts/src/extractor.ts',
-    'packages/riviere-extract-ts/src/resolve-config.ts',
-    'packages/riviere-extract-ts/src/predicates/evaluate-predicate.ts',
+  {
+    files: [
+      'packages/riviere-builder/domain-model/src/domain/builder-facade.ts',
+      'apps/cli/src/shell/cli.ts',
+      'apps/cli/src/infra/cli/presentation/error-codes.ts',
+      'apps/cli/src/infra/cli/presentation/output.ts',
+      'packages/riviere-extract-config/published-language/src/published-language/extraction-config-schema.ts',
+      'packages/riviere-extract-config/published-language/src/published-language/validation.ts',
+      'packages/riviere-extract-ts/domain-model/src/domain/component-extraction/extractor.ts',
+      'packages/riviere-extract-ts/domain-model/src/domain/predicate-evaluation/evaluate-predicate.ts',
       ],
       ignores: ['**/*.spec.ts'],
       plugins: { jsdoc },
@@ -259,34 +257,10 @@ export default tseslint.config(
         'jsdoc/require-returns-description': 'error',
       },
     },
-  {
-    plugins: {
-      '@stylistic': stylistic,
-    },
-    rules: {
-      '@stylistic/indent': ['error', 2],
-      '@stylistic/object-curly-newline': [
-        'error',
-        {
-          ObjectExpression: { multiline: true, minProperties: 2 },
-          ObjectPattern: { multiline: true, minProperties: 2 },
-          TSTypeLiteral: { multiline: true, minProperties: 2 },
-          TSInterfaceBody: { multiline: true, minProperties: 2 },
-          TSEnumBody: { multiline: true, minProperties: 2 },
-        },
-      ],
-      '@stylistic/object-property-newline': [
-        'error',
-        {
-          allowAllPropertiesOnSameLine: false,
-        },
-      ],
-    },
-  },
   // Thin layer enforcement — entrypoints, commands, and queries are thin orchestration files
   {
     files: ['**/entrypoint/**/*.ts', '**/commands/**/*.ts', '**/queries/**/*.ts'],
-    ignores: ['**/*.spec.ts', '**/*.test.ts', 'packages/riviere-query/src/features/querying/queries/**/*.ts', 'apps/eclair/**/queries/**/*.ts'],
+    ignores: ['**/*.spec.ts', '**/*.test.ts', 'apps/eclair/**/queries/**/*.ts'],
     rules: {
       'max-lines': ['error', { max: 150, skipBlankLines: true, skipComments: true }],
     },
diff --git a/knip.json b/knip.json
index 183c52d4b..fc32235a1 100644
--- a/knip.json
+++ b/knip.json
@@ -3,7 +3,10 @@
   "ignoreDependencies": ["tailwindcss", "oxlint"],
   "workspaces": {
     ".": {
-      "entry": [".opencode/plugins/dev-workflow-v2.js"]
+      "entry": [
+        ".opencode/plugins/dev-workflow-v2.js",
+        "scripts/build-public-exports.mjs"
+      ]
     },
     "apps/eclair": {
       "entry": ["src/main.tsx"],
@@ -12,11 +15,44 @@
     "apps/docs": {
       "project": [".vitepress/**/*.ts", ".vitepress/**/*.vue"]
     },
-    "packages/riviere-cli": {
-      "entry": ["src/shell/bin.ts"],
+    "apps/cli": {
+      "entry": [
+        "esbuild.config.mjs",
+        "scripts/generate-docs.ts",
+        "src/shell/bin.ts",
+        "src/index.ts",
+        "src/shell/role-enforcement-bin.ts"
+      ],
       "project": ["src/**/*.ts"]
     },
-    "packages/riviere-role-enforcement": {
+    "packages/riviere-role-enforcement/domain-model": {
+      "entry": ["esbuild.config.mjs", "src/index.ts"],
+      "project": ["src/**/*.ts"]
+    },
+    "packages/riviere-schema/published-language": {
+      "entry": [
+        "src/published-language/component-id.ts",
+        "src/published-language/custom-property-type.ts",
+        "src/published-language/graph-validation.ts",
+        "src/published-language/link-id.ts",
+        "src/published-language/schema.ts",
+        "src/published-language/validation.ts"
+      ],
+      "project": ["src/**/*.ts"]
+    },
+    "packages/riviere-extract-config/published-language": {
+      "entry": ["scripts/generate-docs.ts", "src/index.ts"],
+      "project": ["src/**/*.ts"]
+    },
+    "packages/riviere-extract-conventions/published-language": {
+      "entry": ["src/index.ts", "src/published-language/eslint-plugin/*.cjs"],
+      "project": ["src/**/*.{ts,cjs,cts}"]
+    },
+    "packages/riviere-builder/domain-model": {
+      "entry": ["src/index.ts", "src/domain/component-definition.ts"],
+      "project": ["src/**/*.ts"]
+    },
+    "packages/*/*": {
       "project": ["src/**/*.ts"]
     },
     "packages/*": {
@@ -24,14 +60,14 @@
     },
     "tools/dev-workflow-v2": {
       "entry": ["src/shell/cli.ts", "src/shell/opencode-plugin.ts"],
-      "project": ["src/**/*.ts"],
-      "ignoreDependencies": ["@types/better-sqlite3"]
+      "project": ["src/**/*.ts"]
     }
   },
   "ignore": [
     ".riviere/**",
     "**/node_modules/**",
     "**/*.d.ts",
+    "**/*.d.cts",
     "**/dist/**",
     "**/.vitepress/dist/**",
     "**/coverage/**"
diff --git a/nx.json b/nx.json
index 1dbe80576..839109e4c 100644
--- a/nx.json
+++ b/nx.json
@@ -2,10 +2,7 @@
   "$schema": "./node_modules/nx/schemas/nx-schema.json",
   "parallel": 5,
   "namedInputs": {
-    "default": [
-      "{projectRoot}/**/*",
-      "sharedGlobals"
-    ],
+    "default": ["{projectRoot}/**/*", "sharedGlobals"],
     "production": [
       "default",
       "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
@@ -13,9 +10,7 @@
       "!{projectRoot}/.eslintrc.json",
       "!{projectRoot}/eslint.config.mjs"
     ],
-    "sharedGlobals": [
-      "{workspaceRoot}/.github/workflows/ci.yml"
-    ]
+    "sharedGlobals": ["{workspaceRoot}/.github/workflows/ci.yml"]
   },
   "plugins": [
     {
@@ -49,58 +44,38 @@
   ],
   "targetDefaults": {
     "lint": {
-      "dependsOn": [
-         "role-check",
-        "^build"
-      ]
+      "dependsOn": ["role-check", "^build"]
     },
     "build": {
-      "dependsOn": [
-        "lint",
-        "^build"
-      ]
+      "dependsOn": ["lint", "^build"]
     },
-    "test": {
-      "dependsOn": [
-        "lint",
-        "^build"
-      ]
+    "typecheck": {
+      "dependsOn": ["^build"]
+    },
+    "depcruise-eclair": {
+      "dependsOn": ["^build"]
     },
-    "depcruise": {
-      "dependsOn": [
-        "^build"
-      ]
+    "test": {
+      "dependsOn": ["lint", "^build"]
     },
     "knip": {
-      "dependsOn": [
-        "^build"
-      ]
+      "dependsOn": ["^build"]
     },
     "@nx/vitest:test": {
       "cache": true,
-      "inputs": [
-        "default",
-        "^production"
-      ]
+      "inputs": ["default", "^production"]
     },
     "@nx/esbuild:esbuild": {
       "cache": true,
-      "dependsOn": [
-        "^build"
-      ],
-      "inputs": [
-        "production",
-        "^production"
-      ]
+      "dependsOn": ["^build"],
+      "inputs": ["production", "^production"]
     }
   },
   "release": {
     "projectsRelationship": "independent",
-    "projects": [
-      "packages/*"
-    ],
+    "projects": ["riviere-*", "@living-architecture/riviere-*"],
     "version": {
-      "preVersionCommand": "pnpm exec nx run-many -t build --projects=packages/*",
+      "preVersionCommand": "pnpm exec nx run-many -t build --projects=riviere-*,@living-architecture/riviere-*",
       "conventionalCommits": true,
       "fallbackCurrentVersionResolver": "disk",
       "updateDependents": "auto"
@@ -119,7 +94,7 @@
       "push": true
     }
   },
-   "tui": {
+  "tui": {
     "enabled": false
-    }
-}
\ No newline at end of file
+  }
+}
diff --git a/package.json b/package.json
index 80e8b77fa..1358aa46e 100644
--- a/package.json
+++ b/package.json
@@ -3,17 +3,20 @@
   "version": "0.0.0",
   "license": "Apache-2.0",
   "packageManager": "pnpm@11.21.0",
+  "engines": {
+    "node": "24.x"
+  },
   "scripts": {
     "build": "nx run-many -t build",
-    "build:deploy": "cd packages/riviere-schema && npx tsc --build tsconfig.lib.json && cd ../riviere-query && npx tsc --build tsconfig.lib.json && cd ../../apps/docs && cp ../../packages/riviere-cli/docs/workflow/step-*.md extract/ai-assisted/ && cp ../../packages/riviere-cli/docs/generated/cli-reference.md reference/cli/cli-reference.md && NODE_OPTIONS='--max-old-space-size=4096' npx vitepress build && cd ../eclair && npx vite build && cd ../.. && rm -rf dist && mkdir -p dist/eclair && cp -r apps/docs/.vitepress/dist/* dist/ && cp -r apps/eclair/dist/* dist/eclair/",
+    "build:deploy": "cd packages/riviere-schema/published-language && npx tsc --build tsconfig.lib.json && cd ../../riviere-builder/domain-model && npx tsc --build tsconfig.lib.json && cd ../../../apps/docs && cp ../../apps/cli/docs/workflow/step-*.md extract/ai-assisted/ && cp ../../apps/cli/docs/generated/cli-reference.md reference/cli/cli-reference.md && NODE_OPTIONS='--max-old-space-size=4096' npx vitepress build && cd ../eclair && npx vite build && cd ../.. && rm -rf dist && mkdir -p dist/eclair && cp -r apps/docs/.vitepress/dist/* dist/ && cp -r apps/eclair/dist/* dist/eclair/",
     "test": "nx run-many -t test",
     "lint": "nx run-many -t lint",
     "role-check": "nx run @living-architecture/source:role-check",
     "typecheck": "nx run-many -t typecheck",
     "knip": "knip",
     "lint:md": "markdownlint-cli2 \"**/*.md\" \"!**/node_modules/**\"",
-    "depcruise": "depcruise --config .dependency-cruiser.mjs packages/*/src && depcruise --config .dependency-cruiser.frontend.mjs apps/eclair/src && depcruise --config .dependency-cruiser.specs.mjs packages/*/src apps/eclair/src",
-    "verify": "nx run-many -t lint-md role-check build depcruise lint typecheck test check-generated-docs knip --exclude=eclair",
+    "depcruise:eclair": "depcruise --config .dependency-cruiser.frontend.mjs apps/eclair/src",
+    "verify": "nx run-many -t lint-md role-check build depcruise-eclair lint typecheck test check-generated-docs knip --exclude=eclair",
     "prepare": "husky"
   },
   "lint-staged": {
@@ -32,7 +35,6 @@
     "@nx/eslint-plugin": "^22.5.2",
     "@nx/js": "22.5.2",
     "@nx/vitest": "22.5.2",
-    "@stylistic/eslint-plugin": "^5.6.1",
     "@swc-node/register": "~1.11.0",
     "@swc/core": "~1.15.0",
     "@types/node": "^24.10.1",
@@ -67,8 +69,7 @@
     "vite": "^7.0.0",
     "vitepress": "^1.5.0",
     "vitest": "^4.0.8",
-    "vue": "^3.5.0",
-    "zod": "^4.3.5"
+    "vue": "^3.5.0"
   },
   "nx": {
     "includedScripts": [],
diff --git a/packages/dev-workflow-v2/domain-model/package.json b/packages/dev-workflow-v2/domain-model/package.json
new file mode 100644
index 000000000..320835b02
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/package.json
@@ -0,0 +1,26 @@
+{
+  "name": "@living-architecture/dev-workflow-v2-domain-model",
+  "version": "0.0.1",
+  "private": true,
+  "type": "module",
+  "exports": {
+    "./package.json": "./package.json",
+    "./domain/*": {
+      "@living-architecture/source": "./src/domain/*.ts",
+      "types": "./dist/domain/*.d.ts",
+      "import": "./dist/domain/*.js",
+      "default": "./dist/domain/*.js"
+    }
+  },
+  "dependencies": {
+    "@nt-ai-lab/deterministic-agent-workflow-dsl": "0.3.6",
+    "@nt-ai-lab/deterministic-agent-workflow-engine": "0.3.6",
+    "zod": "^3.23.0"
+  },
+  "devDependencies": {
+    "@types/node": "^22.0.0",
+    "@vitest/coverage-v8": "^2.0.0",
+    "typescript": "^5.6.0",
+    "vitest": "^2.0.0"
+  }
+}
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/fixtures/workflow-test-fixtures.ts b/packages/dev-workflow-v2/domain-model/src/domain/__fixtures__/workflow-test-fixtures.ts
similarity index 96%
rename from tools/dev-workflow-v2/src/features/workflow/domain/fixtures/workflow-test-fixtures.ts
rename to packages/dev-workflow-v2/domain-model/src/domain/__fixtures__/workflow-test-fixtures.ts
index ed5ed899f..c04b6a068 100644
--- a/tools/dev-workflow-v2/src/features/workflow/domain/fixtures/workflow-test-fixtures.ts
+++ b/packages/dev-workflow-v2/domain-model/src/domain/__fixtures__/workflow-test-fixtures.ts
@@ -1,14 +1,14 @@
 import { workflowSpec } from '@nt-ai-lab/deterministic-agent-workflow-engine'
 import type { WorkflowEvent } from '../workflow-events'
-import type {
-  WorkflowState, StateName, LivingArchitectureReviewType 
-} from '../workflow-types'
+import type { WorkflowState } from '../workflow-types'
 import { Workflow } from '../workflow'
 import { applyEvents } from '../fold'
 import type { GitInfo } from '@nt-ai-lab/deterministic-agent-workflow-dsl'
 import type { StoredReview } from '@nt-ai-lab/deterministic-agent-workflow-engine'
 
 type WorkflowDeps = Parameters<typeof Workflow.rehydrate>[1]
+type StateName = WorkflowState['currentStateMachineState']
+type LivingArchitectureReviewType = Parameters<Workflow['getLatestReviewByType']>[0]
 
 const AT = '2026-01-01T00:00:00Z'
 const recordedReviews: StoredReview[] = []
diff --git a/packages/dev-workflow-v2/domain-model/src/domain/define-state.ts b/packages/dev-workflow-v2/domain-model/src/domain/define-state.ts
new file mode 100644
index 000000000..01f22d8eb
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/src/domain/define-state.ts
@@ -0,0 +1,24 @@
+import type { WorkflowStateDefinition } from '@nt-ai-lab/deterministic-agent-workflow-dsl'
+import type { WorkflowState } from './workflow-types'
+
+type StateName = WorkflowState['currentStateMachineState']
+type WorkflowOperation =
+  | 'record-issue'
+  | 'record-branch'
+  | 'record-review'
+  | 'record-pr'
+  | 'record-ci-passed'
+  | 'record-ci-failed'
+  | 'create-pr'
+  | 'verify-feedback-addressed'
+
+type ConcreteStateDefinition = WorkflowStateDefinition<
+  WorkflowState,
+  StateName,
+  WorkflowOperation
+> & { allowIdle?: boolean }
+
+/** @riviere-role domain-service */
+export function defineState(definition: ConcreteStateDefinition): ConcreteStateDefinition {
+  return definition
+}
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/fold-apply-events.spec.ts b/packages/dev-workflow-v2/domain-model/src/domain/fold-apply-events.spec.ts
similarity index 95%
rename from tools/dev-workflow-v2/src/features/workflow/domain/fold-apply-events.spec.ts
rename to packages/dev-workflow-v2/domain-model/src/domain/fold-apply-events.spec.ts
index 84fb960f9..51f82693c 100644
--- a/tools/dev-workflow-v2/src/features/workflow/domain/fold-apply-events.spec.ts
+++ b/packages/dev-workflow-v2/domain-model/src/domain/fold-apply-events.spec.ts
@@ -1,9 +1,9 @@
-import {
-  applyEvents, EMPTY_STATE 
-} from './fold'
+import { applyEvents } from './fold'
 import type { WorkflowEvent } from './workflow-events'
+import { getInitialWorkflowState } from './workflow-types'
 
 const AT = '2026-01-01T00:00:00Z'
+const EMPTY_STATE = getInitialWorkflowState()
 
 describe('applyEvents', () => {
   it('returns EMPTY_STATE for empty event sequence', () => {
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/fold-review-recorded.spec.ts b/packages/dev-workflow-v2/domain-model/src/domain/fold-review-recorded.spec.ts
similarity index 93%
rename from tools/dev-workflow-v2/src/features/workflow/domain/fold-review-recorded.spec.ts
rename to packages/dev-workflow-v2/domain-model/src/domain/fold-review-recorded.spec.ts
index ae27ec66a..3aa9f7d82 100644
--- a/tools/dev-workflow-v2/src/features/workflow/domain/fold-review-recorded.spec.ts
+++ b/packages/dev-workflow-v2/domain-model/src/domain/fold-review-recorded.spec.ts
@@ -1,16 +1,12 @@
-import {
-  applyEvent, EMPTY_STATE 
-} from './fold'
+import { applyEvent } from './fold'
 import type { WorkflowEvent } from './workflow-events'
-import type { WorkflowState } from './workflow-types'
+import { getInitialWorkflowState, type WorkflowState } from './workflow-types'
 
 const AT = '2026-01-01T00:00:00Z'
+const EMPTY_STATE = getInitialWorkflowState()
 
 function makeState(overrides: Partial<WorkflowState>): WorkflowState {
-  return {
-    ...EMPTY_STATE,
-    ...overrides,
-  }
+  return EMPTY_STATE.with(overrides)
 }
 
 describe('applyEvent — review-recorded', () => {
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/fold.spec.ts b/packages/dev-workflow-v2/domain-model/src/domain/fold.spec.ts
similarity index 98%
rename from tools/dev-workflow-v2/src/features/workflow/domain/fold.spec.ts
rename to packages/dev-workflow-v2/domain-model/src/domain/fold.spec.ts
index 93cbc0f66..5b5d8fe8b 100644
--- a/tools/dev-workflow-v2/src/features/workflow/domain/fold.spec.ts
+++ b/packages/dev-workflow-v2/domain-model/src/domain/fold.spec.ts
@@ -1,16 +1,12 @@
-import {
-  applyEvent, EMPTY_STATE 
-} from './fold'
+import { applyEvent } from './fold'
 import type { WorkflowEvent } from './workflow-events'
-import type { WorkflowState } from './workflow-types'
+import { getInitialWorkflowState, type WorkflowState } from './workflow-types'
 
 const AT = '2026-01-01T00:00:00Z'
+const EMPTY_STATE = getInitialWorkflowState()
 
 function makeState(overrides: Partial<WorkflowState>): WorkflowState {
-  return {
-    ...EMPTY_STATE,
-    ...overrides,
-  }
+  return EMPTY_STATE.with(overrides)
 }
 
 describe('EMPTY_STATE', () => {
diff --git a/packages/dev-workflow-v2/domain-model/src/domain/fold.ts b/packages/dev-workflow-v2/domain-model/src/domain/fold.ts
new file mode 100644
index 000000000..fc5f51051
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/src/domain/fold.ts
@@ -0,0 +1,106 @@
+import { z } from 'zod'
+import type { WorkflowEvent } from './workflow-events'
+import { getInitialWorkflowState, WorkflowState } from './workflow-types'
+
+const LIVING_ARCHITECTURE_REVIEW_TYPE_SCHEMA = z.enum([
+  'architecture-review',
+  'code-review',
+  'bug-scanner',
+  'task-check',
+])
+
+function applyRecordedReviewVerdict(
+  state: WorkflowState,
+  event: Extract<WorkflowEvent, { type: 'review-recorded' }>,
+): WorkflowState {
+  const parsedReviewType = LIVING_ARCHITECTURE_REVIEW_TYPE_SCHEMA.safeParse(event.reviewType)
+  if (!parsedReviewType.success) {
+    return state
+  }
+
+  const passed = event.verdict === 'PASS'
+
+  switch (parsedReviewType.data) {
+    case 'architecture-review':
+      return state.with({ architectureReviewPassed: passed })
+    case 'code-review':
+      return state.with({ codeReviewPassed: passed })
+    case 'bug-scanner':
+      return state.with({ bugScannerPassed: passed })
+    case 'task-check':
+      return state.with({ taskCheckPassed: passed })
+  }
+}
+
+function applyTransitioned(
+  state: WorkflowState,
+  event: Extract<WorkflowEvent, { type: 'transitioned' }>,
+): WorkflowState {
+  const newPreBlockedState = event.to === 'BLOCKED' ? event.from : undefined
+  return state.with({
+    ...event.stateOverrides,
+    currentStateMachineState: event.to,
+    preBlockedState: newPreBlockedState,
+  })
+}
+
+function applyReviewEvent(state: WorkflowState, event: WorkflowEvent): WorkflowState | undefined {
+  switch (event.type) {
+    case 'architecture-review-completed':
+      return state.with({ architectureReviewPassed: event.passed })
+    case 'code-review-completed':
+      return state.with({ codeReviewPassed: event.passed })
+    case 'bug-scanner-completed':
+      return state.with({ bugScannerPassed: event.passed })
+    case 'ci-completed':
+      return state.with({ ciPassed: event.passed })
+    case 'feedback-checked':
+      return state.with({
+        feedbackClean: event.clean,
+        feedbackUnresolvedCount: event.unresolvedCount,
+      })
+    case 'feedback-addressed':
+      return state.with({ feedbackAddressed: true })
+    case 'pr-feedback-verification-failed':
+      return state.with({ prFeedbackVerificationFailedReason: event.reason })
+    case 'review-recorded':
+      return applyRecordedReviewVerdict(state, event)
+  }
+
+  return undefined
+}
+
+function applyRecordingEvent(state: WorkflowState, event: WorkflowEvent): WorkflowState {
+  const reviewResult = applyReviewEvent(state, event)
+  if (reviewResult !== undefined) return reviewResult
+  switch (event.type) {
+    case 'issue-recorded':
+      return state.with({ githubIssue: event.issueNumber })
+    case 'branch-recorded':
+      return state.with({ featureBranch: event.branch })
+    case 'pr-recorded':
+      return state.with({
+        prNumber: event.prNumber,
+        prUrl: event.prUrl,
+      })
+    case 'task-check-passed':
+      return state.with({ taskCheckPassed: true })
+    case 'session-started':
+      return state.with({
+        ...(event.transcriptPath !== undefined && { transcriptPath: event.transcriptPath }),
+      })
+    default:
+      return state
+  }
+}
+
+/** @riviere-role domain-service */
+export function applyEvent(state: WorkflowState, event: WorkflowEvent): WorkflowState {
+  if (event.type === 'transitioned') return applyTransitioned(state, event)
+  return applyRecordingEvent(state, event)
+}
+
+/** @riviere-role domain-service */
+export function applyEvents(events: readonly WorkflowEvent[]): WorkflowState {
+  return events.reduce((state, event) => applyEvent(state, event), getInitialWorkflowState())
+}
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/output-messages.spec.ts b/packages/dev-workflow-v2/domain-model/src/domain/output-messages.spec.ts
similarity index 88%
rename from tools/dev-workflow-v2/src/features/workflow/domain/output-messages.spec.ts
rename to packages/dev-workflow-v2/domain-model/src/domain/output-messages.spec.ts
index 0fddebe70..544a6b0bf 100644
--- a/tools/dev-workflow-v2/src/features/workflow/domain/output-messages.spec.ts
+++ b/packages/dev-workflow-v2/domain-model/src/domain/output-messages.spec.ts
@@ -1,6 +1,4 @@
-import {
-  getOperationBody, getTransitionTitle 
-} from './output-messages'
+import { getOperationBody, getTransitionTitle } from './output-messages'
 
 describe('getOperationBody', () => {
   it('capitalizes first word and replaces hyphens with spaces', () => {
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/output-messages.ts b/packages/dev-workflow-v2/domain-model/src/domain/output-messages.ts
similarity index 100%
rename from tools/dev-workflow-v2/src/features/workflow/domain/output-messages.ts
rename to packages/dev-workflow-v2/domain-model/src/domain/output-messages.ts
diff --git a/packages/dev-workflow-v2/domain-model/src/domain/ports/create-pull-request.ts b/packages/dev-workflow-v2/domain-model/src/domain/ports/create-pull-request.ts
new file mode 100644
index 000000000..4f7518263
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/src/domain/ports/create-pull-request.ts
@@ -0,0 +1,9 @@
+/** @riviere-role domain-port */
+export type CreateWorkflowPullRequest = (request: {
+  readonly title: string
+  readonly body: string
+}) => {
+  readonly prNumber: number
+  readonly prUrl: string
+  readonly isDraft: boolean
+}
diff --git a/packages/dev-workflow-v2/domain-model/src/domain/ports/read-git-status.ts b/packages/dev-workflow-v2/domain-model/src/domain/ports/read-git-status.ts
new file mode 100644
index 000000000..556f6d082
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/src/domain/ports/read-git-status.ts
@@ -0,0 +1,8 @@
+/** @riviere-role domain-port */
+export type ReadWorkflowGitStatus = () => {
+  readonly changedFilesVsDefault: readonly string[]
+  readonly currentBranch: string
+  readonly hasCommitsVsDefault: boolean
+  readonly headCommit: string
+  readonly workingTreeClean: boolean
+}
diff --git a/packages/dev-workflow-v2/domain-model/src/domain/ports/read-pull-request-feedback.ts b/packages/dev-workflow-v2/domain-model/src/domain/ports/read-pull-request-feedback.ts
new file mode 100644
index 000000000..393b9ceff
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/src/domain/ports/read-pull-request-feedback.ts
@@ -0,0 +1,18 @@
+/** @riviere-role domain-port */
+export type ReadWorkflowPullRequestFeedback = (prNumber: number) => {
+  readonly reviewDecision: string | null
+  readonly coderabbitReviewSeen: boolean
+  readonly unresolvedCount: number
+  readonly threads: readonly {
+    readonly id: string
+    readonly isResolved: boolean
+    readonly isOutdated: boolean
+    readonly path: string | null
+    readonly line: number | null
+    readonly comments: readonly {
+      readonly author: { readonly login: string } | null
+      readonly body: string
+      readonly url?: string
+    }[]
+  }[]
+}
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/pull-request-description.spec.ts b/packages/dev-workflow-v2/domain-model/src/domain/pull-request-description.spec.ts
similarity index 100%
rename from tools/dev-workflow-v2/src/features/workflow/domain/pull-request-description.spec.ts
rename to packages/dev-workflow-v2/domain-model/src/domain/pull-request-description.spec.ts
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/pull-request-description.ts b/packages/dev-workflow-v2/domain-model/src/domain/pull-request-description.ts
similarity index 91%
rename from tools/dev-workflow-v2/src/features/workflow/domain/pull-request-description.ts
rename to packages/dev-workflow-v2/domain-model/src/domain/pull-request-description.ts
index 86c824fe3..c0de04e05 100644
--- a/tools/dev-workflow-v2/src/features/workflow/domain/pull-request-description.ts
+++ b/packages/dev-workflow-v2/domain-model/src/domain/pull-request-description.ts
@@ -17,8 +17,7 @@ const PULL_REQUEST_OPTION_NAMES: readonly string[] = [
   '--notes',
 ]
 
-/** @riviere-role value-object */
-export type PullRequestDescriptionInput = {
+type PullRequestDescriptionInput = {
   readonly title: string
   readonly description: string
   readonly problem: string
@@ -29,31 +28,25 @@ export type PullRequestDescriptionInput = {
   readonly notes: string
 }
 
-/** @riviere-role value-object */
-export type PullRequestCreationRequest = {
-  readonly title: string
-  readonly body: string
-}
-
 type PullRequestOptionParseResult =
   | {
-    readonly ok: true
-    readonly input: PullRequestDescriptionInput
-  }
+      readonly ok: true
+      readonly input: PullRequestDescriptionInput
+    }
   | {
-    readonly ok: false
-    readonly reason: string
-  }
+      readonly ok: false
+      readonly reason: string
+    }
 
 type OptionValueResult =
   | {
-    readonly ok: true
-    readonly value: string
-  }
+      readonly ok: true
+      readonly value: string
+    }
   | {
-    readonly ok: false
-    readonly reason: string
-  }
+      readonly ok: false
+      readonly reason: string
+    }
 
 type PullRequestOptionValueResults = {
   readonly title: OptionValueResult
@@ -139,7 +132,7 @@ function readSuccessfulOptionValue(optionValueResult: OptionValueResult): string
 export function buildPullRequestCreationRequest(
   input: PullRequestDescriptionInput,
   githubIssue: number,
-): PullRequestCreationRequest {
+): Parameters<import('./ports/create-pull-request').CreateWorkflowPullRequest>[0] {
   return {
     title: input.title,
     body: [
@@ -163,7 +156,7 @@ function validateOptionTokens(commandTokens: readonly string[]): string | undefi
     return `Expected value after ${String(commandTokens.at(-1))}.`
   }
 
-  const optionTokens = commandTokens.filter((commandToken, index) => index % 2 === 0)
+  const optionTokens = commandTokens.filter((_commandToken, index) => index % 2 === 0)
   const unknownOption = optionTokens.find(
     (optionToken) => !PULL_REQUEST_OPTION_NAMES.includes(optionToken),
   )
diff --git a/packages/dev-workflow-v2/domain-model/src/domain/registry.ts b/packages/dev-workflow-v2/domain-model/src/domain/registry.ts
new file mode 100644
index 000000000..ddecba7cf
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/src/domain/registry.ts
@@ -0,0 +1,32 @@
+import { parseStateName } from './workflow-types'
+import { defineImplementingState } from './states/implementing'
+import { defineReviewingState } from './states/reviewing'
+import { defineSubmittingPrState } from './states/submitting-pr'
+import { defineAwaitingCiState } from './states/awaiting-ci'
+import { defineAwaitingPrFeedbackState } from './states/awaiting-pr-feedback'
+import { defineAddressingFeedbackState } from './states/addressing-feedback'
+import { defineReflectingState } from './states/reflecting'
+import { defineCompleteState } from './states/complete'
+import { defineBlockedState } from './states/blocked'
+
+const WORKFLOW_REGISTRY = {
+  IMPLEMENTING: defineImplementingState(),
+  REVIEWING: defineReviewingState(),
+  SUBMITTING_PR: defineSubmittingPrState(),
+  AWAITING_CI: defineAwaitingCiState(),
+  AWAITING_PR_FEEDBACK: defineAwaitingPrFeedbackState(),
+  ADDRESSING_FEEDBACK: defineAddressingFeedbackState(),
+  REFLECTING: defineReflectingState(),
+  COMPLETE: defineCompleteState(),
+  BLOCKED: defineBlockedState(),
+}
+
+/** @riviere-role domain-service */
+export function getStateDefinition(state: string) {
+  return WORKFLOW_REGISTRY[parseStateName(state)]
+}
+
+/** @riviere-role domain-service */
+export function getWorkflowRegistry() {
+  return WORKFLOW_REGISTRY
+}
diff --git a/packages/dev-workflow-v2/domain-model/src/domain/state-definitions.spec.ts b/packages/dev-workflow-v2/domain-model/src/domain/state-definitions.spec.ts
new file mode 100644
index 000000000..9b37b85c6
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/src/domain/state-definitions.spec.ts
@@ -0,0 +1,243 @@
+import type { GitInfo } from '@nt-ai-lab/deterministic-agent-workflow-dsl'
+import { defineAddressingFeedbackState } from './states/addressing-feedback'
+import { defineAwaitingCiState } from './states/awaiting-ci'
+import { defineBlockedState } from './states/blocked'
+import { defineImplementingState } from './states/implementing'
+import { defineReviewingState } from './states/reviewing'
+import { defineSubmittingPrState } from './states/submitting-pr'
+import { getInitialWorkflowState } from './workflow-types'
+
+const cleanGit: GitInfo = {
+  currentBranch: 'issue-42',
+  workingTreeClean: true,
+  headCommit: 'abc123',
+  changedFilesVsDefault: [],
+  hasCommitsVsDefault: true,
+}
+
+const addressingFeedback = defineAddressingFeedbackState()
+const awaitingCi = defineAwaitingCiState()
+const blocked = defineBlockedState()
+const implementing = defineImplementingState()
+const reviewing = defineReviewingState()
+const submittingPr = defineSubmittingPrState()
+
+const addressingFeedbackGuard = addressingFeedback.transitionGuard
+const awaitingCiGuard = awaitingCi.transitionGuard
+const blockedGuard = blocked.transitionGuard
+const implementingGuard = implementing.transitionGuard
+const reviewingGuard = reviewing.transitionGuard
+const submittingPrGuard = submittingPr.transitionGuard
+const addressingFeedbackOnEntry = addressingFeedback.onEntry
+const implementingOnEntry = implementing.onEntry
+
+if (
+  addressingFeedbackGuard === undefined ||
+  awaitingCiGuard === undefined ||
+  blockedGuard === undefined ||
+  implementingGuard === undefined ||
+  reviewingGuard === undefined ||
+  submittingPrGuard === undefined ||
+  addressingFeedbackOnEntry === undefined ||
+  implementingOnEntry === undefined
+) {
+  throw new TypeError('Expected guarded workflow states to define their domain behaviour.')
+}
+
+describe('workflow state definitions', () => {
+  it('requires clean, addressed feedback before returning to review', () => {
+    const baseState = getInitialWorkflowState().with({
+      currentStateMachineState: 'ADDRESSING_FEEDBACK',
+    })
+    const context = {
+      from: 'ADDRESSING_FEEDBACK' as const,
+      to: 'REVIEWING' as const,
+      gitInfo: cleanGit,
+    }
+
+    expect(addressingFeedbackGuard({ ...context, state: baseState })).toMatchObject({
+      pass: false,
+      reason: expect.stringContaining('Feedback not addressed'),
+    })
+    expect(
+      addressingFeedbackGuard({
+        ...context,
+        state: baseState.with({ feedbackAddressed: true, feedbackClean: false }),
+      }),
+    ).toMatchObject({ pass: false, reason: expect.stringContaining('not yet clear') })
+    expect(
+      addressingFeedbackGuard({
+        ...context,
+        state: baseState.with({ feedbackAddressed: true, feedbackClean: true }),
+      }),
+    ).toStrictEqual({ pass: true })
+  })
+
+  it('resets feedback status when feedback addressing begins', () => {
+    const state = getInitialWorkflowState().with({
+      feedbackAddressed: true,
+      feedbackClean: true,
+    })
+
+    expect(
+      addressingFeedbackOnEntry(state, {
+        state,
+        gitInfo: cleanGit,
+        from: 'AWAITING_PR_FEEDBACK',
+        to: 'ADDRESSING_FEEDBACK',
+      }),
+    ).toMatchObject({
+      feedbackAddressed: false,
+      feedbackClean: false,
+    })
+  })
+
+  it('routes the awaiting-CI state according to the recorded CI result', () => {
+    const state = getInitialWorkflowState().with({ currentStateMachineState: 'AWAITING_CI' })
+
+    expect(
+      awaitingCiGuard({
+        state,
+        gitInfo: cleanGit,
+        from: 'AWAITING_CI',
+        to: 'AWAITING_PR_FEEDBACK',
+      }),
+    ).toMatchObject({ pass: false, reason: expect.stringContaining('CI not passed') })
+    expect(
+      awaitingCiGuard({
+        state: state.with({ ciPassed: true }),
+        gitInfo: cleanGit,
+        from: 'AWAITING_CI',
+        to: 'IMPLEMENTING',
+      }),
+    ).toMatchObject({ pass: false, reason: expect.stringContaining('CI passed') })
+    expect(
+      awaitingCiGuard({
+        state: state.with({ ciPassed: true }),
+        gitInfo: cleanGit,
+        from: 'AWAITING_CI',
+        to: 'AWAITING_PR_FEEDBACK',
+      }),
+    ).toStrictEqual({ pass: true })
+  })
+
+  it('only leaves BLOCKED by returning to the pre-blocked state', () => {
+    const state = getInitialWorkflowState().with({
+      currentStateMachineState: 'BLOCKED',
+      preBlockedState: 'REVIEWING',
+    })
+
+    expect(
+      blockedGuard({ state, gitInfo: cleanGit, from: 'BLOCKED', to: 'IMPLEMENTING' }),
+    ).toMatchObject({ pass: false, reason: expect.stringContaining('Must return') })
+    expect(
+      blockedGuard({ state, gitInfo: cleanGit, from: 'BLOCKED', to: 'REVIEWING' }),
+    ).toStrictEqual({ pass: true })
+  })
+
+  it('requires committed work and a recorded issue before review', () => {
+    const state = getInitialWorkflowState()
+    const context = { from: 'IMPLEMENTING' as const, to: 'REVIEWING' as const }
+
+    expect(
+      implementingGuard({
+        ...context,
+        state,
+        gitInfo: { ...cleanGit, hasCommitsVsDefault: false },
+      }),
+    ).toMatchObject({ pass: false, reason: expect.stringContaining('No commits') })
+    expect(
+      implementingGuard({
+        ...context,
+        state,
+        gitInfo: { ...cleanGit, workingTreeClean: false },
+      }),
+    ).toMatchObject({ pass: false, reason: expect.stringContaining('not clean') })
+    expect(implementingGuard({ ...context, state, gitInfo: cleanGit })).toMatchObject({
+      pass: false,
+      reason: expect.stringContaining('No issue recorded'),
+    })
+    expect(
+      implementingGuard({ ...context, state: state.with({ githubIssue: 42 }), gitInfo: cleanGit }),
+    ).toStrictEqual({ pass: true })
+  })
+
+  it('resets delivery checks when implementation resumes', () => {
+    const state = getInitialWorkflowState().with({
+      architectureReviewPassed: true,
+      codeReviewPassed: true,
+      bugScannerPassed: true,
+      taskCheckPassed: true,
+      ciPassed: true,
+      feedbackClean: true,
+      feedbackAddressed: true,
+    })
+
+    expect(
+      implementingOnEntry(state, {
+        state,
+        gitInfo: cleanGit,
+        from: 'REVIEWING',
+        to: 'IMPLEMENTING',
+      }),
+    ).toMatchObject({
+      architectureReviewPassed: false,
+      codeReviewPassed: false,
+      bugScannerPassed: false,
+      taskCheckPassed: false,
+      ciPassed: false,
+      feedbackClean: false,
+      feedbackAddressed: false,
+    })
+  })
+
+  it('requires every applicable review before submitting a pull request', () => {
+    const reviewed = getInitialWorkflowState().with({
+      currentStateMachineState: 'REVIEWING',
+      architectureReviewPassed: true,
+      codeReviewPassed: true,
+      bugScannerPassed: true,
+    })
+
+    expect(
+      reviewingGuard({
+        state: reviewed.with({ githubIssue: 42 }),
+        gitInfo: cleanGit,
+        from: 'REVIEWING',
+        to: 'SUBMITTING_PR',
+      }),
+    ).toMatchObject({ pass: false, reason: expect.stringContaining('task-check') })
+    expect(
+      reviewingGuard({
+        state: reviewed,
+        gitInfo: cleanGit,
+        from: 'REVIEWING',
+        to: 'SUBMITTING_PR',
+      }),
+    ).toStrictEqual({ pass: true })
+    expect(
+      reviewingGuard({
+        state: reviewed,
+        gitInfo: cleanGit,
+        from: 'REVIEWING',
+        to: 'IMPLEMENTING',
+      }),
+    ).toMatchObject({ pass: false, reason: expect.stringContaining('All reviews passed') })
+  })
+
+  it('requires a recorded pull request before awaiting CI', () => {
+    const state = getInitialWorkflowState().with({ currentStateMachineState: 'SUBMITTING_PR' })
+
+    expect(
+      submittingPrGuard({ state, gitInfo: cleanGit, from: 'SUBMITTING_PR', to: 'AWAITING_CI' }),
+    ).toMatchObject({ pass: false, reason: expect.stringContaining('prNumber not set') })
+    expect(
+      submittingPrGuard({
+        state: state.with({ prNumber: 42 }),
+        gitInfo: cleanGit,
+        from: 'SUBMITTING_PR',
+        to: 'AWAITING_CI',
+      }),
+    ).toStrictEqual({ pass: true })
+  })
+})
diff --git a/packages/dev-workflow-v2/domain-model/src/domain/states/addressing-feedback.ts b/packages/dev-workflow-v2/domain-model/src/domain/states/addressing-feedback.ts
new file mode 100644
index 000000000..89cf6b23b
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/src/domain/states/addressing-feedback.ts
@@ -0,0 +1,31 @@
+import type { WorkflowState } from '../workflow-types'
+import { defineState } from '../define-state'
+import { pass, fail } from '@nt-ai-lab/deterministic-agent-workflow-dsl'
+
+/** @riviere-role domain-service */
+export function defineAddressingFeedbackState() {
+  return defineState({
+    emoji: '🔧',
+    agentInstructions: 'states/addressing_feedback.md',
+    canTransitionTo: ['REVIEWING', 'BLOCKED'],
+    allowedWorkflowOperations: ['verify-feedback-addressed'],
+    forbidden: { write: true },
+
+    transitionGuard: (ctx) => {
+      if (ctx.to === 'BLOCKED') return pass()
+      if (!ctx.state.feedbackAddressed)
+        return fail('Feedback not addressed. Run verify-feedback-addressed first.')
+      if (!ctx.state.feedbackClean)
+        return fail(
+          'PR feedback is not yet clear. Resolve all feedback, ensure no CHANGES_REQUESTED review remains, then run verify-feedback-addressed again.',
+        )
+      return pass()
+    },
+
+    onEntry: (state: WorkflowState): WorkflowState =>
+      state.with({
+        feedbackAddressed: false,
+        feedbackClean: false,
+      }),
+  })
+}
diff --git a/packages/dev-workflow-v2/domain-model/src/domain/states/awaiting-ci.ts b/packages/dev-workflow-v2/domain-model/src/domain/states/awaiting-ci.ts
new file mode 100644
index 000000000..d10247b2c
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/src/domain/states/awaiting-ci.ts
@@ -0,0 +1,22 @@
+import { defineState } from '../define-state'
+import { pass, fail } from '@nt-ai-lab/deterministic-agent-workflow-dsl'
+
+/** @riviere-role domain-service */
+export function defineAwaitingCiState() {
+  return defineState({
+    emoji: '⏳',
+    agentInstructions: 'states/awaiting_ci.md',
+    canTransitionTo: ['AWAITING_PR_FEEDBACK', 'IMPLEMENTING', 'BLOCKED'],
+    allowedWorkflowOperations: ['record-ci-passed', 'record-ci-failed'],
+    forbidden: { write: true },
+    allowForbidden: { bash: ['gh pr checks'] },
+
+    transitionGuard: (ctx) => {
+      if (ctx.to === 'AWAITING_PR_FEEDBACK' && !ctx.state.ciPassed)
+        return fail('CI not passed. Run record-ci-passed first.')
+      if (ctx.to === 'IMPLEMENTING' && ctx.state.ciPassed)
+        return fail('CI passed. Transition to AWAITING_PR_FEEDBACK, not IMPLEMENTING.')
+      return pass()
+    },
+  })
+}
diff --git a/packages/dev-workflow-v2/domain-model/src/domain/states/awaiting-pr-feedback.ts b/packages/dev-workflow-v2/domain-model/src/domain/states/awaiting-pr-feedback.ts
new file mode 100644
index 000000000..8d26ef064
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/src/domain/states/awaiting-pr-feedback.ts
@@ -0,0 +1,12 @@
+import { defineState } from '../define-state'
+
+/** @riviere-role domain-service */
+export function defineAwaitingPrFeedbackState() {
+  return defineState({
+    emoji: '💬',
+    agentInstructions: 'states/awaiting_pr_feedback.md',
+    canTransitionTo: ['ADDRESSING_FEEDBACK', 'REFLECTING'],
+    allowedWorkflowOperations: [],
+    forbidden: { write: true },
+  })
+}
diff --git a/packages/dev-workflow-v2/domain-model/src/domain/states/blocked.ts b/packages/dev-workflow-v2/domain-model/src/domain/states/blocked.ts
new file mode 100644
index 000000000..42f238cf6
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/src/domain/states/blocked.ts
@@ -0,0 +1,33 @@
+import { defineState } from '../define-state'
+import { pass, fail } from '@nt-ai-lab/deterministic-agent-workflow-dsl'
+
+/** @riviere-role domain-service */
+export function defineBlockedState() {
+  return defineState({
+    emoji: '⚠️',
+    agentInstructions: 'states/blocked.md',
+    allowIdle: true,
+    forbidden: { write: true },
+    canTransitionTo: [
+      'IMPLEMENTING',
+      'REVIEWING',
+      'SUBMITTING_PR',
+      'AWAITING_CI',
+      'AWAITING_PR_FEEDBACK',
+      'ADDRESSING_FEEDBACK',
+      'REFLECTING',
+    ],
+    allowedWorkflowOperations: [],
+
+    transitionGuard: (ctx) => {
+      const preBlockedState = ctx.state.preBlockedState
+      if (ctx.to !== preBlockedState) {
+        /* v8 ignore next 4 */
+        return fail(
+          `Cannot transition from BLOCKED to ${ctx.to}. Must return to pre-blocked state: ${preBlockedState ?? 'unknown'}.`,
+        )
+      }
+      return pass()
+    },
+  })
+}
diff --git a/packages/dev-workflow-v2/domain-model/src/domain/states/complete.ts b/packages/dev-workflow-v2/domain-model/src/domain/states/complete.ts
new file mode 100644
index 000000000..77a30e4f3
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/src/domain/states/complete.ts
@@ -0,0 +1,13 @@
+import { defineState } from '../define-state'
+
+/** @riviere-role domain-service */
+export function defineCompleteState() {
+  return defineState({
+    emoji: '✅',
+    agentInstructions: 'states/complete.md',
+    allowIdle: true,
+    canTransitionTo: [],
+    allowedWorkflowOperations: [],
+    forbidden: { write: true },
+  })
+}
diff --git a/packages/dev-workflow-v2/domain-model/src/domain/states/implementing.ts b/packages/dev-workflow-v2/domain-model/src/domain/states/implementing.ts
new file mode 100644
index 000000000..3a3a2201d
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/src/domain/states/implementing.ts
@@ -0,0 +1,36 @@
+import type { WorkflowState } from '../workflow-types'
+import { defineState } from '../define-state'
+import { pass, fail } from '@nt-ai-lab/deterministic-agent-workflow-dsl'
+
+/** @riviere-role domain-service */
+export function defineImplementingState() {
+  return defineState({
+    emoji: '🔨',
+    agentInstructions: 'states/implementing.md',
+    canTransitionTo: ['REVIEWING', 'BLOCKED'],
+    allowedWorkflowOperations: ['record-issue', 'record-branch'],
+    forbidden: { write: true },
+
+    transitionGuard: (ctx) => {
+      /* v8 ignore next */
+      if (ctx.to === 'BLOCKED') return pass()
+      if (!ctx.gitInfo.hasCommitsVsDefault)
+        return fail('No commits beyond default branch. Write code and commit before reviewing.')
+      if (!ctx.gitInfo.workingTreeClean)
+        return fail('Working tree is not clean. Commit all changes before transitioning.')
+      if (!ctx.state.githubIssue) return fail('No issue recorded. Run record-issue first.')
+      return pass()
+    },
+
+    onEntry: (state: WorkflowState): WorkflowState =>
+      state.with({
+        architectureReviewPassed: false,
+        codeReviewPassed: false,
+        bugScannerPassed: false,
+        taskCheckPassed: false,
+        ciPassed: false,
+        feedbackClean: false,
+        feedbackAddressed: false,
+      }),
+  })
+}
diff --git a/packages/dev-workflow-v2/domain-model/src/domain/states/reflecting.ts b/packages/dev-workflow-v2/domain-model/src/domain/states/reflecting.ts
new file mode 100644
index 000000000..40ac7d17f
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/src/domain/states/reflecting.ts
@@ -0,0 +1,12 @@
+import { defineState } from '../define-state'
+
+/** @riviere-role domain-service */
+export function defineReflectingState() {
+  return defineState({
+    emoji: '🪞',
+    agentInstructions: 'states/reflecting.md',
+    canTransitionTo: ['COMPLETE', 'BLOCKED'],
+    allowedWorkflowOperations: [],
+    forbidden: { write: true },
+  })
+}
diff --git a/packages/dev-workflow-v2/domain-model/src/domain/states/reviewing.ts b/packages/dev-workflow-v2/domain-model/src/domain/states/reviewing.ts
new file mode 100644
index 000000000..3e245c3a1
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/src/domain/states/reviewing.ts
@@ -0,0 +1,32 @@
+import { defineState } from '../define-state'
+import { pass, fail } from '@nt-ai-lab/deterministic-agent-workflow-dsl'
+
+/** @riviere-role domain-service */
+export function defineReviewingState() {
+  return defineState({
+    emoji: '📋',
+    agentInstructions: 'states/reviewing.md',
+    canTransitionTo: ['SUBMITTING_PR', 'IMPLEMENTING', 'BLOCKED'],
+    forbidden: { write: true },
+    allowedWorkflowOperations: ['record-review'],
+
+    transitionGuard: (ctx) => {
+      const taskCheckRequired = ctx.state.githubIssue !== undefined
+      const allPassed =
+        ctx.state.architectureReviewPassed &&
+        ctx.state.codeReviewPassed &&
+        ctx.state.bugScannerPassed &&
+        (!taskCheckRequired || ctx.state.taskCheckPassed)
+
+      if (ctx.to === 'SUBMITTING_PR' && !allPassed)
+        return fail(
+          taskCheckRequired
+            ? 'Not all reviews passed. Each of architecture-review, code-review, bug-scanner, and task-check must pass.'
+            : 'Not all reviews passed. Each of architecture-review, code-review, and bug-scanner must pass.',
+        )
+      if (ctx.to === 'IMPLEMENTING' && allPassed)
+        return fail('All reviews passed. Transition to SUBMITTING_PR, not IMPLEMENTING.')
+      return pass()
+    },
+  })
+}
diff --git a/packages/dev-workflow-v2/domain-model/src/domain/states/submitting-pr.ts b/packages/dev-workflow-v2/domain-model/src/domain/states/submitting-pr.ts
new file mode 100644
index 000000000..ed23304ca
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/src/domain/states/submitting-pr.ts
@@ -0,0 +1,20 @@
+import { defineState } from '../define-state'
+import { pass, fail } from '@nt-ai-lab/deterministic-agent-workflow-dsl'
+
+/** @riviere-role domain-service */
+export function defineSubmittingPrState() {
+  return defineState({
+    emoji: '🚀',
+    agentInstructions: 'states/submitting_pr.md',
+    canTransitionTo: ['AWAITING_CI', 'BLOCKED'],
+    allowedWorkflowOperations: ['record-pr', 'create-pr'],
+    forbidden: { write: true },
+
+    allowForbidden: { bash: ['git push'] },
+
+    transitionGuard: (ctx) => {
+      if (!ctx.state.prNumber) return fail('prNumber not set. Run record-pr first.')
+      return pass()
+    },
+  })
+}
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/workflow-addressing-feedback.spec.ts b/packages/dev-workflow-v2/domain-model/src/domain/workflow-addressing-feedback.spec.ts
similarity index 94%
rename from tools/dev-workflow-v2/src/features/workflow/domain/workflow-addressing-feedback.spec.ts
rename to packages/dev-workflow-v2/domain-model/src/domain/workflow-addressing-feedback.spec.ts
index de92528cc..0746b8238 100644
--- a/tools/dev-workflow-v2/src/features/workflow/domain/workflow-addressing-feedback.spec.ts
+++ b/packages/dev-workflow-v2/domain-model/src/domain/workflow-addressing-feedback.spec.ts
@@ -1,12 +1,13 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import {
   spec,
   eventsToAddressingFeedback,
   unresolvedThread,
-} from './fixtures/workflow-test-fixtures'
-import { addressingFeedbackState } from './states/addressing-feedback'
+} from './__fixtures__/workflow-test-fixtures'
+import { defineAddressingFeedbackState } from './states/addressing-feedback'
+
+const addressingFeedbackState = defineAddressingFeedbackState()
+import { WorkflowState } from './workflow-types'
 
 function addressingTransitionGuard(): NonNullable<typeof addressingFeedbackState.transitionGuard> {
   const guard = addressingFeedbackState.transitionGuard
@@ -149,7 +150,7 @@ describe('ADDRESSING_FEEDBACK workflow behavior', () => {
     const guard = addressingTransitionGuard()
     const entered = spec.given(...eventsToAddressingFeedback()).when((wf) => wf.getState())
     const guardResult = guard({
-      state: {
+      state: WorkflowState.parse({
         currentStateMachineState: 'ADDRESSING_FEEDBACK',
         architectureReviewPassed: false,
         codeReviewPassed: false,
@@ -158,7 +159,7 @@ describe('ADDRESSING_FEEDBACK workflow behavior', () => {
         ciPassed: false,
         feedbackClean: false,
         feedbackAddressed: true,
-      },
+      }),
       gitInfo: {
         currentBranch: 'issue-42',
         workingTreeClean: true,
@@ -183,7 +184,7 @@ describe('ADDRESSING_FEEDBACK workflow behavior', () => {
   it('allows transition to BLOCKED even when feedback is not yet addressed', () => {
     const guard = addressingTransitionGuard()
     const guardResult = guard({
-      state: {
+      state: WorkflowState.parse({
         currentStateMachineState: 'ADDRESSING_FEEDBACK',
         architectureReviewPassed: false,
         codeReviewPassed: false,
@@ -192,7 +193,7 @@ describe('ADDRESSING_FEEDBACK workflow behavior', () => {
         ciPassed: false,
         feedbackClean: false,
         feedbackAddressed: false,
-      },
+      }),
       gitInfo: {
         currentBranch: 'issue-42',
         workingTreeClean: true,
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/workflow-event-types.spec.ts b/packages/dev-workflow-v2/domain-model/src/domain/workflow-event-types.spec.ts
similarity index 100%
rename from tools/dev-workflow-v2/src/features/workflow/domain/workflow-event-types.spec.ts
rename to packages/dev-workflow-v2/domain-model/src/domain/workflow-event-types.spec.ts
diff --git a/packages/dev-workflow-v2/domain-model/src/domain/workflow-events.spec.ts b/packages/dev-workflow-v2/domain-model/src/domain/workflow-events.spec.ts
new file mode 100644
index 000000000..6fc5c343b
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/src/domain/workflow-events.spec.ts
@@ -0,0 +1,445 @@
+import { parseWorkflowEvent, type WorkflowEvent } from './workflow-events'
+
+const AT = '2026-01-01T00:00:00Z'
+
+describe('parseWorkflowEvent — session-started', () => {
+  it('accepts valid payload', () => {
+    const result: WorkflowEvent = parseWorkflowEvent({
+      type: 'session-started',
+      at: AT,
+    })
+    expect(result.type).toStrictEqual('session-started')
+  })
+
+  it('accepts optional repository', () => {
+    const result = parseWorkflowEvent({
+      type: 'session-started',
+      at: AT,
+      repository: 'owner/repo',
+    })
+    expect(result.type).toStrictEqual('session-started')
+  })
+})
+
+describe('parseWorkflowEvent — issue-recorded', () => {
+  it('accepts valid payload', () => {
+    const result = parseWorkflowEvent({
+      type: 'issue-recorded',
+      at: AT,
+      issueNumber: 42,
+    })
+    expect(result.type).toStrictEqual('issue-recorded')
+  })
+
+  it('rejects missing issueNumber', () => {
+    expect(() =>
+      parseWorkflowEvent({
+        type: 'issue-recorded',
+        at: AT,
+      }),
+    ).toThrow('Required')
+  })
+})
+
+describe('parseWorkflowEvent — branch-recorded', () => {
+  it('accepts valid payload', () => {
+    const result = parseWorkflowEvent({
+      type: 'branch-recorded',
+      at: AT,
+      branch: 'feature/foo',
+    })
+    expect(result.type).toStrictEqual('branch-recorded')
+  })
+
+  it('rejects missing branch', () => {
+    expect(() =>
+      parseWorkflowEvent({
+        type: 'branch-recorded',
+        at: AT,
+      }),
+    ).toThrow('Required')
+  })
+})
+
+describe('parseWorkflowEvent — architecture-review-completed', () => {
+  it('accepts passed payload', () => {
+    const result = parseWorkflowEvent({
+      type: 'architecture-review-completed',
+      at: AT,
+      passed: true,
+    })
+    expect(result.type).toStrictEqual('architecture-review-completed')
+  })
+
+  it('rejects missing passed', () => {
+    expect(() =>
+      parseWorkflowEvent({
+        type: 'architecture-review-completed',
+        at: AT,
+      }),
+    ).toThrow('Required')
+  })
+})
+
+describe('parseWorkflowEvent — code-review-completed', () => {
+  it('accepts passed payload', () => {
+    const result = parseWorkflowEvent({
+      type: 'code-review-completed',
+      at: AT,
+      passed: true,
+    })
+    expect(result.type).toStrictEqual('code-review-completed')
+  })
+
+  it('rejects missing passed', () => {
+    expect(() =>
+      parseWorkflowEvent({
+        type: 'code-review-completed',
+        at: AT,
+      }),
+    ).toThrow('Required')
+  })
+})
+
+describe('parseWorkflowEvent — bug-scanner-completed', () => {
+  it('accepts passed payload', () => {
+    const result = parseWorkflowEvent({
+      type: 'bug-scanner-completed',
+      at: AT,
+      passed: true,
+    })
+    expect(result.type).toStrictEqual('bug-scanner-completed')
+  })
+
+  it('rejects missing passed', () => {
+    expect(() =>
+      parseWorkflowEvent({
+        type: 'bug-scanner-completed',
+        at: AT,
+      }),
+    ).toThrow('Required')
+  })
+})
+
+describe('parseWorkflowEvent — pr-recorded', () => {
+  it('accepts valid payload', () => {
+    const result = parseWorkflowEvent({
+      type: 'pr-recorded',
+      at: AT,
+      prNumber: 7,
+    })
+    expect(result.type).toStrictEqual('pr-recorded')
+  })
+
+  it('accepts optional prUrl', () => {
+    const result = parseWorkflowEvent({
+      type: 'pr-recorded',
+      at: AT,
+      prNumber: 7,
+      prUrl: 'https://github.com/x/y/pull/7',
+    })
+    expect(result.type).toStrictEqual('pr-recorded')
+  })
+
+  it('rejects missing prNumber', () => {
+    expect(() =>
+      parseWorkflowEvent({
+        type: 'pr-recorded',
+        at: AT,
+      }),
+    ).toThrow('Required')
+  })
+})
+
+describe('parseWorkflowEvent — ci-completed', () => {
+  it('accepts passed payload', () => {
+    const result = parseWorkflowEvent({
+      type: 'ci-completed',
+      at: AT,
+      passed: true,
+    })
+    expect(result.type).toStrictEqual('ci-completed')
+  })
+
+  it('accepts failed payload with output', () => {
+    const result = parseWorkflowEvent({
+      type: 'ci-completed',
+      at: AT,
+      passed: false,
+      output: 'test failures',
+    })
+    expect(result.type).toStrictEqual('ci-completed')
+  })
+
+  it('rejects missing passed', () => {
+    expect(() =>
+      parseWorkflowEvent({
+        type: 'ci-completed',
+        at: AT,
+      }),
+    ).toThrow('Required')
+  })
+})
+
+describe('parseWorkflowEvent — feedback-checked', () => {
+  it('accepts clean payload', () => {
+    const result = parseWorkflowEvent({
+      type: 'feedback-checked',
+      at: AT,
+      clean: true,
+    })
+    expect(result.type).toStrictEqual('feedback-checked')
+  })
+
+  it('accepts dirty payload with unresolvedCount', () => {
+    const result = parseWorkflowEvent({
+      type: 'feedback-checked',
+      at: AT,
+      clean: false,
+      unresolvedCount: 3,
+      reviewDecision: 'CHANGES_REQUESTED',
+    })
+    expect(result.type).toStrictEqual('feedback-checked')
+  })
+
+  it('accepts dirty payload with null reviewDecision', () => {
+    const result = parseWorkflowEvent({
+      type: 'feedback-checked',
+      at: AT,
+      clean: false,
+      unresolvedCount: 0,
+      reviewDecision: null,
+    })
+    expect(result.type).toStrictEqual('feedback-checked')
+  })
+
+  it('rejects missing clean', () => {
+    expect(() =>
+      parseWorkflowEvent({
+        type: 'feedback-checked',
+        at: AT,
+      }),
+    ).toThrow('Required')
+  })
+})
+
+describe('parseWorkflowEvent — feedback-addressed', () => {
+  it('accepts valid payload', () => {
+    const result = parseWorkflowEvent({
+      type: 'feedback-addressed',
+      at: AT,
+    })
+    expect(result.type).toStrictEqual('feedback-addressed')
+  })
+
+  it('rejects missing at', () => {
+    const malformedEvent = { type: 'feedback-addressed', at: AT }
+    Reflect.deleteProperty(malformedEvent, 'at')
+
+    expect(() => parseWorkflowEvent(malformedEvent)).toThrow('Required')
+  })
+})
+
+describe('parseWorkflowEvent — task-check-passed', () => {
+  it('accepts valid payload', () => {
+    const result = parseWorkflowEvent({
+      type: 'task-check-passed',
+      at: AT,
+    })
+    expect(result.type).toStrictEqual('task-check-passed')
+  })
+
+  it('rejects missing at', () => {
+    const malformedEvent = { type: 'task-check-passed', at: AT }
+    Reflect.deleteProperty(malformedEvent, 'at')
+
+    expect(() => parseWorkflowEvent(malformedEvent)).toThrow('Required')
+  })
+})
+
+describe('parseWorkflowEvent — review-recorded', () => {
+  it('accepts pass verdict payload', () => {
+    const result = parseWorkflowEvent({
+      type: 'review-recorded',
+      at: AT,
+      reviewId: 1,
+      reviewType: 'task-check',
+      verdict: 'PASS',
+    })
+    expect(result.type).toStrictEqual('review-recorded')
+  })
+
+  it('accepts fail verdict payload', () => {
+    const result = parseWorkflowEvent({
+      type: 'review-recorded',
+      at: AT,
+      reviewId: 2,
+      reviewType: 'code-review',
+      verdict: 'FAIL',
+    })
+    expect(result.type).toStrictEqual('review-recorded')
+  })
+
+  it('rejects missing reviewType', () => {
+    expect(() =>
+      parseWorkflowEvent({
+        type: 'review-recorded',
+        at: AT,
+        reviewId: 1,
+        verdict: 'PASS',
+      }),
+    ).toThrow('Required')
+  })
+
+  it('rejects unknown verdict', () => {
+    expect(() =>
+      parseWorkflowEvent({
+        type: 'review-recorded',
+        at: AT,
+        reviewId: 1,
+        reviewType: 'task-check',
+        verdict: 'MAYBE',
+      }),
+    ).toThrow('Invalid enum value')
+  })
+})
+
+describe('parseWorkflowEvent — bash-checked', () => {
+  it('accepts valid payload', () => {
+    const result = parseWorkflowEvent({
+      type: 'bash-checked',
+      at: AT,
+      tool: 'Bash',
+      command: 'pnpm test',
+      allowed: true,
+    })
+    expect(result.type).toStrictEqual('bash-checked')
+  })
+
+  it('accepts optional reason', () => {
+    const result = parseWorkflowEvent({
+      type: 'bash-checked',
+      at: AT,
+      tool: 'Bash',
+      command: 'git push',
+      allowed: false,
+      reason: 'forbidden',
+    })
+    expect(result.type).toStrictEqual('bash-checked')
+  })
+
+  it('rejects missing command', () => {
+    expect(() =>
+      parseWorkflowEvent({
+        type: 'bash-checked',
+        at: AT,
+        tool: 'Bash',
+        allowed: true,
+      }),
+    ).toThrow('Required')
+  })
+})
+
+describe('parseWorkflowEvent — write-checked', () => {
+  it('accepts valid payload', () => {
+    const result = parseWorkflowEvent({
+      type: 'write-checked',
+      at: AT,
+      tool: 'Write',
+      filePath: '/test-output/x.ts',
+      allowed: true,
+    })
+    expect(result.type).toStrictEqual('write-checked')
+  })
+
+  it('accepts optional reason', () => {
+    const result = parseWorkflowEvent({
+      type: 'write-checked',
+      at: AT,
+      tool: 'Write',
+      filePath: '/test-output/x.ts',
+      allowed: false,
+      reason: 'blocked',
+    })
+    expect(result.type).toStrictEqual('write-checked')
+  })
+
+  it('rejects missing filePath', () => {
+    expect(() =>
+      parseWorkflowEvent({
+        type: 'write-checked',
+        at: AT,
+        tool: 'Write',
+        allowed: true,
+      }),
+    ).toThrow('Required')
+  })
+})
+
+describe('parseWorkflowEvent — transitioned', () => {
+  it('accepts valid payload', () => {
+    const result = parseWorkflowEvent({
+      type: 'transitioned',
+      at: AT,
+      from: 'IMPLEMENTING',
+      to: 'REVIEWING',
+    })
+    expect(result.type).toStrictEqual('transitioned')
+  })
+
+  it('accepts optional preBlockedState', () => {
+    const result = parseWorkflowEvent({
+      type: 'transitioned',
+      at: AT,
+      from: 'IMPLEMENTING',
+      to: 'BLOCKED',
+      preBlockedState: 'IMPLEMENTING',
+    })
+    expect(result.type).toStrictEqual('transitioned')
+  })
+
+  it('rejects missing from', () => {
+    expect(() =>
+      parseWorkflowEvent({
+        type: 'transitioned',
+        at: AT,
+        to: 'REVIEWING',
+      }),
+    ).toThrow('Required')
+  })
+
+  it('rejects missing to', () => {
+    expect(() =>
+      parseWorkflowEvent({
+        type: 'transitioned',
+        at: AT,
+        from: 'IMPLEMENTING',
+      }),
+    ).toThrow('Required')
+  })
+})
+
+describe('parseWorkflowEvent — discriminant validation', () => {
+  it('rejects unknown type discriminant', () => {
+    expect(() =>
+      parseWorkflowEvent({
+        type: 'unknown-event',
+        at: AT,
+      }),
+    ).toThrow('Invalid discriminator value')
+  })
+
+  it('rejects missing type field', () => {
+    const malformedEvent = { type: 'session-started', at: AT }
+    Reflect.deleteProperty(malformedEvent, 'type')
+
+    expect(() => parseWorkflowEvent(malformedEvent)).toThrow('Invalid discriminator value')
+  })
+
+  it('rejects missing at when type is present', () => {
+    const malformedEvent = { type: 'session-started', at: AT }
+    Reflect.deleteProperty(malformedEvent, 'at')
+
+    expect(() => parseWorkflowEvent(malformedEvent)).toThrow('Required')
+  })
+})
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/workflow-events.ts b/packages/dev-workflow-v2/domain-model/src/domain/workflow-events.ts
similarity index 95%
rename from tools/dev-workflow-v2/src/features/workflow/domain/workflow-events.ts
rename to packages/dev-workflow-v2/domain-model/src/domain/workflow-events.ts
index f50d2542d..51307a85d 100644
--- a/tools/dev-workflow-v2/src/features/workflow/domain/workflow-events.ts
+++ b/packages/dev-workflow-v2/domain-model/src/domain/workflow-events.ts
@@ -1,6 +1,8 @@
 import { z } from 'zod'
 import type { BaseEvent } from '@nt-ai-lab/deterministic-agent-workflow-engine'
-import { STATE_NAME_SCHEMA } from './workflow-types'
+import { getWorkflowStateNameSchema } from './workflow-types'
+
+const STATE_NAME_SCHEMA = getWorkflowStateNameSchema()
 
 const KNOWN_WORKFLOW_EVENT_TYPES = [
   'session-started',
@@ -128,7 +130,7 @@ const WRITE_CHECKED_SCHEMA = z.object({
   reason: z.string().optional(),
 })
 
-export const WORKFLOW_EVENT_SCHEMA = z.discriminatedUnion('type', [
+const WORKFLOW_EVENT_SCHEMA = z.discriminatedUnion('type', [
   SESSION_STARTED_SCHEMA,
   TRANSITIONED_SCHEMA,
   ISSUE_RECORDED_SCHEMA,
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/workflow-feedback-reflecting.spec.ts b/packages/dev-workflow-v2/domain-model/src/domain/workflow-feedback-reflecting.spec.ts
similarity index 98%
rename from tools/dev-workflow-v2/src/features/workflow/domain/workflow-feedback-reflecting.spec.ts
rename to packages/dev-workflow-v2/domain-model/src/domain/workflow-feedback-reflecting.spec.ts
index 5a1daf1f3..b9ccc9d22 100644
--- a/tools/dev-workflow-v2/src/features/workflow/domain/workflow-feedback-reflecting.spec.ts
+++ b/packages/dev-workflow-v2/domain-model/src/domain/workflow-feedback-reflecting.spec.ts
@@ -1,11 +1,9 @@
-import {
-  describe, it, expect, vi 
-} from 'vitest'
+import { describe, it, expect, vi } from 'vitest'
 import {
   makeDeps,
   eventsToAwaitingPrFeedback,
   unresolvedThread,
-} from './fixtures/workflow-test-fixtures'
+} from './__fixtures__/workflow-test-fixtures'
 import { Workflow } from './workflow'
 import { applyEvents } from './fold'
 
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/workflow-hook-checks.spec.ts b/packages/dev-workflow-v2/domain-model/src/domain/workflow-hook-checks.spec.ts
similarity index 88%
rename from tools/dev-workflow-v2/src/features/workflow/domain/workflow-hook-checks.spec.ts
rename to packages/dev-workflow-v2/domain-model/src/domain/workflow-hook-checks.spec.ts
index 7d4684f1c..969090686 100644
--- a/tools/dev-workflow-v2/src/features/workflow/domain/workflow-hook-checks.spec.ts
+++ b/packages/dev-workflow-v2/domain-model/src/domain/workflow-hook-checks.spec.ts
@@ -1,9 +1,7 @@
-import {
-  checkWriteAllowed, isWriteAllowed 
-} from './workflow-predicates'
-import type { WorkflowState } from './workflow-types'
+import { checkWriteAllowed, isWriteAllowed } from './workflow-predicates'
+import { WorkflowState } from './workflow-types'
 
-const BASE_STATE: WorkflowState = {
+const BASE_STATE = WorkflowState.parse({
   currentStateMachineState: 'IMPLEMENTING',
   architectureReviewPassed: false,
   codeReviewPassed: false,
@@ -12,7 +10,7 @@ const BASE_STATE: WorkflowState = {
   ciPassed: false,
   feedbackClean: false,
   feedbackAddressed: false,
-}
+})
 
 describe('checkWriteAllowed predicate', () => {
   it('allows writes to normal files', () => {
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/workflow-implementing.spec.ts b/packages/dev-workflow-v2/domain-model/src/domain/workflow-implementing.spec.ts
similarity index 93%
rename from tools/dev-workflow-v2/src/features/workflow/domain/workflow-implementing.spec.ts
rename to packages/dev-workflow-v2/domain-model/src/domain/workflow-implementing.spec.ts
index 0af922b65..39f003a21 100644
--- a/tools/dev-workflow-v2/src/features/workflow/domain/workflow-implementing.spec.ts
+++ b/packages/dev-workflow-v2/domain-model/src/domain/workflow-implementing.spec.ts
@@ -5,7 +5,7 @@ import {
   transitioned,
   eventsToReviewing,
   codeReviewFailed,
-} from './fixtures/workflow-test-fixtures'
+} from './__fixtures__/workflow-test-fixtures'
 
 describe('Workflow', () => {
   describe('createFresh', () => {
@@ -61,9 +61,7 @@ describe('Workflow', () => {
 
   describe('registerAgent', () => {
     it('returns pass (no-op for single-agent workflow)', () => {
-      const {
-        result, events 
-      } = spec.given().when((wf) => wf.registerAgent('lead', 'agent-1'))
+      const { result, events } = spec.given().when((wf) => wf.registerAgent('lead', 'agent-1'))
       expect(result).toStrictEqual({ pass: true })
       expect(events).toHaveLength(0)
     })
@@ -71,9 +69,7 @@ describe('Workflow', () => {
 
   describe('handleTeammateIdle', () => {
     it('returns pass (no-op for single-agent workflow)', () => {
-      const {
-        result, events 
-      } = spec.given().when((wf) => wf.handleTeammateIdle('agent-1'))
+      const { result, events } = spec.given().when((wf) => wf.handleTeammateIdle('agent-1'))
       expect(result).toStrictEqual({ pass: true })
       expect(events).toHaveLength(0)
     })
@@ -81,9 +77,7 @@ describe('Workflow', () => {
 
   describe('IMPLEMENTING state', () => {
     it('sets githubIssue when record-issue succeeds', () => {
-      const {
-        result, state, events 
-      } = spec
+      const { result, state, events } = spec
         .given()
         .when((wf) => wf.executeRecording('record-issue', 42))
       expect(result).toStrictEqual({ pass: true })
@@ -106,9 +100,7 @@ describe('Workflow', () => {
     })
 
     it('sets featureBranch when record-branch succeeds', () => {
-      const {
-        result, state, events 
-      } = spec
+      const { result, state, events } = spec
         .given()
         .when((wf) => wf.executeRecording('record-branch', 'feature/x'))
       expect(result).toStrictEqual({ pass: true })
diff --git a/packages/dev-workflow-v2/domain-model/src/domain/workflow-pr-feedback-verification-events.spec.ts b/packages/dev-workflow-v2/domain-model/src/domain/workflow-pr-feedback-verification-events.spec.ts
new file mode 100644
index 000000000..6c5a8b863
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/src/domain/workflow-pr-feedback-verification-events.spec.ts
@@ -0,0 +1,28 @@
+import { parseWorkflowEvent } from './workflow-events'
+
+const AT = '2026-01-01T00:00:00Z'
+
+describe('parseWorkflowEvent — pr-feedback-verification-failed', () => {
+  it('accepts failure reason payload', () => {
+    const result = parseWorkflowEvent({
+      type: 'pr-feedback-verification-failed',
+      at: AT,
+      reason: 'CodeRabbit feedback did not appear.',
+    })
+
+    expect(result).toStrictEqual({
+      type: 'pr-feedback-verification-failed',
+      at: AT,
+      reason: 'CodeRabbit feedback did not appear.',
+    })
+  })
+
+  it('rejects missing reason', () => {
+    expect(() =>
+      parseWorkflowEvent({
+        type: 'pr-feedback-verification-failed',
+        at: AT,
+      }),
+    ).toThrow('Required')
+  })
+})
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/workflow-predicates.ts b/packages/dev-workflow-v2/domain-model/src/domain/workflow-predicates.ts
similarity index 100%
rename from tools/dev-workflow-v2/src/features/workflow/domain/workflow-predicates.ts
rename to packages/dev-workflow-v2/domain-model/src/domain/workflow-predicates.ts
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/workflow-reviewing-submitting.spec.ts b/packages/dev-workflow-v2/domain-model/src/domain/workflow-reviewing-submitting.spec.ts
similarity index 96%
rename from tools/dev-workflow-v2/src/features/workflow/domain/workflow-reviewing-submitting.spec.ts
rename to packages/dev-workflow-v2/domain-model/src/domain/workflow-reviewing-submitting.spec.ts
index 1c2eb3a21..5a43cc207 100644
--- a/tools/dev-workflow-v2/src/features/workflow/domain/workflow-reviewing-submitting.spec.ts
+++ b/packages/dev-workflow-v2/domain-model/src/domain/workflow-reviewing-submitting.spec.ts
@@ -7,10 +7,12 @@ import {
   eventsToAwaitingCi,
   makeDeps,
   reviewRecorded,
-} from './fixtures/workflow-test-fixtures'
+} from './__fixtures__/workflow-test-fixtures'
 import { Workflow } from './workflow'
 import { applyEvents } from './fold'
-import { reviewingState } from './states/reviewing'
+import { defineReviewingState } from './states/reviewing'
+
+const reviewingState = defineReviewingState()
 
 const CREATE_PR_OPTIONS = [
   '--title',
@@ -39,10 +41,7 @@ function getReviewingTransitionGuard(): NonNullable<typeof reviewingState.transi
   return transitionGuard
 }
 
-function getFailureReason(result: {
-  readonly pass: boolean;
-  readonly reason?: string 
-}): string {
+function getFailureReason(result: { readonly pass: boolean; readonly reason?: string }): string {
   if (result.pass || result.reason === undefined) {
     throw new WorkflowStateError('Expected failed REVIEWING transition guard result.')
   }
@@ -146,13 +145,12 @@ describe('Workflow', () => {
 
     it('rejects SUBMITTING_PR without task check when no issue is recorded and required reviews failed', () => {
       const result = getReviewingTransitionGuard()({
-        state: {
-          ...Workflow.createFresh(makeDeps()).getState(),
+        state: Workflow.createFresh(makeDeps()).getState().with({
           currentStateMachineState: 'REVIEWING',
           architectureReviewPassed: false,
           codeReviewPassed: false,
           bugScannerPassed: false,
-        },
+        }),
         gitInfo: makeDeps().getGitInfo(),
         from: 'REVIEWING',
         to: 'SUBMITTING_PR',
@@ -167,9 +165,7 @@ describe('Workflow', () => {
 
   describe('SUBMITTING_PR state', () => {
     it('records PR number with URL', () => {
-      const {
-        result, state, events 
-      } = spec
+      const { result, state, events } = spec
         .given(...eventsToSubmittingPr())
         .when((wf) => wf.executeRecording('record-pr', 99, 'https://github.com/x/y/pull/99'))
       expect(result).toStrictEqual({ pass: true })
@@ -186,9 +182,7 @@ describe('Workflow', () => {
     })
 
     it('records PR number without URL', () => {
-      const {
-        result, state, events 
-      } = spec
+      const { result, state, events } = spec
         .given(...eventsToSubmittingPr())
         .when((wf) => wf.executeRecording('record-pr', 99))
       expect(result).toStrictEqual({ pass: true })
@@ -357,9 +351,7 @@ describe('Workflow', () => {
 
   describe('AWAITING_CI state', () => {
     it('records CI passed', () => {
-      const {
-        result, state 
-      } = spec
+      const { result, state } = spec
         .given(...eventsToAwaitingCi())
         .when((wf) => wf.executeRecording('record-ci-passed'))
       expect(result).toStrictEqual({ pass: true })
@@ -367,9 +359,7 @@ describe('Workflow', () => {
     })
 
     it('records CI failed', () => {
-      const {
-        result, state 
-      } = spec
+      const { result, state } = spec
         .given(...eventsToAwaitingCi())
         .when((wf) => wf.executeRecording('record-ci-failed', 'test failures'))
       expect(result).toStrictEqual({ pass: true })
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/workflow-types.spec.ts b/packages/dev-workflow-v2/domain-model/src/domain/workflow-types.spec.ts
similarity index 94%
rename from tools/dev-workflow-v2/src/features/workflow/domain/workflow-types.spec.ts
rename to packages/dev-workflow-v2/domain-model/src/domain/workflow-types.spec.ts
index 62c464224..31537fa89 100644
--- a/tools/dev-workflow-v2/src/features/workflow/domain/workflow-types.spec.ts
+++ b/packages/dev-workflow-v2/domain-model/src/domain/workflow-types.spec.ts
@@ -1,7 +1,11 @@
 import {
-  createWorkflowStateSchema, STATE_NAME_SCHEMA, STATE_NAMES 
+  createWorkflowStateSchema,
+  getWorkflowStateNameSchema,
+  getWorkflowStateNames,
 } from './workflow-types'
 
+const STATE_NAMES = getWorkflowStateNames()
+const STATE_NAME_SCHEMA = getWorkflowStateNameSchema()
 const workflowStateSchema = createWorkflowStateSchema(STATE_NAMES)
 
 describe('STATE_NAME_SCHEMA', () => {
diff --git a/packages/dev-workflow-v2/domain-model/src/domain/workflow-types.ts b/packages/dev-workflow-v2/domain-model/src/domain/workflow-types.ts
new file mode 100644
index 000000000..ce7768d96
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/src/domain/workflow-types.ts
@@ -0,0 +1,129 @@
+import { z } from 'zod'
+
+const STATE_NAMES = [
+  'IMPLEMENTING',
+  'REVIEWING',
+  'SUBMITTING_PR',
+  'AWAITING_CI',
+  'AWAITING_PR_FEEDBACK',
+  'ADDRESSING_FEEDBACK',
+  'REFLECTING',
+  'COMPLETE',
+  'BLOCKED',
+] as const
+
+type StateName = (typeof STATE_NAMES)[number]
+
+const STATE_NAME_SCHEMA = z.enum(STATE_NAMES)
+
+/** @riviere-role domain-service */
+export function createWorkflowStateSchema<T extends readonly [string, ...string[]]>(stateNames: T) {
+  const stateNameSchema = z.enum(stateNames)
+  return z.object({
+    currentStateMachineState: stateNameSchema,
+    githubIssue: z.number().int().positive().optional(),
+    featureBranch: z.string().optional(),
+    prNumber: z.number().int().positive().optional(),
+    prUrl: z.string().optional(),
+    architectureReviewPassed: z.boolean(),
+    codeReviewPassed: z.boolean(),
+    bugScannerPassed: z.boolean(),
+    taskCheckPassed: z.boolean(),
+    ciPassed: z.boolean(),
+    feedbackClean: z.boolean(),
+    feedbackAddressed: z.boolean(),
+    feedbackUnresolvedCount: z.number().optional(),
+    prFeedbackVerificationFailedReason: z.string().optional(),
+    preBlockedState: z.string().optional(),
+    transcriptPath: z.string().optional(),
+  })
+}
+
+const WORKFLOW_STATE_SCHEMA = createWorkflowStateSchema(STATE_NAMES)
+
+/** @riviere-role value-object */
+export class WorkflowState {
+  declare private readonly brand: 'WorkflowState'
+
+  readonly currentStateMachineState: StateName
+  readonly githubIssue?: number
+  readonly featureBranch?: string
+  readonly prNumber?: number
+  readonly prUrl?: string
+  readonly architectureReviewPassed: boolean
+  readonly codeReviewPassed: boolean
+  readonly bugScannerPassed: boolean
+  readonly taskCheckPassed: boolean
+  readonly ciPassed: boolean
+  readonly feedbackClean: boolean
+  readonly feedbackAddressed: boolean
+  readonly feedbackUnresolvedCount?: number
+  readonly prFeedbackVerificationFailedReason?: string
+  readonly preBlockedState?: string
+  readonly transcriptPath?: string
+
+  private constructor(value: z.infer<typeof WORKFLOW_STATE_SCHEMA>) {
+    this.currentStateMachineState = value.currentStateMachineState
+    this.architectureReviewPassed = value.architectureReviewPassed
+    this.codeReviewPassed = value.codeReviewPassed
+    this.bugScannerPassed = value.bugScannerPassed
+    this.taskCheckPassed = value.taskCheckPassed
+    this.ciPassed = value.ciPassed
+    this.feedbackClean = value.feedbackClean
+    this.feedbackAddressed = value.feedbackAddressed
+    if (value.githubIssue !== undefined) this.githubIssue = value.githubIssue
+    if (value.featureBranch !== undefined) this.featureBranch = value.featureBranch
+    if (value.prNumber !== undefined) this.prNumber = value.prNumber
+    if (value.prUrl !== undefined) this.prUrl = value.prUrl
+    if (value.feedbackUnresolvedCount !== undefined) {
+      this.feedbackUnresolvedCount = value.feedbackUnresolvedCount
+    }
+    if (value.prFeedbackVerificationFailedReason !== undefined) {
+      this.prFeedbackVerificationFailedReason = value.prFeedbackVerificationFailedReason
+    }
+    if (value.preBlockedState !== undefined) this.preBlockedState = value.preBlockedState
+    if (value.transcriptPath !== undefined) this.transcriptPath = value.transcriptPath
+  }
+
+  static parse(value: unknown): WorkflowState {
+    return new WorkflowState(WORKFLOW_STATE_SCHEMA.parse(value))
+  }
+
+  with(changes: Partial<z.infer<typeof WORKFLOW_STATE_SCHEMA>>): WorkflowState {
+    return WorkflowState.parse({
+      ...this,
+      ...changes,
+    })
+  }
+}
+
+const INITIAL_STATE = WorkflowState.parse({
+  currentStateMachineState: 'IMPLEMENTING',
+  architectureReviewPassed: false,
+  codeReviewPassed: false,
+  bugScannerPassed: false,
+  taskCheckPassed: false,
+  ciPassed: false,
+  feedbackClean: false,
+  feedbackAddressed: false,
+})
+
+/** @riviere-role domain-service */
+export function parseStateName(value: string): StateName {
+  return STATE_NAME_SCHEMA.parse(value)
+}
+
+/** @riviere-role domain-service */
+export function getWorkflowStateNames() {
+  return STATE_NAMES
+}
+
+/** @riviere-role domain-service */
+export function getWorkflowStateNameSchema() {
+  return STATE_NAME_SCHEMA
+}
+
+/** @riviere-role domain-service */
+export function getInitialWorkflowState(): WorkflowState {
+  return INITIAL_STATE
+}
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/workflow.ts b/packages/dev-workflow-v2/domain-model/src/domain/workflow.ts
similarity index 91%
rename from tools/dev-workflow-v2/src/features/workflow/domain/workflow.ts
rename to packages/dev-workflow-v2/domain-model/src/domain/workflow.ts
index 2f73d94e0..26666d079 100644
--- a/tools/dev-workflow-v2/src/features/workflow/domain/workflow.ts
+++ b/packages/dev-workflow-v2/domain-model/src/domain/workflow.ts
@@ -9,25 +9,13 @@ import {
   defineRecordingOps,
   checkOperationGate,
 } from '@nt-ai-lab/deterministic-agent-workflow-dsl'
-import type {
-  BaseEvent, StoredReview 
-} from '@nt-ai-lab/deterministic-agent-workflow-engine'
+import type { BaseEvent, StoredReview } from '@nt-ai-lab/deterministic-agent-workflow-engine'
 import { WorkflowStateError } from '@nt-ai-lab/deterministic-agent-workflow-engine'
-import type {
-  WorkflowState,
-  StateName,
-  WorkflowOperation,
-  LivingArchitectureReviewType,
-} from './workflow-types'
-import {
-  WORKFLOW_REGISTRY, getStateDefinition 
-} from './registry'
-import { WORKFLOW_STATE_SCHEMA } from './workflow-types'
+import { getInitialWorkflowState, WorkflowState } from './workflow-types'
+import { getStateDefinition, getWorkflowRegistry } from './registry'
 import type { WorkflowEvent } from './workflow-events'
 import { parseWorkflowEvent } from './workflow-events'
-import {
-  applyEvent, EMPTY_STATE 
-} from './fold'
+import { applyEvent } from './fold'
 import {
   buildPullRequestCreationRequest,
   parsePullRequestDescriptionOptions,
@@ -35,13 +23,29 @@ import {
 import type { CreateWorkflowPullRequest } from './ports/create-pull-request'
 import type { ReadWorkflowGitStatus } from './ports/read-git-status'
 import type { ReadWorkflowPullRequestFeedback } from './ports/read-pull-request-feedback'
-import type { WorkflowPullRequestFeedback } from './pull-request-feedback'
+
+type StateName = WorkflowState['currentStateMachineState']
+type WorkflowOperation =
+  | 'record-issue'
+  | 'record-branch'
+  | 'record-review'
+  | 'record-pr'
+  | 'record-ci-passed'
+  | 'record-ci-failed'
+  | 'create-pr'
+  | 'verify-feedback-addressed'
+type LivingArchitectureReviewType =
+  | 'architecture-review'
+  | 'code-review'
+  | 'bug-scanner'
+  | 'task-check'
 
 const PR_FEEDBACK_POLL_INTERVAL_MS = 15_000
 const PR_FEEDBACK_TIMEOUT_MS = 300_000
 const PR_FEEDBACK_MAX_ATTEMPTS =
   Math.floor(PR_FEEDBACK_TIMEOUT_MS / PR_FEEDBACK_POLL_INTERVAL_MS) + 1
 const REQUIRED_CONSECUTIVE_CLEAN_CODERABBIT_POLLS = 2
+const WORKFLOW_REGISTRY = getWorkflowRegistry()
 
 const RECORDING_OPS_MAP: Record<string, RecordingOpDefinition<readonly never[]>> = {
   'record-issue': {
@@ -101,7 +105,7 @@ function diffStateOverrides(
   return overrides
 }
 
-function isFeedbackClear(feedback: WorkflowPullRequestFeedback): boolean {
+function isFeedbackClear(feedback: ReturnType<ReadWorkflowPullRequestFeedback>): boolean {
   return feedback.reviewDecision !== 'CHANGES_REQUESTED' && feedback.unresolvedCount === 0
 }
 
@@ -110,13 +114,13 @@ function readPrFeedback(
   prNumber: number,
 ):
   | {
-    ok: true
-    feedback: WorkflowPullRequestFeedback
-  }
+      ok: true
+      feedback: ReturnType<ReadWorkflowPullRequestFeedback>
+    }
   | {
-    ok: false
-    reason: string
-  } {
+      ok: false
+      reason: string
+    } {
   try {
     return {
       ok: true,
@@ -142,11 +146,11 @@ export class Workflow {
   }
 
   static createFresh(deps: WorkflowDeps): Workflow {
-    return new Workflow(EMPTY_STATE, deps)
+    return new Workflow(getInitialWorkflowState(), deps)
   }
 
-  static rehydrate(state: WorkflowState, deps: WorkflowDeps): Workflow {
-    return new Workflow(WORKFLOW_STATE_SCHEMA.parse(state), deps)
+  static rehydrate(state: unknown, deps: WorkflowDeps): Workflow {
+    return new Workflow(WorkflowState.parse(state), deps)
   }
 
   getPendingEvents(): readonly WorkflowEvent[] {
diff --git a/packages/dev-workflow-v2/domain-model/tsconfig.json b/packages/dev-workflow-v2/domain-model/tsconfig.json
new file mode 100644
index 000000000..cf9a15706
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "files": [],
+  "include": [],
+  "references": [
+    { "path": "./tsconfig.lib.json" },
+    { "path": "./tsconfig.spec.json" }
+  ]
+}
diff --git a/packages/dev-workflow-v2/domain-model/tsconfig.lib.json b/packages/dev-workflow-v2/domain-model/tsconfig.lib.json
new file mode 100644
index 000000000..a36640c99
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/tsconfig.lib.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "src",
+    "outDir": "dist",
+    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
+    "emitDeclarationOnly": false,
+    "forceConsistentCasingInFileNames": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["src/**/*.test.ts", "src/**/*.spec.ts", "src/**/__fixtures__/**"]
+}
diff --git a/packages/dev-workflow-v2/domain-model/tsconfig.spec.json b/packages/dev-workflow-v2/domain-model/tsconfig.spec.json
new file mode 100644
index 000000000..dc089a45a
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/tsconfig.spec.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/vitest",
+    "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node", "vitest"],
+    "forceConsistentCasingInFileNames": true
+  },
+  "include": ["vitest.config.mts", "src/**/*.spec.ts", "src/**/*.d.ts", "src/**/__fixtures__/**/*.ts"],
+  "references": [{ "path": "./tsconfig.lib.json" }]
+}
diff --git a/packages/dev-workflow-v2/domain-model/vitest.config.mts b/packages/dev-workflow-v2/domain-model/vitest.config.mts
new file mode 100644
index 000000000..8e94b4bc0
--- /dev/null
+++ b/packages/dev-workflow-v2/domain-model/vitest.config.mts
@@ -0,0 +1,20 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    globals: true,
+    coverage: {
+      enabled: true,
+      reportsDirectory: './test-output/vitest/coverage',
+      provider: 'v8',
+      include: ['src/**/*.ts'],
+      exclude: ['src/**/*.spec.ts', 'src/**/__fixtures__/**'],
+      thresholds: {
+        lines: 100,
+        statements: 100,
+        functions: 100,
+        branches: 100,
+      },
+    },
+  },
+})
diff --git a/packages/dev-workflow-v2/use-cases/package.json b/packages/dev-workflow-v2/use-cases/package.json
new file mode 100644
index 000000000..04ed74ad4
--- /dev/null
+++ b/packages/dev-workflow-v2/use-cases/package.json
@@ -0,0 +1,39 @@
+{
+  "name": "@living-architecture/dev-workflow-v2-use-cases",
+  "version": "0.0.1",
+  "private": true,
+  "type": "module",
+  "exports": {
+    "./package.json": "./package.json",
+    "./commands/*": {
+      "@living-architecture/source": "./src/features/workflow/commands/*.ts",
+      "types": "./dist/features/workflow/commands/*.d.ts",
+      "import": "./dist/features/workflow/commands/*.js",
+      "default": "./dist/features/workflow/commands/*.js"
+    },
+    "./adapters/*": {
+      "@living-architecture/source": "./src/features/workflow/adapters/*.ts",
+      "types": "./dist/features/workflow/adapters/*.d.ts",
+      "import": "./dist/features/workflow/adapters/*.js",
+      "default": "./dist/features/workflow/adapters/*.js"
+    },
+    "./external-clients/*": {
+      "@living-architecture/source": "./src/infra/external-clients/*.ts",
+      "types": "./dist/infra/external-clients/*.d.ts",
+      "import": "./dist/infra/external-clients/*.js",
+      "default": "./dist/infra/external-clients/*.js"
+    }
+  },
+  "dependencies": {
+    "@living-architecture/dev-workflow-v2-domain-model": "workspace:*",
+    "@nt-ai-lab/deterministic-agent-workflow-dsl": "0.3.6",
+    "@nt-ai-lab/deterministic-agent-workflow-engine": "0.3.6",
+    "zod": "^3.23.0"
+  },
+  "devDependencies": {
+    "@types/node": "^22.0.0",
+    "@vitest/coverage-v8": "^2.0.0",
+    "typescript": "^5.6.0",
+    "vitest": "^2.0.0"
+  }
+}
diff --git a/tools/dev-workflow-v2/src/features/workflow/adapters/git/workflow-git-status-reader.spec.ts b/packages/dev-workflow-v2/use-cases/src/features/workflow/adapters/git/workflow-git-status-reader.spec.ts
similarity index 100%
rename from tools/dev-workflow-v2/src/features/workflow/adapters/git/workflow-git-status-reader.spec.ts
rename to packages/dev-workflow-v2/use-cases/src/features/workflow/adapters/git/workflow-git-status-reader.spec.ts
diff --git a/packages/dev-workflow-v2/use-cases/src/features/workflow/adapters/git/workflow-git-status-reader.ts b/packages/dev-workflow-v2/use-cases/src/features/workflow/adapters/git/workflow-git-status-reader.ts
new file mode 100644
index 000000000..329dd9bba
--- /dev/null
+++ b/packages/dev-workflow-v2/use-cases/src/features/workflow/adapters/git/workflow-git-status-reader.ts
@@ -0,0 +1,18 @@
+import type { ReadWorkflowGitStatus } from '@living-architecture/dev-workflow-v2-domain-model/domain/ports/read-git-status'
+import type { GitRepositoryStatus } from '../../../../infra/external-clients/git/git-client'
+
+/** @riviere-role domain-port-adapter */
+export function createWorkflowGitStatusReader(
+  readGitRepositoryStatus: () => GitRepositoryStatus,
+): ReadWorkflowGitStatus {
+  return () => {
+    const status = readGitRepositoryStatus()
+    return {
+      changedFilesVsDefault: status.changedFilesVsDefault,
+      currentBranch: status.currentBranch,
+      hasCommitsVsDefault: status.hasCommitsVsDefault,
+      headCommit: status.headCommit,
+      workingTreeClean: status.workingTreeClean,
+    }
+  }
+}
diff --git a/tools/dev-workflow-v2/src/features/workflow/adapters/github/workflow-pull-request-creator.spec.ts b/packages/dev-workflow-v2/use-cases/src/features/workflow/adapters/github/workflow-pull-request-creator.spec.ts
similarity index 100%
rename from tools/dev-workflow-v2/src/features/workflow/adapters/github/workflow-pull-request-creator.spec.ts
rename to packages/dev-workflow-v2/use-cases/src/features/workflow/adapters/github/workflow-pull-request-creator.spec.ts
diff --git a/packages/dev-workflow-v2/use-cases/src/features/workflow/adapters/github/workflow-pull-request-creator.ts b/packages/dev-workflow-v2/use-cases/src/features/workflow/adapters/github/workflow-pull-request-creator.ts
new file mode 100644
index 000000000..533b5f4f4
--- /dev/null
+++ b/packages/dev-workflow-v2/use-cases/src/features/workflow/adapters/github/workflow-pull-request-creator.ts
@@ -0,0 +1,22 @@
+import type {
+  GithubPullRequest,
+  GithubPullRequestCreationInput,
+} from '../../../../infra/external-clients/github/create-pull-request'
+import type { CreateWorkflowPullRequest } from '@living-architecture/dev-workflow-v2-domain-model/domain/ports/create-pull-request'
+
+/** @riviere-role domain-port-adapter */
+export function createWorkflowPullRequestCreator(
+  createGithubPullRequest: (input: GithubPullRequestCreationInput) => GithubPullRequest,
+): CreateWorkflowPullRequest {
+  return (request) => {
+    const pullRequest = createGithubPullRequest({
+      body: request.body,
+      title: request.title,
+    })
+    return {
+      isDraft: pullRequest.isDraft,
+      prNumber: pullRequest.prNumber,
+      prUrl: pullRequest.prUrl,
+    }
+  }
+}
diff --git a/tools/dev-workflow-v2/src/features/workflow/adapters/github/workflow-pull-request-feedback-reader.spec.ts b/packages/dev-workflow-v2/use-cases/src/features/workflow/adapters/github/workflow-pull-request-feedback-reader.spec.ts
similarity index 100%
rename from tools/dev-workflow-v2/src/features/workflow/adapters/github/workflow-pull-request-feedback-reader.spec.ts
rename to packages/dev-workflow-v2/use-cases/src/features/workflow/adapters/github/workflow-pull-request-feedback-reader.spec.ts
diff --git a/tools/dev-workflow-v2/src/features/workflow/adapters/github/workflow-pull-request-feedback-reader.ts b/packages/dev-workflow-v2/use-cases/src/features/workflow/adapters/github/workflow-pull-request-feedback-reader.ts
similarity index 78%
rename from tools/dev-workflow-v2/src/features/workflow/adapters/github/workflow-pull-request-feedback-reader.ts
rename to packages/dev-workflow-v2/use-cases/src/features/workflow/adapters/github/workflow-pull-request-feedback-reader.ts
index 0d78d707d..ab0902e72 100644
--- a/tools/dev-workflow-v2/src/features/workflow/adapters/github/workflow-pull-request-feedback-reader.ts
+++ b/packages/dev-workflow-v2/use-cases/src/features/workflow/adapters/github/workflow-pull-request-feedback-reader.ts
@@ -1,5 +1,5 @@
-import type { GithubPullRequestFeedback } from '../../../../platform/infra/external-clients/github/index'
-import type { ReadWorkflowPullRequestFeedback } from '../../domain/ports/read-pull-request-feedback'
+import type { ReadWorkflowPullRequestFeedback } from '@living-architecture/dev-workflow-v2-domain-model/domain/ports/read-pull-request-feedback'
+import type { GithubPullRequestFeedback } from '../../../../infra/external-clients/github/get-pr-feedback'
 
 /** @riviere-role domain-port-adapter */
 export function createWorkflowPullRequestFeedbackReader(
diff --git a/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/configure-workflow.spec.ts b/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/configure-workflow.spec.ts
new file mode 100644
index 000000000..d5df857bd
--- /dev/null
+++ b/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/configure-workflow.spec.ts
@@ -0,0 +1,229 @@
+import { configureWorkflow } from './configure-workflow'
+import { Workflow } from '@living-architecture/dev-workflow-v2-domain-model/domain/workflow'
+import type { BaseEvent } from '@nt-ai-lab/deterministic-agent-workflow-engine'
+import { WorkflowStateError } from '@nt-ai-lab/deterministic-agent-workflow-engine'
+import { WorkflowState } from '@living-architecture/dev-workflow-v2-domain-model/domain/workflow-types'
+
+type WorkflowDeps = Parameters<typeof Workflow.rehydrate>[1]
+type StateName = WorkflowState['currentStateMachineState']
+const WORKFLOW_DEFINITION = configureWorkflow({})
+
+function makeWorkflowDeps(): WorkflowDeps {
+  return {
+    getGitInfo: () => ({
+      currentBranch: 'main',
+      workingTreeClean: true,
+      headCommit: 'abc123',
+      changedFilesVsDefault: [],
+      hasCommitsVsDefault: false,
+    }),
+    getPrFeedback: () => ({
+      reviewDecision: null,
+      coderabbitReviewSeen: true,
+      unresolvedCount: 0,
+      threads: [],
+    }),
+    createPullRequest: () => ({
+      prNumber: 1,
+      prUrl: 'https://github.com/example/repo/pull/1',
+      isDraft: false,
+    }),
+    listSessionReviews: () => [],
+    sleepMs: () => undefined,
+    now: () => '2026-01-01T00:00:00Z',
+  }
+}
+
+function buildTransitionEvent(
+  from: StateName,
+  to: StateName,
+  stateBefore: WorkflowState,
+  stateAfter: WorkflowState,
+  now: string,
+): BaseEvent {
+  const fn = WORKFLOW_DEFINITION.buildTransitionEvent
+  if (fn === undefined) throw new WorkflowStateError('buildTransitionEvent not defined')
+  return fn(from, to, stateBefore, stateAfter, now)
+}
+
+describe('WORKFLOW_DEFINITION', () => {
+  it('builds a Workflow in IMPLEMENTING state from initial state', () => {
+    const workflow = WORKFLOW_DEFINITION.buildWorkflow(
+      WORKFLOW_DEFINITION.initialState(),
+      makeWorkflowDeps(),
+    )
+    expect(workflow.getState().currentStateMachineState).toStrictEqual('IMPLEMENTING')
+  })
+
+  it('builds a Workflow from initial state (pass-through, no events folded)', () => {
+    const state = WORKFLOW_DEFINITION.initialState()
+    const workflow = WORKFLOW_DEFINITION.buildWorkflow(state, makeWorkflowDeps())
+    expect(workflow.getState().currentStateMachineState).toStrictEqual('IMPLEMENTING')
+  })
+
+  it('folds a valid event onto state', () => {
+    const event: BaseEvent & Record<string, unknown> = {
+      type: 'issue-recorded',
+      at: '2026-01-01T00:00:00Z',
+      issueNumber: 42,
+    }
+    const state = WORKFLOW_DEFINITION.fold(WORKFLOW_DEFINITION.initialState(), event)
+    const workflow = WORKFLOW_DEFINITION.buildWorkflow(state, makeWorkflowDeps())
+    expect(workflow.getState().githubIssue).toStrictEqual(42)
+  })
+
+  it('folds session-started event and makes transcriptPath available', () => {
+    const event: BaseEvent & Record<string, unknown> = {
+      type: 'session-started',
+      at: '2026-01-01T00:00:00Z',
+      transcriptPath: 'some/transcript.jsonl',
+    }
+    const state = WORKFLOW_DEFINITION.fold(WORKFLOW_DEFINITION.initialState(), event)
+    const workflow = WORKFLOW_DEFINITION.buildWorkflow(state, makeWorkflowDeps())
+    expect(workflow.getTranscriptPath()).toBe('some/transcript.jsonl')
+  })
+
+  it('returns state unchanged for unknown event types (e.g. platform observation events)', () => {
+    const event: BaseEvent = {
+      type: 'identity-verified',
+      at: '2026-01-01T00:00:00Z',
+    }
+    const state = WORKFLOW_DEFINITION.initialState()
+    const result = WORKFLOW_DEFINITION.fold(state, event)
+    expect(result).toStrictEqual(state)
+  })
+
+  it('throws when a known event type has a malformed payload', () => {
+    const malformed: BaseEvent & Record<string, unknown> = {
+      type: 'issue-recorded',
+      at: '2026-01-01T00:00:00Z',
+      issueNumber: 'not-a-number',
+    }
+    expect(() => WORKFLOW_DEFINITION.fold(WORKFLOW_DEFINITION.initialState(), malformed)).toThrow(
+      'Malformed workflow event "issue-recorded"',
+    )
+  })
+
+  it('returns initial state with IMPLEMENTING', () => {
+    const initial = WORKFLOW_DEFINITION.initialState()
+    expect(initial.currentStateMachineState).toStrictEqual('IMPLEMENTING')
+  })
+
+  it('stateSchema parses valid state name', () => {
+    expect(WORKFLOW_DEFINITION.stateSchema.parse('IMPLEMENTING')).toStrictEqual('IMPLEMENTING')
+  })
+
+  it('stateSchema throws on invalid state name', () => {
+    expect(() => WORKFLOW_DEFINITION.stateSchema.parse('UNKNOWN_STATE')).toThrow(
+      'Invalid enum value',
+    )
+  })
+
+  describe('getRegistry', () => {
+    it('returns the workflow registry', () => {
+      const registry = WORKFLOW_DEFINITION.getRegistry()
+      expect(registry.IMPLEMENTING).toBeDefined()
+      expect(registry.REVIEWING).toBeDefined()
+      expect(registry.COMPLETE).toBeDefined()
+    })
+
+    it('marks COMPLETE and BLOCKED as write-forbidden states', () => {
+      const registry = WORKFLOW_DEFINITION.getRegistry()
+      expect(registry.BLOCKED.forbidden).toStrictEqual({ write: true })
+      expect(registry.COMPLETE.forbidden).toStrictEqual({ write: true })
+    })
+  })
+
+  describe('buildTransitionContext', () => {
+    it('builds context with state and transition info', () => {
+      const state = WorkflowState.parse({
+        currentStateMachineState: 'IMPLEMENTING',
+        architectureReviewPassed: false,
+        codeReviewPassed: false,
+        bugScannerPassed: false,
+        taskCheckPassed: false,
+        ciPassed: false,
+        feedbackClean: false,
+        feedbackAddressed: false,
+        prNumber: 42,
+      })
+      const deps = makeWorkflowDeps()
+      const ctx = WORKFLOW_DEFINITION.buildTransitionContext(
+        state,
+        'IMPLEMENTING',
+        'REVIEWING',
+        deps,
+      )
+      expect(ctx.state).toBe(state)
+      expect(ctx.from).toStrictEqual('IMPLEMENTING')
+      expect(ctx.to).toStrictEqual('REVIEWING')
+    })
+  })
+
+  describe('buildTransitionEvent', () => {
+    const baseBefore = WorkflowState.parse({
+      currentStateMachineState: 'IMPLEMENTING',
+      architectureReviewPassed: true,
+      codeReviewPassed: true,
+      bugScannerPassed: true,
+      taskCheckPassed: false,
+      ciPassed: true,
+      feedbackClean: true,
+      feedbackAddressed: true,
+    })
+
+    it('produces event without stateOverrides when no state changes', () => {
+      const event = buildTransitionEvent(
+        'IMPLEMENTING',
+        'REVIEWING',
+        baseBefore,
+        baseBefore,
+        '2026-01-01T00:00:00Z',
+      )
+      expect(event).toStrictEqual({
+        type: 'transitioned',
+        at: '2026-01-01T00:00:00Z',
+        from: 'IMPLEMENTING',
+        to: 'REVIEWING',
+      })
+    })
+
+    it('produces event with stateOverrides when onEntry mutates state', () => {
+      const stateAfter = baseBefore.with({
+        architectureReviewPassed: false,
+        codeReviewPassed: false,
+        bugScannerPassed: false,
+        ciPassed: false,
+        feedbackClean: false,
+        feedbackAddressed: false,
+      })
+      const event = buildTransitionEvent(
+        'REVIEWING',
+        'IMPLEMENTING',
+        baseBefore,
+        stateAfter,
+        '2026-01-01T00:00:00Z',
+      )
+      expect(event).toHaveProperty('stateOverrides', {
+        architectureReviewPassed: false,
+        codeReviewPassed: false,
+        bugScannerPassed: false,
+        ciPassed: false,
+        feedbackClean: false,
+        feedbackAddressed: false,
+      })
+    })
+
+    it('does not include currentStateMachineState in stateOverrides', () => {
+      const stateAfter = baseBefore.with({ currentStateMachineState: 'REVIEWING' })
+      const event = buildTransitionEvent(
+        'IMPLEMENTING',
+        'REVIEWING',
+        baseBefore,
+        stateAfter,
+        '2026-01-01T00:00:00Z',
+      )
+      expect(event).not.toHaveProperty('stateOverrides')
+    })
+  })
+})
diff --git a/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/configure-workflow.ts b/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/configure-workflow.ts
new file mode 100644
index 000000000..1747c3a63
--- /dev/null
+++ b/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/configure-workflow.ts
@@ -0,0 +1,101 @@
+import type { BaseEvent, WorkflowDefinition } from '@nt-ai-lab/deterministic-agent-workflow-engine'
+import { WorkflowStateError } from '@nt-ai-lab/deterministic-agent-workflow-engine'
+import type { TransitionContext } from '@nt-ai-lab/deterministic-agent-workflow-dsl'
+import { applyEvent } from '@living-architecture/dev-workflow-v2-domain-model/domain/fold'
+import {
+  getOperationBody,
+  getTransitionTitle,
+} from '@living-architecture/dev-workflow-v2-domain-model/domain/output-messages'
+import { getWorkflowRegistry } from '@living-architecture/dev-workflow-v2-domain-model/domain/registry'
+import { Workflow } from '@living-architecture/dev-workflow-v2-domain-model/domain/workflow'
+import {
+  getKnownWorkflowEventTypes,
+  parseWorkflowEvent,
+} from '@living-architecture/dev-workflow-v2-domain-model/domain/workflow-events'
+import type { WorkflowState } from '@living-architecture/dev-workflow-v2-domain-model/domain/workflow-types'
+import {
+  getInitialWorkflowState,
+  getWorkflowStateNameSchema,
+} from '@living-architecture/dev-workflow-v2-domain-model/domain/workflow-types'
+import { isWriteAllowed } from '@living-architecture/dev-workflow-v2-domain-model/domain/workflow-predicates'
+
+type WorkflowDeps = Parameters<typeof Workflow.rehydrate>[1]
+type StateName = WorkflowState['currentStateMachineState']
+type WorkflowOperation = Parameters<Workflow['executeRecording']>[0]
+/** @riviere-role command-use-case-result */
+export type ConfigureWorkflowResult = WorkflowDefinition<
+  Workflow,
+  WorkflowState,
+  WorkflowDeps,
+  StateName,
+  WorkflowOperation
+> & {
+  readonly isWriteAllowed: typeof isWriteAllowed
+}
+const KNOWN_EVENT_TYPES: ReadonlySet<string> = new Set(getKnownWorkflowEventTypes())
+
+/** @riviere-role command-use-case-input */
+export type ConfigureWorkflowInput = Readonly<Record<string, never>>
+
+function diffStateOverrides(
+  stateBefore: WorkflowState,
+  stateAfter: WorkflowState,
+): Record<string, unknown> {
+  const overrides: Record<string, unknown> = {}
+  const beforeEntries = new Map(Object.entries(stateBefore))
+  for (const [key, value] of Object.entries(stateAfter)) {
+    if (key === 'currentStateMachineState') continue
+    if (value !== beforeEntries.get(key)) overrides[key] = value
+  }
+  return overrides
+}
+
+/** @riviere-role command-use-case */
+export function configureWorkflow(input: ConfigureWorkflowInput): ConfigureWorkflowResult {
+  void input
+  return {
+    fold(state: WorkflowState, event: BaseEvent): WorkflowState {
+      try {
+        return applyEvent(state, parseWorkflowEvent(event))
+      } catch (error) {
+        if (KNOWN_EVENT_TYPES.has(event.type)) {
+          throw new WorkflowStateError(`Malformed workflow event "${event.type}": ${String(error)}`)
+        }
+        return state
+      }
+    },
+    buildWorkflow(state: WorkflowState, deps: WorkflowDeps): Workflow {
+      return Workflow.rehydrate(state, deps)
+    },
+    stateSchema: getWorkflowStateNameSchema(),
+    initialState: getInitialWorkflowState,
+    getRegistry: getWorkflowRegistry,
+    buildTransitionContext(
+      state: WorkflowState,
+      from: StateName,
+      to: StateName,
+      deps: WorkflowDeps,
+    ): TransitionContext<WorkflowState, StateName> {
+      return { state, gitInfo: deps.getGitInfo(), from, to }
+    },
+    buildTransitionEvent(
+      from: StateName,
+      to: StateName,
+      stateBefore: WorkflowState,
+      stateAfter: WorkflowState,
+      now: string,
+    ): BaseEvent {
+      const overrides = diffStateOverrides(stateBefore, stateAfter)
+      return {
+        type: 'transitioned',
+        at: now,
+        from,
+        to,
+        ...(Object.keys(overrides).length > 0 ? { stateOverrides: overrides } : {}),
+      }
+    },
+    getOperationBody,
+    getTransitionTitle,
+    isWriteAllowed,
+  }
+}
diff --git a/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/create-pull-request.ts b/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/create-pull-request.ts
new file mode 100644
index 000000000..fad09373c
--- /dev/null
+++ b/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/create-pull-request.ts
@@ -0,0 +1,16 @@
+import type { Workflow } from '@living-architecture/dev-workflow-v2-domain-model/domain/workflow'
+import type { WorkflowCommandResult } from './workflow-command-result'
+
+/** @riviere-role command-use-case-input */
+export interface CreatePullRequestInput {
+  readonly arguments: readonly string[]
+}
+
+/** @riviere-role command-use-case */
+export class CreatePullRequest {
+  constructor(private readonly workflow: Workflow) {}
+
+  execute(input: CreatePullRequestInput): WorkflowCommandResult {
+    return this.workflow.createPr(input.arguments)
+  }
+}
diff --git a/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/record-branch.ts b/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/record-branch.ts
new file mode 100644
index 000000000..eb2247abd
--- /dev/null
+++ b/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/record-branch.ts
@@ -0,0 +1,16 @@
+import type { Workflow } from '@living-architecture/dev-workflow-v2-domain-model/domain/workflow'
+import type { WorkflowCommandResult } from './workflow-command-result'
+
+/** @riviere-role command-use-case-input */
+export interface RecordBranchInput {
+  readonly branch: string
+}
+
+/** @riviere-role command-use-case */
+export class RecordBranch {
+  constructor(private readonly workflow: Workflow) {}
+
+  execute(input: RecordBranchInput): WorkflowCommandResult {
+    return this.workflow.executeRecording('record-branch', input.branch)
+  }
+}
diff --git a/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/record-ci-failed.ts b/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/record-ci-failed.ts
new file mode 100644
index 000000000..f16f97107
--- /dev/null
+++ b/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/record-ci-failed.ts
@@ -0,0 +1,16 @@
+import type { Workflow } from '@living-architecture/dev-workflow-v2-domain-model/domain/workflow'
+import type { WorkflowCommandResult } from './workflow-command-result'
+
+/** @riviere-role command-use-case-input */
+export interface RecordCiFailedInput {
+  readonly output: string
+}
+
+/** @riviere-role command-use-case */
+export class RecordCiFailed {
+  constructor(private readonly workflow: Workflow) {}
+
+  execute(input: RecordCiFailedInput): WorkflowCommandResult {
+    return this.workflow.executeRecording('record-ci-failed', input.output)
+  }
+}
diff --git a/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/record-ci-passed.ts b/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/record-ci-passed.ts
new file mode 100644
index 000000000..aa920e92a
--- /dev/null
+++ b/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/record-ci-passed.ts
@@ -0,0 +1,15 @@
+import type { Workflow } from '@living-architecture/dev-workflow-v2-domain-model/domain/workflow'
+import type { WorkflowCommandResult } from './workflow-command-result'
+
+/** @riviere-role command-use-case-input */
+export type RecordCiPassedInput = Record<never, never>
+
+/** @riviere-role command-use-case */
+export class RecordCiPassed {
+  constructor(private readonly workflow: Workflow) {}
+
+  execute(input: RecordCiPassedInput): WorkflowCommandResult {
+    void input
+    return this.workflow.executeRecording('record-ci-passed')
+  }
+}
diff --git a/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/record-issue.ts b/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/record-issue.ts
new file mode 100644
index 000000000..2208ccfe3
--- /dev/null
+++ b/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/record-issue.ts
@@ -0,0 +1,16 @@
+import type { Workflow } from '@living-architecture/dev-workflow-v2-domain-model/domain/workflow'
+import type { WorkflowCommandResult } from './workflow-command-result'
+
+/** @riviere-role command-use-case-input */
+export interface RecordIssueInput {
+  readonly issueNumber: number
+}
+
+/** @riviere-role command-use-case */
+export class RecordIssue {
+  constructor(private readonly workflow: Workflow) {}
+
+  execute(input: RecordIssueInput): WorkflowCommandResult {
+    return this.workflow.executeRecording('record-issue', input.issueNumber)
+  }
+}
diff --git a/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/record-pull-request.ts b/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/record-pull-request.ts
new file mode 100644
index 000000000..da7bc5bca
--- /dev/null
+++ b/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/record-pull-request.ts
@@ -0,0 +1,17 @@
+import type { Workflow } from '@living-architecture/dev-workflow-v2-domain-model/domain/workflow'
+import type { WorkflowCommandResult } from './workflow-command-result'
+
+/** @riviere-role command-use-case-input */
+export interface RecordPullRequestInput {
+  readonly number: number
+  readonly url: string | undefined
+}
+
+/** @riviere-role command-use-case */
+export class RecordPullRequest {
+  constructor(private readonly workflow: Workflow) {}
+
+  execute(input: RecordPullRequestInput): WorkflowCommandResult {
+    return this.workflow.executeRecording('record-pr', input.number, input.url)
+  }
+}
diff --git a/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/verify-feedback-addressed.ts b/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/verify-feedback-addressed.ts
new file mode 100644
index 000000000..5bd54d52a
--- /dev/null
+++ b/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/verify-feedback-addressed.ts
@@ -0,0 +1,15 @@
+import type { Workflow } from '@living-architecture/dev-workflow-v2-domain-model/domain/workflow'
+import type { WorkflowCommandResult } from './workflow-command-result'
+
+/** @riviere-role command-use-case-input */
+export type VerifyFeedbackAddressedInput = Record<never, never>
+
+/** @riviere-role command-use-case */
+export class VerifyFeedbackAddressed {
+  constructor(private readonly workflow: Workflow) {}
+
+  execute(input: VerifyFeedbackAddressedInput): WorkflowCommandResult {
+    void input
+    return this.workflow.verifyFeedbackAddressed()
+  }
+}
diff --git a/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/workflow-command-result.ts b/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/workflow-command-result.ts
new file mode 100644
index 000000000..108a40c2c
--- /dev/null
+++ b/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/workflow-command-result.ts
@@ -0,0 +1,4 @@
+/** @riviere-role command-use-case-result */
+export type WorkflowCommandResult =
+  | { readonly pass: true }
+  | { readonly pass: false; readonly reason: string }
diff --git a/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/workflow-commands.spec.ts b/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/workflow-commands.spec.ts
new file mode 100644
index 000000000..6a72da40e
--- /dev/null
+++ b/packages/dev-workflow-v2/use-cases/src/features/workflow/commands/workflow-commands.spec.ts
@@ -0,0 +1,73 @@
+import { Workflow } from '@living-architecture/dev-workflow-v2-domain-model/domain/workflow'
+import { getInitialWorkflowState } from '@living-architecture/dev-workflow-v2-domain-model/domain/workflow-types'
+import { CreatePullRequest } from './create-pull-request'
+import { RecordBranch } from './record-branch'
+import { RecordCiFailed } from './record-ci-failed'
+import { RecordCiPassed } from './record-ci-passed'
+import { RecordIssue } from './record-issue'
+import { RecordPullRequest } from './record-pull-request'
+import { VerifyFeedbackAddressed } from './verify-feedback-addressed'
+
+type WorkflowDeps = Parameters<typeof Workflow.rehydrate>[1]
+
+function workflow(): Workflow {
+  const deps: WorkflowDeps = {
+    getGitInfo: () => ({
+      currentBranch: 'feature/test',
+      workingTreeClean: true,
+      headCommit: 'abc123',
+      changedFilesVsDefault: [],
+      hasCommitsVsDefault: true,
+    }),
+    getPrFeedback: () => ({
+      reviewDecision: null,
+      coderabbitReviewSeen: true,
+      unresolvedCount: 0,
+      threads: [],
+    }),
+    createPullRequest: () => ({
+      prNumber: 42,
+      prUrl: 'https://github.com/example/repo/pull/42',
+      isDraft: false,
+    }),
+    listSessionReviews: () => [],
+    sleepMs: () => undefined,
+    now: () => '2026-01-01T00:00:00Z',
+  }
+  return Workflow.rehydrate(getInitialWorkflowState(), deps)
+}
+
+describe('workflow commands', () => {
+  it('creates a pull request', () => {
+    expect(new CreatePullRequest(workflow()).execute({ arguments: [] })).toHaveProperty('pass')
+  })
+
+  it('records a branch', () => {
+    expect(new RecordBranch(workflow()).execute({ branch: 'feature/test' })).toHaveProperty('pass')
+  })
+
+  it('records failed CI', () => {
+    expect(new RecordCiFailed(workflow()).execute({ output: 'failed' })).toHaveProperty('pass')
+  })
+
+  it('records passed CI', () => {
+    expect(new RecordCiPassed(workflow()).execute({})).toHaveProperty('pass')
+  })
+
+  it('records an issue', () => {
+    expect(new RecordIssue(workflow()).execute({ issueNumber: 42 })).toHaveProperty('pass')
+  })
+
+  it('records a pull request', () => {
+    expect(
+      new RecordPullRequest(workflow()).execute({
+        number: 42,
+        url: 'https://github.com/example/repo/pull/42',
+      }),
+    ).toHaveProperty('pass')
+  })
+
+  it('verifies addressed feedback', () => {
+    expect(new VerifyFeedbackAddressed(workflow()).execute({})).toHaveProperty('pass')
+  })
+})
diff --git a/tools/dev-workflow-v2/src/platform/infra/external-clients/git/git-client.spec.ts b/packages/dev-workflow-v2/use-cases/src/infra/external-clients/git/git-client.spec.ts
similarity index 97%
rename from tools/dev-workflow-v2/src/platform/infra/external-clients/git/git-client.spec.ts
rename to packages/dev-workflow-v2/use-cases/src/infra/external-clients/git/git-client.spec.ts
index cd4bfc85a..531f42979 100644
--- a/tools/dev-workflow-v2/src/platform/infra/external-clients/git/git-client.spec.ts
+++ b/packages/dev-workflow-v2/use-cases/src/infra/external-clients/git/git-client.spec.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from 'vitest'
-import { readGitRepositoryStatus } from './index'
+import { readGitRepositoryStatus } from './git-client'
 
 describe('readGitRepositoryStatus', () => {
   it('reads repository status using the remote default branch', () => {
diff --git a/tools/dev-workflow-v2/src/platform/infra/external-clients/git/git-client.ts b/packages/dev-workflow-v2/use-cases/src/infra/external-clients/git/git-client.ts
similarity index 100%
rename from tools/dev-workflow-v2/src/platform/infra/external-clients/git/git-client.ts
rename to packages/dev-workflow-v2/use-cases/src/infra/external-clients/git/git-client.ts
diff --git a/tools/dev-workflow-v2/src/platform/infra/external-clients/github/create-pull-request.spec.ts b/packages/dev-workflow-v2/use-cases/src/infra/external-clients/github/create-pull-request.spec.ts
similarity index 96%
rename from tools/dev-workflow-v2/src/platform/infra/external-clients/github/create-pull-request.spec.ts
rename to packages/dev-workflow-v2/use-cases/src/infra/external-clients/github/create-pull-request.spec.ts
index 1fd0101f7..6b91a0d87 100644
--- a/tools/dev-workflow-v2/src/platform/infra/external-clients/github/create-pull-request.spec.ts
+++ b/packages/dev-workflow-v2/use-cases/src/infra/external-clients/github/create-pull-request.spec.ts
@@ -1,7 +1,5 @@
-import {
-  describe, expect, it 
-} from 'vitest'
-import { createGithubPullRequestClient } from './index'
+import { describe, expect, it } from 'vitest'
+import { createGithubPullRequestClient } from './create-pull-request'
 
 describe('createGithubPullRequestClient', () => {
   it('creates pull request from structured title and body', () => {
diff --git a/tools/dev-workflow-v2/src/platform/infra/external-clients/github/create-pull-request.ts b/packages/dev-workflow-v2/use-cases/src/infra/external-clients/github/create-pull-request.ts
similarity index 100%
rename from tools/dev-workflow-v2/src/platform/infra/external-clients/github/create-pull-request.ts
rename to packages/dev-workflow-v2/use-cases/src/infra/external-clients/github/create-pull-request.ts
diff --git a/tools/dev-workflow-v2/src/platform/infra/external-clients/github/get-pr-feedback.spec.ts b/packages/dev-workflow-v2/use-cases/src/infra/external-clients/github/get-pr-feedback.spec.ts
similarity index 98%
rename from tools/dev-workflow-v2/src/platform/infra/external-clients/github/get-pr-feedback.spec.ts
rename to packages/dev-workflow-v2/use-cases/src/infra/external-clients/github/get-pr-feedback.spec.ts
index 3a61b6b29..a1886acf2 100644
--- a/tools/dev-workflow-v2/src/platform/infra/external-clients/github/get-pr-feedback.spec.ts
+++ b/packages/dev-workflow-v2/use-cases/src/infra/external-clients/github/get-pr-feedback.spec.ts
@@ -1,7 +1,5 @@
-import {
-  describe, it, expect, vi 
-} from 'vitest'
-import { createGithubPullRequestFeedbackClient } from './index'
+import { describe, it, expect, vi } from 'vitest'
+import { createGithubPullRequestFeedbackClient } from './get-pr-feedback'
 
 const REPO_INFO = JSON.stringify({
   owner: { login: 'TestOwner' },
diff --git a/tools/dev-workflow-v2/src/platform/infra/external-clients/github/get-pr-feedback.ts b/packages/dev-workflow-v2/use-cases/src/infra/external-clients/github/get-pr-feedback.ts
similarity index 100%
rename from tools/dev-workflow-v2/src/platform/infra/external-clients/github/get-pr-feedback.ts
rename to packages/dev-workflow-v2/use-cases/src/infra/external-clients/github/get-pr-feedback.ts
diff --git a/tools/dev-workflow-v2/src/platform/infra/external-clients/github/github-cli.spec.ts b/packages/dev-workflow-v2/use-cases/src/infra/external-clients/github/github-cli.spec.ts
similarity index 90%
rename from tools/dev-workflow-v2/src/platform/infra/external-clients/github/github-cli.spec.ts
rename to packages/dev-workflow-v2/use-cases/src/infra/external-clients/github/github-cli.spec.ts
index 0ab9a57b1..9d64eb730 100644
--- a/tools/dev-workflow-v2/src/platform/infra/external-clients/github/github-cli.spec.ts
+++ b/packages/dev-workflow-v2/use-cases/src/infra/external-clients/github/github-cli.spec.ts
@@ -1,5 +1,5 @@
 import { expect, it, vi } from 'vitest'
-import { runGh } from './index'
+import { runGh } from './github-cli'
 
 it('executes GitHub CLI arguments without interpreting them in a shell', () => {
   const executeGithub = vi.fn(() => 'result')
diff --git a/tools/dev-workflow-v2/src/platform/infra/external-clients/github/github-cli.ts b/packages/dev-workflow-v2/use-cases/src/infra/external-clients/github/github-cli.ts
similarity index 100%
rename from tools/dev-workflow-v2/src/platform/infra/external-clients/github/github-cli.ts
rename to packages/dev-workflow-v2/use-cases/src/infra/external-clients/github/github-cli.ts
diff --git a/packages/dev-workflow-v2/use-cases/tsconfig.json b/packages/dev-workflow-v2/use-cases/tsconfig.json
new file mode 100644
index 000000000..cf9a15706
--- /dev/null
+++ b/packages/dev-workflow-v2/use-cases/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "files": [],
+  "include": [],
+  "references": [
+    { "path": "./tsconfig.lib.json" },
+    { "path": "./tsconfig.spec.json" }
+  ]
+}
diff --git a/packages/dev-workflow-v2/use-cases/tsconfig.lib.json b/packages/dev-workflow-v2/use-cases/tsconfig.lib.json
new file mode 100644
index 000000000..b42efb48b
--- /dev/null
+++ b/packages/dev-workflow-v2/use-cases/tsconfig.lib.json
@@ -0,0 +1,15 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "src",
+    "outDir": "dist",
+    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
+    "emitDeclarationOnly": false,
+    "forceConsistentCasingInFileNames": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "references": [{ "path": "../domain-model/tsconfig.lib.json" }],
+  "exclude": ["src/**/*.test.ts", "src/**/*.spec.ts", "src/**/fixtures/**"]
+}
diff --git a/packages/dev-workflow-v2/use-cases/tsconfig.spec.json b/packages/dev-workflow-v2/use-cases/tsconfig.spec.json
new file mode 100644
index 000000000..e815819b2
--- /dev/null
+++ b/packages/dev-workflow-v2/use-cases/tsconfig.spec.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/vitest",
+    "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node", "vitest"],
+    "forceConsistentCasingInFileNames": true
+  },
+  "include": ["vitest.config.mts", "src/**/*.spec.ts", "src/**/*.d.ts", "src/**/fixtures/**/*.ts"],
+  "references": [{ "path": "./tsconfig.lib.json" }]
+}
diff --git a/packages/dev-workflow-v2/use-cases/vitest.config.mts b/packages/dev-workflow-v2/use-cases/vitest.config.mts
new file mode 100644
index 000000000..36faf761d
--- /dev/null
+++ b/packages/dev-workflow-v2/use-cases/vitest.config.mts
@@ -0,0 +1,20 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    globals: true,
+    coverage: {
+      enabled: true,
+      reportsDirectory: './test-output/vitest/coverage',
+      provider: 'v8',
+      include: ['src/**/*.ts'],
+      exclude: ['src/**/*.spec.ts', 'src/**/*-test-fixtures.ts'],
+      thresholds: {
+        lines: 100,
+        statements: 100,
+        functions: 100,
+        branches: 100,
+      },
+    },
+  },
+})
diff --git a/packages/riviere-builder/README.md b/packages/riviere-builder/README.md
deleted file mode 100644
index ea9fa5d08..000000000
--- a/packages/riviere-builder/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# @living-architecture/riviere-builder
-
-Construct Riviere architecture graphs programmatically.
-
-## Install
-
-```bash
-npm install @living-architecture/riviere-builder
-```
-
-## Documentation
-
-See [apps/docs](../../apps/docs) for full documentation.
diff --git a/packages/riviere-builder/CLAUDE.md b/packages/riviere-builder/domain-model/CLAUDE.md
similarity index 100%
rename from packages/riviere-builder/CLAUDE.md
rename to packages/riviere-builder/domain-model/CLAUDE.md
diff --git a/packages/riviere-builder/domain-model/README.md b/packages/riviere-builder/domain-model/README.md
new file mode 100644
index 000000000..6c16969e2
--- /dev/null
+++ b/packages/riviere-builder/domain-model/README.md
@@ -0,0 +1,13 @@
+# @living-architecture/riviere-builder-domain-model
+
+Construct and query Riviere architecture graphs programmatically.
+
+## Install
+
+```bash
+npm install @living-architecture/riviere-builder-domain-model
+```
+
+## Documentation
+
+See [apps/docs](../../apps/docs) for full documentation.
diff --git a/packages/riviere-builder/domain-model/package.json b/packages/riviere-builder/domain-model/package.json
new file mode 100644
index 000000000..8a31e25ff
--- /dev/null
+++ b/packages/riviere-builder/domain-model/package.json
@@ -0,0 +1,52 @@
+{
+  "name": "@living-architecture/riviere-builder-domain-model",
+  "version": "0.10.3",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/NTCoding/living-architecture.git",
+    "directory": "packages/riviere-builder/domain-model"
+  },
+  "type": "module",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "@living-architecture/source": "./src/index.ts",
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
+    },
+    "./query": {
+      "@living-architecture/source": "./src/domain/query/RiviereQuery.ts",
+      "types": "./dist/domain/query/RiviereQuery.d.ts",
+      "import": "./dist/domain/query/RiviereQuery.js",
+      "default": "./dist/domain/query/RiviereQuery.js"
+    },
+    "./query/*": {
+      "@living-architecture/source": "./src/domain/query/*.ts",
+      "types": "./dist/domain/query/*.d.ts",
+      "import": "./dist/domain/query/*.js",
+      "default": "./dist/domain/query/*.js"
+    },
+    "./domain/*": {
+      "@living-architecture/source": "./src/domain/*.ts",
+      "types": "./dist/domain/*.d.ts",
+      "import": "./dist/domain/*.js",
+      "default": "./dist/domain/*.js"
+    }
+  },
+  "files": [
+    "dist",
+    "!dist/**/__fixtures__/**",
+    "!**/*.tsbuildinfo"
+  ],
+  "dependencies": {
+    "@living-architecture/riviere-schema-published-language": "workspace:*",
+    "zod": "^4.2.1"
+  }
+}
diff --git a/packages/riviere-builder/domain-model/project.json b/packages/riviere-builder/domain-model/project.json
new file mode 100644
index 000000000..efda4da6c
--- /dev/null
+++ b/packages/riviere-builder/domain-model/project.json
@@ -0,0 +1,26 @@
+{
+  "name": "riviere-builder-domain-model",
+  "targets": {
+    "build": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          "node ../../../scripts/build-public-exports.mjs . --clean",
+          "tsc --build tsconfig.lib.json",
+          "node ../../../scripts/build-public-exports.mjs ."
+        ],
+        "cwd": "{projectRoot}",
+        "parallel": false
+      },
+      "outputs": ["{projectRoot}/dist"]
+    },
+    "typedoc": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "pnpm exec typedoc --options packages/riviere-builder/domain-model/typedoc.json",
+        "cwd": "{workspaceRoot}"
+      },
+      "dependsOn": ["build"]
+    }
+  }
+}
diff --git a/packages/riviere-builder/src/__fixtures__/builder-fixtures.ts b/packages/riviere-builder/domain-model/src/__fixtures__/builder-fixtures.ts
similarity index 75%
rename from packages/riviere-builder/src/__fixtures__/builder-fixtures.ts
rename to packages/riviere-builder/domain-model/src/__fixtures__/builder-fixtures.ts
index 51632baaa..8aad960ef 100644
--- a/packages/riviere-builder/src/__fixtures__/builder-fixtures.ts
+++ b/packages/riviere-builder/domain-model/src/__fixtures__/builder-fixtures.ts
@@ -1,6 +1,4 @@
-import type { BuilderOptions } from '../features/building/domain/builder-facade'
-
-export function createValidOptions(): BuilderOptions {
+export function createValidOptions() {
   return {
     sources: [
       {
@@ -18,7 +16,7 @@ export function createValidOptions(): BuilderOptions {
         systemType: 'domain',
       },
     },
-  }
+  } as const
 }
 
 export function createSourceLocation() {
diff --git a/packages/riviere-builder/domain-model/src/domain/api-definition.spec.ts b/packages/riviere-builder/domain-model/src/domain/api-definition.spec.ts
new file mode 100644
index 000000000..59e4910f8
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/api-definition.spec.ts
@@ -0,0 +1,42 @@
+import { describe, expect, it } from 'vitest'
+import { ApiDefinition } from './api-definition'
+
+describe('ApiDefinition', () => {
+  it.each([
+    ['rest', 'REST'],
+    ['GraphQL', 'GraphQL'],
+    ['OTHER', 'other'],
+  ])('normalises %s', (input, expected) => {
+    const result = ApiDefinition.parse(input, undefined, undefined)
+
+    expect(result).toMatchObject({ success: true, data: { apiType: expected } })
+  })
+
+  it('rejects an unsupported HTTP method', () => {
+    expect(ApiDefinition.parse('REST', 'TRACE', '/orders')).toMatchObject({
+      success: false,
+      message: '--http-method is required for API component',
+    })
+  })
+
+  it('rejects an unsupported API type', () => {
+    expect(ApiDefinition.parse('SOAP', undefined, '/orders')).toMatchObject({
+      success: false,
+      message: '--api-type is required for API component',
+    })
+  })
+
+  it('rejects a missing API type', () => {
+    expect(ApiDefinition.parse(undefined, undefined, '/orders')).toMatchObject({
+      success: false,
+      message: '--api-type is required for API component',
+    })
+  })
+
+  it('accepts a supported HTTP method', () => {
+    expect(ApiDefinition.parse('REST', 'POST', '/orders')).toMatchObject({
+      success: true,
+      data: { apiType: 'REST', httpMethod: 'POST', path: '/orders' },
+    })
+  })
+})
diff --git a/packages/riviere-builder/domain-model/src/domain/api-definition.ts b/packages/riviere-builder/domain-model/src/domain/api-definition.ts
new file mode 100644
index 000000000..08660c3b3
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/api-definition.ts
@@ -0,0 +1,48 @@
+import { z } from 'zod'
+import { HttpMethod } from './http-method'
+
+const apiTypeSchema = z.enum(['REST', 'GraphQL', 'other'])
+
+/** @riviere-role value-object */
+export class ApiDefinition {
+  declare private readonly brand: 'ApiDefinition'
+
+  private constructor(
+    readonly apiType: 'REST' | 'GraphQL' | 'other',
+    readonly httpMethod:
+      | 'GET'
+      | 'POST'
+      | 'PUT'
+      | 'PATCH'
+      | 'DELETE'
+      | 'HEAD'
+      | 'OPTIONS'
+      | undefined,
+    readonly path: string | undefined,
+  ) {}
+
+  static parse(
+    apiTypeInput: string | undefined,
+    httpMethodInput: string | undefined,
+    path: string | undefined,
+  ) {
+    const normalized = normalizeApiType(apiTypeInput)
+    const apiType = apiTypeSchema.safeParse(normalized)
+    if (!apiType.success)
+      return { success: false as const, message: '--api-type is required for API component' }
+    const httpMethod = httpMethodInput === undefined ? undefined : HttpMethod.parse(httpMethodInput)
+    if (httpMethod !== undefined && !httpMethod.success)
+      return { success: false as const, message: '--http-method is required for API component' }
+    return {
+      success: true as const,
+      data: new ApiDefinition(apiType.data, httpMethod?.data.value, path),
+    }
+  }
+}
+
+function normalizeApiType(value: string | undefined): string | undefined {
+  if (value === undefined) return undefined
+  if (value.toLowerCase() === 'rest') return 'REST'
+  if (value.toLowerCase() === 'graphql') return 'GraphQL'
+  return value.toLowerCase()
+}
diff --git a/packages/riviere-builder/src/features/building/domain/builder-components.spec.ts b/packages/riviere-builder/domain-model/src/domain/builder-components.spec.ts
similarity index 98%
rename from packages/riviere-builder/src/features/building/domain/builder-components.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/builder-components.spec.ts
index 18879e7d1..8d2741df5 100644
--- a/packages/riviere-builder/src/features/building/domain/builder-components.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/builder-components.spec.ts
@@ -1,8 +1,6 @@
-import {
-  RiviereBuilder, type BuilderOptions 
-} from './builder-facade'
+import { RiviereBuilder } from './builder-facade'
 
-function createValidOptions(): BuilderOptions {
+function createValidOptions() {
   return {
     sources: [
       {
@@ -16,7 +14,7 @@ function createValidOptions(): BuilderOptions {
         systemType: 'domain',
       },
     },
-  }
+  } as const
 }
 
 describe('RiviereBuilder components', () => {
diff --git a/packages/riviere-builder/src/features/building/domain/builder-custom-types.spec.ts b/packages/riviere-builder/domain-model/src/domain/builder-custom-types.spec.ts
similarity index 97%
rename from packages/riviere-builder/src/features/building/domain/builder-custom-types.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/builder-custom-types.spec.ts
index 4f86fe0cb..946dc1508 100644
--- a/packages/riviere-builder/src/features/building/domain/builder-custom-types.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/builder-custom-types.spec.ts
@@ -1,14 +1,12 @@
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
-import {
-  RiviereBuilder, type BuilderOptions 
-} from './builder-facade'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
+import { RiviereBuilder } from './builder-facade'
 
 function parseGraph(builder: RiviereBuilder): RiviereGraph {
   const graph: RiviereGraph = JSON.parse(builder.serialize())
   return graph
 }
 
-function createValidOptions(): BuilderOptions {
+function createValidOptions() {
   return {
     sources: [
       {
@@ -22,7 +20,7 @@ function createValidOptions(): BuilderOptions {
         systemType: 'domain',
       },
     },
-  }
+  } as const
 }
 
 describe('RiviereBuilder custom types', () => {
diff --git a/packages/riviere-builder/src/features/building/domain/builder-export.spec.ts b/packages/riviere-builder/domain-model/src/domain/builder-export.spec.ts
similarity index 93%
rename from packages/riviere-builder/src/features/building/domain/builder-export.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/builder-export.spec.ts
index 628076546..92fe3abd7 100644
--- a/packages/riviere-builder/src/features/building/domain/builder-export.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/builder-export.spec.ts
@@ -1,10 +1,6 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { RiviereBuilder } from './builder-facade'
-import {
-  createValidOptions, createSourceLocation 
-} from '../../../__fixtures__/builder-fixtures'
+import { createValidOptions, createSourceLocation } from '../__fixtures__/builder-fixtures'
 
 describe('RiviereBuilder', () => {
   describe('build', () => {
@@ -75,9 +71,7 @@ describe('RiviereBuilder', () => {
       })
 
       it('includes components', () => {
-        const {
-          graph, sourceId, targetId 
-        } = buildValidGraph()
+        const { graph, sourceId, targetId } = buildValidGraph()
 
         expect(graph.components).toContainEqual(
           expect.objectContaining({
@@ -96,9 +90,7 @@ describe('RiviereBuilder', () => {
       })
 
       it('includes links', () => {
-        const {
-          graph, sourceId, targetId 
-        } = buildValidGraph()
+        const { graph, sourceId, targetId } = buildValidGraph()
 
         expect(graph.links).toContainEqual({
           id: `${sourceId}->${targetId}`,
@@ -186,7 +178,9 @@ describe('RiviereBuilder', () => {
 
       const graph = builder.build()
 
-      expect(graph.metadata.relationshipTypes).toStrictEqual({reads: { description: 'Reads data from the target' },})
+      expect(graph.metadata.relationshipTypes).toStrictEqual({
+        reads: { description: 'Reads data from the target' },
+      })
     })
 
     it('excludes externalLinks when none present', () => {
diff --git a/packages/riviere-builder/domain-model/src/domain/builder-facade.ts b/packages/riviere-builder/domain-model/src/domain/builder-facade.ts
new file mode 100644
index 000000000..e4487ff3f
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/builder-facade.ts
@@ -0,0 +1,513 @@
+import type {
+  APIComponent,
+  CustomPropertyDefinition,
+  CustomComponent,
+  DomainMetadata,
+  DomainOpComponent,
+  EventComponent,
+  EventHandlerComponent,
+  ExternalLink,
+  Link,
+  RiviereGraph,
+  SourceInfo,
+  SystemType,
+  UIComponent,
+  UseCaseComponent,
+} from '@living-architecture/riviere-schema-published-language/schema'
+import type { ValidationResult } from '@living-architecture/riviere-schema-published-language/graph-validation'
+import { RiviereBuilder as DomainBuilder } from './riviere-builder'
+import type { RiviereQuery } from './query/RiviereQuery'
+
+type BuilderOptions = Readonly<{
+  name?: string
+  description?: string
+  sources: readonly SourceInfo[]
+  domains: Readonly<Record<string, DomainMetadata>>
+}>
+
+type DomainInput = Readonly<{
+  name: string
+  description: string
+  systemType: SystemType
+}>
+
+type UpsertOptions = Readonly<{ noOverwrite?: boolean }>
+
+type UIInput = Readonly<
+  Pick<UIComponent, 'name' | 'domain' | 'module' | 'route' | 'description' | 'sourceLocation'> & {
+    metadata?: Readonly<Record<string, unknown>>
+  }
+>
+
+type APIInput = Readonly<
+  Pick<
+    APIComponent,
+    | 'name'
+    | 'domain'
+    | 'module'
+    | 'apiType'
+    | 'httpMethod'
+    | 'path'
+    | 'operationName'
+    | 'description'
+    | 'sourceLocation'
+  > & { metadata?: Readonly<Record<string, unknown>> }
+>
+
+type UseCaseInput = Readonly<
+  Pick<UseCaseComponent, 'name' | 'domain' | 'module' | 'description' | 'sourceLocation'> & {
+    metadata?: Readonly<Record<string, unknown>>
+  }
+>
+
+type DomainOpInput = Readonly<
+  Pick<
+    DomainOpComponent,
+    | 'name'
+    | 'domain'
+    | 'module'
+    | 'operationName'
+    | 'entity'
+    | 'signature'
+    | 'behavior'
+    | 'stateChanges'
+    | 'businessRules'
+    | 'description'
+    | 'sourceLocation'
+  > & { metadata?: Readonly<Record<string, unknown>> }
+>
+
+type EventInput = Readonly<
+  Pick<
+    EventComponent,
+    'name' | 'domain' | 'module' | 'eventName' | 'eventSchema' | 'description' | 'sourceLocation'
+  > & { metadata?: Readonly<Record<string, unknown>> }
+>
+
+type EventHandlerInput = Readonly<
+  Pick<
+    EventHandlerComponent,
+    'name' | 'domain' | 'module' | 'subscribedEvents' | 'description' | 'sourceLocation'
+  > & { metadata?: Readonly<Record<string, unknown>> }
+>
+
+type CustomTypeInput = Readonly<{
+  name: string
+  description?: string
+  requiredProperties?: Readonly<Record<string, CustomPropertyDefinition>>
+  optionalProperties?: Readonly<Record<string, CustomPropertyDefinition>>
+}>
+
+type RelationshipTypeInput = Readonly<{
+  name: string
+  description: string
+}>
+
+type CustomInput = Readonly<
+  Pick<
+    CustomComponent,
+    'customTypeName' | 'name' | 'domain' | 'module' | 'description' | 'sourceLocation'
+  > & { metadata?: Readonly<Record<string, unknown>> }
+>
+
+type EnrichmentInput = Readonly<
+  Pick<DomainOpComponent, 'entity' | 'stateChanges' | 'businessRules' | 'behavior' | 'signature'>
+>
+
+type LinkInput = Readonly<{
+  from: Link['source']
+  to: Link['target']
+  type?: Link['type']
+  relationshipType?: Link['relationshipType']
+  condition?: Link['condition']
+  sourceLocation?: Link['sourceLocation']
+}>
+
+type ExternalLinkInput = Readonly<{
+  from: ExternalLink['source']
+  target: ExternalLink['target']
+  type?: ExternalLink['type']
+  description?: ExternalLink['description']
+  sourceLocation?: ExternalLink['sourceLocation']
+  metadata?: Readonly<Record<string, unknown>>
+}>
+
+/**
+ * Programmatically construct Riviere architecture graphs.
+ *
+ * Thin facade preserving the flat public API while delegating
+ * to focused domain classes internally.
+ *
+ * @riviere-role aggregate
+ */
+export class RiviereBuilder {
+  private readonly delegate: DomainBuilder
+
+  readonly graphPath: string
+
+  private constructor(delegate: DomainBuilder) {
+    this.delegate = delegate
+    this.graphPath = delegate.graphPath
+  }
+
+  /**
+   * Restores a builder from a previously serialized graph.
+   *
+   * @param graph - A valid RiviereGraph to resume from
+   * @param graphPath - File path where the graph is persisted
+   * @returns A new RiviereBuilder with the graph state restored
+   */
+  static resume(graph: RiviereGraph, graphPath = ''): RiviereBuilder {
+    return new RiviereBuilder(DomainBuilder.resume(graph, graphPath))
+  }
+
+  /**
+   * Creates a new builder with initial configuration.
+   *
+   * @param options - Configuration including sources and domains
+   * @param graphPath - File path where the graph will be persisted
+   * @returns A new RiviereBuilder instance
+   */
+  static new(options: BuilderOptions, graphPath = ''): RiviereBuilder {
+    return new RiviereBuilder(DomainBuilder.new(options, graphPath))
+  }
+
+  /**
+   * Adds an additional source repository to the graph.
+   *
+   * @param source - Source repository information
+   */
+  addSource(source: SourceInfo): void {
+    this.delegate.construction.addSource(source)
+  }
+
+  /**
+   * Adds a new domain to the graph.
+   *
+   * @param input - Domain name and description
+   */
+  addDomain(input: DomainInput): void {
+    this.delegate.construction.addDomain(input)
+  }
+
+  /**
+   * Adds a UI component to the graph.
+   *
+   * @param input - UI component properties
+   * @returns The created UI component
+   */
+  addUI(input: UIInput): UIComponent {
+    return this.delegate.construction.addUI(input)
+  }
+
+  /**
+   * Adds or updates a UI component.
+   *
+   * @param input - UI component properties
+   * @param options - Upsert behaviour
+   * @returns The component and whether it was created
+   */
+  upsertUI(
+    input: UIInput,
+    options?: UpsertOptions,
+  ): {
+    component: UIComponent
+    created: boolean
+  } {
+    return this.delegate.construction.upsertUI(input, options)
+  }
+
+  /**
+   * Adds an API component to the graph.
+   *
+   * @param input - API component properties
+   * @returns The created API component
+   */
+  addApi(input: APIInput): APIComponent {
+    return this.delegate.construction.addApi(input)
+  }
+
+  /**
+   * Adds or updates an API component.
+   *
+   * @param input - API component properties
+   * @param options - Upsert behaviour
+   * @returns The component and whether it was created
+   */
+  upsertApi(
+    input: APIInput,
+    options?: UpsertOptions,
+  ): {
+    component: APIComponent
+    created: boolean
+  } {
+    return this.delegate.construction.upsertApi(input, options)
+  }
+
+  /**
+   * Adds a UseCase component to the graph.
+   *
+   * @param input - UseCase component properties
+   * @returns The created UseCase component
+   */
+  addUseCase(input: UseCaseInput): UseCaseComponent {
+    return this.delegate.construction.addUseCase(input)
+  }
+
+  /**
+   * Adds or updates a UseCase component.
+   *
+   * @param input - UseCase component properties
+   * @param options - Upsert behaviour
+   * @returns The component and whether it was created
+   */
+  upsertUseCase(
+    input: UseCaseInput,
+    options?: UpsertOptions,
+  ): {
+    component: UseCaseComponent
+    created: boolean
+  } {
+    return this.delegate.construction.upsertUseCase(input, options)
+  }
+
+  /**
+   * Adds a DomainOp component to the graph.
+   *
+   * @param input - DomainOp component properties
+   * @returns The created DomainOp component
+   */
+  addDomainOp(input: DomainOpInput): DomainOpComponent {
+    return this.delegate.construction.addDomainOp(input)
+  }
+
+  /**
+   * Adds or updates a DomainOp component.
+   *
+   * @param input - DomainOp component properties
+   * @param options - Upsert behaviour
+   * @returns The component and whether it was created
+   */
+  upsertDomainOp(
+    input: DomainOpInput,
+    options?: UpsertOptions,
+  ): {
+    component: DomainOpComponent
+    created: boolean
+  } {
+    return this.delegate.construction.upsertDomainOp(input, options)
+  }
+
+  /**
+   * Adds an Event component to the graph.
+   *
+   * @param input - Event component properties
+   * @returns The created Event component
+   */
+  addEvent(input: EventInput): EventComponent {
+    return this.delegate.construction.addEvent(input)
+  }
+
+  /**
+   * Adds or updates an Event component.
+   *
+   * @param input - Event component properties
+   * @param options - Upsert behaviour
+   * @returns The component and whether it was created
+   */
+  upsertEvent(
+    input: EventInput,
+    options?: UpsertOptions,
+  ): {
+    component: EventComponent
+    created: boolean
+  } {
+    return this.delegate.construction.upsertEvent(input, options)
+  }
+
+  /**
+   * Adds an EventHandler component to the graph.
+   *
+   * @param input - EventHandler component properties
+   * @returns The created EventHandler component
+   */
+  addEventHandler(input: EventHandlerInput): EventHandlerComponent {
+    return this.delegate.construction.addEventHandler(input)
+  }
+
+  /**
+   * Adds or updates an EventHandler component.
+   *
+   * @param input - EventHandler component properties
+   * @param options - Upsert behaviour
+   * @returns The component and whether it was created
+   */
+  upsertEventHandler(
+    input: EventHandlerInput,
+    options?: UpsertOptions,
+  ): {
+    component: EventHandlerComponent
+    created: boolean
+  } {
+    return this.delegate.construction.upsertEventHandler(input, options)
+  }
+
+  /**
+   * Defines a custom component type for the graph.
+   *
+   * @param input - Custom type definition
+   */
+  defineCustomType(input: CustomTypeInput): void {
+    this.delegate.construction.defineCustomType(input)
+  }
+
+  /**
+   * Defines a relationship type for the graph.
+   *
+   * @param input - Relationship type name and description
+   */
+  defineRelationshipType(input: RelationshipTypeInput): void {
+    this.delegate.construction.defineRelationshipType(input)
+  }
+
+  /**
+   * Adds a Custom component to the graph.
+   *
+   * @param input - Custom component properties
+   * @returns The created Custom component
+   */
+  addCustom(input: CustomInput): CustomComponent {
+    return this.delegate.construction.addCustom(input)
+  }
+
+  /**
+   * Adds or updates a Custom component.
+   *
+   * @param input - Custom component properties
+   * @param options - Upsert behaviour
+   * @returns The component and whether it was created
+   */
+  upsertCustom(
+    input: CustomInput,
+    options?: UpsertOptions,
+  ): {
+    component: CustomComponent
+    created: boolean
+  } {
+    return this.delegate.construction.upsertCustom(input, options)
+  }
+
+  /**
+   * Enriches a DomainOp component with additional domain details.
+   *
+   * @param id - The component ID to enrich
+   * @param enrichment - State changes and business rules to add
+   */
+  enrichComponent(id: string, enrichment: EnrichmentInput): void {
+    this.delegate.enrichment.enrichComponent(id, enrichment)
+  }
+
+  /**
+   * Finds components similar to a query for error recovery.
+   *
+   * @param query - Search criteria including partial ID, name, type, or domain
+   * @param options - Optional matching thresholds and limits
+   * @returns Array of similar components with similarity scores
+   */
+  nearMatches(
+    query: Readonly<{
+      name: string
+      type?: import('@living-architecture/riviere-schema-published-language/schema').ComponentType
+      domain?: string
+    }>,
+    options?: Readonly<{
+      threshold?: number
+      limit?: number
+    }>,
+  ) {
+    return this.delegate.errorRecovery.findNearMatches(query, options)
+  }
+
+  /**
+   * Creates a link between two components in the graph.
+   *
+   * @param input - Link properties including source, target, and type
+   * @returns The created link
+   */
+  link(input: LinkInput): Link {
+    return this.delegate.linking.link(input)
+  }
+
+  /**
+   * Creates a link from a component to an external system.
+   *
+   * @param input - External link properties including target system info
+   * @returns The created external link
+   */
+  linkExternal(input: ExternalLinkInput): ExternalLink {
+    return this.delegate.linking.linkExternal(input)
+  }
+
+  /**
+   * Returns non-fatal issues found in the graph.
+   *
+   * @returns Array of warning objects with type and message
+   */
+  warnings() {
+    return this.delegate.inspection.warnings()
+  }
+
+  /**
+   * Returns statistics about the current graph state.
+   *
+   * @returns Counts of components by type, domains, and links
+   */
+  stats() {
+    return this.delegate.inspection.stats()
+  }
+
+  /**
+   * Runs full validation on the graph.
+   *
+   * @returns Validation result with valid flag and error details
+   */
+  validate(): ValidationResult {
+    return this.delegate.inspection.validate()
+  }
+
+  /**
+   * Returns IDs of components with no incoming or outgoing links.
+   *
+   * @returns Array of orphaned component IDs
+   */
+  orphans(): string[] {
+    return this.delegate.inspection.orphans()
+  }
+
+  /**
+   * Returns query capabilities for the current graph state.
+   *
+   * @returns A snapshot that can be queried without mutating the builder
+   */
+  query(): RiviereQuery {
+    return this.delegate.inspection.query()
+  }
+
+  /**
+   * Serializes the current graph state as a JSON string.
+   *
+   * @returns JSON string representation of the graph
+   */
+  serialize(): string {
+    return this.delegate.serialize()
+  }
+
+  /**
+   * Validates and returns the completed graph.
+   *
+   * @returns Valid RiviereGraph object
+   */
+  build(): RiviereGraph {
+    return this.delegate.build()
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/builder-graph.spec.ts b/packages/riviere-builder/domain-model/src/domain/builder-graph.spec.ts
new file mode 100644
index 000000000..93687b59c
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/builder-graph.spec.ts
@@ -0,0 +1,80 @@
+import { describe, expect, it } from 'vitest'
+import { BuilderGraph } from './builder-graph'
+
+describe('BuilderGraph', () => {
+  it('returns a new graph without changing the original', () => {
+    const original = BuilderGraph.parse({
+      version: '1.0',
+      metadata: {
+        generated: '2026-08-12T00:00:00.000Z',
+        sources: [{ repository: 'example/repository' }],
+        domains: {
+          orders: {
+            description: 'Orders',
+            systemType: 'domain',
+          },
+        },
+        customTypes: {},
+        relationshipTypes: {},
+      },
+      components: [],
+      links: [],
+      externalLinks: [],
+    })
+
+    const updated = original.withDomain('shipping', {
+      description: 'Shipping',
+      systemType: 'domain',
+    })
+
+    expect(original.metadata.domains).not.toHaveProperty('shipping')
+    expect(updated.metadata.domains['shipping']).toStrictEqual({
+      description: 'Shipping',
+      systemType: 'domain',
+    })
+    expect(updated.metadata.generated).toBe('2026-08-12T00:00:00.000Z')
+    expect(updated).not.toBe(original)
+  })
+
+  it('chains updates into successive graph values', () => {
+    const original = BuilderGraph.parse({
+      version: '1.0',
+      metadata: {
+        sources: [{ repository: 'example/repository' }],
+        domains: {
+          orders: {
+            description: 'Orders',
+            systemType: 'domain',
+          },
+        },
+        customTypes: {},
+        relationshipTypes: {},
+      },
+      components: [],
+      links: [],
+      externalLinks: [],
+    })
+
+    const updated = original
+      .withDomain('shipping', {
+        description: 'Shipping',
+        systemType: 'domain',
+      })
+      .withComponent({
+        id: 'shipping:delivery:ui:tracking',
+        type: 'UI',
+        name: 'Tracking',
+        domain: 'shipping',
+        module: 'delivery',
+        route: '/tracking',
+        sourceLocation: {
+          repository: 'example/repository',
+          filePath: 'tracking.ts',
+        },
+      })
+
+    expect(updated.metadata.domains).toHaveProperty('shipping')
+    expect(updated.components).toHaveLength(1)
+    expect(original.components).toHaveLength(0)
+  })
+})
diff --git a/packages/riviere-builder/domain-model/src/domain/builder-graph.ts b/packages/riviere-builder/domain-model/src/domain/builder-graph.ts
new file mode 100644
index 000000000..c53709928
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/builder-graph.ts
@@ -0,0 +1,149 @@
+import type {
+  Component,
+  CustomTypeDefinition,
+  DomainMetadata,
+  ExternalLink,
+  Link,
+  RelationshipTypeDefinition,
+  SourceInfo,
+} from '@living-architecture/riviere-schema-published-language/schema'
+
+type BuilderGraphDefinition = Readonly<{
+  version: string
+  metadata: Readonly<{
+    name?: string
+    description?: string
+    generated?: string
+    sources: readonly SourceInfo[]
+    domains: Readonly<Record<string, DomainMetadata>>
+    customTypes: Readonly<Record<string, CustomTypeDefinition>>
+    relationshipTypes: Readonly<Record<string, RelationshipTypeDefinition>>
+  }>
+  components: readonly Component[]
+  links: readonly Link[]
+  externalLinks: readonly ExternalLink[]
+}>
+
+/** @riviere-role value-object */
+export class BuilderGraph {
+  declare private readonly brand: 'BuilderGraph'
+
+  readonly version: string
+  readonly metadata: BuilderGraphDefinition['metadata']
+  readonly components: readonly Component[]
+  readonly links: readonly Link[]
+  readonly externalLinks: readonly ExternalLink[]
+
+  private constructor(definition: BuilderGraphDefinition) {
+    this.version = definition.version
+    this.metadata = {
+      ...(definition.metadata.name !== undefined && { name: definition.metadata.name }),
+      ...(definition.metadata.description !== undefined && {
+        description: definition.metadata.description,
+      }),
+      ...(definition.metadata.generated !== undefined && {
+        generated: definition.metadata.generated,
+      }),
+      sources: [...definition.metadata.sources],
+      domains: { ...definition.metadata.domains },
+      customTypes: { ...definition.metadata.customTypes },
+      relationshipTypes: { ...definition.metadata.relationshipTypes },
+    }
+    this.components = [...definition.components]
+    this.links = [...definition.links]
+    this.externalLinks = [...definition.externalLinks]
+  }
+
+  static parse(definition: BuilderGraphDefinition): BuilderGraph {
+    return new BuilderGraph(definition)
+  }
+
+  withSource(source: SourceInfo): BuilderGraph {
+    return BuilderGraph.parse({
+      ...this.definition(),
+      metadata: {
+        ...this.metadata,
+        sources: [...this.metadata.sources, source],
+      },
+    })
+  }
+
+  withDomain(name: string, domain: DomainMetadata): BuilderGraph {
+    return BuilderGraph.parse({
+      ...this.definition(),
+      metadata: {
+        ...this.metadata,
+        domains: {
+          ...this.metadata.domains,
+          [name]: domain,
+        },
+      },
+    })
+  }
+
+  withCustomType(name: string, definition: CustomTypeDefinition): BuilderGraph {
+    return BuilderGraph.parse({
+      ...this.definition(),
+      metadata: {
+        ...this.metadata,
+        customTypes: {
+          ...this.metadata.customTypes,
+          [name]: definition,
+        },
+      },
+    })
+  }
+
+  withRelationshipType(name: string, definition: RelationshipTypeDefinition): BuilderGraph {
+    return BuilderGraph.parse({
+      ...this.definition(),
+      metadata: {
+        ...this.metadata,
+        relationshipTypes: {
+          ...this.metadata.relationshipTypes,
+          [name]: definition,
+        },
+      },
+    })
+  }
+
+  withComponent(component: Component): BuilderGraph {
+    return BuilderGraph.parse({
+      ...this.definition(),
+      components: [...this.components, component],
+    })
+  }
+
+  withComponentAt(index: number, component: Component): BuilderGraph {
+    return BuilderGraph.parse({
+      ...this.definition(),
+      components: this.components.map((existing, existingIndex) =>
+        existingIndex === index ? component : existing,
+      ),
+    })
+  }
+
+  withLink(link: Link): BuilderGraph {
+    return BuilderGraph.parse({
+      ...this.definition(),
+      links: [...this.links, link],
+    })
+  }
+
+  withExternalLink(link: ExternalLink): BuilderGraph {
+    return BuilderGraph.parse({
+      ...this.definition(),
+      externalLinks: [...this.externalLinks, link],
+    })
+  }
+
+  private definition(): BuilderGraphDefinition {
+    return {
+      version: this.version,
+      metadata: this.metadata,
+      components: this.components,
+      links: this.links,
+      externalLinks: this.externalLinks,
+    }
+  }
+}
diff --git a/packages/riviere-builder/src/features/building/domain/builder-relationship-types.spec.ts b/packages/riviere-builder/domain-model/src/domain/builder-relationship-types.spec.ts
similarity index 92%
rename from packages/riviere-builder/src/features/building/domain/builder-relationship-types.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/builder-relationship-types.spec.ts
index 4830eb666..fd8ad8150 100644
--- a/packages/riviere-builder/src/features/building/domain/builder-relationship-types.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/builder-relationship-types.spec.ts
@@ -1,11 +1,7 @@
-import {
-  describe, expect, it 
-} from 'vitest'
-import {
-  RiviereBuilder, type BuilderOptions 
-} from './builder-facade'
+import { describe, expect, it } from 'vitest'
+import { RiviereBuilder } from './builder-facade'
 
-function createValidOptions(): BuilderOptions {
+function createValidOptions() {
   return {
     sources: [{ repository: 'test/repo' }],
     domains: {
@@ -14,7 +10,7 @@ function createValidOptions(): BuilderOptions {
         systemType: 'domain',
       },
     },
-  }
+  } as const
 }
 
 describe('RiviereBuilder relationship types', () => {
diff --git a/packages/riviere-builder/src/features/building/domain/builder-serialize.spec.ts b/packages/riviere-builder/domain-model/src/domain/builder-serialize.spec.ts
similarity index 98%
rename from packages/riviere-builder/src/features/building/domain/builder-serialize.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/builder-serialize.spec.ts
index 55c12942b..7d14dab6c 100644
--- a/packages/riviere-builder/src/features/building/domain/builder-serialize.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/builder-serialize.spec.ts
@@ -1,11 +1,7 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import { describe, it, expect } from 'vitest'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import { RiviereBuilder } from './builder-facade'
-import {
-  createValidOptions, createSourceLocation 
-} from '../../../__fixtures__/builder-fixtures'
+import { createValidOptions, createSourceLocation } from '../__fixtures__/builder-fixtures'
 
 describe('RiviereBuilder', () => {
   describe('serialize', () => {
diff --git a/packages/riviere-builder/src/features/building/domain/builder-upsert-nested.spec.ts b/packages/riviere-builder/domain-model/src/domain/builder-upsert-nested.spec.ts
similarity index 98%
rename from packages/riviere-builder/src/features/building/domain/builder-upsert-nested.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/builder-upsert-nested.spec.ts
index d0dbc1d77..33edeaf99 100644
--- a/packages/riviere-builder/src/features/building/domain/builder-upsert-nested.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/builder-upsert-nested.spec.ts
@@ -1,9 +1,7 @@
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
-import {
-  RiviereBuilder, type BuilderOptions 
-} from './index'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
+import { RiviereBuilder } from './builder-facade'
 
-function createValidOptions(): BuilderOptions {
+function createValidOptions() {
   return {
     sources: [
       {
@@ -17,7 +15,7 @@ function createValidOptions(): BuilderOptions {
         systemType: 'domain',
       },
     },
-  }
+  } as const
 }
 
 function sourceLocation() {
diff --git a/packages/riviere-builder/src/features/building/domain/builder-upsert-warnings.spec.ts b/packages/riviere-builder/domain-model/src/domain/builder-upsert-warnings.spec.ts
similarity index 96%
rename from packages/riviere-builder/src/features/building/domain/builder-upsert-warnings.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/builder-upsert-warnings.spec.ts
index 29a501ee7..8027acf98 100644
--- a/packages/riviere-builder/src/features/building/domain/builder-upsert-warnings.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/builder-upsert-warnings.spec.ts
@@ -1,9 +1,8 @@
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
-import {
-  ComponentTypeMismatchError, RiviereBuilder, type BuilderOptions 
-} from './index'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
+import { RiviereBuilder } from './builder-facade'
+import { ComponentTypeMismatchError } from './construction/construction-errors'
 
-function createValidOptions(): BuilderOptions {
+function createValidOptions() {
   return {
     sources: [
       {
@@ -17,7 +16,7 @@ function createValidOptions(): BuilderOptions {
         systemType: 'domain',
       },
     },
-  }
+  } as const
 }
 
 function sourceLocation() {
diff --git a/packages/riviere-builder/src/features/building/domain/builder-upsert.spec.ts b/packages/riviere-builder/domain-model/src/domain/builder-upsert.spec.ts
similarity index 98%
rename from packages/riviere-builder/src/features/building/domain/builder-upsert.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/builder-upsert.spec.ts
index 1305f0d6b..0bd373ea7 100644
--- a/packages/riviere-builder/src/features/building/domain/builder-upsert.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/builder-upsert.spec.ts
@@ -1,8 +1,6 @@
-import {
-  RiviereBuilder, type BuilderOptions 
-} from './index'
+import { RiviereBuilder } from './builder-facade'
 
-function createValidOptions(): BuilderOptions {
+function createValidOptions() {
   return {
     sources: [
       {
@@ -16,7 +14,7 @@ function createValidOptions(): BuilderOptions {
         systemType: 'domain',
       },
     },
-  }
+  } as const
 }
 
 function sourceLocation() {
diff --git a/packages/riviere-builder/src/features/building/domain/builder-validation.spec.ts b/packages/riviere-builder/domain-model/src/domain/builder-validation.spec.ts
similarity index 96%
rename from packages/riviere-builder/src/features/building/domain/builder-validation.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/builder-validation.spec.ts
index 3af34cab5..512b7fa45 100644
--- a/packages/riviere-builder/src/features/building/domain/builder-validation.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/builder-validation.spec.ts
@@ -1,10 +1,6 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { RiviereBuilder } from './builder-facade'
-import {
-  createValidOptions, createSourceLocation 
-} from '../../../__fixtures__/builder-fixtures'
+import { createValidOptions, createSourceLocation } from '../__fixtures__/builder-fixtures'
 
 describe('RiviereBuilder', () => {
   describe('validate', () => {
diff --git a/packages/riviere-builder/src/features/building/domain/builder.spec.ts b/packages/riviere-builder/domain-model/src/domain/builder.spec.ts
similarity index 94%
rename from packages/riviere-builder/src/features/building/domain/builder.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/builder.spec.ts
index e278e66f4..2dfd8ddbb 100644
--- a/packages/riviere-builder/src/features/building/domain/builder.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/builder.spec.ts
@@ -1,14 +1,12 @@
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
-import {
-  RiviereBuilder, type BuilderOptions 
-} from './builder-facade'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
+import { RiviereBuilder } from './builder-facade'
 
 function parseGraph(builder: RiviereBuilder): RiviereGraph {
   const graph: RiviereGraph = JSON.parse(builder.serialize())
   return graph
 }
 
-function createValidOptions(): BuilderOptions {
+function createValidOptions() {
   return {
     sources: [
       {
@@ -22,13 +20,13 @@ function createValidOptions(): BuilderOptions {
         systemType: 'domain',
       },
     },
-  }
+  } as const
 }
 
 describe('RiviereBuilder', () => {
   describe('new', () => {
     it('returns builder instance when given valid options', () => {
-      const options: BuilderOptions = {
+      const options = {
         sources: [
           {
             repository: 'my-org/my-repo',
@@ -41,7 +39,7 @@ describe('RiviereBuilder', () => {
             systemType: 'domain',
           },
         },
-      }
+      } as const
 
       const builder = RiviereBuilder.new(options)
 
@@ -49,7 +47,7 @@ describe('RiviereBuilder', () => {
     })
 
     it('throws when sources array is empty', () => {
-      const options: BuilderOptions = {
+      const options = {
         sources: [],
         domains: {
           orders: {
@@ -57,22 +55,22 @@ describe('RiviereBuilder', () => {
             systemType: 'domain',
           },
         },
-      }
+      } as const
 
       expect(() => RiviereBuilder.new(options)).toThrow('At least one source required')
     })
 
     it('throws when domains object is empty', () => {
-      const options: BuilderOptions = {
+      const options = {
         sources: [{ repository: 'my-org/my-repo' }],
         domains: {},
-      }
+      } as const
 
       expect(() => RiviereBuilder.new(options)).toThrow('At least one domain required')
     })
 
     it('configures graph metadata from options', () => {
-      const options: BuilderOptions = {
+      const options = {
         name: 'my-service',
         description: 'Service description',
         sources: [
@@ -87,7 +85,7 @@ describe('RiviereBuilder', () => {
             systemType: 'domain',
           },
         },
-      }
+      } as const
 
       const builder = RiviereBuilder.new(options)
 
diff --git a/packages/riviere-builder/src/platform/domain/collection-utils/deduplicate-strings.ts b/packages/riviere-builder/domain-model/src/domain/collection-utils/deduplicate-strings.ts
similarity index 100%
rename from packages/riviere-builder/src/platform/domain/collection-utils/deduplicate-strings.ts
rename to packages/riviere-builder/domain-model/src/domain/collection-utils/deduplicate-strings.ts
diff --git a/packages/riviere-builder/src/platform/domain/collection-utils/deduplicate.spec.ts b/packages/riviere-builder/domain-model/src/domain/collection-utils/deduplicate.spec.ts
similarity index 100%
rename from packages/riviere-builder/src/platform/domain/collection-utils/deduplicate.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/collection-utils/deduplicate.spec.ts
diff --git a/packages/riviere-builder/domain-model/src/domain/component-definition.ts b/packages/riviere-builder/domain-model/src/domain/component-definition.ts
new file mode 100644
index 000000000..f061afb9b
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/component-definition.ts
@@ -0,0 +1,190 @@
+import type { Component } from '@living-architecture/riviere-schema-published-language/schema'
+import { ComponentType } from './component-type'
+import { ApiDefinition } from './api-definition'
+import { CustomComponentDefinition } from './custom-component-definition'
+import { SubscribedEvents } from './subscribed-events'
+
+interface ComponentDefinitionInput {
+  componentType: string
+  name: string
+  domain: string
+  module: string
+  repository: string
+  filePath: string
+  lineNumber?: number
+  columnNumber?: number
+  route?: string
+  apiType?: string
+  httpMethod?: string
+  httpPath?: string
+  operationName?: string
+  entity?: string
+  eventName?: string
+  eventSchema?: string
+  subscribedEvents?: string
+  customType?: string
+  customProperty?: string[]
+  description?: string
+}
+
+type CommonInput = Pick<Component, 'name' | 'domain' | 'module' | 'description' | 'sourceLocation'>
+type ComponentDefinitionValue =
+  | { type: 'UI'; input: CommonInput & { route: string } }
+  | {
+      type: 'API'
+      input: CommonInput & {
+        apiType: ApiDefinition['apiType']
+        httpMethod?: NonNullable<ApiDefinition['httpMethod']>
+        path?: string
+      }
+    }
+  | { type: 'UseCase'; input: CommonInput }
+  | { type: 'DomainOp'; input: CommonInput & { operationName: string; entity?: string } }
+  | { type: 'Event'; input: CommonInput & { eventName: string; eventSchema?: string } }
+  | { type: 'EventHandler'; input: CommonInput & { subscribedEvents: string[] } }
+  | {
+      type: 'Custom'
+      input: CommonInput & {
+        customTypeName: string
+        metadata?: NonNullable<CustomComponentDefinition['metadata']>
+      }
+    }
+
+type ParsedValue =
+  | { success: true; data: ComponentDefinitionValue }
+  | { success: false; message: string }
+
+/** @riviere-role value-object */
+export class ComponentDefinition {
+  declare private readonly brand: 'ComponentDefinition'
+
+  private constructor(readonly value: ComponentDefinitionValue) {}
+
+  static parse(input: ComponentDefinitionInput) {
+    const componentType = ComponentType.parse(input.componentType)
+    if (!componentType.success) return invalid(`Invalid component type: ${input.componentType}`)
+    const parsed = parseValue(componentType.data.value, commonInput(input), input)
+    return parsed.success
+      ? { success: true as const, data: new ComponentDefinition(parsed.data) }
+      : parsed
+  }
+}
+
+function parseValue(
+  type: ComponentDefinitionValue['type'],
+  common: CommonInput,
+  input: ComponentDefinitionInput,
+): ParsedValue {
+  switch (type) {
+    case 'UI':
+      return required(input.route, '--route is required for UI component', (route) => ({
+        type,
+        input: { ...common, route },
+      }))
+    case 'API':
+      return parseApi(common, input)
+    case 'UseCase':
+      return valid({ type, input: common })
+    case 'DomainOp':
+      return required(
+        input.operationName,
+        '--operation-name is required for DomainOp component',
+        (operationName) => ({
+          type,
+          input: {
+            ...common,
+            operationName,
+            ...(input.entity === undefined ? {} : { entity: input.entity }),
+          },
+        }),
+      )
+    case 'Event':
+      return required(
+        input.eventName,
+        '--event-name is required for Event component',
+        (eventName) => ({
+          type,
+          input: {
+            ...common,
+            eventName,
+            ...(input.eventSchema === undefined ? {} : { eventSchema: input.eventSchema }),
+          },
+        }),
+      )
+    case 'EventHandler':
+      return parseEventHandler(common, input.subscribedEvents)
+    case 'Custom':
+      return parseCustom(common, input)
+  }
+}
+
+function parseApi(common: CommonInput, input: ComponentDefinitionInput): ParsedValue {
+  const parsed = ApiDefinition.parse(input.apiType, input.httpMethod, input.httpPath)
+  return parsed.success
+    ? valid({
+        type: 'API',
+        input: {
+          ...common,
+          apiType: parsed.data.apiType,
+          ...(parsed.data.httpMethod === undefined ? {} : { httpMethod: parsed.data.httpMethod }),
+          ...(parsed.data.path === undefined ? {} : { path: parsed.data.path }),
+        },
+      })
+    : parsed
+}
+
+function parseEventHandler(common: CommonInput, value: string | undefined): ParsedValue {
+  const parsed = SubscribedEvents.parse(value)
+  return parsed.success
+    ? valid({
+        type: 'EventHandler',
+        input: { ...common, subscribedEvents: [...parsed.data.values] },
+      })
+    : parsed
+}
+
+function parseCustom(common: CommonInput, input: ComponentDefinitionInput): ParsedValue {
+  const parsed = CustomComponentDefinition.parse(input.customType, input.customProperty)
+  return parsed.success
+    ? valid({
+        type: 'Custom',
+        input: {
+          ...common,
+          customTypeName: parsed.data.customTypeName,
+          ...(parsed.data.metadata === undefined ? {} : { metadata: parsed.data.metadata }),
+        },
+      })
+    : parsed
+}
+
+function commonInput(input: ComponentDefinitionInput): CommonInput {
+  return {
+    name: input.name,
+    domain: input.domain,
+    module: input.module,
+    sourceLocation: {
+      repository: input.repository,
+      filePath: input.filePath,
+      ...(input.lineNumber === undefined ? {} : { lineNumber: input.lineNumber }),
+      ...(input.columnNumber === undefined ? {} : { columnNumber: input.columnNumber }),
+    },
+    ...(input.description === undefined ? {} : { description: input.description }),
+  }
+}
+
+function required(
+  value: string | undefined,
+  message: string,
+  create: (value: string) => ComponentDefinitionValue,
+): ParsedValue {
+  return value === undefined || value.trim().length === 0
+    ? invalid(message)
+    : valid(create(value.trim()))
+}
+
+function valid(data: ComponentDefinitionValue): ParsedValue {
+  return { success: true, data }
+}
+function invalid(message: string) {
+  return { success: false as const, message }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/component-type.spec.ts b/packages/riviere-builder/domain-model/src/domain/component-type.spec.ts
new file mode 100644
index 000000000..98d87ec74
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/component-type.spec.ts
@@ -0,0 +1,27 @@
+import { describe, expect, it } from 'vitest'
+import { ComponentType } from './component-type'
+
+describe('ComponentType', () => {
+  it.each([
+    ['UI', 'UI'],
+    ['api', 'API'],
+    ['usecase', 'UseCase'],
+    ['DomainOp', 'DomainOp'],
+    ['event', 'Event'],
+    ['eventhandler', 'EventHandler'],
+    ['custom', 'Custom'],
+  ])('parses %s as %s', (value, expected) => {
+    const result = ComponentType.parse(value)
+
+    expect(result.success).toBe(true)
+    expect(result.success && result.data.value).toBe(expected)
+    expect(result.success && result.data.componentIdValue).toBe(expected.toLowerCase())
+  })
+
+  it('returns the validation error for an unsupported component type', () => {
+    const result = ComponentType.parse('other')
+
+    expect(result.success).toBe(false)
+    expect(!result.success && result.error.issues).not.toHaveLength(0)
+  })
+})
diff --git a/packages/riviere-builder/domain-model/src/domain/component-type.ts b/packages/riviere-builder/domain-model/src/domain/component-type.ts
new file mode 100644
index 000000000..ced7936a6
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/component-type.ts
@@ -0,0 +1,38 @@
+import { z } from 'zod'
+
+const componentTypes = [
+  'UI',
+  'API',
+  'UseCase',
+  'DomainOp',
+  'Event',
+  'EventHandler',
+  'Custom',
+] as const
+const componentTypeSchema = z.enum(componentTypes)
+type ComponentTypeValue = z.infer<typeof componentTypeSchema>
+
+/** @riviere-role value-object */
+export class ComponentType {
+  declare private readonly brand: 'ComponentType'
+  readonly componentIdValue: string
+  readonly value: ComponentTypeValue
+
+  private constructor(value: ComponentTypeValue) {
+    this.componentIdValue = value.toLowerCase()
+    this.value = value
+  }
+
+  static parse(value: string) {
+    const canonicalValue = componentTypes.find(
+      (componentType) => componentType.toLowerCase() === value.toLowerCase(),
+    )
+    const parsed = componentTypeSchema.safeParse(canonicalValue)
+    return parsed.success
+      ? {
+          data: new ComponentType(parsed.data),
+          success: true as const,
+        }
+      : parsed
+  }
+}
diff --git a/packages/riviere-builder/src/features/building/domain/construction/builder-assertions.ts b/packages/riviere-builder/domain-model/src/domain/construction/builder-assertions.ts
similarity index 76%
rename from packages/riviere-builder/src/features/building/domain/construction/builder-assertions.ts
rename to packages/riviere-builder/domain-model/src/domain/construction/builder-assertions.ts
index 9ac57dec9..dbdddcfbb 100644
--- a/packages/riviere-builder/src/features/building/domain/construction/builder-assertions.ts
+++ b/packages/riviere-builder/domain-model/src/domain/construction/builder-assertions.ts
@@ -1,6 +1,7 @@
 import type {
-  CustomTypeDefinition, DomainMetadata 
-} from '@living-architecture/riviere-schema'
+  CustomTypeDefinition,
+  DomainMetadata,
+} from '@living-architecture/riviere-schema-published-language/schema'
 import {
   CustomTypeNotFoundError,
   DomainNotFoundError,
@@ -8,7 +9,10 @@ import {
 } from './construction-errors'
 
 /** @riviere-role domain-service */
-export function assertDomainExists(domains: Record<string, DomainMetadata>, domain: string): void {
+export function assertDomainExists(
+  domains: Readonly<Record<string, DomainMetadata>>,
+  domain: string,
+): void {
   if (!domains[domain]) {
     throw new DomainNotFoundError(domain)
   }
@@ -16,7 +20,7 @@ export function assertDomainExists(domains: Record<string, DomainMetadata>, doma
 
 /** @riviere-role domain-service */
 export function assertCustomTypeExists(
-  customTypes: Record<string, CustomTypeDefinition>,
+  customTypes: Readonly<Record<string, CustomTypeDefinition>>,
   customTypeName: string,
 ): void {
   if (!customTypes[customTypeName]) {
@@ -27,7 +31,7 @@ export function assertCustomTypeExists(
 
 /** @riviere-role domain-service */
 export function assertRequiredPropertiesProvided(
-  customTypes: Record<string, CustomTypeDefinition>,
+  customTypes: Readonly<Record<string, CustomTypeDefinition>>,
   customTypeName: string,
   metadata: Record<string, unknown> | undefined,
 ): void {
diff --git a/packages/riviere-builder/domain-model/src/domain/construction/builder-internals.ts b/packages/riviere-builder/domain-model/src/domain/construction/builder-internals.ts
new file mode 100644
index 000000000..9ded59387
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/construction/builder-internals.ts
@@ -0,0 +1,56 @@
+import type {
+  Component,
+  CustomTypeDefinition,
+  DomainMetadata,
+} from '@living-architecture/riviere-schema-published-language/schema'
+import { ComponentId } from '@living-architecture/riviere-schema-published-language/component-id'
+import { createSourceNotFoundError } from '../error-recovery/component-suggestion'
+import { ComponentNotFoundError } from './construction-errors'
+import {
+  assertCustomTypeExists,
+  assertDomainExists,
+  assertRequiredPropertiesProvided,
+} from './builder-assertions'
+
+/** @riviere-role domain-service */
+export function generateComponentId(
+  domain: string,
+  module: string,
+  type: string,
+  name: string,
+): string {
+  const nameSegment = name.toLowerCase().replaceAll(/\s+/g, '-')
+  return `${domain}:${module}:${type}:${nameSegment}`
+}
+
+/** @riviere-role domain-service */
+export function createComponentNotFoundError(components: readonly Component[], id: string): Error {
+  const parsed = ComponentId.parse(id)
+  if (!parsed.success) return new ComponentNotFoundError(id, [])
+  return createSourceNotFoundError(components, parsed.componentId)
+}
+
+/** @riviere-role domain-service */
+export function validateDomainExists(
+  domains: Readonly<Record<string, DomainMetadata>>,
+  domain: string,
+): void {
+  assertDomainExists(domains, domain)
+}
+
+/** @riviere-role domain-service */
+export function validateCustomType(
+  customTypes: Readonly<Record<string, CustomTypeDefinition>>,
+  customTypeName: string,
+): void {
+  assertCustomTypeExists(customTypes, customTypeName)
+}
+
+/** @riviere-role domain-service */
+export function validateRequiredProperties(
+  customTypes: Readonly<Record<string, CustomTypeDefinition>>,
+  customTypeName: string,
+  metadata: Record<string, unknown> | undefined,
+): void {
+  assertRequiredPropertiesProvided(customTypes, customTypeName, metadata)
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/construction/component-registration.ts b/packages/riviere-builder/domain-model/src/domain/construction/component-registration.ts
new file mode 100644
index 000000000..7b35251cc
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/construction/component-registration.ts
@@ -0,0 +1,74 @@
+import type { Component } from '@living-architecture/riviere-schema-published-language/schema'
+import type { BuilderGraph } from '../builder-graph'
+import { ComponentTypeMismatchError, DuplicateComponentError } from './construction-errors'
+import { mergeComponentForUpsert } from '../enrichment/upsert-merge'
+
+type AddScalarOverwriteWarning = (
+  warning: Readonly<{
+    code: 'SCALAR_OVERWRITE'
+    message: string
+    componentId: string
+    field: string
+    oldValue: string | number | boolean
+    newValue: string | number | boolean
+  }>,
+) => void
+
+/** @riviere-role domain-service */
+export function registerComponent<T extends Component>(
+  graph: BuilderGraph,
+  component: T,
+): Readonly<{
+  graph: BuilderGraph
+  component: T
+}> {
+  if (graph.components.some((existing) => existing.id === component.id)) {
+    throw new DuplicateComponentError(component.id)
+  }
+
+  return {
+    graph: graph.withComponent(component),
+    component,
+  }
+}
+
+/** @riviere-role domain-service */
+export function upsertComponent<T extends Component>(
+  graph: BuilderGraph,
+  incoming: T,
+  options: Readonly<{ noOverwrite?: boolean }> | undefined,
+  addWarning: AddScalarOverwriteWarning,
+): Readonly<{
+  graph: BuilderGraph
+  component: T
+  created: boolean
+}> {
+  const existingIndex = graph.components.findIndex((component) => component.id === incoming.id)
+  if (existingIndex === -1) {
+    return {
+      graph: graph.withComponent(incoming),
+      component: incoming,
+      created: true,
+    }
+  }
+
+  const existing = graph.components[existingIndex]
+  if (!isSameTypeComponent(existing, incoming)) {
+    throw new ComponentTypeMismatchError(incoming.id, existing?.type ?? 'unknown', incoming.type)
+  }
+
+  const component = mergeComponentForUpsert(existing, incoming, options, addWarning)
+
+  return {
+    graph: graph.withComponentAt(existingIndex, component),
+    component,
+    created: false,
+  }
+}
+
+function isSameTypeComponent<T extends Component>(
+  existing: Component | undefined,
+  incoming: T,
+): existing is T {
+  return existing?.type === incoming.type
+}
diff --git a/packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts b/packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts
similarity index 100%
rename from packages/riviere-builder/src/features/building/domain/construction/construction-errors.ts
rename to packages/riviere-builder/domain-model/src/domain/construction/construction-errors.ts
diff --git a/packages/riviere-builder/domain-model/src/domain/construction/errors.spec.ts b/packages/riviere-builder/domain-model/src/domain/construction/errors.spec.ts
new file mode 100644
index 000000000..cb2b81a23
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/construction/errors.spec.ts
@@ -0,0 +1,226 @@
+import { describe, it, expect } from 'vitest'
+import {
+  ComponentNotFoundError,
+  CustomTypeNotFoundError,
+  DomainNotFoundError,
+  DuplicateComponentError,
+  DuplicateDomainError,
+  SourceConflictError,
+  ComponentTypeMismatchError,
+  CustomTypeAlreadyDefinedError,
+  MissingRequiredPropertiesError,
+  InvalidGraphError,
+  MissingSourcesError,
+  MissingDomainsError,
+  BuildValidationError,
+  DuplicateLinkError,
+  RelationshipTypeAlreadyDefinedError,
+  RelationshipTypeNotFoundError,
+} from './construction-errors'
+import { InvalidEnrichmentTargetError } from '../enrichment/enrichment-errors'
+
+describe('errors', () => {
+  describe('DuplicateDomainError', () => {
+    it('includes domain name in message', () => {
+      const error = new DuplicateDomainError('orders')
+
+      expect(error.message).toBe("Domain 'orders' already exists")
+      expect(error.domainName).toBe('orders')
+      expect(error.name).toBe('DuplicateDomainError')
+    })
+  })
+
+  describe('SourceConflictError', () => {
+    it('includes repository in message', () => {
+      const error = new SourceConflictError('test/repo')
+
+      expect(error.message).toBe("Source 'test/repo' already exists with different values")
+      expect(error.repository).toBe('test/repo')
+      expect(error.name).toBe('SourceConflictError')
+    })
+  })
+
+  describe('DomainNotFoundError', () => {
+    it('includes domain name in message', () => {
+      const error = new DomainNotFoundError('orders')
+
+      expect(error.message).toBe("Domain 'orders' does not exist")
+      expect(error.domainName).toBe('orders')
+      expect(error.name).toBe('DomainNotFoundError')
+    })
+  })
+
+  describe('CustomTypeNotFoundError', () => {
+    it('includes custom type name and defined types in message', () => {
+      const error = new CustomTypeNotFoundError('Queue', ['Worker', 'Cache'])
+
+      expect(error.message).toBe("Custom type 'Queue' not defined. Defined types: Worker, Cache")
+      expect(error.customTypeName).toBe('Queue')
+      expect(error.definedTypes).toStrictEqual(['Worker', 'Cache'])
+      expect(error.name).toBe('CustomTypeNotFoundError')
+    })
+
+    it('handles empty defined types', () => {
+      const error = new CustomTypeNotFoundError('Queue', [])
+
+      expect(error.message).toBe(
+        "Custom type 'Queue' not defined. No custom types have been defined.",
+      )
+    })
+  })
+
+  describe('DuplicateComponentError', () => {
+    it('includes component ID in message', () => {
+      const error = new DuplicateComponentError('orders:checkout:api:create-order')
+
+      expect(error.message).toBe(
+        "Component with ID 'orders:checkout:api:create-order' already exists",
+      )
+      expect(error.componentId).toBe('orders:checkout:api:create-order')
+      expect(error.name).toBe('DuplicateComponentError')
+    })
+  })
+
+  describe('ComponentTypeMismatchError', () => {
+    it('includes component identity and types in message', () => {
+      const error = new ComponentTypeMismatchError('orders:checkout:ui:checkout-page', 'UI', 'API')
+
+      expect(error.message).toBe(
+        "Component 'orders:checkout:ui:checkout-page' already exists as type 'UI'; cannot upsert as 'API'",
+      )
+      expect(error.componentId).toBe('orders:checkout:ui:checkout-page')
+      expect(error.existingType).toBe('UI')
+      expect(error.incomingType).toBe('API')
+    })
+  })
+
+  describe('ComponentNotFoundError', () => {
+    it('includes component ID and empty suggestions by default', () => {
+      const error = new ComponentNotFoundError('orders:checkout:api:create-ordr')
+
+      expect(error.message).toBe("Source component 'orders:checkout:api:create-ordr' not found")
+      expect(error.componentId).toBe('orders:checkout:api:create-ordr')
+      expect(error.suggestions).toStrictEqual([])
+      expect(error.name).toBe('ComponentNotFoundError')
+    })
+
+    it('includes suggestions in message when provided', () => {
+      const error = new ComponentNotFoundError('orders:checkout:api:create-ordr', [
+        'orders:checkout:api:create-order',
+        'orders:checkout:api:update-order',
+      ])
+
+      expect(error.message).toBe(
+        "Source component 'orders:checkout:api:create-ordr' not found. Did you mean: orders:checkout:api:create-order, orders:checkout:api:update-order?",
+      )
+      expect(error.suggestions).toStrictEqual([
+        'orders:checkout:api:create-order',
+        'orders:checkout:api:update-order',
+      ])
+    })
+  })
+
+  describe('InvalidEnrichmentTargetError', () => {
+    it('includes component ID and type in message', () => {
+      const error = new InvalidEnrichmentTargetError('orders:api:create', 'API')
+
+      expect(error.message).toBe(
+        "Only DomainOp components can be enriched. 'orders:api:create' is type 'API'",
+      )
+      expect(error.componentId).toBe('orders:api:create')
+      expect(error.componentType).toBe('API')
+      expect(error.name).toBe('InvalidEnrichmentTargetError')
+    })
+  })
+
+  describe('CustomTypeAlreadyDefinedError', () => {
+    it('includes type name in message', () => {
+      const error = new CustomTypeAlreadyDefinedError('Worker')
+
+      expect(error.message).toBe("Custom type 'Worker' already defined")
+      expect(error.typeName).toBe('Worker')
+      expect(error.name).toBe('CustomTypeAlreadyDefinedError')
+    })
+  })
+
+  describe('RelationshipTypeAlreadyDefinedError', () => {
+    it('includes the relationship type name in the message', () => {
+      const error = new RelationshipTypeAlreadyDefinedError('reads')
+
+      expect(error.message).toBe("Relationship type 'reads' already defined")
+      expect(error.typeName).toBe('reads')
+      expect(error.name).toBe('RelationshipTypeAlreadyDefinedError')
+    })
+  })
+
+  describe('RelationshipTypeNotFoundError', () => {
+    it('includes the relationship type and available types in the message', () => {
+      const error = new RelationshipTypeNotFoundError('queries', ['reads', 'writes'])
+
+      expect(error.message).toBe(
+        "Relationship type 'queries' not defined. Defined types: reads, writes",
+      )
+      expect(error.relationshipType).toBe('queries')
+      expect(error.definedTypes).toStrictEqual(['reads', 'writes'])
+      expect(error.name).toBe('RelationshipTypeNotFoundError')
+    })
+  })
+
+  describe('DuplicateLinkError', () => {
+    it('includes the Link ID in the message', () => {
+      const error = new DuplicateLinkError('source->target@file.sql:12:5')
+
+      expect(error.message).toBe("Link with ID 'source->target@file.sql:12:5' already exists")
+      expect(error.linkId).toBe('source->target@file.sql:12:5')
+      expect(error.name).toBe('DuplicateLinkError')
+    })
+  })
+
+  describe('MissingRequiredPropertiesError', () => {
+    it('includes custom type name and missing keys in message', () => {
+      const error = new MissingRequiredPropertiesError('Worker', ['queueName', 'concurrency'])
+
+      expect(error.message).toBe("Missing required properties for 'Worker': queueName, concurrency")
+      expect(error.customTypeName).toBe('Worker')
+      expect(error.missingKeys).toStrictEqual(['queueName', 'concurrency'])
+      expect(error.name).toBe('MissingRequiredPropertiesError')
+    })
+  })
+
+  describe('InvalidGraphError', () => {
+    it('includes reason in message', () => {
+      const error = new InvalidGraphError('missing version')
+
+      expect(error.message).toBe('Invalid graph: missing version')
+      expect(error.name).toBe('InvalidGraphError')
+    })
+  })
+
+  describe('MissingSourcesError', () => {
+    it('sets message', () => {
+      const error = new MissingSourcesError()
+
+      expect(error.message).toBe('At least one source required')
+      expect(error.name).toBe('MissingSourcesError')
+    })
+  })
+
+  describe('MissingDomainsError', () => {
+    it('sets message', () => {
+      const error = new MissingDomainsError()
+
+      expect(error.message).toBe('At least one domain required')
+      expect(error.name).toBe('MissingDomainsError')
+    })
+  })
+
+  describe('BuildValidationError', () => {
+    it('includes validation messages in message', () => {
+      const error = new BuildValidationError(['error 1', 'error 2'])
+
+      expect(error.message).toBe('Validation failed: error 1; error 2')
+      expect(error.validationMessages).toStrictEqual(['error 1', 'error 2'])
+      expect(error.name).toBe('BuildValidationError')
+    })
+  })
+})
diff --git a/packages/riviere-builder/domain-model/src/domain/construction/graph-construction.ts b/packages/riviere-builder/domain-model/src/domain/construction/graph-construction.ts
new file mode 100644
index 000000000..b6c2773b9
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/construction/graph-construction.ts
@@ -0,0 +1,453 @@
+import type {
+  APIComponent,
+  Component,
+  CustomPropertyDefinition,
+  CustomComponent,
+  DomainOpComponent,
+  EventComponent,
+  EventHandlerComponent,
+  SourceInfo,
+  SystemType,
+  UIComponent,
+  UseCaseComponent,
+} from '@living-architecture/riviere-schema-published-language/schema'
+import type { BuilderGraph } from '../builder-graph'
+import {
+  CustomTypeAlreadyDefinedError,
+  DuplicateDomainError,
+  SourceConflictError,
+  RelationshipTypeAlreadyDefinedError,
+} from './construction-errors'
+import {
+  generateComponentId,
+  validateCustomType,
+  validateDomainExists,
+  validateRequiredProperties,
+} from './builder-internals'
+import { registerComponent, upsertComponent } from './component-registration'
+
+type AddScalarOverwriteWarning = (
+  warning: Readonly<{
+    code: 'SCALAR_OVERWRITE'
+    message: string
+    componentId: string
+    field: string
+    oldValue: string | number | boolean
+    newValue: string | number | boolean
+  }>,
+) => void
+
+type DomainInput = Readonly<{
+  name: string
+  description: string
+  systemType: SystemType
+}>
+
+type UpsertOptions = Readonly<{ noOverwrite?: boolean }>
+
+type UIInput = Readonly<
+  Pick<UIComponent, 'name' | 'domain' | 'module' | 'route' | 'description' | 'sourceLocation'> & {
+    metadata?: Readonly<Record<string, unknown>>
+  }
+>
+
+type APIInput = Readonly<
+  Pick<
+    APIComponent,
+    | 'name'
+    | 'domain'
+    | 'module'
+    | 'apiType'
+    | 'httpMethod'
+    | 'path'
+    | 'operationName'
+    | 'description'
+    | 'sourceLocation'
+  > & { metadata?: Readonly<Record<string, unknown>> }
+>
+
+type UseCaseInput = Readonly<
+  Pick<UseCaseComponent, 'name' | 'domain' | 'module' | 'description' | 'sourceLocation'> & {
+    metadata?: Readonly<Record<string, unknown>>
+  }
+>
+
+type DomainOpInput = Readonly<
+  Pick<
+    DomainOpComponent,
+    | 'name'
+    | 'domain'
+    | 'module'
+    | 'operationName'
+    | 'entity'
+    | 'signature'
+    | 'behavior'
+    | 'stateChanges'
+    | 'businessRules'
+    | 'description'
+    | 'sourceLocation'
+  > & { metadata?: Readonly<Record<string, unknown>> }
+>
+
+type EventInput = Readonly<
+  Pick<
+    EventComponent,
+    'name' | 'domain' | 'module' | 'eventName' | 'eventSchema' | 'description' | 'sourceLocation'
+  > & { metadata?: Readonly<Record<string, unknown>> }
+>
+
+type EventHandlerInput = Readonly<
+  Pick<
+    EventHandlerComponent,
+    'name' | 'domain' | 'module' | 'subscribedEvents' | 'description' | 'sourceLocation'
+  > & { metadata?: Readonly<Record<string, unknown>> }
+>
+
+type CustomTypeInput = Readonly<{
+  name: string
+  description?: string
+  requiredProperties?: Readonly<Record<string, CustomPropertyDefinition>>
+  optionalProperties?: Readonly<Record<string, CustomPropertyDefinition>>
+}>
+
+type RelationshipTypeInput = Readonly<{
+  name: string
+  description: string
+}>
+
+type CustomInput = Readonly<
+  Pick<
+    CustomComponent,
+    'customTypeName' | 'name' | 'domain' | 'module' | 'description' | 'sourceLocation'
+  > & { metadata?: Readonly<Record<string, unknown>> }
+>
+
+/** @riviere-role domain-service */
+export class GraphConstruction {
+  constructor(
+    private graph: BuilderGraph,
+    private readonly addWarning: AddScalarOverwriteWarning,
+    private readonly updateGraph: (graph: BuilderGraph) => void,
+  ) {}
+
+  addSource(source: SourceInfo): void {
+    const existing = this.graph.metadata.sources.find(
+      (item) => item.repository === source.repository,
+    )
+    if (existing) {
+      if (
+        existing.repository === source.repository &&
+        existing.commit === source.commit &&
+        existing.extractedAt === source.extractedAt
+      ) {
+        return
+      }
+
+      throw new SourceConflictError(source.repository)
+    }
+
+    this.replaceGraph(this.graph.withSource(source))
+  }
+
+  addDomain(input: DomainInput): void {
+    const existing = this.graph.metadata.domains[input.name]
+    if (existing) {
+      if (existing.description === input.description && existing.systemType === input.systemType) {
+        return
+      }
+
+      throw new DuplicateDomainError(input.name)
+    }
+
+    this.replaceGraph(
+      this.graph.withDomain(input.name, {
+        description: input.description,
+        systemType: input.systemType,
+      }),
+    )
+  }
+
+  addUI(input: UIInput): UIComponent {
+    return this.registerComponent(this.buildUIComponent(input))
+  }
+
+  upsertUI(
+    input: UIInput,
+    options?: UpsertOptions,
+  ): {
+    component: UIComponent
+    created: boolean
+  } {
+    return this.upsertTypedComponent(this.buildUIComponent(input), options)
+  }
+
+  addApi(input: APIInput): APIComponent {
+    return this.registerComponent(this.buildAPIComponent(input))
+  }
+
+  upsertApi(
+    input: APIInput,
+    options?: UpsertOptions,
+  ): {
+    component: APIComponent
+    created: boolean
+  } {
+    return this.upsertTypedComponent(this.buildAPIComponent(input), options)
+  }
+
+  addUseCase(input: UseCaseInput): UseCaseComponent {
+    return this.registerComponent(this.buildUseCaseComponent(input))
+  }
+
+  upsertUseCase(
+    input: UseCaseInput,
+    options?: UpsertOptions,
+  ): {
+    component: UseCaseComponent
+    created: boolean
+  } {
+    return this.upsertTypedComponent(this.buildUseCaseComponent(input), options)
+  }
+
+  addDomainOp(input: DomainOpInput): DomainOpComponent {
+    return this.registerComponent(this.buildDomainOpComponent(input))
+  }
+
+  upsertDomainOp(
+    input: DomainOpInput,
+    options?: UpsertOptions,
+  ): {
+    component: DomainOpComponent
+    created: boolean
+  } {
+    return this.upsertTypedComponent(this.buildDomainOpComponent(input), options)
+  }
+
+  addEvent(input: EventInput): EventComponent {
+    return this.registerComponent(this.buildEventComponent(input))
+  }
+
+  upsertEvent(
+    input: EventInput,
+    options?: UpsertOptions,
+  ): {
+    component: EventComponent
+    created: boolean
+  } {
+    return this.upsertTypedComponent(this.buildEventComponent(input), options)
+  }
+
+  addEventHandler(input: EventHandlerInput): EventHandlerComponent {
+    return this.registerComponent(this.buildEventHandlerComponent(input))
+  }
+
+  upsertEventHandler(
+    input: EventHandlerInput,
+    options?: UpsertOptions,
+  ): {
+    component: EventHandlerComponent
+    created: boolean
+  } {
+    return this.upsertTypedComponent(this.buildEventHandlerComponent(input), options)
+  }
+
+  defineCustomType(input: CustomTypeInput): void {
+    const customTypes = this.graph.metadata.customTypes
+
+    if (customTypes[input.name]) {
+      throw new CustomTypeAlreadyDefinedError(input.name)
+    }
+
+    this.replaceGraph(
+      this.graph.withCustomType(input.name, {
+        ...(input.requiredProperties !== undefined && {
+          requiredProperties: input.requiredProperties,
+        }),
+        ...(input.optionalProperties !== undefined && {
+          optionalProperties: input.optionalProperties,
+        }),
+        ...(input.description !== undefined && { description: input.description }),
+      }),
+    )
+  }
+
+  defineRelationshipType(input: RelationshipTypeInput): void {
+    const relationshipTypes = this.graph.metadata.relationshipTypes
+    if (Object.hasOwn(relationshipTypes, input.name)) {
+      throw new RelationshipTypeAlreadyDefinedError(input.name)
+    }
+
+    this.replaceGraph(
+      this.graph.withRelationshipType(input.name, { description: input.description }),
+    )
+  }
+
+  addCustom(input: CustomInput): CustomComponent {
+    return this.registerComponent(this.buildCustomComponent(input))
+  }
+
+  upsertCustom(
+    input: CustomInput,
+    options?: UpsertOptions,
+  ): {
+    component: CustomComponent
+    created: boolean
+  } {
+    return this.upsertTypedComponent(this.buildCustomComponent(input), options)
+  }
+
+  private buildUIComponent(input: UIInput): UIComponent {
+    validateDomainExists(this.graph.metadata.domains, input.domain)
+    const id = generateComponentId(input.domain, input.module, 'ui', input.name)
+
+    return {
+      id,
+      type: 'UI',
+      name: input.name,
+      domain: input.domain,
+      module: input.module,
+      route: input.route,
+      sourceLocation: input.sourceLocation,
+      ...(input.description !== undefined && { description: input.description }),
+    }
+  }
+
+  private buildAPIComponent(input: APIInput): APIComponent {
+    validateDomainExists(this.graph.metadata.domains, input.domain)
+    const id = generateComponentId(input.domain, input.module, 'api', input.name)
+
+    return {
+      id,
+      type: 'API',
+      name: input.name,
+      domain: input.domain,
+      module: input.module,
+      apiType: input.apiType,
+      sourceLocation: input.sourceLocation,
+      ...(input.httpMethod !== undefined && { httpMethod: input.httpMethod }),
+      ...(input.path !== undefined && { path: input.path }),
+      ...(input.operationName !== undefined && { operationName: input.operationName }),
+      ...(input.description !== undefined && { description: input.description }),
+    }
+  }
+
+  private buildUseCaseComponent(input: UseCaseInput): UseCaseComponent {
+    validateDomainExists(this.graph.metadata.domains, input.domain)
+    const id = generateComponentId(input.domain, input.module, 'usecase', input.name)
+
+    return {
+      id,
+      type: 'UseCase',
+      name: input.name,
+      domain: input.domain,
+      module: input.module,
+      sourceLocation: input.sourceLocation,
+      ...(input.description !== undefined && { description: input.description }),
+    }
+  }
+
+  private buildDomainOpComponent(input: DomainOpInput): DomainOpComponent {
+    validateDomainExists(this.graph.metadata.domains, input.domain)
+    const id = generateComponentId(input.domain, input.module, 'domainop', input.name)
+
+    return {
+      id,
+      type: 'DomainOp',
+      name: input.name,
+      domain: input.domain,
+      module: input.module,
+      operationName: input.operationName,
+      sourceLocation: input.sourceLocation,
+      ...(input.entity !== undefined && { entity: input.entity }),
+      ...(input.signature !== undefined && { signature: input.signature }),
+      ...(input.behavior !== undefined && { behavior: input.behavior }),
+      ...(input.stateChanges !== undefined && { stateChanges: [...input.stateChanges] }),
+      ...(input.businessRules !== undefined && { businessRules: [...input.businessRules] }),
+      ...(input.description !== undefined && { description: input.description }),
+    }
+  }
+
+  private buildEventComponent(input: EventInput): EventComponent {
+    validateDomainExists(this.graph.metadata.domains, input.domain)
+    const id = generateComponentId(input.domain, input.module, 'event', input.name)
+
+    return {
+      id,
+      type: 'Event',
+      name: input.name,
+      domain: input.domain,
+      module: input.module,
+      eventName: input.eventName,
+      sourceLocation: input.sourceLocation,
+      ...(input.eventSchema !== undefined && { eventSchema: input.eventSchema }),
+      ...(input.description !== undefined && { description: input.description }),
+    }
+  }
+
+  private buildEventHandlerComponent(input: EventHandlerInput): EventHandlerComponent {
+    validateDomainExists(this.graph.metadata.domains, input.domain)
+    const id = generateComponentId(input.domain, input.module, 'eventhandler', input.name)
+
+    return {
+      id,
+      type: 'EventHandler',
+      name: input.name,
+      domain: input.domain,
+      module: input.module,
+      subscribedEvents: [...input.subscribedEvents],
+      sourceLocation: input.sourceLocation,
+      ...(input.description !== undefined && { description: input.description }),
+    }
+  }
+
+  private buildCustomComponent(input: CustomInput): CustomComponent {
+    validateDomainExists(this.graph.metadata.domains, input.domain)
+    validateCustomType(this.graph.metadata.customTypes, input.customTypeName)
+    validateRequiredProperties(
+      this.graph.metadata.customTypes,
+      input.customTypeName,
+      input.metadata,
+    )
+    const id = generateComponentId(input.domain, input.module, 'custom', input.name)
+
+    const component: CustomComponent = {
+      id,
+      type: 'Custom',
+      customTypeName: input.customTypeName,
+      name: input.name,
+      domain: input.domain,
+      module: input.module,
+      sourceLocation: input.sourceLocation,
+      ...(input.description !== undefined && { description: input.description }),
+      ...input.metadata,
+    }
+
+    return component
+  }
+
+  private registerComponent<T extends Component>(component: T): T {
+    const result = registerComponent(this.graph, component)
+    this.replaceGraph(result.graph)
+    return result.component
+  }
+
+  private upsertTypedComponent<T extends Component>(
+    incoming: T,
+    options?: UpsertOptions,
+  ): {
+    component: T
+    created: boolean
+  } {
+    const result = upsertComponent(this.graph, incoming, options, this.addWarning)
+    this.replaceGraph(result.graph)
+    return {
+      component: result.component,
+      created: result.created,
+    }
+  }
+
+  private replaceGraph(graph: BuilderGraph): void {
+    this.graph = graph
+    this.updateGraph(graph)
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/custom-component-definition.ts b/packages/riviere-builder/domain-model/src/domain/custom-component-definition.ts
new file mode 100644
index 000000000..52564faec
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/custom-component-definition.ts
@@ -0,0 +1,33 @@
+/** @riviere-role value-object */
+export class CustomComponentDefinition {
+  declare private readonly brand: 'CustomComponentDefinition'
+
+  private constructor(
+    readonly customTypeName: string,
+    readonly metadata: Readonly<Record<string, string>> | undefined,
+  ) {}
+
+  static parse(name: string | undefined, properties: readonly string[] | undefined) {
+    if (name === undefined || name.trim().length === 0) {
+      return { success: false as const, message: '--custom-type is required for Custom component' }
+    }
+    const metadata: Record<string, string> = {}
+    for (const property of properties ?? []) {
+      const separator = property.indexOf(':')
+      if (separator === -1) {
+        return {
+          success: false as const,
+          message: `Invalid custom property format: ${property}. Expected 'key:value'`,
+        }
+      }
+      metadata[property.slice(0, separator)] = property.slice(separator + 1)
+    }
+    return {
+      success: true as const,
+      data: new CustomComponentDefinition(
+        name.trim(),
+        Object.keys(metadata).length === 0 ? undefined : metadata,
+      ),
+    }
+  }
+}
diff --git a/packages/riviere-builder/src/features/building/domain/enrichment/builder-enrichment-duplicates.spec.ts b/packages/riviere-builder/domain-model/src/domain/enrichment/builder-enrichment-duplicates.spec.ts
similarity index 98%
rename from packages/riviere-builder/src/features/building/domain/enrichment/builder-enrichment-duplicates.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/enrichment/builder-enrichment-duplicates.spec.ts
index 50798a317..1989aa097 100644
--- a/packages/riviere-builder/src/features/building/domain/enrichment/builder-enrichment-duplicates.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/enrichment/builder-enrichment-duplicates.spec.ts
@@ -1,7 +1,5 @@
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
-import {
-  RiviereBuilder, type BuilderOptions 
-} from '../builder-facade'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
+import { RiviereBuilder } from '../builder-facade'
 
 function parseGraph(builder: RiviereBuilder): RiviereGraph {
   const graph: RiviereGraph = JSON.parse(builder.serialize())
@@ -12,7 +10,7 @@ function findComponent(builder: RiviereBuilder, id: string) {
   return parseGraph(builder).components.find((c) => c.id === id)
 }
 
-function createValidOptions(): BuilderOptions {
+function createValidOptions() {
   return {
     sources: [
       {
@@ -26,7 +24,7 @@ function createValidOptions(): BuilderOptions {
         systemType: 'domain',
       },
     },
-  }
+  } as const
 }
 
 function createSourceLocation() {
diff --git a/packages/riviere-builder/src/features/building/domain/enrichment/builder-enrichment.spec.ts b/packages/riviere-builder/domain-model/src/domain/enrichment/builder-enrichment.spec.ts
similarity index 93%
rename from packages/riviere-builder/src/features/building/domain/enrichment/builder-enrichment.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/enrichment/builder-enrichment.spec.ts
index 2f1884c3c..22e772a73 100644
--- a/packages/riviere-builder/src/features/building/domain/enrichment/builder-enrichment.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/enrichment/builder-enrichment.spec.ts
@@ -1,7 +1,5 @@
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
-import {
-  RiviereBuilder, type BuilderOptions 
-} from '../builder-facade'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
+import { RiviereBuilder } from '../builder-facade'
 
 function parseGraph(builder: RiviereBuilder): RiviereGraph {
   const graph: RiviereGraph = JSON.parse(builder.serialize())
@@ -12,7 +10,7 @@ function findComponent(builder: RiviereBuilder, id: string) {
   return parseGraph(builder).components.find((c) => c.id === id)
 }
 
-function createValidOptions(): BuilderOptions {
+function createValidOptions() {
   return {
     sources: [
       {
@@ -26,7 +24,7 @@ function createValidOptions(): BuilderOptions {
         systemType: 'domain',
       },
     },
-  }
+  } as const
 }
 
 function createSourceLocation() {
@@ -80,10 +78,14 @@ describe('RiviereBuilder enrichComponent', () => {
         sourceLocation: createSourceLocation(),
       })
 
-      builder.enrichComponent(domainOp.id, {businessRules: ['Customer must have valid payment', 'Inventory must be available'],})
+      builder.enrichComponent(domainOp.id, {
+        businessRules: ['Customer must have valid payment', 'Inventory must be available'],
+      })
 
       const enriched = findComponent(builder, domainOp.id)
-      expect(enriched).toMatchObject({businessRules: ['Customer must have valid payment', 'Inventory must be available'],})
+      expect(enriched).toMatchObject({
+        businessRules: ['Customer must have valid payment', 'Inventory must be available'],
+      })
     })
   })
 
@@ -172,7 +174,9 @@ describe('RiviereBuilder enrichComponent', () => {
         sourceLocation: createSourceLocation(),
       })
 
-      builder.enrichComponent(domainOp.id, {behavior: { reads: ['items parameter', 'this.state'] },})
+      builder.enrichComponent(domainOp.id, {
+        behavior: { reads: ['items parameter', 'this.state'] },
+      })
 
       const enriched = findComponent(builder, domainOp.id)
       expect(enriched).toMatchObject({ behavior: { reads: ['items parameter', 'this.state'] } })
@@ -281,7 +285,9 @@ describe('RiviereBuilder enrichComponent', () => {
       builder.enrichComponent(domainOp.id, { businessRules: ['Inventory must be available'] })
 
       const enriched = findComponent(builder, domainOp.id)
-      expect(enriched).toMatchObject({businessRules: ['Customer must be authenticated', 'Inventory must be available'],})
+      expect(enriched).toMatchObject({
+        businessRules: ['Customer must be authenticated', 'Inventory must be available'],
+      })
     })
   })
 
diff --git a/packages/riviere-builder/src/features/building/domain/enrichment/deduplicate-transitions.spec.ts b/packages/riviere-builder/domain-model/src/domain/enrichment/deduplicate-transitions.spec.ts
similarity index 100%
rename from packages/riviere-builder/src/features/building/domain/enrichment/deduplicate-transitions.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/enrichment/deduplicate-transitions.spec.ts
diff --git a/packages/riviere-builder/src/features/building/domain/enrichment/deduplicate-transitions.ts b/packages/riviere-builder/domain-model/src/domain/enrichment/deduplicate-transitions.ts
similarity index 91%
rename from packages/riviere-builder/src/features/building/domain/enrichment/deduplicate-transitions.ts
rename to packages/riviere-builder/domain-model/src/domain/enrichment/deduplicate-transitions.ts
index 67bacbbb2..e11ea8270 100644
--- a/packages/riviere-builder/src/features/building/domain/enrichment/deduplicate-transitions.ts
+++ b/packages/riviere-builder/domain-model/src/domain/enrichment/deduplicate-transitions.ts
@@ -1,4 +1,4 @@
-import type { StateTransition } from '@living-architecture/riviere-schema'
+import type { StateTransition } from '@living-architecture/riviere-schema-published-language/schema'
 
 /** @riviere-role domain-service */
 export function deduplicateStateTransitions(
diff --git a/packages/riviere-builder/src/features/building/domain/enrichment/enrichment-errors.ts b/packages/riviere-builder/domain-model/src/domain/enrichment/enrichment-errors.ts
similarity index 100%
rename from packages/riviere-builder/src/features/building/domain/enrichment/enrichment-errors.ts
rename to packages/riviere-builder/domain-model/src/domain/enrichment/enrichment-errors.ts
diff --git a/packages/riviere-builder/domain-model/src/domain/enrichment/graph-enrichment.ts b/packages/riviere-builder/domain-model/src/domain/enrichment/graph-enrichment.ts
new file mode 100644
index 000000000..043d579c2
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/enrichment/graph-enrichment.ts
@@ -0,0 +1,69 @@
+import type { DomainOpComponent } from '@living-architecture/riviere-schema-published-language/schema'
+import type { BuilderGraph } from '../builder-graph'
+import { InvalidEnrichmentTargetError } from './enrichment-errors'
+import { createComponentNotFoundError } from '../construction/builder-internals'
+import { deduplicateStateTransitions } from './deduplicate-transitions'
+import { deduplicateStrings } from '../collection-utils/deduplicate-strings'
+import { mergeBehavior } from './merge-behavior'
+
+type EnrichmentInput = Readonly<
+  Pick<DomainOpComponent, 'entity' | 'stateChanges' | 'businessRules' | 'behavior' | 'signature'>
+>
+
+/** @riviere-role domain-service */
+export class GraphEnrichment {
+  private graph: BuilderGraph
+  private readonly updateGraph: (graph: BuilderGraph) => void
+
+  constructor(graph: BuilderGraph, updateGraph: (graph: BuilderGraph) => void) {
+    this.graph = graph
+    this.updateGraph = updateGraph
+  }
+
+  enrichComponent(id: string, enrichment: EnrichmentInput): void {
+    const componentIndex = this.graph.components.findIndex((component) => component.id === id)
+    const component = this.graph.components[componentIndex]
+    if (!component) {
+      throw createComponentNotFoundError(this.graph.components, id)
+    }
+    if (component.type !== 'DomainOp') {
+      throw new InvalidEnrichmentTargetError(id, component.type)
+    }
+    const entityEnriched: DomainOpComponent = {
+      ...component,
+      ...(enrichment.entity !== undefined && { entity: enrichment.entity }),
+    }
+    const stateEnriched: DomainOpComponent = (() => {
+      if (enrichment.stateChanges === undefined) {
+        return entityEnriched
+      }
+      const existing = entityEnriched.stateChanges ?? []
+      const newItems = deduplicateStateTransitions(existing, enrichment.stateChanges)
+      return {
+        ...entityEnriched,
+        stateChanges: [...existing, ...newItems],
+      }
+    })()
+    const rulesEnriched: DomainOpComponent = (() => {
+      if (enrichment.businessRules === undefined) {
+        return stateEnriched
+      }
+      const existing = stateEnriched.businessRules ?? []
+      const newItems = deduplicateStrings(existing, enrichment.businessRules)
+      return {
+        ...stateEnriched,
+        businessRules: [...existing, ...newItems],
+      }
+    })()
+    const updatedComponent: DomainOpComponent = {
+      ...rulesEnriched,
+      ...(enrichment.behavior !== undefined && {
+        behavior: mergeBehavior(rulesEnriched.behavior, enrichment.behavior),
+      }),
+      ...(enrichment.signature !== undefined && { signature: enrichment.signature }),
+    }
+
+    this.graph = this.graph.withComponentAt(componentIndex, updatedComponent)
+    this.updateGraph(this.graph)
+  }
+}
diff --git a/packages/riviere-builder/src/features/building/domain/enrichment/merge-behavior.spec.ts b/packages/riviere-builder/domain-model/src/domain/enrichment/merge-behavior.spec.ts
similarity index 100%
rename from packages/riviere-builder/src/features/building/domain/enrichment/merge-behavior.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/enrichment/merge-behavior.spec.ts
diff --git a/packages/riviere-builder/domain-model/src/domain/enrichment/merge-behavior.ts b/packages/riviere-builder/domain-model/src/domain/enrichment/merge-behavior.ts
new file mode 100644
index 000000000..3e722f95b
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/enrichment/merge-behavior.ts
@@ -0,0 +1,29 @@
+import type {
+  DomainOpComponent,
+  OperationBehavior,
+} from '@living-architecture/riviere-schema-published-language/schema'
+import { deduplicateStrings } from '../collection-utils/deduplicate-strings'
+
+function mergeStringArray(existing: string[] | undefined, incoming: string[]): string[] {
+  const base = existing ?? []
+  return [...base, ...deduplicateStrings(base, incoming)]
+}
+
+/** @riviere-role domain-service */
+export function mergeBehavior(
+  existing: DomainOpComponent['behavior'],
+  incoming: OperationBehavior,
+): OperationBehavior {
+  const base = existing ?? {}
+  return {
+    ...base,
+    ...(incoming.reads !== undefined && { reads: mergeStringArray(base.reads, incoming.reads) }),
+    ...(incoming.validates !== undefined && {
+      validates: mergeStringArray(base.validates, incoming.validates),
+    }),
+    ...(incoming.modifies !== undefined && {
+      modifies: mergeStringArray(base.modifies, incoming.modifies),
+    }),
+    ...(incoming.emits !== undefined && { emits: mergeStringArray(base.emits, incoming.emits) }),
+  }
+}
diff --git a/packages/riviere-builder/src/features/building/domain/enrichment/upsert-merge.ts b/packages/riviere-builder/domain-model/src/domain/enrichment/upsert-merge.ts
similarity index 85%
rename from packages/riviere-builder/src/features/building/domain/enrichment/upsert-merge.ts
rename to packages/riviere-builder/domain-model/src/domain/enrichment/upsert-merge.ts
index 13487de82..f3d8831cd 100644
--- a/packages/riviere-builder/src/features/building/domain/enrichment/upsert-merge.ts
+++ b/packages/riviere-builder/domain-model/src/domain/enrichment/upsert-merge.ts
@@ -2,12 +2,20 @@ import type {
   Component,
   CustomComponent,
   OperationBehavior,
-} from '@living-architecture/riviere-schema'
-import type { UpsertOptions } from '../construction/construction-types'
-import type { BuilderWarning } from '../inspection/inspection-types'
+} from '@living-architecture/riviere-schema-published-language/schema'
 import { mergeBehavior } from './merge-behavior'
 
 type Primitive = string | number | boolean
+type AddScalarOverwriteWarning = (
+  warning: Readonly<{
+    code: 'SCALAR_OVERWRITE'
+    message: string
+    componentId: string
+    field: string
+    oldValue: Primitive
+    newValue: Primitive
+  }>,
+) => void
 
 const IDENTITY_FIELDS = new Set(['id', 'type', 'name', 'domain', 'module'])
 const CUSTOM_BASE_FIELDS = new Set([
@@ -25,8 +33,8 @@ const CUSTOM_BASE_FIELDS = new Set([
 export function mergeComponentForUpsert<T extends Component>(
   existing: T,
   incoming: T,
-  options: UpsertOptions | undefined,
-  warnings: BuilderWarning[],
+  options: { readonly noOverwrite?: boolean } | undefined,
+  addWarning: AddScalarOverwriteWarning,
 ): T {
   const merged: T = { ...existing }
 
@@ -35,11 +43,11 @@ export function mergeComponentForUpsert<T extends Component>(
       continue
     }
 
-    mergeTopLevelField(merged, existing.id, field, incomingValue, options, warnings)
+    mergeTopLevelField(merged, existing.id, field, incomingValue, options, addWarning)
   }
 
   if (isCustomComponent(existing) && isCustomComponent(incoming)) {
-    const mergedMetadata = mergeCustomMetadata(existing, incoming, options, warnings)
+    const mergedMetadata = mergeCustomMetadata(existing, incoming, options, addWarning)
     for (const [key, value] of Object.entries(mergedMetadata)) {
       setField(merged, key, value)
     }
@@ -53,8 +61,8 @@ function mergeTopLevelField(
   componentId: string,
   field: string,
   incomingValue: unknown,
-  options: UpsertOptions | undefined,
-  warnings: BuilderWarning[],
+  options: { readonly noOverwrite?: boolean } | undefined,
+  addWarning: AddScalarOverwriteWarning,
 ): void {
   if (Array.isArray(incomingValue)) {
     mergeArrayField(target, field, incomingValue)
@@ -72,19 +80,19 @@ function mergeTopLevelField(
     setField(
       target,
       field,
-      mergeNestedObject(existingRecord, incomingValue, options, warnings, componentId, field),
+      mergeNestedObject(existingRecord, incomingValue, options, addWarning, componentId, field),
     )
     return
   }
 
-  mergeScalarLikeField(target, field, incomingValue, options, warnings, componentId)
+  mergeScalarLikeField(target, field, incomingValue, options, addWarning, componentId)
 }
 
 function mergeCustomMetadata(
   existing: CustomComponent,
   incoming: CustomComponent,
-  options: UpsertOptions | undefined,
-  warnings: BuilderWarning[],
+  options: { readonly noOverwrite?: boolean } | undefined,
+  addWarning: AddScalarOverwriteWarning,
 ): Record<string, unknown> {
   const existingMetadata = extractCustomMetadata(existing)
   const incomingMetadata = extractCustomMetadata(incoming)
@@ -93,7 +101,7 @@ function mergeCustomMetadata(
     existingMetadata,
     incomingMetadata,
     options,
-    warnings,
+    addWarning,
     existing.id,
     'metadata',
   )
@@ -143,8 +151,8 @@ function mergeScalarLikeField(
   target: object,
   field: string,
   incomingValue: unknown,
-  options: UpsertOptions | undefined,
-  warnings: BuilderWarning[],
+  options: { readonly noOverwrite?: boolean } | undefined,
+  addWarning: AddScalarOverwriteWarning,
   componentId: string,
 ): void {
   const existingValue = getField(target, field)
@@ -153,13 +161,13 @@ function mergeScalarLikeField(
     return
   }
 
-  maybePushScalarOverwriteWarning(warnings, componentId, field, existingValue, incomingValue)
+  maybeAddScalarOverwriteWarning(addWarning, componentId, field, existingValue, incomingValue)
 
   setField(target, field, incomingValue)
 }
 
-function maybePushScalarOverwriteWarning(
-  warnings: BuilderWarning[],
+function maybeAddScalarOverwriteWarning(
+  addWarning: AddScalarOverwriteWarning,
   componentId: string,
   field: string,
   existingValue: unknown,
@@ -173,7 +181,7 @@ function maybePushScalarOverwriteWarning(
     return
   }
 
-  warnings.push({
+  addWarning({
     code: 'SCALAR_OVERWRITE',
     message: `Scalar field '${field}' on component '${componentId}' overwritten`,
     componentId,
@@ -186,8 +194,8 @@ function maybePushScalarOverwriteWarning(
 function mergeNestedObject(
   existing: Record<string, unknown> | undefined,
   incoming: Record<string, unknown>,
-  options: UpsertOptions | undefined,
-  warnings: BuilderWarning[],
+  options: { readonly noOverwrite?: boolean } | undefined,
+  addWarning: AddScalarOverwriteWarning,
   componentId: string,
   pathPrefix: string,
 ): Record<string, unknown> {
@@ -210,7 +218,7 @@ function mergeNestedObject(
         existingRecord,
         incomingValue,
         options,
-        warnings,
+        addWarning,
         componentId,
         `${pathPrefix}.${field}`,
       )
@@ -221,8 +229,8 @@ function mergeNestedObject(
       continue
     }
 
-    maybePushScalarOverwriteWarning(
-      warnings,
+    maybeAddScalarOverwriteWarning(
+      addWarning,
       componentId,
       `${pathPrefix}.${field}`,
       merged[field],
diff --git a/packages/riviere-builder/src/features/building/domain/error-recovery/builder-near-matches.spec.ts b/packages/riviere-builder/domain-model/src/domain/error-recovery/builder-near-matches.spec.ts
similarity index 99%
rename from packages/riviere-builder/src/features/building/domain/error-recovery/builder-near-matches.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/error-recovery/builder-near-matches.spec.ts
index 4117675f2..f590bc364 100644
--- a/packages/riviere-builder/src/features/building/domain/error-recovery/builder-near-matches.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/error-recovery/builder-near-matches.spec.ts
@@ -1,6 +1,4 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { RiviereBuilder } from '../builder-facade'
 
 class TestAssertionError extends Error {
diff --git a/packages/riviere-builder/src/features/building/domain/error-recovery/component-suggestion.ts b/packages/riviere-builder/domain-model/src/domain/error-recovery/component-suggestion.ts
similarity index 76%
rename from packages/riviere-builder/src/features/building/domain/error-recovery/component-suggestion.ts
rename to packages/riviere-builder/domain-model/src/domain/error-recovery/component-suggestion.ts
index 427cc4a3b..e593ae114 100644
--- a/packages/riviere-builder/src/features/building/domain/error-recovery/component-suggestion.ts
+++ b/packages/riviere-builder/domain-model/src/domain/error-recovery/component-suggestion.ts
@@ -1,14 +1,29 @@
-import type {
-  Component, ComponentId 
-} from '@living-architecture/riviere-schema'
+import type { Component } from '@living-architecture/riviere-schema-published-language/schema'
+import type { ComponentId } from '@living-architecture/riviere-schema-published-language/component-id'
 import { ComponentNotFoundError } from '../construction/construction-errors'
-import { similarityScore } from '../../../../platform/domain/text-similarity/string-similarity'
-import type {
-  NearMatchMismatch,
-  NearMatchOptions,
-  NearMatchQuery,
-  NearMatchResult,
-} from './match-types'
+import { similarityScore } from '../text-similarity/string-similarity'
+type NearMatchQuery = Readonly<{
+  name: string
+  type?: import('@living-architecture/riviere-schema-published-language/schema').ComponentType
+  domain?: string
+}>
+
+type NearMatchOptions = Readonly<{
+  threshold?: number
+  limit?: number
+}>
+
+type NearMatchMismatch = Readonly<{
+  field: 'type' | 'domain'
+  expected: string
+  actual: string
+}>
+
+type NearMatchResult = Readonly<{
+  component: Component
+  score: number
+  mismatch?: NearMatchMismatch
+}>
 
 function detectMismatch(
   query: NearMatchQuery,
@@ -58,7 +73,7 @@ function detectMismatch(
  * ```
  */
 export function findNearMatches(
-  components: Component[],
+  components: readonly Component[],
   query: NearMatchQuery,
   options?: NearMatchOptions,
 ): NearMatchResult[] {
@@ -76,7 +91,7 @@ export function findNearMatches(
       return {
         component,
         score,
-        mismatch,
+        ...(mismatch !== undefined && { mismatch }),
       }
     })
     .filter((result) => result.score >= threshold || result.mismatch !== undefined)
@@ -102,7 +117,7 @@ export function findNearMatches(
  * ```
  */
 export function createSourceNotFoundError(
-  components: Component[],
+  components: readonly Component[],
   id: ComponentId,
 ): ComponentNotFoundError {
   const matches = findNearMatches(components, { name: id.name() }, { limit: 3 })
diff --git a/packages/riviere-builder/domain-model/src/domain/error-recovery/near-match.ts b/packages/riviere-builder/domain-model/src/domain/error-recovery/near-match.ts
new file mode 100644
index 000000000..5447ae718
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/error-recovery/near-match.ts
@@ -0,0 +1,25 @@
+import type { BuilderGraph } from '../builder-graph'
+import { findNearMatches } from './component-suggestion'
+
+/** @riviere-role domain-service */
+export class NearMatch {
+  private readonly graph: BuilderGraph
+
+  constructor(graph: BuilderGraph) {
+    this.graph = graph
+  }
+
+  findNearMatches(
+    query: Readonly<{
+      name: string
+      type?: import('@living-architecture/riviere-schema-published-language/schema').ComponentType
+      domain?: string
+    }>,
+    options?: Readonly<{
+      threshold?: number
+      limit?: number
+    }>,
+  ) {
+    return findNearMatches(this.graph.components, query, options)
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/http-method.spec.ts b/packages/riviere-builder/domain-model/src/domain/http-method.spec.ts
new file mode 100644
index 000000000..317f257f7
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/http-method.spec.ts
@@ -0,0 +1,18 @@
+import { describe, expect, it } from 'vitest'
+import { HttpMethod } from './http-method'
+
+describe('HttpMethod', () => {
+  it.each(['GET', 'post', 'Put', 'PATCH', 'DELETE', 'HEAD', 'OPTIONS'])('parses %s', (value) => {
+    const result = HttpMethod.parse(value)
+
+    expect(result.success).toBe(true)
+    expect(result.success && result.data.value).toBe(value.toUpperCase())
+  })
+
+  it('returns the validation error for an unsupported HTTP method', () => {
+    const result = HttpMethod.parse('TRACE')
+
+    expect(result.success).toBe(false)
+    expect(!result.success && result.error.issues).not.toHaveLength(0)
+  })
+})
diff --git a/packages/riviere-builder/domain-model/src/domain/http-method.ts b/packages/riviere-builder/domain-model/src/domain/http-method.ts
new file mode 100644
index 000000000..264d690f2
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/http-method.ts
@@ -0,0 +1,24 @@
+import { z } from 'zod'
+
+const httpMethodSchema = z.enum(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'HEAD', 'OPTIONS'])
+type HttpMethodValue = z.infer<typeof httpMethodSchema>
+
+/** @riviere-role value-object */
+export class HttpMethod {
+  declare private readonly brand: 'HttpMethod'
+  readonly value: HttpMethodValue
+
+  private constructor(value: HttpMethodValue) {
+    this.value = value
+  }
+
+  static parse(value: string) {
+    const parsed = httpMethodSchema.safeParse(value.toUpperCase())
+    return parsed.success
+      ? {
+          data: new HttpMethod(parsed.data),
+          success: true as const,
+        }
+      : parsed
+  }
+}
diff --git a/packages/riviere-builder/src/features/building/domain/inspection/builder-inspection.spec.ts b/packages/riviere-builder/domain-model/src/domain/inspection/builder-inspection.spec.ts
similarity index 95%
rename from packages/riviere-builder/src/features/building/domain/inspection/builder-inspection.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/inspection/builder-inspection.spec.ts
index 66421e1ab..239794fcf 100644
--- a/packages/riviere-builder/src/features/building/domain/inspection/builder-inspection.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/inspection/builder-inspection.spec.ts
@@ -1,12 +1,22 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { RiviereBuilder } from '../builder-facade'
-import {
-  createValidOptions, createSourceLocation 
-} from '../../../../__fixtures__/builder-fixtures'
+import { createValidOptions, createSourceLocation } from '../../__fixtures__/builder-fixtures'
 
 describe('RiviereBuilder', () => {
+  describe('query', () => {
+    it('queries the components currently held by the builder', () => {
+      const builder = RiviereBuilder.new(createValidOptions())
+      const component = builder.addUseCase({
+        name: 'Create Order',
+        domain: 'orders',
+        module: 'checkout',
+        sourceLocation: createSourceLocation(),
+      })
+
+      expect(builder.query().components()).toStrictEqual([component])
+    })
+  })
+
   describe('stats', () => {
     it('returns zero counts when graph has no components', () => {
       const builder = RiviereBuilder.new(createValidOptions())
diff --git a/packages/riviere-builder/domain-model/src/domain/inspection/graph-inspection.ts b/packages/riviere-builder/domain-model/src/domain/inspection/graph-inspection.ts
new file mode 100644
index 000000000..8e2380624
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/inspection/graph-inspection.ts
@@ -0,0 +1,60 @@
+import type { ValidationResult } from '@living-architecture/riviere-schema-published-language/graph-validation'
+import type { BuilderGraph } from '../builder-graph'
+import { RiviereQuery } from '../query/RiviereQuery'
+import {
+  calculateStats,
+  findOrphans,
+  findWarnings,
+  toRiviereGraph,
+  validateGraph,
+} from './inspection-functions'
+
+type OperationWarning =
+  | Readonly<{
+      code: 'SCALAR_OVERWRITE'
+      message: string
+      componentId: string
+      field: string
+      oldValue: string | number | boolean
+      newValue: string | number | boolean
+    }>
+  | Readonly<{
+      code: 'DUPLICATE_LINK_SKIPPED'
+      message: string
+      source: string
+      target: string
+      linkType?: string
+      targetRepository?: string
+      targetName: string
+    }>
+
+/** @riviere-role domain-service */
+export class GraphInspection {
+  private readonly graph: BuilderGraph
+  private readonly operationWarnings: readonly OperationWarning[]
+
+  constructor(graph: BuilderGraph, operationWarnings: readonly OperationWarning[]) {
+    this.graph = graph
+    this.operationWarnings = operationWarnings
+  }
+
+  warnings() {
+    return [...findWarnings(this.graph), ...this.operationWarnings]
+  }
+
+  stats() {
+    return calculateStats(this.graph)
+  }
+
+  orphans(): string[] {
+    return findOrphans(this.graph)
+  }
+
+  validate(): ValidationResult {
+    return validateGraph(this.graph)
+  }
+
+  query(): RiviereQuery {
+    return new RiviereQuery(toRiviereGraph(this.graph))
+  }
+}
diff --git a/packages/riviere-builder/src/features/building/domain/inspection/inspection-functions.ts b/packages/riviere-builder/domain-model/src/domain/inspection/inspection-functions.ts
similarity index 76%
rename from packages/riviere-builder/src/features/building/domain/inspection/inspection-functions.ts
rename to packages/riviere-builder/domain-model/src/domain/inspection/inspection-functions.ts
index ef63e1d1d..f5bdd8f3f 100644
--- a/packages/riviere-builder/src/features/building/domain/inspection/inspection-functions.ts
+++ b/packages/riviere-builder/domain-model/src/domain/inspection/inspection-functions.ts
@@ -7,13 +7,20 @@ import type {
   RiviereGraph,
   SourceInfo,
   RelationshipTypeDefinition,
-} from '@living-architecture/riviere-schema'
-import {
-  RiviereQuery, type ValidationResult 
-} from '@living-architecture/riviere-query'
-import type {
-  BuilderStats, BuilderWarning 
-} from './inspection-types'
+} from '@living-architecture/riviere-schema-published-language/schema'
+import { ValidationResult } from '@living-architecture/riviere-schema-published-language/graph-validation'
+
+type InspectionWarning =
+  | Readonly<{
+      code: 'ORPHAN_COMPONENT'
+      message: string
+      componentId: string
+    }>
+  | Readonly<{
+      code: 'UNUSED_DOMAIN'
+      message: string
+      domainName: string
+    }>
 
 interface InspectionGraph {
   version: string
@@ -21,14 +28,14 @@ interface InspectionGraph {
     name?: string
     description?: string
     generated?: string
-    sources: SourceInfo[]
-    domains: Record<string, DomainMetadata>
-    customTypes: Record<string, CustomTypeDefinition>
-    relationshipTypes: Record<string, RelationshipTypeDefinition>
+    sources: readonly SourceInfo[]
+    domains: Readonly<Record<string, DomainMetadata>>
+    customTypes: Readonly<Record<string, CustomTypeDefinition>>
+    relationshipTypes: Readonly<Record<string, RelationshipTypeDefinition>>
   }
-  components: Component[]
-  links: Link[]
-  externalLinks: ExternalLink[]
+  components: readonly Component[]
+  links: readonly Link[]
+  externalLinks: readonly ExternalLink[]
 }
 
 /**
@@ -74,7 +81,7 @@ export function findOrphans(graph: InspectionGraph): string[] {
  * // { componentCount: 10, linkCount: 8, domainCount: 2, ... }
  * ```
  */
-export function calculateStats(graph: InspectionGraph): BuilderStats {
+export function calculateStats(graph: InspectionGraph) {
   const components = graph.components
   return {
     componentCount: components.length,
@@ -109,8 +116,8 @@ export function calculateStats(graph: InspectionGraph): BuilderStats {
  * // [{ code: 'ORPHAN_COMPONENT', message: '...', componentId: '...' }]
  * ```
  */
-export function findWarnings(graph: InspectionGraph): BuilderWarning[] {
-  const warnings: BuilderWarning[] = []
+export function findWarnings(graph: InspectionGraph): InspectionWarning[] {
+  const warnings: InspectionWarning[] = []
 
   for (const id of findOrphans(graph)) {
     warnings.push({
@@ -160,14 +167,14 @@ export function toRiviereGraph(graph: InspectionGraph): RiviereGraph {
     metadata: {
       ...(graph.metadata.name !== undefined && { name: graph.metadata.name }),
       ...(graph.metadata.description !== undefined && { description: graph.metadata.description }),
-      sources: graph.metadata.sources,
-      domains: graph.metadata.domains,
-      ...(hasCustomTypes && { customTypes: graph.metadata.customTypes }),
-      ...(hasRelationshipTypes && { relationshipTypes: graph.metadata.relationshipTypes }),
+      sources: [...graph.metadata.sources],
+      domains: { ...graph.metadata.domains },
+      ...(hasCustomTypes && { customTypes: { ...graph.metadata.customTypes } }),
+      ...(hasRelationshipTypes && { relationshipTypes: { ...graph.metadata.relationshipTypes } }),
     },
-    components: graph.components,
-    links: graph.links,
-    ...(hasExternalLinks && { externalLinks: graph.externalLinks }),
+    components: [...graph.components],
+    links: [...graph.links],
+    ...(hasExternalLinks && { externalLinks: [...graph.externalLinks] }),
   }
 }
 
@@ -188,5 +195,5 @@ export function toRiviereGraph(graph: InspectionGraph): RiviereGraph {
  * ```
  */
 export function validateGraph(graph: InspectionGraph): ValidationResult {
-  return new RiviereQuery(toRiviereGraph(graph)).validate()
+  return ValidationResult.parse(toRiviereGraph(graph))
 }
diff --git a/packages/riviere-builder/domain-model/src/domain/link-type.spec.ts b/packages/riviere-builder/domain-model/src/domain/link-type.spec.ts
new file mode 100644
index 000000000..2cc422f74
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/link-type.spec.ts
@@ -0,0 +1,18 @@
+import { describe, expect, it } from 'vitest'
+import { LinkType } from './link-type'
+
+describe('LinkType', () => {
+  it.each(['sync', 'async'])('parses %s', (value) => {
+    const result = LinkType.parse(value)
+
+    expect(result.success).toBe(true)
+    expect(result.success && result.data.value).toBe(value)
+  })
+
+  it('returns the validation error for an unsupported link type', () => {
+    const result = LinkType.parse('other')
+
+    expect(result.success).toBe(false)
+    expect(!result.success && result.error.issues).not.toHaveLength(0)
+  })
+})
diff --git a/packages/riviere-builder/domain-model/src/domain/link-type.ts b/packages/riviere-builder/domain-model/src/domain/link-type.ts
new file mode 100644
index 000000000..a8cbdd1df
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/link-type.ts
@@ -0,0 +1,24 @@
+import { z } from 'zod'
+
+const linkTypeSchema = z.enum(['sync', 'async'])
+type LinkTypeValue = z.infer<typeof linkTypeSchema>
+
+/** @riviere-role value-object */
+export class LinkType {
+  declare private readonly brand: 'LinkType'
+  readonly value: LinkTypeValue
+
+  private constructor(value: LinkTypeValue) {
+    this.value = value
+  }
+
+  static parse(value: string) {
+    const parsed = linkTypeSchema.safeParse(value)
+    return parsed.success
+      ? {
+          data: new LinkType(parsed.data),
+          success: true as const,
+        }
+      : parsed
+  }
+}
diff --git a/packages/riviere-builder/src/features/building/domain/linking/builder-link-occurrences.spec.ts b/packages/riviere-builder/domain-model/src/domain/linking/builder-link-occurrences.spec.ts
similarity index 97%
rename from packages/riviere-builder/src/features/building/domain/linking/builder-link-occurrences.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/linking/builder-link-occurrences.spec.ts
index bf2ee7176..9163db0d3 100644
--- a/packages/riviere-builder/src/features/building/domain/linking/builder-link-occurrences.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/linking/builder-link-occurrences.spec.ts
@@ -1,12 +1,8 @@
-import {
-  describe, expect, it 
-} from 'vitest'
-import {
-  RiviereBuilder, type BuilderOptions 
-} from '../builder-facade'
+import { describe, expect, it } from 'vitest'
+import { RiviereBuilder } from '../builder-facade'
 
 function createBuilder(): RiviereBuilder {
-  const options: BuilderOptions = {
+  const options = {
     sources: [{ repository: 'test/repo' }],
     domains: {
       orders: {
@@ -14,7 +10,7 @@ function createBuilder(): RiviereBuilder {
         systemType: 'domain',
       },
     },
-  }
+  } as const
   return RiviereBuilder.new(options)
 }
 
@@ -34,9 +30,9 @@ function replaceFirstLinkId(graph: ReturnType<RiviereBuilder['build']>, id: stri
   graph.links = graph.links.map((link, index) =>
     index === 0
       ? {
-        ...link,
-        id,
-      }
+          ...link,
+          id,
+        }
       : link,
   )
 }
diff --git a/packages/riviere-builder/src/features/building/domain/linking/builder-links.spec.ts b/packages/riviere-builder/domain-model/src/domain/linking/builder-links.spec.ts
similarity index 95%
rename from packages/riviere-builder/src/features/building/domain/linking/builder-links.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/linking/builder-links.spec.ts
index b8c0802ad..56db0909e 100644
--- a/packages/riviere-builder/src/features/building/domain/linking/builder-links.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/linking/builder-links.spec.ts
@@ -1,11 +1,7 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import {
-  RiviereBuilder, type BuilderOptions 
-} from '../builder-facade'
-
-function createValidOptions(): BuilderOptions {
+import { describe, it, expect } from 'vitest'
+import { RiviereBuilder } from '../builder-facade'
+
+function createValidOptions() {
   return {
     sources: [
       {
@@ -19,7 +15,7 @@ function createValidOptions(): BuilderOptions {
         systemType: 'domain',
       },
     },
-  }
+  } as const
 }
 
 describe('RiviereBuilder', () => {
@@ -68,6 +64,17 @@ describe('RiviereBuilder', () => {
       ).toThrow("Source component 'nonexistent:module:usecase:foo' not found")
     })
 
+    it('reports an invalid source component ID without attempting suggestions', () => {
+      const builder = RiviereBuilder.new(createValidOptions())
+
+      expect(() =>
+        builder.link({
+          from: 'not-a-component-id',
+          to: 'any:target:id',
+        }),
+      ).toThrow("Source component 'not-a-component-id' not found")
+    })
+
     it('includes near-match suggestions when source has typo', () => {
       const builder = RiviereBuilder.new(createValidOptions())
 
diff --git a/packages/riviere-builder/domain-model/src/domain/linking/graph-linking.ts b/packages/riviere-builder/domain-model/src/domain/linking/graph-linking.ts
new file mode 100644
index 000000000..fe0e11452
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/linking/graph-linking.ts
@@ -0,0 +1,141 @@
+import type {
+  ExternalLink,
+  Link,
+} from '@living-architecture/riviere-schema-published-language/schema'
+import { LinkId } from '@living-architecture/riviere-schema-published-language/link-id'
+import type { BuilderGraph } from '../builder-graph'
+import { createComponentNotFoundError } from '../construction/builder-internals'
+import {
+  DuplicateLinkError,
+  RelationshipTypeNotFoundError,
+} from '../construction/construction-errors'
+
+type LinkInput = Readonly<{
+  from: Link['source']
+  to: Link['target']
+  type?: Link['type']
+  relationshipType?: Link['relationshipType']
+  condition?: Link['condition']
+  sourceLocation?: Link['sourceLocation']
+}>
+
+type ExternalLinkInput = Readonly<{
+  from: ExternalLink['source']
+  target: ExternalLink['target']
+  type?: ExternalLink['type']
+  description?: ExternalLink['description']
+  sourceLocation?: ExternalLink['sourceLocation']
+  metadata?: Readonly<Record<string, unknown>>
+}>
+
+type AddDuplicateLinkWarning = (
+  warning: Readonly<{
+    code: 'DUPLICATE_LINK_SKIPPED'
+    message: string
+    source: string
+    target: string
+    linkType?: string
+    targetRepository?: string
+    targetName: string
+  }>,
+) => void
+
+/** @riviere-role domain-service */
+export class GraphLinking {
+  private graph: BuilderGraph
+  private readonly addWarning: AddDuplicateLinkWarning
+  private readonly updateGraph: (graph: BuilderGraph) => void
+
+  constructor(
+    graph: BuilderGraph,
+    addWarning: AddDuplicateLinkWarning,
+    updateGraph: (graph: BuilderGraph) => void,
+  ) {
+    this.graph = graph
+    this.addWarning = addWarning
+    this.updateGraph = updateGraph
+  }
+
+  link(input: LinkInput): Link {
+    const sourceExists = this.graph.components.some((c) => c.id === input.from)
+    if (!sourceExists) {
+      throw createComponentNotFoundError(this.graph.components, input.from)
+    }
+
+    if (
+      input.relationshipType !== undefined &&
+      !Object.hasOwn(this.graph.metadata.relationshipTypes, input.relationshipType)
+    ) {
+      throw new RelationshipTypeNotFoundError(
+        input.relationshipType,
+        Object.keys(this.graph.metadata.relationshipTypes),
+      )
+    }
+
+    const id = LinkId.parseFromLink({
+      source: input.from,
+      target: input.to,
+      ...(input.sourceLocation !== undefined && { sourceLocation: input.sourceLocation }),
+    }).toString()
+    if (
+      this.graph.links.some(
+        (link) => link.id === id || LinkId.parseFromLink(link).toString() === id,
+      )
+    ) {
+      throw new DuplicateLinkError(id)
+    }
+
+    const link: Link = {
+      id,
+      source: input.from,
+      target: input.to,
+      ...(input.type !== undefined && { type: input.type }),
+      ...(input.relationshipType !== undefined && { relationshipType: input.relationshipType }),
+      ...(input.condition !== undefined && { condition: input.condition }),
+      ...(input.sourceLocation !== undefined && { sourceLocation: input.sourceLocation }),
+    }
+    this.graph = this.graph.withLink(link)
+    this.updateGraph(this.graph)
+    return link
+  }
+
+  linkExternal(input: ExternalLinkInput): ExternalLink {
+    const sourceExists = this.graph.components.some((c) => c.id === input.from)
+    if (!sourceExists) {
+      throw createComponentNotFoundError(this.graph.components, input.from)
+    }
+
+    const duplicate = this.graph.externalLinks.find(
+      (link) =>
+        link.source === input.from &&
+        link.target.repository === input.target.repository &&
+        link.target.name === input.target.name &&
+        link.type === input.type,
+    )
+
+    if (duplicate) {
+      this.addWarning({
+        code: 'DUPLICATE_LINK_SKIPPED',
+        message: `Duplicate external link '${input.from}' -> '${input.target.name}' (${input.type ?? 'unspecified'}) skipped`,
+        source: input.from,
+        target: input.target.name,
+        ...(input.type !== undefined && { linkType: input.type }),
+        ...(input.target.repository !== undefined && { targetRepository: input.target.repository }),
+        targetName: input.target.name,
+      })
+
+      return duplicate
+    }
+
+    const externalLink: ExternalLink = {
+      source: input.from,
+      target: input.target,
+      ...(input.type !== undefined && { type: input.type }),
+      ...(input.description !== undefined && { description: input.description }),
+      ...(input.sourceLocation !== undefined && { sourceLocation: input.sourceLocation }),
+    }
+    this.graph = this.graph.withExternalLink(externalLink)
+    this.updateGraph(this.graph)
+    return externalLink
+  }
+}
diff --git a/packages/riviere-query/src/features/querying/queries/RiviereQuery.spec.ts b/packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.spec.ts
similarity index 96%
rename from packages/riviere-query/src/features/querying/queries/RiviereQuery.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.spec.ts
index d6d0d3b20..f25de206c 100644
--- a/packages/riviere-query/src/features/querying/queries/RiviereQuery.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.spec.ts
@@ -1,13 +1,12 @@
 import {
-  RiviereQuery, parseComponentId 
-} from './RiviereQuery'
-import {
-  createMinimalValidGraph,
   createAPIComponent,
-  createEventHandlerComponent,
   createCustomComponent,
+  createEventHandlerComponent,
+  createMinimalValidGraph,
   createUseCaseComponent,
-} from '../../../platform/__fixtures__/riviere-graph-fixtures'
+} from './__fixtures__/riviere-graph-fixtures'
+import { RiviereQuery } from './RiviereQuery'
+import { ComponentId } from './component-id'
 
 describe('RiviereQuery', () => {
   describe('constructor', () => {
@@ -85,14 +84,14 @@ describe('RiviereQuery', () => {
 
       const query = new RiviereQuery(graph)
 
-      expect(query.detectOrphans()).toStrictEqual([])
+      expect(query.detectOrphans().map((id) => id.value)).toStrictEqual([])
     })
 
     it('returns orphan IDs when components have no links', () => {
       const graph = createMinimalValidGraph()
       const query = new RiviereQuery(graph)
 
-      expect(query.detectOrphans()).toStrictEqual(['test:mod:ui:page'])
+      expect(query.detectOrphans().map((id) => id.value)).toStrictEqual(['test:mod:ui:page'])
     })
 
     it('considers both source and target links as connected', () => {
@@ -118,7 +117,7 @@ describe('RiviereQuery', () => {
 
       const query = new RiviereQuery(graph)
 
-      expect(query.detectOrphans()).toStrictEqual(['test:mod:ui:page'])
+      expect(query.detectOrphans().map((id) => id.value)).toStrictEqual(['test:mod:ui:page'])
     })
   })
 
@@ -186,7 +185,7 @@ describe('RiviereQuery', () => {
     it('returns component when ID exists', () => {
       const query = new RiviereQuery(createMinimalValidGraph())
 
-      const result = query.componentById(parseComponentId('test:mod:ui:page'))
+      const result = query.componentById(ComponentId.parse('test:mod:ui:page'))
 
       expect(result?.id).toBe('test:mod:ui:page')
     })
@@ -194,7 +193,7 @@ describe('RiviereQuery', () => {
     it('returns undefined when ID does not exist', () => {
       const query = new RiviereQuery(createMinimalValidGraph())
 
-      expect(query.componentById(parseComponentId('nonexistent:id'))).toBeUndefined()
+      expect(query.componentById(ComponentId.parse('nonexistent:id'))).toBeUndefined()
     })
   })
 
diff --git a/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts b/packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts
similarity index 81%
rename from packages/riviere-query/src/features/querying/queries/RiviereQuery.ts
rename to packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts
index 18c475cae..3781806df 100644
--- a/packages/riviere-query/src/features/querying/queries/RiviereQuery.ts
+++ b/packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.ts
@@ -1,96 +1,63 @@
 import type {
-  RiviereGraph,
   Component,
-  Link,
   ComponentType,
   DomainOpComponent,
   ExternalLink,
-} from '@living-architecture/riviere-schema'
-import type {
-  Entity, EntityTransition, PublishedEvent, EventHandlerInfo 
-} from './event-types'
-import type {
-  State,
-  ComponentId,
-  LinkId,
-  ValidationResult,
-  GraphDiff,
-  Domain,
-  Flow,
-  SearchWithFlowResult,
-  CrossDomainLink,
-  DomainConnection,
-  GraphStats,
-  ExternalDomain,
-} from './domain-types'
-import { parseRiviereGraph } from '@living-architecture/riviere-schema'
+  Link,
+  RiviereGraph,
+} from '@living-architecture/riviere-schema-published-language/schema'
+import { parseRiviereGraph } from '@living-architecture/riviere-schema-published-language/validation'
+import type { GraphDiff } from './graph-diff'
 
+import type { ComponentDepths } from './component-depths'
+import type { ComponentId } from './component-id'
 import {
-  findComponent,
+  componentsInDomain as filterByDomain,
+  componentsByType as filterByType,
   findAllComponents,
+  findComponent,
   componentById as lookupComponentById,
   searchComponents,
-  componentsInDomain as filterByDomain,
-  componentsByType as filterByType,
 } from './component-queries'
+import type { CrossDomainLink } from './cross-domain-link'
+import { queryCrossDomainLinks, queryDomainConnections } from './cross-domain-queries'
+import { queryNodeDepths } from './depth-queries'
+import type { Domain } from './domain'
+import type { DomainConnection } from './domain-connection'
 import {
-  queryDomains,
+  businessRulesForEntity,
   operationsForEntity,
+  queryDomains,
   queryEntities,
-  businessRulesForEntity,
-  transitionsForEntity,
   statesForEntity,
+  transitionsForEntity,
 } from './domain-queries'
+import type { Entity } from './entity'
+import type { EntityTransition } from './entity-transition'
+import type { EventHandlerInfo } from './event-handler-info'
+import { queryEventHandlers, queryPublishedEvents } from './event-queries'
+import type { ExternalDomain } from './external-domain'
 import { queryExternalDomains } from './external-system-queries'
-import {
-  findEntryPoints,
-  traceFlowFrom,
-  queryFlows,
-  searchWithFlowContext,
-  type SearchWithFlowOptions,
-} from './flow-queries'
-import {
-  queryCrossDomainLinks, queryDomainConnections 
-} from './cross-domain-queries'
-import {
-  queryPublishedEvents, queryEventHandlers 
-} from './event-queries'
-import {
-  validateGraph, detectOrphanComponents 
-} from './graph-validation'
+import type { Flow } from './flow'
+import { findEntryPoints, queryFlows, searchWithFlowContext, traceFlowFrom } from './flow-queries'
 import { diffGraphs } from './graph-diff'
+import type { GraphStats } from './graph-stats'
+import { detectOrphanComponents } from './graph-validation'
+import { ValidationResult } from '@living-architecture/riviere-schema-published-language/graph-validation'
+import type { LinkId } from './link-id'
+import type { PublishedEvent } from './published-event'
+import type { SearchWithFlowOptions } from './search-with-flow-options'
+import type { SearchWithFlowResult } from './search-with-flow-result'
+import type { State } from './state'
 import { queryStats } from './stats-queries'
-import { queryNodeDepths } from './depth-queries'
-
-export type {
-  Entity, EntityTransition 
-} from './event-types'
-export type {
-  ComponentId,
-  LinkId,
-  ValidationErrorCode,
-  ValidationError,
-  ValidationResult,
-  Domain,
-  ComponentCounts,
-  ComponentModification,
-  DiffStats,
-  GraphDiff,
-  Flow,
-  FlowStep,
-  LinkType,
-  SearchWithFlowResult,
-  CrossDomainLink,
-  DomainConnection,
-  GraphStats,
-  ExternalDomain,
-} from './domain-types'
-export type { SearchWithFlowOptions } from './flow-queries'
-export { parseComponentId } from './domain-types'
+import { InvalidRiviereGraphError } from './errors'
 export { ComponentNotFoundError } from './errors'
 
 function assertValidGraph(graph: unknown): asserts graph is RiviereGraph {
-  parseRiviereGraph(graph)
+  const result = parseRiviereGraph(graph)
+  if (!result.success) {
+    throw new InvalidRiviereGraphError(result.issues)
+  }
 }
 
 /**
@@ -101,7 +68,7 @@ function assertValidGraph(graph: unknown): asserts graph is RiviereGraph {
  *
  * @example
  * ```typescript
- * import { RiviereQuery } from '@living-architecture/riviere-query'
+ * import { RiviereQuery } from '@living-architecture/riviere-builder-domain-model/query'
  *
  * // From JSON
  * const query = RiviereQuery.fromJSON(graphData)
@@ -114,10 +81,10 @@ function assertValidGraph(graph: unknown): asserts graph is RiviereGraph {
  * const flow = query.traceFlow('orders:checkout:api:post-orders')
  * ```
  *
- * @riviere-role query-model
+ * @riviere-role domain-service
  */
 export class RiviereQuery {
-  private readonly graph: RiviereGraph
+  private readonly graphSnapshot: RiviereGraph
 
   /**
    * Creates a new RiviereQuery instance.
@@ -133,7 +100,7 @@ export class RiviereQuery {
    */
   constructor(graph: RiviereGraph) {
     assertValidGraph(graph)
-    this.graph = graph
+    this.graphSnapshot = graph
   }
 
   /**
@@ -166,7 +133,7 @@ export class RiviereQuery {
    * ```
    */
   components(): Component[] {
-    return this.graph.components
+    return this.graphSnapshot.components
   }
 
   /**
@@ -181,7 +148,7 @@ export class RiviereQuery {
    * ```
    */
   links(): Link[] {
-    return this.graph.links
+    return this.graphSnapshot.links
   }
 
   /**
@@ -200,7 +167,7 @@ export class RiviereQuery {
    * ```
    */
   validate(): ValidationResult {
-    return validateGraph(this.graph)
+    return ValidationResult.parse(this.graphSnapshot)
   }
 
   /**
@@ -217,7 +184,7 @@ export class RiviereQuery {
    * ```
    */
   detectOrphans(): ComponentId[] {
-    return detectOrphanComponents(this.graph)
+    return detectOrphanComponents(this.graphSnapshot)
   }
 
   /**
@@ -232,7 +199,7 @@ export class RiviereQuery {
    * ```
    */
   find(predicate: (component: Component) => boolean): Component | undefined {
-    return findComponent(this.graph, predicate)
+    return findComponent(this.graphSnapshot, predicate)
   }
 
   /**
@@ -249,7 +216,7 @@ export class RiviereQuery {
    * ```
    */
   findAll(predicate: (component: Component) => boolean): Component[] {
-    return findAllComponents(this.graph, predicate)
+    return findAllComponents(this.graphSnapshot, predicate)
   }
 
   /**
@@ -264,7 +231,7 @@ export class RiviereQuery {
    * ```
    */
   componentById(id: ComponentId): Component | undefined {
-    return lookupComponentById(this.graph, id)
+    return lookupComponentById(this.graphSnapshot, id.value)
   }
 
   /**
@@ -282,7 +249,7 @@ export class RiviereQuery {
    * ```
    */
   search(query: string): Component[] {
-    return searchComponents(this.graph, query)
+    return searchComponents(this.graphSnapshot, query)
   }
 
   /**
@@ -297,7 +264,7 @@ export class RiviereQuery {
    * ```
    */
   componentsInDomain(domainName: string): Component[] {
-    return filterByDomain(this.graph, domainName)
+    return filterByDomain(this.graphSnapshot, domainName)
   }
 
   /**
@@ -313,7 +280,7 @@ export class RiviereQuery {
    * ```
    */
   componentsByType(type: ComponentType): Component[] {
-    return filterByType(this.graph, type)
+    return filterByType(this.graphSnapshot, type)
   }
 
   /**
@@ -330,7 +297,7 @@ export class RiviereQuery {
    * ```
    */
   domains(): Domain[] {
-    return queryDomains(this.graph)
+    return queryDomains(this.graphSnapshot)
   }
 
   /**
@@ -345,7 +312,7 @@ export class RiviereQuery {
    * ```
    */
   operationsFor(entityName: string): DomainOpComponent[] {
-    return operationsForEntity(this.graph, entityName)
+    return operationsForEntity(this.graphSnapshot, entityName)
   }
 
   /**
@@ -365,7 +332,7 @@ export class RiviereQuery {
    * ```
    */
   entities(domainName?: string): Entity[] {
-    return queryEntities(this.graph, domainName)
+    return queryEntities(this.graphSnapshot, domainName)
   }
 
   /**
@@ -380,7 +347,7 @@ export class RiviereQuery {
    * ```
    */
   businessRulesFor(entityName: string): string[] {
-    return businessRulesForEntity(this.graph, entityName)
+    return businessRulesForEntity(this.graphSnapshot, entityName)
   }
 
   /**
@@ -395,7 +362,7 @@ export class RiviereQuery {
    * ```
    */
   transitionsFor(entityName: string): EntityTransition[] {
-    return transitionsForEntity(this.graph, entityName)
+    return transitionsForEntity(this.graphSnapshot, entityName)
   }
 
   /**
@@ -413,7 +380,7 @@ export class RiviereQuery {
    * ```
    */
   statesFor(entityName: string): State[] {
-    return statesForEntity(this.graph, entityName)
+    return statesForEntity(this.graphSnapshot, entityName)
   }
 
   /**
@@ -430,7 +397,7 @@ export class RiviereQuery {
    * ```
    */
   entryPoints(): Component[] {
-    return findEntryPoints(this.graph)
+    return findEntryPoints(this.graphSnapshot)
   }
 
   /**
@@ -452,7 +419,7 @@ export class RiviereQuery {
     componentIds: ComponentId[]
     linkIds: LinkId[]
   } {
-    return traceFlowFrom(this.graph, startComponentId)
+    return traceFlowFrom(this.graphSnapshot, startComponentId)
   }
 
   /**
@@ -472,7 +439,7 @@ export class RiviereQuery {
    * ```
    */
   diff(other: RiviereGraph): GraphDiff {
-    return diffGraphs(this.graph, other)
+    return diffGraphs(this.graphSnapshot, other)
   }
 
   /**
@@ -492,7 +459,7 @@ export class RiviereQuery {
    * ```
    */
   publishedEvents(domainName?: string): PublishedEvent[] {
-    return queryPublishedEvents(this.graph, domainName)
+    return queryPublishedEvents(this.graphSnapshot, domainName)
   }
 
   /**
@@ -508,7 +475,7 @@ export class RiviereQuery {
    * ```
    */
   eventHandlers(eventName?: string): EventHandlerInfo[] {
-    return queryEventHandlers(this.graph, eventName)
+    return queryEventHandlers(this.graphSnapshot, eventName)
   }
 
   /**
@@ -532,7 +499,7 @@ export class RiviereQuery {
    * ```
    */
   flows(): Flow[] {
-    return queryFlows(this.graph)
+    return queryFlows(this.graphSnapshot)
   }
 
   /**
@@ -552,7 +519,7 @@ export class RiviereQuery {
    * ```
    */
   searchWithFlow(query: string, options: SearchWithFlowOptions): SearchWithFlowResult {
-    return searchWithFlowContext(this.graph, query, options)
+    return searchWithFlowContext(this.graphSnapshot, query, options)
   }
 
   /**
@@ -567,7 +534,7 @@ export class RiviereQuery {
    * ```
    */
   crossDomainLinks(domainName: string): CrossDomainLink[] {
-    return queryCrossDomainLinks(this.graph, domainName)
+    return queryCrossDomainLinks(this.graphSnapshot, domainName)
   }
 
   /**
@@ -587,7 +554,7 @@ export class RiviereQuery {
    * ```
    */
   domainConnections(domainName: string): DomainConnection[] {
-    return queryDomainConnections(this.graph, domainName)
+    return queryDomainConnections(this.graphSnapshot, domainName)
   }
 
   /**
@@ -604,7 +571,7 @@ export class RiviereQuery {
    * ```
    */
   stats(): GraphStats {
-    return queryStats(this.graph)
+    return queryStats(this.graphSnapshot)
   }
 
   /**
@@ -622,8 +589,8 @@ export class RiviereQuery {
    * }
    * ```
    */
-  nodeDepths(): Map<ComponentId, number> {
-    return queryNodeDepths(this.graph)
+  nodeDepths(): ComponentDepths {
+    return queryNodeDepths(this.graphSnapshot)
   }
 
   /**
@@ -643,7 +610,7 @@ export class RiviereQuery {
    * ```
    */
   externalLinks(): ExternalLink[] {
-    return this.graph.externalLinks ?? []
+    return this.graphSnapshot.externalLinks ?? []
   }
 
   /**
@@ -663,6 +630,6 @@ export class RiviereQuery {
    * ```
    */
   externalDomains(): ExternalDomain[] {
-    return queryExternalDomains(this.graph)
+    return queryExternalDomains(this.graphSnapshot)
   }
 }
diff --git a/packages/riviere-query/src/features/querying/queries/RiviereQuery.validation.spec.ts b/packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.validation.spec.ts
similarity index 96%
rename from packages/riviere-query/src/features/querying/queries/RiviereQuery.validation.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.validation.spec.ts
index bb8791c6f..7b184dc18 100644
--- a/packages/riviere-query/src/features/querying/queries/RiviereQuery.validation.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/query/RiviereQuery.validation.spec.ts
@@ -1,5 +1,5 @@
+import { createMinimalValidGraph } from './__fixtures__/riviere-graph-fixtures'
 import { RiviereQuery } from './RiviereQuery'
-import { createMinimalValidGraph } from '../../../platform/__fixtures__/riviere-graph-fixtures'
 
 describe('RiviereQuery validate()', () => {
   it('returns valid=true for a valid minimal graph', () => {
@@ -95,7 +95,9 @@ describe('RiviereQuery validate()', () => {
 
   it('returns valid when Custom type has no requiredProperties', () => {
     const graph = createMinimalValidGraph()
-    graph.metadata.customTypes = {SimpleJob: { description: 'A simple job with no required properties' },}
+    graph.metadata.customTypes = {
+      SimpleJob: { description: 'A simple job with no required properties' },
+    }
     graph.components.push({
       id: 'test:mod:custom:simplejob',
       type: 'Custom',
@@ -128,7 +130,7 @@ describe('RiviereQuery validate()', () => {
 
     const result = new RiviereQuery(graph).validate()
 
-    expect(result).toStrictEqual({
+    expect(JSON.parse(JSON.stringify(result))).toStrictEqual({
       valid: true,
       errors: [],
     })
diff --git a/packages/riviere-query/src/platform/__fixtures__/riviere-graph-fixtures.ts b/packages/riviere-builder/domain-model/src/domain/query/__fixtures__/riviere-graph-fixtures.ts
similarity index 97%
rename from packages/riviere-query/src/platform/__fixtures__/riviere-graph-fixtures.ts
rename to packages/riviere-builder/domain-model/src/domain/query/__fixtures__/riviere-graph-fixtures.ts
index efbd6f655..f40b2ea78 100644
--- a/packages/riviere-query/src/platform/__fixtures__/riviere-graph-fixtures.ts
+++ b/packages/riviere-builder/domain-model/src/domain/query/__fixtures__/riviere-graph-fixtures.ts
@@ -1,13 +1,13 @@
 import type {
-  RiviereGraph,
   APIComponent,
-  EventComponent,
-  EventHandlerComponent,
   CustomComponent,
-  UseCaseComponent,
   DomainOpComponent,
+  EventComponent,
+  EventHandlerComponent,
+  RiviereGraph,
   SourceLocation,
-} from '@living-architecture/riviere-schema'
+  UseCaseComponent,
+} from '@living-architecture/riviere-schema-published-language/schema'
 
 class TestAssertionError extends Error {
   constructor(message: string) {
diff --git a/packages/riviere-query/src/features/querying/queries/compare-by-code-point.spec.ts b/packages/riviere-builder/domain-model/src/domain/query/compare-by-code-point.spec.ts
similarity index 95%
rename from packages/riviere-query/src/features/querying/queries/compare-by-code-point.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/query/compare-by-code-point.spec.ts
index 5672699b8..71f30db30 100644
--- a/packages/riviere-query/src/features/querying/queries/compare-by-code-point.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/query/compare-by-code-point.spec.ts
@@ -1,6 +1,4 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 import { compareByCodePoint } from './compare-by-code-point'
 
 describe('compareByCodePoint', () => {
diff --git a/packages/riviere-query/src/features/querying/queries/compare-by-code-point.ts b/packages/riviere-builder/domain-model/src/domain/query/compare-by-code-point.ts
similarity index 95%
rename from packages/riviere-query/src/features/querying/queries/compare-by-code-point.ts
rename to packages/riviere-builder/domain-model/src/domain/query/compare-by-code-point.ts
index d7819ed1e..01aadfba5 100644
--- a/packages/riviere-query/src/features/querying/queries/compare-by-code-point.ts
+++ b/packages/riviere-builder/domain-model/src/domain/query/compare-by-code-point.ts
@@ -1,4 +1,4 @@
-/** @riviere-role query-model */
+/** @riviere-role domain-service */
 export function compareByCodePoint(a: string, b: string): number {
   const leftCodePoints = Array.from(a, toCodePoint)
   const rightCodePoints = Array.from(b, toCodePoint)
diff --git a/packages/riviere-builder/domain-model/src/domain/query/component-counts.ts b/packages/riviere-builder/domain-model/src/domain/query/component-counts.ts
new file mode 100644
index 000000000..28a3168f1
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/component-counts.ts
@@ -0,0 +1,45 @@
+/** @riviere-role value-object */
+export class ComponentCounts {
+  declare private readonly brand: 'ComponentCounts'
+  readonly UI: number
+  readonly API: number
+  readonly UseCase: number
+  readonly DomainOp: number
+  readonly Event: number
+  readonly EventHandler: number
+  readonly Custom: number
+  readonly total: number
+
+  private constructor(input: {
+    readonly UI: number
+    readonly API: number
+    readonly UseCase: number
+    readonly DomainOp: number
+    readonly Event: number
+    readonly EventHandler: number
+    readonly Custom: number
+    readonly total: number
+  }) {
+    this.UI = input.UI
+    this.API = input.API
+    this.UseCase = input.UseCase
+    this.DomainOp = input.DomainOp
+    this.Event = input.Event
+    this.EventHandler = input.EventHandler
+    this.Custom = input.Custom
+    this.total = input.total
+  }
+
+  static parse(input: {
+    readonly UI: number
+    readonly API: number
+    readonly UseCase: number
+    readonly DomainOp: number
+    readonly Event: number
+    readonly EventHandler: number
+    readonly Custom: number
+    readonly total: number
+  }): ComponentCounts {
+    return new ComponentCounts(input)
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/component-depths.ts b/packages/riviere-builder/domain-model/src/domain/query/component-depths.ts
new file mode 100644
index 000000000..89bc1db71
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/component-depths.ts
@@ -0,0 +1,27 @@
+import type { ComponentId } from './component-id'
+
+/** @riviere-role value-object */
+export class ComponentDepths {
+  declare private readonly brand: 'ComponentDepths'
+  private readonly depths: ReadonlyMap<string, number>
+
+  private constructor(depths: ReadonlyMap<string, number>) {
+    this.depths = new Map(depths)
+  }
+
+  static parse(depths: ReadonlyMap<string, number>): ComponentDepths {
+    return new ComponentDepths(depths)
+  }
+
+  get size(): number {
+    return this.depths.size
+  }
+
+  get(componentId: ComponentId): number | undefined {
+    return this.depths.get(componentId.value)
+  }
+
+  has(componentId: ComponentId): boolean {
+    return this.depths.has(componentId.value)
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/component-id.ts b/packages/riviere-builder/domain-model/src/domain/query/component-id.ts
new file mode 100644
index 000000000..1bfce061a
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/component-id.ts
@@ -0,0 +1,22 @@
+import { z } from 'zod'
+
+const schema = z.string()
+
+/** @riviere-role value-object */
+export class ComponentId {
+  declare private readonly brand: 'ComponentId'
+
+  private constructor(readonly value: string) {}
+
+  static parse(value: string): ComponentId {
+    return new ComponentId(schema.parse(value))
+  }
+
+  localeCompare(other: ComponentId): number {
+    return this.value.localeCompare(other.value)
+  }
+
+  toJSON(): string {
+    return this.value
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/component-modification.ts b/packages/riviere-builder/domain-model/src/domain/query/component-modification.ts
new file mode 100644
index 000000000..ba5b0a393
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/component-modification.ts
@@ -0,0 +1,32 @@
+import type { Component } from '@living-architecture/riviere-schema-published-language/schema'
+import { ComponentId } from './component-id'
+
+/** @riviere-role value-object */
+export class ComponentModification {
+  declare private readonly brand: 'ComponentModification'
+  readonly id: ComponentId
+  readonly before: Component
+  readonly after: Component
+  readonly changedFields: string[]
+
+  private constructor(input: {
+    readonly id: ComponentId
+    readonly before: Component
+    readonly after: Component
+    readonly changedFields: string[]
+  }) {
+    this.id = input.id
+    this.before = input.before
+    this.after = input.after
+    this.changedFields = input.changedFields
+  }
+
+  static parse(input: {
+    readonly id: ComponentId
+    readonly before: Component
+    readonly after: Component
+    readonly changedFields: string[]
+  }): ComponentModification {
+    return new ComponentModification(input)
+  }
+}
diff --git a/packages/riviere-query/src/features/querying/queries/component-queries.ts b/packages/riviere-builder/domain-model/src/domain/query/component-queries.ts
similarity index 78%
rename from packages/riviere-query/src/features/querying/queries/component-queries.ts
rename to packages/riviere-builder/domain-model/src/domain/query/component-queries.ts
index b0683037c..feec2a4ba 100644
--- a/packages/riviere-query/src/features/querying/queries/component-queries.ts
+++ b/packages/riviere-builder/domain-model/src/domain/query/component-queries.ts
@@ -1,8 +1,10 @@
 import type {
-  RiviereGraph, Component, ComponentType 
-} from '@living-architecture/riviere-schema'
+  Component,
+  ComponentType,
+  RiviereGraph,
+} from '@living-architecture/riviere-schema-published-language/schema'
 
-/** @riviere-role query-model */
+/** @riviere-role domain-service */
 export function findComponent(
   graph: RiviereGraph,
   predicate: (component: Component) => boolean,
@@ -10,7 +12,7 @@ export function findComponent(
   return graph.components.find(predicate)
 }
 
-/** @riviere-role query-model */
+/** @riviere-role domain-service */
 export function findAllComponents(
   graph: RiviereGraph,
   predicate: (component: Component) => boolean,
@@ -18,12 +20,12 @@ export function findAllComponents(
   return graph.components.filter(predicate)
 }
 
-/** @riviere-role query-model */
+/** @riviere-role domain-service */
 export function componentById(graph: RiviereGraph, id: string): Component | undefined {
   return findComponent(graph, (c) => c.id === id)
 }
 
-/** @riviere-role query-model */
+/** @riviere-role domain-service */
 export function searchComponents(graph: RiviereGraph, query: string): Component[] {
   if (query === '') {
     return []
@@ -38,12 +40,12 @@ export function searchComponents(graph: RiviereGraph, query: string): Component[
   )
 }
 
-/** @riviere-role query-model */
+/** @riviere-role domain-service */
 export function componentsInDomain(graph: RiviereGraph, domainName: string): Component[] {
   return findAllComponents(graph, (c) => c.domain === domainName)
 }
 
-/** @riviere-role query-model */
+/** @riviere-role domain-service */
 export function componentsByType(graph: RiviereGraph, type: ComponentType): Component[] {
   return findAllComponents(graph, (c) => c.type === type)
 }
diff --git a/packages/riviere-builder/domain-model/src/domain/query/cross-domain-link.ts b/packages/riviere-builder/domain-model/src/domain/query/cross-domain-link.ts
new file mode 100644
index 000000000..798dc32d7
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/cross-domain-link.ts
@@ -0,0 +1,25 @@
+import { DomainName } from './domain-name'
+
+type CrossDomainLinkType = 'sync' | 'async' | undefined
+
+/** @riviere-role value-object */
+export class CrossDomainLink {
+  declare private readonly brand: 'CrossDomainLink'
+  readonly targetDomain: DomainName
+  readonly linkType: CrossDomainLinkType
+
+  private constructor(input: {
+    readonly targetDomain: DomainName
+    readonly linkType: CrossDomainLinkType
+  }) {
+    this.targetDomain = input.targetDomain
+    this.linkType = input.linkType
+  }
+
+  static parse(input: {
+    readonly targetDomain: DomainName
+    readonly linkType: CrossDomainLinkType
+  }): CrossDomainLink {
+    return new CrossDomainLink(input)
+  }
+}
diff --git a/packages/riviere-query/src/features/querying/queries/cross-domain-links.spec.ts b/packages/riviere-builder/domain-model/src/domain/query/cross-domain-links.spec.ts
similarity index 92%
rename from packages/riviere-query/src/features/querying/queries/cross-domain-links.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/query/cross-domain-links.spec.ts
index 52ce81547..5b50b51f1 100644
--- a/packages/riviere-query/src/features/querying/queries/cross-domain-links.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/query/cross-domain-links.spec.ts
@@ -1,14 +1,19 @@
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
+import { describe, expect, it } from 'vitest'
 import {
-  describe, it, expect 
-} from 'vitest'
-import { RiviereQuery } from './RiviereQuery'
-import {
-  createMinimalValidGraph,
   createAPIComponent,
+  createMinimalValidGraph,
   createUseCaseComponent,
-} from '../../../platform/__fixtures__/riviere-graph-fixtures'
+} from './__fixtures__/riviere-graph-fixtures'
 import { queryCrossDomainLinks } from './cross-domain-queries'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+import { RiviereQuery } from './RiviereQuery'
+
+function plainLinks(links: ReturnType<RiviereQuery['crossDomainLinks']>) {
+  return links.map(({ targetDomain, linkType }) => ({
+    targetDomain: targetDomain.value,
+    linkType,
+  }))
+}
 
 describe('crossDomainLinks', () => {
   it('returns empty array when domain has no outgoing links to other domains', () => {
@@ -17,7 +22,7 @@ describe('crossDomainLinks', () => {
 
     const result = query.crossDomainLinks('test')
 
-    expect(result).toStrictEqual([])
+    expect(plainLinks(result)).toStrictEqual([])
   })
 
   it('returns unique outgoing links to other domains with link type', () => {
@@ -63,7 +68,7 @@ describe('crossDomainLinks', () => {
 
     const result = query.crossDomainLinks('test')
 
-    expect(result).toStrictEqual([
+    expect(plainLinks(result)).toStrictEqual([
       {
         targetDomain: 'orders',
         linkType: 'sync',
@@ -119,7 +124,7 @@ describe('crossDomainLinks', () => {
 
     const result = query.crossDomainLinks('test')
 
-    expect(result).toStrictEqual([
+    expect(plainLinks(result)).toStrictEqual([
       {
         targetDomain: 'orders',
         linkType: 'sync',
@@ -171,7 +176,7 @@ describe('crossDomainLinks', () => {
 
     const result = query.crossDomainLinks('test')
 
-    expect(result).toStrictEqual([
+    expect(plainLinks(result)).toStrictEqual([
       {
         targetDomain: 'orders',
         linkType: 'async',
@@ -206,7 +211,7 @@ describe('crossDomainLinks', () => {
 
     const result = query.crossDomainLinks('test')
 
-    expect(result).toStrictEqual([])
+    expect(plainLinks(result)).toStrictEqual([])
   })
 
   it('returns results sorted by targetDomain', () => {
@@ -252,7 +257,7 @@ describe('crossDomainLinks', () => {
 
     const result = query.crossDomainLinks('test')
 
-    expect(result.map((l) => l.targetDomain)).toStrictEqual(['alpha', 'zebra'])
+    expect(result.map((l) => l.targetDomain.value)).toStrictEqual(['alpha', 'zebra'])
   })
 
   it('ignores links to non-existent components (defensive check)', () => {
@@ -290,7 +295,7 @@ describe('crossDomainLinks', () => {
 
     const result = queryCrossDomainLinks(graph, 'test')
 
-    expect(result).toStrictEqual([])
+    expect(plainLinks(result)).toStrictEqual([])
   })
 
   it('handles links with no explicit type (undefined linkType)', () => {
@@ -319,7 +324,7 @@ describe('crossDomainLinks', () => {
 
     const result = query.crossDomainLinks('test')
 
-    expect(result).toStrictEqual([
+    expect(plainLinks(result)).toStrictEqual([
       {
         targetDomain: 'orders',
         linkType: undefined,
@@ -388,7 +393,7 @@ describe('crossDomainLinks', () => {
 
     const result = query.crossDomainLinks('test')
 
-    expect(result).toStrictEqual([
+    expect(plainLinks(result)).toStrictEqual([
       {
         targetDomain: 'orders',
         linkType: undefined,
diff --git a/packages/riviere-query/src/features/querying/queries/cross-domain-queries.ts b/packages/riviere-builder/domain-model/src/domain/query/cross-domain-queries.ts
similarity index 82%
rename from packages/riviere-query/src/features/querying/queries/cross-domain-queries.ts
rename to packages/riviere-builder/domain-model/src/domain/query/cross-domain-queries.ts
index 65a2524c1..9ebc10f0b 100644
--- a/packages/riviere-query/src/features/querying/queries/cross-domain-queries.ts
+++ b/packages/riviere-builder/domain-model/src/domain/query/cross-domain-queries.ts
@@ -1,15 +1,14 @@
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
-import type {
-  CrossDomainLink, DomainConnection 
-} from './domain-types'
-import { parseDomainName } from './domain-types'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import { compareByCodePoint } from './compare-by-code-point'
+import { CrossDomainLink } from './cross-domain-link'
+import { DomainConnection } from './domain-connection'
+import { DomainName } from './domain-name'
 
 function buildNodeIdToDomain(graph: RiviereGraph): Map<string, string> {
   return new Map(graph.components.map((c) => [c.id, c.domain]))
 }
 
-/** @riviere-role query-model */
+/** @riviere-role domain-service */
 export function queryCrossDomainLinks(graph: RiviereGraph, domainName: string): CrossDomainLink[] {
   const nodeIdToDomain = buildNodeIdToDomain(graph)
   const seen = new Set<string>()
@@ -34,10 +33,12 @@ export function queryCrossDomainLinks(graph: RiviereGraph, domainName: string):
     }
 
     seen.add(key)
-    results.push({
-      targetDomain: parseDomainName(targetDomain),
-      linkType: link.type,
-    })
+    results.push(
+      CrossDomainLink.parse({
+        targetDomain: DomainName.parse(targetDomain),
+        linkType: link.type,
+      }),
+    )
   }
 
   return results.sort(compareCrossDomainLinks)
@@ -51,7 +52,7 @@ function linkTypeForSort(linkType: 'sync' | 'async' | undefined): string {
 }
 
 function compareCrossDomainLinks(a: CrossDomainLink, b: CrossDomainLink): number {
-  const domainCompare = compareByCodePoint(a.targetDomain, b.targetDomain)
+  const domainCompare = compareByCodePoint(a.targetDomain.value, b.targetDomain.value)
   if (domainCompare !== 0) return domainCompare
   return compareByCodePoint(linkTypeForSort(a.linkType), linkTypeForSort(b.linkType))
 }
@@ -127,28 +128,28 @@ function toConnectionResults(
   connections: Map<string, ConnectionCounts>,
   direction: 'outgoing' | 'incoming',
 ): DomainConnection[] {
-  return Array.from(connections.entries()).map(([domain, counts]) => ({
-    targetDomain: parseDomainName(domain),
-    direction,
-    apiCount: counts.apiCount,
-    eventCount: counts.eventCount,
-  }))
+  return Array.from(connections.entries()).map(([domain, counts]) =>
+    DomainConnection.parse({
+      targetDomain: DomainName.parse(domain),
+      direction,
+      apiCount: counts.apiCount,
+      eventCount: counts.eventCount,
+    }),
+  )
 }
 
-/** @riviere-role query-model */
+/** @riviere-role domain-service */
 export function queryDomainConnections(
   graph: RiviereGraph,
   domainName: string,
 ): DomainConnection[] {
   const nodeIdToDomain = buildNodeIdToDomain(graph)
   const nodeById = new Map(graph.components.map((c) => [c.id, { type: c.type }]))
-  const {
-    outgoing, incoming 
-  } = collectConnections(graph, domainName, nodeIdToDomain, nodeById)
+  const { outgoing, incoming } = collectConnections(graph, domainName, nodeIdToDomain, nodeById)
 
   const results = [
     ...toConnectionResults(outgoing, 'outgoing'),
     ...toConnectionResults(incoming, 'incoming'),
   ]
-  return results.sort((a, b) => compareByCodePoint(a.targetDomain, b.targetDomain))
+  return results.sort((a, b) => compareByCodePoint(a.targetDomain.value, b.targetDomain.value))
 }
diff --git a/packages/riviere-builder/domain-model/src/domain/query/depth-queries.ts b/packages/riviere-builder/domain-model/src/domain/query/depth-queries.ts
new file mode 100644
index 000000000..bcd9e8088
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/depth-queries.ts
@@ -0,0 +1,83 @@
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
+import { ComponentDepths } from './component-depths'
+import { isEntryPointType } from './flow-constants'
+
+interface DepthQueueEntry {
+  id: string
+  depth: number
+}
+
+/** @riviere-role domain-service */
+export function queryNodeDepths(graph: RiviereGraph): ComponentDepths {
+  const depths = new Map<string, number>()
+
+  const entryPoints = findEntryPointIds(graph)
+  if (entryPoints.length === 0) {
+    return ComponentDepths.parse(depths)
+  }
+
+  const outgoingEdges = buildOutgoingEdges(graph)
+  const queue: DepthQueueEntry[] = entryPoints.map((id) => ({
+    id,
+    depth: 0,
+  }))
+
+  processQueue(queue, depths, outgoingEdges)
+
+  return ComponentDepths.parse(depths)
+}
+
+function processQueue(
+  queue: DepthQueueEntry[],
+  depths: Map<string, number>,
+  outgoingEdges: Map<string, string[]>,
+): void {
+  const current = queue.shift()
+  if (current === undefined) return
+
+  const existingDepth = depths.get(current.id)
+  const shouldProcess = existingDepth === undefined || existingDepth > current.depth
+
+  if (shouldProcess) {
+    depths.set(current.id, current.depth)
+    enqueueChildren(outgoingEdges, current, queue)
+  }
+
+  processQueue(queue, depths, outgoingEdges)
+}
+
+function enqueueChildren(
+  outgoingEdges: Map<string, string[]>,
+  current: DepthQueueEntry,
+  queue: DepthQueueEntry[],
+): void {
+  const edges = outgoingEdges.get(current.id)
+  if (edges) {
+    for (const targetId of edges) {
+      queue.push({
+        id: targetId,
+        depth: current.depth + 1,
+      })
+    }
+  }
+}
+
+function findEntryPointIds(graph: RiviereGraph): string[] {
+  const targets = new Set(graph.links.map((link) => link.target))
+  return graph.components
+    .filter((c) => isEntryPointType(c.type) && !targets.has(c.id))
+    .map((c) => c.id)
+}
+
+function buildOutgoingEdges(graph: RiviereGraph): Map<string, string[]> {
+  const edges = new Map<string, string[]>()
+  for (const link of graph.links) {
+    const existing = edges.get(link.source)
+    if (existing) {
+      existing.push(link.target)
+    } else {
+      edges.set(link.source, [link.target])
+    }
+  }
+  return edges
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/diff-stats.ts b/packages/riviere-builder/domain-model/src/domain/query/diff-stats.ts
new file mode 100644
index 000000000..790287c97
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/diff-stats.ts
@@ -0,0 +1,33 @@
+/** @riviere-role value-object */
+export class DiffStats {
+  declare private readonly brand: 'DiffStats'
+  readonly componentsAdded: number
+  readonly componentsRemoved: number
+  readonly componentsModified: number
+  readonly linksAdded: number
+  readonly linksRemoved: number
+
+  private constructor(input: {
+    readonly componentsAdded: number
+    readonly componentsRemoved: number
+    readonly componentsModified: number
+    readonly linksAdded: number
+    readonly linksRemoved: number
+  }) {
+    this.componentsAdded = input.componentsAdded
+    this.componentsRemoved = input.componentsRemoved
+    this.componentsModified = input.componentsModified
+    this.linksAdded = input.linksAdded
+    this.linksRemoved = input.linksRemoved
+  }
+
+  static parse(input: {
+    readonly componentsAdded: number
+    readonly componentsRemoved: number
+    readonly componentsModified: number
+    readonly linksAdded: number
+    readonly linksRemoved: number
+  }): DiffStats {
+    return new DiffStats(input)
+  }
+}
diff --git a/packages/riviere-query/src/features/querying/queries/diff.spec.ts b/packages/riviere-builder/domain-model/src/domain/query/diff.spec.ts
similarity index 95%
rename from packages/riviere-query/src/features/querying/queries/diff.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/query/diff.spec.ts
index 1eb4b1730..220caa610 100644
--- a/packages/riviere-query/src/features/querying/queries/diff.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/query/diff.spec.ts
@@ -1,14 +1,12 @@
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
+import { describe, expect, it } from 'vitest'
 import {
-  describe, it, expect 
-} from 'vitest'
-import { RiviereQuery } from './RiviereQuery'
-import {
+  assertDefined,
+  createAPIComponent,
   createMinimalValidGraph,
   defaultSourceLocation,
-  createAPIComponent,
-  assertDefined,
-} from '../../../platform/__fixtures__/riviere-graph-fixtures'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+} from './__fixtures__/riviere-graph-fixtures'
+import { RiviereQuery } from './RiviereQuery'
 
 describe('diff', () => {
   describe('components', () => {
@@ -71,7 +69,7 @@ describe('diff', () => {
       const result = query.diff(otherGraph)
 
       expect(result.components.modified).toHaveLength(1)
-      expect(result.components.modified[0]?.id).toBe('test:mod:ui:page')
+      expect(result.components.modified[0]?.id.value).toBe('test:mod:ui:page')
     })
 
     it('includes name in changedFields when component name changes', () => {
@@ -104,7 +102,7 @@ describe('diff', () => {
       const query = new RiviereQuery(graph)
       const result = query.diff(graph)
 
-      expect(result).toStrictEqual({
+      expect(JSON.parse(JSON.stringify(result))).toStrictEqual({
         components: {
           added: [],
           removed: [],
diff --git a/packages/riviere-builder/domain-model/src/domain/query/domain-connection.ts b/packages/riviere-builder/domain-model/src/domain/query/domain-connection.ts
new file mode 100644
index 000000000..4d14e360b
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/domain-connection.ts
@@ -0,0 +1,31 @@
+import { DomainName } from './domain-name'
+
+/** @riviere-role value-object */
+export class DomainConnection {
+  declare private readonly brand: 'DomainConnection'
+  readonly targetDomain: DomainName
+  readonly direction: 'outgoing' | 'incoming'
+  readonly apiCount: number
+  readonly eventCount: number
+
+  private constructor(input: {
+    readonly targetDomain: DomainName
+    readonly direction: 'outgoing' | 'incoming'
+    readonly apiCount: number
+    readonly eventCount: number
+  }) {
+    this.targetDomain = input.targetDomain
+    this.direction = input.direction
+    this.apiCount = input.apiCount
+    this.eventCount = input.eventCount
+  }
+
+  static parse(input: {
+    readonly targetDomain: DomainName
+    readonly direction: 'outgoing' | 'incoming'
+    readonly apiCount: number
+    readonly eventCount: number
+  }): DomainConnection {
+    return new DomainConnection(input)
+  }
+}
diff --git a/packages/riviere-query/src/features/querying/queries/domain-connections.spec.ts b/packages/riviere-builder/domain-model/src/domain/query/domain-connections.spec.ts
similarity index 91%
rename from packages/riviere-query/src/features/querying/queries/domain-connections.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/query/domain-connections.spec.ts
index 3321678bb..b7467f0c6 100644
--- a/packages/riviere-query/src/features/querying/queries/domain-connections.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/query/domain-connections.spec.ts
@@ -1,13 +1,11 @@
+import { describe, expect, it } from 'vitest'
 import {
-  describe, it, expect 
-} from 'vitest'
-import { RiviereQuery } from './RiviereQuery'
-import {
-  createMinimalValidGraph,
   createAPIComponent,
-  createUseCaseComponent,
   createEventHandlerComponent,
-} from '../../../platform/__fixtures__/riviere-graph-fixtures'
+  createMinimalValidGraph,
+  createUseCaseComponent,
+} from './__fixtures__/riviere-graph-fixtures'
+import { RiviereQuery } from './RiviereQuery'
 
 describe('domainConnections', () => {
   it('returns empty array when domain has no connections to other domains', () => {
@@ -16,7 +14,7 @@ describe('domainConnections', () => {
 
     const result = query.domainConnections('test')
 
-    expect(result).toStrictEqual([])
+    expect(JSON.parse(JSON.stringify(result))).toStrictEqual([])
   })
 
   it('returns outgoing connections with API counts when calling other domain APIs', () => {
@@ -58,7 +56,7 @@ describe('domainConnections', () => {
 
     const result = query.domainConnections('test')
 
-    expect(result).toStrictEqual([
+    expect(JSON.parse(JSON.stringify(result))).toStrictEqual([
       {
         targetDomain: 'orders',
         direction: 'outgoing',
@@ -95,7 +93,7 @@ describe('domainConnections', () => {
 
     const result = query.domainConnections('test')
 
-    expect(result).toStrictEqual([
+    expect(JSON.parse(JSON.stringify(result))).toStrictEqual([
       {
         targetDomain: 'notifications',
         direction: 'outgoing',
@@ -132,7 +130,7 @@ describe('domainConnections', () => {
 
     const result = query.domainConnections('test')
 
-    expect(result).toStrictEqual([
+    expect(JSON.parse(JSON.stringify(result))).toStrictEqual([
       {
         targetDomain: 'orders',
         direction: 'incoming',
@@ -186,13 +184,13 @@ describe('domainConnections', () => {
 
     const result = query.domainConnections('test')
 
-    expect(result).toContainEqual({
+    expect(JSON.parse(JSON.stringify(result))).toContainEqual({
       targetDomain: 'orders',
       direction: 'outgoing',
       apiCount: 1,
       eventCount: 0,
     })
-    expect(result).toContainEqual({
+    expect(JSON.parse(JSON.stringify(result))).toContainEqual({
       targetDomain: 'orders',
       direction: 'incoming',
       apiCount: 1,
@@ -243,7 +241,7 @@ describe('domainConnections', () => {
 
     const result = query.domainConnections('test')
 
-    expect(result.map((c) => c.targetDomain)).toStrictEqual(['alpha', 'zebra'])
+    expect(result.map((c) => c.targetDomain.value)).toStrictEqual(['alpha', 'zebra'])
   })
 
   it('excludes links within the same domain from counts', () => {
@@ -269,6 +267,6 @@ describe('domainConnections', () => {
 
     const result = query.domainConnections('test')
 
-    expect(result).toStrictEqual([])
+    expect(JSON.parse(JSON.stringify(result))).toStrictEqual([])
   })
 })
diff --git a/packages/riviere-builder/domain-model/src/domain/query/domain-name.ts b/packages/riviere-builder/domain-model/src/domain/query/domain-name.ts
new file mode 100644
index 000000000..96f7002bf
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/domain-name.ts
@@ -0,0 +1,22 @@
+import { z } from 'zod'
+
+const schema = z.string()
+
+/** @riviere-role value-object */
+export class DomainName {
+  declare private readonly brand: 'DomainName'
+
+  private constructor(readonly value: string) {}
+
+  static parse(value: string): DomainName {
+    return new DomainName(schema.parse(value))
+  }
+
+  localeCompare(other: DomainName): number {
+    return this.value.localeCompare(other.value)
+  }
+
+  toJSON(): string {
+    return this.value
+  }
+}
diff --git a/packages/riviere-query/src/features/querying/queries/domain-queries.ts b/packages/riviere-builder/domain-model/src/domain/query/domain-queries.ts
similarity index 78%
rename from packages/riviere-query/src/features/querying/queries/domain-queries.ts
rename to packages/riviere-builder/domain-model/src/domain/query/domain-queries.ts
index 4bc8117f2..1c0559043 100644
--- a/packages/riviere-query/src/features/querying/queries/domain-queries.ts
+++ b/packages/riviere-builder/domain-model/src/domain/query/domain-queries.ts
@@ -1,23 +1,24 @@
 import type {
-  RiviereGraph, DomainOpComponent 
-} from '@living-architecture/riviere-schema'
-import { Entity } from './event-types'
-import type { EntityTransition } from './event-types'
-import type {
-  State, Domain, ComponentCounts 
-} from './domain-types'
-import {
-  parseEntityName, parseDomainName, parseState, parseOperationName 
-} from './domain-types'
-import { componentsInDomain } from './component-queries'
+  DomainOpComponent,
+  RiviereGraph,
+} from '@living-architecture/riviere-schema-published-language/schema'
 import { compareByCodePoint } from './compare-by-code-point'
+import { ComponentCounts } from './component-counts'
+import { componentsInDomain } from './component-queries'
+import { Domain } from './domain'
+import { DomainName } from './domain-name'
+import { Entity } from './entity'
+import { EntityName } from './entity-name'
+import { EntityTransition } from './entity-transition'
+import { OperationName } from './operation-name'
+import { State } from './state'
 
-/** @riviere-role query-model */
+/** @riviere-role domain-service */
 export function queryDomains(graph: RiviereGraph): Domain[] {
   return Object.entries(graph.metadata.domains).map(([name, metadata]) => {
     const dc = componentsInDomain(graph, name)
     const count = (type: string): number => dc.filter((c) => c.type === type).length
-    const componentCounts: ComponentCounts = {
+    const componentCounts: ComponentCounts = ComponentCounts.parse({
       UI: count('UI'),
       API: count('API'),
       UseCase: count('UseCase'),
@@ -26,17 +27,17 @@ export function queryDomains(graph: RiviereGraph): Domain[] {
       EventHandler: count('EventHandler'),
       Custom: count('Custom'),
       total: dc.length,
-    }
-    return {
+    })
+    return Domain.parse({
       name,
       description: metadata.description,
       systemType: metadata.systemType,
       componentCounts,
-    }
+    })
   })
 }
 
-/** @riviere-role query-model */
+/** @riviere-role domain-service */
 export function operationsForEntity(graph: RiviereGraph, entityName: string): DomainOpComponent[] {
   return graph.components.filter(
     (c): c is DomainOpComponent => c.type === 'DomainOp' && c.entity === entityName,
@@ -49,7 +50,7 @@ interface PartialEntity {
   operations: DomainOpComponent[]
 }
 
-/** @riviere-role query-model */
+/** @riviere-role domain-service */
 export function queryEntities(graph: RiviereGraph, domainName?: string): Entity[] {
   const domainOps = graph.components.filter(
     (c): c is DomainOpComponent & { entity: string } =>
@@ -82,9 +83,9 @@ function createEntity(graph: RiviereGraph, partial: PartialEntity): Entity {
   const sortedOperations = [...partial.operations].sort((a, b) =>
     compareByCodePoint(a.operationName, b.operationName),
   )
-  return new Entity(
-    parseEntityName(partial.name),
-    parseDomainName(partial.domain),
+  return Entity.parse(
+    EntityName.parse(partial.name),
+    DomainName.parse(partial.domain),
     sortedOperations,
     statesForEntity(graph, partial.name),
     transitionsForEntity(graph, partial.name),
@@ -92,7 +93,7 @@ function createEntity(graph: RiviereGraph, partial: PartialEntity): Entity {
   )
 }
 
-/** @riviere-role query-model */
+/** @riviere-role domain-service */
 export function businessRulesForEntity(graph: RiviereGraph, entityName: string): string[] {
   const operations = operationsForEntity(graph, entityName)
   const allRules: string[] = []
@@ -103,24 +104,26 @@ export function businessRulesForEntity(graph: RiviereGraph, entityName: string):
   return [...new Set(allRules)]
 }
 
-/** @riviere-role query-model */
+/** @riviere-role domain-service */
 export function transitionsForEntity(graph: RiviereGraph, entityName: string): EntityTransition[] {
   const operations = operationsForEntity(graph, entityName)
   const transitions: EntityTransition[] = []
   for (const op of operations) {
     if (op.stateChanges === undefined) continue
     for (const sc of op.stateChanges) {
-      transitions.push({
-        from: parseState(sc.from),
-        to: parseState(sc.to),
-        triggeredBy: parseOperationName(op.operationName),
-      })
+      transitions.push(
+        EntityTransition.parse({
+          from: State.parse(sc.from),
+          to: State.parse(sc.to),
+          triggeredBy: OperationName.parse(op.operationName),
+        }),
+      )
     }
   }
   return transitions
 }
 
-/** @riviere-role query-model */
+/** @riviere-role domain-service */
 export function statesForEntity(graph: RiviereGraph, entityName: string): State[] {
   const operations = operationsForEntity(graph, entityName)
   const states = new Set<string>()
@@ -153,13 +156,13 @@ function orderStatesByTransitions(states: Set<string>, operations: DomainOpCompo
   const follow = (s: string): void => {
     if (visited.has(s)) return
     visited.add(s)
-    ordered.push(parseState(s))
+    ordered.push(State.parse(s))
     const next = transitionMap.get(s)
     if (next) follow(next)
   }
   ;[...fromStates].filter((s) => !toStates.has(s)).forEach(follow)
   states.forEach((s) => {
-    if (!visited.has(s)) ordered.push(parseState(s))
+    if (!visited.has(s)) ordered.push(State.parse(s))
   })
   return ordered
 }
diff --git a/packages/riviere-builder/domain-model/src/domain/query/domain.ts b/packages/riviere-builder/domain-model/src/domain/query/domain.ts
new file mode 100644
index 000000000..ec72f4f01
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/domain.ts
@@ -0,0 +1,31 @@
+import { ComponentCounts } from './component-counts'
+
+/** @riviere-role value-object */
+export class Domain {
+  declare private readonly brand: 'Domain'
+  readonly name: string
+  readonly description: string
+  readonly systemType: import('@living-architecture/riviere-schema-published-language/schema').SystemType
+  readonly componentCounts: ComponentCounts
+
+  private constructor(input: {
+    readonly name: string
+    readonly description: string
+    readonly systemType: import('@living-architecture/riviere-schema-published-language/schema').SystemType
+    readonly componentCounts: ComponentCounts
+  }) {
+    this.name = input.name
+    this.description = input.description
+    this.systemType = input.systemType
+    this.componentCounts = input.componentCounts
+  }
+
+  static parse(input: {
+    readonly name: string
+    readonly description: string
+    readonly systemType: import('@living-architecture/riviere-schema-published-language/schema').SystemType
+    readonly componentCounts: ComponentCounts
+  }): Domain {
+    return new Domain(input)
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/domains.spec.ts b/packages/riviere-builder/domain-model/src/domain/query/domains.spec.ts
new file mode 100644
index 000000000..008e92e0b
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/domains.spec.ts
@@ -0,0 +1,158 @@
+import { describe, expect, it } from 'vitest'
+import {
+  assertDefined,
+  createAPIComponent,
+  createMinimalValidGraph,
+  createUseCaseComponent,
+} from './__fixtures__/riviere-graph-fixtures'
+import { RiviereQuery } from './RiviereQuery'
+
+describe('domains', () => {
+  it('returns domain with name, description, and systemType from metadata', () => {
+    const graph = createMinimalValidGraph()
+    const query = new RiviereQuery(graph)
+
+    const result = query.domains()
+
+    expect(JSON.parse(JSON.stringify(result))).toStrictEqual([
+      {
+        name: 'test',
+        description: 'Test domain',
+        systemType: 'domain',
+        componentCounts: {
+          UI: 1,
+          API: 0,
+          UseCase: 0,
+          DomainOp: 0,
+          Event: 0,
+          EventHandler: 0,
+          Custom: 0,
+          total: 1,
+        },
+      },
+    ])
+  })
+
+  it('returns the external-service system type from metadata', () => {
+    const graph = createMinimalValidGraph()
+    graph.metadata.domains['alerts'] = {
+      description: 'External alert service',
+      systemType: 'external-service',
+    }
+    const query = new RiviereQuery(graph)
+
+    const result = query.domains()
+
+    expect(result.find((domain) => domain.name === 'alerts')?.systemType).toBe('external-service')
+  })
+
+  it('returns multiple domains with correct component counts per type', () => {
+    const graph = createMinimalValidGraph()
+    graph.metadata.domains['orders'] = {
+      description: 'Order management',
+      systemType: 'domain',
+    }
+    graph.metadata.domains['shipping'] = {
+      description: 'Shipping integration',
+      systemType: 'bff',
+    }
+    graph.components.push(
+      createAPIComponent({
+        id: 'orders:api:create',
+        name: 'Create Order',
+        domain: 'orders',
+      }),
+      createAPIComponent({
+        id: 'orders:api:get',
+        name: 'Get Order',
+        domain: 'orders',
+      }),
+      createUseCaseComponent({
+        id: 'orders:usecase:checkout',
+        name: 'Checkout',
+        domain: 'orders',
+      }),
+      createAPIComponent({
+        id: 'shipping:api:track',
+        name: 'Track',
+        domain: 'shipping',
+      }),
+    )
+    const query = new RiviereQuery(graph)
+
+    const result = query.domains()
+
+    const orders = result.find((d) => d.name === 'orders')
+    expect(JSON.parse(JSON.stringify(orders))).toStrictEqual({
+      name: 'orders',
+      description: 'Order management',
+      systemType: 'domain',
+      componentCounts: {
+        UI: 0,
+        API: 2,
+        UseCase: 1,
+        DomainOp: 0,
+        Event: 0,
+        EventHandler: 0,
+        Custom: 0,
+        total: 3,
+      },
+    })
+
+    const shipping = result.find((d) => d.name === 'shipping')
+    expect(shipping?.systemType).toBe('bff')
+    expect(shipping?.componentCounts.API).toBe(1)
+    expect(shipping?.componentCounts.total).toBe(1)
+  })
+
+  it('throws when graph has no domains (invalid per schema)', () => {
+    const graph = createMinimalValidGraph()
+    graph.metadata.domains = {}
+    graph.components = []
+
+    expect(() => new RiviereQuery(graph)).toThrow(/must NOT have fewer than 1 properties/i)
+  })
+
+  it('does not include external systems in domains (use externalSystems() instead)', () => {
+    const graph = createMinimalValidGraph()
+    graph.externalLinks = [
+      {
+        source: 'test:mod:ui:page',
+        target: { name: 'Stripe' },
+        type: 'sync',
+      },
+      {
+        source: 'test:mod:ui:page',
+        target: { name: 'Twilio' },
+        type: 'async',
+      },
+    ]
+    const query = new RiviereQuery(graph)
+
+    const result = query.domains()
+
+    expect(result.find((d) => d.name === 'external')).toBeUndefined()
+    expect(result.find((d) => d.name === 'Stripe')).toBeUndefined()
+    expect(result.find((d) => d.name === 'Twilio')).toBeUndefined()
+  })
+})
+
+describe('assertDefined', () => {
+  it('returns value when defined', () => {
+    const value = assertDefined('test')
+
+    expect(value).toBe('test')
+  })
+
+  it('throws when value is undefined', () => {
+    expect(() => assertDefined(undefined)).toThrow('Expected value to be defined')
+  })
+
+  it('throws when value is null', () => {
+    expect(() => assertDefined(null)).toThrow('Expected value to be defined')
+  })
+
+  it('throws with custom message', () => {
+    expect(() => assertDefined(null, 'Custom error')).toThrow('Custom error')
+  })
+})
diff --git a/packages/riviere-query/src/features/querying/queries/entities.spec.ts b/packages/riviere-builder/domain-model/src/domain/query/entities.spec.ts
similarity index 96%
rename from packages/riviere-query/src/features/querying/queries/entities.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/query/entities.spec.ts
index 63027ace0..4b865feb9 100644
--- a/packages/riviere-query/src/features/querying/queries/entities.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/query/entities.spec.ts
@@ -1,8 +1,8 @@
-import { RiviereQuery } from './RiviereQuery'
 import {
-  createMinimalValidGraph,
   createDomainOpComponent,
-} from '../../../platform/__fixtures__/riviere-graph-fixtures'
+  createMinimalValidGraph,
+} from './__fixtures__/riviere-graph-fixtures'
+import { RiviereQuery } from './RiviereQuery'
 
 describe('operationsFor', () => {
   it('returns empty array when entity does not exist', () => {
@@ -70,7 +70,7 @@ describe('entities', () => {
 
     const entities = query.entities()
 
-    expect(entities).toMatchObject([
+    expect(JSON.parse(JSON.stringify(entities))).toMatchObject([
       {
         name: 'Order',
         domain: 'orders',
@@ -103,7 +103,7 @@ describe('entities', () => {
 
     const entities = query.entities('orders')
 
-    expect(entities).toMatchObject([
+    expect(JSON.parse(JSON.stringify(entities))).toMatchObject([
       {
         name: 'Order',
         domain: 'orders',
@@ -136,7 +136,7 @@ describe('entities', () => {
 
     const entities = query.entities()
 
-    expect(entities.map((e) => e.name)).toStrictEqual(['Apple', 'Zebra'])
+    expect(entities.map((e) => e.name.value)).toStrictEqual(['Apple', 'Zebra'])
   })
 
   it('returns entity with states ordered by transition flow', () => {
@@ -173,7 +173,11 @@ describe('entities', () => {
     const entities = query.entities()
 
     expect(entities).toHaveLength(1)
-    expect(entities[0]?.states).toStrictEqual(['Draft', 'Placed', 'Confirmed'])
+    expect(entities[0]?.states.map((state) => state.value)).toStrictEqual([
+      'Draft',
+      'Placed',
+      'Confirmed',
+    ])
   })
 
   it('returns entity with transitions including triggeredBy operation', () => {
@@ -197,7 +201,7 @@ describe('entities', () => {
     const entities = query.entities()
 
     expect(entities).toHaveLength(1)
-    expect(entities[0]?.transitions).toStrictEqual([
+    expect(JSON.parse(JSON.stringify(entities[0]?.transitions))).toStrictEqual([
       {
         from: 'Draft',
         to: 'Placed',
diff --git a/packages/riviere-builder/domain-model/src/domain/query/entity-name.ts b/packages/riviere-builder/domain-model/src/domain/query/entity-name.ts
new file mode 100644
index 000000000..76f715046
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/entity-name.ts
@@ -0,0 +1,18 @@
+import { z } from 'zod'
+
+const schema = z.string()
+
+/** @riviere-role value-object */
+export class EntityName {
+  declare private readonly brand: 'EntityName'
+
+  private constructor(readonly value: string) {}
+
+  static parse(value: string): EntityName {
+    return new EntityName(schema.parse(value))
+  }
+
+  toJSON(): string {
+    return this.value
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/entity-transition.ts b/packages/riviere-builder/domain-model/src/domain/query/entity-transition.ts
new file mode 100644
index 000000000..630b39e6b
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/entity-transition.ts
@@ -0,0 +1,31 @@
+import type { OperationName } from './operation-name'
+import type { State } from './state'
+
+/**
+ * A state transition in an entity's state machine.
+ * @riviere-role value-object
+ */
+export class EntityTransition {
+  declare private readonly brand: 'EntityTransition'
+  readonly from: State
+  readonly to: State
+  readonly triggeredBy: OperationName
+
+  private constructor(input: {
+    readonly from: State
+    readonly to: State
+    readonly triggeredBy: OperationName
+  }) {
+    this.from = input.from
+    this.to = input.to
+    this.triggeredBy = input.triggeredBy
+  }
+
+  static parse(input: {
+    readonly from: State
+    readonly to: State
+    readonly triggeredBy: OperationName
+  }): EntityTransition {
+    return new EntityTransition(input)
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/entity.ts b/packages/riviere-builder/domain-model/src/domain/query/entity.ts
new file mode 100644
index 000000000..187b3e77b
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/entity.ts
@@ -0,0 +1,42 @@
+import type { DomainOpComponent } from '@living-architecture/riviere-schema-published-language/schema'
+import type { DomainName } from './domain-name'
+import type { EntityName } from './entity-name'
+import { EntityTransition } from './entity-transition'
+import type { State } from './state'
+
+/** @riviere-role value-object */
+export class Entity {
+  declare private readonly brand: 'Entity'
+
+  static parse(
+    name: EntityName,
+    domain: DomainName,
+    operations: readonly DomainOpComponent[],
+    states: readonly State[],
+    transitions: readonly EntityTransition[],
+    businessRules: readonly string[],
+  ): Entity {
+    return new Entity(name, domain, operations, states, transitions, businessRules)
+  }
+
+  private constructor(
+    public readonly name: EntityName,
+    public readonly domain: DomainName,
+    public readonly operations: readonly DomainOpComponent[],
+    public readonly states: readonly State[],
+    public readonly transitions: readonly EntityTransition[],
+    public readonly businessRules: readonly string[],
+  ) {}
+
+  hasStates(): boolean {
+    return this.states.length > 0
+  }
+
+  hasBusinessRules(): boolean {
+    return this.businessRules.length > 0
+  }
+
+  firstOperationId(): string | undefined {
+    return this.operations[0]?.id
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/errors.spec.ts b/packages/riviere-builder/domain-model/src/domain/query/errors.spec.ts
new file mode 100644
index 000000000..a1929e38c
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/errors.spec.ts
@@ -0,0 +1,35 @@
+import { describe, expect, it } from 'vitest'
+import { ComponentNotFoundError } from './errors'
+
+describe('ComponentNotFoundError', () => {
+  it('has message containing component ID', () => {
+    const error = new ComponentNotFoundError('orders:checkout:api:place-order')
+
+    expect(error.message).toBe("Component 'orders:checkout:api:place-order' not found")
+  })
+
+  it('exposes componentId property', () => {
+    const error = new ComponentNotFoundError('orders:checkout:api:place-order')
+
+    expect(error.componentId).toBe('orders:checkout:api:place-order')
+  })
+
+  it('defaults suggestions to empty array', () => {
+    const error = new ComponentNotFoundError('orders:checkout:api:place-order')
+
+    expect(error.suggestions).toStrictEqual([])
+  })
+
+  it('exposes provided suggestions', () => {
+    const suggestions = ['orders:checkout:api:create-order', 'orders:checkout:api:get-order']
+    const error = new ComponentNotFoundError('orders:checkout:api:place-ordr', suggestions)
+
+    expect(error.suggestions).toStrictEqual(suggestions)
+  })
+
+  it('has name ComponentNotFoundError', () => {
+    const error = new ComponentNotFoundError('any:id')
+
+    expect(error.name).toBe('ComponentNotFoundError')
+  })
+})
diff --git a/packages/riviere-builder/domain-model/src/domain/query/errors.ts b/packages/riviere-builder/domain-model/src/domain/query/errors.ts
new file mode 100644
index 000000000..c6fb2aae1
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/errors.ts
@@ -0,0 +1,23 @@
+/** @riviere-role domain-error */
+export class ComponentNotFoundError extends Error {
+  readonly componentId: string
+  readonly suggestions: string[]
+
+  constructor(componentId: string, suggestions: string[] = []) {
+    super(`Component '${componentId}' not found`)
+    this.name = 'ComponentNotFoundError'
+    this.componentId = componentId
+    this.suggestions = suggestions
+  }
+}
+
+/** @riviere-role domain-error */
+export class InvalidRiviereGraphError extends Error {
+  readonly issues: readonly string[]
+
+  constructor(issues: readonly string[]) {
+    super(`Invalid RiviereGraph:\n${issues.join('\n')}`)
+    this.name = 'InvalidRiviereGraphError'
+    this.issues = issues
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/event-handler-info.ts b/packages/riviere-builder/domain-model/src/domain/query/event-handler-info.ts
new file mode 100644
index 000000000..dce8ed480
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/event-handler-info.ts
@@ -0,0 +1,45 @@
+import type { DomainName } from './domain-name'
+import type { EventName } from './event-name'
+import type { HandlerId } from './handler-id'
+import type { HandlerName } from './handler-name'
+import { KnownSourceEvent } from './known-source-event'
+import { UnknownSourceEvent } from './unknown-source-event'
+
+type SubscribedEventWithDomain = KnownSourceEvent | UnknownSourceEvent
+
+/**
+ * Information about an event handler component.
+ * @riviere-role value-object
+ */
+export class EventHandlerInfo {
+  declare private readonly brand: 'EventHandlerInfo'
+  readonly id: HandlerId
+  readonly handlerName: HandlerName
+  readonly domain: DomainName
+  readonly subscribedEvents: EventName[]
+  readonly subscribedEventsWithDomain: SubscribedEventWithDomain[]
+
+  private constructor(input: {
+    readonly id: HandlerId
+    readonly handlerName: HandlerName
+    readonly domain: DomainName
+    readonly subscribedEvents: EventName[]
+    readonly subscribedEventsWithDomain: SubscribedEventWithDomain[]
+  }) {
+    this.id = input.id
+    this.handlerName = input.handlerName
+    this.domain = input.domain
+    this.subscribedEvents = input.subscribedEvents
+    this.subscribedEventsWithDomain = input.subscribedEventsWithDomain
+  }
+
+  static parse(input: {
+    readonly id: HandlerId
+    readonly handlerName: HandlerName
+    readonly domain: DomainName
+    readonly subscribedEvents: EventName[]
+    readonly subscribedEventsWithDomain: SubscribedEventWithDomain[]
+  }): EventHandlerInfo {
+    return new EventHandlerInfo(input)
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/event-id.ts b/packages/riviere-builder/domain-model/src/domain/query/event-id.ts
new file mode 100644
index 000000000..770442104
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/event-id.ts
@@ -0,0 +1,18 @@
+import { z } from 'zod'
+
+const schema = z.string()
+
+/** @riviere-role value-object */
+export class EventId {
+  declare private readonly brand: 'EventId'
+
+  private constructor(readonly value: string) {}
+
+  static parse(value: string): EventId {
+    return new EventId(schema.parse(value))
+  }
+
+  toJSON(): string {
+    return this.value
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/event-name.ts b/packages/riviere-builder/domain-model/src/domain/query/event-name.ts
new file mode 100644
index 000000000..0c864ab58
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/event-name.ts
@@ -0,0 +1,18 @@
+import { z } from 'zod'
+
+const schema = z.string()
+
+/** @riviere-role value-object */
+export class EventName {
+  declare private readonly brand: 'EventName'
+
+  private constructor(readonly value: string) {}
+
+  static parse(value: string): EventName {
+    return new EventName(schema.parse(value))
+  }
+
+  toJSON(): string {
+    return this.value
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/event-queries.ts b/packages/riviere-builder/domain-model/src/domain/query/event-queries.ts
new file mode 100644
index 000000000..c751bd024
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/event-queries.ts
@@ -0,0 +1,94 @@
+import type {
+  EventComponent,
+  EventHandlerComponent,
+  RiviereGraph,
+} from '@living-architecture/riviere-schema-published-language/schema'
+import { DomainName } from './domain-name'
+import { EventHandlerInfo } from './event-handler-info'
+import { EventId } from './event-id'
+import { EventName } from './event-name'
+import { EventSubscriber } from './event-subscriber'
+import { HandlerId } from './handler-id'
+import { HandlerName } from './handler-name'
+import { KnownSourceEvent } from './known-source-event'
+import { PublishedEvent } from './published-event'
+import { UnknownSourceEvent } from './unknown-source-event'
+
+/** @riviere-role domain-service */
+export function queryPublishedEvents(graph: RiviereGraph, domainName?: string): PublishedEvent[] {
+  const eventComponents = graph.components.filter((c): c is EventComponent => c.type === 'Event')
+  const filtered = domainName
+    ? eventComponents.filter((e) => e.domain === domainName)
+    : eventComponents
+  const handlers = graph.components.filter(
+    (c): c is EventHandlerComponent => c.type === 'EventHandler',
+  )
+
+  return filtered.map((event) => {
+    const subscribers: EventSubscriber[] = handlers
+      .filter((h) => h.subscribedEvents.includes(event.eventName))
+      .map((h) =>
+        EventSubscriber.parse({
+          handlerId: HandlerId.parse(h.id),
+          handlerName: HandlerName.parse(h.name),
+          domain: DomainName.parse(h.domain),
+        }),
+      )
+    return PublishedEvent.parse({
+      id: EventId.parse(event.id),
+      eventName: EventName.parse(event.eventName),
+      domain: DomainName.parse(event.domain),
+      handlers: subscribers,
+    })
+  })
+}
+
+/** @riviere-role domain-service */
+export function queryEventHandlers(graph: RiviereGraph, eventName?: string): EventHandlerInfo[] {
+  const eventByName = buildEventNameMap(graph)
+  const handlers = findEventHandlerComponents(graph)
+  const filtered = eventName
+    ? handlers.filter((h) => h.subscribedEvents.includes(eventName))
+    : handlers
+  return filtered.map((h) => buildEventHandlerInfo(h, eventByName))
+}
+
+function buildEventNameMap(graph: RiviereGraph): Map<string, EventComponent> {
+  return new Map(
+    graph.components
+      .filter((c): c is EventComponent => c.type === 'Event')
+      .map((e) => [e.eventName, e]),
+  )
+}
+
+function findEventHandlerComponents(graph: RiviereGraph): EventHandlerComponent[] {
+  return graph.components.filter((c): c is EventHandlerComponent => c.type === 'EventHandler')
+}
+
+function buildEventHandlerInfo(
+  handler: EventHandlerComponent,
+  eventByName: Map<string, EventComponent>,
+): EventHandlerInfo {
+  const subscribedEventsWithDomain = handler.subscribedEvents.map(
+    (name): KnownSourceEvent | UnknownSourceEvent => {
+      const event = eventByName.get(name)
+      if (event)
+        return KnownSourceEvent.parse({
+          eventName: EventName.parse(name),
+          sourceDomain: DomainName.parse(event.domain),
+          sourceKnown: true,
+        })
+      return UnknownSourceEvent.parse({
+        eventName: EventName.parse(name),
+        sourceKnown: false,
+      })
+    },
+  )
+  return EventHandlerInfo.parse({
+    id: HandlerId.parse(handler.id),
+    handlerName: HandlerName.parse(handler.name),
+    domain: DomainName.parse(handler.domain),
+    subscribedEvents: handler.subscribedEvents.map(EventName.parse),
+    subscribedEventsWithDomain,
+  })
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/event-subscriber.ts b/packages/riviere-builder/domain-model/src/domain/query/event-subscriber.ts
new file mode 100644
index 000000000..a7b56ca1b
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/event-subscriber.ts
@@ -0,0 +1,32 @@
+import type { DomainName } from './domain-name'
+import type { HandlerId } from './handler-id'
+import type { HandlerName } from './handler-name'
+
+/**
+ * An event handler that subscribes to an event.
+ * @riviere-role value-object
+ */
+export class EventSubscriber {
+  declare private readonly brand: 'EventSubscriber'
+  readonly handlerId: HandlerId
+  readonly handlerName: HandlerName
+  readonly domain: DomainName
+
+  private constructor(input: {
+    readonly handlerId: HandlerId
+    readonly handlerName: HandlerName
+    readonly domain: DomainName
+  }) {
+    this.handlerId = input.handlerId
+    this.handlerName = input.handlerName
+    this.domain = input.domain
+  }
+
+  static parse(input: {
+    readonly handlerId: HandlerId
+    readonly handlerName: HandlerName
+    readonly domain: DomainName
+  }): EventSubscriber {
+    return new EventSubscriber(input)
+  }
+}
diff --git a/packages/riviere-query/src/features/querying/queries/events.spec.ts b/packages/riviere-builder/domain-model/src/domain/query/events.spec.ts
similarity index 92%
rename from packages/riviere-query/src/features/querying/queries/events.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/query/events.spec.ts
index 8eabaf3e6..2d208b5ae 100644
--- a/packages/riviere-query/src/features/querying/queries/events.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/query/events.spec.ts
@@ -1,9 +1,9 @@
-import { RiviereQuery } from './RiviereQuery'
 import {
-  createMinimalValidGraph,
   createEventComponent,
   createEventHandlerComponent,
-} from '../../../platform/__fixtures__/riviere-graph-fixtures'
+  createMinimalValidGraph,
+} from './__fixtures__/riviere-graph-fixtures'
+import { RiviereQuery } from './RiviereQuery'
 
 describe('publishedEvents', () => {
   it('returns empty array when no Event components exist', () => {
@@ -12,7 +12,7 @@ describe('publishedEvents', () => {
 
     const events = query.publishedEvents()
 
-    expect(events).toStrictEqual([])
+    expect(JSON.parse(JSON.stringify(events))).toStrictEqual([])
   })
 
   it('returns event with handlers that subscribe to it', () => {
@@ -35,7 +35,7 @@ describe('publishedEvents', () => {
 
     const events = query.publishedEvents()
 
-    expect(events).toStrictEqual([
+    expect(JSON.parse(JSON.stringify(events))).toStrictEqual([
       {
         id: 'orders:events:OrderCreated',
         eventName: 'OrderCreated',
@@ -79,7 +79,7 @@ describe('publishedEvents', () => {
 
     const events = query.publishedEvents('orders')
 
-    expect(events).toStrictEqual([
+    expect(JSON.parse(JSON.stringify(events))).toStrictEqual([
       {
         id: 'orders:events:OrderCreated',
         eventName: 'OrderCreated',
@@ -97,7 +97,7 @@ describe('eventHandlers', () => {
 
     const handlers = query.eventHandlers()
 
-    expect(handlers).toStrictEqual([])
+    expect(JSON.parse(JSON.stringify(handlers))).toStrictEqual([])
   })
 
   it('returns handler with subscribedEventsWithDomain including source domain', () => {
@@ -128,7 +128,7 @@ describe('eventHandlers', () => {
 
     const handlers = query.eventHandlers()
 
-    expect(handlers).toStrictEqual([
+    expect(JSON.parse(JSON.stringify(handlers))).toStrictEqual([
       {
         id: 'shipping:handlers:OnOrderCreated',
         handlerName: 'On Order Created',
@@ -163,7 +163,7 @@ describe('eventHandlers', () => {
 
     const handlers = query.eventHandlers()
 
-    expect(handlers).toStrictEqual([
+    expect(JSON.parse(JSON.stringify(handlers))).toStrictEqual([
       {
         id: 'shipping:handlers:OnUnknownEvent',
         handlerName: 'On Unknown Event',
@@ -217,7 +217,7 @@ describe('eventHandlers', () => {
 
     const handlers = query.eventHandlers('OrderCreated')
 
-    expect(handlers).toStrictEqual([
+    expect(JSON.parse(JSON.stringify(handlers))).toStrictEqual([
       {
         id: 'shipping:handlers:OnOrderCreated',
         handlerName: 'On Order Created',
diff --git a/packages/riviere-builder/domain-model/src/domain/query/external-domain.ts b/packages/riviere-builder/domain-model/src/domain/query/external-domain.ts
new file mode 100644
index 000000000..aec9b3778
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/external-domain.ts
@@ -0,0 +1,27 @@
+import { DomainName } from './domain-name'
+
+/** @riviere-role value-object */
+export class ExternalDomain {
+  declare private readonly brand: 'ExternalDomain'
+  readonly name: string
+  readonly sourceDomains: DomainName[]
+  readonly connectionCount: number
+
+  private constructor(input: {
+    readonly name: string
+    readonly sourceDomains: DomainName[]
+    readonly connectionCount: number
+  }) {
+    this.name = input.name
+    this.sourceDomains = input.sourceDomains
+    this.connectionCount = input.connectionCount
+  }
+
+  static parse(input: {
+    readonly name: string
+    readonly sourceDomains: DomainName[]
+    readonly connectionCount: number
+  }): ExternalDomain {
+    return new ExternalDomain(input)
+  }
+}
diff --git a/packages/riviere-query/src/features/querying/queries/external-system-queries.ts b/packages/riviere-builder/domain-model/src/domain/query/external-system-queries.ts
similarity index 84%
rename from packages/riviere-query/src/features/querying/queries/external-system-queries.ts
rename to packages/riviere-builder/domain-model/src/domain/query/external-system-queries.ts
index dbedcc89d..db48b8055 100644
--- a/packages/riviere-query/src/features/querying/queries/external-system-queries.ts
+++ b/packages/riviere-builder/domain-model/src/domain/query/external-system-queries.ts
@@ -1,7 +1,7 @@
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
-import type { ExternalDomain } from './domain-types'
-import { parseDomainName } from './domain-types'
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
 import { compareByCodePoint } from './compare-by-code-point'
+import { DomainName } from './domain-name'
+import { ExternalDomain } from './external-domain'
 
 interface ExternalDomainAccumulator {
   sourceDomains: Set<string>
@@ -45,11 +45,13 @@ function convertToExternalDomains(
   domains: Map<string, ExternalDomainAccumulator>,
 ): ExternalDomain[] {
   return Array.from(domains.entries())
-    .map(([name, acc]) => ({
-      name,
-      sourceDomains: Array.from(acc.sourceDomains).map((d) => parseDomainName(d)),
-      connectionCount: acc.connectionCount,
-    }))
+    .map(([name, acc]) =>
+      ExternalDomain.parse({
+        name,
+        sourceDomains: Array.from(acc.sourceDomains).map((d) => DomainName.parse(d)),
+        connectionCount: acc.connectionCount,
+      }),
+    )
     .sort((a, b) => compareByCodePoint(a.name, b.name))
 }
 
@@ -61,7 +63,7 @@ function convertToExternalDomains(
  *
  * @param graph - The RiviereGraph to query
  * @returns Array of ExternalDomain objects, sorted alphabetically by name
- * @riviere-role query-model
+ * @riviere-role domain-service
  */
 export function queryExternalDomains(graph: RiviereGraph): ExternalDomain[] {
   if (graph.externalLinks === undefined || graph.externalLinks.length === 0) {
diff --git a/packages/riviere-query/src/features/querying/queries/external-systems.spec.ts b/packages/riviere-builder/domain-model/src/domain/query/external-systems.spec.ts
similarity index 92%
rename from packages/riviere-query/src/features/querying/queries/external-systems.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/query/external-systems.spec.ts
index 18c6823d6..1c9bf0ef4 100644
--- a/packages/riviere-query/src/features/querying/queries/external-systems.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/query/external-systems.spec.ts
@@ -1,13 +1,11 @@
+import { describe, expect, it } from 'vitest'
 import {
-  describe, it, expect 
-} from 'vitest'
-import { queryExternalDomains } from './external-system-queries'
-import {
-  createMinimalValidGraph,
   createAPIComponent,
+  createMinimalValidGraph,
   createUseCaseComponent,
-} from '../../../platform/__fixtures__/riviere-graph-fixtures'
-import { parseDomainName } from './domain-types'
+} from './__fixtures__/riviere-graph-fixtures'
+import { DomainName } from './domain-name'
+import { queryExternalDomains } from './external-system-queries'
 
 describe('queryExternalDomains', () => {
   it('returns empty array when graph has no external links', () => {
@@ -68,7 +66,7 @@ describe('queryExternalDomains', () => {
 
     const result = queryExternalDomains(graph)
 
-    expect(result[0]?.sourceDomains).toStrictEqual([parseDomainName('orders')])
+    expect(result[0]?.sourceDomains).toStrictEqual([DomainName.parse('orders')])
   })
 
   it('aggregates multiple source domains for same external domain', () => {
@@ -107,7 +105,7 @@ describe('queryExternalDomains', () => {
     expect(result).toHaveLength(1)
     expect(result[0]?.name).toBe('Stripe')
     expect(result[0]?.sourceDomains.sort((a, b) => a.localeCompare(b))).toStrictEqual(
-      [parseDomainName('orders'), parseDomainName('payments')].sort((a, b) => a.localeCompare(b)),
+      [DomainName.parse('orders'), DomainName.parse('payments')].sort((a, b) => a.localeCompare(b)),
     )
   })
 
@@ -181,7 +179,7 @@ describe('queryExternalDomains', () => {
 
     const result = queryExternalDomains(graph)
 
-    expect(result[0]?.sourceDomains).toStrictEqual([parseDomainName('orders')])
+    expect(result[0]?.sourceDomains).toStrictEqual([DomainName.parse('orders')])
   })
 
   it('skips external links with unknown source component', () => {
diff --git a/packages/riviere-builder/domain-model/src/domain/query/flow-constants.ts b/packages/riviere-builder/domain-model/src/domain/query/flow-constants.ts
new file mode 100644
index 000000000..986a3dce1
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/flow-constants.ts
@@ -0,0 +1,13 @@
+import type { ComponentType } from '@living-architecture/riviere-schema-published-language/schema'
+
+const entryPointTypes: ReadonlySet<ComponentType> = new Set<ComponentType>([
+  'UI',
+  'API',
+  'EventHandler',
+  'Custom',
+])
+
+/** @riviere-role domain-service */
+export function isEntryPointType(componentType: ComponentType): boolean {
+  return entryPointTypes.has(componentType)
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/flow-queries.ts b/packages/riviere-builder/domain-model/src/domain/query/flow-queries.ts
new file mode 100644
index 000000000..ad562d888
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/flow-queries.ts
@@ -0,0 +1,184 @@
+import type {
+  Component,
+  ExternalLink,
+  Link,
+  RiviereGraph,
+} from '@living-architecture/riviere-schema-published-language/schema'
+import { ComponentId } from './component-id'
+import { componentById, searchComponents } from './component-queries'
+import { ComponentNotFoundError } from './errors'
+import { Flow } from './flow'
+import { isEntryPointType } from './flow-constants'
+import { FlowStep } from './flow-step'
+import { LinkId } from './link-id'
+import { createLinkKey } from './link-key'
+import { SearchWithFlowOptions } from './search-with-flow-options'
+import { SearchWithFlowResult } from './search-with-flow-result'
+
+/** @riviere-role domain-service */
+export function findEntryPoints(graph: RiviereGraph): Component[] {
+  const targets = new Set(graph.links.map((link) => link.target))
+  return graph.components.filter((c) => isEntryPointType(c.type) && !targets.has(c.id))
+}
+
+/** @riviere-role domain-service */
+export function traceFlowFrom(
+  graph: RiviereGraph,
+  startComponentId: ComponentId,
+): {
+  componentIds: ComponentId[]
+  linkIds: LinkId[]
+} {
+  const component = componentById(graph, startComponentId.value)
+  if (!component) {
+    throw new ComponentNotFoundError(startComponentId.value)
+  }
+
+  const visited = new Set<string>()
+  const visitedLinks = new Set<string>()
+  const queue: string[] = [startComponentId.value]
+
+  while (queue.length > 0) {
+    const currentId = queue.shift()
+    if (currentId === undefined || visited.has(currentId)) continue
+    visited.add(currentId)
+
+    for (const link of graph.links) {
+      if (link.source === currentId && !visited.has(link.target)) {
+        queue.push(link.target)
+        visitedLinks.add(createLinkKey(link).value)
+      }
+      if (link.target === currentId && !visited.has(link.source)) {
+        queue.push(link.source)
+        visitedLinks.add(createLinkKey(link).value)
+      }
+    }
+  }
+
+  return {
+    componentIds: Array.from(visited, ComponentId.parse),
+    linkIds: Array.from(visitedLinks, LinkId.parse),
+  }
+}
+
+/** @riviere-role domain-service */
+export function queryFlows(graph: RiviereGraph): Flow[] {
+  const componentByIdMap = new Map(graph.components.map((c) => [c.id, c]))
+  const outgoingEdges = buildOutgoingEdges(graph)
+  const externalLinksBySource = buildExternalLinksBySource(graph)
+
+  const traceForward = (entryPointId: string): Flow['steps'] => {
+    const steps: Flow['steps'] = []
+    const visited = new Set<string>()
+
+    const traverse = (nodeId: string, depth: number): void => {
+      if (visited.has(nodeId)) return
+      visited.add(nodeId)
+
+      const component = componentByIdMap.get(nodeId)
+      if (!component) return
+
+      const edges = outgoingEdges.get(nodeId) ?? []
+      const externalLinks = externalLinksBySource.get(nodeId) ?? []
+
+      steps.push(
+        FlowStep.parse({
+          component,
+          outgoingLinks: edges,
+          depth,
+          externalLinks,
+        }),
+      )
+
+      for (const edge of edges) {
+        traverse(edge.target, depth + 1)
+      }
+    }
+
+    traverse(entryPointId, 0)
+    return steps
+  }
+
+  return findEntryPoints(graph).map((entryPoint) =>
+    Flow.parse({
+      entryPoint,
+      steps: traceForward(entryPoint.id),
+    }),
+  )
+}
+
+function buildExternalLinksBySource(graph: RiviereGraph): Map<string, ExternalLink[]> {
+  const externalLinks = graph.externalLinks ?? []
+  const bySource = new Map<string, ExternalLink[]>()
+
+  for (const link of externalLinks) {
+    const existing = bySource.get(link.source)
+    if (existing) {
+      existing.push(link)
+    } else {
+      bySource.set(link.source, [link])
+    }
+  }
+
+  return bySource
+}
+
+function buildOutgoingEdges(graph: RiviereGraph): Map<string, Link[]> {
+  const edges = new Map<string, Link[]>()
+  for (const link of graph.links) {
+    const existing = edges.get(link.source)
+    if (existing) {
+      existing.push(link)
+    } else {
+      edges.set(link.source, [link])
+    }
+  }
+  return edges
+}
+
+/** @riviere-role domain-service */
+export function searchWithFlowContext(
+  graph: RiviereGraph,
+  query: string,
+  options: SearchWithFlowOptions,
+): SearchWithFlowResult {
+  const trimmedQuery = query.trim().toLowerCase()
+  const isEmptyQuery = trimmedQuery === ''
+
+  if (isEmptyQuery) {
+    if (options.returnAllOnEmptyQuery) {
+      const allIds = graph.components.map((c) => ComponentId.parse(c.id))
+      return SearchWithFlowResult.parse({
+        matchingIds: allIds,
+        visibleIds: allIds,
+      })
+    }
+    return SearchWithFlowResult.parse({
+      matchingIds: [],
+      visibleIds: [],
+    })
+  }
+
+  const matchingComponents = searchComponents(graph, query)
+  if (matchingComponents.length === 0) {
+    return SearchWithFlowResult.parse({
+      matchingIds: [],
+      visibleIds: [],
+    })
+  }
+
+  const matchingIds = matchingComponents.map((c) => ComponentId.parse(c.id))
+  const visibleIds = new Set<ComponentId>()
+
+  for (const component of matchingComponents) {
+    const flow = traceFlowFrom(graph, ComponentId.parse(component.id))
+    for (const id of flow.componentIds) {
+      visibleIds.add(id)
+    }
+  }
+
+  return SearchWithFlowResult.parse({
+    matchingIds,
+    visibleIds: Array.from(visibleIds),
+  })
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/flow-step.ts b/packages/riviere-builder/domain-model/src/domain/query/flow-step.ts
new file mode 100644
index 000000000..f9e16d4f0
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/flow-step.ts
@@ -0,0 +1,35 @@
+import type {
+  Component,
+  ExternalLink,
+  Link,
+} from '@living-architecture/riviere-schema-published-language/schema'
+
+/** @riviere-role value-object */
+export class FlowStep {
+  declare private readonly brand: 'FlowStep'
+  readonly component: Component
+  readonly outgoingLinks: Link[]
+  readonly depth: number
+  readonly externalLinks: ExternalLink[]
+
+  private constructor(input: {
+    readonly component: Component
+    readonly outgoingLinks: Link[]
+    readonly depth: number
+    readonly externalLinks: ExternalLink[]
+  }) {
+    this.component = input.component
+    this.outgoingLinks = input.outgoingLinks
+    this.depth = input.depth
+    this.externalLinks = input.externalLinks
+  }
+
+  static parse(input: {
+    readonly component: Component
+    readonly outgoingLinks: Link[]
+    readonly depth: number
+    readonly externalLinks: ExternalLink[]
+  }): FlowStep {
+    return new FlowStep(input)
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/flow.ts b/packages/riviere-builder/domain-model/src/domain/query/flow.ts
new file mode 100644
index 000000000..10b78d4cb
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/flow.ts
@@ -0,0 +1,18 @@
+import type { Component } from '@living-architecture/riviere-schema-published-language/schema'
+import { FlowStep } from './flow-step'
+
+/** @riviere-role value-object */
+export class Flow {
+  declare private readonly brand: 'Flow'
+  readonly entryPoint: Component
+  readonly steps: FlowStep[]
+
+  private constructor(input: { readonly entryPoint: Component; readonly steps: FlowStep[] }) {
+    this.entryPoint = input.entryPoint
+    this.steps = input.steps
+  }
+
+  static parse(input: { readonly entryPoint: Component; readonly steps: FlowStep[] }): Flow {
+    return new Flow(input)
+  }
+}
diff --git a/packages/riviere-query/src/features/querying/queries/flows.spec.ts b/packages/riviere-builder/domain-model/src/domain/query/flows.spec.ts
similarity index 87%
rename from packages/riviere-query/src/features/querying/queries/flows.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/query/flows.spec.ts
index f620f4fb8..23969af32 100644
--- a/packages/riviere-query/src/features/querying/queries/flows.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/query/flows.spec.ts
@@ -1,10 +1,11 @@
-import { RiviereQuery } from './RiviereQuery'
 import {
-  createMinimalValidGraph,
+  assertDefined,
   createAPIComponent,
+  createMinimalValidGraph,
   createUseCaseComponent,
-  assertDefined,
-} from '../../../platform/__fixtures__/riviere-graph-fixtures'
+} from './__fixtures__/riviere-graph-fixtures'
+import { RiviereQuery } from './RiviereQuery'
+import { SearchWithFlowOptions } from './search-with-flow-options'
 
 describe('RiviereQuery.flows()', () => {
   it('returns single flow when graph has one entry point', () => {
@@ -91,9 +92,7 @@ describe('RiviereQuery.flows()', () => {
       },
     ])(
       'sets step $stepIndex to $expectedId with depth $expectedDepth',
-      ({
-        stepIndex, expectedId, expectedDepth 
-      }) => {
+      ({ stepIndex, expectedId, expectedDepth }) => {
         const query = new RiviereQuery(createLinkedGraph())
 
         const result = query.flows()
@@ -356,16 +355,23 @@ describe('RiviereQuery.searchWithFlow()', () => {
     )
     const query = new RiviereQuery(graph)
 
-    const result = query.searchWithFlow('', { returnAllOnEmptyQuery: true })
+    const result = query.searchWithFlow(
+      '',
+      SearchWithFlowOptions.parse({ returnAllOnEmptyQuery: true }),
+    )
 
-    expect(result.matchingIds.slice().sort((a, b) => a.localeCompare(b))).toStrictEqual([
-      'test:api:a',
-      'test:mod:ui:page',
-    ])
-    expect(result.visibleIds.slice().sort((a, b) => a.localeCompare(b))).toStrictEqual([
-      'test:api:a',
-      'test:mod:ui:page',
-    ])
+    expect(
+      result.matchingIds
+        .slice()
+        .sort((a, b) => a.localeCompare(b))
+        .map((id) => id.value),
+    ).toStrictEqual(['test:api:a', 'test:mod:ui:page'])
+    expect(
+      result.visibleIds
+        .slice()
+        .sort((a, b) => a.localeCompare(b))
+        .map((id) => id.value),
+    ).toStrictEqual(['test:api:a', 'test:mod:ui:page'])
   })
 
   it('returns empty arrays when query is empty and returnAllOnEmptyQuery is false', () => {
@@ -379,10 +385,13 @@ describe('RiviereQuery.searchWithFlow()', () => {
     )
     const query = new RiviereQuery(graph)
 
-    const result = query.searchWithFlow('', { returnAllOnEmptyQuery: false })
+    const result = query.searchWithFlow(
+      '',
+      SearchWithFlowOptions.parse({ returnAllOnEmptyQuery: false }),
+    )
 
-    expect(result.matchingIds).toStrictEqual([])
-    expect(result.visibleIds).toStrictEqual([])
+    expect(result.matchingIds.map((id) => id.value)).toStrictEqual([])
+    expect(result.visibleIds.map((id) => id.value)).toStrictEqual([])
   })
 
   it('returns matching component ID and all connected component IDs as visible', () => {
@@ -411,22 +420,29 @@ describe('RiviereQuery.searchWithFlow()', () => {
     ]
     const query = new RiviereQuery(graph)
 
-    const result = query.searchWithFlow('API A', { returnAllOnEmptyQuery: false })
+    const result = query.searchWithFlow(
+      'API A',
+      SearchWithFlowOptions.parse({ returnAllOnEmptyQuery: false }),
+    )
 
-    expect(result.matchingIds).toStrictEqual(['test:api:a'])
-    expect(result.visibleIds.slice().sort((a, b) => a.localeCompare(b))).toStrictEqual([
-      'test:api:a',
-      'test:mod:ui:page',
-      'test:uc:b',
-    ])
+    expect(result.matchingIds.map((id) => id.value)).toStrictEqual(['test:api:a'])
+    expect(
+      result.visibleIds
+        .slice()
+        .sort((a, b) => a.localeCompare(b))
+        .map((id) => id.value),
+    ).toStrictEqual(['test:api:a', 'test:mod:ui:page', 'test:uc:b'])
   })
 
   it('returns empty arrays when query matches nothing', () => {
     const query = new RiviereQuery(createMinimalValidGraph())
 
-    const result = query.searchWithFlow('nonexistent', { returnAllOnEmptyQuery: false })
+    const result = query.searchWithFlow(
+      'nonexistent',
+      SearchWithFlowOptions.parse({ returnAllOnEmptyQuery: false }),
+    )
 
-    expect(result.matchingIds).toStrictEqual([])
-    expect(result.visibleIds).toStrictEqual([])
+    expect(result.matchingIds.map((id) => id.value)).toStrictEqual([])
+    expect(result.visibleIds.map((id) => id.value)).toStrictEqual([])
   })
 })
diff --git a/packages/riviere-builder/domain-model/src/domain/query/graph-diff.ts b/packages/riviere-builder/domain-model/src/domain/query/graph-diff.ts
new file mode 100644
index 000000000..41ae71556
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/graph-diff.ts
@@ -0,0 +1,123 @@
+import type {
+  Component,
+  Link,
+  RiviereGraph,
+} from '@living-architecture/riviere-schema-published-language/schema'
+import { ComponentId } from './component-id'
+import { ComponentModification } from './component-modification'
+import { DiffStats } from './diff-stats'
+import { createLinkKey } from './link-key'
+
+/** @riviere-role value-object */
+export class GraphDiff {
+  declare private readonly brand: 'GraphDiff'
+  readonly components: {
+    added: Component[]
+    removed: Component[]
+    modified: ComponentModification[]
+  }
+  readonly links: {
+    added: Link[]
+    removed: Link[]
+  }
+  readonly stats: DiffStats
+
+  private constructor(input: {
+    readonly components: {
+      added: Component[]
+      removed: Component[]
+      modified: ComponentModification[]
+    }
+    readonly links: {
+      added: Link[]
+      removed: Link[]
+    }
+    readonly stats: DiffStats
+  }) {
+    this.components = input.components
+    this.links = input.links
+    this.stats = input.stats
+  }
+
+  static parse(input: {
+    readonly components: {
+      added: Component[]
+      removed: Component[]
+      modified: ComponentModification[]
+    }
+    readonly links: {
+      added: Link[]
+      removed: Link[]
+    }
+    readonly stats: DiffStats
+  }): GraphDiff {
+    return new GraphDiff(input)
+  }
+}
+
+/** @riviere-role domain-service */
+export function diffGraphs(current: RiviereGraph, other: RiviereGraph): GraphDiff {
+  const thisIds = new Set(current.components.map((c) => c.id))
+  const otherIds = new Set(other.components.map((c) => c.id))
+  const otherById = new Map(other.components.map((c) => [c.id, c]))
+
+  const added = other.components.filter((c) => !thisIds.has(c.id))
+  const removed = current.components.filter((c) => !otherIds.has(c.id))
+  const modified: ComponentModification[] = []
+
+  for (const tc of current.components) {
+    const oc = otherById.get(tc.id)
+    if (oc === undefined) continue
+    const changedFields = findChangedFields(tc, oc)
+    if (changedFields.length > 0) {
+      modified.push(
+        ComponentModification.parse({
+          id: ComponentId.parse(tc.id),
+          before: tc,
+          after: oc,
+          changedFields,
+        }),
+      )
+    }
+  }
+
+  const thisLinkKeys = new Set(current.links.map((l) => createLinkKey(l).value))
+  const otherLinkKeys = new Set(other.links.map((l) => createLinkKey(l).value))
+  const linksAdded = other.links.filter((l) => !thisLinkKeys.has(createLinkKey(l).value))
+  const linksRemoved = current.links.filter((l) => !otherLinkKeys.has(createLinkKey(l).value))
+
+  return GraphDiff.parse({
+    components: {
+      added,
+      removed,
+      modified,
+    },
+    links: {
+      added: linksAdded,
+      removed: linksRemoved,
+    },
+    stats: DiffStats.parse({
+      componentsAdded: added.length,
+      componentsRemoved: removed.length,
+      componentsModified: modified.length,
+      linksAdded: linksAdded.length,
+      linksRemoved: linksRemoved.length,
+    }),
+  })
+}
+
+function findChangedFields(before: Component, after: Component): string[] {
+  const beforeEntries = new Map(Object.entries(before))
+  const afterEntries = new Map(Object.entries(after))
+  const changedFields: string[] = []
+  const allKeys = new Set([...beforeEntries.keys(), ...afterEntries.keys()])
+
+  for (const key of allKeys) {
+    if (key === 'id') continue
+    if (JSON.stringify(beforeEntries.get(key)) !== JSON.stringify(afterEntries.get(key))) {
+      changedFields.push(key)
+    }
+  }
+
+  return changedFields
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/graph-stats.ts b/packages/riviere-builder/domain-model/src/domain/query/graph-stats.ts
new file mode 100644
index 000000000..af9ee083b
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/graph-stats.ts
@@ -0,0 +1,37 @@
+/** @riviere-role value-object */
+export class GraphStats {
+  declare private readonly brand: 'GraphStats'
+  readonly componentCount: number
+  readonly linkCount: number
+  readonly domainCount: number
+  readonly apiCount: number
+  readonly entityCount: number
+  readonly eventCount: number
+
+  private constructor(input: {
+    readonly componentCount: number
+    readonly linkCount: number
+    readonly domainCount: number
+    readonly apiCount: number
+    readonly entityCount: number
+    readonly eventCount: number
+  }) {
+    this.componentCount = input.componentCount
+    this.linkCount = input.linkCount
+    this.domainCount = input.domainCount
+    this.apiCount = input.apiCount
+    this.entityCount = input.entityCount
+    this.eventCount = input.eventCount
+  }
+
+  static parse(input: {
+    readonly componentCount: number
+    readonly linkCount: number
+    readonly domainCount: number
+    readonly apiCount: number
+    readonly entityCount: number
+    readonly eventCount: number
+  }): GraphStats {
+    return new GraphStats(input)
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/graph-validation.ts b/packages/riviere-builder/domain-model/src/domain/query/graph-validation.ts
new file mode 100644
index 000000000..5569cb885
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/graph-validation.ts
@@ -0,0 +1,15 @@
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
+import { ComponentId } from './component-id'
+
+/** @riviere-role domain-service */
+export function detectOrphanComponents(graph: RiviereGraph): ComponentId[] {
+  const connectedComponentIds = new Set<string>()
+  graph.links.forEach((link) => {
+    connectedComponentIds.add(link.source)
+    connectedComponentIds.add(link.target)
+  })
+
+  return graph.components
+    .filter((component) => !connectedComponentIds.has(component.id))
+    .map((component) => ComponentId.parse(component.id))
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/handler-id.ts b/packages/riviere-builder/domain-model/src/domain/query/handler-id.ts
new file mode 100644
index 000000000..93c96b73d
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/handler-id.ts
@@ -0,0 +1,18 @@
+import { z } from 'zod'
+
+const schema = z.string()
+
+/** @riviere-role value-object */
+export class HandlerId {
+  declare private readonly brand: 'HandlerId'
+
+  private constructor(readonly value: string) {}
+
+  static parse(value: string): HandlerId {
+    return new HandlerId(schema.parse(value))
+  }
+
+  toJSON(): string {
+    return this.value
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/handler-name.ts b/packages/riviere-builder/domain-model/src/domain/query/handler-name.ts
new file mode 100644
index 000000000..0c18d75ea
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/handler-name.ts
@@ -0,0 +1,18 @@
+import { z } from 'zod'
+
+const schema = z.string()
+
+/** @riviere-role value-object */
+export class HandlerName {
+  declare private readonly brand: 'HandlerName'
+
+  private constructor(readonly value: string) {}
+
+  static parse(value: string): HandlerName {
+    return new HandlerName(schema.parse(value))
+  }
+
+  toJSON(): string {
+    return this.value
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/identifier-serialization.spec.ts b/packages/riviere-builder/domain-model/src/domain/query/identifier-serialization.spec.ts
new file mode 100644
index 000000000..34cf63c49
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/identifier-serialization.spec.ts
@@ -0,0 +1,13 @@
+import { describe, expect, it } from 'vitest'
+import { ComponentId } from './component-id'
+import { LinkId } from './link-id'
+
+describe('identifier serialization', () => {
+  it('serializes a component ID to its value', () => {
+    expect(JSON.stringify(ComponentId.parse('component-id'))).toBe('"component-id"')
+  })
+
+  it('serializes a link ID to its value', () => {
+    expect(JSON.stringify(LinkId.parse('link-id'))).toBe('"link-id"')
+  })
+})
diff --git a/packages/riviere-builder/domain-model/src/domain/query/known-source-event.ts b/packages/riviere-builder/domain-model/src/domain/query/known-source-event.ts
new file mode 100644
index 000000000..cb4e8cf88
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/known-source-event.ts
@@ -0,0 +1,31 @@
+import type { DomainName } from './domain-name'
+import type { EventName } from './event-name'
+
+/**
+ * A subscribed event where the source domain is known.
+ * @riviere-role value-object
+ */
+export class KnownSourceEvent {
+  declare private readonly brand: 'KnownSourceEvent'
+  readonly eventName: EventName
+  readonly sourceDomain: DomainName
+  readonly sourceKnown: true
+
+  private constructor(input: {
+    readonly eventName: EventName
+    readonly sourceDomain: DomainName
+    readonly sourceKnown: true
+  }) {
+    this.eventName = input.eventName
+    this.sourceDomain = input.sourceDomain
+    this.sourceKnown = input.sourceKnown
+  }
+
+  static parse(input: {
+    readonly eventName: EventName
+    readonly sourceDomain: DomainName
+    readonly sourceKnown: true
+  }): KnownSourceEvent {
+    return new KnownSourceEvent(input)
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/link-id.ts b/packages/riviere-builder/domain-model/src/domain/query/link-id.ts
new file mode 100644
index 000000000..ae53f0a0d
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/link-id.ts
@@ -0,0 +1,22 @@
+import { z } from 'zod'
+
+const schema = z.string()
+
+/** @riviere-role value-object */
+export class LinkId {
+  declare private readonly brand: 'LinkId'
+
+  private constructor(readonly value: string) {}
+
+  static parse(value: string): LinkId {
+    return new LinkId(schema.parse(value))
+  }
+
+  localeCompare(other: LinkId): number {
+    return this.value.localeCompare(other.value)
+  }
+
+  toJSON(): string {
+    return this.value
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/link-key.ts b/packages/riviere-builder/domain-model/src/domain/query/link-key.ts
new file mode 100644
index 000000000..278d254db
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/link-key.ts
@@ -0,0 +1,10 @@
+import type { Link } from '@living-architecture/riviere-schema-published-language/schema'
+import { LinkId } from './link-id'
+
+/** @riviere-role domain-service */
+export function createLinkKey(link: Link): LinkId {
+  if (link.id !== undefined) {
+    return LinkId.parse(link.id)
+  }
+  return LinkId.parse(`${link.source}->${link.target}`)
+}
diff --git a/packages/riviere-query/src/features/querying/queries/nodeDepths.spec.ts b/packages/riviere-builder/domain-model/src/domain/query/nodeDepths.spec.ts
similarity index 77%
rename from packages/riviere-query/src/features/querying/queries/nodeDepths.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/query/nodeDepths.spec.ts
index 535eb7eeb..a83739ead 100644
--- a/packages/riviere-query/src/features/querying/queries/nodeDepths.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/query/nodeDepths.spec.ts
@@ -1,16 +1,13 @@
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
+import { describe, expect, it } from 'vitest'
 import {
-  describe, it, expect 
-} from 'vitest'
-import {
-  RiviereQuery, parseComponentId 
-} from './RiviereQuery'
-import {
-  createMinimalValidGraph,
   createAPIComponent,
+  createMinimalValidGraph,
   createUseCaseComponent,
   defaultSourceLocation,
-} from '../../../platform/__fixtures__/riviere-graph-fixtures'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
+} from './__fixtures__/riviere-graph-fixtures'
+import { RiviereQuery } from './RiviereQuery'
+import { ComponentId } from './component-id'
 
 describe('nodeDepths', () => {
   it('returns depth 0 for entry points', () => {
@@ -19,7 +16,7 @@ describe('nodeDepths', () => {
     const query = new RiviereQuery(graph)
     const depths = query.nodeDepths()
 
-    expect(depths.get(parseComponentId('test:mod:ui:page'))).toBe(0)
+    expect(depths.get(ComponentId.parse('test:mod:ui:page'))).toBe(0)
   })
 
   it('returns depth based on hops from entry point', () => {
@@ -50,9 +47,9 @@ describe('nodeDepths', () => {
     const query = new RiviereQuery(graph)
     const depths = query.nodeDepths()
 
-    expect(depths.get(parseComponentId('test:mod:ui:page'))).toBe(0)
-    expect(depths.get(parseComponentId('test:mod:api:users'))).toBe(1)
-    expect(depths.get(parseComponentId('test:mod:uc:getUser'))).toBe(2)
+    expect(depths.get(ComponentId.parse('test:mod:ui:page'))).toBe(0)
+    expect(depths.get(ComponentId.parse('test:mod:api:users'))).toBe(1)
+    expect(depths.get(ComponentId.parse('test:mod:uc:getUser'))).toBe(2)
   })
 
   it('returns minimum depth when reachable from multiple entry points', () => {
@@ -83,9 +80,9 @@ describe('nodeDepths', () => {
     const query = new RiviereQuery(graph)
     const depths = query.nodeDepths()
 
-    expect(depths.get(parseComponentId('test:mod:ui:page'))).toBe(0)
-    expect(depths.get(parseComponentId('test:mod:api:direct'))).toBe(0)
-    expect(depths.get(parseComponentId('test:mod:uc:shared'))).toBe(1)
+    expect(depths.get(ComponentId.parse('test:mod:ui:page'))).toBe(0)
+    expect(depths.get(ComponentId.parse('test:mod:api:direct'))).toBe(0)
+    expect(depths.get(ComponentId.parse('test:mod:uc:shared'))).toBe(1)
   })
 
   it('excludes unreachable nodes from result', () => {
@@ -101,8 +98,8 @@ describe('nodeDepths', () => {
     const query = new RiviereQuery(graph)
     const depths = query.nodeDepths()
 
-    expect(depths.get(parseComponentId('test:mod:ui:page'))).toBe(0)
-    expect(depths.has(parseComponentId('test:mod:uc:orphan'))).toBe(false)
+    expect(depths.get(ComponentId.parse('test:mod:ui:page'))).toBe(0)
+    expect(depths.has(ComponentId.parse('test:mod:uc:orphan'))).toBe(false)
   })
 
   it('handles source with multiple outgoing links', () => {
@@ -133,9 +130,9 @@ describe('nodeDepths', () => {
     const query = new RiviereQuery(graph)
     const depths = query.nodeDepths()
 
-    expect(depths.get(parseComponentId('test:mod:ui:page'))).toBe(0)
-    expect(depths.get(parseComponentId('test:mod:uc:a'))).toBe(1)
-    expect(depths.get(parseComponentId('test:mod:uc:b'))).toBe(1)
+    expect(depths.get(ComponentId.parse('test:mod:ui:page'))).toBe(0)
+    expect(depths.get(ComponentId.parse('test:mod:uc:a'))).toBe(1)
+    expect(depths.get(ComponentId.parse('test:mod:uc:b'))).toBe(1)
   })
 
   it('returns empty map for graph with no entry points', () => {
diff --git a/packages/riviere-builder/domain-model/src/domain/query/operation-name.ts b/packages/riviere-builder/domain-model/src/domain/query/operation-name.ts
new file mode 100644
index 000000000..142e9e361
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/operation-name.ts
@@ -0,0 +1,18 @@
+import { z } from 'zod'
+
+const schema = z.string()
+
+/** @riviere-role value-object */
+export class OperationName {
+  declare private readonly brand: 'OperationName'
+
+  private constructor(readonly value: string) {}
+
+  static parse(value: string): OperationName {
+    return new OperationName(schema.parse(value))
+  }
+
+  toJSON(): string {
+    return this.value
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/published-event.ts b/packages/riviere-builder/domain-model/src/domain/query/published-event.ts
new file mode 100644
index 000000000..21baf2591
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/published-event.ts
@@ -0,0 +1,37 @@
+import type { DomainName } from './domain-name'
+import type { EventId } from './event-id'
+import type { EventName } from './event-name'
+import { EventSubscriber } from './event-subscriber'
+
+/**
+ * A published event with its subscribers.
+ * @riviere-role value-object
+ */
+export class PublishedEvent {
+  declare private readonly brand: 'PublishedEvent'
+  readonly id: EventId
+  readonly eventName: EventName
+  readonly domain: DomainName
+  readonly handlers: EventSubscriber[]
+
+  private constructor(input: {
+    readonly id: EventId
+    readonly eventName: EventName
+    readonly domain: DomainName
+    readonly handlers: EventSubscriber[]
+  }) {
+    this.id = input.id
+    this.eventName = input.eventName
+    this.domain = input.domain
+    this.handlers = input.handlers
+  }
+
+  static parse(input: {
+    readonly id: EventId
+    readonly eventName: EventName
+    readonly domain: DomainName
+    readonly handlers: EventSubscriber[]
+  }): PublishedEvent {
+    return new PublishedEvent(input)
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/search-with-flow-options.ts b/packages/riviere-builder/domain-model/src/domain/query/search-with-flow-options.ts
new file mode 100644
index 000000000..09b1cbdb6
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/search-with-flow-options.ts
@@ -0,0 +1,13 @@
+/** @riviere-role value-object */
+export class SearchWithFlowOptions {
+  declare private readonly brand: 'SearchWithFlowOptions'
+  readonly returnAllOnEmptyQuery: boolean
+
+  private constructor(input: { readonly returnAllOnEmptyQuery: boolean }) {
+    this.returnAllOnEmptyQuery = input.returnAllOnEmptyQuery
+  }
+
+  static parse(input: { readonly returnAllOnEmptyQuery: boolean }): SearchWithFlowOptions {
+    return new SearchWithFlowOptions(input)
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/search-with-flow-result.ts b/packages/riviere-builder/domain-model/src/domain/query/search-with-flow-result.ts
new file mode 100644
index 000000000..4c0d1f95e
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/search-with-flow-result.ts
@@ -0,0 +1,23 @@
+import { ComponentId } from './component-id'
+
+/** @riviere-role value-object */
+export class SearchWithFlowResult {
+  declare private readonly brand: 'SearchWithFlowResult'
+  readonly matchingIds: ComponentId[]
+  readonly visibleIds: ComponentId[]
+
+  private constructor(input: {
+    readonly matchingIds: ComponentId[]
+    readonly visibleIds: ComponentId[]
+  }) {
+    this.matchingIds = input.matchingIds
+    this.visibleIds = input.visibleIds
+  }
+
+  static parse(input: {
+    readonly matchingIds: ComponentId[]
+    readonly visibleIds: ComponentId[]
+  }): SearchWithFlowResult {
+    return new SearchWithFlowResult(input)
+  }
+}
diff --git a/packages/riviere-query/src/features/querying/queries/state-machine.spec.ts b/packages/riviere-builder/domain-model/src/domain/query/state-machine.spec.ts
similarity index 88%
rename from packages/riviere-query/src/features/querying/queries/state-machine.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/query/state-machine.spec.ts
index fb3594a95..3fa4da9bf 100644
--- a/packages/riviere-query/src/features/querying/queries/state-machine.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/query/state-machine.spec.ts
@@ -1,8 +1,8 @@
-import { RiviereQuery } from './RiviereQuery'
 import {
-  createMinimalValidGraph,
   createDomainOpComponent,
-} from '../../../platform/__fixtures__/riviere-graph-fixtures'
+  createMinimalValidGraph,
+} from './__fixtures__/riviere-graph-fixtures'
+import { RiviereQuery } from './RiviereQuery'
 
 describe('transitionsFor', () => {
   it('returns empty array for nonexistent entity but transitions for existing entity', () => {
@@ -65,7 +65,7 @@ describe('transitionsFor', () => {
 
     const transitions = query.transitionsFor('Order')
 
-    expect(transitions).toStrictEqual([
+    expect(JSON.parse(JSON.stringify(transitions))).toStrictEqual([
       {
         from: 'Draft',
         to: 'Placed',
@@ -100,7 +100,7 @@ describe('transitionsFor', () => {
 
     const transitions = query.transitionsFor('Order')
 
-    expect(transitions).toStrictEqual([
+    expect(JSON.parse(JSON.stringify(transitions))).toStrictEqual([
       {
         from: '*',
         to: 'Cancelled',
@@ -137,7 +137,7 @@ describe('transitionsFor', () => {
 
     const transitions = query.transitionsFor('Order')
 
-    expect(transitions).toStrictEqual([
+    expect(JSON.parse(JSON.stringify(transitions))).toStrictEqual([
       {
         from: 'Draft',
         to: 'Placed',
@@ -208,10 +208,10 @@ describe('statesFor', () => {
 
     const states = query.statesFor('Order')
 
-    expect(states).toHaveLength(3)
-    expect(states).toContain('Draft')
-    expect(states).toContain('Placed')
-    expect(states).toContain('Confirmed')
+    expect(states.map((state) => state.value)).toHaveLength(3)
+    expect(states.map((state) => state.value)).toContain('Draft')
+    expect(states.map((state) => state.value)).toContain('Placed')
+    expect(states.map((state) => state.value)).toContain('Confirmed')
   })
 
   it('orders states by transition flow from initial to terminal', () => {
@@ -261,7 +261,12 @@ describe('statesFor', () => {
 
     const states = query.statesFor('Order')
 
-    expect(states).toStrictEqual(['Draft', 'Placed', 'Confirmed', 'Shipped'])
+    expect(states.map((state) => state.value)).toStrictEqual([
+      'Draft',
+      'Placed',
+      'Confirmed',
+      'Shipped',
+    ])
   })
 
   it('excludes wildcard from states but includes target states', () => {
@@ -298,8 +303,8 @@ describe('statesFor', () => {
 
     const states = query.statesFor('Order')
 
-    expect(states).not.toContain('*')
-    expect(states).toContain('Cancelled')
+    expect(states.map((state) => state.value)).not.toContain('*')
+    expect(states.map((state) => state.value)).toContain('Cancelled')
   })
 
   it('ignores operations without stateChanges when ordering', () => {
@@ -330,7 +335,7 @@ describe('statesFor', () => {
 
     const states = query.statesFor('Order')
 
-    expect(states).toStrictEqual(['Draft', 'Placed'])
+    expect(states.map((state) => state.value)).toStrictEqual(['Draft', 'Placed'])
   })
 
   it('handles cycles in state transitions', () => {
@@ -367,9 +372,9 @@ describe('statesFor', () => {
 
     const states = query.statesFor('Order')
 
-    expect(states).toHaveLength(2)
-    expect(states).toContain('Draft')
-    expect(states).toContain('Active')
+    expect(states.map((state) => state.value)).toHaveLength(2)
+    expect(states.map((state) => state.value)).toContain('Draft')
+    expect(states.map((state) => state.value)).toContain('Active')
   })
 
   it('handles cycles with initial state', () => {
@@ -419,9 +424,9 @@ describe('statesFor', () => {
 
     const states = query.statesFor('Order')
 
-    expect(states[0]).toBe('Draft')
-    expect(states).toContain('Active')
-    expect(states).toContain('Processing')
-    expect(states).toHaveLength(3)
+    expect(states[0]?.value).toBe('Draft')
+    expect(states.map((state) => state.value)).toContain('Active')
+    expect(states.map((state) => state.value)).toContain('Processing')
+    expect(states.map((state) => state.value)).toHaveLength(3)
   })
 })
diff --git a/packages/riviere-builder/domain-model/src/domain/query/state.ts b/packages/riviere-builder/domain-model/src/domain/query/state.ts
new file mode 100644
index 000000000..7f68328b9
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/state.ts
@@ -0,0 +1,18 @@
+import { z } from 'zod'
+
+const schema = z.string()
+
+/** @riviere-role value-object */
+export class State {
+  declare private readonly brand: 'State'
+
+  private constructor(readonly value: string) {}
+
+  static parse(value: string): State {
+    return new State(schema.parse(value))
+  }
+
+  toJSON(): string {
+    return this.value
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/query/stats-queries.ts b/packages/riviere-builder/domain-model/src/domain/query/stats-queries.ts
new file mode 100644
index 000000000..4e791c612
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/stats-queries.ts
@@ -0,0 +1,24 @@
+import type {
+  DomainOpComponent,
+  RiviereGraph,
+} from '@living-architecture/riviere-schema-published-language/schema'
+import { GraphStats } from './graph-stats'
+
+/** @riviere-role domain-service */
+export function queryStats(graph: RiviereGraph): GraphStats {
+  const components = graph.components
+
+  const uniqueDomains = new Set(components.map((c) => c.domain))
+
+  const domainOps = components.filter((c): c is DomainOpComponent => c.type === 'DomainOp')
+  const uniqueEntities = new Set(domainOps.filter((c) => c.entity).map((c) => c.entity))
+
+  return GraphStats.parse({
+    componentCount: components.length,
+    linkCount: graph.links.length,
+    domainCount: uniqueDomains.size,
+    apiCount: components.filter((c) => c.type === 'API').length,
+    entityCount: uniqueEntities.size,
+    eventCount: components.filter((c) => c.type === 'Event').length,
+  })
+}
diff --git a/packages/riviere-query/src/features/querying/queries/stats.spec.ts b/packages/riviere-builder/domain-model/src/domain/query/stats.spec.ts
similarity index 96%
rename from packages/riviere-query/src/features/querying/queries/stats.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/query/stats.spec.ts
index 6876f424d..37324ea4f 100644
--- a/packages/riviere-query/src/features/querying/queries/stats.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/query/stats.spec.ts
@@ -1,15 +1,13 @@
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
+import { describe, expect, it } from 'vitest'
 import {
-  describe, it, expect 
-} from 'vitest'
-import { RiviereQuery } from './RiviereQuery'
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
-import {
-  createMinimalValidGraph,
   createAPIComponent,
-  createEventComponent,
   createDomainOpComponent,
+  createEventComponent,
+  createMinimalValidGraph,
   defaultSourceLocation,
-} from '../../../platform/__fixtures__/riviere-graph-fixtures'
+} from './__fixtures__/riviere-graph-fixtures'
+import { RiviereQuery } from './RiviereQuery'
 
 describe('stats', () => {
   it('returns componentCount matching number of components', () => {
@@ -201,7 +199,7 @@ describe('stats', () => {
     const query = new RiviereQuery(graph)
     const result = query.stats()
 
-    expect(result).toStrictEqual({
+    expect(JSON.parse(JSON.stringify(result))).toStrictEqual({
       componentCount: 0,
       linkCount: 0,
       domainCount: 0,
diff --git a/packages/riviere-builder/domain-model/src/domain/query/traceFlow.spec.ts b/packages/riviere-builder/domain-model/src/domain/query/traceFlow.spec.ts
new file mode 100644
index 000000000..d5c940c87
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/traceFlow.spec.ts
@@ -0,0 +1,347 @@
+import { createAPIComponent, createMinimalValidGraph } from './__fixtures__/riviere-graph-fixtures'
+import { ComponentNotFoundError, RiviereQuery } from './RiviereQuery'
+import { ComponentId } from './component-id'
+
+describe('RiviereQuery.traceFlow()', () => {
+  it('throws ComponentNotFoundError when startComponentId does not exist', () => {
+    const query = new RiviereQuery(createMinimalValidGraph())
+
+    expect(() => query.traceFlow(ComponentId.parse('nonexistent:mod:api:foo'))).toThrow(
+      ComponentNotFoundError,
+    )
+  })
+
+  it('includes componentId in ComponentNotFoundError', () => {
+    const query = new RiviereQuery(createMinimalValidGraph())
+
+    const captureError = (): ComponentNotFoundError | undefined => {
+      try {
+        query.traceFlow(ComponentId.parse('nonexistent:mod:api:foo'))
+        return undefined
+      } catch (error) {
+        if (error instanceof ComponentNotFoundError) {
+          return error
+        }
+        return undefined
+      }
+    }
+
+    const caughtError = captureError()
+    expect(caughtError).toBeDefined()
+    expect(caughtError?.componentId).toBe('nonexistent:mod:api:foo')
+  })
+
+  it('returns only starting component when component is isolated', () => {
+    const query = new RiviereQuery(createMinimalValidGraph())
+
+    const result = query.traceFlow(ComponentId.parse('test:mod:ui:page'))
+
+    expect(result.componentIds.map((id) => id.value)).toStrictEqual(['test:mod:ui:page'])
+    expect(result.linkIds.map((id) => id.value)).toStrictEqual([])
+  })
+
+  it('returns downstream components when starting from source', () => {
+    const graph = createMinimalValidGraph()
+    graph.components.push(
+      createAPIComponent({
+        id: 'test:api:create',
+        name: 'Create',
+        domain: 'test',
+      }),
+    )
+    graph.links = [
+      {
+        source: 'test:mod:ui:page',
+        target: 'test:api:create',
+      },
+    ]
+    const query = new RiviereQuery(graph)
+
+    const result = query.traceFlow(ComponentId.parse('test:mod:ui:page'))
+
+    expect(
+      result.componentIds
+        .slice()
+        .sort((a, b) => a.localeCompare(b))
+        .map((id) => id.value),
+    ).toStrictEqual(['test:api:create', 'test:mod:ui:page'])
+    expect(result.linkIds.map((id) => id.value)).toStrictEqual([
+      'test:mod:ui:page->test:api:create',
+    ])
+  })
+
+  it('returns upstream components when starting from target', () => {
+    const graph = createMinimalValidGraph()
+    graph.components.push(
+      createAPIComponent({
+        id: 'test:api:create',
+        name: 'Create',
+        domain: 'test',
+      }),
+    )
+    graph.links = [
+      {
+        source: 'test:mod:ui:page',
+        target: 'test:api:create',
+      },
+    ]
+    const query = new RiviereQuery(graph)
+
+    const result = query.traceFlow(ComponentId.parse('test:api:create'))
+
+    expect(
+      result.componentIds
+        .slice()
+        .sort((a, b) => a.localeCompare(b))
+        .map((id) => id.value),
+    ).toStrictEqual(['test:api:create', 'test:mod:ui:page'])
+    expect(result.linkIds.map((id) => id.value)).toStrictEqual([
+      'test:mod:ui:page->test:api:create',
+    ])
+  })
+
+  it('returns all branches when flow branches', () => {
+    const graph = createMinimalValidGraph()
+    graph.components.push(
+      createAPIComponent({
+        id: 'test:api:a',
+        name: 'API A',
+        domain: 'test',
+      }),
+      createAPIComponent({
+        id: 'test:api:b',
+        name: 'API B',
+        domain: 'test',
+      }),
+    )
+    graph.links = [
+      {
+        source: 'test:mod:ui:page',
+        target: 'test:api:a',
+      },
+      {
+        source: 'test:mod:ui:page',
+        target: 'test:api:b',
+      },
+    ]
+    const query = new RiviereQuery(graph)
+
+    const result = query.traceFlow(ComponentId.parse('test:mod:ui:page'))
+
+    expect(
+      result.componentIds
+        .slice()
+        .sort((a, b) => a.localeCompare(b))
+        .map((id) => id.value),
+    ).toStrictEqual(['test:api:a', 'test:api:b', 'test:mod:ui:page'])
+    expect(
+      result.linkIds
+        .slice()
+        .sort((a, b) => a.localeCompare(b))
+        .map((id) => id.value),
+    ).toStrictEqual(['test:mod:ui:page->test:api:a', 'test:mod:ui:page->test:api:b'])
+  })
+
+  it('handles cycles without infinite loop', () => {
+    const graph = createMinimalValidGraph()
+    graph.components.push(
+      createAPIComponent({
+        id: 'test:api:a',
+        name: 'API A',
+        domain: 'test',
+      }),
+    )
+    graph.links = [
+      {
+        source: 'test:mod:ui:page',
+        target: 'test:api:a',
+      },
+      {
+        source: 'test:api:a',
+        target: 'test:mod:ui:page',
+      },
+    ]
+    const query = new RiviereQuery(graph)
+
+    const result = query.traceFlow(ComponentId.parse('test:mod:ui:page'))
+
+    expect(
+      result.componentIds
+        .slice()
+        .sort((a, b) => a.localeCompare(b))
+        .map((id) => id.value),
+    ).toStrictEqual(['test:api:a', 'test:mod:ui:page'])
+    expect(
+      result.linkIds
+        .slice()
+        .sort((a, b) => a.localeCompare(b))
+        .map((id) => id.value),
+    ).toStrictEqual(['test:api:a->test:mod:ui:page', 'test:mod:ui:page->test:api:a'])
+  })
+
+  it('only includes components in connected subgraph', () => {
+    const graph = createMinimalValidGraph()
+    graph.metadata.domains['other'] = {
+      description: 'Other',
+      systemType: 'domain',
+    }
+    graph.components.push(
+      createAPIComponent({
+        id: 'test:api:a',
+        name: 'API A',
+        domain: 'test',
+      }),
+      createAPIComponent({
+        id: 'other:api:x',
+        name: 'API X',
+        domain: 'other',
+      }),
+      createAPIComponent({
+        id: 'other:api:y',
+        name: 'API Y',
+        domain: 'other',
+      }),
+    )
+    graph.links = [
+      {
+        source: 'test:mod:ui:page',
+        target: 'test:api:a',
+      },
+      {
+        source: 'other:api:x',
+        target: 'other:api:y',
+      },
+    ]
+    const query = new RiviereQuery(graph)
+
+    const result = query.traceFlow(ComponentId.parse('test:mod:ui:page'))
+
+    expect(
+      result.componentIds
+        .slice()
+        .sort((a, b) => a.localeCompare(b))
+        .map((id) => id.value),
+    ).toStrictEqual(['test:api:a', 'test:mod:ui:page'])
+    expect(result.linkIds.map((id) => id.value)).toStrictEqual(['test:mod:ui:page->test:api:a'])
+  })
+
+  it('traces full chain when starting from middle', () => {
+    const graph = createMinimalValidGraph()
+    graph.components.push(
+      createAPIComponent({
+        id: 'test:api:b',
+        name: 'API B',
+        domain: 'test',
+      }),
+      createAPIComponent({
+        id: 'test:api:c',
+        name: 'API C',
+        domain: 'test',
+      }),
+    )
+    graph.links = [
+      {
+        source: 'test:mod:ui:page',
+        target: 'test:api:b',
+      },
+      {
+        source: 'test:api:b',
+        target: 'test:api:c',
+      },
+    ]
+    const query = new RiviereQuery(graph)
+
+    const result = query.traceFlow(ComponentId.parse('test:api:b'))
+
+    expect(
+      result.componentIds
+        .slice()
+        .sort((a, b) => a.localeCompare(b))
+        .map((id) => id.value),
+    ).toStrictEqual(['test:api:b', 'test:api:c', 'test:mod:ui:page'])
+    expect(
+      result.linkIds
+        .slice()
+        .sort((a, b) => a.localeCompare(b))
+        .map((id) => id.value),
+    ).toStrictEqual(['test:api:b->test:api:c', 'test:mod:ui:page->test:api:b'])
+  })
+
+  it('uses explicit link ID when provided', () => {
+    const graph = createMinimalValidGraph()
+    graph.components.push(
+      createAPIComponent({
+        id: 'test:api:a',
+        name: 'API A',
+        domain: 'test',
+      }),
+    )
+    graph.links = [
+      {
+        id: 'custom-link-id',
+        source: 'test:mod:ui:page',
+        target: 'test:api:a',
+      },
+    ]
+    const query = new RiviereQuery(graph)
+
+    const result = query.traceFlow(ComponentId.parse('test:mod:ui:page'))
+
+    expect(result.linkIds.map((id) => id.value)).toStrictEqual(['custom-link-id'])
+  })
+
+  it('traverses full chain beyond immediate neighbors', () => {
+    const graph = createMinimalValidGraph()
+    graph.components.push(
+      createAPIComponent({
+        id: 'test:api:b',
+        name: 'API B',
+        domain: 'test',
+      }),
+      createAPIComponent({
+        id: 'test:api:c',
+        name: 'API C',
+        domain: 'test',
+      }),
+      createAPIComponent({
+        id: 'test:api:d',
+        name: 'API D',
+        domain: 'test',
+      }),
+    )
+    graph.links = [
+      {
+        source: 'test:mod:ui:page',
+        target: 'test:api:b',
+      },
+      {
+        source: 'test:api:b',
+        target: 'test:api:c',
+      },
+      {
+        source: 'test:api:c',
+        target: 'test:api:d',
+      },
+    ]
+    const query = new RiviereQuery(graph)
+
+    const result = query.traceFlow(ComponentId.parse('test:api:b'))
+
+    expect(
+      result.componentIds
+        .slice()
+        .sort((a, b) => a.localeCompare(b))
+        .map((id) => id.value),
+    ).toStrictEqual(['test:api:b', 'test:api:c', 'test:api:d', 'test:mod:ui:page'])
+    expect(
+      result.linkIds
+        .slice()
+        .sort((a, b) => a.localeCompare(b))
+        .map((id) => id.value),
+    ).toStrictEqual([
+      'test:api:b->test:api:c',
+      'test:api:c->test:api:d',
+      'test:mod:ui:page->test:api:b',
+    ])
+  })
+})
diff --git a/packages/riviere-builder/domain-model/src/domain/query/unknown-source-event.ts b/packages/riviere-builder/domain-model/src/domain/query/unknown-source-event.ts
new file mode 100644
index 000000000..32d7ae1f3
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/query/unknown-source-event.ts
@@ -0,0 +1,23 @@
+import type { EventName } from './event-name'
+
+/**
+ * A subscribed event where the source domain is unknown.
+ * @riviere-role value-object
+ */
+export class UnknownSourceEvent {
+  declare private readonly brand: 'UnknownSourceEvent'
+  readonly eventName: EventName
+  readonly sourceKnown: false
+
+  private constructor(input: { readonly eventName: EventName; readonly sourceKnown: false }) {
+    this.eventName = input.eventName
+    this.sourceKnown = input.sourceKnown
+  }
+
+  static parse(input: {
+    readonly eventName: EventName
+    readonly sourceKnown: false
+  }): UnknownSourceEvent {
+    return new UnknownSourceEvent(input)
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/riviere-builder.ts b/packages/riviere-builder/domain-model/src/domain/riviere-builder.ts
new file mode 100644
index 000000000..1408081a8
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/riviere-builder.ts
@@ -0,0 +1,155 @@
+import type {
+  DomainMetadata,
+  RiviereGraph,
+  SourceInfo,
+} from '@living-architecture/riviere-schema-published-language/schema'
+import { BuilderGraph } from './builder-graph'
+import { GraphConstruction } from './construction/graph-construction'
+import { GraphEnrichment } from './enrichment/graph-enrichment'
+import { GraphLinking } from './linking/graph-linking'
+import { GraphInspection } from './inspection/graph-inspection'
+import { NearMatch } from './error-recovery/near-match'
+import {
+  BuildValidationError,
+  InvalidGraphError,
+  MissingDomainsError,
+  MissingSourcesError,
+} from './construction/construction-errors'
+import { toRiviereGraph } from './inspection/inspection-functions'
+
+type ScalarOverwriteWarning = Readonly<{
+  code: 'SCALAR_OVERWRITE'
+  message: string
+  componentId: string
+  field: string
+  oldValue: string | number | boolean
+  newValue: string | number | boolean
+}>
+
+type DuplicateLinkWarning = Readonly<{
+  code: 'DUPLICATE_LINK_SKIPPED'
+  message: string
+  source: string
+  target: string
+  linkType?: string
+  targetRepository?: string
+  targetName: string
+}>
+
+type OperationWarning = ScalarOverwriteWarning | DuplicateLinkWarning
+
+/** @riviere-role domain-service */
+export class RiviereBuilder {
+  readonly graphPath: string
+
+  private graph: BuilderGraph
+  private readonly operationWarnings: OperationWarning[]
+
+  private constructor(graph: BuilderGraph, graphPath: string) {
+    this.graph = graph
+    this.graphPath = graphPath
+    this.operationWarnings = []
+  }
+
+  get construction(): GraphConstruction {
+    return new GraphConstruction(
+      this.graph,
+      (warning) => this.operationWarnings.push(warning),
+      (graph) => {
+        this.graph = graph
+      },
+    )
+  }
+
+  get enrichment(): GraphEnrichment {
+    return new GraphEnrichment(this.graph, (graph) => {
+      this.graph = graph
+    })
+  }
+
+  get linking(): GraphLinking {
+    return new GraphLinking(
+      this.graph,
+      (warning) => this.operationWarnings.push(warning),
+      (graph) => {
+        this.graph = graph
+      },
+    )
+  }
+
+  get inspection(): GraphInspection {
+    return new GraphInspection(this.graph, this.operationWarnings)
+  }
+
+  get errorRecovery(): NearMatch {
+    return new NearMatch(this.graph)
+  }
+
+  static resume(graph: RiviereGraph, graphPath = ''): RiviereBuilder {
+    if (!graph.metadata.sources || graph.metadata.sources.length === 0) {
+      throw new InvalidGraphError('missing sources')
+    }
+
+    const builderGraph = BuilderGraph.parse({
+      version: graph.version,
+      metadata: {
+        ...graph.metadata,
+        sources: graph.metadata.sources,
+        customTypes: graph.metadata.customTypes ?? {},
+        relationshipTypes: graph.metadata.relationshipTypes ?? {},
+      },
+      components: graph.components,
+      links: graph.links,
+      externalLinks: graph.externalLinks ?? [],
+    })
+    return new RiviereBuilder(builderGraph, graphPath)
+  }
+
+  static new(
+    options: {
+      readonly name?: string
+      readonly description?: string
+      readonly sources: readonly SourceInfo[]
+      readonly domains: Readonly<Record<string, DomainMetadata>>
+    },
+    graphPath = '',
+  ): RiviereBuilder {
+    if (options.sources.length === 0) {
+      throw new MissingSourcesError()
+    }
+
+    if (Object.keys(options.domains).length === 0) {
+      throw new MissingDomainsError()
+    }
+
+    const graph = BuilderGraph.parse({
+      version: '1.0',
+      metadata: {
+        ...(options.name !== undefined && { name: options.name }),
+        ...(options.description !== undefined && { description: options.description }),
+        sources: [...options.sources],
+        domains: { ...options.domains },
+        customTypes: {},
+        relationshipTypes: {},
+      },
+      components: [],
+      links: [],
+      externalLinks: [],
+    })
+
+    return new RiviereBuilder(graph, graphPath)
+  }
+
+  serialize(): string {
+    return JSON.stringify(this.graph, null, 2)
+  }
+
+  build(): RiviereGraph {
+    const result = this.inspection.validate()
+    if (!result.valid) {
+      const messages = result.errors.map((e) => e.message)
+      throw new BuildValidationError(messages)
+    }
+    return toRiviereGraph(this.graph)
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/subscribed-events.ts b/packages/riviere-builder/domain-model/src/domain/subscribed-events.ts
new file mode 100644
index 000000000..f2ae15231
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/subscribed-events.ts
@@ -0,0 +1,20 @@
+/** @riviere-role value-object */
+export class SubscribedEvents {
+  declare private readonly brand: 'SubscribedEvents'
+
+  private constructor(readonly values: readonly string[]) {}
+
+  static parse(value: string | undefined) {
+    const values =
+      value
+        ?.split(',')
+        .map((event) => event.trim())
+        .filter(Boolean) ?? []
+    return values.length === 0
+      ? {
+          success: false as const,
+          message: '--subscribed-events is required for EventHandler component',
+        }
+      : { success: true as const, data: new SubscribedEvents(values) }
+  }
+}
diff --git a/packages/riviere-builder/domain-model/src/domain/system-type.spec.ts b/packages/riviere-builder/domain-model/src/domain/system-type.spec.ts
new file mode 100644
index 000000000..c8a1a2993
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/system-type.spec.ts
@@ -0,0 +1,18 @@
+import { describe, expect, it } from 'vitest'
+import { SystemType } from './system-type'
+
+describe('SystemType', () => {
+  it.each(['domain', 'bff', 'ui', 'external-service', 'other'])('parses %s', (value) => {
+    const result = SystemType.parse(value)
+
+    expect(result.success).toBe(true)
+    expect(result.success && result.data.value).toBe(value)
+  })
+
+  it('returns the validation error for an unsupported system type', () => {
+    const result = SystemType.parse('backend')
+
+    expect(result.success).toBe(false)
+    expect(!result.success && result.error.issues).not.toHaveLength(0)
+  })
+})
diff --git a/packages/riviere-builder/domain-model/src/domain/system-type.ts b/packages/riviere-builder/domain-model/src/domain/system-type.ts
new file mode 100644
index 000000000..65f4b8e5e
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/domain/system-type.ts
@@ -0,0 +1,24 @@
+import { z } from 'zod'
+
+const systemTypeSchema = z.enum(['domain', 'bff', 'ui', 'external-service', 'other'])
+type SystemTypeValue = z.infer<typeof systemTypeSchema>
+
+/** @riviere-role value-object */
+export class SystemType {
+  declare private readonly brand: 'SystemType'
+  readonly value: SystemTypeValue
+
+  private constructor(value: SystemTypeValue) {
+    this.value = value
+  }
+
+  static parse(value: string) {
+    const parsed = systemTypeSchema.safeParse(value)
+    return parsed.success
+      ? {
+          data: new SystemType(parsed.data),
+          success: true as const,
+        }
+      : parsed
+  }
+}
diff --git a/packages/riviere-builder/src/platform/domain/text-similarity/string-similarity.spec.ts b/packages/riviere-builder/domain-model/src/domain/text-similarity/string-similarity.spec.ts
similarity index 91%
rename from packages/riviere-builder/src/platform/domain/text-similarity/string-similarity.spec.ts
rename to packages/riviere-builder/domain-model/src/domain/text-similarity/string-similarity.spec.ts
index d21db3f3f..e7f846a06 100644
--- a/packages/riviere-builder/src/platform/domain/text-similarity/string-similarity.spec.ts
+++ b/packages/riviere-builder/domain-model/src/domain/text-similarity/string-similarity.spec.ts
@@ -1,9 +1,5 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import {
-  levenshteinDistance, similarityScore 
-} from './string-similarity'
+import { describe, it, expect } from 'vitest'
+import { levenshteinDistance, similarityScore } from './string-similarity'
 
 describe('levenshteinDistance', () => {
   it.each([
diff --git a/packages/riviere-builder/src/platform/domain/text-similarity/string-similarity.ts b/packages/riviere-builder/domain-model/src/domain/text-similarity/string-similarity.ts
similarity index 100%
rename from packages/riviere-builder/src/platform/domain/text-similarity/string-similarity.ts
rename to packages/riviere-builder/domain-model/src/domain/text-similarity/string-similarity.ts
diff --git a/packages/riviere-builder/domain-model/src/index.ts b/packages/riviere-builder/domain-model/src/index.ts
new file mode 100644
index 000000000..735190ddf
--- /dev/null
+++ b/packages/riviere-builder/domain-model/src/index.ts
@@ -0,0 +1,23 @@
+export { RiviereBuilder } from './domain/builder-facade'
+export { ComponentId } from '@living-architecture/riviere-schema-published-language/component-id'
+export {
+  BuildValidationError,
+  ComponentNotFoundError,
+  ComponentTypeMismatchError,
+  CustomTypeAlreadyDefinedError,
+  CustomTypeNotFoundError,
+  DomainNotFoundError,
+  DuplicateComponentError,
+  DuplicateDomainError,
+  DuplicateLinkError,
+  InvalidGraphError,
+  MissingDomainsError,
+  MissingRequiredPropertiesError,
+  MissingSourcesError,
+  RelationshipTypeAlreadyDefinedError,
+  RelationshipTypeNotFoundError,
+  SourceConflictError,
+} from './domain/construction/construction-errors'
+export { InvalidEnrichmentTargetError } from './domain/enrichment/enrichment-errors'
+export { findNearMatches } from './domain/error-recovery/component-suggestion'
+export { RiviereQuery } from './domain/query/RiviereQuery'
diff --git a/packages/riviere-builder/domain-model/tsconfig.json b/packages/riviere-builder/domain-model/tsconfig.json
new file mode 100644
index 000000000..667a3463d
--- /dev/null
+++ b/packages/riviere-builder/domain-model/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/packages/riviere-builder/domain-model/tsconfig.lib.json b/packages/riviere-builder/domain-model/tsconfig.lib.json
new file mode 100644
index 000000000..6abfe048d
--- /dev/null
+++ b/packages/riviere-builder/domain-model/tsconfig.lib.json
@@ -0,0 +1,33 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "src",
+    "outDir": "dist",
+    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
+    "emitDeclarationOnly": false,
+    "forceConsistentCasingInFileNames": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "references": [
+    {
+      "path": "../../riviere-schema/published-language/tsconfig.lib.json"
+    }
+  ],
+  "exclude": [
+    "vite.config.ts",
+    "vite.config.mts",
+    "vitest.config.ts",
+    "vitest.config.mts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx",
+    "src/__fixtures__/**"
+  ]
+}
diff --git a/packages/riviere-builder/domain-model/tsconfig.spec.json b/packages/riviere-builder/domain-model/tsconfig.spec.json
new file mode 100644
index 000000000..c98b0e87c
--- /dev/null
+++ b/packages/riviere-builder/domain-model/tsconfig.spec.json
@@ -0,0 +1,35 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/vitest",
+    "types": [
+      "vitest/globals",
+      "vitest/importMeta",
+      "vite/client",
+      "node",
+      "vitest"
+    ],
+    "forceConsistentCasingInFileNames": true
+  },
+  "include": [
+    "vite.config.ts",
+    "vite.config.mts",
+    "vitest.config.ts",
+    "vitest.config.mts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx",
+    "src/**/*.d.ts",
+    "src/__fixtures__/**/*.ts"
+  ],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    }
+  ]
+}
diff --git a/packages/riviere-builder/domain-model/typedoc.json b/packages/riviere-builder/domain-model/typedoc.json
new file mode 100644
index 000000000..9cee20c4a
--- /dev/null
+++ b/packages/riviere-builder/domain-model/typedoc.json
@@ -0,0 +1,24 @@
+{
+  "$schema": "https://typedoc.org/schema.json",
+  "entryPoints": ["./src/index.ts"],
+  "out": "../../../apps/docs/reference/api/generated/riviere-builder",
+  "plugin": ["typedoc-plugin-markdown", "typedoc-plugin-frontmatter"],
+  "frontmatterGlobals": {
+    "pageClass": "reference"
+  },
+  "name": "@living-architecture/riviere-builder-domain-model",
+  "readme": "none",
+  "excludePrivate": true,
+  "excludeProtected": true,
+  "excludeInternal": true,
+  "includeVersion": false,
+  "disableSources": false,
+  "sourceLinkTemplate": "https://github.com/NTCoding/living-architecture/blob/main/{path}#L{line}",
+  "tsconfig": "./tsconfig.lib.json",
+  "validation": {
+    "invalidLink": true,
+    "notExported": false
+  },
+  "hidePageHeader": true,
+  "hideBreadcrumbs": true
+}
diff --git a/packages/riviere-builder/domain-model/vite.config.ts b/packages/riviere-builder/domain-model/vite.config.ts
new file mode 100644
index 000000000..66caeabfa
--- /dev/null
+++ b/packages/riviere-builder/domain-model/vite.config.ts
@@ -0,0 +1,20 @@
+/// <reference types='vitest' />
+import { defineConfig } from 'vite'
+
+export default defineConfig(() => ({
+  root: import.meta.dirname,
+  cacheDir: '../../../node_modules/.vite/packages/riviere-builder',
+  plugins: [],
+  test: {
+    name: '@living-architecture/riviere-builder-domain-model',
+    watch: false,
+    globals: true,
+    environment: 'node',
+    include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+    reporters: ['default'],
+    coverage: {
+      reportsDirectory: './test-output/vitest/coverage',
+      provider: 'v8' as const,
+    },
+  },
+}))
diff --git a/packages/riviere-builder/domain-model/vitest.config.mts b/packages/riviere-builder/domain-model/vitest.config.mts
new file mode 100644
index 000000000..5c1bf4466
--- /dev/null
+++ b/packages/riviere-builder/domain-model/vitest.config.mts
@@ -0,0 +1,32 @@
+import path from 'node:path'
+import { defineConfig } from 'vitest/config'
+
+const repoRoot = path.resolve(__dirname, '../../..')
+
+export default defineConfig(() => ({
+  root: __dirname,
+  cacheDir: '../../../node_modules/.vite/packages/riviere-builder',
+  test: {
+    name: '@living-architecture/riviere-builder-domain-model',
+    watch: false,
+    globals: true,
+    environment: 'node',
+    include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+    reporters: ['default'],
+    coverage: {
+      enabled: true,
+      reportsDirectory: './test-output/vitest/coverage',
+      provider: 'v8' as const,
+      reporter: ['text', ['lcov', { projectRoot: repoRoot }]] as [
+        'text',
+        ['lcov', { projectRoot: string }],
+      ],
+      thresholds: {
+        lines: 100,
+        statements: 100,
+        functions: 100,
+        branches: 100,
+      },
+    },
+  },
+}))
diff --git a/packages/riviere-builder/package.json b/packages/riviere-builder/package.json
deleted file mode 100644
index 5937b7b46..000000000
--- a/packages/riviere-builder/package.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "name": "@living-architecture/riviere-builder",
-  "version": "0.10.3",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/NTCoding/living-architecture.git",
-    "directory": "packages/riviere-builder"
-  },
-  "type": "module",
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    "./package.json": "./package.json",
-    ".": {
-      "@living-architecture/source": "./src/index.ts",
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "default": "./dist/index.js"
-    }
-  },
-  "files": [
-    "dist",
-    "!**/*.tsbuildinfo"
-  ],
-  "dependencies": {
-    "@living-architecture/riviere-query": "workspace:*",
-    "@living-architecture/riviere-schema": "workspace:*"
-  }
-}
diff --git a/packages/riviere-builder/project.json b/packages/riviere-builder/project.json
deleted file mode 100644
index bf79ce85a..000000000
--- a/packages/riviere-builder/project.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "riviere-builder",
-  "targets": {
-    "typedoc": {
-      "executor": "nx:run-commands",
-      "options": {
-        "command": "pnpm exec typedoc --options packages/riviere-builder/typedoc.json",
-        "cwd": "{workspaceRoot}"
-      },
-      "dependsOn": ["build"]
-    }
-  }
-}
diff --git a/packages/riviere-builder/src/features/building/domain/builder-facade.ts b/packages/riviere-builder/src/features/building/domain/builder-facade.ts
deleted file mode 100644
index 1c5b5ff11..000000000
--- a/packages/riviere-builder/src/features/building/domain/builder-facade.ts
+++ /dev/null
@@ -1,387 +0,0 @@
-import type {
-  APIComponent,
-  CustomComponent,
-  DomainOpComponent,
-  EventComponent,
-  EventHandlerComponent,
-  ExternalLink,
-  Link,
-  RiviereGraph,
-  SourceInfo,
-  UIComponent,
-  UseCaseComponent,
-} from '@living-architecture/riviere-schema'
-import type { ValidationResult } from '@living-architecture/riviere-query'
-import { RiviereBuilder as DomainBuilder } from './riviere-builder'
-import type {
-  APIInput,
-  BuilderOptions,
-  CustomInput,
-  CustomTypeInput,
-  DomainInput,
-  DomainOpInput,
-  EventHandlerInput,
-  EventInput,
-  RelationshipTypeInput,
-  UpsertOptions,
-  UIInput,
-  UseCaseInput,
-} from './construction/construction-types'
-import type { EnrichmentInput } from './enrichment/enrichment-types'
-import type {
-  NearMatchMismatch,
-  NearMatchOptions,
-  NearMatchQuery,
-  NearMatchResult,
-} from './error-recovery/match-types'
-import type {
-  BuilderStats, BuilderWarning 
-} from './inspection/inspection-types'
-import type {
-  ExternalLinkInput, LinkInput 
-} from './linking/linking-types'
-
-export type {
-  APIInput,
-  BuilderOptions,
-  BuilderStats,
-  BuilderWarning,
-  CustomInput,
-  CustomTypeInput,
-  DomainInput,
-  DomainOpInput,
-  EnrichmentInput,
-  EventHandlerInput,
-  EventInput,
-  RelationshipTypeInput,
-  ExternalLinkInput,
-  LinkInput,
-  NearMatchMismatch,
-  NearMatchOptions,
-  NearMatchQuery,
-  NearMatchResult,
-  UpsertOptions,
-  UIInput,
-  UseCaseInput,
-}
-
-/**
- * Programmatically construct Riviere architecture graphs.
- *
- * Thin facade preserving the flat public API while delegating
- * to focused domain classes internally.
- *
- * @riviere-role aggregate
- */
-export class RiviereBuilder {
-  private readonly delegate: DomainBuilder
-
-  readonly graphPath: string
-
-  private constructor(delegate: DomainBuilder) {
-    this.delegate = delegate
-    this.graphPath = delegate.graphPath
-  }
-
-  /**
-   * Restores a builder from a previously serialized graph.
-   *
-   * @param graph - A valid RiviereGraph to resume from
-   * @param graphPath - File path where the graph is persisted
-   * @returns A new RiviereBuilder with the graph state restored
-   */
-  static resume(graph: RiviereGraph, graphPath = ''): RiviereBuilder {
-    return new RiviereBuilder(DomainBuilder.resume(graph, graphPath))
-  }
-
-  /**
-   * Creates a new builder with initial configuration.
-   *
-   * @param options - Configuration including sources and domains
-   * @param graphPath - File path where the graph will be persisted
-   * @returns A new RiviereBuilder instance
-   */
-  static new(options: BuilderOptions, graphPath = ''): RiviereBuilder {
-    return new RiviereBuilder(DomainBuilder.new(options, graphPath))
-  }
-
-  /**
-   * Adds an additional source repository to the graph.
-   *
-   * @param source - Source repository information
-   */
-  addSource(source: SourceInfo): void {
-    this.delegate.construction.addSource(source)
-  }
-
-  /**
-   * Adds a new domain to the graph.
-   *
-   * @param input - Domain name and description
-   */
-  addDomain(input: DomainInput): void {
-    this.delegate.construction.addDomain(input)
-  }
-
-  /**
-   * Adds a UI component to the graph.
-   *
-   * @param input - UI component properties
-   * @returns The created UI component
-   */
-  addUI(input: UIInput): UIComponent {
-    return this.delegate.construction.addUI(input)
-  }
-
-  upsertUI(
-    input: UIInput,
-    options?: UpsertOptions,
-  ): {
-    component: UIComponent
-    created: boolean
-  } {
-    return this.delegate.construction.upsertUI(input, options)
-  }
-
-  /**
-   * Adds an API component to the graph.
-   *
-   * @param input - API component properties
-   * @returns The created API component
-   */
-  addApi(input: APIInput): APIComponent {
-    return this.delegate.construction.addApi(input)
-  }
-
-  upsertApi(
-    input: APIInput,
-    options?: UpsertOptions,
-  ): {
-    component: APIComponent
-    created: boolean
-  } {
-    return this.delegate.construction.upsertApi(input, options)
-  }
-
-  /**
-   * Adds a UseCase component to the graph.
-   *
-   * @param input - UseCase component properties
-   * @returns The created UseCase component
-   */
-  addUseCase(input: UseCaseInput): UseCaseComponent {
-    return this.delegate.construction.addUseCase(input)
-  }
-
-  upsertUseCase(
-    input: UseCaseInput,
-    options?: UpsertOptions,
-  ): {
-    component: UseCaseComponent
-    created: boolean
-  } {
-    return this.delegate.construction.upsertUseCase(input, options)
-  }
-
-  /**
-   * Adds a DomainOp component to the graph.
-   *
-   * @param input - DomainOp component properties
-   * @returns The created DomainOp component
-   */
-  addDomainOp(input: DomainOpInput): DomainOpComponent {
-    return this.delegate.construction.addDomainOp(input)
-  }
-
-  upsertDomainOp(
-    input: DomainOpInput,
-    options?: UpsertOptions,
-  ): {
-    component: DomainOpComponent
-    created: boolean
-  } {
-    return this.delegate.construction.upsertDomainOp(input, options)
-  }
-
-  /**
-   * Adds an Event component to the graph.
-   *
-   * @param input - Event component properties
-   * @returns The created Event component
-   */
-  addEvent(input: EventInput): EventComponent {
-    return this.delegate.construction.addEvent(input)
-  }
-
-  upsertEvent(
-    input: EventInput,
-    options?: UpsertOptions,
-  ): {
-    component: EventComponent
-    created: boolean
-  } {
-    return this.delegate.construction.upsertEvent(input, options)
-  }
-
-  /**
-   * Adds an EventHandler component to the graph.
-   *
-   * @param input - EventHandler component properties
-   * @returns The created EventHandler component
-   */
-  addEventHandler(input: EventHandlerInput): EventHandlerComponent {
-    return this.delegate.construction.addEventHandler(input)
-  }
-
-  upsertEventHandler(
-    input: EventHandlerInput,
-    options?: UpsertOptions,
-  ): {
-    component: EventHandlerComponent
-    created: boolean
-  } {
-    return this.delegate.construction.upsertEventHandler(input, options)
-  }
-
-  /**
-   * Defines a custom component type for the graph.
-   *
-   * @param input - Custom type definition
-   */
-  defineCustomType(input: CustomTypeInput): void {
-    this.delegate.construction.defineCustomType(input)
-  }
-
-  /**
-   * Defines a relationship type for the graph.
-   *
-   * @param input - Relationship type name and description
-   */
-  defineRelationshipType(input: RelationshipTypeInput): void {
-    this.delegate.construction.defineRelationshipType(input)
-  }
-
-  /**
-   * Adds a Custom component to the graph.
-   *
-   * @param input - Custom component properties
-   * @returns The created Custom component
-   */
-  addCustom(input: CustomInput): CustomComponent {
-    return this.delegate.construction.addCustom(input)
-  }
-
-  upsertCustom(
-    input: CustomInput,
-    options?: UpsertOptions,
-  ): {
-    component: CustomComponent
-    created: boolean
-  } {
-    return this.delegate.construction.upsertCustom(input, options)
-  }
-
-  /**
-   * Enriches a DomainOp component with additional domain details.
-   *
-   * @param id - The component ID to enrich
-   * @param enrichment - State changes and business rules to add
-   */
-  enrichComponent(id: string, enrichment: EnrichmentInput): void {
-    this.delegate.enrichment.enrichComponent(id, enrichment)
-  }
-
-  /**
-   * Finds components similar to a query for error recovery.
-   *
-   * @param query - Search criteria including partial ID, name, type, or domain
-   * @param options - Optional matching thresholds and limits
-   * @returns Array of similar components with similarity scores
-   */
-  nearMatches(query: NearMatchQuery, options?: NearMatchOptions): NearMatchResult[] {
-    return this.delegate.errorRecovery.findNearMatches(query, options)
-  }
-
-  /**
-   * Creates a link between two components in the graph.
-   *
-   * @param input - Link properties including source, target, and type
-   * @returns The created link
-   */
-  link(input: LinkInput): Link {
-    return this.delegate.linking.link(input)
-  }
-
-  /**
-   * Creates a link from a component to an external system.
-   *
-   * @param input - External link properties including target system info
-   * @returns The created external link
-   */
-  linkExternal(input: ExternalLinkInput): ExternalLink {
-    return this.delegate.linking.linkExternal(input)
-  }
-
-  /**
-   * Returns non-fatal issues found in the graph.
-   *
-   * @returns Array of warning objects with type and message
-   */
-  warnings(): BuilderWarning[] {
-    return this.delegate.inspection.warnings()
-  }
-
-  /**
-   * Returns statistics about the current graph state.
-   *
-   * @returns Counts of components by type, domains, and links
-   */
-  stats(): BuilderStats {
-    return this.delegate.inspection.stats()
-  }
-
-  /**
-   * Runs full validation on the graph.
-   *
-   * @returns Validation result with valid flag and error details
-   */
-  validate(): ValidationResult {
-    return this.delegate.inspection.validate()
-  }
-
-  /**
-   * Returns IDs of components with no incoming or outgoing links.
-   *
-   * @returns Array of orphaned component IDs
-   */
-  orphans(): string[] {
-    return this.delegate.inspection.orphans()
-  }
-
-  /**
-   * Returns a RiviereQuery instance for the current graph state.
-   *
-   * @returns RiviereQuery instance for the current graph
-   */
-  query(): import('@living-architecture/riviere-query').RiviereQuery {
-    return this.delegate.inspection.query()
-  }
-
-  /**
-   * Serializes the current graph state as a JSON string.
-   *
-   * @returns JSON string representation of the graph
-   */
-  serialize(): string {
-    return this.delegate.serialize()
-  }
-
-  /**
-   * Validates and returns the completed graph.
-   *
-   * @returns Valid RiviereGraph object
-   */
-  build(): RiviereGraph {
-    return this.delegate.build()
-  }
-}
diff --git a/packages/riviere-builder/src/features/building/domain/builder-graph.ts b/packages/riviere-builder/src/features/building/domain/builder-graph.ts
deleted file mode 100644
index 163e874b5..000000000
--- a/packages/riviere-builder/src/features/building/domain/builder-graph.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import type {
-  CustomTypeDefinition,
-  ExternalLink,
-  GraphMetadata,
-  RiviereGraph,
-  SourceInfo,
-  RelationshipTypeDefinition,
-} from '@living-architecture/riviere-schema'
-
-/** @riviere-role value-object */
-export interface BuilderMetadata extends Omit<
-  GraphMetadata,
-  'sources' | 'customTypes' | 'relationshipTypes'
-> {
-  sources: SourceInfo[]
-  customTypes: Record<string, CustomTypeDefinition>
-  relationshipTypes: Record<string, RelationshipTypeDefinition>
-}
-
-/** @riviere-role value-object */
-export interface BuilderGraph extends Omit<RiviereGraph, 'metadata' | 'externalLinks'> {
-  metadata: BuilderMetadata
-  externalLinks: ExternalLink[]
-}
diff --git a/packages/riviere-builder/src/features/building/domain/builder-query.spec.ts b/packages/riviere-builder/src/features/building/domain/builder-query.spec.ts
deleted file mode 100644
index e1a51c0e7..000000000
--- a/packages/riviere-builder/src/features/building/domain/builder-query.spec.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-import { RiviereQuery } from '@living-architecture/riviere-query'
-import {
-  RiviereBuilder, type BuilderOptions 
-} from './builder-facade'
-
-function createValidOptions(): BuilderOptions {
-  return {
-    sources: [
-      {
-        repository: 'my-org/my-repo',
-        commit: 'abc123',
-      },
-    ],
-    domains: {
-      orders: {
-        description: 'Order management',
-        systemType: 'domain',
-      },
-    },
-  }
-}
-
-describe('query', () => {
-  it('returns RiviereQuery instance when builder has components', () => {
-    const builder = RiviereBuilder.new(createValidOptions())
-    builder.addApi({
-      name: 'Create Order',
-      domain: 'orders',
-      module: 'checkout',
-      apiType: 'REST',
-      httpMethod: 'POST',
-      path: '/orders',
-      sourceLocation: {
-        repository: 'my-org/my-repo',
-        filePath: 'src/orders.ts',
-      },
-    })
-
-    const result = builder.query()
-
-    expect(result).toBeInstanceOf(RiviereQuery)
-  })
-
-  it('returns APIs via componentsByType when builder has API components', () => {
-    const builder = RiviereBuilder.new(createValidOptions())
-    builder.addApi({
-      name: 'Create Order',
-      domain: 'orders',
-      module: 'checkout',
-      apiType: 'REST',
-      httpMethod: 'POST',
-      path: '/orders',
-      sourceLocation: {
-        repository: 'my-org/my-repo',
-        filePath: 'src/orders.ts',
-      },
-    })
-
-    const apis = builder.query().componentsByType('API')
-
-    expect(apis).toHaveLength(1)
-    expect(apis[0]?.name).toBe('Create Order')
-  })
-
-  it('returns query instance without throwing when builder has orphan components', () => {
-    const builder = RiviereBuilder.new(createValidOptions())
-    builder.addApi({
-      name: 'Orphan API',
-      domain: 'orders',
-      module: 'checkout',
-      apiType: 'REST',
-      httpMethod: 'GET',
-      path: '/orphan',
-      sourceLocation: {
-        repository: 'my-org/my-repo',
-        filePath: 'src/orphan.ts',
-      },
-    })
-
-    expect(() => builder.query()).not.toThrow()
-  })
-
-  it('includes newly added components in subsequent query calls', () => {
-    const builder = RiviereBuilder.new(createValidOptions())
-
-    const beforeApis = builder.query().componentsByType('API')
-    expect(beforeApis).toHaveLength(0)
-
-    builder.addApi({
-      name: 'New API',
-      domain: 'orders',
-      module: 'checkout',
-      apiType: 'REST',
-      httpMethod: 'POST',
-      path: '/new',
-      sourceLocation: {
-        repository: 'my-org/my-repo',
-        filePath: 'src/new.ts',
-      },
-    })
-
-    const afterApis = builder.query().componentsByType('API')
-    expect(afterApis).toHaveLength(1)
-    expect(afterApis[0]?.name).toBe('New API')
-  })
-
-  it('returns updated component count after each add operation', () => {
-    const builder = RiviereBuilder.new(createValidOptions())
-
-    expect(builder.query().componentsByType('API')).toHaveLength(0)
-
-    builder.addApi({
-      name: 'First API',
-      domain: 'orders',
-      module: 'checkout',
-      apiType: 'REST',
-      httpMethod: 'GET',
-      path: '/first',
-      sourceLocation: {
-        repository: 'my-org/my-repo',
-        filePath: 'src/first.ts',
-      },
-    })
-
-    expect(builder.query().componentsByType('API')).toHaveLength(1)
-
-    builder.addApi({
-      name: 'Second API',
-      domain: 'orders',
-      module: 'checkout',
-      apiType: 'REST',
-      httpMethod: 'GET',
-      path: '/second',
-      sourceLocation: {
-        repository: 'my-org/my-repo',
-        filePath: 'src/second.ts',
-      },
-    })
-
-    expect(builder.query().componentsByType('API')).toHaveLength(2)
-  })
-})
diff --git a/packages/riviere-builder/src/features/building/domain/construction/builder-internals.ts b/packages/riviere-builder/src/features/building/domain/construction/builder-internals.ts
deleted file mode 100644
index d45a9ec97..000000000
--- a/packages/riviere-builder/src/features/building/domain/construction/builder-internals.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import type {
-  Component,
-  CustomTypeDefinition,
-  DomainMetadata,
-} from '@living-architecture/riviere-schema'
-import { ComponentId } from '@living-architecture/riviere-schema'
-import { createSourceNotFoundError } from '../error-recovery/component-suggestion'
-import {
-  assertCustomTypeExists,
-  assertDomainExists,
-  assertRequiredPropertiesProvided,
-} from './builder-assertions'
-
-/** @riviere-role domain-service */
-export function generateComponentId(
-  domain: string,
-  module: string,
-  type: string,
-  name: string,
-): string {
-  const nameSegment = name.toLowerCase().replaceAll(/\s+/g, '-')
-  return `${domain}:${module}:${type}:${nameSegment}`
-}
-
-/** @riviere-role domain-service */
-export function createComponentNotFoundError(components: Component[], id: string): Error {
-  return createSourceNotFoundError(components, ComponentId.parse(id))
-}
-
-/** @riviere-role domain-service */
-export function validateDomainExists(
-  domains: Record<string, DomainMetadata>,
-  domain: string,
-): void {
-  assertDomainExists(domains, domain)
-}
-
-/** @riviere-role domain-service */
-export function validateCustomType(
-  customTypes: Record<string, CustomTypeDefinition>,
-  customTypeName: string,
-): void {
-  assertCustomTypeExists(customTypes, customTypeName)
-}
-
-/** @riviere-role domain-service */
-export function validateRequiredProperties(
-  customTypes: Record<string, CustomTypeDefinition>,
-  customTypeName: string,
-  metadata: Record<string, unknown> | undefined,
-): void {
-  assertRequiredPropertiesProvided(customTypes, customTypeName, metadata)
-}
diff --git a/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts b/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts
deleted file mode 100644
index 3d2a92ec7..000000000
--- a/packages/riviere-builder/src/features/building/domain/construction/construction-types.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import type {
-  ApiType,
-  CustomPropertyDefinition,
-  DomainMetadata,
-  HttpMethod,
-  OperationBehavior,
-  OperationSignature,
-  SourceInfo,
-  SourceLocation,
-  StateTransition,
-  SystemType,
-} from '@living-architecture/riviere-schema'
-
-/** @riviere-role value-object */
-export interface BuilderOptions {
-  name?: string
-  description?: string
-  sources: SourceInfo[]
-  domains: Record<string, DomainMetadata>
-}
-
-/** @riviere-role value-object */
-export interface DomainInput {
-  name: string
-  description: string
-  systemType: SystemType
-}
-
-/** @riviere-role value-object */
-export interface UpsertOptions {noOverwrite?: boolean}
-
-/** @riviere-role value-object */
-export interface UIInput {
-  name: string
-  domain: string
-  module: string
-  route: string
-  description?: string
-  sourceLocation: SourceLocation
-  metadata?: Record<string, unknown>
-}
-
-/** @riviere-role value-object */
-export interface APIInput {
-  name: string
-  domain: string
-  module: string
-  apiType: ApiType
-  httpMethod?: HttpMethod
-  path?: string
-  operationName?: string
-  description?: string
-  sourceLocation: SourceLocation
-  metadata?: Record<string, unknown>
-}
-
-/** @riviere-role value-object */
-export interface UseCaseInput {
-  name: string
-  domain: string
-  module: string
-  description?: string
-  sourceLocation: SourceLocation
-  metadata?: Record<string, unknown>
-}
-
-/** @riviere-role value-object */
-export interface DomainOpInput {
-  name: string
-  domain: string
-  module: string
-  operationName: string
-  entity?: string
-  signature?: OperationSignature
-  behavior?: OperationBehavior
-  stateChanges?: StateTransition[]
-  businessRules?: string[]
-  description?: string
-  sourceLocation: SourceLocation
-  metadata?: Record<string, unknown>
-}
-
-/** @riviere-role value-object */
-export interface EventInput {
-  name: string
-  domain: string
-  module: string
-  eventName: string
-  eventSchema?: string
-  description?: string
-  sourceLocation: SourceLocation
-  metadata?: Record<string, unknown>
-}
-
-/** @riviere-role value-object */
-export interface EventHandlerInput {
-  name: string
-  domain: string
-  module: string
-  subscribedEvents: string[]
-  description?: string
-  sourceLocation: SourceLocation
-  metadata?: Record<string, unknown>
-}
-
-/** @riviere-role value-object */
-export interface CustomTypeInput {
-  name: string
-  description?: string
-  requiredProperties?: Record<string, CustomPropertyDefinition>
-  optionalProperties?: Record<string, CustomPropertyDefinition>
-}
-
-/** @riviere-role value-object */
-export interface RelationshipTypeInput {
-  name: string
-  description: string
-}
-
-/** @riviere-role value-object */
-export interface CustomInput {
-  customTypeName: string
-  name: string
-  domain: string
-  module: string
-  description?: string
-  sourceLocation: SourceLocation
-  metadata?: Record<string, unknown>
-}
diff --git a/packages/riviere-builder/src/features/building/domain/construction/errors.spec.ts b/packages/riviere-builder/src/features/building/domain/construction/errors.spec.ts
deleted file mode 100644
index 96b1460b2..000000000
--- a/packages/riviere-builder/src/features/building/domain/construction/errors.spec.ts
+++ /dev/null
@@ -1,228 +0,0 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import {
-  ComponentNotFoundError,
-  CustomTypeNotFoundError,
-  DomainNotFoundError,
-  DuplicateComponentError,
-  DuplicateDomainError,
-  SourceConflictError,
-  ComponentTypeMismatchError,
-  CustomTypeAlreadyDefinedError,
-  MissingRequiredPropertiesError,
-  InvalidGraphError,
-  MissingSourcesError,
-  MissingDomainsError,
-  BuildValidationError,
-  DuplicateLinkError,
-  RelationshipTypeAlreadyDefinedError,
-  RelationshipTypeNotFoundError,
-} from './construction-errors'
-import { InvalidEnrichmentTargetError } from '../enrichment/enrichment-errors'
-
-describe('errors', () => {
-  describe('DuplicateDomainError', () => {
-    it('includes domain name in message', () => {
-      const error = new DuplicateDomainError('orders')
-
-      expect(error.message).toBe("Domain 'orders' already exists")
-      expect(error.domainName).toBe('orders')
-      expect(error.name).toBe('DuplicateDomainError')
-    })
-  })
-
-  describe('SourceConflictError', () => {
-    it('includes repository in message', () => {
-      const error = new SourceConflictError('test/repo')
-
-      expect(error.message).toBe("Source 'test/repo' already exists with different values")
-      expect(error.repository).toBe('test/repo')
-      expect(error.name).toBe('SourceConflictError')
-    })
-  })
-
-  describe('DomainNotFoundError', () => {
-    it('includes domain name in message', () => {
-      const error = new DomainNotFoundError('orders')
-
-      expect(error.message).toBe("Domain 'orders' does not exist")
-      expect(error.domainName).toBe('orders')
-      expect(error.name).toBe('DomainNotFoundError')
-    })
-  })
-
-  describe('CustomTypeNotFoundError', () => {
-    it('includes custom type name and defined types in message', () => {
-      const error = new CustomTypeNotFoundError('Queue', ['Worker', 'Cache'])
-
-      expect(error.message).toBe("Custom type 'Queue' not defined. Defined types: Worker, Cache")
-      expect(error.customTypeName).toBe('Queue')
-      expect(error.definedTypes).toStrictEqual(['Worker', 'Cache'])
-      expect(error.name).toBe('CustomTypeNotFoundError')
-    })
-
-    it('handles empty defined types', () => {
-      const error = new CustomTypeNotFoundError('Queue', [])
-
-      expect(error.message).toBe(
-        "Custom type 'Queue' not defined. No custom types have been defined.",
-      )
-    })
-  })
-
-  describe('DuplicateComponentError', () => {
-    it('includes component ID in message', () => {
-      const error = new DuplicateComponentError('orders:checkout:api:create-order')
-
-      expect(error.message).toBe(
-        "Component with ID 'orders:checkout:api:create-order' already exists",
-      )
-      expect(error.componentId).toBe('orders:checkout:api:create-order')
-      expect(error.name).toBe('DuplicateComponentError')
-    })
-  })
-
-  describe('ComponentTypeMismatchError', () => {
-    it('includes component identity and types in message', () => {
-      const error = new ComponentTypeMismatchError('orders:checkout:ui:checkout-page', 'UI', 'API')
-
-      expect(error.message).toBe(
-        "Component 'orders:checkout:ui:checkout-page' already exists as type 'UI'; cannot upsert as 'API'",
-      )
-      expect(error.componentId).toBe('orders:checkout:ui:checkout-page')
-      expect(error.existingType).toBe('UI')
-      expect(error.incomingType).toBe('API')
-    })
-  })
-
-  describe('ComponentNotFoundError', () => {
-    it('includes component ID and empty suggestions by default', () => {
-      const error = new ComponentNotFoundError('orders:checkout:api:create-ordr')
-
-      expect(error.message).toBe("Source component 'orders:checkout:api:create-ordr' not found")
-      expect(error.componentId).toBe('orders:checkout:api:create-ordr')
-      expect(error.suggestions).toStrictEqual([])
-      expect(error.name).toBe('ComponentNotFoundError')
-    })
-
-    it('includes suggestions in message when provided', () => {
-      const error = new ComponentNotFoundError('orders:checkout:api:create-ordr', [
-        'orders:checkout:api:create-order',
-        'orders:checkout:api:update-order',
-      ])
-
-      expect(error.message).toBe(
-        "Source component 'orders:checkout:api:create-ordr' not found. Did you mean: orders:checkout:api:create-order, orders:checkout:api:update-order?",
-      )
-      expect(error.suggestions).toStrictEqual([
-        'orders:checkout:api:create-order',
-        'orders:checkout:api:update-order',
-      ])
-    })
-  })
-
-  describe('InvalidEnrichmentTargetError', () => {
-    it('includes component ID and type in message', () => {
-      const error = new InvalidEnrichmentTargetError('orders:api:create', 'API')
-
-      expect(error.message).toBe(
-        "Only DomainOp components can be enriched. 'orders:api:create' is type 'API'",
-      )
-      expect(error.componentId).toBe('orders:api:create')
-      expect(error.componentType).toBe('API')
-      expect(error.name).toBe('InvalidEnrichmentTargetError')
-    })
-  })
-
-  describe('CustomTypeAlreadyDefinedError', () => {
-    it('includes type name in message', () => {
-      const error = new CustomTypeAlreadyDefinedError('Worker')
-
-      expect(error.message).toBe("Custom type 'Worker' already defined")
-      expect(error.typeName).toBe('Worker')
-      expect(error.name).toBe('CustomTypeAlreadyDefinedError')
-    })
-  })
-
-  describe('RelationshipTypeAlreadyDefinedError', () => {
-    it('includes the relationship type name in the message', () => {
-      const error = new RelationshipTypeAlreadyDefinedError('reads')
-
-      expect(error.message).toBe("Relationship type 'reads' already defined")
-      expect(error.typeName).toBe('reads')
-      expect(error.name).toBe('RelationshipTypeAlreadyDefinedError')
-    })
-  })
-
-  describe('RelationshipTypeNotFoundError', () => {
-    it('includes the relationship type and available types in the message', () => {
-      const error = new RelationshipTypeNotFoundError('queries', ['reads', 'writes'])
-
-      expect(error.message).toBe(
-        "Relationship type 'queries' not defined. Defined types: reads, writes",
-      )
-      expect(error.relationshipType).toBe('queries')
-      expect(error.definedTypes).toStrictEqual(['reads', 'writes'])
-      expect(error.name).toBe('RelationshipTypeNotFoundError')
-    })
-  })
-
-  describe('DuplicateLinkError', () => {
-    it('includes the Link ID in the message', () => {
-      const error = new DuplicateLinkError('source->target@file.sql:12:5')
-
-      expect(error.message).toBe("Link with ID 'source->target@file.sql:12:5' already exists")
-      expect(error.linkId).toBe('source->target@file.sql:12:5')
-      expect(error.name).toBe('DuplicateLinkError')
-    })
-  })
-
-  describe('MissingRequiredPropertiesError', () => {
-    it('includes custom type name and missing keys in message', () => {
-      const error = new MissingRequiredPropertiesError('Worker', ['queueName', 'concurrency'])
-
-      expect(error.message).toBe("Missing required properties for 'Worker': queueName, concurrency")
-      expect(error.customTypeName).toBe('Worker')
-      expect(error.missingKeys).toStrictEqual(['queueName', 'concurrency'])
-      expect(error.name).toBe('MissingRequiredPropertiesError')
-    })
-  })
-
-  describe('InvalidGraphError', () => {
-    it('includes reason in message', () => {
-      const error = new InvalidGraphError('missing version')
-
-      expect(error.message).toBe('Invalid graph: missing version')
-      expect(error.name).toBe('InvalidGraphError')
-    })
-  })
-
-  describe('MissingSourcesError', () => {
-    it('sets message', () => {
-      const error = new MissingSourcesError()
-
-      expect(error.message).toBe('At least one source required')
-      expect(error.name).toBe('MissingSourcesError')
-    })
-  })
-
-  describe('MissingDomainsError', () => {
-    it('sets message', () => {
-      const error = new MissingDomainsError()
-
-      expect(error.message).toBe('At least one domain required')
-      expect(error.name).toBe('MissingDomainsError')
-    })
-  })
-
-  describe('BuildValidationError', () => {
-    it('includes validation messages in message', () => {
-      const error = new BuildValidationError(['error 1', 'error 2'])
-
-      expect(error.message).toBe('Validation failed: error 1; error 2')
-      expect(error.validationMessages).toStrictEqual(['error 1', 'error 2'])
-      expect(error.name).toBe('BuildValidationError')
-    })
-  })
-})
diff --git a/packages/riviere-builder/src/features/building/domain/construction/graph-construction.ts b/packages/riviere-builder/src/features/building/domain/construction/graph-construction.ts
deleted file mode 100644
index 106ffca32..000000000
--- a/packages/riviere-builder/src/features/building/domain/construction/graph-construction.ts
+++ /dev/null
@@ -1,395 +0,0 @@
-import type {
-  APIComponent,
-  Component,
-  CustomComponent,
-  DomainOpComponent,
-  EventComponent,
-  EventHandlerComponent,
-  SourceInfo,
-  UIComponent,
-  UseCaseComponent,
-} from '@living-architecture/riviere-schema'
-import type { BuilderGraph } from '../builder-graph'
-import type {
-  APIInput,
-  CustomInput,
-  CustomTypeInput,
-  DomainInput,
-  DomainOpInput,
-  EventHandlerInput,
-  EventInput,
-  RelationshipTypeInput,
-  UpsertOptions,
-  UIInput,
-  UseCaseInput,
-} from './construction-types'
-import {
-  ComponentTypeMismatchError,
-  CustomTypeAlreadyDefinedError,
-  DuplicateComponentError,
-  DuplicateDomainError,
-  SourceConflictError,
-  RelationshipTypeAlreadyDefinedError,
-} from './construction-errors'
-import {
-  generateComponentId,
-  validateCustomType,
-  validateDomainExists,
-  validateRequiredProperties,
-} from './builder-internals'
-import { mergeComponentForUpsert } from '../enrichment/upsert-merge'
-import type { BuilderWarning } from '../inspection/inspection-types'
-
-/** @riviere-role domain-service */
-export class GraphConstruction {
-  private readonly graph: BuilderGraph
-  private readonly operationWarnings: BuilderWarning[]
-
-  constructor(graph: BuilderGraph, operationWarnings: BuilderWarning[]) {
-    this.graph = graph
-    this.operationWarnings = operationWarnings
-  }
-
-  addSource(source: SourceInfo): void {
-    const existing = this.graph.metadata.sources.find(
-      (item) => item.repository === source.repository,
-    )
-    if (existing) {
-      if (areSourcesEqual(existing, source)) {
-        return
-      }
-
-      throw new SourceConflictError(source.repository)
-    }
-
-    this.graph.metadata.sources.push(source)
-  }
-
-  addDomain(input: DomainInput): void {
-    const existing = this.graph.metadata.domains[input.name]
-    if (existing) {
-      if (existing.description === input.description && existing.systemType === input.systemType) {
-        return
-      }
-
-      throw new DuplicateDomainError(input.name)
-    }
-
-    this.graph.metadata.domains[input.name] = {
-      description: input.description,
-      systemType: input.systemType,
-    }
-  }
-
-  addUI(input: UIInput): UIComponent {
-    return this.registerComponent(this.buildUIComponent(input))
-  }
-
-  upsertUI(
-    input: UIInput,
-    options?: UpsertOptions,
-  ): {
-    component: UIComponent
-    created: boolean
-  } {
-    return this.upsertTypedComponent(this.buildUIComponent(input), options)
-  }
-
-  addApi(input: APIInput): APIComponent {
-    return this.registerComponent(this.buildAPIComponent(input))
-  }
-
-  upsertApi(
-    input: APIInput,
-    options?: UpsertOptions,
-  ): {
-    component: APIComponent
-    created: boolean
-  } {
-    return this.upsertTypedComponent(this.buildAPIComponent(input), options)
-  }
-
-  addUseCase(input: UseCaseInput): UseCaseComponent {
-    return this.registerComponent(this.buildUseCaseComponent(input))
-  }
-
-  upsertUseCase(
-    input: UseCaseInput,
-    options?: UpsertOptions,
-  ): {
-    component: UseCaseComponent
-    created: boolean
-  } {
-    return this.upsertTypedComponent(this.buildUseCaseComponent(input), options)
-  }
-
-  addDomainOp(input: DomainOpInput): DomainOpComponent {
-    return this.registerComponent(this.buildDomainOpComponent(input))
-  }
-
-  upsertDomainOp(
-    input: DomainOpInput,
-    options?: UpsertOptions,
-  ): {
-    component: DomainOpComponent
-    created: boolean
-  } {
-    return this.upsertTypedComponent(this.buildDomainOpComponent(input), options)
-  }
-
-  addEvent(input: EventInput): EventComponent {
-    return this.registerComponent(this.buildEventComponent(input))
-  }
-
-  upsertEvent(
-    input: EventInput,
-    options?: UpsertOptions,
-  ): {
-    component: EventComponent
-    created: boolean
-  } {
-    return this.upsertTypedComponent(this.buildEventComponent(input), options)
-  }
-
-  addEventHandler(input: EventHandlerInput): EventHandlerComponent {
-    return this.registerComponent(this.buildEventHandlerComponent(input))
-  }
-
-  upsertEventHandler(
-    input: EventHandlerInput,
-    options?: UpsertOptions,
-  ): {
-    component: EventHandlerComponent
-    created: boolean
-  } {
-    return this.upsertTypedComponent(this.buildEventHandlerComponent(input), options)
-  }
-
-  defineCustomType(input: CustomTypeInput): void {
-    const customTypes = this.graph.metadata.customTypes
-
-    if (customTypes[input.name]) {
-      throw new CustomTypeAlreadyDefinedError(input.name)
-    }
-
-    customTypes[input.name] = {
-      ...(input.requiredProperties !== undefined && {requiredProperties: input.requiredProperties,}),
-      ...(input.optionalProperties !== undefined && {optionalProperties: input.optionalProperties,}),
-      ...(input.description !== undefined && { description: input.description }),
-    }
-  }
-
-  defineRelationshipType(input: RelationshipTypeInput): void {
-    const relationshipTypes = this.graph.metadata.relationshipTypes
-    if (Object.hasOwn(relationshipTypes, input.name)) {
-      throw new RelationshipTypeAlreadyDefinedError(input.name)
-    }
-
-    Object.defineProperty(relationshipTypes, input.name, {
-      value: { description: input.description },
-      enumerable: true,
-      configurable: true,
-      writable: true,
-    })
-  }
-
-  addCustom(input: CustomInput): CustomComponent {
-    return this.registerComponent(this.buildCustomComponent(input))
-  }
-
-  upsertCustom(
-    input: CustomInput,
-    options?: UpsertOptions,
-  ): {
-    component: CustomComponent
-    created: boolean
-  } {
-    return this.upsertTypedComponent(this.buildCustomComponent(input), options)
-  }
-
-  private buildUIComponent(input: UIInput): UIComponent {
-    validateDomainExists(this.graph.metadata.domains, input.domain)
-    const id = generateComponentId(input.domain, input.module, 'ui', input.name)
-
-    return {
-      id,
-      type: 'UI',
-      name: input.name,
-      domain: input.domain,
-      module: input.module,
-      route: input.route,
-      sourceLocation: input.sourceLocation,
-      ...(input.description !== undefined && { description: input.description }),
-    }
-  }
-
-  private buildAPIComponent(input: APIInput): APIComponent {
-    validateDomainExists(this.graph.metadata.domains, input.domain)
-    const id = generateComponentId(input.domain, input.module, 'api', input.name)
-
-    return {
-      id,
-      type: 'API',
-      name: input.name,
-      domain: input.domain,
-      module: input.module,
-      apiType: input.apiType,
-      sourceLocation: input.sourceLocation,
-      ...(input.httpMethod !== undefined && { httpMethod: input.httpMethod }),
-      ...(input.path !== undefined && { path: input.path }),
-      ...(input.operationName !== undefined && { operationName: input.operationName }),
-      ...(input.description !== undefined && { description: input.description }),
-    }
-  }
-
-  private buildUseCaseComponent(input: UseCaseInput): UseCaseComponent {
-    validateDomainExists(this.graph.metadata.domains, input.domain)
-    const id = generateComponentId(input.domain, input.module, 'usecase', input.name)
-
-    return {
-      id,
-      type: 'UseCase',
-      name: input.name,
-      domain: input.domain,
-      module: input.module,
-      sourceLocation: input.sourceLocation,
-      ...(input.description !== undefined && { description: input.description }),
-    }
-  }
-
-  private buildDomainOpComponent(input: DomainOpInput): DomainOpComponent {
-    validateDomainExists(this.graph.metadata.domains, input.domain)
-    const id = generateComponentId(input.domain, input.module, 'domainop', input.name)
-
-    return {
-      id,
-      type: 'DomainOp',
-      name: input.name,
-      domain: input.domain,
-      module: input.module,
-      operationName: input.operationName,
-      sourceLocation: input.sourceLocation,
-      ...(input.entity !== undefined && { entity: input.entity }),
-      ...(input.signature !== undefined && { signature: input.signature }),
-      ...(input.behavior !== undefined && { behavior: input.behavior }),
-      ...(input.stateChanges !== undefined && { stateChanges: input.stateChanges }),
-      ...(input.businessRules !== undefined && { businessRules: input.businessRules }),
-      ...(input.description !== undefined && { description: input.description }),
-    }
-  }
-
-  private buildEventComponent(input: EventInput): EventComponent {
-    validateDomainExists(this.graph.metadata.domains, input.domain)
-    const id = generateComponentId(input.domain, input.module, 'event', input.name)
-
-    return {
-      id,
-      type: 'Event',
-      name: input.name,
-      domain: input.domain,
-      module: input.module,
-      eventName: input.eventName,
-      sourceLocation: input.sourceLocation,
-      ...(input.eventSchema !== undefined && { eventSchema: input.eventSchema }),
-      ...(input.description !== undefined && { description: input.description }),
-    }
-  }
-
-  private buildEventHandlerComponent(input: EventHandlerInput): EventHandlerComponent {
-    validateDomainExists(this.graph.metadata.domains, input.domain)
-    const id = generateComponentId(input.domain, input.module, 'eventhandler', input.name)
-
-    return {
-      id,
-      type: 'EventHandler',
-      name: input.name,
-      domain: input.domain,
-      module: input.module,
-      subscribedEvents: input.subscribedEvents,
-      sourceLocation: input.sourceLocation,
-      ...(input.description !== undefined && { description: input.description }),
-    }
-  }
-
-  private buildCustomComponent(input: CustomInput): CustomComponent {
-    validateDomainExists(this.graph.metadata.domains, input.domain)
-    validateCustomType(this.graph.metadata.customTypes, input.customTypeName)
-    validateRequiredProperties(
-      this.graph.metadata.customTypes,
-      input.customTypeName,
-      input.metadata,
-    )
-    const id = generateComponentId(input.domain, input.module, 'custom', input.name)
-
-    const component: CustomComponent = {
-      id,
-      type: 'Custom',
-      customTypeName: input.customTypeName,
-      name: input.name,
-      domain: input.domain,
-      module: input.module,
-      sourceLocation: input.sourceLocation,
-      ...(input.description !== undefined && { description: input.description }),
-      ...input.metadata,
-    }
-
-    return component
-  }
-
-  private registerComponent<T extends Component>(component: T): T {
-    if (this.graph.components.some((c) => c.id === component.id)) {
-      throw new DuplicateComponentError(component.id)
-    }
-    this.graph.components.push(component)
-    return component
-  }
-
-  private upsertTypedComponent<T extends Component>(
-    incoming: T,
-    options?: UpsertOptions,
-  ): {
-    component: T
-    created: boolean
-  } {
-    const existingIndex = this.graph.components.findIndex(
-      (component) => component.id === incoming.id,
-    )
-    if (existingIndex === -1) {
-      this.graph.components.push(incoming)
-      return {
-        component: incoming,
-        created: true,
-      }
-    }
-
-    const existing = this.graph.components[existingIndex]
-
-    if (!isSameTypeComponent(existing, incoming)) {
-      throw new ComponentTypeMismatchError(incoming.id, existing?.type ?? 'unknown', incoming.type)
-    }
-
-    const merged = mergeComponentForUpsert(existing, incoming, options, this.operationWarnings)
-
-    this.graph.components[existingIndex] = merged
-
-    return {
-      component: merged,
-      created: false,
-    }
-  }
-}
-
-function areSourcesEqual(existing: SourceInfo, incoming: SourceInfo): boolean {
-  return (
-    existing.repository === incoming.repository &&
-    existing.commit === incoming.commit &&
-    existing.extractedAt === incoming.extractedAt
-  )
-}
-
-function isSameTypeComponent<T extends Component>(
-  existing: Component | undefined,
-  incoming: T,
-): existing is T {
-  return existing?.type === incoming.type
-}
diff --git a/packages/riviere-builder/src/features/building/domain/enrichment/enrichment-types.ts b/packages/riviere-builder/src/features/building/domain/enrichment/enrichment-types.ts
deleted file mode 100644
index 2db827275..000000000
--- a/packages/riviere-builder/src/features/building/domain/enrichment/enrichment-types.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import type {
-  OperationBehavior,
-  OperationSignature,
-  StateTransition,
-} from '@living-architecture/riviere-schema'
-
-/** @riviere-role value-object */
-export interface EnrichmentInput {
-  entity?: string
-  stateChanges?: StateTransition[]
-  businessRules?: string[]
-  behavior?: OperationBehavior
-  signature?: OperationSignature
-}
diff --git a/packages/riviere-builder/src/features/building/domain/enrichment/graph-enrichment.ts b/packages/riviere-builder/src/features/building/domain/enrichment/graph-enrichment.ts
deleted file mode 100644
index ebadbc983..000000000
--- a/packages/riviere-builder/src/features/building/domain/enrichment/graph-enrichment.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import type { BuilderGraph } from '../builder-graph'
-import type { EnrichmentInput } from './enrichment-types'
-import { InvalidEnrichmentTargetError } from './enrichment-errors'
-import { createComponentNotFoundError } from '../construction/builder-internals'
-import { deduplicateStateTransitions } from './deduplicate-transitions'
-import { deduplicateStrings } from '../../../../platform/domain/collection-utils/deduplicate-strings'
-import { mergeBehavior } from './merge-behavior'
-
-/** @riviere-role domain-service */
-export class GraphEnrichment {
-  private readonly graph: BuilderGraph
-
-  constructor(graph: BuilderGraph) {
-    this.graph = graph
-  }
-
-  enrichComponent(id: string, enrichment: EnrichmentInput): void {
-    const component = this.graph.components.find((c) => c.id === id)
-    if (!component) {
-      throw createComponentNotFoundError(this.graph.components, id)
-    }
-    if (component.type !== 'DomainOp') {
-      throw new InvalidEnrichmentTargetError(id, component.type)
-    }
-    if (enrichment.entity !== undefined) {
-      component.entity = enrichment.entity
-    }
-    if (enrichment.stateChanges !== undefined) {
-      const existing = component.stateChanges ?? []
-      const newItems = deduplicateStateTransitions(existing, enrichment.stateChanges)
-      component.stateChanges = [...existing, ...newItems]
-    }
-    if (enrichment.businessRules !== undefined) {
-      const existing = component.businessRules ?? []
-      const newItems = deduplicateStrings(existing, enrichment.businessRules)
-      component.businessRules = [...existing, ...newItems]
-    }
-    if (enrichment.behavior !== undefined) {
-      component.behavior = mergeBehavior(component.behavior, enrichment.behavior)
-    }
-    if (enrichment.signature !== undefined) {
-      component.signature = enrichment.signature
-    }
-  }
-}
diff --git a/packages/riviere-builder/src/features/building/domain/enrichment/merge-behavior.ts b/packages/riviere-builder/src/features/building/domain/enrichment/merge-behavior.ts
deleted file mode 100644
index 21d883c40..000000000
--- a/packages/riviere-builder/src/features/building/domain/enrichment/merge-behavior.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import type {
-  DomainOpComponent, OperationBehavior 
-} from '@living-architecture/riviere-schema'
-import { deduplicateStrings } from '../../../../platform/domain/collection-utils/deduplicate-strings'
-
-function mergeStringArray(existing: string[] | undefined, incoming: string[]): string[] {
-  const base = existing ?? []
-  return [...base, ...deduplicateStrings(base, incoming)]
-}
-
-/** @riviere-role domain-service */
-export function mergeBehavior(
-  existing: DomainOpComponent['behavior'],
-  incoming: OperationBehavior,
-): OperationBehavior {
-  const base = existing ?? {}
-  return {
-    ...base,
-    ...(incoming.reads !== undefined && { reads: mergeStringArray(base.reads, incoming.reads) }),
-    ...(incoming.validates !== undefined && {validates: mergeStringArray(base.validates, incoming.validates),}),
-    ...(incoming.modifies !== undefined && {modifies: mergeStringArray(base.modifies, incoming.modifies),}),
-    ...(incoming.emits !== undefined && { emits: mergeStringArray(base.emits, incoming.emits) }),
-  }
-}
diff --git a/packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts b/packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts
deleted file mode 100644
index c4e316e6e..000000000
--- a/packages/riviere-builder/src/features/building/domain/error-recovery/match-types.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import type { ComponentType } from '@living-architecture/riviere-schema'
-
-/** @riviere-role value-object */
-export interface NearMatchQuery {
-  name: string
-  type?: ComponentType
-  domain?: string
-}
-
-/** @riviere-role value-object */
-export interface NearMatchMismatch {
-  field: 'type' | 'domain'
-  expected: string
-  actual: string
-}
-
-/** @riviere-role value-object */
-export interface NearMatchResult {
-  component: import('@living-architecture/riviere-schema').Component
-  score: number
-  mismatch?: NearMatchMismatch | undefined
-}
-
-/** @riviere-role value-object */
-export interface NearMatchOptions {
-  threshold?: number
-  limit?: number
-}
diff --git a/packages/riviere-builder/src/features/building/domain/error-recovery/near-match.ts b/packages/riviere-builder/src/features/building/domain/error-recovery/near-match.ts
deleted file mode 100644
index 95402e155..000000000
--- a/packages/riviere-builder/src/features/building/domain/error-recovery/near-match.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import type { BuilderGraph } from '../builder-graph'
-import type {
-  NearMatchOptions, NearMatchQuery, NearMatchResult 
-} from './match-types'
-import { findNearMatches } from './component-suggestion'
-
-/** @riviere-role domain-service */
-export class NearMatch {
-  private readonly graph: BuilderGraph
-
-  constructor(graph: BuilderGraph) {
-    this.graph = graph
-  }
-
-  findNearMatches(query: NearMatchQuery, options?: NearMatchOptions): NearMatchResult[] {
-    return findNearMatches(this.graph.components, query, options)
-  }
-}
diff --git a/packages/riviere-builder/src/features/building/domain/index.ts b/packages/riviere-builder/src/features/building/domain/index.ts
deleted file mode 100644
index 6f54cd729..000000000
--- a/packages/riviere-builder/src/features/building/domain/index.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-export * from './builder-facade'
-export {
-  ComponentId, type ComponentIdParts 
-} from '@living-architecture/riviere-schema'
-export {
-  DuplicateDomainError,
-  SourceConflictError,
-  DomainNotFoundError,
-  CustomTypeNotFoundError,
-  DuplicateComponentError,
-  ComponentTypeMismatchError,
-  ComponentNotFoundError,
-  CustomTypeAlreadyDefinedError,
-  RelationshipTypeAlreadyDefinedError,
-  RelationshipTypeNotFoundError,
-  DuplicateLinkError,
-  MissingRequiredPropertiesError,
-  InvalidGraphError,
-  MissingSourcesError,
-  MissingDomainsError,
-  BuildValidationError,
-} from './construction/construction-errors'
-export { InvalidEnrichmentTargetError } from './enrichment/enrichment-errors'
-export { findNearMatches } from './error-recovery/component-suggestion'
diff --git a/packages/riviere-builder/src/features/building/domain/inspection/graph-inspection.ts b/packages/riviere-builder/src/features/building/domain/inspection/graph-inspection.ts
deleted file mode 100644
index bb31f3d4e..000000000
--- a/packages/riviere-builder/src/features/building/domain/inspection/graph-inspection.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import type { ValidationResult } from '@living-architecture/riviere-query'
-import { RiviereQuery } from '@living-architecture/riviere-query'
-import type { BuilderGraph } from '../builder-graph'
-import type {
-  BuilderStats, BuilderWarning 
-} from './inspection-types'
-import {
-  calculateStats,
-  findOrphans,
-  findWarnings,
-  toRiviereGraph,
-  validateGraph,
-} from './inspection-functions'
-
-/** @riviere-role domain-service */
-export class GraphInspection {
-  private readonly graph: BuilderGraph
-  private readonly operationWarnings: readonly BuilderWarning[]
-
-  constructor(graph: BuilderGraph, operationWarnings: readonly BuilderWarning[]) {
-    this.graph = graph
-    this.operationWarnings = operationWarnings
-  }
-
-  warnings(): BuilderWarning[] {
-    return [...findWarnings(this.graph), ...this.operationWarnings]
-  }
-
-  stats(): BuilderStats {
-    return calculateStats(this.graph)
-  }
-
-  orphans(): string[] {
-    return findOrphans(this.graph)
-  }
-
-  validate(): ValidationResult {
-    return validateGraph(this.graph)
-  }
-
-  query(): RiviereQuery {
-    return new RiviereQuery(toRiviereGraph(this.graph))
-  }
-}
diff --git a/packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts b/packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts
deleted file mode 100644
index e52a31907..000000000
--- a/packages/riviere-builder/src/features/building/domain/inspection/inspection-types.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/** @riviere-role value-object */
-export interface BuilderStats {
-  componentCount: number
-  componentsByType: {
-    UI: number
-    API: number
-    UseCase: number
-    DomainOp: number
-    Event: number
-    EventHandler: number
-    Custom: number
-  }
-  linkCount: number
-  externalLinkCount: number
-  domainCount: number
-}
-
-/** @riviere-role value-object */
-export type WarningCode =
-  | 'ORPHAN_COMPONENT'
-  | 'UNUSED_DOMAIN'
-  | 'SCALAR_OVERWRITE'
-  | 'DUPLICATE_LINK_SKIPPED'
-
-/** @riviere-role value-object */
-export interface BuilderWarning {
-  code: WarningCode
-  message: string
-  componentId?: string
-  domainName?: string
-  field?: string
-  oldValue?: string | number | boolean
-  newValue?: string | number | boolean
-  source?: string
-  target?: string
-  linkType?: string
-  targetRepository?: string
-  targetName?: string
-}
diff --git a/packages/riviere-builder/src/features/building/domain/linking/graph-linking.ts b/packages/riviere-builder/src/features/building/domain/linking/graph-linking.ts
deleted file mode 100644
index 8af107cb5..000000000
--- a/packages/riviere-builder/src/features/building/domain/linking/graph-linking.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import type {
-  ExternalLink, Link 
-} from '@living-architecture/riviere-schema'
-import { createLinkId } from '@living-architecture/riviere-schema'
-import type { BuilderGraph } from '../builder-graph'
-import type { BuilderWarning } from '../inspection/inspection-types'
-import type {
-  ExternalLinkInput, LinkInput 
-} from './linking-types'
-import { createComponentNotFoundError } from '../construction/builder-internals'
-import {
-  DuplicateLinkError,
-  RelationshipTypeNotFoundError,
-} from '../construction/construction-errors'
-
-/** @riviere-role domain-service */
-export class GraphLinking {
-  private readonly graph: BuilderGraph
-  private readonly operationWarnings: BuilderWarning[]
-
-  constructor(graph: BuilderGraph, operationWarnings: BuilderWarning[]) {
-    this.graph = graph
-    this.operationWarnings = operationWarnings
-  }
-
-  link(input: LinkInput): Link {
-    const sourceExists = this.graph.components.some((c) => c.id === input.from)
-    if (!sourceExists) {
-      throw createComponentNotFoundError(this.graph.components, input.from)
-    }
-
-    if (
-      input.relationshipType !== undefined &&
-      !Object.hasOwn(this.graph.metadata.relationshipTypes, input.relationshipType)
-    ) {
-      throw new RelationshipTypeNotFoundError(
-        input.relationshipType,
-        Object.keys(this.graph.metadata.relationshipTypes),
-      )
-    }
-
-    const id = createLinkId({
-      source: input.from,
-      target: input.to,
-      ...(input.sourceLocation !== undefined && { sourceLocation: input.sourceLocation }),
-    })
-    if (this.graph.links.some((link) => link.id === id || createLinkId(link) === id)) {
-      throw new DuplicateLinkError(id)
-    }
-
-    const link: Link = {
-      id,
-      source: input.from,
-      target: input.to,
-      ...(input.type !== undefined && { type: input.type }),
-      ...(input.relationshipType !== undefined && { relationshipType: input.relationshipType }),
-      ...(input.condition !== undefined && { condition: input.condition }),
-      ...(input.sourceLocation !== undefined && { sourceLocation: input.sourceLocation }),
-    }
-    this.graph.links.push(link)
-    return link
-  }
-
-  linkExternal(input: ExternalLinkInput): ExternalLink {
-    const sourceExists = this.graph.components.some((c) => c.id === input.from)
-    if (!sourceExists) {
-      throw createComponentNotFoundError(this.graph.components, input.from)
-    }
-
-    const duplicate = this.graph.externalLinks.find(
-      (link) =>
-        link.source === input.from &&
-        link.target.repository === input.target.repository &&
-        link.target.name === input.target.name &&
-        link.type === input.type,
-    )
-
-    if (duplicate) {
-      this.operationWarnings.push({
-        code: 'DUPLICATE_LINK_SKIPPED',
-        message: `Duplicate external link '${input.from}' -> '${input.target.name}' (${input.type ?? 'unspecified'}) skipped`,
-        source: input.from,
-        target: input.target.name,
-        ...(input.type !== undefined && { linkType: input.type }),
-        ...(input.target.repository !== undefined && { targetRepository: input.target.repository }),
-        targetName: input.target.name,
-      })
-
-      return duplicate
-    }
-
-    const externalLink: ExternalLink = {
-      source: input.from,
-      target: input.target,
-      ...(input.type !== undefined && { type: input.type }),
-      ...(input.description !== undefined && { description: input.description }),
-      ...(input.sourceLocation !== undefined && { sourceLocation: input.sourceLocation }),
-    }
-    this.graph.externalLinks.push(externalLink)
-    return externalLink
-  }
-}
diff --git a/packages/riviere-builder/src/features/building/domain/linking/linking-types.ts b/packages/riviere-builder/src/features/building/domain/linking/linking-types.ts
deleted file mode 100644
index c6b63cd76..000000000
--- a/packages/riviere-builder/src/features/building/domain/linking/linking-types.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import type {
-  ExternalTarget, LinkType, SourceLocation 
-} from '@living-architecture/riviere-schema'
-
-/** @riviere-role value-object */
-export interface LinkInput {
-  from: string
-  to: string
-  type?: LinkType
-  relationshipType?: string
-  condition?: string
-  sourceLocation?: SourceLocation
-}
-
-/** @riviere-role value-object */
-export interface ExternalLinkInput {
-  from: string
-  target: ExternalTarget
-  type?: LinkType
-  description?: string
-  sourceLocation?: SourceLocation
-  metadata?: Record<string, unknown>
-}
diff --git a/packages/riviere-builder/src/features/building/domain/riviere-builder.ts b/packages/riviere-builder/src/features/building/domain/riviere-builder.ts
deleted file mode 100644
index 7cd861fd7..000000000
--- a/packages/riviere-builder/src/features/building/domain/riviere-builder.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
-import type { BuilderGraph } from './builder-graph'
-import { GraphConstruction } from './construction/graph-construction'
-import { GraphEnrichment } from './enrichment/graph-enrichment'
-import { GraphLinking } from './linking/graph-linking'
-import { GraphInspection } from './inspection/graph-inspection'
-import { NearMatch } from './error-recovery/near-match'
-import type { BuilderOptions } from './construction/construction-types'
-import type { BuilderWarning } from './inspection/inspection-types'
-import {
-  BuildValidationError,
-  InvalidGraphError,
-  MissingDomainsError,
-  MissingSourcesError,
-} from './construction/construction-errors'
-import { toRiviereGraph } from './inspection/inspection-functions'
-
-/** @riviere-role domain-service */
-export class RiviereBuilder {
-  readonly construction: GraphConstruction
-  readonly enrichment: GraphEnrichment
-  readonly linking: GraphLinking
-  readonly inspection: GraphInspection
-  readonly errorRecovery: NearMatch
-  readonly graphPath: string
-
-  private readonly graph: BuilderGraph
-
-  private constructor(graph: BuilderGraph, graphPath: string) {
-    this.graph = graph
-    this.graphPath = graphPath
-    const operationWarnings: BuilderWarning[] = []
-    this.construction = new GraphConstruction(graph, operationWarnings)
-    this.enrichment = new GraphEnrichment(graph)
-    this.linking = new GraphLinking(graph, operationWarnings)
-    this.inspection = new GraphInspection(graph, operationWarnings)
-    this.errorRecovery = new NearMatch(graph)
-  }
-
-  static resume(graph: RiviereGraph, graphPath = ''): RiviereBuilder {
-    if (!graph.metadata.sources || graph.metadata.sources.length === 0) {
-      throw new InvalidGraphError('missing sources')
-    }
-
-    const builderGraph: BuilderGraph = {
-      version: graph.version,
-      metadata: {
-        ...graph.metadata,
-        sources: graph.metadata.sources,
-        customTypes: graph.metadata.customTypes ?? {},
-        relationshipTypes: graph.metadata.relationshipTypes ?? {},
-      },
-      components: graph.components,
-      links: graph.links,
-      externalLinks: graph.externalLinks ?? [],
-    }
-    return new RiviereBuilder(builderGraph, graphPath)
-  }
-
-  static new(options: BuilderOptions, graphPath = ''): RiviereBuilder {
-    if (options.sources.length === 0) {
-      throw new MissingSourcesError()
-    }
-
-    if (Object.keys(options.domains).length === 0) {
-      throw new MissingDomainsError()
-    }
-
-    const graph: BuilderGraph = {
-      version: '1.0',
-      metadata: {
-        ...(options.name !== undefined && { name: options.name }),
-        ...(options.description !== undefined && { description: options.description }),
-        sources: options.sources,
-        domains: options.domains,
-        customTypes: {},
-        relationshipTypes: {},
-      },
-      components: [],
-      links: [],
-      externalLinks: [],
-    }
-
-    return new RiviereBuilder(graph, graphPath)
-  }
-
-  serialize(): string {
-    return JSON.stringify(this.graph, null, 2)
-  }
-
-  build(): RiviereGraph {
-    const result = this.inspection.validate()
-    if (!result.valid) {
-      const messages = result.errors.map((e) => e.message)
-      throw new BuildValidationError(messages)
-    }
-    return toRiviereGraph(this.graph)
-  }
-}
diff --git a/packages/riviere-builder/src/index.ts b/packages/riviere-builder/src/index.ts
deleted file mode 100644
index 867bb9ce6..000000000
--- a/packages/riviere-builder/src/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './features/building/domain'
diff --git a/packages/riviere-builder/tsconfig.json b/packages/riviere-builder/tsconfig.json
deleted file mode 100644
index 62ebbd946..000000000
--- a/packages/riviere-builder/tsconfig.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ]
-}
diff --git a/packages/riviere-builder/tsconfig.lib.json b/packages/riviere-builder/tsconfig.lib.json
deleted file mode 100644
index 66780aac6..000000000
--- a/packages/riviere-builder/tsconfig.lib.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "baseUrl": ".",
-    "rootDir": "src",
-    "outDir": "dist",
-    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
-    "emitDeclarationOnly": false,
-    "forceConsistentCasingInFileNames": true,
-    "types": ["node"]
-  },
-  "include": ["src/**/*.ts"],
-  "references": [
-    {
-      "path": "../riviere-schema/tsconfig.lib.json"
-    },
-    {
-      "path": "../riviere-query/tsconfig.lib.json"
-    }
-  ],
-  "exclude": [
-    "vite.config.ts",
-    "vite.config.mts",
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx",
-    "src/__fixtures__/**"
-  ]
-}
diff --git a/packages/riviere-builder/tsconfig.spec.json b/packages/riviere-builder/tsconfig.spec.json
deleted file mode 100644
index e879c9ad5..000000000
--- a/packages/riviere-builder/tsconfig.spec.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./out-tsc/vitest",
-    "types": [
-      "vitest/globals",
-      "vitest/importMeta",
-      "vite/client",
-      "node",
-      "vitest"
-    ],
-    "forceConsistentCasingInFileNames": true
-  },
-  "include": [
-    "vite.config.ts",
-    "vite.config.mts",
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx",
-    "src/**/*.d.ts",
-    "src/__fixtures__/**/*.ts"
-  ],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    }
-  ]
-}
diff --git a/packages/riviere-builder/typedoc.json b/packages/riviere-builder/typedoc.json
deleted file mode 100644
index 8c1be8f96..000000000
--- a/packages/riviere-builder/typedoc.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "$schema": "https://typedoc.org/schema.json",
-  "entryPoints": ["./src/index.ts"],
-  "out": "../../apps/docs/reference/api/generated/riviere-builder",
-  "plugin": ["typedoc-plugin-markdown", "typedoc-plugin-frontmatter"],
-  "frontmatterGlobals": {
-    "pageClass": "reference"
-  },
-  "name": "@living-architecture/riviere-builder",
-  "readme": "none",
-  "excludePrivate": true,
-  "excludeProtected": true,
-  "excludeInternal": true,
-  "includeVersion": false,
-  "disableSources": false,
-  "sourceLinkTemplate": "https://github.com/NTCoding/living-architecture/blob/main/{path}#L{line}",
-  "tsconfig": "./tsconfig.lib.json",
-  "validation": {
-    "invalidLink": true,
-    "notExported": false
-  },
-  "hidePageHeader": true,
-  "hideBreadcrumbs": true
-}
diff --git a/packages/riviere-builder/use-cases/README.md b/packages/riviere-builder/use-cases/README.md
new file mode 100644
index 000000000..457420d8d
--- /dev/null
+++ b/packages/riviere-builder/use-cases/README.md
@@ -0,0 +1,7 @@
+# use-cases
+
+This library was generated with [Nx](https://nx.dev).
+
+## Building
+
+Run `nx build use-cases` to build the library.
diff --git a/packages/riviere-builder/use-cases/package.json b/packages/riviere-builder/use-cases/package.json
new file mode 100644
index 000000000..36ad15fee
--- /dev/null
+++ b/packages/riviere-builder/use-cases/package.json
@@ -0,0 +1,35 @@
+{
+  "name": "@living-architecture/riviere-builder-use-cases",
+  "version": "0.0.1",
+  "publishConfig": {
+    "access": "public"
+  },
+  "type": "module",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "@living-architecture/source": "./src/index.ts",
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
+    },
+    "./features/*": {
+      "@living-architecture/source": "./src/features/*.ts",
+      "types": "./dist/features/*.d.ts",
+      "import": "./dist/features/*.js",
+      "default": "./dist/features/*.js"
+    }
+  },
+  "files": [
+    "dist",
+    "!dist/**/__fixtures__/**",
+    "!**/*.tsbuildinfo"
+  ],
+  "dependencies": {
+    "@living-architecture/riviere-builder-domain-model": "workspace:*",
+    "@living-architecture/riviere-schema-published-language": "workspace:*"
+  }
+}
diff --git a/packages/riviere-builder/use-cases/project.json b/packages/riviere-builder/use-cases/project.json
new file mode 100644
index 000000000..e270a2226
--- /dev/null
+++ b/packages/riviere-builder/use-cases/project.json
@@ -0,0 +1,18 @@
+{
+  "name": "@living-architecture/riviere-builder-use-cases",
+  "targets": {
+    "build": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          "node ../../../scripts/build-public-exports.mjs . --clean",
+          "tsc --build tsconfig.lib.json",
+          "node ../../../scripts/build-public-exports.mjs ."
+        ],
+        "cwd": "{projectRoot}",
+        "parallel": false
+      },
+      "outputs": ["{projectRoot}/dist"]
+    }
+  }
+}
diff --git a/packages/riviere-builder/use-cases/src/__fixtures__/command-test-fixtures.ts b/packages/riviere-builder/use-cases/src/__fixtures__/command-test-fixtures.ts
new file mode 100644
index 000000000..310ed9d9d
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/__fixtures__/command-test-fixtures.ts
@@ -0,0 +1,47 @@
+import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, vi } from 'vitest'
+
+export interface TestContext {
+  testDir: string
+  originalCwd: string
+}
+
+export function createTestContext(): TestContext {
+  return { originalCwd: '', testDir: '' }
+}
+
+export function setupCommandTest(ctx: TestContext): void {
+  beforeEach(async () => {
+    ctx.testDir = await mkdtemp(join(tmpdir(), 'riviere-test-'))
+    ctx.originalCwd = process.cwd()
+    process.chdir(ctx.testDir)
+  })
+
+  afterEach(async () => {
+    vi.restoreAllMocks()
+    process.chdir(ctx.originalCwd)
+    await rm(ctx.testDir, { force: true, recursive: true })
+  })
+}
+
+export async function createGraphWithDomain(testDir: string, domainName: string): Promise<void> {
+  const graphDir = join(testDir, '.riviere')
+  await mkdir(graphDir, { recursive: true })
+  await writeFile(
+    join(graphDir, 'graph.json'),
+    JSON.stringify({
+      components: [],
+      links: [],
+      metadata: {
+        domains: {
+          [domainName]: { description: 'Test domain', systemType: 'domain' },
+        },
+        sources: [{ repository: 'https://github.com/org/repo' }],
+      },
+      version: '1.0',
+    }),
+    'utf-8',
+  )
+}
diff --git a/packages/riviere-cli/src/features/builder/commands/add-component-input.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/add-component-input.ts
similarity index 95%
rename from packages/riviere-cli/src/features/builder/commands/add-component-input.ts
rename to packages/riviere-builder/use-cases/src/features/builder/commands/add-component-input.ts
index a09c7eaba..c1add90dd 100644
--- a/packages/riviere-cli/src/features/builder/commands/add-component-input.ts
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/add-component-input.ts
@@ -8,6 +8,7 @@ export interface AddComponentInput {
   filePath: string
   graphPathOption?: string
   lineNumber?: number
+  columnNumber?: number
   route?: string
   apiType?: string
   httpMethod?: string
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/add-component-result.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/add-component-result.ts
new file mode 100644
index 000000000..3abf8c7b9
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/add-component-result.ts
@@ -0,0 +1,19 @@
+/** @riviere-role command-use-case-result-value */
+export type AddComponentErrorCode =
+  | 'VALIDATION_ERROR'
+  | 'GRAPH_NOT_FOUND'
+  | 'DOMAIN_NOT_FOUND'
+  | 'CUSTOM_TYPE_NOT_FOUND'
+  | 'DUPLICATE_COMPONENT'
+
+/** @riviere-role command-use-case-result */
+export type AddComponentResult =
+  | {
+      success: true
+      componentId: string
+    }
+  | {
+      success: false
+      code: AddComponentErrorCode
+      message: string
+    }
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/add-component.spec.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/add-component.spec.ts
new file mode 100644
index 000000000..8854de7b2
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/add-component.spec.ts
@@ -0,0 +1,170 @@
+import { writeFile, mkdir } from 'node:fs/promises'
+import { join } from 'node:path'
+import { describe, expect, it } from 'vitest'
+import { AddComponent } from './add-component'
+import { RiviereBuilderRepository } from '../data-access/riviere-builder/riviere-builder-repository'
+import type { AddComponentErrorCode } from './add-component-result'
+import {
+  type TestContext,
+  createTestContext,
+  setupCommandTest,
+  createGraphWithDomain,
+} from '../../../__fixtures__/command-test-fixtures'
+
+describe('addComponent command', () => {
+  const ctx: TestContext = createTestContext()
+  setupCommandTest(ctx)
+
+  const baseInput = {
+    componentType: 'UI',
+    name: 'TestComponent',
+    domain: 'test-domain',
+    module: 'test-module',
+    repository: 'test-repo',
+    filePath: '/path/to/file.ts',
+  }
+
+  function inputWithGraphPath(overrides: Partial<typeof baseInput> = {}) {
+    return {
+      ...baseInput,
+      graphPathOption: join(ctx.testDir, '.riviere', 'graph.json'),
+      route: '/test',
+      ...overrides,
+    }
+  }
+
+  function failureShape(code: AddComponentErrorCode) {
+    return {
+      success: false as const,
+      code,
+    }
+  }
+
+  describe('component type validation', () => {
+    it.each([
+      ['invalid string', 'INVALID'],
+      ['empty', ''],
+      ['whitespace', '   '],
+      ['special chars', 'UI<script>'],
+      ['typo', 'UseCasee'],
+    ])('returns VALIDATION_ERROR when componentType is %s', async (_label, value) => {
+      const result = new AddComponent(new RiviereBuilderRepository()).execute({
+        ...inputWithGraphPath(),
+        componentType: value,
+      })
+
+      expect(result).toMatchObject({
+        ...failureShape('VALIDATION_ERROR'),
+        message: expect.stringContaining('Invalid component type'),
+      })
+    })
+  })
+
+  describe('line number validation', () => {
+    it.each([
+      ['NaN', NaN],
+      ['Infinity', Infinity],
+      ['negative Infinity', -Infinity],
+      ['fractional', 3.14],
+      ['negative', -1],
+      ['zero', 0],
+      ['unsafe integer', Number.MAX_SAFE_INTEGER + 1],
+    ])('returns VALIDATION_ERROR when lineNumber is %s', async (_label, value) => {
+      const result = new AddComponent(new RiviereBuilderRepository()).execute({
+        ...inputWithGraphPath(),
+        lineNumber: value,
+      })
+
+      expect(result).toMatchObject({
+        ...failureShape('VALIDATION_ERROR'),
+        message: expect.stringContaining('Invalid line number'),
+      })
+    })
+
+    it.each([
+      ['small positive', 1],
+      ['typical', 42],
+      ['large', Number.MAX_SAFE_INTEGER],
+    ])('valid lineNumber (%s) reaches graph check', async (_label, value) => {
+      const result = new AddComponent(new RiviereBuilderRepository()).execute({
+        ...inputWithGraphPath(),
+        lineNumber: value,
+      })
+
+      expect(result).toMatchObject(failureShape('GRAPH_NOT_FOUND'))
+    })
+  })
+
+  describe('column number validation', () => {
+    it.each([
+      ['NaN', NaN],
+      ['Infinity', Infinity],
+      ['negative Infinity', -Infinity],
+      ['fractional', 3.14],
+      ['negative', -1],
+      ['zero', 0],
+      ['unsafe integer', Number.MAX_SAFE_INTEGER + 1],
+    ])('returns VALIDATION_ERROR when columnNumber is %s', async (_label, value) => {
+      const result = new AddComponent(new RiviereBuilderRepository()).execute({
+        ...inputWithGraphPath(),
+        columnNumber: value,
+      })
+
+      expect(result).toMatchObject({
+        ...failureShape('VALIDATION_ERROR'),
+        message: expect.stringContaining('Invalid column number'),
+      })
+    })
+
+    it.each([
+      ['small positive', 1],
+      ['typical', 42],
+      ['large', Number.MAX_SAFE_INTEGER],
+    ])('valid columnNumber (%s) reaches graph check', async (_label, value) => {
+      const result = new AddComponent(new RiviereBuilderRepository()).execute({
+        ...inputWithGraphPath(),
+        columnNumber: value,
+      })
+
+      expect(result).toMatchObject(failureShape('GRAPH_NOT_FOUND'))
+    })
+  })
+
+  describe('malformed JSON handling', () => {
+    it('returns VALIDATION_ERROR when graph file contains invalid JSON', async () => {
+      const graphDir = join(ctx.testDir, '.riviere')
+      await mkdir(graphDir, { recursive: true })
+      await writeFile(join(graphDir, 'graph.json'), 'not valid json {{{', 'utf-8')
+
+      const result = new AddComponent(new RiviereBuilderRepository()).execute(inputWithGraphPath())
+
+      expect(result).toMatchObject({
+        ...failureShape('VALIDATION_ERROR'),
+        message: expect.stringContaining('invalid JSON'),
+      })
+    })
+  })
+
+  describe('successful component addition', () => {
+    it('returns componentId for UI component in valid graph', async () => {
+      await createGraphWithDomain(ctx.testDir, 'test-domain')
+
+      const result = new AddComponent(new RiviereBuilderRepository()).execute(inputWithGraphPath())
+
+      expect(result).toMatchObject({
+        success: true,
+        componentId: expect.any(String),
+      })
+    })
+  })
+
+  describe('domain not found error', () => {
+    it('returns DOMAIN_NOT_FOUND when domain does not exist', async () => {
+      await createGraphWithDomain(ctx.testDir, 'other-domain')
+
+      const result = new AddComponent(new RiviereBuilderRepository()).execute(inputWithGraphPath())
+
+      expect(result).toMatchObject(failureShape('DOMAIN_NOT_FOUND'))
+    })
+  })
+})
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/add-component.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/add-component.ts
new file mode 100644
index 000000000..ccd691480
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/add-component.ts
@@ -0,0 +1,93 @@
+import {
+  CustomTypeNotFoundError,
+  DomainNotFoundError,
+  DuplicateComponentError,
+} from '@living-architecture/riviere-builder-domain-model/domain/construction/construction-errors'
+import type { RiviereBuilder } from '@living-architecture/riviere-builder-domain-model/domain/builder-facade'
+import { ComponentDefinition } from '@living-architecture/riviere-builder-domain-model/domain/component-definition'
+import { GraphCorruptedError } from '../data-access/riviere-builder/graph-corrupted-error'
+import { GraphNotFoundError } from '../data-access/riviere-builder/graph-not-found-error'
+import { RiviereBuilderRepository } from '../data-access/riviere-builder/riviere-builder-repository'
+import type { AddComponentInput } from './add-component-input'
+import type { AddComponentErrorCode, AddComponentResult } from './add-component-result'
+
+/** @riviere-role command-use-case */
+export class AddComponent {
+  constructor(private readonly repository: RiviereBuilderRepository) {}
+
+  execute(input: AddComponentInput): AddComponentResult {
+    if (
+      input.lineNumber !== undefined &&
+      (!Number.isSafeInteger(input.lineNumber) || input.lineNumber < 1)
+    ) {
+      return failure('VALIDATION_ERROR', 'Invalid line number: must be a positive integer')
+    }
+
+    if (
+      input.columnNumber !== undefined &&
+      (!Number.isSafeInteger(input.columnNumber) || input.columnNumber < 1)
+    ) {
+      return failure('VALIDATION_ERROR', 'Invalid column number: must be a positive integer')
+    }
+
+    try {
+      const definition = ComponentDefinition.parse(input)
+      if (!definition.success) return failure('VALIDATION_ERROR', definition.message)
+      const builder = this.repository.load(input.graphPathOption)
+      const componentId = addDefinition(builder, definition.data.value)
+      this.repository.save(builder)
+      return {
+        success: true,
+        componentId,
+      }
+    } catch (error) {
+      if (error instanceof GraphNotFoundError) return failure('GRAPH_NOT_FOUND', error.message)
+      if (error instanceof GraphCorruptedError)
+        return failure('VALIDATION_ERROR', 'Graph file contains invalid JSON')
+      return mapError(error)
+    }
+  }
+}
+
+function addDefinition(builder: RiviereBuilder, definition: ComponentDefinition['value']): string {
+  switch (definition.type) {
+    case 'UI':
+      return builder.addUI(definition.input).id
+    case 'API':
+      return builder.addApi(definition.input).id
+    case 'UseCase':
+      return builder.addUseCase(definition.input).id
+    case 'DomainOp':
+      return builder.addDomainOp(definition.input).id
+    case 'Event':
+      return builder.addEvent(definition.input).id
+    case 'EventHandler':
+      return builder.addEventHandler(definition.input).id
+    case 'Custom':
+      return builder.addCustom(definition.input).id
+  }
+}
+
+function mapError(error: unknown): AddComponentResult {
+  if (error instanceof DomainNotFoundError) {
+    return failure('DOMAIN_NOT_FOUND', error.message)
+  }
+  if (error instanceof CustomTypeNotFoundError) {
+    return failure('CUSTOM_TYPE_NOT_FOUND', error.message)
+  }
+  if (error instanceof DuplicateComponentError) {
+    return failure('DUPLICATE_COMPONENT', error.message)
+  }
+  if (error instanceof Error) {
+    return failure('VALIDATION_ERROR', error.message)
+  }
+  throw error
+}
+
+function failure(code: AddComponentErrorCode, message: string): AddComponentResult {
+  return {
+    success: false,
+    code,
+    message,
+  }
+}
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/add-domain-input.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/add-domain-input.ts
new file mode 100644
index 000000000..aa635eadc
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/add-domain-input.ts
@@ -0,0 +1,7 @@
+/** @riviere-role command-use-case-input */
+export interface AddDomainInput {
+  description: string
+  graphPathOption: string | undefined
+  name: string
+  systemType: string
+}
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/add-domain-result.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/add-domain-result.ts
new file mode 100644
index 000000000..d7139e77e
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/add-domain-result.ts
@@ -0,0 +1,20 @@
+/** @riviere-role command-use-case-result-value */
+export type AddDomainErrorCode =
+  | 'DUPLICATE_DOMAIN'
+  | 'GRAPH_CORRUPTED'
+  | 'GRAPH_NOT_FOUND'
+  | 'VALIDATION_ERROR'
+
+/** @riviere-role command-use-case-result */
+export type AddDomainResult =
+  | {
+      description: string
+      name: string
+      success: true
+      systemType: string
+    }
+  | {
+      code: AddDomainErrorCode
+      message: string
+      success: false
+    }
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/add-domain.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/add-domain.ts
new file mode 100644
index 000000000..c20bed99f
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/add-domain.ts
@@ -0,0 +1,54 @@
+import { DuplicateDomainError } from '@living-architecture/riviere-builder-domain-model/domain/construction/construction-errors'
+import { GraphCorruptedError } from '../data-access/riviere-builder/graph-corrupted-error'
+import { GraphNotFoundError } from '../data-access/riviere-builder/graph-not-found-error'
+import { RiviereBuilderRepository } from '../data-access/riviere-builder/riviere-builder-repository'
+import { SystemType } from '@living-architecture/riviere-builder-domain-model/domain/system-type'
+import type { AddDomainInput } from './add-domain-input'
+import type { AddDomainErrorCode, AddDomainResult } from './add-domain-result'
+
+/** @riviere-role command-use-case */
+export class AddDomain {
+  constructor(private readonly repository: RiviereBuilderRepository) {}
+
+  execute(input: AddDomainInput): AddDomainResult {
+    const systemType = SystemType.parse(input.systemType)
+    if (!systemType.success) {
+      return failure('VALIDATION_ERROR', `Invalid system type: ${input.systemType}`)
+    }
+
+    try {
+      const builder = this.repository.load(input.graphPathOption)
+      builder.addDomain({
+        description: input.description,
+        name: input.name,
+        systemType: systemType.data.value,
+      })
+      this.repository.save(builder)
+      return {
+        description: input.description,
+        name: input.name,
+        success: true,
+        systemType: systemType.data.value,
+      }
+    } catch (error) {
+      if (error instanceof GraphNotFoundError) {
+        return failure('GRAPH_NOT_FOUND', error.message)
+      }
+      if (error instanceof GraphCorruptedError) {
+        return failure('GRAPH_CORRUPTED', 'Graph file contains invalid JSON')
+      }
+      if (error instanceof DuplicateDomainError) {
+        return failure('DUPLICATE_DOMAIN', error.message)
+      }
+      throw error
+    }
+  }
+}
+
+function failure(code: AddDomainErrorCode, message: string): AddDomainResult {
+  return {
+    code,
+    message,
+    success: false,
+  }
+}
diff --git a/packages/riviere-cli/src/features/builder/commands/add-source-input.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/add-source-input.ts
similarity index 100%
rename from packages/riviere-cli/src/features/builder/commands/add-source-input.ts
rename to packages/riviere-builder/use-cases/src/features/builder/commands/add-source-input.ts
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/add-source-result.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/add-source-result.ts
new file mode 100644
index 000000000..dc5c39905
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/add-source-result.ts
@@ -0,0 +1,14 @@
+/** @riviere-role command-use-case-result-value */
+export type AddSourceErrorCode = 'GRAPH_CORRUPTED' | 'GRAPH_NOT_FOUND'
+
+/** @riviere-role command-use-case-result */
+export type AddSourceResult =
+  | {
+      repository: string
+      success: true
+    }
+  | {
+      code: AddSourceErrorCode
+      message: string
+      success: false
+    }
diff --git a/packages/riviere-cli/src/features/builder/commands/add-source.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/add-source.ts
similarity index 77%
rename from packages/riviere-cli/src/features/builder/commands/add-source.ts
rename to packages/riviere-builder/use-cases/src/features/builder/commands/add-source.ts
index e80b9c308..e596bff31 100644
--- a/packages/riviere-cli/src/features/builder/commands/add-source.ts
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/add-source.ts
@@ -1,10 +1,8 @@
-import { GraphCorruptedError } from '../../../platform/domain/graph-corrupted-error'
-import { GraphNotFoundError } from '../../../platform/domain/graph-not-found-error'
-import { RiviereBuilderRepository } from '../data-access/riviere-builder-repository'
+import { GraphCorruptedError } from '../data-access/riviere-builder/graph-corrupted-error'
+import { GraphNotFoundError } from '../data-access/riviere-builder/graph-not-found-error'
+import { RiviereBuilderRepository } from '../data-access/riviere-builder/riviere-builder-repository'
 import type { AddSourceInput } from './add-source-input'
-import type {
-  AddSourceErrorCode, AddSourceResult 
-} from './add-source-result'
+import type { AddSourceErrorCode, AddSourceResult } from './add-source-result'
 
 /** @riviere-role command-use-case */
 export class AddSource {
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/check-consistency-input.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/check-consistency-input.ts
new file mode 100644
index 000000000..a0aa16367
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/check-consistency-input.ts
@@ -0,0 +1,4 @@
+/** @riviere-role command-use-case-input */
+export interface CheckConsistencyInput {
+  graphPathOption: string | undefined
+}
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/check-consistency-result.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/check-consistency-result.ts
new file mode 100644
index 000000000..33c2b1301
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/check-consistency-result.ts
@@ -0,0 +1,20 @@
+import type { RiviereBuilder } from '@living-architecture/riviere-builder-domain-model/domain/builder-facade'
+
+/** @riviere-role command-use-case-result-value */
+export type CheckConsistencyErrorCode = 'GRAPH_CORRUPTED' | 'GRAPH_NOT_FOUND'
+
+/** @riviere-role command-use-case-result-value */
+export type BuilderWarnings = ReturnType<RiviereBuilder['warnings']>
+
+/** @riviere-role command-use-case-result */
+export type CheckConsistencyResult =
+  | {
+      consistent: boolean
+      success: true
+      warnings: BuilderWarnings
+    }
+  | {
+      code: CheckConsistencyErrorCode
+      message: string
+      success: false
+    }
diff --git a/packages/riviere-cli/src/features/builder/commands/check-consistency.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/check-consistency.ts
similarity index 79%
rename from packages/riviere-cli/src/features/builder/commands/check-consistency.ts
rename to packages/riviere-builder/use-cases/src/features/builder/commands/check-consistency.ts
index 834f55945..c8a34a223 100644
--- a/packages/riviere-cli/src/features/builder/commands/check-consistency.ts
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/check-consistency.ts
@@ -1,10 +1,8 @@
-import { GraphCorruptedError } from '../../../platform/domain/graph-corrupted-error'
-import { GraphNotFoundError } from '../../../platform/domain/graph-not-found-error'
-import { RiviereBuilderRepository } from '../data-access/riviere-builder-repository'
+import { GraphCorruptedError } from '../data-access/riviere-builder/graph-corrupted-error'
+import { GraphNotFoundError } from '../data-access/riviere-builder/graph-not-found-error'
+import { RiviereBuilderRepository } from '../data-access/riviere-builder/riviere-builder-repository'
 import type { CheckConsistencyInput } from './check-consistency-input'
-import type {
-  CheckConsistencyErrorCode, CheckConsistencyResult 
-} from './check-consistency-result'
+import type { CheckConsistencyErrorCode, CheckConsistencyResult } from './check-consistency-result'
 
 /** @riviere-role command-use-case */
 export class CheckConsistency {
diff --git a/packages/riviere-cli/src/features/builder/commands/component-checklist-input.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/component-checklist-input.ts
similarity index 100%
rename from packages/riviere-cli/src/features/builder/commands/component-checklist-input.ts
rename to packages/riviere-builder/use-cases/src/features/builder/commands/component-checklist-input.ts
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/component-checklist-result.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/component-checklist-result.ts
new file mode 100644
index 000000000..580b405b4
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/component-checklist-result.ts
@@ -0,0 +1,23 @@
+/** @riviere-role command-use-case-result-value */
+export interface ChecklistComponent {
+  domain: string
+  id: string
+  name: string
+  type: string
+}
+
+/** @riviere-role command-use-case-result-value */
+export type ComponentChecklistErrorCode = 'GRAPH_CORRUPTED' | 'GRAPH_NOT_FOUND' | 'VALIDATION_ERROR'
+
+/** @riviere-role command-use-case-result */
+export type ComponentChecklistResult =
+  | {
+      components: ChecklistComponent[]
+      success: true
+      total: number
+    }
+  | {
+      code: ComponentChecklistErrorCode
+      message: string
+      success: false
+    }
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/component-checklist.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/component-checklist.ts
new file mode 100644
index 000000000..7500ec887
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/component-checklist.ts
@@ -0,0 +1,57 @@
+import { GraphCorruptedError } from '../data-access/riviere-builder/graph-corrupted-error'
+import { GraphNotFoundError } from '../data-access/riviere-builder/graph-not-found-error'
+import { ComponentType } from '@living-architecture/riviere-builder-domain-model/domain/component-type'
+import { RiviereBuilderRepository } from '../data-access/riviere-builder/riviere-builder-repository'
+import type { ComponentChecklistInput } from './component-checklist-input'
+import type {
+  ComponentChecklistErrorCode,
+  ComponentChecklistResult,
+} from './component-checklist-result'
+
+/** @riviere-role command-use-case */
+export class ComponentChecklist {
+  constructor(private readonly repository: RiviereBuilderRepository) {}
+
+  execute(input: ComponentChecklistInput): ComponentChecklistResult {
+    const componentType = input.type === undefined ? undefined : ComponentType.parse(input.type)
+    if (componentType !== undefined && !componentType.success) {
+      return failure('VALIDATION_ERROR', `Invalid component type: ${input.type}`)
+    }
+
+    try {
+      const builder = this.repository.load(input.graphPathOption)
+      const allComponents = builder.query().components()
+      const filteredComponents =
+        componentType === undefined
+          ? allComponents
+          : allComponents.filter((component) => component.type === componentType.data.value)
+      const components = filteredComponents.map((component) => ({
+        domain: component.domain,
+        id: component.id,
+        name: component.name,
+        type: component.type,
+      }))
+      return {
+        components,
+        success: true,
+        total: components.length,
+      }
+    } catch (error) {
+      if (error instanceof GraphNotFoundError) {
+        return failure('GRAPH_NOT_FOUND', error.message)
+      }
+      if (error instanceof GraphCorruptedError) {
+        return failure('GRAPH_CORRUPTED', 'Graph file contains invalid JSON')
+      }
+      throw error
+    }
+  }
+}
+
+function failure(code: ComponentChecklistErrorCode, message: string): ComponentChecklistResult {
+  return {
+    code,
+    message,
+    success: false,
+  }
+}
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/component-summary-input.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/component-summary-input.ts
new file mode 100644
index 000000000..744621a42
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/component-summary-input.ts
@@ -0,0 +1,4 @@
+/** @riviere-role command-use-case-input */
+export interface ComponentSummaryInput {
+  graphPathOption: string | undefined
+}
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/component-summary-result.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/component-summary-result.ts
new file mode 100644
index 000000000..a52eefdb9
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/component-summary-result.ts
@@ -0,0 +1,13 @@
+import type { RiviereBuilder } from '@living-architecture/riviere-builder-domain-model/domain/builder-facade'
+
+/** @riviere-role command-use-case-result-value */
+export type ComponentSummaryErrorCode = 'GRAPH_CORRUPTED' | 'GRAPH_NOT_FOUND'
+
+/** @riviere-role command-use-case-result */
+export type ComponentSummaryResult =
+  | ({ success: true } & ReturnType<RiviereBuilder['stats']>)
+  | {
+      code: ComponentSummaryErrorCode
+      message: string
+      success: false
+    }
diff --git a/packages/riviere-cli/src/features/builder/commands/component-summary.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/component-summary.ts
similarity index 77%
rename from packages/riviere-cli/src/features/builder/commands/component-summary.ts
rename to packages/riviere-builder/use-cases/src/features/builder/commands/component-summary.ts
index da20dda61..d5d5a3963 100644
--- a/packages/riviere-cli/src/features/builder/commands/component-summary.ts
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/component-summary.ts
@@ -1,10 +1,8 @@
-import { GraphCorruptedError } from '../../../platform/domain/graph-corrupted-error'
-import { GraphNotFoundError } from '../../../platform/domain/graph-not-found-error'
-import { RiviereBuilderRepository } from '../data-access/riviere-builder-repository'
+import { GraphCorruptedError } from '../data-access/riviere-builder/graph-corrupted-error'
+import { GraphNotFoundError } from '../data-access/riviere-builder/graph-not-found-error'
+import { RiviereBuilderRepository } from '../data-access/riviere-builder/riviere-builder-repository'
 import type { ComponentSummaryInput } from './component-summary-input'
-import type {
-  ComponentSummaryErrorCode, ComponentSummaryResult 
-} from './component-summary-result'
+import type { ComponentSummaryErrorCode, ComponentSummaryResult } from './component-summary-result'
 
 /** @riviere-role command-use-case */
 export class ComponentSummary {
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/define-custom-type-input.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/define-custom-type-input.ts
new file mode 100644
index 000000000..69a7322a1
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/define-custom-type-input.ts
@@ -0,0 +1,8 @@
+/** @riviere-role command-use-case-input */
+export interface DefineCustomTypeInput {
+  description: string | undefined
+  graphPathOption: string | undefined
+  name: string
+  optionalProperties: Record<string, { description?: string; type: string }>
+  requiredProperties: Record<string, { description?: string; type: string }>
+}
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/define-custom-type-result.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/define-custom-type-result.ts
new file mode 100644
index 000000000..35188a569
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/define-custom-type-result.ts
@@ -0,0 +1,19 @@
+import type { CustomPropertyDefinition } from '@living-architecture/riviere-schema-published-language/schema'
+
+/** @riviere-role command-use-case-result-value */
+export type DefineCustomTypeErrorCode = 'GRAPH_CORRUPTED' | 'GRAPH_NOT_FOUND' | 'VALIDATION_ERROR'
+
+/** @riviere-role command-use-case-result */
+export type DefineCustomTypeResult =
+  | {
+      description: string | undefined
+      name: string
+      optionalProperties: Record<string, CustomPropertyDefinition>
+      requiredProperties: Record<string, CustomPropertyDefinition>
+      success: true
+    }
+  | {
+      code: DefineCustomTypeErrorCode
+      message: string
+      success: false
+    }
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/define-custom-type.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/define-custom-type.ts
new file mode 100644
index 000000000..50322c393
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/define-custom-type.ts
@@ -0,0 +1,86 @@
+import { CustomTypeAlreadyDefinedError } from '@living-architecture/riviere-builder-domain-model/domain/construction/construction-errors'
+import { CustomPropertyType } from '@living-architecture/riviere-schema-published-language/custom-property-type'
+import type { CustomPropertyDefinition } from '@living-architecture/riviere-schema-published-language/schema'
+import { GraphCorruptedError } from '../data-access/riviere-builder/graph-corrupted-error'
+import { GraphNotFoundError } from '../data-access/riviere-builder/graph-not-found-error'
+import { RiviereBuilderRepository } from '../data-access/riviere-builder/riviere-builder-repository'
+import type { DefineCustomTypeInput } from './define-custom-type-input'
+import type { DefineCustomTypeErrorCode, DefineCustomTypeResult } from './define-custom-type-result'
+
+/** @riviere-role command-use-case */
+export class DefineCustomType {
+  constructor(private readonly repository: RiviereBuilderRepository) {}
+
+  execute(input: DefineCustomTypeInput): DefineCustomTypeResult {
+    const requiredProperties = parseProperties(input.requiredProperties)
+    if (!requiredProperties.success) return requiredProperties.result
+    const optionalProperties = parseProperties(input.optionalProperties)
+    if (!optionalProperties.success) return optionalProperties.result
+
+    try {
+      const builder = this.repository.load(input.graphPathOption)
+      builder.defineCustomType({
+        ...(input.description !== undefined && { description: input.description }),
+        name: input.name,
+        ...(Object.keys(optionalProperties.properties).length > 0
+          ? { optionalProperties: optionalProperties.properties }
+          : {}),
+        ...(Object.keys(requiredProperties.properties).length > 0
+          ? { requiredProperties: requiredProperties.properties }
+          : {}),
+      })
+      this.repository.save(builder)
+      return {
+        description: input.description,
+        name: input.name,
+        optionalProperties: optionalProperties.properties,
+        requiredProperties: requiredProperties.properties,
+        success: true,
+      }
+    } catch (error) {
+      if (error instanceof GraphNotFoundError) {
+        return failure('GRAPH_NOT_FOUND', error.message)
+      }
+      if (error instanceof GraphCorruptedError) {
+        return failure('GRAPH_CORRUPTED', 'Graph file contains invalid JSON')
+      }
+      if (error instanceof CustomTypeAlreadyDefinedError) {
+        return failure('VALIDATION_ERROR', error.message)
+      }
+      throw error
+    }
+  }
+}
+
+function parseProperties(
+  properties: Record<string, { description?: string; type: string }>,
+):
+  | { success: true; properties: Record<string, CustomPropertyDefinition> }
+  | { success: false; result: DefineCustomTypeResult } {
+  const parsedProperties: Record<string, CustomPropertyDefinition> = {}
+  for (const [name, definition] of Object.entries(properties)) {
+    const propertyType = CustomPropertyType.parse(definition.type)
+    if (!propertyType.success) {
+      return {
+        success: false,
+        result: failure(
+          'VALIDATION_ERROR',
+          `Invalid property type: "${definition.type}". Valid types: ${CustomPropertyType.names().join(', ')}`,
+        ),
+      }
+    }
+    parsedProperties[name] = {
+      ...(definition.description === undefined ? {} : { description: definition.description }),
+      type: propertyType.propertyType.name(),
+    }
+  }
+  return { success: true, properties: parsedProperties }
+}
+
+function failure(code: DefineCustomTypeErrorCode, message: string): DefineCustomTypeResult {
+  return {
+    code,
+    message,
+    success: false,
+  }
+}
diff --git a/packages/riviere-cli/src/features/builder/commands/define-relationship-type-input.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/define-relationship-type-input.ts
similarity index 100%
rename from packages/riviere-cli/src/features/builder/commands/define-relationship-type-input.ts
rename to packages/riviere-builder/use-cases/src/features/builder/commands/define-relationship-type-input.ts
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/define-relationship-type-result.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/define-relationship-type-result.ts
new file mode 100644
index 000000000..e964b051c
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/define-relationship-type-result.ts
@@ -0,0 +1,18 @@
+/** @riviere-role command-use-case-result-value */
+export type DefineRelationshipTypeErrorCode =
+  | 'GRAPH_CORRUPTED'
+  | 'GRAPH_NOT_FOUND'
+  | 'VALIDATION_ERROR'
+
+/** @riviere-role command-use-case-result */
+export type DefineRelationshipTypeResult =
+  | {
+      description: string
+      name: string
+      success: true
+    }
+  | {
+      code: DefineRelationshipTypeErrorCode
+      message: string
+      success: false
+    }
diff --git a/packages/riviere-cli/src/features/builder/commands/define-relationship-type.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/define-relationship-type.ts
similarity index 83%
rename from packages/riviere-cli/src/features/builder/commands/define-relationship-type.ts
rename to packages/riviere-builder/use-cases/src/features/builder/commands/define-relationship-type.ts
index 706847980..078968f9b 100644
--- a/packages/riviere-cli/src/features/builder/commands/define-relationship-type.ts
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/define-relationship-type.ts
@@ -1,7 +1,7 @@
-import { RelationshipTypeAlreadyDefinedError } from '@living-architecture/riviere-builder'
-import { GraphCorruptedError } from '../../../platform/domain/graph-corrupted-error'
-import { GraphNotFoundError } from '../../../platform/domain/graph-not-found-error'
-import { RiviereBuilderRepository } from '../data-access/riviere-builder-repository'
+import { RelationshipTypeAlreadyDefinedError } from '@living-architecture/riviere-builder-domain-model/domain/construction/construction-errors'
+import { GraphCorruptedError } from '../data-access/riviere-builder/graph-corrupted-error'
+import { GraphNotFoundError } from '../data-access/riviere-builder/graph-not-found-error'
+import { RiviereBuilderRepository } from '../data-access/riviere-builder/riviere-builder-repository'
 import type { DefineRelationshipTypeInput } from './define-relationship-type-input'
 import type {
   DefineRelationshipTypeErrorCode,
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/enrich-component-input.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/enrich-component-input.ts
new file mode 100644
index 000000000..831ecf67c
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/enrich-component-input.ts
@@ -0,0 +1,18 @@
+/** @riviere-role command-use-case-input */
+export interface EnrichComponentInput {
+  businessRules: string[]
+  entity: string | undefined
+  graphPathOption: string | undefined
+  id: string
+  modifies: string[]
+  emits: string[]
+  reads: string[]
+  signature:
+    | {
+        parameters?: Array<{ description?: string; name: string; type: string }>
+        returnType?: string
+      }
+    | undefined
+  stateChanges: Array<{ from: string; to: string }>
+  validates: string[]
+}
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/enrich-component-result.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/enrich-component-result.ts
new file mode 100644
index 000000000..165447ef6
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/enrich-component-result.ts
@@ -0,0 +1,19 @@
+/** @riviere-role command-use-case-result-value */
+export type EnrichComponentErrorCode =
+  | 'COMPONENT_NOT_FOUND'
+  | 'GRAPH_CORRUPTED'
+  | 'GRAPH_NOT_FOUND'
+  | 'INVALID_COMPONENT_TYPE'
+
+/** @riviere-role command-use-case-result */
+export type EnrichComponentResult =
+  | {
+      componentId: string
+      success: true
+    }
+  | {
+      code: EnrichComponentErrorCode
+      message: string
+      suggestions: string[]
+      success: false
+    }
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/enrich-component.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/enrich-component.ts
new file mode 100644
index 000000000..fd41d0173
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/enrich-component.ts
@@ -0,0 +1,80 @@
+import { ComponentNotFoundError } from '@living-architecture/riviere-builder-domain-model/domain/construction/construction-errors'
+import { InvalidEnrichmentTargetError } from '@living-architecture/riviere-builder-domain-model/domain/enrichment/enrichment-errors'
+import { GraphCorruptedError } from '../data-access/riviere-builder/graph-corrupted-error'
+import { GraphNotFoundError } from '../data-access/riviere-builder/graph-not-found-error'
+import { RiviereBuilderRepository } from '../data-access/riviere-builder/riviere-builder-repository'
+import type { EnrichComponentInput } from './enrich-component-input'
+import type { EnrichComponentErrorCode, EnrichComponentResult } from './enrich-component-result'
+
+/** @riviere-role command-use-case */
+export class EnrichComponent {
+  constructor(private readonly repository: RiviereBuilderRepository) {}
+
+  execute(input: EnrichComponentInput): EnrichComponentResult {
+    try {
+      const builder = this.repository.load(input.graphPathOption)
+      const enrichmentInput = {
+        ...buildBehavior(input),
+        ...(input.businessRules.length > 0 ? { businessRules: input.businessRules } : {}),
+        ...(input.stateChanges.length > 0 ? { stateChanges: input.stateChanges } : {}),
+        ...(input.entity === undefined ? {} : { entity: input.entity }),
+        ...(input.signature === undefined ? {} : { signature: input.signature }),
+      }
+      builder.enrichComponent(input.id, enrichmentInput)
+      this.repository.save(builder)
+      return {
+        componentId: input.id,
+        success: true,
+      }
+    } catch (error) {
+      if (error instanceof GraphNotFoundError) {
+        return failure('GRAPH_NOT_FOUND', error.message)
+      }
+      if (error instanceof GraphCorruptedError) {
+        return failure('GRAPH_CORRUPTED', 'Graph file contains invalid JSON')
+      }
+      if (error instanceof InvalidEnrichmentTargetError) {
+        return failure('INVALID_COMPONENT_TYPE', error.message)
+      }
+      if (error instanceof ComponentNotFoundError) {
+        return failure('COMPONENT_NOT_FOUND', error.message, error.suggestions)
+      }
+      throw error
+    }
+  }
+}
+
+function failure(
+  code: EnrichComponentErrorCode,
+  message: string,
+  suggestions: string[] = [],
+): EnrichComponentResult {
+  return {
+    code,
+    message,
+    suggestions,
+    success: false,
+  }
+}
+
+function buildBehavior(input: EnrichComponentInput): { behavior: object } | Record<string, never> {
+  const hasBehavior =
+    input.reads.length > 0 ||
+    input.validates.length > 0 ||
+    input.modifies.length > 0 ||
+    input.emits.length > 0
+
+  if (!hasBehavior) {
+    return {}
+  }
+
+  return {
+    behavior: {
+      ...(input.reads.length > 0 ? { reads: input.reads } : {}),
+      /* v8 ignore next -- symmetric conditional branch */
+      ...(input.validates.length > 0 ? { validates: input.validates } : {}),
+      ...(input.modifies.length > 0 ? { modifies: input.modifies } : {}),
+      ...(input.emits.length > 0 ? { emits: input.emits } : {}),
+    },
+  }
+}
diff --git a/packages/riviere-cli/src/features/builder/commands/error-coverage.spec.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/error-coverage.spec.ts
similarity index 82%
rename from packages/riviere-cli/src/features/builder/commands/error-coverage.spec.ts
rename to packages/riviere-builder/use-cases/src/features/builder/commands/error-coverage.spec.ts
index 3c6d2eda7..6512d3418 100644
--- a/packages/riviere-cli/src/features/builder/commands/error-coverage.spec.ts
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/error-coverage.spec.ts
@@ -1,19 +1,12 @@
-import {
-  mkdir, writeFile 
-} from 'node:fs/promises'
+import { mkdir, writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
-import type { ApiComponent } from '../domain/api-component-queries'
-import { RiviereBuilder } from '@living-architecture/riviere-builder'
-import {
-  afterEach, describe, expect, it, vi 
-} from 'vitest'
+import { RiviereBuilder } from '@living-architecture/riviere-builder-domain-model/domain/builder-facade'
+import { afterEach, describe, expect, it, vi } from 'vitest'
 import {
   type TestContext,
   createTestContext,
   setupCommandTest,
-} from '../../../platform/__fixtures__/command-test-fixtures'
-import * as addComponentDomain from '../../../platform/domain/add-component'
-import * as apiQueries from '../domain/api-component-queries'
+} from '../../../__fixtures__/command-test-fixtures'
 import { AddComponent } from './add-component'
 import { AddDomain } from './add-domain'
 import { AddSource } from './add-source'
@@ -26,7 +19,7 @@ import { LinkComponents } from './link-components'
 import { LinkExternal } from './link-external'
 import { LinkHttp } from './link-http'
 import { ValidateGraph } from './validate-graph'
-import { RiviereBuilderRepository } from '../data-access/riviere-builder-repository'
+import { RiviereBuilderRepository } from '../data-access/riviere-builder/riviere-builder-repository'
 
 class UnexpectedBuilderFailure extends Error {
   constructor(message: string) {
@@ -115,6 +108,23 @@ describe('builder command coverage', () => {
     })
   })
 
+  it('rethrows unexpected add-domain errors', () => {
+    const builder = createLoadedBuilder(ctx.testDir)
+    vi.spyOn(RiviereBuilderRepository.prototype, 'load').mockReturnValue(builder)
+    vi.spyOn(builder, 'addDomain').mockImplementation(() => {
+      throw new UnexpectedBuilderFailure('domain explode')
+    })
+
+    expect(() =>
+      new AddDomain(new RiviereBuilderRepository()).execute({
+        description: 'Payments',
+        graphPathOption: undefined,
+        name: 'payments',
+        systemType: 'domain',
+      }),
+    ).toThrow('domain explode')
+  })
+
   it('returns graph corrupted for define-relationship-type', async () => {
     const graphPath = await createInvalidGraphPath(ctx.testDir)
 
@@ -199,20 +209,22 @@ describe('builder command coverage', () => {
     ).toThrow('enrich explode')
     expect(() =>
       new LinkComponents(new RiviereBuilderRepository()).execute({
-        condition: undefined,
-        from: 'a',
+        from: 'orders:core:api:source',
         graphPathOption: undefined,
-        relationshipType: undefined,
-        sourceLocation: undefined,
-        to: 'b',
+        targetDomain: 'orders',
+        targetModule: 'core',
+        targetName: 'Place Order',
+        targetType: 'UseCase',
         type: undefined,
       }),
     ).toThrow('link explode')
     expect(() =>
       new LinkExternal(new RiviereBuilderRepository()).execute({
-        from: 'a',
+        from: 'orders:core:api:source',
         graphPathOption: undefined,
-        target: { name: 'Stripe' },
+        targetDomain: undefined,
+        targetName: 'Stripe',
+        targetUrl: undefined,
         type: undefined,
       }),
     ).toThrow('external explode')
@@ -227,7 +239,10 @@ describe('builder command coverage', () => {
         httpMethod: undefined,
         linkType: undefined,
         path: '/orders',
-        targetId: 'orders:core:usecase:place-order',
+        targetDomain: 'orders',
+        targetModule: 'core',
+        targetName: 'Place Order',
+        targetType: 'UseCase',
       }),
     ).toMatchObject({
       code: 'GRAPH_CORRUPTED',
@@ -238,34 +253,30 @@ describe('builder command coverage', () => {
   it('includes ambiguous suggestions in link-http results', () => {
     const builder = createLoadedBuilder(ctx.testDir)
     vi.spyOn(RiviereBuilderRepository.prototype, 'load').mockReturnValue(builder)
-    vi.spyOn(builder, 'build').mockReturnValue({
-      components: [],
-      links: [],
-      metadata: {
-        domains: {},
-        sources: [],
+    builder.addApi({
+      apiType: 'REST',
+      domain: 'orders',
+      httpMethod: 'POST',
+      module: 'core',
+      name: 'CreateOrder',
+      path: '/orders',
+      sourceLocation: {
+        filePath: 'src/create-order.ts',
+        repository: 'https://github.com/org/repo',
       },
-      version: '1.0',
     })
-    const matchingApis: ApiComponent[] = [
-      {
-        domain: 'orders',
-        httpMethod: 'POST',
-        id: 'api-a',
-        name: 'CreateOrder',
-        path: '/orders',
-        type: 'API',
-      },
-      {
-        domain: 'orders',
-        httpMethod: 'GET',
-        id: 'api-b',
-        name: 'ListOrders',
-        path: '/orders',
-        type: 'API',
+    builder.addApi({
+      apiType: 'REST',
+      domain: 'orders',
+      httpMethod: 'GET',
+      module: 'core',
+      name: 'ListOrders',
+      path: '/orders',
+      sourceLocation: {
+        filePath: 'src/list-orders.ts',
+        repository: 'https://github.com/org/repo',
       },
-    ]
-    vi.spyOn(apiQueries, 'findApisByPath').mockReturnValue(matchingApis)
+    })
 
     expect(
       new LinkHttp(new RiviereBuilderRepository()).execute({
@@ -273,7 +284,10 @@ describe('builder command coverage', () => {
         httpMethod: undefined,
         linkType: undefined,
         path: '/orders',
-        targetId: 'orders:core:usecase:place-order',
+        targetDomain: 'orders',
+        targetModule: 'core',
+        targetName: 'Place Order',
+        targetType: 'UseCase',
       }),
     ).toMatchObject({
       code: 'AMBIGUOUS_API_MATCH',
@@ -285,7 +299,7 @@ describe('builder command coverage', () => {
   it('maps generic Error in add-component', () => {
     const builder = createLoadedBuilder(ctx.testDir)
     vi.spyOn(RiviereBuilderRepository.prototype, 'load').mockReturnValue(builder)
-    vi.spyOn(addComponentDomain, 'addComponentToBuilder').mockImplementation(() => {
+    vi.spyOn(builder, 'addUI').mockImplementation(() => {
       throw new UnexpectedBuilderFailure('builder exploded')
     })
 
@@ -309,7 +323,7 @@ describe('builder command coverage', () => {
   it('rethrows non-Error values in add-component', () => {
     const builder = createLoadedBuilder(ctx.testDir)
     vi.spyOn(RiviereBuilderRepository.prototype, 'load').mockReturnValue(builder)
-    vi.spyOn(addComponentDomain, 'addComponentToBuilder').mockImplementation(() => {
+    vi.spyOn(builder, 'addUI').mockImplementation(() => {
       throw 'boom'
     })
 
@@ -363,7 +377,10 @@ describe('builder command coverage', () => {
         httpMethod: undefined,
         linkType: undefined,
         path: '/orders',
-        targetId: 'orders:core:usecase:place-order',
+        targetDomain: 'orders',
+        targetModule: 'core',
+        targetName: 'Place Order',
+        targetType: 'UseCase',
       }),
     ).toThrow('unexpected load failure')
   })
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/finalize-graph-input.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/finalize-graph-input.ts
new file mode 100644
index 000000000..1caa1c741
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/finalize-graph-input.ts
@@ -0,0 +1,4 @@
+/** @riviere-role command-use-case-input */
+export interface FinalizeGraphInput {
+  graphPathOption: string | undefined
+}
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/finalize-graph-result.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/finalize-graph-result.ts
new file mode 100644
index 000000000..f96385894
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/finalize-graph-result.ts
@@ -0,0 +1,19 @@
+import type { RiviereGraph } from '@living-architecture/riviere-schema-published-language/schema'
+
+/** @riviere-role command-use-case-result-value */
+export type FinalizeGraphErrorCode = 'GRAPH_CORRUPTED' | 'GRAPH_NOT_FOUND' | 'VALIDATION_ERROR'
+
+/** @riviere-role command-use-case-result-value */
+export type FinalizedGraph = RiviereGraph
+
+/** @riviere-role command-use-case-result */
+export type FinalizeGraphResult =
+  | {
+      finalGraph: FinalizedGraph
+      success: true
+    }
+  | {
+      code: FinalizeGraphErrorCode
+      message: string
+      success: false
+    }
diff --git a/packages/riviere-cli/src/features/builder/commands/finalize-graph.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/finalize-graph.ts
similarity index 79%
rename from packages/riviere-cli/src/features/builder/commands/finalize-graph.ts
rename to packages/riviere-builder/use-cases/src/features/builder/commands/finalize-graph.ts
index dbb8e1a29..85f73a927 100644
--- a/packages/riviere-cli/src/features/builder/commands/finalize-graph.ts
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/finalize-graph.ts
@@ -1,10 +1,8 @@
-import { GraphCorruptedError } from '../../../platform/domain/graph-corrupted-error'
-import { GraphNotFoundError } from '../../../platform/domain/graph-not-found-error'
-import { RiviereBuilderRepository } from '../data-access/riviere-builder-repository'
+import { GraphCorruptedError } from '../data-access/riviere-builder/graph-corrupted-error'
+import { GraphNotFoundError } from '../data-access/riviere-builder/graph-not-found-error'
+import { RiviereBuilderRepository } from '../data-access/riviere-builder/riviere-builder-repository'
 import type { FinalizeGraphInput } from './finalize-graph-input'
-import type {
-  FinalizeGraphErrorCode, FinalizeGraphResult 
-} from './finalize-graph-result'
+import type { FinalizeGraphErrorCode, FinalizeGraphResult } from './finalize-graph-result'
 
 /** @riviere-role command-use-case */
 export class FinalizeGraph {
diff --git a/packages/riviere-cli/src/features/builder/commands/init-graph-input.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/init-graph-input.ts
similarity index 76%
rename from packages/riviere-cli/src/features/builder/commands/init-graph-input.ts
rename to packages/riviere-builder/use-cases/src/features/builder/commands/init-graph-input.ts
index fe3a38886..f99c1de96 100644
--- a/packages/riviere-cli/src/features/builder/commands/init-graph-input.ts
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/init-graph-input.ts
@@ -1,10 +1,8 @@
-import type { SystemType } from '@living-architecture/riviere-schema'
-
 /** @riviere-role command-use-case-input */
 export interface InitDomainInput {
   description: string
   name: string
-  systemType: SystemType
+  systemType: string
 }
 
 /** @riviere-role command-use-case-input */
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/init-graph-result.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/init-graph-result.ts
new file mode 100644
index 000000000..13641be3f
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/init-graph-result.ts
@@ -0,0 +1,17 @@
+/** @riviere-role command-use-case-result-value */
+export type InitGraphErrorCode = 'GRAPH_EXISTS' | 'VALIDATION_ERROR'
+
+/** @riviere-role command-use-case-result */
+export type InitGraphResult =
+  | {
+      domains: string[]
+      path: string
+      sources: number
+      success: true
+    }
+  | {
+      code: InitGraphErrorCode
+      message: string
+      path?: string
+      success: false
+    }
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/init-graph.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/init-graph.ts
new file mode 100644
index 000000000..29083a0ef
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/init-graph.ts
@@ -0,0 +1,77 @@
+import { RiviereBuilder } from '@living-architecture/riviere-builder-domain-model/domain/builder-facade'
+import { GraphCorruptedError } from '../data-access/riviere-builder/graph-corrupted-error'
+import { GraphNotFoundError } from '../data-access/riviere-builder/graph-not-found-error'
+import { RiviereBuilderRepository } from '../data-access/riviere-builder/riviere-builder-repository'
+import { SystemType } from '@living-architecture/riviere-builder-domain-model/domain/system-type'
+import type { InitGraphInput } from './init-graph-input'
+import type { InitGraphResult } from './init-graph-result'
+
+/** @riviere-role command-use-case */
+export class InitGraph {
+  constructor(private readonly repository: RiviereBuilderRepository) {}
+
+  execute(input: InitGraphInput): InitGraphResult {
+    const parsedDomains: {
+      domain: InitGraphInput['domains'][number]
+      systemType: SystemType
+    }[] = []
+    for (const domain of input.domains) {
+      const systemType = SystemType.parse(domain.systemType)
+      if (!systemType.success) {
+        return {
+          code: 'VALIDATION_ERROR',
+          message: `Invalid system type: ${domain.systemType}`,
+          success: false,
+        }
+      }
+      parsedDomains.push({
+        domain,
+        systemType: systemType.data,
+      })
+    }
+
+    const builderOptions = {
+      ...(input.name === undefined ? {} : { name: input.name }),
+      domains: Object.fromEntries(
+        parsedDomains.map(({ domain, systemType }) => [
+          domain.name,
+          {
+            description: domain.description,
+            systemType: systemType.value,
+          },
+        ]),
+      ),
+      sources: input.sources.map((repositoryUrl) => ({ repository: repositoryUrl })),
+    }
+
+    try {
+      const builder = this.repository.load(input.graphPathOption)
+      return {
+        code: 'GRAPH_EXISTS',
+        message: `Graph already exists at ${builder.graphPath}`,
+        path: builder.graphPath,
+        success: false,
+      }
+    } catch (error) {
+      if (error instanceof GraphNotFoundError) {
+        const newBuilder = RiviereBuilder.new(builderOptions, error.graphPath)
+        this.repository.save(newBuilder)
+        return {
+          domains: input.domains.map((domain) => domain.name),
+          path: newBuilder.graphPath,
+          sources: input.sources.length,
+          success: true,
+        }
+      }
+      if (error instanceof GraphCorruptedError) {
+        return {
+          code: 'GRAPH_EXISTS',
+          message: `Graph already exists at ${error.graphPath}`,
+          path: error.graphPath,
+          success: false,
+        }
+      }
+      throw error
+    }
+  }
+}
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/link-components-input.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/link-components-input.ts
new file mode 100644
index 000000000..bf5189631
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/link-components-input.ts
@@ -0,0 +1,18 @@
+/** @riviere-role command-use-case-input */
+export interface LinkComponentsInput {
+  condition?: string
+  from: string
+  graphPathOption: string | undefined
+  relationshipType?: string
+  sourceLocation?: {
+    repository: string
+    filePath: string
+    lineNumber?: number
+    columnNumber?: number
+  }
+  targetDomain: string
+  targetModule: string
+  targetName: string
+  targetType: string
+  type: string | undefined
+}
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/link-components-result.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/link-components-result.ts
new file mode 100644
index 000000000..376c4df2e
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/link-components-result.ts
@@ -0,0 +1,21 @@
+import type { Link } from '@living-architecture/riviere-schema-published-language/schema'
+
+/** @riviere-role command-use-case-result-value */
+export type LinkComponentsErrorCode =
+  | 'COMPONENT_NOT_FOUND'
+  | 'GRAPH_CORRUPTED'
+  | 'GRAPH_NOT_FOUND'
+  | 'VALIDATION_ERROR'
+
+/** @riviere-role command-use-case-result */
+export type LinkComponentsResult =
+  | {
+      link: Link
+      success: true
+    }
+  | {
+      code: LinkComponentsErrorCode
+      message: string
+      suggestions: string[]
+      success: false
+    }
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/link-components.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/link-components.ts
new file mode 100644
index 000000000..9359d3c5c
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/link-components.ts
@@ -0,0 +1,128 @@
+import {
+  ComponentNotFoundError,
+  DuplicateLinkError,
+  RelationshipTypeNotFoundError,
+} from '@living-architecture/riviere-builder-domain-model/domain/construction/construction-errors'
+import { ComponentId } from '@living-architecture/riviere-schema-published-language/component-id'
+import { GraphCorruptedError } from '../data-access/riviere-builder/graph-corrupted-error'
+import { GraphNotFoundError } from '../data-access/riviere-builder/graph-not-found-error'
+import { RiviereBuilderRepository } from '../data-access/riviere-builder/riviere-builder-repository'
+import { LinkType } from '@living-architecture/riviere-builder-domain-model/domain/link-type'
+import { ComponentType } from '@living-architecture/riviere-builder-domain-model/domain/component-type'
+import type { LinkComponentsInput } from './link-components-input'
+import type { LinkComponentsErrorCode, LinkComponentsResult } from './link-components-result'
+
+/** @riviere-role command-use-case */
+export class LinkComponents {
+  constructor(private readonly repository: RiviereBuilderRepository) {}
+
+  execute(input: LinkComponentsInput): LinkComponentsResult {
+    const parsedInput = parseInput(input)
+    if (!parsedInput.success) return parsedInput.result
+
+    try {
+      const builder = this.repository.load(input.graphPathOption)
+      const linkInput: {
+        from: string
+        to: string
+        type?: 'sync' | 'async'
+        relationshipType?: string
+        condition?: string
+        sourceLocation?: NonNullable<LinkComponentsInput['sourceLocation']>
+      } = {
+        from: parsedInput.sourceId.toString(),
+        to: ComponentId.parseFromParts({
+          domain: input.targetDomain,
+          module: input.targetModule,
+          name: input.targetName,
+          type: parsedInput.componentType.componentIdValue,
+        }).toString(),
+      }
+      if (parsedInput.linkType !== undefined) {
+        linkInput.type = parsedInput.linkType.value
+      }
+      if (input.relationshipType !== undefined) {
+        linkInput.relationshipType = input.relationshipType
+      }
+      if (input.condition !== undefined) {
+        linkInput.condition = input.condition
+      }
+      if (input.sourceLocation !== undefined) {
+        linkInput.sourceLocation = input.sourceLocation
+      }
+      const link = builder.link(linkInput)
+      this.repository.save(builder)
+      return {
+        link,
+        success: true,
+      }
+    } catch (error) {
+      if (error instanceof GraphNotFoundError) {
+        return failure('GRAPH_NOT_FOUND', error.message)
+      }
+      if (error instanceof GraphCorruptedError) {
+        return failure('GRAPH_CORRUPTED', 'Graph file contains invalid JSON')
+      }
+      if (error instanceof ComponentNotFoundError) {
+        return failure('COMPONENT_NOT_FOUND', error.message, error.suggestions)
+      }
+      if (error instanceof DuplicateLinkError || error instanceof RelationshipTypeNotFoundError) {
+        return failure('VALIDATION_ERROR', error.message)
+      }
+      throw error
+    }
+  }
+}
+
+function parseInput(input: LinkComponentsInput):
+  | {
+      success: false
+      result: LinkComponentsResult
+    }
+  | {
+      success: true
+      componentType: ComponentType
+      linkType: LinkType | undefined
+      sourceId: ComponentId
+    } {
+  const sourceId = ComponentId.parse(input.from)
+  if (!sourceId.success) {
+    return {
+      result: failure('VALIDATION_ERROR', sourceId.message),
+      success: false,
+    }
+  }
+  const componentType = ComponentType.parse(input.targetType)
+  if (!componentType.success) {
+    return {
+      result: failure('VALIDATION_ERROR', `Invalid component type: ${input.targetType}`),
+      success: false,
+    }
+  }
+  const linkType = input.type === undefined ? undefined : LinkType.parse(input.type)
+  if (linkType !== undefined && !linkType.success) {
+    return {
+      result: failure('VALIDATION_ERROR', `Invalid link type: ${input.type}`),
+      success: false,
+    }
+  }
+  return {
+    componentType: componentType.data,
+    linkType: linkType?.data,
+    sourceId: sourceId.componentId,
+    success: true,
+  }
+}
+
+function failure(
+  code: LinkComponentsErrorCode,
+  message: string,
+  suggestions: string[] = [],
+): LinkComponentsResult {
+  return {
+    code,
+    message,
+    suggestions,
+    success: false,
+  }
+}
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/link-external-input.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/link-external-input.ts
new file mode 100644
index 000000000..7f3c49fd6
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/link-external-input.ts
@@ -0,0 +1,9 @@
+/** @riviere-role command-use-case-input */
+export interface LinkExternalInput {
+  from: string
+  graphPathOption: string | undefined
+  targetDomain: string | undefined
+  targetName: string
+  targetUrl: string | undefined
+  type: string | undefined
+}
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/link-external-result.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/link-external-result.ts
new file mode 100644
index 000000000..9474b612d
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/link-external-result.ts
@@ -0,0 +1,21 @@
+import type { ExternalLink } from '@living-architecture/riviere-schema-published-language/schema'
+
+/** @riviere-role command-use-case-result-value */
+export type LinkExternalErrorCode =
+  | 'COMPONENT_NOT_FOUND'
+  | 'GRAPH_CORRUPTED'
+  | 'GRAPH_NOT_FOUND'
+  | 'VALIDATION_ERROR'
+
+/** @riviere-role command-use-case-result */
+export type LinkExternalResult =
+  | {
+      externalLink: ExternalLink
+      success: true
+    }
+  | {
+      code: LinkExternalErrorCode
+      message: string
+      suggestions: string[]
+      success: false
+    }
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/link-external.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/link-external.ts
new file mode 100644
index 000000000..a21a1e78f
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/link-external.ts
@@ -0,0 +1,86 @@
+import { ComponentNotFoundError } from '@living-architecture/riviere-builder-domain-model/domain/construction/construction-errors'
+import { ComponentId } from '@living-architecture/riviere-schema-published-language/component-id'
+import { GraphCorruptedError } from '../data-access/riviere-builder/graph-corrupted-error'
+import { GraphNotFoundError } from '../data-access/riviere-builder/graph-not-found-error'
+import { RiviereBuilderRepository } from '../data-access/riviere-builder/riviere-builder-repository'
+import { LinkType } from '@living-architecture/riviere-builder-domain-model/domain/link-type'
+import type { LinkExternalInput } from './link-external-input'
+import type { LinkExternalErrorCode, LinkExternalResult } from './link-external-result'
+
+/** @riviere-role command-use-case */
+export class LinkExternal {
+  constructor(private readonly repository: RiviereBuilderRepository) {}
+
+  execute(input: LinkExternalInput): LinkExternalResult {
+    const parsedInput = parseInput(input)
+    if (!parsedInput.success) return parsedInput.result
+
+    try {
+      const builder = this.repository.load(input.graphPathOption)
+      const externalLinkInput = {
+        from: parsedInput.sourceId.toString(),
+        target: {
+          ...(input.targetDomain === undefined ? {} : { domain: input.targetDomain }),
+          name: input.targetName,
+          ...(input.targetUrl === undefined ? {} : { url: input.targetUrl }),
+        },
+        ...(parsedInput.linkType === undefined ? {} : { type: parsedInput.linkType.value }),
+      }
+      const externalLink = builder.linkExternal(externalLinkInput)
+      this.repository.save(builder)
+      return {
+        externalLink,
+        success: true,
+      }
+    } catch (error) {
+      if (error instanceof GraphNotFoundError) {
+        return failure('GRAPH_NOT_FOUND', error.message)
+      }
+      if (error instanceof GraphCorruptedError) {
+        return failure('GRAPH_CORRUPTED', 'Graph file contains invalid JSON')
+      }
+      if (error instanceof ComponentNotFoundError) {
+        return failure('COMPONENT_NOT_FOUND', error.message, error.suggestions)
+      }
+      throw error
+    }
+  }
+}
+
+function parseInput(
+  input: LinkExternalInput,
+):
+  | { success: false; result: LinkExternalResult }
+  | { success: true; sourceId: ComponentId; linkType: LinkType | undefined } {
+  const sourceId = ComponentId.parse(input.from)
+  if (!sourceId.success) {
+    return { result: failure('VALIDATION_ERROR', sourceId.message), success: false }
+  }
+
+  const linkType = input.type === undefined ? undefined : LinkType.parse(input.type)
+  if (linkType !== undefined && !linkType.success) {
+    return {
+      result: failure('VALIDATION_ERROR', `Invalid link type: ${input.type}`),
+      success: false,
+    }
+  }
+
+  return {
+    linkType: linkType?.data,
+    sourceId: sourceId.componentId,
+    success: true,
+  }
+}
+
+function failure(
+  code: LinkExternalErrorCode,
+  message: string,
+  suggestions: string[] = [],
+): LinkExternalResult {
+  return {
+    code,
+    message,
+    suggestions,
+    success: false,
+  }
+}
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/link-http-input.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/link-http-input.ts
new file mode 100644
index 000000000..6cf01c775
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/link-http-input.ts
@@ -0,0 +1,11 @@
+/** @riviere-role command-use-case-input */
+export interface LinkHttpInput {
+  graphPathOption: string | undefined
+  httpMethod: string | undefined
+  linkType: string | undefined
+  path: string
+  targetDomain: string
+  targetModule: string
+  targetName: string
+  targetType: string
+}
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/link-http-result.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/link-http-result.ts
new file mode 100644
index 000000000..d13e02831
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/link-http-result.ts
@@ -0,0 +1,30 @@
+import type { Link } from '@living-architecture/riviere-schema-published-language/schema'
+
+/** @riviere-role command-use-case-result-value */
+export interface MatchedApi {
+  id: string
+  method: string | undefined
+  path: string
+}
+
+/** @riviere-role command-use-case-result-value */
+export type LinkHttpErrorCode =
+  | 'AMBIGUOUS_API_MATCH'
+  | 'COMPONENT_NOT_FOUND'
+  | 'GRAPH_CORRUPTED'
+  | 'GRAPH_NOT_FOUND'
+  | 'VALIDATION_ERROR'
+
+/** @riviere-role command-use-case-result */
+export type LinkHttpResult =
+  | {
+      link: Link
+      matchedApi: MatchedApi
+      success: true
+    }
+  | {
+      code: LinkHttpErrorCode
+      message: string
+      suggestions: string[]
+      success: false
+    }
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/link-http.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/link-http.ts
new file mode 100644
index 000000000..328237017
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/link-http.ts
@@ -0,0 +1,162 @@
+import { ComponentId } from '@living-architecture/riviere-schema-published-language/component-id'
+import type {
+  APIComponent,
+  Component,
+  HttpMethod as PublishedHttpMethod,
+  RiviereGraph,
+} from '@living-architecture/riviere-schema-published-language/schema'
+import { GraphCorruptedError } from '../data-access/riviere-builder/graph-corrupted-error'
+import { GraphNotFoundError } from '../data-access/riviere-builder/graph-not-found-error'
+import { ComponentType } from '@living-architecture/riviere-builder-domain-model/domain/component-type'
+import { RiviereBuilderRepository } from '../data-access/riviere-builder/riviere-builder-repository'
+import { HttpMethod } from '@living-architecture/riviere-builder-domain-model/domain/http-method'
+import { LinkType } from '@living-architecture/riviere-builder-domain-model/domain/link-type'
+import type { LinkHttpInput } from './link-http-input'
+import type { LinkHttpErrorCode, LinkHttpResult } from './link-http-result'
+
+/** @riviere-role command-use-case */
+export class LinkHttp {
+  constructor(private readonly repository: RiviereBuilderRepository) {}
+
+  execute(input: LinkHttpInput): LinkHttpResult {
+    const parsedInput = parseInput(input)
+    if (!parsedInput.success) return parsedInput.result
+
+    try {
+      const builder = this.repository.load(input.graphPathOption)
+      const graph = builder.build()
+      const matchingApis = findApisByPath(graph, input.path, parsedInput.httpMethod?.value)
+      const [matchedApi, ...otherApis] = matchingApis
+
+      if (matchedApi === undefined) {
+        return failure(
+          'COMPONENT_NOT_FOUND',
+          `No API found for path ${input.path}`,
+          getAllApiPaths(graph),
+        )
+      }
+
+      if (otherApis.length > 0) {
+        return failure(
+          'AMBIGUOUS_API_MATCH',
+          `Multiple APIs matched path ${input.path}`,
+          /* v8 ignore next -- defensive ANY fallback for malformed API metadata */
+          matchingApis.map((api) => `${api.httpMethod ?? 'ANY'} ${api.path}`),
+        )
+      }
+
+      const linkInput: {
+        from: string
+        to: string
+        type?: 'sync' | 'async'
+      } = {
+        from: matchedApi.id,
+        to: ComponentId.parseFromParts({
+          domain: input.targetDomain,
+          module: input.targetModule,
+          name: input.targetName,
+          type: parsedInput.componentType.componentIdValue,
+        }).toString(),
+      }
+      if (parsedInput.linkType !== undefined) {
+        linkInput.type = parsedInput.linkType.value
+      }
+
+      const link = builder.link(linkInput)
+      this.repository.save(builder)
+
+      return {
+        link,
+        matchedApi: {
+          id: matchedApi.id,
+          method: matchedApi.httpMethod,
+          path: matchedApi.path,
+        },
+        success: true,
+      }
+    } catch (error) {
+      if (error instanceof GraphNotFoundError) {
+        return failure('GRAPH_NOT_FOUND', error.message)
+      }
+      if (error instanceof GraphCorruptedError) {
+        return failure('GRAPH_CORRUPTED', 'Graph file contains invalid JSON')
+      }
+      throw error
+    }
+  }
+}
+
+type RestApiWithPath = APIComponent & Required<Pick<APIComponent, 'httpMethod' | 'path'>>
+
+function isRestApiWithPath(component: Component): component is RestApiWithPath {
+  return component.type === 'API' && 'path' in component && 'httpMethod' in component
+}
+
+function findApisByPath(
+  graph: RiviereGraph,
+  path: string,
+  method?: PublishedHttpMethod,
+): RestApiWithPath[] {
+  const matchingPath = graph.components.filter(isRestApiWithPath).filter((api) => api.path === path)
+  return method === undefined
+    ? matchingPath
+    : matchingPath.filter((api) => api.httpMethod === method)
+}
+
+function getAllApiPaths(graph: RiviereGraph): string[] {
+  return [...new Set(graph.components.filter(isRestApiWithPath).map((api) => api.path))]
+}
+
+function parseInput(input: LinkHttpInput):
+  | {
+      success: false
+      result: LinkHttpResult
+    }
+  | {
+      success: true
+      componentType: ComponentType
+      httpMethod: HttpMethod | undefined
+      linkType: LinkType | undefined
+    } {
+  const componentType = ComponentType.parse(input.targetType)
+  if (!componentType.success) {
+    return invalidInput(`Invalid component type: ${input.targetType}`)
+  }
+  const httpMethod = input.httpMethod === undefined ? undefined : HttpMethod.parse(input.httpMethod)
+  if (httpMethod !== undefined && !httpMethod.success) {
+    return invalidInput(`Invalid HTTP method: ${input.httpMethod}`)
+  }
+  const linkType = input.linkType === undefined ? undefined : LinkType.parse(input.linkType)
+  if (linkType !== undefined && !linkType.success) {
+    return invalidInput(`Invalid link type: ${input.linkType}`)
+  }
+  return {
+    componentType: componentType.data,
+    httpMethod: httpMethod?.data,
+    linkType: linkType?.data,
+    success: true,
+  }
+}
+
+function invalidInput(message: string): {
+  success: false
+  result: LinkHttpResult
+} {
+  return {
+    result: failure('VALIDATION_ERROR', message),
+    success: false,
+  }
+}
+
+function failure(
+  code: LinkHttpErrorCode,
+  message: string,
+  suggestions: string[] = [],
+): LinkHttpResult {
+  return {
+    code,
+    message,
+    suggestions,
+    success: false,
+  }
+}
diff --git a/packages/riviere-cli/src/features/builder/commands/more-command-coverage.spec.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/more-command-coverage.spec.ts
similarity index 85%
rename from packages/riviere-cli/src/features/builder/commands/more-command-coverage.spec.ts
rename to packages/riviere-builder/use-cases/src/features/builder/commands/more-command-coverage.spec.ts
index 910012873..cb8a6f2cd 100644
--- a/packages/riviere-cli/src/features/builder/commands/more-command-coverage.spec.ts
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/more-command-coverage.spec.ts
@@ -1,16 +1,12 @@
-import {
-  mkdir, writeFile 
-} from 'node:fs/promises'
+import { mkdir, writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
-import {
-  describe, expect, it, vi 
-} from 'vitest'
-import { RiviereBuilder } from '@living-architecture/riviere-builder'
+import { describe, expect, it, vi } from 'vitest'
+import { RiviereBuilder } from '@living-architecture/riviere-builder-domain-model/domain/builder-facade'
 import {
   type TestContext,
   createTestContext,
   setupCommandTest,
-} from '../../../platform/__fixtures__/command-test-fixtures'
+} from '../../../__fixtures__/command-test-fixtures'
 import { ComponentChecklist } from './component-checklist'
 import { DefineCustomType } from './define-custom-type'
 import { EnrichComponent } from './enrich-component'
@@ -18,7 +14,7 @@ import { FinalizeGraph } from './finalize-graph'
 import { InitGraph } from './init-graph'
 import { LinkComponents } from './link-components'
 import { LinkExternal } from './link-external'
-import { RiviereBuilderRepository } from '../data-access/riviere-builder-repository'
+import { RiviereBuilderRepository } from '../data-access/riviere-builder/riviere-builder-repository'
 
 class UnexpectedError extends Error {
   constructor(message: string) {
@@ -64,23 +60,27 @@ describe('additional builder command coverage', () => {
         type: undefined,
       }),
     ).toMatchObject({ code: 'GRAPH_CORRUPTED' })
-    expect(new FinalizeGraph(repo).execute({ graphPathOption: graphPath })).toMatchObject({code: 'GRAPH_CORRUPTED',})
+    expect(new FinalizeGraph(repo).execute({ graphPathOption: graphPath })).toMatchObject({
+      code: 'GRAPH_CORRUPTED',
+    })
     expect(
       new LinkComponents(repo).execute({
-        condition: undefined,
-        from: 'a',
+        from: 'orders:core:api:source',
         graphPathOption: graphPath,
-        relationshipType: undefined,
-        sourceLocation: undefined,
-        to: 'b',
+        targetDomain: 'orders',
+        targetModule: 'core',
+        targetName: 'Place Order',
+        targetType: 'UseCase',
         type: undefined,
       }),
     ).toMatchObject({ code: 'GRAPH_CORRUPTED' })
     expect(
       new LinkExternal(repo).execute({
-        from: 'a',
+        from: 'orders:core:api:source',
         graphPathOption: graphPath,
-        target: { name: 'Stripe' },
+        targetDomain: undefined,
+        targetName: 'Stripe',
+        targetUrl: undefined,
         type: undefined,
       }),
     ).toMatchObject({ code: 'GRAPH_CORRUPTED' })
@@ -105,6 +105,21 @@ describe('additional builder command coverage', () => {
     })
   })
 
+  it('rejects an invalid optional custom property type', () => {
+    expect(
+      new DefineCustomType(new RiviereBuilderRepository()).execute({
+        description: undefined,
+        graphPathOption: undefined,
+        name: 'Queue',
+        optionalProperties: { retries: { type: 'not-a-property-type' } },
+        requiredProperties: {},
+      }),
+    ).toMatchObject({
+      code: 'VALIDATION_ERROR',
+      success: false,
+    })
+  })
+
   it('returns validation errors for duplicate Links and undefined relationship types', () => {
     const builder = createBuilder(ctx.testDir)
     const source = builder.addUseCase({
@@ -119,14 +134,14 @@ describe('additional builder command coverage', () => {
     vi.spyOn(RiviereBuilderRepository.prototype, 'load').mockReturnValue(builder)
     const command = new LinkComponents(new RiviereBuilderRepository())
     const input = {
-      condition: undefined,
       from: source.id,
       graphPathOption: undefined,
-      relationshipType: undefined,
-      sourceLocation: undefined,
-      to: source.id,
+      targetDomain: 'orders',
+      targetModule: 'checkout',
+      targetName: 'Create Order',
+      targetType: 'UseCase',
       type: undefined,
-    }
+    } satisfies import('./link-components-input').LinkComponentsInput
 
     expect(command.execute(input)).toMatchObject({ success: true })
     expect(command.execute(input)).toMatchObject({
@@ -204,7 +219,9 @@ describe('additional builder command coverage', () => {
       validates: [],
     })
 
-    expect(enrichSpy).toHaveBeenCalledWith('orders:checkout:domainop:place-order', {behavior: { reads: ['order.items'] },})
+    expect(enrichSpy).toHaveBeenCalledWith('orders:checkout:domainop:place-order', {
+      behavior: { reads: ['order.items'] },
+    })
   })
 
   it('includes validates in enrichment behavior', () => {
@@ -225,7 +242,9 @@ describe('additional builder command coverage', () => {
       validates: ['order.total'],
     })
 
-    expect(enrichSpy).toHaveBeenCalledWith('orders:checkout:domainop:place-order', {behavior: { validates: ['order.total'] },})
+    expect(enrichSpy).toHaveBeenCalledWith('orders:checkout:domainop:place-order', {
+      behavior: { validates: ['order.total'] },
+    })
   })
 
   it('returns graph corrupted for define-custom-type and enrich-component', async () => {
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/validate-graph-input.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/validate-graph-input.ts
new file mode 100644
index 000000000..ad8fc175e
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/validate-graph-input.ts
@@ -0,0 +1,4 @@
+/** @riviere-role command-use-case-input */
+export interface ValidateGraphInput {
+  graphPathOption: string | undefined
+}
diff --git a/packages/riviere-builder/use-cases/src/features/builder/commands/validate-graph-result.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/validate-graph-result.ts
new file mode 100644
index 000000000..f94b76cb5
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/validate-graph-result.ts
@@ -0,0 +1,21 @@
+import type { RiviereBuilder } from '@living-architecture/riviere-builder-domain-model/domain/builder-facade'
+
+/** @riviere-role command-use-case-result-value */
+export type ValidationData = ReturnType<RiviereBuilder['validate']>
+
+/** @riviere-role command-use-case-result-value */
+export type ValidateGraphErrorCode = 'GRAPH_CORRUPTED' | 'GRAPH_NOT_FOUND'
+
+/** @riviere-role command-use-case-result */
+export type ValidateGraphResult =
+  | {
+      errors: ValidationData['errors']
+      success: true
+      valid: boolean
+      warnings: ReturnType<RiviereBuilder['warnings']>
+    }
+  | {
+      code: ValidateGraphErrorCode
+      message: string
+      success: false
+    }
diff --git a/packages/riviere-cli/src/features/builder/commands/validate-graph.ts b/packages/riviere-builder/use-cases/src/features/builder/commands/validate-graph.ts
similarity index 77%
rename from packages/riviere-cli/src/features/builder/commands/validate-graph.ts
rename to packages/riviere-builder/use-cases/src/features/builder/commands/validate-graph.ts
index 0d163917f..c78456804 100644
--- a/packages/riviere-cli/src/features/builder/commands/validate-graph.ts
+++ b/packages/riviere-builder/use-cases/src/features/builder/commands/validate-graph.ts
@@ -1,10 +1,8 @@
-import { GraphCorruptedError } from '../../../platform/domain/graph-corrupted-error'
-import { GraphNotFoundError } from '../../../platform/domain/graph-not-found-error'
-import { RiviereBuilderRepository } from '../data-access/riviere-builder-repository'
+import { GraphCorruptedError } from '../data-access/riviere-builder/graph-corrupted-error'
+import { GraphNotFoundError } from '../data-access/riviere-builder/graph-not-found-error'
+import { RiviereBuilderRepository } from '../data-access/riviere-builder/riviere-builder-repository'
 import type { ValidateGraphInput } from './validate-graph-input'
-import type {
-  ValidateGraphErrorCode, ValidateGraphResult 
-} from './validate-graph-result'
+import type { ValidateGraphErrorCode, ValidateGraphResult } from './validate-graph-result'
 
 /** @riviere-role command-use-case */
 export class ValidateGraph {
diff --git a/packages/riviere-builder/use-cases/src/features/builder/data-access/riviere-builder/graph-corrupted-error.ts b/packages/riviere-builder/use-cases/src/features/builder/data-access/riviere-builder/graph-corrupted-error.ts
new file mode 100644
index 000000000..9f541f5b7
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/data-access/riviere-builder/graph-corrupted-error.ts
@@ -0,0 +1,9 @@
+/** @riviere-role data-access-error */
+export class GraphCorruptedError extends Error {
+  constructor(
+    readonly graphPath: string,
+    options?: ErrorOptions,
+  ) {
+    super(`Graph at ${graphPath} is corrupted`, options)
+  }
+}
diff --git a/packages/riviere-builder/use-cases/src/features/builder/data-access/riviere-builder/graph-not-found-error.ts b/packages/riviere-builder/use-cases/src/features/builder/data-access/riviere-builder/graph-not-found-error.ts
new file mode 100644
index 000000000..e5629f7b0
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/data-access/riviere-builder/graph-not-found-error.ts
@@ -0,0 +1,6 @@
+/** @riviere-role data-access-error */
+export class GraphNotFoundError extends Error {
+  constructor(readonly graphPath: string) {
+    super(`Graph not found at ${graphPath}`)
+  }
+}
diff --git a/packages/riviere-builder/use-cases/src/features/builder/data-access/riviere-builder/riviere-builder-repository.ts b/packages/riviere-builder/use-cases/src/features/builder/data-access/riviere-builder/riviere-builder-repository.ts
new file mode 100644
index 000000000..fe6e1427f
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/builder/data-access/riviere-builder/riviere-builder-repository.ts
@@ -0,0 +1,44 @@
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { RiviereBuilder } from '@living-architecture/riviere-builder-domain-model/domain/builder-facade'
+import { parseRiviereGraph } from '@living-architecture/riviere-schema-published-language/validation'
+import { GraphCorruptedError } from './graph-corrupted-error'
+import { GraphNotFoundError } from './graph-not-found-error'
+
+const DEFAULT_GRAPH_PATH = '.riviere/graph.json'
+
+/** @riviere-role aggregate-repository */
+export class RiviereBuilderRepository {
+  load(graphPathOption?: string): RiviereBuilder {
+    const graphPath = this.resolveGraphPath(graphPathOption)
+
+    if (!existsSync(graphPath)) {
+      throw new GraphNotFoundError(graphPath)
+    }
+
+    const content = readFileSync(graphPath, 'utf-8')
+    const parsed = this.parseJson(content, graphPath)
+    const result = parseRiviereGraph(parsed)
+    if (!result.success) {
+      throw new GraphCorruptedError(graphPath, { cause: result.issues })
+    }
+    return RiviereBuilder.resume(result.graph, graphPath)
+  }
+
+  save(builder: RiviereBuilder): void {
+    mkdirSync(dirname(builder.graphPath), { recursive: true })
+    writeFileSync(builder.graphPath, builder.serialize(), 'utf-8')
+  }
+
+  private resolveGraphPath(graphPathOption?: string): string {
+    return graphPathOption ?? join(process.cwd(), DEFAULT_GRAPH_PATH)
+  }
+
+  private parseJson(content: string, graphPath: string): unknown {
+    try {
+      return JSON.parse(content)
+    } catch (error) {
+      throw new GraphCorruptedError(graphPath, { cause: error })
+    }
+  }
+}
diff --git a/packages/riviere-builder/use-cases/src/features/query/data-access/graph/graph-corrupted-error.ts b/packages/riviere-builder/use-cases/src/features/query/data-access/graph/graph-corrupted-error.ts
new file mode 100644
index 000000000..9f541f5b7
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/data-access/graph/graph-corrupted-error.ts
@@ -0,0 +1,9 @@
+/** @riviere-role data-access-error */
+export class GraphCorruptedError extends Error {
+  constructor(
+    readonly graphPath: string,
+    options?: ErrorOptions,
+  ) {
+    super(`Graph at ${graphPath} is corrupted`, options)
+  }
+}
diff --git a/packages/riviere-builder/use-cases/src/features/query/data-access/graph/graph-not-found-error.ts b/packages/riviere-builder/use-cases/src/features/query/data-access/graph/graph-not-found-error.ts
new file mode 100644
index 000000000..e5629f7b0
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/data-access/graph/graph-not-found-error.ts
@@ -0,0 +1,6 @@
+/** @riviere-role data-access-error */
+export class GraphNotFoundError extends Error {
+  constructor(readonly graphPath: string) {
+    super(`Graph not found at ${graphPath}`)
+  }
+}
diff --git a/packages/riviere-builder/use-cases/src/features/query/data-access/graph/query-loaders.spec.ts b/packages/riviere-builder/use-cases/src/features/query/data-access/graph/query-loaders.spec.ts
new file mode 100644
index 000000000..555712f03
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/data-access/graph/query-loaders.spec.ts
@@ -0,0 +1,115 @@
+import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { describe, expect, it } from 'vitest'
+import {
+  type TestContext,
+  createTestContext,
+  setupCommandTest,
+} from '../../../../__fixtures__/command-test-fixtures'
+import { GraphCorruptedError } from './graph-corrupted-error'
+import { GraphNotFoundError } from './graph-not-found-error'
+import {
+  ComponentListLoader,
+  ComponentSearchLoader,
+  DomainListLoader,
+  EntryPointListLoader,
+  OrphanListLoader,
+} from './query-loaders'
+
+describe('query loaders', () => {
+  const ctx: TestContext = createTestContext()
+  setupCommandTest(ctx)
+
+  it('loads each query-specific read from the persisted graph', async () => {
+    await writeGraph(ctx.testDir)
+
+    const domain = new DomainListLoader().load(undefined).domains[0]
+
+    expect({
+      componentList: new ComponentListLoader().load(undefined, undefined, undefined),
+      componentSearch: new ComponentSearchLoader().load(undefined, 'order'),
+      domain:
+        domain === undefined
+          ? undefined
+          : {
+              ...domain,
+              componentCounts: { ...domain.componentCounts },
+            },
+      entryPoints: new EntryPointListLoader().load(undefined),
+      orphans: new OrphanListLoader().load(undefined),
+    }).toMatchObject({
+      componentList: { components: [] },
+      componentSearch: { components: [] },
+      domain: {
+        componentCounts: {
+          API: 0,
+          Custom: 0,
+          DomainOp: 0,
+          Event: 0,
+          EventHandler: 0,
+          UI: 0,
+          UseCase: 0,
+          total: 0,
+        },
+        description: 'Orders',
+        name: 'orders',
+        systemType: 'domain',
+      },
+      entryPoints: { entryPoints: [] },
+      orphans: { orphans: [] },
+    })
+  })
+
+  it('throws GraphCorruptedError for invalid JSON files', async () => {
+    const graphDir = join(ctx.testDir, '.riviere')
+    await mkdir(graphDir, { recursive: true })
+    await writeFile(join(graphDir, 'graph.json'), '{invalid', 'utf-8')
+
+    expect(() => new ComponentListLoader().load(undefined, undefined, undefined)).toThrow(
+      GraphCorruptedError,
+    )
+  })
+
+  it('throws GraphNotFoundError when graph file does not exist', () => {
+    expect(() =>
+      new ComponentListLoader().load(join(ctx.testDir, 'missing.json'), undefined, undefined),
+    ).toThrow(GraphNotFoundError)
+  })
+
+  it('rejects a graph path outside the working directory', async () => {
+    const outsideDirectory = await mkdtemp(join(tmpdir(), 'riviere-query-outside-'))
+    const outsideGraphPath = join(outsideDirectory, '.riviere', 'graph.json')
+    await writeGraph(outsideDirectory)
+
+    try {
+      expect(() => new ComponentListLoader().load(outsideGraphPath, undefined, undefined)).toThrow(
+        GraphNotFoundError,
+      )
+    } finally {
+      await rm(outsideDirectory, { recursive: true })
+    }
+  })
+})
+
+async function writeGraph(testDir: string): Promise<void> {
+  const graphDir = join(testDir, '.riviere')
+  await mkdir(graphDir, { recursive: true })
+  await writeFile(
+    join(graphDir, 'graph.json'),
+    JSON.stringify({
+      components: [],
+      links: [],
+      metadata: {
+        domains: {
+          orders: {
+            description: 'Orders',
+            systemType: 'domain',
+          },
+        },
+      },
+      version: '1.0',
+    }),
+    'utf-8',
+  )
+}
diff --git a/packages/riviere-builder/use-cases/src/features/query/data-access/graph/query-loaders.ts b/packages/riviere-builder/use-cases/src/features/query/data-access/graph/query-loaders.ts
new file mode 100644
index 000000000..5729003d3
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/data-access/graph/query-loaders.ts
@@ -0,0 +1,89 @@
+import { existsSync, readFileSync } from 'node:fs'
+import { isAbsolute, relative, resolve, sep } from 'node:path'
+import type { ComponentType } from '@living-architecture/riviere-schema-published-language/schema'
+import { OrphanList } from '../../queries/detect-orphans-result'
+import { ComponentList } from '../../queries/list-components-result'
+import { DomainList } from '../../queries/list-domains-result'
+import { EntryPointList } from '../../queries/list-entry-points-result'
+import { ComponentSearch } from '../../queries/search-components-result'
+import { FoundFlowTrace, type FlowTrace } from '../../queries/trace-flow-result'
+import { GraphCorruptedError } from './graph-corrupted-error'
+import { GraphNotFoundError } from './graph-not-found-error'
+
+const DEFAULT_GRAPH_PATH = '.riviere/graph.json'
+
+/** @riviere-role query-model-loader */
+export class ComponentListLoader {
+  load(
+    graphPathOption: string | undefined,
+    domain: string | undefined,
+    type: ComponentType | undefined,
+  ): ComponentList {
+    return loadQueryModel(graphPathOption, (graph) => ComponentList.parse(graph, domain, type))
+  }
+}
+
+/** @riviere-role query-model-loader */
+export class DomainListLoader {
+  load(graphPathOption: string | undefined): DomainList {
+    return loadQueryModel(graphPathOption, DomainList.parse)
+  }
+}
+
+/** @riviere-role query-model-loader */
+export class EntryPointListLoader {
+  load(graphPathOption: string | undefined): EntryPointList {
+    return loadQueryModel(graphPathOption, EntryPointList.parse)
+  }
+}
+
+/** @riviere-role query-model-loader */
+export class OrphanListLoader {
+  load(graphPathOption: string | undefined): OrphanList {
+    return loadQueryModel(graphPathOption, OrphanList.parse)
+  }
+}
+
+/** @riviere-role query-model-loader */
+export class ComponentSearchLoader {
+  load(graphPathOption: string | undefined, term: string): ComponentSearch {
+    return loadQueryModel(graphPathOption, (graph) => ComponentSearch.parse(graph, term))
+  }
+}
+
+/** @riviere-role query-model-loader */
+export class FlowTraceLoader {
+  load(graphPathOption: string | undefined, componentIdInput: string): FlowTrace {
+    return loadQueryModel(graphPathOption, (graph) => FoundFlowTrace.parse(graph, componentIdInput))
+  }
+}
+
+function loadQueryModel<T>(graphPathOption: string | undefined, parse: (graph: unknown) => T): T {
+  const graphPath = resolveGraphPath(graphPathOption)
+  if (!existsSync(graphPath)) {
+    throw new GraphNotFoundError(graphPath)
+  }
+  const content = readFileSync(graphPath, 'utf-8')
+  try {
+    const parsed: unknown = JSON.parse(content)
+    return parse(parsed)
+  } catch (error) {
+    throw new GraphCorruptedError(graphPath, { cause: error })
+  }
+}
+
+function resolveGraphPath(graphPathOption: string | undefined): string {
+  const workingDirectory = resolve(process.cwd())
+  const graphPath = resolve(workingDirectory, graphPathOption ?? DEFAULT_GRAPH_PATH)
+  const pathFromWorkingDirectory = relative(workingDirectory, graphPath)
+  const isOutsideWorkingDirectory =
+    pathFromWorkingDirectory === '..' ||
+    pathFromWorkingDirectory.startsWith(`..${sep}`) ||
+    isAbsolute(pathFromWorkingDirectory)
+
+  if (isOutsideWorkingDirectory) {
+    throw new GraphNotFoundError(graphPath)
+  }
+
+  return graphPath
+}
diff --git a/packages/riviere-builder/use-cases/src/features/query/queries/detect-orphans-input.ts b/packages/riviere-builder/use-cases/src/features/query/queries/detect-orphans-input.ts
new file mode 100644
index 000000000..e5dabdbb3
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/queries/detect-orphans-input.ts
@@ -0,0 +1,4 @@
+/** @riviere-role query-model-use-case-input */
+export interface DetectOrphansInput {
+  graphPathOption: string | undefined
+}
diff --git a/packages/riviere-builder/use-cases/src/features/query/queries/detect-orphans-result.ts b/packages/riviere-builder/use-cases/src/features/query/queries/detect-orphans-result.ts
new file mode 100644
index 000000000..d0d966e2b
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/queries/detect-orphans-result.ts
@@ -0,0 +1,17 @@
+import { RiviereQuery } from '@living-architecture/riviere-builder-domain-model/query'
+import type { QueryGraphLoadFailure } from './query-graph-load-failure'
+
+/** @riviere-role query-model */
+export type OrphanComponent = ReturnType<RiviereQuery['detectOrphans']>[number]
+
+/** @riviere-role query-model */
+export class OrphanList {
+  private constructor(readonly orphans: OrphanComponent[]) {}
+
+  static parse(graph: unknown): OrphanList {
+    return new OrphanList(RiviereQuery.fromJSON(graph).detectOrphans())
+  }
+}
+
+/** @riviere-role query-model */
+export type DetectOrphansResult = OrphanList | QueryGraphLoadFailure
diff --git a/packages/riviere-builder/use-cases/src/features/query/queries/detect-orphans.ts b/packages/riviere-builder/use-cases/src/features/query/queries/detect-orphans.ts
new file mode 100644
index 000000000..94a57cda6
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/queries/detect-orphans.ts
@@ -0,0 +1,21 @@
+import { OrphanListLoader } from '../data-access/graph/query-loaders'
+import type { DetectOrphansInput } from './detect-orphans-input'
+import type { DetectOrphansResult } from './detect-orphans-result'
+import { toQueryGraphLoadFailure } from './query-graph-load-failure'
+
+/** @riviere-role query-model-use-case */
+export class DetectOrphans {
+  constructor(private readonly orphans: OrphanListLoader) {}
+
+  execute(input: DetectOrphansInput): DetectOrphansResult {
+    try {
+      return this.orphans.load(input.graphPathOption)
+    } catch (error) {
+      const failure = toQueryGraphLoadFailure(error)
+      if (failure !== undefined) {
+        return failure
+      }
+      throw error
+    }
+  }
+}
diff --git a/packages/riviere-builder/use-cases/src/features/query/queries/list-components-input.ts b/packages/riviere-builder/use-cases/src/features/query/queries/list-components-input.ts
new file mode 100644
index 000000000..2312b4498
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/queries/list-components-input.ts
@@ -0,0 +1,6 @@
+/** @riviere-role query-model-use-case-input */
+export interface ListComponentsInput {
+  domain: string | undefined
+  graphPathOption: string | undefined
+  type: string | undefined
+}
diff --git a/packages/riviere-builder/use-cases/src/features/query/queries/list-components-result.ts b/packages/riviere-builder/use-cases/src/features/query/queries/list-components-result.ts
new file mode 100644
index 000000000..2aa9af80f
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/queries/list-components-result.ts
@@ -0,0 +1,35 @@
+import { RiviereQuery } from '@living-architecture/riviere-builder-domain-model/query'
+import type { ComponentType } from '@living-architecture/riviere-schema-published-language/schema'
+import type { QueryGraphLoadFailure } from './query-graph-load-failure'
+
+/** @riviere-role query-model */
+export type ListedComponent = ReturnType<RiviereQuery['components']>[number]
+
+/** @riviere-role query-model */
+export class ComponentList {
+  private constructor(readonly components: ListedComponent[]) {}
+
+  static parse(
+    graph: unknown,
+    domain: string | undefined,
+    type: ComponentType | undefined,
+  ): ComponentList {
+    const allComponents = RiviereQuery.fromJSON(graph).components()
+    const inDomain =
+      domain === undefined
+        ? allComponents
+        : allComponents.filter((component) => component.domain === domain)
+    const components =
+      type === undefined ? inDomain : inDomain.filter((component) => component.type === type)
+    return new ComponentList(components)
+  }
+}
+
+/** @riviere-role query-model */
+export type ListComponentsResult =
+  | ComponentList
+  | QueryGraphLoadFailure
+  | {
+      readonly kind: 'invalidComponentType'
+      readonly message: string
+    }
diff --git a/packages/riviere-builder/use-cases/src/features/query/queries/list-components.ts b/packages/riviere-builder/use-cases/src/features/query/queries/list-components.ts
new file mode 100644
index 000000000..9c7ba4ec3
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/queries/list-components.ts
@@ -0,0 +1,30 @@
+import { ComponentListLoader } from '../data-access/graph/query-loaders'
+import { ComponentType } from '@living-architecture/riviere-builder-domain-model/domain/component-type'
+import type { ListComponentsInput } from './list-components-input'
+import type { ListComponentsResult } from './list-components-result'
+import { toQueryGraphLoadFailure } from './query-graph-load-failure'
+
+/** @riviere-role query-model-use-case */
+export class ListComponents {
+  constructor(private readonly components: ComponentListLoader) {}
+
+  execute(input: ListComponentsInput): ListComponentsResult {
+    const componentType = input.type === undefined ? undefined : ComponentType.parse(input.type)
+    if (componentType !== undefined && !componentType.success) {
+      return {
+        kind: 'invalidComponentType',
+        message: `Invalid component type: ${input.type}`,
+      }
+    }
+
+    try {
+      return this.components.load(input.graphPathOption, input.domain, componentType?.data.value)
+    } catch (error) {
+      const failure = toQueryGraphLoadFailure(error)
+      if (failure !== undefined) {
+        return failure
+      }
+      throw error
+    }
+  }
+}
diff --git a/packages/riviere-builder/use-cases/src/features/query/queries/list-domains-input.ts b/packages/riviere-builder/use-cases/src/features/query/queries/list-domains-input.ts
new file mode 100644
index 000000000..b9a3328ce
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/queries/list-domains-input.ts
@@ -0,0 +1,4 @@
+/** @riviere-role query-model-use-case-input */
+export interface ListDomainsInput {
+  graphPathOption: string | undefined
+}
diff --git a/packages/riviere-builder/use-cases/src/features/query/queries/list-domains-result.ts b/packages/riviere-builder/use-cases/src/features/query/queries/list-domains-result.ts
new file mode 100644
index 000000000..00b46572d
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/queries/list-domains-result.ts
@@ -0,0 +1,17 @@
+import { RiviereQuery } from '@living-architecture/riviere-builder-domain-model/query'
+import type { QueryGraphLoadFailure } from './query-graph-load-failure'
+
+/** @riviere-role query-model */
+export type DomainSummary = ReturnType<RiviereQuery['domains']>[number]
+
+/** @riviere-role query-model */
+export class DomainList {
+  private constructor(readonly domains: DomainSummary[]) {}
+
+  static parse(graph: unknown): DomainList {
+    return new DomainList(RiviereQuery.fromJSON(graph).domains())
+  }
+}
+
+/** @riviere-role query-model */
+export type ListDomainsResult = DomainList | QueryGraphLoadFailure
diff --git a/packages/riviere-builder/use-cases/src/features/query/queries/list-domains.ts b/packages/riviere-builder/use-cases/src/features/query/queries/list-domains.ts
new file mode 100644
index 000000000..4dd3a4e70
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/queries/list-domains.ts
@@ -0,0 +1,21 @@
+import { DomainListLoader } from '../data-access/graph/query-loaders'
+import type { ListDomainsInput } from './list-domains-input'
+import type { ListDomainsResult } from './list-domains-result'
+import { toQueryGraphLoadFailure } from './query-graph-load-failure'
+
+/** @riviere-role query-model-use-case */
+export class ListDomains {
+  constructor(private readonly domains: DomainListLoader) {}
+
+  execute(input: ListDomainsInput): ListDomainsResult {
+    try {
+      return this.domains.load(input.graphPathOption)
+    } catch (error) {
+      const failure = toQueryGraphLoadFailure(error)
+      if (failure !== undefined) {
+        return failure
+      }
+      throw error
+    }
+  }
+}
diff --git a/packages/riviere-builder/use-cases/src/features/query/queries/list-entry-points-input.ts b/packages/riviere-builder/use-cases/src/features/query/queries/list-entry-points-input.ts
new file mode 100644
index 000000000..d83d1c09d
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/queries/list-entry-points-input.ts
@@ -0,0 +1,4 @@
+/** @riviere-role query-model-use-case-input */
+export interface ListEntryPointsInput {
+  graphPathOption: string | undefined
+}
diff --git a/packages/riviere-builder/use-cases/src/features/query/queries/list-entry-points-result.ts b/packages/riviere-builder/use-cases/src/features/query/queries/list-entry-points-result.ts
new file mode 100644
index 000000000..9a9aacbe8
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/queries/list-entry-points-result.ts
@@ -0,0 +1,17 @@
+import { RiviereQuery } from '@living-architecture/riviere-builder-domain-model/query'
+import type { QueryGraphLoadFailure } from './query-graph-load-failure'
+
+/** @riviere-role query-model */
+export type EntryPointComponent = ReturnType<RiviereQuery['entryPoints']>[number]
+
+/** @riviere-role query-model */
+export class EntryPointList {
+  private constructor(readonly entryPoints: EntryPointComponent[]) {}
+
+  static parse(graph: unknown): EntryPointList {
+    return new EntryPointList(RiviereQuery.fromJSON(graph).entryPoints())
+  }
+}
+
+/** @riviere-role query-model */
+export type ListEntryPointsResult = EntryPointList | QueryGraphLoadFailure
diff --git a/packages/riviere-builder/use-cases/src/features/query/queries/list-entry-points.ts b/packages/riviere-builder/use-cases/src/features/query/queries/list-entry-points.ts
new file mode 100644
index 000000000..2cb191fe0
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/queries/list-entry-points.ts
@@ -0,0 +1,21 @@
+import { EntryPointListLoader } from '../data-access/graph/query-loaders'
+import type { ListEntryPointsInput } from './list-entry-points-input'
+import type { ListEntryPointsResult } from './list-entry-points-result'
+import { toQueryGraphLoadFailure } from './query-graph-load-failure'
+
+/** @riviere-role query-model-use-case */
+export class ListEntryPoints {
+  constructor(private readonly entryPoints: EntryPointListLoader) {}
+
+  execute(input: ListEntryPointsInput): ListEntryPointsResult {
+    try {
+      return this.entryPoints.load(input.graphPathOption)
+    } catch (error) {
+      const failure = toQueryGraphLoadFailure(error)
+      if (failure !== undefined) {
+        return failure
+      }
+      throw error
+    }
+  }
+}
diff --git a/packages/riviere-builder/use-cases/src/features/query/queries/query-graph-load-failure.spec.ts b/packages/riviere-builder/use-cases/src/features/query/queries/query-graph-load-failure.spec.ts
new file mode 100644
index 000000000..3a2a4cc05
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/queries/query-graph-load-failure.spec.ts
@@ -0,0 +1,31 @@
+import { describe, expect, it } from 'vitest'
+import { GraphCorruptedError } from '../data-access/graph/graph-corrupted-error'
+import { GraphNotFoundError } from '../data-access/graph/graph-not-found-error'
+import { toQueryGraphLoadFailure } from './query-graph-load-failure'
+
+class UnexpectedQueryGraphLoadError extends Error {
+  constructor() {
+    super('boom')
+    this.name = 'UnexpectedQueryGraphLoadError'
+  }
+}
+
+describe('toQueryGraphLoadFailure', () => {
+  it('returns graphNotFound failure when graph file is missing', () => {
+    expect(toQueryGraphLoadFailure(new GraphNotFoundError('graph.json'))).toStrictEqual({
+      kind: 'graphNotFound',
+      message: 'Graph not found at graph.json',
+    })
+  })
+
+  it('returns graphCorrupted failure when graph file cannot be parsed', () => {
+    expect(toQueryGraphLoadFailure(new GraphCorruptedError('graph.json'))).toStrictEqual({
+      kind: 'graphCorrupted',
+      message: 'Graph file contains invalid JSON',
+    })
+  })
+
+  it('returns undefined when error is not a graph loading failure', () => {
+    expect(toQueryGraphLoadFailure(new UnexpectedQueryGraphLoadError())).toBeUndefined()
+  })
+})
diff --git a/packages/riviere-builder/use-cases/src/features/query/queries/query-graph-load-failure.ts b/packages/riviere-builder/use-cases/src/features/query/queries/query-graph-load-failure.ts
new file mode 100644
index 000000000..72d91e6e3
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/queries/query-graph-load-failure.ts
@@ -0,0 +1,32 @@
+import { GraphCorruptedError } from '../data-access/graph/graph-corrupted-error'
+import { GraphNotFoundError } from '../data-access/graph/graph-not-found-error'
+
+/** @riviere-role query-model */
+export type QueryGraphLoadFailure =
+  | {
+      readonly kind: 'graphCorrupted'
+      readonly message: string
+    }
+  | {
+      readonly kind: 'graphNotFound'
+      readonly message: string
+    }
+
+/** @riviere-role query-model */
+export function toQueryGraphLoadFailure(error: unknown): QueryGraphLoadFailure | undefined {
+  if (error instanceof GraphNotFoundError) {
+    return {
+      kind: 'graphNotFound',
+      message: error.message,
+    }
+  }
+
+  if (error instanceof GraphCorruptedError) {
+    return {
+      kind: 'graphCorrupted',
+      message: 'Graph file contains invalid JSON',
+    }
+  }
+
+  return undefined
+}
diff --git a/packages/riviere-builder/use-cases/src/features/query/queries/query-use-case-errors.spec.ts b/packages/riviere-builder/use-cases/src/features/query/queries/query-use-case-errors.spec.ts
new file mode 100644
index 000000000..95c1d87e0
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/queries/query-use-case-errors.spec.ts
@@ -0,0 +1,86 @@
+import { describe, expect, it, vi } from 'vitest'
+import {
+  ComponentListLoader,
+  ComponentSearchLoader,
+  DomainListLoader,
+  EntryPointListLoader,
+  OrphanListLoader,
+} from '../data-access/graph/query-loaders'
+import { DetectOrphans } from './detect-orphans'
+import { ListComponents } from './list-components'
+import { ListDomains } from './list-domains'
+import { ListEntryPoints } from './list-entry-points'
+import { SearchComponents } from './search-components'
+
+class UnexpectedQueryFailure extends Error {
+  constructor() {
+    super('unexpected failure')
+    this.name = 'UnexpectedQueryFailure'
+  }
+}
+
+const unexpectedFailure = new UnexpectedQueryFailure()
+
+describe('query use case errors', () => {
+  it('rethrows an unexpected component list loading failure', () => {
+    const loader = new ComponentListLoader()
+    vi.spyOn(loader, 'load').mockImplementation(() => {
+      throw unexpectedFailure
+    })
+
+    expect(() =>
+      new ListComponents(loader).execute({
+        domain: undefined,
+        graphPathOption: undefined,
+        type: undefined,
+      }),
+    ).toThrow(unexpectedFailure)
+  })
+
+  it('rethrows an unexpected domain list loading failure', () => {
+    const loader = new DomainListLoader()
+    vi.spyOn(loader, 'load').mockImplementation(() => {
+      throw unexpectedFailure
+    })
+
+    expect(() => new ListDomains(loader).execute({ graphPathOption: undefined })).toThrow(
+      unexpectedFailure,
+    )
+  })
+
+  it('rethrows an unexpected entry point list loading failure', () => {
+    const loader = new EntryPointListLoader()
+    vi.spyOn(loader, 'load').mockImplementation(() => {
+      throw unexpectedFailure
+    })
+
+    expect(() => new ListEntryPoints(loader).execute({ graphPathOption: undefined })).toThrow(
+      unexpectedFailure,
+    )
+  })
+
+  it('rethrows an unexpected orphan list loading failure', () => {
+    const loader = new OrphanListLoader()
+    vi.spyOn(loader, 'load').mockImplementation(() => {
+      throw unexpectedFailure
+    })
+
+    expect(() => new DetectOrphans(loader).execute({ graphPathOption: undefined })).toThrow(
+      unexpectedFailure,
+    )
+  })
+
+  it('rethrows an unexpected component search loading failure', () => {
+    const loader = new ComponentSearchLoader()
+    vi.spyOn(loader, 'load').mockImplementation(() => {
+      throw unexpectedFailure
+    })
+
+    expect(() =>
+      new SearchComponents(loader).execute({
+        graphPathOption: undefined,
+        term: 'payment',
+      }),
+    ).toThrow(unexpectedFailure)
+  })
+})
diff --git a/packages/riviere-cli/src/features/query/queries/search-components-input.ts b/packages/riviere-builder/use-cases/src/features/query/queries/search-components-input.ts
similarity index 100%
rename from packages/riviere-cli/src/features/query/queries/search-components-input.ts
rename to packages/riviere-builder/use-cases/src/features/query/queries/search-components-input.ts
diff --git a/packages/riviere-builder/use-cases/src/features/query/queries/search-components-result.ts b/packages/riviere-builder/use-cases/src/features/query/queries/search-components-result.ts
new file mode 100644
index 000000000..381087946
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/queries/search-components-result.ts
@@ -0,0 +1,17 @@
+import { RiviereQuery } from '@living-architecture/riviere-builder-domain-model/query'
+import type { QueryGraphLoadFailure } from './query-graph-load-failure'
+
+/** @riviere-role query-model */
+export type SearchComponent = ReturnType<RiviereQuery['search']>[number]
+
+/** @riviere-role query-model */
+export class ComponentSearch {
+  private constructor(readonly components: SearchComponent[]) {}
+
+  static parse(graph: unknown, term: string): ComponentSearch {
+    return new ComponentSearch(RiviereQuery.fromJSON(graph).search(term))
+  }
+}
+
+/** @riviere-role query-model */
+export type SearchComponentsResult = ComponentSearch | QueryGraphLoadFailure
diff --git a/packages/riviere-builder/use-cases/src/features/query/queries/search-components.ts b/packages/riviere-builder/use-cases/src/features/query/queries/search-components.ts
new file mode 100644
index 000000000..84126e01c
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/queries/search-components.ts
@@ -0,0 +1,21 @@
+import { ComponentSearchLoader } from '../data-access/graph/query-loaders'
+import type { SearchComponentsInput } from './search-components-input'
+import type { SearchComponentsResult } from './search-components-result'
+import { toQueryGraphLoadFailure } from './query-graph-load-failure'
+
+/** @riviere-role query-model-use-case */
+export class SearchComponents {
+  constructor(private readonly components: ComponentSearchLoader) {}
+
+  execute(input: SearchComponentsInput): SearchComponentsResult {
+    try {
+      return this.components.load(input.graphPathOption, input.term)
+    } catch (error) {
+      const failure = toQueryGraphLoadFailure(error)
+      if (failure !== undefined) {
+        return failure
+      }
+      throw error
+    }
+  }
+}
diff --git a/packages/riviere-cli/src/features/query/queries/trace-flow-input.ts b/packages/riviere-builder/use-cases/src/features/query/queries/trace-flow-input.ts
similarity index 100%
rename from packages/riviere-cli/src/features/query/queries/trace-flow-input.ts
rename to packages/riviere-builder/use-cases/src/features/query/queries/trace-flow-input.ts
diff --git a/packages/riviere-builder/use-cases/src/features/query/queries/trace-flow-result.ts b/packages/riviere-builder/use-cases/src/features/query/queries/trace-flow-result.ts
new file mode 100644
index 000000000..92f931a63
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/queries/trace-flow-result.ts
@@ -0,0 +1,60 @@
+import { findNearMatches } from '@living-architecture/riviere-builder-domain-model/domain/error-recovery/component-suggestion'
+import { ComponentId as QueryComponentId } from '@living-architecture/riviere-builder-domain-model/query/component-id'
+import { ComponentId } from '@living-architecture/riviere-schema-published-language/component-id'
+import {
+  ComponentNotFoundError,
+  RiviereQuery,
+} from '@living-architecture/riviere-builder-domain-model/query'
+import type { QueryGraphLoadFailure } from './query-graph-load-failure'
+
+/** @riviere-role query-model */
+export type TraceFlowGraph = ReturnType<RiviereQuery['traceFlow']>
+
+/** @riviere-role query-model */
+export class FoundFlowTrace {
+  readonly success = true
+
+  private constructor(readonly flow: TraceFlowGraph) {}
+
+  static parse(graph: unknown, componentIdInput: string): FlowTrace {
+    const query = RiviereQuery.fromJSON(graph)
+    try {
+      return new FoundFlowTrace(query.traceFlow(QueryComponentId.parse(componentIdInput)))
+    } catch (error) {
+      if (!(error instanceof ComponentNotFoundError)) throw error
+
+      const parsedComponentId = ComponentId.parse(componentIdInput)
+      if (!parsedComponentId.success) {
+        return MissingFlowTrace.parse(error.message, [])
+      }
+      const matches = findNearMatches(
+        query.components(),
+        { name: parsedComponentId.componentId.name() },
+        { limit: 3 },
+      )
+      return MissingFlowTrace.parse(
+        error.message,
+        matches.map((match) => match.component.id),
+      )
+    }
+  }
+}
+
+class MissingFlowTrace {
+  readonly success = false
+
+  private constructor(
+    readonly message: string,
+    readonly suggestions: string[],
+  ) {}
+
+  static parse(message: string, suggestions: string[]): MissingFlowTrace {
+    return new MissingFlowTrace(message, suggestions)
+  }
+}
+
+/** @riviere-role query-model */
+export type FlowTrace = FoundFlowTrace | MissingFlowTrace
+
+/** @riviere-role query-model */
+export type TraceFlowResult = FlowTrace | QueryGraphLoadFailure
diff --git a/packages/riviere-builder/use-cases/src/features/query/queries/trace-flow.spec.ts b/packages/riviere-builder/use-cases/src/features/query/queries/trace-flow.spec.ts
new file mode 100644
index 000000000..8abcbb902
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/queries/trace-flow.spec.ts
@@ -0,0 +1,149 @@
+import { mkdir, writeFile } from 'node:fs/promises'
+import { join } from 'node:path'
+import { describe, expect, it, vi } from 'vitest'
+import { RiviereQuery } from '@living-architecture/riviere-builder-domain-model/query'
+import {
+  type TestContext,
+  createTestContext,
+  setupCommandTest,
+} from '../../../__fixtures__/command-test-fixtures'
+import { TraceFlow } from './trace-flow'
+import { FlowTraceLoader } from '../data-access/graph/query-loaders'
+import { FoundFlowTrace } from './trace-flow-result'
+
+class UnexpectedLoaderError extends Error {}
+
+class ThrowingFlowTraceLoader extends FlowTraceLoader {
+  override load(): never {
+    throw new UnexpectedLoaderError('unexpected loader failure')
+  }
+}
+
+describe('traceFlow command', () => {
+  const ctx: TestContext = createTestContext()
+  setupCommandTest(ctx)
+
+  it('returns near-match suggestions when component is not found', async () => {
+    const graphDir = join(ctx.testDir, '.riviere')
+    await mkdir(graphDir, { recursive: true })
+    await writeFile(
+      join(graphDir, 'graph.json'),
+      JSON.stringify({
+        components: [
+          {
+            domain: 'orders',
+            id: 'orders:checkout:usecase:place-order',
+            module: 'checkout',
+            name: 'place-order',
+            sourceLocation: {
+              filePath: 'src/usecase.ts',
+              repository: 'https://github.com/org/repo',
+            },
+            type: 'UseCase',
+          },
+        ],
+        links: [],
+        metadata: {
+          domains: {
+            orders: {
+              description: 'Orders',
+              systemType: 'domain',
+            },
+          },
+          sources: [{ repository: 'https://github.com/org/repo' }],
+        },
+        version: '1.0',
+      }),
+      'utf-8',
+    )
+
+    expect(
+      new TraceFlow(new FlowTraceLoader()).execute({
+        componentId: 'orders:checkout:usecase:place-orde',
+        graphPathOption: undefined,
+      }),
+    ).toMatchObject({
+      success: false,
+      suggestions: ['orders:checkout:usecase:place-order'],
+    })
+  })
+
+  it('returns no suggestions when the missing component ID is invalid', async () => {
+    const graphDir = join(ctx.testDir, '.riviere')
+    await mkdir(graphDir, { recursive: true })
+    await writeFile(
+      join(graphDir, 'graph.json'),
+      JSON.stringify({
+        components: [
+          {
+            domain: 'orders',
+            id: 'orders:checkout:usecase:place-order',
+            module: 'checkout',
+            name: 'place-order',
+            sourceLocation: {
+              filePath: 'src/usecase.ts',
+              repository: 'https://github.com/org/repo',
+            },
+            type: 'UseCase',
+          },
+        ],
+        links: [],
+        metadata: {
+          domains: { orders: { description: 'Orders', systemType: 'domain' } },
+          sources: [{ repository: 'https://github.com/org/repo' }],
+        },
+        version: '1.0',
+      }),
+      'utf-8',
+    )
+
+    expect(
+      new TraceFlow(new FlowTraceLoader()).execute({
+        componentId: 'invalid',
+        graphPathOption: undefined,
+      }),
+    ).toMatchObject({ success: false, suggestions: [] })
+  })
+
+  it('rethrows an unexpected loader failure', () => {
+    expect(() =>
+      new TraceFlow(new ThrowingFlowTraceLoader()).execute({
+        componentId: 'orders:checkout:usecase:place-order',
+        graphPathOption: undefined,
+      }),
+    ).toThrow('unexpected loader failure')
+  })
+
+  it('rethrows an unexpected flow query failure', () => {
+    vi.spyOn(RiviereQuery.prototype, 'traceFlow').mockImplementationOnce(() => {
+      throw new UnexpectedLoaderError('unexpected query failure')
+    })
+
+    expect(() =>
+      FoundFlowTrace.parse(
+        {
+          components: [
+            {
+              domain: 'orders',
+              id: 'orders:checkout:usecase:place-order',
+              module: 'checkout',
+              name: 'place-order',
+              sourceLocation: {
+                filePath: 'src/usecase.ts',
+                repository: 'https://github.com/org/repo',
+              },
+              type: 'UseCase',
+            },
+          ],
+          links: [],
+          metadata: {
+            domains: { orders: { description: 'Orders', systemType: 'domain' } },
+            sources: [{ repository: 'https://github.com/org/repo' }],
+          },
+          version: '1.0',
+        },
+        'orders:checkout:usecase:place-order',
+      ),
+    ).toThrow('unexpected query failure')
+  })
+})
diff --git a/packages/riviere-builder/use-cases/src/features/query/queries/trace-flow.ts b/packages/riviere-builder/use-cases/src/features/query/queries/trace-flow.ts
new file mode 100644
index 000000000..69376ac9e
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/features/query/queries/trace-flow.ts
@@ -0,0 +1,21 @@
+import { FlowTraceLoader } from '../data-access/graph/query-loaders'
+import type { TraceFlowInput } from './trace-flow-input'
+import type { TraceFlowResult } from './trace-flow-result'
+import { toQueryGraphLoadFailure } from './query-graph-load-failure'
+
+/** @riviere-role query-model-use-case */
+export class TraceFlow {
+  constructor(private readonly flowTrace: FlowTraceLoader) {}
+
+  execute(input: TraceFlowInput): TraceFlowResult {
+    try {
+      return this.flowTrace.load(input.graphPathOption, input.componentId)
+    } catch (error) {
+      const failure = toQueryGraphLoadFailure(error)
+      if (failure !== undefined) {
+        return failure
+      }
+      throw error
+    }
+  }
+}
diff --git a/packages/riviere-builder/use-cases/src/index.ts b/packages/riviere-builder/use-cases/src/index.ts
new file mode 100644
index 000000000..1ee0804c3
--- /dev/null
+++ b/packages/riviere-builder/use-cases/src/index.ts
@@ -0,0 +1 @@
+export { AddComponent } from './features/builder/commands/add-component'
diff --git a/packages/riviere-builder/use-cases/tsconfig.json b/packages/riviere-builder/use-cases/tsconfig.json
new file mode 100644
index 000000000..667a3463d
--- /dev/null
+++ b/packages/riviere-builder/use-cases/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/packages/riviere-builder/use-cases/tsconfig.lib.json b/packages/riviere-builder/use-cases/tsconfig.lib.json
new file mode 100644
index 000000000..02fad9c6c
--- /dev/null
+++ b/packages/riviere-builder/use-cases/tsconfig.lib.json
@@ -0,0 +1,22 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "src",
+    "outDir": "dist",
+    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
+    "emitDeclarationOnly": false,
+    "forceConsistentCasingInFileNames": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "references": [
+    { "path": "../domain-model/tsconfig.lib.json" },
+    { "path": "../../riviere-schema/published-language/tsconfig.lib.json" }
+  ],
+  "exclude": [
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/__fixtures__/**"
+  ]
+}
diff --git a/packages/riviere-builder/use-cases/tsconfig.spec.json b/packages/riviere-builder/use-cases/tsconfig.spec.json
new file mode 100644
index 000000000..7d04601fa
--- /dev/null
+++ b/packages/riviere-builder/use-cases/tsconfig.spec.json
@@ -0,0 +1,15 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/vitest",
+    "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node", "vitest"],
+    "forceConsistentCasingInFileNames": true
+  },
+  "include": [
+    "vitest.config.mts",
+    "src/**/*.spec.ts",
+    "src/**/*.d.ts",
+    "src/**/__fixtures__/**/*.ts"
+  ],
+  "references": [{ "path": "./tsconfig.lib.json" }]
+}
diff --git a/packages/riviere-builder/use-cases/vitest.config.mts b/packages/riviere-builder/use-cases/vitest.config.mts
new file mode 100644
index 000000000..97f80a030
--- /dev/null
+++ b/packages/riviere-builder/use-cases/vitest.config.mts
@@ -0,0 +1,26 @@
+import path from 'node:path'
+import { defineConfig } from 'vitest/config'
+
+const repoRoot = path.resolve(__dirname, '../../..')
+
+export default defineConfig(() => ({
+  root: __dirname,
+  cacheDir: '../../../node_modules/.vite/packages/riviere-builder-use-cases',
+  test: {
+    name: '@living-architecture/riviere-builder-use-cases',
+    watch: false,
+    globals: true,
+    environment: 'node',
+    include: ['src/**/*.{test,spec}.{ts,mts}'],
+    reporters: ['default'],
+    coverage: {
+      enabled: true,
+      reportsDirectory: './test-output/vitest/coverage',
+      provider: 'v8' as const,
+      reporter: ['text', ['lcov', { projectRoot: repoRoot }]] as [
+        'text',
+        ['lcov', { projectRoot: string }],
+      ],
+    },
+  },
+}))
diff --git a/packages/riviere-builder/vite.config.ts b/packages/riviere-builder/vite.config.ts
deleted file mode 100644
index e5d3a40c3..000000000
--- a/packages/riviere-builder/vite.config.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/// <reference types='vitest' />
-import { defineConfig } from 'vite'
-
-export default defineConfig(() => ({
-  root: import.meta.dirname,
-  cacheDir: '../../node_modules/.vite/packages/riviere-builder',
-  plugins: [],
-  test: {
-    name: '@living-architecture/riviere-builder',
-    watch: false,
-    globals: true,
-    environment: 'node',
-    include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    reporters: ['default'],
-    coverage: {
-      reportsDirectory: './test-output/vitest/coverage',
-      provider: 'v8' as const,
-    },
-  },
-}))
diff --git a/packages/riviere-builder/vitest.config.mts b/packages/riviere-builder/vitest.config.mts
deleted file mode 100644
index ef69e95ee..000000000
--- a/packages/riviere-builder/vitest.config.mts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { defineConfig } from 'vitest/config';
-
-export default defineConfig(() => ({
-  root: __dirname,
-  cacheDir: '../../node_modules/.vite/packages/riviere-builder',
-  test: {
-    name: '@living-architecture/riviere-builder',
-    watch: false,
-    globals: true,
-    environment: 'node',
-    include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    reporters: ['default'],
-    coverage: {
-      enabled: true,
-      reportsDirectory: './test-output/vitest/coverage',
-      provider: 'v8' as const,
-      reporter: ['text', 'lcov'],
-      thresholds: {
-        lines: 100,
-        statements: 100,
-        functions: 100,
-        branches: 100,
-      },
-    },
-  },
-}));
diff --git a/packages/riviere-cli/CLAUDE.md b/packages/riviere-cli/CLAUDE.md
deleted file mode 100644
index 8605836ee..000000000
--- a/packages/riviere-cli/CLAUDE.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# riviere-cli
-
-CLI tool for building and querying Rivière architecture graphs.
-
-Architecture defined in [ADR-002](../../docs/architecture/adr/ADR-002-allowed-folder-structures.md).
-
-## Workflow Prompts
-
-The `docs/workflow/` directory contains AI extraction workflow prompts (step-1 through step-6). These prompts reference CLI commands directly.
-
-**When modifying CLI commands, update the corresponding workflow prompts.**
-
-If a command's flags, behavior, or output format changes, ensure the workflow prompts still work correctly. This keeps the extraction workflow in sync with the CLI.
-
-## Design Philosophy
-
-Default to the most reliable, powerful behavior. Opt-out flags (`--no-*`) for edge cases. Users should get the best experience by default, not discover it when things don't work.
-
-## Layer Pattern
-
-Follows [`development-skills:separation-of-concerns`](https://github.com/NTCoding/claude-skillz/blob/main/separation-of-concerns/SKILL.md) skill. See decision tree (Q1-Q7) for code placement.
-
-## Commands
-
-- `riviere builder <command>` - Graph building commands
-- `riviere query <command>` - Graph query commands
-
-Run `nx generate-docs riviere-cli` to regenerate CLI reference documentation after command changes.
diff --git a/packages/riviere-cli/esbuild.config.mjs b/packages/riviere-cli/esbuild.config.mjs
deleted file mode 100644
index a7864a35e..000000000
--- a/packages/riviere-cli/esbuild.config.mjs
+++ /dev/null
@@ -1,40 +0,0 @@
-import * as esbuild from 'esbuild'
-import { readFileSync } from 'node:fs'
-import {
-  dirname,
-  join,
-} from 'node:path'
-import { fileURLToPath } from 'node:url'
-
-// Resolve package.json relative to this config file, not CWD
-const __dirname = dirname(fileURLToPath(import.meta.url))
-const pkg = JSON.parse(readFileSync(join(__dirname, 'package.json'), 'utf-8'))
-
-// Auto-derive external dependencies from package.json
-// This prevents drift between declared dependencies and bundler config
-const externalDependencies = Object.keys(pkg.dependencies || {})
-  .filter(dep => !dep.startsWith('@living-architecture/')) // Bundle workspace packages
-
-// CLI binary entry point
-await esbuild.build({
-  entryPoints: ['src/shell/bin.ts'],
-  bundle: true,
-  platform: 'node',
-  target: 'node18',
-  format: 'esm',
-  outfile: 'dist/bin.js',
-  banner: {js: '#!/usr/bin/env node',},
-  external: externalDependencies,
-  define: { INJECTED_VERSION: JSON.stringify(pkg.version) },
-})
-
-// Library entry point (no side effects)
-await esbuild.build({
-  entryPoints: ['src/shell/index.ts'],
-  bundle: true,
-  platform: 'node',
-  target: 'node18',
-  format: 'esm',
-  outfile: 'dist/index.js',
-  external: externalDependencies,
-})
diff --git a/packages/riviere-cli/package.json b/packages/riviere-cli/package.json
deleted file mode 100644
index 0c8ff7116..000000000
--- a/packages/riviere-cli/package.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "name": "@living-architecture/riviere-cli",
-  "version": "0.11.3",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/NTCoding/living-architecture.git",
-    "directory": "packages/riviere-cli"
-  },
-  "type": "module",
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/shell/index.d.ts",
-  "exports": {
-    "./package.json": "./package.json",
-    ".": {
-      "@living-architecture/source": "./src/shell/index.ts",
-      "types": "./dist/shell/index.d.ts",
-      "import": "./dist/index.js",
-      "default": "./dist/index.js"
-    }
-  },
-  "files": [
-    "dist",
-    "!**/*.tsbuildinfo"
-  ],
-  "bin": {
-    "riviere": "./dist/bin.js"
-  },
-  "engines": {
-    "node": ">=20"
-  },
-  "dependencies": {
-    "@living-architecture/riviere-builder": "workspace:*",
-    "@living-architecture/riviere-extract-config": "workspace:*",
-    "@living-architecture/riviere-extract-ts": "workspace:*",
-    "@living-architecture/riviere-query": "workspace:*",
-    "@living-architecture/riviere-schema": "workspace:*",
-    "commander": "^14.0.2",
-    "glob": "^11.0.2",
-    "ts-morph": "^24.0.0",
-    "yaml": "^2.7.0"
-  }
-}
diff --git a/packages/riviere-cli/project.json b/packages/riviere-cli/project.json
deleted file mode 100644
index 30cfe3759..000000000
--- a/packages/riviere-cli/project.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "name": "riviere-cli",
-  "targets": {
-    "build": {
-      "executor": "nx:run-commands",
-      "options": {
-        "commands": [
-          "node esbuild.config.mjs",
-          "tsc --emitDeclarationOnly --declaration --declarationDir dist"
-        ],
-        "cwd": "{projectRoot}",
-        "parallel": false
-      },
-      "outputs": ["{projectRoot}/dist"]
-    },
-    "generate-docs": {
-      "executor": "nx:run-commands",
-      "options": {
-        "command": "pnpm exec npx tsx packages/riviere-cli/scripts/generate-docs.ts",
-        "cwd": "{workspaceRoot}"
-      },
-      "dependsOn": ["build"],
-      "outputs": ["{projectRoot}/docs/generated"]
-    },
-    "check-generated-docs": {
-      "executor": "nx:run-commands",
-      "options": {
-        "commands": [
-          "pnpm exec npx tsx packages/riviere-cli/scripts/generate-docs.ts",
-          "git diff --exit-code packages/riviere-cli/docs/generated/ || (echo 'Generated docs are stale. Run: pnpm nx generate-docs riviere-cli' && exit 1)"
-        ],
-        "cwd": "{workspaceRoot}",
-        "parallel": false
-      },
-      "dependsOn": ["build"]
-    },
-    "role-check": {
-      "executor": "nx:run-commands",
-      "dependsOn": ["^build"],
-      "options": {
-        "command": "pnpm exec tsx packages/riviere-role-enforcement/src/shell/bin.ts .riviere/role-enforcement.config.ts --package packages/riviere-cli",
-        "cwd": "{workspaceRoot}"
-      }
-    },
-    "smoke-test": {
-      "executor": "nx:run-commands",
-      "options": {
-        "commands": ["node dist/bin.js --help", "node dist/bin.js extract --help"],
-        "cwd": "{projectRoot}",
-        "parallel": false
-      },
-      "dependsOn": ["build"]
-    }
-  }
-}
diff --git a/packages/riviere-cli/scripts/generate-docs.ts b/packages/riviere-cli/scripts/generate-docs.ts
deleted file mode 100644
index b238796e6..000000000
--- a/packages/riviere-cli/scripts/generate-docs.ts
+++ /dev/null
@@ -1,339 +0,0 @@
-#!/usr/bin/env tsx
-/**
- * CLI Reference Documentation Generator
- *
- * Generates markdown documentation from Commander.js command definitions.
- * Run with: pnpm exec tsx scripts/generate-docs.ts
- */
-
-import type {
-  Command, Argument 
-} from 'commander'
-import {
-  writeFileSync, mkdirSync 
-} from 'node:fs'
-import { join } from 'node:path'
-import { createProgram } from '../src/shell/cli'
-
-interface OptionInfo {
-  flags: string
-  description: string
-  required: boolean
-}
-
-interface ArgumentInfo {
-  name: string
-  description: string
-  required: boolean
-}
-
-interface CommandInfo {
-  name: string
-  fullName: string
-  description: string
-  options: OptionInfo[]
-  arguments: ArgumentInfo[]
-  examples: readonly string[]
-}
-
-interface CommandWithRegisteredArgs {readonly registeredArguments?: readonly Argument[]}
-
-interface CommandWithEvents {readonly _events?: { readonly afterHelp?: unknown }}
-
-type AfterHelpContext = {
-  readonly command: Command
-  readonly write: (str: string) => void
-}
-
-function extractOptions(cmd: Command): readonly OptionInfo[] {
-  return cmd.options
-    .filter((opt) => opt.long !== '--help' && opt.long !== '--version')
-    .map((opt) => ({
-      flags: opt.flags,
-      description: opt.description ?? '(no description)',
-      required: opt.mandatory,
-    }))
-}
-
-function hasRegisteredArguments(cmd: Command): cmd is Command & CommandWithRegisteredArgs {
-  return 'registeredArguments' in cmd && Array.isArray(cmd.registeredArguments)
-}
-
-function extractArguments(cmd: Command): readonly ArgumentInfo[] {
-  if (!hasRegisteredArguments(cmd)) {
-    return []
-  }
-
-  return cmd.registeredArguments.map((arg) => ({
-    name: arg.name(),
-    description: arg.description,
-    required: arg.required,
-  }))
-}
-
-function isAfterHelpCallback(fn: unknown): fn is (ctx: AfterHelpContext) => string | void {
-  return typeof fn === 'function'
-}
-
-function callAfterHelpHandler(afterHelp: unknown, cmd: Command): string {
-  if (isAfterHelpCallback(afterHelp)) {
-    const parts: string[] = []
-    const context: AfterHelpContext = {
-      command: cmd,
-      write: (str: string) => {
-        parts.push(str)
-      },
-    }
-    const result = afterHelp(context)
-    return typeof result === 'string' ? result : parts.join('')
-  }
-
-  if (typeof afterHelp === 'string') {
-    return afterHelp
-  }
-
-  return ''
-}
-
-function parseExamplesFromHelpText(helpText: string): readonly string[] {
-  const lines = helpText.split('\n')
-  const examples: string[] = []
-  const examplesStartIndex = lines.findIndex((line) => line.trim().startsWith('Examples:'))
-
-  if (examplesStartIndex === -1) {
-    return examples
-  }
-
-  const exampleLines = lines.slice(examplesStartIndex + 1)
-  const exampleParts: string[] = []
-
-  for (const line of exampleLines) {
-    const trimmed = line.trim()
-    const isNewExample = trimmed.startsWith('$') || trimmed.startsWith('#')
-    const isContinuation = trimmed && exampleParts.length > 0 && !isNewExample
-    const isBlankAfterExample = !trimmed && exampleParts.length > 0
-
-    if (isNewExample) {
-      if (exampleParts.length > 0) {
-        examples.push(exampleParts.join('\n  ').trim())
-        exampleParts.length = 0
-      }
-      exampleParts.push(trimmed)
-    } else if (isContinuation) {
-      exampleParts.push(trimmed)
-    } else if (isBlankAfterExample) {
-      examples.push(exampleParts.join('\n  ').trim())
-      exampleParts.length = 0
-    }
-  }
-
-  if (exampleParts.length > 0) {
-    examples.push(exampleParts.join('\n  ').trim())
-  }
-
-  return examples
-}
-
-function hasEvents(cmd: Command): cmd is Command & CommandWithEvents {
-  return '_events' in cmd && typeof cmd._events === 'object' && cmd._events !== null
-}
-
-function extractExamples(cmd: Command): readonly string[] {
-  if (!hasEvents(cmd)) {
-    return []
-  }
-
-  const afterHelp = cmd._events?.afterHelp
-  if (!afterHelp) {
-    return []
-  }
-
-  try {
-    const helpText = callAfterHelpHandler(afterHelp, cmd)
-    return helpText ? parseExamplesFromHelpText(helpText) : []
-  } catch {
-    return []
-  }
-}
-
-function extractCommandInfo(cmd: Command, parentName: string): CommandInfo {
-  const fullName = parentName ? `${parentName} ${cmd.name()}` : cmd.name()
-
-  return {
-    name: cmd.name(),
-    fullName,
-    description: cmd.description() ?? '(no description)',
-    options: [...extractOptions(cmd)],
-    arguments: [...extractArguments(cmd)],
-    examples: extractExamples(cmd),
-  }
-}
-
-function collectCommands(cmd: Command, parentName: string): readonly CommandInfo[] {
-  const fullName = parentName ? `${parentName} ${cmd.name()}` : cmd.name()
-
-  return cmd.commands.flatMap((subcmd) =>
-    subcmd.commands.length > 0
-      ? collectCommands(subcmd, fullName)
-      : [extractCommandInfo(subcmd, fullName)],
-  )
-}
-
-function formatOption(opt: OptionInfo): string {
-  return `| \`${opt.flags}\` | ${opt.description} |`
-}
-
-function generateCommandMarkdown(cmd: CommandInfo): string {
-  const lines: string[] = []
-
-  lines.push(`### \`${cmd.name}\``)
-  lines.push('')
-  lines.push(cmd.description)
-  lines.push('')
-
-  const args = cmd.arguments.map((a) => (a.required ? `<${a.name}>` : `[${a.name}]`)).join(' ')
-  const syntax = `${cmd.fullName}${args ? ' ' + args : ''} [options]`
-  lines.push('```bash')
-  lines.push(syntax)
-  lines.push('```')
-  lines.push('')
-
-  if (cmd.arguments.length > 0) {
-    lines.push('**Arguments:**')
-    lines.push('| Argument | Description |')
-    lines.push('|----------|-------------|')
-    for (const arg of cmd.arguments) {
-      lines.push(`| \`<${arg.name}>\` | ${arg.description} |`)
-    }
-    lines.push('')
-  }
-
-  const requiredOpts = cmd.options.filter((o) => o.required)
-  if (requiredOpts.length > 0) {
-    lines.push('**Required:**')
-    lines.push('| Flag | Description |')
-    lines.push('|------|-------------|')
-    for (const opt of requiredOpts) {
-      lines.push(formatOption(opt))
-    }
-    lines.push('')
-  }
-
-  const optionalOpts = cmd.options.filter((o) => !o.required)
-  if (optionalOpts.length > 0) {
-    lines.push('**Optional:**')
-    lines.push('| Flag | Description |')
-    lines.push('|------|-------------|')
-    for (const opt of optionalOpts) {
-      lines.push(formatOption(opt))
-    }
-    lines.push('')
-  }
-
-  if (cmd.examples.length > 0) {
-    lines.push('**Examples:**')
-    lines.push('```bash')
-    for (const example of cmd.examples) {
-      const cleaned = example.replace(/^\$\s*/, '').replace(/^#\s*/, '# ')
-      lines.push(cleaned)
-    }
-    lines.push('```')
-    lines.push('')
-  }
-
-  lines.push('---')
-  lines.push('')
-
-  return lines.join('\n')
-}
-
-function generateReference(): string {
-  const program = createProgram()
-  const allCommands = collectCommands(program, '')
-
-  const builderCommands = allCommands.filter((c) => c.fullName.startsWith('riviere builder'))
-  const queryCommands = allCommands.filter((c) => c.fullName.startsWith('riviere query'))
-  const extractCommands = allCommands.filter((c) => c.fullName.startsWith('riviere extract'))
-
-  const lines: string[] = []
-
-  lines.push('---')
-  lines.push('pageClass: reference')
-  lines.push('---')
-  lines.push('')
-  lines.push('# CLI Command Reference')
-  lines.push('')
-  lines.push('Complete documentation for all Riviere CLI commands.')
-  lines.push('')
-
-  lines.push('## Installation')
-  lines.push('')
-  lines.push('```bash')
-  lines.push('npm install @living-architecture/riviere-cli')
-  lines.push('```')
-  lines.push('')
-
-  lines.push('## Usage')
-  lines.push('')
-  lines.push('```bash')
-  lines.push('riviere builder <command> [options]  # Graph building commands')
-  lines.push('riviere query <command> [options]    # Graph query commands')
-  lines.push('riviere extract <command> [options]  # Component extraction commands')
-  lines.push('```')
-  lines.push('')
-
-  lines.push('## Exit Codes')
-  lines.push('')
-  lines.push('- `0`: Success (including warnings)')
-  lines.push('- `1`: Error or failed validation/consistency')
-  lines.push('')
-  lines.push('---')
-  lines.push('')
-
-  lines.push('## Builder Commands')
-  lines.push('')
-  lines.push('Commands for constructing architecture graphs.')
-  lines.push('')
-
-  for (const cmd of builderCommands) {
-    lines.push(generateCommandMarkdown(cmd))
-  }
-
-  lines.push('## Query Commands')
-  lines.push('')
-  lines.push('Commands for analyzing and querying graphs.')
-  lines.push('')
-
-  for (const cmd of queryCommands) {
-    lines.push(generateCommandMarkdown(cmd))
-  }
-
-  lines.push('## Extract Commands')
-  lines.push('')
-  lines.push('Commands for extracting architectural components from source code.')
-  lines.push('')
-
-  for (const cmd of extractCommands) {
-    lines.push(generateCommandMarkdown(cmd))
-  }
-
-  lines.push('## See Also')
-  lines.push('')
-  lines.push('- [CLI Quick Start](/get-started/cli-quick-start)')
-  lines.push('- [Extraction Workflow](/extract/)')
-  lines.push('- [Graph Structure](/reference/schema/graph-structure)')
-  lines.push('')
-
-  return lines.join('\n')
-}
-
-const outputDir = join(import.meta.dirname, '..', 'docs', 'generated')
-const outputPath = join(outputDir, 'cli-reference.md')
-
-mkdirSync(outputDir, { recursive: true })
-
-const content = generateReference()
-writeFileSync(outputPath, content, 'utf-8')
-
-console.log(`Generated: ${outputPath}`)
-console.log(`Lines: ${content.split('\n').length}`)
diff --git a/packages/riviere-cli/src/entrypoint/_platform/cli/component-types.spec.ts b/packages/riviere-cli/src/entrypoint/_platform/cli/component-types.spec.ts
deleted file mode 100644
index ea99ba808..000000000
--- a/packages/riviere-cli/src/entrypoint/_platform/cli/component-types.spec.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-import {
-  describe, expect, it 
-} from 'vitest'
-import {
-  isValidComponentType,
-  isValidLinkType,
-  isValidApiType,
-  isValidSystemType,
-  normalizeComponentType,
-  normalizeToSchemaComponentType,
-  VALID_COMPONENT_TYPES,
-  VALID_LINK_TYPES,
-  VALID_API_TYPES,
-  VALID_SYSTEM_TYPES,
-} from './component-types'
-
-describe('component-types', () => {
-  describe('VALID_COMPONENT_TYPES', () => {
-    it('contains all expected component types', () => {
-      expect(VALID_COMPONENT_TYPES).toStrictEqual([
-        'UI',
-        'API',
-        'UseCase',
-        'DomainOp',
-        'Event',
-        'EventHandler',
-        'Custom',
-      ])
-    })
-  })
-
-  describe('isValidComponentType', () => {
-    it.each(VALID_COMPONENT_TYPES)('accepts %s as valid', (type) => {
-      expect(isValidComponentType(type)).toBe(true)
-    })
-
-    it.each(VALID_COMPONENT_TYPES)('accepts lowercase %s as valid', (type) => {
-      expect(isValidComponentType(type.toLowerCase())).toBe(true)
-    })
-
-    it('rejects invalid component types', () => {
-      expect(isValidComponentType('Invalid')).toBe(false)
-      expect(isValidComponentType('unknown')).toBe(false)
-      expect(isValidComponentType('')).toBe(false)
-    })
-  })
-
-  describe('normalizeComponentType', () => {
-    it.each([
-      ['UI', 'ui'],
-      ['ui', 'ui'],
-      ['API', 'api'],
-      ['UseCase', 'usecase'],
-      ['USECASE', 'usecase'],
-      ['DomainOp', 'domainop'],
-      ['Event', 'event'],
-      ['EventHandler', 'eventhandler'],
-      ['Custom', 'custom'],
-    ])('normalizes %s to %s', (input, expected) => {
-      expect(normalizeComponentType(input)).toBe(expected)
-    })
-
-    it('throws for invalid component type', () => {
-      expect(() => normalizeComponentType('Invalid')).toThrow(/Invalid component type/)
-    })
-  })
-
-  describe('normalizeToSchemaComponentType', () => {
-    it.each([
-      ['UI', 'UI'],
-      ['ui', 'UI'],
-      ['API', 'API'],
-      ['api', 'API'],
-      ['UseCase', 'UseCase'],
-      ['usecase', 'UseCase'],
-      ['DomainOp', 'DomainOp'],
-      ['domainop', 'DomainOp'],
-      ['Event', 'Event'],
-      ['EventHandler', 'EventHandler'],
-      ['Custom', 'Custom'],
-    ])('normalizes %s to schema type %s', (input, expected) => {
-      expect(normalizeToSchemaComponentType(input)).toBe(expected)
-    })
-
-    it('throws for invalid component type', () => {
-      expect(() => normalizeToSchemaComponentType('InvalidType')).toThrow(
-        /Expected valid ComponentType/,
-      )
-    })
-  })
-
-  describe('VALID_SYSTEM_TYPES', () => {
-    it('contains every supported system type', () => {
-      expect(VALID_SYSTEM_TYPES).toStrictEqual(['domain', 'bff', 'ui', 'external-service', 'other'])
-    })
-  })
-
-  describe('isValidSystemType', () => {
-    it.each(VALID_SYSTEM_TYPES)('accepts %s as valid', (type) => {
-      expect(isValidSystemType(type)).toBe(true)
-    })
-
-    it('rejects invalid system types', () => {
-      expect(isValidSystemType('backend')).toBe(false)
-      expect(isValidSystemType('DOMAIN')).toBe(false)
-      expect(isValidSystemType('')).toBe(false)
-    })
-  })
-
-  describe('VALID_API_TYPES', () => {
-    it('contains REST, GraphQL, and other', () => {
-      expect(VALID_API_TYPES).toStrictEqual(['REST', 'GraphQL', 'other'])
-    })
-  })
-
-  describe('isValidApiType', () => {
-    it.each(VALID_API_TYPES)('accepts %s as valid', (type) => {
-      expect(isValidApiType(type)).toBe(true)
-    })
-
-    it.each(VALID_API_TYPES)('accepts case variations of %s', (type) => {
-      expect(isValidApiType(type.toLowerCase())).toBe(true)
-      expect(isValidApiType(type.toUpperCase())).toBe(true)
-    })
-
-    it('rejects invalid API types', () => {
-      expect(isValidApiType('SOAP')).toBe(false)
-      expect(isValidApiType('')).toBe(false)
-    })
-  })
-
-  describe('VALID_LINK_TYPES', () => {
-    it('contains sync and async', () => {
-      expect(VALID_LINK_TYPES).toStrictEqual(['sync', 'async'])
-    })
-  })
-
-  describe('isValidLinkType', () => {
-    it('accepts sync as valid', () => {
-      expect(isValidLinkType('sync')).toBe(true)
-    })
-
-    it('accepts async as valid', () => {
-      expect(isValidLinkType('async')).toBe(true)
-    })
-
-    it('rejects invalid link types', () => {
-      expect(isValidLinkType('synchronous')).toBe(false)
-      expect(isValidLinkType('SYNC')).toBe(false)
-      expect(isValidLinkType('')).toBe(false)
-    })
-  })
-})
diff --git a/packages/riviere-cli/src/entrypoint/_platform/cli/component-types.ts b/packages/riviere-cli/src/entrypoint/_platform/cli/component-types.ts
deleted file mode 100644
index 529c3d80a..000000000
--- a/packages/riviere-cli/src/entrypoint/_platform/cli/component-types.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-export const VALID_COMPONENT_TYPES = [
-  'UI',
-  'API',
-  'UseCase',
-  'DomainOp',
-  'Event',
-  'EventHandler',
-  'Custom',
-] as const
-
-type ComponentTypeFlag = (typeof VALID_COMPONENT_TYPES)[number]
-
-class InvalidComponentTypeError extends Error {
-  readonly validTypes: readonly string[]
-  readonly value: string
-
-  constructor(value: string, validTypes: readonly string[]) {
-    super(`Expected valid ComponentType. Got: ${value}. Valid types: ${validTypes.join(', ')}`)
-    this.name = 'InvalidComponentTypeError'
-    this.value = value
-    this.validTypes = validTypes
-  }
-}
-
-class InvalidNormalizedComponentTypeError extends Error {
-  readonly validTypes: string[]
-  readonly value: string
-
-  constructor(value: string, validTypes: string[]) {
-    super(`Invalid component type: ${value}. Valid types: ${validTypes.join(', ')}`)
-    this.name = 'InvalidNormalizedComponentTypeError'
-    this.value = value
-    this.validTypes = validTypes
-  }
-}
-
-/** @riviere-role entrypoint-cli-input-parser */
-export function isValidComponentType(value: string): value is ComponentTypeFlag {
-  return VALID_COMPONENT_TYPES.some((t) => t.toLowerCase() === value.toLowerCase())
-}
-
-/** @riviere-role entrypoint-cli-input-parser */
-export function normalizeToSchemaComponentType(value: string): ComponentTypeFlag {
-  const found = VALID_COMPONENT_TYPES.find((t) => t.toLowerCase() === value.toLowerCase())
-  if (found === undefined) {
-    throw new InvalidComponentTypeError(value, VALID_COMPONENT_TYPES)
-  }
-  return found
-}
-
-/** @riviere-role entrypoint-cli-input-parser */
-export function normalizeComponentType(value: string): string {
-  const typeMap: Record<string, string> = {
-    api: 'api',
-    custom: 'custom',
-    domainop: 'domainop',
-    event: 'event',
-    eventhandler: 'eventhandler',
-    ui: 'ui',
-    usecase: 'usecase',
-  }
-  const normalized = typeMap[value.toLowerCase()]
-  if (normalized === undefined) {
-    throw new InvalidNormalizedComponentTypeError(value, Object.keys(typeMap))
-  }
-  return normalized
-}
-
-export const VALID_SYSTEM_TYPES = ['domain', 'bff', 'ui', 'external-service', 'other'] as const
-type SystemTypeFlag = (typeof VALID_SYSTEM_TYPES)[number]
-
-/** @riviere-role entrypoint-cli-input-parser */
-export function isValidSystemType(value: string): value is SystemTypeFlag {
-  return VALID_SYSTEM_TYPES.some((t) => t === value)
-}
-
-export const VALID_API_TYPES = ['REST', 'GraphQL', 'other'] as const
-type ApiTypeFlag = (typeof VALID_API_TYPES)[number]
-
-/** @riviere-role entrypoint-cli-input-parser */
-export function isValidApiType(value: string): value is ApiTypeFlag {
-  return VALID_API_TYPES.some((t) => t.toLowerCase() === value.toLowerCase())
-}
-
-export const VALID_LINK_TYPES = ['sync', 'async'] as const
-type LinkType = (typeof VALID_LINK_TYPES)[number]
-
-/** @riviere-role entrypoint-cli-input-parser */
-export function isValidLinkType(value: string): value is LinkType {
-  return VALID_LINK_TYPES.some((t) => t === value)
-}
diff --git a/packages/riviere-cli/src/features/builder/commands/add-component-result.ts b/packages/riviere-cli/src/features/builder/commands/add-component-result.ts
deleted file mode 100644
index b53790138..000000000
--- a/packages/riviere-cli/src/features/builder/commands/add-component-result.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/** @riviere-role command-use-case-result-value */
-export type AddComponentErrorCode =
-  | 'VALIDATION_ERROR'
-  | 'GRAPH_NOT_FOUND'
-  | 'DOMAIN_NOT_FOUND'
-  | 'CUSTOM_TYPE_NOT_FOUND'
-  | 'DUPLICATE_COMPONENT'
-
-/** @riviere-role command-use-case-result */
-export type AddComponentResult =
-  | {
-    success: true
-    componentId: string
-  }
-  | {
-    success: false
-    code: AddComponentErrorCode
-    message: string
-  }
diff --git a/packages/riviere-cli/src/features/builder/commands/add-component.spec.ts b/packages/riviere-cli/src/features/builder/commands/add-component.spec.ts
deleted file mode 100644
index be86ff21f..000000000
--- a/packages/riviere-cli/src/features/builder/commands/add-component.spec.ts
+++ /dev/null
@@ -1,174 +0,0 @@
-import {
-  writeFile, mkdir 
-} from 'node:fs/promises'
-import { join } from 'node:path'
-import {
-  describe, expect, it 
-} from 'vitest'
-import { AddComponent } from './add-component'
-import { RiviereBuilderRepository } from '../data-access/riviere-builder-repository'
-import type { AddComponentErrorCode } from './add-component-result'
-import {
-  type TestContext,
-  createTestContext,
-  setupCommandTest,
-  createGraphWithDomain,
-} from '../../../platform/__fixtures__/command-test-fixtures'
-
-describe('addComponent command', () => {
-  const ctx: TestContext = createTestContext()
-  setupCommandTest(ctx)
-
-  const baseInput = {
-    componentType: 'UI',
-    name: 'TestComponent',
-    domain: 'test-domain',
-    module: 'test-module',
-    repository: 'test-repo',
-    filePath: '/path/to/file.ts',
-  }
-
-  function inputWithGraphPath(overrides: Partial<typeof baseInput> = {}) {
-    return {
-      ...baseInput,
-      graphPathOption: join(ctx.testDir, '.riviere', 'graph.json'),
-      route: '/test',
-      ...overrides,
-    }
-  }
-
-  function failureShape(code: AddComponentErrorCode) {
-    return {
-      success: false as const,
-      code,
-    }
-  }
-
-  describe('component type validation', () => {
-    it.each([
-      ['invalid string', 'INVALID'],
-      ['empty', ''],
-      ['whitespace', '   '],
-      ['special chars', 'UI<script>'],
-      ['typo', 'UseCasee'],
-    ])('returns VALIDATION_ERROR when componentType is %s', async (_label, value) => {
-      const result = new AddComponent(new RiviereBuilderRepository()).execute({
-        ...inputWithGraphPath(),
-        componentType: value,
-      })
-
-      expect(result).toMatchObject({
-        ...failureShape('VALIDATION_ERROR'),
-        message: expect.stringContaining('Invalid component type'),
-      })
-    })
-  })
-
-  describe('line number validation', () => {
-    it.each([
-      ['NaN', NaN],
-      ['Infinity', Infinity],
-      ['negative Infinity', -Infinity],
-      ['fractional', 3.14],
-      ['negative', -1],
-      ['zero', 0],
-      ['unsafe integer', Number.MAX_SAFE_INTEGER + 1],
-    ])('returns VALIDATION_ERROR when lineNumber is %s', async (_label, value) => {
-      const result = new AddComponent(new RiviereBuilderRepository()).execute({
-        ...inputWithGraphPath(),
-        lineNumber: value,
-      })
-
-      expect(result).toMatchObject({
-        ...failureShape('VALIDATION_ERROR'),
-        message: expect.stringContaining('Invalid line number'),
-      })
-    })
-
-    it.each([
-      ['small positive', 1],
-      ['typical', 42],
-      ['large', Number.MAX_SAFE_INTEGER],
-    ])('valid lineNumber (%s) reaches graph check', async (_label, value) => {
-      const result = new AddComponent(new RiviereBuilderRepository()).execute({
-        ...inputWithGraphPath(),
-        lineNumber: value,
-      })
-
-      expect(result).toMatchObject(failureShape('GRAPH_NOT_FOUND'))
-    })
-  })
-
-  describe('column number validation', () => {
-    it.each([
-      ['NaN', NaN],
-      ['Infinity', Infinity],
-      ['negative Infinity', -Infinity],
-      ['fractional', 3.14],
-      ['negative', -1],
-      ['zero', 0],
-      ['unsafe integer', Number.MAX_SAFE_INTEGER + 1],
-    ])('returns VALIDATION_ERROR when columnNumber is %s', async (_label, value) => {
-      const result = new AddComponent(new RiviereBuilderRepository()).execute({
-        ...inputWithGraphPath(),
-        columnNumber: value,
-      })
-
-      expect(result).toMatchObject({
-        ...failureShape('VALIDATION_ERROR'),
-        message: expect.stringContaining('Invalid column number'),
-      })
-    })
-
-    it.each([
-      ['small positive', 1],
-      ['typical', 42],
-      ['large', Number.MAX_SAFE_INTEGER],
-    ])('valid columnNumber (%s) reaches graph check', async (_label, value) => {
-      const result = new AddComponent(new RiviereBuilderRepository()).execute({
-        ...inputWithGraphPath(),
-        columnNumber: value,
-      })
-
-      expect(result).toMatchObject(failureShape('GRAPH_NOT_FOUND'))
-    })
-  })
-
-  describe('malformed JSON handling', () => {
-    it('returns VALIDATION_ERROR when graph file contains invalid JSON', async () => {
-      const graphDir = join(ctx.testDir, '.riviere')
-      await mkdir(graphDir, { recursive: true })
-      await writeFile(join(graphDir, 'graph.json'), 'not valid json {{{', 'utf-8')
-
-      const result = new AddComponent(new RiviereBuilderRepository()).execute(inputWithGraphPath())
-
-      expect(result).toMatchObject({
-        ...failureShape('VALIDATION_ERROR'),
-        message: expect.stringContaining('invalid JSON'),
-      })
-    })
-  })
-
-  describe('successful component addition', () => {
-    it('returns componentId for UI component in valid graph', async () => {
-      await createGraphWithDomain(ctx.testDir, 'test-domain')
-
-      const result = new AddComponent(new RiviereBuilderRepository()).execute(inputWithGraphPath())
-
-      expect(result).toMatchObject({
-        success: true,
-        componentId: expect.any(String),
-      })
-    })
-  })
-
-  describe('domain not found error', () => {
-    it('returns DOMAIN_NOT_FOUND when domain does not exist', async () => {
-      await createGraphWithDomain(ctx.testDir, 'other-domain')
-
-      const result = new AddComponent(new RiviereBuilderRepository()).execute(inputWithGraphPath())
-
-      expect(result).toMatchObject(failureShape('DOMAIN_NOT_FOUND'))
-    })
-  })
-})
diff --git a/packages/riviere-cli/src/features/builder/commands/add-component.ts b/packages/riviere-cli/src/features/builder/commands/add-component.ts
deleted file mode 100644
index c93cf4f4d..000000000
--- a/packages/riviere-cli/src/features/builder/commands/add-component.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import {
-  CustomTypeNotFoundError,
-  DomainNotFoundError,
-  DuplicateComponentError,
-} from '@living-architecture/riviere-builder'
-import { addComponentToBuilder } from '../../../platform/domain/add-component'
-import {
-  createDomainInput,
-  isAddComponentValidationError,
-} from '../../../platform/domain/add-component-input-factory'
-import { GraphCorruptedError } from '../../../platform/domain/graph-corrupted-error'
-import { GraphNotFoundError } from '../../../platform/domain/graph-not-found-error'
-import { RiviereBuilderRepository } from '../data-access/riviere-builder-repository'
-import type { AddComponentInput } from './add-component-input'
-import type {
-  AddComponentErrorCode, AddComponentResult 
-} from './add-component-result'
-
-const validComponentTypes = new Set([
-  'ui',
-  'api',
-  'usecase',
-  'domainop',
-  'event',
-  'eventhandler',
-  'custom',
-])
-
-/** @riviere-role command-use-case */
-export class AddComponent {
-  constructor(private readonly repository: RiviereBuilderRepository) {}
-
-  execute(input: AddComponentInput): AddComponentResult {
-    if (!validComponentTypes.has(input.componentType.toLowerCase())) {
-      return failure('VALIDATION_ERROR', `Invalid component type: ${input.componentType}`)
-    }
-
-    if (
-      input.lineNumber !== undefined &&
-      (!Number.isSafeInteger(input.lineNumber) || input.lineNumber < 1)
-    ) {
-      return failure('VALIDATION_ERROR', 'Invalid line number: must be a positive integer')
-    }
-
-    if (
-      input.columnNumber !== undefined &&
-      (!Number.isSafeInteger(input.columnNumber) || input.columnNumber < 1)
-    ) {
-      return failure('VALIDATION_ERROR', 'Invalid column number: must be a positive integer')
-    }
-
-    try {
-      const builder = this.repository.load(input.graphPathOption)
-      const componentId = addComponentToBuilder(builder, createDomainInput(input))
-      this.repository.save(builder)
-      return {
-        success: true,
-        componentId,
-      }
-    } catch (error) {
-      if (error instanceof GraphNotFoundError) return failure('GRAPH_NOT_FOUND', error.message)
-      if (error instanceof GraphCorruptedError)
-        return failure('VALIDATION_ERROR', 'Graph file contains invalid JSON')
-      return mapError(error)
-    }
-  }
-}
-
-function mapError(error: unknown): AddComponentResult {
-  if (error instanceof DomainNotFoundError) {
-    return failure('DOMAIN_NOT_FOUND', error.message)
-  }
-  if (error instanceof CustomTypeNotFoundError) {
-    return failure('CUSTOM_TYPE_NOT_FOUND', error.message)
-  }
-  if (error instanceof DuplicateComponentError) {
-    return failure('DUPLICATE_COMPONENT', error.message)
-  }
-  if (isAddComponentValidationError(error)) {
-    return failure('VALIDATION_ERROR', error.message)
-  }
-  if (error instanceof Error) {
-    return failure('VALIDATION_ERROR', error.message)
-  }
-  throw error
-}
-
-function failure(code: AddComponentErrorCode, message: string): AddComponentResult {
-  return {
-    success: false,
-    code,
-    message,
-  }
-}
diff --git a/packages/riviere-cli/src/features/builder/commands/add-domain-input.ts b/packages/riviere-cli/src/features/builder/commands/add-domain-input.ts
deleted file mode 100644
index baf00e0b3..000000000
--- a/packages/riviere-cli/src/features/builder/commands/add-domain-input.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { SystemType } from '@living-architecture/riviere-schema'
-
-/** @riviere-role command-use-case-input */
-export interface AddDomainInput {
-  description: string
-  graphPathOption: string | undefined
-  name: string
-  systemType: SystemType
-}
diff --git a/packages/riviere-cli/src/features/builder/commands/add-domain-result.ts b/packages/riviere-cli/src/features/builder/commands/add-domain-result.ts
deleted file mode 100644
index 93517ced4..000000000
--- a/packages/riviere-cli/src/features/builder/commands/add-domain-result.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/** @riviere-role command-use-case-result-value */
-export type AddDomainErrorCode = 'DUPLICATE_DOMAIN' | 'GRAPH_CORRUPTED' | 'GRAPH_NOT_FOUND'
-
-/** @riviere-role command-use-case-result */
-export type AddDomainResult =
-  | {
-    description: string
-    name: string
-    success: true
-    systemType: string
-  }
-  | {
-    code: AddDomainErrorCode
-    message: string
-    success: false
-  }
diff --git a/packages/riviere-cli/src/features/builder/commands/add-domain.ts b/packages/riviere-cli/src/features/builder/commands/add-domain.ts
deleted file mode 100644
index 4d84ebf85..000000000
--- a/packages/riviere-cli/src/features/builder/commands/add-domain.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { DuplicateDomainError } from '@living-architecture/riviere-builder'
-import { GraphCorruptedError } from '../../../platform/domain/graph-corrupted-error'
-import { GraphNotFoundError } from '../../../platform/domain/graph-not-found-error'
-import { RiviereBuilderRepository } from '../data-access/riviere-builder-repository'
-import type { AddDomainInput } from './add-domain-input'
-import type {
-  AddDomainErrorCode, AddDomainResult 
-} from './add-domain-result'
-
-/** @riviere-role command-use-case */
-export class AddDomain {
-  constructor(private readonly repository: RiviereBuilderRepository) {}
-
-  execute(input: AddDomainInput): AddDomainResult {
-    try {
-      const builder = this.repository.load(input.graphPathOption)
-      builder.addDomain({
-        description: input.description,
-        name: input.name,
-        systemType: input.systemType,
-      })
-      this.repository.save(builder)
-      return {
-        description: input.description,
-        name: input.name,
-        success: true,
-        systemType: input.systemType,
-      }
-    } catch (error) {
-      if (error instanceof GraphNotFoundError) {
-        return failure('GRAPH_NOT_FOUND', error.message)
-      }
-      if (error instanceof GraphCorruptedError) {
-        return failure('GRAPH_CORRUPTED', 'Graph file contains invalid JSON')
-      }
-      if (error instanceof DuplicateDomainError) {
-        return failure('DUPLICATE_DOMAIN', error.message)
-      }
-      throw error
-    }
-  }
-}
-
-function failure(code: AddDomainErrorCode, message: string): AddDomainResult {
-  return {
-    code,
-    message,
-    success: false,
-  }
-}
diff --git a/packages/riviere-cli/src/features/builder/commands/add-source-result.ts b/packages/riviere-cli/src/features/builder/commands/add-source-result.ts
deleted file mode 100644
index 1eda171af..000000000
--- a/packages/riviere-cli/src/features/builder/commands/add-source-result.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/** @riviere-role command-use-case-result-value */
-export type AddSourceErrorCode = 'GRAPH_CORRUPTED' | 'GRAPH_NOT_FOUND'
-
-/** @riviere-role command-use-case-result */
-export type AddSourceResult =
-  | {
-    repository: string
-    success: true
-  }
-  | {
-    code: AddSourceErrorCode
-    message: string
-    success: false
-  }
diff --git a/packages/riviere-cli/src/features/builder/commands/check-consistency-input.ts b/packages/riviere-cli/src/features/builder/commands/check-consistency-input.ts
deleted file mode 100644
index a8fccb7c4..000000000
--- a/packages/riviere-cli/src/features/builder/commands/check-consistency-input.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/** @riviere-role command-use-case-input */
-export interface CheckConsistencyInput {graphPathOption: string | undefined}
diff --git a/packages/riviere-cli/src/features/builder/commands/check-consistency-result.ts b/packages/riviere-cli/src/features/builder/commands/check-consistency-result.ts
deleted file mode 100644
index 5cf54437c..000000000
--- a/packages/riviere-cli/src/features/builder/commands/check-consistency-result.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import type { RiviereBuilder } from '@living-architecture/riviere-builder'
-
-/** @riviere-role command-use-case-result-value */
-export type CheckConsistencyErrorCode = 'GRAPH_CORRUPTED' | 'GRAPH_NOT_FOUND'
-
-/** @riviere-role command-use-case-result-value */
-export type BuilderWarnings = ReturnType<RiviereBuilder['warnings']>
-
-/** @riviere-role command-use-case-result */
-export type CheckConsistencyResult =
-  | {
-    consistent: boolean
-    success: true
-    warnings: BuilderWarnings
-  }
-  | {
-    code: CheckConsistencyErrorCode
-    message: string
-    success: false
-  }
diff --git a/packages/riviere-cli/src/features/builder/commands/component-checklist-result.ts b/packages/riviere-cli/src/features/builder/commands/component-checklist-result.ts
deleted file mode 100644
index 6b6ab9f61..000000000
--- a/packages/riviere-cli/src/features/builder/commands/component-checklist-result.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/** @riviere-role command-use-case-result-value */
-export interface ChecklistComponent {
-  domain: string
-  id: string
-  name: string
-  type: string
-}
-
-/** @riviere-role command-use-case-result-value */
-export type ComponentChecklistErrorCode = 'GRAPH_CORRUPTED' | 'GRAPH_NOT_FOUND'
-
-/** @riviere-role command-use-case-result */
-export type ComponentChecklistResult =
-  | {
-    components: ChecklistComponent[]
-    success: true
-    total: number
-  }
-  | {
-    code: ComponentChecklistErrorCode
-    message: string
-    success: false
-  }
diff --git a/packages/riviere-cli/src/features/builder/commands/component-checklist.ts b/packages/riviere-cli/src/features/builder/commands/component-checklist.ts
deleted file mode 100644
index 7c7e87624..000000000
--- a/packages/riviere-cli/src/features/builder/commands/component-checklist.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { GraphCorruptedError } from '../../../platform/domain/graph-corrupted-error'
-import { GraphNotFoundError } from '../../../platform/domain/graph-not-found-error'
-import { RiviereBuilderRepository } from '../data-access/riviere-builder-repository'
-import type { ComponentChecklistInput } from './component-checklist-input'
-import type {
-  ComponentChecklistErrorCode,
-  ComponentChecklistResult,
-} from './component-checklist-result'
-
-/** @riviere-role command-use-case */
-export class ComponentChecklist {
-  constructor(private readonly repository: RiviereBuilderRepository) {}
-
-  execute(input: ComponentChecklistInput): ComponentChecklistResult {
-    try {
-      const builder = this.repository.load(input.graphPathOption)
-      const allComponents = builder.query().components()
-      const filteredComponents =
-        input.type === undefined
-          ? allComponents
-          : allComponents.filter((component) => component.type === input.type)
-      const components = filteredComponents.map((component) => ({
-        domain: component.domain,
-        id: component.id,
-        name: component.name,
-        type: component.type,
-      }))
-      return {
-        components,
-        success: true,
-        total: components.length,
-      }
-    } catch (error) {
-      if (error instanceof GraphNotFoundError) {
-        return failure('GRAPH_NOT_FOUND', error.message)
-      }
-      if (error instanceof GraphCorruptedError) {
-        return failure('GRAPH_CORRUPTED', 'Graph file contains invalid JSON')
-      }
-      throw error
-    }
-  }
-}
-
-function failure(code: ComponentChecklistErrorCode, message: string): ComponentChecklistResult {
-  return {
-    code,
-    message,
-    success: false,
-  }
-}
diff --git a/packages/riviere-cli/src/features/builder/commands/component-summary-input.ts b/packages/riviere-cli/src/features/builder/commands/component-summary-input.ts
deleted file mode 100644
index e28b139c9..000000000
--- a/packages/riviere-cli/src/features/builder/commands/component-summary-input.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/** @riviere-role command-use-case-input */
-export interface ComponentSummaryInput {graphPathOption: string | undefined}
diff --git a/packages/riviere-cli/src/features/builder/commands/component-summary-result.ts b/packages/riviere-cli/src/features/builder/commands/component-summary-result.ts
deleted file mode 100644
index e39d97fa8..000000000
--- a/packages/riviere-cli/src/features/builder/commands/component-summary-result.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { RiviereBuilder } from '@living-architecture/riviere-builder'
-
-/** @riviere-role command-use-case-result-value */
-export type ComponentSummaryErrorCode = 'GRAPH_CORRUPTED' | 'GRAPH_NOT_FOUND'
-
-/** @riviere-role command-use-case-result */
-export type ComponentSummaryResult =
-  | ({ success: true } & ReturnType<RiviereBuilder['stats']>)
-  | {
-    code: ComponentSummaryErrorCode
-    message: string
-    success: false
-  }
diff --git a/packages/riviere-cli/src/features/builder/commands/define-custom-type-input.ts b/packages/riviere-cli/src/features/builder/commands/define-custom-type-input.ts
deleted file mode 100644
index f6d242c2c..000000000
--- a/packages/riviere-cli/src/features/builder/commands/define-custom-type-input.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { CustomPropertyDefinition } from '@living-architecture/riviere-schema'
-
-/** @riviere-role command-use-case-input */
-export interface DefineCustomTypeInput {
-  description: string | undefined
-  graphPathOption: string | undefined
-  name: string
-  optionalProperties: Record<string, CustomPropertyDefinition>
-  requiredProperties: Record<string, CustomPropertyDefinition>
-}
diff --git a/packages/riviere-cli/src/features/builder/commands/define-custom-type-result.ts b/packages/riviere-cli/src/features/builder/commands/define-custom-type-result.ts
deleted file mode 100644
index 38436d48d..000000000
--- a/packages/riviere-cli/src/features/builder/commands/define-custom-type-result.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import type { CustomPropertyDefinition } from '@living-architecture/riviere-schema'
-
-/** @riviere-role command-use-case-result-value */
-export type DefineCustomTypeErrorCode = 'GRAPH_CORRUPTED' | 'GRAPH_NOT_FOUND' | 'VALIDATION_ERROR'
-
-/** @riviere-role command-use-case-result */
-export type DefineCustomTypeResult =
-  | {
-    description: string | undefined
-    name: string
-    optionalProperties: Record<string, CustomPropertyDefinition>
-    requiredProperties: Record<string, CustomPropertyDefinition>
-    success: true
-  }
-  | {
-    code: DefineCustomTypeErrorCode
-    message: string
-    success: false
-  }
diff --git a/packages/riviere-cli/src/features/builder/commands/define-custom-type.ts b/packages/riviere-cli/src/features/builder/commands/define-custom-type.ts
deleted file mode 100644
index 094c0b5be..000000000
--- a/packages/riviere-cli/src/features/builder/commands/define-custom-type.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { CustomTypeAlreadyDefinedError } from '@living-architecture/riviere-builder'
-import { GraphCorruptedError } from '../../../platform/domain/graph-corrupted-error'
-import { GraphNotFoundError } from '../../../platform/domain/graph-not-found-error'
-import { RiviereBuilderRepository } from '../data-access/riviere-builder-repository'
-import type { DefineCustomTypeInput } from './define-custom-type-input'
-import type {
-  DefineCustomTypeErrorCode, DefineCustomTypeResult 
-} from './define-custom-type-result'
-
-/** @riviere-role command-use-case */
-export class DefineCustomType {
-  constructor(private readonly repository: RiviereBuilderRepository) {}
-
-  execute(input: DefineCustomTypeInput): DefineCustomTypeResult {
-    try {
-      const builder = this.repository.load(input.graphPathOption)
-      builder.defineCustomType({
-        ...(input.description !== undefined && { description: input.description }),
-        name: input.name,
-        ...(Object.keys(input.optionalProperties).length > 0
-          ? { optionalProperties: input.optionalProperties }
-          : {}),
-        ...(Object.keys(input.requiredProperties).length > 0
-          ? { requiredProperties: input.requiredProperties }
-          : {}),
-      })
-      this.repository.save(builder)
-      return {
-        description: input.description,
-        name: input.name,
-        optionalProperties: input.optionalProperties,
-        requiredProperties: input.requiredProperties,
-        success: true,
-      }
-    } catch (error) {
-      if (error instanceof GraphNotFoundError) {
-        return failure('GRAPH_NOT_FOUND', error.message)
-      }
-      if (error instanceof GraphCorruptedError) {
-        return failure('GRAPH_CORRUPTED', 'Graph file contains invalid JSON')
-      }
-      if (error instanceof CustomTypeAlreadyDefinedError) {
-        return failure('VALIDATION_ERROR', error.message)
-      }
-      throw error
-    }
-  }
-}
-
-function failure(code: DefineCustomTypeErrorCode, message: string): DefineCustomTypeResult {
-  return {
-    code,
-    message,
-    success: false,
-  }
-}
diff --git a/packages/riviere-cli/src/features/builder/commands/define-relationship-type-result.ts b/packages/riviere-cli/src/features/builder/commands/define-relationship-type-result.ts
deleted file mode 100644
index 4fe55fe2a..000000000
--- a/packages/riviere-cli/src/features/builder/commands/define-relationship-type-result.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/** @riviere-role command-use-case-result-value */
-export type DefineRelationshipTypeErrorCode =
-  | 'GRAPH_CORRUPTED'
-  | 'GRAPH_NOT_FOUND'
-  | 'VALIDATION_ERROR'
-
-/** @riviere-role command-use-case-result */
-export type DefineRelationshipTypeResult =
-  | {
-    description: string
-    name: string
-    success: true
-  }
-  | {
-    code: DefineRelationshipTypeErrorCode
-    message: string
-    success: false
-  }
diff --git a/packages/riviere-cli/src/features/builder/commands/enrich-component-input.ts b/packages/riviere-cli/src/features/builder/commands/enrich-component-input.ts
deleted file mode 100644
index d43e11599..000000000
--- a/packages/riviere-cli/src/features/builder/commands/enrich-component-input.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type {
-  OperationSignature, StateTransition 
-} from '@living-architecture/riviere-schema'
-
-/** @riviere-role command-use-case-input */
-export interface EnrichComponentInput {
-  businessRules: string[]
-  entity: string | undefined
-  graphPathOption: string | undefined
-  id: string
-  modifies: string[]
-  emits: string[]
-  reads: string[]
-  signature: OperationSignature | undefined
-  stateChanges: StateTransition[]
-  validates: string[]
-}
diff --git a/packages/riviere-cli/src/features/builder/commands/enrich-component-result.ts b/packages/riviere-cli/src/features/builder/commands/enrich-component-result.ts
deleted file mode 100644
index 2ad5ddc24..000000000
--- a/packages/riviere-cli/src/features/builder/commands/enrich-component-result.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/** @riviere-role command-use-case-result-value */
-export type EnrichComponentErrorCode =
-  | 'COMPONENT_NOT_FOUND'
-  | 'GRAPH_CORRUPTED'
-  | 'GRAPH_NOT_FOUND'
-  | 'INVALID_COMPONENT_TYPE'
-
-/** @riviere-role command-use-case-result */
-export type EnrichComponentResult =
-  | {
-    componentId: string
-    success: true
-  }
-  | {
-    code: EnrichComponentErrorCode
-    message: string
-    suggestions: string[]
-    success: false
-  }
diff --git a/packages/riviere-cli/src/features/builder/commands/enrich-component.ts b/packages/riviere-cli/src/features/builder/commands/enrich-component.ts
deleted file mode 100644
index 980506966..000000000
--- a/packages/riviere-cli/src/features/builder/commands/enrich-component.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import {
-  ComponentNotFoundError,
-  InvalidEnrichmentTargetError,
-} from '@living-architecture/riviere-builder'
-import { GraphCorruptedError } from '../../../platform/domain/graph-corrupted-error'
-import { GraphNotFoundError } from '../../../platform/domain/graph-not-found-error'
-import { RiviereBuilderRepository } from '../data-access/riviere-builder-repository'
-import type { EnrichComponentInput } from './enrich-component-input'
-import type {
-  EnrichComponentErrorCode, EnrichComponentResult 
-} from './enrich-component-result'
-
-/** @riviere-role command-use-case */
-export class EnrichComponent {
-  constructor(private readonly repository: RiviereBuilderRepository) {}
-
-  execute(input: EnrichComponentInput): EnrichComponentResult {
-    try {
-      const builder = this.repository.load(input.graphPathOption)
-      const enrichmentInput: Parameters<typeof builder.enrichComponent>[1] = {
-        ...buildBehavior(input),
-        ...(input.businessRules.length > 0 ? { businessRules: input.businessRules } : {}),
-        ...(input.stateChanges.length > 0 ? { stateChanges: input.stateChanges } : {}),
-      }
-      if (input.entity !== undefined) {
-        enrichmentInput.entity = input.entity
-      }
-      if (input.signature !== undefined) {
-        enrichmentInput.signature = input.signature
-      }
-      builder.enrichComponent(input.id, enrichmentInput)
-      this.repository.save(builder)
-      return {
-        componentId: input.id,
-        success: true,
-      }
-    } catch (error) {
-      if (error instanceof GraphNotFoundError) {
-        return failure('GRAPH_NOT_FOUND', error.message)
-      }
-      if (error instanceof GraphCorruptedError) {
-        return failure('GRAPH_CORRUPTED', 'Graph file contains invalid JSON')
-      }
-      if (error instanceof InvalidEnrichmentTargetError) {
-        return failure('INVALID_COMPONENT_TYPE', error.message)
-      }
-      if (error instanceof ComponentNotFoundError) {
-        return failure('COMPONENT_NOT_FOUND', error.message, error.suggestions)
-      }
-      throw error
-    }
-  }
-}
-
-function failure(
-  code: EnrichComponentErrorCode,
-  message: string,
-  suggestions: string[] = [],
-): EnrichComponentResult {
-  return {
-    code,
-    message,
-    suggestions,
-    success: false,
-  }
-}
-
-function buildBehavior(input: EnrichComponentInput): { behavior: object } | Record<string, never> {
-  const hasBehavior =
-    input.reads.length > 0 ||
-    input.validates.length > 0 ||
-    input.modifies.length > 0 ||
-    input.emits.length > 0
-
-  if (!hasBehavior) {
-    return {}
-  }
-
-  return {
-    behavior: {
-      ...(input.reads.length > 0 ? { reads: input.reads } : {}),
-      /* v8 ignore next -- symmetric conditional branch */
-      ...(input.validates.length > 0 ? { validates: input.validates } : {}),
-      ...(input.modifies.length > 0 ? { modifies: input.modifies } : {}),
-      ...(input.emits.length > 0 ? { emits: input.emits } : {}),
-    },
-  }
-}
diff --git a/packages/riviere-cli/src/features/builder/commands/finalize-graph-input.ts b/packages/riviere-cli/src/features/builder/commands/finalize-graph-input.ts
deleted file mode 100644
index bfe6b3a44..000000000
--- a/packages/riviere-cli/src/features/builder/commands/finalize-graph-input.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/** @riviere-role command-use-case-input */
-export interface FinalizeGraphInput {graphPathOption: string | undefined}
diff --git a/packages/riviere-cli/src/features/builder/commands/finalize-graph-result.ts b/packages/riviere-cli/src/features/builder/commands/finalize-graph-result.ts
deleted file mode 100644
index 5c55efe0d..000000000
--- a/packages/riviere-cli/src/features/builder/commands/finalize-graph-result.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
-
-/** @riviere-role command-use-case-result-value */
-export type FinalizeGraphErrorCode = 'GRAPH_CORRUPTED' | 'GRAPH_NOT_FOUND' | 'VALIDATION_ERROR'
-
-/** @riviere-role command-use-case-result-value */
-export type FinalizedGraph = RiviereGraph
-
-/** @riviere-role command-use-case-result */
-export type FinalizeGraphResult =
-  | {
-    finalGraph: FinalizedGraph
-    success: true
-  }
-  | {
-    code: FinalizeGraphErrorCode
-    message: string
-    success: false
-  }
diff --git a/packages/riviere-cli/src/features/builder/commands/init-graph-result.ts b/packages/riviere-cli/src/features/builder/commands/init-graph-result.ts
deleted file mode 100644
index 16c2caa8f..000000000
--- a/packages/riviere-cli/src/features/builder/commands/init-graph-result.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/** @riviere-role command-use-case-result-value */
-export type InitGraphErrorCode = 'GRAPH_EXISTS'
-
-/** @riviere-role command-use-case-result */
-export type InitGraphResult =
-  | {
-    domains: string[]
-    path: string
-    sources: number
-    success: true
-  }
-  | {
-    code: InitGraphErrorCode
-    message: string
-    path: string
-    success: false
-  }
diff --git a/packages/riviere-cli/src/features/builder/commands/init-graph.ts b/packages/riviere-cli/src/features/builder/commands/init-graph.ts
deleted file mode 100644
index 50028ea45..000000000
--- a/packages/riviere-cli/src/features/builder/commands/init-graph.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { RiviereBuilder } from '@living-architecture/riviere-builder'
-import type { BuilderOptions } from '@living-architecture/riviere-builder'
-import { GraphCorruptedError } from '../../../platform/domain/graph-corrupted-error'
-import { GraphNotFoundError } from '../../../platform/domain/graph-not-found-error'
-import { RiviereBuilderRepository } from '../data-access/riviere-builder-repository'
-import type { InitGraphInput } from './init-graph-input'
-import type { InitGraphResult } from './init-graph-result'
-
-/** @riviere-role command-use-case */
-export class InitGraph {
-  constructor(private readonly repository: RiviereBuilderRepository) {}
-
-  execute(input: InitGraphInput): InitGraphResult {
-    const builderOptions: BuilderOptions = {
-      ...(input.name === undefined ? {} : { name: input.name }),
-      domains: Object.fromEntries(
-        input.domains.map((domain) => [
-          domain.name,
-          {
-            description: domain.description,
-            systemType: domain.systemType,
-          },
-        ]),
-      ),
-      sources: input.sources.map((repositoryUrl) => ({ repository: repositoryUrl })),
-    }
-
-    try {
-      const builder = this.repository.load(input.graphPathOption)
-      return {
-        code: 'GRAPH_EXISTS',
-        message: `Graph already exists at ${builder.graphPath}`,
-        path: builder.graphPath,
-        success: false,
-      }
-    } catch (error) {
-      if (error instanceof GraphNotFoundError) {
-        const newBuilder = RiviereBuilder.new(builderOptions, error.graphPath)
-        this.repository.save(newBuilder)
-        return {
-          domains: input.domains.map((domain) => domain.name),
-          path: newBuilder.graphPath,
-          sources: input.sources.length,
-          success: true,
-        }
-      }
-      if (error instanceof GraphCorruptedError) {
-        return {
-          code: 'GRAPH_EXISTS',
-          message: `Graph already exists at ${error.graphPath}`,
-          path: error.graphPath,
-          success: false,
-        }
-      }
-      throw error
-    }
-  }
-}
diff --git a/packages/riviere-cli/src/features/builder/commands/link-components-input.ts b/packages/riviere-cli/src/features/builder/commands/link-components-input.ts
deleted file mode 100644
index 3b4fc2c6e..000000000
--- a/packages/riviere-cli/src/features/builder/commands/link-components-input.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type { SourceLocation } from '@living-architecture/riviere-schema'
-
-/** @riviere-role command-use-case-input */
-export interface LinkComponentsInput {
-  condition?: string
-  from: string
-  graphPathOption: string | undefined
-  relationshipType?: string
-  sourceLocation?: SourceLocation
-  to: string
-  type: 'sync' | 'async' | undefined
-}
diff --git a/packages/riviere-cli/src/features/builder/commands/link-components-result.ts b/packages/riviere-cli/src/features/builder/commands/link-components-result.ts
deleted file mode 100644
index d9a4724c4..000000000
--- a/packages/riviere-cli/src/features/builder/commands/link-components-result.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import type { Link } from '@living-architecture/riviere-schema'
-
-/** @riviere-role command-use-case-result-value */
-export type LinkComponentsErrorCode =
-  | 'COMPONENT_NOT_FOUND'
-  | 'GRAPH_CORRUPTED'
-  | 'GRAPH_NOT_FOUND'
-  | 'VALIDATION_ERROR'
-
-/** @riviere-role command-use-case-result */
-export type LinkComponentsResult =
-  | {
-    link: Link
-    success: true
-  }
-  | {
-    code: LinkComponentsErrorCode
-    message: string
-    suggestions: string[]
-    success: false
-  }
diff --git a/packages/riviere-cli/src/features/builder/commands/link-components.ts b/packages/riviere-cli/src/features/builder/commands/link-components.ts
deleted file mode 100644
index 90ab49ef1..000000000
--- a/packages/riviere-cli/src/features/builder/commands/link-components.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import {
-  ComponentNotFoundError,
-  DuplicateLinkError,
-  RelationshipTypeNotFoundError,
-} from '@living-architecture/riviere-builder'
-import { GraphCorruptedError } from '../../../platform/domain/graph-corrupted-error'
-import { GraphNotFoundError } from '../../../platform/domain/graph-not-found-error'
-import { RiviereBuilderRepository } from '../data-access/riviere-builder-repository'
-import type { LinkComponentsInput } from './link-components-input'
-import type {
-  LinkComponentsErrorCode, LinkComponentsResult 
-} from './link-components-result'
-
-/** @riviere-role command-use-case */
-export class LinkComponents {
-  constructor(private readonly repository: RiviereBuilderRepository) {}
-
-  execute(input: LinkComponentsInput): LinkComponentsResult {
-    try {
-      const builder = this.repository.load(input.graphPathOption)
-      const linkInput: {
-        from: string
-        to: string
-        type?: 'sync' | 'async'
-        relationshipType?: string
-        condition?: string
-        sourceLocation?: NonNullable<LinkComponentsInput['sourceLocation']>
-      } = {
-        from: input.from,
-        to: input.to,
-      }
-      if (input.type !== undefined) {
-        linkInput.type = input.type
-      }
-      if (input.relationshipType !== undefined) {
-        linkInput.relationshipType = input.relationshipType
-      }
-      if (input.condition !== undefined) {
-        linkInput.condition = input.condition
-      }
-      if (input.sourceLocation !== undefined) {
-        linkInput.sourceLocation = input.sourceLocation
-      }
-      const link = builder.link(linkInput)
-      this.repository.save(builder)
-      return {
-        link,
-        success: true,
-      }
-    } catch (error) {
-      if (error instanceof GraphNotFoundError) {
-        return failure('GRAPH_NOT_FOUND', error.message)
-      }
-      if (error instanceof GraphCorruptedError) {
-        return failure('GRAPH_CORRUPTED', 'Graph file contains invalid JSON')
-      }
-      if (error instanceof ComponentNotFoundError) {
-        return failure('COMPONENT_NOT_FOUND', error.message, error.suggestions)
-      }
-      if (error instanceof DuplicateLinkError || error instanceof RelationshipTypeNotFoundError) {
-        return failure('VALIDATION_ERROR', error.message)
-      }
-      throw error
-    }
-  }
-}
-
-function failure(
-  code: LinkComponentsErrorCode,
-  message: string,
-  suggestions: string[] = [],
-): LinkComponentsResult {
-  return {
-    code,
-    message,
-    suggestions,
-    success: false,
-  }
-}
diff --git a/packages/riviere-cli/src/features/builder/commands/link-external-input.ts b/packages/riviere-cli/src/features/builder/commands/link-external-input.ts
deleted file mode 100644
index e18cfe705..000000000
--- a/packages/riviere-cli/src/features/builder/commands/link-external-input.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { ExternalTarget } from '@living-architecture/riviere-schema'
-
-/** @riviere-role command-use-case-input */
-export interface LinkExternalInput {
-  from: string
-  graphPathOption: string | undefined
-  target: ExternalTarget
-  type: 'sync' | 'async' | undefined
-}
diff --git a/packages/riviere-cli/src/features/builder/commands/link-external-result.ts b/packages/riviere-cli/src/features/builder/commands/link-external-result.ts
deleted file mode 100644
index 680e28a3f..000000000
--- a/packages/riviere-cli/src/features/builder/commands/link-external-result.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { ExternalLink } from '@living-architecture/riviere-schema'
-
-/** @riviere-role command-use-case-result-value */
-export type LinkExternalErrorCode = 'COMPONENT_NOT_FOUND' | 'GRAPH_CORRUPTED' | 'GRAPH_NOT_FOUND'
-
-/** @riviere-role command-use-case-result */
-export type LinkExternalResult =
-  | {
-    externalLink: ExternalLink
-    success: true
-  }
-  | {
-    code: LinkExternalErrorCode
-    message: string
-    suggestions: string[]
-    success: false
-  }
diff --git a/packages/riviere-cli/src/features/builder/commands/link-external.ts b/packages/riviere-cli/src/features/builder/commands/link-external.ts
deleted file mode 100644
index 1a8dc9155..000000000
--- a/packages/riviere-cli/src/features/builder/commands/link-external.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { ComponentNotFoundError } from '@living-architecture/riviere-builder'
-import { GraphCorruptedError } from '../../../platform/domain/graph-corrupted-error'
-import { GraphNotFoundError } from '../../../platform/domain/graph-not-found-error'
-import { RiviereBuilderRepository } from '../data-access/riviere-builder-repository'
-import type { LinkExternalInput } from './link-external-input'
-import type {
-  LinkExternalErrorCode, LinkExternalResult 
-} from './link-external-result'
-
-/** @riviere-role command-use-case */
-export class LinkExternal {
-  constructor(private readonly repository: RiviereBuilderRepository) {}
-
-  execute(input: LinkExternalInput): LinkExternalResult {
-    try {
-      const builder = this.repository.load(input.graphPathOption)
-      const externalLinkInput: Parameters<typeof builder.linkExternal>[0] = {
-        from: input.from,
-        target: input.target,
-      }
-      if (input.type !== undefined) {
-        externalLinkInput.type = input.type
-      }
-      const externalLink = builder.linkExternal(externalLinkInput)
-      this.repository.save(builder)
-      return {
-        externalLink,
-        success: true,
-      }
-    } catch (error) {
-      if (error instanceof GraphNotFoundError) {
-        return failure('GRAPH_NOT_FOUND', error.message)
-      }
-      if (error instanceof GraphCorruptedError) {
-        return failure('GRAPH_CORRUPTED', 'Graph file contains invalid JSON')
-      }
-      if (error instanceof ComponentNotFoundError) {
-        return failure('COMPONENT_NOT_FOUND', error.message, error.suggestions)
-      }
-      throw error
-    }
-  }
-}
-
-function failure(
-  code: LinkExternalErrorCode,
-  message: string,
-  suggestions: string[] = [],
-): LinkExternalResult {
-  return {
-    code,
-    message,
-    suggestions,
-    success: false,
-  }
-}
diff --git a/packages/riviere-cli/src/features/builder/commands/link-http-input.ts b/packages/riviere-cli/src/features/builder/commands/link-http-input.ts
deleted file mode 100644
index 8b1002673..000000000
--- a/packages/riviere-cli/src/features/builder/commands/link-http-input.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { HttpMethod } from '@living-architecture/riviere-schema'
-
-/** @riviere-role command-use-case-input */
-export interface LinkHttpInput {
-  graphPathOption: string | undefined
-  httpMethod: HttpMethod | undefined
-  linkType: 'sync' | 'async' | undefined
-  path: string
-  targetId: string
-}
diff --git a/packages/riviere-cli/src/features/builder/commands/link-http-result.ts b/packages/riviere-cli/src/features/builder/commands/link-http-result.ts
deleted file mode 100644
index 2b440fd0f..000000000
--- a/packages/riviere-cli/src/features/builder/commands/link-http-result.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import type { Link } from '@living-architecture/riviere-schema'
-
-/** @riviere-role command-use-case-result-value */
-export interface MatchedApi {
-  id: string
-  method: string | undefined
-  path: string
-}
-
-/** @riviere-role command-use-case-result-value */
-export type LinkHttpErrorCode =
-  | 'AMBIGUOUS_API_MATCH'
-  | 'COMPONENT_NOT_FOUND'
-  | 'GRAPH_CORRUPTED'
-  | 'GRAPH_NOT_FOUND'
-  | 'VALIDATION_ERROR'
-
-/** @riviere-role command-use-case-result */
-export type LinkHttpResult =
-  | {
-    link: Link
-    matchedApi: MatchedApi
-    success: true
-  }
-  | {
-    code: LinkHttpErrorCode
-    message: string
-    suggestions: string[]
-    success: false
-  }
diff --git a/packages/riviere-cli/src/features/builder/commands/link-http.ts b/packages/riviere-cli/src/features/builder/commands/link-http.ts
deleted file mode 100644
index b527e93d5..000000000
--- a/packages/riviere-cli/src/features/builder/commands/link-http.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { GraphCorruptedError } from '../../../platform/domain/graph-corrupted-error'
-import { GraphNotFoundError } from '../../../platform/domain/graph-not-found-error'
-import { RiviereBuilderRepository } from '../data-access/riviere-builder-repository'
-import {
-  findApisByPath, getAllApiPaths 
-} from '../domain/api-component-queries'
-import type { LinkHttpInput } from './link-http-input'
-import type {
-  LinkHttpErrorCode, LinkHttpResult 
-} from './link-http-result'
-
-/** @riviere-role command-use-case */
-export class LinkHttp {
-  constructor(private readonly repository: RiviereBuilderRepository) {}
-
-  execute(input: LinkHttpInput): LinkHttpResult {
-    try {
-      const builder = this.repository.load(input.graphPathOption)
-      const graph = builder.build()
-      const matchingApis = findApisByPath(graph, input.path, input.httpMethod)
-      const [matchedApi, ...otherApis] = matchingApis
-
-      if (matchedApi === undefined) {
-        return failure(
-          'COMPONENT_NOT_FOUND',
-          `No API found for path ${input.path}`,
-          getAllApiPaths(graph),
-        )
-      }
-
-      if (otherApis.length > 0) {
-        return failure(
-          'AMBIGUOUS_API_MATCH',
-          `Multiple APIs matched path ${input.path}`,
-          /* v8 ignore next -- defensive ANY fallback for malformed API metadata */
-          matchingApis.map((api) => `${api.httpMethod ?? 'ANY'} ${api.path}`),
-        )
-      }
-
-      const linkInput: {
-        from: string
-        to: string
-        type?: 'sync' | 'async'
-      } = {
-        from: matchedApi.id,
-        to: input.targetId,
-      }
-      if (input.linkType !== undefined) {
-        linkInput.type = input.linkType
-      }
-
-      const link = builder.link(linkInput)
-      this.repository.save(builder)
-
-      return {
-        link,
-        matchedApi: {
-          id: matchedApi.id,
-          method: matchedApi.httpMethod,
-          path: matchedApi.path,
-        },
-        success: true,
-      }
-    } catch (error) {
-      if (error instanceof GraphNotFoundError) {
-        return failure('GRAPH_NOT_FOUND', error.message)
-      }
-      if (error instanceof GraphCorruptedError) {
-        return failure('GRAPH_CORRUPTED', 'Graph file contains invalid JSON')
-      }
-      throw error
-    }
-  }
-}
-
-function failure(
-  code: LinkHttpErrorCode,
-  message: string,
-  suggestions: string[] = [],
-): LinkHttpResult {
-  return {
-    code,
-    message,
-    suggestions,
-    success: false,
-  }
-}
diff --git a/packages/riviere-cli/src/features/builder/commands/validate-graph-input.ts b/packages/riviere-cli/src/features/builder/commands/validate-graph-input.ts
deleted file mode 100644
index 1e51daeb4..000000000
--- a/packages/riviere-cli/src/features/builder/commands/validate-graph-input.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/** @riviere-role command-use-case-input */
-export interface ValidateGraphInput {graphPathOption: string | undefined}
diff --git a/packages/riviere-cli/src/features/builder/commands/validate-graph-result.ts b/packages/riviere-cli/src/features/builder/commands/validate-graph-result.ts
deleted file mode 100644
index e1f1fada3..000000000
--- a/packages/riviere-cli/src/features/builder/commands/validate-graph-result.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import type { RiviereBuilder } from '@living-architecture/riviere-builder'
-
-/** @riviere-role command-use-case-result-value */
-export type ValidationData = ReturnType<RiviereBuilder['validate']>
-
-/** @riviere-role command-use-case-result-value */
-export type ValidateGraphErrorCode = 'GRAPH_CORRUPTED' | 'GRAPH_NOT_FOUND'
-
-/** @riviere-role command-use-case-result */
-export type ValidateGraphResult =
-  | {
-    errors: ValidationData['errors']
-    success: true
-    valid: boolean
-    warnings: ReturnType<RiviereBuilder['warnings']>
-  }
-  | {
-    code: ValidateGraphErrorCode
-    message: string
-    success: false
-  }
diff --git a/packages/riviere-cli/src/features/builder/data-access/riviere-builder-repository.ts b/packages/riviere-cli/src/features/builder/data-access/riviere-builder-repository.ts
deleted file mode 100644
index 9a4caf681..000000000
--- a/packages/riviere-cli/src/features/builder/data-access/riviere-builder-repository.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import {
-  mkdirSync, readFileSync, writeFileSync 
-} from 'node:fs'
-import {
-  dirname, join 
-} from 'node:path'
-import { RiviereBuilder } from '@living-architecture/riviere-builder'
-import { parseRiviereGraph } from '@living-architecture/riviere-schema'
-import { GraphCorruptedError } from '../../../platform/domain/graph-corrupted-error'
-import { GraphNotFoundError } from '../../../platform/domain/graph-not-found-error'
-import { fileExists } from '../../../platform/infra/external-clients/filesystem/file-existence'
-
-const DEFAULT_GRAPH_PATH = '.riviere/graph.json'
-
-/** @riviere-role aggregate-repository */
-export class RiviereBuilderRepository {
-  load(graphPathOption?: string): RiviereBuilder {
-    const graphPath = this.resolveGraphPath(graphPathOption)
-
-    if (!fileExists(graphPath)) {
-      throw new GraphNotFoundError(graphPath)
-    }
-
-    const content = readFileSync(graphPath, 'utf-8')
-    try {
-      const parsed: unknown = JSON.parse(content)
-      const graph = parseRiviereGraph(parsed)
-      return RiviereBuilder.resume(graph, graphPath)
-    } catch (error) {
-      throw new GraphCorruptedError(graphPath, { cause: error })
-    }
-  }
-
-  save(builder: RiviereBuilder): void {
-    mkdirSync(dirname(builder.graphPath), { recursive: true })
-    writeFileSync(builder.graphPath, builder.serialize(), 'utf-8')
-  }
-
-  private resolveGraphPath(graphPathOption?: string): string {
-    return graphPathOption ?? join(process.cwd(), DEFAULT_GRAPH_PATH)
-  }
-}
diff --git a/packages/riviere-cli/src/features/builder/domain/api-component-queries.ts b/packages/riviere-cli/src/features/builder/domain/api-component-queries.ts
deleted file mode 100644
index 284a0d36f..000000000
--- a/packages/riviere-cli/src/features/builder/domain/api-component-queries.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { RiviereQuery } from '@living-architecture/riviere-query'
-import type {
-  Component, HttpMethod, RiviereGraph 
-} from '@living-architecture/riviere-schema'
-
-/** @riviere-role value-object */
-export interface ApiComponent {
-  domain: string
-  httpMethod: HttpMethod
-  id: string
-  name: string
-  path: string
-  type: 'API'
-}
-
-function isRestApiWithPath(component: Component): component is Component & ApiComponent {
-  return component.type === 'API' && 'path' in component && 'httpMethod' in component
-}
-
-/** @riviere-role domain-service */
-export function findApisByPath(
-  graph: RiviereGraph,
-  path: string,
-  method?: HttpMethod,
-): ApiComponent[] {
-  const query = new RiviereQuery(graph)
-  const allComponents = query.componentsByType('API')
-  const apis = allComponents.filter(isRestApiWithPath)
-  const matchingPath = apis.filter((api) => api.path === path)
-
-  if (method) {
-    return matchingPath.filter((api) => api.httpMethod === method)
-  }
-
-  return matchingPath
-}
-
-/** @riviere-role domain-service */
-export function getAllApiPaths(graph: RiviereGraph): string[] {
-  const query = new RiviereQuery(graph)
-  const allComponents = query.componentsByType('API')
-  const apis = allComponents.filter(isRestApiWithPath)
-  return [...new Set(apis.map((api) => api.path))]
-}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/_platform/cli/validation.spec.ts b/packages/riviere-cli/src/features/builder/entrypoint/_platform/cli/validation.spec.ts
deleted file mode 100644
index b1b09c00e..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/_platform/cli/validation.spec.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import {
-  describe, expect, it 
-} from 'vitest'
-import {
-  validateComponentType,
-  validateLinkType,
-  validateSystemType,
-  validateHttpMethod,
-  isValidHttpMethod,
-} from './validation'
-import { VALID_SYSTEM_TYPES } from '../../../../../entrypoint/_platform/cli/component-types'
-import { CliErrorCode } from '../../../../../platform/infra/cli/presentation/error-codes'
-
-function parseErrorJson(errorJson: string | undefined): unknown {
-  expect(errorJson).toBeTruthy()
-
-  return JSON.parse(errorJson ?? 'null')
-}
-
-describe('validation', () => {
-  describe('validateComponentType', () => {
-    it('returns valid for UI component type', () => {
-      expect(validateComponentType('UI')).toStrictEqual({ valid: true })
-    })
-
-    it('returns valid for lowercase component type', () => {
-      expect(validateComponentType('api')).toStrictEqual({ valid: true })
-    })
-
-    it('returns invalid with error for unknown type', () => {
-      const result = validateComponentType('InvalidType')
-      expect(result.valid).toBe(false)
-      const error = parseErrorJson(result.errorJson)
-      expect(error).toMatchObject({
-        success: false,
-        error: {
-          code: CliErrorCode.ValidationError,
-          message: 'Invalid component type: InvalidType',
-        },
-      })
-    })
-  })
-
-  describe('validateLinkType', () => {
-    it('returns valid for undefined link type', () => {
-      expect(validateLinkType(undefined)).toStrictEqual({ valid: true })
-    })
-
-    it('returns valid for sync link type', () => {
-      expect(validateLinkType('sync')).toStrictEqual({ valid: true })
-    })
-
-    it('returns valid for async link type', () => {
-      expect(validateLinkType('async')).toStrictEqual({ valid: true })
-    })
-
-    it('returns invalid with error for unknown link type', () => {
-      const result = validateLinkType('invalid')
-      expect(result.valid).toBe(false)
-      const error = parseErrorJson(result.errorJson)
-      expect(error).toMatchObject({
-        success: false,
-        error: {
-          code: CliErrorCode.ValidationError,
-          message: 'Invalid link type: invalid',
-        },
-      })
-    })
-  })
-
-  describe('validateHttpMethod', () => {
-    it('returns valid for undefined method', () => {
-      expect(validateHttpMethod(undefined)).toStrictEqual({ valid: true })
-    })
-
-    it.each(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'HEAD', 'OPTIONS'])(
-      'returns valid for %s',
-      (method) => {
-        expect(validateHttpMethod(method)).toStrictEqual({ valid: true })
-      },
-    )
-
-    it('returns valid for lowercase method', () => {
-      expect(validateHttpMethod('get')).toStrictEqual({ valid: true })
-    })
-
-    it('returns invalid with error for unknown method', () => {
-      const result = validateHttpMethod('INVALID')
-      expect(result.valid).toBe(false)
-      const error = parseErrorJson(result.errorJson)
-      expect(error).toMatchObject({
-        success: false,
-        error: {
-          code: CliErrorCode.ValidationError,
-          message: 'Invalid HTTP method: INVALID',
-        },
-      })
-    })
-  })
-
-  describe('isValidHttpMethod', () => {
-    it('returns true for valid HTTP methods', () => {
-      expect(isValidHttpMethod('GET')).toBe(true)
-      expect(isValidHttpMethod('post')).toBe(true)
-    })
-
-    it('returns false for invalid HTTP methods', () => {
-      expect(isValidHttpMethod('INVALID')).toBe(false)
-    })
-  })
-
-  describe('validateSystemType', () => {
-    it.each(VALID_SYSTEM_TYPES)('returns valid for %s', (type) => {
-      expect(validateSystemType(type)).toStrictEqual({ valid: true })
-    })
-
-    it('returns invalid with error for unknown system type', () => {
-      const result = validateSystemType('backend')
-      expect(result.valid).toBe(false)
-      const error = parseErrorJson(result.errorJson)
-      expect(error).toMatchObject({
-        success: false,
-        error: {
-          code: CliErrorCode.ValidationError,
-          message: 'Invalid system type: backend',
-        },
-      })
-    })
-  })
-})
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/_platform/cli/validation.ts b/packages/riviere-cli/src/features/builder/entrypoint/_platform/cli/validation.ts
deleted file mode 100644
index 7efac1b42..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/_platform/cli/validation.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import type { HttpMethod } from '@living-architecture/riviere-schema'
-import { CliErrorCode } from '../../../../../platform/infra/cli/presentation/error-codes'
-import { formatError } from '../../../../../platform/infra/cli/presentation/output'
-import {
-  isValidComponentType,
-  isValidLinkType,
-  isValidSystemType,
-  VALID_COMPONENT_TYPES,
-  VALID_LINK_TYPES,
-  VALID_SYSTEM_TYPES,
-} from '../../../../../entrypoint/_platform/cli/component-types'
-
-interface ValidationResult {
-  errorJson?: string
-  valid: boolean
-}
-
-/** @riviere-role entrypoint-cli-input-parser */
-export function validateComponentType(componentType: string): ValidationResult {
-  if (isValidComponentType(componentType)) return { valid: true }
-  return {
-    errorJson: JSON.stringify(
-      formatError(CliErrorCode.ValidationError, `Invalid component type: ${componentType}`, [
-        `Valid types: ${VALID_COMPONENT_TYPES.join(', ')}`,
-      ]),
-    ),
-    valid: false,
-  }
-}
-
-/** @riviere-role entrypoint-cli-input-parser */
-export function validateLinkType(linkType: string | undefined): ValidationResult {
-  if (linkType === undefined || isValidLinkType(linkType)) return { valid: true }
-  return {
-    errorJson: JSON.stringify(
-      formatError(CliErrorCode.ValidationError, `Invalid link type: ${linkType}`, [
-        `Valid types: ${VALID_LINK_TYPES.join(', ')}`,
-      ]),
-    ),
-    valid: false,
-  }
-}
-
-/** @riviere-role entrypoint-cli-input-parser */
-export function validateSystemType(systemType: string): ValidationResult {
-  if (isValidSystemType(systemType)) return { valid: true }
-  return {
-    errorJson: JSON.stringify(
-      formatError(CliErrorCode.ValidationError, `Invalid system type: ${systemType}`, [
-        `Valid types: ${VALID_SYSTEM_TYPES.join(', ')}`,
-      ]),
-    ),
-    valid: false,
-  }
-}
-
-const VALID_HTTP_METHODS: readonly HttpMethod[] = [
-  'GET',
-  'POST',
-  'PUT',
-  'PATCH',
-  'DELETE',
-  'HEAD',
-  'OPTIONS',
-]
-
-/** @riviere-role entrypoint-cli-input-parser */
-export function isValidHttpMethod(value: string): value is HttpMethod {
-  return VALID_HTTP_METHODS.some((m) => m === value.toUpperCase())
-}
-
-/** @riviere-role entrypoint-cli-input-parser */
-export function validateHttpMethod(method: string | undefined): ValidationResult {
-  if (method === undefined || isValidHttpMethod(method)) return { valid: true }
-  return {
-    errorJson: JSON.stringify(
-      formatError(CliErrorCode.ValidationError, `Invalid HTTP method: ${method}`, [
-        `Valid methods: ${VALID_HTTP_METHODS.join(', ')}`,
-      ]),
-    ),
-    valid: false,
-  }
-}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/add-component/add-component.spec.ts b/packages/riviere-cli/src/features/builder/entrypoint/add-component/add-component.spec.ts
deleted file mode 100644
index 1cdf863b4..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/add-component/add-component.spec.ts
+++ /dev/null
@@ -1,402 +0,0 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import { readFile } from 'node:fs/promises'
-import { join } from 'node:path'
-import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import {
-  type TestContext,
-  assertDefined,
-  createTestContext,
-  setupCommandTest,
-  createGraphWithDomain,
-  MockError,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
-import { buildAddComponentArgs } from '../../../../platform/__fixtures__/add-component-fixtures'
-
-function getErrorMessage(error: unknown): string {
-  if (error instanceof Error) {
-    return error.message
-  }
-  return 'Unknown error'
-}
-
-describe('riviere builder add-component', () => {
-  describe('command registration', () => {
-    it('registers add-component command under builder', () => {
-      const program = createProgram()
-      const builderCmd = program.commands.find((cmd) => cmd.name() === 'builder')
-      const addComponentCmd = builderCmd?.commands.find((cmd) => cmd.name() === 'add-component')
-
-      expect(addComponentCmd?.name()).toBe('add-component')
-    })
-  })
-
-  describe('error handling', () => {
-    const ctx: TestContext = createTestContext()
-    setupCommandTest(ctx)
-
-    it('returns GRAPH_NOT_FOUND when no graph exists', async () => {
-      const program = createProgram()
-      await program.parseAsync(buildAddComponentArgs({ extraArgs: ['--route', '/test'] }))
-
-      const output = ctx.consoleOutput.join('\n')
-      expect(output).toContain(CliErrorCode.GraphNotFound)
-    })
-
-    it('returns VALIDATION_ERROR when --type is invalid', async () => {
-      const program = createProgram()
-      await program.parseAsync(buildAddComponentArgs({ type: 'InvalidType' }))
-
-      expect(ctx.consoleOutput).toHaveLength(1)
-      expect(ctx.consoleOutput[0]).toBeTruthy()
-
-      const output: unknown = JSON.parse(assertDefined(ctx.consoleOutput[0], 'Expected output'))
-      expect(output).toMatchObject({
-        success: false,
-        error: {
-          code: CliErrorCode.ValidationError,
-          message: 'Invalid component type: InvalidType',
-        },
-      })
-    })
-  })
-
-  describe('adding components', () => {
-    const ctx: TestContext = createTestContext()
-    setupCommandTest(ctx)
-
-    it('returns DOMAIN_NOT_FOUND when domain does not exist', async () => {
-      await createGraphWithDomain(ctx.testDir, 'orders')
-      const program = createProgram()
-      await program.parseAsync(
-        buildAddComponentArgs({
-          name: 'Test',
-          domain: 'nonexistent',
-          extraArgs: ['--route', '/test'],
-        }),
-      )
-      expect(ctx.consoleOutput.join('\n')).toContain(CliErrorCode.DomainNotFound)
-    })
-
-    it.each([
-      {
-        type: 'UI',
-        expectedFlag: '--route',
-      },
-      {
-        type: 'API',
-        expectedFlag: '--api-type',
-      },
-      {
-        type: 'DomainOp',
-        expectedFlag: '--operation-name',
-      },
-      {
-        type: 'Event',
-        expectedFlag: '--event-name',
-      },
-      {
-        type: 'EventHandler',
-        expectedFlag: '--subscribed-events',
-      },
-      {
-        type: 'Custom',
-        expectedFlag: '--custom-type',
-      },
-    ])(
-      'returns VALIDATION_ERROR when $type missing $expectedFlag',
-      async ({
-        type, expectedFlag 
-      }) => {
-        await createGraphWithDomain(ctx.testDir, 'orders')
-        const program = createProgram()
-        await program.parseAsync(
-          buildAddComponentArgs({
-            type,
-            name: 'Test',
-          }),
-        )
-        const output = ctx.consoleOutput.join('\n')
-        expect(output).toContain(CliErrorCode.ValidationError)
-        expect(output).toContain(expectedFlag)
-      },
-    )
-
-    it.each([
-      {
-        type: 'UI',
-        name: 'Checkout Page',
-        module: 'checkout',
-        filePath: 'src/pages/checkout.tsx',
-        extraArgs: ['--route', '/checkout'],
-        expectedId: 'orders:checkout:ui:checkout-page',
-        expectedFields: {
-          type: 'UI',
-          route: '/checkout',
-        },
-      },
-      {
-        type: 'API',
-        name: 'Create Order',
-        module: 'api',
-        filePath: 'src/api/orders.ts',
-        extraArgs: ['--api-type', 'REST', '--http-method', 'POST', '--http-path', '/api/orders'],
-        expectedId: 'orders:api:api:create-order',
-        expectedFields: {
-          type: 'API',
-          apiType: 'REST',
-          httpMethod: 'POST',
-          path: '/api/orders',
-        },
-      },
-      {
-        type: 'API',
-        name: 'List Orders',
-        module: 'api',
-        filePath: 'src/api/orders.ts',
-        extraArgs: ['--api-type', 'REST'],
-        expectedId: 'orders:api:api:list-orders',
-        expectedFields: {
-          type: 'API',
-          apiType: 'REST',
-        },
-      },
-      {
-        type: 'UseCase',
-        name: 'Place Order',
-        module: 'core',
-        filePath: 'src/usecases/place-order.ts',
-        extraArgs: [],
-        expectedId: 'orders:core:usecase:place-order',
-        expectedFields: { type: 'UseCase' },
-      },
-      {
-        type: 'DomainOp',
-        name: 'Order Create',
-        module: 'domain',
-        filePath: 'src/domain/order.ts',
-        extraArgs: ['--operation-name', 'create', '--entity', 'Order'],
-        expectedId: 'orders:domain:domainop:order-create',
-        expectedFields: {
-          type: 'DomainOp',
-          operationName: 'create',
-          entity: 'Order',
-        },
-      },
-      {
-        type: 'DomainOp',
-        name: 'Order Archive',
-        module: 'domain',
-        filePath: 'src/domain/order.ts',
-        extraArgs: ['--operation-name', 'archive'],
-        expectedId: 'orders:domain:domainop:order-archive',
-        expectedFields: {
-          type: 'DomainOp',
-          operationName: 'archive',
-        },
-      },
-      {
-        type: 'Event',
-        name: 'Order Placed',
-        module: 'events',
-        filePath: 'src/events/order-placed.ts',
-        extraArgs: ['--event-name', 'OrderPlaced'],
-        expectedId: 'orders:events:event:order-placed',
-        expectedFields: {
-          type: 'Event',
-          eventName: 'OrderPlaced',
-        },
-      },
-      {
-        type: 'Event',
-        name: 'Payment Received',
-        module: 'events',
-        filePath: 'src/events/payment-received.ts',
-        extraArgs: ['--event-name', 'PaymentReceived', '--event-schema', '{ orderId: string }'],
-        expectedId: 'orders:events:event:payment-received',
-        expectedFields: {
-          type: 'Event',
-          eventName: 'PaymentReceived',
-          eventSchema: '{ orderId: string }',
-        },
-      },
-      {
-        type: 'EventHandler',
-        name: 'Send Confirmation',
-        module: 'handlers',
-        filePath: 'src/handlers/send-confirmation.ts',
-        extraArgs: ['--subscribed-events', 'OrderPlaced,PaymentReceived'],
-        expectedId: 'orders:handlers:eventhandler:send-confirmation',
-        expectedFields: {
-          type: 'EventHandler',
-          subscribedEvents: ['OrderPlaced', 'PaymentReceived'],
-        },
-      },
-    ])(
-      'creates $type component',
-      async ({
-        type, name, module, filePath, extraArgs, expectedId, expectedFields 
-      }) => {
-        await createGraphWithDomain(ctx.testDir, 'orders')
-
-        const program = createProgram()
-        await program.parseAsync(
-          buildAddComponentArgs({
-            type,
-            name,
-            module,
-            filePath,
-            extraArgs,
-          }),
-        )
-
-        const graphPath = join(ctx.testDir, '.riviere', 'graph.json')
-        const content = await readFile(graphPath, 'utf-8')
-        const graph: unknown = JSON.parse(content)
-
-        expect(graph).toMatchObject({
-          components: [
-            {
-              id: expectedId,
-              ...expectedFields,
-            },
-          ],
-        })
-      },
-    )
-
-    it('returns CUSTOM_TYPE_NOT_FOUND when custom type not defined', async () => {
-      await createGraphWithDomain(ctx.testDir, 'orders')
-
-      const program = createProgram()
-      await program.parseAsync(
-        buildAddComponentArgs({
-          type: 'Custom',
-          name: 'Order Queue',
-          module: 'messaging',
-          filePath: 'src/queues/orders.ts',
-          extraArgs: ['--custom-type', 'MessageQueue'],
-        }),
-      )
-
-      const output = ctx.consoleOutput.join('\n')
-      expect(output).toContain(CliErrorCode.CustomTypeNotFound)
-    })
-
-    it('returns DUPLICATE_COMPONENT when component already exists', async () => {
-      await createGraphWithDomain(ctx.testDir, 'orders')
-
-      const args = buildAddComponentArgs({
-        name: 'Checkout Page',
-        filePath: 'src/pages/checkout.tsx',
-        extraArgs: ['--route', '/checkout'],
-      })
-
-      const program1 = createProgram()
-      await program1.parseAsync(args)
-
-      const program2 = createProgram()
-      await program2.parseAsync(args)
-
-      const output = ctx.consoleOutput.join('\n')
-      expect(output).toContain(CliErrorCode.DuplicateComponent)
-    })
-
-    it('outputs success JSON with component ID when --json flag provided', async () => {
-      await createGraphWithDomain(ctx.testDir, 'orders')
-
-      const program = createProgram()
-      await program.parseAsync(
-        buildAddComponentArgs({
-          name: 'Checkout Page',
-          filePath: 'src/pages/checkout.tsx',
-          extraArgs: ['--route', '/checkout', '--json'],
-        }),
-      )
-
-      expect(ctx.consoleOutput).toHaveLength(1)
-      expect(ctx.consoleOutput[0]).toBeTruthy()
-
-      const output: unknown = JSON.parse(assertDefined(ctx.consoleOutput[0], 'Expected output'))
-      expect(output).toMatchObject({
-        success: true,
-        data: { componentId: 'orders:checkout:ui:checkout-page' },
-      })
-    })
-
-    it('includes description when --description provided', async () => {
-      await createGraphWithDomain(ctx.testDir, 'orders')
-      const program = createProgram()
-      await program.parseAsync(
-        buildAddComponentArgs({
-          name: 'Checkout',
-          module: 'web',
-          filePath: 'src/checkout.tsx',
-          extraArgs: ['--route', '/checkout', '--description', 'Main checkout page'],
-        }),
-      )
-      const graphPath = join(ctx.testDir, '.riviere', 'graph.json')
-      const content = await readFile(graphPath, 'utf-8')
-      const graph: unknown = JSON.parse(content)
-      expect(graph).toMatchObject({ components: [{ description: 'Main checkout page' }] })
-    })
-
-    it('includes lineNumber in sourceLocation when --line-number provided', async () => {
-      await createGraphWithDomain(ctx.testDir, 'orders')
-      const program = createProgram()
-      await program.parseAsync(
-        buildAddComponentArgs({
-          name: 'Checkout',
-          module: 'web',
-          filePath: 'src/checkout.tsx',
-          extraArgs: ['--route', '/checkout', '--line-number', '42'],
-        }),
-      )
-      const graphPath = join(ctx.testDir, '.riviere', 'graph.json')
-      const content = await readFile(graphPath, 'utf-8')
-      const graph: unknown = JSON.parse(content)
-      expect(graph).toMatchObject({ components: [{ sourceLocation: { lineNumber: 42 } }] })
-    })
-
-    it('includes columnNumber in sourceLocation when --column-number provided', async () => {
-      await createGraphWithDomain(ctx.testDir, 'orders')
-      const program = createProgram()
-      await program.parseAsync(
-        buildAddComponentArgs({ extraArgs: ['--route', '/test', '--column-number', '17'] }),
-      )
-
-      const graphPath = join(ctx.testDir, '.riviere', 'graph.json')
-      const content = await readFile(graphPath, 'utf-8')
-      const graph: unknown = JSON.parse(content)
-
-      expect(graph).toMatchObject({ components: [{ sourceLocation: { columnNumber: 17 } }] })
-    })
-
-    it('rejects a fractional --column-number', async () => {
-      await createGraphWithDomain(ctx.testDir, 'orders')
-      const program = createProgram()
-      await program.parseAsync(
-        buildAddComponentArgs({ extraArgs: ['--route', '/test', '--column-number', '3.14'] }),
-      )
-
-      expect(ctx.consoleOutput.join('\n')).toContain(
-        'Invalid column number: must be a positive integer',
-      )
-    })
-  })
-
-  describe('getErrorMessage', () => {
-    it('returns message from Error instance', () =>
-      expect(getErrorMessage(new MockError('test error'))).toBe('test error'))
-    it('returns Unknown error when input is string', () =>
-      expect(getErrorMessage('string error')).toBe('Unknown error'))
-    it('returns Unknown error when input is null', () =>
-      expect(getErrorMessage(null)).toBe('Unknown error'))
-    it('returns Unknown error when input is undefined', () =>
-      expect(getErrorMessage(undefined)).toBe('Unknown error'))
-    it('returns Unknown error when input is number', () =>
-      expect(getErrorMessage(42)).toBe('Unknown error'))
-  })
-})
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/add-component/entrypoint.ts b/packages/riviere-cli/src/features/builder/entrypoint/add-component/entrypoint.ts
deleted file mode 100644
index 0bf5421f0..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/add-component/entrypoint.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import { Command } from 'commander'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import { getDefaultGraphPathDescription } from '../../../../platform/infra/cli/presentation/graph-path-option'
-import {
-  formatError, formatSuccess 
-} from '../../../../platform/infra/cli/presentation/output'
-import { getAddComponentHints } from '../../../../platform/infra/cli/presentation/add-component-hints'
-import { toAddComponentInput } from './add-component-options'
-import type { AddComponent } from '../../commands/add-component'
-import type { AddComponentErrorCode } from '../../commands/add-component-result'
-
-interface CliOptions {
-  type: string
-  name: string
-  domain: string
-  module: string
-  repository: string
-  filePath: string
-  route?: string
-  apiType?: string
-  httpMethod?: string
-  httpPath?: string
-  operationName?: string
-  entity?: string
-  eventName?: string
-  eventSchema?: string
-  subscribedEvents?: string
-  customType?: string
-  customProperty?: string[]
-  description?: string
-  lineNumber?: string
-  columnNumber?: string
-  graph?: string
-  json?: boolean
-}
-
-/** @riviere-role cli-entrypoint */
-export function createAddComponentCommand(addComponent: AddComponent): Command {
-  return new Command('add-component')
-    .description('Add a component to the graph')
-    .requiredOption(
-      '--type <type>',
-      'Component type (UI, API, UseCase, DomainOp, Event, EventHandler, Custom)',
-    )
-    .requiredOption('--name <name>', 'Component name')
-    .requiredOption('--domain <domain>', 'Domain name')
-    .requiredOption('--module <module>', 'Module name')
-    .requiredOption('--repository <url>', 'Source repository URL')
-    .requiredOption('--file-path <path>', 'Source file path')
-    .option('--route <route>', 'UI route path')
-    .option('--api-type <type>', 'API type (REST, GraphQL, other)')
-    .option('--http-method <method>', 'HTTP method')
-    .option('--http-path <path>', 'HTTP endpoint path')
-    .option('--operation-name <name>', 'Operation name (DomainOp)')
-    .option('--entity <entity>', 'Entity name (DomainOp)')
-    .option('--event-name <name>', 'Event name')
-    .option('--event-schema <schema>', 'Event schema definition')
-    .option('--subscribed-events <events>', 'Comma-separated subscribed event names')
-    .option('--custom-type <name>', 'Custom type name')
-    .option(
-      '--custom-property <key:value>',
-      'Custom property (repeatable)',
-      (val, acc: string[]) => [...acc, val],
-      [],
-    )
-    .option('--description <desc>', 'Component description')
-    .option('--line-number <n>', 'Source line number')
-    .option('--column-number <n>', 'Source column number')
-    .option('--graph <path>', getDefaultGraphPathDescription())
-    .option('--json', 'Output result as JSON')
-    .action(async (options: CliOptions) => {
-      const result = addComponent.execute(toAddComponentInput(options))
-
-      if (!result.success) {
-        const cliErrorCode = CLI_ERROR_CODES[result.code]
-        console.log(
-          JSON.stringify(
-            formatError(cliErrorCode, result.message, getAddComponentHints(cliErrorCode)),
-          ),
-        )
-        return
-      }
-
-      if (options.json) {
-        console.log(JSON.stringify(formatSuccess({ componentId: result.componentId })))
-      }
-    })
-}
-
-const CLI_ERROR_CODES: Record<AddComponentErrorCode, CliErrorCode> = {
-  VALIDATION_ERROR: CliErrorCode.ValidationError,
-  GRAPH_NOT_FOUND: CliErrorCode.GraphNotFound,
-  DOMAIN_NOT_FOUND: CliErrorCode.DomainNotFound,
-  CUSTOM_TYPE_NOT_FOUND: CliErrorCode.CustomTypeNotFound,
-  DUPLICATE_COMPONENT: CliErrorCode.DuplicateComponent,
-}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/add-domain/entrypoint.ts b/packages/riviere-cli/src/features/builder/entrypoint/add-domain/entrypoint.ts
deleted file mode 100644
index 4dbb602c6..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/add-domain/entrypoint.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import { Command } from 'commander'
-import {
-  formatError, formatSuccess 
-} from '../../../../platform/infra/cli/presentation/output'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import { getDefaultGraphPathDescription } from '../../../../platform/infra/cli/presentation/graph-path-option'
-import {
-  isValidSystemType,
-  VALID_SYSTEM_TYPES,
-} from '../../../../entrypoint/_platform/cli/component-types'
-import type { AddDomain } from '../../commands/add-domain'
-
-interface AddDomainOptions {
-  name: string
-  description: string
-  systemType: string
-  graph?: string
-  json?: boolean
-}
-
-/** @riviere-role cli-entrypoint */
-export function createAddDomainCommand(addDomain: AddDomain): Command {
-  return new Command('add-domain')
-    .description('Add a domain to the graph')
-    .addHelpText(
-      'after',
-      `
-Examples:
-  $ riviere builder add-domain --name orders --system-type domain \\
-      --description "Order management"
-
-  $ riviere builder add-domain --name checkout-bff --system-type bff \\
-      --description "Checkout backend-for-frontend"
-`,
-    )
-    .requiredOption('--name <name>', 'Domain name')
-    .requiredOption('--description <description>', 'Domain description')
-    .requiredOption(
-      '--system-type <type>',
-      'System type (domain, bff, ui, external-service, other)',
-    )
-    .option('--graph <path>', getDefaultGraphPathDescription())
-    .option('--json', 'Output result as JSON')
-    .action(async (options: AddDomainOptions) => {
-      if (!isValidSystemType(options.systemType)) {
-        console.log(
-          JSON.stringify(
-            formatError(
-              CliErrorCode.ValidationError,
-              `Invalid system type: ${options.systemType}`,
-              [`Valid types: ${VALID_SYSTEM_TYPES.join(', ')}`],
-            ),
-          ),
-        )
-        return
-      }
-      const result = addDomain.execute({
-        description: options.description,
-        graphPathOption: options.graph,
-        name: options.name,
-        systemType: options.systemType,
-      })
-      if (!result.success) {
-        const errorCodeByResult = {
-          DUPLICATE_DOMAIN: CliErrorCode.DuplicateDomain,
-          GRAPH_NOT_FOUND: CliErrorCode.GraphNotFound,
-          GRAPH_CORRUPTED: CliErrorCode.GraphCorrupted,
-        } as const
-        const errorCode = errorCodeByResult[result.code]
-        const suggestions: string[] = []
-        if (result.code === 'DUPLICATE_DOMAIN') {
-          suggestions.push('Use a different domain name')
-        }
-
-        console.log(JSON.stringify(formatError(errorCode, result.message, suggestions)))
-        return
-      }
-
-      if (options.json === true) {
-        console.log(JSON.stringify(formatSuccess(result)))
-      }
-    })
-}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/add-source/entrypoint.ts b/packages/riviere-cli/src/features/builder/entrypoint/add-source/entrypoint.ts
deleted file mode 100644
index 80971263f..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/add-source/entrypoint.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { Command } from 'commander'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import { getDefaultGraphPathDescription } from '../../../../platform/infra/cli/presentation/graph-path-option'
-import {
-  formatError, formatSuccess 
-} from '../../../../platform/infra/cli/presentation/output'
-import type { AddSource } from '../../commands/add-source'
-
-interface AddSourceOptions {
-  repository: string
-  graph?: string
-  json?: boolean
-}
-
-/** @riviere-role cli-entrypoint */
-export function createAddSourceCommand(addSource: AddSource): Command {
-  return new Command('add-source')
-    .description('Add a source repository to the graph')
-    .addHelpText(
-      'after',
-      `
-Examples:
-  $ riviere builder add-source --repository https://github.com/your-org/orders-service
-  $ riviere builder add-source --repository https://github.com/your-org/payments-api --json
-`,
-    )
-    .requiredOption('--repository <url>', 'Source repository URL')
-    .option('--graph <path>', getDefaultGraphPathDescription())
-    .option('--json', 'Output result as JSON')
-    .action(async (options: AddSourceOptions) => {
-      const result = addSource.execute({
-        graphPathOption: options.graph,
-        repository: options.repository,
-      })
-      if (!result.success) {
-        console.log(
-          JSON.stringify(
-            formatError(
-              result.code === 'GRAPH_NOT_FOUND'
-                ? CliErrorCode.GraphNotFound
-                : CliErrorCode.GraphCorrupted,
-              result.message,
-              [],
-            ),
-          ),
-        )
-        return
-      }
-
-      if (options.json === true) {
-        console.log(JSON.stringify(formatSuccess({ repository: result.repository })))
-      }
-    })
-}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/check-consistency/entrypoint.ts b/packages/riviere-cli/src/features/builder/entrypoint/check-consistency/entrypoint.ts
deleted file mode 100644
index 0482c986a..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/check-consistency/entrypoint.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { Command } from 'commander'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import { getDefaultGraphPathDescription } from '../../../../platform/infra/cli/presentation/graph-path-option'
-import {
-  formatError, formatSuccess 
-} from '../../../../platform/infra/cli/presentation/output'
-import type { CheckConsistency } from '../../commands/check-consistency'
-
-interface CheckConsistencyOptions {
-  graph?: string
-  json?: boolean
-}
-
-/** @riviere-role cli-entrypoint */
-export function createCheckConsistencyCommand(checkConsistency: CheckConsistency): Command {
-  return new Command('check-consistency')
-    .description('Check for structural issues in the graph')
-    .addHelpText(
-      'after',
-      `
-Examples:
-  $ riviere builder check-consistency
-  $ riviere builder check-consistency --json
-`,
-    )
-    .option('--graph <path>', getDefaultGraphPathDescription())
-    .option('--json', 'Output result as JSON')
-    .action(async (options: CheckConsistencyOptions) => {
-      const result = checkConsistency.execute({ graphPathOption: options.graph })
-      if (!result.success) {
-        console.log(
-          JSON.stringify(
-            formatError(
-              result.code === 'GRAPH_NOT_FOUND'
-                ? CliErrorCode.GraphNotFound
-                : CliErrorCode.GraphCorrupted,
-              result.message,
-              [],
-            ),
-          ),
-        )
-        return
-      }
-
-      if (options.json === true) {
-        console.log(
-          JSON.stringify(
-            formatSuccess({
-              consistent: result.consistent,
-              warnings: result.warnings,
-            }),
-          ),
-        )
-      }
-    })
-}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/component-checklist/entrypoint.ts b/packages/riviere-cli/src/features/builder/entrypoint/component-checklist/entrypoint.ts
deleted file mode 100644
index 64a0b68ef..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/component-checklist/entrypoint.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { Command } from 'commander'
-import { getDefaultGraphPathDescription } from '../../../../platform/infra/cli/presentation/graph-path-option'
-import {
-  formatError, formatSuccess 
-} from '../../../../platform/infra/cli/presentation/output'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import { isValidComponentType } from '../../../../entrypoint/_platform/cli/component-types'
-import type { ComponentChecklist } from '../../commands/component-checklist'
-
-interface ComponentChecklistOptions {
-  graph?: string
-  json?: boolean
-  type?: string
-}
-
-/** @riviere-role cli-entrypoint */
-export function createComponentChecklistCommand(componentChecklist: ComponentChecklist): Command {
-  return new Command('component-checklist')
-    .description('List components as a checklist for linking/enrichment')
-    .addHelpText(
-      'after',
-      `
-Examples:
-  $ riviere builder component-checklist
-  $ riviere builder component-checklist --type DomainOp
-  $ riviere builder component-checklist --type API --json
-`,
-    )
-    .option('--graph <path>', getDefaultGraphPathDescription())
-    .option('--json', 'Output result as JSON')
-    .option('--type <type>', 'Filter by component type')
-    .action(async (options: ComponentChecklistOptions) => {
-      if (options.type !== undefined && !isValidComponentType(options.type)) {
-        console.log(
-          JSON.stringify(
-            formatError(
-              CliErrorCode.InvalidComponentType,
-              `Invalid component type: ${options.type}`,
-              ['Valid types: UI, API, UseCase, DomainOp, Event, EventHandler, Custom'],
-            ),
-          ),
-        )
-        return
-      }
-
-      const result = componentChecklist.execute({
-        graphPathOption: options.graph,
-        type: options.type,
-      })
-      if (!result.success) {
-        console.log(
-          JSON.stringify(
-            formatError(
-              result.code === 'GRAPH_NOT_FOUND'
-                ? CliErrorCode.GraphNotFound
-                : CliErrorCode.GraphCorrupted,
-              result.message,
-              [],
-            ),
-          ),
-        )
-        return
-      }
-
-      if (options.json === true) {
-        console.log(
-          JSON.stringify(
-            formatSuccess({
-              components: result.components,
-              total: result.total,
-            }),
-          ),
-        )
-      }
-    })
-}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/component-summary/entrypoint.ts b/packages/riviere-cli/src/features/builder/entrypoint/component-summary/entrypoint.ts
deleted file mode 100644
index cd70a5361..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/component-summary/entrypoint.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Command } from 'commander'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import { getDefaultGraphPathDescription } from '../../../../platform/infra/cli/presentation/graph-path-option'
-import {
-  formatError, formatSuccess 
-} from '../../../../platform/infra/cli/presentation/output'
-import type { ComponentSummary } from '../../commands/component-summary'
-
-interface ComponentSummaryOptions {graph?: string}
-
-/** @riviere-role cli-entrypoint */
-export function createComponentSummaryCommand(componentSummary: ComponentSummary): Command {
-  return new Command('component-summary')
-    .description('Show component counts by type and domain')
-    .addHelpText(
-      'after',
-      `
-Examples:
-  $ riviere builder component-summary
-  $ riviere builder component-summary > summary.json
-`,
-    )
-    .option('--graph <path>', getDefaultGraphPathDescription())
-    .action(async (options: ComponentSummaryOptions) => {
-      const result = componentSummary.execute({ graphPathOption: options.graph })
-      if (!result.success) {
-        console.log(
-          JSON.stringify(
-            formatError(
-              result.code === 'GRAPH_NOT_FOUND'
-                ? CliErrorCode.GraphNotFound
-                : CliErrorCode.GraphCorrupted,
-              result.message,
-              [],
-            ),
-          ),
-        )
-        return
-      }
-
-      console.log(JSON.stringify(formatSuccess(result)))
-    })
-}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/define-custom-type/custom-type-parser.ts b/packages/riviere-cli/src/features/builder/entrypoint/define-custom-type/custom-type-parser.ts
deleted file mode 100644
index 19352de4d..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/define-custom-type/custom-type-parser.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import type {
-  CustomPropertyDefinition,
-  CustomPropertyType,
-} from '@living-architecture/riviere-schema'
-
-const VALID_PROPERTY_TYPES: readonly CustomPropertyType[] = [
-  'string',
-  'number',
-  'boolean',
-  'array',
-  'object',
-]
-
-function isValidPropertyType(value: string): value is CustomPropertyType {
-  return VALID_PROPERTY_TYPES.some((t) => t === value)
-}
-
-function parsePropertySpec(spec: string):
-  | {
-    definition: CustomPropertyDefinition
-    name: string
-  }
-  | { error: string } {
-  const parts = spec.split(':')
-  if (parts.length < 2 || parts.length > 3)
-    return {error: `Invalid property format: "${spec}". Expected "name:type" or "name:type:description"`,}
-  const [name, type, description] = parts
-  if (!name || name.trim() === '') return { error: 'Property name cannot be empty' }
-  if (!type || !isValidPropertyType(type))
-    return {error: `Invalid property type: "${type}". Valid types: ${VALID_PROPERTY_TYPES.join(', ')}`,}
-  const definition: CustomPropertyDefinition = { type }
-  if (description && description.trim() !== '') definition.description = description
-  return {
-    definition,
-    name: name.trim(),
-  }
-}
-
-type ParsePropertiesResult =
-  | {
-    properties: Record<string, CustomPropertyDefinition>
-    success: true
-  }
-  | {
-    error: string
-    success: false
-  }
-
-/** @riviere-role entrypoint-cli-input-parser */
-export function parsePropertySpecs(specs: string[] | undefined): ParsePropertiesResult {
-  if (specs === undefined || specs.length === 0)
-    return {
-      properties: {},
-      success: true,
-    }
-  const properties: Record<string, CustomPropertyDefinition> = {}
-  for (const spec of specs) {
-    const result = parsePropertySpec(spec)
-    if ('error' in result)
-      return {
-        error: result.error,
-        success: false,
-      }
-    if (properties[result.name] !== undefined)
-      return {
-        error: `Duplicate property name: "${result.name}"`,
-        success: false,
-      }
-    properties[result.name] = result.definition
-  }
-  return {
-    properties,
-    success: true,
-  }
-}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/define-custom-type/entrypoint.ts b/packages/riviere-cli/src/features/builder/entrypoint/define-custom-type/entrypoint.ts
deleted file mode 100644
index 18d827289..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/define-custom-type/entrypoint.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { Command } from 'commander'
-import { getDefaultGraphPathDescription } from '../../../../platform/infra/cli/presentation/graph-path-option'
-import {
-  formatError, formatSuccess 
-} from '../../../../platform/infra/cli/presentation/output'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import { parsePropertySpecs } from './custom-type-parser'
-import { collectOption } from '../_platform/cli/option-collectors'
-import type { DefineCustomType } from '../../commands/define-custom-type'
-
-interface DefineCustomTypeOptions {
-  name: string
-  description?: string
-  requiredProperty?: string[]
-  optionalProperty?: string[]
-  graph?: string
-  json?: boolean
-}
-
-/** @riviere-role cli-entrypoint */
-export function createDefineCustomTypeCommand(defineCustomType: DefineCustomType): Command {
-  return new Command('define-custom-type')
-    .description('Define a custom component type')
-    .requiredOption('--name <name>', 'Custom type name')
-    .option('--description <desc>', 'Custom type description')
-    .option(
-      '--required-property <spec>',
-      'Required property (format: name:type[:description])',
-      collectOption,
-      [],
-    )
-    .option(
-      '--optional-property <spec>',
-      'Optional property (format: name:type[:description])',
-      collectOption,
-      [],
-    )
-    .option('--graph <path>', getDefaultGraphPathDescription())
-    .option('--json', 'Output result as JSON')
-    .action(async (options: DefineCustomTypeOptions) => {
-      const requiredResult = parsePropertySpecs(options.requiredProperty)
-      if (!requiredResult.success) {
-        console.log(
-          JSON.stringify(formatError(CliErrorCode.ValidationError, requiredResult.error, [])),
-        )
-        return
-      }
-
-      const optionalResult = parsePropertySpecs(options.optionalProperty)
-      if (!optionalResult.success) {
-        console.log(
-          JSON.stringify(formatError(CliErrorCode.ValidationError, optionalResult.error, [])),
-        )
-        return
-      }
-
-      const result = defineCustomType.execute({
-        description: options.description,
-        graphPathOption: options.graph,
-        name: options.name,
-        optionalProperties: optionalResult.properties,
-        requiredProperties: requiredResult.properties,
-      })
-      if (!result.success) {
-        const errorCodeByResult = {
-          GRAPH_CORRUPTED: CliErrorCode.GraphCorrupted,
-          GRAPH_NOT_FOUND: CliErrorCode.GraphNotFound,
-          VALIDATION_ERROR: CliErrorCode.ValidationError,
-        } as const
-        const errorCode = errorCodeByResult[result.code]
-
-        console.log(JSON.stringify(formatError(errorCode, result.message, [])))
-        return
-      }
-
-      if (options.json === true) {
-        console.log(JSON.stringify(formatSuccess(result)))
-      }
-    })
-}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/define-relationship-type/entrypoint.ts b/packages/riviere-cli/src/features/builder/entrypoint/define-relationship-type/entrypoint.ts
deleted file mode 100644
index d41ff2b5d..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/define-relationship-type/entrypoint.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { Command } from 'commander'
-import { getDefaultGraphPathDescription } from '../../../../platform/infra/cli/presentation/graph-path-option'
-import {
-  formatError, formatSuccess 
-} from '../../../../platform/infra/cli/presentation/output'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import type { DefineRelationshipType } from '../../commands/define-relationship-type'
-
-interface DefineRelationshipTypeOptions {
-  name: string
-  description: string
-  graph?: string
-  json?: boolean
-}
-
-/** @riviere-role cli-entrypoint */
-export function createDefineRelationshipTypeCommand(
-  defineRelationshipType: DefineRelationshipType,
-): Command {
-  return new Command('define-relationship-type')
-    .description('Define a project relationship type')
-    .requiredOption('--name <name>', 'Relationship type name')
-    .requiredOption('--description <description>', 'Relationship type description')
-    .option('--graph <path>', getDefaultGraphPathDescription())
-    .option('--json', 'Output result as JSON')
-    .action(async (options: DefineRelationshipTypeOptions) => {
-      const result = defineRelationshipType.execute({
-        description: options.description,
-        graphPathOption: options.graph,
-        name: options.name,
-      })
-      if (!result.success) {
-        const errorCodeByResult = {
-          GRAPH_CORRUPTED: CliErrorCode.GraphCorrupted,
-          GRAPH_NOT_FOUND: CliErrorCode.GraphNotFound,
-          VALIDATION_ERROR: CliErrorCode.ValidationError,
-        } as const
-        console.log(JSON.stringify(formatError(errorCodeByResult[result.code], result.message, [])))
-        return
-      }
-
-      if (options.json === true) {
-        console.log(JSON.stringify(formatSuccess(result)))
-      }
-    })
-}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/enrich/enrichment-parser.ts b/packages/riviere-cli/src/features/builder/entrypoint/enrich/enrichment-parser.ts
deleted file mode 100644
index 6ff7a0974..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/enrich/enrichment-parser.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import type { StateTransition } from '@living-architecture/riviere-schema'
-
-function parseStateChange(input: string): StateTransition | undefined {
-  const [from, to, ...rest] = input.split(':')
-  if (from === undefined || to === undefined || rest.length > 0) return undefined
-  return {
-    from,
-    to,
-  }
-}
-
-type ParseResult =
-  | {
-    stateChanges: StateTransition[]
-    success: true
-  }
-  | {
-    invalidInput: string
-    success: false
-  }
-
-/** @riviere-role entrypoint-cli-input-parser */
-export function parseStateChanges(inputs: string[]): ParseResult {
-  const stateChanges: StateTransition[] = []
-  for (const sc of inputs) {
-    const parsed = parseStateChange(sc)
-    if (parsed === undefined)
-      return {
-        invalidInput: sc,
-        success: false,
-      }
-    stateChanges.push(parsed)
-  }
-  return {
-    stateChanges,
-    success: true,
-  }
-}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/enrich/entrypoint.ts b/packages/riviere-cli/src/features/builder/entrypoint/enrich/entrypoint.ts
deleted file mode 100644
index 8969d919b..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/enrich/entrypoint.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import { Command } from 'commander'
-import {
-  formatError, formatSuccess 
-} from '../../../../platform/infra/cli/presentation/output'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import { getDefaultGraphPathDescription } from '../../../../platform/infra/cli/presentation/graph-path-option'
-import { collectOption } from '../_platform/cli/option-collectors'
-import { parseStateChanges } from './enrichment-parser'
-import { parseSignature } from './signature-parser'
-import type { EnrichComponent } from '../../commands/enrich-component'
-
-interface EnrichOptions {
-  id: string
-  entity?: string
-  stateChange: string[]
-  businessRule: string[]
-  reads: string[]
-  validates: string[]
-  modifies: string[]
-  emits: string[]
-  signature?: string
-  graph?: string
-  json?: boolean
-}
-
-/** @riviere-role cli-entrypoint */
-export function createEnrichCommand(enrichComponent: EnrichComponent): Command {
-  return new Command('enrich')
-    .description(
-      'Enrich a DomainOp component with semantic information. ' +
-        'Note: Enrichment is additive — running multiple times accumulates values.',
-    )
-    .addHelpText(
-      'after',
-      `
-Examples:
-  $ riviere builder enrich \\
-      --id "orders:checkout:domainop:orderbegin" \\
-      --entity Order \\
-      --state-change "Draft:Placed" \\
-      --business-rule "Order must have at least one item" \\
-      --reads "this.items" \\
-      --validates "items.length > 0" \\
-      --modifies "this.state <- Placed" \\
-      --emits "OrderPlaced event"
-
-  $ riviere builder enrich \\
-      --id "payments:gateway:domainop:paymentprocess" \\
-      --state-change "Pending:Processing" \\
-      --reads "amount parameter" \\
-      --validates "amount > 0" \\
-      --modifies "this.status <- Processing"
-`,
-    )
-    .requiredOption('--id <component-id>', 'Component ID to enrich')
-    .option('--entity <name>', 'Entity name')
-    .option('--state-change <from:to>', 'State transition (repeatable)', collectOption, [])
-    .option('--business-rule <rule>', 'Business rule (repeatable)', collectOption, [])
-    .option('--reads <value>', 'What the operation reads (repeatable)', collectOption, [])
-    .option('--validates <value>', 'What the operation validates (repeatable)', collectOption, [])
-    .option('--modifies <value>', 'What the operation modifies (repeatable)', collectOption, [])
-    .option('--emits <value>', 'What the operation emits (repeatable)', collectOption, [])
-    .option(
-      '--signature <dsl>',
-      'Operation signature (e.g., "orderId:string, amount:number -> Order")',
-    )
-    .option('--graph <path>', getDefaultGraphPathDescription())
-    .option('--json', 'Output result as JSON')
-    .action(async (options: EnrichOptions) => {
-      const parseResult = parseStateChanges(options.stateChange)
-      if (!parseResult.success) {
-        const msg = `Invalid state-change format: '${parseResult.invalidInput}'. Expected 'from:to'.`
-        console.log(JSON.stringify(formatError(CliErrorCode.ValidationError, msg, [])))
-        return
-      }
-
-      const signatureResult =
-        options.signature === undefined ? undefined : parseSignature(options.signature)
-      if (signatureResult !== undefined && !signatureResult.success) {
-        console.log(
-          JSON.stringify(formatError(CliErrorCode.ValidationError, signatureResult.error, [])),
-        )
-        return
-      }
-      const parsedSignature =
-        signatureResult?.success === true ? signatureResult.signature : undefined
-
-      const result = enrichComponent.execute({
-        businessRules: options.businessRule,
-        entity: options.entity,
-        emits: options.emits,
-        graphPathOption: options.graph,
-        id: options.id,
-        modifies: options.modifies,
-        reads: options.reads,
-        signature: parsedSignature,
-        stateChanges: parseResult.stateChanges,
-        validates: options.validates,
-      })
-      if (!result.success) {
-        const errorCodeByResult = {
-          COMPONENT_NOT_FOUND: CliErrorCode.ComponentNotFound,
-          GRAPH_CORRUPTED: CliErrorCode.GraphCorrupted,
-          GRAPH_NOT_FOUND: CliErrorCode.GraphNotFound,
-          INVALID_COMPONENT_TYPE: CliErrorCode.InvalidComponentType,
-        } as const
-        const errorCode = errorCodeByResult[result.code]
-
-        console.log(JSON.stringify(formatError(errorCode, result.message, result.suggestions)))
-        return
-      }
-
-      if (options.json === true) {
-        console.log(JSON.stringify(formatSuccess({ componentId: result.componentId })))
-      }
-    })
-}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/enrich/signature-parser.ts b/packages/riviere-cli/src/features/builder/entrypoint/enrich/signature-parser.ts
deleted file mode 100644
index 9fa0a9a88..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/enrich/signature-parser.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-import type {
-  OperationParameter, OperationSignature 
-} from '@living-architecture/riviere-schema'
-
-function parseParameter(input: string): OperationParameter | undefined {
-  const parts = input.split(':')
-  if (parts.length < 2 || parts.length > 3) return undefined
-  const [name, type, description] = parts
-  if (name === undefined || name === '' || type === undefined || type === '') return undefined
-  return {
-    ...(description !== undefined && description !== '' ? { description: description.trim() } : {}),
-    name: name.trim(),
-    type: type.trim(),
-  }
-}
-
-type SignatureParseResult =
-  | {
-    signature: OperationSignature
-    success: true
-  }
-  | {
-    error: string
-    success: false
-  }
-type ParametersParseResult =
-  | {
-    parameters: OperationParameter[]
-    success: true
-  }
-  | {
-    error: string
-    success: false
-  }
-
-function parseParameters(paramsPart: string): ParametersParseResult {
-  if (paramsPart === '')
-    return {
-      parameters: [],
-      success: true,
-    }
-  const paramStrings = paramsPart.split(',').map((p) => p.trim())
-  const parameters: OperationParameter[] = []
-  for (const paramStr of paramStrings) {
-    const param = parseParameter(paramStr)
-    if (param === undefined)
-      return {
-        error: `Invalid parameter format: '${paramStr}'. Expected 'name:type' or 'name:type:description'.`,
-        success: false,
-      }
-    parameters.push(param)
-  }
-  return {
-    parameters,
-    success: true,
-  }
-}
-
-function buildSignatureObject(
-  parameters: OperationParameter[],
-  returnType: string | undefined,
-): OperationSignature {
-  const signature: OperationSignature = {}
-  if (parameters.length > 0) signature.parameters = parameters
-  if (returnType !== undefined && returnType !== '') signature.returnType = returnType
-  return signature
-}
-
-/** @riviere-role entrypoint-cli-input-parser */
-export function parseSignature(input: string): SignatureParseResult {
-  const trimmed = input.trim()
-  if (trimmed.startsWith('->')) {
-    const returnType = trimmed.slice(2).trim()
-    return returnType === ''
-      ? {
-        error: `Invalid signature format: '${input}'. Return type cannot be empty.`,
-        success: false,
-      }
-      : {
-        signature: { returnType },
-        success: true,
-      }
-  }
-  const arrowIndex = trimmed.indexOf(' -> ')
-  const paramsPart = arrowIndex === -1 ? trimmed : trimmed.slice(0, arrowIndex).trim()
-  const returnType = arrowIndex === -1 ? undefined : trimmed.slice(arrowIndex + 4).trim()
-  const paramsResult = parseParameters(paramsPart)
-  if (!paramsResult.success) return paramsResult
-  const signature = buildSignatureObject(paramsResult.parameters, returnType)
-  if (paramsResult.parameters.length === 0 && returnType === undefined) {
-    return {
-      error: `Invalid signature format: '${input}'. Expected 'param:type, ... -> ReturnType' or '-> ReturnType' or 'param:type'.`,
-      success: false,
-    }
-  }
-  return {
-    signature,
-    success: true,
-  }
-}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/finalize/entrypoint.ts b/packages/riviere-cli/src/features/builder/entrypoint/finalize/entrypoint.ts
deleted file mode 100644
index 80dcb3d08..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/finalize/entrypoint.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { Command } from 'commander'
-import { writeFile } from 'node:fs/promises'
-import {
-  formatError, formatSuccess 
-} from '../../../../platform/infra/cli/presentation/output'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import { getDefaultGraphPathDescription } from '../../../../platform/infra/cli/presentation/graph-path-option'
-import type { FinalizeGraph } from '../../commands/finalize-graph'
-
-interface FinalizeOptions {
-  graph?: string
-  output?: string
-  json?: boolean
-}
-
-/** @riviere-role cli-entrypoint */
-export function createFinalizeCommand(finalizeGraph: FinalizeGraph): Command {
-  return new Command('finalize')
-    .description('Validate and export the final graph')
-    .addHelpText(
-      'after',
-      `
-Examples:
-  $ riviere builder finalize
-  $ riviere builder finalize --output ./dist/architecture.json
-  $ riviere builder finalize --json
-`,
-    )
-    .option('--graph <path>', getDefaultGraphPathDescription())
-    .option('--output <path>', 'Output path for finalized graph (defaults to input path)')
-    .option('--json', 'Output result as JSON')
-    .action(async (options: FinalizeOptions) => {
-      const result = finalizeGraph.execute({ graphPathOption: options.graph })
-      if (!result.success) {
-        const errorCodeByResult = {
-          GRAPH_CORRUPTED: CliErrorCode.GraphCorrupted,
-          GRAPH_NOT_FOUND: CliErrorCode.GraphNotFound,
-          VALIDATION_ERROR: CliErrorCode.ValidationError,
-        } as const
-        const errorCode = errorCodeByResult[result.code]
-        const suggestions =
-          result.code === 'VALIDATION_ERROR' ? ['Fix the validation errors and try again'] : []
-
-        console.log(JSON.stringify(formatError(errorCode, result.message, suggestions)))
-        return
-      }
-
-      const outputPath = options.output ?? options.graph ?? '.riviere/graph.json'
-      await writeFile(outputPath, JSON.stringify(result.finalGraph, null, 2), 'utf-8')
-
-      if (options.json === true) {
-        console.log(JSON.stringify(formatSuccess({ path: outputPath })))
-      }
-    })
-}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/init/entrypoint.ts b/packages/riviere-cli/src/features/builder/entrypoint/init/entrypoint.ts
deleted file mode 100644
index d84fc4e01..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/init/entrypoint.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import { Command } from 'commander'
-import type { SystemType } from '@living-architecture/riviere-schema'
-import {
-  formatError, formatSuccess 
-} from '../../../../platform/infra/cli/presentation/output'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import { getDefaultGraphPathDescription } from '../../../../platform/infra/cli/presentation/graph-path-option'
-import { collectOption } from '../_platform/cli/option-collectors'
-import { parseDomainJson } from './domain-input-parser'
-import type { InitGraph } from '../../commands/init-graph'
-
-interface InitOptions {
-  name?: string
-  graph?: string
-  json?: boolean
-  source: string[]
-  domain: DomainInputParsed[]
-}
-
-interface DomainInputParsed {
-  description: string
-  name: string
-  systemType: SystemType
-}
-
-/** @riviere-role cli-entrypoint */
-export function createInitCommand(initGraph: InitGraph): Command {
-  return new Command('init')
-    .description('Initialize a new graph')
-    .addHelpText(
-      'after',
-      `
-Examples:
-  $ riviere builder init --source https://github.com/your-org/your-repo \\
-      --domain '{"name":"orders","description":"Order management","systemType":"domain"}'
-
-  $ riviere builder init --name "ecommerce" \\
-      --source https://github.com/your-org/orders \\
-      --source https://github.com/your-org/payments \\
-      --domain '{"name":"orders","description":"Order management","systemType":"domain"}' \\
-      --domain '{"name":"payments","description":"Payment processing","systemType":"domain"}'
-`,
-    )
-    .option('--name <name>', 'System name')
-    .option('--graph <path>', getDefaultGraphPathDescription())
-    .option('--json', 'Output result as JSON')
-    .option('--source <url>', 'Source repository URL (repeatable)', collectOption, [])
-    .option('--domain <json>', 'Domain as JSON (repeatable)', parseDomainJson, [])
-    .action(async (options: InitOptions) => {
-      // Validate required flags
-      if (options.source.length === 0) {
-        console.log(
-          JSON.stringify(
-            formatError(CliErrorCode.ValidationError, 'At least one source required', [
-              'Add --source <url> flag',
-            ]),
-          ),
-        )
-        return
-      }
-
-      if (options.domain.length === 0) {
-        console.log(
-          JSON.stringify(
-            formatError(CliErrorCode.ValidationError, 'At least one domain required', [
-              'Add --domain <json> flag',
-            ]),
-          ),
-        )
-        return
-      }
-
-      const domains = options.domain.map(({
-        description, name, systemType 
-      }) => ({
-        description,
-        name,
-        systemType,
-      }))
-
-      const result = initGraph.execute({
-        domains,
-        graphPathOption: options.graph,
-        name: options.name,
-        sources: options.source,
-      })
-
-      if (!result.success) {
-        console.log(
-          JSON.stringify(
-            formatError(CliErrorCode.GraphExists, result.message, [
-              'Delete the file to reinitialize',
-            ]),
-          ),
-        )
-        return
-      }
-
-      if (options.json === true) {
-        console.log(
-          JSON.stringify(
-            formatSuccess({
-              domains: result.domains,
-              path: result.path,
-              sources: result.sources,
-            }),
-          ),
-        )
-      }
-    })
-}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/link-external/entrypoint.ts b/packages/riviere-cli/src/features/builder/entrypoint/link-external/entrypoint.ts
deleted file mode 100644
index 29d41f22f..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/link-external/entrypoint.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { Command } from 'commander'
-import { getDefaultGraphPathDescription } from '../../../../platform/infra/cli/presentation/graph-path-option'
-import {
-  formatError, formatSuccess 
-} from '../../../../platform/infra/cli/presentation/output'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import { isValidLinkType } from '../../../../entrypoint/_platform/cli/component-types'
-import { validateLinkType } from '../_platform/cli/validation'
-import { buildExternalTarget } from './link-external-transformer'
-import type { LinkExternal } from '../../commands/link-external'
-
-interface LinkExternalOptions {
-  from: string
-  targetName: string
-  targetDomain?: string
-  targetUrl?: string
-  linkType?: string
-  graph?: string
-  json?: boolean
-}
-
-/** @riviere-role cli-entrypoint */
-export function createLinkExternalCommand(linkExternal: LinkExternal): Command {
-  return new Command('link-external')
-    .description('Link a component to an external system')
-    .addHelpText(
-      'after',
-      `
-Examples:
-  $ riviere builder link-external \\
-      --from "payments:gateway:usecase:processpayment" \\
-      --target-name "Stripe" \\
-      --target-url "https://api.stripe.com" \\
-      --link-type sync
-
-  $ riviere builder link-external \\
-      --from "shipping:tracking:usecase:updatetracking" \\
-      --target-name "FedEx API" \\
-      --target-domain "shipping" \\
-      --link-type async
-`,
-    )
-    .requiredOption('--from <component-id>', 'Source component ID')
-    .requiredOption('--target-name <name>', 'External target name')
-    .option('--target-domain <domain>', 'External target domain')
-    .option('--target-url <url>', 'External target URL')
-    .option('--link-type <type>', 'Link type (sync, async)')
-    .option('--graph <path>', getDefaultGraphPathDescription())
-    .option('--json', 'Output result as JSON')
-    .action(async (options: LinkExternalOptions) => {
-      const linkTypeValidation = validateLinkType(options.linkType)
-      if (!linkTypeValidation.valid) {
-        console.log(linkTypeValidation.errorJson)
-        return
-      }
-
-      const linkType =
-        options.linkType !== undefined && isValidLinkType(options.linkType)
-          ? options.linkType
-          : undefined
-
-      const result = linkExternal.execute({
-        from: options.from,
-        graphPathOption: options.graph,
-        target: buildExternalTarget(options),
-        type: linkType,
-      })
-      if (!result.success) {
-        const errorCodeByResult = {
-          COMPONENT_NOT_FOUND: CliErrorCode.ComponentNotFound,
-          GRAPH_CORRUPTED: CliErrorCode.GraphCorrupted,
-          GRAPH_NOT_FOUND: CliErrorCode.GraphNotFound,
-        } as const
-        const errorCode = errorCodeByResult[result.code]
-
-        console.log(JSON.stringify(formatError(errorCode, result.message, result.suggestions)))
-        return
-      }
-
-      if (options.json) {
-        console.log(JSON.stringify(formatSuccess({ externalLink: result.externalLink })))
-      }
-    })
-}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/link-external/link-external-transformer.ts b/packages/riviere-cli/src/features/builder/entrypoint/link-external/link-external-transformer.ts
deleted file mode 100644
index 26ce61527..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/link-external/link-external-transformer.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import type { ExternalTarget } from '@living-architecture/riviere-schema'
-
-interface LinkExternalOptions {
-  targetDomain?: string
-  targetName: string
-  targetUrl?: string
-}
-
-/** @riviere-role entrypoint-cli-input-parser */
-export function buildExternalTarget(options: LinkExternalOptions): ExternalTarget {
-  return {
-    ...(options.targetDomain ? { domain: options.targetDomain } : {}),
-    ...(options.targetUrl ? { url: options.targetUrl } : {}),
-    name: options.targetName,
-  }
-}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/link-http/entrypoint.ts b/packages/riviere-cli/src/features/builder/entrypoint/link-http/entrypoint.ts
deleted file mode 100644
index 0b511788a..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/link-http/entrypoint.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import { Command } from 'commander'
-import { ComponentId } from '@living-architecture/riviere-builder'
-import { getDefaultGraphPathDescription } from '../../../../platform/infra/cli/presentation/graph-path-option'
-import {
-  formatError, formatSuccess 
-} from '../../../../platform/infra/cli/presentation/output'
-import {
-  isValidLinkType,
-  normalizeComponentType,
-} from '../../../../entrypoint/_platform/cli/component-types'
-import { isValidHttpMethod } from '../_platform/cli/validation'
-import { validateOptions } from './link-http-validator'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import type { LinkHttp } from '../../commands/link-http'
-
-interface LinkHttpOptions {
-  path: string
-  toDomain: string
-  toModule: string
-  toType: string
-  toName: string
-  method?: string
-  linkType?: string
-  graph?: string
-  json?: boolean
-}
-
-/** @riviere-role cli-entrypoint */
-export function createLinkHttpCommand(linkHttp: LinkHttp): Command {
-  return new Command('link-http')
-    .description('Find an API by HTTP path and link to a target component')
-    .addHelpText(
-      'after',
-      `
-Examples:
-  $ riviere builder link-http \\
-      --path "/orders" --method POST \\
-      --to-domain orders --to-module checkout --to-type UseCase --to-name "place-order"
-
-  $ riviere builder link-http \\
-      --path "/users/{id}" --method GET \\
-      --to-domain users --to-module queries --to-type UseCase --to-name "get-user" \\
-      --link-type sync
-`,
-    )
-    .requiredOption('--path <http-path>', 'HTTP path to match')
-    .requiredOption('--to-domain <domain>', 'Target domain')
-    .requiredOption('--to-module <module>', 'Target module')
-    .requiredOption('--to-type <type>', 'Target component type')
-    .requiredOption('--to-name <name>', 'Target component name')
-    .option('--method <method>', 'Filter by HTTP method (GET, POST, PUT, PATCH, DELETE)')
-    .option('--link-type <type>', 'Link type (sync, async)')
-    .option('--graph <path>', getDefaultGraphPathDescription())
-    .option('--json', 'Output result as JSON')
-    .action(async (options: LinkHttpOptions) => {
-      const validationError = validateOptions(options)
-      if (validationError) {
-        console.log(validationError)
-        return
-      }
-
-      const normalizedMethod = options.method?.toUpperCase()
-      const httpMethod =
-        normalizedMethod !== undefined && isValidHttpMethod(normalizedMethod)
-          ? normalizedMethod
-          : undefined
-      const linkType =
-        options.linkType !== undefined && isValidLinkType(options.linkType)
-          ? options.linkType
-          : undefined
-
-      const result = linkHttp.execute({
-        graphPathOption: options.graph,
-        httpMethod,
-        linkType,
-        path: options.path,
-        targetId: ComponentId.create({
-          domain: options.toDomain,
-          module: options.toModule,
-          type: normalizeComponentType(options.toType),
-          name: options.toName,
-        }).toString(),
-      })
-      if (!result.success) {
-        const errorCodeByResult = {
-          AMBIGUOUS_API_MATCH: CliErrorCode.AmbiguousApiMatch,
-          COMPONENT_NOT_FOUND: CliErrorCode.ComponentNotFound,
-          GRAPH_CORRUPTED: CliErrorCode.GraphCorrupted,
-          GRAPH_NOT_FOUND: CliErrorCode.GraphNotFound,
-          VALIDATION_ERROR: CliErrorCode.ValidationError,
-        } as const
-        const errorCode = errorCodeByResult[result.code]
-
-        console.log(JSON.stringify(formatError(errorCode, result.message, result.suggestions)))
-        return
-      }
-
-      if (options.json) {
-        console.log(JSON.stringify(formatSuccess(result)))
-      }
-    })
-}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/link-http/link-http-validator.ts b/packages/riviere-cli/src/features/builder/entrypoint/link-http/link-http-validator.ts
deleted file mode 100644
index 77f049564..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/link-http/link-http-validator.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import {
-  validateComponentType,
-  validateHttpMethod,
-  validateLinkType,
-} from '../_platform/cli/validation'
-
-interface LinkHttpOptions {
-  linkType?: string
-  method?: string
-  toType: string
-}
-
-/** @riviere-role entrypoint-cli-input-parser */
-export function validateOptions(options: LinkHttpOptions): string | undefined {
-  const componentTypeValidation = validateComponentType(options.toType)
-  if (!componentTypeValidation.valid) return componentTypeValidation.errorJson
-  const httpMethodValidation = validateHttpMethod(options.method)
-  if (!httpMethodValidation.valid) return httpMethodValidation.errorJson
-  const linkTypeValidation = validateLinkType(options.linkType)
-  if (!linkTypeValidation.valid) return linkTypeValidation.errorJson
-  return undefined
-}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/link/entrypoint.ts b/packages/riviere-cli/src/features/builder/entrypoint/link/entrypoint.ts
deleted file mode 100644
index a15d10f97..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/link/entrypoint.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-import { Command } from 'commander'
-import { ComponentId } from '@living-architecture/riviere-builder'
-import { getDefaultGraphPathDescription } from '../../../../platform/infra/cli/presentation/graph-path-option'
-import * as cliOutput from '../../../../platform/infra/cli/presentation/output'
-import {
-  isValidLinkType,
-  normalizeComponentType,
-} from '../../../../entrypoint/_platform/cli/component-types'
-import * as linkOptionValidation from '../_platform/cli/validation'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import type { LinkComponents } from '../../commands/link-components'
-import { parseLinkSourceLocation } from './link-source-location-options'
-
-interface LinkOptions {
-  from: string
-  toDomain: string
-  toModule: string
-  toType: string
-  toName: string
-  linkType?: string
-  relationshipType?: string
-  condition?: string
-  repository?: string
-  filePath?: string
-  lineNumber?: string
-  columnNumber?: string
-  graph?: string
-  json?: boolean
-}
-
-/** @riviere-role cli-entrypoint */
-export function createLinkCommand(linkComponents: LinkComponents): Command {
-  return new Command('link')
-    .description('Link two components')
-    .addHelpText(
-      'after',
-      `
-Examples:
-  $ riviere builder link \\
-      --from "orders:api:api:postorders" \\
-      --to-domain orders --to-module checkout --to-type UseCase --to-name "place-order" \\
-      --link-type sync
-
-  $ riviere builder link \\
-      --from "orders:checkout:domainop:orderbegin" \\
-      --to-domain orders --to-module events --to-type Event --to-name "order-placed" \\
-      --link-type async
-`,
-    )
-    .requiredOption('--from <component-id>', 'Source component ID')
-    .requiredOption('--to-domain <domain>', 'Target domain')
-    .requiredOption('--to-module <module>', 'Target module')
-    .requiredOption(
-      '--to-type <type>',
-      'Target component type (UI, API, UseCase, DomainOp, Event, EventHandler, Custom)',
-    )
-    .requiredOption('--to-name <name>', 'Target component name')
-    .option('--link-type <type>', 'Link type (sync, async)')
-    .option('--relationship-type <name>', 'Project-defined relationship type')
-    .option('--condition <condition>', 'Condition retained exactly as supplied')
-    .option('--repository <repository>', 'Source repository identifier')
-    .option('--file-path <path>', 'Source file path')
-    .option('--line-number <n>', 'Source line number')
-    .option('--column-number <n>', 'Source column number')
-    .option('--graph <path>', getDefaultGraphPathDescription())
-    .option('--json', 'Output result as JSON')
-    .action(async (options: LinkOptions) => {
-      const componentTypeValidation = linkOptionValidation.validateComponentType(options.toType)
-      if (!componentTypeValidation.valid) {
-        console.log(componentTypeValidation.errorJson)
-        return
-      }
-
-      const linkTypeValidation = linkOptionValidation.validateLinkType(options.linkType)
-      if (!linkTypeValidation.valid) {
-        console.log(linkTypeValidation.errorJson)
-        return
-      }
-
-      const linkType =
-        options.linkType !== undefined && isValidLinkType(options.linkType)
-          ? options.linkType
-          : undefined
-
-      const sourceLocationResult = parseLinkSourceLocation(options)
-      if (!sourceLocationResult.success) {
-        console.log(
-          JSON.stringify(
-            cliOutput.formatError(CliErrorCode.ValidationError, sourceLocationResult.message, []),
-          ),
-        )
-        return
-      }
-
-      const result = linkComponents.execute({
-        condition: options.condition,
-        from: options.from,
-        graphPathOption: options.graph,
-        relationshipType: options.relationshipType,
-        sourceLocation: sourceLocationResult.sourceLocation,
-        to: ComponentId.create({
-          domain: options.toDomain,
-          module: options.toModule,
-          type: normalizeComponentType(options.toType),
-          name: options.toName,
-        }).toString(),
-        type: linkType,
-      })
-      if (!result.success) {
-        const errorCodeByResult = {
-          COMPONENT_NOT_FOUND: CliErrorCode.ComponentNotFound,
-          GRAPH_CORRUPTED: CliErrorCode.GraphCorrupted,
-          GRAPH_NOT_FOUND: CliErrorCode.GraphNotFound,
-          VALIDATION_ERROR: CliErrorCode.ValidationError,
-        } as const
-        const errorCode = errorCodeByResult[result.code]
-
-        console.log(
-          JSON.stringify(cliOutput.formatError(errorCode, result.message, result.suggestions)),
-        )
-        return
-      }
-
-      if (options.json) {
-        console.log(JSON.stringify(cliOutput.formatSuccess({ link: result.link })))
-      }
-    })
-}
diff --git a/packages/riviere-cli/src/features/builder/entrypoint/validate/entrypoint.ts b/packages/riviere-cli/src/features/builder/entrypoint/validate/entrypoint.ts
deleted file mode 100644
index 67b6c3391..000000000
--- a/packages/riviere-cli/src/features/builder/entrypoint/validate/entrypoint.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { Command } from 'commander'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import { getDefaultGraphPathDescription } from '../../../../platform/infra/cli/presentation/graph-path-option'
-import {
-  formatError, formatSuccess 
-} from '../../../../platform/infra/cli/presentation/output'
-import type { ValidateGraph } from '../../commands/validate-graph'
-
-interface ValidateOptions {
-  graph?: string
-  json?: boolean
-}
-
-/** @riviere-role cli-entrypoint */
-export function createValidateCommand(validateGraph: ValidateGraph): Command {
-  return new Command('validate')
-    .description('Validate the graph for errors and warnings')
-    .addHelpText(
-      'after',
-      `
-Examples:
-  $ riviere builder validate
-  $ riviere builder validate --json
-  $ riviere builder validate --graph .riviere/my-graph.json
-`,
-    )
-    .option('--graph <path>', getDefaultGraphPathDescription())
-    .option('--json', 'Output result as JSON')
-    .action(async (options: ValidateOptions) => {
-      const result = validateGraph.execute({ graphPathOption: options.graph })
-      if (!result.success) {
-        console.log(
-          JSON.stringify(
-            formatError(
-              result.code === 'GRAPH_NOT_FOUND'
-                ? CliErrorCode.GraphNotFound
-                : CliErrorCode.GraphCorrupted,
-              result.message,
-              [],
-            ),
-          ),
-        )
-        return
-      }
-
-      if (options.json === true) {
-        console.log(
-          JSON.stringify(
-            formatSuccess({
-              errors: result.errors,
-              valid: result.valid,
-              warnings: result.warnings,
-            }),
-          ),
-        )
-      }
-    })
-}
diff --git a/packages/riviere-cli/src/features/extract/commands/enrich-draft-components-result.ts b/packages/riviere-cli/src/features/extract/commands/enrich-draft-components-result.ts
deleted file mode 100644
index 68cab7298..000000000
--- a/packages/riviere-cli/src/features/extract/commands/enrich-draft-components-result.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import type {
-  ConnectionTimings,
-  DraftComponent,
-  EnrichedComponent,
-  ExtractedLink,
-} from '@living-architecture/riviere-extract-ts'
-import type { ExternalLink } from '@living-architecture/riviere-schema'
-
-interface EnrichDraftComponentsDraftOnlyResult {
-  kind: 'draftOnly'
-  components: DraftComponent[]
-}
-
-interface EnrichDraftComponentsFullResult {
-  kind: 'full'
-  components: EnrichedComponent[]
-  links: ExtractedLink[]
-  externalLinks: ExternalLink[]
-  timings: ConnectionTimings[]
-  failedFields: string[]
-}
-
-interface EnrichDraftComponentsFieldFailureResult {
-  kind: 'fieldFailure'
-  failedFields: string[]
-}
-
-/** @riviere-role command-use-case-result */
-export type EnrichDraftComponentsResult =
-  | EnrichDraftComponentsDraftOnlyResult
-  | EnrichDraftComponentsFullResult
-  | EnrichDraftComponentsFieldFailureResult
diff --git a/packages/riviere-cli/src/features/extract/commands/enrich-draft-components.spec.ts b/packages/riviere-cli/src/features/extract/commands/enrich-draft-components.spec.ts
deleted file mode 100644
index 1f89b5344..000000000
--- a/packages/riviere-cli/src/features/extract/commands/enrich-draft-components.spec.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import {
-  beforeEach, describe, expect, it, vi 
-} from 'vitest'
-
-const mocks = vi.hoisted(() => ({
-  enrichDraftComponentsMethodMock: vi.fn(),
-  loadFromDraftEnrichmentMock: vi.fn(),
-}))
-
-vi.mock('../data-access/extraction-project/extraction-project-repository', () => ({
-  ExtractionProjectRepository: class {
-    loadFromDraftEnrichment = mocks.loadFromDraftEnrichmentMock
-  },
-}))
-
-import { EnrichDraftComponents } from './enrich-draft-components'
-import { ExtractionProjectRepository } from '../data-access/extraction-project/extraction-project-repository'
-
-describe('enrichDraftComponents', () => {
-  beforeEach(() => {
-    vi.resetAllMocks()
-    mocks.loadFromDraftEnrichmentMock.mockReturnValue({enrichDraftComponents: mocks.enrichDraftComponentsMethodMock,})
-    mocks.enrichDraftComponentsMethodMock.mockReturnValue({
-      kind: 'draftOnly',
-      components: [{ name: 'Draft' }],
-    })
-  })
-
-  it('returns draft-only results when connections are disabled', () => {
-    const result = new EnrichDraftComponents(new ExtractionProjectRepository()).execute({
-      allowIncomplete: false,
-      configPath: 'config.yml',
-      draftComponentsPath: 'draft.json',
-      includeConnections: false,
-      useTsConfig: true,
-    })
-
-    expect(result).toStrictEqual({
-      kind: 'draftOnly',
-      components: [{ name: 'Draft' }],
-    })
-    expect(mocks.enrichDraftComponentsMethodMock).toHaveBeenCalledWith({
-      allowIncomplete: false,
-      includeConnections: false,
-    })
-  })
-
-  it('returns field failure when enrichment fails and incomplete output is disabled', () => {
-    mocks.enrichDraftComponentsMethodMock.mockReturnValue({
-      kind: 'fieldFailure',
-      failedFields: ['fieldA'],
-    })
-
-    const result = new EnrichDraftComponents(new ExtractionProjectRepository()).execute({
-      allowIncomplete: false,
-      configPath: 'config.yml',
-      draftComponentsPath: 'draft.json',
-      includeConnections: true,
-      useTsConfig: true,
-    })
-
-    expect(result).toStrictEqual({
-      kind: 'fieldFailure',
-      failedFields: ['fieldA'],
-    })
-  })
-})
diff --git a/packages/riviere-cli/src/features/extract/commands/enrich-draft-components.ts b/packages/riviere-cli/src/features/extract/commands/enrich-draft-components.ts
deleted file mode 100644
index 1c06d3841..000000000
--- a/packages/riviere-cli/src/features/extract/commands/enrich-draft-components.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ExtractionProjectRepository } from '../data-access/extraction-project/extraction-project-repository'
-import type { EnrichDraftComponentsInput } from './enrich-draft-components-input'
-import type { EnrichDraftComponentsResult } from './enrich-draft-components-result'
-
-/** @riviere-role command-use-case */
-export class EnrichDraftComponents {
-  constructor(private readonly extractionProjectRepository: ExtractionProjectRepository) {}
-
-  execute(enrichDraftComponentsInput: EnrichDraftComponentsInput): EnrichDraftComponentsResult {
-    const extractionProject = this.extractionProjectRepository.loadFromDraftEnrichment({
-      configPath: enrichDraftComponentsInput.configPath,
-      draftComponentsPath: enrichDraftComponentsInput.draftComponentsPath,
-      useTsConfig: enrichDraftComponentsInput.useTsConfig,
-    })
-
-    return extractionProject.enrichDraftComponents({
-      allowIncomplete: enrichDraftComponentsInput.allowIncomplete,
-      includeConnections: enrichDraftComponentsInput.includeConnections,
-    })
-  }
-}
diff --git a/packages/riviere-cli/src/features/extract/commands/extract-draft-components-result.ts b/packages/riviere-cli/src/features/extract/commands/extract-draft-components-result.ts
deleted file mode 100644
index 9075508d8..000000000
--- a/packages/riviere-cli/src/features/extract/commands/extract-draft-components-result.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import type {
-  ConnectionTimings,
-  DraftComponent,
-  EnrichedComponent,
-  ExtractedLink,
-} from '@living-architecture/riviere-extract-ts'
-import type { ExternalLink } from '@living-architecture/riviere-schema'
-
-interface ExtractDraftComponentsDraftOnlyResult {
-  kind: 'draftOnly'
-  components: DraftComponent[]
-}
-
-interface ExtractDraftComponentsFullResult {
-  kind: 'full'
-  components: EnrichedComponent[]
-  links: ExtractedLink[]
-  externalLinks: ExternalLink[]
-  timings: ConnectionTimings[]
-  failedFields: string[]
-}
-
-interface ExtractDraftComponentsFieldFailureResult {
-  kind: 'fieldFailure'
-  failedFields: string[]
-}
-
-/** @riviere-role command-use-case-result */
-export type ExtractDraftComponentsResult =
-  | ExtractDraftComponentsDraftOnlyResult
-  | ExtractDraftComponentsFullResult
-  | ExtractDraftComponentsFieldFailureResult
diff --git a/packages/riviere-cli/src/features/extract/commands/extract-draft-components.spec.ts b/packages/riviere-cli/src/features/extract/commands/extract-draft-components.spec.ts
deleted file mode 100644
index 030fd0ac6..000000000
--- a/packages/riviere-cli/src/features/extract/commands/extract-draft-components.spec.ts
+++ /dev/null
@@ -1,140 +0,0 @@
-import {
-  beforeEach, describe, expect, it, vi 
-} from 'vitest'
-
-const mocks = vi.hoisted(() => ({
-  extractDraftComponentsMethodMock: vi.fn(),
-  loadFromChangedProjectMock: vi.fn(),
-  loadFromFullProjectMock: vi.fn(),
-  loadFromSelectedFilesMock: vi.fn(),
-}))
-
-vi.mock('../data-access/extraction-project/extraction-project-repository', () => ({
-  ExtractionProjectRepository: class {
-    loadFromChangedProject = mocks.loadFromChangedProjectMock
-    loadFromFullProject = mocks.loadFromFullProjectMock
-    loadFromSelectedFiles = mocks.loadFromSelectedFilesMock
-  },
-}))
-
-import { ExtractDraftComponents } from './extract-draft-components'
-import { ExtractionProjectRepository } from '../data-access/extraction-project/extraction-project-repository'
-
-const DRAFT_ONLY_RESULT = {
-  kind: 'draftOnly' as const,
-  components: [],
-}
-
-describe('extractDraftComponents', () => {
-  beforeEach(() => {
-    vi.resetAllMocks()
-    mocks.loadFromChangedProjectMock.mockReturnValue({extractDraftComponents: mocks.extractDraftComponentsMethodMock,})
-    mocks.loadFromFullProjectMock.mockReturnValue({extractDraftComponents: mocks.extractDraftComponentsMethodMock,})
-    mocks.loadFromSelectedFilesMock.mockReturnValue({extractDraftComponents: mocks.extractDraftComponentsMethodMock,})
-    mocks.extractDraftComponentsMethodMock.mockReturnValue(DRAFT_ONLY_RESULT)
-  })
-
-  describe('pull-request source mode', () => {
-    it('loads from changed project with base branch when provided', () => {
-      new ExtractDraftComponents(new ExtractionProjectRepository()).execute({
-        allowIncomplete: false,
-        baseBranch: 'main',
-        configPath: 'config.yml',
-        includeConnections: true,
-        sourceMode: 'pull-request',
-        useTsConfig: false,
-      })
-
-      expect(mocks.loadFromChangedProjectMock).toHaveBeenCalledWith({
-        baseBranch: 'main',
-        configPath: 'config.yml',
-        useTsConfig: false,
-      })
-    })
-
-    it('loads from changed project without base branch when not provided', () => {
-      new ExtractDraftComponents(new ExtractionProjectRepository()).execute({
-        allowIncomplete: false,
-        configPath: 'config.yml',
-        includeConnections: true,
-        sourceMode: 'pull-request',
-        useTsConfig: false,
-      })
-
-      expect(mocks.loadFromChangedProjectMock).toHaveBeenCalledWith({
-        configPath: 'config.yml',
-        useTsConfig: false,
-      })
-    })
-  })
-
-  describe('files source mode', () => {
-    it('loads from selected files when files are provided', () => {
-      new ExtractDraftComponents(new ExtractionProjectRepository()).execute({
-        allowIncomplete: false,
-        configPath: 'config.yml',
-        files: ['src/foo.ts', 'src/bar.ts'],
-        includeConnections: false,
-        sourceMode: 'files',
-        useTsConfig: true,
-      })
-
-      expect(mocks.loadFromSelectedFilesMock).toHaveBeenCalledWith({
-        configPath: 'config.yml',
-        filePaths: ['src/foo.ts', 'src/bar.ts'],
-        useTsConfig: true,
-      })
-    })
-
-    it('defaults filePaths to empty array when files is undefined', () => {
-      new ExtractDraftComponents(new ExtractionProjectRepository()).execute({
-        allowIncomplete: false,
-        configPath: 'config.yml',
-        includeConnections: false,
-        sourceMode: 'files',
-        useTsConfig: true,
-      })
-
-      expect(mocks.loadFromSelectedFilesMock).toHaveBeenCalledWith({
-        configPath: 'config.yml',
-        filePaths: [],
-        useTsConfig: true,
-      })
-    })
-  })
-
-  describe('all source mode', () => {
-    it('loads from full project', () => {
-      new ExtractDraftComponents(new ExtractionProjectRepository()).execute({
-        allowIncomplete: false,
-        configPath: 'config.yml',
-        includeConnections: true,
-        sourceMode: 'all',
-        useTsConfig: true,
-      })
-
-      expect(mocks.loadFromFullProjectMock).toHaveBeenCalledWith({
-        configPath: 'config.yml',
-        useTsConfig: true,
-      })
-    })
-  })
-
-  describe('result forwarding', () => {
-    it('returns the extraction result', () => {
-      const result = new ExtractDraftComponents(new ExtractionProjectRepository()).execute({
-        allowIncomplete: true,
-        configPath: 'config.yml',
-        includeConnections: false,
-        sourceMode: 'all',
-        useTsConfig: false,
-      })
-
-      expect(result).toStrictEqual(DRAFT_ONLY_RESULT)
-      expect(mocks.extractDraftComponentsMethodMock).toHaveBeenCalledWith({
-        allowIncomplete: true,
-        includeConnections: false,
-      })
-    })
-  })
-})
diff --git a/packages/riviere-cli/src/features/extract/commands/extract-draft-components.ts b/packages/riviere-cli/src/features/extract/commands/extract-draft-components.ts
deleted file mode 100644
index e856d03a0..000000000
--- a/packages/riviere-cli/src/features/extract/commands/extract-draft-components.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { ExtractionProjectRepository } from '../data-access/extraction-project/extraction-project-repository'
-import type { ExtractDraftComponentsInput } from './extract-draft-components-input'
-import type { ExtractDraftComponentsResult } from './extract-draft-components-result'
-
-/** @riviere-role command-use-case */
-export class ExtractDraftComponents {
-  constructor(private readonly extractionProjectRepository: ExtractionProjectRepository) {}
-
-  execute(extractDraftComponentsInput: ExtractDraftComponentsInput): ExtractDraftComponentsResult {
-    const extractionProject = loadProjectFromInput(
-      this.extractionProjectRepository,
-      extractDraftComponentsInput,
-    )
-
-    return extractionProject.extractDraftComponents({
-      allowIncomplete: extractDraftComponentsInput.allowIncomplete,
-      includeConnections: extractDraftComponentsInput.includeConnections,
-    })
-  }
-}
-
-function loadProjectFromInput(
-  extractionProjectRepository: ExtractionProjectRepository,
-  extractDraftComponentsInput: ExtractDraftComponentsInput,
-) {
-  if (extractDraftComponentsInput.sourceMode === 'pull-request') {
-    return extractionProjectRepository.loadFromChangedProject({
-      configPath: extractDraftComponentsInput.configPath,
-      ...(extractDraftComponentsInput.baseBranch === undefined
-        ? {}
-        : { baseBranch: extractDraftComponentsInput.baseBranch }),
-      useTsConfig: extractDraftComponentsInput.useTsConfig,
-    })
-  }
-
-  if (extractDraftComponentsInput.sourceMode === 'files') {
-    return extractionProjectRepository.loadFromSelectedFiles({
-      configPath: extractDraftComponentsInput.configPath,
-      filePaths: extractDraftComponentsInput.files ?? [],
-      useTsConfig: extractDraftComponentsInput.useTsConfig,
-    })
-  }
-
-  return extractionProjectRepository.loadFromFullProject({
-    configPath: extractDraftComponentsInput.configPath,
-    useTsConfig: extractDraftComponentsInput.useTsConfig,
-  })
-}
diff --git a/packages/riviere-cli/src/features/extract/data-access/extraction-project/extraction-project-repository-draft-components.spec.ts b/packages/riviere-cli/src/features/extract/data-access/extraction-project/extraction-project-repository-draft-components.spec.ts
deleted file mode 100644
index b0d0f7521..000000000
--- a/packages/riviere-cli/src/features/extract/data-access/extraction-project/extraction-project-repository-draft-components.spec.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { expect, it } from 'vitest'
-import { ExtractionProjectRepository } from './extraction-project-repository'
-
-it('rejects JSON that is not a draft-component array', () => {
-  const directory = mkdtempSync(join(tmpdir(), 'extract-project-drafts-'))
-  try {
-    writeFileSync(join(directory, 'package.json'), '{"name":"workspace"}', 'utf-8')
-    writeFileSync(join(directory, 'component.ts'), 'export class Order {}', 'utf-8')
-    writeFileSync(
-      join(directory, 'extract.yml'),
-      `modules:
-  - name: orders
-    domain: orders
-    path: .
-    glob: "*.ts"
-    api: { notUsed: true }
-    useCase: { notUsed: true }
-    domainOp: { notUsed: true }
-    event: { notUsed: true }
-    eventHandler: { notUsed: true }
-    ui: { notUsed: true }
-`,
-      'utf-8',
-    )
-    writeFileSync(join(directory, 'draft-components.json'), '{"invalid":true}', 'utf-8')
-
-    expect(() =>
-      new ExtractionProjectRepository().loadFromDraftEnrichment({
-        configPath: join(directory, 'extract.yml'),
-        draftComponentsPath: join(directory, 'draft-components.json'),
-        useTsConfig: false,
-      }),
-    ).toThrow(/does not contain valid draft components/)
-  } finally {
-    rmSync(directory, { recursive: true })
-  }
-})
diff --git a/packages/riviere-cli/src/features/extract/data-access/extraction-project/extraction-project-repository.ts b/packages/riviere-cli/src/features/extract/data-access/extraction-project/extraction-project-repository.ts
deleted file mode 100644
index 2b15937b7..000000000
--- a/packages/riviere-cli/src/features/extract/data-access/extraction-project/extraction-project-repository.ts
+++ /dev/null
@@ -1,444 +0,0 @@
-import {
-  dirname, posix, resolve 
-} from 'node:path'
-import { parse as parseYaml } from 'yaml'
-import { globSync } from 'glob'
-import type { DraftComponent } from '@living-architecture/riviere-extract-ts'
-import { resolveConfig } from '@living-architecture/riviere-extract-ts'
-import {
-  type ExtractionConfig,
-  formatValidationErrors,
-  isValidExtractionConfig,
-  type ModuleConfig,
-  type Module,
-  type ResolvedExtractionConfig,
-  validateExtractionConfig,
-} from '@living-architecture/riviere-extract-config'
-import {
-  FileReadError,
-  fileExists,
-  readJsonFile,
-  readTextFile,
-} from '../../../../platform/infra/external-clients/filesystem/index'
-import { resolveFileOrPackagePath } from '../../../../platform/infra/external-clients/node-modules/index'
-import {
-  CliErrorCode,
-  ConfigValidationError,
-} from '../../../../platform/infra/cli/presentation/error-codes'
-import { detectChangedTypeScriptFiles } from '../../../../platform/infra/external-clients/git/git-changed-files'
-import { getRepositoryInfo } from '../../../../platform/infra/external-clients/git/git-repository-info'
-import { ExtractionProject } from '../../domain/extraction-project'
-import {
-  createConfiguredProject,
-  findModuleTsConfigDir,
-} from '../../../../platform/infra/external-clients/ts-morph/index'
-
-class ExtractionConfigLoadError extends Error {}
-interface FullProjectParams {
-  configPath: string
-  useTsConfig: boolean
-}
-
-interface ChangedProjectParams {
-  baseBranch?: string
-  configPath: string
-  useTsConfig: boolean
-}
-
-interface SelectedFilesProjectParams {
-  configPath: string
-  filePaths: string[]
-  useTsConfig: boolean
-}
-
-interface DraftEnrichmentParams {
-  configPath: string
-  draftComponentsPath: string
-  useTsConfig: boolean
-}
-
-type ParsedConfigState = Readonly<{
-  configDir: string
-  resolvedConfig: ResolvedExtractionConfig
-}>
-
-const NOT_USED = { notUsed: true } as const
-
-/** @riviere-role aggregate-repository */
-export class ExtractionProjectRepository {
-  loadFromChangedProject(params: ChangedProjectParams): ExtractionProject {
-    const parsedConfigState = this.loadParsedConfigState(params.configPath)
-    const sourceFilePaths = this.resolveChangedSourceFilePaths(
-      this.resolveSourceFilePaths(parsedConfigState),
-      params.baseBranch,
-    )
-    return this.createExtractionProject(parsedConfigState, sourceFilePaths, params.useTsConfig)
-  }
-
-  loadFromDraftEnrichment(params: DraftEnrichmentParams): ExtractionProject {
-    const parsedConfigState = this.loadParsedConfigState(params.configPath)
-    return this.createExtractionProject(
-      parsedConfigState,
-      this.resolveSourceFilePaths(parsedConfigState),
-      params.useTsConfig,
-      this.loadDraftComponentsFromFile(params.draftComponentsPath),
-    )
-  }
-
-  loadFromFullProject(params: FullProjectParams): ExtractionProject {
-    const parsedConfigState = this.loadParsedConfigState(params.configPath)
-    return this.createExtractionProject(
-      parsedConfigState,
-      this.resolveSourceFilePaths(parsedConfigState),
-      params.useTsConfig,
-    )
-  }
-
-  loadFromSelectedFiles(params: SelectedFilesProjectParams): ExtractionProject {
-    const parsedConfigState = this.loadParsedConfigState(params.configPath)
-    const sourceFilePaths = this.resolveSelectedSourceFilePaths(
-      this.resolveSourceFilePaths(parsedConfigState),
-      params.filePaths,
-    )
-    return this.createExtractionProject(parsedConfigState, sourceFilePaths, params.useTsConfig)
-  }
-
-  private loadParsedConfigState(configPath: string): ParsedConfigState {
-    if (!fileExists(configPath)) {
-      throw new ConfigValidationError(
-        CliErrorCode.ConfigNotFound,
-        `Config file not found: ${configPath}`,
-      )
-    }
-
-    const content = readTextFile(configPath)
-    const parsed = this.parseConfigFile(content)
-    const configDir = dirname(resolve(configPath))
-    const expanded = this.expandModuleRefs(parsed, configDir)
-
-    if (!isValidExtractionConfig(expanded)) {
-      const validationResult = validateExtractionConfig(expanded)
-      throw new ConfigValidationError(
-        CliErrorCode.ValidationError,
-        `Invalid extraction config:\n${formatValidationErrors(validationResult.errors)}`,
-      )
-    }
-
-    return {
-      configDir,
-      resolvedConfig: this.resolveConfigWithExtends(expanded, configDir),
-    }
-  }
-
-  private parseConfigFile(content: string): unknown {
-    try {
-      const parsed: unknown = parseYaml(content)
-      return parsed
-    } catch (error) {
-      throw new ConfigValidationError(
-        CliErrorCode.ValidationError,
-        `Invalid config file: ${String(error)}`,
-      )
-    }
-  }
-
-  private expandModuleRefs(config: unknown, configDir: string): unknown {
-    try {
-      if (!this.hasModulesArray(config)) {
-        return config
-      }
-
-      return {
-        ...config,
-        modules: config.modules.map((item) => this.expandModuleRefItem(item, configDir)),
-      }
-    } catch (error) {
-      throw new ConfigValidationError(
-        CliErrorCode.ValidationError,
-        `Error expanding module references: ${String(error)}`,
-      )
-    }
-  }
-
-  private expandModuleRefItem(item: unknown, configDir: string): unknown {
-    if (!this.isModuleRef(item)) {
-      return item
-    }
-
-    const refPath = resolve(configDir, item.$ref)
-    if (!fileExists(refPath)) {
-      throw new ExtractionConfigLoadError(
-        `Cannot resolve module reference '${item.$ref}'. File not found: ${refPath}`,
-      )
-    }
-
-    const content = readTextFile(refPath)
-    const parsed: unknown = parseYaml(content)
-    return parsed
-  }
-
-  private resolveConfigWithExtends(
-    config: ExtractionConfig,
-    configDir: string,
-  ): ResolvedExtractionConfig {
-    return resolveConfig({
-      ...config,
-      modules: config.modules.map((moduleConfig) =>
-        this.resolveModuleConfig(moduleConfig, configDir),
-      ),
-    })
-  }
-
-  private loadDraftComponentsFromFile(filePath: string): DraftComponent[] {
-    const parsed = readJsonFile(filePath, 'Enrich file')
-    if (!this.isDraftComponentArray(parsed)) {
-      throw new FileReadError(`Enrich file does not contain valid draft components: ${filePath}`)
-    }
-    return parsed
-  }
-
-  private loadExtendedModule(source: string, configDir: string): Partial<Module> {
-    const filePath = resolveFileOrPackagePath({
-      baseDirectory: configDir,
-      packageRelativePath: 'src/default-extraction.config.json',
-      source,
-    })
-    if (!fileExists(filePath)) {
-      throw new ExtractionConfigLoadError(
-        `Cannot resolve extends reference '${source}'. File not found: ${filePath}`,
-      )
-    }
-
-    const parsed: unknown = parseYaml(readTextFile(filePath))
-    if (this.hasModulesArray(parsed)) {
-      return this.resolveFirstModuleFromConfig(parsed, source, dirname(filePath))
-    }
-    if (this.isTopLevelRulesConfig(parsed)) {
-      return this.topLevelRulesToModule(parsed)
-    }
-    const preview = JSON.stringify(parsed, null, 2).slice(0, 200)
-    throw new ExtractionConfigLoadError(
-      `Invalid extended config format in '${source}'. ` +
-        `Expected object with 'modules' array or top-level component rules. Got: ${preview}`,
-    )
-  }
-
-  private resolveFirstModuleFromConfig(
-    parsed: { modules: unknown[] },
-    source: string,
-    configDir: string,
-  ): Module {
-    if (parsed.modules.length === 0) {
-      throw new ExtractionConfigLoadError(
-        `Invalid extended config in '${source}': Config has empty modules array`,
-      )
-    }
-
-    if (!isValidExtractionConfig(parsed)) {
-      const validationResult = validateExtractionConfig(parsed)
-      throw new ExtractionConfigLoadError(
-        `Invalid extended config in '${source}': ` +
-          formatValidationErrors(validationResult.errors),
-      )
-    }
-
-    const [first] = this.resolveConfigWithExtends(parsed, configDir).modules
-    /* v8 ignore start -- resolved config returns one module for one-module input */
-    if (first === undefined) {
-      throw new ExtractionConfigLoadError(
-        `Invalid extended config in '${source}': Config has empty modules array`,
-      )
-    }
-    /* v8 ignore stop */
-    return first
-  }
-
-  private topLevelRulesToModule(parsed: Partial<Module>): Module {
-    return {
-      name: 'extended',
-      path: '.',
-      glob: '**',
-      api: parsed.api ?? NOT_USED,
-      useCase: parsed.useCase ?? NOT_USED,
-      domainOp: parsed.domainOp ?? NOT_USED,
-      event: parsed.event ?? NOT_USED,
-      eventHandler: parsed.eventHandler ?? NOT_USED,
-      ui: parsed.ui ?? NOT_USED,
-    }
-  }
-
-  private resolveModuleConfig(moduleConfig: ModuleConfig, configDir: string): Module {
-    const extendsSource = moduleConfig.extends
-    if (extendsSource === undefined) {
-      const [resolvedModule] = resolveConfig({ modules: [moduleConfig] }).modules
-      /* v8 ignore start -- resolveConfig returns one module for one-module input */
-      if (resolvedModule === undefined) {
-        throw new TypeError(`Expected resolved module for '${moduleConfig.name}'`)
-      }
-      /* v8 ignore end */
-      return resolvedModule
-    }
-
-    const baseModule = this.loadExtendedModule(extendsSource, configDir)
-    const mergedCustomTypes = this.mergeCustomTypes(
-      baseModule.customTypes,
-      moduleConfig.customTypes,
-    )
-
-    return {
-      name: moduleConfig.name,
-      domain: moduleConfig.domain,
-      path: moduleConfig.path,
-      glob: moduleConfig.glob,
-      ...(moduleConfig.modules !== undefined && { modules: moduleConfig.modules }),
-      api: moduleConfig.api ?? baseModule.api,
-      useCase: moduleConfig.useCase ?? baseModule.useCase,
-      domainOp: moduleConfig.domainOp ?? baseModule.domainOp,
-      event: moduleConfig.event ?? baseModule.event,
-      eventHandler: moduleConfig.eventHandler ?? baseModule.eventHandler,
-      ui: moduleConfig.ui ?? baseModule.ui,
-      ...(mergedCustomTypes !== undefined && { customTypes: mergedCustomTypes }),
-    }
-  }
-
-  private mergeCustomTypes(
-    base: Module['customTypes'],
-    local: ModuleConfig['customTypes'],
-  ): Module['customTypes'] {
-    if (base === undefined && local === undefined) {
-      return undefined
-    }
-
-    return {
-      ...base,
-      ...local,
-    }
-  }
-
-  private createExtractionProject(
-    parsedConfigState: ParsedConfigState,
-    sourceFilePaths: string[],
-    useTsConfig: boolean,
-    draftComponents: DraftComponent[] = [],
-  ): ExtractionProject {
-    return new ExtractionProject(
-      this.createModuleContexts(
-        parsedConfigState.configDir,
-        parsedConfigState.resolvedConfig,
-        sourceFilePaths,
-        useTsConfig,
-      ),
-      parsedConfigState.resolvedConfig,
-      getRepositoryInfo().name,
-      draftComponents,
-    )
-  }
-
-  private resolveSourceFilePaths(parsedConfigState: ParsedConfigState): string[] {
-    const sourceFilePaths = parsedConfigState.resolvedConfig.modules
-      .flatMap((module) =>
-        globSync(posix.join(module.path, module.glob), { cwd: parsedConfigState.configDir }),
-      )
-      .map((filePath) => resolve(parsedConfigState.configDir, filePath))
-
-    if (sourceFilePaths.length === 0) {
-      const patterns = parsedConfigState.resolvedConfig.modules
-        .map((module) => posix.join(module.path, module.glob))
-        .join(', ')
-      throw new ConfigValidationError(
-        CliErrorCode.ValidationError,
-        `No files matched extraction patterns: ${patterns}\nConfig directory: ${parsedConfigState.configDir}`,
-      )
-    }
-
-    return sourceFilePaths
-  }
-
-  private resolveChangedSourceFilePaths(allSourceFiles: string[], baseBranch?: string): string[] {
-    const gitOptions = baseBranch === undefined ? {} : { base: baseBranch }
-    const result = detectChangedTypeScriptFiles(process.cwd(), gitOptions)
-    for (const warning of result.warnings) {
-      console.error(warning)
-    }
-    const changedAbsolute = new Set(result.files.map((filePath) => resolve(filePath)))
-    return allSourceFiles.filter((filePath) => changedAbsolute.has(filePath))
-  }
-
-  private resolveSelectedSourceFilePaths(
-    allSourceFiles: string[],
-    requestedFiles: string[],
-  ): string[] {
-    const missingFiles = requestedFiles.filter((filePath) => !fileExists(resolve(filePath)))
-    if (missingFiles.length > 0) {
-      throw new ConfigValidationError(
-        CliErrorCode.ValidationError,
-        `Files not found: ${missingFiles.join(', ')}`,
-      )
-    }
-
-    const requestedAbsolute = new Set(requestedFiles.map((filePath) => resolve(filePath)))
-    return allSourceFiles.filter((filePath) => requestedAbsolute.has(filePath))
-  }
-
-  private createModuleContexts(
-    configDir: string,
-    resolvedConfig: ResolvedExtractionConfig,
-    sourceFilePaths: string[],
-    useTsConfig: boolean,
-  ) {
-    const sourceFileSet = new Set(sourceFilePaths)
-
-    return resolvedConfig.modules.map((module) => {
-      const allModuleFiles = globSync(posix.join(module.path, module.glob), { cwd: configDir }).map(
-        (filePath) => resolve(configDir, filePath),
-      )
-      const moduleFiles = allModuleFiles.filter((filePath) => sourceFileSet.has(filePath))
-      const moduleConfigDir = findModuleTsConfigDir(configDir, module.path)
-      const project = createConfiguredProject(moduleConfigDir, !useTsConfig)
-      project.addSourceFilesAtPaths(moduleFiles)
-
-      return {
-        files: moduleFiles,
-        module,
-        project,
-      }
-    })
-  }
-
-  private hasModulesArray(value: unknown): value is { modules: unknown[] } {
-    return (
-      typeof value === 'object' &&
-      value !== null &&
-      'modules' in value &&
-      Array.isArray(value.modules)
-    )
-  }
-
-  private isModuleRef(value: unknown): value is { $ref: string } {
-    return (
-      typeof value === 'object' &&
-      value !== null &&
-      '$ref' in value &&
-      typeof value.$ref === 'string'
-    )
-  }
-
-  private isDraftComponentArray(value: unknown): value is DraftComponent[] {
-    if (!Array.isArray(value)) return false
-    return value.every(
-      (item) =>
-        typeof item === 'object' &&
-        item !== null &&
-        'type' in item &&
-        'name' in item &&
-        'domain' in item &&
-        'location' in item,
-    )
-  }
-
-  private isTopLevelRulesConfig(value: unknown): value is Partial<Module> {
-    return (
-      typeof value === 'object' && value !== null && !Array.isArray(value) && !('modules' in value)
-    )
-  }
-}
diff --git a/packages/riviere-cli/src/features/extract/domain/detect-connections-per-module.spec.ts b/packages/riviere-cli/src/features/extract/domain/detect-connections-per-module.spec.ts
deleted file mode 100644
index 261ad2557..000000000
--- a/packages/riviere-cli/src/features/extract/domain/detect-connections-per-module.spec.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-import {
-  beforeEach, describe, expect, it, vi 
-} from 'vitest'
-import { Project } from 'ts-morph'
-import type { Module } from '@living-architecture/riviere-extract-config'
-import { ExtractionProject } from './extraction-project'
-
-const {
-  mockExtractComponents,
-  mockEnrichComponents,
-  mockDeduplicateCrossStrategy,
-  mockDetectCrossModule,
-  mockDetectPerModule,
-} = vi.hoisted(() => ({
-  mockExtractComponents: vi.fn().mockReturnValue([]),
-  mockEnrichComponents: vi.fn().mockReturnValue({
-    components: [],
-    failures: [],
-  }),
-  mockDeduplicateCrossStrategy: vi.fn((links: { source: string }[]) => links),
-  mockDetectPerModule: vi.fn().mockReturnValue({
-    links: [
-      {
-        source: 'orders:useCase:OrderService',
-        target: 'orders:repository:OrderRepo',
-        type: 'sync',
-      },
-    ],
-    externalLinks: [],
-    timings: {
-      callGraphMs: 1,
-      setupMs: 0,
-    },
-  }),
-  mockDetectCrossModule: vi.fn().mockReturnValue({
-    links: [],
-    timings: { asyncDetectionMs: 0 },
-  }),
-}))
-
-vi.mock('@living-architecture/riviere-extract-ts', () => ({
-  extractComponents: mockExtractComponents,
-  enrichComponents: mockEnrichComponents,
-  detectPerModuleConnections: mockDetectPerModule,
-  detectCrossModuleConnections: mockDetectCrossModule,
-  deduplicateCrossStrategy: mockDeduplicateCrossStrategy,
-  stripResolvedCustomTypes: vi.fn((components: unknown[]) => components),
-}))
-
-function createModule(name: string): Module {
-  return {
-    api: { notUsed: true },
-    domainOp: { notUsed: true },
-    event: { notUsed: true },
-    eventHandler: { notUsed: true },
-    glob: 'src/**',
-    name,
-    path: name,
-    ui: { notUsed: true },
-    useCase: { notUsed: true },
-  }
-}
-
-function createModuleContext(moduleName: string) {
-  return {
-    files: [`/src/${moduleName}/test.ts`],
-    module: createModule(moduleName),
-    project: new Project(),
-  }
-}
-
-describe('ExtractionProject.extractDraftComponents', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('returns links when includeConnections is true', () => {
-    const ctx = createModuleContext('orders')
-
-    mockExtractComponents.mockReturnValue([
-      {
-        name: 'OrderService',
-        domain: 'orders',
-        type: 'useCase',
-        location: {
-          file: 'test.ts',
-          line: 1,
-        },
-      },
-    ])
-    mockEnrichComponents.mockReturnValue({
-      components: [
-        {
-          name: 'OrderService',
-          domain: 'orders',
-          type: 'useCase',
-          location: {
-            file: 'test.ts',
-            line: 1,
-          },
-          metadata: {},
-        },
-      ],
-      failures: [],
-    })
-    mockDetectPerModule.mockReturnValue({
-      links: [
-        {
-          source: 'orders:useCase:OrderService',
-          target: 'orders:repository:OrderRepo',
-          type: 'sync' as const,
-        },
-      ],
-      externalLinks: [],
-      timings: {
-        callGraphMs: 1,
-        setupMs: 0,
-      },
-    })
-
-    const project = new ExtractionProject([ctx], { modules: [] }, 'test-repo')
-    const result = project.extractDraftComponents({
-      allowIncomplete: true,
-      includeConnections: true,
-    })
-
-    expect(result.kind).toBe('full')
-  })
-
-  it('returns no links when includeConnections is false', () => {
-    const ctx = createModuleContext('orders')
-    mockExtractComponents.mockReturnValue([
-      {
-        name: 'OrderService',
-        domain: 'orders',
-        type: 'useCase',
-        location: {
-          file: 'test.ts',
-          line: 1,
-        },
-      },
-    ])
-
-    const project = new ExtractionProject([ctx], { modules: [] }, 'test-repo')
-    const result = project.extractDraftComponents({
-      allowIncomplete: true,
-      includeConnections: false,
-    })
-
-    expect(result.kind).toBe('draftOnly')
-    expect(result.components).toStrictEqual([
-      expect.objectContaining({
-        type: 'useCase',
-        name: 'OrderService',
-      }),
-    ])
-  })
-})
diff --git a/packages/riviere-cli/src/features/extract/domain/enrich-per-module.spec.ts b/packages/riviere-cli/src/features/extract/domain/enrich-per-module.spec.ts
deleted file mode 100644
index 0718a4ad5..000000000
--- a/packages/riviere-cli/src/features/extract/domain/enrich-per-module.spec.ts
+++ /dev/null
@@ -1,272 +0,0 @@
-import {
-  beforeEach, describe, expect, it, vi 
-} from 'vitest'
-import { Project } from 'ts-morph'
-import type {
-  ComponentRule,
-  Module,
-  ResolvedExtractionConfig,
-} from '@living-architecture/riviere-extract-config'
-import type {
-  DraftComponent, ExtractedLink 
-} from '@living-architecture/riviere-extract-ts'
-import {
-  ExtractionProject, OrphanedDraftComponentError 
-} from './extraction-project'
-
-const {
-  mockEnrichComponents,
-  mockDetectPerModuleConnections,
-  mockDetectCrossModuleConnections,
-  mockDeduplicateCrossStrategy,
-} = vi.hoisted(() => ({
-  mockEnrichComponents: vi.fn(),
-  mockDetectPerModuleConnections: vi.fn().mockReturnValue({
-    links: [],
-    externalLinks: [],
-    timings: {
-      callGraphMs: 0,
-      setupMs: 0,
-    },
-  }),
-  mockDetectCrossModuleConnections: vi.fn().mockReturnValue({
-    links: [],
-    timings: { asyncDetectionMs: 0 },
-  }),
-  mockDeduplicateCrossStrategy: vi.fn((links: ExtractedLink[]): ExtractedLink[] => links),
-}))
-
-vi.mock('@living-architecture/riviere-extract-ts', () => ({
-  enrichComponents: mockEnrichComponents,
-  detectPerModuleConnections: mockDetectPerModuleConnections,
-  detectCrossModuleConnections: mockDetectCrossModuleConnections,
-  deduplicateCrossStrategy: mockDeduplicateCrossStrategy,
-  stripResolvedCustomTypes: vi.fn((components: unknown[]) => components),
-}))
-
-const notUsedRule: ComponentRule = { notUsed: true }
-
-function createModule(name: string): Module {
-  return {
-    api: notUsedRule,
-    domainOp: notUsedRule,
-    event: notUsedRule,
-    eventHandler: notUsedRule,
-    glob: 'src/**',
-    name,
-    path: name,
-    ui: notUsedRule,
-    useCase: notUsedRule,
-  }
-}
-
-function createModuleContext(moduleName: string) {
-  return {
-    files: [],
-    module: createModule(moduleName),
-    project: new Project(),
-  }
-}
-
-function createDraft(domain: string, name: string): DraftComponent {
-  return {
-    domain,
-    location: {
-      file: 'test.ts',
-      line: 1,
-    },
-    name,
-    type: 'api',
-  }
-}
-
-const stubConfig: ResolvedExtractionConfig = { modules: [] }
-
-function createExtractionProject(
-  moduleContexts: Array<{
-    files: string[]
-    module: Module
-    project: Project
-  }>,
-  draftComponents: DraftComponent[] = [],
-): ExtractionProject {
-  return new ExtractionProject(moduleContexts, stubConfig, 'test-repo', draftComponents)
-}
-
-describe('ExtractionProject.enrichDraftComponents', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('enriches drafts grouped by module', () => {
-    mockEnrichComponents
-      .mockReturnValueOnce({
-        components: [
-          {
-            domain: 'orders',
-            name: 'CompA',
-          },
-        ],
-        failures: [],
-      })
-      .mockReturnValueOnce({
-        components: [
-          {
-            domain: 'shipping',
-            name: 'CompB',
-          },
-        ],
-        failures: [],
-      })
-
-    const result = createExtractionProject(
-      [createModuleContext('orders'), createModuleContext('shipping')],
-      [createDraft('orders', 'CompA'), createDraft('shipping', 'CompB')],
-    ).enrichDraftComponents({
-      allowIncomplete: false,
-      includeConnections: true,
-    })
-
-    expect(result.components).toHaveLength(2)
-    expect(mockEnrichComponents).toHaveBeenCalledTimes(2)
-  })
-
-  it('routes correct drafts to each module', () => {
-    mockEnrichComponents.mockReturnValue({
-      components: [],
-      failures: [],
-    })
-
-    createExtractionProject(
-      [createModuleContext('orders'), createModuleContext('shipping')],
-      [createDraft('orders', 'CompA'), createDraft('shipping', 'CompB')],
-    ).enrichDraftComponents({
-      allowIncomplete: false,
-      includeConnections: true,
-    })
-
-    expect(mockEnrichComponents).toHaveBeenNthCalledWith(
-      1,
-      [createDraft('orders', 'CompA')],
-      createModule('orders'),
-      expect.anything(),
-    )
-    expect(mockEnrichComponents).toHaveBeenNthCalledWith(
-      2,
-      [createDraft('shipping', 'CompB')],
-      createModule('shipping'),
-      expect.anything(),
-    )
-  })
-
-  it('deduplicates failed fields across modules', () => {
-    mockEnrichComponents
-      .mockReturnValueOnce({
-        components: [],
-        failures: [{ field: 'name' }],
-      })
-      .mockReturnValueOnce({
-        components: [],
-        failures: [{ field: 'name' }, { field: 'type' }],
-      })
-
-    const result = createExtractionProject(
-      [createModuleContext('orders'), createModuleContext('shipping')],
-      [createDraft('orders', 'A'), createDraft('shipping', 'B')],
-    ).enrichDraftComponents({
-      allowIncomplete: true,
-      includeConnections: true,
-    })
-
-    expect(result.components).toHaveLength(0)
-    expect(result.failedFields).toStrictEqual(['name', 'type'])
-  })
-
-  it('skips modules with no matching drafts', () => {
-    mockEnrichComponents.mockReturnValue({
-      components: [],
-      failures: [],
-    })
-
-    const result = createExtractionProject(
-      [createModuleContext('orders'), createModuleContext('empty')],
-      [createDraft('orders', 'A')],
-    ).enrichDraftComponents({
-      allowIncomplete: false,
-      includeConnections: true,
-    })
-
-    expect(mockEnrichComponents).toHaveBeenCalledTimes(1)
-    expect(result.components).toStrictEqual([])
-  })
-
-  it('throws OrphanedDraftComponentError when drafts reference unknown modules', () => {
-    expect(() =>
-      createExtractionProject(
-        [createModuleContext('orders')],
-        [createDraft('orders', 'A'), createDraft('unknown-module', 'B')],
-      ).enrichDraftComponents({
-        allowIncomplete: false,
-        includeConnections: true,
-      }),
-    ).toThrow(OrphanedDraftComponentError)
-  })
-
-  it('includes module names in orphan error message', () => {
-    expect(() =>
-      createExtractionProject(
-        [createModuleContext('orders')],
-        [createDraft('ghost', 'X')],
-      ).enrichDraftComponents({
-        allowIncomplete: false,
-        includeConnections: true,
-      }),
-    ).toThrow('Draft components reference unknown modules: [ghost]. Known modules: [orders]')
-  })
-
-  it('returns empty result when no drafts provided', () => {
-    const result = createExtractionProject(
-      [createModuleContext('orders')],
-      [],
-    ).enrichDraftComponents({
-      allowIncomplete: false,
-      includeConnections: true,
-    })
-
-    expect(result.components).toStrictEqual([])
-    expect(mockEnrichComponents).not.toHaveBeenCalled()
-  })
-
-  it('returns field failure when enrichment fails and incomplete is disabled', () => {
-    mockEnrichComponents.mockReturnValue({
-      components: [],
-      failures: [{ field: 'name' }],
-    })
-
-    const result = createExtractionProject(
-      [createModuleContext('orders')],
-      [createDraft('orders', 'A')],
-    ).enrichDraftComponents({
-      allowIncomplete: false,
-      includeConnections: true,
-    })
-
-    expect(result).toStrictEqual({
-      kind: 'fieldFailure',
-      failedFields: ['name'],
-    })
-  })
-
-  it('returns draftOnly when includeConnections is false', () => {
-    const result = createExtractionProject(
-      [createModuleContext('orders')],
-      [createDraft('orders', 'CompA')],
-    ).enrichDraftComponents({
-      allowIncomplete: false,
-      includeConnections: false,
-    })
-
-    expect(result.kind).toBe('draftOnly')
-    expect(result.components).toHaveLength(1)
-  })
-})
diff --git a/packages/riviere-cli/src/features/extract/domain/extraction-outcome.ts b/packages/riviere-cli/src/features/extract/domain/extraction-outcome.ts
deleted file mode 100644
index 937e3b18b..000000000
--- a/packages/riviere-cli/src/features/extract/domain/extraction-outcome.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import type {
-  ConnectionTimings,
-  DraftComponent,
-  EnrichedComponent,
-  ExtractedLink,
-} from '@living-architecture/riviere-extract-ts'
-import type { ExternalLink } from '@living-architecture/riviere-schema'
-
-interface DraftOnlyOutcome {
-  kind: 'draftOnly'
-  components: DraftComponent[]
-}
-
-interface FullExtractionOutcome {
-  kind: 'full'
-  components: EnrichedComponent[]
-  failedFields: string[]
-  links: ExtractedLink[]
-  externalLinks: ExternalLink[]
-  timings: ConnectionTimings[]
-}
-
-interface FieldFailureOutcome {
-  kind: 'fieldFailure'
-  failedFields: string[]
-}
-
-/** @riviere-role value-object */
-export type ExtractionOutcome = DraftOnlyOutcome | FullExtractionOutcome | FieldFailureOutcome
diff --git a/packages/riviere-cli/src/features/extract/domain/extraction-project.ts b/packages/riviere-cli/src/features/extract/domain/extraction-project.ts
deleted file mode 100644
index 994d0d7d8..000000000
--- a/packages/riviere-cli/src/features/extract/domain/extraction-project.ts
+++ /dev/null
@@ -1,257 +0,0 @@
-import type { Project } from 'ts-morph'
-import type {
-  Module, ResolvedExtractionConfig 
-} from '@living-architecture/riviere-extract-config'
-import {
-  deduplicateCrossStrategy,
-  detectCrossModuleConnections,
-  detectPerModuleConnections,
-  enrichComponents,
-  extractComponents,
-  stripResolvedCustomTypes,
-  type ConnectionTimings,
-  type DraftComponent,
-  type EnrichedComponent,
-  type ExtractedLink,
-} from '@living-architecture/riviere-extract-ts'
-import type { ExternalLink } from '@living-architecture/riviere-schema'
-import type { ExtractionOutcome } from './extraction-outcome'
-
-interface ModuleContext {
-  module: Module
-  files: string[]
-  project: Project
-}
-
-/** @riviere-role domain-error */
-export class OrphanedDraftComponentError extends Error {
-  constructor(orphanedModules: string[], knownModules: string[]) {
-    super(
-      `Draft components reference unknown modules: [${orphanedModules.join(', ')}]. Known modules: [${knownModules.join(', ')}]`,
-    )
-    this.name = 'OrphanedDraftComponentError'
-  }
-}
-
-interface FieldFailureEnrichment {
-  kind: 'fieldFailure'
-  failedFields: string[]
-}
-
-interface SuccessfulEnrichment {
-  kind: 'enriched'
-  components: EnrichedComponent[]
-  failedFields: string[]
-}
-
-type EnrichmentResult = FieldFailureEnrichment | SuccessfulEnrichment
-
-/** @riviere-role aggregate */
-export class ExtractionProject {
-  constructor(
-    private readonly moduleContexts: ModuleContext[],
-    private readonly resolvedConfig: ResolvedExtractionConfig,
-    private readonly repositoryName: string,
-    private readonly draftComponents: DraftComponent[] = [],
-  ) {}
-
-  extractDraftComponents(options: {
-    allowIncomplete: boolean
-    includeConnections: boolean
-  }): ExtractionOutcome {
-    const draftComponents = this.moduleContexts.flatMap((moduleContext) =>
-      extractComponents(moduleContext.project, moduleContext.files, moduleContext.module),
-    )
-
-    if (!options.includeConnections) {
-      return {
-        kind: 'draftOnly',
-        components: draftComponents,
-      }
-    }
-
-    const enrichment = this.enrichDraftComponentValues(draftComponents, options.allowIncomplete)
-    if (enrichment.kind === 'fieldFailure') {
-      return enrichment
-    }
-
-    const connectionResult = this.detectConnections(enrichment.components, options.allowIncomplete)
-    const httpLinks = this.resolvedConfig.connections?.httpLinks ?? []
-    const visibleComponents = stripResolvedCustomTypes(
-      enrichment.components,
-      httpLinks,
-      connectionResult.links,
-    )
-
-    return {
-      kind: 'full',
-      components: visibleComponents,
-      failedFields: enrichment.failedFields,
-      links: connectionResult.links,
-      externalLinks: connectionResult.externalLinks,
-      timings: connectionResult.timings,
-    }
-  }
-
-  enrichDraftComponents(options: {
-    allowIncomplete: boolean
-    includeConnections: boolean
-  }): ExtractionOutcome {
-    if (!options.includeConnections) {
-      return {
-        kind: 'draftOnly',
-        components: this.draftComponents,
-      }
-    }
-
-    const enrichment = this.enrichDraftComponentValues(
-      this.draftComponents,
-      options.allowIncomplete,
-    )
-    if (enrichment.kind === 'fieldFailure') {
-      return enrichment
-    }
-
-    const connectionResult = this.detectConnections(enrichment.components, options.allowIncomplete)
-    const httpLinks = this.resolvedConfig.connections?.httpLinks ?? []
-    const visibleComponents = stripResolvedCustomTypes(
-      enrichment.components,
-      httpLinks,
-      connectionResult.links,
-    )
-
-    return {
-      kind: 'full',
-      components: visibleComponents,
-      failedFields: enrichment.failedFields,
-      links: connectionResult.links,
-      externalLinks: connectionResult.externalLinks,
-      timings: connectionResult.timings,
-    }
-  }
-
-  get moduleContextProjectNames(): string[] {
-    return this.moduleContexts.map((moduleContext) => moduleContext.module.name)
-  }
-
-  public detectConnections(
-    enrichedComponents: EnrichedComponent[],
-    allowIncomplete: boolean,
-  ): {
-    links: ExtractedLink[]
-    externalLinks: ExternalLink[]
-    timings: ConnectionTimings[]
-  } {
-    const links: ExtractedLink[] = []
-    const externalLinks: ExternalLink[] = []
-    const timings: ConnectionTimings[] = []
-    const httpLinks = this.resolvedConfig.connections?.httpLinks ?? []
-
-    for (const moduleContext of this.moduleContexts) {
-      const moduleComponents = enrichedComponents.filter(
-        (component) => component.module === moduleContext.module.name,
-      )
-      if (moduleComponents.length === 0) {
-        continue
-      }
-
-      const result = detectPerModuleConnections(moduleContext.project, moduleComponents, {
-        allComponents: enrichedComponents,
-        allowIncomplete,
-        httpLinks,
-        repository: this.repositoryName,
-        sourceFilePaths: moduleContext.files,
-      })
-      links.push(...result.links)
-      externalLinks.push(...result.externalLinks)
-      timings.push({
-        callGraphMs: result.timings.callGraphMs,
-        asyncDetectionMs: 0,
-        setupMs: result.timings.setupMs,
-        totalMs: result.timings.callGraphMs + result.timings.setupMs,
-      })
-    }
-
-    const crossResult = detectCrossModuleConnections(enrichedComponents, {
-      allowIncomplete,
-      repository: this.repositoryName,
-      eventPublishers: this.resolvedConfig.connections?.eventPublishers,
-    })
-    links.push(...crossResult.links)
-    timings.push({
-      callGraphMs: 0,
-      asyncDetectionMs: crossResult.timings.asyncDetectionMs,
-      setupMs: 0,
-      totalMs: crossResult.timings.asyncDetectionMs,
-    })
-
-    return {
-      links: deduplicateCrossStrategy(links),
-      externalLinks,
-      timings,
-    }
-  }
-
-  private enrichDraftComponentValues(
-    draftComponents: DraftComponent[],
-    allowIncomplete: boolean,
-  ): EnrichmentResult {
-    const moduleNames = new Set(this.moduleContextProjectNames)
-    const draftsByModule = groupDraftsByModule(draftComponents)
-    assertAllDraftsMatchModules(draftsByModule, moduleNames)
-    const components: EnrichedComponent[] = []
-    const failedFieldSet = new Set<string>()
-
-    for (const moduleContext of this.moduleContexts) {
-      const moduleDrafts = draftsByModule.get(moduleContext.module.name) ?? []
-      if (moduleDrafts.length === 0) {
-        continue
-      }
-
-      const result = enrichComponents(moduleDrafts, moduleContext.module, moduleContext.project)
-      components.push(...result.components)
-      for (const failure of result.failures) {
-        failedFieldSet.add(failure.field)
-      }
-    }
-
-    const failedFields = [...failedFieldSet]
-    if (failedFields.length > 0 && !allowIncomplete) {
-      return {
-        kind: 'fieldFailure',
-        failedFields,
-      }
-    }
-
-    return {
-      kind: 'enriched',
-      components,
-      failedFields,
-    }
-  }
-}
-
-function assertAllDraftsMatchModules(
-  draftsByModule: Map<string, DraftComponent[]>,
-  moduleNames: Set<string>,
-): void {
-  const orphanedModules = [...draftsByModule.keys()].filter((name) => !moduleNames.has(name))
-  if (orphanedModules.length > 0) {
-    throw new OrphanedDraftComponentError(orphanedModules, [...moduleNames])
-  }
-}
-
-function groupDraftsByModule(drafts: DraftComponent[]): Map<string, DraftComponent[]> {
-  const grouped = new Map<string, DraftComponent[]>()
-  for (const draft of drafts) {
-    const existing = grouped.get(draft.domain)
-    if (existing !== undefined) {
-      existing.push(draft)
-      continue
-    }
-
-    grouped.set(draft.domain, [draft])
-  }
-
-  return grouped
-}
diff --git a/packages/riviere-cli/src/features/extract/entrypoint/extract/entrypoint.ts b/packages/riviere-cli/src/features/extract/entrypoint/extract/entrypoint.ts
deleted file mode 100644
index 3af9d805b..000000000
--- a/packages/riviere-cli/src/features/extract/entrypoint/extract/entrypoint.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { Command } from 'commander'
-import {
-  CliErrorCode, ExitCode 
-} from '../../../../platform/infra/cli/presentation/error-codes'
-import { exitWithCliError } from '../../../../platform/infra/cli/presentation/exit-with-cli-error'
-import { validateFlagCombinations } from './extract-validator'
-import type { EnrichDraftComponents } from '../../commands/enrich-draft-components'
-import type { ExtractDraftComponents } from '../../commands/extract-draft-components'
-import { createExtractDraftComponentsInput } from './create-extract-draft-components-input'
-import { createEnrichDraftComponentsInput } from './create-enrich-draft-components-input'
-import { presentExtractionResult } from './present-extraction-result'
-
-/** @riviere-role cli-entrypoint */
-export function createExtractCommand(
-  extractDraftComponents: ExtractDraftComponents,
-  enrichDraftComponents: EnrichDraftComponents,
-): Command {
-  return new Command('extract')
-    .description('Extract architectural components from source code')
-    .requiredOption('--config <path>', 'Path to extraction config file')
-    .option('--dry-run', 'Show component counts per domain without full output')
-    .option('-o, --output <file>', 'Write output to file instead of stdout')
-    .option('--components-only', 'Output only component identity (no metadata enrichment)')
-    .option('--enrich <file>', 'Read draft components from file and enrich with extraction rules')
-    .option('--allow-incomplete', 'Output components even when some extraction fields fail')
-    .option('--pr', 'Extract from files changed in current branch vs base branch')
-    .option('--base <branch>', 'Override base branch for --pr (default: auto-detect)')
-    .option('--files <paths...>', 'Extract from specific files')
-    .option('--format <type>', 'Output format: json (default) or markdown')
-    .option('--stats', 'Show extraction statistics on stderr')
-    .option('--no-ts-config', 'Skip tsconfig.json auto-discovery (disables full type resolution)')
-    .action(
-      (options: {
-        allowIncomplete?: boolean
-        base?: string
-        componentsOnly?: boolean
-        config: string
-        dryRun?: boolean
-        enrich?: string
-        files?: string[]
-        format?: string
-        output?: string
-        pr?: boolean
-        stats?: boolean
-        tsConfig?: boolean
-      }) => {
-        validateFlagCombinations(options)
-
-        const result =
-          options.enrich === undefined
-            ? extractDraftComponents.execute(createExtractDraftComponentsInput(options))
-            : enrichDraftComponents.execute(
-              createEnrichDraftComponentsInput(options, options.enrich),
-            )
-
-        if (result.kind === 'fieldFailure') {
-          exitWithCliError(
-            CliErrorCode.ValidationError,
-            `Extraction failed for fields: ${result.failedFields.join(', ')}`,
-            ExitCode.ExtractionFailure,
-          )
-        }
-
-        presentExtractionResult(result, options)
-      },
-    )
-}
diff --git a/packages/riviere-cli/src/features/extract/entrypoint/extract/present-extraction-result.spec.ts b/packages/riviere-cli/src/features/extract/entrypoint/extract/present-extraction-result.spec.ts
deleted file mode 100644
index 1a2b67af9..000000000
--- a/packages/riviere-cli/src/features/extract/entrypoint/extract/present-extraction-result.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import {
-  describe, expect, it, vi 
-} from 'vitest'
-import { presentExtractionResult } from './present-extraction-result'
-
-describe('presentExtractionResult', () => {
-  it('returns early for fieldFailure results', () => {
-    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => undefined)
-    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => undefined)
-
-    presentExtractionResult(
-      {
-        failedFields: ['name'],
-        kind: 'fieldFailure',
-      },
-      {},
-    )
-
-    expect(logSpy).not.toHaveBeenCalled()
-    expect(errorSpy).not.toHaveBeenCalled()
-
-    logSpy.mockRestore()
-    errorSpy.mockRestore()
-  })
-})
diff --git a/packages/riviere-cli/src/features/extract/entrypoint/extract/present-extraction-result.ts b/packages/riviere-cli/src/features/extract/entrypoint/extract/present-extraction-result.ts
deleted file mode 100644
index ccb4b6fb4..000000000
--- a/packages/riviere-cli/src/features/extract/entrypoint/extract/present-extraction-result.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { categorizeComponents } from './categorize-components'
-import {
-  countLinksByType,
-  formatExtractionStats,
-  formatTimingLine,
-} from './format-extraction-stats'
-import { formatDryRunOutput } from './extract-output-formatter'
-import { formatPrMarkdown } from '../../../../platform/infra/cli/presentation/format-pr-markdown'
-import { formatSuccess } from '../../../../platform/infra/cli/presentation/output'
-import { outputResult } from '../../../../platform/infra/cli/presentation/output-writer'
-import type { EnrichDraftComponentsResult } from '../../commands/enrich-draft-components-result'
-import type { ExtractDraftComponentsResult } from '../../commands/extract-draft-components-result'
-
-type ExtractionResult = ExtractDraftComponentsResult | EnrichDraftComponentsResult
-type ExtractionPresentationOptions = {
-  dryRun?: boolean
-  format?: string
-  output?: string
-  stats?: boolean
-}
-
-/** @riviere-role cli-output-formatter */
-export function presentExtractionResult(
-  result: ExtractionResult,
-  options: ExtractionPresentationOptions,
-): void {
-  if (result.kind === 'draftOnly') {
-    presentDraftResult(result.components, options)
-    return
-  }
-
-  if (result.kind === 'fieldFailure') {
-    return
-  }
-
-  presentFullResult(result, options)
-}
-
-function presentDraftResult(
-  components: Extract<ExtractionResult, { kind: 'draftOnly' }>['components'],
-  options: ExtractionPresentationOptions,
-): void {
-  /* v8 ignore start -- @preserve: dry-run tested via CLI integration */
-  if (options.dryRun) {
-    for (const line of formatDryRunOutput(components)) {
-      console.log(line)
-    }
-    return
-  }
-  /* v8 ignore stop */
-
-  if (options.format === 'markdown') {
-    const markdown = formatPrMarkdown(categorizeComponents(components, undefined))
-    console.log(markdown)
-    return
-  }
-
-  outputResult(formatSuccess(components), createOutputOptions(options.output))
-}
-
-function presentFullResult(
-  result: Extract<ExtractionResult, { kind: 'full' }>,
-  options: ExtractionPresentationOptions,
-): void {
-  if (result.failedFields.length > 0) {
-    console.error(
-      `Warning: Enrichment failed for ${result.failedFields.length} field(s): ${result.failedFields.join(', ')}`,
-    )
-  }
-
-  if (options.stats === true) {
-    for (const timing of result.timings) {
-      console.error(formatTimingLine(timing))
-    }
-    const stats = countLinksByType(result.components.length, result.links)
-    for (const line of formatExtractionStats(stats)) {
-      console.error(line)
-    }
-  }
-
-  outputResult(
-    formatSuccess({
-      components: result.components,
-      links: result.links,
-      externalLinks: result.externalLinks,
-    }),
-    createOutputOptions(options.output),
-  )
-}
-
-function createOutputOptions(outputPath: string | undefined): { output?: string } {
-  return outputPath === undefined ? {} : { output: outputPath }
-}
diff --git a/packages/riviere-cli/src/features/query/data-access/riviere-query-repository.spec.ts b/packages/riviere-cli/src/features/query/data-access/riviere-query-repository.spec.ts
deleted file mode 100644
index 2cf3355f1..000000000
--- a/packages/riviere-cli/src/features/query/data-access/riviere-query-repository.spec.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import {
-  mkdir, writeFile 
-} from 'node:fs/promises'
-import { join } from 'node:path'
-import {
-  describe, expect, it 
-} from 'vitest'
-import {
-  type TestContext,
-  createTestContext,
-  setupCommandTest,
-} from '../../../platform/__fixtures__/command-test-fixtures'
-import { GraphCorruptedError } from '../../../platform/domain/graph-corrupted-error'
-import { GraphNotFoundError } from '../../../platform/domain/graph-not-found-error'
-import { RiviereQueryRepository } from './riviere-query-repository'
-
-describe('RiviereQueryRepository', () => {
-  const ctx: TestContext = createTestContext()
-  setupCommandTest(ctx)
-
-  it('throws GraphCorruptedError for invalid JSON files', async () => {
-    const graphDir = join(ctx.testDir, '.riviere')
-    await mkdir(graphDir, { recursive: true })
-    await writeFile(join(graphDir, 'graph.json'), '{invalid', 'utf-8')
-
-    expect(() => new RiviereQueryRepository().load()).toThrow(GraphCorruptedError)
-  })
-
-  it('throws GraphNotFoundError when graph file does not exist', () => {
-    expect(() => new RiviereQueryRepository().load(join(ctx.testDir, 'missing.json'))).toThrow(
-      GraphNotFoundError,
-    )
-  })
-})
diff --git a/packages/riviere-cli/src/features/query/data-access/riviere-query-repository.ts b/packages/riviere-cli/src/features/query/data-access/riviere-query-repository.ts
deleted file mode 100644
index 0c03eeab6..000000000
--- a/packages/riviere-cli/src/features/query/data-access/riviere-query-repository.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { RiviereQuery } from '@living-architecture/riviere-query'
-import { GraphCorruptedError } from '../../../platform/domain/graph-corrupted-error'
-import { GraphNotFoundError } from '../../../platform/domain/graph-not-found-error'
-import { fileExists } from '../../../platform/infra/external-clients/filesystem/file-existence'
-
-const DEFAULT_GRAPH_PATH = '.riviere/graph.json'
-
-/** @riviere-role query-model-loader */
-export class RiviereQueryRepository {
-  load(graphPathOption?: string): RiviereQuery {
-    const graphPath = this.resolveGraphPath(graphPathOption)
-
-    if (!fileExists(graphPath)) {
-      throw new GraphNotFoundError(graphPath)
-    }
-
-    const content = readFileSync(graphPath, 'utf-8')
-    try {
-      const parsed: unknown = JSON.parse(content)
-      return RiviereQuery.fromJSON(parsed)
-    } catch (error) {
-      throw new GraphCorruptedError(graphPath, { cause: error })
-    }
-  }
-
-  private resolveGraphPath(graphPathOption?: string): string {
-    return graphPathOption ?? join(process.cwd(), DEFAULT_GRAPH_PATH)
-  }
-}
diff --git a/packages/riviere-cli/src/features/query/entrypoint/_platform/cli/component-output.ts b/packages/riviere-cli/src/features/query/entrypoint/_platform/cli/component-output.ts
deleted file mode 100644
index 2562880e2..000000000
--- a/packages/riviere-cli/src/features/query/entrypoint/_platform/cli/component-output.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import type { Component } from '@living-architecture/riviere-schema'
-
-interface ComponentOutput {
-  id: string
-  type: string
-  name: string
-  domain: string
-}
-
-/** @riviere-role cli-output-formatter */
-export function toComponentOutput(component: Component): ComponentOutput {
-  return {
-    id: component.id,
-    type: component.type,
-    name: component.name,
-    domain: component.domain,
-  }
-}
diff --git a/packages/riviere-cli/src/features/query/entrypoint/components/entrypoint.ts b/packages/riviere-cli/src/features/query/entrypoint/components/entrypoint.ts
deleted file mode 100644
index 942e88d16..000000000
--- a/packages/riviere-cli/src/features/query/entrypoint/components/entrypoint.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { Command } from 'commander'
-import {
-  formatSuccess, formatError 
-} from '../../../../platform/infra/cli/presentation/output'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import { formatQueryGraphLoadFailure } from '../../../../platform/infra/cli/presentation/query-graph-load-failure-output'
-import { getDefaultGraphPathDescription } from '../../../../platform/infra/cli/presentation/graph-path-option'
-import {
-  isValidComponentType,
-  normalizeToSchemaComponentType,
-  VALID_COMPONENT_TYPES,
-} from '../../../../entrypoint/_platform/cli/component-types'
-import { toComponentOutput } from '../_platform/cli/component-output'
-import type { ListComponents } from '../../queries/list-components'
-
-interface ComponentsOptions {
-  graph?: string
-  json?: boolean
-  domain?: string
-  type?: string
-}
-
-/** @riviere-role cli-entrypoint */
-export function createComponentsCommand(listComponents: ListComponents): Command {
-  return new Command('components')
-    .description('List components with optional filtering')
-    .addHelpText(
-      'after',
-      `
-Examples:
-  $ riviere query components
-  $ riviere query components --domain orders
-  $ riviere query components --type API --json
-  $ riviere query components --domain orders --type UseCase
-`,
-    )
-    .option('--graph <path>', getDefaultGraphPathDescription())
-    .option('--json', 'Output result as JSON')
-    .option('--domain <name>', 'Filter by domain name')
-    .option('--type <type>', 'Filter by component type')
-    .action(async (options: ComponentsOptions) => {
-      if (options.type !== undefined && !isValidComponentType(options.type)) {
-        const errorMessage = `Invalid component type: ${options.type}. Valid types: ${VALID_COMPONENT_TYPES.join(', ')}`
-        if (options.json) {
-          console.log(JSON.stringify(formatError(CliErrorCode.ValidationError, errorMessage)))
-        } else {
-          console.error(`Error: ${errorMessage}`)
-        }
-        return
-      }
-
-      const result = listComponents.execute({
-        domain: options.domain,
-        graphPathOption: options.graph,
-        type: options.type === undefined ? undefined : normalizeToSchemaComponentType(options.type),
-      })
-
-      if ('kind' in result) {
-        console.log(JSON.stringify(formatQueryGraphLoadFailure(result)))
-        return
-      }
-
-      const components = result.components.map(toComponentOutput)
-
-      if (options.json) {
-        console.log(JSON.stringify(formatSuccess({ components })))
-      }
-    })
-}
diff --git a/packages/riviere-cli/src/features/query/entrypoint/components/query-entrypoint-error-rethrow.spec.ts b/packages/riviere-cli/src/features/query/entrypoint/components/query-entrypoint-error-rethrow.spec.ts
deleted file mode 100644
index e65aae8d3..000000000
--- a/packages/riviere-cli/src/features/query/entrypoint/components/query-entrypoint-error-rethrow.spec.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import {
-  afterEach, describe, expect, it, vi 
-} from 'vitest'
-
-type Loader<T> = () => Promise<T>
-
-class UnexpectedQueryEntrypointError extends Error {
-  constructor(message: string) {
-    super(message)
-    this.name = 'UnexpectedQueryEntrypointError'
-  }
-}
-
-async function expectRethrow<
-  T extends { createProgram: () => { parseAsync: (argv: string[]) => Promise<unknown> } },
->(loadModule: Loader<T>, argv: string[]): Promise<void> {
-  const module = await loadModule()
-  await expect(module.createProgram().parseAsync(argv)).rejects.toThrow('unexpected failure')
-}
-
-describe('query entrypoints rethrow unknown errors', () => {
-  afterEach(() => {
-    vi.resetModules()
-    vi.restoreAllMocks()
-    vi.doUnmock('../../queries/list-components')
-    vi.doUnmock('../../queries/list-domains')
-    vi.doUnmock('../../queries/list-entry-points')
-    vi.doUnmock('../../queries/detect-orphans')
-    vi.doUnmock('../../queries/search-components')
-    vi.doUnmock('../../queries/trace-flow')
-  })
-
-  it('rethrows unknown list-components errors', async () => {
-    vi.doMock('../../queries/list-components', () => ({
-      ListComponents: class {
-        execute() {
-          throw new UnexpectedQueryEntrypointError('unexpected failure')
-        }
-      },
-    }))
-    await expectRethrow(
-      () => import('../../../../shell/cli'),
-      ['node', 'riviere', 'query', 'components', '--json'],
-    )
-  })
-
-  it('rethrows unknown list-domains errors', async () => {
-    vi.doMock('../../queries/list-domains', () => ({
-      ListDomains: class {
-        execute() {
-          throw new UnexpectedQueryEntrypointError('unexpected failure')
-        }
-      },
-    }))
-    await expectRethrow(
-      () => import('../../../../shell/cli'),
-      ['node', 'riviere', 'query', 'domains', '--json'],
-    )
-  })
-
-  it('rethrows unknown list-entry-points errors', async () => {
-    vi.doMock('../../queries/list-entry-points', () => ({
-      ListEntryPoints: class {
-        execute() {
-          throw new UnexpectedQueryEntrypointError('unexpected failure')
-        }
-      },
-    }))
-    await expectRethrow(
-      () => import('../../../../shell/cli'),
-      ['node', 'riviere', 'query', 'entry-points', '--json'],
-    )
-  })
-
-  it('rethrows unknown orphan errors', async () => {
-    vi.doMock('../../queries/detect-orphans', () => ({
-      DetectOrphans: class {
-        execute() {
-          throw new UnexpectedQueryEntrypointError('unexpected failure')
-        }
-      },
-    }))
-    await expectRethrow(
-      () => import('../../../../shell/cli'),
-      ['node', 'riviere', 'query', 'orphans', '--json'],
-    )
-  })
-
-  it('rethrows unknown search errors', async () => {
-    vi.doMock('../../queries/search-components', () => ({
-      SearchComponents: class {
-        execute() {
-          throw new UnexpectedQueryEntrypointError('unexpected failure')
-        }
-      },
-    }))
-    await expectRethrow(
-      () => import('../../../../shell/cli'),
-      ['node', 'riviere', 'query', 'search', 'term', '--json'],
-    )
-  })
-
-  it('rethrows unknown trace errors', async () => {
-    vi.doMock('../../queries/trace-flow', () => ({
-      TraceFlow: class {
-        execute() {
-          throw new UnexpectedQueryEntrypointError('unexpected failure')
-        }
-      },
-    }))
-    await expectRethrow(
-      () => import('../../../../shell/cli'),
-      ['node', 'riviere', 'query', 'trace', 'orders:mod:api:test', '--json'],
-    )
-  })
-})
diff --git a/packages/riviere-cli/src/features/query/entrypoint/domains/domains.spec.ts b/packages/riviere-cli/src/features/query/entrypoint/domains/domains.spec.ts
deleted file mode 100644
index 746a36171..000000000
--- a/packages/riviere-cli/src/features/query/entrypoint/domains/domains.spec.ts
+++ /dev/null
@@ -1,210 +0,0 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import { createProgram } from '../../../../shell/cli'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import type { TestContext } from '../../../../platform/__fixtures__/command-test-fixtures'
-import {
-  createTestContext,
-  setupCommandTest,
-  createGraph,
-  sourceLocation,
-  TestAssertionError,
-} from '../../../../platform/__fixtures__/command-test-fixtures'
-
-interface ComponentCounts {
-  UI: number
-  API: number
-  UseCase: number
-  DomainOp: number
-  Event: number
-  EventHandler: number
-  Custom: number
-  total: number
-}
-
-interface DomainInfo {
-  name: string
-  description: string
-  systemType: string
-  componentCounts: ComponentCounts
-}
-
-interface DomainsOutput {
-  success: true
-  data: { domains: DomainInfo[] }
-  warnings: string[]
-}
-
-function isDomainsOutput(value: unknown): value is DomainsOutput {
-  if (typeof value !== 'object' || value === null) return false
-  if (!('success' in value) || value.success !== true) return false
-  if (!('data' in value) || typeof value.data !== 'object' || value.data === null) return false
-  if (!('domains' in value.data) || !Array.isArray(value.data.domains)) return false
-  return true
-}
-
-function parseOutput(consoleOutput: string[]): DomainsOutput {
-  const parsed: unknown = JSON.parse(consoleOutput[0] ?? '{}')
-  if (!isDomainsOutput(parsed)) {
-    throw new TestAssertionError(`Invalid domains output: ${consoleOutput[0]}`)
-  }
-  return parsed
-}
-
-describe('riviere query domains', () => {
-  describe('command registration', () => {
-    it('registers domains command under query', () => {
-      const program = createProgram()
-      const queryCmd = program.commands.find((cmd) => cmd.name() === 'query')
-      const domainsCmd = queryCmd?.commands.find((cmd) => cmd.name() === 'domains')
-      expect(domainsCmd?.name()).toBe('domains')
-    })
-  })
-
-  describe('querying domains', () => {
-    const ctx: TestContext = createTestContext()
-    setupCommandTest(ctx)
-
-    it('returns domain names with component counts', async () => {
-      await createGraph(ctx.testDir, {
-        version: '1.0',
-        metadata: {
-          sources: [{ repository: 'https://github.com/org/repo' }],
-          domains: {
-            orders: {
-              description: 'Order management',
-              systemType: 'domain',
-            },
-          },
-        },
-        components: [
-          {
-            id: 'orders:checkout:api:place-order',
-            type: 'API',
-            name: 'place-order',
-            domain: 'orders',
-            module: 'checkout',
-            sourceLocation,
-            apiType: 'REST',
-            httpMethod: 'POST',
-            path: '/orders',
-          },
-          {
-            id: 'orders:checkout:usecase:place-order',
-            type: 'UseCase',
-            name: 'place-order',
-            domain: 'orders',
-            module: 'checkout',
-            sourceLocation,
-          },
-          {
-            id: 'orders:checkout:usecase:cancel-order',
-            type: 'UseCase',
-            name: 'cancel-order',
-            domain: 'orders',
-            module: 'checkout',
-            sourceLocation,
-          },
-        ],
-        links: [],
-      })
-
-      await createProgram().parseAsync(['node', 'riviere', 'query', 'domains', '--json'])
-      const output = parseOutput(ctx.consoleOutput)
-      expect(output.success).toBe(true)
-      expect(output.data.domains).toHaveLength(1)
-      expect(output.data.domains[0]).toMatchObject({
-        name: 'orders',
-        description: 'Order management',
-        systemType: 'domain',
-        componentCounts: {
-          API: 1,
-          UseCase: 2,
-          total: 3,
-        },
-      })
-    })
-
-    it('returns all domains from graph metadata', async () => {
-      await createGraph(ctx.testDir, {
-        version: '1.0',
-        metadata: {
-          sources: [{ repository: 'https://github.com/org/repo' }],
-          domains: {
-            orders: {
-              description: 'Order management',
-              systemType: 'domain',
-            },
-            payments: {
-              description: 'Payment processing',
-              systemType: 'bff',
-            },
-          },
-        },
-        components: [
-          {
-            id: 'orders:checkout:api:place-order',
-            type: 'API',
-            name: 'place-order',
-            domain: 'orders',
-            module: 'checkout',
-            sourceLocation,
-            apiType: 'REST',
-            httpMethod: 'POST',
-            path: '/orders',
-          },
-          {
-            id: 'payments:billing:api:process-payment',
-            type: 'API',
-            name: 'process-payment',
-            domain: 'payments',
-            module: 'billing',
-            sourceLocation,
-            apiType: 'REST',
-            httpMethod: 'POST',
-            path: '/payments',
-          },
-        ],
-        links: [],
-      })
-
-      await createProgram().parseAsync(['node', 'riviere', 'query', 'domains', '--json'])
-      const output = parseOutput(ctx.consoleOutput)
-      expect(output.data.domains).toHaveLength(2)
-      expect(
-        output.data.domains.map((d) => d.name).sort((a, b) => a.localeCompare(b)),
-      ).toStrictEqual(['orders', 'payments'])
-    })
-
-    it('produces no output when --json flag is not provided', async () => {
-      await createGraph(ctx.testDir, {
-        version: '1.0',
-        metadata: {
-          sources: [{ repository: 'https://github.com/org/repo' }],
-          domains: {
-            orders: {
-              description: 'Order management',
-              systemType: 'domain',
-            },
-          },
-        },
-        components: [],
-        links: [],
-      })
-
-      await createProgram().parseAsync(['node', 'riviere', 'query', 'domains'])
-      expect(ctx.consoleOutput).toHaveLength(0)
-    })
-  })
-
-  describe('error handling', () => {
-    const ctx: TestContext = createTestContext()
-    setupCommandTest(ctx)
-
-    it('returns GRAPH_NOT_FOUND when no graph exists', async () => {
-      await createProgram().parseAsync(['node', 'riviere', 'query', 'domains', '--json'])
-      expect(ctx.consoleOutput.join('\n')).toContain(CliErrorCode.GraphNotFound)
-    })
-  })
-})
diff --git a/packages/riviere-cli/src/features/query/entrypoint/domains/entrypoint.ts b/packages/riviere-cli/src/features/query/entrypoint/domains/entrypoint.ts
deleted file mode 100644
index cb9240e03..000000000
--- a/packages/riviere-cli/src/features/query/entrypoint/domains/entrypoint.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Command } from 'commander'
-import { formatSuccess } from '../../../../platform/infra/cli/presentation/output'
-import { formatQueryGraphLoadFailure } from '../../../../platform/infra/cli/presentation/query-graph-load-failure-output'
-import { getDefaultGraphPathDescription } from '../../../../platform/infra/cli/presentation/graph-path-option'
-import type { ListDomains } from '../../queries/list-domains'
-
-interface DomainsOptions {
-  graph?: string
-  json?: boolean
-}
-
-/** @riviere-role cli-entrypoint */
-export function createDomainsCommand(listDomains: ListDomains): Command {
-  return new Command('domains')
-    .description('List domains with component counts')
-    .addHelpText(
-      'after',
-      `
-Examples:
-  $ riviere query domains
-  $ riviere query domains --json
-`,
-    )
-    .option('--graph <path>', getDefaultGraphPathDescription())
-    .option('--json', 'Output result as JSON')
-    .action(async (options: DomainsOptions) => {
-      const result = listDomains.execute({ graphPathOption: options.graph })
-
-      if ('kind' in result) {
-        console.log(JSON.stringify(formatQueryGraphLoadFailure(result)))
-        return
-      }
-
-      if (options.json) {
-        console.log(JSON.stringify(formatSuccess(result)))
-      }
-    })
-}
diff --git a/packages/riviere-cli/src/features/query/entrypoint/entry-points/entrypoint.ts b/packages/riviere-cli/src/features/query/entrypoint/entry-points/entrypoint.ts
deleted file mode 100644
index a06d78c59..000000000
--- a/packages/riviere-cli/src/features/query/entrypoint/entry-points/entrypoint.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Command } from 'commander'
-import { formatSuccess } from '../../../../platform/infra/cli/presentation/output'
-import { formatQueryGraphLoadFailure } from '../../../../platform/infra/cli/presentation/query-graph-load-failure-output'
-import { getDefaultGraphPathDescription } from '../../../../platform/infra/cli/presentation/graph-path-option'
-import type { ListEntryPoints } from '../../queries/list-entry-points'
-
-interface EntryPointsOptions {
-  graph?: string
-  json?: boolean
-}
-
-/** @riviere-role cli-entrypoint */
-export function createEntryPointsCommand(listEntryPoints: ListEntryPoints): Command {
-  return new Command('entry-points')
-    .description('List entry points (APIs, UIs, EventHandlers with no incoming links)')
-    .addHelpText(
-      'after',
-      `
-Examples:
-  $ riviere query entry-points
-  $ riviere query entry-points --json
-`,
-    )
-    .option('--graph <path>', getDefaultGraphPathDescription())
-    .option('--json', 'Output result as JSON')
-    .action(async (options: EntryPointsOptions) => {
-      const result = listEntryPoints.execute({ graphPathOption: options.graph })
-
-      if ('kind' in result) {
-        console.log(JSON.stringify(formatQueryGraphLoadFailure(result)))
-        return
-      }
-
-      if (options.json) {
-        console.log(JSON.stringify(formatSuccess(result)))
-      }
-    })
-}
diff --git a/packages/riviere-cli/src/features/query/entrypoint/orphans/entrypoint.ts b/packages/riviere-cli/src/features/query/entrypoint/orphans/entrypoint.ts
deleted file mode 100644
index 25080665c..000000000
--- a/packages/riviere-cli/src/features/query/entrypoint/orphans/entrypoint.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Command } from 'commander'
-import { formatSuccess } from '../../../../platform/infra/cli/presentation/output'
-import { formatQueryGraphLoadFailure } from '../../../../platform/infra/cli/presentation/query-graph-load-failure-output'
-import { getDefaultGraphPathDescription } from '../../../../platform/infra/cli/presentation/graph-path-option'
-import type { DetectOrphans } from '../../queries/detect-orphans'
-
-interface OrphansOptions {
-  graph?: string
-  json?: boolean
-}
-
-/** @riviere-role cli-entrypoint */
-export function createOrphansCommand(detectOrphans: DetectOrphans): Command {
-  return new Command('orphans')
-    .description('Find orphan components with no links')
-    .addHelpText(
-      'after',
-      `
-Examples:
-  $ riviere query orphans
-  $ riviere query orphans --json
-`,
-    )
-    .option('--graph <path>', getDefaultGraphPathDescription())
-    .option('--json', 'Output result as JSON')
-    .action(async (options: OrphansOptions) => {
-      const result = detectOrphans.execute({ graphPathOption: options.graph })
-
-      if ('kind' in result) {
-        console.log(JSON.stringify(formatQueryGraphLoadFailure(result)))
-        return
-      }
-
-      if (options.json) {
-        console.log(JSON.stringify(formatSuccess(result)))
-      }
-    })
-}
diff --git a/packages/riviere-cli/src/features/query/entrypoint/search/entrypoint.ts b/packages/riviere-cli/src/features/query/entrypoint/search/entrypoint.ts
deleted file mode 100644
index 06ac7b644..000000000
--- a/packages/riviere-cli/src/features/query/entrypoint/search/entrypoint.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { Command } from 'commander'
-import { formatSuccess } from '../../../../platform/infra/cli/presentation/output'
-import { formatQueryGraphLoadFailure } from '../../../../platform/infra/cli/presentation/query-graph-load-failure-output'
-import { getDefaultGraphPathDescription } from '../../../../platform/infra/cli/presentation/graph-path-option'
-import { toComponentOutput } from '../_platform/cli/component-output'
-import type { SearchComponents } from '../../queries/search-components'
-
-interface SearchOptions {
-  graph?: string
-  json?: boolean
-}
-
-/** @riviere-role cli-entrypoint */
-export function createSearchCommand(searchComponents: SearchComponents): Command {
-  return new Command('search')
-    .description('Search components by name')
-    .addHelpText(
-      'after',
-      `
-Examples:
-  $ riviere query search order
-  $ riviere query search "place-order" --json
-`,
-    )
-    .argument('<term>', 'Search term')
-    .option('--graph <path>', getDefaultGraphPathDescription())
-    .option('--json', 'Output result as JSON')
-    .action(async (term: string, options: SearchOptions) => {
-      const result = searchComponents.execute({
-        graphPathOption: options.graph,
-        term,
-      })
-
-      if ('kind' in result) {
-        console.log(JSON.stringify(formatQueryGraphLoadFailure(result)))
-        return
-      }
-
-      const components = result.components.map(toComponentOutput)
-
-      if (options.json) {
-        console.log(JSON.stringify(formatSuccess({ components })))
-      }
-    })
-}
diff --git a/packages/riviere-cli/src/features/query/entrypoint/trace/entrypoint.ts b/packages/riviere-cli/src/features/query/entrypoint/trace/entrypoint.ts
deleted file mode 100644
index 588d8199d..000000000
--- a/packages/riviere-cli/src/features/query/entrypoint/trace/entrypoint.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { Command } from 'commander'
-import {
-  formatError, formatSuccess 
-} from '../../../../platform/infra/cli/presentation/output'
-import { CliErrorCode } from '../../../../platform/infra/cli/presentation/error-codes'
-import { formatQueryGraphLoadFailure } from '../../../../platform/infra/cli/presentation/query-graph-load-failure-output'
-import { getDefaultGraphPathDescription } from '../../../../platform/infra/cli/presentation/graph-path-option'
-import type { TraceFlow } from '../../queries/trace-flow'
-
-interface TraceOptions {
-  graph?: string
-  json?: boolean
-}
-
-/** @riviere-role cli-entrypoint */
-export function createTraceCommand(traceFlow: TraceFlow): Command {
-  return new Command('trace')
-    .description('Trace flow from a component (bidirectional)')
-    .addHelpText(
-      'after',
-      `
-Examples:
-  $ riviere query trace "orders:api:api:postorders"
-  $ riviere query trace "orders:checkout:usecase:placeorder" --json
-`,
-    )
-    .argument('<componentId>', 'Component ID to trace from')
-    .option('--graph <path>', getDefaultGraphPathDescription())
-    .option('--json', 'Output result as JSON')
-    .action(async (componentIdArg: string, options: TraceOptions) => {
-      const result = traceFlow.execute({
-        componentId: componentIdArg,
-        graphPathOption: options.graph,
-      })
-
-      if ('kind' in result) {
-        console.log(JSON.stringify(formatQueryGraphLoadFailure(result)))
-        return
-      }
-
-      if (!result.success) {
-        console.log(
-          JSON.stringify(
-            formatError(CliErrorCode.ComponentNotFound, result.message, result.suggestions),
-          ),
-        )
-        return
-      }
-
-      if (options.json) {
-        console.log(JSON.stringify(formatSuccess(result.flow)))
-      }
-    })
-}
diff --git a/packages/riviere-cli/src/features/query/queries/detect-orphans-input.ts b/packages/riviere-cli/src/features/query/queries/detect-orphans-input.ts
deleted file mode 100644
index f5cf48f80..000000000
--- a/packages/riviere-cli/src/features/query/queries/detect-orphans-input.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/** @riviere-role query-model-use-case-input */
-export interface DetectOrphansInput {graphPathOption: string | undefined}
diff --git a/packages/riviere-cli/src/features/query/queries/detect-orphans-result.ts b/packages/riviere-cli/src/features/query/queries/detect-orphans-result.ts
deleted file mode 100644
index bcd7cad2a..000000000
--- a/packages/riviere-cli/src/features/query/queries/detect-orphans-result.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type { RiviereQuery } from '@living-architecture/riviere-query'
-import type { QueryGraphLoadFailure } from './query-graph-load-failure'
-
-/** @riviere-role query-model */
-export type OrphanComponent = ReturnType<RiviereQuery['detectOrphans']>[number]
-
-/** @riviere-role query-model */
-export type DetectOrphansResult = { orphans: OrphanComponent[] } | QueryGraphLoadFailure
diff --git a/packages/riviere-cli/src/features/query/queries/detect-orphans.ts b/packages/riviere-cli/src/features/query/queries/detect-orphans.ts
deleted file mode 100644
index 28630e19c..000000000
--- a/packages/riviere-cli/src/features/query/queries/detect-orphans.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { RiviereQueryRepository } from '../data-access/riviere-query-repository'
-import type { DetectOrphansInput } from './detect-orphans-input'
-import type { DetectOrphansResult } from './detect-orphans-result'
-import { loadQueryGraph } from './query-graph-load-failure'
-
-/** @riviere-role query-model-use-case */
-export class DetectOrphans {
-  constructor(private readonly repository: RiviereQueryRepository) {}
-
-  execute(input: DetectOrphansInput): DetectOrphansResult {
-    const loaded = loadQueryGraph(this.repository, input.graphPathOption)
-    if (loaded.kind !== 'loaded') {
-      return loaded
-    }
-    return { orphans: loaded.query.detectOrphans() }
-  }
-}
diff --git a/packages/riviere-cli/src/features/query/queries/list-components-input.ts b/packages/riviere-cli/src/features/query/queries/list-components-input.ts
deleted file mode 100644
index 40373c4f3..000000000
--- a/packages/riviere-cli/src/features/query/queries/list-components-input.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type { ComponentType } from '@living-architecture/riviere-schema'
-
-/** @riviere-role query-model-use-case-input */
-export interface ListComponentsInput {
-  domain: string | undefined
-  graphPathOption: string | undefined
-  type: ComponentType | undefined
-}
diff --git a/packages/riviere-cli/src/features/query/queries/list-components-result.ts b/packages/riviere-cli/src/features/query/queries/list-components-result.ts
deleted file mode 100644
index 0a045c220..000000000
--- a/packages/riviere-cli/src/features/query/queries/list-components-result.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type { RiviereQuery } from '@living-architecture/riviere-query'
-import type { QueryGraphLoadFailure } from './query-graph-load-failure'
-
-/** @riviere-role query-model */
-export type ListedComponent = ReturnType<RiviereQuery['components']>[number]
-
-/** @riviere-role query-model */
-export type ListComponentsResult = { components: ListedComponent[] } | QueryGraphLoadFailure
diff --git a/packages/riviere-cli/src/features/query/queries/list-components.ts b/packages/riviere-cli/src/features/query/queries/list-components.ts
deleted file mode 100644
index 69af8ccf5..000000000
--- a/packages/riviere-cli/src/features/query/queries/list-components.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { RiviereQueryRepository } from '../data-access/riviere-query-repository'
-import type { ListComponentsInput } from './list-components-input'
-import type { ListComponentsResult } from './list-components-result'
-import { loadQueryGraph } from './query-graph-load-failure'
-
-/** @riviere-role query-model-use-case */
-export class ListComponents {
-  constructor(private readonly repository: RiviereQueryRepository) {}
-
-  execute(input: ListComponentsInput): ListComponentsResult {
-    const loaded = loadQueryGraph(this.repository, input.graphPathOption)
-    if (loaded.kind !== 'loaded') {
-      return loaded
-    }
-
-    const allComponents = loaded.query.components()
-    const filteredByDomain =
-      input.domain === undefined
-        ? allComponents
-        : allComponents.filter((component) => component.domain === input.domain)
-
-    return {
-      components:
-        input.type === undefined
-          ? filteredByDomain
-          : filteredByDomain.filter((component) => component.type === input.type),
-    }
-  }
-}
diff --git a/packages/riviere-cli/src/features/query/queries/list-domains-input.ts b/packages/riviere-cli/src/features/query/queries/list-domains-input.ts
deleted file mode 100644
index cdf287eff..000000000
--- a/packages/riviere-cli/src/features/query/queries/list-domains-input.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/** @riviere-role query-model-use-case-input */
-export interface ListDomainsInput {graphPathOption: string | undefined}
diff --git a/packages/riviere-cli/src/features/query/queries/list-domains-result.ts b/packages/riviere-cli/src/features/query/queries/list-domains-result.ts
deleted file mode 100644
index aaa81578b..000000000
--- a/packages/riviere-cli/src/features/query/queries/list-domains-result.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type { RiviereQuery } from '@living-architecture/riviere-query'
-import type { QueryGraphLoadFailure } from './query-graph-load-failure'
-
-/** @riviere-role query-model */
-export type DomainSummary = ReturnType<RiviereQuery['domains']>[number]
-
-/** @riviere-role query-model */
-export type ListDomainsResult = { domains: DomainSummary[] } | QueryGraphLoadFailure
diff --git a/packages/riviere-cli/src/features/query/queries/list-domains.ts b/packages/riviere-cli/src/features/query/queries/list-domains.ts
deleted file mode 100644
index dc117008b..000000000
--- a/packages/riviere-cli/src/features/query/queries/list-domains.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { RiviereQueryRepository } from '../data-access/riviere-query-repository'
-import type { ListDomainsInput } from './list-domains-input'
-import type { ListDomainsResult } from './list-domains-result'
-import { loadQueryGraph } from './query-graph-load-failure'
-
-/** @riviere-role query-model-use-case */
-export class ListDomains {
-  constructor(private readonly repository: RiviereQueryRepository) {}
-
-  execute(input: ListDomainsInput): ListDomainsResult {
-    const loaded = loadQueryGraph(this.repository, input.graphPathOption)
-    if (loaded.kind !== 'loaded') {
-      return loaded
-    }
-    return { domains: loaded.query.domains() }
-  }
-}
diff --git a/packages/riviere-cli/src/features/query/queries/list-entry-points-input.ts b/packages/riviere-cli/src/features/query/queries/list-entry-points-input.ts
deleted file mode 100644
index 4d48e62f9..000000000
--- a/packages/riviere-cli/src/features/query/queries/list-entry-points-input.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/** @riviere-role query-model-use-case-input */
-export interface ListEntryPointsInput {graphPathOption: string | undefined}
diff --git a/packages/riviere-cli/src/features/query/queries/list-entry-points-result.ts b/packages/riviere-cli/src/features/query/queries/list-entry-points-result.ts
deleted file mode 100644
index f320530fe..000000000
--- a/packages/riviere-cli/src/features/query/queries/list-entry-points-result.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type { RiviereQuery } from '@living-architecture/riviere-query'
-import type { QueryGraphLoadFailure } from './query-graph-load-failure'
-
-/** @riviere-role query-model */
-export type EntryPointComponent = ReturnType<RiviereQuery['entryPoints']>[number]
-
-/** @riviere-role query-model */
-export type ListEntryPointsResult = { entryPoints: EntryPointComponent[] } | QueryGraphLoadFailure
diff --git a/packages/riviere-cli/src/features/query/queries/list-entry-points.ts b/packages/riviere-cli/src/features/query/queries/list-entry-points.ts
deleted file mode 100644
index ae6e2724b..000000000
--- a/packages/riviere-cli/src/features/query/queries/list-entry-points.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { RiviereQueryRepository } from '../data-access/riviere-query-repository'
-import type { ListEntryPointsInput } from './list-entry-points-input'
-import type { ListEntryPointsResult } from './list-entry-points-result'
-import { loadQueryGraph } from './query-graph-load-failure'
-
-/** @riviere-role query-model-use-case */
-export class ListEntryPoints {
-  constructor(private readonly repository: RiviereQueryRepository) {}
-
-  execute(input: ListEntryPointsInput): ListEntryPointsResult {
-    const loaded = loadQueryGraph(this.repository, input.graphPathOption)
-    if (loaded.kind !== 'loaded') {
-      return loaded
-    }
-    return { entryPoints: loaded.query.entryPoints() }
-  }
-}
diff --git a/packages/riviere-cli/src/features/query/queries/query-graph-load-failure.spec.ts b/packages/riviere-cli/src/features/query/queries/query-graph-load-failure.spec.ts
deleted file mode 100644
index a089cfa36..000000000
--- a/packages/riviere-cli/src/features/query/queries/query-graph-load-failure.spec.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import {
-  describe, expect, it 
-} from 'vitest'
-import { GraphCorruptedError } from '../../../platform/domain/graph-corrupted-error'
-import { GraphNotFoundError } from '../../../platform/domain/graph-not-found-error'
-import { RiviereQuery } from '@living-architecture/riviere-query'
-import { RiviereQueryRepository } from '../data-access/riviere-query-repository'
-import {
-  loadQueryGraph, toQueryGraphLoadFailure 
-} from './query-graph-load-failure'
-
-class UnexpectedQueryGraphLoadError extends Error {
-  constructor() {
-    super('boom')
-    this.name = 'UnexpectedQueryGraphLoadError'
-  }
-}
-
-class ReturningRepository extends RiviereQueryRepository {
-  override load(): RiviereQuery {
-    return RiviereQuery.fromJSON({
-      version: '1.0',
-      metadata: {
-        sources: [],
-        domains: {
-          orders: {
-            description: 'Order management',
-            systemType: 'domain',
-          },
-        },
-      },
-      components: [],
-      links: [],
-    })
-  }
-}
-
-class FailingRepository extends RiviereQueryRepository {
-  constructor(private readonly error: unknown) {
-    super()
-  }
-
-  override load(): never {
-    throw this.error
-  }
-}
-
-describe('toQueryGraphLoadFailure', () => {
-  it('returns graphNotFound failure when graph file is missing', () => {
-    expect(toQueryGraphLoadFailure(new GraphNotFoundError('graph.json'))).toStrictEqual({
-      kind: 'graphNotFound',
-      message: 'Graph not found at graph.json',
-    })
-  })
-
-  it('returns graphCorrupted failure when graph file cannot be parsed', () => {
-    expect(toQueryGraphLoadFailure(new GraphCorruptedError('graph.json'))).toStrictEqual({
-      kind: 'graphCorrupted',
-      message: 'Graph file contains invalid JSON',
-    })
-  })
-
-  it('returns undefined when error is not a graph loading failure', () => {
-    expect(toQueryGraphLoadFailure(new UnexpectedQueryGraphLoadError())).toBeUndefined()
-  })
-})
-
-describe('loadQueryGraph', () => {
-  it('returns loaded query when repository loads graph', () => {
-    const result = loadQueryGraph(new ReturningRepository(), undefined)
-    expect(result.kind).toStrictEqual('loaded')
-  })
-
-  it('returns graph loading failure when repository throws known loading error', () => {
-    expect(
-      loadQueryGraph(new FailingRepository(new GraphNotFoundError('graph.json')), undefined),
-    ).toStrictEqual({
-      kind: 'graphNotFound',
-      message: 'Graph not found at graph.json',
-    })
-  })
-
-  it('returns graph loading failure when repository throws corrupted graph error', () => {
-    expect(
-      loadQueryGraph(new FailingRepository(new GraphCorruptedError('graph.json')), undefined),
-    ).toStrictEqual({
-      kind: 'graphCorrupted',
-      message: 'Graph file contains invalid JSON',
-    })
-  })
-
-  it('rethrows unexpected repository errors', () => {
-    expect(() =>
-      loadQueryGraph(new FailingRepository(new UnexpectedQueryGraphLoadError()), undefined),
-    ).toThrow(UnexpectedQueryGraphLoadError)
-  })
-})
diff --git a/packages/riviere-cli/src/features/query/queries/query-graph-load-failure.ts b/packages/riviere-cli/src/features/query/queries/query-graph-load-failure.ts
deleted file mode 100644
index 467310b36..000000000
--- a/packages/riviere-cli/src/features/query/queries/query-graph-load-failure.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { GraphCorruptedError } from '../../../platform/domain/graph-corrupted-error'
-import { GraphNotFoundError } from '../../../platform/domain/graph-not-found-error'
-import type { RiviereQuery } from '@living-architecture/riviere-query'
-import { RiviereQueryRepository } from '../data-access/riviere-query-repository'
-
-/** @riviere-role query-model */
-export type QueryGraphLoadFailure =
-  | {
-    readonly kind: 'graphCorrupted'
-    readonly message: string
-  }
-  | {
-    readonly kind: 'graphNotFound'
-    readonly message: string
-  }
-
-/** @riviere-role query-model */
-export type LoadedQueryGraph =
-  | {
-    readonly kind: 'loaded'
-    readonly query: RiviereQuery
-  }
-  | QueryGraphLoadFailure
-
-/** @riviere-role query-model */
-export function toQueryGraphLoadFailure(error: unknown): QueryGraphLoadFailure | undefined {
-  if (error instanceof GraphNotFoundError) {
-    return {
-      kind: 'graphNotFound',
-      message: error.message,
-    }
-  }
-
-  if (error instanceof GraphCorruptedError) {
-    return {
-      kind: 'graphCorrupted',
-      message: 'Graph file contains invalid JSON',
-    }
-  }
-
-  return undefined
-}
-
-/** @riviere-role query-model */
-export function loadQueryGraph(
-  repository: RiviereQueryRepository,
-  graphPathOption: string | undefined,
-): LoadedQueryGraph {
-  try {
-    return {
-      kind: 'loaded',
-      query: repository.load(graphPathOption),
-    }
-  } catch (error) {
-    const failure = toQueryGraphLoadFailure(error)
-    if (failure !== undefined) {
-      return failure
-    }
-    throw error
-  }
-}
diff --git a/packages/riviere-cli/src/features/query/queries/search-components-result.ts b/packages/riviere-cli/src/features/query/queries/search-components-result.ts
deleted file mode 100644
index d72d68eb5..000000000
--- a/packages/riviere-cli/src/features/query/queries/search-components-result.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type { RiviereQuery } from '@living-architecture/riviere-query'
-import type { QueryGraphLoadFailure } from './query-graph-load-failure'
-
-/** @riviere-role query-model */
-export type SearchComponent = ReturnType<RiviereQuery['search']>[number]
-
-/** @riviere-role query-model */
-export type SearchComponentsResult = { components: SearchComponent[] } | QueryGraphLoadFailure
diff --git a/packages/riviere-cli/src/features/query/queries/search-components.ts b/packages/riviere-cli/src/features/query/queries/search-components.ts
deleted file mode 100644
index 937e4390a..000000000
--- a/packages/riviere-cli/src/features/query/queries/search-components.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { RiviereQueryRepository } from '../data-access/riviere-query-repository'
-import type { SearchComponentsInput } from './search-components-input'
-import type { SearchComponentsResult } from './search-components-result'
-import { loadQueryGraph } from './query-graph-load-failure'
-
-/** @riviere-role query-model-use-case */
-export class SearchComponents {
-  constructor(private readonly repository: RiviereQueryRepository) {}
-
-  execute(input: SearchComponentsInput): SearchComponentsResult {
-    const loaded = loadQueryGraph(this.repository, input.graphPathOption)
-    if (loaded.kind !== 'loaded') {
-      return loaded
-    }
-    return { components: loaded.query.search(input.term) }
-  }
-}
diff --git a/packages/riviere-cli/src/features/query/queries/trace-flow-result.ts b/packages/riviere-cli/src/features/query/queries/trace-flow-result.ts
deleted file mode 100644
index a33927508..000000000
--- a/packages/riviere-cli/src/features/query/queries/trace-flow-result.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import type { RiviereQuery } from '@living-architecture/riviere-query'
-import type { QueryGraphLoadFailure } from './query-graph-load-failure'
-
-/** @riviere-role query-model */
-export type TraceFlowGraph = ReturnType<RiviereQuery['traceFlow']>
-
-/** @riviere-role query-model */
-export type TraceFlowResult =
-  | {
-    flow: TraceFlowGraph
-    success: true
-  }
-  | {
-    message: string
-    suggestions: string[]
-    success: false
-  }
-  | QueryGraphLoadFailure
diff --git a/packages/riviere-cli/src/features/query/queries/trace-flow.spec.ts b/packages/riviere-cli/src/features/query/queries/trace-flow.spec.ts
deleted file mode 100644
index 5307ad8ee..000000000
--- a/packages/riviere-cli/src/features/query/queries/trace-flow.spec.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import {
-  ComponentNotFoundError, RiviereQuery 
-} from '@living-architecture/riviere-query'
-import {
-  describe, expect, it, vi 
-} from 'vitest'
-import {
-  type TestContext,
-  createTestContext,
-  setupCommandTest,
-} from '../../../platform/__fixtures__/command-test-fixtures'
-import { TraceFlow } from './trace-flow'
-import { RiviereQueryRepository } from '../data-access/riviere-query-repository'
-
-describe('traceFlow command', () => {
-  const ctx: TestContext = createTestContext()
-  setupCommandTest(ctx)
-
-  it('returns near-match suggestions when component is not found', () => {
-    const query = RiviereQuery.fromJSON({
-      components: [
-        {
-          domain: 'orders',
-          id: 'orders:checkout:usecase:place-order',
-          module: 'checkout',
-          name: 'place-order',
-          sourceLocation: {
-            filePath: 'src/usecase.ts',
-            repository: 'https://github.com/org/repo',
-          },
-          type: 'UseCase',
-        },
-      ],
-      links: [],
-      metadata: {
-        domains: {
-          orders: {
-            description: 'Orders',
-            systemType: 'domain',
-          },
-        },
-        sources: [{ repository: 'https://github.com/org/repo' }],
-      },
-      version: '1.0',
-    })
-    vi.spyOn(query, 'traceFlow').mockImplementation(() => {
-      throw new ComponentNotFoundError('orders:checkout:usecase:place-orde')
-    })
-
-    vi.spyOn(RiviereQueryRepository.prototype, 'load').mockReturnValue(query)
-
-    expect(
-      new TraceFlow(new RiviereQueryRepository()).execute({
-        componentId: 'orders:checkout:usecase:place-orde',
-        graphPathOption: undefined,
-      }),
-    ).toMatchObject({
-      success: false,
-      suggestions: ['orders:checkout:usecase:place-order'],
-    })
-  })
-})
diff --git a/packages/riviere-cli/src/features/query/queries/trace-flow.ts b/packages/riviere-cli/src/features/query/queries/trace-flow.ts
deleted file mode 100644
index 6b67b4ddf..000000000
--- a/packages/riviere-cli/src/features/query/queries/trace-flow.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import {
-  findNearMatches, ComponentId 
-} from '@living-architecture/riviere-builder'
-import {
-  ComponentNotFoundError, parseComponentId 
-} from '@living-architecture/riviere-query'
-import { RiviereQueryRepository } from '../data-access/riviere-query-repository'
-import type { TraceFlowInput } from './trace-flow-input'
-import type { TraceFlowResult } from './trace-flow-result'
-import { loadQueryGraph } from './query-graph-load-failure'
-
-/** @riviere-role query-model-use-case */
-export class TraceFlow {
-  constructor(private readonly repository: RiviereQueryRepository) {}
-
-  execute(input: TraceFlowInput): TraceFlowResult {
-    const loaded = loadQueryGraph(this.repository, input.graphPathOption)
-    if (loaded.kind !== 'loaded') {
-      return loaded
-    }
-
-    try {
-      const componentId = parseComponentId(input.componentId)
-      return {
-        flow: loaded.query.traceFlow(componentId),
-        success: true,
-      }
-    } catch (error) {
-      if (!(error instanceof ComponentNotFoundError)) {
-        throw error
-      }
-
-      const parsedId = ComponentId.parse(input.componentId)
-      const matches = findNearMatches(
-        loaded.query.components(),
-        { name: parsedId.name() },
-        { limit: 3 },
-      )
-
-      return {
-        message: error.message,
-        success: false,
-        suggestions: matches.map((match) => match.component.id),
-      }
-    }
-  }
-}
diff --git a/packages/riviere-cli/src/platform/__fixtures__/command-test-fixtures.ts b/packages/riviere-cli/src/platform/__fixtures__/command-test-fixtures.ts
deleted file mode 100644
index 970c4c0f0..000000000
--- a/packages/riviere-cli/src/platform/__fixtures__/command-test-fixtures.ts
+++ /dev/null
@@ -1,362 +0,0 @@
-import {
-  mkdtemp, rm, mkdir, writeFile 
-} from 'node:fs/promises'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import {
-  vi, beforeEach, afterEach, expect, it 
-} from 'vitest'
-import { createProgram } from '../../shell/cli'
-import { handleGlobalError } from '../../shell/global-error-handler'
-
-class ProcessExitError extends Error {
-  constructor(public exitCode: number) {
-    super(`process.exit(${exitCode})`)
-    this.name = 'ProcessExitError'
-  }
-}
-
-export class TestAssertionError extends Error {
-  constructor(message: string) {
-    super(message)
-    this.name = 'TestAssertionError'
-  }
-}
-
-export class MockError extends Error {
-  constructor(message: string) {
-    super(message)
-    this.name = 'MockError'
-  }
-}
-
-export interface ErrorOutput {
-  success: false
-  error: {
-    code: string
-    message: string
-    suggestions: string[]
-  }
-}
-
-function isErrorOutput(value: unknown): value is ErrorOutput {
-  if (typeof value !== 'object' || value === null) return false
-  if (!('success' in value) || value.success !== false) return false
-  if (!('error' in value) || typeof value.error !== 'object' || value.error === null) return false
-  return true
-}
-
-export function parseErrorOutput(consoleOutput: string[]): ErrorOutput {
-  const firstLine = consoleOutput[0]
-  if (firstLine === undefined) {
-    throw new TestAssertionError('Expected console output but got empty array')
-  }
-  const parsed: unknown = JSON.parse(firstLine)
-  if (!isErrorOutput(parsed)) {
-    throw new TestAssertionError('Invalid error output')
-  }
-  return parsed
-}
-
-export function parseSuccessOutput<T>(
-  consoleOutput: string[],
-  guard: (value: unknown) => value is T,
-  errorMessage: string,
-): T {
-  const firstLine = consoleOutput[0]
-  if (firstLine === undefined) {
-    throw new TestAssertionError('Expected console output but got empty array')
-  }
-  const parsed: unknown = JSON.parse(firstLine)
-  if (!guard(parsed)) {
-    throw new TestAssertionError(errorMessage)
-  }
-  return parsed
-}
-
-export interface TestContext {
-  testDir: string
-  originalCwd: string
-  consoleOutput: string[]
-}
-
-export function createTestContext(): TestContext {
-  return {
-    testDir: '',
-    originalCwd: '',
-    consoleOutput: [],
-  }
-}
-
-export function setupCommandTest(ctx: TestContext): void {
-  beforeEach(async () => {
-    ctx.testDir = await mkdtemp(join(tmpdir(), 'riviere-test-'))
-    ctx.originalCwd = process.cwd()
-    ctx.consoleOutput = []
-    process.chdir(ctx.testDir)
-    vi.spyOn(console, 'log').mockImplementation((msg: string) => ctx.consoleOutput.push(msg))
-    vi.spyOn(process, 'exit').mockImplementation((code?: string | number | null | undefined) => {
-      throw new ProcessExitError(typeof code === 'number' ? code : 0)
-    })
-  })
-
-  afterEach(async () => {
-    vi.restoreAllMocks()
-    process.chdir(ctx.originalCwd)
-    await rm(ctx.testDir, { recursive: true })
-  })
-}
-
-export async function createGraph(
-  testDir: string,
-  graphData: object,
-  subPath = '.riviere',
-): Promise<string> {
-  const graphDir = join(testDir, subPath)
-  await mkdir(graphDir, { recursive: true })
-  const graphPath = join(graphDir, 'graph.json')
-  await writeFile(graphPath, JSON.stringify(graphData), 'utf-8')
-  return graphPath
-}
-
-export const baseMetadata = {
-  sources: [{ repository: 'https://github.com/org/repo' }],
-  domains: {
-    orders: {
-      description: 'Order management',
-      systemType: 'domain',
-    },
-  },
-}
-
-export const sourceLocation = {
-  repository: 'https://github.com/org/repo',
-  filePath: 'src/orders/handler.ts',
-}
-
-export const useCaseComponent = {
-  id: 'orders:checkout:usecase:place-order',
-  type: 'UseCase',
-  name: 'place-order',
-  domain: 'orders',
-  module: 'checkout',
-  sourceLocation,
-}
-
-export const apiComponent = {
-  id: 'orders:checkout:api:place-order',
-  type: 'API',
-  name: 'place-order',
-  domain: 'orders',
-  module: 'checkout',
-  sourceLocation,
-  apiType: 'REST',
-  httpMethod: 'POST',
-  path: '/orders',
-}
-
-export const eventHandlerComponent = {
-  id: 'orders:checkout:eventhandler:on-order-placed',
-  type: 'EventHandler',
-  name: 'on-order-placed',
-  domain: 'orders',
-  module: 'checkout',
-  sourceLocation,
-  subscribedEvents: ['OrderPlaced'],
-}
-
-export const validLink = {
-  id: 'orders:checkout:api:place-order→orders:checkout:usecase:place-order:sync',
-  source: 'orders:checkout:api:place-order',
-  target: 'orders:checkout:usecase:place-order',
-  type: 'sync',
-}
-
-export async function createGraphWithDomain(testDir: string, domainName: string): Promise<void> {
-  const graphDir = join(testDir, '.riviere')
-  await mkdir(graphDir, { recursive: true })
-  const graph = {
-    version: '1.0',
-    metadata: {
-      sources: [{ repository: 'https://github.com/org/repo' }],
-      domains: {
-        [domainName]: {
-          description: 'Test domain',
-          systemType: 'domain',
-        },
-      },
-    },
-    components: [],
-    links: [],
-  }
-  await writeFile(join(graphDir, 'graph.json'), JSON.stringify(graph), 'utf-8')
-}
-
-export async function createGraphWithSource(testDir: string, repository: string): Promise<void> {
-  const graphDir = join(testDir, '.riviere')
-  await mkdir(graphDir, { recursive: true })
-  const graph = {
-    version: '1.0',
-    metadata: {
-      sources: [{ repository }],
-      domains: {
-        orders: {
-          description: 'Orders',
-          systemType: 'domain',
-        },
-      },
-    },
-    components: [],
-    links: [],
-  }
-  await writeFile(join(graphDir, 'graph.json'), JSON.stringify(graph), 'utf-8')
-}
-
-export async function createGraphWithComponent(testDir: string, component: object): Promise<void> {
-  const graphDir = join(testDir, '.riviere')
-  await mkdir(graphDir, { recursive: true })
-  const graph = {
-    version: '1.0',
-    metadata: {
-      sources: [{ repository: 'https://github.com/org/repo' }],
-      domains: {
-        orders: {
-          description: 'Order management',
-          systemType: 'domain',
-        },
-      },
-    },
-    components: [component],
-    links: [],
-  }
-  await writeFile(join(graphDir, 'graph.json'), JSON.stringify(graph), 'utf-8')
-}
-
-export interface CustomTypeDefinition {
-  description?: string
-  requiredProperties?: Record<
-    string,
-    {
-      type: string
-      description?: string
-    }
-  >
-  optionalProperties?: Record<
-    string,
-    {
-      type: string
-      description?: string
-    }
-  >
-}
-
-export async function createGraphWithCustomType(
-  testDir: string,
-  domainName: string,
-  customTypeName: string,
-  customTypeDefinition: CustomTypeDefinition,
-): Promise<void> {
-  const graphDir = join(testDir, '.riviere')
-  await mkdir(graphDir, { recursive: true })
-  const graph = {
-    version: '1.0',
-    metadata: {
-      sources: [{ repository: 'https://github.com/org/repo' }],
-      domains: {
-        [domainName]: {
-          description: 'Test domain',
-          systemType: 'domain',
-        },
-      },
-      customTypes: { [customTypeName]: customTypeDefinition },
-    },
-    components: [],
-    links: [],
-  }
-  await writeFile(join(graphDir, 'graph.json'), JSON.stringify(graph), 'utf-8')
-}
-
-export const domainOpComponent = {
-  id: 'orders:checkout:domainop:confirm-order',
-  type: 'DomainOp',
-  name: 'Confirm Order',
-  domain: 'orders',
-  module: 'checkout',
-  operationName: 'confirmOrder',
-  sourceLocation: {
-    repository: 'https://github.com/org/repo',
-    filePath: 'src/domain.ts',
-  },
-}
-
-export const simpleUseCaseComponent = {
-  id: 'orders:checkout:usecase:place-order',
-  type: 'UseCase',
-  name: 'Place Order',
-  domain: 'orders',
-  module: 'checkout',
-  sourceLocation: {
-    repository: 'https://github.com/org/repo',
-    filePath: 'src/usecase.ts',
-  },
-}
-
-export function hasSuccessOutputStructure(value: unknown): value is {
-  success: true
-  data: object
-} {
-  if (typeof value !== 'object' || value === null) return false
-  if (!('success' in value) || value.success !== true) return false
-  if (!('data' in value) || typeof value.data !== 'object' || value.data === null) return false
-  return true
-}
-
-export function testCommandRegistration(commandName: string): void {
-  it(`registers ${commandName} command under builder`, () => {
-    const program = createProgram()
-    const builderCmd = program.commands.find((cmd) => cmd.name() === 'builder')
-    const cmd = builderCmd?.commands.find((cmd) => cmd.name() === commandName)
-    expect(cmd?.name()).toBe(commandName)
-  })
-}
-
-export async function testCustomGraphPath<T>(
-  ctx: TestContext,
-  commandArgs: string[],
-  parseOutput: (consoleOutput: string[]) => T,
-): Promise<T> {
-  const customPath = await createGraph(
-    ctx.testDir,
-    {
-      version: '1.0',
-      metadata: baseMetadata,
-      components: [],
-      links: [],
-    },
-    'custom',
-  )
-
-  await createProgram().parseAsync([
-    'node',
-    'riviere',
-    ...commandArgs,
-    '--graph',
-    customPath,
-    '--json',
-  ])
-  return parseOutput(ctx.consoleOutput)
-}
-
-export function parseCommandWithErrorHandling(args: string[]): Promise<void> {
-  return createProgram().parseAsync(args).catch(handleGlobalError)
-}
-
-export function assertDefined<T>(
-  value: T | undefined | null,
-  message = 'Expected value to be defined',
-): T {
-  if (value === undefined || value === null) {
-    throw new TestAssertionError(message)
-  }
-  return value
-}
diff --git a/packages/riviere-cli/src/platform/domain/add-component-input-factory.spec.ts b/packages/riviere-cli/src/platform/domain/add-component-input-factory.spec.ts
deleted file mode 100644
index f7567ed21..000000000
--- a/packages/riviere-cli/src/platform/domain/add-component-input-factory.spec.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-import {
-  describe, expect, it 
-} from 'vitest'
-import {
-  createDomainInput, isAddComponentValidationError 
-} from './add-component-input-factory'
-
-function captureThrownValue(call: () => unknown): unknown {
-  try {
-    call()
-  } catch (error) {
-    return error
-  }
-
-  return undefined
-}
-
-describe('add-component-input-factory', () => {
-  const baseInput = {
-    componentType: 'API',
-    domain: 'orders',
-    filePath: 'src/api/orders.ts',
-    module: 'api',
-    name: 'Orders API',
-    repository: 'https://github.com/org/repo',
-  }
-
-  it('omits optional API path when httpPath is undefined', () => {
-    const result = createDomainInput({
-      ...baseInput,
-      apiType: 'REST',
-      description: 'Order endpoints',
-      httpMethod: 'GET',
-    })
-
-    expect(result).toMatchObject({
-      input: {
-        apiType: 'REST',
-        description: 'Order endpoints',
-        httpMethod: 'GET',
-      },
-      type: 'API',
-    })
-    expect('path' in result.input).toBe(false)
-  })
-
-  it('throws validation error for unsupported API http methods', () => {
-    const call = () =>
-      createDomainInput({
-        ...baseInput,
-        apiType: 'REST',
-        httpMethod: 'TRACE',
-      })
-
-    expect(call).toThrow('--http-method is required for API component')
-    const caughtError = captureThrownValue(call)
-    expect(isAddComponentValidationError(caughtError)).toBe(true)
-  })
-
-  it('throws validation error when subscribed events are empty', () => {
-    const call = () =>
-      createDomainInput({
-        ...baseInput,
-        componentType: 'EventHandler',
-        subscribedEvents: ' , ',
-      })
-
-    expect(call).toThrow('--subscribed-events is required for EventHandler component')
-  })
-
-  it('supports graphql, other, and remaining http methods', () => {
-    expect(
-      createDomainInput({
-        ...baseInput,
-        apiType: 'graphql',
-        httpMethod: 'PUT',
-      }),
-    ).toMatchObject({
-      input: {
-        apiType: 'GraphQL',
-        httpMethod: 'PUT',
-      },
-    })
-
-    expect(
-      createDomainInput({
-        ...baseInput,
-        apiType: 'other',
-        httpMethod: 'DELETE',
-      }),
-    ).toMatchObject({
-      input: {
-        apiType: 'other',
-        httpMethod: 'DELETE',
-      },
-    })
-
-    expect(
-      createDomainInput({
-        ...baseInput,
-        apiType: 'REST',
-        httpMethod: 'PATCH',
-      }),
-    ).toMatchObject({
-      input: {
-        apiType: 'REST',
-        httpMethod: 'PATCH',
-      },
-    })
-  })
-
-  it('throws for invalid component and api types', () => {
-    expect(() =>
-      createDomainInput({
-        ...baseInput,
-        componentType: 'Unknown',
-      }),
-    ).toThrow('Invalid component type: Unknown')
-
-    expect(() =>
-      createDomainInput({
-        ...baseInput,
-        apiType: 'SOAP',
-        httpMethod: 'GET',
-      }),
-    ).toThrow('--api-type is required for API component')
-  })
-})
diff --git a/packages/riviere-cli/src/platform/domain/add-component-input-factory.ts b/packages/riviere-cli/src/platform/domain/add-component-input-factory.ts
deleted file mode 100644
index c7c4105fc..000000000
--- a/packages/riviere-cli/src/platform/domain/add-component-input-factory.ts
+++ /dev/null
@@ -1,262 +0,0 @@
-import type { SourceLocation } from '@living-architecture/riviere-schema'
-import type {
-  addComponentToBuilder, AddComponentInput as DomainInput 
-} from './add-component'
-
-interface AddComponentValidationError {
-  kind: 'ADD_COMPONENT_VALIDATION_ERROR'
-  message: string
-}
-
-interface AddComponentCommandInput {
-  componentType: string
-  name: string
-  domain: string
-  module: string
-  repository: string
-  filePath: string
-  lineNumber?: number
-  columnNumber?: number
-  route?: string
-  apiType?: string
-  httpMethod?: string
-  httpPath?: string
-  operationName?: string
-  entity?: string
-  eventName?: string
-  eventSchema?: string
-  subscribedEvents?: string
-  customType?: string
-  customProperty?: string[]
-  description?: string
-}
-
-type CommonInput = Exclude<Parameters<typeof addComponentToBuilder>[1], { type: 'API' }>['input']
-
-/** @riviere-role domain-service */
-export function createDomainInput(input: AddComponentCommandInput): DomainInput {
-  const commonInput = createCommonInput(input)
-
-  switch (input.componentType) {
-    case 'UI':
-      return createUiInput(commonInput, input)
-    case 'API':
-      return createApiInput(commonInput, input)
-    case 'UseCase':
-      return {
-        type: 'UseCase',
-        input: commonInput,
-      }
-    case 'DomainOp':
-      return createDomainOpInput(commonInput, input)
-    case 'Event':
-      return createEventInput(commonInput, input)
-    case 'EventHandler':
-      return createEventHandlerInput(commonInput, input)
-    case 'Custom':
-      return createCustomInput(commonInput, input)
-    default:
-      throw validationError(`Invalid component type: ${input.componentType}`)
-  }
-}
-
-/** @riviere-role domain-service */
-export function isAddComponentValidationError(
-  error: unknown,
-): error is AddComponentValidationError {
-  return (
-    typeof error === 'object' &&
-    error !== null &&
-    'kind' in error &&
-    error.kind === 'ADD_COMPONENT_VALIDATION_ERROR' &&
-    'message' in error &&
-    typeof error.message === 'string'
-  )
-}
-
-function createCommonInput(input: AddComponentCommandInput): CommonInput {
-  const sourceLocation: SourceLocation = {
-    repository: input.repository,
-    filePath: input.filePath,
-    ...(input.lineNumber === undefined ? {} : { lineNumber: input.lineNumber }),
-    ...(input.columnNumber === undefined ? {} : { columnNumber: input.columnNumber }),
-  }
-
-  return {
-    name: input.name,
-    domain: input.domain,
-    module: input.module,
-    sourceLocation,
-    ...(input.description === undefined ? {} : { description: input.description }),
-  }
-}
-
-function createUiInput(commonInput: CommonInput, input: AddComponentCommandInput): DomainInput {
-  return {
-    type: 'UI',
-    input: {
-      ...commonInput,
-      route: requireOption(input.route, 'route', 'UI'),
-    },
-  }
-}
-
-function createApiInput(commonInput: CommonInput, input: AddComponentCommandInput): DomainInput {
-  const apiType = normalizeApiType(requireOption(input.apiType, 'api-type', 'API'))
-  const httpMethod = normalizeHttpMethod(input.httpMethod)
-
-  return {
-    type: 'API',
-    input: {
-      ...commonInput,
-      apiType,
-      ...(httpMethod === undefined ? {} : { httpMethod }),
-      ...(input.httpPath === undefined ? {} : { path: input.httpPath }),
-    },
-  }
-}
-
-function createDomainOpInput(
-  commonInput: CommonInput,
-  input: AddComponentCommandInput,
-): DomainInput {
-  return {
-    type: 'DomainOp',
-    input: {
-      ...commonInput,
-      operationName: requireOption(input.operationName, 'operation-name', 'DomainOp'),
-      ...(input.entity === undefined ? {} : { entity: input.entity }),
-    },
-  }
-}
-
-function createEventInput(commonInput: CommonInput, input: AddComponentCommandInput): DomainInput {
-  return {
-    type: 'Event',
-    input: {
-      ...commonInput,
-      eventName: requireOption(input.eventName, 'event-name', 'Event'),
-      ...(input.eventSchema === undefined ? {} : { eventSchema: input.eventSchema }),
-    },
-  }
-}
-
-function createEventHandlerInput(
-  commonInput: CommonInput,
-  input: AddComponentCommandInput,
-): DomainInput {
-  return {
-    type: 'EventHandler',
-    input: {
-      ...commonInput,
-      subscribedEvents: parseSubscribedEvents(input.subscribedEvents),
-    },
-  }
-}
-
-function createCustomInput(commonInput: CommonInput, input: AddComponentCommandInput): DomainInput {
-  const metadata = parseCustomProperties(input.customProperty)
-
-  return {
-    type: 'Custom',
-    input: {
-      ...commonInput,
-      customTypeName: requireOption(input.customType, 'custom-type', 'Custom'),
-      ...(metadata === undefined ? {} : { metadata }),
-    },
-  }
-}
-
-function normalizeApiType(value: string): 'REST' | 'GraphQL' | 'other' {
-  switch (value.toLowerCase()) {
-    case 'rest':
-      return 'REST'
-    case 'graphql':
-      return 'GraphQL'
-    case 'other':
-      return 'other'
-    default:
-      throw validationError('--api-type is required for API component')
-  }
-}
-
-function normalizeHttpMethod(
-  value: string | undefined,
-): 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | undefined {
-  if (value === undefined) {
-    return undefined
-  }
-
-  switch (value.toUpperCase()) {
-    case 'GET':
-      return 'GET'
-    case 'POST':
-      return 'POST'
-    case 'PUT':
-      return 'PUT'
-    case 'DELETE':
-      return 'DELETE'
-    case 'PATCH':
-      return 'PATCH'
-    default:
-      throw validationError('--http-method is required for API component')
-  }
-}
-
-function requireOption(
-  value: string | undefined,
-  optionName: string,
-  componentType: string,
-): string {
-  if (value === undefined || value.trim().length === 0) {
-    throw validationError(`--${optionName} is required for ${componentType} component`)
-  }
-
-  return value.trim()
-}
-
-function parseSubscribedEvents(value: string | undefined): string[] {
-  if (value === undefined) {
-    throw validationError('--subscribed-events is required for EventHandler component')
-  }
-
-  const subscribedEvents = value
-    .split(',')
-    .map((eventName) => eventName.trim())
-    .filter((eventName) => eventName.length > 0)
-
-  if (subscribedEvents.length === 0) {
-    throw validationError('--subscribed-events is required for EventHandler component')
-  }
-
-  return subscribedEvents
-}
-
-function parseCustomProperties(
-  properties: string[] | undefined,
-): Record<string, string> | undefined {
-  if (properties === undefined || properties.length === 0) {
-    return undefined
-  }
-
-  const metadata: Record<string, string> = {}
-  for (const property of properties) {
-    const colonIndex = property.indexOf(':')
-    if (colonIndex === -1) {
-      throw validationError(`Invalid custom property format: ${property}. Expected 'key:value'`)
-    }
-
-    const key = property.slice(0, colonIndex)
-    const value = property.slice(colonIndex + 1)
-    metadata[key] = value
-  }
-
-  return metadata
-}
-
-function validationError(message: string): AddComponentValidationError {
-  return {
-    kind: 'ADD_COMPONENT_VALIDATION_ERROR',
-    message,
-  }
-}
diff --git a/packages/riviere-cli/src/platform/domain/add-component.ts b/packages/riviere-cli/src/platform/domain/add-component.ts
deleted file mode 100644
index a5f80be9a..000000000
--- a/packages/riviere-cli/src/platform/domain/add-component.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import type { RiviereBuilder } from '@living-architecture/riviere-builder'
-import type { SourceLocation } from '@living-architecture/riviere-schema'
-
-interface CommonInput {
-  name: string
-  domain: string
-  module: string
-  sourceLocation: SourceLocation
-  description?: string
-}
-
-/** @riviere-role value-object */
-export interface AddUIInput extends CommonInput {route: string}
-
-/** @riviere-role value-object */
-export interface AddAPIInput extends CommonInput {
-  apiType: 'REST' | 'GraphQL' | 'other'
-  httpMethod?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH'
-  path?: string
-}
-
-/** @riviere-role value-object */
-export type AddUseCaseInput = CommonInput
-
-/** @riviere-role value-object */
-export interface AddDomainOpInput extends CommonInput {
-  operationName: string
-  entity?: string
-}
-
-/** @riviere-role value-object */
-export interface AddEventInput extends CommonInput {
-  eventName: string
-  eventSchema?: string
-}
-
-/** @riviere-role value-object */
-export interface AddEventHandlerInput extends CommonInput {subscribedEvents: string[]}
-
-/** @riviere-role value-object */
-export interface AddCustomInput extends CommonInput {
-  customTypeName: string
-  metadata?: Record<string, unknown>
-}
-
-/** @riviere-role value-object */
-export type AddComponentInput =
-  | {
-    type: 'UI'
-    input: AddUIInput
-  }
-  | {
-    type: 'API'
-    input: AddAPIInput
-  }
-  | {
-    type: 'UseCase'
-    input: AddUseCaseInput
-  }
-  | {
-    type: 'DomainOp'
-    input: AddDomainOpInput
-  }
-  | {
-    type: 'Event'
-    input: AddEventInput
-  }
-  | {
-    type: 'EventHandler'
-    input: AddEventHandlerInput
-  }
-  | {
-    type: 'Custom'
-    input: AddCustomInput
-  }
-
-/** @riviere-role domain-service */
-export function addComponentToBuilder(
-  builder: RiviereBuilder,
-  component: AddComponentInput,
-): string {
-  switch (component.type) {
-    case 'UI':
-      return builder.addUI(component.input).id
-    case 'API':
-      return builder.addApi(component.input).id
-    case 'UseCase':
-      return builder.addUseCase(component.input).id
-    case 'DomainOp':
-      return builder.addDomainOp(component.input).id
-    case 'Event':
-      return builder.addEvent(component.input).id
-    case 'EventHandler':
-      return builder.addEventHandler(component.input).id
-    case 'Custom':
-      return builder.addCustom(component.input).id
-  }
-}
diff --git a/packages/riviere-cli/src/platform/domain/graph-corrupted-error.ts b/packages/riviere-cli/src/platform/domain/graph-corrupted-error.ts
deleted file mode 100644
index 19ee9eea5..000000000
--- a/packages/riviere-cli/src/platform/domain/graph-corrupted-error.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/** @riviere-role domain-error */
-export class GraphCorruptedError extends Error {
-  constructor(
-    readonly graphPath: string,
-    options?: ErrorOptions,
-  ) {
-    super(`Graph at ${graphPath} is corrupted`, options)
-  }
-}
diff --git a/packages/riviere-cli/src/platform/domain/graph-not-found-error.ts b/packages/riviere-cli/src/platform/domain/graph-not-found-error.ts
deleted file mode 100644
index 1e7cf7067..000000000
--- a/packages/riviere-cli/src/platform/domain/graph-not-found-error.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/** @riviere-role domain-error */
-export class GraphNotFoundError extends Error {
-  constructor(readonly graphPath: string) {
-    super(`Graph not found at ${graphPath}`)
-  }
-}
diff --git a/packages/riviere-cli/src/platform/infra/cli/presentation/exit-with-cli-error.ts b/packages/riviere-cli/src/platform/infra/cli/presentation/exit-with-cli-error.ts
deleted file mode 100644
index af36dfd4a..000000000
--- a/packages/riviere-cli/src/platform/infra/cli/presentation/exit-with-cli-error.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import {
-  type CliErrorCode, ExitCode 
-} from './error-codes'
-import { formatError } from './output'
-
-/** @riviere-role cli-response-writer */
-export function exitWithCliError(code: CliErrorCode, message: string, exitCode: ExitCode): never {
-  console.log(JSON.stringify(formatError(code, message)))
-  process.exit(exitCode)
-}
diff --git a/packages/riviere-cli/src/platform/infra/cli/presentation/output-writer.ts b/packages/riviere-cli/src/platform/infra/cli/presentation/output-writer.ts
deleted file mode 100644
index 58b4e0265..000000000
--- a/packages/riviere-cli/src/platform/infra/cli/presentation/output-writer.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { writeFileSync } from 'node:fs'
-import {
-  formatError, type SuccessOutput 
-} from './output'
-import {
-  CliErrorCode, ExitCode 
-} from './error-codes'
-
-interface OutputOptions {output?: string}
-
-/** @riviere-role cli-response-writer */
-export function outputResult<T>(data: SuccessOutput<T>, options: OutputOptions): void {
-  if (options.output !== undefined) {
-    try {
-      writeFileSync(options.output, JSON.stringify(data))
-    } catch {
-      console.log(
-        JSON.stringify(
-          formatError(
-            CliErrorCode.ValidationError,
-            'Failed to write output file: ' + options.output,
-          ),
-        ),
-      )
-      process.exit(ExitCode.RuntimeError)
-    }
-    return
-  }
-
-  console.log(JSON.stringify(data))
-}
diff --git a/packages/riviere-cli/src/platform/infra/external-clients/filesystem/index.ts b/packages/riviere-cli/src/platform/infra/external-clients/filesystem/index.ts
deleted file mode 100644
index 80c82dc1c..000000000
--- a/packages/riviere-cli/src/platform/infra/external-clients/filesystem/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { FileReadError, readJsonFile, readTextFile } from './file-reader'
-export { fileExists } from './file-existence'
diff --git a/packages/riviere-cli/src/platform/infra/external-clients/node-modules/index.ts b/packages/riviere-cli/src/platform/infra/external-clients/node-modules/index.ts
deleted file mode 100644
index 796d098e5..000000000
--- a/packages/riviere-cli/src/platform/infra/external-clients/node-modules/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PackageFileResolveError, resolveFileOrPackagePath } from './node-module-file-resolver'
diff --git a/packages/riviere-cli/src/platform/infra/external-clients/ts-morph/index.ts b/packages/riviere-cli/src/platform/infra/external-clients/ts-morph/index.ts
deleted file mode 100644
index 64ee84cea..000000000
--- a/packages/riviere-cli/src/platform/infra/external-clients/ts-morph/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { createConfiguredProject } from './create-configured-project'
-export { findModuleTsConfigDir } from './find-module-tsconfig-dir'
diff --git a/packages/riviere-cli/src/shell/cli.ts b/packages/riviere-cli/src/shell/cli.ts
deleted file mode 100644
index 718f44298..000000000
--- a/packages/riviere-cli/src/shell/cli.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import { Command } from 'commander'
-import { createRequire } from 'module'
-import { AddComponent } from '../features/builder/commands/add-component'
-import { AddDomain } from '../features/builder/commands/add-domain'
-import { AddSource } from '../features/builder/commands/add-source'
-import { CheckConsistency } from '../features/builder/commands/check-consistency'
-import { ComponentChecklist } from '../features/builder/commands/component-checklist'
-import { ComponentSummary } from '../features/builder/commands/component-summary'
-import { DefineCustomType } from '../features/builder/commands/define-custom-type'
-import { DefineRelationshipType } from '../features/builder/commands/define-relationship-type'
-import { EnrichComponent } from '../features/builder/commands/enrich-component'
-import { FinalizeGraph } from '../features/builder/commands/finalize-graph'
-import { InitGraph } from '../features/builder/commands/init-graph'
-import { LinkComponents } from '../features/builder/commands/link-components'
-import { LinkExternal } from '../features/builder/commands/link-external'
-import { LinkHttp } from '../features/builder/commands/link-http'
-import { ValidateGraph } from '../features/builder/commands/validate-graph'
-import { RiviereBuilderRepository } from '../features/builder/data-access/riviere-builder-repository'
-import { createAddComponentCommand } from '../features/builder/entrypoint/add-component/entrypoint'
-import { createAddDomainCommand } from '../features/builder/entrypoint/add-domain/entrypoint'
-import { createAddSourceCommand } from '../features/builder/entrypoint/add-source/entrypoint'
-import { createCheckConsistencyCommand } from '../features/builder/entrypoint/check-consistency/entrypoint'
-import { createComponentChecklistCommand } from '../features/builder/entrypoint/component-checklist/entrypoint'
-import { createComponentSummaryCommand } from '../features/builder/entrypoint/component-summary/entrypoint'
-import { createDefineCustomTypeCommand } from '../features/builder/entrypoint/define-custom-type/entrypoint'
-import { createDefineRelationshipTypeCommand } from '../features/builder/entrypoint/define-relationship-type/entrypoint'
-import { createEnrichCommand } from '../features/builder/entrypoint/enrich/entrypoint'
-import { createFinalizeCommand } from '../features/builder/entrypoint/finalize/entrypoint'
-import { createInitCommand } from '../features/builder/entrypoint/init/entrypoint'
-import { createLinkCommand } from '../features/builder/entrypoint/link/entrypoint'
-import { createLinkExternalCommand } from '../features/builder/entrypoint/link-external/entrypoint'
-import { createLinkHttpCommand } from '../features/builder/entrypoint/link-http/entrypoint'
-import { createValidateCommand } from '../features/builder/entrypoint/validate/entrypoint'
-import { EnrichDraftComponents } from '../features/extract/commands/enrich-draft-components'
-import { ExtractDraftComponents } from '../features/extract/commands/extract-draft-components'
-import { ExtractionProjectRepository } from '../features/extract/data-access/extraction-project/extraction-project-repository'
-import { createExtractCommand } from '../features/extract/entrypoint/extract/entrypoint'
-import { DetectOrphans } from '../features/query/queries/detect-orphans'
-import { ListComponents } from '../features/query/queries/list-components'
-import { ListDomains } from '../features/query/queries/list-domains'
-import { ListEntryPoints } from '../features/query/queries/list-entry-points'
-import { SearchComponents } from '../features/query/queries/search-components'
-import { TraceFlow } from '../features/query/queries/trace-flow'
-import { RiviereQueryRepository } from '../features/query/data-access/riviere-query-repository'
-import { createComponentsCommand } from '../features/query/entrypoint/components/entrypoint'
-import { createDomainsCommand } from '../features/query/entrypoint/domains/entrypoint'
-import { createEntryPointsCommand } from '../features/query/entrypoint/entry-points/entrypoint'
-import { createOrphansCommand } from '../features/query/entrypoint/orphans/entrypoint'
-import { createSearchCommand } from '../features/query/entrypoint/search/entrypoint'
-import { createTraceCommand } from '../features/query/entrypoint/trace/entrypoint'
-
-interface PackageJson {version: string}
-
-class InvalidPackageJsonError extends Error {
-  constructor(reason: string) {
-    super(`Invalid package.json: ${reason}`)
-    this.name = 'InvalidPackageJsonError'
-  }
-}
-
-function parsePackageJson(pkg: unknown): PackageJson {
-  if (typeof pkg !== 'object' || pkg === null || !('version' in pkg)) {
-    throw new InvalidPackageJsonError('missing version field')
-  }
-  if (typeof pkg.version !== 'string') {
-    throw new InvalidPackageJsonError('version must be a string')
-  }
-  return { version: pkg.version }
-}
-
-declare const INJECTED_VERSION: string | undefined
-
-function loadPackageJson(): PackageJson {
-  if (typeof INJECTED_VERSION === 'string') {
-    return { version: INJECTED_VERSION }
-  }
-  const require = createRequire(import.meta.url)
-  return parsePackageJson(require('../../package.json'))
-}
-
-const packageJson = loadPackageJson()
-
-/** @riviere-role main */
-export function createProgram(): Command {
-  const builderRepository = new RiviereBuilderRepository()
-  const queryRepository = new RiviereQueryRepository()
-  const extractionProjectRepository = new ExtractionProjectRepository()
-
-  const program = new Command()
-
-  program.name('riviere').version(packageJson.version)
-
-  const builderCmd = program.command('builder').description('Commands for building a graph')
-
-  builderCmd.addCommand(createAddComponentCommand(new AddComponent(builderRepository)))
-  builderCmd.addCommand(createAddDomainCommand(new AddDomain(builderRepository)))
-  builderCmd.addCommand(createAddSourceCommand(new AddSource(builderRepository)))
-  builderCmd.addCommand(createInitCommand(new InitGraph(builderRepository)))
-  builderCmd.addCommand(createLinkCommand(new LinkComponents(builderRepository)))
-  builderCmd.addCommand(createLinkExternalCommand(new LinkExternal(builderRepository)))
-  builderCmd.addCommand(createLinkHttpCommand(new LinkHttp(builderRepository)))
-  builderCmd.addCommand(createValidateCommand(new ValidateGraph(builderRepository)))
-  builderCmd.addCommand(createFinalizeCommand(new FinalizeGraph(builderRepository)))
-  builderCmd.addCommand(createEnrichCommand(new EnrichComponent(builderRepository)))
-  builderCmd.addCommand(createComponentSummaryCommand(new ComponentSummary(builderRepository)))
-  builderCmd.addCommand(createComponentChecklistCommand(new ComponentChecklist(builderRepository)))
-  builderCmd.addCommand(createCheckConsistencyCommand(new CheckConsistency(builderRepository)))
-  builderCmd.addCommand(createDefineCustomTypeCommand(new DefineCustomType(builderRepository)))
-  builderCmd.addCommand(
-    createDefineRelationshipTypeCommand(new DefineRelationshipType(builderRepository)),
-  )
-
-  const queryCmd = program.command('query').description('Commands for querying a graph')
-
-  queryCmd.addCommand(createEntryPointsCommand(new ListEntryPoints(queryRepository)))
-  queryCmd.addCommand(createDomainsCommand(new ListDomains(queryRepository)))
-  queryCmd.addCommand(createTraceCommand(new TraceFlow(queryRepository)))
-  queryCmd.addCommand(createOrphansCommand(new DetectOrphans(queryRepository)))
-  queryCmd.addCommand(createComponentsCommand(new ListComponents(queryRepository)))
-  queryCmd.addCommand(createSearchCommand(new SearchComponents(queryRepository)))
-
-  program.addCommand(
-    createExtractCommand(
-      new ExtractDraftComponents(extractionProjectRepository),
-      new EnrichDraftComponents(extractionProjectRepository),
-    ),
-  )
-
-  return program
-}
diff --git a/packages/riviere-cli/src/shell/global-error-handler.spec.ts b/packages/riviere-cli/src/shell/global-error-handler.spec.ts
deleted file mode 100644
index 9ed08990b..000000000
--- a/packages/riviere-cli/src/shell/global-error-handler.spec.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import { handleGlobalError } from './global-error-handler'
-import { GitError } from '../platform/infra/external-clients/git/git-errors'
-import { FileReadError } from '../platform/infra/external-clients/filesystem/index'
-import { ConnectionDetectionError } from '@living-architecture/riviere-extract-ts'
-import {
-  CliErrorCode,
-  ConfigValidationError,
-  ExitCode,
-} from '../platform/infra/cli/presentation/error-codes'
-import {
-  TestAssertionError,
-  createTestContext,
-  setupCommandTest,
-} from '../platform/__fixtures__/command-test-fixtures'
-import type { TestContext } from '../platform/__fixtures__/command-test-fixtures'
-
-function firstConsoleOutput(consoleOutput: string[]): unknown {
-  const first = consoleOutput[0]
-  if (first === undefined) {
-    throw new TestAssertionError('Expected console output but got empty array')
-  }
-  return JSON.parse(first)
-}
-
-describe('handleGlobalError', () => {
-  const ctx: TestContext = createTestContext()
-  setupCommandTest(ctx)
-
-  it('formats GitError with runtime exit code', () => {
-    const error = new GitError('NOT_A_REPOSITORY', 'Not a git repo')
-
-    expect(() => handleGlobalError(error)).toThrow('process.exit')
-
-    const output = firstConsoleOutput(ctx.consoleOutput)
-    expect(output).toMatchObject({ error: { code: CliErrorCode.GitNotARepository } })
-    expect(process.exit).toHaveBeenCalledWith(ExitCode.RuntimeError)
-  })
-
-  it('formats FileReadError with runtime exit code', () => {
-    const error = new FileReadError('Invalid draft components')
-
-    expect(() => handleGlobalError(error)).toThrow('process.exit')
-
-    const output = firstConsoleOutput(ctx.consoleOutput)
-    expect(output).toMatchObject({ error: { code: CliErrorCode.ValidationError } })
-    expect(process.exit).toHaveBeenCalledWith(ExitCode.RuntimeError)
-  })
-
-  it('formats ConnectionDetectionError with extraction failure exit code', () => {
-    const error = new ConnectionDetectionError({
-      file: 'src/handler.ts',
-      line: 42,
-      typeName: 'OrderService',
-      reason: 'Could not resolve type',
-    })
-
-    expect(() => handleGlobalError(error)).toThrow('process.exit')
-
-    const output = firstConsoleOutput(ctx.consoleOutput)
-    expect(output).toMatchObject({
-      error: {
-        code: CliErrorCode.ConnectionDetectionFailure,
-        suggestions: ['Use --allow-incomplete to emit uncertain links instead of failing'],
-      },
-    })
-    expect(process.exit).toHaveBeenCalledWith(ExitCode.ExtractionFailure)
-  })
-
-  it('formats GitError with GIT_NOT_FOUND code', () => {
-    const gitError = new GitError('GIT_NOT_FOUND', 'git binary not found')
-
-    expect(() => handleGlobalError(gitError)).toThrow('process.exit')
-
-    const output = firstConsoleOutput(ctx.consoleOutput)
-    expect(output).toMatchObject({ error: { code: CliErrorCode.GitNotFound } })
-    expect(process.exit).toHaveBeenCalledWith(ExitCode.RuntimeError)
-  })
-
-  it('formats unknown GitError codes as validation errors', () => {
-    const gitError = new GitError('NO_REMOTE', 'remote missing')
-
-    expect(() => handleGlobalError(gitError)).toThrow('process.exit')
-
-    const output = firstConsoleOutput(ctx.consoleOutput)
-    expect(output).toMatchObject({ error: { code: CliErrorCode.ValidationError } })
-    expect(process.exit).toHaveBeenCalledWith(ExitCode.RuntimeError)
-  })
-
-  it('formats ConfigValidationError with config validation exit code', () => {
-    const error = new ConfigValidationError(CliErrorCode.ConfigNotFound, 'Config file not found')
-
-    expect(() => handleGlobalError(error)).toThrow('process.exit')
-
-    const output = firstConsoleOutput(ctx.consoleOutput)
-    expect(output).toMatchObject({ error: { code: CliErrorCode.ConfigNotFound } })
-    expect(process.exit).toHaveBeenCalledWith(ExitCode.ConfigValidation)
-  })
-
-  it('formats GitError with NOT_A_REPOSITORY code', () => {
-    const gitError = new GitError('NOT_A_REPOSITORY', 'Not a git repository')
-
-    expect(() => handleGlobalError(gitError)).toThrow('process.exit')
-
-    const output = firstConsoleOutput(ctx.consoleOutput)
-    expect(output).toMatchObject({ error: { code: CliErrorCode.GitNotARepository } })
-    expect(process.exit).toHaveBeenCalledWith(ExitCode.RuntimeError)
-  })
-
-  it('formats ConfigValidationError for missing files as validation error', () => {
-    const error = new ConfigValidationError(
-      CliErrorCode.ValidationError,
-      'Files not found: missing.ts',
-    )
-
-    expect(() => handleGlobalError(error)).toThrow('process.exit')
-
-    const output = firstConsoleOutput(ctx.consoleOutput)
-    expect(output).toMatchObject({ error: { code: CliErrorCode.ValidationError } })
-    expect(process.exit).toHaveBeenCalledWith(ExitCode.ConfigValidation)
-  })
-
-  it('re-throws unknown errors', () => {
-    const error = new TestAssertionError('unexpected')
-
-    expect(() => handleGlobalError(error)).toThrow('unexpected')
-  })
-})
diff --git a/packages/riviere-cli/src/shell/global-error-handler.ts b/packages/riviere-cli/src/shell/global-error-handler.ts
deleted file mode 100644
index a29261f4e..000000000
--- a/packages/riviere-cli/src/shell/global-error-handler.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { formatError } from '../platform/infra/cli/presentation/output'
-import {
-  CliErrorCode,
-  ExitCode,
-  ConfigValidationError,
-} from '../platform/infra/cli/presentation/error-codes'
-import { GitError } from '../platform/infra/external-clients/git/git-errors'
-import { FileReadError } from '../platform/infra/external-clients/filesystem/index'
-import { ConnectionDetectionError } from '@living-architecture/riviere-extract-ts'
-
-/** @riviere-role cli-error-handler */
-export function handleGlobalError(error: unknown): never {
-  if (error instanceof ConfigValidationError) {
-    console.log(JSON.stringify(formatError(error.errorCode, error.message)))
-    process.exit(ExitCode.ConfigValidation)
-  }
-
-  if (error instanceof GitError) {
-    const code = getGitCliErrorCode(error.gitErrorCode)
-
-    console.log(JSON.stringify(formatError(code, error.message)))
-    process.exit(ExitCode.RuntimeError)
-  }
-
-  if (error instanceof FileReadError) {
-    console.log(JSON.stringify(formatError(CliErrorCode.ValidationError, error.message)))
-    process.exit(ExitCode.RuntimeError)
-  }
-
-  if (error instanceof ConnectionDetectionError) {
-    console.log(
-      JSON.stringify(
-        formatError(
-          CliErrorCode.ConnectionDetectionFailure,
-          `${error.file}:${error.line}: ${error.reason} — ${error.typeName}`,
-          ['Use --allow-incomplete to emit uncertain links instead of failing'],
-        ),
-      ),
-    )
-    process.exit(ExitCode.ExtractionFailure)
-  }
-
-  throw error
-}
-
-function getGitCliErrorCode(gitErrorCode: GitError['gitErrorCode']): CliErrorCode {
-  switch (gitErrorCode) {
-    case 'NOT_A_REPOSITORY':
-      return CliErrorCode.GitNotARepository
-    case 'GIT_NOT_FOUND':
-      return CliErrorCode.GitNotFound
-    default:
-      return CliErrorCode.ValidationError
-  }
-}
diff --git a/packages/riviere-cli/src/shell/index.ts b/packages/riviere-cli/src/shell/index.ts
deleted file mode 100644
index ca201f1fb..000000000
--- a/packages/riviere-cli/src/shell/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './cli'
-export * from '../platform/infra/cli/presentation/error-codes'
-export * from '../platform/infra/cli/presentation/output'
diff --git a/packages/riviere-cli/tsconfig.lib.json b/packages/riviere-cli/tsconfig.lib.json
deleted file mode 100644
index ce05abcb7..000000000
--- a/packages/riviere-cli/tsconfig.lib.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "baseUrl": ".",
-    "rootDir": "src",
-    "outDir": "dist",
-    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
-    "emitDeclarationOnly": false,
-    "forceConsistentCasingInFileNames": true,
-    "types": ["node"]
-  },
-  "include": ["src/**/*.ts"],
-  "references": [
-    {
-      "path": "../riviere-schema/tsconfig.lib.json"
-    },
-    {
-      "path": "../riviere-query/tsconfig.lib.json"
-    },
-    {
-      "path": "../riviere-extract-ts/tsconfig.lib.json"
-    },
-    {
-      "path": "../riviere-extract-config/tsconfig.lib.json"
-    },
-    {
-      "path": "../riviere-builder/tsconfig.lib.json"
-    }
-  ],
-  "exclude": [
-    "vite.config.ts",
-    "vite.config.mts",
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx"
-  ]
-}
diff --git a/packages/riviere-cli/tsconfig.spec.json b/packages/riviere-cli/tsconfig.spec.json
deleted file mode 100644
index f68d9d3b8..000000000
--- a/packages/riviere-cli/tsconfig.spec.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./out-tsc/vitest",
-    "types": [
-      "vitest/globals",
-      "vitest/importMeta",
-      "vite/client",
-      "node",
-      "vitest"
-    ],
-    "forceConsistentCasingInFileNames": true
-  },
-  "include": [
-    "vite.config.ts",
-    "vite.config.mts",
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx",
-    "src/**/*.d.ts"
-  ],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    }
-  ]
-}
diff --git a/packages/riviere-cli/vitest.config.mts b/packages/riviere-cli/vitest.config.mts
deleted file mode 100644
index 50e95bc65..000000000
--- a/packages/riviere-cli/vitest.config.mts
+++ /dev/null
@@ -1,36 +0,0 @@
-import path from 'node:path';
-import { defineConfig } from 'vitest/config';
-
-const repoRoot = path.resolve(__dirname, '../..');
-
-export default defineConfig(() => ({
-  root: __dirname,
-  cacheDir: '../../node_modules/.vite/packages/riviere-cli',
-  test: {
-    name: '@living-architecture/riviere-cli',
-    watch: false,
-    globals: true,
-    environment: 'node',
-    testTimeout: 60_000,
-    include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    reporters: ['default'],
-    coverage: {
-      enabled: true,
-      reportsDirectory: './test-output/vitest/coverage',
-      provider: 'v8' as const,
-      reporter: ['text', ['lcov', { projectRoot: repoRoot }]] as ['text', ['lcov', { projectRoot: string }]],
-      exclude: [
-        '**/*test-fixtures.ts',
-        // extract-output-formatter.ts: dry-run output formatting, tested via CLI integration tests.
-        // Contains v8 ignore comments but coverage provider doesn't respect them consistently.
-        'src/platform/infra/cli-presentation/extract-output-formatter.ts',
-      ],
-      thresholds: {
-        lines: 100,
-        statements: 100,
-        functions: 100,
-        branches: 100,
-      },
-    },
-  },
-}));
diff --git a/packages/riviere-extract-config/README.md b/packages/riviere-extract-config/README.md
deleted file mode 100644
index 1a53f93a1..000000000
--- a/packages/riviere-extract-config/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# riviere-extract-config
-
-JSON Schema validation for extraction configuration DSL.
-
-## Usage
-
-```typescript
-import {
-  validateExtractionConfig,
-  parseExtractionConfig,
-  isValidExtractionConfig,
-} from '@living-architecture/riviere-extract-config';
-
-const config = { modules: [{ name: 'orders', path: 'orders', glob: 'src/**', api: { find: 'classes', where: { hasDecorator: { name: 'Controller' } } } }] };
-
-if (isValidExtractionConfig(config)) {
-  // config is typed as ExtractionConfig
-}
-
-const result = validateExtractionConfig(config);
-if (result.valid) {
-  // use result.data
-} else {
-  // handle result.errors
-}
-```
-
-## Documentation
-
-- [CLAUDE.md](./CLAUDE.md) — Design principles and schema overview
-- [extraction-config.schema.json](./extraction-config.schema.json) — JSON Schema reference
-
-## Building
-
-Run `nx build riviere-extract-config` to build the library.
diff --git a/packages/riviere-extract-config/package.json b/packages/riviere-extract-config/package.json
deleted file mode 100644
index 058356470..000000000
--- a/packages/riviere-extract-config/package.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "name": "@living-architecture/riviere-extract-config",
-  "version": "0.6.3",
-  "type": "module",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/NTCoding/living-architecture.git",
-    "directory": "packages/riviere-extract-config"
-  },
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    "./package.json": "./package.json",
-    ".": {
-      "@living-architecture/source": "./src/index.ts",
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "default": "./dist/index.js"
-    },
-    "./schema.json": "./extraction-config.schema.json"
-  },
-  "files": [
-    "dist",
-    "extraction-config.schema.json",
-    "!**/*.tsbuildinfo"
-  ],
-  "dependencies": {
-    "ajv": "^8.17.1",
-    "ajv-formats": "^3.0.1"
-  }
-}
diff --git a/packages/riviere-extract-config/project.json b/packages/riviere-extract-config/project.json
deleted file mode 100644
index 2026abd09..000000000
--- a/packages/riviere-extract-config/project.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "name": "riviere-extract-config",
-  "targets": {
-    "generate-docs": {
-      "executor": "nx:run-commands",
-      "options": {
-        "command": "pnpm exec npx tsx packages/riviere-extract-config/scripts/generate-docs.ts",
-        "cwd": "{workspaceRoot}"
-      },
-      "outputs": ["{projectRoot}/docs/generated"]
-    },
-    "check-generated-docs": {
-      "executor": "nx:run-commands",
-      "options": {
-        "commands": [
-          "pnpm exec npx tsx packages/riviere-extract-config/scripts/generate-docs.ts",
-          "git diff --exit-code packages/riviere-extract-config/docs/generated/ || (echo 'Generated docs are stale. Run: pnpm nx generate-docs riviere-extract-config' && exit 1)"
-        ],
-        "cwd": "{workspaceRoot}",
-        "parallel": false
-      }
-    }
-  }
-}
diff --git a/packages/riviere-extract-config/CLAUDE.md b/packages/riviere-extract-config/published-language/CLAUDE.md
similarity index 100%
rename from packages/riviere-extract-config/CLAUDE.md
rename to packages/riviere-extract-config/published-language/CLAUDE.md
diff --git a/packages/riviere-extract-config/published-language/README.md b/packages/riviere-extract-config/published-language/README.md
new file mode 100644
index 000000000..6e385f01e
--- /dev/null
+++ b/packages/riviere-extract-config/published-language/README.md
@@ -0,0 +1,35 @@
+# riviere-extract-config
+
+JSON Schema validation for extraction configuration DSL.
+
+## Usage
+
+```typescript
+import {
+  validateExtractionConfig,
+  parseExtractionConfig,
+  isValidExtractionConfig,
+} from '@living-architecture/riviere-extract-config-published-language';
+
+const config = { modules: [{ name: 'orders', path: 'orders', glob: 'src/**', api: { find: 'classes', where: { hasDecorator: { name: 'Controller' } } } }] };
+
+if (isValidExtractionConfig(config)) {
+  // config is typed as ExtractionConfig
+}
+
+const result = validateExtractionConfig(config);
+if (result.valid) {
+  // use result.data
+} else {
+  // handle result.errors
+}
+```
+
+## Documentation
+
+- [CLAUDE.md](./CLAUDE.md) — Design principles and schema overview
+- [extraction-config.schema.json](./extraction-config.schema.json) — JSON Schema reference
+
+## Building
+
+Run `nx build riviere-extract-config` to build the library.
diff --git a/packages/riviere-extract-config/docs/generated/predicates.md b/packages/riviere-extract-config/published-language/docs/generated/predicates.md
similarity index 100%
rename from packages/riviere-extract-config/docs/generated/predicates.md
rename to packages/riviere-extract-config/published-language/docs/generated/predicates.md
diff --git a/packages/riviere-extract-config/docs/generated/schema.md b/packages/riviere-extract-config/published-language/docs/generated/schema.md
similarity index 100%
rename from packages/riviere-extract-config/docs/generated/schema.md
rename to packages/riviere-extract-config/published-language/docs/generated/schema.md
diff --git a/packages/riviere-extract-config/extraction-config.schema.json b/packages/riviere-extract-config/published-language/extraction-config.schema.json
similarity index 100%
rename from packages/riviere-extract-config/extraction-config.schema.json
rename to packages/riviere-extract-config/published-language/extraction-config.schema.json
diff --git a/packages/riviere-extract-config/published-language/package.json b/packages/riviere-extract-config/published-language/package.json
new file mode 100644
index 000000000..ae269d851
--- /dev/null
+++ b/packages/riviere-extract-config/published-language/package.json
@@ -0,0 +1,36 @@
+{
+  "name": "@living-architecture/riviere-extract-config-published-language",
+  "version": "0.6.3",
+  "type": "module",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/NTCoding/living-architecture.git",
+    "directory": "packages/riviere-extract-config/published-language"
+  },
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "@living-architecture/source": "./src/index.ts",
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
+    },
+    "./schema.json": "./extraction-config.schema.json"
+  },
+  "files": [
+    "dist",
+    "!dist/**/__fixtures__/**",
+    "extraction-config.schema.json",
+    "!**/*.tsbuildinfo"
+  ],
+  "dependencies": {
+    "ajv": "^8.17.1",
+    "ajv-formats": "^3.0.1"
+  }
+}
diff --git a/packages/riviere-extract-config/published-language/project.json b/packages/riviere-extract-config/published-language/project.json
new file mode 100644
index 000000000..36ce9de39
--- /dev/null
+++ b/packages/riviere-extract-config/published-language/project.json
@@ -0,0 +1,37 @@
+{
+  "name": "riviere-extract-config-published-language",
+  "targets": {
+    "build": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          "node ../../../scripts/build-public-exports.mjs . --clean",
+          "tsc --build tsconfig.lib.json",
+          "node ../../../scripts/build-public-exports.mjs ."
+        ],
+        "cwd": "{projectRoot}",
+        "parallel": false
+      },
+      "outputs": ["{projectRoot}/dist"]
+    },
+    "generate-docs": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "pnpm exec npx tsx packages/riviere-extract-config/published-language/scripts/generate-docs.ts",
+        "cwd": "{workspaceRoot}"
+      },
+      "outputs": ["{projectRoot}/docs/generated"]
+    },
+    "check-generated-docs": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          "pnpm exec npx tsx packages/riviere-extract-config/published-language/scripts/generate-docs.ts",
+          "git diff --exit-code packages/riviere-extract-config/published-language/docs/generated/ || (echo 'Generated docs are stale. Run: pnpm nx generate-docs riviere-extract-config' && exit 1)"
+        ],
+        "cwd": "{workspaceRoot}",
+        "parallel": false
+      }
+    }
+  }
+}
diff --git a/packages/riviere-extract-config/published-language/scripts/generate-docs.ts b/packages/riviere-extract-config/published-language/scripts/generate-docs.ts
new file mode 100644
index 000000000..446bb0b2f
--- /dev/null
+++ b/packages/riviere-extract-config/published-language/scripts/generate-docs.ts
@@ -0,0 +1,418 @@
+#!/usr/bin/env tsx
+/**
+ * Extraction Config Reference Documentation Generator
+ *
+ * Generates markdown documentation from JSON Schema definitions.
+ * ALL content is derived from the schema - no hardcoded documentation.
+ * Run with: pnpm exec tsx scripts/generate-docs.ts
+ */
+
+import { readFileSync, writeFileSync, mkdirSync } from 'node:fs'
+import { join } from 'node:path'
+
+/** Error thrown when schema JSON does not match expected structure. */
+class InvalidSchemaFormatError extends Error {
+  constructor() {
+    super('Invalid schema format')
+    this.name = 'InvalidSchemaFormatError'
+  }
+}
+
+interface SchemaProperty {
+  type?: string
+  description?: string
+  oneOf?: SchemaProperty[]
+  $ref?: string
+  const?: unknown
+  minLength?: number
+  minItems?: number
+  items?: SchemaProperty
+  enum?: string[]
+  additionalProperties?: SchemaProperty | boolean
+}
+
+interface SchemaDef {
+  type?: string
+  description?: string
+  required?: string[]
+  additionalProperties?: boolean
+  properties?: Record<string, SchemaProperty>
+  oneOf?: SchemaProperty[]
+  items?: SchemaProperty
+  enum?: string[]
+  $ref?: string
+  minItems?: number
+}
+
+interface Schema {
+  $defs: Record<string, SchemaDef>
+  title?: string
+  description?: string
+  properties?: Record<string, SchemaProperty>
+  required?: string[]
+}
+
+function escapePipes(str: string): string {
+  return str.replaceAll('|', '\\|')
+}
+
+function resolveRef(schema: Schema, ref: string): SchemaDef | undefined {
+  const path = ref.replace('#/$defs/', '')
+  return schema.$defs[path]
+}
+
+function getRefTypeName(ref: string): string {
+  return ref.replace('#/$defs/', '')
+}
+
+function extractOneOfTypeNames(oneOf: SchemaProperty[]): string[] {
+  return oneOf.map((o) => {
+    if (o.$ref) return getRefTypeName(o.$ref)
+    if (o.type === 'array' && o.items) {
+      if (o.items.$ref) return `${getRefTypeName(o.items.$ref)}[]`
+      return `${o.items.type}[]`
+    }
+    return o.type ?? 'any'
+  })
+}
+
+function formatOneOfType(prop: SchemaProperty): string {
+  if (!prop.oneOf) return '`any`'
+  return extractOneOfTypeNames(prop.oneOf)
+    .map((t) => `\`${t}\``)
+    .join(' \\| ')
+}
+
+function formatArrayType(items: SchemaProperty): string {
+  if (items.$ref) return `\`${getRefTypeName(items.$ref)}[]\``
+  if (items.oneOf) {
+    const types = extractOneOfTypeNames(items.oneOf)
+    return `\`(${types.join(' \\| ')})[]\``
+  }
+  return `\`${items.type}[]\``
+}
+
+function formatRecordType(additionalProperties: SchemaProperty): string {
+  const valueType = additionalProperties.$ref
+    ? getRefTypeName(additionalProperties.$ref)
+    : (additionalProperties.type ?? 'unknown')
+  return `\`Record<string, ${valueType}>\``
+}
+
+function getTypeString(prop: SchemaProperty): string {
+  if (prop.$ref) {
+    return `\`${getRefTypeName(prop.$ref)}\``
+  }
+  if (prop.oneOf) {
+    return formatOneOfType(prop)
+  }
+  if (prop.type === 'array' && prop.items) {
+    return formatArrayType(prop.items)
+  }
+  if (prop.enum) {
+    return prop.enum.map((e) => `\`"${e}"\``).join(' \\| ')
+  }
+  if (prop.type === 'object' && typeof prop.additionalProperties === 'object') {
+    return formatRecordType(prop.additionalProperties)
+  }
+  return `\`${prop.type ?? 'any'}\``
+}
+
+function generatePropertiesTable(
+  properties: Record<string, SchemaProperty>,
+  required: string[] = [],
+): string[] {
+  const lines: string[] = []
+  lines.push('| Field | Type | Required | Description |')
+  lines.push('|-------|------|----------|-------------|')
+
+  for (const [propName, prop] of Object.entries(properties)) {
+    const isRequired = required.includes(propName) ? '**Yes**' : 'No'
+    const type = getTypeString(prop)
+    const desc = escapePipes(prop.description ?? '(no description)')
+    lines.push(`| \`${propName}\` | ${type} | ${isRequired} | ${desc} |`)
+  }
+  return lines
+}
+
+function generateDefMarkdown(name: string, def: SchemaDef, schema: Schema): string {
+  const lines: string[] = []
+
+  lines.push(`### \`${name}\``)
+  lines.push('')
+  if (def.description) {
+    lines.push(def.description)
+    lines.push('')
+  }
+
+  // Handle enum type definitions (like findTarget)
+  if (def.enum) {
+    lines.push('**Values:**')
+    lines.push('')
+    for (const val of def.enum) {
+      lines.push(`- \`"${val}"\``)
+    }
+    lines.push('')
+  }
+
+  if (def.properties && Object.keys(def.properties).length > 0) {
+    lines.push('**Properties:**')
+    lines.push('')
+    lines.push(...generatePropertiesTable(def.properties, def.required))
+    lines.push('')
+  }
+
+  if (def.oneOf) {
+    lines.push('**One of:**')
+    lines.push('')
+    for (const option of def.oneOf) {
+      if (option.$ref) {
+        const refName = getRefTypeName(option.$ref)
+        const refDef = resolveRef(schema, option.$ref)
+        lines.push(`- \`${refName}\` — ${escapePipes(refDef?.description ?? '(no description)')}`)
+      }
+    }
+    lines.push('')
+  }
+
+  lines.push('---')
+  lines.push('')
+
+  return lines.join('\n')
+}
+
+function isPredicateDef(name: string): boolean {
+  return name.endsWith('Predicate')
+}
+
+function generatePredicateOverview(predicateDef: SchemaDef, schema: Schema): string[] {
+  const lines: string[] = []
+  if (!predicateDef.oneOf) return lines
+
+  lines.push('## Overview')
+  lines.push('')
+  lines.push('| Predicate | Description |')
+  lines.push('|-----------|-------------|')
+
+  for (const option of predicateDef.oneOf) {
+    if (option.$ref) {
+      const refName = getRefTypeName(option.$ref)
+      const refDef = resolveRef(schema, option.$ref)
+      const predicateKey = refName.replace('Predicate', '')
+      const key = predicateKey.charAt(0).toLowerCase() + predicateKey.slice(1)
+      lines.push(`| \`${key}\` | ${escapePipes(refDef?.description ?? '(no description)')} |`)
+    }
+  }
+  lines.push('')
+  lines.push('---')
+  lines.push('')
+
+  return lines
+}
+
+function isSchemaDef(value: unknown): value is SchemaDef {
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    ('properties' in value || 'type' in value || 'oneOf' in value || '$ref' in value)
+  )
+}
+
+function generateRefPredicateTable(innerProp: SchemaDef): string[] {
+  const lines: string[] = []
+  lines.push('**Parameters:**')
+  lines.push('')
+  lines.push('| Field | Type | Required | Description |')
+  lines.push('|-------|------|----------|-------------|')
+  if (!innerProp.$ref) {
+    throw new InvalidSchemaFormatError()
+  }
+  const refName = getRefTypeName(innerProp.$ref)
+  const desc = escapePipes(innerProp.description ?? `Nested ${refName}`)
+  lines.push(`| (nested) | \`${refName}\` | **Yes** | ${desc} |`)
+  lines.push('')
+  return lines
+}
+
+function generateArrayPredicateTable(innerProp: SchemaDef): string[] {
+  const lines: string[] = []
+  lines.push('**Parameters:**')
+  lines.push('')
+  lines.push('| Field | Type | Required | Description |')
+  lines.push('|-------|------|----------|-------------|')
+  const itemType = innerProp.items?.$ref
+    ? getRefTypeName(innerProp.items.$ref)
+    : (innerProp.items?.type ?? 'any')
+  const minItems = innerProp.minItems ?? 1
+  const desc = escapePipes(innerProp.description ?? `Array of ${itemType}`)
+  lines.push(`| (array) | \`${itemType}[]\` | **Yes** (min: ${minItems}) | ${desc} |`)
+  lines.push('')
+  return lines
+}
+
+function generatePredicateParameters(def: SchemaDef): string[] {
+  const outerProps = def.properties ?? {}
+  const innerPropName = Object.keys(outerProps)[0]
+  if (!innerPropName) return []
+
+  const innerProp = outerProps[innerPropName]
+  if (!isSchemaDef(innerProp)) return []
+
+  // Handle nested object with properties (hasDecorator, hasJSDoc, etc.)
+  if (innerProp.properties && Object.keys(innerProp.properties).length > 0) {
+    const lines: string[] = []
+    lines.push('**Parameters:**')
+    lines.push('')
+    lines.push(...generatePropertiesTable(innerProp.properties, innerProp.required))
+    lines.push('')
+    return lines
+  }
+
+  // Handle $ref predicates (inClassWith)
+  if (innerProp.$ref) {
+    return generateRefPredicateTable(innerProp)
+  }
+
+  // Handle array predicates (and, or)
+  if (innerProp.type === 'array' && innerProp.items) {
+    return generateArrayPredicateTable(innerProp)
+  }
+
+  return []
+}
+
+function generatePredicateSection(name: string, def: SchemaDef): string[] {
+  const lines: string[] = []
+  const predicateKey = name.replace('Predicate', '')
+  const key = predicateKey.charAt(0).toLowerCase() + predicateKey.slice(1)
+
+  lines.push(`### \`${key}\``)
+  lines.push('')
+  if (def.description) {
+    lines.push(def.description)
+    lines.push('')
+  }
+
+  lines.push(...generatePredicateParameters(def))
+  lines.push('---')
+  lines.push('')
+
+  return lines
+}
+
+function generatePredicatesReference(schema: Schema): string {
+  const lines: string[] = []
+
+  lines.push('---')
+  lines.push('pageClass: reference')
+  lines.push('---')
+  lines.push('')
+  lines.push('# Predicate Reference')
+  lines.push('')
+
+  const predicateDef = schema.$defs['predicate']
+  if (predicateDef) {
+    lines.push(...generatePredicateOverview(predicateDef, schema))
+  }
+
+  for (const [name, def] of Object.entries(schema.$defs)) {
+    if (isPredicateDef(name)) {
+      lines.push(...generatePredicateSection(name, def))
+    }
+  }
+
+  lines.push('## See Also')
+  lines.push('')
+  lines.push('- [Config Schema Reference](/reference/extraction-config/schema)')
+  lines.push('- [TypeScript Getting Started](/extract/deterministic/typescript/getting-started)')
+  lines.push('')
+
+  return lines.join('\n')
+}
+
+function generateSchemaReference(schema: Schema): string {
+  const lines: string[] = []
+
+  lines.push('---')
+  lines.push('pageClass: reference')
+  lines.push('---')
+  lines.push('')
+  lines.push(`# ${schema.title ?? 'Extraction Config Schema'}`)
+  lines.push('')
+  if (schema.description) {
+    lines.push(schema.description)
+    lines.push('')
+  }
+
+  lines.push('**Format:** JSON or YAML')
+  lines.push('')
+  lines.push('---')
+  lines.push('')
+
+  if (schema.properties) {
+    lines.push('## Root Properties')
+    lines.push('')
+    lines.push(...generatePropertiesTable(schema.properties, schema.required))
+    lines.push('')
+    lines.push('---')
+    lines.push('')
+  }
+
+  for (const [name, def] of Object.entries(schema.$defs)) {
+    if (!isPredicateDef(name) && name !== 'predicate') {
+      lines.push(generateDefMarkdown(name, def, schema))
+    }
+  }
+
+  lines.push('## See Also')
+  lines.push('')
+  lines.push('- [Predicate Reference](/reference/extraction-config/predicates)')
+  lines.push('- [TypeScript Getting Started](/extract/deterministic/typescript/getting-started)')
+  lines.push('')
+
+  return lines.join('\n')
+}
+
+function hasKey<K extends string>(obj: object, key: K): obj is object & Record<K, unknown> {
+  return key in obj
+}
+
+function isSchema(value: unknown): value is Schema {
+  if (typeof value !== 'object' || value === null) return false
+  if (!hasKey(value, '$defs')) return false
+  return typeof value['$defs'] === 'object'
+}
+
+// Main execution
+try {
+  const schemaPath = join(import.meta.dirname, '..', 'extraction-config.schema.json')
+  const schemaContent = readFileSync(schemaPath, 'utf-8')
+  const parsed: unknown = JSON.parse(schemaContent)
+  if (!isSchema(parsed)) {
+    throw new InvalidSchemaFormatError()
+  }
+  const schema = parsed
+
+  const outputDir = join(import.meta.dirname, '..', 'docs', 'generated')
+  mkdirSync(outputDir, { recursive: true })
+
+  const predicatesContent = generatePredicatesReference(schema)
+  const predicatesPath = join(outputDir, 'predicates.md')
+  writeFileSync(predicatesPath, predicatesContent, 'utf-8')
+  console.log(`Generated: ${predicatesPath}`)
+  console.log(`Lines: ${predicatesContent.split('\n').length}`)
+
+  const schemaRefContent = generateSchemaReference(schema)
+  const schemaRefPath = join(outputDir, 'schema.md')
+  writeFileSync(schemaRefPath, schemaRefContent, 'utf-8')
+  console.log(`Generated: ${schemaRefPath}`)
+  console.log(`Lines: ${schemaRefContent.split('\n').length}`)
+} catch (error) {
+  const message = error instanceof Error ? error.message : String(error)
+  const stack = error instanceof Error ? error.stack : undefined
+  console.error('Documentation generation failed:', message)
+  if (stack) {
+    console.error(stack)
+  }
+  process.exit(1)
+}
diff --git a/packages/riviere-extract-config/published-language/src/index.ts b/packages/riviere-extract-config/published-language/src/index.ts
new file mode 100644
index 000000000..ec23a1df5
--- /dev/null
+++ b/packages/riviere-extract-config/published-language/src/index.ts
@@ -0,0 +1,51 @@
+export type {
+  AndPredicate,
+  ComponentRule,
+  ComponentType,
+  ConnectionsConfig,
+  CustomTypes,
+  DetectionRule,
+  DraftConfiguration,
+  DraftModule,
+  EventPublisherConfig,
+  ExtendsClassPredicate,
+  ExtractBlock,
+  ExtractionRule,
+  FindTarget,
+  FromClassDecoratorArgExtractionRule,
+  FromClassNameExtractionRule,
+  FromConstructorParamsExtractionRule,
+  FromDecoratorArgExtractionRule,
+  FromDecoratorNameExtractionRule,
+  FromFilePathExtractionRule,
+  FromGenericArgExtractionRule,
+  FromMethodNameExtractionRule,
+  FromMethodSignatureExtractionRule,
+  FromParameterTypeExtractionRule,
+  FromPropertyExtractionRule,
+  HasDecoratorPredicate,
+  HasJSDocPredicate,
+  HttpLinkConfig,
+  ImplementsInterfacePredicate,
+  InClassWithPredicate,
+  LiteralExtractionRule,
+  ModuleRef,
+  NameEndsWithPredicate,
+  NameMatchesPredicate,
+  NotUsed,
+  OrPredicate,
+  Predicate,
+  StandaloneDraftModule,
+  Transform,
+  ValidatedConfigurationInput,
+  ValidatedModuleInput,
+} from './published-language/extraction-config-schema'
+export {
+  ValidatedConfiguration,
+  ValidatedModule,
+} from './published-language/validated-configuration'
+export {
+  parseExtractionConfigSchema,
+  parseExtractionConfig,
+  type ValidationError,
+} from './published-language/validation'
diff --git a/packages/riviere-extract-config/published-language/src/published-language/__fixtures__/validation-fixtures.ts b/packages/riviere-extract-config/published-language/src/published-language/__fixtures__/validation-fixtures.ts
new file mode 100644
index 000000000..8e8038101
--- /dev/null
+++ b/packages/riviere-extract-config/published-language/src/published-language/__fixtures__/validation-fixtures.ts
@@ -0,0 +1,77 @@
+import type { DraftConfiguration, ValidatedModuleInput } from '../extraction-config-schema'
+import {
+  parseExtractionConfig,
+  parseExtractionConfigSchema,
+  type ValidationError,
+} from '../validation'
+
+type ValidationResult = { valid: true; errors: [] } | { valid: false; errors: ValidationError[] }
+
+export function validateExtractionConfig(value: unknown): ValidationResult {
+  const result = parseExtractionConfig(value)
+  return result.success ? { valid: true, errors: [] } : { valid: false, errors: result.errors }
+}
+
+export function validateExtractionConfigSchema(value: unknown): ValidationResult {
+  const result = parseExtractionConfigSchema(value)
+  return result.success ? { valid: true, errors: [] } : { valid: false, errors: result.errors }
+}
+
+export function createModuleWithoutPath(): Omit<ValidatedModuleInput, 'path'> {
+  return {
+    name: 'test',
+    domain: 'test',
+    glob: 'src/**',
+    api: { notUsed: true },
+    useCase: { notUsed: true },
+    domainOp: { notUsed: true },
+    event: { notUsed: true },
+    eventHandler: { notUsed: true },
+    ui: { notUsed: true },
+  }
+}
+
+export function createModuleWithoutApi(): Omit<ValidatedModuleInput, 'api'> {
+  return {
+    name: 'test',
+    domain: 'test',
+    path: '.',
+    glob: 'src/**',
+    useCase: { notUsed: true },
+    domainOp: { notUsed: true },
+    event: { notUsed: true },
+    eventHandler: { notUsed: true },
+    ui: { notUsed: true },
+  }
+}
+
+export function createMinimalModule(): ValidatedModuleInput {
+  return {
+    name: 'test',
+    domain: 'test',
+    path: '.',
+    glob: 'src/**',
+    api: { notUsed: true },
+    useCase: { notUsed: true },
+    domainOp: { notUsed: true },
+    event: { notUsed: true },
+    eventHandler: { notUsed: true },
+    ui: { notUsed: true },
+  }
+}
+
+export function createMinimalConfig(): DraftConfiguration {
+  return { modules: [createMinimalModule()] }
+}
+
+export function createMutableConfig(): {
+  config: DraftConfiguration
+  module: ValidatedModuleInput
+} {
+  const module = createMinimalModule()
+  const config = { modules: [module] }
+  return {
+    config,
+    module,
+  }
+}
diff --git a/packages/riviere-extract-config/published-language/src/published-language/extraction-config-schema.ts b/packages/riviere-extract-config/published-language/src/published-language/extraction-config-schema.ts
new file mode 100644
index 000000000..9deb0731a
--- /dev/null
+++ b/packages/riviere-extract-config/published-language/src/published-language/extraction-config-schema.ts
@@ -0,0 +1,362 @@
+/**
+ * AST element type to search for during extraction.
+ */
+/** @riviere-role published-language-union */
+export type FindTarget = 'classes' | 'methods' | 'functions'
+
+/**
+ * Standard architectural component types recognized by the Riviere extractor.
+ * Each type represents a distinct role in the system's flow-based architecture.
+ */
+/** @riviere-role published-language-union */
+export type ComponentType = 'api' | 'useCase' | 'domainOp' | 'event' | 'eventHandler' | 'ui'
+
+/** Matches elements with a specific decorator. */
+/** @riviere-role published-language-data-structure */
+export interface HasDecoratorPredicate {
+  hasDecorator: {
+    name: string | string[]
+    from?: string
+  }
+}
+
+/** Matches elements with a specific JSDoc tag. */
+/** @riviere-role published-language-data-structure */
+export interface HasJSDocPredicate {
+  hasJSDoc: { tag: string }
+}
+
+/** Matches classes extending a specific base class. */
+/** @riviere-role published-language-data-structure */
+export interface ExtendsClassPredicate {
+  extendsClass: { name: string }
+}
+
+/** Matches classes implementing a specific interface. */
+/** @riviere-role published-language-data-structure */
+export interface ImplementsInterfacePredicate {
+  implementsInterface: { name: string }
+}
+
+/** Matches elements whose name ends with a suffix. */
+/** @riviere-role published-language-data-structure */
+export interface NameEndsWithPredicate {
+  nameEndsWith: { suffix: string }
+}
+
+/** Matches elements whose name matches a regex pattern. */
+/** @riviere-role published-language-data-structure */
+export interface NameMatchesPredicate {
+  nameMatches: { pattern: string }
+}
+
+/** Matches methods inside classes satisfying a predicate. */
+/** @riviere-role published-language-data-structure */
+export interface InClassWithPredicate {
+  inClassWith: Predicate
+}
+
+/** Combines predicates with AND logic. */
+/** @riviere-role published-language-data-structure */
+export interface AndPredicate {
+  and: Predicate[]
+}
+
+/** Combines predicates with OR logic. */
+/** @riviere-role published-language-data-structure */
+export interface OrPredicate {
+  or: Predicate[]
+}
+
+/** Union of all predicate types for filtering AST elements. */
+/** @riviere-role published-language-union */
+export type Predicate =
+  | HasDecoratorPredicate
+  | HasJSDocPredicate
+  | ExtendsClassPredicate
+  | ImplementsInterfacePredicate
+  | NameEndsWithPredicate
+  | NameMatchesPredicate
+  | InClassWithPredicate
+  | AndPredicate
+  | OrPredicate
+
+/** Marker indicating a component type is not used in the module. */
+/** @riviere-role published-language-data-structure */
+export interface NotUsed {
+  notUsed: true
+}
+
+/** Transform operations to apply to extracted values. */
+/** @riviere-role published-language-data-structure */
+export interface Transform {
+  stripSuffix?: string
+  stripPrefix?: string
+  toLowerCase?: true
+  toUpperCase?: true
+  kebabToPascal?: true
+  pascalToKebab?: true
+}
+
+/** Extracts a hardcoded literal value. */
+/** @riviere-role published-language-data-structure */
+export interface LiteralExtractionRule {
+  literal: string | boolean | number
+}
+
+/** Extracts value from the class name. */
+/** @riviere-role published-language-data-structure */
+export interface FromClassNameExtractionRule {
+  fromClassName: true | { transform?: Transform }
+}
+
+/** Extracts value from the method name. */
+/** @riviere-role published-language-data-structure */
+export interface FromMethodNameExtractionRule {
+  fromMethodName: true | { transform?: Transform }
+}
+
+/** Extracts value from the file path using regex capture. */
+/** @riviere-role published-language-data-structure */
+export interface FromFilePathExtractionRule {
+  fromFilePath: {
+    pattern: string
+    capture: number
+    transform?: Transform
+  }
+}
+
+/** Extracts value from a class property. */
+/** @riviere-role published-language-data-structure */
+export interface FromPropertyExtractionRule {
+  fromProperty: {
+    name: string
+    kind: 'static' | 'instance'
+    transform?: Transform
+  }
+}
+
+/** Extracts value from decorator argument. */
+/** @riviere-role published-language-data-structure */
+export interface FromDecoratorArgExtractionRule {
+  fromDecoratorArg: {
+    decorator?: string
+    position?: number
+    name?: string
+    transform?: Transform
+  }
+}
+
+/** Extracts value from decorator argument on the containing class. */
+/** @riviere-role published-language-data-structure */
+export interface FromClassDecoratorArgExtractionRule {
+  fromClassDecoratorArg:
+    | {
+        decorator: string
+        position: number
+        name?: never
+        transform?: Transform
+      }
+    | {
+        decorator: string
+        name: string
+        position?: never
+        transform?: Transform
+      }
+}
+
+/** Extracts value from the decorator name itself. */
+/** @riviere-role published-language-data-structure */
+export interface FromDecoratorNameExtractionRule {
+  fromDecoratorName:
+    | true
+    | {
+        mapping?: Record<string, string>
+        transform?: Transform
+      }
+}
+
+/** Extracts value from generic type argument. */
+/** @riviere-role published-language-data-structure */
+export interface FromGenericArgExtractionRule {
+  fromGenericArg: {
+    interface: string
+    position: number
+    transform?: Transform
+  }
+}
+
+/** Extracts method parameters and return type. */
+/** @riviere-role published-language-data-structure */
+export interface FromMethodSignatureExtractionRule {
+  fromMethodSignature: true
+}
+
+/** Extracts constructor parameter names and types. */
+/** @riviere-role published-language-data-structure */
+export interface FromConstructorParamsExtractionRule {
+  fromConstructorParams: true
+}
+
+/** Extracts type name of parameter at position. */
+/** @riviere-role published-language-data-structure */
+export interface FromParameterTypeExtractionRule {
+  fromParameterType: {
+    position: number
+    transform?: Transform
+  }
+}
+
+/**
+ * Union of all extraction rule types.
+ * Each rule type corresponds to a different source of metadata.
+ */
+/** @riviere-role published-language-union */
+export type ExtractionRule =
+  | LiteralExtractionRule
+  | FromClassNameExtractionRule
+  | FromMethodNameExtractionRule
+  | FromFilePathExtractionRule
+  | FromPropertyExtractionRule
+  | FromDecoratorArgExtractionRule
+  | FromClassDecoratorArgExtractionRule
+  | FromDecoratorNameExtractionRule
+  | FromGenericArgExtractionRule
+  | FromMethodSignatureExtractionRule
+  | FromConstructorParamsExtractionRule
+  | FromParameterTypeExtractionRule
+
+/**
+ * Extract block mapping field names to extraction rules.
+ * Each key is a Riviere schema field name (e.g., apiType, httpMethod, path).
+ */
+/** @riviere-role published-language-data-structure */
+export interface ExtractBlock {
+  [fieldName: string]: ExtractionRule
+}
+
+/** Rule specifying what to find and how to filter matches. */
+/** @riviere-role published-language-data-structure */
+export interface DetectionRule {
+  find: FindTarget
+  where: Predicate
+  extract?: ExtractBlock
+}
+
+/** Either a detection rule or a marker that the component type is unused. */
+/** @riviere-role published-language-union */
+export type ComponentRule = NotUsed | DetectionRule
+
+/** User-defined component types with their detection rules. */
+/** @riviere-role published-language-data-structure */
+export interface CustomTypes {
+  [customTypeName: string]: DetectionRule
+}
+
+/**
+ * Declares a custom component type as an event publisher.
+ * The component type must be defined in customTypes in at least one module.
+ */
+/** @riviere-role published-language-data-structure */
+export interface EventPublisherConfig {
+  /** The custom component type name (e.g. 'eventPublisher'). */
+  fromType: string
+  /** The metadata key on this component type that holds the published event type name. */
+  metadataKey: string
+}
+
+/**
+ * Declares how to resolve HTTP client calls into cross-domain Links.
+ * The custom type must be defined in customTypes in at least one module.
+ */
+/** @riviere-role published-language-data-structure */
+export interface HttpLinkConfig {
+  /** The custom component type name for HTTP clients (e.g. 'httpCall'). */
+  fromCustomType: string
+  /** Metadata key whose value identifies the target domain. */
+  matchDomainBy: string
+  /** Metadata keys used to match the target API component. */
+  matchApiBy: string[]
+}
+
+/** Connection detection configuration. */
+/** @riviere-role published-language-data-structure */
+export interface ConnectionsConfig {
+  /** Declares which custom component types publish events and how to detect them. */
+  eventPublishers?: EventPublisherConfig[]
+  /** Declares how to resolve HTTP client calls into cross-domain Links. */
+  httpLinks?: HttpLinkConfig[]
+}
+
+/**
+ * Reference to an external module definition file.
+ * The CLI expands these references before extraction by loading the referenced file.
+ */
+/** @riviere-role published-language-data-structure */
+export interface ModuleRef {
+  $ref: string
+}
+
+/**
+ * A module config as written in the extraction config file.
+ * When `extends` is present, component rules are inherited from the extended config.
+ * Local rules override inherited rules.
+ */
+interface ModuleIdentity {
+  name: string
+  domain: string
+  path: string
+  glob: string
+  /** Path pattern with `{module}` placeholder for resolving module names from file paths. */
+  modules?: string
+  customTypes?: CustomTypes
+}
+
+interface ModuleRules {
+  api: ComponentRule
+  useCase: ComponentRule
+  domainOp: ComponentRule
+  event: ComponentRule
+  eventHandler: ComponentRule
+  ui: ComponentRule
+}
+
+/** @riviere-role published-language-data-structure */
+export interface StandaloneDraftModule extends ModuleIdentity, ModuleRules {
+  extends?: never
+}
+
+/** @riviere-role published-language-union */
+export type DraftModule =
+  | StandaloneDraftModule
+  | (ModuleIdentity & Partial<ModuleRules> & { extends: string })
+
+/**
+ * A fully resolved module with all component rules.
+ * This is what the extractor uses after config resolution.
+ */
+/** @riviere-role published-language-data-structure */
+export interface ValidatedModuleInput extends ModuleIdentity, ModuleRules {}
+
+/**
+ * Extraction config after $ref expansion.
+ * At this point all ModuleRef entries have been resolved to DraftModule.
+ * This is what the extractor uses for processing.
+ */
+/** @riviere-role published-language-schema */
+export interface DraftConfiguration {
+  $schema?: string
+  modules: DraftModule[]
+  connections?: ConnectionsConfig
+}
+
+/**
+ * Fully resolved extraction config ready for the extractor.
+ * All extends references resolved, all modules have complete rules.
+ */
+/** @riviere-role published-language-data-structure */
+export interface ValidatedConfigurationInput {
+  $schema?: string
+  modules: ValidatedModuleInput[]
+  connections?: ConnectionsConfig
+}
diff --git a/packages/riviere-extract-config/published-language/src/published-language/published-parser.spec.ts b/packages/riviere-extract-config/published-language/src/published-language/published-parser.spec.ts
new file mode 100644
index 000000000..2c19ed0a9
--- /dev/null
+++ b/packages/riviere-extract-config/published-language/src/published-language/published-parser.spec.ts
@@ -0,0 +1,39 @@
+import { createMinimalConfig } from './__fixtures__/validation-fixtures'
+import { parseExtractionConfig, parseExtractionConfigSchema } from './validation'
+
+describe('published-language parsers', () => {
+  it('returns the extraction configuration when schema parsing succeeds', () => {
+    const configuration = createMinimalConfig()
+
+    expect(parseExtractionConfigSchema(configuration)).toStrictEqual({
+      success: true,
+      configuration,
+    })
+  })
+
+  it('returns schema errors without throwing', () => {
+    const result = parseExtractionConfigSchema({ modules: [] })
+
+    expect(result.success).toBe(false)
+  })
+
+  it('returns the extraction configuration when full parsing succeeds', () => {
+    const configuration = createMinimalConfig()
+
+    expect(parseExtractionConfig(configuration)).toStrictEqual({
+      success: true,
+      configuration,
+    })
+  })
+
+  it('returns semantic errors without throwing', () => {
+    const result = parseExtractionConfig({
+      ...createMinimalConfig(),
+      connections: {
+        eventPublishers: [{ fromType: 'missing', metadataKey: 'eventName' }],
+      },
+    })
+
+    expect(result.success).toBe(false)
+  })
+})
diff --git a/packages/riviere-extract-config/published-language/src/published-language/validated-configuration.spec.ts b/packages/riviere-extract-config/published-language/src/published-language/validated-configuration.spec.ts
new file mode 100644
index 000000000..27bdd847d
--- /dev/null
+++ b/packages/riviere-extract-config/published-language/src/published-language/validated-configuration.spec.ts
@@ -0,0 +1,249 @@
+import { assert, describe, expect, it } from 'vitest'
+import type { ValidatedModuleInput } from './extraction-config-schema'
+import { ValidatedConfiguration, ValidatedModule } from './validated-configuration'
+
+const notUsed = { notUsed: true } as const
+
+function validModule(name: string): ValidatedModuleInput {
+  return {
+    name,
+    domain: name,
+    path: name,
+    glob: '**/*.ts',
+    api: notUsed,
+    useCase: notUsed,
+    domainOp: notUsed,
+    event: notUsed,
+    eventHandler: notUsed,
+    ui: notUsed,
+  }
+}
+
+function requireSuccessfulConfiguration(
+  result: ReturnType<typeof ValidatedConfiguration.parse>,
+): ValidatedConfiguration {
+  assert(result.success)
+  return result.data
+}
+
+describe('ValidatedConfiguration', () => {
+  it('returns every validation failure', () => {
+    const result = ValidatedConfiguration.parse({
+      modules: [
+        {
+          ...validModule('orders'),
+          api: {
+            find: 'methods',
+            where: { nameEndsWith: { suffix: 'Controller' } },
+            extract: {},
+          },
+        },
+        {
+          ...validModule('shipping'),
+          event: {
+            find: 'classes',
+            where: { nameEndsWith: { suffix: 'Event' } },
+            extract: {},
+          },
+        },
+      ],
+    })
+
+    expect(result).toStrictEqual({
+      success: false,
+      errors: [
+        expect.objectContaining({ path: '/modules/0/api' }),
+        expect.objectContaining({ path: '/modules/1/event' }),
+      ],
+    })
+  })
+
+  it('returns a configuration containing validated modules', () => {
+    const orders = {
+      ...validModule('orders'),
+      modules: 'src/{module}',
+      customTypes: {
+        eventPublisher: {
+          find: 'methods' as const,
+          where: { nameEndsWith: { suffix: 'Publisher' } },
+          extract: {
+            publishedEventType: { fromParameterType: { position: 0 } },
+            targetDomain: { fromMethodName: true as const },
+            targetApi: { fromClassName: true as const },
+          },
+        },
+      },
+    }
+    const connections = {
+      eventPublishers: [{ fromType: 'eventPublisher', metadataKey: 'publishedEventType' }],
+      httpLinks: [
+        {
+          fromCustomType: 'eventPublisher',
+          matchDomainBy: 'targetDomain',
+          matchApiBy: ['targetApi'],
+        },
+      ],
+    }
+    const result = ValidatedConfiguration.parse({
+      $schema: 'schema.json',
+      modules: [orders],
+      connections,
+    })
+    const configuration = requireSuccessfulConfiguration(result)
+    const module = configuration.modules[0]
+    assert(module)
+
+    expect({
+      isValidatedModule: module instanceof ValidatedModule,
+      module: {
+        name: module.name,
+        domain: module.domain,
+        path: module.path,
+        glob: module.glob,
+        modules: module.modules,
+        api: module.api,
+        useCase: module.useCase,
+        domainOp: module.domainOp,
+        event: module.event,
+        eventHandler: module.eventHandler,
+        ui: module.ui,
+        customTypes: module.customTypes,
+        selectedRule: module.ruleFor('api'),
+      },
+      connections: configuration.connections,
+      schema: configuration.schema,
+    }).toStrictEqual({
+      isValidatedModule: true,
+      module: {
+        name: 'orders',
+        domain: 'orders',
+        path: 'orders',
+        glob: '**/*.ts',
+        modules: 'src/{module}',
+        api: notUsed,
+        useCase: notUsed,
+        domainOp: notUsed,
+        event: notUsed,
+        eventHandler: notUsed,
+        ui: notUsed,
+        customTypes: orders.customTypes,
+        selectedRule: notUsed,
+      },
+      connections,
+      schema: 'schema.json',
+    })
+  })
+
+  it('returns failures from every built-in component rule', () => {
+    const missingExtraction = {
+      find: 'methods' as const,
+      where: { nameEndsWith: { suffix: 'Thing' } },
+    }
+    const result = ValidatedModule.parse({
+      ...validModule('orders'),
+      api: missingExtraction,
+      useCase: missingExtraction,
+      domainOp: missingExtraction,
+      event: missingExtraction,
+      eventHandler: missingExtraction,
+      ui: missingExtraction,
+    })
+
+    expect(result).toStrictEqual({
+      success: false,
+      errors: [
+        expect.objectContaining({ path: '/api' }),
+        expect.objectContaining({ path: '/domainOp' }),
+        expect.objectContaining({ path: '/event' }),
+        expect.objectContaining({ path: '/eventHandler' }),
+        expect.objectContaining({ path: '/ui' }),
+      ],
+    })
+  })
+
+  it('returns every invalid connection reference', () => {
+    const result = ValidatedConfiguration.parse({
+      modules: [
+        {
+          ...validModule('orders'),
+          customTypes: {
+            publisher: {
+              find: 'methods',
+              where: { nameEndsWith: { suffix: 'Publisher' } },
+              extract: { available: { fromMethodName: true } },
+            },
+          },
+        },
+      ],
+      connections: {
+        eventPublishers: [
+          { fromType: 'missing', metadataKey: 'event' },
+          { fromType: 'publisher', metadataKey: 'missing' },
+        ],
+        httpLinks: [
+          { fromCustomType: 'missing', matchDomainBy: 'domain', matchApiBy: [] },
+          {
+            fromCustomType: 'publisher',
+            matchDomainBy: 'missingDomain',
+            matchApiBy: ['available', 'missingApi'],
+          },
+        ],
+      },
+    })
+
+    expect(result).toStrictEqual({
+      success: false,
+      errors: [
+        expect.objectContaining({ path: '/connections/eventPublishers/0/fromType' }),
+        expect.objectContaining({ path: '/connections/eventPublishers/1/metadataKey' }),
+        expect.objectContaining({ path: '/connections/httpLinks/0/fromCustomType' }),
+        expect.objectContaining({ path: '/connections/httpLinks/1' }),
+        expect.objectContaining({ path: '/connections/httpLinks/1' }),
+      ],
+    })
+  })
+
+  it('accepts optional connection sections and custom types spread across modules', () => {
+    const emptyConnections = ValidatedConfiguration.parse({
+      modules: [validModule('orders')],
+      connections: {},
+    })
+    const distributedCustomType = ValidatedConfiguration.parse({
+      modules: [
+        {
+          ...validModule('orders'),
+          customTypes: {
+            shared: {
+              find: 'methods',
+              where: { nameEndsWith: { suffix: 'First' } },
+            },
+          },
+        },
+        {
+          ...validModule('shipping'),
+          customTypes: {
+            shared: {
+              find: 'methods',
+              where: { nameEndsWith: { suffix: 'Second' } },
+              extract: { event: { fromMethodName: true } },
+            },
+          },
+        },
+      ],
+      connections: {
+        eventPublishers: [{ fromType: 'shared', metadataKey: 'event' }],
+      },
+    })
+
+    expect([emptyConnections.success, distributedCustomType.success]).toStrictEqual([true, true])
+  })
+
+  it('does not allow an object literal to represent a validated module', () => {
+    const candidate = validModule('orders')
+
+    // @ts-expect-error A candidate has not passed through ValidatedModule.parse.
+    const validated: ValidatedModule = candidate
+
+    expect(validated).toBe(candidate)
+  })
+})
diff --git a/packages/riviere-extract-config/published-language/src/published-language/validated-configuration.ts b/packages/riviere-extract-config/published-language/src/published-language/validated-configuration.ts
new file mode 100644
index 000000000..62d778547
--- /dev/null
+++ b/packages/riviere-extract-config/published-language/src/published-language/validated-configuration.ts
@@ -0,0 +1,245 @@
+import type {
+  ComponentRule,
+  ComponentType,
+  ConnectionsConfig,
+  CustomTypes,
+  ValidatedConfigurationInput,
+  ValidatedModuleInput,
+} from './extraction-config-schema'
+import type { ValidationError } from './validation'
+
+const REQUIRED_FIELDS: Record<ComponentType, readonly string[]> = {
+  api: ['apiType'],
+  useCase: [],
+  domainOp: ['operationName'],
+  event: ['eventName'],
+  eventHandler: ['subscribedEvents'],
+  ui: ['route'],
+}
+
+const COMPONENT_TYPES: readonly ComponentType[] = [
+  'api',
+  'useCase',
+  'domainOp',
+  'event',
+  'eventHandler',
+  'ui',
+]
+
+type ValidatedModuleParseResult =
+  | { success: true; data: ValidatedModule }
+  | { success: false; errors: ValidationError[] }
+
+/** @riviere-role value-object */
+export class ValidatedModule {
+  declare private readonly brand: 'ValidatedModule'
+  readonly #values: Readonly<ValidatedModuleInput>
+
+  private constructor(values: Readonly<ValidatedModuleInput>) {
+    this.#values = values
+  }
+
+  static parse(input: Readonly<ValidatedModuleInput>): ValidatedModuleParseResult {
+    const errors = validateModule(input)
+    if (errors.length > 0) {
+      return { success: false, errors }
+    }
+    return { success: true, data: new ValidatedModule(input) }
+  }
+
+  get name(): string {
+    return this.#values.name
+  }
+
+  get domain(): string {
+    return this.#values.domain
+  }
+
+  get path(): string {
+    return this.#values.path
+  }
+
+  get glob(): string {
+    return this.#values.glob
+  }
+
+  get modules(): string | undefined {
+    return this.#values.modules
+  }
+
+  get api(): ComponentRule {
+    return this.#values.api
+  }
+
+  get useCase(): ComponentRule {
+    return this.#values.useCase
+  }
+
+  get domainOp(): ComponentRule {
+    return this.#values.domainOp
+  }
+
+  get event(): ComponentRule {
+    return this.#values.event
+  }
+
+  get eventHandler(): ComponentRule {
+    return this.#values.eventHandler
+  }
+
+  get ui(): ComponentRule {
+    return this.#values.ui
+  }
+
+  get customTypes(): CustomTypes | undefined {
+    return this.#values.customTypes
+  }
+
+  ruleFor(componentType: ComponentType): ComponentRule {
+    return this.#values[componentType]
+  }
+}
+
+type ValidatedConfigurationParseResult =
+  | { success: true; data: ValidatedConfiguration }
+  | { success: false; errors: ValidationError[] }
+
+/** @riviere-role value-object */
+export class ValidatedConfiguration {
+  declare private readonly brand: 'ValidatedConfiguration'
+  readonly #modules: readonly ValidatedModule[]
+
+  private constructor(
+    modules: readonly ValidatedModule[],
+    readonly connections: ConnectionsConfig | undefined,
+    readonly schema: string | undefined,
+  ) {
+    this.#modules = modules
+  }
+
+  static parse(input: Readonly<ValidatedConfigurationInput>): ValidatedConfigurationParseResult {
+    const modules: ValidatedModule[] = []
+    const moduleErrors: ValidationError[] = []
+    input.modules.forEach((module, index) => {
+      const result = ValidatedModule.parse(module)
+      if (result.success) {
+        modules.push(result.data)
+        return
+      }
+      moduleErrors.push(
+        ...result.errors.map((error) => ({
+          ...error,
+          path: `/modules/${index}${error.path}`,
+        })),
+      )
+    })
+    const connectionErrors = validateConnections(input)
+    const errors = [...moduleErrors, ...connectionErrors]
+    if (errors.length > 0) {
+      return { success: false, errors }
+    }
+
+    return {
+      success: true,
+      data: new ValidatedConfiguration(modules, input.connections, input.$schema),
+    }
+  }
+
+  get modules(): readonly ValidatedModule[] {
+    return this.#modules
+  }
+}
+
+function validateModule(module: Readonly<ValidatedModuleInput>): ValidationError[] {
+  return COMPONENT_TYPES.flatMap((componentType) => {
+    const rule = module[componentType]
+    if ('notUsed' in rule) {
+      return []
+    }
+    const extractedFields = new Set(Object.keys(rule.extract ?? {}))
+    const missingFields = REQUIRED_FIELDS[componentType].filter(
+      (field) => !extractedFields.has(field),
+    )
+    return missingFields.length === 0
+      ? []
+      : [
+          {
+            path: `/${componentType}`,
+            message:
+              `Missing required extraction rules: ${missingFields.join(', ')}. ` +
+              `Add extraction rules to the 'extract' block or use 'notUsed: true' if not extracting ${componentType} components.`,
+          },
+        ]
+  })
+}
+
+function validateConnections(input: Readonly<ValidatedConfigurationInput>): ValidationError[] {
+  if (input.connections === undefined) return []
+
+  const customTypeFields = new Map<string, Set<string>>()
+  for (const module of input.modules) {
+    for (const [typeName, rule] of Object.entries(module.customTypes ?? {})) {
+      const fields = customTypeFields.get(typeName) ?? new Set<string>()
+      for (const field of Object.keys(rule.extract ?? {})) fields.add(field)
+      customTypeFields.set(typeName, fields)
+    }
+  }
+
+  return [
+    ...validateEventPublishers(input.connections, customTypeFields),
+    ...validateHttpLinks(input.connections, customTypeFields),
+  ]
+}
+
+function validateEventPublishers(
+  connections: ConnectionsConfig,
+  customTypeFields: ReadonlyMap<string, ReadonlySet<string>>,
+): ValidationError[] {
+  return (connections.eventPublishers ?? []).flatMap((publisher, index) => {
+    const fields = customTypeFields.get(publisher.fromType)
+    if (fields === undefined) {
+      return [
+        {
+          path: `/connections/eventPublishers/${index}/fromType`,
+          message: `"${publisher.fromType}" is not defined as a customType in any module.`,
+        },
+      ]
+    }
+    return fields.has(publisher.metadataKey)
+      ? []
+      : [
+          {
+            path: `/connections/eventPublishers/${index}/metadataKey`,
+            message: `customType "${publisher.fromType}" does not extract "${publisher.metadataKey}".`,
+          },
+        ]
+  })
+}
+
+function validateHttpLinks(
+  connections: ConnectionsConfig,
+  customTypeFields: ReadonlyMap<string, ReadonlySet<string>>,
+): ValidationError[] {
+  return (connections.httpLinks ?? []).flatMap((httpLink, index) => {
+    const fields = customTypeFields.get(httpLink.fromCustomType)
+    if (fields === undefined) {
+      return [
+        {
+          path: `/connections/httpLinks/${index}/fromCustomType`,
+          message: `"${httpLink.fromCustomType}" is not defined as a customType in any module.`,
+        },
+      ]
+    }
+    const requiredFields = [httpLink.matchDomainBy, ...httpLink.matchApiBy]
+    return requiredFields.flatMap((field) =>
+      fields.has(field)
+        ? []
+        : [
+            {
+              path: `/connections/httpLinks/${index}`,
+              message: `customType "${httpLink.fromCustomType}" does not extract "${field}".`,
+            },
+          ],
+    )
+  })
+}
diff --git a/packages/riviere-extract-config/src/validation-connections-event-publishers.spec.ts b/packages/riviere-extract-config/published-language/src/published-language/validation-connections-event-publishers.spec.ts
similarity index 96%
rename from packages/riviere-extract-config/src/validation-connections-event-publishers.spec.ts
rename to packages/riviere-extract-config/published-language/src/published-language/validation-connections-event-publishers.spec.ts
index 82d439c9f..57b5818a5 100644
--- a/packages/riviere-extract-config/src/validation-connections-event-publishers.spec.ts
+++ b/packages/riviere-extract-config/published-language/src/published-language/validation-connections-event-publishers.spec.ts
@@ -1,7 +1,8 @@
-import { validateExtractionConfig } from './validation'
 import {
-  createMinimalConfig, createMinimalModule 
-} from './validation-fixtures'
+  validateExtractionConfig,
+  createMinimalConfig,
+  createMinimalModule,
+} from './__fixtures__/validation-fixtures'
 
 describe('eventPublishers validation', () => {
   function configWithEventPublisher(
diff --git a/packages/riviere-extract-config/src/validation-connections-http-links.spec.ts b/packages/riviere-extract-config/published-language/src/published-language/validation-connections-http-links.spec.ts
similarity index 97%
rename from packages/riviere-extract-config/src/validation-connections-http-links.spec.ts
rename to packages/riviere-extract-config/published-language/src/published-language/validation-connections-http-links.spec.ts
index 2f01499cf..bcbdd742e 100644
--- a/packages/riviere-extract-config/src/validation-connections-http-links.spec.ts
+++ b/packages/riviere-extract-config/published-language/src/published-language/validation-connections-http-links.spec.ts
@@ -1,7 +1,8 @@
-import { validateExtractionConfig } from './validation'
 import {
-  createMinimalConfig, createMinimalModule 
-} from './validation-fixtures'
+  validateExtractionConfig,
+  createMinimalConfig,
+  createMinimalModule,
+} from './__fixtures__/validation-fixtures'
 
 describe('httpLinks validation', () => {
   function configWithHttpLink(fromCustomType: string) {
diff --git a/packages/riviere-extract-config/src/validation-extends.spec.ts b/packages/riviere-extract-config/published-language/src/published-language/validation-extends.spec.ts
similarity index 93%
rename from packages/riviere-extract-config/src/validation-extends.spec.ts
rename to packages/riviere-extract-config/published-language/src/published-language/validation-extends.spec.ts
index 6d1077a1e..cd79912db 100644
--- a/packages/riviere-extract-config/src/validation-extends.spec.ts
+++ b/packages/riviere-extract-config/published-language/src/published-language/validation-extends.spec.ts
@@ -1,5 +1,4 @@
-import { validateExtractionConfig } from './validation'
-import { createMinimalModule } from './validation-fixtures'
+import { validateExtractionConfig, createMinimalModule } from './__fixtures__/validation-fixtures'
 
 describe('module extends validation', () => {
   describe('valid configs with extends', () => {
@@ -11,7 +10,7 @@ describe('module extends validation', () => {
             domain: 'orders',
             path: 'orders',
             glob: '**',
-            extends: '@living-architecture/riviere-extract-conventions',
+            extends: '@living-architecture/riviere-extract-conventions-published-language',
           },
         ],
       })
@@ -41,7 +40,7 @@ describe('module extends validation', () => {
             domain: 'orders',
             path: 'orders',
             glob: '**',
-            extends: '@living-architecture/riviere-extract-conventions',
+            extends: '@living-architecture/riviere-extract-conventions-published-language',
             event: { notUsed: true },
           },
         ],
@@ -57,7 +56,7 @@ describe('module extends validation', () => {
             domain: 'orders',
             path: 'orders',
             glob: '**',
-            extends: '@living-architecture/riviere-extract-conventions',
+            extends: '@living-architecture/riviere-extract-conventions-published-language',
           },
           {
             ...createMinimalModule(),
@@ -80,7 +79,7 @@ describe('module extends validation', () => {
             domain: 'orders',
             path: 'orders',
             glob: '**',
-            extends: '@living-architecture/riviere-extract-conventions',
+            extends: '@living-architecture/riviere-extract-conventions-published-language',
           },
         ],
       })
@@ -94,7 +93,7 @@ describe('module extends validation', () => {
           {
             name: 'orders',
             domain: 'orders',
-            extends: '@living-architecture/riviere-extract-conventions',
+            extends: '@living-architecture/riviere-extract-conventions-published-language',
           },
         ],
       })
diff --git a/packages/riviere-extract-config/src/validation-extraction-rules.spec.ts b/packages/riviere-extract-config/published-language/src/published-language/validation-extraction-rules.spec.ts
similarity index 82%
rename from packages/riviere-extract-config/src/validation-extraction-rules.spec.ts
rename to packages/riviere-extract-config/published-language/src/published-language/validation-extraction-rules.spec.ts
index 383f2b239..dbf789d27 100644
--- a/packages/riviere-extract-config/src/validation-extraction-rules.spec.ts
+++ b/packages/riviere-extract-config/published-language/src/published-language/validation-extraction-rules.spec.ts
@@ -1,12 +1,12 @@
-import { validateExtractionConfigSchema } from './validation'
-import { createMutableConfig } from './validation-fixtures'
+import {
+  validateExtractionConfigSchema,
+  createMutableConfig,
+} from './__fixtures__/validation-fixtures'
 
 describe('extraction rules schema validation', () => {
   describe('literal extraction rule', () => {
     it('returns valid when extract block has literal with string value', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.api = {
         find: 'classes',
         where: { hasDecorator: { name: 'Controller' } },
@@ -16,9 +16,7 @@ describe('extraction rules schema validation', () => {
     })
 
     it('returns valid when literal has boolean value', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.api = {
         find: 'classes',
         where: { hasDecorator: { name: 'Controller' } },
@@ -28,9 +26,7 @@ describe('extraction rules schema validation', () => {
     })
 
     it('returns invalid when literal has empty string', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.api = {
         find: 'classes',
         where: { hasDecorator: { name: 'Controller' } },
@@ -42,9 +38,7 @@ describe('extraction rules schema validation', () => {
 
   describe('fromClassName extraction rule', () => {
     it('returns valid when fromClassName is true', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.api = {
         find: 'classes',
         where: { hasDecorator: { name: 'Controller' } },
@@ -54,9 +48,7 @@ describe('extraction rules schema validation', () => {
     })
 
     it('returns valid when fromClassName has transform', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.api = {
         find: 'classes',
         where: { hasDecorator: { name: 'Controller' } },
@@ -66,9 +58,7 @@ describe('extraction rules schema validation', () => {
     })
 
     it('returns invalid when fromClassName is false', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.api = {
         find: 'classes',
         where: { hasDecorator: { name: 'Controller' } },
@@ -80,9 +70,7 @@ describe('extraction rules schema validation', () => {
 
   describe('fromMethodName extraction rule', () => {
     it('returns valid when fromMethodName is true', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.api = {
         find: 'methods',
         where: { hasDecorator: { name: 'Get' } },
@@ -92,9 +80,7 @@ describe('extraction rules schema validation', () => {
     })
 
     it('returns invalid when fromMethodName is false', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.api = {
         find: 'methods',
         where: { hasDecorator: { name: 'Get' } },
@@ -106,9 +92,7 @@ describe('extraction rules schema validation', () => {
 
   describe('fromFilePath extraction rule', () => {
     it('returns valid when fromFilePath has pattern and capture', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.api = {
         find: 'classes',
         where: { hasDecorator: { name: 'Controller' } },
@@ -125,9 +109,7 @@ describe('extraction rules schema validation', () => {
     })
 
     it('returns invalid when fromFilePath missing pattern', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.api = {
         find: 'classes',
         where: { hasDecorator: { name: 'Controller' } },
@@ -137,9 +119,7 @@ describe('extraction rules schema validation', () => {
     })
 
     it('returns invalid when fromFilePath missing capture', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.api = {
         find: 'classes',
         where: { hasDecorator: { name: 'Controller' } },
@@ -151,9 +131,7 @@ describe('extraction rules schema validation', () => {
 
   describe('fromProperty extraction rule', () => {
     it('returns valid when fromProperty has name and static kind', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.ui = {
         find: 'classes',
         where: { hasDecorator: { name: 'Page' } },
@@ -170,9 +148,7 @@ describe('extraction rules schema validation', () => {
     })
 
     it('returns valid when fromProperty has instance kind', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.event = {
         find: 'classes',
         where: { extendsClass: { name: 'DomainEvent' } },
@@ -189,9 +165,7 @@ describe('extraction rules schema validation', () => {
     })
 
     it('returns invalid when fromProperty has invalid kind', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.ui = {
         find: 'classes',
         where: { hasDecorator: { name: 'Page' } },
@@ -210,9 +184,7 @@ describe('extraction rules schema validation', () => {
 
   describe('fromDecoratorArg extraction rule', () => {
     it('returns valid when fromDecoratorArg has position', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.api = {
         find: 'methods',
         where: { hasDecorator: { name: 'Get' } },
@@ -222,9 +194,7 @@ describe('extraction rules schema validation', () => {
     })
 
     it('returns valid when fromDecoratorArg has name', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.api = {
         find: 'methods',
         where: { hasDecorator: { name: 'Get' } },
@@ -234,9 +204,7 @@ describe('extraction rules schema validation', () => {
     })
 
     it('returns invalid when fromDecoratorArg is empty', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.api = {
         find: 'methods',
         where: { hasDecorator: { name: 'Get' } },
@@ -248,9 +216,7 @@ describe('extraction rules schema validation', () => {
 
   describe('fromDecoratorName extraction rule', () => {
     it('returns valid when fromDecoratorName is true', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.api = {
         find: 'methods',
         where: { hasDecorator: { name: ['Get', 'Post'] } },
@@ -260,9 +226,7 @@ describe('extraction rules schema validation', () => {
     })
 
     it('returns valid when fromDecoratorName has mapping', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.api = {
         find: 'methods',
         where: { hasDecorator: { name: ['Get', 'Post'] } },
@@ -283,9 +247,7 @@ describe('extraction rules schema validation', () => {
 
   describe('fromGenericArg extraction rule', () => {
     it('returns valid when fromGenericArg has interface and position', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.eventHandler = {
         find: 'classes',
         where: { implementsInterface: { name: 'IEventHandler' } },
@@ -302,9 +264,7 @@ describe('extraction rules schema validation', () => {
     })
 
     it('returns invalid when fromGenericArg missing interface', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.eventHandler = {
         find: 'classes',
         where: { implementsInterface: { name: 'IEventHandler' } },
@@ -323,13 +283,9 @@ describe('extraction rules schema validation', () => {
       rule: 'fromConstructorParams',
       field: 'eventSchema',
     },
-  ])('$rule extraction rule', ({
-    rule, field 
-  }) => {
+  ])('$rule extraction rule', ({ rule, field }) => {
     it('returns valid when true', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.api = {
         find: 'methods',
         where: { hasDecorator: { name: 'Get' } },
@@ -339,9 +295,7 @@ describe('extraction rules schema validation', () => {
     })
 
     it('returns invalid when false', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.api = {
         find: 'methods',
         where: { hasDecorator: { name: 'Get' } },
@@ -353,9 +307,7 @@ describe('extraction rules schema validation', () => {
 
   describe('fromParameterType extraction rule', () => {
     it('returns valid when fromParameterType has position', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.useCase = {
         find: 'methods',
         where: { hasDecorator: { name: 'Execute' } },
@@ -365,9 +317,7 @@ describe('extraction rules schema validation', () => {
     })
 
     it('returns invalid when fromParameterType missing position', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.useCase = {
         find: 'methods',
         where: { hasDecorator: { name: 'Execute' } },
@@ -377,9 +327,7 @@ describe('extraction rules schema validation', () => {
     })
 
     it('returns invalid when fromParameterType has negative position', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
+      const { config, module } = createMutableConfig()
       module.useCase = {
         find: 'methods',
         where: { hasDecorator: { name: 'Execute' } },
diff --git a/packages/riviere-extract-config/src/validation-from-class-decorator-arg.spec.ts b/packages/riviere-extract-config/published-language/src/published-language/validation-from-class-decorator-arg.spec.ts
similarity index 89%
rename from packages/riviere-extract-config/src/validation-from-class-decorator-arg.spec.ts
rename to packages/riviere-extract-config/published-language/src/published-language/validation-from-class-decorator-arg.spec.ts
index 49680aa84..88ab3cd2d 100644
--- a/packages/riviere-extract-config/src/validation-from-class-decorator-arg.spec.ts
+++ b/packages/riviere-extract-config/published-language/src/published-language/validation-from-class-decorator-arg.spec.ts
@@ -1,11 +1,11 @@
-import { validateExtractionConfigSchema } from './validation'
-import { createMutableConfig } from './validation-fixtures'
+import {
+  validateExtractionConfigSchema,
+  createMutableConfig,
+} from './__fixtures__/validation-fixtures'
 
 describe('fromClassDecoratorArg extraction rule schema validation', () => {
   it('returns valid when decorator and position are provided', () => {
-    const {
-      config, module 
-    } = createMutableConfig()
+    const { config, module } = createMutableConfig()
 
     module.api = {
       find: 'methods',
@@ -24,9 +24,7 @@ describe('fromClassDecoratorArg extraction rule schema validation', () => {
   })
 
   it('returns invalid when decorator is missing', () => {
-    const {
-      config, module 
-    } = createMutableConfig()
+    const { config, module } = createMutableConfig()
 
     module.api = {
       find: 'methods',
@@ -41,9 +39,7 @@ describe('fromClassDecoratorArg extraction rule schema validation', () => {
   })
 
   it('returns invalid when neither position nor name is provided', () => {
-    const {
-      config, module 
-    } = createMutableConfig()
+    const { config, module } = createMutableConfig()
 
     module.api = {
       find: 'methods',
@@ -62,9 +58,7 @@ describe('fromClassDecoratorArg extraction rule schema validation', () => {
   })
 
   it('returns invalid when both position and name are provided', () => {
-    const {
-      config, module 
-    } = createMutableConfig()
+    const { config, module } = createMutableConfig()
 
     module.api = {
       find: 'methods',
diff --git a/packages/riviere-extract-config/src/validation-required-fields.spec.ts b/packages/riviere-extract-config/published-language/src/published-language/validation-required-fields.spec.ts
similarity index 80%
rename from packages/riviere-extract-config/src/validation-required-fields.spec.ts
rename to packages/riviere-extract-config/published-language/src/published-language/validation-required-fields.spec.ts
index 5c90237f8..087863f99 100644
--- a/packages/riviere-extract-config/src/validation-required-fields.spec.ts
+++ b/packages/riviere-extract-config/published-language/src/published-language/validation-required-fields.spec.ts
@@ -1,11 +1,8 @@
-import { validateExtractionConfig } from './validation'
-import { createMutableConfig } from './validation-fixtures'
+import { validateExtractionConfig, createMutableConfig } from './__fixtures__/validation-fixtures'
 
 describe('required extraction rules validation', () => {
   it('returns error when api detection defined but apiType extraction missing', () => {
-    const {
-      config, module 
-    } = createMutableConfig()
+    const { config, module } = createMutableConfig()
     module.api = {
       find: 'classes',
       where: { hasDecorator: { name: 'Controller' } },
@@ -17,9 +14,7 @@ describe('required extraction rules validation', () => {
   })
 
   it('returns valid when api detection has required apiType extraction', () => {
-    const {
-      config, module 
-    } = createMutableConfig()
+    const { config, module } = createMutableConfig()
     module.api = {
       find: 'classes',
       where: { hasDecorator: { name: 'Controller' } },
@@ -29,9 +24,7 @@ describe('required extraction rules validation', () => {
   })
 
   it('returns error when event detection defined but eventName extraction missing', () => {
-    const {
-      config, module 
-    } = createMutableConfig()
+    const { config, module } = createMutableConfig()
     module.event = {
       find: 'classes',
       where: { extendsClass: { name: 'DomainEvent' } },
@@ -42,9 +35,7 @@ describe('required extraction rules validation', () => {
   })
 
   it('returns error when eventHandler detection defined but subscribedEvents missing', () => {
-    const {
-      config, module 
-    } = createMutableConfig()
+    const { config, module } = createMutableConfig()
     module.eventHandler = {
       find: 'classes',
       where: { implementsInterface: { name: 'IEventHandler' } },
@@ -55,9 +46,7 @@ describe('required extraction rules validation', () => {
   })
 
   it('returns error when domainOp detection defined but operationName missing', () => {
-    const {
-      config, module 
-    } = createMutableConfig()
+    const { config, module } = createMutableConfig()
     module.domainOp = {
       find: 'functions',
       where: { hasJSDoc: { tag: 'domainOp' } },
@@ -68,9 +57,7 @@ describe('required extraction rules validation', () => {
   })
 
   it('returns error when ui detection defined but route extraction missing', () => {
-    const {
-      config, module 
-    } = createMutableConfig()
+    const { config, module } = createMutableConfig()
     module.ui = {
       find: 'classes',
       where: { hasDecorator: { name: 'Page' } },
@@ -81,9 +68,7 @@ describe('required extraction rules validation', () => {
   })
 
   it('returns valid when useCase detection has no extraction rules (none required)', () => {
-    const {
-      config, module 
-    } = createMutableConfig()
+    const { config, module } = createMutableConfig()
     module.useCase = {
       find: 'classes',
       where: { hasDecorator: { name: 'UseCase' } },
@@ -92,17 +77,13 @@ describe('required extraction rules validation', () => {
   })
 
   it('skips validation when component type is notUsed', () => {
-    const {
-      config, module 
-    } = createMutableConfig()
+    const { config, module } = createMutableConfig()
     module.api = { notUsed: true }
     expect(validateExtractionConfig(config).valid).toBe(true)
   })
 
   it('error message suggests adding extraction rules or using notUsed', () => {
-    const {
-      config, module 
-    } = createMutableConfig()
+    const { config, module } = createMutableConfig()
     module.api = {
       find: 'classes',
       where: { hasDecorator: { name: 'Controller' } },
@@ -113,7 +94,7 @@ describe('required extraction rules validation', () => {
   })
 
   it('skips validation for $ref module references', () => {
-    const config = {modules: [{ $ref: './domains/orders.extraction.json' }],}
+    const config = { modules: [{ $ref: './domains/orders.extraction.json' }] }
     expect(validateExtractionConfig(config).valid).toBe(true)
   })
 })
diff --git a/packages/riviere-extract-config/src/validation-transforms.spec.ts b/packages/riviere-extract-config/published-language/src/published-language/validation-transforms.spec.ts
similarity index 77%
rename from packages/riviere-extract-config/src/validation-transforms.spec.ts
rename to packages/riviere-extract-config/published-language/src/published-language/validation-transforms.spec.ts
index 3041b71fd..a73b1438f 100644
--- a/packages/riviere-extract-config/src/validation-transforms.spec.ts
+++ b/packages/riviere-extract-config/published-language/src/published-language/validation-transforms.spec.ts
@@ -1,11 +1,11 @@
-import { validateExtractionConfigSchema } from './validation'
-import { createMutableConfig } from './validation-fixtures'
+import {
+  validateExtractionConfigSchema,
+  createMutableConfig,
+} from './__fixtures__/validation-fixtures'
 
 describe('extraction transform rules schema validation', () => {
   it('returns valid when multiple transforms applied', () => {
-    const {
-      config, module 
-    } = createMutableConfig()
+    const { config, module } = createMutableConfig()
     module.api = {
       find: 'classes',
       where: { hasDecorator: { name: 'Controller' } },
@@ -24,9 +24,7 @@ describe('extraction transform rules schema validation', () => {
   })
 
   it('returns invalid when unknown transform used', () => {
-    const {
-      config, module 
-    } = createMutableConfig()
+    const { config, module } = createMutableConfig()
     module.api = {
       find: 'classes',
       where: { hasDecorator: { name: 'Controller' } },
diff --git a/packages/riviere-extract-config/published-language/src/published-language/validation.spec.ts b/packages/riviere-extract-config/published-language/src/published-language/validation.spec.ts
new file mode 100644
index 000000000..f22d75c07
--- /dev/null
+++ b/packages/riviere-extract-config/published-language/src/published-language/validation.spec.ts
@@ -0,0 +1,289 @@
+import {
+  validateExtractionConfig,
+  validateExtractionConfigSchema,
+  createMinimalConfig,
+  createMinimalModule,
+  createModuleWithoutPath,
+  createModuleWithoutApi,
+  createMutableConfig,
+} from './__fixtures__/validation-fixtures'
+import type { DraftConfiguration } from './extraction-config-schema'
+
+describe('validateExtractionConfig', () => {
+  describe('valid configs', () => {
+    it('returns valid=true and empty errors when config is valid', () => {
+      const result = validateExtractionConfig(createMinimalConfig())
+      expect(result.valid).toBe(true)
+      expect(result.errors).toStrictEqual([])
+    })
+
+    it('returns valid=true when using nameEndsWith predicate', () => {
+      const { config, module } = createMutableConfig()
+      module.api = {
+        find: 'classes',
+        where: { nameEndsWith: { suffix: 'Controller' } },
+      }
+      expect(validateExtractionConfigSchema(config).valid).toBe(true)
+    })
+
+    it('returns valid=true when using nameMatches predicate', () => {
+      const { config, module } = createMutableConfig()
+      module.api = {
+        find: 'classes',
+        where: { nameMatches: { pattern: '^.*Controller$' } },
+      }
+      expect(validateExtractionConfigSchema(config).valid).toBe(true)
+    })
+
+    it('returns valid=true when using inClassWith predicate', () => {
+      const { config, module } = createMutableConfig()
+      module.api = {
+        find: 'methods',
+        where: { inClassWith: { hasDecorator: { name: 'Controller' } } },
+      }
+      expect(validateExtractionConfigSchema(config).valid).toBe(true)
+    })
+
+    it('returns valid=true when using and predicate', () => {
+      const { config, module } = createMutableConfig()
+      module.api = {
+        find: 'methods',
+        where: {
+          and: [
+            { hasDecorator: { name: 'Get' } },
+            { inClassWith: { hasDecorator: { name: 'Controller' } } },
+          ],
+        },
+      }
+      expect(validateExtractionConfigSchema(config).valid).toBe(true)
+    })
+
+    it('returns valid=true when using or predicate', () => {
+      const { config, module } = createMutableConfig()
+      module.api = {
+        find: 'methods',
+        where: { or: [{ hasDecorator: { name: 'Get' } }, { hasDecorator: { name: 'Post' } }] },
+      }
+      expect(validateExtractionConfigSchema(config).valid).toBe(true)
+    })
+
+    it('returns valid=true when using nested and/or predicates', () => {
+      const { config, module } = createMutableConfig()
+      module.api = {
+        find: 'methods',
+        where: {
+          and: [
+            { or: [{ hasDecorator: { name: 'Get' } }, { hasDecorator: { name: 'Post' } }] },
+            { inClassWith: { hasDecorator: { name: 'Controller' } } },
+          ],
+        },
+      }
+      expect(validateExtractionConfigSchema(config).valid).toBe(true)
+    })
+
+    it('returns valid=true with multiple modules', () => {
+      const config: DraftConfiguration = {
+        modules: [
+          {
+            ...createMinimalModule(),
+            path: 'orders',
+            glob: '**',
+          },
+          {
+            ...createMinimalModule(),
+            path: 'inventory',
+            glob: '**',
+          },
+        ],
+      }
+      expect(validateExtractionConfig(config).valid).toBe(true)
+    })
+
+    it('returns valid=true when module has customTypes with detection rule', () => {
+      const result = validateExtractionConfig({
+        modules: [
+          {
+            ...createMinimalModule(),
+            customTypes: {
+              backgroundJob: {
+                find: 'functions',
+                where: { hasJSDoc: { tag: 'backgroundJob' } },
+              },
+            },
+          },
+        ],
+      })
+      expect(result.valid).toBe(true)
+    })
+
+    it('returns valid=true when customTypes is empty object', () => {
+      const result = validateExtractionConfig({
+        modules: [
+          {
+            ...createMinimalModule(),
+            customTypes: {},
+          },
+        ],
+      })
+      expect(result.valid).toBe(true)
+    })
+  })
+
+  describe('invalid configs', () => {
+    it('returns error when modules array is empty', () => {
+      const result = validateExtractionConfig({ modules: [] })
+      expect(result.valid).toBe(false)
+      expect(result.errors[0]?.path).toBe('/modules')
+    })
+
+    it('returns error when module path is missing', () => {
+      const result = validateExtractionConfig({ modules: [createModuleWithoutPath()] })
+      expect(result.valid).toBe(false)
+      expect(result.errors.some((e) => e.path.includes('/modules/0'))).toBe(true)
+    })
+
+    it('returns error when module path is empty string', () => {
+      const result = validateExtractionConfig({
+        modules: [
+          {
+            ...createMinimalModule(),
+            path: '',
+          },
+        ],
+      })
+      expect(result.valid).toBe(false)
+      expect(result.errors.some((e) => e.path.includes('/modules/0/path'))).toBe(true)
+    })
+
+    it('returns error when required component type is missing', () => {
+      const result = validateExtractionConfig({ modules: [createModuleWithoutApi()] })
+      expect(result.valid).toBe(false)
+      expect(result.errors.some((e) => e.path.includes('/modules/0'))).toBe(true)
+    })
+
+    it('returns error when find target is invalid', () => {
+      const result = validateExtractionConfig({
+        modules: [
+          {
+            ...createMinimalModule(),
+            api: {
+              find: 'invalid',
+              where: { hasDecorator: { name: 'Get' } },
+            },
+          },
+        ],
+      })
+      expect(result.valid).toBe(false)
+      expect(result.errors.some((e) => e.path.includes('/modules/0/api'))).toBe(true)
+    })
+
+    it('returns error when predicate is missing required field', () => {
+      const result = validateExtractionConfig({
+        modules: [
+          {
+            ...createMinimalModule(),
+            api: {
+              find: 'classes',
+              where: { hasDecorator: {} },
+            },
+          },
+        ],
+      })
+      expect(result.valid).toBe(false)
+    })
+
+    it('returns error when decorator name is empty string', () => {
+      const result = validateExtractionConfig({
+        modules: [
+          {
+            ...createMinimalModule(),
+            api: {
+              find: 'classes',
+              where: { hasDecorator: { name: '' } },
+            },
+          },
+        ],
+      })
+      expect(result.valid).toBe(false)
+    })
+
+    it.each([
+      ['and', { and: [{ hasDecorator: { name: 'Get' } }] }],
+      ['or', { or: [{ hasDecorator: { name: 'Get' } }] }],
+    ])('returns error when %s predicate has less than 2 items', (_, predicate) => {
+      const result = validateExtractionConfig({
+        modules: [
+          {
+            ...createMinimalModule(),
+            api: {
+              find: 'classes',
+              where: predicate,
+            },
+          },
+        ],
+      })
+      expect(result.valid).toBe(false)
+    })
+
+    it('returns error when unknown property exists on module', () => {
+      const result = validateExtractionConfig({
+        modules: [
+          {
+            ...createMinimalModule(),
+            unknownProp: 'value',
+          },
+        ],
+      })
+      expect(result.valid).toBe(false)
+    })
+
+    it('returns error when notUsed is false', () => {
+      const result = validateExtractionConfig({
+        modules: [
+          {
+            ...createMinimalModule(),
+            api: { notUsed: false },
+          },
+        ],
+      })
+      expect(result.valid).toBe(false)
+    })
+
+    it('returns multiple errors when config has multiple issues', () => {
+      const result = validateExtractionConfig({
+        modules: [
+          {
+            path: '',
+            api: { find: 'invalid' },
+            useCase: { notUsed: true },
+          },
+        ],
+      })
+      expect(result.valid).toBe(false)
+      expect(result.errors.length).toBeGreaterThan(1)
+    })
+
+    it.each([
+      ['missing find property', { where: { hasJSDoc: { tag: 'job' } } }],
+      ['missing where property', { find: 'functions' }],
+      [
+        'invalid find value',
+        {
+          find: 'invalid',
+          where: { hasJSDoc: { tag: 'job' } },
+        },
+      ],
+    ])('returns error when customTypes entry has %s', (_, invalidRule) => {
+      const result = validateExtractionConfig({
+        modules: [
+          {
+            ...createMinimalModule(),
+            customTypes: { job: invalidRule },
+          },
+        ],
+      })
+      expect(result.valid).toBe(false)
+      expect(result.errors.some((e) => e.path.includes('customTypes'))).toBe(true)
+    })
+  })
+})
diff --git a/packages/riviere-extract-config/published-language/src/published-language/validation.ts b/packages/riviere-extract-config/published-language/src/published-language/validation.ts
new file mode 100644
index 000000000..041e19c29
--- /dev/null
+++ b/packages/riviere-extract-config/published-language/src/published-language/validation.ts
@@ -0,0 +1,337 @@
+import Ajv from 'ajv'
+import addFormats from 'ajv-formats'
+import type {
+  ComponentRule,
+  ComponentType,
+  DraftConfiguration,
+  DraftModule,
+  ConnectionsConfig,
+} from './extraction-config-schema'
+import rawSchema from '../../extraction-config.schema.json' with { type: 'json' }
+
+/**
+ * Required extraction fields by component type.
+ * These fields must have extraction rules defined (unless notUsed: true).
+ */
+const REQUIRED_FIELDS: Record<ComponentType, string[]> = {
+  api: ['apiType'],
+  event: ['eventName'],
+  eventHandler: ['subscribedEvents'],
+  domainOp: ['operationName'],
+  ui: ['route'],
+  useCase: [],
+}
+
+const COMPONENT_TYPES: ComponentType[] = [
+  'api',
+  'useCase',
+  'domainOp',
+  'event',
+  'eventHandler',
+  'ui',
+]
+
+const ajv = new Ajv({ allErrors: true })
+addFormats(ajv)
+
+const validate = ajv.compile<DraftConfiguration>(rawSchema)
+
+/**
+ * Type guard checking if data is a valid DraftConfiguration.
+ * @param data - Data to validate.
+ * @returns True if data matches the schema.
+ */
+function isValidExtractionConfig(data: unknown): data is DraftConfiguration {
+  return validate(data) === true
+}
+
+/** A validation error with JSON path and message. */
+/** @riviere-role published-language-data-structure */
+export interface ValidationError {
+  path: string
+  message: string
+}
+
+/** Result of validating extraction config data. */
+interface ValidationResult {
+  valid: boolean
+  errors: ValidationError[]
+}
+
+/** Error thrown when extraction config validation fails. */
+interface AjvErrorLike {
+  instancePath: string
+  message?: string
+}
+
+/**
+ * Converts AJV errors to ValidationError format.
+ * @param errors - AJV validation errors.
+ * @returns Array of ValidationError objects.
+ */
+function mapAjvErrors(errors: AjvErrorLike[] | null | undefined): ValidationError[] {
+  /* v8 ignore start -- AJV supplies both the errors array and each error message after validation fails. */
+  if (!errors) {
+    return []
+  }
+  return errors.map((e) => ({
+    path: e.instancePath || '/',
+    message: e.message ?? 'unknown error',
+  }))
+  /* v8 ignore stop */
+}
+
+function isNotUsed(rule: ComponentRule | undefined): boolean {
+  return rule !== undefined && 'notUsed' in rule && rule.notUsed === true
+}
+
+function hasDetectionRule(rule: ComponentRule | undefined): boolean {
+  return rule !== undefined && 'find' in rule && 'where' in rule
+}
+
+function getExtractedFields(rule: ComponentRule | undefined): string[] {
+  if (!rule || !('extract' in rule) || !rule.extract) {
+    return []
+  }
+  return Object.keys(rule.extract)
+}
+
+function validateModuleExtractionRules(
+  module: DraftModule,
+  moduleIndex: number,
+): ValidationError[] {
+  const errors: ValidationError[] = []
+
+  for (const componentType of COMPONENT_TYPES) {
+    const rule = module[componentType]
+
+    if (isNotUsed(rule)) {
+      continue
+    }
+
+    if (!hasDetectionRule(rule)) {
+      continue
+    }
+
+    const requiredFields = REQUIRED_FIELDS[componentType]
+    if (requiredFields.length === 0) {
+      continue
+    }
+
+    const extractedFields = getExtractedFields(rule)
+    const missingFields = requiredFields.filter((field) => !extractedFields.includes(field))
+
+    if (missingFields.length > 0) {
+      errors.push({
+        path: `/modules/${moduleIndex}/${componentType}`,
+        message:
+          `Missing required extraction rules: ${missingFields.join(', ')}. ` +
+          `Add extraction rules to the 'extract' block or use 'notUsed: true' if not extracting ${componentType} components.`,
+      })
+    }
+  }
+
+  return errors
+}
+
+function validateAllExtractionRules(config: DraftConfiguration): ValidationError[] {
+  return config.modules.flatMap((module, index) => {
+    if ('$ref' in module) {
+      return []
+    }
+    return validateModuleExtractionRules(module, index)
+  })
+}
+
+function collectCustomTypeExtractedFields(config: DraftConfiguration): Map<string, Set<string>> {
+  const fieldsByType = new Map<string, Set<string>>()
+  for (const module of config.modules) {
+    if ('$ref' in module || module.customTypes === undefined) {
+      continue
+    }
+    for (const [typeName, rule] of Object.entries(module.customTypes)) {
+      const existing = fieldsByType.get(typeName) ?? new Set<string>()
+      for (const key of Object.keys(rule.extract ?? {})) {
+        existing.add(key)
+      }
+      fieldsByType.set(typeName, existing)
+    }
+  }
+  return fieldsByType
+}
+
+function validateEventPublishers(
+  connections: ConnectionsConfig,
+  customTypeFields: Map<string, Set<string>>,
+): ValidationError[] {
+  if (connections.eventPublishers === undefined) {
+    return []
+  }
+  return connections.eventPublishers.flatMap((publisher, index) => {
+    const extractedFields = customTypeFields.get(publisher.fromType)
+    if (extractedFields === undefined) {
+      return [
+        {
+          path: `/connections/eventPublishers/${index}/fromType`,
+          message:
+            `"${publisher.fromType}" is not defined as a customType in any module. ` +
+            `Add a customType named "${publisher.fromType}" to at least one module.`,
+        },
+      ]
+    }
+    if (!extractedFields.has(publisher.metadataKey)) {
+      return [
+        {
+          path: `/connections/eventPublishers/${index}/fromType`,
+          message:
+            `customType "${publisher.fromType}" does not extract "${publisher.metadataKey}". ` +
+            `Add extract["${publisher.metadataKey}"] to that custom type.`,
+        },
+      ]
+    }
+    return []
+  })
+}
+
+function validateHttpLinks(
+  connections: ConnectionsConfig,
+  customTypeFields: Map<string, Set<string>>,
+): ValidationError[] {
+  if (connections.httpLinks === undefined) {
+    return []
+  }
+  return connections.httpLinks.flatMap((httpLink, index) => {
+    const extractedFields = customTypeFields.get(httpLink.fromCustomType)
+    if (extractedFields === undefined) {
+      return [
+        {
+          path: `/connections/httpLinks/${index}/fromCustomType`,
+          message:
+            `"${httpLink.fromCustomType}" is not defined as a customType in any module. ` +
+            `Add a customType named "${httpLink.fromCustomType}" to at least one module.`,
+        },
+      ]
+    }
+    const errors: ValidationError[] = []
+    if (!extractedFields.has(httpLink.matchDomainBy)) {
+      errors.push({
+        path: `/connections/httpLinks/${index}/matchDomainBy`,
+        message:
+          `customType "${httpLink.fromCustomType}" does not extract "${httpLink.matchDomainBy}". ` +
+          `Add extract["${httpLink.matchDomainBy}"] to that custom type.`,
+      })
+    }
+    for (const field of httpLink.matchApiBy) {
+      if (!extractedFields.has(field)) {
+        errors.push({
+          path: `/connections/httpLinks/${index}/matchApiBy`,
+          message:
+            `customType "${httpLink.fromCustomType}" does not extract "${field}". ` +
+            `Add extract["${field}"] to that custom type.`,
+        })
+      }
+    }
+    return errors
+  })
+}
+
+function validateConnectionsConfig(config: DraftConfiguration): ValidationError[] {
+  if (config.connections === undefined) {
+    return []
+  }
+  const customTypeFields = collectCustomTypeExtractedFields(config)
+  return [
+    ...validateEventPublishers(config.connections, customTypeFields),
+    ...validateHttpLinks(config.connections, customTypeFields),
+  ]
+}
+
+/**
+ * Validates data against the DraftConfiguration JSON Schema only.
+ * Does NOT check semantic rules like required extraction fields.
+ * Use validateExtractionConfig() for full validation.
+ * @param data - Data to validate.
+ * @returns Validation result with errors if invalid.
+ */
+function validateExtractionConfigSchema(data: unknown): ValidationResult {
+  const schemaValid = validate(data) === true
+  if (!schemaValid) {
+    return {
+      valid: false,
+      errors: mapAjvErrors(validate.errors),
+    }
+  }
+
+  return {
+    valid: true,
+    errors: [],
+  }
+}
+
+/**
+ * Validates data against the DraftConfiguration schema.
+ * Performs both JSON Schema validation and semantic validation
+ * for required extraction rules.
+ * @param data - Data to validate.
+ * @returns Validation result with errors if invalid.
+ */
+function validateExtractionConfig(data: unknown): ValidationResult {
+  // Type guard validates schema AND narrows type in one step
+  if (!isValidExtractionConfig(data)) {
+    // Get detailed error messages from schema validation
+    return validateExtractionConfigSchema(data)
+  }
+
+  // data is now narrowed to DraftConfiguration
+  const semanticErrors = [...validateAllExtractionRules(data), ...validateConnectionsConfig(data)]
+
+  if (semanticErrors.length > 0) {
+    return {
+      valid: false,
+      errors: semanticErrors,
+    }
+  }
+
+  return {
+    valid: true,
+    errors: [],
+  }
+}
+
+/**
+ * Parses an extraction configuration against the structural schema.
+ *
+ * @riviere-role published-language-parser
+ * @param data - Configuration value to parse
+ * @returns The draft configuration or its validation errors
+ */
+export function parseExtractionConfigSchema(
+  data: unknown,
+):
+  | { success: true; configuration: DraftConfiguration }
+  | { success: false; errors: ValidationError[] } {
+  const result = validateExtractionConfigSchema(data)
+  if (result.valid && isValidExtractionConfig(data)) {
+    return { success: true, configuration: data }
+  }
+  return { success: false, errors: result.errors }
+}
+
+/**
+ * Parses and semantically validates an extraction configuration.
+ *
+ * @riviere-role published-language-parser
+ * @param data - Configuration value to parse
+ * @returns The draft configuration or its validation errors
+ */
+export function parseExtractionConfig(
+  data: unknown,
+):
+  | { success: true; configuration: DraftConfiguration }
+  | { success: false; errors: ValidationError[] } {
+  const result = validateExtractionConfig(data)
+  if (result.valid && isValidExtractionConfig(data)) {
+    return { success: true, configuration: data }
+  }
+  return { success: false, errors: result.errors }
+}
diff --git a/packages/riviere-extract-config/published-language/tsconfig.json b/packages/riviere-extract-config/published-language/tsconfig.json
new file mode 100644
index 000000000..a71ccfae2
--- /dev/null
+++ b/packages/riviere-extract-config/published-language/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    },
+    {
+      "path": "./tsconfig.scripts.json"
+    }
+  ]
+}
diff --git a/packages/riviere-extract-config/published-language/tsconfig.lib.json b/packages/riviere-extract-config/published-language/tsconfig.lib.json
new file mode 100644
index 000000000..22ea854f9
--- /dev/null
+++ b/packages/riviere-extract-config/published-language/tsconfig.lib.json
@@ -0,0 +1,28 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "src",
+    "outDir": "dist",
+    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
+    "emitDeclarationOnly": false,
+    "forceConsistentCasingInFileNames": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": [
+    "vite.config.ts",
+    "vite.config.mts",
+    "vitest.config.ts",
+    "vitest.config.mts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx"
+  ],
+  "references": []
+}
diff --git a/packages/riviere-extract-config/tsconfig.scripts.json b/packages/riviere-extract-config/published-language/tsconfig.scripts.json
similarity index 86%
rename from packages/riviere-extract-config/tsconfig.scripts.json
rename to packages/riviere-extract-config/published-language/tsconfig.scripts.json
index 132d8b2e9..bdbc22cd5 100644
--- a/packages/riviere-extract-config/tsconfig.scripts.json
+++ b/packages/riviere-extract-config/published-language/tsconfig.scripts.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "module": "ESNext",
     "moduleResolution": "bundler",
diff --git a/packages/riviere-extract-config/published-language/tsconfig.spec.json b/packages/riviere-extract-config/published-language/tsconfig.spec.json
new file mode 100644
index 000000000..dd6f5b59d
--- /dev/null
+++ b/packages/riviere-extract-config/published-language/tsconfig.spec.json
@@ -0,0 +1,34 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/vitest",
+    "types": [
+      "vitest/globals",
+      "vitest/importMeta",
+      "vite/client",
+      "node",
+      "vitest"
+    ],
+    "forceConsistentCasingInFileNames": true
+  },
+  "include": [
+    "vite.config.ts",
+    "vite.config.mts",
+    "vitest.config.ts",
+    "vitest.config.mts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx",
+    "src/**/*.d.ts"
+  ],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    }
+  ]
+}
diff --git a/packages/riviere-extract-config/published-language/vite.config.ts b/packages/riviere-extract-config/published-language/vite.config.ts
new file mode 100644
index 000000000..046e1c05f
--- /dev/null
+++ b/packages/riviere-extract-config/published-language/vite.config.ts
@@ -0,0 +1,7 @@
+import { defineConfig } from 'vite'
+
+export default defineConfig(() => ({
+  root: import.meta.dirname,
+  cacheDir: '../../../node_modules/.vite/packages/riviere-extract-config',
+  plugins: [],
+}))
diff --git a/packages/riviere-extract-config/published-language/vitest.config.mts b/packages/riviere-extract-config/published-language/vitest.config.mts
new file mode 100644
index 000000000..d9c1c76cc
--- /dev/null
+++ b/packages/riviere-extract-config/published-language/vitest.config.mts
@@ -0,0 +1,32 @@
+import path from 'node:path'
+import { defineConfig } from 'vitest/config'
+
+const repoRoot = path.resolve(__dirname, '../../..')
+
+export default defineConfig(() => ({
+  root: __dirname,
+  cacheDir: '../../../node_modules/.vite/packages/riviere-extract-config',
+  test: {
+    name: '@living-architecture/riviere-extract-config-published-language',
+    watch: false,
+    globals: true,
+    environment: 'node',
+    include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+    reporters: ['default'],
+    coverage: {
+      enabled: true,
+      reportsDirectory: './test-output/vitest/coverage',
+      provider: 'v8' as const,
+      reporter: ['text', ['lcov', { projectRoot: repoRoot }]] as [
+        'text',
+        ['lcov', { projectRoot: string }],
+      ],
+      thresholds: {
+        lines: 100,
+        statements: 100,
+        functions: 100,
+        branches: 100,
+      },
+    },
+  },
+}))
diff --git a/packages/riviere-extract-config/scripts/generate-docs.ts b/packages/riviere-extract-config/scripts/generate-docs.ts
deleted file mode 100644
index a21376767..000000000
--- a/packages/riviere-extract-config/scripts/generate-docs.ts
+++ /dev/null
@@ -1,420 +0,0 @@
-#!/usr/bin/env tsx
-/**
- * Extraction Config Reference Documentation Generator
- *
- * Generates markdown documentation from JSON Schema definitions.
- * ALL content is derived from the schema - no hardcoded documentation.
- * Run with: pnpm exec tsx scripts/generate-docs.ts
- */
-
-import {
-  readFileSync, writeFileSync, mkdirSync 
-} from 'node:fs'
-import { join } from 'node:path'
-
-/** Error thrown when schema JSON does not match expected structure. */
-class InvalidSchemaFormatError extends Error {
-  constructor() {
-    super('Invalid schema format')
-    this.name = 'InvalidSchemaFormatError'
-  }
-}
-
-interface SchemaProperty {
-  type?: string
-  description?: string
-  oneOf?: SchemaProperty[]
-  $ref?: string
-  const?: unknown
-  minLength?: number
-  minItems?: number
-  items?: SchemaProperty
-  enum?: string[]
-  additionalProperties?: SchemaProperty | boolean
-}
-
-interface SchemaDef {
-  type?: string
-  description?: string
-  required?: string[]
-  additionalProperties?: boolean
-  properties?: Record<string, SchemaProperty>
-  oneOf?: SchemaProperty[]
-  items?: SchemaProperty
-  enum?: string[]
-  $ref?: string
-  minItems?: number
-}
-
-interface Schema {
-  $defs: Record<string, SchemaDef>
-  title?: string
-  description?: string
-  properties?: Record<string, SchemaProperty>
-  required?: string[]
-}
-
-function escapePipes(str: string): string {
-  return str.replaceAll('|', '\\|')
-}
-
-function resolveRef(schema: Schema, ref: string): SchemaDef | undefined {
-  const path = ref.replace('#/$defs/', '')
-  return schema.$defs[path]
-}
-
-function getRefTypeName(ref: string): string {
-  return ref.replace('#/$defs/', '')
-}
-
-function extractOneOfTypeNames(oneOf: SchemaProperty[]): string[] {
-  return oneOf.map((o) => {
-    if (o.$ref) return getRefTypeName(o.$ref)
-    if (o.type === 'array' && o.items) {
-      if (o.items.$ref) return `${getRefTypeName(o.items.$ref)}[]`
-      return `${o.items.type}[]`
-    }
-    return o.type ?? 'any'
-  })
-}
-
-function formatOneOfType(prop: SchemaProperty): string {
-  if (!prop.oneOf) return '`any`'
-  return extractOneOfTypeNames(prop.oneOf)
-    .map((t) => `\`${t}\``)
-    .join(' \\| ')
-}
-
-function formatArrayType(items: SchemaProperty): string {
-  if (items.$ref) return `\`${getRefTypeName(items.$ref)}[]\``
-  if (items.oneOf) {
-    const types = extractOneOfTypeNames(items.oneOf)
-    return `\`(${types.join(' \\| ')})[]\``
-  }
-  return `\`${items.type}[]\``
-}
-
-function formatRecordType(additionalProperties: SchemaProperty): string {
-  const valueType = additionalProperties.$ref
-    ? getRefTypeName(additionalProperties.$ref)
-    : (additionalProperties.type ?? 'unknown')
-  return `\`Record<string, ${valueType}>\``
-}
-
-function getTypeString(prop: SchemaProperty): string {
-  if (prop.$ref) {
-    return `\`${getRefTypeName(prop.$ref)}\``
-  }
-  if (prop.oneOf) {
-    return formatOneOfType(prop)
-  }
-  if (prop.type === 'array' && prop.items) {
-    return formatArrayType(prop.items)
-  }
-  if (prop.enum) {
-    return prop.enum.map((e) => `\`"${e}"\``).join(' \\| ')
-  }
-  if (prop.type === 'object' && typeof prop.additionalProperties === 'object') {
-    return formatRecordType(prop.additionalProperties)
-  }
-  return `\`${prop.type ?? 'any'}\``
-}
-
-function generatePropertiesTable(
-  properties: Record<string, SchemaProperty>,
-  required: string[] = [],
-): string[] {
-  const lines: string[] = []
-  lines.push('| Field | Type | Required | Description |')
-  lines.push('|-------|------|----------|-------------|')
-
-  for (const [propName, prop] of Object.entries(properties)) {
-    const isRequired = required.includes(propName) ? '**Yes**' : 'No'
-    const type = getTypeString(prop)
-    const desc = escapePipes(prop.description ?? '(no description)')
-    lines.push(`| \`${propName}\` | ${type} | ${isRequired} | ${desc} |`)
-  }
-  return lines
-}
-
-function generateDefMarkdown(name: string, def: SchemaDef, schema: Schema): string {
-  const lines: string[] = []
-
-  lines.push(`### \`${name}\``)
-  lines.push('')
-  if (def.description) {
-    lines.push(def.description)
-    lines.push('')
-  }
-
-  // Handle enum type definitions (like findTarget)
-  if (def.enum) {
-    lines.push('**Values:**')
-    lines.push('')
-    for (const val of def.enum) {
-      lines.push(`- \`"${val}"\``)
-    }
-    lines.push('')
-  }
-
-  if (def.properties && Object.keys(def.properties).length > 0) {
-    lines.push('**Properties:**')
-    lines.push('')
-    lines.push(...generatePropertiesTable(def.properties, def.required))
-    lines.push('')
-  }
-
-  if (def.oneOf) {
-    lines.push('**One of:**')
-    lines.push('')
-    for (const option of def.oneOf) {
-      if (option.$ref) {
-        const refName = getRefTypeName(option.$ref)
-        const refDef = resolveRef(schema, option.$ref)
-        lines.push(`- \`${refName}\` — ${escapePipes(refDef?.description ?? '(no description)')}`)
-      }
-    }
-    lines.push('')
-  }
-
-  lines.push('---')
-  lines.push('')
-
-  return lines.join('\n')
-}
-
-function isPredicateDef(name: string): boolean {
-  return name.endsWith('Predicate')
-}
-
-function generatePredicateOverview(predicateDef: SchemaDef, schema: Schema): string[] {
-  const lines: string[] = []
-  if (!predicateDef.oneOf) return lines
-
-  lines.push('## Overview')
-  lines.push('')
-  lines.push('| Predicate | Description |')
-  lines.push('|-----------|-------------|')
-
-  for (const option of predicateDef.oneOf) {
-    if (option.$ref) {
-      const refName = getRefTypeName(option.$ref)
-      const refDef = resolveRef(schema, option.$ref)
-      const predicateKey = refName.replace('Predicate', '')
-      const key = predicateKey.charAt(0).toLowerCase() + predicateKey.slice(1)
-      lines.push(`| \`${key}\` | ${escapePipes(refDef?.description ?? '(no description)')} |`)
-    }
-  }
-  lines.push('')
-  lines.push('---')
-  lines.push('')
-
-  return lines
-}
-
-function isSchemaDef(value: unknown): value is SchemaDef {
-  return (
-    typeof value === 'object' &&
-    value !== null &&
-    ('properties' in value || 'type' in value || 'oneOf' in value || '$ref' in value)
-  )
-}
-
-function generateRefPredicateTable(innerProp: SchemaDef): string[] {
-  const lines: string[] = []
-  lines.push('**Parameters:**')
-  lines.push('')
-  lines.push('| Field | Type | Required | Description |')
-  lines.push('|-------|------|----------|-------------|')
-  if (!innerProp.$ref) {
-    throw new InvalidSchemaFormatError()
-  }
-  const refName = getRefTypeName(innerProp.$ref)
-  const desc = escapePipes(innerProp.description ?? `Nested ${refName}`)
-  lines.push(`| (nested) | \`${refName}\` | **Yes** | ${desc} |`)
-  lines.push('')
-  return lines
-}
-
-function generateArrayPredicateTable(innerProp: SchemaDef): string[] {
-  const lines: string[] = []
-  lines.push('**Parameters:**')
-  lines.push('')
-  lines.push('| Field | Type | Required | Description |')
-  lines.push('|-------|------|----------|-------------|')
-  const itemType = innerProp.items?.$ref
-    ? getRefTypeName(innerProp.items.$ref)
-    : (innerProp.items?.type ?? 'any')
-  const minItems = innerProp.minItems ?? 1
-  const desc = escapePipes(innerProp.description ?? `Array of ${itemType}`)
-  lines.push(`| (array) | \`${itemType}[]\` | **Yes** (min: ${minItems}) | ${desc} |`)
-  lines.push('')
-  return lines
-}
-
-function generatePredicateParameters(def: SchemaDef): string[] {
-  const outerProps = def.properties ?? {}
-  const innerPropName = Object.keys(outerProps)[0]
-  if (!innerPropName) return []
-
-  const innerProp = outerProps[innerPropName]
-  if (!isSchemaDef(innerProp)) return []
-
-  // Handle nested object with properties (hasDecorator, hasJSDoc, etc.)
-  if (innerProp.properties && Object.keys(innerProp.properties).length > 0) {
-    const lines: string[] = []
-    lines.push('**Parameters:**')
-    lines.push('')
-    lines.push(...generatePropertiesTable(innerProp.properties, innerProp.required))
-    lines.push('')
-    return lines
-  }
-
-  // Handle $ref predicates (inClassWith)
-  if (innerProp.$ref) {
-    return generateRefPredicateTable(innerProp)
-  }
-
-  // Handle array predicates (and, or)
-  if (innerProp.type === 'array' && innerProp.items) {
-    return generateArrayPredicateTable(innerProp)
-  }
-
-  return []
-}
-
-function generatePredicateSection(name: string, def: SchemaDef): string[] {
-  const lines: string[] = []
-  const predicateKey = name.replace('Predicate', '')
-  const key = predicateKey.charAt(0).toLowerCase() + predicateKey.slice(1)
-
-  lines.push(`### \`${key}\``)
-  lines.push('')
-  if (def.description) {
-    lines.push(def.description)
-    lines.push('')
-  }
-
-  lines.push(...generatePredicateParameters(def))
-  lines.push('---')
-  lines.push('')
-
-  return lines
-}
-
-function generatePredicatesReference(schema: Schema): string {
-  const lines: string[] = []
-
-  lines.push('---')
-  lines.push('pageClass: reference')
-  lines.push('---')
-  lines.push('')
-  lines.push('# Predicate Reference')
-  lines.push('')
-
-  const predicateDef = schema.$defs['predicate']
-  if (predicateDef) {
-    lines.push(...generatePredicateOverview(predicateDef, schema))
-  }
-
-  for (const [name, def] of Object.entries(schema.$defs)) {
-    if (isPredicateDef(name)) {
-      lines.push(...generatePredicateSection(name, def))
-    }
-  }
-
-  lines.push('## See Also')
-  lines.push('')
-  lines.push('- [Config Schema Reference](/reference/extraction-config/schema)')
-  lines.push('- [TypeScript Getting Started](/extract/deterministic/typescript/getting-started)')
-  lines.push('')
-
-  return lines.join('\n')
-}
-
-function generateSchemaReference(schema: Schema): string {
-  const lines: string[] = []
-
-  lines.push('---')
-  lines.push('pageClass: reference')
-  lines.push('---')
-  lines.push('')
-  lines.push(`# ${schema.title ?? 'Extraction Config Schema'}`)
-  lines.push('')
-  if (schema.description) {
-    lines.push(schema.description)
-    lines.push('')
-  }
-
-  lines.push('**Format:** JSON or YAML')
-  lines.push('')
-  lines.push('---')
-  lines.push('')
-
-  if (schema.properties) {
-    lines.push('## Root Properties')
-    lines.push('')
-    lines.push(...generatePropertiesTable(schema.properties, schema.required))
-    lines.push('')
-    lines.push('---')
-    lines.push('')
-  }
-
-  for (const [name, def] of Object.entries(schema.$defs)) {
-    if (!isPredicateDef(name) && name !== 'predicate') {
-      lines.push(generateDefMarkdown(name, def, schema))
-    }
-  }
-
-  lines.push('## See Also')
-  lines.push('')
-  lines.push('- [Predicate Reference](/reference/extraction-config/predicates)')
-  lines.push('- [TypeScript Getting Started](/extract/deterministic/typescript/getting-started)')
-  lines.push('')
-
-  return lines.join('\n')
-}
-
-function hasKey<K extends string>(obj: object, key: K): obj is object & Record<K, unknown> {
-  return key in obj
-}
-
-function isSchema(value: unknown): value is Schema {
-  if (typeof value !== 'object' || value === null) return false
-  if (!hasKey(value, '$defs')) return false
-  return typeof value['$defs'] === 'object'
-}
-
-// Main execution
-try {
-  const schemaPath = join(import.meta.dirname, '..', 'extraction-config.schema.json')
-  const schemaContent = readFileSync(schemaPath, 'utf-8')
-  const parsed: unknown = JSON.parse(schemaContent)
-  if (!isSchema(parsed)) {
-    throw new InvalidSchemaFormatError()
-  }
-  const schema = parsed
-
-  const outputDir = join(import.meta.dirname, '..', 'docs', 'generated')
-  mkdirSync(outputDir, { recursive: true })
-
-  const predicatesContent = generatePredicatesReference(schema)
-  const predicatesPath = join(outputDir, 'predicates.md')
-  writeFileSync(predicatesPath, predicatesContent, 'utf-8')
-  console.log(`Generated: ${predicatesPath}`)
-  console.log(`Lines: ${predicatesContent.split('\n').length}`)
-
-  const schemaRefContent = generateSchemaReference(schema)
-  const schemaRefPath = join(outputDir, 'schema.md')
-  writeFileSync(schemaRefPath, schemaRefContent, 'utf-8')
-  console.log(`Generated: ${schemaRefPath}`)
-  console.log(`Lines: ${schemaRefContent.split('\n').length}`)
-} catch (error) {
-  const message = error instanceof Error ? error.message : String(error)
-  const stack = error instanceof Error ? error.stack : undefined
-  console.error('Documentation generation failed:', message)
-  if (stack) {
-    console.error(stack)
-  }
-  process.exit(1)
-}
diff --git a/packages/riviere-extract-config/src/extraction-config-schema.ts b/packages/riviere-extract-config/src/extraction-config-schema.ts
deleted file mode 100644
index 67a7a150a..000000000
--- a/packages/riviere-extract-config/src/extraction-config-schema.ts
+++ /dev/null
@@ -1,292 +0,0 @@
-/**
- * AST element type to search for during extraction.
- */
-export type FindTarget = 'classes' | 'methods' | 'functions'
-
-/**
- * Standard architectural component types recognized by the Riviere extractor.
- * Each type represents a distinct role in the system's flow-based architecture.
- */
-export type ComponentType = 'api' | 'useCase' | 'domainOp' | 'event' | 'eventHandler' | 'ui'
-
-/** Matches elements with a specific decorator. */
-export interface HasDecoratorPredicate {
-  hasDecorator: {
-    name: string | string[]
-    from?: string
-  }
-}
-
-/** Matches elements with a specific JSDoc tag. */
-export interface HasJSDocPredicate {hasJSDoc: { tag: string }}
-
-/** Matches classes extending a specific base class. */
-export interface ExtendsClassPredicate {extendsClass: { name: string }}
-
-/** Matches classes implementing a specific interface. */
-export interface ImplementsInterfacePredicate {implementsInterface: { name: string }}
-
-/** Matches elements whose name ends with a suffix. */
-export interface NameEndsWithPredicate {nameEndsWith: { suffix: string }}
-
-/** Matches elements whose name matches a regex pattern. */
-export interface NameMatchesPredicate {nameMatches: { pattern: string }}
-
-/** Matches methods inside classes satisfying a predicate. */
-export interface InClassWithPredicate {inClassWith: Predicate}
-
-/** Combines predicates with AND logic. */
-export interface AndPredicate {and: Predicate[]}
-
-/** Combines predicates with OR logic. */
-export interface OrPredicate {or: Predicate[]}
-
-/** Union of all predicate types for filtering AST elements. */
-export type Predicate =
-  | HasDecoratorPredicate
-  | HasJSDocPredicate
-  | ExtendsClassPredicate
-  | ImplementsInterfacePredicate
-  | NameEndsWithPredicate
-  | NameMatchesPredicate
-  | InClassWithPredicate
-  | AndPredicate
-  | OrPredicate
-
-/** Marker indicating a component type is not used in the module. */
-export interface NotUsed {notUsed: true}
-
-/** Transform operations to apply to extracted values. */
-export interface Transform {
-  stripSuffix?: string
-  stripPrefix?: string
-  toLowerCase?: true
-  toUpperCase?: true
-  kebabToPascal?: true
-  pascalToKebab?: true
-}
-
-/** Extracts a hardcoded literal value. */
-export interface LiteralExtractionRule {literal: string | boolean | number}
-
-/** Extracts value from the class name. */
-export interface FromClassNameExtractionRule {fromClassName: true | { transform?: Transform }}
-
-/** Extracts value from the method name. */
-export interface FromMethodNameExtractionRule {fromMethodName: true | { transform?: Transform }}
-
-/** Extracts value from the file path using regex capture. */
-export interface FromFilePathExtractionRule {
-  fromFilePath: {
-    pattern: string
-    capture: number
-    transform?: Transform
-  }
-}
-
-/** Extracts value from a class property. */
-export interface FromPropertyExtractionRule {
-  fromProperty: {
-    name: string
-    kind: 'static' | 'instance'
-    transform?: Transform
-  }
-}
-
-/** Extracts value from decorator argument. */
-export interface FromDecoratorArgExtractionRule {
-  fromDecoratorArg: {
-    decorator?: string
-    position?: number
-    name?: string
-    transform?: Transform
-  }
-}
-
-/** Extracts value from decorator argument on the containing class. */
-export interface FromClassDecoratorArgExtractionRule {
-  fromClassDecoratorArg:
-    | {
-      decorator: string
-      position: number
-      name?: never
-      transform?: Transform
-    }
-    | {
-      decorator: string
-      name: string
-      position?: never
-      transform?: Transform
-    }
-}
-
-/** Extracts value from the decorator name itself. */
-export interface FromDecoratorNameExtractionRule {
-  fromDecoratorName:
-    | true
-    | {
-      mapping?: Record<string, string>
-      transform?: Transform
-    }
-}
-
-/** Extracts value from generic type argument. */
-export interface FromGenericArgExtractionRule {
-  fromGenericArg: {
-    interface: string
-    position: number
-    transform?: Transform
-  }
-}
-
-/** Extracts method parameters and return type. */
-export interface FromMethodSignatureExtractionRule {fromMethodSignature: true}
-
-/** Extracts constructor parameter names and types. */
-export interface FromConstructorParamsExtractionRule {fromConstructorParams: true}
-
-/** Extracts type name of parameter at position. */
-export interface FromParameterTypeExtractionRule {
-  fromParameterType: {
-    position: number
-    transform?: Transform
-  }
-}
-
-/**
- * Union of all extraction rule types.
- * Each rule type corresponds to a different source of metadata.
- */
-export type ExtractionRule =
-  | LiteralExtractionRule
-  | FromClassNameExtractionRule
-  | FromMethodNameExtractionRule
-  | FromFilePathExtractionRule
-  | FromPropertyExtractionRule
-  | FromDecoratorArgExtractionRule
-  | FromClassDecoratorArgExtractionRule
-  | FromDecoratorNameExtractionRule
-  | FromGenericArgExtractionRule
-  | FromMethodSignatureExtractionRule
-  | FromConstructorParamsExtractionRule
-  | FromParameterTypeExtractionRule
-
-/**
- * Extract block mapping field names to extraction rules.
- * Each key is a Riviere schema field name (e.g., apiType, httpMethod, path).
- */
-export type ExtractBlock = Record<string, ExtractionRule>
-
-/** Rule specifying what to find and how to filter matches. */
-export interface DetectionRule {
-  find: FindTarget
-  where: Predicate
-  extract?: ExtractBlock
-}
-
-/** Either a detection rule or a marker that the component type is unused. */
-export type ComponentRule = NotUsed | DetectionRule
-
-/** User-defined component types with their detection rules. */
-export type CustomTypes = Record<string, DetectionRule>
-
-/**
- * Declares a custom component type as an event publisher.
- * The component type must be defined in customTypes in at least one module.
- */
-export interface EventPublisherConfig {
-  /** The custom component type name (e.g. 'eventPublisher'). */
-  fromType: string
-  /** The metadata key on this component type that holds the published event type name. */
-  metadataKey: string
-}
-
-/**
- * Declares how to resolve HTTP client calls into cross-domain Links.
- * The custom type must be defined in customTypes in at least one module.
- */
-export interface HttpLinkConfig {
-  /** The custom component type name for HTTP clients (e.g. 'httpCall'). */
-  fromCustomType: string
-  /** Metadata key whose value identifies the target domain. */
-  matchDomainBy: string
-  /** Metadata keys used to match the target API component. */
-  matchApiBy: string[]
-}
-
-/** Connection detection configuration. */
-export interface ConnectionsConfig {
-  /** Declares which custom component types publish events and how to detect them. */
-  eventPublishers?: EventPublisherConfig[]
-  /** Declares how to resolve HTTP client calls into cross-domain Links. */
-  httpLinks?: HttpLinkConfig[]
-}
-
-/**
- * Reference to an external module definition file.
- * The CLI expands these references before extraction by loading the referenced file.
- */
-export interface ModuleRef {$ref: string}
-
-/**
- * A module config as written in the extraction config file.
- * When `extends` is present, component rules are inherited from the extended config.
- * Local rules override inherited rules.
- */
-export interface ModuleConfig {
-  name: string
-  domain: string
-  path: string
-  glob: string
-  /** Path pattern with `{module}` placeholder for resolving module names from file paths. */
-  modules?: string
-  extends?: string
-  api?: ComponentRule
-  useCase?: ComponentRule
-  domainOp?: ComponentRule
-  event?: ComponentRule
-  eventHandler?: ComponentRule
-  ui?: ComponentRule
-  customTypes?: CustomTypes
-}
-
-/**
- * A fully resolved module with all component rules.
- * This is what the extractor uses after config resolution.
- */
-export interface Module {
-  name: string
-  domain: string
-  path: string
-  glob: string
-  /** Path pattern with `{module}` placeholder for resolving module names from file paths. */
-  modules?: string
-  api: ComponentRule
-  useCase: ComponentRule
-  domainOp: ComponentRule
-  event: ComponentRule
-  eventHandler: ComponentRule
-  ui: ComponentRule
-  customTypes?: CustomTypes
-}
-
-/**
- * Extraction config after $ref expansion.
- * At this point all ModuleRef entries have been resolved to ModuleConfig.
- * This is what the extractor uses for processing.
- */
-export interface ExtractionConfig {
-  $schema?: string
-  modules: ModuleConfig[]
-  connections?: ConnectionsConfig
-}
-
-/**
- * Fully resolved extraction config ready for the extractor.
- * All extends references resolved, all modules have complete rules.
- */
-export interface ResolvedExtractionConfig {
-  $schema?: string
-  modules: Module[]
-  connections?: ConnectionsConfig
-}
diff --git a/packages/riviere-extract-config/src/index.ts b/packages/riviere-extract-config/src/index.ts
deleted file mode 100644
index b87ea54e2..000000000
--- a/packages/riviere-extract-config/src/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export * from './extraction-config-schema'
-export {
-  isValidExtractionConfig,
-  validateExtractionConfig,
-  validateExtractionConfigSchema,
-  parseExtractionConfig,
-  formatValidationErrors,
-  mapAjvErrors,
-  ExtractionConfigValidationError,
-  type ValidationError,
-  type ValidationResult,
-} from './validation'
diff --git a/packages/riviere-extract-config/src/validation-fixtures.ts b/packages/riviere-extract-config/src/validation-fixtures.ts
deleted file mode 100644
index 837886ef5..000000000
--- a/packages/riviere-extract-config/src/validation-fixtures.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import type {
-  ExtractionConfig, ResolvedExtractionConfig, Module 
-} from './extraction-config-schema'
-
-export function createModuleWithoutPath(): Omit<Module, 'path'> {
-  return {
-    name: 'test',
-    domain: 'test',
-    glob: 'src/**',
-    api: { notUsed: true },
-    useCase: { notUsed: true },
-    domainOp: { notUsed: true },
-    event: { notUsed: true },
-    eventHandler: { notUsed: true },
-    ui: { notUsed: true },
-  }
-}
-
-export function createModuleWithoutApi(): Omit<Module, 'api'> {
-  return {
-    name: 'test',
-    domain: 'test',
-    path: '.',
-    glob: 'src/**',
-    useCase: { notUsed: true },
-    domainOp: { notUsed: true },
-    event: { notUsed: true },
-    eventHandler: { notUsed: true },
-    ui: { notUsed: true },
-  }
-}
-
-export function createMinimalModule(): Module {
-  return {
-    name: 'test',
-    domain: 'test',
-    path: '.',
-    glob: 'src/**',
-    api: { notUsed: true },
-    useCase: { notUsed: true },
-    domainOp: { notUsed: true },
-    event: { notUsed: true },
-    eventHandler: { notUsed: true },
-    ui: { notUsed: true },
-  }
-}
-
-export function createMinimalConfig(): ExtractionConfig {
-  return { modules: [createMinimalModule()] }
-}
-
-export function createResolvedConfig(): ResolvedExtractionConfig {
-  return { modules: [createMinimalModule()] }
-}
-
-export function createMutableConfig(): {
-  config: ExtractionConfig
-  module: Module
-} {
-  const module = createMinimalModule()
-  const config = { modules: [module] }
-  return {
-    config,
-    module,
-  }
-}
-
-export function createFullConfig(): ExtractionConfig {
-  return {
-    modules: [
-      {
-        name: 'orders',
-        domain: 'orders',
-        path: 'orders',
-        glob: '**',
-        api: {
-          find: 'methods',
-          where: {
-            hasDecorator: {
-              name: ['Get', 'Post', 'Put', 'Delete'],
-              from: '@nestjs/common',
-            },
-          },
-        },
-        useCase: {
-          find: 'classes',
-          where: { hasDecorator: { name: 'UseCase' } },
-        },
-        domainOp: {
-          find: 'functions',
-          where: { hasJSDoc: { tag: 'domainOp' } },
-        },
-        event: {
-          find: 'classes',
-          where: { extendsClass: { name: 'DomainEvent' } },
-        },
-        eventHandler: {
-          find: 'classes',
-          where: { implementsInterface: { name: 'EventHandler' } },
-        },
-        ui: { notUsed: true },
-      },
-    ],
-  }
-}
diff --git a/packages/riviere-extract-config/src/validation.spec.ts b/packages/riviere-extract-config/src/validation.spec.ts
deleted file mode 100644
index 5a9397ce8..000000000
--- a/packages/riviere-extract-config/src/validation.spec.ts
+++ /dev/null
@@ -1,422 +0,0 @@
-import {
-  isValidExtractionConfig,
-  validateExtractionConfig,
-  validateExtractionConfigSchema,
-  parseExtractionConfig,
-  formatValidationErrors,
-  mapAjvErrors,
-  ExtractionConfigValidationError,
-} from './validation'
-import type { ExtractionConfig } from './extraction-config-schema'
-import {
-  createMinimalConfig,
-  createFullConfig,
-  createMinimalModule,
-  createModuleWithoutPath,
-  createModuleWithoutApi,
-  createMutableConfig,
-  createResolvedConfig,
-} from './validation-fixtures'
-
-describe('isValidExtractionConfig', () => {
-  it('returns true when module uses $ref file reference', () => {
-    const config = { modules: [{ $ref: './domains/orders.extraction.json' }] }
-    expect(isValidExtractionConfig(config)).toBe(true)
-  })
-
-  it('returns true when mixing $ref and inline modules', () => {
-    const config = {modules: [{ $ref: './domains/orders.extraction.json' }, createMinimalModule()],}
-    expect(isValidExtractionConfig(config)).toBe(true)
-  })
-
-  it('returns true when config is minimal valid', () => {
-    expect(isValidExtractionConfig(createMinimalConfig())).toBe(true)
-  })
-
-  it('returns true when using createResolvedConfig', () => {
-    expect(isValidExtractionConfig(createResolvedConfig())).toBe(true)
-  })
-
-  it('returns true when config uses all component types', () => {
-    expect(isValidExtractionConfig(createFullConfig())).toBe(true)
-  })
-
-  it('returns true when config includes $schema', () => {
-    const config = {
-      $schema: './extraction-config.schema.json',
-      ...createMinimalConfig(),
-    }
-    expect(isValidExtractionConfig(config)).toBe(true)
-  })
-
-  it.each([
-    ['null', null],
-    ['string', 'invalid'],
-    ['missing modules', {}],
-    ['empty modules', { modules: [] }],
-  ])('returns false when data is %s', (_, input) => {
-    expect(isValidExtractionConfig(input)).toBe(false)
-  })
-})
-
-describe('validateExtractionConfig', () => {
-  describe('valid configs', () => {
-    it('returns valid=true and empty errors when config is valid', () => {
-      const result = validateExtractionConfig(createMinimalConfig())
-      expect(result.valid).toBe(true)
-      expect(result.errors).toStrictEqual([])
-    })
-
-    it('returns valid=true when using nameEndsWith predicate', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
-      module.api = {
-        find: 'classes',
-        where: { nameEndsWith: { suffix: 'Controller' } },
-      }
-      expect(validateExtractionConfigSchema(config).valid).toBe(true)
-    })
-
-    it('returns valid=true when using nameMatches predicate', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
-      module.api = {
-        find: 'classes',
-        where: { nameMatches: { pattern: '^.*Controller$' } },
-      }
-      expect(validateExtractionConfigSchema(config).valid).toBe(true)
-    })
-
-    it('returns valid=true when using inClassWith predicate', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
-      module.api = {
-        find: 'methods',
-        where: { inClassWith: { hasDecorator: { name: 'Controller' } } },
-      }
-      expect(validateExtractionConfigSchema(config).valid).toBe(true)
-    })
-
-    it('returns valid=true when using and predicate', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
-      module.api = {
-        find: 'methods',
-        where: {
-          and: [
-            { hasDecorator: { name: 'Get' } },
-            { inClassWith: { hasDecorator: { name: 'Controller' } } },
-          ],
-        },
-      }
-      expect(validateExtractionConfigSchema(config).valid).toBe(true)
-    })
-
-    it('returns valid=true when using or predicate', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
-      module.api = {
-        find: 'methods',
-        where: { or: [{ hasDecorator: { name: 'Get' } }, { hasDecorator: { name: 'Post' } }] },
-      }
-      expect(validateExtractionConfigSchema(config).valid).toBe(true)
-    })
-
-    it('returns valid=true when using nested and/or predicates', () => {
-      const {
-        config, module 
-      } = createMutableConfig()
-      module.api = {
-        find: 'methods',
-        where: {
-          and: [
-            { or: [{ hasDecorator: { name: 'Get' } }, { hasDecorator: { name: 'Post' } }] },
-            { inClassWith: { hasDecorator: { name: 'Controller' } } },
-          ],
-        },
-      }
-      expect(validateExtractionConfigSchema(config).valid).toBe(true)
-    })
-
-    it('returns valid=true with multiple modules', () => {
-      const config: ExtractionConfig = {
-        modules: [
-          {
-            ...createMinimalModule(),
-            path: 'orders',
-            glob: '**',
-          },
-          {
-            ...createMinimalModule(),
-            path: 'inventory',
-            glob: '**',
-          },
-        ],
-      }
-      expect(validateExtractionConfig(config).valid).toBe(true)
-    })
-
-    it('returns valid=true when module has customTypes with detection rule', () => {
-      const result = validateExtractionConfig({
-        modules: [
-          {
-            ...createMinimalModule(),
-            customTypes: {
-              backgroundJob: {
-                find: 'functions',
-                where: { hasJSDoc: { tag: 'backgroundJob' } },
-              },
-            },
-          },
-        ],
-      })
-      expect(result.valid).toBe(true)
-    })
-
-    it('returns valid=true when customTypes is empty object', () => {
-      const result = validateExtractionConfig({
-        modules: [
-          {
-            ...createMinimalModule(),
-            customTypes: {},
-          },
-        ],
-      })
-      expect(result.valid).toBe(true)
-    })
-  })
-
-  describe('invalid configs', () => {
-    it('returns error when modules array is empty', () => {
-      const result = validateExtractionConfig({ modules: [] })
-      expect(result.valid).toBe(false)
-      expect(result.errors[0]?.path).toBe('/modules')
-    })
-
-    it('returns error when module path is missing', () => {
-      const result = validateExtractionConfig({ modules: [createModuleWithoutPath()] })
-      expect(result.valid).toBe(false)
-      expect(result.errors.some((e) => e.path.includes('/modules/0'))).toBe(true)
-    })
-
-    it('returns error when module path is empty string', () => {
-      const result = validateExtractionConfig({
-        modules: [
-          {
-            ...createMinimalModule(),
-            path: '',
-          },
-        ],
-      })
-      expect(result.valid).toBe(false)
-      expect(result.errors.some((e) => e.path.includes('/modules/0/path'))).toBe(true)
-    })
-
-    it('returns error when required component type is missing', () => {
-      const result = validateExtractionConfig({ modules: [createModuleWithoutApi()] })
-      expect(result.valid).toBe(false)
-      expect(result.errors.some((e) => e.path.includes('/modules/0'))).toBe(true)
-    })
-
-    it('returns error when find target is invalid', () => {
-      const result = validateExtractionConfig({
-        modules: [
-          {
-            ...createMinimalModule(),
-            api: {
-              find: 'invalid',
-              where: { hasDecorator: { name: 'Get' } },
-            },
-          },
-        ],
-      })
-      expect(result.valid).toBe(false)
-      expect(result.errors.some((e) => e.path.includes('/modules/0/api'))).toBe(true)
-    })
-
-    it('returns error when predicate is missing required field', () => {
-      const result = validateExtractionConfig({
-        modules: [
-          {
-            ...createMinimalModule(),
-            api: {
-              find: 'classes',
-              where: { hasDecorator: {} },
-            },
-          },
-        ],
-      })
-      expect(result.valid).toBe(false)
-    })
-
-    it('returns error when decorator name is empty string', () => {
-      const result = validateExtractionConfig({
-        modules: [
-          {
-            ...createMinimalModule(),
-            api: {
-              find: 'classes',
-              where: { hasDecorator: { name: '' } },
-            },
-          },
-        ],
-      })
-      expect(result.valid).toBe(false)
-    })
-
-    it.each([
-      ['and', { and: [{ hasDecorator: { name: 'Get' } }] }],
-      ['or', { or: [{ hasDecorator: { name: 'Get' } }] }],
-    ])('returns error when %s predicate has less than 2 items', (_, predicate) => {
-      const result = validateExtractionConfig({
-        modules: [
-          {
-            ...createMinimalModule(),
-            api: {
-              find: 'classes',
-              where: predicate,
-            },
-          },
-        ],
-      })
-      expect(result.valid).toBe(false)
-    })
-
-    it('returns error when unknown property exists on module', () => {
-      const result = validateExtractionConfig({
-        modules: [
-          {
-            ...createMinimalModule(),
-            unknownProp: 'value',
-          },
-        ],
-      })
-      expect(result.valid).toBe(false)
-    })
-
-    it('returns error when notUsed is false', () => {
-      const result = validateExtractionConfig({
-        modules: [
-          {
-            ...createMinimalModule(),
-            api: { notUsed: false },
-          },
-        ],
-      })
-      expect(result.valid).toBe(false)
-    })
-
-    it('returns multiple errors when config has multiple issues', () => {
-      const result = validateExtractionConfig({
-        modules: [
-          {
-            path: '',
-            api: { find: 'invalid' },
-            useCase: { notUsed: true },
-          },
-        ],
-      })
-      expect(result.valid).toBe(false)
-      expect(result.errors.length).toBeGreaterThan(1)
-    })
-
-    it.each([
-      ['missing find property', { where: { hasJSDoc: { tag: 'job' } } }],
-      ['missing where property', { find: 'functions' }],
-      [
-        'invalid find value',
-        {
-          find: 'invalid',
-          where: { hasJSDoc: { tag: 'job' } },
-        },
-      ],
-    ])('returns error when customTypes entry has %s', (_, invalidRule) => {
-      const result = validateExtractionConfig({
-        modules: [
-          {
-            ...createMinimalModule(),
-            customTypes: { job: invalidRule },
-          },
-        ],
-      })
-      expect(result.valid).toBe(false)
-      expect(result.errors.some((e) => e.path.includes('customTypes'))).toBe(true)
-    })
-  })
-})
-
-describe('formatValidationErrors', () => {
-  it('returns fallback message when errors array is empty', () => {
-    expect(formatValidationErrors([])).toBe('validation failed without specific errors')
-  })
-
-  it('formats single error with path and message', () => {
-    const result = formatValidationErrors([
-      {
-        path: '/modules/0/path',
-        message: 'must NOT have fewer than 1 characters',
-      },
-    ])
-    expect(result).toBe('/modules/0/path: must NOT have fewer than 1 characters')
-  })
-
-  it('formats multiple errors with newlines', () => {
-    const result = formatValidationErrors([
-      {
-        path: '/modules/0/path',
-        message: 'must NOT have fewer than 1 characters',
-      },
-      {
-        path: '/modules/0/api',
-        message: 'must match a schema in oneOf',
-      },
-    ])
-    expect(result).toContain('/modules/0/path:')
-    expect(result).toContain('/modules/0/api:')
-    expect(result.split('\n')).toHaveLength(2)
-  })
-})
-
-describe('parseExtractionConfig', () => {
-  it('returns config when valid', () => {
-    const config = createMinimalConfig()
-    expect(parseExtractionConfig(config)).toStrictEqual(config)
-  })
-
-  it('throws ExtractionConfigValidationError with error details when invalid', () => {
-    expect(() => parseExtractionConfig({})).toThrow(ExtractionConfigValidationError)
-    expect(() => parseExtractionConfig({})).toThrow(/Invalid extraction config/)
-    expect(() => parseExtractionConfig({ modules: [] })).toThrow('/modules')
-  })
-})
-
-describe('mapAjvErrors', () => {
-  it.each([[null], [undefined]])('returns empty array when errors is %s', (input) => {
-    expect(mapAjvErrors(input)).toStrictEqual([])
-  })
-
-  it('maps AJV errors to path/message format', () => {
-    expect(
-      mapAjvErrors([
-        {
-          instancePath: '/modules/0',
-          message: 'test',
-        },
-      ])[0]?.path,
-    ).toBe('/modules/0')
-    expect(
-      mapAjvErrors([
-        {
-          instancePath: '',
-          message: 'test',
-        },
-      ])[0]?.path,
-    ).toBe('/')
-    expect(mapAjvErrors([{ instancePath: '/test' }])[0]?.message).toBe('unknown error')
-  })
-})
diff --git a/packages/riviere-extract-config/src/validation.ts b/packages/riviere-extract-config/src/validation.ts
deleted file mode 100644
index 99b05301d..000000000
--- a/packages/riviere-extract-config/src/validation.ts
+++ /dev/null
@@ -1,334 +0,0 @@
-import Ajv from 'ajv'
-import addFormats from 'ajv-formats'
-import type {
-  ComponentRule,
-  ComponentType,
-  ExtractionConfig,
-  ModuleConfig,
-  ConnectionsConfig,
-} from './extraction-config-schema'
-import rawSchema from '../extraction-config.schema.json' with { type: 'json' }
-
-/**
- * Required extraction fields by component type.
- * These fields must have extraction rules defined (unless notUsed: true).
- */
-const REQUIRED_FIELDS: Record<ComponentType, string[]> = {
-  api: ['apiType'],
-  event: ['eventName'],
-  eventHandler: ['subscribedEvents'],
-  domainOp: ['operationName'],
-  ui: ['route'],
-  useCase: [],
-}
-
-const COMPONENT_TYPES: ComponentType[] = [
-  'api',
-  'useCase',
-  'domainOp',
-  'event',
-  'eventHandler',
-  'ui',
-]
-
-const ajv = new Ajv({ allErrors: true })
-addFormats(ajv)
-
-const validate = ajv.compile<ExtractionConfig>(rawSchema)
-
-/**
- * Type guard checking if data is a valid ExtractionConfig.
- * @param data - Data to validate.
- * @returns True if data matches the schema.
- */
-export function isValidExtractionConfig(data: unknown): data is ExtractionConfig {
-  return validate(data) === true
-}
-
-/** A validation error with JSON path and message. */
-export interface ValidationError {
-  path: string
-  message: string
-}
-
-/** Result of validating extraction config data. */
-export interface ValidationResult {
-  valid: boolean
-  errors: ValidationError[]
-}
-
-/** Error thrown when extraction config validation fails. */
-export class ExtractionConfigValidationError extends Error {
-  /** @param errors - Validation errors that caused this exception */
-  constructor(public readonly errors: ValidationError[]) {
-    super(`Invalid extraction config:\n${formatValidationErrorsInternal(errors)}`)
-    this.name = 'ExtractionConfigValidationError'
-  }
-}
-
-function formatValidationErrorsInternal(errors: ValidationError[]): string {
-  if (errors.length === 0) {
-    return 'validation failed without specific errors'
-  }
-  return errors.map((e) => `${e.path}: ${e.message}`).join('\n')
-}
-
-interface AjvErrorLike {
-  instancePath: string
-  message?: string
-}
-
-/**
- * Converts AJV errors to ValidationError format.
- * @param errors - AJV validation errors.
- * @returns Array of ValidationError objects.
- */
-export function mapAjvErrors(errors: AjvErrorLike[] | null | undefined): ValidationError[] {
-  if (!errors) {
-    return []
-  }
-  return errors.map((e) => ({
-    path: e.instancePath || '/',
-    message: e.message ?? 'unknown error',
-  }))
-}
-
-function isNotUsed(rule: ComponentRule | undefined): boolean {
-  return rule !== undefined && 'notUsed' in rule && rule.notUsed === true
-}
-
-function hasDetectionRule(rule: ComponentRule | undefined): boolean {
-  return rule !== undefined && 'find' in rule && 'where' in rule
-}
-
-function getExtractedFields(rule: ComponentRule | undefined): string[] {
-  if (!rule || !('extract' in rule) || !rule.extract) {
-    return []
-  }
-  return Object.keys(rule.extract)
-}
-
-function validateModuleExtractionRules(
-  module: ModuleConfig,
-  moduleIndex: number,
-): ValidationError[] {
-  const errors: ValidationError[] = []
-
-  for (const componentType of COMPONENT_TYPES) {
-    const rule = module[componentType]
-
-    if (isNotUsed(rule)) {
-      continue
-    }
-
-    if (!hasDetectionRule(rule)) {
-      continue
-    }
-
-    const requiredFields = REQUIRED_FIELDS[componentType]
-    if (requiredFields.length === 0) {
-      continue
-    }
-
-    const extractedFields = getExtractedFields(rule)
-    const missingFields = requiredFields.filter((field) => !extractedFields.includes(field))
-
-    if (missingFields.length > 0) {
-      errors.push({
-        path: `/modules/${moduleIndex}/${componentType}`,
-        message:
-          `Missing required extraction rules: ${missingFields.join(', ')}. ` +
-          `Add extraction rules to the 'extract' block or use 'notUsed: true' if not extracting ${componentType} components.`,
-      })
-    }
-  }
-
-  return errors
-}
-
-function validateAllExtractionRules(config: ExtractionConfig): ValidationError[] {
-  return config.modules.flatMap((module, index) => {
-    if ('$ref' in module) {
-      return []
-    }
-    return validateModuleExtractionRules(module, index)
-  })
-}
-
-function collectCustomTypeExtractedFields(config: ExtractionConfig): Map<string, Set<string>> {
-  const fieldsByType = new Map<string, Set<string>>()
-  for (const module of config.modules) {
-    if ('$ref' in module || module.customTypes === undefined) {
-      continue
-    }
-    for (const [typeName, rule] of Object.entries(module.customTypes)) {
-      const existing = fieldsByType.get(typeName) ?? new Set<string>()
-      for (const key of Object.keys(rule.extract ?? {})) {
-        existing.add(key)
-      }
-      fieldsByType.set(typeName, existing)
-    }
-  }
-  return fieldsByType
-}
-
-function validateEventPublishers(
-  connections: ConnectionsConfig,
-  customTypeFields: Map<string, Set<string>>,
-): ValidationError[] {
-  if (connections.eventPublishers === undefined) {
-    return []
-  }
-  return connections.eventPublishers.flatMap((publisher, index) => {
-    const extractedFields = customTypeFields.get(publisher.fromType)
-    if (extractedFields === undefined) {
-      return [
-        {
-          path: `/connections/eventPublishers/${index}/fromType`,
-          message:
-            `"${publisher.fromType}" is not defined as a customType in any module. ` +
-            `Add a customType named "${publisher.fromType}" to at least one module.`,
-        },
-      ]
-    }
-    if (!extractedFields.has(publisher.metadataKey)) {
-      return [
-        {
-          path: `/connections/eventPublishers/${index}/fromType`,
-          message:
-            `customType "${publisher.fromType}" does not extract "${publisher.metadataKey}". ` +
-            `Add extract["${publisher.metadataKey}"] to that custom type.`,
-        },
-      ]
-    }
-    return []
-  })
-}
-
-function validateHttpLinks(
-  connections: ConnectionsConfig,
-  customTypeFields: Map<string, Set<string>>,
-): ValidationError[] {
-  if (connections.httpLinks === undefined) {
-    return []
-  }
-  return connections.httpLinks.flatMap((httpLink, index) => {
-    const extractedFields = customTypeFields.get(httpLink.fromCustomType)
-    if (extractedFields === undefined) {
-      return [
-        {
-          path: `/connections/httpLinks/${index}/fromCustomType`,
-          message:
-            `"${httpLink.fromCustomType}" is not defined as a customType in any module. ` +
-            `Add a customType named "${httpLink.fromCustomType}" to at least one module.`,
-        },
-      ]
-    }
-    const errors: ValidationError[] = []
-    if (!extractedFields.has(httpLink.matchDomainBy)) {
-      errors.push({
-        path: `/connections/httpLinks/${index}/matchDomainBy`,
-        message:
-          `customType "${httpLink.fromCustomType}" does not extract "${httpLink.matchDomainBy}". ` +
-          `Add extract["${httpLink.matchDomainBy}"] to that custom type.`,
-      })
-    }
-    for (const field of httpLink.matchApiBy) {
-      if (!extractedFields.has(field)) {
-        errors.push({
-          path: `/connections/httpLinks/${index}/matchApiBy`,
-          message:
-            `customType "${httpLink.fromCustomType}" does not extract "${field}". ` +
-            `Add extract["${field}"] to that custom type.`,
-        })
-      }
-    }
-    return errors
-  })
-}
-
-function validateConnectionsConfig(config: ExtractionConfig): ValidationError[] {
-  if (config.connections === undefined) {
-    return []
-  }
-  const customTypeFields = collectCustomTypeExtractedFields(config)
-  return [
-    ...validateEventPublishers(config.connections, customTypeFields),
-    ...validateHttpLinks(config.connections, customTypeFields),
-  ]
-}
-
-/**
- * Validates data against the ExtractionConfig JSON Schema only.
- * Does NOT check semantic rules like required extraction fields.
- * Use validateExtractionConfig() for full validation.
- * @param data - Data to validate.
- * @returns Validation result with errors if invalid.
- */
-export function validateExtractionConfigSchema(data: unknown): ValidationResult {
-  const schemaValid = validate(data) === true
-  if (!schemaValid) {
-    return {
-      valid: false,
-      errors: mapAjvErrors(validate.errors),
-    }
-  }
-
-  return {
-    valid: true,
-    errors: [],
-  }
-}
-
-/**
- * Validates data against the ExtractionConfig schema.
- * Performs both JSON Schema validation and semantic validation
- * for required extraction rules.
- * @param data - Data to validate.
- * @returns Validation result with errors if invalid.
- */
-export function validateExtractionConfig(data: unknown): ValidationResult {
-  // Type guard validates schema AND narrows type in one step
-  if (!isValidExtractionConfig(data)) {
-    // Get detailed error messages from schema validation
-    return validateExtractionConfigSchema(data)
-  }
-
-  // data is now narrowed to ExtractionConfig
-  const semanticErrors = [...validateAllExtractionRules(data), ...validateConnectionsConfig(data)]
-
-  if (semanticErrors.length > 0) {
-    return {
-      valid: false,
-      errors: semanticErrors,
-    }
-  }
-
-  return {
-    valid: true,
-    errors: [],
-  }
-}
-
-/**
- * Formats validation errors as a human-readable string.
- * @param errors - Array of validation errors.
- * @returns Formatted error message.
- */
-export function formatValidationErrors(errors: ValidationError[]): string {
-  return formatValidationErrorsInternal(errors)
-}
-
-/**
- * Parses and validates data as an ExtractionConfig.
- * @param data - Data to parse.
- * @returns Validated ExtractionConfig.
- * @throws ExtractionConfigValidationError if validation fails.
- */
-export function parseExtractionConfig(data: unknown): ExtractionConfig {
-  const result = validateExtractionConfig(data)
-  if (result.valid && isValidExtractionConfig(data)) {
-    return data
-  }
-  throw new ExtractionConfigValidationError(result.errors)
-}
diff --git a/packages/riviere-extract-config/tsconfig.json b/packages/riviere-extract-config/tsconfig.json
deleted file mode 100644
index e3368d651..000000000
--- a/packages/riviere-extract-config/tsconfig.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    },
-    {
-      "path": "./tsconfig.scripts.json"
-    }
-  ]
-}
diff --git a/packages/riviere-extract-config/tsconfig.lib.json b/packages/riviere-extract-config/tsconfig.lib.json
deleted file mode 100644
index 2e3ca3b47..000000000
--- a/packages/riviere-extract-config/tsconfig.lib.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "baseUrl": ".",
-    "rootDir": "src",
-    "outDir": "dist",
-    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
-    "emitDeclarationOnly": false,
-    "forceConsistentCasingInFileNames": true,
-    "types": ["node"]
-  },
-  "include": ["src/**/*.ts"],
-  "exclude": [
-    "vite.config.ts",
-    "vite.config.mts",
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx"
-  ],
-  "references": []
-}
diff --git a/packages/riviere-extract-config/tsconfig.spec.json b/packages/riviere-extract-config/tsconfig.spec.json
deleted file mode 100644
index f68d9d3b8..000000000
--- a/packages/riviere-extract-config/tsconfig.spec.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./out-tsc/vitest",
-    "types": [
-      "vitest/globals",
-      "vitest/importMeta",
-      "vite/client",
-      "node",
-      "vitest"
-    ],
-    "forceConsistentCasingInFileNames": true
-  },
-  "include": [
-    "vite.config.ts",
-    "vite.config.mts",
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx",
-    "src/**/*.d.ts"
-  ],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    }
-  ]
-}
diff --git a/packages/riviere-extract-config/vite.config.ts b/packages/riviere-extract-config/vite.config.ts
deleted file mode 100644
index 347f63d11..000000000
--- a/packages/riviere-extract-config/vite.config.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { defineConfig } from 'vite'
-
-export default defineConfig(() => ({
-  root: import.meta.dirname,
-  cacheDir: '../../node_modules/.vite/packages/riviere-extract-config',
-  plugins: [],
-}))
diff --git a/packages/riviere-extract-config/vitest.config.mts b/packages/riviere-extract-config/vitest.config.mts
deleted file mode 100644
index 16bb4d036..000000000
--- a/packages/riviere-extract-config/vitest.config.mts
+++ /dev/null
@@ -1,29 +0,0 @@
-import path from 'node:path';
-import { defineConfig } from 'vitest/config';
-
-const repoRoot = path.resolve(__dirname, '../..');
-
-export default defineConfig(() => ({
-  root: __dirname,
-  cacheDir: '../../node_modules/.vite/packages/riviere-extract-config',
-  test: {
-    name: '@living-architecture/riviere-extract-config',
-    watch: false,
-    globals: true,
-    environment: 'node',
-    include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    reporters: ['default'],
-    coverage: {
-      enabled: true,
-      reportsDirectory: './test-output/vitest/coverage',
-      provider: 'v8' as const,
-      reporter: ['text', ['lcov', { projectRoot: repoRoot }]] as ['text', ['lcov', { projectRoot: string }]],
-      thresholds: {
-        lines: 100,
-        statements: 100,
-        functions: 100,
-        branches: 100,
-      },
-    },
-  },
-}));
diff --git a/packages/riviere-extract-conventions/CLAUDE.md b/packages/riviere-extract-conventions/CLAUDE.md
deleted file mode 100644
index 8ac29b86c..000000000
--- a/packages/riviere-extract-conventions/CLAUDE.md
+++ /dev/null
@@ -1,119 +0,0 @@
-# riviere-extract-conventions
-
-Decorators for marking architectural components in TypeScript code.
-
-## Purpose
-
-Provides a convention-based approach to annotating code for architectural extraction. Teams adopting these decorators get:
-- Consistent component marking across the codebase
-- Deterministic extraction via riviere-extract-ts
-- ESLint enforcement to ensure coverage (D2.3)
-
-## Decorator Categories
-
-### Container Decorators (class-level)
-All public methods in the class inherit the component type:
-- `@DomainOpContainer` - domain operation container
-- `@APIContainer` - API endpoint container
-- `@EventHandlerContainer` - event handler container
-
-### Class-as-Component Decorators
-The class itself is the component:
-- `@UseCase` - use case class
-- `@Event` - domain event class
-- `@UI` - UI component class
-
-### Method-level Decorators
-Individual methods marked as components:
-- `@DomainOp` - domain operation method
-- `@APIEndpoint` - API endpoint method
-- `@EventHandler` - event handler method
-
-### Other
-- `@Custom(type)` - custom component type
-- `@Ignore` - exclude from analysis
-
-## Default Extraction Config
-
-A ready-to-use extraction config is provided for teams adopting our decorator conventions.
-
-### Usage
-
-Import the default config in your project:
-
-```typescript
-import defaultConfig from '@living-architecture/riviere-extract-conventions/default-config'
-```
-
-Or reference it directly in your extraction tooling:
-```bash
-riviere extract --config ./node_modules/@living-architecture/riviere-extract-conventions/src/default-extraction.config.json
-```
-
-### What It Does
-
-The default config detects all 6 component types using class-level decorators:
-
-**Container decorators** (all public methods become separate components):
-- **api** → all public methods in classes with `@APIContainer`
-- **domainOp** → all public methods in classes with `@DomainOpContainer`
-- **eventHandler** → all public methods in classes with `@EventHandlerContainer`
-
-**Single-method decorators** (the one public method becomes the component):
-- **useCase** → the single public method in classes with `@UseCase`
-- **ui** → the single public method in classes with `@UI`
-
-**Class-as-component decorator** (the class itself is the component):
-- **event** → classes with `@Event`
-
-Detection rules:
-- Container types find `methods` in classes with decorators
-- Class types find `classes` with decorators
-- All decorators from `@living-architecture/riviere-extract-conventions`
-- Path: `**/*.ts` (all TypeScript files)
-
-The extractor (riviere-extract-ts) will:
-- Extract all public methods from container classes as individual components
-- Extract the single public method from UseCase/UI classes as the component
-- Extract Event classes themselves as components
-
-### Customization
-
-The default config is a starting point. Teams can:
-1. Copy it and modify detection rules
-2. Add additional modules for different paths
-3. Combine with other detection strategies (JSDoc, naming conventions)
-
-## ESLint Enforcement
-
-An ESLint plugin ensures all classes have component decorators.
-
-### Setup
-
-```javascript
-import conventionsPlugin from '@living-architecture/riviere-extract-conventions/eslint-plugin'
-
-export default [
-  {
-    files: ['src/domain/**/*.ts'],
-    plugins: { conventions: conventionsPlugin },
-    rules: { 'conventions/require-component-decorator': 'error' },
-  },
-]
-```
-
-### What It Checks
-
-The `require-component-decorator` rule reports errors when classes lack component decorators:
-
-**Valid decorators:** `@UseCase`, `@Event`, `@UI`, `@DomainOpContainer`, `@APIContainer`, `@EventHandlerContainer`, `@Custom('type')`, `@Ignore`
-
-**Ignored:** Functions, interfaces, type aliases, anonymous classes
-
-Use ESLint's `files` config to scope enforcement to specific paths.
-
-## Principles
-
-1. **Pure markers** - Decorators have no runtime behavior; they exist only for extraction
-2. **ECMAScript standard** - Uses Stage 3 decorators (TypeScript 5.0+), not legacy experimentalDecorators
-3. **Extractor-friendly** - Designed to be detected by ts-morph in riviere-extract-ts
diff --git a/packages/riviere-extract-conventions/README.md b/packages/riviere-extract-conventions/README.md
deleted file mode 100644
index c0335c2d8..000000000
--- a/packages/riviere-extract-conventions/README.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# riviere-extract-conventions
-
-Decorators for marking architectural components in TypeScript code.
-
-## Installation
-
-```bash
-npm install @living-architecture/riviere-extract-conventions
-```
-
-## Usage
-
-```typescript
-import {
-  APIContainer,
-  APIEndpoint,
-  UseCase,
-  Event,
-  DomainOp,
-  Ignore,
-} from '@living-architecture/riviere-extract-conventions'
-
-// Container decorator - all public methods are API endpoints
-@APIContainer
-class OrderController {
-  @APIEndpoint
-  getOrders(): Order[] { /* ... */ }
-
-  @Ignore
-  healthCheck(): boolean { return true }
-}
-
-// Class-as-component
-@UseCase
-class CreateOrderUseCase {
-  execute(command: CreateOrderCommand): Order { /* ... */ }
-}
-
-@Event
-class OrderCreated {
-  constructor(readonly orderId: string) {}
-}
-```
-
-## Decorators
-
-| Decorator | Target | Description |
-|-----------|--------|-------------|
-| `@DomainOpContainer` | Class | All public methods are domain operations |
-| `@APIContainer` | Class | All public methods are API endpoints |
-| `@EventHandlerContainer` | Class | All public methods are event handlers |
-| `@UseCase` | Class | Class is a use case |
-| `@Event` | Class | Class is a domain event |
-| `@UI` | Class | Class is a UI component |
-| `@DomainOp` | Method | Method is a domain operation |
-| `@APIEndpoint` | Method | Method is an API endpoint |
-| `@EventHandler` | Method | Method is an event handler |
-| `@Custom(type)` | Class/Method | Custom component type |
-| `@Ignore` | Class/Method | Exclude from analysis |
-
-## Building
-
-```bash
-nx build riviere-extract-conventions
-```
-
-## Documentation
-
-- [CLAUDE.md](./CLAUDE.md) - Package principles and design decisions
diff --git a/packages/riviere-extract-conventions/package.json b/packages/riviere-extract-conventions/package.json
deleted file mode 100644
index 3cfcbaba0..000000000
--- a/packages/riviere-extract-conventions/package.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "name": "@living-architecture/riviere-extract-conventions",
-  "version": "0.6.3",
-  "type": "module",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/NTCoding/living-architecture.git",
-    "directory": "packages/riviere-extract-conventions"
-  },
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    "./package.json": "./package.json",
-    ".": {
-      "@living-architecture/source": "./src/index.ts",
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "default": "./dist/index.js"
-    },
-    "./default-config": "./src/default-extraction.config.json",
-    "./eslint-plugin": {
-      "types": "./src/eslint/index.d.ts",
-      "require": "./src/eslint/index.cjs",
-      "default": "./src/eslint/index.cjs"
-    }
-  },
-  "files": [
-    "dist",
-    "src/default-extraction.config.json",
-    "src/eslint/*.cjs",
-    "src/eslint/*.d.ts",
-    "src/eslint/*.d.cts",
-    "!**/*.tsbuildinfo"
-  ],
-  "dependencies": {
-    "@living-architecture/riviere-extract-config": "workspace:*"
-  }
-}
diff --git a/packages/riviere-extract-conventions/project.json b/packages/riviere-extract-conventions/project.json
deleted file mode 100644
index cfbb2cb25..000000000
--- a/packages/riviere-extract-conventions/project.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "name": "riviere-extract-conventions"
-}
diff --git a/packages/riviere-extract-conventions/published-language/CLAUDE.md b/packages/riviere-extract-conventions/published-language/CLAUDE.md
new file mode 100644
index 000000000..f1c991734
--- /dev/null
+++ b/packages/riviere-extract-conventions/published-language/CLAUDE.md
@@ -0,0 +1,119 @@
+# riviere-extract-conventions
+
+Decorators for marking architectural components in TypeScript code.
+
+## Purpose
+
+Provides a convention-based approach to annotating code for architectural extraction. Teams adopting these decorators get:
+- Consistent component marking across the codebase
+- Deterministic extraction via riviere-extract-ts
+- ESLint enforcement to ensure coverage (D2.3)
+
+## Decorator Categories
+
+### Container Decorators (class-level)
+All public methods in the class inherit the component type:
+- `@DomainOpContainer` - domain operation container
+- `@APIContainer` - API endpoint container
+- `@EventHandlerContainer` - event handler container
+
+### Class-as-Component Decorators
+The class itself is the component:
+- `@UseCase` - use case class
+- `@Event` - domain event class
+- `@UI` - UI component class
+
+### Method-level Decorators
+Individual methods marked as components:
+- `@DomainOp` - domain operation method
+- `@APIEndpoint` - API endpoint method
+- `@EventHandler` - event handler method
+
+### Other
+- `@Custom(type)` - custom component type
+- `@Ignore` - exclude from analysis
+
+## Default Extraction Config
+
+A ready-to-use extraction config is provided for teams adopting our decorator conventions.
+
+### Usage
+
+Import the default config in your project:
+
+```typescript
+import defaultConfig from '@living-architecture/riviere-extract-conventions-published-language/default-config'
+```
+
+Or reference it directly in your extraction tooling:
+```bash
+riviere extract --config ./node_modules/@living-architecture/riviere-extract-conventions-published-language/src/default-extraction.config.json
+```
+
+### What It Does
+
+The default config detects all 6 component types using class-level decorators:
+
+**Container decorators** (all public methods become separate components):
+- **api** → all public methods in classes with `@APIContainer`
+- **domainOp** → all public methods in classes with `@DomainOpContainer`
+- **eventHandler** → all public methods in classes with `@EventHandlerContainer`
+
+**Single-method decorators** (the one public method becomes the component):
+- **useCase** → the single public method in classes with `@UseCase`
+- **ui** → the single public method in classes with `@UI`
+
+**Class-as-component decorator** (the class itself is the component):
+- **event** → classes with `@Event`
+
+Detection rules:
+- Container types find `methods` in classes with decorators
+- Class types find `classes` with decorators
+- All decorators from `@living-architecture/riviere-extract-conventions-published-language`
+- Path: `**/*.ts` (all TypeScript files)
+
+The extractor (riviere-extract-ts) will:
+- Extract all public methods from container classes as individual components
+- Extract the single public method from UseCase/UI classes as the component
+- Extract Event classes themselves as components
+
+### Customization
+
+The default config is a starting point. Teams can:
+1. Copy it and modify detection rules
+2. Add additional modules for different paths
+3. Combine with other detection strategies (JSDoc, naming conventions)
+
+## ESLint Enforcement
+
+An ESLint plugin ensures all classes have component decorators.
+
+### Setup
+
+```javascript
+import conventionsPlugin from '@living-architecture/riviere-extract-conventions-published-language/eslint-plugin'
+
+export default [
+  {
+    files: ['src/domain/**/*.ts'],
+    plugins: { conventions: conventionsPlugin },
+    rules: { 'conventions/require-component-decorator': 'error' },
+  },
+]
+```
+
+### What It Checks
+
+The `require-component-decorator` rule reports errors when classes lack component decorators:
+
+**Valid decorators:** `@UseCase`, `@Event`, `@UI`, `@DomainOpContainer`, `@APIContainer`, `@EventHandlerContainer`, `@Custom('type')`, `@Ignore`
+
+**Ignored:** Functions, interfaces, type aliases, anonymous classes
+
+Use ESLint's `files` config to scope enforcement to specific paths.
+
+## Principles
+
+1. **Pure markers** - Decorators have no runtime behavior; they exist only for extraction
+2. **ECMAScript standard** - Uses Stage 3 decorators (TypeScript 5.0+), not legacy experimentalDecorators
+3. **Extractor-friendly** - Designed to be detected by ts-morph in riviere-extract-ts
diff --git a/packages/riviere-extract-conventions/published-language/README.md b/packages/riviere-extract-conventions/published-language/README.md
new file mode 100644
index 000000000..00a111e72
--- /dev/null
+++ b/packages/riviere-extract-conventions/published-language/README.md
@@ -0,0 +1,69 @@
+# riviere-extract-conventions
+
+Decorators for marking architectural components in TypeScript code.
+
+## Installation
+
+```bash
+npm install @living-architecture/riviere-extract-conventions-published-language
+```
+
+## Usage
+
+```typescript
+import {
+  APIContainer,
+  APIEndpoint,
+  UseCase,
+  Event,
+  DomainOp,
+  Ignore,
+} from '@living-architecture/riviere-extract-conventions-published-language'
+
+// Container decorator - all public methods are API endpoints
+@APIContainer
+class OrderController {
+  @APIEndpoint
+  getOrders(): Order[] { /* ... */ }
+
+  @Ignore
+  healthCheck(): boolean { return true }
+}
+
+// Class-as-component
+@UseCase
+class CreateOrderUseCase {
+  execute(command: CreateOrderCommand): Order { /* ... */ }
+}
+
+@Event
+class OrderCreated {
+  constructor(readonly orderId: string) {}
+}
+```
+
+## Decorators
+
+| Decorator | Target | Description |
+|-----------|--------|-------------|
+| `@DomainOpContainer` | Class | All public methods are domain operations |
+| `@APIContainer` | Class | All public methods are API endpoints |
+| `@EventHandlerContainer` | Class | All public methods are event handlers |
+| `@UseCase` | Class | Class is a use case |
+| `@Event` | Class | Class is a domain event |
+| `@UI` | Class | Class is a UI component |
+| `@DomainOp` | Method | Method is a domain operation |
+| `@APIEndpoint` | Method | Method is an API endpoint |
+| `@EventHandler` | Method | Method is an event handler |
+| `@Custom(type)` | Class/Method | Custom component type |
+| `@Ignore` | Class/Method | Exclude from analysis |
+
+## Building
+
+```bash
+nx build riviere-extract-conventions-published-language
+```
+
+## Documentation
+
+- [CLAUDE.md](./CLAUDE.md) - Package principles and design decisions
diff --git a/packages/riviere-extract-conventions/published-language/package.json b/packages/riviere-extract-conventions/published-language/package.json
new file mode 100644
index 000000000..dfdc3a9c5
--- /dev/null
+++ b/packages/riviere-extract-conventions/published-language/package.json
@@ -0,0 +1,44 @@
+{
+  "name": "@living-architecture/riviere-extract-conventions-published-language",
+  "version": "0.6.3",
+  "type": "module",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/NTCoding/living-architecture.git",
+    "directory": "packages/riviere-extract-conventions/published-language"
+  },
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "@living-architecture/source": "./src/index.ts",
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
+    },
+    "./default-config": "./src/published-language/default-extraction.config.json",
+    "./eslint-plugin": {
+      "types": "./src/published-language/eslint-plugin/index.d.ts",
+      "require": "./src/published-language/eslint-plugin/index.cjs",
+      "default": "./src/published-language/eslint-plugin/index.cjs"
+    }
+  },
+  "files": [
+    "dist",
+    "!dist/**/__fixtures__/**",
+    "src/published-language/default-extraction.config.json",
+    "src/published-language/eslint-plugin/*.cjs",
+    "src/published-language/eslint-plugin/*.d.ts",
+    "src/published-language/eslint-plugin/*.d.cts",
+    "!**/*.tsbuildinfo"
+  ],
+  "dependencies": {
+    "@living-architecture/riviere-extract-config-published-language": "workspace:*",
+    "@typescript-eslint/utils": "8.53.0"
+  }
+}
diff --git a/packages/riviere-extract-conventions/published-language/project.json b/packages/riviere-extract-conventions/published-language/project.json
new file mode 100644
index 000000000..2ed6987f7
--- /dev/null
+++ b/packages/riviere-extract-conventions/published-language/project.json
@@ -0,0 +1,18 @@
+{
+  "name": "riviere-extract-conventions-published-language",
+  "targets": {
+    "build": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          "node ../../../scripts/build-public-exports.mjs . --clean",
+          "tsc --build tsconfig.lib.json",
+          "node ../../../scripts/build-public-exports.mjs ."
+        ],
+        "cwd": "{projectRoot}",
+        "parallel": false
+      },
+      "outputs": ["{projectRoot}/dist"]
+    }
+  }
+}
diff --git a/packages/riviere-extract-conventions/published-language/src/index.ts b/packages/riviere-extract-conventions/published-language/src/index.ts
new file mode 100644
index 000000000..e8157c82d
--- /dev/null
+++ b/packages/riviere-extract-conventions/published-language/src/index.ts
@@ -0,0 +1,20 @@
+export {
+  // Container decorators
+  DomainOpContainer,
+  APIContainer,
+  EventHandlerContainer,
+  EventPublisherContainer,
+  // Class-as-component decorators
+  UseCase,
+  Event,
+  UI,
+  // Method-level decorators
+  DomainOp,
+  APIEndpoint,
+  EventHandler,
+  HttpClient,
+  HttpCall,
+  // Other decorators
+  Custom,
+  Ignore,
+} from './published-language/decorators'
diff --git a/packages/riviere-extract-conventions/published-language/src/published-language/__fixtures__/default-config-fixtures.ts b/packages/riviere-extract-conventions/published-language/src/published-language/__fixtures__/default-config-fixtures.ts
new file mode 100644
index 000000000..48d6fb490
--- /dev/null
+++ b/packages/riviere-extract-conventions/published-language/src/published-language/__fixtures__/default-config-fixtures.ts
@@ -0,0 +1,50 @@
+import { readFileSync } from 'node:fs'
+import { join, dirname } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import {
+  parseExtractionConfig,
+  type DraftConfiguration,
+} from '@living-architecture/riviere-extract-config-published-language'
+
+const CURRENT_DIR = dirname(fileURLToPath(import.meta.url))
+
+export class TestAssertionError extends Error {
+  constructor(message: string) {
+    super(message)
+    this.name = 'TestAssertionError'
+  }
+}
+
+export function loadDefaultConfig(): unknown {
+  const configPath = join(CURRENT_DIR, '../default-extraction.config.json')
+  const configContent = readFileSync(configPath, 'utf-8')
+  return JSON.parse(configContent)
+}
+
+export function getDraftConfiguration(config: unknown): DraftConfiguration {
+  const result = parseExtractionConfig(config)
+  if (!result.success) {
+    throw new TestAssertionError(
+      `Expected a valid DraftConfiguration. Got an invalid configuration.`,
+    )
+  }
+  return result.configuration
+}
+
+export function getFirstModule(config: unknown): DraftConfiguration['modules'][number] {
+  const result = parseExtractionConfig(config)
+  if (!result.success) {
+    throw new TestAssertionError(
+      `Expected a valid DraftConfiguration. Got an invalid configuration.`,
+    )
+  }
+
+  const [module] = result.configuration.modules
+  if (!module) {
+    throw new TestAssertionError(
+      `Expected modules[0] after schema validation. Got undefined. Schema enforces minItems: 1.`,
+    )
+  }
+
+  return module
+}
diff --git a/packages/riviere-extract-conventions/src/decorators-typed-constructors.spec.ts b/packages/riviere-extract-conventions/published-language/src/published-language/decorators-typed-constructors.spec.ts
similarity index 80%
rename from packages/riviere-extract-conventions/src/decorators-typed-constructors.spec.ts
rename to packages/riviere-extract-conventions/published-language/src/published-language/decorators-typed-constructors.spec.ts
index 22660945b..f948c4f80 100644
--- a/packages/riviere-extract-conventions/src/decorators-typed-constructors.spec.ts
+++ b/packages/riviere-extract-conventions/published-language/src/published-language/decorators-typed-constructors.spec.ts
@@ -1,6 +1,4 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import {
   DomainOpContainer,
   APIContainer,
@@ -11,13 +9,14 @@ import {
   UI,
   Custom,
   Ignore,
-  getCustomType,
 } from './decorators'
 
 describe('All decorators with typed constructor parameters', () => {
   describe('DomainOpContainer with typed constructor', () => {
     it('preserves method behavior with injected dependency', () => {
-      interface Repo {find(): string}
+      interface Repo {
+        find(): string
+      }
       @DomainOpContainer
       class Handler {
         constructor(private repo: Repo) {}
@@ -32,7 +31,9 @@ describe('All decorators with typed constructor parameters', () => {
 
   describe('APIContainer with typed constructor', () => {
     it('preserves method behavior with injected dependency', () => {
-      interface Service {process(): string}
+      interface Service {
+        process(): string
+      }
       @APIContainer
       class Endpoint {
         constructor(private service: Service) {}
@@ -47,7 +48,9 @@ describe('All decorators with typed constructor parameters', () => {
 
   describe('EventHandlerContainer with typed constructor', () => {
     it('preserves method behavior with injected dependency', () => {
-      interface Store {save(data: object): string}
+      interface Store {
+        save(data: object): string
+      }
       @EventHandlerContainer
       class Listener {
         constructor(private store: Store) {}
@@ -62,7 +65,9 @@ describe('All decorators with typed constructor parameters', () => {
 
   describe('EventPublisherContainer with typed constructor', () => {
     it('preserves method behavior with injected dependency', () => {
-      interface EventBus {publish(event: object): string}
+      interface EventBus {
+        publish(event: object): string
+      }
       @EventPublisherContainer
       class Publisher {
         constructor(private bus: EventBus) {}
@@ -77,7 +82,9 @@ describe('All decorators with typed constructor parameters', () => {
 
   describe('UseCase with typed constructor', () => {
     it('preserves method behavior with injected dependency', () => {
-      interface Repo {create(data: object): string}
+      interface Repo {
+        create(data: object): string
+      }
       @UseCase
       class CreateUseCase {
         constructor(private repo: Repo) {}
@@ -129,7 +136,9 @@ describe('All decorators with typed constructor parameters', () => {
 
   describe('UI with typed constructor', () => {
     it('preserves render output with injected dependency', () => {
-      interface Theme {primary: string}
+      interface Theme {
+        primary: string
+      }
       @UI
       class Form {
         constructor(private theme: Theme) {}
@@ -144,7 +153,9 @@ describe('All decorators with typed constructor parameters', () => {
 
   describe('Custom with typed constructor', () => {
     it('stores custom type and preserves method behavior', () => {
-      interface Config {timeout: number}
+      interface Config {
+        timeout: number
+      }
       @Custom('MyComponent')
       class MyClass {
         constructor(private config: Config) {}
@@ -154,11 +165,12 @@ describe('All decorators with typed constructor parameters', () => {
       }
       const instance = new MyClass({ timeout: 5000 })
       expect(instance.getTimeout()).toBe(5000)
-      expect(getCustomType(MyClass)).toBe('MyComponent')
     })
 
     it('stores custom type on method in class with typed constructor', () => {
-      interface Service {process(): string}
+      interface Service {
+        process(): string
+      }
       class MyClass {
         constructor(private service: Service) {}
         @Custom('Query')
@@ -167,13 +179,15 @@ describe('All decorators with typed constructor parameters', () => {
         }
       }
       const instance = new MyClass({ process: () => 'result' })
-      expect(getCustomType(instance.find)).toBe('Query')
+      expect(instance.find()).toBe('result')
     })
   })
 
   describe('Ignore with typed constructor', () => {
     it('preserves method behavior when applied to class', () => {
-      interface Logger {log(msg: string): string}
+      interface Logger {
+        log(msg: string): string
+      }
       @Ignore
       class AuditLogger {
         constructor(private logger: Logger) {}
@@ -186,7 +200,9 @@ describe('All decorators with typed constructor parameters', () => {
     })
 
     it('preserves method behavior when applied to method', () => {
-      interface Repo {find(): string}
+      interface Repo {
+        find(): string
+      }
       class MyClass {
         constructor(private repo: Repo) {}
         @Ignore
@@ -198,25 +214,4 @@ describe('All decorators with typed constructor parameters', () => {
       expect(instance.internalMethod()).toBe('data')
     })
   })
-
-  describe('getCustomType edge cases', () => {
-    it('returns undefined for null', () => {
-      expect(getCustomType(null)).toBeUndefined()
-    })
-
-    it('returns undefined for undefined', () => {
-      expect(getCustomType(undefined)).toBeUndefined()
-    })
-
-    it('returns undefined for primitives', () => {
-      expect(getCustomType(42)).toBeUndefined()
-      expect(getCustomType('string')).toBeUndefined()
-      expect(getCustomType(true)).toBeUndefined()
-    })
-
-    it('returns undefined when no custom type is set', () => {
-      class NoType {}
-      expect(getCustomType(NoType)).toBeUndefined()
-    })
-  })
 })
diff --git a/packages/riviere-extract-conventions/src/decorators.spec.ts b/packages/riviere-extract-conventions/published-language/src/published-language/decorators.spec.ts
similarity index 76%
rename from packages/riviere-extract-conventions/src/decorators.spec.ts
rename to packages/riviere-extract-conventions/published-language/src/published-language/decorators.spec.ts
index b844f2b7a..7f6cdf210 100644
--- a/packages/riviere-extract-conventions/src/decorators.spec.ts
+++ b/packages/riviere-extract-conventions/published-language/src/published-language/decorators.spec.ts
@@ -1,6 +1,4 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import {
   DomainOpContainer,
   APIContainer,
@@ -16,7 +14,6 @@ import {
   HttpCall,
   Custom,
   Ignore,
-  getCustomType,
 } from './decorators'
 
 describe('Container decorators', () => {
@@ -210,17 +207,6 @@ describe('Other decorators', () => {
       expect(new Order().id).toBe('order-1')
     })
 
-    it('stores custom type for extraction', () => {
-      @Custom('Repository')
-      class OrderRepository {
-        findAll(): string[] {
-          return []
-        }
-      }
-
-      expect(getCustomType(OrderRepository)).toBe('Repository')
-    })
-
     it('preserves method return value when applied to method', () => {
       class OrderQuery {
         @Custom('Query')
@@ -232,26 +218,6 @@ describe('Other decorators', () => {
       expect(new OrderQuery().findAll()).toStrictEqual(['item1'])
     })
 
-    it('returns undefined for undecorated class', () => {
-      class UndecoratedOrder {
-        readonly id: string = 'order-1'
-      }
-
-      expect(getCustomType(UndecoratedOrder)).toBeUndefined()
-    })
-
-    it('stores custom type for method extraction', () => {
-      class OrderQueries {
-        @Custom('Query')
-        findById(): string {
-          return 'order-1'
-        }
-      }
-
-      const instance = new OrderQueries()
-      expect(getCustomType(instance.findById)).toBe('Query')
-    })
-
     it('throws TypeError for empty string type', () => {
       expect(() => Custom('')).toThrow(TypeError)
       expect(() => Custom('')).toThrow("Custom component type must be a non-empty string, got: ''")
@@ -264,63 +230,16 @@ describe('Other decorators', () => {
       )
     })
 
-    it('trims whitespace from type parameter', () => {
-      @Custom('  Aggregate  ')
-      class TrimmedOrder {
-        readonly id: string = 'order-1'
-      }
-
-      expect(getCustomType(TrimmedOrder)).toBe('Aggregate')
-    })
-
     it('accepts type with forward slash', () => {
-      @Custom('Order/Manager')
-      class SlashType {
-        readonly id: string = '1'
-      }
-
-      expect(getCustomType(SlashType)).toBe('Order/Manager')
+      expect(() => Custom('Order/Manager')).not.toThrow()
     })
 
     it('accepts type with hyphen', () => {
-      @Custom('Order-Manager')
-      class HyphenType {
-        readonly id: string = '1'
-      }
-
-      expect(getCustomType(HyphenType)).toBe('Order-Manager')
+      expect(() => Custom('Order-Manager')).not.toThrow()
     })
 
     it('accepts type with dot', () => {
-      @Custom('Order.Manager')
-      class DotType {
-        readonly id: string = '1'
-      }
-
-      expect(getCustomType(DotType)).toBe('Order.Manager')
-    })
-
-    it('last decorator wins when multiple Custom decorators applied to class', () => {
-      @Custom('First')
-      @Custom('Second')
-      class MultiCustom {
-        readonly id: string = '1'
-      }
-
-      expect(getCustomType(MultiCustom)).toBe('First')
-    })
-
-    it('last decorator wins when multiple Custom decorators applied to method', () => {
-      class MultiMethod {
-        @Custom('First')
-        @Custom('Second')
-        multiMethod(): string {
-          return 'multi'
-        }
-      }
-
-      const instance = new MultiMethod()
-      expect(getCustomType(instance.multiMethod)).toBe('First')
+      expect(() => Custom('Order.Manager')).not.toThrow()
     })
   })
 
diff --git a/packages/riviere-extract-conventions/src/decorators.ts b/packages/riviere-extract-conventions/published-language/src/published-language/decorators.ts
similarity index 82%
rename from packages/riviere-extract-conventions/src/decorators.ts
rename to packages/riviere-extract-conventions/published-language/src/published-language/decorators.ts
index 14a73c360..0f35d009f 100644
--- a/packages/riviere-extract-conventions/src/decorators.ts
+++ b/packages/riviere-extract-conventions/published-language/src/published-language/decorators.ts
@@ -14,6 +14,7 @@ type Method = (...args: unknown[]) => unknown
 /**
  * Marks a class as a container where all public methods are domain operations.
  */
+/** @riviere-role published-language-annotation */
 export function DomainOpContainer<T>(target: T, _: ClassDecoratorContext): T {
   return target
 }
@@ -21,6 +22,7 @@ export function DomainOpContainer<T>(target: T, _: ClassDecoratorContext): T {
 /**
  * Marks a class as a container where all public methods are API endpoints.
  */
+/** @riviere-role published-language-annotation */
 export function APIContainer<T>(target: T, _: ClassDecoratorContext): T {
   return target
 }
@@ -28,6 +30,7 @@ export function APIContainer<T>(target: T, _: ClassDecoratorContext): T {
 /**
  * Marks a class as a container where all public methods are event handlers.
  */
+/** @riviere-role published-language-annotation */
 export function EventHandlerContainer<T>(target: T, _: ClassDecoratorContext): T {
   return target
 }
@@ -35,6 +38,7 @@ export function EventHandlerContainer<T>(target: T, _: ClassDecoratorContext): T
 /**
  * Marks a class as a container where all public methods are event publishers.
  */
+/** @riviere-role published-language-annotation */
 export function EventPublisherContainer<T>(target: T, _: ClassDecoratorContext): T {
   return target
 }
@@ -46,6 +50,7 @@ export function EventPublisherContainer<T>(target: T, _: ClassDecoratorContext):
 /**
  * Marks a class as a use case component.
  */
+/** @riviere-role published-language-annotation */
 export function UseCase<T>(target: T, _: ClassDecoratorContext): T {
   return target
 }
@@ -53,6 +58,7 @@ export function UseCase<T>(target: T, _: ClassDecoratorContext): T {
 /**
  * Marks a class as a domain event.
  */
+/** @riviere-role published-language-annotation */
 export function Event<T>(target: T, _: ClassDecoratorContext): T {
   return target
 }
@@ -60,6 +66,7 @@ export function Event<T>(target: T, _: ClassDecoratorContext): T {
 /**
  * Marks a class as a UI component.
  */
+/** @riviere-role published-language-annotation */
 export function UI<T>(target: T, _: ClassDecoratorContext): T {
   return target
 }
@@ -71,6 +78,7 @@ export function UI<T>(target: T, _: ClassDecoratorContext): T {
 /**
  * Marks a method as a domain operation.
  */
+/** @riviere-role published-language-annotation */
 export function DomainOp<T extends Method>(target: T, _: ClassMethodDecoratorContext): T {
   return target
 }
@@ -78,6 +86,7 @@ export function DomainOp<T extends Method>(target: T, _: ClassMethodDecoratorCon
 /**
  * Marks a method as an API endpoint.
  */
+/** @riviere-role published-language-annotation */
 export function APIEndpoint<T extends Method>(target: T, _: ClassMethodDecoratorContext): T {
   return target
 }
@@ -85,6 +94,7 @@ export function APIEndpoint<T extends Method>(target: T, _: ClassMethodDecorator
 /**
  * Marks a method as an event handler.
  */
+/** @riviere-role published-language-annotation */
 export function EventHandler<T extends Method>(target: T, _: ClassMethodDecoratorContext): T {
   return target
 }
@@ -92,6 +102,7 @@ export function EventHandler<T extends Method>(target: T, _: ClassMethodDecorato
 /**
  * Marks a class as an HTTP client for a named remote service.
  */
+/** @riviere-role published-language-annotation */
 export function HttpClient(
   _serviceName: string,
 ): <T>(target: T, context: ClassDecoratorContext) => T {
@@ -103,6 +114,7 @@ export function HttpClient(
 /**
  * Marks a method as an HTTP call operation.
  */
+/** @riviere-role published-language-annotation */
 export function HttpCall(
   _route: string,
   _method: string,
@@ -116,17 +128,13 @@ export function HttpCall(
 // Other Decorators
 // ============================================================================
 
-// Symbol for storing custom types on decorated targets
-const CUSTOM_COMPONENT_TYPE_KEY = Symbol.for(
-  '@living-architecture/riviere-extract-conventions.customType',
-)
-
 /**
  * Marks a class or method with a custom component type.
  * Use when standard component types don't fit.
  *
  * @throws TypeError if type is empty or whitespace-only
  */
+/** @riviere-role published-language-annotation */
 export function Custom(
   type: string,
 ): <T>(target: T, context: ClassDecoratorContext | ClassMethodDecoratorContext) => T {
@@ -135,14 +143,6 @@ export function Custom(
     throw new TypeError(`Custom component type must be a non-empty string, got: '${type}'`)
   }
   return function <T>(target: T, _: ClassDecoratorContext | ClassMethodDecoratorContext): T {
-    try {
-      Object.defineProperty(target, CUSTOM_COMPONENT_TYPE_KEY, {
-        value: trimmed,
-        configurable: true,
-      })
-    } catch {
-      // Ignore errors when setting property on non-objects
-    }
     return target
   }
 }
@@ -151,20 +151,7 @@ export function Custom(
  * Excludes a class or method from architectural analysis.
  * Use for infrastructure code, utilities, or code that shouldn't appear in the architecture.
  */
+/** @riviere-role published-language-annotation */
 export function Ignore<T>(target: T, _: ClassDecoratorContext | ClassMethodDecoratorContext): T {
   return target
 }
-
-/**
- * Gets the custom type for a decorated target.
- * Used by the extractor to read custom component types.
- */
-export function getCustomType(target: unknown): string | undefined {
-  if (target == null) return undefined
-  if (typeof target !== 'object' && typeof target !== 'function') return undefined
-  const descriptor = Object.getOwnPropertyDescriptor(target, CUSTOM_COMPONENT_TYPE_KEY)
-  if (descriptor && typeof descriptor.value === 'string') {
-    return descriptor.value
-  }
-  return undefined
-}
diff --git a/packages/riviere-extract-conventions/published-language/src/published-language/default-config-fixtures.spec.ts b/packages/riviere-extract-conventions/published-language/src/published-language/default-config-fixtures.spec.ts
new file mode 100644
index 000000000..8fbbaca0d
--- /dev/null
+++ b/packages/riviere-extract-conventions/published-language/src/published-language/default-config-fixtures.spec.ts
@@ -0,0 +1,38 @@
+import { describe, it, expect, vi } from 'vitest'
+import * as extractionConfig from '@living-architecture/riviere-extract-config-published-language'
+import {
+  getDraftConfiguration,
+  getFirstModule,
+  loadDefaultConfig,
+} from './__fixtures__/default-config-fixtures'
+
+describe('getDraftConfiguration', () => {
+  it('throws when config is invalid', () => {
+    expect(() => getDraftConfiguration({ modules: [] })).toThrow(
+      'Expected a valid DraftConfiguration',
+    )
+  })
+})
+
+describe('getFirstModule', () => {
+  it('returns first module when config is valid', () => {
+    const result = getFirstModule(loadDefaultConfig())
+
+    expect(result.name).toBe('default')
+  })
+
+  it('throws when config is invalid', () => {
+    const invalidConfig = { modules: [] }
+
+    expect(() => getFirstModule(invalidConfig)).toThrow('Expected a valid DraftConfiguration')
+  })
+
+  it('rejects an empty parsed module collection', () => {
+    vi.spyOn(extractionConfig, 'parseExtractionConfig').mockReturnValueOnce({
+      success: true,
+      configuration: { modules: [] },
+    })
+
+    expect(() => getFirstModule({})).toThrow('Expected modules[0] after schema validation')
+  })
+})
diff --git a/packages/riviere-extract-conventions/src/default-config.spec.ts b/packages/riviere-extract-conventions/published-language/src/published-language/default-config.spec.ts
similarity index 89%
rename from packages/riviere-extract-conventions/src/default-config.spec.ts
rename to packages/riviere-extract-conventions/published-language/src/published-language/default-config.spec.ts
index 7d70ae6f8..125376347 100644
--- a/packages/riviere-extract-conventions/src/default-config.spec.ts
+++ b/packages/riviere-extract-conventions/published-language/src/published-language/default-config.spec.ts
@@ -1,16 +1,14 @@
+import { describe, it, expect } from 'vitest'
 import {
-  describe, it, expect 
-} from 'vitest'
-import {
-  validateExtractionConfig,
+  parseExtractionConfig,
   type ComponentRule,
-} from '@living-architecture/riviere-extract-config'
+} from '@living-architecture/riviere-extract-config-published-language'
 import {
   loadDefaultConfig,
   getFirstModule,
-  getValidatedConfig,
+  getDraftConfiguration,
   TestAssertionError,
-} from './default-config-fixtures'
+} from './__fixtures__/default-config-fixtures'
 
 function narrowToDetectionRule(rule: ComponentRule | undefined) {
   if (!rule) {
@@ -36,7 +34,7 @@ function assertContainerDecorator(
 
   expect(detection.where.inClassWith.hasDecorator).toStrictEqual({
     name: expectedDecorator,
-    from: '@living-architecture/riviere-extract-conventions',
+    from: '@living-architecture/riviere-extract-conventions-published-language',
   })
 }
 
@@ -56,7 +54,7 @@ function assertDirectDecorator(rule: ComponentRule | undefined, expectedDecorato
 
   expect(detection.where.hasDecorator).toStrictEqual({
     name: expectedDecorator,
-    from: '@living-architecture/riviere-extract-conventions',
+    from: '@living-architecture/riviere-extract-conventions-published-language',
   })
 }
 
@@ -64,9 +62,9 @@ describe('Default extraction config', () => {
   it('validates against extraction config schema and semantic rules', () => {
     const config = loadDefaultConfig()
 
-    const result = validateExtractionConfig(config)
+    const result = parseExtractionConfig(config)
 
-    expect(result.valid).toBe(true)
+    expect(result.success).toBe(true)
   })
 
   it('declares all 6 required component types and eventPublisher customType', () => {
@@ -105,14 +103,14 @@ describe('Default extraction config', () => {
           {
             hasDecorator: {
               name: 'HttpCall',
-              from: '@living-architecture/riviere-extract-conventions',
+              from: '@living-architecture/riviere-extract-conventions-published-language',
             },
           },
           {
             inClassWith: {
               hasDecorator: {
                 name: 'HttpClient',
-                from: '@living-architecture/riviere-extract-conventions',
+                from: '@living-architecture/riviere-extract-conventions-published-language',
               },
             },
           },
@@ -166,9 +164,7 @@ describe('Default extraction config', () => {
       componentType: 'ui' as const,
       expectedFind: 'classes',
     },
-  ])('$componentType finds $expectedFind', ({
-    componentType, expectedFind 
-  }) => {
+  ])('$componentType finds $expectedFind', ({ componentType, expectedFind }) => {
     const config = loadDefaultConfig()
     const module = getFirstModule(config)
 
@@ -191,9 +187,7 @@ describe('Default extraction config', () => {
       },
     ])(
       '$componentType uses inClassWith $decoratorName decorator',
-      ({
-        componentType, decoratorName 
-      }) => {
+      ({ componentType, decoratorName }) => {
         const config = loadDefaultConfig()
         const module = getFirstModule(config)
 
@@ -203,7 +197,7 @@ describe('Default extraction config', () => {
   })
 
   it('configures eventPublishers connection detection for the eventPublisher customType', () => {
-    const config = getValidatedConfig(loadDefaultConfig())
+    const config = getDraftConfiguration(loadDefaultConfig())
 
     expect(config.connections?.eventPublishers).toStrictEqual([
       {
@@ -266,9 +260,7 @@ describe('Default extraction config', () => {
       },
     ])(
       '$componentType uses direct $decoratorName decorator',
-      ({
-        componentType, decoratorName 
-      }) => {
+      ({ componentType, decoratorName }) => {
         const config = loadDefaultConfig()
         const module = getFirstModule(config)
 
diff --git a/packages/riviere-extract-conventions/src/default-extraction.config.json b/packages/riviere-extract-conventions/published-language/src/published-language/default-extraction.config.json
similarity index 93%
rename from packages/riviere-extract-conventions/src/default-extraction.config.json
rename to packages/riviere-extract-conventions/published-language/src/published-language/default-extraction.config.json
index bc54ecb12..85bd5a344 100644
--- a/packages/riviere-extract-conventions/src/default-extraction.config.json
+++ b/packages/riviere-extract-conventions/published-language/src/published-language/default-extraction.config.json
@@ -12,7 +12,7 @@
           "inClassWith": {
             "hasDecorator": {
               "name": "APIContainer",
-              "from": "@living-architecture/riviere-extract-conventions"
+              "from": "@living-architecture/riviere-extract-conventions-published-language"
             }
           }
         },
@@ -27,7 +27,7 @@
         "where": {
           "hasDecorator": {
             "name": "UseCase",
-            "from": "@living-architecture/riviere-extract-conventions"
+            "from": "@living-architecture/riviere-extract-conventions-published-language"
           }
         }
       },
@@ -37,7 +37,7 @@
           "inClassWith": {
             "hasDecorator": {
               "name": "DomainOpContainer",
-              "from": "@living-architecture/riviere-extract-conventions"
+              "from": "@living-architecture/riviere-extract-conventions-published-language"
             }
           }
         },
@@ -50,7 +50,7 @@
         "where": {
           "hasDecorator": {
             "name": "Event",
-            "from": "@living-architecture/riviere-extract-conventions"
+            "from": "@living-architecture/riviere-extract-conventions-published-language"
           }
         },
         "extract": {
@@ -63,7 +63,7 @@
           "inClassWith": {
             "hasDecorator": {
               "name": "EventHandlerContainer",
-              "from": "@living-architecture/riviere-extract-conventions"
+              "from": "@living-architecture/riviere-extract-conventions-published-language"
             }
           }
         },
@@ -76,7 +76,7 @@
         "where": {
           "hasDecorator": {
             "name": "UI",
-            "from": "@living-architecture/riviere-extract-conventions"
+            "from": "@living-architecture/riviere-extract-conventions-published-language"
           }
         },
         "extract": {
@@ -90,7 +90,7 @@
             "inClassWith": {
               "hasDecorator": {
                 "name": "EventPublisherContainer",
-                "from": "@living-architecture/riviere-extract-conventions"
+                "from": "@living-architecture/riviere-extract-conventions-published-language"
               }
             }
           },
@@ -105,14 +105,14 @@
               {
                 "hasDecorator": {
                   "name": "HttpCall",
-                  "from": "@living-architecture/riviere-extract-conventions"
+                  "from": "@living-architecture/riviere-extract-conventions-published-language"
                 }
               },
               {
                 "inClassWith": {
                   "hasDecorator": {
                     "name": "HttpClient",
-                    "from": "@living-architecture/riviere-extract-conventions"
+                    "from": "@living-architecture/riviere-extract-conventions-published-language"
                   }
                 }
               }
diff --git a/packages/riviere-extract-conventions/src/eslint/api-controller-requires-route-and-method.cjs b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/api-controller-requires-route-and-method.cjs
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/api-controller-requires-route-and-method.cjs
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/api-controller-requires-route-and-method.cjs
diff --git a/packages/riviere-extract-conventions/src/eslint/api-controller-requires-route-and-method.d.cts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/api-controller-requires-route-and-method.d.cts
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/api-controller-requires-route-and-method.d.cts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/api-controller-requires-route-and-method.d.cts
diff --git a/packages/riviere-extract-conventions/src/eslint/api-controller-requires-route-and-method.spec.ts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/api-controller-requires-route-and-method.spec.ts
similarity index 98%
rename from packages/riviere-extract-conventions/src/eslint/api-controller-requires-route-and-method.spec.ts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/api-controller-requires-route-and-method.spec.ts
index 446c41199..34d02ad5e 100644
--- a/packages/riviere-extract-conventions/src/eslint/api-controller-requires-route-and-method.spec.ts
+++ b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/api-controller-requires-route-and-method.spec.ts
@@ -1,6 +1,4 @@
-import {
-  afterAll, describe, expect, it 
-} from 'vitest'
+import { afterAll, describe, expect, it } from 'vitest'
 import { RuleTester } from '@typescript-eslint/rule-tester'
 import rule from './api-controller-requires-route-and-method.cjs'
 
diff --git a/packages/riviere-extract-conventions/src/eslint/event-handler-requires-subscribed-events.cjs b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/event-handler-requires-subscribed-events.cjs
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/event-handler-requires-subscribed-events.cjs
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/event-handler-requires-subscribed-events.cjs
diff --git a/packages/riviere-extract-conventions/src/eslint/event-handler-requires-subscribed-events.d.cts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/event-handler-requires-subscribed-events.d.cts
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/event-handler-requires-subscribed-events.d.cts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/event-handler-requires-subscribed-events.d.cts
diff --git a/packages/riviere-extract-conventions/src/eslint/event-handler-requires-subscribed-events.spec.ts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/event-handler-requires-subscribed-events.spec.ts
similarity index 95%
rename from packages/riviere-extract-conventions/src/eslint/event-handler-requires-subscribed-events.spec.ts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/event-handler-requires-subscribed-events.spec.ts
index 95c79da99..c54f5f3a6 100644
--- a/packages/riviere-extract-conventions/src/eslint/event-handler-requires-subscribed-events.spec.ts
+++ b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/event-handler-requires-subscribed-events.spec.ts
@@ -1,6 +1,4 @@
-import {
-  afterAll, describe, expect, it 
-} from 'vitest'
+import { afterAll, describe, expect, it } from 'vitest'
 import { RuleTester } from '@typescript-eslint/rule-tester'
 import rule from './event-handler-requires-subscribed-events.cjs'
 
@@ -15,7 +13,9 @@ const missingSubscribedEventsError = (className: string) => ({
   data: { className },
 })
 
-const subscribedEventsNotLiteralArrayError = () => ({messageId: 'subscribedEventsNotLiteralArray' as const,})
+const subscribedEventsNotLiteralArrayError = () => ({
+  messageId: 'subscribedEventsNotLiteralArray' as const,
+})
 
 describe('event-handler-requires-subscribed-events', () => {
   it('exports a valid ESLint rule object', () => {
diff --git a/packages/riviere-extract-conventions/src/eslint/event-publisher-method-signature.cjs b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/event-publisher-method-signature.cjs
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/event-publisher-method-signature.cjs
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/event-publisher-method-signature.cjs
diff --git a/packages/riviere-extract-conventions/src/eslint/event-publisher-method-signature.d.cts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/event-publisher-method-signature.d.cts
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/event-publisher-method-signature.d.cts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/event-publisher-method-signature.d.cts
diff --git a/packages/riviere-extract-conventions/src/eslint/event-publisher-method-signature.spec.ts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/event-publisher-method-signature.spec.ts
similarity index 99%
rename from packages/riviere-extract-conventions/src/eslint/event-publisher-method-signature.spec.ts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/event-publisher-method-signature.spec.ts
index 5535da330..445d829cc 100644
--- a/packages/riviere-extract-conventions/src/eslint/event-publisher-method-signature.spec.ts
+++ b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/event-publisher-method-signature.spec.ts
@@ -1,6 +1,4 @@
-import {
-  afterAll, describe, expect, it 
-} from 'vitest'
+import { afterAll, describe, expect, it } from 'vitest'
 import { RuleTester } from '@typescript-eslint/rule-tester'
 import rule from './event-publisher-method-signature.cjs'
 
diff --git a/packages/riviere-extract-conventions/src/eslint/event-requires-type-property.cjs b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/event-requires-type-property.cjs
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/event-requires-type-property.cjs
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/event-requires-type-property.cjs
diff --git a/packages/riviere-extract-conventions/src/eslint/event-requires-type-property.d.cts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/event-requires-type-property.d.cts
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/event-requires-type-property.d.cts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/event-requires-type-property.d.cts
diff --git a/packages/riviere-extract-conventions/src/eslint/event-requires-type-property.spec.ts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/event-requires-type-property.spec.ts
similarity index 97%
rename from packages/riviere-extract-conventions/src/eslint/event-requires-type-property.spec.ts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/event-requires-type-property.spec.ts
index a5e1bd56f..4a5cb09cf 100644
--- a/packages/riviere-extract-conventions/src/eslint/event-requires-type-property.spec.ts
+++ b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/event-requires-type-property.spec.ts
@@ -1,6 +1,4 @@
-import {
-  afterAll, describe, expect, it 
-} from 'vitest'
+import { afterAll, describe, expect, it } from 'vitest'
 import { RuleTester } from '@typescript-eslint/rule-tester'
 import rule from './event-requires-type-property.cjs'
 
diff --git a/packages/riviere-extract-conventions/src/eslint/http-call-requires-http-client-container.cjs b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-call-requires-http-client-container.cjs
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/http-call-requires-http-client-container.cjs
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-call-requires-http-client-container.cjs
diff --git a/packages/riviere-extract-conventions/src/eslint/http-call-requires-http-client-container.d.cts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-call-requires-http-client-container.d.cts
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/http-call-requires-http-client-container.d.cts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-call-requires-http-client-container.d.cts
diff --git a/packages/riviere-extract-conventions/src/eslint/http-call-requires-http-client-container.spec.ts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-call-requires-http-client-container.spec.ts
similarity index 97%
rename from packages/riviere-extract-conventions/src/eslint/http-call-requires-http-client-container.spec.ts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-call-requires-http-client-container.spec.ts
index e543f1615..1b1e70ce2 100644
--- a/packages/riviere-extract-conventions/src/eslint/http-call-requires-http-client-container.spec.ts
+++ b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-call-requires-http-client-container.spec.ts
@@ -1,6 +1,4 @@
-import {
-  afterAll, describe, expect, it 
-} from 'vitest'
+import { afterAll, describe, expect, it } from 'vitest'
 import { RuleTester } from '@typescript-eslint/rule-tester'
 import rule from './http-call-requires-http-client-container.cjs'
 
diff --git a/packages/riviere-extract-conventions/src/eslint/http-call-requires-route.cjs b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-call-requires-route.cjs
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/http-call-requires-route.cjs
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-call-requires-route.cjs
diff --git a/packages/riviere-extract-conventions/src/eslint/http-call-requires-route.d.cts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-call-requires-route.d.cts
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/http-call-requires-route.d.cts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-call-requires-route.d.cts
diff --git a/packages/riviere-extract-conventions/src/eslint/http-call-requires-route.spec.ts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-call-requires-route.spec.ts
similarity index 98%
rename from packages/riviere-extract-conventions/src/eslint/http-call-requires-route.spec.ts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-call-requires-route.spec.ts
index c52c361f7..9e5846684 100644
--- a/packages/riviere-extract-conventions/src/eslint/http-call-requires-route.spec.ts
+++ b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-call-requires-route.spec.ts
@@ -1,6 +1,4 @@
-import {
-  afterAll, describe, expect, it 
-} from 'vitest'
+import { afterAll, describe, expect, it } from 'vitest'
 import { RuleTester } from '@typescript-eslint/rule-tester'
 import rule from './http-call-requires-route.cjs'
 
diff --git a/packages/riviere-extract-conventions/src/eslint/http-client-public-methods-require-http-call.cjs b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-client-public-methods-require-http-call.cjs
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/http-client-public-methods-require-http-call.cjs
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-client-public-methods-require-http-call.cjs
diff --git a/packages/riviere-extract-conventions/src/eslint/http-client-public-methods-require-http-call.d.cts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-client-public-methods-require-http-call.d.cts
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/http-client-public-methods-require-http-call.d.cts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-client-public-methods-require-http-call.d.cts
diff --git a/packages/riviere-extract-conventions/src/eslint/http-client-public-methods-require-http-call.spec.ts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-client-public-methods-require-http-call.spec.ts
similarity index 98%
rename from packages/riviere-extract-conventions/src/eslint/http-client-public-methods-require-http-call.spec.ts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-client-public-methods-require-http-call.spec.ts
index 6ebdc3f11..127c15d34 100644
--- a/packages/riviere-extract-conventions/src/eslint/http-client-public-methods-require-http-call.spec.ts
+++ b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-client-public-methods-require-http-call.spec.ts
@@ -1,6 +1,4 @@
-import {
-  afterAll, describe, expect, it 
-} from 'vitest'
+import { afterAll, describe, expect, it } from 'vitest'
 import { RuleTester } from '@typescript-eslint/rule-tester'
 import rule from './http-client-public-methods-require-http-call.cjs'
 
diff --git a/packages/riviere-extract-conventions/src/eslint/http-client-requires-remote-name.cjs b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-client-requires-remote-name.cjs
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/http-client-requires-remote-name.cjs
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-client-requires-remote-name.cjs
diff --git a/packages/riviere-extract-conventions/src/eslint/http-client-requires-remote-name.d.cts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-client-requires-remote-name.d.cts
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/http-client-requires-remote-name.d.cts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-client-requires-remote-name.d.cts
diff --git a/packages/riviere-extract-conventions/src/eslint/http-client-requires-remote-name.spec.ts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-client-requires-remote-name.spec.ts
similarity index 97%
rename from packages/riviere-extract-conventions/src/eslint/http-client-requires-remote-name.spec.ts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-client-requires-remote-name.spec.ts
index 989380749..c84c1ace2 100644
--- a/packages/riviere-extract-conventions/src/eslint/http-client-requires-remote-name.spec.ts
+++ b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/http-client-requires-remote-name.spec.ts
@@ -1,6 +1,4 @@
-import {
-  afterAll, describe, expect, it 
-} from 'vitest'
+import { afterAll, describe, expect, it } from 'vitest'
 import { RuleTester } from '@typescript-eslint/rule-tester'
 import rule from './http-client-requires-remote-name.cjs'
 
diff --git a/packages/riviere-extract-conventions/src/eslint/index.cjs b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/index.cjs
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/index.cjs
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/index.cjs
diff --git a/packages/riviere-extract-conventions/src/eslint/index.d.ts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/index.d.ts
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/index.d.ts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/index.d.ts
diff --git a/packages/riviere-extract-conventions/src/eslint/interface-ast-predicates.cjs b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/interface-ast-predicates.cjs
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/interface-ast-predicates.cjs
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/interface-ast-predicates.cjs
diff --git a/packages/riviere-extract-conventions/src/eslint/no-fetch-outside-http-client.cjs b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/no-fetch-outside-http-client.cjs
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/no-fetch-outside-http-client.cjs
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/no-fetch-outside-http-client.cjs
diff --git a/packages/riviere-extract-conventions/src/eslint/no-fetch-outside-http-client.d.cts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/no-fetch-outside-http-client.d.cts
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/no-fetch-outside-http-client.d.cts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/no-fetch-outside-http-client.d.cts
diff --git a/packages/riviere-extract-conventions/src/eslint/no-fetch-outside-http-client.spec.ts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/no-fetch-outside-http-client.spec.ts
similarity index 95%
rename from packages/riviere-extract-conventions/src/eslint/no-fetch-outside-http-client.spec.ts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/no-fetch-outside-http-client.spec.ts
index 1118a67f8..6950e9a6d 100644
--- a/packages/riviere-extract-conventions/src/eslint/no-fetch-outside-http-client.spec.ts
+++ b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/no-fetch-outside-http-client.spec.ts
@@ -1,6 +1,4 @@
-import {
-  afterAll, describe, expect, it 
-} from 'vitest'
+import { afterAll, describe, expect, it } from 'vitest'
 import { RuleTester } from '@typescript-eslint/rule-tester'
 import rule from './no-fetch-outside-http-client.cjs'
 
diff --git a/packages/riviere-extract-conventions/src/eslint/require-component-decorator.cjs b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/require-component-decorator.cjs
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/require-component-decorator.cjs
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/require-component-decorator.cjs
diff --git a/packages/riviere-extract-conventions/src/eslint/require-component-decorator.d.cts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/require-component-decorator.d.cts
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/require-component-decorator.d.cts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/require-component-decorator.d.cts
diff --git a/packages/riviere-extract-conventions/src/eslint/require-component-decorator.spec.ts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/require-component-decorator.spec.ts
similarity index 98%
rename from packages/riviere-extract-conventions/src/eslint/require-component-decorator.spec.ts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/require-component-decorator.spec.ts
index 9d095324c..a54959337 100644
--- a/packages/riviere-extract-conventions/src/eslint/require-component-decorator.spec.ts
+++ b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/require-component-decorator.spec.ts
@@ -1,6 +1,4 @@
-import {
-  afterAll, describe, expect, it 
-} from 'vitest'
+import { afterAll, describe, expect, it } from 'vitest'
 import { RuleTester } from '@typescript-eslint/rule-tester'
 import rule from './require-component-decorator.cjs'
 
diff --git a/packages/riviere-extract-conventions/src/eslint/rule-module-declarations.d.ts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/rule-module-declarations.d.ts
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/rule-module-declarations.d.ts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/rule-module-declarations.d.ts
diff --git a/packages/riviere-extract-conventions/src/eslint/ui-page-requires-route.cjs b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/ui-page-requires-route.cjs
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/ui-page-requires-route.cjs
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/ui-page-requires-route.cjs
diff --git a/packages/riviere-extract-conventions/src/eslint/ui-page-requires-route.d.cts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/ui-page-requires-route.d.cts
similarity index 100%
rename from packages/riviere-extract-conventions/src/eslint/ui-page-requires-route.d.cts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/ui-page-requires-route.d.cts
diff --git a/packages/riviere-extract-conventions/src/eslint/ui-page-requires-route.spec.ts b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/ui-page-requires-route.spec.ts
similarity index 97%
rename from packages/riviere-extract-conventions/src/eslint/ui-page-requires-route.spec.ts
rename to packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/ui-page-requires-route.spec.ts
index 656f7587f..3099e0bb2 100644
--- a/packages/riviere-extract-conventions/src/eslint/ui-page-requires-route.spec.ts
+++ b/packages/riviere-extract-conventions/published-language/src/published-language/eslint-plugin/ui-page-requires-route.spec.ts
@@ -1,6 +1,4 @@
-import {
-  afterAll, describe, expect, it 
-} from 'vitest'
+import { afterAll, describe, expect, it } from 'vitest'
 import { RuleTester } from '@typescript-eslint/rule-tester'
 import rule from './ui-page-requires-route.cjs'
 
diff --git a/packages/riviere-extract-conventions/published-language/tsconfig.json b/packages/riviere-extract-conventions/published-language/tsconfig.json
new file mode 100644
index 000000000..667a3463d
--- /dev/null
+++ b/packages/riviere-extract-conventions/published-language/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/packages/riviere-extract-conventions/published-language/tsconfig.lib.json b/packages/riviere-extract-conventions/published-language/tsconfig.lib.json
new file mode 100644
index 000000000..896cb83e4
--- /dev/null
+++ b/packages/riviere-extract-conventions/published-language/tsconfig.lib.json
@@ -0,0 +1,31 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "src",
+    "outDir": "dist",
+    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
+    "emitDeclarationOnly": false,
+    "forceConsistentCasingInFileNames": true
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": [
+    "vite.config.ts",
+    "vite.config.mts",
+    "vitest.config.ts",
+    "vitest.config.mts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx"
+  ],
+  "references": [
+    {
+      "path": "../../riviere-extract-config/published-language/tsconfig.lib.json"
+    }
+  ]
+}
diff --git a/packages/riviere-extract-conventions/published-language/tsconfig.spec.json b/packages/riviere-extract-conventions/published-language/tsconfig.spec.json
new file mode 100644
index 000000000..1f22d385c
--- /dev/null
+++ b/packages/riviere-extract-conventions/published-language/tsconfig.spec.json
@@ -0,0 +1,29 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/vitest",
+    "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node", "vitest"],
+    "forceConsistentCasingInFileNames": true
+  },
+  "include": [
+    "vite.config.ts",
+    "vite.config.mts",
+    "vitest.config.ts",
+    "vitest.config.mts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx",
+    "src/**/*.d.ts",
+    "src/**/*.d.cts"
+  ],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    }
+  ]
+}
diff --git a/packages/riviere-extract-conventions/published-language/vite.config.ts b/packages/riviere-extract-conventions/published-language/vite.config.ts
new file mode 100644
index 000000000..389d7466d
--- /dev/null
+++ b/packages/riviere-extract-conventions/published-language/vite.config.ts
@@ -0,0 +1,7 @@
+import { defineConfig } from 'vite'
+
+export default defineConfig(() => ({
+  root: import.meta.dirname,
+  cacheDir: '../../../node_modules/.vite/packages/riviere-extract-conventions',
+  plugins: [],
+}))
diff --git a/packages/riviere-extract-conventions/published-language/vitest.config.mts b/packages/riviere-extract-conventions/published-language/vitest.config.mts
new file mode 100644
index 000000000..202fee002
--- /dev/null
+++ b/packages/riviere-extract-conventions/published-language/vitest.config.mts
@@ -0,0 +1,33 @@
+import path from 'node:path'
+import { defineConfig } from 'vitest/config'
+
+const repoRoot = path.resolve(__dirname, '../../..')
+
+export default defineConfig(() => ({
+  root: __dirname,
+  cacheDir: '../../../node_modules/.vite/packages/riviere-extract-conventions',
+  test: {
+    name: '@living-architecture/riviere-extract-conventions-published-language',
+    testTimeout: 30_000,
+    watch: false,
+    globals: true,
+    environment: 'node',
+    include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+    reporters: ['default'],
+    coverage: {
+      enabled: true,
+      reportsDirectory: './test-output/vitest/coverage',
+      provider: 'v8' as const,
+      reporter: ['text', ['lcov', { projectRoot: repoRoot }]] as [
+        'text',
+        ['lcov', { projectRoot: string }],
+      ],
+      thresholds: {
+        lines: 100,
+        statements: 100,
+        functions: 100,
+        branches: 100,
+      },
+    },
+  },
+}))
diff --git a/packages/riviere-extract-conventions/src/default-config-fixtures.spec.ts b/packages/riviere-extract-conventions/src/default-config-fixtures.spec.ts
deleted file mode 100644
index 9675b030b..000000000
--- a/packages/riviere-extract-conventions/src/default-config-fixtures.spec.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import {
-  describe, it, expect, vi 
-} from 'vitest'
-import {
-  getFirstModule, getValidatedConfig 
-} from './default-config-fixtures'
-import * as validation from '@living-architecture/riviere-extract-config'
-
-describe('getValidatedConfig', () => {
-  it('throws when config is invalid', () => {
-    expect(() => getValidatedConfig({ modules: [] })).toThrow('Expected valid ExtractionConfig')
-  })
-})
-
-describe('getFirstModule', () => {
-  it('returns first module when config is valid', () => {
-    const validConfig = {
-      modules: [
-        {
-          path: '.',
-          glob: '**/*.ts',
-          api: { find: 'methods' },
-        },
-        {
-          path: '.',
-          glob: '**/*.js',
-          api: { find: 'classes' },
-        },
-      ],
-    }
-
-    vi.spyOn(validation, 'isValidExtractionConfig').mockReturnValueOnce(true)
-
-    const result = getFirstModule(validConfig)
-
-    expect(result).toStrictEqual({
-      path: '.',
-      glob: '**/*.ts',
-      api: { find: 'methods' },
-    })
-  })
-
-  it('throws when config is invalid', () => {
-    const invalidConfig = { modules: [] }
-
-    expect(() => getFirstModule(invalidConfig)).toThrow('Expected valid ExtractionConfig')
-  })
-
-  it('throws when modules array is empty despite passing validation', () => {
-    const configWithNoModules = { modules: [] }
-
-    vi.spyOn(validation, 'isValidExtractionConfig').mockReturnValueOnce(true)
-
-    expect(() => getFirstModule(configWithNoModules)).toThrow(
-      'Expected modules[0] after schema validation',
-    )
-  })
-})
diff --git a/packages/riviere-extract-conventions/src/default-config-fixtures.ts b/packages/riviere-extract-conventions/src/default-config-fixtures.ts
deleted file mode 100644
index 4be8bda72..000000000
--- a/packages/riviere-extract-conventions/src/default-config-fixtures.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { readFileSync } from 'node:fs'
-import {
-  join, dirname 
-} from 'node:path'
-import { fileURLToPath } from 'node:url'
-import {
-  isValidExtractionConfig,
-  type ExtractionConfig,
-} from '@living-architecture/riviere-extract-config'
-
-const CURRENT_DIR = dirname(fileURLToPath(import.meta.url))
-
-export class TestAssertionError extends Error {
-  constructor(message: string) {
-    super(message)
-    this.name = 'TestAssertionError'
-  }
-}
-
-export function loadDefaultConfig(): unknown {
-  const configPath = join(CURRENT_DIR, 'default-extraction.config.json')
-  const configContent = readFileSync(configPath, 'utf-8')
-  return JSON.parse(configContent)
-}
-
-export function getValidatedConfig(config: unknown): ExtractionConfig {
-  if (!isValidExtractionConfig(config)) {
-    throw new TestAssertionError(
-      `Expected valid ExtractionConfig. Got invalid config. Validation needed.`,
-    )
-  }
-  return config
-}
-
-export function getFirstModule(config: unknown): ExtractionConfig['modules'][number] {
-  if (!isValidExtractionConfig(config)) {
-    throw new TestAssertionError(
-      `Expected valid ExtractionConfig. Got invalid config. Validation needed.`,
-    )
-  }
-
-  const [module] = config.modules
-  if (!module) {
-    throw new TestAssertionError(
-      `Expected modules[0] after schema validation. Got undefined. Schema enforces minItems: 1.`,
-    )
-  }
-
-  return module
-}
diff --git a/packages/riviere-extract-conventions/src/index.ts b/packages/riviere-extract-conventions/src/index.ts
deleted file mode 100644
index 0cb786614..000000000
--- a/packages/riviere-extract-conventions/src/index.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export {
-  // Container decorators
-  DomainOpContainer,
-  APIContainer,
-  EventHandlerContainer,
-  EventPublisherContainer,
-  // Class-as-component decorators
-  UseCase,
-  Event,
-  UI,
-  // Method-level decorators
-  DomainOp,
-  APIEndpoint,
-  EventHandler,
-  HttpClient,
-  HttpCall,
-  // Other decorators
-  Custom,
-  Ignore,
-  // Utilities
-  getCustomType,
-} from './decorators'
diff --git a/packages/riviere-extract-conventions/tsconfig.json b/packages/riviere-extract-conventions/tsconfig.json
deleted file mode 100644
index 62ebbd946..000000000
--- a/packages/riviere-extract-conventions/tsconfig.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ]
-}
diff --git a/packages/riviere-extract-conventions/tsconfig.lib.json b/packages/riviere-extract-conventions/tsconfig.lib.json
deleted file mode 100644
index ffc82db34..000000000
--- a/packages/riviere-extract-conventions/tsconfig.lib.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "baseUrl": ".",
-    "rootDir": "src",
-    "outDir": "dist",
-    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
-    "emitDeclarationOnly": false,
-    "forceConsistentCasingInFileNames": true
-  },
-  "include": ["src/**/*.ts"],
-  "exclude": [
-    "vite.config.ts",
-    "vite.config.mts",
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx"
-  ],
-  "references": [
-    {
-      "path": "../riviere-extract-config/tsconfig.lib.json"
-    }
-  ]
-}
diff --git a/packages/riviere-extract-conventions/tsconfig.spec.json b/packages/riviere-extract-conventions/tsconfig.spec.json
deleted file mode 100644
index ded774286..000000000
--- a/packages/riviere-extract-conventions/tsconfig.spec.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./out-tsc/vitest",
-    "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node", "vitest"],
-    "forceConsistentCasingInFileNames": true
-  },
-  "include": [
-    "vite.config.ts",
-    "vite.config.mts",
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx",
-    "src/**/*.d.ts",
-    "src/**/*.d.cts"
-  ],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    }
-  ]
-}
diff --git a/packages/riviere-extract-conventions/vite.config.ts b/packages/riviere-extract-conventions/vite.config.ts
deleted file mode 100644
index 2f73e004f..000000000
--- a/packages/riviere-extract-conventions/vite.config.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { defineConfig } from 'vite'
-
-export default defineConfig(() => ({
-  root: import.meta.dirname,
-  cacheDir: '../../node_modules/.vite/packages/riviere-extract-conventions',
-  plugins: [],
-}))
diff --git a/packages/riviere-extract-conventions/vitest.config.mts b/packages/riviere-extract-conventions/vitest.config.mts
deleted file mode 100644
index c38389829..000000000
--- a/packages/riviere-extract-conventions/vitest.config.mts
+++ /dev/null
@@ -1,30 +0,0 @@
-import path from 'node:path';
-import { defineConfig } from 'vitest/config';
-
-const repoRoot = path.resolve(__dirname, '../..');
-
-export default defineConfig(() => ({
-  root: __dirname,
-  cacheDir: '../../node_modules/.vite/packages/riviere-extract-conventions',
-  test: {
-    name: '@living-architecture/riviere-extract-conventions',
-    testTimeout: 30_000,
-    watch: false,
-    globals: true,
-    environment: 'node',
-    include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    reporters: ['default'],
-    coverage: {
-      enabled: true,
-      reportsDirectory: './test-output/vitest/coverage',
-      provider: 'v8' as const,
-      reporter: ['text', ['lcov', { projectRoot: repoRoot }]] as ['text', ['lcov', { projectRoot: string }]],
-      thresholds: {
-        lines: 100,
-        statements: 100,
-        functions: 100,
-        branches: 100,
-      },
-    },
-  },
-}));
diff --git a/packages/riviere-extract-ts/CLAUDE.md b/packages/riviere-extract-ts/CLAUDE.md
deleted file mode 100644
index 3a82cc4fb..000000000
--- a/packages/riviere-extract-ts/CLAUDE.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# riviere-extract-ts
-
-TypeScript extractor for detecting architectural components from source code using ts-morph.
-
-Architecture defined in [ADR-002](../../docs/architecture/adr/ADR-002-allowed-folder-structures.md).
-
-## Purpose
-
-Reads extraction configs and extracts component nodes from TypeScript source code using AST parsing. This is the deterministic, config-driven extractor that runs in seconds without AI or network calls.
-
-## Principles
-
-1. **Deterministic extraction** - No AI, no network calls, same results every time for the same input
-2. **Config-driven** - All extraction rules come from validated ExtractionConfig (riviere-extract-config)
-3. **ts-morph for AST** - TypeScript-native parser with full type information and compiler APIs
-4. **Pure functions** - No side effects, testable in isolation, functional composition
-5. **Component extraction only** - This phase extracts component nodes; connections come later (PRD 12)
-6. **Predicate composability** - Detection rules compose via and/or logic for complex conditions
-7. **Module-based organization** - Config organizes rules by path patterns (glob matching)
-8. **Fail fast** - Invalid configs rejected at load time by riviere-extract-config, not during extraction
-
-## Architecture
-
-### Core Concepts
-
-**Draft Components** - Extracted components before connection detection. Contains component identity (type, name) and location (file, line) but no relationships. See domain glossary for definition.
-
-**Predicates** - Detection logic that answers "does this code element match the rule?" Nine predicate types: hasDecorator, hasJSDoc, extendsClass, implementsInterface, nameEndsWith, nameMatches, inClassWith, and, or.
-
-**Modules** - Path-based organization of extraction rules. Each module targets a glob pattern and defines detection rules for 6 component types.
-
-### Dependencies
-
-- **@living-architecture/riviere-extract-config** - Config schema, types, and validation (already built at extraction time)
-- **ts-morph** - TypeScript AST parsing and compiler API access
-
-### What This Package Does NOT Do
-
-- **Schema validation** - Done by riviere-extract-config at config load time
-- **Connection detection** - Deferred to future PRD (PRD 12)
-- **AI/LLM extraction** - Deterministic only, no external services
-- **Runtime code execution** - Static analysis only
-
-## Testing Strategy
-
-- **Unit tests** - Each predicate tested in isolation with positive and negative cases
-- **Integration tests** - End-to-end extraction from sample TypeScript code to JSON output
-- **In-memory file system** - ts-morph's `useInMemoryFileSystem: true` for fast, isolated tests
-- **100% coverage enforced** - Vitest with v8 coverage, thresholds in vitest.config.mts
diff --git a/packages/riviere-extract-ts/README.md b/packages/riviere-extract-ts/README.md
deleted file mode 100644
index 927af2037..000000000
--- a/packages/riviere-extract-ts/README.md
+++ /dev/null
@@ -1,81 +0,0 @@
-# @living-architecture/riviere-extract-ts
-
-TypeScript extractor for detecting architectural components from source code.
-
-## Overview
-
-Extracts architectural components from TypeScript code using deterministic, config-driven detection rules. Uses ts-morph for AST parsing to identify components based on decorators, JSDoc tags, inheritance, interfaces, and naming patterns.
-
-**Current Status:** Skeleton implementation. Predicate logic and output generation coming in subsequent tasks (see PRD phase-10-typescript-extraction).
-
-## Installation
-
-```bash
-npm install @living-architecture/riviere-extract-ts
-```
-
-## Usage
-
-```typescript
-import { extractComponents } from '@living-architecture/riviere-extract-ts'
-import type { ExtractionConfig } from '@living-architecture/riviere-extract-config'
-
-const config: ExtractionConfig = {
-  modules: [
-    {
-      name: 'users',
-      path: '.',
-      glob: 'src/**/*.ts',
-      api: {
-        find: 'methods',
-        where: { hasDecorator: { name: 'Get' } },
-      },
-      useCase: { notUsed: true },
-      domainOp: { notUsed: true },
-      event: { notUsed: true },
-      eventHandler: { notUsed: true },
-      ui: { notUsed: true },
-    },
-  ],
-}
-
-const sourceFiles = ['src/api/users.controller.ts']
-const components = extractComponents(sourceFiles, config)
-
-console.log(components)
-```
-
-## Output Format
-
-Draft components (before connection detection):
-
-```json
-{
-  "type": "api",
-  "name": "getUserById",
-  "location": {
-    "file": "src/api/users.controller.ts",
-    "line": 42
-  },
-  "domain": "users"
-}
-```
-
-## Development
-
-```bash
-# Tests (coverage enabled by default)
-pnpm nx test riviere-extract-ts
-
-# Build
-pnpm nx build riviere-extract-ts
-```
-
-## Related Packages
-
-- **@living-architecture/riviere-extract-config** - Config schema and validation
-- **@living-architecture/riviere-extract-conventions** - Decorators for marking components
-
-## License
-
-Apache 2.0
diff --git a/packages/riviere-extract-ts/domain-model/CLAUDE.md b/packages/riviere-extract-ts/domain-model/CLAUDE.md
new file mode 100644
index 000000000..8e36fa6c4
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/CLAUDE.md
@@ -0,0 +1,49 @@
+# riviere-extract-ts
+
+TypeScript extractor for detecting architectural components from source code using ts-morph.
+
+Architecture defined in [ADR-002](../../docs/architecture/adr/ADR-002-allowed-folder-structures.md).
+
+## Purpose
+
+Reads extraction configs and extracts component nodes from TypeScript source code using AST parsing. This is the deterministic, config-driven extractor that runs in seconds without AI or network calls.
+
+## Principles
+
+1. **Deterministic extraction** - No AI, no network calls, same results every time for the same input
+2. **Config-driven** - All extraction rules come from validated ExtractionConfig (riviere-extract-config)
+3. **ts-morph for AST** - TypeScript-native parser with full type information and compiler APIs
+4. **Pure functions** - No side effects, testable in isolation, functional composition
+5. **Component extraction only** - This phase extracts component nodes; connections come later (PRD 12)
+6. **Predicate composability** - Detection rules compose via and/or logic for complex conditions
+7. **Module-based organization** - Config organizes rules by path patterns (glob matching)
+8. **Fail fast** - Invalid configs rejected at load time by riviere-extract-config, not during extraction
+
+## Architecture
+
+### Core Concepts
+
+**Draft Components** - Extracted components before connection detection. Contains component identity (type, name) and location (file, line) but no relationships. See domain glossary for definition.
+
+**Predicates** - Detection logic that answers "does this code element match the rule?" Nine predicate types: hasDecorator, hasJSDoc, extendsClass, implementsInterface, nameEndsWith, nameMatches, inClassWith, and, or.
+
+**Modules** - Path-based organization of extraction rules. Each module targets a glob pattern and defines detection rules for 6 component types.
+
+### Dependencies
+
+- **@living-architecture/riviere-extract-config-published-language** - Config schema, types, and validation (already built at extraction time)
+- **ts-morph** - TypeScript AST parsing and compiler API access
+
+### What This Package Does NOT Do
+
+- **Schema validation** - Done by riviere-extract-config at config load time
+- **Connection detection** - Deferred to future PRD (PRD 12)
+- **AI/LLM extraction** - Deterministic only, no external services
+- **Runtime code execution** - Static analysis only
+
+## Testing Strategy
+
+- **Unit tests** - Each predicate tested in isolation with positive and negative cases
+- **Integration tests** - End-to-end extraction from sample TypeScript code to JSON output
+- **In-memory file system** - ts-morph's `useInMemoryFileSystem: true` for fast, isolated tests
+- **100% coverage enforced** - Vitest with v8 coverage, thresholds in vitest.config.mts
diff --git a/packages/riviere-extract-ts/domain-model/README.md b/packages/riviere-extract-ts/domain-model/README.md
new file mode 100644
index 000000000..fd0150056
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/README.md
@@ -0,0 +1,81 @@
+# @living-architecture/riviere-extract-ts-domain-model
+
+TypeScript extractor for detecting architectural components from source code.
+
+## Overview
+
+Extracts architectural components from TypeScript code using deterministic, config-driven detection rules. Uses ts-morph for AST parsing to identify components based on decorators, JSDoc tags, inheritance, interfaces, and naming patterns.
+
+**Current Status:** Skeleton implementation. Predicate logic and output generation coming in subsequent tasks (see PRD phase-10-typescript-extraction).
+
+## Installation
+
+```bash
+npm install @living-architecture/riviere-extract-ts-domain-model
+```
+
+## Usage
+
+```typescript
+import { extractComponents } from '@living-architecture/riviere-extract-ts-domain-model'
+import type { ExtractionConfig } from '@living-architecture/riviere-extract-config-published-language'
+
+const config: ExtractionConfig = {
+  modules: [
+    {
+      name: 'users',
+      path: '.',
+      glob: 'src/**/*.ts',
+      api: {
+        find: 'methods',
+        where: { hasDecorator: { name: 'Get' } },
+      },
+      useCase: { notUsed: true },
+      domainOp: { notUsed: true },
+      event: { notUsed: true },
+      eventHandler: { notUsed: true },
+      ui: { notUsed: true },
+    },
+  ],
+}
+
+const sourceFiles = ['src/api/users.controller.ts']
+const components = extractComponents(sourceFiles, config)
+
+console.log(components)
+```
+
+## Output Format
+
+Draft components (before connection detection):
+
+```json
+{
+  "type": "api",
+  "name": "getUserById",
+  "location": {
+    "file": "src/api/users.controller.ts",
+    "line": 42
+  },
+  "domain": "users"
+}
+```
+
+## Development
+
+```bash
+# Tests (coverage enabled by default)
+pnpm nx test riviere-extract-ts-domain-model
+
+# Build
+pnpm nx build riviere-extract-ts-domain-model
+```
+
+## Related Packages
+
+- **@living-architecture/riviere-extract-config-published-language** - Config schema and validation
+- **@living-architecture/riviere-extract-conventions-published-language** - Decorators for marking components
+
+## License
+
+Apache 2.0
diff --git a/packages/riviere-extract-ts/domain-model/package.json b/packages/riviere-extract-ts/domain-model/package.json
new file mode 100644
index 000000000..635ddb536
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/package.json
@@ -0,0 +1,32 @@
+{
+  "name": "@living-architecture/riviere-extract-ts-domain-model",
+  "version": "0.6.3",
+  "type": "module",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/NTCoding/living-architecture.git",
+    "directory": "packages/riviere-extract-ts/domain-model"
+  },
+  "exports": {
+    "./package.json": "./package.json",
+    "./domain/*": {
+      "@living-architecture/source": "./src/domain/*.ts",
+      "types": "./dist/domain/*.d.ts",
+      "import": "./dist/domain/*.js",
+      "default": "./dist/domain/*.js"
+    }
+  },
+  "files": [
+    "dist",
+    "!dist/**/__fixtures__/**",
+    "!**/*.tsbuildinfo"
+  ],
+  "dependencies": {
+    "@living-architecture/riviere-extract-config-published-language": "workspace:*",
+    "@living-architecture/riviere-schema-published-language": "workspace:*",
+    "ts-morph": "^24.0.0"
+  }
+}
diff --git a/packages/riviere-extract-ts/domain-model/project.json b/packages/riviere-extract-ts/domain-model/project.json
new file mode 100644
index 000000000..c4e153e17
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/project.json
@@ -0,0 +1,30 @@
+{
+  "name": "riviere-extract-ts-domain-model",
+  "targets": {
+    "build": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          "node ../../../scripts/build-public-exports.mjs . --clean",
+          "tsc --build tsconfig.lib.json",
+          "node ../../../scripts/build-public-exports.mjs ."
+        ],
+        "cwd": "{projectRoot}",
+        "parallel": false
+      },
+      "outputs": ["{projectRoot}/dist"]
+    },
+    "role-check": {
+      "executor": "nx:run-commands",
+      "dependsOn": [
+        "^build",
+        "riviere-role-enforcement:build",
+        "@living-architecture/riviere-role-enforcement-use-cases:build"
+      ],
+      "options": {
+        "command": "pnpm exec tsx apps/cli/src/shell/role-enforcement-bin.ts .riviere/role-enforcement.config.ts --package packages/riviere-extract-ts/domain-model",
+        "cwd": "{workspaceRoot}"
+      }
+    }
+  }
+}
diff --git a/packages/riviere-extract-ts/domain-model/src/__fixtures__/test-fixtures.ts b/packages/riviere-extract-ts/domain-model/src/__fixtures__/test-fixtures.ts
new file mode 100644
index 000000000..770969529
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/src/__fixtures__/test-fixtures.ts
@@ -0,0 +1,133 @@
+import type {
+  ComponentType,
+  CustomTypes,
+  DetectionRule,
+  ExtractBlock,
+  ValidatedModuleInput,
+} from '@living-architecture/riviere-extract-config-published-language'
+import {
+  ValidatedConfiguration,
+  ValidatedModule,
+} from '@living-architecture/riviere-extract-config-published-language'
+
+const NOT_USED = { notUsed: true } as const
+
+export function createValidatedModule(
+  overrides: Partial<ValidatedModuleInput> = {},
+): ValidatedModule {
+  const result = ValidatedModule.parse({
+    name: 'test-module',
+    domain: 'test-domain',
+    path: '.',
+    glob: 'src/**',
+    api: NOT_USED,
+    useCase: NOT_USED,
+    domainOp: NOT_USED,
+    event: NOT_USED,
+    eventHandler: NOT_USED,
+    ui: NOT_USED,
+    ...overrides,
+  })
+  if (!result.success) {
+    throw new TypeError(result.errors.map((error) => error.message).join('\n'))
+  }
+  return result.data
+}
+
+function createConfiguration(modules: ValidatedModuleInput[]): ValidatedConfiguration {
+  const result = ValidatedConfiguration.parse({ modules })
+  if (!result.success) {
+    throw new TypeError(result.errors.map((error) => error.message).join('\n'))
+  }
+  return result.data
+}
+
+export function createResolvedConfig(): ValidatedConfiguration {
+  return createConfiguration([
+    {
+      name: 'test-module',
+      domain: 'test-domain',
+      path: '.',
+      glob: 'src/**',
+      api: NOT_USED,
+      useCase: NOT_USED,
+      domainOp: NOT_USED,
+      event: NOT_USED,
+      eventHandler: NOT_USED,
+      ui: NOT_USED,
+    },
+  ])
+}
+
+export function createConfigWithCustomTypes(
+  domain: string,
+  modulePath: string,
+  customTypes: CustomTypes,
+  moduleGlob = '**',
+): ValidatedConfiguration {
+  return createConfiguration([
+    {
+      name: `${domain}-module`,
+      domain,
+      path: modulePath,
+      glob: moduleGlob,
+      api: NOT_USED,
+      useCase: NOT_USED,
+      domainOp: NOT_USED,
+      event: NOT_USED,
+      eventHandler: NOT_USED,
+      ui: NOT_USED,
+      customTypes,
+    },
+  ])
+}
+
+export function createConfigWithRule(
+  domain: string,
+  modulePath: string,
+  componentType: ComponentType,
+  rule: DetectionRule,
+  moduleGlob = '**',
+): ValidatedConfiguration {
+  const requiredFields: Partial<Record<ComponentType, ExtractBlock>> = {
+    api: { apiType: { literal: 'REST' } },
+    domainOp: { operationName: { literal: 'operation' } },
+    event: { eventName: { literal: 'Event' } },
+    eventHandler: { subscribedEvents: { literal: 'Event' } },
+    ui: { route: { literal: '/' } },
+  }
+  return createConfiguration([
+    {
+      name: `${domain}-module`,
+      domain,
+      path: modulePath,
+      glob: moduleGlob,
+      api: NOT_USED,
+      useCase: NOT_USED,
+      domainOp: NOT_USED,
+      event: NOT_USED,
+      eventHandler: NOT_USED,
+      ui: NOT_USED,
+      [componentType]: {
+        ...rule,
+        extract: { ...requiredFields[componentType], ...rule.extract },
+      },
+    },
+  ])
+}
+
+export function createOrdersUseCaseConfig(
+  modulePath = 'orders',
+  moduleGlob = '**',
+): ValidatedConfiguration {
+  return createConfigWithRule(
+    'orders',
+    modulePath,
+    'useCase',
+    {
+      find: 'classes',
+      where: { hasDecorator: { name: 'UseCase' } },
+    },
+    moduleGlob,
+  )
+}
diff --git a/packages/riviere-extract-ts/domain-model/src/domain/component-extraction/draft-component.ts b/packages/riviere-extract-ts/domain-model/src/domain/component-extraction/draft-component.ts
new file mode 100644
index 000000000..a95d64467
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/src/domain/component-extraction/draft-component.ts
@@ -0,0 +1,42 @@
+/** @riviere-role value-object */
+export class DraftComponent {
+  declare private brand: 'DraftComponent'
+  readonly type: string
+  readonly name: string
+  readonly location: {
+    file: string
+    line: number
+  }
+  readonly domain: string
+  readonly module: string
+
+  static parse(params: {
+    type: string
+    name: string
+    location: {
+      file: string
+      line: number
+    }
+    domain: string
+    module: string
+  }): DraftComponent {
+    return new DraftComponent(params)
+  }
+
+  private constructor(params: {
+    type: string
+    name: string
+    location: {
+      file: string
+      line: number
+    }
+    domain: string
+    module: string
+  }) {
+    this.type = params.type
+    this.name = params.name
+    this.location = params.location
+    this.domain = params.domain
+    this.module = params.module
+  }
+}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/component-extraction/extractor-method-extraction.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/component-extraction/extractor-method-extraction.spec.ts
similarity index 96%
rename from packages/riviere-extract-ts/src/features/extraction/domain/component-extraction/extractor-method-extraction.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/component-extraction/extractor-method-extraction.spec.ts
index a0dd34e9d..0e1d04d87 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/component-extraction/extractor-method-extraction.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/component-extraction/extractor-method-extraction.spec.ts
@@ -1,9 +1,7 @@
-import {
-  describe, it, expect 
-} from 'vitest'
 import { Project } from 'ts-morph'
+import { describe, expect, it } from 'vitest'
+import { createConfigWithRule } from '../../__fixtures__/test-fixtures'
 import { extractComponents } from './extractor'
-import { createConfigWithRule } from '../../../../test-fixtures'
 
 function createTestProject() {
   return new Project({ useInMemoryFileSystem: true })
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/component-extraction/extractor-module-resolution.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/component-extraction/extractor-module-resolution.spec.ts
similarity index 93%
rename from packages/riviere-extract-ts/src/features/extraction/domain/component-extraction/extractor-module-resolution.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/component-extraction/extractor-module-resolution.spec.ts
index 066c83728..362bab7ef 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/component-extraction/extractor-module-resolution.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/component-extraction/extractor-module-resolution.spec.ts
@@ -1,15 +1,13 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { ValidatedConfiguration } from '@living-architecture/riviere-extract-config-published-language'
 import { Project } from 'ts-morph'
-import type { ResolvedExtractionConfig } from '@living-architecture/riviere-extract-config'
+import { describe, expect, it } from 'vitest'
 import { extractComponents } from './extractor'
 
 function createTestProject() {
   return new Project({ useInMemoryFileSystem: true })
 }
 
-function extract(project: Project, paths: string[], config: ResolvedExtractionConfig) {
+function extract(project: Project, paths: string[], config: ValidatedConfiguration) {
   const [module] = config.modules
   if (module === undefined) {
     throw new TypeError('Expected one module in test config')
@@ -26,8 +24,8 @@ function createModuleResolutionConfig(
     modules?: string
     glob?: string
   } = {},
-): ResolvedExtractionConfig {
-  return {
+): ValidatedConfiguration {
+  const result = ValidatedConfiguration.parse({
     modules: [
       {
         name: overrides.name ?? 'config-module',
@@ -46,7 +44,11 @@ function createModuleResolutionConfig(
         ui: NOT_USED,
       },
     ],
+  })
+  if (!result.success) {
+    throw new TypeError(result.errors.map((error) => error.message).join('\n'))
   }
+  return result.data
 }
 
 describe('extractComponents — module resolution', () => {
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/component-extraction/extractor.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/component-extraction/extractor.spec.ts
similarity index 96%
rename from packages/riviere-extract-ts/src/features/extraction/domain/component-extraction/extractor.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/component-extraction/extractor.spec.ts
index 5b94dc436..c91b05700 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/component-extraction/extractor.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/component-extraction/extractor.spec.ts
@@ -1,15 +1,13 @@
-import {
-  describe, it, expect 
-} from 'vitest'
 import { Project } from 'ts-morph'
-import { extractComponents } from './extractor'
+import { describe, expect, it } from 'vitest'
 import {
-  createResolvedConfig,
-  createOrdersUseCaseConfig,
-  createConfigWithRule,
   createConfigWithCustomTypes,
-} from '../../../../test-fixtures'
+  createConfigWithRule,
+  createOrdersUseCaseConfig,
+  createResolvedConfig,
+} from '../../__fixtures__/test-fixtures'
 import { DraftComponent } from './draft-component'
+import { extractComponents } from './extractor'
 
 function createTestProject() {
   return new Project({ useInMemoryFileSystem: true })
@@ -57,7 +55,7 @@ describe('extractComponents', () => {
         createOrdersUseCaseConfig(),
       )
       expect(result).toStrictEqual([
-        new DraftComponent({
+        DraftComponent.parse({
           type: 'useCase',
           name: 'CreateOrder',
           location: {
@@ -83,7 +81,7 @@ describe('extractComponents', () => {
       )
       const result = extract(project, [absolutePath], createOrdersUseCaseConfig())
       expect(result).toStrictEqual([
-        new DraftComponent({
+        DraftComponent.parse({
           type: 'useCase',
           name: 'CreateOrder',
           location: {
@@ -109,7 +107,7 @@ describe('extractComponents', () => {
       )
       const result = extract(project, [absolutePath], createOrdersUseCaseConfig())
       expect(result).toStrictEqual([
-        new DraftComponent({
+        DraftComponent.parse({
           type: 'useCase',
           name: 'CreateOrder',
           location: {
@@ -135,7 +133,7 @@ describe('extractComponents', () => {
       )
       const result = extract(project, [absolutePath], createOrdersUseCaseConfig())
       expect(result).toStrictEqual([
-        new DraftComponent({
+        DraftComponent.parse({
           type: 'useCase',
           name: 'CreateOrder',
           location: {
@@ -179,7 +177,7 @@ describe('extractComponents', () => {
       })
       const result = extract(project, ['orders/domain/process-order.ts'], config)
       expect(result).toStrictEqual([
-        new DraftComponent({
+        DraftComponent.parse({
           type: 'domainOp',
           name: 'processOrder',
           location: {
@@ -227,7 +225,7 @@ describe('extractComponents', () => {
         createOrdersUseCaseConfig(),
       )
       expect(result).toStrictEqual([
-        new DraftComponent({
+        DraftComponent.parse({
           type: 'useCase',
           name: 'CreateOrder',
           location: {
@@ -256,7 +254,7 @@ describe('extractComponents', () => {
       })
       const result = extract(project, ['shipping/handlers/ship-order.ts'], config)
       expect(result).toStrictEqual([
-        new DraftComponent({
+        DraftComponent.parse({
           type: 'eventHandler',
           name: 'ShipOrder',
           location: {
@@ -288,7 +286,7 @@ describe('extractComponents', () => {
       })
       const result = extract(project, ['shipping/jobs/tracking-update.ts'], config)
       expect(result).toStrictEqual([
-        new DraftComponent({
+        DraftComponent.parse({
           type: 'backgroundJob',
           name: 'runTrackingUpdate',
           location: {
@@ -312,7 +310,7 @@ describe('extractComponents', () => {
       })
       const result = extract(project, ['orders/sagas/order-saga.ts'], config)
       expect(result).toStrictEqual([
-        new DraftComponent({
+        DraftComponent.parse({
           type: 'saga',
           name: 'OrderSaga',
           location: {
@@ -345,7 +343,7 @@ describe('extractComponents', () => {
       })
       const result = extract(project, ['orders/policies/policy.ts'], config)
       expect(result).toStrictEqual([
-        new DraftComponent({
+        DraftComponent.parse({
           type: 'policy',
           name: 'validateOrder',
           location: {
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/component-extraction/extractor.ts b/packages/riviere-extract-ts/domain-model/src/domain/component-extraction/extractor.ts
similarity index 86%
rename from packages/riviere-extract-ts/src/features/extraction/domain/component-extraction/extractor.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/component-extraction/extractor.ts
index 75e7f1626..4a6348cd2 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/component-extraction/extractor.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/component-extraction/extractor.ts
@@ -1,3 +1,8 @@
+import type {
+  ComponentType,
+  DetectionRule,
+  ValidatedModule,
+} from '@living-architecture/riviere-extract-config-published-language'
 import {
   Scope,
   type ClassDeclaration,
@@ -6,11 +11,6 @@ import {
   type Project,
   type SourceFile,
 } from 'ts-morph'
-import type {
-  ComponentType,
-  Module,
-  DetectionRule,
-} from '@living-architecture/riviere-extract-config'
 import { evaluatePredicate } from '../predicate-evaluation/evaluate-predicate'
 import { DraftComponent } from './draft-component'
 
@@ -23,16 +23,28 @@ const COMPONENT_TYPES: ComponentType[] = [
   'ui',
 ]
 
-/** @riviere-role domain-service */
+/**
+ * Extracts draft components from source files using a validated module configuration.
+ *
+ * @riviere-role domain-service
+ * @param project - TypeScript project containing the source files
+ * @param sourceFilePaths - Source files to inspect
+ * @param module - Validated extraction rules and module metadata
+ * @returns Extracted draft components
+ */
 export function extractComponents(
   project: Project,
   sourceFilePaths: string[],
-  module: Module,
+  module: ValidatedModule,
 ): DraftComponent[] {
   return sourceFilePaths.flatMap((filePath) => extractFromFile(project, filePath, module))
 }
 
-function extractFromFile(project: Project, filePath: string, module: Module): DraftComponent[] {
+function extractFromFile(
+  project: Project,
+  filePath: string,
+  module: ValidatedModule,
+): DraftComponent[] {
   const sourceFile = project.getSourceFile(filePath)
   if (sourceFile === undefined) {
     return []
@@ -50,7 +62,7 @@ interface ComponentContext {
 function extractFromModule(
   sourceFile: SourceFile,
   filePath: string,
-  module: Module,
+  module: ValidatedModule,
 ): DraftComponent[] {
   const context = resolveComponentContext(filePath, module)
   const builtInComponents = COMPONENT_TYPES.flatMap((componentType) =>
@@ -60,14 +72,14 @@ function extractFromModule(
   return [...builtInComponents, ...customComponents]
 }
 
-function resolveComponentContext(filePath: string, module: Module): ComponentContext {
+function resolveComponentContext(filePath: string, module: ValidatedModule): ComponentContext {
   return {
     domain: module.domain,
     module: resolveModuleName(filePath, module),
   }
 }
 
-function resolveModuleName(filePath: string, module: Module): string {
+function resolveModuleName(filePath: string, module: ValidatedModule): string {
   if (module.modules === undefined) {
     return module.name
   }
@@ -98,7 +110,7 @@ function extractCustomTypes(
   sourceFile: SourceFile,
   filePath: string,
   context: ComponentContext,
-  module: Module,
+  module: ValidatedModule,
 ): DraftComponent[] {
   if (module.customTypes === undefined) {
     return []
@@ -133,10 +145,10 @@ function extractComponentType(
   sourceFile: SourceFile,
   filePath: string,
   context: ComponentContext,
-  module: Module,
+  module: ValidatedModule,
   componentType: ComponentType,
 ): DraftComponent[] {
-  const rule = module[componentType]
+  const rule = module.ruleFor(componentType)
   if (!('find' in rule)) {
     return []
   }
@@ -201,7 +213,7 @@ function createClassComponent(
   }
 
   return [
-    new DraftComponent({
+    DraftComponent.parse({
       type: componentType,
       name,
       location: {
@@ -223,7 +235,7 @@ function createMethodComponent(
   const name = method.getName()
 
   return [
-    new DraftComponent({
+    DraftComponent.parse({
       type: componentType,
       name,
       location: {
@@ -248,7 +260,7 @@ function createFunctionComponent(
   }
 
   return [
-    new DraftComponent({
+    DraftComponent.parse({
       type: componentType,
       name,
       location: {
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/detect-connections-fixtures.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/__fixtures__/detect-connections-fixtures.ts
similarity index 77%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/detect-connections-fixtures.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/__fixtures__/detect-connections-fixtures.ts
index 888748e6d..c5c039202 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/detect-connections-fixtures.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/__fixtures__/detect-connections-fixtures.ts
@@ -1,6 +1,4 @@
-import {
-  Project, ScriptTarget, ModuleKind 
-} from 'ts-morph'
+import { ModuleKind, Project, ScriptTarget } from 'ts-morph'
 
 export function createProject(): Project {
   return new Project({
diff --git a/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/async-detection/async-detection-options.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/async-detection/async-detection-options.ts
new file mode 100644
index 000000000..87226375f
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/async-detection/async-detection-options.ts
@@ -0,0 +1,15 @@
+/** @riviere-role value-object */
+export class AsyncDetectionOptions {
+  declare private brand: 'AsyncDetectionOptions'
+  readonly strict: boolean
+  readonly repository: string
+
+  static parse(params: { strict: boolean; repository: string }): AsyncDetectionOptions {
+    return new AsyncDetectionOptions(params)
+  }
+
+  private constructor(params: { strict: boolean; repository: string }) {
+    this.strict = params.strict
+    this.repository = params.repository
+  }
+}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/async-detection/async-detection-types.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/async-detection/async-detection-types.ts
similarity index 91%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/async-detection/async-detection-types.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/async-detection/async-detection-types.ts
index a4ad18df3..79ab1b1b5 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/async-detection/async-detection-types.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/async-detection/async-detection-types.ts
@@ -1,4 +1,4 @@
-import type { SourceLocation } from '@living-architecture/riviere-schema'
+import type { SourceLocation } from '@living-architecture/riviere-schema-published-language/schema'
 import type { EnrichedComponent } from '../../value-extraction/enriched-component'
 
 /** @riviere-role domain-service */
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/async-detection/detect-event-publisher-connections-missing-metadata.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/async-detection/detect-event-publisher-connections-missing-metadata.spec.ts
similarity index 94%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/async-detection/detect-event-publisher-connections-missing-metadata.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/async-detection/detect-event-publisher-connections-missing-metadata.spec.ts
index a038b34ef..a1042a192 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/async-detection/detect-event-publisher-connections-missing-metadata.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/async-detection/detect-event-publisher-connections-missing-metadata.spec.ts
@@ -1,12 +1,10 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import { detectEventPublisherConnections } from './detect-event-publisher-connections'
+import { describe, expect, it } from 'vitest'
+import { buildComponent } from '../call-graph/__fixtures__/call-graph-fixtures'
 import { ConnectionDetectionError } from '../connection-detection-error'
 import { AsyncDetectionOptions } from './async-detection-options'
-import { buildComponent } from '../call-graph/call-graph-fixtures'
+import { detectEventPublisherConnections } from './detect-event-publisher-connections'
 
-const defaultOptions = new AsyncDetectionOptions({
+const defaultOptions = AsyncDetectionOptions.parse({
   strict: false,
   repository: 'test-repo',
 })
@@ -52,7 +50,7 @@ describe('detectEventPublisherConnections — missing/invalid metadata', () => {
       detectEventPublisherConnections(
         [publisher],
         config,
-        new AsyncDetectionOptions({
+        AsyncDetectionOptions.parse({
           strict: true,
           repository: 'test-repo',
         }),
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/async-detection/detect-event-publisher-connections.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/async-detection/detect-event-publisher-connections.spec.ts
similarity index 97%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/async-detection/detect-event-publisher-connections.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/async-detection/detect-event-publisher-connections.spec.ts
index 867806e85..fde0f48fe 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/async-detection/detect-event-publisher-connections.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/async-detection/detect-event-publisher-connections.spec.ts
@@ -1,12 +1,10 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import { detectEventPublisherConnections } from './detect-event-publisher-connections'
+import { describe, expect, it } from 'vitest'
+import { buildComponent } from '../call-graph/__fixtures__/call-graph-fixtures'
 import { ConnectionDetectionError } from '../connection-detection-error'
 import { AsyncDetectionOptions } from './async-detection-options'
-import { buildComponent } from '../call-graph/call-graph-fixtures'
+import { detectEventPublisherConnections } from './detect-event-publisher-connections'
 
-const defaultOptions = new AsyncDetectionOptions({
+const defaultOptions = AsyncDetectionOptions.parse({
   strict: false,
   repository: 'test-repo',
 })
@@ -130,7 +128,7 @@ describe('detectEventPublisherConnections', () => {
       detectEventPublisherConnections(
         [publisher],
         eventPublisherConfig(),
-        new AsyncDetectionOptions({
+        AsyncDetectionOptions.parse({
           strict: true,
           repository: 'test-repo',
         }),
@@ -188,7 +186,7 @@ describe('detectEventPublisherConnections', () => {
       detectEventPublisherConnections(
         [event1, event2, publisher],
         eventPublisherConfig(),
-        new AsyncDetectionOptions({
+        AsyncDetectionOptions.parse({
           strict: true,
           repository: 'test-repo',
         }),
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/async-detection/detect-event-publisher-connections.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/async-detection/detect-event-publisher-connections.ts
similarity index 84%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/async-detection/detect-event-publisher-connections.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/async-detection/detect-event-publisher-connections.ts
index 43d102924..4fceeb96d 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/async-detection/detect-event-publisher-connections.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/async-detection/detect-event-publisher-connections.ts
@@ -1,9 +1,9 @@
-import type { EventPublisherConfig } from '@living-architecture/riviere-extract-config'
-import { EVENT_NAME_FIELD } from '@living-architecture/riviere-schema'
+import type { EventPublisherConfig } from '@living-architecture/riviere-extract-config-published-language'
+import { ComponentId } from '@living-architecture/riviere-schema-published-language/component-id'
+import { EVENT_NAME_FIELD } from '@living-architecture/riviere-schema-published-language/schema'
 import type { EnrichedComponent } from '../../value-extraction/enriched-component'
-import { ExtractedLink } from '../extracted-link'
 import { ConnectionDetectionError } from '../connection-detection-error'
-import { componentIdentity } from '../call-graph/component-identity'
+import { ExtractedLink } from '../extracted-link'
 import type { AsyncDetectionOptions } from './async-detection-options'
 import { toSourceLocation } from './async-detection-types'
 
@@ -20,9 +20,7 @@ export function detectEventPublisherConnections(
   const events = components.filter((c) => c.type === 'event')
 
   return eventPublishers.flatMap((publisherConfig) => {
-    const {
-      fromType, metadataKey 
-    } = publisherConfig
+    const { fromType, metadataKey } = publisherConfig
     const publishers = components.filter((c) => c.type === fromType)
     return publishers.flatMap((publisher) => {
       const publishedEventType = publisher.metadata[metadataKey]
@@ -59,8 +57,8 @@ function handleMissingMetadata(
       reason: `published event type in "${metadataKey}" metadata is missing or invalid`,
     })
   }
-  return new ExtractedLink({
-    source: componentIdentity(publisher),
+  return ExtractedLink.parse({
+    source: ComponentId.parseFromParts(publisher).toString(),
     target: '_unresolved',
     type: 'async',
     sourceLocation: toSourceLocation(publisher, options.repository),
@@ -84,14 +82,13 @@ function resolvePublishTarget(
     return [handleAmbiguousMatch(publisher, publishedEventType, matchingEvents.length, options)]
   }
 
-  return matchingEvents.map(
-    (event) =>
-      new ExtractedLink({
-        source: componentIdentity(publisher),
-        target: componentIdentity(event),
-        type: 'async',
-        sourceLocation: toSourceLocation(publisher, options.repository),
-      }),
+  return matchingEvents.map((event) =>
+    ExtractedLink.parse({
+      source: ComponentId.parseFromParts(publisher).toString(),
+      target: ComponentId.parseFromParts(event).toString(),
+      type: 'async',
+      sourceLocation: toSourceLocation(publisher, options.repository),
+    }),
   )
 }
 
@@ -109,8 +106,8 @@ function handleAmbiguousMatch(
       reason: `published event "${publishedEventType}" matches ${matchCount} Event components (ambiguous)`,
     })
   }
-  return new ExtractedLink({
-    source: componentIdentity(publisher),
+  return ExtractedLink.parse({
+    source: ComponentId.parseFromParts(publisher).toString(),
     target: '_unresolved',
     type: 'async',
     sourceLocation: toSourceLocation(publisher, options.repository),
@@ -131,8 +128,8 @@ function handleNoMatch(
       reason: `published event "${publishedEventType}" does not match any Event component`,
     })
   }
-  return new ExtractedLink({
-    source: componentIdentity(publisher),
+  return ExtractedLink.parse({
+    source: ComponentId.parseFromParts(publisher).toString(),
     target: '_unresolved',
     type: 'async',
     sourceLocation: toSourceLocation(publisher, options.repository),
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/async-detection/detect-subscribe-connections.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/async-detection/detect-subscribe-connections.spec.ts
similarity index 98%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/async-detection/detect-subscribe-connections.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/async-detection/detect-subscribe-connections.spec.ts
index 3be706d60..8be3e36f4 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/async-detection/detect-subscribe-connections.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/async-detection/detect-subscribe-connections.spec.ts
@@ -1,13 +1,11 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import { detectSubscribeConnections } from './detect-subscribe-connections'
-import { buildComponent } from '../call-graph/call-graph-fixtures'
+import { describe, expect, it } from 'vitest'
+import { buildComponent } from '../call-graph/__fixtures__/call-graph-fixtures'
 import { ConnectionDetectionError } from '../connection-detection-error'
 import { AsyncDetectionOptions } from './async-detection-options'
+import { detectSubscribeConnections } from './detect-subscribe-connections'
 
 function createOptions(strict: boolean): AsyncDetectionOptions {
-  return new AsyncDetectionOptions({
+  return AsyncDetectionOptions.parse({
     strict,
     repository: 'test-repo',
   })
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/async-detection/detect-subscribe-connections.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/async-detection/detect-subscribe-connections.ts
similarity index 81%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/async-detection/detect-subscribe-connections.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/async-detection/detect-subscribe-connections.ts
index f8362f3b7..f01c6002d 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/async-detection/detect-subscribe-connections.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/async-detection/detect-subscribe-connections.ts
@@ -1,10 +1,11 @@
 import {
-  EVENT_NAME_FIELD, SUBSCRIBED_EVENTS_FIELD 
-} from '@living-architecture/riviere-schema'
+  EVENT_NAME_FIELD,
+  SUBSCRIBED_EVENTS_FIELD,
+} from '@living-architecture/riviere-schema-published-language/schema'
+import { ComponentId } from '@living-architecture/riviere-schema-published-language/component-id'
 import type { EnrichedComponent } from '../../value-extraction/enriched-component'
-import { ExtractedLink } from '../extracted-link'
 import { ConnectionDetectionError } from '../connection-detection-error'
-import { componentIdentity } from '../call-graph/component-identity'
+import { ExtractedLink } from '../extracted-link'
 import type { AsyncDetectionOptions } from './async-detection-options'
 import { toSourceLocation } from './async-detection-types'
 
@@ -41,14 +42,13 @@ function resolveSubscription(
     return [handleAmbiguousMatch(handler, eventName, matchingEvents.length, options, repository)]
   }
 
-  return matchingEvents.map(
-    (event) =>
-      new ExtractedLink({
-        source: componentIdentity(event),
-        target: componentIdentity(handler),
-        type: 'async',
-        sourceLocation: toSourceLocation(handler, repository),
-      }),
+  return matchingEvents.map((event) =>
+    ExtractedLink.parse({
+      source: ComponentId.parseFromParts(event).toString(),
+      target: ComponentId.parseFromParts(handler).toString(),
+      type: 'async',
+      sourceLocation: toSourceLocation(handler, repository),
+    }),
   )
 }
 
@@ -67,9 +67,9 @@ function handleAmbiguousMatch(
       reason: `subscribed event "${eventName}" matches ${matchCount} Event components (ambiguous)`,
     })
   }
-  return new ExtractedLink({
+  return ExtractedLink.parse({
     source: '_unresolved',
-    target: componentIdentity(handler),
+    target: ComponentId.parseFromParts(handler).toString(),
     type: 'async',
     sourceLocation: toSourceLocation(handler, repository),
     _uncertain: `ambiguous: ${matchCount} events match subscribed event name: ${eventName}`,
@@ -90,9 +90,9 @@ function handleNoMatch(
       reason: `subscribed event "${eventName}" does not match any Event component`,
     })
   }
-  return new ExtractedLink({
+  return ExtractedLink.parse({
     source: '_unresolved',
-    target: componentIdentity(handler),
+    target: ComponentId.parseFromParts(handler).toString(),
     type: 'async',
     sourceLocation: toSourceLocation(handler, repository),
     _uncertain: `no event found for subscribed event name: ${eventName}`,
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/call-graph-fixtures.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/__fixtures__/call-graph-fixtures.ts
similarity index 82%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/call-graph-fixtures.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/__fixtures__/call-graph-fixtures.ts
index 60997951c..2bab88c87 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/call-graph-fixtures.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/__fixtures__/call-graph-fixtures.ts
@@ -1,6 +1,6 @@
 import { Project } from 'ts-morph'
-import { EnrichedComponent } from '../../value-extraction/enriched-component'
-import { CallGraphOptions } from './call-graph-types'
+import { EnrichedComponent } from '../../../value-extraction/enriched-component'
+import { CallGraphOptions } from '../call-graph-types'
 
 export const sharedProject = new Project({
   useInMemoryFileSystem: true,
@@ -26,7 +26,7 @@ export function buildComponent(
   line: number,
   overrides: Partial<EnrichedComponent> = {},
 ): EnrichedComponent {
-  return new EnrichedComponent({
+  return EnrichedComponent.parse({
     type: 'useCase',
     name,
     location: {
@@ -42,7 +42,7 @@ export function buildComponent(
 }
 
 export function defaultOptions(): CallGraphOptions {
-  return new CallGraphOptions({
+  return CallGraphOptions.parse({
     strict: false,
     sourceFilePaths: sharedProject.getSourceFiles().map((sf) => sf.getFilePath()),
     repository: 'test-repo',
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/type-resolver-fixtures.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/__fixtures__/type-resolver-fixtures.ts
similarity index 96%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/type-resolver-fixtures.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/__fixtures__/type-resolver-fixtures.ts
index 853591c36..e4c33cdac 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/type-resolver-fixtures.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/__fixtures__/type-resolver-fixtures.ts
@@ -1,6 +1,4 @@
-import {
-  Project, CallExpression, SyntaxKind 
-} from 'ts-morph'
+import { CallExpression, Project, SyntaxKind } from 'ts-morph'
 
 export class CallExpressionNotFoundError extends Error {
   constructor(scope: string, method: string) {
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/build-call-graph-unresolved-reason.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/build-call-graph-unresolved-reason.spec.ts
similarity index 88%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/build-call-graph-unresolved-reason.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/build-call-graph-unresolved-reason.spec.ts
index b030a2335..760180896 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/build-call-graph-unresolved-reason.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/build-call-graph-unresolved-reason.spec.ts
@@ -1,10 +1,8 @@
-import {
-  describe, it, expect, vi 
-} from 'vitest'
 import { Project } from 'ts-morph'
-import { buildCallGraph } from './build-call-graph'
-import { ComponentIndex } from '../component-index'
+import { describe, expect, it, vi } from 'vitest'
 import { EnrichedComponent } from '../../value-extraction/enriched-component'
+import { ComponentIndex } from '../component-index'
+import { buildCallGraph } from './build-call-graph'
 import { CallGraphOptions } from './call-graph-types'
 
 vi.mock('./type-resolver', async () => {
@@ -42,7 +40,7 @@ describe('buildCallGraph unresolved receiver fallback', () => {
       ].join('\n'),
     )
 
-    const caller = new EnrichedComponent({
+    const caller = EnrichedComponent.parse({
       type: 'useCase',
       name: 'Caller',
       location: {
@@ -54,13 +52,13 @@ describe('buildCallGraph unresolved receiver fallback', () => {
       metadata: {},
       _missing: undefined,
     })
-    const options = new CallGraphOptions({
+    const options = CallGraphOptions.parse({
       strict: false,
       sourceFilePaths: [filePath],
       repository: 'test-repo',
     })
 
-    const result = buildCallGraph(project, [caller], new ComponentIndex([caller]), options)
+    const result = buildCallGraph(project, [caller], ComponentIndex.parse([caller]), options)
 
     expect(result).toStrictEqual([
       expect.objectContaining({
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/build-call-graph.coverage.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/build-call-graph.coverage.spec.ts
similarity index 91%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/build-call-graph.coverage.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/build-call-graph.coverage.spec.ts
index b7ec9157c..39f415c42 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/build-call-graph.coverage.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/build-call-graph.coverage.spec.ts
@@ -1,12 +1,13 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 import { ComponentIndex } from '../component-index'
 import { buildCallGraph } from './build-call-graph'
-import { CallGraphOptions } from './call-graph-types'
 import {
-  sharedProject, nextFile, buildComponent, defaultOptions 
-} from './call-graph-fixtures'
+  buildComponent,
+  defaultOptions,
+  nextFile,
+  sharedProject,
+} from './__fixtures__/call-graph-fixtures'
+import { CallGraphOptions } from './call-graph-types'
 
 describe('buildCallGraph coverage - receiver resolution', () => {
   it('skips call when receiver has no property access in source method', () => {
@@ -28,7 +29,7 @@ class BCCaller1 {
 `)
     const compTarget = buildComponent('BCTarget1', file, 2, { type: 'domainOp' })
     const compCaller = buildComponent('BCCaller1', file, 8)
-    const index = new ComponentIndex([compTarget, compCaller])
+    const index = ComponentIndex.parse([compTarget, compCaller])
     const result = buildCallGraph(sharedProject, [compCaller], index, defaultOptions())
 
     expect(result).toHaveLength(1)
@@ -51,7 +52,7 @@ class BCCaller2 {
 `)
     const compTarget = buildComponent('BCTarget2', file, 2, { type: 'domainOp' })
     const compCaller = buildComponent('BCCaller2', file, 6)
-    const index = new ComponentIndex([compTarget, compCaller])
+    const index = ComponentIndex.parse([compTarget, compCaller])
     const result = buildCallGraph(sharedProject, [compCaller], index, defaultOptions())
 
     expect(result).toHaveLength(1)
@@ -74,7 +75,7 @@ class BCCaller3 {
 `)
     const compTarget = buildComponent('BCTarget3', file, 2, { type: 'domainOp' })
     const compCaller = buildComponent('BCCaller3', file, 6)
-    const index = new ComponentIndex([compTarget, compCaller])
+    const index = ComponentIndex.parse([compTarget, compCaller])
     const result = buildCallGraph(sharedProject, [compCaller], index, defaultOptions())
 
     expect(result).toHaveLength(1)
@@ -105,7 +106,7 @@ class TCCaller1 {
 `)
     const compTarget = buildComponent('TCTarget1', file, 2, { type: 'domainOp' })
     const compCaller = buildComponent('TCCaller1', file, 17)
-    const index = new ComponentIndex([compTarget, compCaller])
+    const index = ComponentIndex.parse([compTarget, compCaller])
     const result = buildCallGraph(sharedProject, [compCaller], index, defaultOptions())
 
     expect(result).toStrictEqual([
@@ -139,9 +140,9 @@ class StrictCaller {
 `)
     const compTarget = buildComponent('StrictTarget', file, 2, { type: 'domainOp' })
     const compCaller = buildComponent('StrictCaller', file, 15)
-    const index = new ComponentIndex([compTarget, compCaller])
+    const index = ComponentIndex.parse([compTarget, compCaller])
     const defaults = defaultOptions()
-    const strictOptions = new CallGraphOptions({
+    const strictOptions = CallGraphOptions.parse({
       strict: true,
       sourceFilePaths: defaults.sourceFilePaths,
       repository: defaults.repository,
@@ -182,7 +183,7 @@ class AnyCaller {
 `)
     const compTarget = buildComponent('AnyTarget', file, 2, { type: 'domainOp' })
     const compCaller = buildComponent('AnyCaller', file, 16)
-    const index = new ComponentIndex([compTarget, compCaller])
+    const index = ComponentIndex.parse([compTarget, compCaller])
     const result = buildCallGraph(sharedProject, [compCaller], index, defaultOptions())
 
     expect(result).toStrictEqual([
@@ -216,7 +217,7 @@ class TCCaller2 {
 `)
     const compTarget = buildComponent('TCTarget2', file, 2, { type: 'domainOp' })
     const compCaller = buildComponent('TCCaller2', file, 15)
-    const index = new ComponentIndex([compTarget, compCaller])
+    const index = ComponentIndex.parse([compTarget, compCaller])
     const result = buildCallGraph(sharedProject, [compCaller], index, defaultOptions())
 
     expect(result).toStrictEqual([
@@ -245,7 +246,7 @@ class TCNoMethodCaller {
 `)
     const compTarget = buildComponent('TCNoMethodTarget', file, 2, { type: 'domainOp' })
     const compCaller = buildComponent('TCNoMethodCaller', file, 10)
-    const index = new ComponentIndex([compTarget, compCaller])
+    const index = ComponentIndex.parse([compTarget, compCaller])
     const result = buildCallGraph(sharedProject, [compCaller], index, defaultOptions())
 
     expect(result).toStrictEqual([])
@@ -255,7 +256,7 @@ class TCNoMethodCaller {
 describe('buildCallGraph coverage', () => {
   it('skips component when source file not found in project', () => {
     const comp = buildComponent('NonExistentClass', '/src/missing-file.ts', 1)
-    const index = new ComponentIndex([comp])
+    const index = ComponentIndex.parse([comp])
     const result = buildCallGraph(sharedProject, [comp], index, defaultOptions())
     expect(result).toStrictEqual([])
   })
@@ -277,7 +278,7 @@ class CovCaller {
 `)
     const compTarget = buildComponent('CovTarget', file, 2, { type: 'domainOp' })
     const compCaller = buildComponent('CovCaller', file, 6)
-    const index = new ComponentIndex([compTarget, compCaller])
+    const index = ComponentIndex.parse([compTarget, compCaller])
     const result = buildCallGraph(sharedProject, [compTarget, compCaller], index, defaultOptions())
 
     expect(result).toHaveLength(1)
@@ -303,7 +304,7 @@ class CovCaller2 {
 `)
     const compTarget = buildComponent('CovTarget2', file, 2, { type: 'domainOp' })
     const compCaller = buildComponent('CovCaller2', file, 10)
-    const index = new ComponentIndex([compTarget, compCaller])
+    const index = ComponentIndex.parse([compTarget, compCaller])
     const result = buildCallGraph(sharedProject, [compTarget, compCaller], index, defaultOptions())
     expect(result).toStrictEqual([])
   })
@@ -328,7 +329,7 @@ class CovSelfSource {
 `)
     const compSource = buildComponent('CovSelfSource', file, 12)
     const compTarget = buildComponent('CovSelfComp', file, 2, { type: 'domainOp' })
-    const index = new ComponentIndex([compSource, compTarget])
+    const index = ComponentIndex.parse([compSource, compTarget])
     const result = buildCallGraph(sharedProject, [compSource], index, defaultOptions())
 
     expect(result).toStrictEqual([
@@ -368,7 +369,7 @@ class CovNC4Origin {
 `)
     const compTarget = buildComponent('CovNC4Target', file, 2, { type: 'domainOp' })
     const compOrigin = buildComponent('CovNC4Origin', file, 21)
-    const index = new ComponentIndex([compTarget, compOrigin])
+    const index = ComponentIndex.parse([compTarget, compOrigin])
     const result = buildCallGraph(sharedProject, [compOrigin], index, defaultOptions())
 
     expect(result).toStrictEqual([
@@ -400,7 +401,7 @@ class TCCallerNotify {
 }
 `)
     const comp = buildComponent('TCCallerNotify', file, 14)
-    const index = new ComponentIndex([comp])
+    const index = ComponentIndex.parse([comp])
     const result = buildCallGraph(sharedProject, [comp], index, defaultOptions())
 
     expect(result).toStrictEqual([
@@ -428,7 +429,7 @@ class CovSelfMid3 {
 }
 `)
     const comp = buildComponent('CovSelfComp3', file, 2)
-    const index = new ComponentIndex([comp])
+    const index = ComponentIndex.parse([comp])
     const result = buildCallGraph(sharedProject, [comp], index, defaultOptions())
 
     expect(result).toStrictEqual([])
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/build-call-graph.edge-cases.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/build-call-graph.edge-cases.spec.ts
similarity index 91%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/build-call-graph.edge-cases.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/build-call-graph.edge-cases.spec.ts
index 678a9b84a..3aeb2e1a9 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/build-call-graph.edge-cases.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/build-call-graph.edge-cases.spec.ts
@@ -1,11 +1,12 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 import { ComponentIndex } from '../component-index'
 import { buildCallGraph } from './build-call-graph'
 import {
-  sharedProject, nextFile, buildComponent, defaultOptions 
-} from './call-graph-fixtures'
+  buildComponent,
+  defaultOptions,
+  nextFile,
+  sharedProject,
+} from './__fixtures__/call-graph-fixtures'
 
 describe('buildCallGraph edge cases', () => {
   it('deduplicates to single link per source-target-type tuple', () => {
@@ -26,7 +27,7 @@ class UseCase {
 `)
     const compRepo = buildComponent('Repo', file, 2, { type: 'domainOp' })
     const compUC = buildComponent('UseCase', file, 7)
-    const index = new ComponentIndex([compRepo, compUC])
+    const index = ComponentIndex.parse([compRepo, compUC])
     const result = buildCallGraph(sharedProject, [compRepo, compUC], index, defaultOptions())
 
     expect(result).toHaveLength(1)
@@ -56,7 +57,7 @@ class Handler {
 `)
     const compStore = buildComponent('Store', file, 2, { type: 'domainOp' })
     const compHandler = buildComponent('Handler', file, 7)
-    const index = new ComponentIndex([compStore, compHandler])
+    const index = ComponentIndex.parse([compStore, compHandler])
     const result = buildCallGraph(sharedProject, [compStore, compHandler], index, defaultOptions())
 
     expect(result).toHaveLength(1)
@@ -87,7 +88,7 @@ class Entry {
 `)
     const compSink = buildComponent('Sink', file, 2, { type: 'domainOp' })
     const compEntry = buildComponent('Entry', file, 14)
-    const index = new ComponentIndex([compSink, compEntry])
+    const index = ComponentIndex.parse([compSink, compEntry])
     const result = buildCallGraph(sharedProject, [compSink, compEntry], index, defaultOptions())
 
     expect(result).toHaveLength(1)
@@ -122,7 +123,7 @@ class Caller {
 `)
     const compDep = buildComponent('Dep', file, 2, { type: 'domainOp' })
     const compCaller = buildComponent('Caller', file, 12)
-    const index = new ComponentIndex([compDep, compCaller])
+    const index = ComponentIndex.parse([compDep, compCaller])
     const result = buildCallGraph(sharedProject, [compDep, compCaller], index, defaultOptions())
 
     expect(result).toStrictEqual([
@@ -148,7 +149,7 @@ class Reader {
 }
 `)
     const comp = buildComponent('Reader', file, 6)
-    const index = new ComponentIndex([comp])
+    const index = ComponentIndex.parse([comp])
     const result = buildCallGraph(sharedProject, [comp], index, defaultOptions())
     expect(result).toStrictEqual([])
   })
@@ -169,7 +170,7 @@ class AsyncUseCase {
 `)
     const compRepo = buildComponent('AsyncRepo', file, 2, { type: 'domainOp' })
     const compUC = buildComponent('AsyncUseCase', file, 6)
-    const index = new ComponentIndex([compRepo, compUC])
+    const index = ComponentIndex.parse([compRepo, compUC])
     const result = buildCallGraph(sharedProject, [compRepo, compUC], index, defaultOptions())
 
     expect(result).toStrictEqual([
@@ -212,7 +213,7 @@ class Start {
     const compX = buildComponent('CompX', file, 2, { type: 'domainOp' })
     const compY = buildComponent('CompY', file, 6, { type: 'api' })
     const compStart = buildComponent('Start', file, 20)
-    const index = new ComponentIndex([compX, compY, compStart])
+    const index = ComponentIndex.parse([compX, compY, compStart])
     const result = buildCallGraph(sharedProject, [compX, compY, compStart], index, defaultOptions())
 
     const startToX = result.find(
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/build-call-graph.gaps.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/build-call-graph.gaps.spec.ts
similarity index 91%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/build-call-graph.gaps.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/build-call-graph.gaps.spec.ts
index a010b9110..335b5f7de 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/build-call-graph.gaps.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/build-call-graph.gaps.spec.ts
@@ -1,11 +1,12 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 import { ComponentIndex } from '../component-index'
 import { buildCallGraph } from './build-call-graph'
 import {
-  sharedProject, nextFile, buildComponent, defaultOptions 
-} from './call-graph-fixtures'
+  buildComponent,
+  defaultOptions,
+  nextFile,
+  sharedProject,
+} from './__fixtures__/call-graph-fixtures'
 
 describe('buildCallGraph — method-level source components', () => {
   it('detects connection from method-level component to injected dependency', () => {
@@ -23,7 +24,7 @@ class PlaceOrderEndpoint {
 `)
     const handleComp = buildComponent('handle', file, 8, { type: 'api' })
     const useCaseComp = buildComponent('PlaceOrderUseCase', file, 2)
-    const index = new ComponentIndex([handleComp, useCaseComp])
+    const index = ComponentIndex.parse([handleComp, useCaseComp])
     const result = buildCallGraph(sharedProject, [handleComp, useCaseComp], index, defaultOptions())
 
     expect(result).toStrictEqual(
@@ -60,7 +61,7 @@ class Container {
     const methodAComp = buildComponent('methodA', file, 12, { type: 'api' })
     const targetA = buildComponent('TargetA', file, 2, { type: 'domainOp' })
     const targetB = buildComponent('TargetB', file, 6, { type: 'domainOp' })
-    const index = new ComponentIndex([methodAComp, targetA, targetB])
+    const index = ComponentIndex.parse([methodAComp, targetA, targetB])
     const result = buildCallGraph(
       sharedProject,
       [methodAComp, targetA, targetB],
@@ -97,7 +98,7 @@ class PlaceOrderUseCase {
     const beginComp = buildComponent('begin', file, 3, { type: 'domainOp' })
     const cancelComp = buildComponent('cancel', file, 4, { type: 'domainOp' })
     const useCaseComp = buildComponent('PlaceOrderUseCase', file, 7)
-    const index = new ComponentIndex([beginComp, cancelComp, useCaseComp])
+    const index = ComponentIndex.parse([beginComp, cancelComp, useCaseComp])
     const result = buildCallGraph(
       sharedProject,
       [beginComp, cancelComp, useCaseComp],
@@ -131,9 +132,11 @@ class PlaceOrderUseCase {
 }
 `)
     const publishComp = buildComponent('publishOrderPlaced', file, 3, { type: 'eventPublisher' })
-    const cancelPubComp = buildComponent('publishOrderCancelled', file, 4, {type: 'eventPublisher',})
+    const cancelPubComp = buildComponent('publishOrderCancelled', file, 4, {
+      type: 'eventPublisher',
+    })
     const useCaseComp = buildComponent('PlaceOrderUseCase', file, 7)
-    const index = new ComponentIndex([publishComp, cancelPubComp, useCaseComp])
+    const index = ComponentIndex.parse([publishComp, cancelPubComp, useCaseComp])
     const result = buildCallGraph(
       sharedProject,
       [publishComp, cancelPubComp, useCaseComp],
@@ -176,7 +179,7 @@ class DispatchShipmentUseCase {
 `)
     const dispatchComp = buildComponent('dispatch', file, 3, { type: 'domainOp' })
     const useCaseComp = buildComponent('DispatchShipmentUseCase', file, 14)
-    const index = new ComponentIndex([dispatchComp, useCaseComp])
+    const index = ComponentIndex.parse([dispatchComp, useCaseComp])
     const result = buildCallGraph(
       sharedProject,
       [dispatchComp, useCaseComp],
@@ -218,7 +221,7 @@ class Caller {
 `)
     const targetComp = buildComponent('Target', file, 2, { type: 'domainOp' })
     const callerComp = buildComponent('Caller', file, 14)
-    const index = new ComponentIndex([targetComp, callerComp])
+    const index = ComponentIndex.parse([targetComp, callerComp])
     const result = buildCallGraph(sharedProject, [targetComp, callerComp], index, defaultOptions())
 
     expect(result).toStrictEqual(
@@ -240,7 +243,7 @@ class Ledger {
 }
 `)
     const reconcileComp = buildComponent('reconcile', file, 3, { type: 'domainOp' })
-    const index = new ComponentIndex([reconcileComp])
+    const index = ComponentIndex.parse([reconcileComp])
     const result = buildCallGraph(sharedProject, [reconcileComp], index, defaultOptions())
 
     const selfLinks = result.filter(
@@ -258,7 +261,7 @@ describe('buildCallGraph — component not found in any class', () => {
 function standalone(): void {}
 `)
     const orphanComp = buildComponent('orphan', file, 99)
-    const index = new ComponentIndex([orphanComp])
+    const index = ComponentIndex.parse([orphanComp])
     const result = buildCallGraph(sharedProject, [orphanComp], index, defaultOptions())
 
     expect(result).toStrictEqual([])
@@ -283,7 +286,7 @@ class ApplyDiscountsUseCase {
 `)
     const applyDiscountComp = buildComponent('applyDiscount', file, 3, { type: 'domainOp' })
     const useCaseComp = buildComponent('ApplyDiscountsUseCase', file, 6)
-    const index = new ComponentIndex([applyDiscountComp, useCaseComp])
+    const index = ComponentIndex.parse([applyDiscountComp, useCaseComp])
     const result = buildCallGraph(
       sharedProject,
       [applyDiscountComp, useCaseComp],
@@ -316,7 +319,7 @@ export function runTrackingUpdate(useCase: UpdateTrackingUseCase): void {
 `)
     const funcComp = buildComponent('runTrackingUpdate', file, 6, { type: 'backgroundJob' })
     const useCaseComp = buildComponent('UpdateTrackingUseCase', file, 2)
-    const index = new ComponentIndex([funcComp, useCaseComp])
+    const index = ComponentIndex.parse([funcComp, useCaseComp])
     const result = buildCallGraph(sharedProject, [funcComp, useCaseComp], index, defaultOptions())
 
     expect(result).toStrictEqual(
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/build-call-graph.guard.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/build-call-graph.guard.spec.ts
similarity index 84%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/build-call-graph.guard.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/build-call-graph.guard.spec.ts
index 4162c0323..29c31f1fb 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/build-call-graph.guard.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/build-call-graph.guard.spec.ts
@@ -1,10 +1,8 @@
-import {
-  describe, it, expect, vi 
-} from 'vitest'
 import { Project } from 'ts-morph'
-import { buildCallGraph } from './build-call-graph'
-import { ComponentIndex } from '../component-index'
+import { describe, expect, it, vi } from 'vitest'
 import { EnrichedComponent } from '../../value-extraction/enriched-component'
+import { ComponentIndex } from '../component-index'
+import { buildCallGraph } from './build-call-graph'
 import { CallGraphOptions } from './call-graph-types'
 
 vi.mock('./type-resolver', async () => {
@@ -42,7 +40,7 @@ describe('buildCallGraph guards', () => {
       ].join('\n'),
     )
 
-    const caller = new EnrichedComponent({
+    const caller = EnrichedComponent.parse({
       type: 'useCase',
       name: 'Caller',
       location: {
@@ -54,14 +52,14 @@ describe('buildCallGraph guards', () => {
       metadata: {},
       _missing: undefined,
     })
-    const options = new CallGraphOptions({
+    const options = CallGraphOptions.parse({
       strict: false,
       sourceFilePaths: [filePath],
       repository: 'test-repo',
     })
 
-    expect(() => buildCallGraph(project, [caller], new ComponentIndex([caller]), options)).toThrow(
-      'Expected resolved type name',
-    )
+    expect(() =>
+      buildCallGraph(project, [caller], ComponentIndex.parse([caller]), options),
+    ).toThrow('Expected resolved type name')
   })
 })
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/build-call-graph.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/build-call-graph.spec.ts
similarity index 91%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/build-call-graph.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/build-call-graph.spec.ts
index 3346f8c3d..0ba726cb5 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/build-call-graph.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/build-call-graph.spec.ts
@@ -1,17 +1,18 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 import { ComponentIndex } from '../component-index'
 import { ConnectionDetectionError } from '../connection-detection-error'
 import { buildCallGraph } from './build-call-graph'
-import { CallGraphOptions } from './call-graph-types'
 import {
-  sharedProject, nextFile, buildComponent, defaultOptions 
-} from './call-graph-fixtures'
+  buildComponent,
+  defaultOptions,
+  nextFile,
+  sharedProject,
+} from './__fixtures__/call-graph-fixtures'
+import { CallGraphOptions } from './call-graph-types'
 
 function strictOptions(): CallGraphOptions {
   const defaults = defaultOptions()
-  return new CallGraphOptions({
+  return CallGraphOptions.parse({
     strict: true,
     sourceFilePaths: defaults.sourceFilePaths,
     repository: defaults.repository,
@@ -20,7 +21,7 @@ function strictOptions(): CallGraphOptions {
 
 describe('buildCallGraph', () => {
   it('returns empty links when no components provided', () => {
-    const result = buildCallGraph(sharedProject, [], new ComponentIndex([]), defaultOptions())
+    const result = buildCallGraph(sharedProject, [], ComponentIndex.parse([]), defaultOptions())
     expect(result).toStrictEqual([])
   })
 
@@ -33,7 +34,7 @@ class PlaceOrder {
 }
 `)
     const comp = buildComponent('PlaceOrder', file, 2)
-    const index = new ComponentIndex([comp])
+    const index = ComponentIndex.parse([comp])
     const result = buildCallGraph(sharedProject, [comp], index, defaultOptions())
     expect(result).toStrictEqual([])
   })
@@ -54,7 +55,7 @@ class PlaceOrder {
 `)
     const compRepo = buildComponent('OrderRepo', file, 2, { type: 'domainOp' })
     const compUC = buildComponent('PlaceOrder', file, 6)
-    const index = new ComponentIndex([compRepo, compUC])
+    const index = ComponentIndex.parse([compRepo, compUC])
     const result = buildCallGraph(sharedProject, [compRepo, compUC], index, defaultOptions())
 
     expect(result).toStrictEqual([
@@ -95,7 +96,7 @@ class SendEmail {
 `)
     const compNotifier = buildComponent('Notifier', file, 2, { type: 'domainOp' })
     const compSendEmail = buildComponent('SendEmail', file, 14)
-    const index = new ComponentIndex([compNotifier, compSendEmail])
+    const index = ComponentIndex.parse([compNotifier, compSendEmail])
     const result = buildCallGraph(
       sharedProject,
       [compNotifier, compSendEmail],
@@ -160,7 +161,7 @@ class Origin {
 `)
     const compTarget = buildComponent('Target', file, 2, { type: 'domainOp' })
     const compOrigin = buildComponent('Origin', file, 36)
-    const index = new ComponentIndex([compTarget, compOrigin])
+    const index = ComponentIndex.parse([compTarget, compOrigin])
     const result = buildCallGraph(sharedProject, [compTarget, compOrigin], index, defaultOptions())
 
     expect(result).toStrictEqual([
@@ -186,7 +187,7 @@ class DoStuff {
 }
 `)
     const comp = buildComponent('DoStuff', file, 6)
-    const index = new ComponentIndex([comp])
+    const index = ComponentIndex.parse([comp])
     const result = buildCallGraph(sharedProject, [comp], index, defaultOptions())
     expect(result).toStrictEqual([])
   })
@@ -206,7 +207,7 @@ class CompA {
 `)
     const compA = buildComponent('CompA', file, 7)
     const compB = buildComponent('CompB', file, 2, { type: 'domainOp' })
-    const index = new ComponentIndex([compA, compB])
+    const index = ComponentIndex.parse([compA, compB])
     const result = buildCallGraph(sharedProject, [compA, compB], index, defaultOptions())
 
     const aToB = result.find(
@@ -234,7 +235,7 @@ class SelfRef {
 }
 `)
     const comp = buildComponent('SelfRef', file, 2)
-    const index = new ComponentIndex([comp])
+    const index = ComponentIndex.parse([comp])
     const result = buildCallGraph(sharedProject, [comp], index, defaultOptions())
     expect(result).toStrictEqual([])
   })
@@ -259,7 +260,7 @@ class PlaceOrder {
 `)
     const compRepo = buildComponent('OrderRepo', file, 6, { type: 'repository' })
     const compUC = buildComponent('PlaceOrder', file, 10)
-    const index = new ComponentIndex([compRepo, compUC])
+    const index = ComponentIndex.parse([compRepo, compUC])
     const result = buildCallGraph(sharedProject, [compRepo, compUC], index, defaultOptions())
 
     expect(result).toStrictEqual([
@@ -291,7 +292,7 @@ class SendNotification {
 `)
     const compNotifier = buildComponent('EmailNotifier', file, 6, { type: 'domainOp' })
     const compUC = buildComponent('SendNotification', file, 10)
-    const index = new ComponentIndex([compNotifier, compUC])
+    const index = ComponentIndex.parse([compNotifier, compUC])
     const result = buildCallGraph(sharedProject, [compNotifier, compUC], index, defaultOptions())
 
     expect(result).toStrictEqual([
@@ -312,7 +313,7 @@ class UncertainCaller {
 }
 `)
     const comp = buildComponent('UncertainCaller', file, 2)
-    const index = new ComponentIndex([comp])
+    const index = ComponentIndex.parse([comp])
     const result = buildCallGraph(sharedProject, [comp], index, defaultOptions())
 
     expect(result).toStrictEqual([
@@ -334,7 +335,7 @@ class StrictUncertainCaller {
 }
 `)
     const comp = buildComponent('StrictUncertainCaller', file, 2)
-    const index = new ComponentIndex([comp])
+    const index = ComponentIndex.parse([comp])
 
     expect(() => buildCallGraph(sharedProject, [comp], index, strictOptions())).toThrow(
       ConnectionDetectionError,
@@ -369,7 +370,7 @@ class PublishEvent {
 `)
     const store = buildComponent('EventStore', file, 6, { type: 'repository' })
     const useCase = buildComponent('PublishEvent', file, 18)
-    const index = new ComponentIndex([store, useCase])
+    const index = ComponentIndex.parse([store, useCase])
     const result = buildCallGraph(sharedProject, [store, useCase], index, defaultOptions())
 
     expect(result).toStrictEqual([
@@ -395,7 +396,7 @@ class AlertUser {
 }
 `)
     const comp = buildComponent('AlertUser', file, 6)
-    const index = new ComponentIndex([comp])
+    const index = ComponentIndex.parse([comp])
     const result = buildCallGraph(sharedProject, [comp], index, defaultOptions())
 
     expect(result).toStrictEqual([
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/build-call-graph.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/build-call-graph.ts
similarity index 89%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/build-call-graph.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/build-call-graph.ts
index 0529c721d..8b4248a73 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/build-call-graph.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/build-call-graph.ts
@@ -6,27 +6,25 @@ import {
   type Project,
   SyntaxKind,
 } from 'ts-morph'
+import { ComponentId } from '@living-architecture/riviere-schema-published-language/component-id'
 import type { EnrichedComponent } from '../../value-extraction/enriched-component'
 import type { ComponentIndex } from '../component-index'
 import type { ExtractedLink } from '../extracted-link'
 import {
-  CallGraphOptions, CallSite, RawLink, UncertainRawLink 
-} from './call-graph-types'
-import { componentIdentity } from './component-identity'
+  findMethodInProject,
+  getCalledMethodName,
+  resolveContainerMethod,
+  resolveTypeThroughInterface,
+} from './call-graph-shared'
+import { CallGraphOptions, CallSite, RawLink, UncertainRawLink } from './call-graph-types'
+import { deduplicateLinks } from './deduplicate-links'
 import {
   findClassInProject,
   findFunctionInProject,
   findMethodLevelComponent,
   traceCallsInBody,
 } from './trace-calls'
-import { deduplicateLinks } from './deduplicate-links'
 import { resolveCallExpressionReceiverType } from './type-resolver'
-import {
-  getCalledMethodName,
-  resolveContainerMethod,
-  resolveTypeThroughInterface,
-  findMethodInProject,
-} from './call-graph-shared'
 
 function processCallExpression(
   callExpr: CallExpression,
@@ -43,9 +41,11 @@ function processCallExpression(
   }
 
   const sourceFile = callExpr.getSourceFile()
-  const typeResult = resolveCallExpressionReceiverType(callExpr, sourceFile, {strict: options.strict,})
+  const typeResult = resolveCallExpressionReceiverType(callExpr, sourceFile, {
+    strict: options.strict,
+  })
 
-  const currentCallSite = new CallSite({
+  const currentCallSite = CallSite.parse({
     filePath: component.location.file,
     lineNumber: callExpr.getStartLineNumber(),
     methodName,
@@ -53,7 +53,7 @@ function processCallExpression(
 
   if (!typeResult.resolved) {
     uncertainLinks.push(
-      new UncertainRawLink({
+      UncertainRawLink.parse({
         source: component,
         reason: typeResult.reason ?? 'Receiver type unresolved',
         callSite: currentCallSite,
@@ -76,9 +76,12 @@ function processCallExpression(
   const uncertain = interfaceResolution.uncertain
 
   if (targetComponent !== undefined) {
-    if (componentIdentity(component) !== componentIdentity(targetComponent)) {
+    if (
+      ComponentId.parseFromParts(component).toString() !==
+      ComponentId.parseFromParts(targetComponent).toString()
+    ) {
       rawLinks.push(
-        new RawLink({
+        RawLink.parse({
           source: component,
           target: targetComponent,
           callSite: currentCallSite,
@@ -95,9 +98,12 @@ function processCallExpression(
     componentIndex,
   )
   if (containerTarget !== undefined) {
-    if (componentIdentity(component) !== componentIdentity(containerTarget)) {
+    if (
+      ComponentId.parseFromParts(component).toString() !==
+      ComponentId.parseFromParts(containerTarget).toString()
+    ) {
       rawLinks.push(
-        new RawLink({
+        RawLink.parse({
           source: component,
           target: containerTarget,
           callSite: currentCallSite,
@@ -249,9 +255,7 @@ function traceNonComponent(
   const visited = new Set<string>()
   visited.add(`${typeName}.${calledMethodName}`)
 
-  const {
-    method, classFound 
-  } = findMethodInProject(project, typeName, calledMethodName)
+  const { method, classFound } = findMethodInProject(project, typeName, calledMethodName)
 
   if (method !== undefined) {
     traceCallsInBody(
@@ -270,7 +274,7 @@ function traceNonComponent(
 
   if (!classFound && interfaceUncertainty !== undefined) {
     uncertainLinks.push(
-      new UncertainRawLink({
+      UncertainRawLink.parse({
         source,
         reason: interfaceUncertainty,
         callSite,
diff --git a/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/call-graph-outcomes.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/call-graph-outcomes.ts
new file mode 100644
index 000000000..5f233382a
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/call-graph-outcomes.ts
@@ -0,0 +1,47 @@
+import type { MethodDeclaration } from 'ts-morph'
+import type { EnrichedComponent } from '../../value-extraction/enriched-component'
+
+/** @riviere-role value-object */
+export class InterfaceResolutionOutcome {
+  declare private brand: 'InterfaceResolutionOutcome'
+  readonly component: EnrichedComponent | undefined
+  readonly resolvedTypeName: string | undefined
+  readonly uncertain: string | undefined
+
+  static parse(params: {
+    component: EnrichedComponent | undefined
+    resolvedTypeName: string | undefined
+    uncertain: string | undefined
+  }): InterfaceResolutionOutcome {
+    return new InterfaceResolutionOutcome(params)
+  }
+
+  private constructor(params: {
+    component: EnrichedComponent | undefined
+    resolvedTypeName: string | undefined
+    uncertain: string | undefined
+  }) {
+    this.component = params.component
+    this.resolvedTypeName = params.resolvedTypeName
+    this.uncertain = params.uncertain
+  }
+}
+
+/** @riviere-role value-object */
+export class MethodLookup {
+  declare private brand: 'MethodLookup'
+  readonly method: MethodDeclaration | undefined
+  readonly classFound: boolean
+
+  static parse(params: {
+    method: MethodDeclaration | undefined
+    classFound: boolean
+  }): MethodLookup {
+    return new MethodLookup(params)
+  }
+
+  private constructor(params: { method: MethodDeclaration | undefined; classFound: boolean }) {
+    this.method = params.method
+    this.classFound = params.classFound
+  }
+}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/call-graph-shared.guard.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/call-graph-shared.guard.spec.ts
similarity index 89%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/call-graph-shared.guard.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/call-graph-shared.guard.spec.ts
index 2aebaba02..4711a932b 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/call-graph-shared.guard.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/call-graph-shared.guard.spec.ts
@@ -1,9 +1,7 @@
-import {
-  describe, it, expect, vi 
-} from 'vitest'
 import { Project } from 'ts-morph'
-import { resolveTypeThroughInterface } from './call-graph-shared'
+import { describe, expect, it, vi } from 'vitest'
 import { ComponentIndex } from '../component-index'
+import { resolveTypeThroughInterface } from './call-graph-shared'
 import { CallGraphOptions } from './call-graph-types'
 
 vi.mock('../interface-resolution/resolve-interface', async () => {
@@ -23,7 +21,7 @@ vi.mock('../interface-resolution/resolve-interface', async () => {
 
 describe('resolveTypeThroughInterface guards', () => {
   it('throws TypeError when interface resolution is marked resolved without a type name', () => {
-    const options = new CallGraphOptions({
+    const options = CallGraphOptions.parse({
       strict: false,
       sourceFilePaths: [],
       repository: 'test-repo',
@@ -33,7 +31,7 @@ describe('resolveTypeThroughInterface guards', () => {
       resolveTypeThroughInterface(
         'OrderGateway',
         new Project({ useInMemoryFileSystem: true }),
-        new ComponentIndex([]),
+        ComponentIndex.parse([]),
         options,
       ),
     ).toThrow('Expected interface resolution type name')
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/call-graph-shared.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/call-graph-shared.spec.ts
similarity index 91%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/call-graph-shared.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/call-graph-shared.spec.ts
index 562ea4588..f6223e8be 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/call-graph-shared.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/call-graph-shared.spec.ts
@@ -1,23 +1,19 @@
+import { Project, SyntaxKind } from 'ts-morph'
+import { describe, expect, it } from 'vitest'
+import { ComponentIndex } from '../component-index'
+import { buildComponent } from './__fixtures__/call-graph-fixtures'
 import {
-  describe, it, expect 
-} from 'vitest'
-import {
-  Project, SyntaxKind 
-} from 'ts-morph'
-import {
+  findMethodInProject,
   getCalledMethodName,
   resolveTypeThroughInterface,
-  findMethodInProject,
 } from './call-graph-shared'
 import { CallGraphOptions } from './call-graph-types'
-import { ComponentIndex } from '../component-index'
-import { buildComponent } from './call-graph-fixtures'
 
 const sharedProject = new Project({ useInMemoryFileSystem: true })
 const counter = { value: 0 }
 
 function createOptions(sourceFilePaths: string[]): CallGraphOptions {
-  return new CallGraphOptions({
+  return CallGraphOptions.parse({
     strict: false,
     sourceFilePaths,
     repository: 'test-repo',
@@ -47,7 +43,7 @@ describe('getCalledMethodName', () => {
 describe('resolveTypeThroughInterface', () => {
   it('returns component directly when type is a known component', () => {
     const comp = buildComponent('OrderService', '/test.ts', 1)
-    const index = new ComponentIndex([comp])
+    const index = ComponentIndex.parse([comp])
 
     const result = resolveTypeThroughInterface(
       'OrderService',
@@ -72,7 +68,7 @@ describe('resolveTypeThroughInterface', () => {
       export class ConcreteGateway implements SharedGateway { process(): void {} }
     `)
     const comp = buildComponent('ConcreteGateway', implFile, 1)
-    const index = new ComponentIndex([comp])
+    const index = ComponentIndex.parse([comp])
 
     const result = resolveTypeThroughInterface(
       'SharedGateway',
@@ -92,7 +88,7 @@ describe('resolveTypeThroughInterface', () => {
     const interfaceFile = nextFile(`
       export interface OrphanGateway { run(): void }
     `)
-    const index = new ComponentIndex([])
+    const index = ComponentIndex.parse([])
 
     const result = resolveTypeThroughInterface(
       'OrphanGateway',
@@ -109,7 +105,7 @@ describe('resolveTypeThroughInterface', () => {
   })
 
   it('returns no uncertainty when type is not defined in source files', () => {
-    const index = new ComponentIndex([])
+    const index = ComponentIndex.parse([])
 
     const result = resolveTypeThroughInterface(
       'UnknownType',
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/call-graph-shared.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/call-graph-shared.ts
similarity index 90%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/call-graph-shared.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/call-graph-shared.ts
index ec2fc95cd..38b512a5c 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/call-graph-shared.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/call-graph-shared.ts
@@ -7,11 +7,9 @@ import {
 } from 'ts-morph'
 import type { EnrichedComponent } from '../../value-extraction/enriched-component'
 import type { ComponentIndex } from '../component-index'
-import type { CallGraphOptions } from './call-graph-types'
-import {
-  InterfaceResolutionOutcome, MethodLookup 
-} from './call-graph-outcomes'
 import { resolveInterface } from '../interface-resolution/resolve-interface'
+import { InterfaceResolutionOutcome, MethodLookup } from './call-graph-outcomes'
+import type { CallGraphOptions } from './call-graph-types'
 
 /** @riviere-role domain-service */
 export function getCalledMethodName(callExpr: CallExpression): string {
@@ -28,24 +26,26 @@ export function resolveTypeThroughInterface(
 ): InterfaceResolutionOutcome {
   const component = componentIndex.getComponentByTypeName(typeName)
   if (component !== undefined) {
-    return new InterfaceResolutionOutcome({
+    return InterfaceResolutionOutcome.parse({
       component,
       resolvedTypeName: undefined,
       uncertain: undefined,
     })
   }
 
-  const interfaceResult = resolveInterface(typeName, project, options.sourceFilePaths, {strict: options.strict,})
+  const interfaceResult = resolveInterface(typeName, project, options.sourceFilePaths, {
+    strict: options.strict,
+  })
   if (interfaceResult.resolved) {
     const resolvedTypeName = requireInterfaceTypeName(interfaceResult)
-    return new InterfaceResolutionOutcome({
+    return InterfaceResolutionOutcome.parse({
       component: componentIndex.getComponentByTypeName(resolvedTypeName),
       resolvedTypeName: resolvedTypeName,
       uncertain: undefined,
     })
   }
 
-  return new InterfaceResolutionOutcome({
+  return InterfaceResolutionOutcome.parse({
     component: undefined,
     resolvedTypeName: undefined,
     uncertain: interfaceResult.typeDefinedInSource ? interfaceResult.reason : undefined,
@@ -111,12 +111,12 @@ export function findMethodInProject(
 ): MethodLookup {
   const lookup = findClassByNameInProject(project, typeName)
   if (lookup === undefined) {
-    return new MethodLookup({
+    return MethodLookup.parse({
       method: undefined,
       classFound: false,
     })
   }
-  return new MethodLookup({
+  return MethodLookup.parse({
     method: lookup.classDecl.getMethod(methodName),
     classFound: true,
   })
diff --git a/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/call-graph-types.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/call-graph-types.spec.ts
new file mode 100644
index 000000000..e53c7c43a
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/call-graph-types.spec.ts
@@ -0,0 +1,24 @@
+import { describe, expect, it } from 'vitest'
+import { stripGenericArgs } from './type-name-normalization'
+
+describe('stripGenericArgs', () => {
+  it('returns original string when no generic arguments present', () => {
+    expect(stripGenericArgs('OrderRepository')).toBe('OrderRepository')
+  })
+
+  it('strips generic arguments from type name', () => {
+    expect(stripGenericArgs('Repository<Order>')).toBe('Repository')
+  })
+
+  it('returns empty string for empty input', () => {
+    expect(stripGenericArgs('')).toBe('')
+  })
+
+  it('strips nested generics from type name', () => {
+    expect(stripGenericArgs('Map<K, List<V>>')).toBe('Map')
+  })
+
+  it('strips multiple type parameters from type name', () => {
+    expect(stripGenericArgs('Pair<A, B>')).toBe('Pair')
+  })
+})
diff --git a/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/call-graph-types.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/call-graph-types.ts
new file mode 100644
index 000000000..e1d472ca5
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/call-graph-types.ts
@@ -0,0 +1,89 @@
+import type { EnrichedComponent } from '../../value-extraction/enriched-component'
+
+/** @riviere-role value-object */
+export class CallGraphOptions {
+  declare private brand: 'CallGraphOptions'
+  readonly strict: boolean
+  readonly sourceFilePaths: string[]
+  readonly repository: string
+
+  static parse(params: {
+    strict: boolean
+    sourceFilePaths: string[]
+    repository: string
+  }): CallGraphOptions {
+    return new CallGraphOptions(params)
+  }
+
+  private constructor(params: { strict: boolean; sourceFilePaths: string[]; repository: string }) {
+    this.strict = params.strict
+    this.sourceFilePaths = params.sourceFilePaths
+    this.repository = params.repository
+  }
+}
+
+/** @riviere-role value-object */
+export class CallSite {
+  declare private brand: 'CallSite'
+  readonly filePath: string
+  readonly lineNumber: number
+  readonly methodName: string
+
+  static parse(params: { filePath: string; lineNumber: number; methodName: string }): CallSite {
+    return new CallSite(params)
+  }
+
+  private constructor(params: { filePath: string; lineNumber: number; methodName: string }) {
+    this.filePath = params.filePath
+    this.lineNumber = params.lineNumber
+    this.methodName = params.methodName
+  }
+}
+
+/** @riviere-role value-object */
+export class RawLink {
+  declare private brand: 'RawLink'
+  readonly source: EnrichedComponent
+  readonly target: EnrichedComponent
+  readonly callSite: CallSite
+
+  static parse(params: {
+    source: EnrichedComponent
+    target: EnrichedComponent
+    callSite: CallSite
+  }): RawLink {
+    return new RawLink(params)
+  }
+
+  private constructor(params: {
+    source: EnrichedComponent
+    target: EnrichedComponent
+    callSite: CallSite
+  }) {
+    this.source = params.source
+    this.target = params.target
+    this.callSite = params.callSite
+  }
+}
+
+/** @riviere-role value-object */
+export class UncertainRawLink {
+  declare private brand: 'UncertainRawLink'
+  readonly source: EnrichedComponent
+  readonly reason: string
+  readonly callSite: CallSite
+
+  static parse(params: {
+    source: EnrichedComponent
+    reason: string
+    callSite: CallSite
+  }): UncertainRawLink {
+    return new UncertainRawLink(params)
+  }
+
+  private constructor(params: { source: EnrichedComponent; reason: string; callSite: CallSite }) {
+    this.source = params.source
+    this.reason = params.reason
+    this.callSite = params.callSite
+  }
+}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/deduplicate-links.guard.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/deduplicate-links.guard.spec.ts
similarity index 79%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/deduplicate-links.guard.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/deduplicate-links.guard.spec.ts
index d8869126a..c9909c3e1 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/deduplicate-links.guard.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/deduplicate-links.guard.spec.ts
@@ -1,10 +1,6 @@
-import {
-  afterEach, describe, it, expect, vi 
-} from 'vitest'
-import {
-  CallSite, RawLink 
-} from './call-graph-types'
-import { buildComponent } from './call-graph-fixtures'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { buildComponent } from './__fixtures__/call-graph-fixtures'
+import { CallSite, RawLink } from './call-graph-types'
 
 type ExtractedLinkMockMode =
   | 'missingSourceLocation'
@@ -12,35 +8,43 @@ type ExtractedLinkMockMode =
   | 'missingLineNumber'
   | 'missingMethodName'
 
-const extractedLinkState = vi.hoisted((): { mode: ExtractedLinkMockMode } => ({mode: 'missingSourceLocation',}))
+interface ExtractedLinkParams {
+  source: string
+  target: string
+  type?: 'sync' | 'async'
+  _uncertain?: string
+  sourceLocation?: {
+    repository: string
+    filePath: string
+    lineNumber?: number
+    methodName?: string
+  }
+}
+
+const extractedLinkState = vi.hoisted((): { mode: ExtractedLinkMockMode } => ({
+  mode: 'missingSourceLocation',
+}))
 
-vi.mock('../extracted-link', () => ({
-  ExtractedLink: class {
+vi.mock('../extracted-link', () => {
+  class MockExtractedLink {
     readonly source: string
     readonly target: string
     readonly type: 'sync' | 'async' | undefined
     readonly _uncertain: string | undefined
     readonly sourceLocation:
       | {
-        repository: string
-        filePath: string
-        lineNumber?: number
-        methodName?: string
-      }
+          repository: string
+          filePath: string
+          lineNumber?: number
+          methodName?: string
+        }
       | undefined
 
-    constructor(params: {
-      source: string
-      target: string
-      type?: 'sync' | 'async'
-      _uncertain?: string
-      sourceLocation?: {
-        repository: string
-        filePath: string
-        lineNumber?: number
-        methodName?: string
-      }
-    }) {
+    static parse(params: ExtractedLinkParams): MockExtractedLink {
+      return new MockExtractedLink(params)
+    }
+
+    constructor(params: ExtractedLinkParams) {
       this.source = params.source
       this.target = params.target
       this.type = params.type
@@ -86,18 +90,20 @@ vi.mock('../extracted-link', () => ({
         lineNumber: 10,
       }
     }
-  },
-}))
+  }
+
+  return { ExtractedLink: MockExtractedLink }
+})
 
 afterEach(() => {
   extractedLinkState.mode = 'missingSourceLocation'
 })
 
 function buildRawLink(sourceName: string, targetName: string, lineNumber: number): RawLink {
-  return new RawLink({
+  return RawLink.parse({
     source: buildComponent(sourceName, '/test.ts', 1),
     target: buildComponent(targetName, '/test.ts', 10, { type: 'domainOp' }),
-    callSite: new CallSite({
+    callSite: CallSite.parse({
       filePath: '/test.ts',
       lineNumber,
       methodName: 'execute',
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/deduplicate-links.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/deduplicate-links.spec.ts
similarity index 87%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/deduplicate-links.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/deduplicate-links.spec.ts
index 23be16ae0..3aa63d03b 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/deduplicate-links.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/deduplicate-links.spec.ts
@@ -1,17 +1,13 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
+import { buildComponent } from './__fixtures__/call-graph-fixtures'
+import { CallSite, RawLink, UncertainRawLink } from './call-graph-types'
 import { deduplicateLinks } from './deduplicate-links'
-import {
-  CallSite, RawLink, UncertainRawLink 
-} from './call-graph-types'
-import { buildComponent } from './call-graph-fixtures'
 
 function buildRawLink(sourceName: string, targetName: string, lineNumber: number): RawLink {
-  return new RawLink({
+  return RawLink.parse({
     source: buildComponent(sourceName, '/test.ts', 1),
     target: buildComponent(targetName, '/test.ts', 10, { type: 'domainOp' }),
-    callSite: new CallSite({
+    callSite: CallSite.parse({
       filePath: '/test.ts',
       lineNumber,
       methodName: 'execute',
@@ -64,19 +60,19 @@ describe('deduplicateLinks', () => {
 
   it('includes multiple uncertain links in output', () => {
     const uncertainLinks: UncertainRawLink[] = [
-      new UncertainRawLink({
+      UncertainRawLink.parse({
         source: buildComponent('Source1', '/test.ts', 1),
         reason: "Receiver type is 'any'",
-        callSite: new CallSite({
+        callSite: CallSite.parse({
           filePath: '/test.ts',
           lineNumber: 5,
           methodName: 'execute',
         }),
       }),
-      new UncertainRawLink({
+      UncertainRawLink.parse({
         source: buildComponent('Source2', '/test.ts', 2),
         reason: 'No implementation found for Foo',
-        callSite: new CallSite({
+        callSite: CallSite.parse({
           filePath: '/test.ts',
           lineNumber: 8,
           methodName: 'run',
@@ -93,10 +89,10 @@ describe('deduplicateLinks', () => {
 
   it('includes uncertain links in output', () => {
     const uncertainLinks: UncertainRawLink[] = [
-      new UncertainRawLink({
+      UncertainRawLink.parse({
         source: buildComponent('Source', '/test.ts', 1),
         reason: "Receiver type is 'any'",
-        callSite: new CallSite({
+        callSite: CallSite.parse({
           filePath: '/test.ts',
           lineNumber: 5,
           methodName: 'execute',
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/deduplicate-links.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/deduplicate-links.ts
similarity index 86%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/deduplicate-links.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/deduplicate-links.ts
index 5257fe7ee..0cd7b68f5 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/deduplicate-links.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/deduplicate-links.ts
@@ -1,8 +1,6 @@
+import { ComponentId } from '@living-architecture/riviere-schema-published-language/component-id'
 import { ExtractedLink } from '../extracted-link'
-import type {
-  RawLink, UncertainRawLink, CallSite 
-} from './call-graph-types'
-import { componentIdentity } from './component-identity'
+import type { CallSite, RawLink, UncertainRawLink } from './call-graph-types'
 
 interface RequiredSourceLocation {
   repository: string
@@ -29,7 +27,7 @@ function buildExtractedLink(
   callSite: CallSite,
   repository: string,
 ): ExtractedLink {
-  const link = new ExtractedLink({
+  const link = ExtractedLink.parse({
     source,
     target,
     type,
@@ -55,7 +53,7 @@ function buildUncertainLink(
   callSite: CallSite,
   repository: string,
 ): ExtractedLink {
-  return new ExtractedLink({
+  return ExtractedLink.parse({
     source,
     target: '_unresolved',
     type: 'sync',
@@ -78,8 +76,8 @@ export function deduplicateLinks(
   const seen = new Map<string, ExtractedLink>()
 
   for (const raw of rawLinks) {
-    const sourceId = componentIdentity(raw.source)
-    const targetId = componentIdentity(raw.target)
+    const sourceId = ComponentId.parseFromParts(raw.source).toString()
+    const targetId = ComponentId.parseFromParts(raw.target).toString()
     const type = 'sync'
     const key = linkKey(sourceId, targetId, type)
 
@@ -99,7 +97,7 @@ export function deduplicateLinks(
   for (const uncertain of uncertainLinks) {
     result.push(
       buildUncertainLink(
-        componentIdentity(uncertain.source),
+        ComponentId.parseFromParts(uncertain.source).toString(),
         uncertain.reason,
         uncertain.callSite,
         repository,
diff --git a/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/method-level-target.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/method-level-target.ts
new file mode 100644
index 000000000..fa82e7d9d
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/method-level-target.ts
@@ -0,0 +1,20 @@
+import type { ClassDeclaration, MethodDeclaration } from 'ts-morph'
+
+/** @riviere-role value-object */
+export class MethodLevelTarget {
+  declare private brand: 'MethodLevelTarget'
+  readonly classDecl: ClassDeclaration
+  readonly method: MethodDeclaration
+
+  static parse(params: {
+    classDecl: ClassDeclaration
+    method: MethodDeclaration
+  }): MethodLevelTarget {
+    return new MethodLevelTarget(params)
+  }
+
+  private constructor(params: { classDecl: ClassDeclaration; method: MethodDeclaration }) {
+    this.classDecl = params.classDecl
+    this.method = params.method
+  }
+}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/trace-calls.guard.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/trace-calls.guard.spec.ts
similarity index 87%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/trace-calls.guard.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/trace-calls.guard.spec.ts
index b1577a4fb..c25b88524 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/trace-calls.guard.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/trace-calls.guard.spec.ts
@@ -1,13 +1,9 @@
-import {
-  describe, it, expect, vi 
-} from 'vitest'
 import { Project } from 'ts-morph'
-import {
-  CallGraphOptions, CallSite 
-} from './call-graph-types'
-import { traceCallsInBody } from './trace-calls'
-import { ComponentIndex } from '../component-index'
+import { describe, expect, it, vi } from 'vitest'
 import { EnrichedComponent } from '../../value-extraction/enriched-component'
+import { ComponentIndex } from '../component-index'
+import { CallGraphOptions, CallSite } from './call-graph-types'
+import { traceCallsInBody } from './trace-calls'
 
 vi.mock('./type-resolver', async () => {
   const actual = await vi.importActual<typeof import('./type-resolver')>('./type-resolver')
@@ -46,7 +42,7 @@ describe('traceCallsInBody guards', () => {
 
     const sourceFile = project.getSourceFileOrThrow(filePath)
     const method = sourceFile.getClassOrThrow('Caller').getMethodOrThrow('execute')
-    const component = new EnrichedComponent({
+    const component = EnrichedComponent.parse({
       type: 'useCase',
       name: 'Caller',
       location: {
@@ -58,12 +54,12 @@ describe('traceCallsInBody guards', () => {
       metadata: {},
       _missing: undefined,
     })
-    const originCallSite = new CallSite({
+    const originCallSite = CallSite.parse({
       filePath,
       lineNumber: 5,
       methodName: 'execute',
     })
-    const options = new CallGraphOptions({
+    const options = CallGraphOptions.parse({
       strict: false,
       sourceFilePaths: [filePath],
       repository: 'test-repo',
@@ -73,7 +69,7 @@ describe('traceCallsInBody guards', () => {
       traceCallsInBody(
         method,
         project,
-        new ComponentIndex([component]),
+        ComponentIndex.parse([component]),
         component,
         originCallSite,
         new Set<string>(),
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/trace-calls.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/trace-calls.ts
similarity index 90%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/trace-calls.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/trace-calls.ts
index 9d53d47c7..da79455ce 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/trace-calls.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/trace-calls.ts
@@ -7,20 +7,18 @@ import {
   Node,
   SyntaxKind,
 } from 'ts-morph'
-import type { ComponentIndex } from '../component-index'
+import { ComponentId } from '@living-architecture/riviere-schema-published-language/component-id'
 import type { EnrichedComponent } from '../../value-extraction/enriched-component'
+import type { ComponentIndex } from '../component-index'
 import {
-  CallGraphOptions, CallSite, RawLink, UncertainRawLink 
-} from './call-graph-types'
-import { componentIdentity } from './component-identity'
-import { MethodLevelTarget } from './method-level-target'
-import { resolveCallExpressionReceiverType } from './type-resolver'
-import {
+  findMethodInProject,
   getCalledMethodName,
   resolveContainerMethod,
   resolveTypeThroughInterface,
-  findMethodInProject,
 } from './call-graph-shared'
+import { CallGraphOptions, CallSite, RawLink, UncertainRawLink } from './call-graph-types'
+import { MethodLevelTarget } from './method-level-target'
+import { resolveCallExpressionReceiverType } from './type-resolver'
 
 interface TraceContext {
   project: Project
@@ -75,7 +73,9 @@ function traceCallExpression(callExpr: CallExpression, ctx: TraceContext): void
     return
   }
   const sourceFile = callExpr.getSourceFile()
-  const typeResult = resolveCallExpressionReceiverType(callExpr, sourceFile, {strict: ctx.options.strict,})
+  const typeResult = resolveCallExpressionReceiverType(callExpr, sourceFile, {
+    strict: ctx.options.strict,
+  })
 
   if (!typeResult.resolved) {
     return
@@ -86,9 +86,12 @@ function traceCallExpression(callExpr: CallExpression, ctx: TraceContext): void
   const outcome = resolveComponentTarget(typeName, calledMethodName, ctx)
 
   if (outcome.target !== undefined) {
-    if (componentIdentity(ctx.sourceComponent) !== componentIdentity(outcome.target)) {
+    if (
+      ComponentId.parseFromParts(ctx.sourceComponent).toString() !==
+      ComponentId.parseFromParts(outcome.target).toString()
+    ) {
       ctx.results.push(
-        new RawLink({
+        RawLink.parse({
           source: ctx.sourceComponent,
           target: outcome.target,
           callSite: ctx.originCallSite,
@@ -114,9 +117,7 @@ function traceIntoNonComponent(
   }
   ctx.visited.add(visitKey)
 
-  const {
-    method: resolvedMethod, classFound 
-  } = findMethodInProject(
+  const { method: resolvedMethod, classFound } = findMethodInProject(
     ctx.project,
     traceTypeName,
     calledMethodName,
@@ -129,7 +130,7 @@ function traceIntoNonComponent(
 
   if (!classFound && outcome.uncertain !== undefined) {
     ctx.uncertainResults.push(
-      new UncertainRawLink({
+      UncertainRawLink.parse({
         source: ctx.sourceComponent,
         reason: outcome.uncertain,
         callSite: ctx.originCallSite,
@@ -204,7 +205,7 @@ export function findMethodLevelComponent(
       .getMethods()
       .find((m) => m.getStartLineNumber() === component.location.line)
     if (method !== undefined) {
-      return new MethodLevelTarget({
+      return MethodLevelTarget.parse({
         classDecl,
         method,
       })
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/type-name-normalization.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/type-name-normalization.ts
similarity index 100%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/type-name-normalization.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/type-name-normalization.ts
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/type-resolver.coverage.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/type-resolver.coverage.spec.ts
similarity index 99%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/type-resolver.coverage.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/type-resolver.coverage.spec.ts
index 29d63269e..221401820 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/type-resolver.coverage.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/type-resolver.coverage.spec.ts
@@ -1,16 +1,14 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import { resolveCallExpressionReceiverType } from './type-resolver'
+import { describe, expect, it } from 'vitest'
 import { ConnectionDetectionError } from '../connection-detection-error'
+import { resolveCallExpressionReceiverType } from './type-resolver'
 import {
-  sharedProject,
-  nextFile,
-  getFirstCallExpression,
-  getCallExpressionFromFunction,
-  getCallExpressionByText,
   CallExpressionNotFoundError,
-} from './type-resolver-fixtures'
+  getCallExpressionByText,
+  getCallExpressionFromFunction,
+  getFirstCallExpression,
+  nextFile,
+  sharedProject,
+} from './__fixtures__/type-resolver-fixtures'
 
 describe('resolveCallExpressionReceiverType coverage', () => {
   it('returns uncertain when call has no property access receiver in lenient mode', () => {
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/type-resolver.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/type-resolver.spec.ts
similarity index 98%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/type-resolver.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/type-resolver.spec.ts
index 81cc3b433..e469b1952 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/type-resolver.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/type-resolver.spec.ts
@@ -1,15 +1,13 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import { resolveCallExpressionReceiverType } from './type-resolver'
+import { describe, expect, it } from 'vitest'
 import { ConnectionDetectionError } from '../connection-detection-error'
+import { resolveCallExpressionReceiverType } from './type-resolver'
 import {
-  sharedProject,
-  nextFile,
-  getFirstCallExpression,
-  getCallExpressionFromFunction,
   getCallExpressionByText,
-} from './type-resolver-fixtures'
+  getCallExpressionFromFunction,
+  getFirstCallExpression,
+  nextFile,
+  sharedProject,
+} from './__fixtures__/type-resolver-fixtures'
 
 describe('resolveCallExpressionReceiverType', () => {
   it('resolves type from explicitly typed constructor parameter', () => {
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/type-resolver.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/type-resolver.ts
similarity index 94%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/type-resolver.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/type-resolver.ts
index 5f7b267a2..fc1637a42 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/type-resolver.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/call-graph/type-resolver.ts
@@ -1,7 +1,5 @@
-import {
-  CallExpression, SourceFile, Node 
-} from 'ts-morph'
 import type { Type } from 'ts-morph'
+import { CallExpression, Node, SourceFile } from 'ts-morph'
 import { ConnectionDetectionError } from '../connection-detection-error'
 
 /** @riviere-role value-object */
@@ -11,6 +9,14 @@ export class TypeResolution {
   readonly typeName: string | undefined
   readonly reason: string | undefined
 
+  static parse(params: {
+    resolved: boolean
+    typeName: string | undefined
+    reason: string | undefined
+  }): TypeResolution {
+    return new TypeResolution(params)
+  }
+
   private constructor(params: {
     resolved: boolean
     typeName: string | undefined
@@ -22,7 +28,7 @@ export class TypeResolution {
   }
 
   static resolved(typeName: string): TypeResolution {
-    return new TypeResolution({
+    return TypeResolution.parse({
       resolved: true,
       typeName,
       reason: undefined,
@@ -30,7 +36,7 @@ export class TypeResolution {
   }
 
   static unresolved(reason: string): TypeResolution {
-    return new TypeResolution({
+    return TypeResolution.parse({
       resolved: false,
       typeName: undefined,
       reason,
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/component-index.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/component-index.spec.ts
similarity index 77%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/component-index.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/component-index.spec.ts
index e47de5f08..5993d44c7 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/component-index.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/component-index.spec.ts
@@ -1,9 +1,7 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import { ComponentIndex } from './component-index'
-import { buildComponent as buildFixtureComponent } from './call-graph/call-graph-fixtures'
+import { describe, expect, it } from 'vitest'
 import type { EnrichedComponent } from '../value-extraction/enriched-component'
+import { buildComponent as buildFixtureComponent } from './call-graph/__fixtures__/call-graph-fixtures'
+import { ComponentIndex } from './component-index'
 
 function buildComponent(overrides: Partial<EnrichedComponent> = {}): EnrichedComponent {
   return buildFixtureComponent('OrderService', 'src/order-service.ts', 10, overrides)
@@ -12,31 +10,31 @@ function buildComponent(overrides: Partial<EnrichedComponent> = {}): EnrichedCom
 describe('ComponentIndex', () => {
   describe('isComponent', () => {
     it('returns false when built from empty array', () => {
-      const index = new ComponentIndex([])
+      const index = ComponentIndex.parse([])
 
       expect(index.isComponent('OrderService')).toBe(false)
     })
 
     it('returns true when type name matches component name', () => {
-      const index = new ComponentIndex([buildComponent({ name: 'OrderRepository' })])
+      const index = ComponentIndex.parse([buildComponent({ name: 'OrderRepository' })])
 
       expect(index.isComponent('OrderRepository')).toBe(true)
     })
 
     it('returns false when type name matches no component', () => {
-      const index = new ComponentIndex([buildComponent({ name: 'OrderRepository' })])
+      const index = ComponentIndex.parse([buildComponent({ name: 'OrderRepository' })])
 
       expect(index.isComponent('PaymentService')).toBe(false)
     })
 
     it('matches generic type Repository<Order> to component named Repository', () => {
-      const index = new ComponentIndex([buildComponent({ name: 'Repository' })])
+      const index = ComponentIndex.parse([buildComponent({ name: 'Repository' })])
 
       expect(index.isComponent('Repository<Order>')).toBe(true)
     })
 
     it('is case-sensitive: orderrepository does not match OrderRepository', () => {
-      const index = new ComponentIndex([buildComponent({ name: 'OrderRepository' })])
+      const index = ComponentIndex.parse([buildComponent({ name: 'OrderRepository' })])
 
       expect(index.isComponent('orderrepository')).toBe(false)
     })
@@ -45,13 +43,13 @@ describe('ComponentIndex', () => {
   describe('getComponentByTypeName', () => {
     it('returns component when type name matches', () => {
       const component = buildComponent({ name: 'OrderRepository' })
-      const index = new ComponentIndex([component])
+      const index = ComponentIndex.parse([component])
 
       expect(index.getComponentByTypeName('OrderRepository')).toStrictEqual(component)
     })
 
     it('returns undefined when type name matches no component', () => {
-      const index = new ComponentIndex([buildComponent({ name: 'OrderRepository' })])
+      const index = ComponentIndex.parse([buildComponent({ name: 'OrderRepository' })])
 
       expect(index.getComponentByTypeName('PaymentService')).toBeUndefined()
     })
@@ -66,7 +64,7 @@ describe('ComponentIndex', () => {
           line: 5,
         },
       })
-      const index = new ComponentIndex([component])
+      const index = ComponentIndex.parse([component])
 
       expect(index.getComponentByLocation('src/order-service.ts', 5)).toStrictEqual(component)
     })
@@ -79,13 +77,13 @@ describe('ComponentIndex', () => {
           line: 20,
         },
       })
-      const index = new ComponentIndex([component])
+      const index = ComponentIndex.parse([component])
 
       expect(index.getComponentByLocation('src/order-service.ts', 20)).toStrictEqual(component)
     })
 
     it('returns undefined for unknown location', () => {
-      const index = new ComponentIndex([
+      const index = ComponentIndex.parse([
         buildComponent({
           location: {
             file: 'src/order-service.ts',
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/component-index.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/component-index.ts
similarity index 88%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/component-index.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/component-index.ts
index c40750746..1bd1fb569 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/component-index.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/component-index.ts
@@ -10,7 +10,11 @@ export class ComponentIndex {
   private readonly byName: ReadonlyMap<string, EnrichedComponent>
   private readonly byLocation: ReadonlyMap<string, EnrichedComponent>
 
-  constructor(components: readonly EnrichedComponent[]) {
+  static parse(components: readonly EnrichedComponent[]): ComponentIndex {
+    return new ComponentIndex(components)
+  }
+
+  private constructor(components: readonly EnrichedComponent[]) {
     const nameMap = new Map<string, EnrichedComponent>()
     const locationMap = new Map<string, EnrichedComponent>()
 
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/connection-detection-error.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/connection-detection-error.ts
similarity index 81%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/connection-detection-error.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/connection-detection-error.ts
index afa8a9980..0833e405d 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/connection-detection-error.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/connection-detection-error.ts
@@ -5,12 +5,7 @@ export class ConnectionDetectionError extends Error {
   readonly typeName: string
   readonly reason: string
 
-  constructor(params: {
-    file: string;
-    line: number;
-    typeName: string;
-    reason: string 
-  }) {
+  constructor(params: { file: string; line: number; typeName: string; reason: string }) {
     super(
       `Connection detection failed for ${params.typeName} at ${params.file}:${params.line}: ${params.reason}`,
     )
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/connection-detection-values.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/connection-detection-values.spec.ts
similarity index 88%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/connection-detection-values.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/connection-detection-values.spec.ts
index 41138283d..f2b6502e0 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/connection-detection-values.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/connection-detection-values.spec.ts
@@ -1,12 +1,10 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
+import { buildComponent } from './call-graph/__fixtures__/call-graph-fixtures'
 import {
   ConnectionDetectionOptions,
-  PerModuleConnectionOptions,
   CrossModuleConnectionOptions,
+  PerModuleConnectionOptions,
 } from './connection-detection-values'
-import { buildComponent } from './call-graph/call-graph-fixtures'
 
 describe('ConnectionDetectionOptions', () => {
   it('stores all constructor fields when event publishers and http links are provided', () => {
@@ -24,7 +22,7 @@ describe('ConnectionDetectionOptions', () => {
       },
     ]
 
-    const result = new ConnectionDetectionOptions({
+    const result = ConnectionDetectionOptions.parse({
       allowIncomplete: true,
       sourceFilePaths: ['/src/orders/order.ts'],
       eventPublishers,
@@ -53,7 +51,7 @@ describe('PerModuleConnectionOptions', () => {
       },
     ]
 
-    const result = new PerModuleConnectionOptions({
+    const result = PerModuleConnectionOptions.parse({
       allComponents: [component],
       allowIncomplete: true,
       sourceFilePaths: ['/src/orders/order-service.ts'],
@@ -80,7 +78,7 @@ describe('CrossModuleConnectionOptions', () => {
       },
     ]
 
-    const result = new CrossModuleConnectionOptions({
+    const result = CrossModuleConnectionOptions.parse({
       allowIncomplete: false,
       eventPublishers,
       repository: 'test-repo',
diff --git a/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/connection-detection-values.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/connection-detection-values.ts
new file mode 100644
index 000000000..5182590ac
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/connection-detection-values.ts
@@ -0,0 +1,247 @@
+import type {
+  EventPublisherConfig,
+  HttpLinkConfig,
+} from '@living-architecture/riviere-extract-config-published-language'
+import type { ExternalLink } from '@living-architecture/riviere-schema-published-language/schema'
+import type { EnrichedComponent } from '../value-extraction/enriched-component'
+import type { ExtractedLink } from './extracted-link'
+
+type LinkCollectionParams<TTimings> = {
+  links: ExtractedLink[]
+  externalLinks: ExternalLink[]
+  timings: TTimings
+}
+
+function assignLinkCollections<TTimings>(
+  target: {
+    links: ExtractedLink[]
+    externalLinks: ExternalLink[]
+    timings: TTimings
+  },
+  params: LinkCollectionParams<TTimings>,
+): void {
+  target.links = params.links
+  target.externalLinks = params.externalLinks
+  target.timings = params.timings
+}
+
+/** @riviere-role value-object */
+export class ConnectionDetectionOptions {
+  declare private brand: 'ConnectionDetectionOptions'
+  readonly allowIncomplete: boolean | undefined
+  readonly sourceFilePaths: string[]
+  readonly eventPublishers: EventPublisherConfig[] | undefined
+  readonly httpLinks: HttpLinkConfig[] | undefined
+  readonly repository: string
+
+  static parse(params: {
+    allowIncomplete?: boolean
+    sourceFilePaths: string[]
+    eventPublishers?: EventPublisherConfig[]
+    httpLinks?: HttpLinkConfig[]
+    repository: string
+  }): ConnectionDetectionOptions {
+    return new ConnectionDetectionOptions(params)
+  }
+
+  private constructor(params: {
+    allowIncomplete?: boolean
+    sourceFilePaths: string[]
+    eventPublishers?: EventPublisherConfig[]
+    httpLinks?: HttpLinkConfig[]
+    repository: string
+  }) {
+    this.allowIncomplete = params.allowIncomplete
+    this.sourceFilePaths = params.sourceFilePaths
+    this.eventPublishers = params.eventPublishers
+    this.httpLinks = params.httpLinks
+    this.repository = params.repository
+  }
+}
+
+/** @riviere-role value-object */
+export class ConnectionTimings {
+  declare private brand: 'ConnectionTimings'
+  readonly callGraphMs: number
+  readonly asyncDetectionMs: number
+  readonly setupMs: number
+  readonly totalMs: number
+
+  static parse(params: {
+    callGraphMs: number
+    asyncDetectionMs: number
+    setupMs: number
+    totalMs: number
+  }): ConnectionTimings {
+    return new ConnectionTimings(params)
+  }
+
+  private constructor(params: {
+    callGraphMs: number
+    asyncDetectionMs: number
+    setupMs: number
+    totalMs: number
+  }) {
+    this.callGraphMs = params.callGraphMs
+    this.asyncDetectionMs = params.asyncDetectionMs
+    this.setupMs = params.setupMs
+    this.totalMs = params.totalMs
+  }
+}
+
+/** @riviere-role value-object */
+export class ConnectionDetectionResult {
+  declare private brand: 'ConnectionDetectionResult'
+  declare readonly links: ExtractedLink[]
+  declare readonly externalLinks: ExternalLink[]
+  declare readonly timings: ConnectionTimings
+
+  static parse(params: {
+    links: ExtractedLink[]
+    externalLinks: ExternalLink[]
+    timings: ConnectionTimings
+  }): ConnectionDetectionResult {
+    return new ConnectionDetectionResult(params)
+  }
+
+  private constructor(params: {
+    links: ExtractedLink[]
+    externalLinks: ExternalLink[]
+    timings: ConnectionTimings
+  }) {
+    assignLinkCollections(this, params)
+  }
+}
+
+/** @riviere-role value-object */
+export class PerModuleConnectionOptions {
+  declare private brand: 'PerModuleConnectionOptions'
+  readonly allComponents: readonly EnrichedComponent[] | undefined
+  readonly allowIncomplete: boolean | undefined
+  readonly sourceFilePaths: string[]
+  readonly httpLinks: HttpLinkConfig[] | undefined
+  readonly repository: string
+
+  static parse(params: {
+    allComponents?: readonly EnrichedComponent[]
+    allowIncomplete?: boolean
+    sourceFilePaths: string[]
+    httpLinks?: HttpLinkConfig[]
+    repository: string
+  }): PerModuleConnectionOptions {
+    return new PerModuleConnectionOptions(params)
+  }
+
+  private constructor(params: {
+    allComponents?: readonly EnrichedComponent[]
+    allowIncomplete?: boolean
+    sourceFilePaths: string[]
+    httpLinks?: HttpLinkConfig[]
+    repository: string
+  }) {
+    this.allComponents = params.allComponents
+    this.allowIncomplete = params.allowIncomplete
+    this.sourceFilePaths = params.sourceFilePaths
+    this.httpLinks = params.httpLinks
+    this.repository = params.repository
+  }
+}
+
+/** @riviere-role value-object */
+export class PerModuleTimings {
+  declare private brand: 'PerModuleTimings'
+  readonly callGraphMs: number
+  readonly setupMs: number
+
+  static parse(params: { callGraphMs: number; setupMs: number }): PerModuleTimings {
+    return new PerModuleTimings(params)
+  }
+
+  private constructor(params: { callGraphMs: number; setupMs: number }) {
+    this.callGraphMs = params.callGraphMs
+    this.setupMs = params.setupMs
+  }
+}
+
+/** @riviere-role value-object */
+export class PerModuleDetectionResult {
+  declare private brand: 'PerModuleDetectionResult'
+  declare readonly links: ExtractedLink[]
+  declare readonly externalLinks: ExternalLink[]
+  declare readonly timings: PerModuleTimings
+
+  static parse(params: {
+    links: ExtractedLink[]
+    externalLinks: ExternalLink[]
+    timings: PerModuleTimings
+  }): PerModuleDetectionResult {
+    return new PerModuleDetectionResult(params)
+  }
+
+  private constructor(params: {
+    links: ExtractedLink[]
+    externalLinks: ExternalLink[]
+    timings: PerModuleTimings
+  }) {
+    assignLinkCollections(this, params)
+  }
+}
+
+/** @riviere-role value-object */
+export class CrossModuleConnectionOptions {
+  declare private brand: 'CrossModuleConnectionOptions'
+  readonly allowIncomplete: boolean | undefined
+  readonly eventPublishers: EventPublisherConfig[] | undefined
+  readonly repository: string
+
+  static parse(params: {
+    allowIncomplete?: boolean
+    eventPublishers?: EventPublisherConfig[]
+    repository: string
+  }): CrossModuleConnectionOptions {
+    return new CrossModuleConnectionOptions(params)
+  }
+
+  private constructor(params: {
+    allowIncomplete?: boolean
+    eventPublishers?: EventPublisherConfig[]
+    repository: string
+  }) {
+    this.allowIncomplete = params.allowIncomplete
+    this.eventPublishers = params.eventPublishers
+    this.repository = params.repository
+  }
+}
+
+/** @riviere-role value-object */
+export class CrossModuleTimings {
+  declare private brand: 'CrossModuleTimings'
+  readonly asyncDetectionMs: number
+
+  static parse(params: { asyncDetectionMs: number }): CrossModuleTimings {
+    return new CrossModuleTimings(params)
+  }
+
+  private constructor(params: { asyncDetectionMs: number }) {
+    this.asyncDetectionMs = params.asyncDetectionMs
+  }
+}
+
+/** @riviere-role value-object */
+export class CrossModuleDetectionResult {
+  declare private brand: 'CrossModuleDetectionResult'
+  readonly links: ExtractedLink[]
+  readonly timings: CrossModuleTimings
+
+  static parse(params: {
+    links: ExtractedLink[]
+    timings: CrossModuleTimings
+  }): CrossModuleDetectionResult {
+    return new CrossModuleDetectionResult(params)
+  }
+
+  private constructor(params: { links: ExtractedLink[]; timings: CrossModuleTimings }) {
+    this.links = params.links
+    this.timings = params.timings
+  }
+}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/detect-connections.dedup.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/detect-connections.dedup.spec.ts
similarity index 96%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/detect-connections.dedup.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/detect-connections.dedup.spec.ts
index 9bd101389..ae8477c11 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/detect-connections.dedup.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/detect-connections.dedup.spec.ts
@@ -1,11 +1,9 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 import { deduplicateCrossStrategy } from './detect-connections'
 import { ExtractedLink } from './extracted-link'
 
 function createLink(overrides: Partial<ExtractedLink> = {}): ExtractedLink {
-  return new ExtractedLink({
+  return ExtractedLink.parse({
     source: 'orders:orders-module:useCase:orderservice',
     target: overrides.target ?? 'orders:orders-module:event:eventbus',
     type: overrides.type ?? 'sync',
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/detect-connections.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/detect-connections.spec.ts
similarity index 97%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/detect-connections.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/detect-connections.spec.ts
index 0c17e4cd1..eabc9e411 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/detect-connections.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/detect-connections.spec.ts
@@ -1,11 +1,9 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import { detectConnections } from './detect-connections'
-import { ConnectionDetectionOptions } from './connection-detection-values'
-import { buildComponent } from './call-graph/call-graph-fixtures'
+import { describe, expect, it } from 'vitest'
+import { buildComponent } from './call-graph/__fixtures__/call-graph-fixtures'
 import { ConnectionDetectionError } from './connection-detection-error'
-import { createProject } from './detect-connections-fixtures'
+import { ConnectionDetectionOptions } from './connection-detection-values'
+import { detectConnections } from './detect-connections'
+import { createProject } from './__fixtures__/detect-connections-fixtures'
 
 function createOptions(params: {
   allowIncomplete?: boolean
@@ -15,7 +13,7 @@ function createOptions(params: {
     metadataKey: string
   }[]
 }): ConnectionDetectionOptions {
-  return new ConnectionDetectionOptions({
+  return ConnectionDetectionOptions.parse({
     repository: 'test-repo',
     sourceFilePaths: params.sourceFilePaths,
     ...(params.allowIncomplete !== undefined && { allowIncomplete: params.allowIncomplete }),
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/detect-connections.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/detect-connections.ts
similarity index 83%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/detect-connections.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/detect-connections.ts
index ed3f1be99..7c37c08ea 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/detect-connections.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/detect-connections.ts
@@ -1,29 +1,24 @@
 import { performance } from 'node:perf_hooks'
 import type { Project } from 'ts-morph'
 import type { EnrichedComponent } from '../value-extraction/enriched-component'
-import type { ExtractedLink } from './extracted-link'
 import { AsyncDetectionOptions } from './async-detection/async-detection-options'
-import { ComponentIndex } from './component-index'
-import { buildCallGraph } from './call-graph/build-call-graph'
 import { detectEventPublisherConnections } from './async-detection/detect-event-publisher-connections'
 import { detectSubscribeConnections } from './async-detection/detect-subscribe-connections'
+import { buildCallGraph } from './call-graph/build-call-graph'
 import { CallGraphOptions } from './call-graph/call-graph-types'
-import type {
+import { ComponentIndex } from './component-index'
+import {
   ConnectionDetectionOptions,
   ConnectionDetectionResult,
+  ConnectionTimings,
   CrossModuleConnectionOptions,
   CrossModuleDetectionResult,
+  CrossModuleTimings,
   PerModuleConnectionOptions,
   PerModuleDetectionResult,
+  PerModuleTimings,
 } from './connection-detection-values'
-import {
-  ConnectionDetectionResult as ConnectionDetectionResultRecord,
-  ConnectionTimings as ConnectionTimingsRecord,
-  CrossModuleDetectionResult as CrossModuleDetectionResultRecord,
-  CrossModuleTimings as CrossModuleTimingsRecord,
-  PerModuleDetectionResult as PerModuleDetectionResultRecord,
-  PerModuleTimings as PerModuleTimingsRecord,
-} from './connection-detection-values'
+import type { ExtractedLink } from './extracted-link'
 import { resolveHttpLinks } from './resolve-http-links'
 
 /** @riviere-role domain-service */
@@ -51,7 +46,7 @@ export function detectPerModuleConnections(
 ): PerModuleDetectionResult {
   const setupStart = performance.now()
   const visibleComponents = options.allComponents ?? components
-  const componentIndex = new ComponentIndex(visibleComponents)
+  const componentIndex = ComponentIndex.parse(visibleComponents)
   const sourceFilePaths = options.sourceFilePaths
   const setupMs = performance.now() - setupStart
 
@@ -63,7 +58,7 @@ export function detectPerModuleConnections(
     project,
     components,
     componentIndex,
-    new CallGraphOptions({
+    CallGraphOptions.parse({
       strict,
       sourceFilePaths,
       repository,
@@ -74,10 +69,10 @@ export function detectPerModuleConnections(
   const httpLinkConfigs = options.httpLinks ?? []
   const resolved = resolveHttpLinks(syncLinks, visibleComponents, httpLinkConfigs)
 
-  return new PerModuleDetectionResultRecord({
+  return PerModuleDetectionResult.parse({
     links: resolved.links,
     externalLinks: resolved.externalLinks,
-    timings: new PerModuleTimingsRecord({
+    timings: PerModuleTimings.parse({
       callGraphMs,
       setupMs,
     }),
@@ -91,7 +86,7 @@ export function detectCrossModuleConnections(
 ): CrossModuleDetectionResult {
   const strict = options.allowIncomplete !== true
   const repository = options.repository
-  const asyncOptions = new AsyncDetectionOptions({
+  const asyncOptions = AsyncDetectionOptions.parse({
     strict,
     repository,
   })
@@ -105,9 +100,9 @@ export function detectCrossModuleConnections(
   const subscribeLinks = detectSubscribeConnections(allComponents, asyncOptions)
   const asyncDetectionMs = performance.now() - asyncStart
 
-  return new CrossModuleDetectionResultRecord({
+  return CrossModuleDetectionResult.parse({
     links: [...publishLinks, ...subscribeLinks],
-    timings: new CrossModuleTimingsRecord({ asyncDetectionMs }),
+    timings: CrossModuleTimings.parse({ asyncDetectionMs }),
   })
 }
 
@@ -120,7 +115,7 @@ export function detectConnections(
   const totalStart = performance.now()
 
   const setupStart = performance.now()
-  const componentIndex = new ComponentIndex(components)
+  const componentIndex = ComponentIndex.parse(components)
   const sourceFilePaths = options.sourceFilePaths
   const setupMs = performance.now() - setupStart
 
@@ -132,7 +127,7 @@ export function detectConnections(
     project,
     components,
     componentIndex,
-    new CallGraphOptions({
+    CallGraphOptions.parse({
       strict,
       sourceFilePaths,
       repository,
@@ -140,7 +135,7 @@ export function detectConnections(
   )
   const callGraphMs = performance.now() - callGraphStart
 
-  const asyncOptions = new AsyncDetectionOptions({
+  const asyncOptions = AsyncDetectionOptions.parse({
     strict,
     repository,
   })
@@ -159,10 +154,10 @@ export function detectConnections(
   const resolved = resolveHttpLinks(deduplicatedLinks, components, httpLinkConfigs)
   const totalMs = performance.now() - totalStart
 
-  return new ConnectionDetectionResultRecord({
+  return ConnectionDetectionResult.parse({
     links: resolved.links,
     externalLinks: resolved.externalLinks,
-    timings: new ConnectionTimingsRecord({
+    timings: ConnectionTimings.parse({
       callGraphMs,
       asyncDetectionMs,
       setupMs,
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/detect-cross-module-connections.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/detect-cross-module-connections.spec.ts
similarity index 96%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/detect-cross-module-connections.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/detect-cross-module-connections.spec.ts
index 826343fcf..715f4973a 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/detect-cross-module-connections.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/detect-cross-module-connections.spec.ts
@@ -1,10 +1,8 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import { detectCrossModuleConnections } from './detect-connections'
-import { CrossModuleConnectionOptions } from './connection-detection-values'
-import { buildComponent } from './call-graph/call-graph-fixtures'
+import { describe, expect, it } from 'vitest'
+import { buildComponent } from './call-graph/__fixtures__/call-graph-fixtures'
 import { ConnectionDetectionError } from './connection-detection-error'
+import { CrossModuleConnectionOptions } from './connection-detection-values'
+import { detectCrossModuleConnections } from './detect-connections'
 
 const publisherConfig = [
   {
@@ -20,7 +18,7 @@ function createOptions(params: {
     metadataKey: string
   }[]
 }): CrossModuleConnectionOptions {
-  return new CrossModuleConnectionOptions({
+  return CrossModuleConnectionOptions.parse({
     repository: 'test-repo',
     ...(params.allowIncomplete !== undefined && { allowIncomplete: params.allowIncomplete }),
     ...(params.eventPublishers !== undefined && { eventPublishers: params.eventPublishers }),
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/detect-per-module-connections.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/detect-per-module-connections.spec.ts
similarity index 96%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/detect-per-module-connections.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/detect-per-module-connections.spec.ts
index 082642d11..7c2c4a415 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/detect-per-module-connections.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/detect-per-module-connections.spec.ts
@@ -1,16 +1,14 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import { detectPerModuleConnections } from './detect-connections'
+import { describe, expect, it } from 'vitest'
+import { buildComponent } from './call-graph/__fixtures__/call-graph-fixtures'
 import { PerModuleConnectionOptions } from './connection-detection-values'
-import { buildComponent } from './call-graph/call-graph-fixtures'
-import { createProject } from './detect-connections-fixtures'
+import { detectPerModuleConnections } from './detect-connections'
+import { createProject } from './__fixtures__/detect-connections-fixtures'
 
 function createOptions(params: {
   sourceFilePaths: string[]
   allComponents?: readonly ReturnType<typeof buildComponent>[]
 }): PerModuleConnectionOptions {
-  return new PerModuleConnectionOptions({
+  return PerModuleConnectionOptions.parse({
     repository: 'test-repo',
     sourceFilePaths: params.sourceFilePaths,
     ...(params.allComponents !== undefined && { allComponents: params.allComponents }),
diff --git a/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/extracted-link.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/extracted-link.ts
new file mode 100644
index 000000000..7fb4f4e77
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/extracted-link.ts
@@ -0,0 +1,35 @@
+import type { Link } from '@living-architecture/riviere-schema-published-language/schema'
+
+/** @riviere-role value-object */
+export class ExtractedLink {
+  declare private brand: 'ExtractedLink'
+  readonly source: string
+  readonly target: string
+  readonly type: 'sync' | 'async' | undefined
+  readonly _uncertain: string | undefined
+  readonly sourceLocation: Link['sourceLocation'] | undefined
+
+  static parse(params: {
+    source: string
+    target: string
+    type?: 'sync' | 'async'
+    _uncertain?: string
+    sourceLocation?: Link['sourceLocation']
+  }): ExtractedLink {
+    return new ExtractedLink(params)
+  }
+
+  private constructor(params: {
+    source: string
+    target: string
+    type?: 'sync' | 'async'
+    _uncertain?: string
+    sourceLocation?: Link['sourceLocation']
+  }) {
+    this.source = params.source
+    this.target = params.target
+    this.type = params.type
+    this._uncertain = params._uncertain
+    this.sourceLocation = params.sourceLocation
+  }
+}
diff --git a/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/http-link-resolution-result.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/http-link-resolution-result.ts
new file mode 100644
index 000000000..c6fe96677
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/http-link-resolution-result.ts
@@ -0,0 +1,21 @@
+import type { ExternalLink } from '@living-architecture/riviere-schema-published-language/schema'
+import type { ExtractedLink } from './extracted-link'
+
+/** @riviere-role value-object */
+export class HttpLinkResolutionResult {
+  declare private brand: 'HttpLinkResolutionResult'
+  readonly links: ExtractedLink[]
+  readonly externalLinks: ExternalLink[]
+
+  static parse(params: {
+    links: ExtractedLink[]
+    externalLinks: ExternalLink[]
+  }): HttpLinkResolutionResult {
+    return new HttpLinkResolutionResult(params)
+  }
+
+  private constructor(params: { links: ExtractedLink[]; externalLinks: ExternalLink[] }) {
+    this.links = params.links
+    this.externalLinks = params.externalLinks
+  }
+}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/interface-resolution/resolve-interface.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/interface-resolution/resolve-interface.spec.ts
similarity index 93%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/interface-resolution/resolve-interface.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/interface-resolution/resolve-interface.spec.ts
index d18edf9f0..2a579e19c 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/interface-resolution/resolve-interface.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/interface-resolution/resolve-interface.spec.ts
@@ -1,9 +1,7 @@
-import {
-  describe, it, expect 
-} from 'vitest'
 import { Project } from 'ts-morph'
-import { resolveInterface } from './resolve-interface'
+import { describe, expect, it } from 'vitest'
 import { ConnectionDetectionError } from '../connection-detection-error'
+import { resolveInterface } from './resolve-interface'
 
 const sharedProject = new Project({ useInMemoryFileSystem: true })
 const counter = { value: 0 }
@@ -35,7 +33,9 @@ describe('resolveInterface', () => {
     `,
     )
 
-    const result = resolveInterface('PaymentGateway', sharedProject, [interfaceFile, implFile], {strict: false,})
+    const result = resolveInterface('PaymentGateway', sharedProject, [interfaceFile, implFile], {
+      strict: false,
+    })
 
     expect(result).toMatchObject({
       resolved: true,
@@ -62,7 +62,9 @@ describe('resolveInterface', () => {
     `,
     )
 
-    const result = resolveInterface('BaseRepository', sharedProject, [abstractFile, implFile], {strict: false,})
+    const result = resolveInterface('BaseRepository', sharedProject, [abstractFile, implFile], {
+      strict: false,
+    })
 
     expect(result).toMatchObject({
       resolved: true,
@@ -95,7 +97,9 @@ describe('resolveInterface', () => {
     `,
     )
 
-    const result = resolveInterface('UnusedInterface', sharedProject, [interfaceFile], {strict: false,})
+    const result = resolveInterface('UnusedInterface', sharedProject, [interfaceFile], {
+      strict: false,
+    })
 
     expect(result).toMatchObject({
       resolved: false,
@@ -165,7 +169,9 @@ describe('resolveInterface', () => {
     `,
     )
 
-    const result = resolveInterface('Notifier', sharedProject, [interfaceFile, impl1, impl2], {strict: false,})
+    const result = resolveInterface('Notifier', sharedProject, [interfaceFile, impl1, impl2], {
+      strict: false,
+    })
 
     expect(result).toMatchObject({
       resolved: false,
@@ -202,7 +208,9 @@ describe('resolveInterface', () => {
     `,
     )
 
-    const result = resolveInterface('Cache', sharedProject, [interfaceFile, inScopeImpl], {strict: false,})
+    const result = resolveInterface('Cache', sharedProject, [interfaceFile, inScopeImpl], {
+      strict: false,
+    })
 
     expect(result).toMatchObject({
       resolved: true,
@@ -229,7 +237,9 @@ describe('resolveInterface', () => {
     `,
     )
 
-    const result = resolveInterface('Service', sharedProject, [interfaceFile, nodeModulesFile], {strict: false,})
+    const result = resolveInterface('Service', sharedProject, [interfaceFile, nodeModulesFile], {
+      strict: false,
+    })
 
     expect(result).toMatchObject({
       resolved: false,
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/interface-resolution/resolve-interface.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/interface-resolution/resolve-interface.ts
similarity index 90%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/interface-resolution/resolve-interface.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/interface-resolution/resolve-interface.ts
index 717cb4106..89cbb55a4 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/interface-resolution/resolve-interface.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/interface-resolution/resolve-interface.ts
@@ -1,6 +1,4 @@
-import {
-  Project, ClassDeclaration, SourceFile 
-} from 'ts-morph'
+import { ClassDeclaration, Project, SourceFile } from 'ts-morph'
 import { ConnectionDetectionError } from '../connection-detection-error'
 
 /** @riviere-role value-object */
@@ -11,6 +9,15 @@ export class InterfaceResolution {
   readonly reason: string | undefined
   readonly typeDefinedInSource: boolean | undefined
 
+  static parse(params: {
+    resolved: boolean
+    typeName: string | undefined
+    reason: string | undefined
+    typeDefinedInSource: boolean | undefined
+  }): InterfaceResolution {
+    return new InterfaceResolution(params)
+  }
+
   private constructor(params: {
     resolved: boolean
     typeName: string | undefined
@@ -24,7 +31,7 @@ export class InterfaceResolution {
   }
 
   static resolved(typeName: string): InterfaceResolution {
-    return new InterfaceResolution({
+    return InterfaceResolution.parse({
       resolved: true,
       typeName,
       reason: undefined,
@@ -32,11 +39,8 @@ export class InterfaceResolution {
     })
   }
 
-  static unresolved(params: {
-    reason: string;
-    typeDefinedInSource: boolean 
-  }): InterfaceResolution {
-    return new InterfaceResolution({
+  static unresolved(params: { reason: string; typeDefinedInSource: boolean }): InterfaceResolution {
+    return InterfaceResolution.parse({
       resolved: false,
       typeName: undefined,
       reason: params.reason,
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/resolve-http-links.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/resolve-http-links.spec.ts
similarity index 96%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/resolve-http-links.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/resolve-http-links.spec.ts
index bfd1b8927..cb790a299 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/resolve-http-links.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/resolve-http-links.spec.ts
@@ -1,13 +1,9 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import type { HttpLinkConfig } from '@living-architecture/riviere-extract-config'
+import type { HttpLinkConfig } from '@living-architecture/riviere-extract-config-published-language'
+import { describe, expect, it } from 'vitest'
 import type { EnrichedComponent } from '../value-extraction/enriched-component'
+import { buildComponent } from './call-graph/__fixtures__/call-graph-fixtures'
 import { ExtractedLink } from './extracted-link'
-import {
-  resolveHttpLinks, stripResolvedCustomTypes 
-} from './resolve-http-links'
-import { buildComponent } from './call-graph/call-graph-fixtures'
+import { resolveHttpLinks, stripResolvedCustomTypes } from './resolve-http-links'
 
 function createHttpLinkConfig(overrides: Partial<HttpLinkConfig> = {}): HttpLinkConfig {
   return {
@@ -19,7 +15,7 @@ function createHttpLinkConfig(overrides: Partial<HttpLinkConfig> = {}): HttpLink
 }
 
 function createLink(overrides: Partial<ExtractedLink> = {}): ExtractedLink {
-  return new ExtractedLink({
+  return ExtractedLink.parse({
     source: 'bff:bff-module:useCase:placeorder',
     target: overrides.target ?? 'bff:bff-module:httpCall:placeorder',
     type: overrides.type ?? 'sync',
@@ -259,7 +255,7 @@ describe('stripResolvedCustomTypes', () => {
     const useCase = buildComponent('PlaceOrder', '/src/uc.ts', 1)
     const httpCall = buildComponent('check', '/src/http.ts', 1, { type: 'httpCall' })
     const config = createHttpLinkConfig()
-    const linkTargetingHttpCall = new ExtractedLink({
+    const linkTargetingHttpCall = ExtractedLink.parse({
       source: 'bff:bff-module:useCase:placeorder',
       target: 'orders:orders-module:httpCall:check',
       type: 'sync',
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/resolve-http-links.ts b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/resolve-http-links.ts
similarity index 89%
rename from packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/resolve-http-links.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/connection-detection/resolve-http-links.ts
index ce1f1843d..7331af178 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/resolve-http-links.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/connection-detection/resolve-http-links.ts
@@ -1,11 +1,12 @@
-import type { HttpLinkConfig } from '@living-architecture/riviere-extract-config'
+import type { HttpLinkConfig } from '@living-architecture/riviere-extract-config-published-language'
+import { ComponentId } from '@living-architecture/riviere-schema-published-language/component-id'
 import type {
-  ExternalLink, ExternalTarget 
-} from '@living-architecture/riviere-schema'
+  ExternalLink,
+  ExternalTarget,
+} from '@living-architecture/riviere-schema-published-language/schema'
 import type { EnrichedComponent } from '../value-extraction/enriched-component'
-import { ExtractedLink } from './extracted-link'
-import { componentIdentity } from './call-graph/component-identity'
 import { ConnectionDetectionError } from './connection-detection-error'
+import { ExtractedLink } from './extracted-link'
 import { HttpLinkResolutionResult } from './http-link-resolution-result'
 
 /** @riviere-role domain-service */
@@ -15,7 +16,7 @@ export function resolveHttpLinks(
   httpLinkConfigs: readonly HttpLinkConfig[],
 ): HttpLinkResolutionResult {
   if (httpLinkConfigs.length === 0) {
-    return new HttpLinkResolutionResult({
+    return HttpLinkResolutionResult.parse({
       links: [...links],
       externalLinks: [],
     })
@@ -60,9 +61,9 @@ export function resolveHttpLinks(
     }
 
     resolvedLinks.push(
-      new ExtractedLink({
+      ExtractedLink.parse({
         source: link.source,
-        target: componentIdentity(matchedApi),
+        target: ComponentId.parseFromParts(matchedApi).toString(),
         ...(link.type !== undefined && { type: link.type }),
         ...(link._uncertain !== undefined && { _uncertain: link._uncertain }),
         ...(link.sourceLocation !== undefined && { sourceLocation: link.sourceLocation }),
@@ -70,7 +71,7 @@ export function resolveHttpLinks(
     )
   }
 
-  return new HttpLinkResolutionResult({
+  return HttpLinkResolutionResult.parse({
     links: resolvedLinks,
     externalLinks,
   })
@@ -88,7 +89,7 @@ export function stripResolvedCustomTypes(
     if (!resolvedCustomTypes.has(component.type)) {
       return true
     }
-    return targetedIdentities.has(componentIdentity(component))
+    return targetedIdentities.has(ComponentId.parseFromParts(component).toString())
   })
 }
 
@@ -97,7 +98,7 @@ function indexComponentsByIdentity(
 ): ReadonlyMap<string, EnrichedComponent> {
   const byIdentity = new Map<string, EnrichedComponent>()
   for (const component of components) {
-    byIdentity.set(componentIdentity(component), component)
+    byIdentity.set(ComponentId.parseFromParts(component).toString(), component)
   }
   return byIdentity
 }
diff --git a/packages/riviere-extract-ts/domain-model/src/domain/detect-connections-per-module.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/detect-connections-per-module.spec.ts
new file mode 100644
index 000000000..ec38896eb
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/src/domain/detect-connections-per-module.spec.ts
@@ -0,0 +1,269 @@
+import { assert, beforeEach, describe, expect, it, vi } from 'vitest'
+import { Project } from 'ts-morph'
+import {
+  type ConnectionsConfig,
+  ValidatedConfiguration,
+} from '@living-architecture/riviere-extract-config-published-language'
+import { DraftComponent } from './component-extraction/draft-component'
+import { ExtractionProject } from './extraction-project'
+
+const {
+  mockExtractComponents,
+  mockEnrichComponents,
+  mockDeduplicateCrossStrategy,
+  mockDetectCrossModule,
+  mockDetectPerModule,
+} = vi.hoisted(() => ({
+  mockExtractComponents: vi.fn().mockReturnValue([]),
+  mockEnrichComponents: vi.fn().mockReturnValue({
+    components: [],
+    failures: [],
+  }),
+  mockDeduplicateCrossStrategy: vi.fn((links: { source: string }[]) => links),
+  mockDetectPerModule: vi.fn().mockReturnValue({
+    links: [
+      {
+        source: 'orders:useCase:OrderService',
+        target: 'orders:repository:OrderRepo',
+        type: 'sync',
+      },
+    ],
+    externalLinks: [],
+    timings: {
+      callGraphMs: 1,
+      setupMs: 0,
+    },
+  }),
+  mockDetectCrossModule: vi.fn().mockReturnValue({
+    links: [],
+    timings: { asyncDetectionMs: 0 },
+  }),
+}))
+
+vi.mock('./component-extraction/extractor', () => ({
+  extractComponents: mockExtractComponents,
+}))
+
+vi.mock('./value-extraction/enrich-components', () => ({
+  enrichComponents: mockEnrichComponents,
+}))
+
+vi.mock('./connection-detection/detect-connections', () => ({
+  detectPerModuleConnections: mockDetectPerModule,
+  detectCrossModuleConnections: mockDetectCrossModule,
+  deduplicateCrossStrategy: mockDeduplicateCrossStrategy,
+}))
+
+vi.mock('./connection-detection/resolve-http-links', () => ({
+  stripResolvedCustomTypes: vi.fn((components: unknown[]) => components),
+}))
+
+function createExtractionProject(
+  moduleName: string,
+  connections?: ConnectionsConfig,
+): ExtractionProject {
+  const configurationResult = ValidatedConfiguration.parse({
+    ...(connections === undefined ? {} : { connections }),
+    modules: [
+      {
+        api: { notUsed: true },
+        customTypes: {
+          eventSender: {
+            find: 'classes',
+            where: { hasJSDoc: { tag: 'eventSender' } },
+            extract: { publishedEventType: { fromClassName: true } },
+          },
+        },
+        domain: moduleName,
+        domainOp: { notUsed: true },
+        event: { notUsed: true },
+        eventHandler: { notUsed: true },
+        glob: 'src/**',
+        name: moduleName,
+        path: moduleName,
+        ui: { notUsed: true },
+        useCase: { notUsed: true },
+      },
+    ],
+  })
+  assert(configurationResult.success)
+  const module = configurationResult.data.modules[0]
+  assert(module)
+  const projectResult = ExtractionProject.parse({
+    configuration: configurationResult.data,
+    moduleSources: new Map([
+      [module, { files: [`/src/${moduleName}/test.ts`], project: new Project() }],
+    ]),
+    repositoryName: 'test-repo',
+  })
+  assert(projectResult.success)
+  return projectResult.data
+}
+
+describe('ExtractionProject.extractDraftComponents', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('returns links when includeConnections is true', () => {
+    mockExtractComponents.mockReturnValue([
+      DraftComponent.parse({
+        name: 'OrderService',
+        domain: 'orders',
+        module: 'orders',
+        type: 'useCase',
+        location: {
+          file: 'test.ts',
+          line: 1,
+        },
+      }),
+    ])
+    mockEnrichComponents.mockReturnValue({
+      components: [
+        {
+          name: 'OrderService',
+          domain: 'orders',
+          module: 'orders',
+          type: 'useCase',
+          location: {
+            file: 'test.ts',
+            line: 1,
+          },
+          metadata: {},
+        },
+      ],
+      failures: [],
+    })
+    mockDetectPerModule.mockReturnValue({
+      links: [
+        {
+          source: 'orders:useCase:OrderService',
+          target: 'orders:repository:OrderRepo',
+          type: 'sync' as const,
+        },
+      ],
+      externalLinks: [],
+      timings: {
+        callGraphMs: 1,
+        setupMs: 0,
+      },
+    })
+
+    const eventPublishers = [{ fromType: 'eventSender', metadataKey: 'publishedEventType' }]
+    const project = createExtractionProject('orders', { eventPublishers })
+    const result = project.extractDraftComponents({
+      allowIncomplete: true,
+      includeConnections: true,
+    })
+
+    expect(result.kind).toBe('full')
+    expect(mockDetectCrossModule).toHaveBeenCalledWith(
+      expect.any(Array),
+      expect.objectContaining({ eventPublishers }),
+    )
+  })
+
+  it('returns no links when includeConnections is false', () => {
+    mockExtractComponents.mockReturnValue([
+      DraftComponent.parse({
+        name: 'OrderService',
+        domain: 'orders',
+        module: 'orders',
+        type: 'useCase',
+        location: {
+          file: 'test.ts',
+          line: 1,
+        },
+      }),
+    ])
+
+    const project = createExtractionProject('orders')
+    const result = project.extractDraftComponents({
+      allowIncomplete: true,
+      includeConnections: false,
+    })
+
+    assert(result.kind === 'draftOnly')
+    expect(result.components).toStrictEqual([
+      expect.objectContaining({
+        type: 'useCase',
+        name: 'OrderService',
+      }),
+    ])
+  })
+
+  it('returns a field failure when extracted components cannot be enriched', () => {
+    mockExtractComponents.mockReturnValue([
+      DraftComponent.parse({
+        name: 'OrderService',
+        domain: 'orders',
+        module: 'orders',
+        type: 'useCase',
+        location: { file: 'test.ts', line: 1 },
+      }),
+    ])
+    mockEnrichComponents.mockReturnValue({
+      components: [],
+      failures: [{ field: 'name' }],
+    })
+
+    const result = createExtractionProject('orders').extractDraftComponents({
+      allowIncomplete: false,
+      includeConnections: true,
+    })
+
+    expect(result).toStrictEqual({ kind: 'fieldFailure', failedFields: ['name'] })
+  })
+})
+
+describe('ExtractionProject.parse', () => {
+  it('rejects missing and foreign module sources', () => {
+    const orders = ValidatedConfiguration.parse({
+      modules: [
+        {
+          name: 'orders',
+          domain: 'orders',
+          path: '.',
+          glob: '**',
+          api: { notUsed: true },
+          useCase: { notUsed: true },
+          domainOp: { notUsed: true },
+          event: { notUsed: true },
+          eventHandler: { notUsed: true },
+          ui: { notUsed: true },
+        },
+      ],
+    })
+    const billing = ValidatedConfiguration.parse({
+      modules: [
+        {
+          name: 'billing',
+          domain: 'billing',
+          path: '.',
+          glob: '**',
+          api: { notUsed: true },
+          useCase: { notUsed: true },
+          domainOp: { notUsed: true },
+          event: { notUsed: true },
+          eventHandler: { notUsed: true },
+          ui: { notUsed: true },
+        },
+      ],
+    })
+    assert(orders.success)
+    assert(billing.success)
+    const foreignModule = billing.data.modules[0]
+    assert(foreignModule)
+
+    const result = ExtractionProject.parse({
+      configuration: orders.data,
+      moduleSources: new Map([[foreignModule, { files: [], project: new Project() }]]),
+      repositoryName: 'test-repo',
+    })
+
+    expect(result).toMatchObject({
+      success: false,
+      error: "Missing source for module 'orders'\nSource supplied for unknown module 'billing'",
+    })
+  })
+})
diff --git a/packages/riviere-extract-ts/domain-model/src/domain/enrich-per-module.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/enrich-per-module.spec.ts
new file mode 100644
index 000000000..bb784c24d
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/src/domain/enrich-per-module.spec.ts
@@ -0,0 +1,306 @@
+import { assert, beforeEach, describe, expect, it, vi } from 'vitest'
+import { Project } from 'ts-morph'
+import {
+  type ComponentRule,
+  ValidatedConfiguration,
+  ValidatedModule,
+  type ValidatedModuleInput,
+} from '@living-architecture/riviere-extract-config-published-language'
+import { DraftComponent } from './component-extraction/draft-component'
+import type { ExtractedLink } from './connection-detection/extracted-link'
+import { ExtractionProject, OrphanedDraftComponentError } from './extraction-project'
+
+const {
+  mockEnrichComponents,
+  mockDetectPerModuleConnections,
+  mockDetectCrossModuleConnections,
+  mockDeduplicateCrossStrategy,
+} = vi.hoisted(() => ({
+  mockEnrichComponents: vi.fn(),
+  mockDetectPerModuleConnections: vi.fn().mockReturnValue({
+    links: [],
+    externalLinks: [],
+    timings: {
+      callGraphMs: 0,
+      setupMs: 0,
+    },
+  }),
+  mockDetectCrossModuleConnections: vi.fn().mockReturnValue({
+    links: [],
+    timings: { asyncDetectionMs: 0 },
+  }),
+  mockDeduplicateCrossStrategy: vi.fn((links: ExtractedLink[]): ExtractedLink[] => links),
+}))
+
+vi.mock('./value-extraction/enrich-components', () => ({
+  enrichComponents: mockEnrichComponents,
+}))
+
+vi.mock('./connection-detection/detect-connections', () => ({
+  detectPerModuleConnections: mockDetectPerModuleConnections,
+  detectCrossModuleConnections: mockDetectCrossModuleConnections,
+  deduplicateCrossStrategy: mockDeduplicateCrossStrategy,
+}))
+
+vi.mock('./connection-detection/resolve-http-links', () => ({
+  stripResolvedCustomTypes: vi.fn((components: unknown[]) => components),
+}))
+
+const notUsedRule: ComponentRule = { notUsed: true }
+
+function createModule(name: string): ValidatedModuleInput {
+  return {
+    api: notUsedRule,
+    domain: name,
+    domainOp: notUsedRule,
+    event: notUsedRule,
+    eventHandler: notUsedRule,
+    glob: 'src/**',
+    name,
+    path: name,
+    ui: notUsedRule,
+    useCase: notUsedRule,
+  }
+}
+
+function createModuleContext(moduleName: string) {
+  return {
+    files: [],
+    moduleName,
+    project: new Project(),
+  }
+}
+
+function createDraft(domain: string, name: string): DraftComponent {
+  return DraftComponent.parse({
+    domain,
+    location: {
+      file: 'test.ts',
+      line: 1,
+    },
+    name,
+    module: domain,
+    type: 'api',
+  })
+}
+
+function calledModuleName(callIndex: number): string {
+  const value: unknown = mockEnrichComponents.mock.calls[callIndex]?.[1]
+  if (!(value instanceof ValidatedModule)) throw new TypeError('Expected validated module')
+  return value.name
+}
+
+function createExtractionProject(
+  moduleContexts: Array<{
+    files: string[]
+    moduleName: string
+    project: Project
+  }>,
+  draftComponents: DraftComponent[] = [],
+): ExtractionProject {
+  const configurationResult = ValidatedConfiguration.parse({
+    modules: moduleContexts.map((context) => createModule(context.moduleName)),
+  })
+  assert(configurationResult.success)
+  const moduleSources = new Map<ValidatedModule, { files: string[]; project: Project }>()
+  configurationResult.data.modules.forEach((module, index) => {
+    const context = moduleContexts[index]
+    assert(context)
+    moduleSources.set(module, { files: context.files, project: context.project })
+  })
+  const projectResult = ExtractionProject.parse({
+    configuration: configurationResult.data,
+    moduleSources,
+    repositoryName: 'test-repo',
+    draftComponents,
+  })
+  assert(projectResult.success)
+  return projectResult.data
+}
+
+describe('ExtractionProject.enrichDraftComponents', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('enriches drafts grouped by module', () => {
+    mockEnrichComponents
+      .mockReturnValueOnce({
+        components: [
+          {
+            domain: 'orders',
+            name: 'CompA',
+          },
+        ],
+        failures: [],
+      })
+      .mockReturnValueOnce({
+        components: [
+          {
+            domain: 'shipping',
+            name: 'CompB',
+          },
+        ],
+        failures: [],
+      })
+
+    const result = createExtractionProject(
+      [createModuleContext('orders'), createModuleContext('shipping')],
+      [
+        createDraft('orders', 'CompA'),
+        createDraft('orders', 'CompA2'),
+        createDraft('shipping', 'CompB'),
+      ],
+    ).enrichDraftComponents({
+      allowIncomplete: false,
+      includeConnections: true,
+    })
+
+    assert(result.kind === 'full')
+    expect(result.components).toHaveLength(2)
+    expect(mockEnrichComponents).toHaveBeenCalledTimes(2)
+  })
+
+  it('routes correct drafts to each module', () => {
+    mockEnrichComponents.mockReturnValue({
+      components: [],
+      failures: [],
+    })
+
+    createExtractionProject(
+      [createModuleContext('orders'), createModuleContext('shipping')],
+      [createDraft('orders', 'CompA'), createDraft('shipping', 'CompB')],
+    ).enrichDraftComponents({
+      allowIncomplete: false,
+      includeConnections: true,
+    })
+
+    expect([
+      {
+        drafts: mockEnrichComponents.mock.calls[0]?.[0],
+        moduleName: calledModuleName(0),
+      },
+      {
+        drafts: mockEnrichComponents.mock.calls[1]?.[0],
+        moduleName: calledModuleName(1),
+      },
+    ]).toStrictEqual([
+      { drafts: [createDraft('orders', 'CompA')], moduleName: 'orders' },
+      { drafts: [createDraft('shipping', 'CompB')], moduleName: 'shipping' },
+    ])
+  })
+
+  it('deduplicates failed fields across modules', () => {
+    mockEnrichComponents
+      .mockReturnValueOnce({
+        components: [],
+        failures: [{ field: 'name' }],
+      })
+      .mockReturnValueOnce({
+        components: [],
+        failures: [{ field: 'name' }, { field: 'type' }],
+      })
+
+    const result = createExtractionProject(
+      [createModuleContext('orders'), createModuleContext('shipping')],
+      [createDraft('orders', 'A'), createDraft('shipping', 'B')],
+    ).enrichDraftComponents({
+      allowIncomplete: true,
+      includeConnections: true,
+    })
+
+    assert(result.kind === 'full')
+    expect(result.components).toHaveLength(0)
+    expect(result.failedFields).toStrictEqual(['name', 'type'])
+  })
+
+  it('skips modules with no matching drafts', () => {
+    mockEnrichComponents.mockReturnValue({
+      components: [],
+      failures: [],
+    })
+
+    const result = createExtractionProject(
+      [createModuleContext('orders'), createModuleContext('empty')],
+      [createDraft('orders', 'A')],
+    ).enrichDraftComponents({
+      allowIncomplete: false,
+      includeConnections: true,
+    })
+
+    expect(mockEnrichComponents).toHaveBeenCalledTimes(1)
+    assert(result.kind === 'full')
+    expect(result.components).toStrictEqual([])
+  })
+
+  it('throws OrphanedDraftComponentError when drafts reference unknown modules', () => {
+    expect(() =>
+      createExtractionProject(
+        [createModuleContext('orders')],
+        [createDraft('orders', 'A'), createDraft('unknown-module', 'B')],
+      ).enrichDraftComponents({
+        allowIncomplete: false,
+        includeConnections: true,
+      }),
+    ).toThrow(OrphanedDraftComponentError)
+  })
+
+  it('includes module names in orphan error message', () => {
+    expect(() =>
+      createExtractionProject(
+        [createModuleContext('orders')],
+        [createDraft('ghost', 'X')],
+      ).enrichDraftComponents({
+        allowIncomplete: false,
+        includeConnections: true,
+      }),
+    ).toThrow('Draft components reference unknown modules: [ghost]. Known modules: [orders]')
+  })
+
+  it('returns empty result when no drafts provided', () => {
+    const result = createExtractionProject(
+      [createModuleContext('orders')],
+      [],
+    ).enrichDraftComponents({
+      allowIncomplete: false,
+      includeConnections: true,
+    })
+
+    assert(result.kind === 'full')
+    expect(result.components).toStrictEqual([])
+    expect(mockEnrichComponents).not.toHaveBeenCalled()
+  })
+
+  it('returns field failure when enrichment fails and incomplete is disabled', () => {
+    mockEnrichComponents.mockReturnValue({
+      components: [],
+      failures: [{ field: 'name' }],
+    })
+
+    const result = createExtractionProject(
+      [createModuleContext('orders')],
+      [createDraft('orders', 'A')],
+    ).enrichDraftComponents({
+      allowIncomplete: false,
+      includeConnections: true,
+    })
+
+    expect(result).toStrictEqual({
+      kind: 'fieldFailure',
+      failedFields: ['name'],
+    })
+  })
+
+  it('returns draftOnly when includeConnections is false', () => {
+    const result = createExtractionProject(
+      [createModuleContext('orders')],
+      [createDraft('orders', 'CompA')],
+    ).enrichDraftComponents({
+      allowIncomplete: false,
+      includeConnections: false,
+    })
+
+    assert(result.kind === 'draftOnly')
+    expect(result.components).toHaveLength(1)
+  })
+})
diff --git a/packages/riviere-extract-ts/domain-model/src/domain/extraction-project.ts b/packages/riviere-extract-ts/domain-model/src/domain/extraction-project.ts
new file mode 100644
index 000000000..fe6731ef8
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/src/domain/extraction-project.ts
@@ -0,0 +1,343 @@
+import type { Project } from 'ts-morph'
+import type {
+  ValidatedConfiguration,
+  ValidatedModule,
+} from '@living-architecture/riviere-extract-config-published-language'
+import type { ExternalLink } from '@living-architecture/riviere-schema-published-language/schema'
+import type { DraftComponent } from './component-extraction/draft-component'
+import { extractComponents } from './component-extraction/extractor'
+import {
+  ConnectionTimings,
+  CrossModuleConnectionOptions,
+  PerModuleConnectionOptions,
+} from './connection-detection/connection-detection-values'
+import {
+  deduplicateCrossStrategy,
+  detectCrossModuleConnections,
+  detectPerModuleConnections,
+} from './connection-detection/detect-connections'
+import type { ExtractedLink } from './connection-detection/extracted-link'
+import { stripResolvedCustomTypes } from './connection-detection/resolve-http-links'
+import { enrichComponents } from './value-extraction/enrich-components'
+import type { EnrichedComponent } from './value-extraction/enriched-component'
+
+interface DraftOnlyOutcome {
+  kind: 'draftOnly'
+  components: readonly DraftComponent[]
+}
+
+interface FullExtractionOutcome {
+  kind: 'full'
+  components: EnrichedComponent[]
+  failedFields: string[]
+  links: ExtractedLink[]
+  externalLinks: ExternalLink[]
+  timings: ConnectionTimings[]
+}
+
+interface FieldFailureOutcome {
+  kind: 'fieldFailure'
+  failedFields: string[]
+}
+
+type ExtractionOutcome = DraftOnlyOutcome | FullExtractionOutcome | FieldFailureOutcome
+
+interface ModuleSource {
+  files: readonly string[]
+  project: Project
+}
+
+interface ExtractionProjectInput {
+  configuration: ValidatedConfiguration
+  moduleSources: ReadonlyMap<ValidatedModule, ModuleSource>
+  repositoryName: string
+  draftComponents?: readonly DraftComponent[]
+}
+
+type ExtractionProjectParseResult =
+  | { success: true; data: ExtractionProject }
+  | { success: false; error: string }
+
+/** @riviere-role domain-error */
+export class OrphanedDraftComponentError extends Error {
+  constructor(orphanedModules: string[], knownModules: string[]) {
+    super(
+      `Draft components reference unknown modules: [${orphanedModules.join(', ')}]. Known modules: [${knownModules.join(', ')}]`,
+    )
+    this.name = 'OrphanedDraftComponentError'
+  }
+}
+
+interface FieldFailureEnrichment {
+  kind: 'fieldFailure'
+  failedFields: string[]
+}
+
+interface SuccessfulEnrichment {
+  kind: 'enriched'
+  components: EnrichedComponent[]
+  failedFields: string[]
+}
+
+type EnrichmentResult = FieldFailureEnrichment | SuccessfulEnrichment
+
+/** @riviere-role aggregate */
+export class ExtractionProject {
+  private constructor(
+    private readonly configuration: ValidatedConfiguration,
+    private readonly moduleSources: ReadonlyMap<ValidatedModule, ModuleSource>,
+    private readonly repositoryName: string,
+    private readonly draftComponents: readonly DraftComponent[] = [],
+  ) {}
+
+  static parse(input: ExtractionProjectInput): ExtractionProjectParseResult {
+    const configuredModules = new Set(input.configuration.modules)
+    const missingSources = input.configuration.modules.filter(
+      (module) => !input.moduleSources.has(module),
+    )
+    const foreignSources = [...input.moduleSources.keys()].filter(
+      (module) => !configuredModules.has(module),
+    )
+    if (missingSources.length > 0 || foreignSources.length > 0) {
+      return {
+        success: false,
+        error: [
+          ...missingSources.map((module) => `Missing source for module '${module.name}'`),
+          ...foreignSources.map((module) => `Source supplied for unknown module '${module.name}'`),
+        ].join('\n'),
+      }
+    }
+
+    return {
+      success: true,
+      data: new ExtractionProject(
+        input.configuration,
+        input.moduleSources,
+        input.repositoryName,
+        input.draftComponents,
+      ),
+    }
+  }
+
+  extractDraftComponents(options: {
+    allowIncomplete: boolean
+    includeConnections: boolean
+  }): ExtractionOutcome {
+    const draftComponents = this.configuration.modules.flatMap((module) => {
+      const source = this.sourceFor(module)
+      return extractComponents(source.project, [...source.files], module)
+    })
+
+    if (!options.includeConnections) {
+      return {
+        kind: 'draftOnly',
+        components: draftComponents,
+      }
+    }
+
+    const enrichment = this.enrichDraftComponentValues(draftComponents, options.allowIncomplete)
+    if (enrichment.kind === 'fieldFailure') {
+      return enrichment
+    }
+
+    const connectionResult = this.detectConnections(enrichment.components, options.allowIncomplete)
+    const httpLinks = this.configuration.connections?.httpLinks ?? []
+    const visibleComponents = stripResolvedCustomTypes(
+      enrichment.components,
+      httpLinks,
+      connectionResult.links,
+    )
+
+    return {
+      kind: 'full',
+      components: visibleComponents,
+      failedFields: enrichment.failedFields,
+      links: connectionResult.links,
+      externalLinks: connectionResult.externalLinks,
+      timings: connectionResult.timings,
+    }
+  }
+
+  enrichDraftComponents(options: {
+    allowIncomplete: boolean
+    includeConnections: boolean
+  }): ExtractionOutcome {
+    if (!options.includeConnections) {
+      return {
+        kind: 'draftOnly',
+        components: this.draftComponents,
+      }
+    }
+
+    const enrichment = this.enrichDraftComponentValues(
+      this.draftComponents,
+      options.allowIncomplete,
+    )
+    if (enrichment.kind === 'fieldFailure') {
+      return enrichment
+    }
+
+    const connectionResult = this.detectConnections(enrichment.components, options.allowIncomplete)
+    const httpLinks = this.configuration.connections?.httpLinks ?? []
+    const visibleComponents = stripResolvedCustomTypes(
+      enrichment.components,
+      httpLinks,
+      connectionResult.links,
+    )
+
+    return {
+      kind: 'full',
+      components: visibleComponents,
+      failedFields: enrichment.failedFields,
+      links: connectionResult.links,
+      externalLinks: connectionResult.externalLinks,
+      timings: connectionResult.timings,
+    }
+  }
+
+  get moduleContextProjectNames(): string[] {
+    return this.configuration.modules.map((module) => module.name)
+  }
+
+  public detectConnections(
+    enrichedComponents: EnrichedComponent[],
+    allowIncomplete: boolean,
+  ): {
+    links: ExtractedLink[]
+    externalLinks: ExternalLink[]
+    timings: ConnectionTimings[]
+  } {
+    const links: ExtractedLink[] = []
+    const externalLinks: ExternalLink[] = []
+    const timings: ConnectionTimings[] = []
+    const httpLinks = this.configuration.connections?.httpLinks ?? []
+
+    for (const module of this.configuration.modules) {
+      const source = this.sourceFor(module)
+      const moduleComponents = enrichedComponents.filter(
+        (component) => component.module === module.name,
+      )
+      if (moduleComponents.length === 0) {
+        continue
+      }
+
+      const result = detectPerModuleConnections(
+        source.project,
+        moduleComponents,
+        PerModuleConnectionOptions.parse({
+          allComponents: enrichedComponents,
+          allowIncomplete,
+          httpLinks,
+          repository: this.repositoryName,
+          sourceFilePaths: [...source.files],
+        }),
+      )
+      links.push(...result.links)
+      externalLinks.push(...result.externalLinks)
+      timings.push(
+        ConnectionTimings.parse({
+          callGraphMs: result.timings.callGraphMs,
+          asyncDetectionMs: 0,
+          setupMs: result.timings.setupMs,
+          totalMs: result.timings.callGraphMs + result.timings.setupMs,
+        }),
+      )
+    }
+
+    const eventPublishers = this.configuration.connections?.eventPublishers
+    const crossResult = detectCrossModuleConnections(
+      enrichedComponents,
+      CrossModuleConnectionOptions.parse({
+        allowIncomplete,
+        repository: this.repositoryName,
+        ...(eventPublishers === undefined ? {} : { eventPublishers }),
+      }),
+    )
+    links.push(...crossResult.links)
+    timings.push(
+      ConnectionTimings.parse({
+        callGraphMs: 0,
+        asyncDetectionMs: crossResult.timings.asyncDetectionMs,
+        setupMs: 0,
+        totalMs: crossResult.timings.asyncDetectionMs,
+      }),
+    )
+
+    return {
+      links: deduplicateCrossStrategy(links),
+      externalLinks,
+      timings,
+    }
+  }
+
+  private enrichDraftComponentValues(
+    draftComponents: readonly DraftComponent[],
+    allowIncomplete: boolean,
+  ): EnrichmentResult {
+    const moduleNames = new Set(this.moduleContextProjectNames)
+    const draftsByModule = groupDraftsByModule(draftComponents)
+    assertAllDraftsMatchModules(draftsByModule, moduleNames)
+    const components: EnrichedComponent[] = []
+    const failedFieldSet = new Set<string>()
+
+    for (const module of this.configuration.modules) {
+      const moduleDrafts = draftsByModule.get(module.name) ?? []
+      if (moduleDrafts.length === 0) {
+        continue
+      }
+
+      const result = enrichComponents(moduleDrafts, module, this.sourceFor(module).project)
+      components.push(...result.components)
+      for (const failure of result.failures) {
+        failedFieldSet.add(failure.field)
+      }
+    }
+
+    const failedFields = [...failedFieldSet]
+    if (failedFields.length > 0 && !allowIncomplete) {
+      return {
+        kind: 'fieldFailure',
+        failedFields,
+      }
+    }
+
+    return {
+      kind: 'enriched',
+      components,
+      failedFields,
+    }
+  }
+
+  private sourceFor(module: ValidatedModule): ModuleSource {
+    const source = this.moduleSources.get(module)
+    /* v8 ignore start -- parse rejects missing module sources */
+    if (source === undefined) throw new TypeError(`Missing source for module '${module.name}'`)
+    /* v8 ignore stop */
+    return source
+  }
+}
+
+function assertAllDraftsMatchModules(
+  draftsByModule: Map<string, DraftComponent[]>,
+  moduleNames: Set<string>,
+): void {
+  const orphanedModules = [...draftsByModule.keys()].filter((name) => !moduleNames.has(name))
+  if (orphanedModules.length > 0) {
+    throw new OrphanedDraftComponentError(orphanedModules, [...moduleNames])
+  }
+}
+
+function groupDraftsByModule(drafts: readonly DraftComponent[]): Map<string, DraftComponent[]> {
+  const grouped = new Map<string, DraftComponent[]>()
+  for (const draft of drafts) {
+    const existing = grouped.get(draft.module)
+    if (existing !== undefined) {
+      existing.push(draft)
+      continue
+    }
+
+    grouped.set(draft.module, [draft])
+  }
+
+  return grouped
+}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/predicate-evaluation/evaluate-predicate.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/predicate-evaluation/evaluate-predicate.spec.ts
similarity index 88%
rename from packages/riviere-extract-ts/src/features/extraction/domain/predicate-evaluation/evaluate-predicate.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/predicate-evaluation/evaluate-predicate.spec.ts
index 3b799aede..6a8dbdafa 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/predicate-evaluation/evaluate-predicate.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/predicate-evaluation/evaluate-predicate.spec.ts
@@ -1,8 +1,6 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import type { Predicate } from '@living-architecture/riviere-extract-config-published-language'
 import { Project } from 'ts-morph'
-import type { Predicate } from '@living-architecture/riviere-extract-config'
+import { describe, expect, it } from 'vitest'
 import { evaluatePredicate } from './evaluate-predicate'
 
 function createTestProject(code: string) {
@@ -135,14 +133,18 @@ describe('evaluatePredicate', () => {
         process() {}
       }`)
       expect(
-        evaluatePredicate(sf.getClassOrThrow('S').getMethodOrThrow('process'), {hasJSDoc: { tag: 'riviere' },}),
+        evaluatePredicate(sf.getClassOrThrow('S').getMethodOrThrow('process'), {
+          hasJSDoc: { tag: 'riviere' },
+        }),
       ).toBe(true)
     })
 
     it('returns false when method has no JSDoc', () => {
       const sf = createTestProject(`class S { process() {} }`)
       expect(
-        evaluatePredicate(sf.getClassOrThrow('S').getMethodOrThrow('process'), {hasJSDoc: { tag: 'riviere' },}),
+        evaluatePredicate(sf.getClassOrThrow('S').getMethodOrThrow('process'), {
+          hasJSDoc: { tag: 'riviere' },
+        }),
       ).toBe(false)
     })
 
@@ -152,7 +154,9 @@ describe('evaluatePredicate', () => {
         process() {}
       }`)
       expect(
-        evaluatePredicate(sf.getClassOrThrow('S').getMethodOrThrow('process'), {hasJSDoc: { tag: 'riviere' },}),
+        evaluatePredicate(sf.getClassOrThrow('S').getMethodOrThrow('process'), {
+          hasJSDoc: { tag: 'riviere' },
+        }),
       ).toBe(false)
     })
 
@@ -176,21 +180,27 @@ describe('evaluatePredicate', () => {
     it('returns true when class extends specified base class', () => {
       const sf = createTestProject(`class DomainEvent {} class OrderCreated extends DomainEvent {}`)
       expect(
-        evaluatePredicate(sf.getClassOrThrow('OrderCreated'), {extendsClass: { name: 'DomainEvent' },}),
+        evaluatePredicate(sf.getClassOrThrow('OrderCreated'), {
+          extendsClass: { name: 'DomainEvent' },
+        }),
       ).toBe(true)
     })
 
     it('returns false when class extends different base class', () => {
       const sf = createTestProject(`class BaseEvent {} class OrderCreated extends BaseEvent {}`)
       expect(
-        evaluatePredicate(sf.getClassOrThrow('OrderCreated'), {extendsClass: { name: 'DomainEvent' },}),
+        evaluatePredicate(sf.getClassOrThrow('OrderCreated'), {
+          extendsClass: { name: 'DomainEvent' },
+        }),
       ).toBe(false)
     })
 
     it('returns false when class has no extends clause', () => {
       const sf = createTestProject(`class OrderCreated {}`)
       expect(
-        evaluatePredicate(sf.getClassOrThrow('OrderCreated'), {extendsClass: { name: 'DomainEvent' },}),
+        evaluatePredicate(sf.getClassOrThrow('OrderCreated'), {
+          extendsClass: { name: 'DomainEvent' },
+        }),
       ).toBe(false)
     })
 
@@ -208,7 +218,9 @@ describe('evaluatePredicate', () => {
         `interface IHandler {} class OrderHandler implements IHandler {}`,
       )
       expect(
-        evaluatePredicate(sf.getClassOrThrow('OrderHandler'), {implementsInterface: { name: 'IHandler' },}),
+        evaluatePredicate(sf.getClassOrThrow('OrderHandler'), {
+          implementsInterface: { name: 'IHandler' },
+        }),
       ).toBe(true)
     })
 
@@ -217,21 +229,27 @@ describe('evaluatePredicate', () => {
         `interface IService {} class OrderHandler implements IService {}`,
       )
       expect(
-        evaluatePredicate(sf.getClassOrThrow('OrderHandler'), {implementsInterface: { name: 'IHandler' },}),
+        evaluatePredicate(sf.getClassOrThrow('OrderHandler'), {
+          implementsInterface: { name: 'IHandler' },
+        }),
       ).toBe(false)
     })
 
     it('returns false when class has no implements clause', () => {
       const sf = createTestProject(`class OrderHandler {}`)
       expect(
-        evaluatePredicate(sf.getClassOrThrow('OrderHandler'), {implementsInterface: { name: 'IHandler' },}),
+        evaluatePredicate(sf.getClassOrThrow('OrderHandler'), {
+          implementsInterface: { name: 'IHandler' },
+        }),
       ).toBe(false)
     })
 
     it('returns false when node is not a class', () => {
       const sf = createTestProject(`function fn() {}`)
       expect(
-        evaluatePredicate(sf.getFunctionOrThrow('fn'), {implementsInterface: { name: 'IHandler' },}),
+        evaluatePredicate(sf.getFunctionOrThrow('fn'), {
+          implementsInterface: { name: 'IHandler' },
+        }),
       ).toBe(false)
     })
   })
@@ -330,7 +348,9 @@ describe('evaluatePredicate', () => {
         class OrderController {}
       `)
       const classDecl = sourceFile.getClassOrThrow('OrderController')
-      const predicate: Predicate = {and: [{ hasDecorator: { name: 'API' } }, { nameEndsWith: { suffix: 'Controller' } }],}
+      const predicate: Predicate = {
+        and: [{ hasDecorator: { name: 'API' } }, { nameEndsWith: { suffix: 'Controller' } }],
+      }
 
       const result = evaluatePredicate(classDecl, predicate)
 
@@ -344,7 +364,9 @@ describe('evaluatePredicate', () => {
         class OrderService {}
       `)
       const classDecl = sourceFile.getClassOrThrow('OrderService')
-      const predicate: Predicate = {and: [{ hasDecorator: { name: 'API' } }, { nameEndsWith: { suffix: 'Controller' } }],}
+      const predicate: Predicate = {
+        and: [{ hasDecorator: { name: 'API' } }, { nameEndsWith: { suffix: 'Controller' } }],
+      }
 
       const result = evaluatePredicate(classDecl, predicate)
 
@@ -358,7 +380,9 @@ describe('evaluatePredicate', () => {
         class OrderController {}
       `)
       const classDecl = sourceFile.getClassOrThrow('OrderController')
-      const predicate: Predicate = {or: [{ hasDecorator: { name: 'API' } }, { nameEndsWith: { suffix: 'Controller' } }],}
+      const predicate: Predicate = {
+        or: [{ hasDecorator: { name: 'API' } }, { nameEndsWith: { suffix: 'Controller' } }],
+      }
 
       const result = evaluatePredicate(classDecl, predicate)
 
@@ -370,7 +394,9 @@ describe('evaluatePredicate', () => {
         class OrderService {}
       `)
       const classDecl = sourceFile.getClassOrThrow('OrderService')
-      const predicate: Predicate = {or: [{ hasDecorator: { name: 'API' } }, { nameEndsWith: { suffix: 'Controller' } }],}
+      const predicate: Predicate = {
+        or: [{ hasDecorator: { name: 'API' } }, { nameEndsWith: { suffix: 'Controller' } }],
+      }
 
       const result = evaluatePredicate(classDecl, predicate)
 
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/predicate-evaluation/evaluate-predicate.ts b/packages/riviere-extract-ts/domain-model/src/domain/predicate-evaluation/evaluate-predicate.ts
similarity index 94%
rename from packages/riviere-extract-ts/src/features/extraction/domain/predicate-evaluation/evaluate-predicate.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/predicate-evaluation/evaluate-predicate.ts
index 5c5863eea..aa03b1756 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/predicate-evaluation/evaluate-predicate.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/predicate-evaluation/evaluate-predicate.ts
@@ -1,3 +1,4 @@
+import type { Predicate } from '@living-architecture/riviere-extract-config-published-language'
 import type {
   ClassDeclaration,
   Decorator,
@@ -6,7 +7,6 @@ import type {
   Node,
 } from 'ts-morph'
 import { Node as TsMorphNode } from 'ts-morph'
-import type { Predicate } from '@living-architecture/riviere-extract-config'
 
 type DecoratableNode = ClassDeclaration | MethodDeclaration
 
@@ -34,7 +34,14 @@ function isNameableNode(node: Node): node is NameableNode {
   )
 }
 
-/** @riviere-role domain-service */
+/**
+ * Evaluates an extraction predicate against a TypeScript syntax node.
+ *
+ * @riviere-role domain-service
+ * @param node - Syntax node to inspect
+ * @param predicate - Predicate to evaluate
+ * @returns Whether the node satisfies the predicate
+ */
 export function evaluatePredicate(node: Node, predicate: Predicate): boolean {
   if ('hasDecorator' in predicate) {
     return evaluateHasDecorator(node, predicate.hasDecorator.name, predicate.hasDecorator.from)
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/enrich-components-decorator-guidance.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/enrich-components-decorator-guidance.spec.ts
similarity index 88%
rename from packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/enrich-components-decorator-guidance.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/value-extraction/enrich-components-decorator-guidance.spec.ts
index 7057dac96..f9120ed30 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/enrich-components-decorator-guidance.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/enrich-components-decorator-guidance.spec.ts
@@ -1,12 +1,12 @@
-import {
-  describe, expect, it 
-} from 'vitest'
-import { Project } from 'ts-morph'
 import type {
-  Module, ExtractionRule 
-} from '@living-architecture/riviere-extract-config'
+  ExtractionRule,
+  ValidatedModule,
+} from '@living-architecture/riviere-extract-config-published-language'
+import { Project } from 'ts-morph'
+import { describe, expect, it } from 'vitest'
 import { DraftComponent } from '../component-extraction/draft-component'
 import { enrichComponents } from './enrich-components'
+import { createValidatedModule } from '../../__fixtures__/test-fixtures'
 
 const project = new Project({ useInMemoryFileSystem: true })
 
@@ -16,8 +16,8 @@ function nextFile(content: string): string {
   return filePath
 }
 
-function createBaseModule(extract: Record<string, ExtractionRule>): Module {
-  return {
+function createBaseModule(extract: Record<string, ExtractionRule>): ValidatedModule {
+  return createValidatedModule({
     name: 'orders',
     domain: 'orders-domain',
     path: '/src/orders',
@@ -25,18 +25,18 @@ function createBaseModule(extract: Record<string, ExtractionRule>): Module {
     api: {
       find: 'classes',
       where: { hasDecorator: { name: 'HttpClient' } },
-      extract,
+      extract: { apiType: { literal: 'HTTP client' }, ...extract },
     },
     useCase: { notUsed: true },
     domainOp: { notUsed: true },
     event: { notUsed: true },
     eventHandler: { notUsed: true },
     ui: { notUsed: true },
-  }
+  })
 }
 
 function createDraft(file: string): DraftComponent {
-  return new DraftComponent({
+  return DraftComponent.parse({
     type: 'api',
     name: 'FraudClient',
     location: {
@@ -89,7 +89,7 @@ export class FraudClient {}`,
   })
 
   it('preserves source-file-not-found error for fromDecoratorArg', () => {
-    const missingDraft = new DraftComponent({
+    const missingDraft = DraftComponent.parse({
       type: 'api',
       name: 'MissingFileComponent',
       location: {
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/enrich-components-http-call.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/enrich-components-http-call.spec.ts
similarity index 93%
rename from packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/enrich-components-http-call.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/value-extraction/enrich-components-http-call.spec.ts
index d3a27ad22..cc3fc1d17 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/enrich-components-http-call.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/enrich-components-http-call.spec.ts
@@ -1,12 +1,12 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import { Project } from 'ts-morph'
 import type {
-  Module, ExtractionRule 
-} from '@living-architecture/riviere-extract-config'
+  ExtractionRule,
+  ValidatedModule,
+} from '@living-architecture/riviere-extract-config-published-language'
+import { Project } from 'ts-morph'
+import { describe, expect, it } from 'vitest'
 import { DraftComponent } from '../component-extraction/draft-component'
 import { enrichComponents } from './enrich-components'
+import { createValidatedModule } from '../../__fixtures__/test-fixtures'
 
 const sharedProject = new Project({ useInMemoryFileSystem: true })
 const counter = { value: 0 }
@@ -18,8 +18,8 @@ function nextFile(path: string, content: string) {
   return filePath
 }
 
-function httpCallModule(extract: Record<string, ExtractionRule>): Module {
-  return {
+function httpCallModule(extract: Record<string, ExtractionRule>): ValidatedModule {
+  return createValidatedModule({
     api: { notUsed: true },
     useCase: { notUsed: true },
     event: { notUsed: true },
@@ -37,11 +37,11 @@ function httpCallModule(extract: Record<string, ExtractionRule>): Module {
         extract,
       },
     },
-  }
+  })
 }
 
 function httpCallDraft(file: string, line: number): DraftComponent {
-  return new DraftComponent({
+  return DraftComponent.parse({
     type: 'httpCall',
     name: 'check',
     location: {
@@ -53,7 +53,7 @@ function httpCallDraft(file: string, line: number): DraftComponent {
   })
 }
 
-function enrich(drafts: DraftComponent[], modules: Module[]) {
+function enrich(drafts: DraftComponent[], modules: ValidatedModule[]) {
   const [module] = modules
   if (module === undefined) {
     throw new TypeError('Expected one module in test config')
@@ -74,7 +74,7 @@ export class FraudClient {
 }`,
     )
 
-    const module: Module = {
+    const module = createValidatedModule({
       api: { notUsed: true },
       useCase: { notUsed: true },
       event: { notUsed: true },
@@ -104,7 +104,7 @@ export class FraudClient {
           },
         },
       },
-    }
+    })
 
     const result = enrich([httpCallDraft(file, 5)], [module])
 
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/enrich-components-method-extraction.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/enrich-components-method-extraction.spec.ts
similarity index 85%
rename from packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/enrich-components-method-extraction.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/value-extraction/enrich-components-method-extraction.spec.ts
index 45c08f0ef..610de6042 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/enrich-components-method-extraction.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/enrich-components-method-extraction.spec.ts
@@ -1,14 +1,13 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import { Project } from 'ts-morph'
 import type {
-  Module,
   ComponentRule,
   ExtractBlock,
-} from '@living-architecture/riviere-extract-config'
+  ValidatedModule,
+} from '@living-architecture/riviere-extract-config-published-language'
+import { Project } from 'ts-morph'
+import { describe, expect, it } from 'vitest'
 import { DraftComponent } from '../component-extraction/draft-component'
 import { enrichComponents } from './enrich-components'
+import { createValidatedModule } from '../../__fixtures__/test-fixtures'
 
 const sharedProject = new Project({ useInMemoryFileSystem: true })
 const counter = { value: 0 }
@@ -22,7 +21,7 @@ function nextFile(path: string, content: string) {
 
 const notUsed = { notUsed: true } as const
 
-function enrich(drafts: DraftComponent[], modules: Module[]) {
+function enrich(drafts: DraftComponent[], modules: ValidatedModule[]) {
   const [module] = modules
   if (module === undefined) {
     throw new TypeError('Expected one module in test config')
@@ -31,7 +30,7 @@ function enrich(drafts: DraftComponent[], modules: Module[]) {
 }
 
 function ordersDraft(type: string, name: string, file: string, line: number): DraftComponent {
-  return new DraftComponent({
+  return DraftComponent.parse({
     type,
     name,
     location: {
@@ -49,8 +48,8 @@ function ordersModule(
     domainOp?: ComponentRule
     eventHandler?: ComponentRule
   },
-): Module {
-  return {
+): ValidatedModule {
+  return createValidatedModule({
     api: notUsed,
     useCase: notUsed,
     event: notUsed,
@@ -61,7 +60,7 @@ function ordersModule(
     glob: '**',
     domainOp: overrides.domainOp ?? notUsed,
     eventHandler: overrides.eventHandler ?? notUsed,
-  }
+  })
 }
 
 const domainOpMethodRule = (extract: ExtractBlock): ComponentRule => ({
@@ -94,7 +93,9 @@ describe('enrichComponents — fromMethodName extraction', () => {
   cancelOrder() {}
 }`,
     )
-    const module = ordersModule('/src/orders', {domainOp: domainOpMethodRule({ operationName: { fromMethodName: true } }),})
+    const module = ordersModule('/src/orders', {
+      domainOp: domainOpMethodRule({ operationName: { fromMethodName: true } }),
+    })
     const result = enrich([ordersDraft('domainOp', 'placeOrder', file, 2)], [module])
 
     expect(result.components[0]?.metadata).toMatchObject({ operationName: 'placeOrder' })
@@ -108,7 +109,9 @@ describe('enrichComponents — fromMethodName extraction', () => {
   placeOrder() {}
 }`,
     )
-    const module = ordersModule('/src/orders', {domainOp: domainOpMethodRule({ operationName: { fromMethodName: true } }),})
+    const module = ordersModule('/src/orders', {
+      domainOp: domainOpMethodRule({ operationName: { fromMethodName: true } }),
+    })
     const result = enrich([ordersDraft('domainOp', 'placeOrder', file, 99)], [module])
 
     expect(result.failures).toHaveLength(1)
@@ -117,7 +120,9 @@ describe('enrichComponents — fromMethodName extraction', () => {
   })
 
   it('records failure when source file not found for fromMethodName', () => {
-    const module = ordersModule('/src', {domainOp: domainOpMethodRule({ operationName: { fromMethodName: true } }),})
+    const module = ordersModule('/src', {
+      domainOp: domainOpMethodRule({ operationName: { fromMethodName: true } }),
+    })
     const result = enrich(
       [ordersDraft('domainOp', 'placeOrder', '/src/missing/ops.ts', 2)],
       [module],
@@ -138,7 +143,9 @@ export class OrderHandler implements IEventHandler<OrderPlaced> {
   handle() {}
 }`,
     )
-    const module = ordersModule('/src/orders', {eventHandler: eventHandlerMethodRule(genericArgExtract),})
+    const module = ordersModule('/src/orders', {
+      eventHandler: eventHandlerMethodRule(genericArgExtract),
+    })
     const result = enrich([ordersDraft('eventHandler', 'handle', file, 4)], [module])
 
     expect(result.components[0]?.metadata).toMatchObject({ subscribedEvents: ['OrderPlaced'] })
@@ -157,7 +164,9 @@ export class OrderHandler implements IEventHandler<OrderPlaced> {
   handle() {}
 }`,
     )
-    const module = ordersModule('/src/orders', {eventHandler: eventHandlerMethodRule(genericArgExtract),})
+    const module = ordersModule('/src/orders', {
+      eventHandler: eventHandlerMethodRule(genericArgExtract),
+    })
     const result = enrich([ordersDraft('eventHandler', 'handle', file, 7)], [module])
 
     expect(result.components[0]?.metadata).toMatchObject({ subscribedEvents: ['OrderPlaced'] })
@@ -166,7 +175,9 @@ export class OrderHandler implements IEventHandler<OrderPlaced> {
 
   it('records failure when no containing class found for fromGenericArg', () => {
     const file = nextFile('/src/orders/standalone.ts', 'const x = 1')
-    const module = ordersModule('/src/orders', {eventHandler: eventHandlerMethodRule(genericArgExtract),})
+    const module = ordersModule('/src/orders', {
+      eventHandler: eventHandlerMethodRule(genericArgExtract),
+    })
     const result = enrich([ordersDraft('eventHandler', 'handle', file, 1)], [module])
 
     expect(result.failures).toHaveLength(1)
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/enrich-components.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/enrich-components.spec.ts
similarity index 91%
rename from packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/enrich-components.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/value-extraction/enrich-components.spec.ts
index 88f49068b..551772e4a 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/enrich-components.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/enrich-components.spec.ts
@@ -1,12 +1,13 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import { Project } from 'ts-morph'
 import type {
-  Module, ComponentRule 
-} from '@living-architecture/riviere-extract-config'
+  ComponentRule,
+  ValidatedModule,
+  ValidatedModuleInput,
+} from '@living-architecture/riviere-extract-config-published-language'
+import { Project } from 'ts-morph'
+import { describe, expect, it } from 'vitest'
 import { DraftComponent } from '../component-extraction/draft-component'
 import { enrichComponents } from './enrich-components'
+import { createValidatedModule } from '../../__fixtures__/test-fixtures'
 
 const sharedProject = new Project({ useInMemoryFileSystem: true })
 const counter = { value: 0 }
@@ -27,8 +28,16 @@ const BUILT_IN_TYPES: readonly string[] = [
   'ui',
 ]
 
-function notUsedModule(name: string, path: string): Module {
-  return {
+const REQUIRED_FIELDS: Readonly<Record<string, Record<string, { literal: string }>>> = {
+  api: { apiType: { literal: 'REST' } },
+  domainOp: { operationName: { literal: 'operation' } },
+  event: { eventName: { literal: 'Event' } },
+  eventHandler: { subscribedEvents: { literal: 'Event' } },
+  ui: { route: { literal: '/' } },
+}
+
+function notUsedModule(name: string, path: string): ValidatedModule {
+  return createValidatedModule({
     name,
     domain: `${name}-domain`,
     path,
@@ -36,17 +45,18 @@ function notUsedModule(name: string, path: string): Module {
     api: {
       find: 'classes',
       where: { nameEndsWith: { suffix: 'Controller' } },
+      extract: { apiType: { literal: 'REST' } },
     },
     useCase: { notUsed: true },
     domainOp: { notUsed: true },
     event: { notUsed: true },
     eventHandler: { notUsed: true },
     ui: { notUsed: true },
-  }
+  })
 }
 
-function moduleWith(componentType: string, rule: ComponentRule): Module {
-  const base: Module = {
+function moduleWith(componentType: string, rule: ComponentRule): ValidatedModule {
+  const base: ValidatedModuleInput = {
     name: 'orders',
     domain: 'orders-domain',
     path: '/src/orders',
@@ -59,23 +69,27 @@ function moduleWith(componentType: string, rule: ComponentRule): Module {
     ui: { notUsed: true },
   }
   if (BUILT_IN_TYPES.includes(componentType)) {
-    return {
+    const completedRule =
+      'find' in rule
+        ? { ...rule, extract: { ...REQUIRED_FIELDS[componentType], ...rule.extract } }
+        : rule
+    return createValidatedModule({
       ...base,
-      [componentType]: rule,
-    }
+      [componentType]: completedRule,
+    })
   }
   if ('find' in rule) {
-    return {
+    return createValidatedModule({
       ...base,
       customTypes: { [componentType]: rule },
-    }
+    })
   }
   throw new TypeError(
     `moduleWith: rule for custom type '${componentType}' must have a 'find' property`,
   )
 }
 
-function enrich(drafts: DraftComponent[], modules: Module[]) {
+function enrich(drafts: DraftComponent[], modules: ValidatedModule[]) {
   const [module] = modules
   if (module === undefined) {
     throw new TypeError('Expected one module in test config')
@@ -84,7 +98,7 @@ function enrich(drafts: DraftComponent[], modules: Module[]) {
 }
 
 function draft(type: string, name: string, file: string, line: number): DraftComponent {
-  return new DraftComponent({
+  return DraftComponent.parse({
     type,
     name,
     location: {
@@ -306,16 +320,13 @@ describe('enrichComponents', () => {
 
     it('enriches component from customTypes detection rule', () => {
       const file = nextFile('/src/orders/order.saga.ts', 'export class OrderSaga {}')
-      const module: Module = {
-        ...moduleWith('api', { notUsed: true }),
-        customTypes: {
-          saga: {
-            find: 'classes',
-            where: { nameEndsWith: { suffix: 'Saga' } },
-            extract: { sagaType: { literal: 'orchestrator' } },
-          },
+      const module = moduleWith('saga', {
+        find: 'classes',
+        where: { nameEndsWith: { suffix: 'Saga' } },
+        extract: {
+          sagaType: { literal: 'orchestrator' },
         },
-      }
+      })
       const result = enrich([draft('saga', 'OrderSaga', file, 1)], [module])
 
       expect(result.components[0]?.metadata).toMatchObject({ sagaType: 'orchestrator' })
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/enrich-components.ts b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/enrich-components.ts
similarity index 91%
rename from packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/enrich-components.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/value-extraction/enrich-components.ts
index c0e08046f..551b45099 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/enrich-components.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/enrich-components.ts
@@ -1,40 +1,33 @@
 import type {
-  ClassDeclaration, MethodDeclaration, Project 
-} from 'ts-morph'
-import type {
-  Module,
   ComponentRule,
   DetectionRule,
   ExtractionRule,
-} from '@living-architecture/riviere-extract-config'
+  ValidatedModule,
+} from '@living-architecture/riviere-extract-config-published-language'
+import type { ClassDeclaration, MethodDeclaration, Project } from 'ts-morph'
+import { ExtractionError } from './literal-detection'
+import { applyTransforms } from './transforms'
 import type { DraftComponent } from '../component-extraction/draft-component'
-import { ExtractionResult } from './extraction-result'
-import type {
+import {
   EnrichedComponent,
   EnrichmentFailure,
   EnrichmentResult,
-  MetadataValue,
+  type MetadataValue,
 } from './enriched-component'
 import {
-  EnrichedComponent as EnrichedComponentRecord,
-  EnrichmentFailure as EnrichmentFailureRecord,
-  EnrichmentResult as EnrichmentResultRecord,
-} from './enriched-component'
-import {
-  evaluateLiteralRule,
+  evaluateFromClassDecoratorArgRule,
   evaluateFromClassNameRule,
-  evaluateFromFilePathRule,
-  evaluateFromPropertyRule,
-  evaluateFromMethodNameRule,
   evaluateFromDecoratorArgRule,
   evaluateFromDecoratorNameRule,
-  evaluateFromClassDecoratorArgRule,
+  evaluateFromFilePathRule,
+  evaluateFromMethodNameRule,
+  evaluateFromPropertyRule,
+  evaluateLiteralRule,
 } from './evaluate-extraction-rule'
 import { evaluateFromGenericArgRule } from './evaluate-extraction-rule-generic'
-import { ExtractionError } from '../../../../platform/domain/ast-literals/literal-detection'
-import { applyTransforms } from '../../../../platform/domain/string-transforms/transforms'
+import { ExtractionResult } from './extraction-result'
 
-function getBuiltInRule(module: Module, componentType: string): DetectionRule | undefined {
+function getBuiltInRule(module: ValidatedModule, componentType: string): DetectionRule | undefined {
   const ruleMap: Record<string, ComponentRule> = {
     api: module.api,
     useCase: module.useCase,
@@ -50,7 +43,10 @@ function getBuiltInRule(module: Module, componentType: string): DetectionRule |
   return rule
 }
 
-function findDetectionRule(module: Module, componentType: string): DetectionRule | undefined {
+function findDetectionRule(
+  module: ValidatedModule,
+  componentType: string,
+): DetectionRule | undefined {
   const builtInTypes: readonly string[] = [
     'api',
     'useCase',
@@ -261,9 +257,9 @@ function evaluateMethodRule(
     const typeName = param.getTypeNode()?.getText() ?? 'unknown'
     const transform = rule.fromParameterType.transform
     if (transform === undefined) {
-      return new ExtractionResult({ value: typeName })
+      return ExtractionResult.parse({ value: typeName })
     }
-    return new ExtractionResult({ value: applyTransforms(typeName, transform) })
+    return ExtractionResult.parse({ value: applyTransforms(typeName, transform) })
   }
 
   return undefined
@@ -308,7 +304,7 @@ interface SingleComponentResult {
 
 function componentWithEmptyMetadata(draft: DraftComponent): SingleComponentResult {
   return {
-    enriched: new EnrichedComponentRecord({
+    enriched: EnrichedComponent.parse({
       type: draft.type,
       name: draft.name,
       location: draft.location,
@@ -360,7 +356,7 @@ function extractMetadataFields(
       }
 
       failures.push(
-        new EnrichmentFailureRecord({
+        EnrichmentFailure.parse({
           component: draft,
           field: fieldName,
           error: errorMessage,
@@ -379,7 +375,7 @@ function extractMetadataFields(
 
 function enrichSingleComponent(
   draft: DraftComponent,
-  module: Module,
+  module: ValidatedModule,
   project: Project,
 ): SingleComponentResult {
   const detectionRule = findDetectionRule(module, draft.type)
@@ -390,7 +386,7 @@ function enrichSingleComponent(
 
   const extracted = extractMetadataFields(detectionRule.extract, draft, project)
 
-  const enriched = new EnrichedComponentRecord({
+  const enriched = EnrichedComponent.parse({
     type: draft.type,
     name: draft.name,
     location: draft.location,
@@ -408,8 +404,8 @@ function enrichSingleComponent(
 
 /** @riviere-role domain-service */
 export function enrichComponents(
-  draftComponents: DraftComponent[],
-  module: Module,
+  draftComponents: readonly DraftComponent[],
+  module: ValidatedModule,
   project: Project,
 ): EnrichmentResult {
   const allComponents: EnrichedComponent[] = []
@@ -421,7 +417,7 @@ export function enrichComponents(
     allFailures.push(...result.failures)
   }
 
-  return new EnrichmentResultRecord({
+  return EnrichmentResult.parse({
     components: allComponents,
     failures: allFailures,
   })
diff --git a/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/enriched-component.ts b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/enriched-component.ts
new file mode 100644
index 000000000..855010263
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/enriched-component.ts
@@ -0,0 +1,97 @@
+import type { DraftComponent } from '../component-extraction/draft-component'
+
+type MetadataValue = string | number | boolean | string[]
+
+/** @riviere-role value-object */
+export class EnrichedComponent {
+  declare private brand: 'EnrichedComponent'
+  readonly type: string
+  readonly name: string
+  readonly location: {
+    file: string
+    line: number
+  }
+  readonly domain: string
+  readonly module: string
+  readonly metadata: Record<string, MetadataValue>
+  _missing: string[] | undefined
+
+  static parse(params: {
+    type: string
+    name: string
+    location: {
+      file: string
+      line: number
+    }
+    domain: string
+    module: string
+    metadata: Record<string, MetadataValue>
+    _missing: string[] | undefined
+  }): EnrichedComponent {
+    return new EnrichedComponent(params)
+  }
+
+  private constructor(params: {
+    type: string
+    name: string
+    location: {
+      file: string
+      line: number
+    }
+    domain: string
+    module: string
+    metadata: Record<string, MetadataValue>
+    _missing: string[] | undefined
+  }) {
+    this.type = params.type
+    this.name = params.name
+    this.location = params.location
+    this.domain = params.domain
+    this.module = params.module
+    this.metadata = params.metadata
+    this._missing = params._missing
+  }
+}
+
+/** @riviere-role value-object */
+export class EnrichmentFailure {
+  declare private brand: 'EnrichmentFailure'
+  readonly component: DraftComponent
+  readonly field: string
+  readonly error: string
+
+  static parse(params: {
+    component: DraftComponent
+    field: string
+    error: string
+  }): EnrichmentFailure {
+    return new EnrichmentFailure(params)
+  }
+
+  private constructor(params: { component: DraftComponent; field: string; error: string }) {
+    this.component = params.component
+    this.field = params.field
+    this.error = params.error
+  }
+}
+
+/** @riviere-role value-object */
+export class EnrichmentResult {
+  declare private brand: 'EnrichmentResult'
+  readonly components: EnrichedComponent[]
+  readonly failures: EnrichmentFailure[]
+
+  static parse(params: {
+    components: EnrichedComponent[]
+    failures: EnrichmentFailure[]
+  }): EnrichmentResult {
+    return new EnrichmentResult(params)
+  }
+
+  private constructor(params: { components: EnrichedComponent[]; failures: EnrichmentFailure[] }) {
+    this.components = params.components
+    this.failures = params.failures
+  }
+}
+
+export type { MetadataValue }
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule-class-decorator.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule-class-decorator.spec.ts
similarity index 93%
rename from packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule-class-decorator.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule-class-decorator.spec.ts
index 642f8c6b4..d903febfe 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule-class-decorator.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule-class-decorator.spec.ts
@@ -1,14 +1,7 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import {
-  Project, SyntaxKind 
-} from 'ts-morph'
+import { Project, SyntaxKind } from 'ts-morph'
+import { describe, expect, it } from 'vitest'
+import { ExtractionError, TestFixtureError } from './literal-detection'
 import { evaluateFromClassDecoratorArgRule } from './evaluate-extraction-rule'
-import {
-  ExtractionError,
-  TestFixtureError,
-} from '../../../../platform/domain/ast-literals/literal-detection'
 
 function createMethodFromClass(code: string) {
   const project = new Project({ useInMemoryFileSystem: true })
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule-decorator.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule-decorator.spec.ts
similarity index 98%
rename from packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule-decorator.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule-decorator.spec.ts
index 108fcc30a..826b02e93 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule-decorator.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule-decorator.spec.ts
@@ -1,16 +1,11 @@
-import {
-  describe, it, expect 
-} from 'vitest'
 import { Project } from 'ts-morph'
+import { describe, expect, it } from 'vitest'
+import { ExtractionError, TestFixtureError } from './literal-detection'
 import {
-  evaluateFromDecoratorArgRule,
   evaluateFromClassDecoratorArgRule,
+  evaluateFromDecoratorArgRule,
   evaluateFromDecoratorNameRule,
 } from './evaluate-extraction-rule'
-import {
-  TestFixtureError,
-  ExtractionError,
-} from '../../../../platform/domain/ast-literals/literal-detection'
 
 function createDecoratorFromMethod(code: string) {
   const project = new Project({ useInMemoryFileSystem: true })
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule-generic.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule-generic.spec.ts
similarity index 97%
rename from packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule-generic.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule-generic.spec.ts
index 877a10246..699bdeaf9 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule-generic.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule-generic.spec.ts
@@ -1,12 +1,7 @@
-import {
-  describe, it, expect 
-} from 'vitest'
 import { Project } from 'ts-morph'
+import { describe, expect, it } from 'vitest'
+import { ExtractionError, TestFixtureError } from './literal-detection'
 import { evaluateFromGenericArgRule } from './evaluate-extraction-rule'
-import {
-  TestFixtureError,
-  ExtractionError,
-} from '../../../../platform/domain/ast-literals/literal-detection'
 
 const sharedProject = new Project({ useInMemoryFileSystem: true })
 const counter = { value: 0 }
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule-generic.ts b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule-generic.ts
similarity index 86%
rename from packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule-generic.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule-generic.ts
index 2d4f05dd4..bdac163ed 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule-generic.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule-generic.ts
@@ -1,8 +1,8 @@
-import type { FromGenericArgExtractionRule } from '@living-architecture/riviere-extract-config'
+import type { FromGenericArgExtractionRule } from '@living-architecture/riviere-extract-config-published-language'
 import type { ClassDeclaration } from 'ts-morph'
 import { SyntaxKind } from 'ts-morph'
-import { applyTransforms } from '../../../../platform/domain/string-transforms/transforms'
-import { ExtractionError } from '../../../../platform/domain/ast-literals/literal-detection'
+import { ExtractionError } from './literal-detection'
+import { applyTransforms } from './transforms'
 import { ExtractionResult } from './extraction-result'
 
 function getInterfaceTypeArgs(
@@ -43,9 +43,7 @@ export function evaluateFromGenericArgRule(
   rule: FromGenericArgExtractionRule,
   classDecl: ClassDeclaration,
 ): ExtractionResult {
-  const {
-    interface: interfaceName, position, transform 
-  } = rule.fromGenericArg
+  const { interface: interfaceName, position, transform } = rule.fromGenericArg
 
   const sourceFile = classDecl.getSourceFile()
   const location = {
@@ -91,8 +89,10 @@ export function evaluateFromGenericArgRule(
   const typeNames = extractTypeNames(typeArg)
 
   if (transform === undefined) {
-    return new ExtractionResult({ value: typeNames })
+    return ExtractionResult.parse({ value: typeNames })
   }
 
-  return new ExtractionResult({ value: typeNames.map((name) => applyTransforms(name, transform)) })
+  return ExtractionResult.parse({
+    value: typeNames.map((name) => applyTransforms(name, transform)),
+  })
 }
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule-method.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule-method.spec.ts
similarity index 97%
rename from packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule-method.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule-method.spec.ts
index eb7aba19e..46e4fd43a 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule-method.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule-method.spec.ts
@@ -1,16 +1,11 @@
-import {
-  describe, it, expect 
-} from 'vitest'
 import { Project } from 'ts-morph'
+import { describe, expect, it } from 'vitest'
+import { ExtractionError, TestFixtureError } from './literal-detection'
 import {
-  evaluateFromMethodSignatureRule,
   evaluateFromConstructorParamsRule,
+  evaluateFromMethodSignatureRule,
   evaluateFromParameterTypeRule,
 } from './evaluate-extraction-rule'
-import {
-  ExtractionError,
-  TestFixtureError,
-} from '../../../../platform/domain/ast-literals/literal-detection'
 
 function createMethodDeclaration(code: string, methodName: string) {
   const project = new Project({ useInMemoryFileSystem: true })
diff --git a/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule-method.ts b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule-method.ts
new file mode 100644
index 000000000..1d252d260
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule-method.ts
@@ -0,0 +1,74 @@
+import type {
+  FromConstructorParamsExtractionRule,
+  FromMethodSignatureExtractionRule,
+  FromParameterTypeExtractionRule,
+} from '@living-architecture/riviere-extract-config-published-language'
+import type { ClassDeclaration, MethodDeclaration, ParameterDeclaration } from 'ts-morph'
+import { ExtractionError } from './literal-detection'
+import { applyTransforms } from './transforms'
+import { MethodExtractionResult, MethodSignature, ParameterInfo } from './method-extraction-result'
+
+function extractParameterInfo(param: ParameterDeclaration): ParameterInfo {
+  const typeNode = param.getTypeNode()
+  return ParameterInfo.parse({
+    name: param.getName(),
+    type: typeNode?.getText() ?? 'unknown',
+  })
+}
+
+/** @riviere-role domain-service */
+export function evaluateFromMethodSignatureRule(
+  _rule: FromMethodSignatureExtractionRule,
+  methodDecl: MethodDeclaration,
+): MethodExtractionResult {
+  const parameters = methodDecl.getParameters().map(extractParameterInfo)
+  const returnTypeNode = methodDecl.getReturnTypeNode()
+
+  return MethodExtractionResult.parse({
+    value: MethodSignature.parse({
+      parameters,
+      returnType: returnTypeNode?.getText() ?? 'unknown',
+    }),
+  })
+}
+
+/** @riviere-role domain-service */
+export function evaluateFromConstructorParamsRule(
+  _rule: FromConstructorParamsExtractionRule,
+  classDecl: ClassDeclaration,
+): MethodExtractionResult {
+  const ctor = classDecl.getConstructors()[0]
+  if (ctor === undefined) {
+    return MethodExtractionResult.parse({ value: [] })
+  }
+
+  const parameters = ctor.getParameters().map(extractParameterInfo)
+  return MethodExtractionResult.parse({ value: parameters })
+}
+
+/** @riviere-role domain-service */
+export function evaluateFromParameterTypeRule(
+  rule: FromParameterTypeExtractionRule,
+  methodDecl: MethodDeclaration,
+): MethodExtractionResult {
+  const { position, transform } = rule.fromParameterType
+
+  const params = methodDecl.getParameters()
+  const param = params[position]
+  if (param === undefined) {
+    throw new ExtractionError(
+      `Parameter position ${position} out of bounds. Method has ${params.length} parameter(s)`,
+      methodDecl.getSourceFile().getFilePath(),
+      methodDecl.getStartLineNumber(),
+    )
+  }
+
+  const typeNode = param.getTypeNode()
+  const typeName = typeNode?.getText() ?? 'unknown'
+
+  if (transform === undefined) {
+    return MethodExtractionResult.parse({ value: typeName })
+  }
+
+  return MethodExtractionResult.parse({ value: applyTransforms(typeName, transform) })
+}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule.spec.ts
similarity index 98%
rename from packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule.spec.ts
index 66867c722..6597322a1 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule.spec.ts
@@ -1,18 +1,13 @@
-import {
-  describe, it, expect 
-} from 'vitest'
 import { Project } from 'ts-morph'
+import { describe, expect, it } from 'vitest'
+import { ExtractionError, TestFixtureError } from './literal-detection'
 import {
-  evaluateLiteralRule,
   evaluateFromClassNameRule,
-  evaluateFromMethodNameRule,
   evaluateFromFilePathRule,
+  evaluateFromMethodNameRule,
   evaluateFromPropertyRule,
+  evaluateLiteralRule,
 } from './evaluate-extraction-rule'
-import {
-  TestFixtureError,
-  ExtractionError,
-} from '../../../../platform/domain/ast-literals/literal-detection'
 
 const sharedProject = new Project({ useInMemoryFileSystem: true })
 const counter = { value: 0 }
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule.ts b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule.ts
similarity index 89%
rename from packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule.ts
index f248d7d76..56b8f38da 100644
--- a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/evaluate-extraction-rule.ts
@@ -1,35 +1,32 @@
 import type {
-  LiteralExtractionRule,
+  FromClassDecoratorArgExtractionRule,
   FromClassNameExtractionRule,
-  FromMethodNameExtractionRule,
-  FromFilePathExtractionRule,
-  FromPropertyExtractionRule,
   FromDecoratorArgExtractionRule,
-  FromClassDecoratorArgExtractionRule,
   FromDecoratorNameExtractionRule,
-} from '@living-architecture/riviere-extract-config'
+  FromFilePathExtractionRule,
+  FromMethodNameExtractionRule,
+  FromPropertyExtractionRule,
+  LiteralExtractionRule,
+} from '@living-architecture/riviere-extract-config-published-language'
+import { SyntaxKind } from 'ts-morph'
+import { ExtractionError, extractLiteralValue } from './literal-detection'
+import { applyTransforms } from './transforms'
+import { ExtractionResult } from './extraction-result'
 
 export {
-  evaluateFromMethodSignatureRule,
   evaluateFromConstructorParamsRule,
+  evaluateFromMethodSignatureRule,
   evaluateFromParameterTypeRule,
 } from './evaluate-extraction-rule-method'
-import { ExtractionResult } from './extraction-result'
 
 export { evaluateFromGenericArgRule } from './evaluate-extraction-rule-generic'
-import { SyntaxKind } from 'ts-morph'
-import { applyTransforms } from '../../../../platform/domain/string-transforms/transforms'
-import {
-  ExtractionError,
-  extractLiteralValue,
-} from '../../../../platform/domain/ast-literals/literal-detection'
 
 type ClassDeclaration = import('ts-morph').ClassDeclaration
 type MethodDeclaration = import('ts-morph').MethodDeclaration
 type Decorator = import('ts-morph').Decorator
 
 function literal(value: string | number | boolean): ExtractionResult {
-  return new ExtractionResult({ value })
+  return ExtractionResult.parse({ value })
 }
 
 /** @riviere-role domain-service */
@@ -50,15 +47,15 @@ export function evaluateFromClassNameRule(
   }
 
   if (rule.fromClassName === true) {
-    return new ExtractionResult({ value: className })
+    return ExtractionResult.parse({ value: className })
   }
 
   const transform = rule.fromClassName.transform
   if (transform === undefined) {
-    return new ExtractionResult({ value: className })
+    return ExtractionResult.parse({ value: className })
   }
 
-  return new ExtractionResult({ value: applyTransforms(className, transform) })
+  return ExtractionResult.parse({ value: applyTransforms(className, transform) })
 }
 
 /** @riviere-role domain-service */
@@ -69,15 +66,15 @@ export function evaluateFromMethodNameRule(
   const methodName = methodDecl.getName()
 
   if (rule.fromMethodName === true) {
-    return new ExtractionResult({ value: methodName })
+    return ExtractionResult.parse({ value: methodName })
   }
 
   const transform = rule.fromMethodName.transform
   if (transform === undefined) {
-    return new ExtractionResult({ value: methodName })
+    return ExtractionResult.parse({ value: methodName })
   }
 
-  return new ExtractionResult({ value: applyTransforms(methodName, transform) })
+  return ExtractionResult.parse({ value: applyTransforms(methodName, transform) })
 }
 
 /** @riviere-role domain-service */
@@ -109,10 +106,10 @@ export function evaluateFromFilePathRule(
   }
 
   if (transform === undefined) {
-    return new ExtractionResult({ value: capturedValue })
+    return ExtractionResult.parse({ value: capturedValue })
   }
 
-  return new ExtractionResult({ value: applyTransforms(capturedValue, transform) })
+  return ExtractionResult.parse({ value: applyTransforms(capturedValue, transform) })
 }
 
 type PropertyInfo = {
@@ -178,14 +175,14 @@ export function evaluateFromPropertyRule(
   )
 
   if (transform === undefined) {
-    return new ExtractionResult({ value: literalResult.value })
+    return ExtractionResult.parse({ value: literalResult.value })
   }
 
   if (typeof literalResult.value !== 'string') {
-    return new ExtractionResult({ value: literalResult.value })
+    return ExtractionResult.parse({ value: literalResult.value })
   }
 
-  return new ExtractionResult({ value: applyTransforms(literalResult.value, transform) })
+  return ExtractionResult.parse({ value: applyTransforms(literalResult.value, transform) })
 }
 
 type DecoratorLocation = {
@@ -335,10 +332,10 @@ export function evaluateFromDecoratorArgRule(
   const value = extractValue()
 
   if (transform === undefined) {
-    return new ExtractionResult({ value })
+    return ExtractionResult.parse({ value })
   }
 
-  return new ExtractionResult({ value: applyTransforms(value, transform) })
+  return ExtractionResult.parse({ value: applyTransforms(value, transform) })
 }
 
 /** @riviere-role domain-service */
@@ -392,7 +389,7 @@ export function evaluateFromDecoratorNameRule(
   const decoratorName = decorator.getName()
 
   if (rule.fromDecoratorName === true) {
-    return new ExtractionResult({ value: decoratorName })
+    return ExtractionResult.parse({ value: decoratorName })
   }
 
   const mapping = rule.fromDecoratorName.mapping
@@ -401,8 +398,8 @@ export function evaluateFromDecoratorNameRule(
   const mappedValue = mapping?.[decoratorName] ?? decoratorName
 
   if (transform === undefined) {
-    return new ExtractionResult({ value: mappedValue })
+    return ExtractionResult.parse({ value: mappedValue })
   }
 
-  return new ExtractionResult({ value: applyTransforms(mappedValue, transform) })
+  return ExtractionResult.parse({ value: applyTransforms(mappedValue, transform) })
 }
diff --git a/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/extraction-result.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/extraction-result.spec.ts
new file mode 100644
index 000000000..fa0ab5616
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/extraction-result.spec.ts
@@ -0,0 +1,18 @@
+import { describe, expect, it } from 'vitest'
+import { ExtractionContext, ExtractionResult } from './extraction-result'
+
+describe('ExtractionContext', () => {
+  it('stores file path when constructed', () => {
+    const result = ExtractionContext.parse({ filePath: '/src/orders/order-service.ts' })
+
+    expect(result.filePath).toBe('/src/orders/order-service.ts')
+  })
+})
+
+describe('ExtractionResult', () => {
+  it('stores extracted value when constructed', () => {
+    const result = ExtractionResult.parse({ value: 'orders' })
+
+    expect(result.value).toBe('orders')
+  })
+})
diff --git a/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/extraction-result.ts b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/extraction-result.ts
new file mode 100644
index 000000000..d118b79a6
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/extraction-result.ts
@@ -0,0 +1,29 @@
+/** @riviere-role value-object */
+export class ExtractionContext {
+  declare private brand: 'ExtractionContext'
+  readonly filePath: string
+
+  static parse(params: { filePath: string }): ExtractionContext {
+    return new ExtractionContext(params)
+  }
+
+  private constructor(params: { filePath: string }) {
+    this.filePath = params.filePath
+  }
+}
+
+type ExtractionValue = string | number | boolean | string[]
+
+/** @riviere-role value-object */
+export class ExtractionResult {
+  declare private brand: 'ExtractionResult'
+  readonly value: ExtractionValue
+
+  static parse(params: { value: ExtractionValue }): ExtractionResult {
+    return new ExtractionResult(params)
+  }
+
+  private constructor(params: { value: ExtractionValue }) {
+    this.value = params.value
+  }
+}
diff --git a/packages/riviere-extract-ts/src/platform/domain/ast-literals/literal-detection.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/literal-detection.spec.ts
similarity index 99%
rename from packages/riviere-extract-ts/src/platform/domain/ast-literals/literal-detection.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/value-extraction/literal-detection.spec.ts
index bed734465..d59457e6f 100644
--- a/packages/riviere-extract-ts/src/platform/domain/ast-literals/literal-detection.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/literal-detection.spec.ts
@@ -1,11 +1,9 @@
-import {
-  describe, it, expect 
-} from 'vitest'
 import { Project } from 'ts-morph'
+import { describe, expect, it } from 'vitest'
 import {
-  isLiteralValue,
-  extractLiteralValue,
   ExtractionError,
+  extractLiteralValue,
+  isLiteralValue,
   TestFixtureError,
 } from './literal-detection'
 
diff --git a/packages/riviere-extract-ts/src/platform/domain/ast-literals/literal-detection.ts b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/literal-detection.ts
similarity index 87%
rename from packages/riviere-extract-ts/src/platform/domain/ast-literals/literal-detection.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/value-extraction/literal-detection.ts
index d459fa754..193df37da 100644
--- a/packages/riviere-extract-ts/src/platform/domain/ast-literals/literal-detection.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/literal-detection.ts
@@ -26,6 +26,9 @@ export class TestFixtureError extends Error {
   }
 }
 
+type LiteralKind = 'string' | 'number' | 'boolean' | 'string[]'
+type LiteralValue = string | number | boolean | string[]
+
 /** @riviere-role domain-service */
 export function isLiteralValue(expression: Expression | undefined): boolean {
   if (expression === undefined) {
@@ -53,13 +56,14 @@ function isStringArrayLiteral(expression: Expression): boolean {
 /** @riviere-role value-object */
 export class LiteralResult {
   declare private brand: 'LiteralResult'
-  readonly kind: 'string' | 'number' | 'boolean' | 'string[]'
-  readonly value: string | number | boolean | string[]
+  readonly kind: LiteralKind
+  readonly value: LiteralValue
+
+  static parse(params: { kind: LiteralKind; value: LiteralValue }): LiteralResult {
+    return new LiteralResult(params)
+  }
 
-  constructor(params: {
-    kind: 'string' | 'number' | 'boolean' | 'string[]'
-    value: string | number | boolean | string[]
-  }) {
+  private constructor(params: { kind: LiteralKind; value: LiteralValue }) {
     this.kind = params.kind
     this.value = params.value
   }
@@ -91,22 +95,22 @@ function buildExtractionResult(expression: Expression): LiteralResult | undefine
 
   switch (syntaxKind) {
     case SyntaxKind.StringLiteral:
-      return new LiteralResult({
+      return LiteralResult.parse({
         kind: 'string',
         value: extractString(expression),
       })
     case SyntaxKind.NumericLiteral:
-      return new LiteralResult({
+      return LiteralResult.parse({
         kind: 'number',
         value: extractNumber(expression),
       })
     case SyntaxKind.TrueKeyword:
-      return new LiteralResult({
+      return LiteralResult.parse({
         kind: 'boolean',
         value: true,
       })
     case SyntaxKind.FalseKeyword:
-      return new LiteralResult({
+      return LiteralResult.parse({
         kind: 'boolean',
         value: false,
       })
@@ -115,7 +119,7 @@ function buildExtractionResult(expression: Expression): LiteralResult | undefine
       if (values === undefined) {
         return undefined
       }
-      return new LiteralResult({
+      return LiteralResult.parse({
         kind: 'string[]',
         value: values,
       })
diff --git a/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/method-extraction-result.ts b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/method-extraction-result.ts
new file mode 100644
index 000000000..80d6d238a
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/method-extraction-result.ts
@@ -0,0 +1,47 @@
+/** @riviere-role value-object */
+export class ParameterInfo {
+  declare private brand: 'ParameterInfo'
+  readonly name: string
+  readonly type: string
+
+  static parse(params: { name: string; type: string }): ParameterInfo {
+    return new ParameterInfo(params)
+  }
+
+  private constructor(params: { name: string; type: string }) {
+    this.name = params.name
+    this.type = params.type
+  }
+}
+
+/** @riviere-role value-object */
+export class MethodSignature {
+  declare private brand: 'MethodSignature'
+  readonly parameters: ParameterInfo[]
+  readonly returnType: string
+
+  static parse(params: { parameters: ParameterInfo[]; returnType: string }): MethodSignature {
+    return new MethodSignature(params)
+  }
+
+  private constructor(params: { parameters: ParameterInfo[]; returnType: string }) {
+    this.parameters = params.parameters
+    this.returnType = params.returnType
+  }
+}
+
+type MethodExtractionValue = string | ParameterInfo[] | MethodSignature
+
+/** @riviere-role value-object */
+export class MethodExtractionResult {
+  declare private brand: 'MethodExtractionResult'
+  readonly value: MethodExtractionValue
+
+  static parse(params: { value: MethodExtractionValue }): MethodExtractionResult {
+    return new MethodExtractionResult(params)
+  }
+
+  private constructor(params: { value: MethodExtractionValue }) {
+    this.value = params.value
+  }
+}
diff --git a/packages/riviere-extract-ts/src/platform/domain/string-transforms/transforms.spec.ts b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/transforms.spec.ts
similarity index 97%
rename from packages/riviere-extract-ts/src/platform/domain/string-transforms/transforms.spec.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/value-extraction/transforms.spec.ts
index 7a89bdf6b..7636dac66 100644
--- a/packages/riviere-extract-ts/src/platform/domain/string-transforms/transforms.spec.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/transforms.spec.ts
@@ -1,16 +1,14 @@
+import type { Transform } from '@living-architecture/riviere-extract-config-published-language'
+import { describe, expect, it } from 'vitest'
 import {
-  describe, it, expect 
-} from 'vitest'
-import {
-  stripSuffix,
+  applyTransforms,
+  kebabToPascal,
+  pascalToKebab,
   stripPrefix,
+  stripSuffix,
   toLowerCase,
   toUpperCase,
-  kebabToPascal,
-  pascalToKebab,
-  applyTransforms,
 } from './transforms'
-import type { Transform } from '@living-architecture/riviere-extract-config'
 
 describe('stripSuffix', () => {
   it("returns 'PlaceOrder' when input is 'PlaceOrderController' and suffix is 'Controller'", () => {
diff --git a/packages/riviere-extract-ts/src/platform/domain/string-transforms/transforms.ts b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/transforms.ts
similarity index 98%
rename from packages/riviere-extract-ts/src/platform/domain/string-transforms/transforms.ts
rename to packages/riviere-extract-ts/domain-model/src/domain/value-extraction/transforms.ts
index ab0fb0654..1145b8b6e 100644
--- a/packages/riviere-extract-ts/src/platform/domain/string-transforms/transforms.ts
+++ b/packages/riviere-extract-ts/domain-model/src/domain/value-extraction/transforms.ts
@@ -1,4 +1,4 @@
-import type { Transform } from '@living-architecture/riviere-extract-config'
+import type { Transform } from '@living-architecture/riviere-extract-config-published-language'
 
 /** @riviere-role domain-service */
 export function stripSuffix(value: string, suffix: string): string {
diff --git a/packages/riviere-extract-ts/domain-model/tsconfig.json b/packages/riviere-extract-ts/domain-model/tsconfig.json
new file mode 100644
index 000000000..667a3463d
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/packages/riviere-extract-ts/domain-model/tsconfig.lib.json b/packages/riviere-extract-ts/domain-model/tsconfig.lib.json
new file mode 100644
index 000000000..82f4ad09d
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/tsconfig.lib.json
@@ -0,0 +1,34 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "src",
+    "outDir": "dist",
+    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
+    "emitDeclarationOnly": false,
+    "forceConsistentCasingInFileNames": true
+  },
+  "include": ["src/**/*.ts"],
+  "references": [
+    {
+      "path": "../../riviere-schema/published-language/tsconfig.lib.json"
+    },
+    {
+      "path": "../../riviere-extract-config/published-language/tsconfig.lib.json"
+    }
+  ],
+  "exclude": [
+    "vite.config.ts",
+    "vite.config.mts",
+    "vitest.config.ts",
+    "vitest.config.mts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx"
+  ]
+}
diff --git a/packages/riviere-extract-ts/domain-model/tsconfig.spec.json b/packages/riviere-extract-ts/domain-model/tsconfig.spec.json
new file mode 100644
index 000000000..dcf808204
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/tsconfig.spec.json
@@ -0,0 +1,31 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/vitest",
+    "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node", "vitest"],
+    "forceConsistentCasingInFileNames": true
+  },
+  "include": [
+    "vite.config.ts",
+    "vite.config.mts",
+    "vitest.config.ts",
+    "vitest.config.mts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx",
+    "src/**/*.d.ts"
+  ],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "../../riviere-extract-config/published-language/tsconfig.lib.json"
+    }
+  ]
+}
diff --git a/packages/riviere-extract-ts/domain-model/vitest.config.mts b/packages/riviere-extract-ts/domain-model/vitest.config.mts
new file mode 100644
index 000000000..fd76f7a6b
--- /dev/null
+++ b/packages/riviere-extract-ts/domain-model/vitest.config.mts
@@ -0,0 +1,34 @@
+import path from 'node:path'
+import { defineConfig } from 'vitest/config'
+
+const repoRoot = path.resolve(__dirname, '../../..')
+
+export default defineConfig(() => ({
+  root: __dirname,
+  cacheDir: '../../../node_modules/.vite/packages/riviere-extract-ts',
+  test: {
+    name: '@living-architecture/riviere-extract-ts-domain-model',
+    watch: false,
+    globals: true,
+    environment: 'node',
+    testTimeout: 60_000,
+    include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+    reporters: ['default'],
+    coverage: {
+      enabled: true,
+      reportsDirectory: './test-output/vitest/coverage',
+      provider: 'v8' as const,
+      reporter: ['text', ['lcov', { projectRoot: repoRoot }]] as [
+        'text',
+        ['lcov', { projectRoot: string }],
+      ],
+      exclude: ['**/*-fixtures.ts', '**/*-fixtures/**'],
+      thresholds: {
+        lines: 100,
+        statements: 100,
+        functions: 100,
+        branches: 100,
+      },
+    },
+  },
+}))
diff --git a/packages/riviere-extract-ts/package.json b/packages/riviere-extract-ts/package.json
deleted file mode 100644
index fb4daa6d8..000000000
--- a/packages/riviere-extract-ts/package.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "name": "@living-architecture/riviere-extract-ts",
-  "version": "0.6.3",
-  "type": "module",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/NTCoding/living-architecture.git",
-    "directory": "packages/riviere-extract-ts"
-  },
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    "./package.json": "./package.json",
-    ".": {
-      "@living-architecture/source": "./src/index.ts",
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "default": "./dist/index.js"
-    }
-  },
-  "files": [
-    "dist",
-    "!**/*.tsbuildinfo"
-  ],
-  "dependencies": {
-    "@living-architecture/riviere-extract-config": "workspace:*",
-    "@living-architecture/riviere-schema": "workspace:*",
-    "minimatch": "^10.0.1",
-    "ts-morph": "^24.0.0"
-  }
-}
diff --git a/packages/riviere-extract-ts/project.json b/packages/riviere-extract-ts/project.json
deleted file mode 100644
index 8d136ad4d..000000000
--- a/packages/riviere-extract-ts/project.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "riviere-extract-ts",
-  "targets": {
-    "role-check": {
-      "executor": "nx:run-commands",
-      "dependsOn": ["^build", "riviere-role-enforcement:build"],
-      "options": {
-        "command": "pnpm exec tsx packages/riviere-role-enforcement/src/shell/bin.ts .riviere/role-enforcement.config.ts --package packages/riviere-extract-ts",
-        "cwd": "{workspaceRoot}"
-      }
-    }
-  }
-}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/component-extraction/draft-component.ts b/packages/riviere-extract-ts/src/features/extraction/domain/component-extraction/draft-component.ts
deleted file mode 100644
index 47f62651d..000000000
--- a/packages/riviere-extract-ts/src/features/extraction/domain/component-extraction/draft-component.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/** @riviere-role value-object */
-export class DraftComponent {
-  declare private brand: 'DraftComponent'
-  readonly type: string
-  readonly name: string
-  readonly location: {
-    file: string
-    line: number
-  }
-  readonly domain: string
-  readonly module: string
-
-  constructor(params: {
-    type: string
-    name: string
-    location: {
-      file: string
-      line: number
-    }
-    domain: string
-    module: string
-  }) {
-    this.type = params.type
-    this.name = params.name
-    this.location = params.location
-    this.domain = params.domain
-    this.module = params.module
-  }
-}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/config-resolution/config-resolution-errors.spec.ts b/packages/riviere-extract-ts/src/features/extraction/domain/config-resolution/config-resolution-errors.spec.ts
deleted file mode 100644
index ec40cdf6f..000000000
--- a/packages/riviere-extract-ts/src/features/extraction/domain/config-resolution/config-resolution-errors.spec.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import { MissingComponentRuleError } from './config-resolution-errors'
-
-describe('errors', () => {
-  describe('MissingComponentRuleError', () => {
-    it('sets message with module and rule name', () => {
-      const error = new MissingComponentRuleError('my-module', 'api')
-      expect(error.message).toBe(
-        "Module 'my-module' is missing required rule 'api'. " +
-          'Either provide the rule or use extends to inherit from a base config.',
-      )
-    })
-
-    it('sets name', () => {
-      const error = new MissingComponentRuleError('mod', 'rule')
-      expect(error.name).toBe('MissingComponentRuleError')
-    })
-
-    it('exposes moduleName and ruleName', () => {
-      const error = new MissingComponentRuleError('test-module', 'useCase')
-      expect(error.moduleName).toBe('test-module')
-      expect(error.ruleName).toBe('useCase')
-    })
-  })
-})
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/config-resolution/config-resolution-errors.ts b/packages/riviere-extract-ts/src/features/extraction/domain/config-resolution/config-resolution-errors.ts
deleted file mode 100644
index 5b55be4c6..000000000
--- a/packages/riviere-extract-ts/src/features/extraction/domain/config-resolution/config-resolution-errors.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/** @riviere-role domain-error */
-export class MissingComponentRuleError extends Error {
-  readonly moduleName: string
-  readonly ruleName: string
-
-  constructor(moduleName: string, ruleName: string) {
-    super(
-      `Module '${moduleName}' is missing required rule '${ruleName}'. ` +
-        `Either provide the rule or use extends to inherit from a base config.`,
-    )
-    this.name = 'MissingComponentRuleError'
-    this.moduleName = moduleName
-    this.ruleName = ruleName
-  }
-}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/config-resolution/resolve-config.spec.ts b/packages/riviere-extract-ts/src/features/extraction/domain/config-resolution/resolve-config.spec.ts
deleted file mode 100644
index 7155e5c54..000000000
--- a/packages/riviere-extract-ts/src/features/extraction/domain/config-resolution/resolve-config.spec.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import type { ExtractionConfig } from '@living-architecture/riviere-extract-config'
-import { resolveConfig } from './resolve-config'
-
-describe('resolveConfig', () => {
-  describe('modules without extends', () => {
-    it('returns resolved config unchanged when no module has extends', () => {
-      const config: ExtractionConfig = {
-        modules: [
-          {
-            name: 'orders',
-            domain: 'orders',
-            path: 'orders',
-            glob: '**',
-            api: { notUsed: true },
-            useCase: { notUsed: true },
-            domainOp: { notUsed: true },
-            event: { notUsed: true },
-            eventHandler: { notUsed: true },
-            ui: { notUsed: true },
-          },
-        ],
-      }
-
-      const result = resolveConfig(config)
-
-      expect(result).toStrictEqual({
-        modules: [
-          {
-            name: 'orders',
-            domain: 'orders',
-            path: 'orders',
-            glob: '**',
-            api: { notUsed: true },
-            useCase: { notUsed: true },
-            domainOp: { notUsed: true },
-            event: { notUsed: true },
-            eventHandler: { notUsed: true },
-            ui: { notUsed: true },
-          },
-        ],
-      })
-    })
-
-    it('throws error when module is missing required rule without extends', () => {
-      const config: ExtractionConfig = {
-        modules: [
-          {
-            name: 'orders',
-            domain: 'orders',
-            path: 'orders',
-            glob: '**',
-            api: { notUsed: true },
-            domainOp: { notUsed: true },
-            event: { notUsed: true },
-            eventHandler: { notUsed: true },
-            ui: { notUsed: true },
-          },
-        ],
-      }
-
-      expect(() => resolveConfig(config)).toThrow(
-        "Module 'orders' is missing required rule 'useCase'",
-      )
-    })
-
-    it('includes customTypes in resolved module', () => {
-      const config: ExtractionConfig = {
-        modules: [
-          {
-            name: 'orders',
-            domain: 'orders',
-            path: 'orders',
-            glob: '**',
-            api: { notUsed: true },
-            useCase: { notUsed: true },
-            domainOp: { notUsed: true },
-            event: { notUsed: true },
-            eventHandler: { notUsed: true },
-            ui: { notUsed: true },
-            customTypes: {
-              repository: {
-                find: 'classes',
-                where: { nameEndsWith: { suffix: 'Repository' } },
-              },
-            },
-          },
-        ],
-      }
-
-      const result = resolveConfig(config)
-
-      expect(result.modules[0]?.customTypes).toStrictEqual({
-        repository: {
-          find: 'classes',
-          where: { nameEndsWith: { suffix: 'Repository' } },
-        },
-      })
-    })
-
-    it('includes modules pattern in resolved module', () => {
-      const config: ExtractionConfig = {
-        modules: [
-          {
-            name: 'orders',
-            domain: 'orders',
-            path: 'orders',
-            glob: '**',
-            modules: '/src/{module}/',
-            api: { notUsed: true },
-            useCase: { notUsed: true },
-            domainOp: { notUsed: true },
-            event: { notUsed: true },
-            eventHandler: { notUsed: true },
-            ui: { notUsed: true },
-          },
-        ],
-      }
-
-      const result = resolveConfig(config)
-
-      expect(result.modules[0]?.modules).toBe('/src/{module}/')
-    })
-  })
-})
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/config-resolution/resolve-config.ts b/packages/riviere-extract-ts/src/features/extraction/domain/config-resolution/resolve-config.ts
deleted file mode 100644
index a3b726c72..000000000
--- a/packages/riviere-extract-ts/src/features/extraction/domain/config-resolution/resolve-config.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import type {
-  ExtractionConfig,
-  ResolvedExtractionConfig,
-  ComponentRule,
-  Module,
-  ModuleConfig,
-} from '@living-architecture/riviere-extract-config'
-import { MissingComponentRuleError } from './config-resolution-errors'
-
-/** @riviere-role domain-service */
-export function resolveConfig(config: ExtractionConfig): ResolvedExtractionConfig {
-  return {
-    ...config,
-    modules: config.modules.map(resolveModule),
-  }
-}
-
-function resolveModule(moduleConfig: ModuleConfig): Module {
-  return {
-    name: moduleConfig.name,
-    domain: moduleConfig.domain,
-    path: moduleConfig.path,
-    glob: moduleConfig.glob,
-    ...(moduleConfig.modules !== undefined && { modules: moduleConfig.modules }),
-    api: requireRule(moduleConfig.api, 'api', moduleConfig.name),
-    useCase: requireRule(moduleConfig.useCase, 'useCase', moduleConfig.name),
-    domainOp: requireRule(moduleConfig.domainOp, 'domainOp', moduleConfig.name),
-    event: requireRule(moduleConfig.event, 'event', moduleConfig.name),
-    eventHandler: requireRule(moduleConfig.eventHandler, 'eventHandler', moduleConfig.name),
-    ui: requireRule(moduleConfig.ui, 'ui', moduleConfig.name),
-    ...(moduleConfig.customTypes !== undefined && { customTypes: moduleConfig.customTypes }),
-  }
-}
-
-function requireRule(
-  rule: ComponentRule | undefined,
-  ruleName: string,
-  moduleName: string,
-): ComponentRule {
-  if (rule === undefined) {
-    throw new MissingComponentRuleError(moduleName, ruleName)
-  }
-  return rule
-}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/async-detection/async-detection-options.ts b/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/async-detection/async-detection-options.ts
deleted file mode 100644
index 53500bc0e..000000000
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/async-detection/async-detection-options.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/** @riviere-role value-object */
-export class AsyncDetectionOptions {
-  declare private brand: 'AsyncDetectionOptions'
-  readonly strict: boolean
-  readonly repository: string
-
-  constructor(params: {
-    strict: boolean;
-    repository: string 
-  }) {
-    this.strict = params.strict
-    this.repository = params.repository
-  }
-}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/call-graph-outcomes.ts b/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/call-graph-outcomes.ts
deleted file mode 100644
index 708ffe161..000000000
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/call-graph-outcomes.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import type { EnrichedComponent } from '../../value-extraction/enriched-component'
-import type { MethodDeclaration } from 'ts-morph'
-
-/** @riviere-role value-object */
-export class InterfaceResolutionOutcome {
-  declare private brand: 'InterfaceResolutionOutcome'
-  readonly component: EnrichedComponent | undefined
-  readonly resolvedTypeName: string | undefined
-  readonly uncertain: string | undefined
-
-  constructor(params: {
-    component: EnrichedComponent | undefined
-    resolvedTypeName: string | undefined
-    uncertain: string | undefined
-  }) {
-    this.component = params.component
-    this.resolvedTypeName = params.resolvedTypeName
-    this.uncertain = params.uncertain
-  }
-}
-
-/** @riviere-role value-object */
-export class MethodLookup {
-  declare private brand: 'MethodLookup'
-  readonly method: MethodDeclaration | undefined
-  readonly classFound: boolean
-
-  constructor(params: {
-    method: MethodDeclaration | undefined;
-    classFound: boolean 
-  }) {
-    this.method = params.method
-    this.classFound = params.classFound
-  }
-}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/call-graph-types.spec.ts b/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/call-graph-types.spec.ts
deleted file mode 100644
index bf6548b5e..000000000
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/call-graph-types.spec.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import { componentIdentity } from './component-identity'
-import { stripGenericArgs } from './type-name-normalization'
-import { buildComponent } from './call-graph-fixtures'
-
-describe('stripGenericArgs', () => {
-  it('returns original string when no generic arguments present', () => {
-    expect(stripGenericArgs('OrderRepository')).toBe('OrderRepository')
-  })
-
-  it('strips generic arguments from type name', () => {
-    expect(stripGenericArgs('Repository<Order>')).toBe('Repository')
-  })
-
-  it('returns empty string for empty input', () => {
-    expect(stripGenericArgs('')).toBe('')
-  })
-
-  it('strips nested generics from type name', () => {
-    expect(stripGenericArgs('Map<K, List<V>>')).toBe('Map')
-  })
-
-  it('strips multiple type parameters from type name', () => {
-    expect(stripGenericArgs('Pair<A, B>')).toBe('Pair')
-  })
-})
-
-describe('componentIdentity', () => {
-  it('returns domain:module:type:lowercasedname identity string', () => {
-    const comp = buildComponent('MyComp', '/test.ts', 1, {
-      domain: 'billing',
-      type: 'api',
-    })
-    expect(componentIdentity(comp)).toBe('billing:orders-module:api:mycomp')
-  })
-})
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/call-graph-types.ts b/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/call-graph-types.ts
deleted file mode 100644
index c5cd6ff70..000000000
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/call-graph-types.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import type { EnrichedComponent } from '../../value-extraction/enriched-component'
-
-/** @riviere-role value-object */
-export class CallGraphOptions {
-  declare private brand: 'CallGraphOptions'
-  readonly strict: boolean
-  readonly sourceFilePaths: string[]
-  readonly repository: string
-
-  constructor(params: {
-    strict: boolean;
-    sourceFilePaths: string[];
-    repository: string 
-  }) {
-    this.strict = params.strict
-    this.sourceFilePaths = params.sourceFilePaths
-    this.repository = params.repository
-  }
-}
-
-/** @riviere-role value-object */
-export class CallSite {
-  declare private brand: 'CallSite'
-  readonly filePath: string
-  readonly lineNumber: number
-  readonly methodName: string
-
-  constructor(params: {
-    filePath: string;
-    lineNumber: number;
-    methodName: string 
-  }) {
-    this.filePath = params.filePath
-    this.lineNumber = params.lineNumber
-    this.methodName = params.methodName
-  }
-}
-
-/** @riviere-role value-object */
-export class RawLink {
-  declare private brand: 'RawLink'
-  readonly source: EnrichedComponent
-  readonly target: EnrichedComponent
-  readonly callSite: CallSite
-
-  constructor(params: {
-    source: EnrichedComponent
-    target: EnrichedComponent
-    callSite: CallSite
-  }) {
-    this.source = params.source
-    this.target = params.target
-    this.callSite = params.callSite
-  }
-}
-
-/** @riviere-role value-object */
-export class UncertainRawLink {
-  declare private brand: 'UncertainRawLink'
-  readonly source: EnrichedComponent
-  readonly reason: string
-  readonly callSite: CallSite
-
-  constructor(params: {
-    source: EnrichedComponent;
-    reason: string;
-    callSite: CallSite 
-  }) {
-    this.source = params.source
-    this.reason = params.reason
-    this.callSite = params.callSite
-  }
-}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/component-identity.ts b/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/component-identity.ts
deleted file mode 100644
index d7226570c..000000000
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/component-identity.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { ComponentId } from '@living-architecture/riviere-schema'
-import type { EnrichedComponent } from '../../value-extraction/enriched-component'
-
-/** @riviere-role domain-service */
-export function componentIdentity(component: EnrichedComponent): string {
-  return ComponentId.create({
-    domain: component.domain,
-    module: component.module,
-    type: component.type,
-    name: component.name,
-  }).toString()
-}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/method-level-target.ts b/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/method-level-target.ts
deleted file mode 100644
index 8ed4a6ef1..000000000
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/call-graph/method-level-target.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import type {
-  ClassDeclaration, MethodDeclaration 
-} from 'ts-morph'
-
-/** @riviere-role value-object */
-export class MethodLevelTarget {
-  declare private brand: 'MethodLevelTarget'
-  readonly classDecl: ClassDeclaration
-  readonly method: MethodDeclaration
-
-  constructor(params: {
-    classDecl: ClassDeclaration;
-    method: MethodDeclaration 
-  }) {
-    this.classDecl = params.classDecl
-    this.method = params.method
-  }
-}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/connection-detection-values.ts b/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/connection-detection-values.ts
deleted file mode 100644
index e743237a9..000000000
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/connection-detection-values.ts
+++ /dev/null
@@ -1,185 +0,0 @@
-import type {
-  EventPublisherConfig,
-  HttpLinkConfig,
-} from '@living-architecture/riviere-extract-config'
-import type { ExternalLink } from '@living-architecture/riviere-schema'
-import type { EnrichedComponent } from '../value-extraction/enriched-component'
-import type { ExtractedLink } from './extracted-link'
-
-type LinkCollectionParams<TTimings> = {
-  links: ExtractedLink[]
-  externalLinks: ExternalLink[]
-  timings: TTimings
-}
-
-function assignLinkCollections<TTimings>(
-  target: {
-    links: ExtractedLink[]
-    externalLinks: ExternalLink[]
-    timings: TTimings
-  },
-  params: LinkCollectionParams<TTimings>,
-): void {
-  target.links = params.links
-  target.externalLinks = params.externalLinks
-  target.timings = params.timings
-}
-
-/** @riviere-role value-object */
-export class ConnectionDetectionOptions {
-  declare private brand: 'ConnectionDetectionOptions'
-  readonly allowIncomplete: boolean | undefined
-  readonly sourceFilePaths: string[]
-  readonly eventPublishers: EventPublisherConfig[] | undefined
-  readonly httpLinks: HttpLinkConfig[] | undefined
-  readonly repository: string
-
-  constructor(params: {
-    allowIncomplete?: boolean
-    sourceFilePaths: string[]
-    eventPublishers?: EventPublisherConfig[]
-    httpLinks?: HttpLinkConfig[]
-    repository: string
-  }) {
-    this.allowIncomplete = params.allowIncomplete
-    this.sourceFilePaths = params.sourceFilePaths
-    this.eventPublishers = params.eventPublishers
-    this.httpLinks = params.httpLinks
-    this.repository = params.repository
-  }
-}
-
-/** @riviere-role value-object */
-export class ConnectionTimings {
-  declare private brand: 'ConnectionTimings'
-  readonly callGraphMs: number
-  readonly asyncDetectionMs: number
-  readonly setupMs: number
-  readonly totalMs: number
-
-  constructor(params: {
-    callGraphMs: number
-    asyncDetectionMs: number
-    setupMs: number
-    totalMs: number
-  }) {
-    this.callGraphMs = params.callGraphMs
-    this.asyncDetectionMs = params.asyncDetectionMs
-    this.setupMs = params.setupMs
-    this.totalMs = params.totalMs
-  }
-}
-
-/** @riviere-role value-object */
-export class ConnectionDetectionResult {
-  declare private brand: 'ConnectionDetectionResult'
-  declare readonly links: ExtractedLink[]
-  declare readonly externalLinks: ExternalLink[]
-  declare readonly timings: ConnectionTimings
-
-  constructor(params: {
-    links: ExtractedLink[]
-    externalLinks: ExternalLink[]
-    timings: ConnectionTimings
-  }) {
-    assignLinkCollections(this, params)
-  }
-}
-
-/** @riviere-role value-object */
-export class PerModuleConnectionOptions {
-  declare private brand: 'PerModuleConnectionOptions'
-  readonly allComponents: readonly EnrichedComponent[] | undefined
-  readonly allowIncomplete: boolean | undefined
-  readonly sourceFilePaths: string[]
-  readonly httpLinks: HttpLinkConfig[] | undefined
-  readonly repository: string
-
-  constructor(params: {
-    allComponents?: readonly EnrichedComponent[]
-    allowIncomplete?: boolean
-    sourceFilePaths: string[]
-    httpLinks?: HttpLinkConfig[]
-    repository: string
-  }) {
-    this.allComponents = params.allComponents
-    this.allowIncomplete = params.allowIncomplete
-    this.sourceFilePaths = params.sourceFilePaths
-    this.httpLinks = params.httpLinks
-    this.repository = params.repository
-  }
-}
-
-/** @riviere-role value-object */
-export class PerModuleTimings {
-  declare private brand: 'PerModuleTimings'
-  readonly callGraphMs: number
-  readonly setupMs: number
-
-  constructor(params: {
-    callGraphMs: number;
-    setupMs: number 
-  }) {
-    this.callGraphMs = params.callGraphMs
-    this.setupMs = params.setupMs
-  }
-}
-
-/** @riviere-role value-object */
-export class PerModuleDetectionResult {
-  declare private brand: 'PerModuleDetectionResult'
-  declare readonly links: ExtractedLink[]
-  declare readonly externalLinks: ExternalLink[]
-  declare readonly timings: PerModuleTimings
-
-  constructor(params: {
-    links: ExtractedLink[]
-    externalLinks: ExternalLink[]
-    timings: PerModuleTimings
-  }) {
-    assignLinkCollections(this, params)
-  }
-}
-
-/** @riviere-role value-object */
-export class CrossModuleConnectionOptions {
-  declare private brand: 'CrossModuleConnectionOptions'
-  readonly allowIncomplete: boolean | undefined
-  readonly eventPublishers: EventPublisherConfig[] | undefined
-  readonly repository: string
-
-  constructor(params: {
-    allowIncomplete?: boolean
-    eventPublishers?: EventPublisherConfig[]
-    repository: string
-  }) {
-    this.allowIncomplete = params.allowIncomplete
-    this.eventPublishers = params.eventPublishers
-    this.repository = params.repository
-  }
-}
-
-/** @riviere-role value-object */
-export class CrossModuleTimings {
-  declare private brand: 'CrossModuleTimings'
-  readonly asyncDetectionMs: number
-
-  constructor(params: { asyncDetectionMs: number }) {
-    this.asyncDetectionMs = params.asyncDetectionMs
-  }
-}
-
-/** @riviere-role value-object */
-export class CrossModuleDetectionResult {
-  declare private brand: 'CrossModuleDetectionResult'
-  readonly links: ExtractedLink[]
-  readonly timings: CrossModuleTimings
-
-  constructor(params: {
-    links: ExtractedLink[];
-    timings: CrossModuleTimings 
-  }) {
-    this.links = params.links
-    this.timings = params.timings
-  }
-}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/extracted-link.ts b/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/extracted-link.ts
deleted file mode 100644
index a46530973..000000000
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/extracted-link.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import type { Link } from '@living-architecture/riviere-schema'
-
-/** @riviere-role value-object */
-export class ExtractedLink {
-  declare private brand: 'ExtractedLink'
-  readonly source: string
-  readonly target: string
-  readonly type: 'sync' | 'async' | undefined
-  readonly _uncertain: string | undefined
-  readonly sourceLocation: Link['sourceLocation'] | undefined
-
-  constructor(params: {
-    source: string
-    target: string
-    type?: 'sync' | 'async'
-    _uncertain?: string
-    sourceLocation?: Link['sourceLocation']
-  }) {
-    this.source = params.source
-    this.target = params.target
-    this.type = params.type
-    this._uncertain = params._uncertain
-    this.sourceLocation = params.sourceLocation
-  }
-}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/http-link-resolution-result.ts b/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/http-link-resolution-result.ts
deleted file mode 100644
index 64de731b6..000000000
--- a/packages/riviere-extract-ts/src/features/extraction/domain/connection-detection/http-link-resolution-result.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { ExternalLink } from '@living-architecture/riviere-schema'
-import type { ExtractedLink } from './extracted-link'
-
-/** @riviere-role value-object */
-export class HttpLinkResolutionResult {
-  declare private brand: 'HttpLinkResolutionResult'
-  readonly links: ExtractedLink[]
-  readonly externalLinks: ExternalLink[]
-
-  constructor(params: {
-    links: ExtractedLink[];
-    externalLinks: ExternalLink[] 
-  }) {
-    this.links = params.links
-    this.externalLinks = params.externalLinks
-  }
-}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/enriched-component.ts b/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/enriched-component.ts
deleted file mode 100644
index 5d8770f66..000000000
--- a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/enriched-component.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import type { DraftComponent } from '../component-extraction/draft-component'
-
-type MetadataValue = string | number | boolean | string[]
-
-/** @riviere-role value-object */
-export class EnrichedComponent {
-  declare private brand: 'EnrichedComponent'
-  readonly type: string
-  readonly name: string
-  readonly location: {
-    file: string
-    line: number
-  }
-  readonly domain: string
-  readonly module: string
-  readonly metadata: Record<string, MetadataValue>
-  _missing: string[] | undefined
-
-  constructor(params: {
-    type: string
-    name: string
-    location: {
-      file: string
-      line: number
-    }
-    domain: string
-    module: string
-    metadata: Record<string, MetadataValue>
-    _missing: string[] | undefined
-  }) {
-    this.type = params.type
-    this.name = params.name
-    this.location = params.location
-    this.domain = params.domain
-    this.module = params.module
-    this.metadata = params.metadata
-    this._missing = params._missing
-  }
-}
-
-/** @riviere-role value-object */
-export class EnrichmentFailure {
-  declare private brand: 'EnrichmentFailure'
-  readonly component: DraftComponent
-  readonly field: string
-  readonly error: string
-
-  constructor(params: {
-    component: DraftComponent;
-    field: string;
-    error: string 
-  }) {
-    this.component = params.component
-    this.field = params.field
-    this.error = params.error
-  }
-}
-
-/** @riviere-role value-object */
-export class EnrichmentResult {
-  declare private brand: 'EnrichmentResult'
-  readonly components: EnrichedComponent[]
-  readonly failures: EnrichmentFailure[]
-
-  constructor(params: {
-    components: EnrichedComponent[];
-    failures: EnrichmentFailure[] 
-  }) {
-    this.components = params.components
-    this.failures = params.failures
-  }
-}
-
-export type { MetadataValue }
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule-method.ts b/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule-method.ts
deleted file mode 100644
index b93fcb14b..000000000
--- a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/evaluate-extraction-rule-method.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import type {
-  FromMethodSignatureExtractionRule,
-  FromConstructorParamsExtractionRule,
-  FromParameterTypeExtractionRule,
-} from '@living-architecture/riviere-extract-config'
-import type {
-  ClassDeclaration, MethodDeclaration, ParameterDeclaration 
-} from 'ts-morph'
-import { applyTransforms } from '../../../../platform/domain/string-transforms/transforms'
-import { ExtractionError } from '../../../../platform/domain/ast-literals/literal-detection'
-import {
-  MethodExtractionResult, MethodSignature, ParameterInfo 
-} from './method-extraction-result'
-
-function extractParameterInfo(param: ParameterDeclaration): ParameterInfo {
-  const typeNode = param.getTypeNode()
-  return new ParameterInfo({
-    name: param.getName(),
-    type: typeNode?.getText() ?? 'unknown',
-  })
-}
-
-/** @riviere-role domain-service */
-export function evaluateFromMethodSignatureRule(
-  _rule: FromMethodSignatureExtractionRule,
-  methodDecl: MethodDeclaration,
-): MethodExtractionResult {
-  const parameters = methodDecl.getParameters().map(extractParameterInfo)
-  const returnTypeNode = methodDecl.getReturnTypeNode()
-
-  return new MethodExtractionResult({
-    value: new MethodSignature({
-      parameters,
-      returnType: returnTypeNode?.getText() ?? 'unknown',
-    }),
-  })
-}
-
-/** @riviere-role domain-service */
-export function evaluateFromConstructorParamsRule(
-  _rule: FromConstructorParamsExtractionRule,
-  classDecl: ClassDeclaration,
-): MethodExtractionResult {
-  const ctor = classDecl.getConstructors()[0]
-  if (ctor === undefined) {
-    return new MethodExtractionResult({ value: [] })
-  }
-
-  const parameters = ctor.getParameters().map(extractParameterInfo)
-  return new MethodExtractionResult({ value: parameters })
-}
-
-/** @riviere-role domain-service */
-export function evaluateFromParameterTypeRule(
-  rule: FromParameterTypeExtractionRule,
-  methodDecl: MethodDeclaration,
-): MethodExtractionResult {
-  const {
-    position, transform 
-  } = rule.fromParameterType
-
-  const params = methodDecl.getParameters()
-  const param = params[position]
-  if (param === undefined) {
-    throw new ExtractionError(
-      `Parameter position ${position} out of bounds. Method has ${params.length} parameter(s)`,
-      methodDecl.getSourceFile().getFilePath(),
-      methodDecl.getStartLineNumber(),
-    )
-  }
-
-  const typeNode = param.getTypeNode()
-  const typeName = typeNode?.getText() ?? 'unknown'
-
-  if (transform === undefined) {
-    return new MethodExtractionResult({ value: typeName })
-  }
-
-  return new MethodExtractionResult({ value: applyTransforms(typeName, transform) })
-}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/extraction-result.spec.ts b/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/extraction-result.spec.ts
deleted file mode 100644
index 0b91c2314..000000000
--- a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/extraction-result.spec.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import {
-  ExtractionContext, ExtractionResult 
-} from './extraction-result'
-
-describe('ExtractionContext', () => {
-  it('stores file path when constructed', () => {
-    const result = new ExtractionContext({ filePath: '/src/orders/order-service.ts' })
-
-    expect(result.filePath).toBe('/src/orders/order-service.ts')
-  })
-})
-
-describe('ExtractionResult', () => {
-  it('stores extracted value when constructed', () => {
-    const result = new ExtractionResult({ value: 'orders' })
-
-    expect(result.value).toBe('orders')
-  })
-})
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/extraction-result.ts b/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/extraction-result.ts
deleted file mode 100644
index 137ec7457..000000000
--- a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/extraction-result.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/** @riviere-role value-object */
-export class ExtractionContext {
-  declare private brand: 'ExtractionContext'
-  readonly filePath: string
-
-  constructor(params: { filePath: string }) {
-    this.filePath = params.filePath
-  }
-}
-
-type ExtractionValue = string | number | boolean | string[]
-
-/** @riviere-role value-object */
-export class ExtractionResult {
-  declare private brand: 'ExtractionResult'
-  readonly value: ExtractionValue
-
-  constructor(params: { value: ExtractionValue }) {
-    this.value = params.value
-  }
-}
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/index.ts b/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/index.ts
deleted file mode 100644
index 5e7d3c369..000000000
--- a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export {
-  ExtractionContext, ExtractionResult 
-} from './extraction-result'
-export type {
-  MethodSignature, ParameterInfo 
-} from './method-extraction-result'
-
-export { applyTransforms } from '../../../../platform/domain/string-transforms/transforms'
-
-export { ExtractionError } from '../../../../platform/domain/ast-literals/literal-detection'
diff --git a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/method-extraction-result.ts b/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/method-extraction-result.ts
deleted file mode 100644
index b1f0d18a3..000000000
--- a/packages/riviere-extract-ts/src/features/extraction/domain/value-extraction/method-extraction-result.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/** @riviere-role value-object */
-export class ParameterInfo {
-  declare private brand: 'ParameterInfo'
-  readonly name: string
-  readonly type: string
-
-  constructor(params: {
-    name: string;
-    type: string 
-  }) {
-    this.name = params.name
-    this.type = params.type
-  }
-}
-
-/** @riviere-role value-object */
-export class MethodSignature {
-  declare private brand: 'MethodSignature'
-  readonly parameters: ParameterInfo[]
-  readonly returnType: string
-
-  constructor(params: {
-    parameters: ParameterInfo[];
-    returnType: string 
-  }) {
-    this.parameters = params.parameters
-    this.returnType = params.returnType
-  }
-}
-
-type MethodExtractionValue = string | ParameterInfo[] | MethodSignature
-
-/** @riviere-role value-object */
-export class MethodExtractionResult {
-  declare private brand: 'MethodExtractionResult'
-  readonly value: MethodExtractionValue
-
-  constructor(params: { value: MethodExtractionValue }) {
-    this.value = params.value
-  }
-}
diff --git a/packages/riviere-extract-ts/src/index.ts b/packages/riviere-extract-ts/src/index.ts
deleted file mode 100644
index 0cab6fe63..000000000
--- a/packages/riviere-extract-ts/src/index.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-export { extractComponents } from './features/extraction/domain/component-extraction/extractor'
-export { DraftComponent } from './features/extraction/domain/component-extraction/draft-component'
-export { evaluatePredicate } from './features/extraction/domain/predicate-evaluation/evaluate-predicate'
-export { resolveConfig } from './features/extraction/domain/config-resolution/resolve-config'
-export { MissingComponentRuleError } from './features/extraction/domain/config-resolution/config-resolution-errors'
-export {
-  applyTransforms,
-  ExtractionError,
-  type ExtractionContext,
-  type ExtractionResult,
-  type ParameterInfo,
-  type MethodSignature,
-} from './features/extraction/domain/value-extraction'
-export {
-  detectConnections,
-  detectPerModuleConnections,
-  detectCrossModuleConnections,
-  deduplicateCrossStrategy,
-} from './features/extraction/domain/connection-detection/detect-connections'
-export {
-  ConnectionDetectionOptions,
-  ConnectionDetectionResult,
-  ConnectionTimings,
-  PerModuleConnectionOptions,
-  PerModuleDetectionResult,
-  PerModuleTimings,
-  CrossModuleConnectionOptions,
-  CrossModuleDetectionResult,
-  CrossModuleTimings,
-} from './features/extraction/domain/connection-detection/connection-detection-values'
-export { ExtractedLink } from './features/extraction/domain/connection-detection/extracted-link'
-export { ComponentIndex } from './features/extraction/domain/connection-detection/component-index'
-export { ConnectionDetectionError } from './features/extraction/domain/connection-detection/connection-detection-error'
-export { stripResolvedCustomTypes } from './features/extraction/domain/connection-detection/resolve-http-links'
-export { enrichComponents } from './features/extraction/domain/value-extraction/enrich-components'
-export {
-  EnrichedComponent,
-  EnrichmentFailure,
-  EnrichmentResult,
-} from './features/extraction/domain/value-extraction/enriched-component'
diff --git a/packages/riviere-extract-ts/src/platform/infra/external-clients/minimatch/minimatch-glob.spec.ts b/packages/riviere-extract-ts/src/platform/infra/external-clients/minimatch/minimatch-glob.spec.ts
deleted file mode 100644
index 8b52881a7..000000000
--- a/packages/riviere-extract-ts/src/platform/infra/external-clients/minimatch/minimatch-glob.spec.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import { matchesGlob } from './minimatch-glob'
-
-describe('matchesGlob', () => {
-  it('returns true when path matches glob pattern', () => {
-    expect(matchesGlob('orders/use-cases/create-order.ts', 'orders/**')).toBe(true)
-  })
-
-  it('returns false when path does not match glob pattern', () => {
-    expect(matchesGlob('shipping/handlers/ship.ts', 'orders/**')).toBe(false)
-  })
-
-  it('matches exact file name', () => {
-    expect(matchesGlob('index.ts', 'index.ts')).toBe(true)
-  })
-
-  it('matches nested glob patterns', () => {
-    expect(matchesGlob('src/orders/api/controller.ts', 'src/**/api/**')).toBe(true)
-  })
-})
diff --git a/packages/riviere-extract-ts/src/platform/infra/external-clients/minimatch/minimatch-glob.ts b/packages/riviere-extract-ts/src/platform/infra/external-clients/minimatch/minimatch-glob.ts
deleted file mode 100644
index 50e3914cd..000000000
--- a/packages/riviere-extract-ts/src/platform/infra/external-clients/minimatch/minimatch-glob.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { minimatch } from 'minimatch'
-
-/** @riviere-role external-client-service */
-export function matchesGlob(path: string, pattern: string): boolean {
-  return minimatch(path, pattern)
-}
diff --git a/packages/riviere-extract-ts/src/test-fixtures.ts b/packages/riviere-extract-ts/src/test-fixtures.ts
deleted file mode 100644
index b423ea3a3..000000000
--- a/packages/riviere-extract-ts/src/test-fixtures.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import type {
-  ResolvedExtractionConfig,
-  Module,
-  DetectionRule,
-  CustomTypes,
-  ComponentType,
-} from '@living-architecture/riviere-extract-config'
-
-const NOT_USED = { notUsed: true } as const
-
-function createMinimalModule(overrides: Partial<Module> = {}): Module {
-  return {
-    name: 'test-module',
-    domain: 'test-domain',
-    path: '.',
-    glob: 'src/**',
-    api: NOT_USED,
-    useCase: NOT_USED,
-    domainOp: NOT_USED,
-    event: NOT_USED,
-    eventHandler: NOT_USED,
-    ui: NOT_USED,
-    ...overrides,
-  }
-}
-
-export function createResolvedConfig(): ResolvedExtractionConfig {
-  return { modules: [createMinimalModule()] }
-}
-
-export function createConfigWithCustomTypes(
-  domain: string,
-  modulePath: string,
-  customTypes: CustomTypes,
-  moduleGlob = '**',
-): ResolvedExtractionConfig {
-  return {
-    modules: [
-      createMinimalModule({
-        name: `${domain}-module`,
-        domain,
-        path: modulePath,
-        glob: moduleGlob,
-        customTypes,
-      }),
-    ],
-  }
-}
-
-export function createConfigWithRule(
-  domain: string,
-  modulePath: string,
-  componentType: ComponentType,
-  rule: DetectionRule,
-  moduleGlob = '**',
-): ResolvedExtractionConfig {
-  return {
-    modules: [
-      createMinimalModule({
-        name: `${domain}-module`,
-        domain,
-        path: modulePath,
-        glob: moduleGlob,
-        [componentType]: rule,
-      }),
-    ],
-  }
-}
-
-export function createOrdersUseCaseConfig(
-  modulePath = 'orders',
-  moduleGlob = '**',
-): ResolvedExtractionConfig {
-  return createConfigWithRule(
-    'orders',
-    modulePath,
-    'useCase',
-    {
-      find: 'classes',
-      where: { hasDecorator: { name: 'UseCase' } },
-    },
-    moduleGlob,
-  )
-}
diff --git a/packages/riviere-extract-ts/tsconfig.json b/packages/riviere-extract-ts/tsconfig.json
deleted file mode 100644
index 62ebbd946..000000000
--- a/packages/riviere-extract-ts/tsconfig.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ]
-}
diff --git a/packages/riviere-extract-ts/tsconfig.lib.json b/packages/riviere-extract-ts/tsconfig.lib.json
deleted file mode 100644
index b0e3f58c2..000000000
--- a/packages/riviere-extract-ts/tsconfig.lib.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "baseUrl": ".",
-    "rootDir": "src",
-    "outDir": "dist",
-    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
-    "emitDeclarationOnly": false,
-    "forceConsistentCasingInFileNames": true
-  },
-  "include": ["src/**/*.ts"],
-  "references": [
-    {
-      "path": "../riviere-schema/tsconfig.lib.json"
-    },
-    {
-      "path": "../riviere-extract-config/tsconfig.lib.json"
-    }
-  ],
-  "exclude": [
-    "vite.config.ts",
-    "vite.config.mts",
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx"
-  ]
-}
diff --git a/packages/riviere-extract-ts/tsconfig.spec.json b/packages/riviere-extract-ts/tsconfig.spec.json
deleted file mode 100644
index 73856cc71..000000000
--- a/packages/riviere-extract-ts/tsconfig.spec.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./out-tsc/vitest",
-    "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node", "vitest"],
-    "forceConsistentCasingInFileNames": true
-  },
-  "include": [
-    "vite.config.ts",
-    "vite.config.mts",
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx",
-    "src/**/*.d.ts"
-  ],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "../riviere-extract-config/tsconfig.lib.json"
-    }
-  ]
-}
diff --git a/packages/riviere-extract-ts/use-cases/README.md b/packages/riviere-extract-ts/use-cases/README.md
new file mode 100644
index 000000000..457420d8d
--- /dev/null
+++ b/packages/riviere-extract-ts/use-cases/README.md
@@ -0,0 +1,7 @@
+# use-cases
+
+This library was generated with [Nx](https://nx.dev).
+
+## Building
+
+Run `nx build use-cases` to build the library.
diff --git a/packages/riviere-extract-ts/use-cases/package.json b/packages/riviere-extract-ts/use-cases/package.json
new file mode 100644
index 000000000..cb1823c8f
--- /dev/null
+++ b/packages/riviere-extract-ts/use-cases/package.json
@@ -0,0 +1,39 @@
+{
+  "name": "@living-architecture/riviere-extract-ts-use-cases",
+  "version": "0.0.1",
+  "publishConfig": {
+    "access": "public"
+  },
+  "type": "module",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "@living-architecture/source": "./src/index.ts",
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
+    },
+    "./features/*": {
+      "@living-architecture/source": "./src/features/*.ts",
+      "types": "./dist/features/*.d.ts",
+      "import": "./dist/features/*.js",
+      "default": "./dist/features/*.js"
+    }
+  },
+  "files": [
+    "dist",
+    "!dist/**/__fixtures__/**",
+    "!**/*.tsbuildinfo"
+  ],
+  "dependencies": {
+    "@living-architecture/riviere-extract-config-published-language": "workspace:*",
+    "@living-architecture/riviere-extract-ts-domain-model": "workspace:*",
+    "@living-architecture/riviere-schema-published-language": "workspace:*",
+    "glob": "^11.0.2",
+    "ts-morph": "^24.0.0",
+    "yaml": "^2.7.0"
+  }
+}
diff --git a/packages/riviere-extract-ts/use-cases/project.json b/packages/riviere-extract-ts/use-cases/project.json
new file mode 100644
index 000000000..0b0cdfec1
--- /dev/null
+++ b/packages/riviere-extract-ts/use-cases/project.json
@@ -0,0 +1,18 @@
+{
+  "name": "@living-architecture/riviere-extract-ts-use-cases",
+  "targets": {
+    "build": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          "node ../../../scripts/build-public-exports.mjs . --clean",
+          "tsc --build tsconfig.lib.json",
+          "node ../../../scripts/build-public-exports.mjs ."
+        ],
+        "cwd": "{projectRoot}",
+        "parallel": false
+      },
+      "outputs": ["{projectRoot}/dist"]
+    }
+  }
+}
diff --git a/packages/riviere-extract-ts/use-cases/src/__fixtures__/command-test-fixtures.ts b/packages/riviere-extract-ts/use-cases/src/__fixtures__/command-test-fixtures.ts
new file mode 100644
index 000000000..b0f7ce191
--- /dev/null
+++ b/packages/riviere-extract-ts/use-cases/src/__fixtures__/command-test-fixtures.ts
@@ -0,0 +1,26 @@
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach } from 'vitest'
+
+export interface TestContext {
+  testDir: string
+  originalCwd: string
+}
+
+export function createTestContext(): TestContext {
+  return { originalCwd: '', testDir: '' }
+}
+
+export function setupCommandTest(ctx: TestContext): void {
+  beforeEach(async () => {
+    ctx.testDir = await mkdtemp(join(tmpdir(), 'riviere-test-'))
+    ctx.originalCwd = process.cwd()
+    process.chdir(ctx.testDir)
+  })
+
+  afterEach(async () => {
+    process.chdir(ctx.originalCwd)
+    await rm(ctx.testDir, { force: true, recursive: true })
+  })
+}
diff --git a/packages/riviere-cli/src/features/extract/commands/enrich-draft-components-input.ts b/packages/riviere-extract-ts/use-cases/src/features/extract/commands/enrich-draft-components-input.ts
similarity index 100%
rename from packages/riviere-cli/src/features/extract/commands/enrich-draft-components-input.ts
rename to packages/riviere-extract-ts/use-cases/src/features/extract/commands/enrich-draft-components-input.ts
diff --git a/packages/riviere-extract-ts/use-cases/src/features/extract/commands/enrich-draft-components-result.ts b/packages/riviere-extract-ts/use-cases/src/features/extract/commands/enrich-draft-components-result.ts
new file mode 100644
index 000000000..b510fc1f5
--- /dev/null
+++ b/packages/riviere-extract-ts/use-cases/src/features/extract/commands/enrich-draft-components-result.ts
@@ -0,0 +1,55 @@
+import type { ExternalLink } from '@living-architecture/riviere-schema-published-language/schema'
+import type { DraftComponent } from '@living-architecture/riviere-extract-ts-domain-model/domain/component-extraction/draft-component'
+import type { ConnectionTimings } from '@living-architecture/riviere-extract-ts-domain-model/domain/connection-detection/connection-detection-values'
+import type { ExtractedLink } from '@living-architecture/riviere-extract-ts-domain-model/domain/connection-detection/extracted-link'
+import type { EnrichedComponent } from '@living-architecture/riviere-extract-ts-domain-model/domain/value-extraction/enriched-component'
+
+interface EnrichDraftComponentsDraftOnlyResult {
+  kind: 'draftOnly'
+  components: readonly DraftComponent[]
+}
+
+interface EnrichDraftComponentsFullResult {
+  kind: 'full'
+  components: readonly EnrichedComponent[]
+  links: readonly ExtractedLink[]
+  externalLinks: readonly ExternalLink[]
+  timings: readonly ConnectionTimings[]
+  failedFields: readonly string[]
+}
+
+interface EnrichDraftComponentsFieldFailureResult {
+  kind: 'fieldFailure'
+  failedFields: readonly string[]
+}
+
+interface EnrichDraftComponentsConfigFailureResult {
+  kind: 'configFailure'
+  code: 'CONFIG_NOT_FOUND' | 'VALIDATION_ERROR'
+  message: string
+}
+
+interface EnrichDraftComponentsConnectionFailureResult {
+  kind: 'connectionDetectionFailure'
+  message: string
+}
+
+interface EnrichDraftComponentsDataAccessFailureResult {
+  kind: 'dataAccessFailure'
+  code:
+    | 'BASE_BRANCH_NOT_FOUND'
+    | 'FILE_READ_ERROR'
+    | 'GIT_NOT_FOUND'
+    | 'NOT_A_REPOSITORY'
+    | 'NO_REMOTE'
+  message: string
+}
+
+/** @riviere-role command-use-case-result */
+export type EnrichDraftComponentsResult =
+  | EnrichDraftComponentsDraftOnlyResult
+  | EnrichDraftComponentsFullResult
+  | EnrichDraftComponentsFieldFailureResult
+  | EnrichDraftComponentsConfigFailureResult
+  | EnrichDraftComponentsConnectionFailureResult
+  | EnrichDraftComponentsDataAccessFailureResult
diff --git a/packages/riviere-extract-ts/use-cases/src/features/extract/commands/enrich-draft-components.spec.ts b/packages/riviere-extract-ts/use-cases/src/features/extract/commands/enrich-draft-components.spec.ts
new file mode 100644
index 000000000..5e8e104af
--- /dev/null
+++ b/packages/riviere-extract-ts/use-cases/src/features/extract/commands/enrich-draft-components.spec.ts
@@ -0,0 +1,152 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const mocks = vi.hoisted(() => ({
+  enrichDraftComponentsMethodMock: vi.fn(),
+  loadFromDraftEnrichmentMock: vi.fn(),
+}))
+
+vi.mock('../data-access/extraction-project/extraction-project-repository', () => ({
+  ExtractionProjectRepository: class {
+    loadFromDraftEnrichment = mocks.loadFromDraftEnrichmentMock
+  },
+}))
+
+import { EnrichDraftComponents } from './enrich-draft-components'
+import { ExtractionProjectRepository } from '../data-access/extraction-project/extraction-project-repository'
+import { ExtractionConfigError } from '../data-access/extraction-project/extraction-config-error'
+import { ExtractionDataAccessError } from '../data-access/extraction-project/extraction-project-error'
+import { ConnectionDetectionError } from '@living-architecture/riviere-extract-ts-domain-model/domain/connection-detection/connection-detection-error'
+
+class UnexpectedLoadingError extends Error {}
+
+describe('enrichDraftComponents', () => {
+  beforeEach(() => {
+    vi.resetAllMocks()
+    mocks.loadFromDraftEnrichmentMock.mockReturnValue({
+      enrichDraftComponents: mocks.enrichDraftComponentsMethodMock,
+    })
+    mocks.enrichDraftComponentsMethodMock.mockReturnValue({
+      kind: 'draftOnly',
+      components: [{ name: 'Draft' }],
+    })
+  })
+
+  it('returns draft-only results when connections are disabled', () => {
+    const result = new EnrichDraftComponents(new ExtractionProjectRepository()).execute({
+      allowIncomplete: false,
+      configPath: 'config.yml',
+      draftComponentsPath: 'draft.json',
+      includeConnections: false,
+      useTsConfig: true,
+    })
+
+    expect(result).toStrictEqual({
+      kind: 'draftOnly',
+      components: [{ name: 'Draft' }],
+    })
+    expect(mocks.enrichDraftComponentsMethodMock).toHaveBeenCalledWith({
+      allowIncomplete: false,
+      includeConnections: false,
+    })
+  })
+
+  it('returns field failure when enrichment fails and incomplete output is disabled', () => {
+    mocks.enrichDraftComponentsMethodMock.mockReturnValue({
+      kind: 'fieldFailure',
+      failedFields: ['fieldA'],
+    })
+
+    const result = new EnrichDraftComponents(new ExtractionProjectRepository()).execute({
+      allowIncomplete: false,
+      configPath: 'config.yml',
+      draftComponentsPath: 'draft.json',
+      includeConnections: true,
+      useTsConfig: true,
+    })
+
+    expect(result).toStrictEqual({
+      kind: 'fieldFailure',
+      failedFields: ['fieldA'],
+    })
+  })
+
+  it('returns config failure when loading the extraction config fails', () => {
+    mocks.loadFromDraftEnrichmentMock.mockImplementation(() => {
+      throw new ExtractionConfigError('VALIDATION_ERROR', 'Invalid extraction config')
+    })
+
+    const result = new EnrichDraftComponents(new ExtractionProjectRepository()).execute({
+      allowIncomplete: false,
+      configPath: 'config.yml',
+      draftComponentsPath: 'draft.json',
+      includeConnections: true,
+      useTsConfig: true,
+    })
+
+    expect(result).toStrictEqual({
+      code: 'VALIDATION_ERROR',
+      kind: 'configFailure',
+      message: 'Invalid extraction config',
+    })
+  })
+
+  it('returns connection detection failure from enrichment', () => {
+    mocks.enrichDraftComponentsMethodMock.mockImplementation(() => {
+      throw new ConnectionDetectionError({
+        file: 'src/handler.ts',
+        line: 42,
+        reason: 'Could not resolve type',
+        typeName: 'OrderService',
+      })
+    })
+
+    const result = new EnrichDraftComponents(new ExtractionProjectRepository()).execute({
+      allowIncomplete: false,
+      configPath: 'config.yml',
+      draftComponentsPath: 'draft.json',
+      includeConnections: true,
+      useTsConfig: true,
+    })
+
+    expect(result).toStrictEqual({
+      kind: 'connectionDetectionFailure',
+      message: 'src/handler.ts:42: Could not resolve type — OrderService',
+    })
+  })
+
+  it('returns data access failure when loading the extraction project fails', () => {
+    mocks.loadFromDraftEnrichmentMock.mockImplementation(() => {
+      throw new ExtractionDataAccessError('FILE_READ_ERROR', 'Could not read draft components')
+    })
+
+    const result = new EnrichDraftComponents(new ExtractionProjectRepository()).execute({
+      allowIncomplete: false,
+      configPath: 'config.yml',
+      draftComponentsPath: 'draft.json',
+      includeConnections: true,
+      useTsConfig: true,
+    })
+
+    expect(result).toStrictEqual({
+      code: 'FILE_READ_ERROR',
+      kind: 'dataAccessFailure',
+      message: 'Could not read draft components',
+    })
+  })
+
+  it('rethrows unexpected loading errors', () => {
+    mocks.loadFromDraftEnrichmentMock.mockImplementation(() => {
+      throw new UnexpectedLoadingError('Unexpected failure')
+    })
+
+    expect(() =>
+      new EnrichDraftComponents(new ExtractionProjectRepository()).execute({
+        allowIncomplete: false,
+        configPath: 'config.yml',
+        draftComponentsPath: 'draft.json',
+        includeConnections: true,
+        useTsConfig: true,
+      }),
+    ).toThrow('Unexpected failure')
+  })
+})
diff --git a/packages/riviere-extract-ts/use-cases/src/features/extract/commands/enrich-draft-components.ts b/packages/riviere-extract-ts/use-cases/src/features/extract/commands/enrich-draft-components.ts
new file mode 100644
index 000000000..c5a64fa36
--- /dev/null
+++ b/packages/riviere-extract-ts/use-cases/src/features/extract/commands/enrich-draft-components.ts
@@ -0,0 +1,44 @@
+import { ExtractionProjectRepository } from '../data-access/extraction-project/extraction-project-repository'
+import { ExtractionConfigError } from '../data-access/extraction-project/extraction-config-error'
+import { ConnectionDetectionError } from '@living-architecture/riviere-extract-ts-domain-model/domain/connection-detection/connection-detection-error'
+import type { EnrichDraftComponentsInput } from './enrich-draft-components-input'
+import type { EnrichDraftComponentsResult } from './enrich-draft-components-result'
+import { ExtractionDataAccessError } from '../data-access/extraction-project/extraction-project-error'
+
+/** @riviere-role command-use-case */
+export class EnrichDraftComponents {
+  constructor(private readonly extractionProjectRepository: ExtractionProjectRepository) {}
+
+  execute(enrichDraftComponentsInput: EnrichDraftComponentsInput): EnrichDraftComponentsResult {
+    try {
+      const extractionProject = this.extractionProjectRepository.loadFromDraftEnrichment({
+        configPath: enrichDraftComponentsInput.configPath,
+        draftComponentsPath: enrichDraftComponentsInput.draftComponentsPath,
+        useTsConfig: enrichDraftComponentsInput.useTsConfig,
+      })
+
+      return extractionProject.enrichDraftComponents({
+        allowIncomplete: enrichDraftComponentsInput.allowIncomplete,
+        includeConnections: enrichDraftComponentsInput.includeConnections,
+      })
+    } catch (error) {
+      if (error instanceof ConnectionDetectionError) {
+        return {
+          kind: 'connectionDetectionFailure',
+          message: `${error.file}:${error.line}: ${error.reason} — ${error.typeName}`,
+        }
+      }
+      if (error instanceof ExtractionConfigError) {
+        return {
+          code: error.code,
+          kind: 'configFailure',
+          message: error.message,
+        }
+      }
+      if (error instanceof ExtractionDataAccessError) {
+        return { code: error.code, kind: 'dataAccessFailure', message: error.message }
+      }
+      throw error
+    }
+  }
+}
diff --git a/packages/riviere-cli/src/features/extract/commands/extract-draft-components-input.ts b/packages/riviere-extract-ts/use-cases/src/features/extract/commands/extract-draft-components-input.ts
similarity index 100%
rename from packages/riviere-cli/src/features/extract/commands/extract-draft-components-input.ts
rename to packages/riviere-extract-ts/use-cases/src/features/extract/commands/extract-draft-components-input.ts
diff --git a/packages/riviere-extract-ts/use-cases/src/features/extract/commands/extract-draft-components-result.ts b/packages/riviere-extract-ts/use-cases/src/features/extract/commands/extract-draft-components-result.ts
new file mode 100644
index 000000000..89f5f6f4c
--- /dev/null
+++ b/packages/riviere-extract-ts/use-cases/src/features/extract/commands/extract-draft-components-result.ts
@@ -0,0 +1,55 @@
+import type { ExternalLink } from '@living-architecture/riviere-schema-published-language/schema'
+import type { DraftComponent } from '@living-architecture/riviere-extract-ts-domain-model/domain/component-extraction/draft-component'
+import type { ConnectionTimings } from '@living-architecture/riviere-extract-ts-domain-model/domain/connection-detection/connection-detection-values'
+import type { ExtractedLink } from '@living-architecture/riviere-extract-ts-domain-model/domain/connection-detection/extracted-link'
+import type { EnrichedComponent } from '@living-architecture/riviere-extract-ts-domain-model/domain/value-extraction/enriched-component'
+
+interface ExtractDraftComponentsDraftOnlyResult {
+  kind: 'draftOnly'
+  components: readonly DraftComponent[]
+}
+
+interface ExtractDraftComponentsFullResult {
+  kind: 'full'
+  components: readonly EnrichedComponent[]
+  links: readonly ExtractedLink[]
+  externalLinks: readonly ExternalLink[]
+  timings: readonly ConnectionTimings[]
+  failedFields: readonly string[]
+}
+
+interface ExtractDraftComponentsFieldFailureResult {
+  kind: 'fieldFailure'
+  failedFields: readonly string[]
+}
+
+interface ExtractDraftComponentsConfigFailureResult {
+  kind: 'configFailure'
+  code: 'CONFIG_NOT_FOUND' | 'VALIDATION_ERROR'
+  message: string
+}
+
+interface ExtractDraftComponentsConnectionFailureResult {
+  kind: 'connectionDetectionFailure'
+  message: string
+}
+
+interface ExtractDraftComponentsDataAccessFailureResult {
+  kind: 'dataAccessFailure'
+  code:
+    | 'BASE_BRANCH_NOT_FOUND'
+    | 'FILE_READ_ERROR'
+    | 'GIT_NOT_FOUND'
+    | 'NOT_A_REPOSITORY'
+    | 'NO_REMOTE'
+  message: string
+}
+
+/** @riviere-role command-use-case-result */
+export type ExtractDraftComponentsResult =
+  | ExtractDraftComponentsDraftOnlyResult
+  | ExtractDraftComponentsFullResult
+  | ExtractDraftComponentsFieldFailureResult
+  | ExtractDraftComponentsConfigFailureResult
+  | ExtractDraftComponentsConnectionFailureResult
+  | ExtractDraftComponentsDataAccessFailureResult
diff --git a/packages/riviere-extract-ts/use-cases/src/features/extract/commands/extract-draft-components.spec.ts b/packages/riviere-extract-ts/use-cases/src/features/extract/commands/extract-draft-components.spec.ts
new file mode 100644
index 000000000..e71b5fce6
--- /dev/null
+++ b/packages/riviere-extract-ts/use-cases/src/features/extract/commands/extract-draft-components.spec.ts
@@ -0,0 +1,208 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const mocks = vi.hoisted(() => ({
+  extractDraftComponentsMethodMock: vi.fn(),
+  loadFromChangedProjectMock: vi.fn(),
+  loadFromFullProjectMock: vi.fn(),
+  loadFromSelectedFilesMock: vi.fn(),
+}))
+
+vi.mock('../data-access/extraction-project/extraction-project-repository', () => ({
+  ExtractionProjectRepository: class {
+    loadFromChangedProject = mocks.loadFromChangedProjectMock
+    loadFromFullProject = mocks.loadFromFullProjectMock
+    loadFromSelectedFiles = mocks.loadFromSelectedFilesMock
+  },
+}))
+
+import { ExtractDraftComponents } from './extract-draft-components'
+import { ExtractionProjectRepository } from '../data-access/extraction-project/extraction-project-repository'
+import { ExtractionConfigError } from '../data-access/extraction-project/extraction-config-error'
+import { ConnectionDetectionError } from '@living-architecture/riviere-extract-ts-domain-model/domain/connection-detection/connection-detection-error'
+
+const DRAFT_ONLY_RESULT = {
+  kind: 'draftOnly' as const,
+  components: [],
+}
+
+class UnexpectedLoadingError extends Error {}
+
+describe('extractDraftComponents', () => {
+  beforeEach(() => {
+    vi.resetAllMocks()
+    mocks.loadFromChangedProjectMock.mockReturnValue({
+      extractDraftComponents: mocks.extractDraftComponentsMethodMock,
+    })
+    mocks.loadFromFullProjectMock.mockReturnValue({
+      extractDraftComponents: mocks.extractDraftComponentsMethodMock,
+    })
+    mocks.loadFromSelectedFilesMock.mockReturnValue({
+      extractDraftComponents: mocks.extractDraftComponentsMethodMock,
+    })
+    mocks.extractDraftComponentsMethodMock.mockReturnValue(DRAFT_ONLY_RESULT)
+  })
+
+  describe('pull-request source mode', () => {
+    it('loads from changed project with base branch when provided', () => {
+      new ExtractDraftComponents(new ExtractionProjectRepository()).execute({
+        allowIncomplete: false,
+        baseBranch: 'main',
+        configPath: 'config.yml',
+        includeConnections: true,
+        sourceMode: 'pull-request',
+        useTsConfig: false,
+      })
+
+      expect(mocks.loadFromChangedProjectMock).toHaveBeenCalledWith({
+        baseBranch: 'main',
+        configPath: 'config.yml',
+        useTsConfig: false,
+      })
+    })
+
+    it('loads from changed project without base branch when not provided', () => {
+      new ExtractDraftComponents(new ExtractionProjectRepository()).execute({
+        allowIncomplete: false,
+        configPath: 'config.yml',
+        includeConnections: true,
+        sourceMode: 'pull-request',
+        useTsConfig: false,
+      })
+
+      expect(mocks.loadFromChangedProjectMock).toHaveBeenCalledWith({
+        configPath: 'config.yml',
+        useTsConfig: false,
+      })
+    })
+  })
+
+  describe('files source mode', () => {
+    it('loads from selected files when files are provided', () => {
+      new ExtractDraftComponents(new ExtractionProjectRepository()).execute({
+        allowIncomplete: false,
+        configPath: 'config.yml',
+        files: ['src/foo.ts', 'src/bar.ts'],
+        includeConnections: false,
+        sourceMode: 'files',
+        useTsConfig: true,
+      })
+
+      expect(mocks.loadFromSelectedFilesMock).toHaveBeenCalledWith({
+        configPath: 'config.yml',
+        filePaths: ['src/foo.ts', 'src/bar.ts'],
+        useTsConfig: true,
+      })
+    })
+
+    it('defaults filePaths to empty array when files is undefined', () => {
+      new ExtractDraftComponents(new ExtractionProjectRepository()).execute({
+        allowIncomplete: false,
+        configPath: 'config.yml',
+        includeConnections: false,
+        sourceMode: 'files',
+        useTsConfig: true,
+      })
+
+      expect(mocks.loadFromSelectedFilesMock).toHaveBeenCalledWith({
+        configPath: 'config.yml',
+        filePaths: [],
+        useTsConfig: true,
+      })
+    })
+  })
+
+  describe('all source mode', () => {
+    it('loads from full project', () => {
+      new ExtractDraftComponents(new ExtractionProjectRepository()).execute({
+        allowIncomplete: false,
+        configPath: 'config.yml',
+        includeConnections: true,
+        sourceMode: 'all',
+        useTsConfig: true,
+      })
+
+      expect(mocks.loadFromFullProjectMock).toHaveBeenCalledWith({
+        configPath: 'config.yml',
+        useTsConfig: true,
+      })
+    })
+  })
+
+  describe('result forwarding', () => {
+    it('returns the extraction result', () => {
+      const result = new ExtractDraftComponents(new ExtractionProjectRepository()).execute({
+        allowIncomplete: true,
+        configPath: 'config.yml',
+        includeConnections: false,
+        sourceMode: 'all',
+        useTsConfig: false,
+      })
+
+      expect(result).toStrictEqual(DRAFT_ONLY_RESULT)
+      expect(mocks.extractDraftComponentsMethodMock).toHaveBeenCalledWith({
+        allowIncomplete: true,
+        includeConnections: false,
+      })
+    })
+
+    it('returns config failure when loading the extraction config fails', () => {
+      mocks.loadFromFullProjectMock.mockImplementation(() => {
+        throw new ExtractionConfigError('CONFIG_NOT_FOUND', 'Config file not found')
+      })
+
+      const result = new ExtractDraftComponents(new ExtractionProjectRepository()).execute({
+        allowIncomplete: true,
+        configPath: 'missing.yml',
+        includeConnections: false,
+        sourceMode: 'all',
+        useTsConfig: false,
+      })
+
+      expect(result).toStrictEqual({
+        code: 'CONFIG_NOT_FOUND',
+        kind: 'configFailure',
+        message: 'Config file not found',
+      })
+    })
+
+    it('returns connection detection failure from extraction', () => {
+      mocks.extractDraftComponentsMethodMock.mockImplementation(() => {
+        throw new ConnectionDetectionError({
+          file: 'src/handler.ts',
+          line: 42,
+          reason: 'Could not resolve type',
+          typeName: 'OrderService',
+        })
+      })
+
+      const result = new ExtractDraftComponents(new ExtractionProjectRepository()).execute({
+        allowIncomplete: false,
+        configPath: 'config.yml',
+        includeConnections: true,
+        sourceMode: 'all',
+        useTsConfig: true,
+      })
+
+      expect(result).toStrictEqual({
+        kind: 'connectionDetectionFailure',
+        message: 'src/handler.ts:42: Could not resolve type — OrderService',
+      })
+    })
+
+    it('rethrows unexpected loading errors', () => {
+      mocks.loadFromFullProjectMock.mockImplementation(() => {
+        throw new UnexpectedLoadingError('Unexpected failure')
+      })
+
+      expect(() =>
+        new ExtractDraftComponents(new ExtractionProjectRepository()).execute({
+          allowIncomplete: true,
+          configPath: 'config.yml',
+          includeConnections: false,
+          sourceMode: 'all',
+          useTsConfig: false,
+        }),
+      ).toThrow('Unexpected failure')
+    })
+  })
+})
diff --git a/packages/riviere-extract-ts/use-cases/src/features/extract/commands/extract-draft-components.ts b/packages/riviere-extract-ts/use-cases/src/features/extract/commands/extract-draft-components.ts
new file mode 100644
index 000000000..692ce0bed
--- /dev/null
+++ b/packages/riviere-extract-ts/use-cases/src/features/extract/commands/extract-draft-components.ts
@@ -0,0 +1,71 @@
+import { ExtractionProjectRepository } from '../data-access/extraction-project/extraction-project-repository'
+import { ExtractionConfigError } from '../data-access/extraction-project/extraction-config-error'
+import { ConnectionDetectionError } from '@living-architecture/riviere-extract-ts-domain-model/domain/connection-detection/connection-detection-error'
+import type { ExtractDraftComponentsInput } from './extract-draft-components-input'
+import type { ExtractDraftComponentsResult } from './extract-draft-components-result'
+import { ExtractionDataAccessError } from '../data-access/extraction-project/extraction-project-error'
+
+/** @riviere-role command-use-case */
+export class ExtractDraftComponents {
+  constructor(private readonly extractionProjectRepository: ExtractionProjectRepository) {}
+
+  execute(extractDraftComponentsInput: ExtractDraftComponentsInput): ExtractDraftComponentsResult {
+    try {
+      const extractionProject = loadProjectFromInput(
+        this.extractionProjectRepository,
+        extractDraftComponentsInput,
+      )
+
+      return extractionProject.extractDraftComponents({
+        allowIncomplete: extractDraftComponentsInput.allowIncomplete,
+        includeConnections: extractDraftComponentsInput.includeConnections,
+      })
+    } catch (error) {
+      if (error instanceof ConnectionDetectionError) {
+        return {
+          kind: 'connectionDetectionFailure',
+          message: `${error.file}:${error.line}: ${error.reason} — ${error.typeName}`,
+        }
+      }
+      if (error instanceof ExtractionConfigError) {
+        return {
+          code: error.code,
+          kind: 'configFailure',
+          message: error.message,
+        }
+      }
+      if (error instanceof ExtractionDataAccessError) {
+        return { code: error.code, kind: 'dataAccessFailure', message: error.message }
+      }
+      throw error
+    }
+  }
+}
+
+function loadProjectFromInput(
+  extractionProjectRepository: ExtractionProjectRepository,
+  extractDraftComponentsInput: ExtractDraftComponentsInput,
+) {
+  if (extractDraftComponentsInput.sourceMode === 'pull-request') {
+    return extractionProjectRepository.loadFromChangedProject({
+      configPath: extractDraftComponentsInput.configPath,
+      ...(extractDraftComponentsInput.baseBranch === undefined
+        ? {}
+        : { baseBranch: extractDraftComponentsInput.baseBranch }),
+      useTsConfig: extractDraftComponentsInput.useTsConfig,
+    })
+  }
+
+  if (extractDraftComponentsInput.sourceMode === 'files') {
+    return extractionProjectRepository.loadFromSelectedFiles({
+      configPath: extractDraftComponentsInput.configPath,
+      filePaths: extractDraftComponentsInput.files ?? [],
+      useTsConfig: extractDraftComponentsInput.useTsConfig,
+    })
+  }
+
+  return extractionProjectRepository.loadFromFullProject({
+    configPath: extractDraftComponentsInput.configPath,
+    useTsConfig: extractDraftComponentsInput.useTsConfig,
+  })
+}
diff --git a/packages/riviere-extract-ts/use-cases/src/features/extract/data-access/extraction-project/extraction-config-error.ts b/packages/riviere-extract-ts/use-cases/src/features/extract/data-access/extraction-project/extraction-config-error.ts
new file mode 100644
index 000000000..b16483c74
--- /dev/null
+++ b/packages/riviere-extract-ts/use-cases/src/features/extract/data-access/extraction-project/extraction-config-error.ts
@@ -0,0 +1,10 @@
+/** @riviere-role data-access-error */
+export class ExtractionConfigError extends Error {
+  constructor(
+    readonly code: 'CONFIG_NOT_FOUND' | 'VALIDATION_ERROR',
+    message: string,
+  ) {
+    super(message)
+    this.name = 'ExtractionConfigError'
+  }
+}
diff --git a/packages/riviere-extract-ts/use-cases/src/features/extract/data-access/extraction-project/extraction-project-error.ts b/packages/riviere-extract-ts/use-cases/src/features/extract/data-access/extraction-project/extraction-project-error.ts
new file mode 100644
index 000000000..5454fb6bc
--- /dev/null
+++ b/packages/riviere-extract-ts/use-cases/src/features/extract/data-access/extraction-project/extraction-project-error.ts
@@ -0,0 +1,17 @@
+type ExtractionDataAccessErrorCode =
+  | 'BASE_BRANCH_NOT_FOUND'
+  | 'FILE_READ_ERROR'
+  | 'GIT_NOT_FOUND'
+  | 'NOT_A_REPOSITORY'
+  | 'NO_REMOTE'
+
+/** @riviere-role data-access-error */
+export class ExtractionDataAccessError extends Error {
+  constructor(
+    readonly code: ExtractionDataAccessErrorCode,
+    message: string,
+  ) {
+    super(message)
+    this.name = 'ExtractionDataAccessError'
+  }
+}
diff --git a/packages/riviere-extract-ts/use-cases/src/features/extract/data-access/extraction-project/extraction-project-repository-draft-components.spec.ts b/packages/riviere-extract-ts/use-cases/src/features/extract/data-access/extraction-project/extraction-project-repository-draft-components.spec.ts
new file mode 100644
index 000000000..5650ea25e
--- /dev/null
+++ b/packages/riviere-extract-ts/use-cases/src/features/extract/data-access/extraction-project/extraction-project-repository-draft-components.spec.ts
@@ -0,0 +1,121 @@
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { expect, it } from 'vitest'
+import { ExtractionProjectRepository } from './extraction-project-repository'
+
+it('rejects JSON that is not a draft-component array', () => {
+  const directory = mkdtempSync(join(tmpdir(), 'extract-project-drafts-'))
+  try {
+    writeFileSync(join(directory, 'package.json'), '{"name":"workspace"}', 'utf-8')
+    writeFileSync(join(directory, 'component.ts'), 'export class Order {}', 'utf-8')
+    writeFileSync(
+      join(directory, 'extract.yml'),
+      `modules:
+  - name: orders
+    domain: orders
+    path: .
+    glob: "*.ts"
+    api: { notUsed: true }
+    useCase: { notUsed: true }
+    domainOp: { notUsed: true }
+    event: { notUsed: true }
+    eventHandler: { notUsed: true }
+    ui: { notUsed: true }
+`,
+      'utf-8',
+    )
+    writeFileSync(join(directory, 'draft-components.json'), '{"invalid":true}', 'utf-8')
+
+    expect(() =>
+      new ExtractionProjectRepository().loadFromDraftEnrichment({
+        configPath: join(directory, 'extract.yml'),
+        draftComponentsPath: join(directory, 'draft-components.json'),
+        useTsConfig: false,
+      }),
+    ).toThrow(/does not contain valid draft components/)
+  } finally {
+    rmSync(directory, { recursive: true })
+  }
+})
+
+it('rejects a non-object inside a persisted draft-component array', () => {
+  const directory = mkdtempSync(join(tmpdir(), 'extract-project-drafts-'))
+  try {
+    writeFileSync(join(directory, 'package.json'), '{"name":"workspace"}', 'utf-8')
+    writeFileSync(join(directory, 'component.ts'), 'export class Order {}', 'utf-8')
+    writeFileSync(
+      join(directory, 'extract.yml'),
+      `modules:
+  - name: orders
+    domain: orders
+    path: .
+    glob: "*.ts"
+    api: { notUsed: true }
+    useCase: { notUsed: true }
+    domainOp: { notUsed: true }
+    event: { notUsed: true }
+    eventHandler: { notUsed: true }
+    ui: { notUsed: true }
+`,
+      'utf-8',
+    )
+    writeFileSync(join(directory, 'draft-components.json'), '[null]', 'utf-8')
+
+    expect(() =>
+      new ExtractionProjectRepository().loadFromDraftEnrichment({
+        configPath: join(directory, 'extract.yml'),
+        draftComponentsPath: join(directory, 'draft-components.json'),
+        useTsConfig: false,
+      }),
+    ).toThrow(/does not contain valid draft components/)
+  } finally {
+    rmSync(directory, { recursive: true })
+  }
+})
+
+it('rejects a persisted draft component without its module', () => {
+  const directory = mkdtempSync(join(tmpdir(), 'extract-project-drafts-'))
+  try {
+    writeFileSync(join(directory, 'package.json'), '{"name":"workspace"}', 'utf-8')
+    writeFileSync(join(directory, 'component.ts'), 'export class Order {}', 'utf-8')
+    writeFileSync(
+      join(directory, 'extract.yml'),
+      `modules:
+  - name: orders
+    domain: orders
+    path: .
+    glob: "*.ts"
+    api: { notUsed: true }
+    useCase: { notUsed: true }
+    domainOp: { notUsed: true }
+    event: { notUsed: true }
+    eventHandler: { notUsed: true }
+    ui: { notUsed: true }
+`,
+      'utf-8',
+    )
+    writeFileSync(
+      join(directory, 'draft-components.json'),
+      JSON.stringify([
+        {
+          type: 'useCase',
+          name: 'PlaceOrder',
+          domain: 'orders',
+          location: { file: join(directory, 'component.ts'), line: 1 },
+        },
+      ]),
+      'utf-8',
+    )
+
+    expect(() =>
+      new ExtractionProjectRepository().loadFromDraftEnrichment({
+        configPath: join(directory, 'extract.yml'),
+        draftComponentsPath: join(directory, 'draft-components.json'),
+        useTsConfig: false,
+      }),
+    ).toThrow(/does not contain valid draft components/)
+  } finally {
+    rmSync(directory, { recursive: true })
+  }
+})
diff --git a/packages/riviere-extract-ts/use-cases/src/features/extract/data-access/extraction-project/extraction-project-repository-validation.spec.ts b/packages/riviere-extract-ts/use-cases/src/features/extract/data-access/extraction-project/extraction-project-repository-validation.spec.ts
new file mode 100644
index 000000000..9f5908bfe
--- /dev/null
+++ b/packages/riviere-extract-ts/use-cases/src/features/extract/data-access/extraction-project/extraction-project-repository-validation.spec.ts
@@ -0,0 +1,126 @@
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { describe, expect, it, vi } from 'vitest'
+import { ExtractionProject } from '@living-architecture/riviere-extract-ts-domain-model/domain/extraction-project'
+import { ValidatedConfiguration } from '@living-architecture/riviere-extract-config-published-language'
+import { ExtractionProjectRepository } from './extraction-project-repository'
+
+const VALID_CONFIG = `modules:
+  - name: orders
+    domain: orders
+    path: .
+    glob: "*.ts"
+    api: { notUsed: true }
+    useCase: { notUsed: true }
+    domainOp: { notUsed: true }
+    event: { notUsed: true }
+    eventHandler: { notUsed: true }
+    ui: { notUsed: true }
+`
+
+function withWorkspace(run: (directory: string) => void): void {
+  const directory = mkdtempSync(join(tmpdir(), 'extract-validation-test-'))
+  writeFileSync(join(directory, 'package.json'), JSON.stringify({ name: 'workspace' }))
+  writeFileSync(join(directory, 'component.ts'), 'export class Order {}')
+  try {
+    run(directory)
+  } finally {
+    rmSync(directory, { recursive: true })
+  }
+}
+
+function load(directory: string): void {
+  new ExtractionProjectRepository().loadFromFullProject({
+    configPath: join(directory, 'extract.yml'),
+    useTsConfig: false,
+  })
+}
+
+describe('ExtractionProjectRepository validation', () => {
+  it('inherits every rule from a modules-array configuration', () => {
+    withWorkspace((directory) => {
+      writeFileSync(
+        join(directory, 'extended.yml'),
+        `modules:
+  - name: base
+    domain: base
+    path: src
+    glob: "**/*.ts"
+    modules: "/src/{module}/"
+    api: { notUsed: true }
+    useCase: { notUsed: true }
+    domainOp: { notUsed: true }
+    event: { notUsed: true }
+    eventHandler: { notUsed: true }
+    ui: { notUsed: true }
+    customTypes:
+      service:
+        find: classes
+        where: { nameEndsWith: { suffix: Service } }
+`,
+      )
+      writeFileSync(
+        join(directory, 'extract.yml'),
+        `modules:
+  - name: orders
+    domain: orders
+    path: .
+    glob: "*.ts"
+    modules: "/src/{module}/"
+    extends: ./extended.yml
+`,
+      )
+      expect(() => load(directory)).not.toThrow()
+    })
+  })
+
+  it('rejects a resolved configuration missing required extraction metadata', () => {
+    withWorkspace((directory) => {
+      writeFileSync(
+        join(directory, 'extract.yml'),
+        VALID_CONFIG.replace(
+          'api: { notUsed: true }',
+          'api: { find: classes, where: { nameEndsWith: { suffix: Controller } } }',
+        ),
+      )
+      expect(() => load(directory)).toThrow(/Missing required extraction rules: apiType/)
+    })
+  })
+
+  it('maps an invalid aggregate result to a configuration error', () => {
+    withWorkspace((directory) => {
+      writeFileSync(join(directory, 'extract.yml'), VALID_CONFIG)
+      const parse = vi.spyOn(ExtractionProject, 'parse').mockReturnValueOnce({
+        success: false,
+        error: 'Invalid module sources',
+      })
+      expect(() => load(directory)).toThrow(/Invalid module sources/)
+      parse.mockRestore()
+    })
+  })
+
+  it('maps a resolved configuration validation failure to a configuration error', () => {
+    withWorkspace((directory) => {
+      writeFileSync(join(directory, 'extract.yml'), VALID_CONFIG)
+      const parse = vi.spyOn(ValidatedConfiguration, 'parse').mockReturnValueOnce({
+        success: false,
+        errors: [{ path: 'modules', message: 'Invalid resolved modules' }],
+      })
+      expect(() => load(directory)).toThrow(/modules: Invalid resolved modules/)
+      parse.mockRestore()
+    })
+  })
+
+  it('reports a resolved configuration failure without specific errors', () => {
+    withWorkspace((directory) => {
+      writeFileSync(join(directory, 'extract.yml'), VALID_CONFIG)
+      const parse = vi.spyOn(ValidatedConfiguration, 'parse').mockReturnValueOnce({
+        success: false,
+        errors: [],
+      })
+      expect(() => load(directory)).toThrow(/validation failed without specific errors/)
+      parse.mockRestore()
+    })
+  })
+})
diff --git a/packages/riviere-cli/src/features/extract/data-access/extraction-project/extraction-project-repository.spec.ts b/packages/riviere-extract-ts/use-cases/src/features/extract/data-access/extraction-project/extraction-project-repository.spec.ts
similarity index 87%
rename from packages/riviere-cli/src/features/extract/data-access/extraction-project/extraction-project-repository.spec.ts
rename to packages/riviere-extract-ts/use-cases/src/features/extract/data-access/extraction-project/extraction-project-repository.spec.ts
index debedefc8..ce4ba0ae8 100644
--- a/packages/riviere-cli/src/features/extract/data-access/extraction-project/extraction-project-repository.spec.ts
+++ b/packages/riviere-extract-ts/use-cases/src/features/extract/data-access/extraction-project/extraction-project-repository.spec.ts
@@ -1,12 +1,8 @@
-import {
-  describe, expect, it 
-} from 'vitest'
-import {
-  mkdirSync, mkdtempSync, rmSync, writeFileSync 
-} from 'node:fs'
+import { describe, expect, it } from 'vitest'
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { join } from 'node:path'
 import { tmpdir } from 'node:os'
-import { ConfigValidationError } from '../../../../platform/infra/cli/presentation/error-codes'
+import { ExtractionConfigError } from './extraction-config-error'
 import { ExtractionProjectRepository } from './extraction-project-repository'
 
 const VALID_CONFIG = `modules:
@@ -94,16 +90,16 @@ describe('ExtractionProjectRepository', () => {
     })
   })
 
-  it('loadFromFullProject throws ConfigValidationError when config file does not exist', () => {
+  it('loadFromFullProject throws ExtractionConfigError when config file does not exist', () => {
     expect(() =>
       new ExtractionProjectRepository().loadFromFullProject({
         configPath: '/nonexistent/path/extract.yml',
         useTsConfig: false,
       }),
-    ).toThrow(ConfigValidationError)
+    ).toThrow(ExtractionConfigError)
   })
 
-  it('loadFromFullProject throws ConfigValidationError for invalid YAML', () => {
+  it('loadFromFullProject throws ExtractionConfigError for invalid YAML', () => {
     withWorkspace((dir) => {
       writeFileSync(join(dir, 'extract.yml'), '}{invalid yaml', 'utf-8')
       expect(() =>
@@ -111,11 +107,11 @@ describe('ExtractionProjectRepository', () => {
           configPath: join(dir, 'extract.yml'),
           useTsConfig: false,
         }),
-      ).toThrow(ConfigValidationError)
+      ).toThrow(ExtractionConfigError)
     })
   })
 
-  it('loadFromFullProject throws ConfigValidationError for non-object root config', () => {
+  it('loadFromFullProject throws ExtractionConfigError for non-object root config', () => {
     withWorkspace((dir) => {
       writeFileSync(join(dir, 'extract.yml'), 'hello\n', 'utf-8')
       expect(() =>
@@ -123,11 +119,11 @@ describe('ExtractionProjectRepository', () => {
           configPath: join(dir, 'extract.yml'),
           useTsConfig: false,
         }),
-      ).toThrow(ConfigValidationError)
+      ).toThrow(ExtractionConfigError)
     })
   })
 
-  it('loadFromFullProject throws ConfigValidationError for invalid modules array shape', () => {
+  it('loadFromFullProject throws ExtractionConfigError for invalid modules array shape', () => {
     withWorkspace((dir) => {
       writeFileSync(join(dir, 'bad-modules.yml'), 'modules: hello\n', 'utf-8')
       expect(() =>
@@ -135,11 +131,11 @@ describe('ExtractionProjectRepository', () => {
           configPath: join(dir, 'bad-modules.yml'),
           useTsConfig: false,
         }),
-      ).toThrow(ConfigValidationError)
+      ).toThrow(ExtractionConfigError)
     })
   })
 
-  it('loadFromFullProject throws ConfigValidationError for missing $ref module file', () => {
+  it('loadFromFullProject throws ExtractionConfigError for missing $ref module file', () => {
     withWorkspace((dir) => {
       writeFileSync(join(dir, 'extract.yml'), 'modules:\n  - $ref: ./missing.yml\n', 'utf-8')
       expect(() =>
@@ -147,7 +143,7 @@ describe('ExtractionProjectRepository', () => {
           configPath: join(dir, 'extract.yml'),
           useTsConfig: false,
         }),
-      ).toThrow(ConfigValidationError)
+      ).toThrow(ExtractionConfigError)
     })
   })
 
@@ -163,6 +159,7 @@ describe('ExtractionProjectRepository', () => {
           '    domain: orders',
           '    path: src',
           '    glob: "**/*.ts"',
+          '    modules: "/src/{module}/"',
           '    api: { notUsed: true }',
           '    useCase: { notUsed: true }',
           '    domainOp: { notUsed: true }',
@@ -232,35 +229,6 @@ describe('ExtractionProjectRepository', () => {
     })
   })
 
-  it('loadFromFullProject loads extends from a modules-array config file', () => {
-    withWorkspace((dir) => {
-      writeFileSync(
-        join(dir, 'extended.yml'),
-        [
-          'modules:',
-          '  - name: orders',
-          '    domain: orders',
-          '    path: src',
-          '    glob: "**/*.ts"',
-          '    api: { notUsed: true }',
-          '    useCase: { notUsed: true }',
-          '    domainOp: { notUsed: true }',
-          '    event: { notUsed: true }',
-          '    eventHandler: { notUsed: true }',
-          '    ui: { notUsed: true }',
-        ].join('\n'),
-        'utf-8',
-      )
-      writeExtendsConfig(dir, './extended.yml')
-      expect(
-        new ExtractionProjectRepository().loadFromFullProject({
-          configPath: join(dir, 'extract.yml'),
-          useTsConfig: false,
-        }),
-      ).toBeDefined()
-    })
-  })
-
   it('loadFromFullProject merges customTypes from base and local extends config', () => {
     withWorkspace((dir) => {
       writeFileSync(
@@ -320,10 +288,10 @@ describe('ExtractionProjectRepository', () => {
   it('loadFromFullProject loads package-based extends from node_modules', () => {
     withWorkspace((dir) => {
       const pkgDir = join(dir, 'node_modules', 'my-config')
-      mkdirSync(join(pkgDir, 'src'), { recursive: true })
+      mkdirSync(join(pkgDir, 'src', 'published-language'), { recursive: true })
       writeFileSync(join(pkgDir, 'package.json'), JSON.stringify({ name: 'my-config' }), 'utf-8')
       writeFileSync(
-        join(pkgDir, 'src', 'default-extraction.config.json'),
+        join(pkgDir, 'src', 'published-language', 'default-extraction.config.json'),
         '{"api":{"notUsed":true}}',
         'utf-8',
       )
@@ -414,7 +382,7 @@ describe('ExtractionProjectRepository', () => {
     })
   })
 
-  it('loadFromSelectedFiles throws ConfigValidationError when a selected file does not exist', () => {
+  it('loadFromSelectedFiles throws ExtractionConfigError when a selected file does not exist', () => {
     withWorkspace((dir) => {
       writeFileSync(join(dir, 'component.ts'), 'export class Order {}')
       writeFileSync(join(dir, 'extract.config.yml'), VALID_CONFIG)
@@ -425,7 +393,7 @@ describe('ExtractionProjectRepository', () => {
           filePaths: [join(dir, 'nonexistent.ts')],
           useTsConfig: false,
         }),
-      ).toThrow(ConfigValidationError)
+      ).toThrow(ExtractionConfigError)
     })
   })
 })
diff --git a/packages/riviere-extract-ts/use-cases/src/features/extract/data-access/extraction-project/extraction-project-repository.ts b/packages/riviere-extract-ts/use-cases/src/features/extract/data-access/extraction-project/extraction-project-repository.ts
new file mode 100644
index 000000000..e74b3cf60
--- /dev/null
+++ b/packages/riviere-extract-ts/use-cases/src/features/extract/data-access/extraction-project/extraction-project-repository.ts
@@ -0,0 +1,447 @@
+import { dirname, posix, resolve } from 'node:path'
+import { parse as parseYaml } from 'yaml'
+import { globSync } from 'glob'
+import { DraftComponent } from '@living-architecture/riviere-extract-ts-domain-model/domain/component-extraction/draft-component'
+import {
+  type DraftConfiguration,
+  type DraftModule,
+  parseExtractionConfig,
+  type ValidatedModuleInput,
+  type ValidatedModule,
+  ValidatedConfiguration,
+  type ValidationError,
+} from '@living-architecture/riviere-extract-config-published-language'
+import {
+  FileReadError,
+  readJsonFile,
+  readTextFile,
+} from '../../../../infra/external-clients/filesystem/file-reader'
+import { fileExists } from '../../../../infra/external-clients/filesystem/file-existence'
+import { resolveFileOrPackagePath } from '../../../../infra/external-clients/node-modules/node-module-file-resolver'
+import { detectChangedTypeScriptFiles } from '../../../../infra/external-clients/git/git-changed-files'
+import { GitError } from '../../../../infra/external-clients/git/git-errors'
+import { getRepositoryInfo } from '../../../../infra/external-clients/git/git-repository-info'
+import { ExtractionProject } from '@living-architecture/riviere-extract-ts-domain-model/domain/extraction-project'
+import { createConfiguredProject } from '../../../../infra/external-clients/ts-morph/create-configured-project'
+import { findModuleTsConfigDir } from '../../../../infra/external-clients/ts-morph/find-module-tsconfig-dir'
+import { ExtractionConfigError } from './extraction-config-error'
+import { ExtractionDataAccessError } from './extraction-project-error'
+
+class ExtractionConfigLoadError extends Error {}
+type FullProjectParams = { configPath: string; useTsConfig: boolean }
+
+type ChangedProjectParams = FullProjectParams & { baseBranch?: string }
+
+type SelectedFilesProjectParams = FullProjectParams & { filePaths: string[] }
+type DraftEnrichmentParams = FullProjectParams & { draftComponentsPath: string }
+type ParsedConfigState = Readonly<{ configDir: string; configuration: ValidatedConfiguration }>
+type DraftComponentInput = Parameters<typeof DraftComponent.parse>[0]
+type ResolvedModuleDefaults = Pick<
+  ValidatedModuleInput,
+  'api' | 'useCase' | 'domainOp' | 'event' | 'eventHandler' | 'ui' | 'customTypes'
+>
+
+const NOT_USED = { notUsed: true } as const
+
+function formatExtractionConfigErrors(errors: readonly ValidationError[]): string {
+  if (errors.length === 0) return 'validation failed without specific errors'
+  return errors.map((error) => `${error.path}: ${error.message}`).join('\n')
+}
+
+/** @riviere-role aggregate-repository */
+export class ExtractionProjectRepository {
+  loadFromChangedProject(params: ChangedProjectParams): ExtractionProject {
+    return this.translateDataAccessErrors(() => {
+      const parsedConfigState = this.loadParsedConfigState(params.configPath)
+      const sourceFilePaths = this.resolveChangedSourceFilePaths(
+        this.resolveSourceFilePaths(parsedConfigState),
+        params.baseBranch,
+      )
+      return this.createExtractionProject(parsedConfigState, sourceFilePaths, params.useTsConfig)
+    })
+  }
+
+  loadFromDraftEnrichment(params: DraftEnrichmentParams): ExtractionProject {
+    return this.translateDataAccessErrors(() => {
+      const parsedConfigState = this.loadParsedConfigState(params.configPath)
+      return this.createExtractionProject(
+        parsedConfigState,
+        this.resolveSourceFilePaths(parsedConfigState),
+        params.useTsConfig,
+        this.loadDraftComponentsFromFile(params.draftComponentsPath),
+      )
+    })
+  }
+
+  loadFromFullProject(params: FullProjectParams): ExtractionProject {
+    return this.translateDataAccessErrors(() => {
+      const parsedConfigState = this.loadParsedConfigState(params.configPath)
+      return this.createExtractionProject(
+        parsedConfigState,
+        this.resolveSourceFilePaths(parsedConfigState),
+        params.useTsConfig,
+      )
+    })
+  }
+
+  loadFromSelectedFiles(params: SelectedFilesProjectParams): ExtractionProject {
+    return this.translateDataAccessErrors(() => {
+      const parsedConfigState = this.loadParsedConfigState(params.configPath)
+      const sourceFilePaths = this.resolveSelectedSourceFilePaths(
+        this.resolveSourceFilePaths(parsedConfigState),
+        params.filePaths,
+      )
+      return this.createExtractionProject(parsedConfigState, sourceFilePaths, params.useTsConfig)
+    })
+  }
+
+  private translateDataAccessErrors<T>(load: () => T): T {
+    try {
+      return load()
+    } catch (error) {
+      if (error instanceof GitError) {
+        throw new ExtractionDataAccessError(error.gitErrorCode, error.message)
+      }
+      if (error instanceof FileReadError) {
+        throw new ExtractionDataAccessError('FILE_READ_ERROR', error.message)
+      }
+      throw error
+    }
+  }
+
+  private loadParsedConfigState(configPath: string): ParsedConfigState {
+    if (!fileExists(configPath))
+      throw new ExtractionConfigError('CONFIG_NOT_FOUND', `Config file not found: ${configPath}`)
+
+    const content = readTextFile(configPath)
+    const parsed = this.parseConfigFile(content)
+    const configDir = dirname(resolve(configPath))
+    const expanded = this.expandModuleRefs(parsed, configDir)
+
+    const extractionConfig = parseExtractionConfig(expanded)
+    if (!extractionConfig.success)
+      throw new ExtractionConfigError(
+        'VALIDATION_ERROR',
+        `Invalid extraction config:\n${formatExtractionConfigErrors(extractionConfig.errors)}`,
+      )
+
+    return {
+      configDir,
+      configuration: this.resolveConfiguration(extractionConfig.configuration, configDir),
+    }
+  }
+
+  private parseConfigFile(content: string): unknown {
+    try {
+      return parseYaml(content)
+    } catch (error) {
+      throw new ExtractionConfigError('VALIDATION_ERROR', `Invalid config file: ${String(error)}`)
+    }
+  }
+
+  private expandModuleRefs(config: unknown, configDir: string): unknown {
+    try {
+      if (!this.hasModulesArray(config)) return config
+
+      return {
+        ...config,
+        modules: config.modules.map((item) => this.expandModuleRefItem(item, configDir)),
+      }
+    } catch (error) {
+      throw new ExtractionConfigError(
+        'VALIDATION_ERROR',
+        `Error expanding module references: ${String(error)}`,
+      )
+    }
+  }
+
+  private expandModuleRefItem(item: unknown, configDir: string): unknown {
+    if (!this.isModuleRef(item)) {
+      return item
+    }
+
+    const refPath = resolve(configDir, item.$ref)
+    if (!fileExists(refPath))
+      throw new ExtractionConfigLoadError(
+        `Cannot resolve module reference '${item.$ref}'. File not found: ${refPath}`,
+      )
+
+    const content = readTextFile(refPath)
+    const parsed: unknown = parseYaml(content)
+    return parsed
+  }
+
+  private resolveConfiguration(
+    config: DraftConfiguration,
+    configDir: string,
+  ): ValidatedConfiguration {
+    const result = ValidatedConfiguration.parse({
+      ...config,
+      modules: config.modules.map((module) => this.resolveModule(module, configDir)),
+    })
+    if (!result.success)
+      throw new ExtractionConfigError(
+        'VALIDATION_ERROR',
+        formatExtractionConfigErrors(result.errors),
+      )
+    return result.data
+  }
+
+  private loadDraftComponentsFromFile(filePath: string): DraftComponent[] {
+    const parsed = readJsonFile(filePath, 'Enrich file')
+    if (!this.isDraftComponentArray(parsed))
+      throw new FileReadError(`Enrich file does not contain valid draft components: ${filePath}`)
+    return parsed.map((component) => DraftComponent.parse(component))
+  }
+
+  private loadExtendedModule(source: string, configDir: string): ResolvedModuleDefaults {
+    const filePath = resolveFileOrPackagePath({
+      baseDirectory: configDir,
+      packageRelativePath: 'src/published-language/default-extraction.config.json',
+      source,
+    })
+    if (!fileExists(filePath))
+      throw new ExtractionConfigLoadError(
+        `Cannot resolve extends reference '${source}'. File not found: ${filePath}`,
+      )
+
+    const parsed: unknown = parseYaml(readTextFile(filePath))
+    if (this.hasModulesArray(parsed)) {
+      return this.resolveFirstModuleFromConfig(parsed, source, dirname(filePath))
+    }
+    if (this.isTopLevelRulesConfig(parsed)) {
+      return this.topLevelRulesToModule(parsed)
+    }
+    const preview = JSON.stringify(parsed, null, 2).slice(0, 200)
+    throw new ExtractionConfigLoadError(
+      `Invalid extended config format in '${source}'. ` +
+        `Expected object with 'modules' array or top-level component rules. Got: ${preview}`,
+    )
+  }
+
+  private resolveFirstModuleFromConfig(
+    parsed: { modules: unknown[] },
+    source: string,
+    configDir: string,
+  ): ValidatedModuleInput {
+    if (parsed.modules.length === 0)
+      throw new ExtractionConfigLoadError(
+        `Invalid extended config in '${source}': Config has empty modules array`,
+      )
+
+    const extractionConfig = parseExtractionConfig(parsed)
+    if (!extractionConfig.success)
+      throw new ExtractionConfigLoadError(
+        `Invalid extended config in '${source}': ` +
+          formatExtractionConfigErrors(extractionConfig.errors),
+      )
+
+    const [first] = this.resolveConfiguration(extractionConfig.configuration, configDir).modules
+    /* v8 ignore start -- resolved config returns one module for one-module input */
+    if (first === undefined)
+      throw new ExtractionConfigLoadError(
+        `Invalid extended config in '${source}': Config has empty modules array`,
+      )
+    /* v8 ignore stop */
+    return this.moduleInput(first)
+  }
+
+  private topLevelRulesToModule(parsed: Partial<ValidatedModuleInput>): ResolvedModuleDefaults {
+    return {
+      api: parsed.api ?? NOT_USED,
+      useCase: parsed.useCase ?? NOT_USED,
+      domainOp: parsed.domainOp ?? NOT_USED,
+      event: parsed.event ?? NOT_USED,
+      eventHandler: parsed.eventHandler ?? NOT_USED,
+      ui: parsed.ui ?? NOT_USED,
+    }
+  }
+
+  private resolveModule(module: DraftModule, configDir: string): ValidatedModuleInput {
+    const extendsSource = module.extends
+    if (extendsSource === undefined) {
+      return module
+    }
+
+    const baseModule = this.loadExtendedModule(extendsSource, configDir)
+    const mergedCustomTypes =
+      baseModule.customTypes === undefined && module.customTypes === undefined
+        ? undefined
+        : { ...baseModule.customTypes, ...module.customTypes }
+
+    return {
+      name: module.name,
+      domain: module.domain,
+      path: module.path,
+      glob: module.glob,
+      ...(module.modules !== undefined && { modules: module.modules }),
+      api: module.api ?? baseModule.api,
+      useCase: module.useCase ?? baseModule.useCase,
+      domainOp: module.domainOp ?? baseModule.domainOp,
+      event: module.event ?? baseModule.event,
+      eventHandler: module.eventHandler ?? baseModule.eventHandler,
+      ui: module.ui ?? baseModule.ui,
+      ...(mergedCustomTypes !== undefined && { customTypes: mergedCustomTypes }),
+    }
+  }
+
+  private createExtractionProject(
+    parsedConfigState: ParsedConfigState,
+    sourceFilePaths: string[],
+    useTsConfig: boolean,
+    draftComponents: DraftComponent[] = [],
+  ): ExtractionProject {
+    const projectResult = ExtractionProject.parse({
+      configuration: parsedConfigState.configuration,
+      moduleSources: this.createModuleSources(
+        parsedConfigState.configDir,
+        parsedConfigState.configuration,
+        sourceFilePaths,
+        useTsConfig,
+      ),
+      repositoryName: getRepositoryInfo().name,
+      draftComponents,
+    })
+    if (!projectResult.success)
+      throw new ExtractionConfigError('VALIDATION_ERROR', projectResult.error)
+    return projectResult.data
+  }
+
+  private resolveSourceFilePaths(parsedConfigState: ParsedConfigState): string[] {
+    const sourceFilePaths = parsedConfigState.configuration.modules
+      .flatMap((module) =>
+        globSync(posix.join(module.path, module.glob), { cwd: parsedConfigState.configDir }),
+      )
+      .map((filePath) => resolve(parsedConfigState.configDir, filePath))
+
+    if (sourceFilePaths.length === 0) {
+      const patterns = parsedConfigState.configuration.modules
+        .map((module) => posix.join(module.path, module.glob))
+        .join(', ')
+      throw new ExtractionConfigError(
+        'VALIDATION_ERROR',
+        `No files matched extraction patterns: ${patterns}\nConfig directory: ${parsedConfigState.configDir}`,
+      )
+    }
+
+    return sourceFilePaths
+  }
+
+  private resolveChangedSourceFilePaths(allSourceFiles: string[], baseBranch?: string): string[] {
+    const gitOptions = baseBranch === undefined ? {} : { base: baseBranch }
+    const result = detectChangedTypeScriptFiles(process.cwd(), gitOptions)
+    for (const warning of result.warnings) {
+      console.error(warning)
+    }
+    const changedAbsolute = new Set(result.files.map((filePath) => resolve(filePath)))
+    return allSourceFiles.filter((filePath) => changedAbsolute.has(filePath))
+  }
+
+  private resolveSelectedSourceFilePaths(
+    allSourceFiles: string[],
+    requestedFiles: string[],
+  ): string[] {
+    const missingFiles = requestedFiles.filter((filePath) => !fileExists(resolve(filePath)))
+    if (missingFiles.length > 0)
+      throw new ExtractionConfigError(
+        'VALIDATION_ERROR',
+        `Files not found: ${missingFiles.join(', ')}`,
+      )
+
+    const requestedAbsolute = new Set(requestedFiles.map((filePath) => resolve(filePath)))
+    return allSourceFiles.filter((filePath) => requestedAbsolute.has(filePath))
+  }
+
+  private createModuleSources(
+    configDir: string,
+    configuration: ValidatedConfiguration,
+    sourceFilePaths: string[],
+    useTsConfig: boolean,
+  ) {
+    const sourceFileSet = new Set(sourceFilePaths)
+
+    const sources = new Map<
+      ValidatedModule,
+      { files: string[]; project: ReturnType<typeof createConfiguredProject> }
+    >()
+    for (const module of configuration.modules) {
+      const allModuleFiles = globSync(posix.join(module.path, module.glob), { cwd: configDir }).map(
+        (filePath) => resolve(configDir, filePath),
+      )
+      const moduleFiles = allModuleFiles.filter((filePath) => sourceFileSet.has(filePath))
+      const moduleConfigDir = findModuleTsConfigDir(configDir, module.path)
+      const project = createConfiguredProject(moduleConfigDir, !useTsConfig)
+      project.addSourceFilesAtPaths(moduleFiles)
+
+      sources.set(module, { files: moduleFiles, project })
+    }
+    return sources
+  }
+
+  private hasModulesArray(value: unknown): value is { modules: unknown[] } {
+    return (
+      typeof value === 'object' &&
+      value !== null &&
+      'modules' in value &&
+      Array.isArray(value.modules)
+    )
+  }
+
+  private isModuleRef(value: unknown): value is { $ref: string } {
+    return (
+      typeof value === 'object' &&
+      value !== null &&
+      '$ref' in value &&
+      typeof value.$ref === 'string'
+    )
+  }
+
+  private isDraftComponentArray(value: unknown): value is DraftComponentInput[] {
+    if (!Array.isArray(value)) return false
+    return value.every((item: unknown) => this.isDraftComponentInput(item))
+  }
+
+  private isDraftComponentInput(value: unknown): value is DraftComponentInput {
+    if (!this.isRecord(value)) return false
+    return (
+      typeof value['type'] === 'string' &&
+      typeof value['name'] === 'string' &&
+      typeof value['domain'] === 'string' &&
+      typeof value['module'] === 'string' &&
+      this.isSourceLocation(value['location'])
+    )
+  }
+
+  private isSourceLocation(value: unknown): value is DraftComponentInput['location'] {
+    return (
+      this.isRecord(value) && typeof value['file'] === 'string' && typeof value['line'] === 'number'
+    )
+  }
+
+  private isRecord(value: unknown): value is Record<string, unknown> {
+    return typeof value === 'object' && value !== null
+  }
+
+  private isTopLevelRulesConfig(value: unknown): value is Partial<ValidatedModuleInput> {
+    return (
+      typeof value === 'object' && value !== null && !Array.isArray(value) && !('modules' in value)
+    )
+  }
+
+  private moduleInput(module: ValidatedModule): ValidatedModuleInput {
+    return {
+      name: module.name,
+      domain: module.domain,
+      path: module.path,
+      glob: module.glob,
+      ...(module.modules !== undefined && { modules: module.modules }),
+      api: module.api,
+      useCase: module.useCase,
+      domainOp: module.domainOp,
+      event: module.event,
+      eventHandler: module.eventHandler,
+      ui: module.ui,
+      ...(module.customTypes !== undefined && { customTypes: module.customTypes }),
+    }
+  }
+}
diff --git a/packages/riviere-extract-ts/use-cases/src/index.ts b/packages/riviere-extract-ts/use-cases/src/index.ts
new file mode 100644
index 000000000..de2f322bc
--- /dev/null
+++ b/packages/riviere-extract-ts/use-cases/src/index.ts
@@ -0,0 +1 @@
+export { ExtractDraftComponents } from './features/extract/commands/extract-draft-components'
diff --git a/packages/riviere-cli/src/platform/infra/external-clients/filesystem/file-existence.spec.ts b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/filesystem/file-existence.spec.ts
similarity index 91%
rename from packages/riviere-cli/src/platform/infra/external-clients/filesystem/file-existence.spec.ts
rename to packages/riviere-extract-ts/use-cases/src/infra/external-clients/filesystem/file-existence.spec.ts
index aab1a29b0..2b68bbda3 100644
--- a/packages/riviere-cli/src/platform/infra/external-clients/filesystem/file-existence.spec.ts
+++ b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/filesystem/file-existence.spec.ts
@@ -1,7 +1,5 @@
 import { join } from 'node:path'
-import {
-  describe, expect, it 
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 import { fileExists } from './file-existence'
 import {
   type TestContext,
diff --git a/packages/riviere-cli/src/platform/infra/external-clients/filesystem/file-existence.ts b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/filesystem/file-existence.ts
similarity index 88%
rename from packages/riviere-cli/src/platform/infra/external-clients/filesystem/file-existence.ts
rename to packages/riviere-extract-ts/use-cases/src/infra/external-clients/filesystem/file-existence.ts
index e169ce815..a37ca1fc7 100644
--- a/packages/riviere-cli/src/platform/infra/external-clients/filesystem/file-existence.ts
+++ b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/filesystem/file-existence.ts
@@ -1,6 +1,8 @@
 import { accessSync } from 'node:fs'
 
-interface NodeError extends Error {code?: string}
+interface NodeError extends Error {
+  code?: string
+}
 
 function isNodeError(error: unknown): error is NodeError {
   return error instanceof Error && 'code' in error
diff --git a/packages/riviere-cli/src/platform/infra/external-clients/filesystem/file-reader.spec.ts b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/filesystem/file-reader.spec.ts
similarity index 92%
rename from packages/riviere-cli/src/platform/infra/external-clients/filesystem/file-reader.spec.ts
rename to packages/riviere-extract-ts/use-cases/src/infra/external-clients/filesystem/file-reader.spec.ts
index 0ffb062e2..cc1fbd473 100644
--- a/packages/riviere-cli/src/platform/infra/external-clients/filesystem/file-reader.spec.ts
+++ b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/filesystem/file-reader.spec.ts
@@ -2,7 +2,8 @@ import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { dirname, join } from 'node:path'
 import { afterEach, describe, expect, it } from 'vitest'
-import { FileReadError, fileExists, readJsonFile, readTextFile } from './index'
+import { FileReadError, readJsonFile, readTextFile } from './file-reader'
+import { fileExists } from './file-existence'
 
 const temporaryDirectories: string[] = []
 
diff --git a/packages/riviere-cli/src/platform/infra/external-clients/filesystem/file-reader.ts b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/filesystem/file-reader.ts
similarity index 100%
rename from packages/riviere-cli/src/platform/infra/external-clients/filesystem/file-reader.ts
rename to packages/riviere-extract-ts/use-cases/src/infra/external-clients/filesystem/file-reader.ts
diff --git a/packages/riviere-cli/src/platform/infra/external-clients/git/git-changed-files.spec.ts b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/git/git-changed-files.spec.ts
similarity index 98%
rename from packages/riviere-cli/src/platform/infra/external-clients/git/git-changed-files.spec.ts
rename to packages/riviere-extract-ts/use-cases/src/infra/external-clients/git/git-changed-files.spec.ts
index 8160ef0c1..c922a6765 100644
--- a/packages/riviere-cli/src/platform/infra/external-clients/git/git-changed-files.spec.ts
+++ b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/git/git-changed-files.spec.ts
@@ -1,10 +1,6 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { join } from 'node:path'
-import {
-  detectChangedTypeScriptFiles, GitError 
-} from './git-changed-files'
+import { detectChangedTypeScriptFiles, GitError } from './git-changed-files'
 
 type GitExecutor = (binary: string, args: readonly string[], cwd: string) => string
 
diff --git a/packages/riviere-cli/src/platform/infra/external-clients/git/git-changed-files.ts b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/git/git-changed-files.ts
similarity index 94%
rename from packages/riviere-cli/src/platform/infra/external-clients/git/git-changed-files.ts
rename to packages/riviere-extract-ts/use-cases/src/infra/external-clients/git/git-changed-files.ts
index fd061ff06..f1ad027bc 100644
--- a/packages/riviere-cli/src/platform/infra/external-clients/git/git-changed-files.ts
+++ b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/git/git-changed-files.ts
@@ -21,7 +21,9 @@ function isGitError(error: unknown): error is GitError {
   return error instanceof GitError
 }
 
-interface ChangedFilesOptions {readonly base?: string}
+interface ChangedFilesOptions {
+  readonly base?: string
+}
 
 /** @riviere-role external-client-model */
 export interface ChangedFilesResult {
@@ -31,10 +33,17 @@ export interface ChangedFilesResult {
 
 type GitExecutor = (binary: string, args: readonly string[], cwd: string) => string
 
+function isolatedGitEnvironment(): NodeJS.ProcessEnv {
+  return Object.fromEntries(
+    Object.entries(process.env).filter(([name]) => !name.startsWith('GIT_')),
+  )
+}
+
 /* v8 ignore start -- @preserve: default executor delegates to execFileSync; tested via CLI integration */
 function defaultGitExecutor(binary: string, args: readonly string[], cwd: string): string {
   return execFileSync(binary, args, {
     cwd,
+    env: isolatedGitEnvironment(),
     encoding: 'utf-8',
     stdio: ['pipe', 'pipe', 'pipe'],
   }).trim()
diff --git a/packages/riviere-cli/src/platform/infra/external-clients/git/git-errors.ts b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/git/git-errors.ts
similarity index 100%
rename from packages/riviere-cli/src/platform/infra/external-clients/git/git-errors.ts
rename to packages/riviere-extract-ts/use-cases/src/infra/external-clients/git/git-errors.ts
diff --git a/packages/riviere-cli/src/platform/infra/external-clients/git/git-repository-info.spec.ts b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/git/git-repository-info.spec.ts
similarity index 99%
rename from packages/riviere-cli/src/platform/infra/external-clients/git/git-repository-info.spec.ts
rename to packages/riviere-extract-ts/use-cases/src/infra/external-clients/git/git-repository-info.spec.ts
index 7cfabe9da..fc0855d86 100644
--- a/packages/riviere-cli/src/platform/infra/external-clients/git/git-repository-info.spec.ts
+++ b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/git/git-repository-info.spec.ts
@@ -1,6 +1,4 @@
-import {
-  describe, it, expect 
-} from 'vitest'
+import { describe, it, expect } from 'vitest'
 import { getRepositoryInfo } from './git-repository-info'
 import { GitError } from './git-errors'
 
diff --git a/packages/riviere-cli/src/platform/infra/external-clients/git/git-repository-info.ts b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/git/git-repository-info.ts
similarity index 95%
rename from packages/riviere-cli/src/platform/infra/external-clients/git/git-repository-info.ts
rename to packages/riviere-extract-ts/use-cases/src/infra/external-clients/git/git-repository-info.ts
index 078a83432..87a0011bf 100644
--- a/packages/riviere-cli/src/platform/infra/external-clients/git/git-repository-info.ts
+++ b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/git/git-repository-info.ts
@@ -19,10 +19,17 @@ export interface RepositoryInfo {
 
 type GitExecutor = (binary: string, args: readonly string[], cwd: string) => string
 
+function isolatedGitEnvironment(): NodeJS.ProcessEnv {
+  return Object.fromEntries(
+    Object.entries(process.env).filter(([name]) => !name.startsWith('GIT_')),
+  )
+}
+
 /* v8 ignore start -- @preserve: default executor delegates to execFileSync; tested via CLI integration */
 function defaultGitExecutor(binary: string, args: readonly string[], cwd: string): string {
   return execFileSync(binary, args, {
     cwd,
+    env: isolatedGitEnvironment(),
     encoding: 'utf-8',
     stdio: ['pipe', 'pipe', 'pipe'],
   }).trim()
diff --git a/packages/riviere-cli/src/platform/infra/external-clients/node-modules/node-module-file-resolver.spec.ts b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/node-modules/node-module-file-resolver.spec.ts
similarity index 98%
rename from packages/riviere-cli/src/platform/infra/external-clients/node-modules/node-module-file-resolver.spec.ts
rename to packages/riviere-extract-ts/use-cases/src/infra/external-clients/node-modules/node-module-file-resolver.spec.ts
index 6cff3055e..340d53850 100644
--- a/packages/riviere-cli/src/platform/infra/external-clients/node-modules/node-module-file-resolver.spec.ts
+++ b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/node-modules/node-module-file-resolver.spec.ts
@@ -2,7 +2,7 @@ import { mkdirSync, mkdtempSync, realpathSync, rmSync, writeFileSync } from 'nod
 import { tmpdir } from 'node:os'
 import { join, resolve } from 'node:path'
 import { afterEach, describe, expect, it } from 'vitest'
-import { PackageFileResolveError, resolveFileOrPackagePath } from './index'
+import { PackageFileResolveError, resolveFileOrPackagePath } from './node-module-file-resolver'
 
 const temporaryDirectories: string[] = []
 
diff --git a/packages/riviere-cli/src/platform/infra/external-clients/node-modules/node-module-file-resolver.ts b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/node-modules/node-module-file-resolver.ts
similarity index 95%
rename from packages/riviere-cli/src/platform/infra/external-clients/node-modules/node-module-file-resolver.ts
rename to packages/riviere-extract-ts/use-cases/src/infra/external-clients/node-modules/node-module-file-resolver.ts
index 32ed94d08..036ba118b 100644
--- a/packages/riviere-cli/src/platform/infra/external-clients/node-modules/node-module-file-resolver.ts
+++ b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/node-modules/node-module-file-resolver.ts
@@ -1,6 +1,6 @@
 import { createRequire } from 'node:module'
 import { dirname, resolve } from 'node:path'
-import { fileExists } from '../filesystem/index'
+import { fileExists } from '../filesystem/file-existence'
 
 /** @riviere-role external-client-error */
 export class PackageFileResolveError extends Error {
diff --git a/packages/riviere-cli/src/platform/infra/external-clients/ts-morph/create-configured-project.spec.ts b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/ts-morph/create-configured-project.spec.ts
similarity index 81%
rename from packages/riviere-cli/src/platform/infra/external-clients/ts-morph/create-configured-project.spec.ts
rename to packages/riviere-extract-ts/use-cases/src/infra/external-clients/ts-morph/create-configured-project.spec.ts
index a40e28ad6..b1839c0b2 100644
--- a/packages/riviere-cli/src/platform/infra/external-clients/ts-morph/create-configured-project.spec.ts
+++ b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/ts-morph/create-configured-project.spec.ts
@@ -1,9 +1,5 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import {
-  mkdtempSync, writeFileSync, rmSync 
-} from 'node:fs'
+import { describe, it, expect } from 'vitest'
+import { mkdtempSync, writeFileSync, rmSync } from 'node:fs'
 import { join } from 'node:path'
 import { tmpdir } from 'node:os'
 import { createConfiguredProject } from './create-configured-project'
@@ -22,14 +18,14 @@ describe('createConfiguredProject', () => {
     withTempDir((dir) => {
       writeFileSync(join(dir, 'tsconfig.json'), '{ "compilerOptions": {} }')
       const project = createConfiguredProject(dir, true)
-      expect(project.getCompilerOptions().configFilePath).toBeUndefined()
+      expect(project.getCompilerOptions()['configFilePath']).toBeUndefined()
     })
   })
 
   it('returns bare project when tsconfig.json does not exist in configDir', () => {
     withTempDir((dir) => {
       const project = createConfiguredProject(dir, false)
-      expect(project.getCompilerOptions().configFilePath).toBeUndefined()
+      expect(project.getCompilerOptions()['configFilePath']).toBeUndefined()
     })
   })
 
@@ -40,7 +36,7 @@ describe('createConfiguredProject', () => {
         JSON.stringify({ compilerOptions: { strict: true } }),
       )
       const project = createConfiguredProject(dir, false)
-      expect(project.getCompilerOptions().configFilePath).toContain('tsconfig.json')
+      expect(project.getCompilerOptions()['configFilePath']).toContain('tsconfig.json')
       expect(project.getCompilerOptions().strict).toBe(true)
     })
   })
diff --git a/packages/riviere-cli/src/platform/infra/external-clients/ts-morph/create-configured-project.ts b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/ts-morph/create-configured-project.ts
similarity index 100%
rename from packages/riviere-cli/src/platform/infra/external-clients/ts-morph/create-configured-project.ts
rename to packages/riviere-extract-ts/use-cases/src/infra/external-clients/ts-morph/create-configured-project.ts
diff --git a/packages/riviere-cli/src/platform/infra/external-clients/ts-morph/find-module-tsconfig-dir.spec.ts b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/ts-morph/find-module-tsconfig-dir.spec.ts
similarity index 91%
rename from packages/riviere-cli/src/platform/infra/external-clients/ts-morph/find-module-tsconfig-dir.spec.ts
rename to packages/riviere-extract-ts/use-cases/src/infra/external-clients/ts-morph/find-module-tsconfig-dir.spec.ts
index 457b9b874..99209e133 100644
--- a/packages/riviere-cli/src/platform/infra/external-clients/ts-morph/find-module-tsconfig-dir.spec.ts
+++ b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/ts-morph/find-module-tsconfig-dir.spec.ts
@@ -1,11 +1,7 @@
-import {
-  mkdirSync, writeFileSync, rmSync 
-} from 'node:fs'
+import { mkdirSync, writeFileSync, rmSync } from 'node:fs'
 import { join } from 'node:path'
 import { tmpdir } from 'node:os'
-import {
-  describe, it, expect, afterEach 
-} from 'vitest'
+import { describe, it, expect, afterEach } from 'vitest'
 import { findModuleTsConfigDir } from './find-module-tsconfig-dir'
 
 function createTestDir(): string {
diff --git a/packages/riviere-cli/src/platform/infra/external-clients/ts-morph/find-module-tsconfig-dir.ts b/packages/riviere-extract-ts/use-cases/src/infra/external-clients/ts-morph/find-module-tsconfig-dir.ts
similarity index 100%
rename from packages/riviere-cli/src/platform/infra/external-clients/ts-morph/find-module-tsconfig-dir.ts
rename to packages/riviere-extract-ts/use-cases/src/infra/external-clients/ts-morph/find-module-tsconfig-dir.ts
diff --git a/packages/riviere-extract-ts/use-cases/tsconfig.json b/packages/riviere-extract-ts/use-cases/tsconfig.json
new file mode 100644
index 000000000..667a3463d
--- /dev/null
+++ b/packages/riviere-extract-ts/use-cases/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/packages/riviere-extract-ts/use-cases/tsconfig.lib.json b/packages/riviere-extract-ts/use-cases/tsconfig.lib.json
new file mode 100644
index 000000000..c85de6155
--- /dev/null
+++ b/packages/riviere-extract-ts/use-cases/tsconfig.lib.json
@@ -0,0 +1,23 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "src",
+    "outDir": "dist",
+    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
+    "emitDeclarationOnly": false,
+    "forceConsistentCasingInFileNames": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "references": [
+    { "path": "../domain-model/tsconfig.lib.json" },
+    { "path": "../../riviere-extract-config/published-language/tsconfig.lib.json" },
+    { "path": "../../riviere-schema/published-language/tsconfig.lib.json" }
+  ],
+  "exclude": [
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/__fixtures__/**"
+  ]
+}
diff --git a/packages/riviere-extract-ts/use-cases/tsconfig.spec.json b/packages/riviere-extract-ts/use-cases/tsconfig.spec.json
new file mode 100644
index 000000000..7d04601fa
--- /dev/null
+++ b/packages/riviere-extract-ts/use-cases/tsconfig.spec.json
@@ -0,0 +1,15 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/vitest",
+    "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node", "vitest"],
+    "forceConsistentCasingInFileNames": true
+  },
+  "include": [
+    "vitest.config.mts",
+    "src/**/*.spec.ts",
+    "src/**/*.d.ts",
+    "src/**/__fixtures__/**/*.ts"
+  ],
+  "references": [{ "path": "./tsconfig.lib.json" }]
+}
diff --git a/packages/riviere-extract-ts/use-cases/vitest.config.mts b/packages/riviere-extract-ts/use-cases/vitest.config.mts
new file mode 100644
index 000000000..6ade7529f
--- /dev/null
+++ b/packages/riviere-extract-ts/use-cases/vitest.config.mts
@@ -0,0 +1,27 @@
+import path from 'node:path'
+import { defineConfig } from 'vitest/config'
+
+const repoRoot = path.resolve(__dirname, '../../..')
+
+export default defineConfig(() => ({
+  root: __dirname,
+  cacheDir: '../../../node_modules/.vite/packages/riviere-extract-ts-use-cases',
+  test: {
+    name: '@living-architecture/riviere-extract-ts-use-cases',
+    watch: false,
+    globals: true,
+    environment: 'node',
+    testTimeout: 60_000,
+    include: ['src/**/*.{test,spec}.{ts,mts}'],
+    reporters: ['default'],
+    coverage: {
+      enabled: true,
+      reportsDirectory: './test-output/vitest/coverage',
+      provider: 'v8' as const,
+      reporter: ['text', ['lcov', { projectRoot: repoRoot }]] as [
+        'text',
+        ['lcov', { projectRoot: string }],
+      ],
+    },
+  },
+}))
diff --git a/packages/riviere-extract-ts/vitest.config.mts b/packages/riviere-extract-ts/vitest.config.mts
deleted file mode 100644
index 21d59baf8..000000000
--- a/packages/riviere-extract-ts/vitest.config.mts
+++ /dev/null
@@ -1,31 +0,0 @@
-import path from 'node:path';
-import { defineConfig } from 'vitest/config';
-
-const repoRoot = path.resolve(__dirname, '../..');
-
-export default defineConfig(() => ({
-  root: __dirname,
-  cacheDir: '../../node_modules/.vite/packages/riviere-extract-ts',
-  test: {
-    name: '@living-architecture/riviere-extract-ts',
-    watch: false,
-    globals: true,
-    environment: 'node',
-    testTimeout: 60_000,
-    include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    reporters: ['default'],
-    coverage: {
-      enabled: true,
-      reportsDirectory: './test-output/vitest/coverage',
-      provider: 'v8' as const,
-      reporter: ['text', ['lcov', { projectRoot: repoRoot }]] as ['text', ['lcov', { projectRoot: string }]],
-      exclude: ['**/*-fixtures.ts', '**/*-fixtures/**'],
-      thresholds: {
-        lines: 100,
-        statements: 100,
-        functions: 100,
-        branches: 100,
-      },
-    },
-  },
-}));
diff --git a/packages/riviere-query/CLAUDE.md b/packages/riviere-query/CLAUDE.md
deleted file mode 100644
index 6fbe394bb..000000000
--- a/packages/riviere-query/CLAUDE.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# riviere-query
-
-Browser-safe library for querying Riviere architecture graphs.
-
-Architecture defined in [ADR-002](../../docs/architecture/adr/ADR-002-allowed-folder-structures.md).
diff --git a/packages/riviere-query/README.md b/packages/riviere-query/README.md
deleted file mode 100644
index 245b41bf6..000000000
--- a/packages/riviere-query/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# @living-architecture/riviere-query
-
-Query library for Riviere architecture graphs.
-
-## Install
-
-```bash
-npm install @living-architecture/riviere-query
-```
-
-## Documentation
-
-See [apps/docs](../../apps/docs) for full documentation.
diff --git a/packages/riviere-query/package.json b/packages/riviere-query/package.json
deleted file mode 100644
index 5de2d667b..000000000
--- a/packages/riviere-query/package.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "name": "@living-architecture/riviere-query",
-  "version": "0.8.3",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/NTCoding/living-architecture.git",
-    "directory": "packages/riviere-query"
-  },
-  "type": "module",
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    "./package.json": "./package.json",
-    ".": {
-      "@living-architecture/source": "./src/index.ts",
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "default": "./dist/index.js"
-    }
-  },
-  "files": [
-    "dist",
-    "!**/*.tsbuildinfo"
-  ],
-  "dependencies": {
-    "@living-architecture/riviere-schema": "workspace:*",
-    "zod": "^4.2.1"
-  }
-}
diff --git a/packages/riviere-query/project.json b/packages/riviere-query/project.json
deleted file mode 100644
index 41d69c74b..000000000
--- a/packages/riviere-query/project.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "riviere-query",
-  "targets": {
-    "typedoc": {
-      "executor": "nx:run-commands",
-      "options": {
-        "command": "pnpm exec typedoc --options packages/riviere-query/typedoc.json",
-        "cwd": "{workspaceRoot}"
-      },
-      "dependsOn": ["build"]
-    }
-  }
-}
diff --git a/packages/riviere-query/src/features/querying/queries/depth-queries.ts b/packages/riviere-query/src/features/querying/queries/depth-queries.ts
deleted file mode 100644
index 236714f94..000000000
--- a/packages/riviere-query/src/features/querying/queries/depth-queries.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import type { RiviereGraph } from '@living-architecture/riviere-schema'
-import type { ComponentId } from './domain-types'
-import { parseComponentId } from './domain-types'
-import { ENTRY_POINT_TYPES } from './flow-constants'
-
-interface DepthQueueEntry {
-  id: ComponentId
-  depth: number
-}
-
-/** @riviere-role query-model */
-export function queryNodeDepths(graph: RiviereGraph): Map<ComponentId, number> {
-  const depths = new Map<ComponentId, number>()
-
-  const entryPoints = findEntryPointIds(graph)
-  if (entryPoints.length === 0) {
-    return depths
-  }
-
-  const outgoingEdges = buildOutgoingEdges(graph)
-  const queue: DepthQueueEntry[] = entryPoints.map((id) => ({
-    id,
-    depth: 0,
-  }))
-
-  processQueue(queue, depths, outgoingEdges)
-
-  return depths
-}
-
-function processQueue(
-  queue: DepthQueueEntry[],
-  depths: Map<ComponentId, number>,
-  outgoingEdges: Map<ComponentId, ComponentId[]>,
-): void {
-  const current = queue.shift()
-  if (current === undefined) return
-
-  const existingDepth = depths.get(current.id)
-  const shouldProcess = existingDepth === undefined || existingDepth > current.depth
-
-  if (shouldProcess) {
-    depths.set(current.id, current.depth)
-    enqueueChildren(outgoingEdges, current, queue)
-  }
-
-  processQueue(queue, depths, outgoingEdges)
-}
-
-function enqueueChildren(
-  outgoingEdges: Map<ComponentId, ComponentId[]>,
-  current: DepthQueueEntry,
-  queue: DepthQueueEntry[],
-): void {
-  const edges = outgoingEdges.get(current.id)
-  if (edges) {
-    for (const targetId of edges) {
-      queue.push({
-        id: targetId,
-        depth: current.depth + 1,
-      })
-    }
-  }
-}
-
-function findEntryPointIds(graph: RiviereGraph): ComponentId[] {
-  const targets = new Set(graph.links.map((link) => link.target))
-  return graph.components
-    .filter((c) => ENTRY_POINT_TYPES.has(c.type) && !targets.has(c.id))
-    .map((c) => parseComponentId(c.id))
-}
-
-function buildOutgoingEdges(graph: RiviereGraph): Map<ComponentId, ComponentId[]> {
-  const edges = new Map<ComponentId, ComponentId[]>()
-  for (const link of graph.links) {
-    const sourceId = parseComponentId(link.source)
-    const targetId = parseComponentId(link.target)
-    const existing = edges.get(sourceId)
-    if (existing) {
-      existing.push(targetId)
-    } else {
-      edges.set(sourceId, [targetId])
-    }
-  }
-  return edges
-}
diff --git a/packages/riviere-query/src/features/querying/queries/domain-types.ts b/packages/riviere-query/src/features/querying/queries/domain-types.ts
deleted file mode 100644
index 95ae64be7..000000000
--- a/packages/riviere-query/src/features/querying/queries/domain-types.ts
+++ /dev/null
@@ -1,430 +0,0 @@
-import type {
-  Component, Link, ExternalLink 
-} from '@living-architecture/riviere-schema'
-import { z } from 'zod'
-
-/** @internal */
-const componentIdSchema = z.string().brand<'ComponentId'>()
-/** @internal */
-const linkIdSchema = z.string().brand<'LinkId'>()
-/** @internal */
-const entityNameSchema = z.string().brand<'EntityName'>()
-/** @internal */
-const domainNameSchema = z.string().brand<'DomainName'>()
-/** @internal */
-const stateSchema = z.string().brand<'State'>()
-/** @internal */
-const operationNameSchema = z.string().brand<'OperationName'>()
-/** @internal */
-const eventIdSchema = z.string().brand<'EventId'>()
-/** @internal */
-const eventNameSchema = z.string().brand<'EventName'>()
-/** @internal */
-const handlerIdSchema = z.string().brand<'HandlerId'>()
-/** @internal */
-const handlerNameSchema = z.string().brand<'HandlerName'>()
-
-/**
- * Branded type for component identifiers.
- * @riviere-role query-model
- */
-export type ComponentId = z.infer<typeof componentIdSchema>
-
-/**
- * Branded type for link identifiers.
- * @riviere-role query-model
- */
-export type LinkId = z.infer<typeof linkIdSchema>
-
-/**
- * Branded type for entity names.
- * @riviere-role query-model
- */
-export type EntityName = z.infer<typeof entityNameSchema>
-
-/**
- * Branded type for domain names.
- * @riviere-role query-model
- */
-export type DomainName = z.infer<typeof domainNameSchema>
-
-/**
- * Branded type for state names in entity state machines.
- * @riviere-role query-model
- */
-export type State = z.infer<typeof stateSchema>
-
-/**
- * Branded type for operation names.
- * @riviere-role query-model
- */
-export type OperationName = z.infer<typeof operationNameSchema>
-
-/**
- * Branded type for event identifiers.
- * @riviere-role query-model
- */
-export type EventId = z.infer<typeof eventIdSchema>
-
-/**
- * Branded type for event names.
- * @riviere-role query-model
- */
-export type EventName = z.infer<typeof eventNameSchema>
-
-/**
- * Branded type for event handler identifiers.
- * @riviere-role query-model
- */
-export type HandlerId = z.infer<typeof handlerIdSchema>
-
-/**
- * Branded type for event handler names.
- * @riviere-role query-model
- */
-export type HandlerName = z.infer<typeof handlerNameSchema>
-
-/**
- * Error codes for graph validation failures.
- * @riviere-role query-model
- */
-export type ValidationErrorCode =
-  | 'INVALID_LINK_SOURCE'
-  | 'INVALID_LINK_TARGET'
-  | 'INVALID_TYPE'
-  | 'INVALID_RELATIONSHIP_TYPE'
-  | 'DUPLICATE_LINK_ID'
-  | 'DUPLICATE_LINK'
-
-/**
- * A validation error found in the graph.
- * @riviere-role query-model
- */
-export interface ValidationError {
-  /** JSON path to the error location. */
-  path: string
-  /** Human-readable error description. */
-  message: string
-  /** Machine-readable error code. */
-  code: ValidationErrorCode
-}
-
-/**
- * Result of graph validation.
- * @riviere-role query-model
- */
-export interface ValidationResult {
-  /** Whether the graph passed validation. */
-  valid: boolean
-  /** List of validation errors (empty if valid). */
-  errors: ValidationError[]
-}
-
-/**
- * Component counts by type within a domain.
- * @riviere-role query-model
- */
-export interface ComponentCounts {
-  /** Number of UI components. */
-  UI: number
-  /** Number of API components. */
-  API: number
-  /** Number of UseCase components. */
-  UseCase: number
-  /** Number of DomainOp components. */
-  DomainOp: number
-  /** Number of Event components. */
-  Event: number
-  /** Number of EventHandler components. */
-  EventHandler: number
-  /** Number of Custom components. */
-  Custom: number
-  /** Total number of components. */
-  total: number
-}
-
-/**
- * Domain information with metadata and component counts.
- * @riviere-role query-model
- */
-export interface Domain {
-  /** Domain name. */
-  name: string
-  /** Domain description from graph metadata. */
-  description: string
-  /** System type classification. */
-  systemType: import('@living-architecture/riviere-schema').SystemType
-  /** Counts of components by type. */
-  componentCounts: ComponentCounts
-}
-
-/**
- * A component that was modified between graph versions.
- * @riviere-role query-model
- */
-export interface ComponentModification {
-  /** The component ID. */
-  id: ComponentId
-  /** The component state before modification. */
-  before: Component
-  /** The component state after modification. */
-  after: Component
-  /** List of field names that changed. */
-  changedFields: string[]
-}
-
-/**
- * Summary statistics of differences between graphs.
- * @riviere-role query-model
- */
-export interface DiffStats {
-  /** Number of components added. */
-  componentsAdded: number
-  /** Number of components removed. */
-  componentsRemoved: number
-  /** Number of components modified. */
-  componentsModified: number
-  /** Number of links added. */
-  linksAdded: number
-  /** Number of links removed. */
-  linksRemoved: number
-}
-
-/**
- * Complete diff between two graph versions.
- * @riviere-role query-model
- */
-export interface GraphDiff {
-  /** Component changes. */
-  components: {
-    /** Components present in new graph but not old. */
-    added: Component[]
-    /** Components present in old graph but not new. */
-    removed: Component[]
-    /** Components present in both with different values. */
-    modified: ComponentModification[]
-  }
-  /** Link changes. */
-  links: {
-    /** Links present in new graph but not old. */
-    added: Link[]
-    /** Links present in old graph but not new. */
-    removed: Link[]
-  }
-  /** Summary statistics. */
-  stats: DiffStats
-}
-
-/**
- * Type of link between components.
- * @riviere-role query-model
- */
-export type LinkType = 'sync' | 'async'
-
-/**
- * A step in an execution flow.
- * @riviere-role query-model
- */
-export interface FlowStep {
-  /** The component at this step. */
-  component: Component
-  /** Exact links leaving this component, preserving branching relationship semantics. */
-  outgoingLinks: Link[]
-  /** Depth from entry point (0 = entry point). */
-  depth: number
-  /** External links from this component to external systems. */
-  externalLinks: ExternalLink[]
-}
-
-/**
- * An execution flow from entry point through the graph.
- * @riviere-role query-model
- */
-export interface Flow {
-  /** The entry point component. */
-  entryPoint: Component
-  /** Steps in the flow including entry point. */
-  steps: FlowStep[]
-}
-
-/**
- * Result of searchWithFlow containing matches and their flow context.
- * @riviere-role query-model
- */
-export interface SearchWithFlowResult {
-  /** IDs of components that matched the search. */
-  matchingIds: ComponentId[]
-  /** IDs of all components visible in the matching flows. */
-  visibleIds: ComponentId[]
-}
-
-/**
- * A link that crosses domain boundaries.
- * @riviere-role query-model
- */
-export interface CrossDomainLink {
-  /** The target domain name. */
-  targetDomain: DomainName
-  /** Type of the cross-domain link. */
-  linkType: LinkType | undefined
-}
-
-/**
- * Summary of connections between domains.
- * @riviere-role query-model
- */
-export interface DomainConnection {
-  /** The connected domain name. */
-  targetDomain: DomainName
-  /** Direction relative to the queried domain. */
-  direction: 'outgoing' | 'incoming'
-  /** Number of API-based connections. */
-  apiCount: number
-  /** Number of event-based connections. */
-  eventCount: number
-}
-
-/**
- * Aggregate statistics about a graph.
- * @riviere-role query-model
- */
-export interface GraphStats {
-  /** Total number of components. */
-  componentCount: number
-  /** Total number of links. */
-  linkCount: number
-  /** Number of domains. */
-  domainCount: number
-  /** Number of API components. */
-  apiCount: number
-  /** Number of unique entities. */
-  entityCount: number
-  /** Number of Event components. */
-  eventCount: number
-}
-
-/**
- * An external domain that components connect to.
- *
- * External domains are any systems not represented in the graph—third-party
- * services (Stripe, Twilio) or internal domains outside the current scope.
- * @riviere-role query-model
- */
-export interface ExternalDomain {
-  /** Name of the external domain (e.g., "Stripe", "Twilio"). */
-  name: string
-  /** Domains that have connections to this external domain. */
-  sourceDomains: DomainName[]
-  /** Total number of connections to this external domain. */
-  connectionCount: number
-}
-
-/**
- * Parses a string as a ComponentId.
- *
- * @param id - The string to parse
- * @returns A branded ComponentId
- * @riviere-role query-model
- */
-export function parseComponentId(id: string): ComponentId {
-  return componentIdSchema.parse(id)
-}
-
-/**
- * Parses a string as a LinkId.
- *
- * @param id - The string to parse
- * @returns A branded LinkId
- * @riviere-role query-model
- */
-export function parseLinkId(id: string): LinkId {
-  return linkIdSchema.parse(id)
-}
-
-/**
- * Parses a string as an EntityName.
- *
- * @param value - The string to parse
- * @returns A branded EntityName
- * @riviere-role query-model
- */
-export function parseEntityName(value: string): EntityName {
-  return entityNameSchema.parse(value)
-}
-
-/**
- * Parses a string as a DomainName.
- *
- * @param value - The string to parse
- * @returns A branded DomainName
- * @riviere-role query-model
- */
-export function parseDomainName(value: string): DomainName {
-  return domainNameSchema.parse(value)
-}
-
-/**
- * Parses a string as a State.
- *
- * @param value - The string to parse
- * @returns A branded State
- * @riviere-role query-model
- */
-export function parseState(value: string): State {
-  return stateSchema.parse(value)
-}
-
-/**
- * Parses a string as an OperationName.
- *
- * @param value - The string to parse
- * @returns A branded OperationName
- * @riviere-role query-model
- */
-export function parseOperationName(value: string): OperationName {
-  return operationNameSchema.parse(value)
-}
-
-/**
- * Parses a string as an EventId.
- *
- * @param value - The string to parse
- * @returns A branded EventId
- * @riviere-role query-model
- */
-export function parseEventId(value: string): EventId {
-  return eventIdSchema.parse(value)
-}
-
-/**
- * Parses a string as an EventName.
- *
- * @param value - The string to parse
- * @returns A branded EventName
- * @riviere-role query-model
- */
-export function parseEventName(value: string): EventName {
-  return eventNameSchema.parse(value)
-}
-
-/**
- * Parses a string as a HandlerId.
- *
- * @param value - The string to parse
- * @returns A branded HandlerId
- * @riviere-role query-model
- */
-export function parseHandlerId(value: string): HandlerId {
-  return handlerIdSchema.parse(value)
-}
-
-/**
- * Parses a string as a HandlerName.
- *
- * @param value - The string to parse
- * @returns A branded HandlerName
- * @riviere-role query-model
- */
-export function parseHandlerName(value: string): HandlerName {
-  return handlerNameSchema.parse(value)
-}
diff --git a/packages/riviere-query/src/features/querying/queries/domains.spec.ts b/packages/riviere-query/src/features/querying/queries/domains.spec.ts
deleted file mode 100644
index b8a93a47d..000000000
--- a/packages/riviere-query/src/features/querying/queries/domains.spec.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import { RiviereQuery } from './RiviereQuery'
-import {
-  createMinimalValidGraph,
-  createAPIComponent,
-  createUseCaseComponent,
-  assertDefined,
-} from '../../../platform/__fixtures__/riviere-graph-fixtures'
-
-describe('domains', () => {
-  it('returns domain with name, description, and systemType from metadata', () => {
-    const graph = createMinimalValidGraph()
-    const query = new RiviereQuery(graph)
-
-    const result = query.domains()
-
-    expect(result).toStrictEqual([
-      {
-        name: 'test',
-        description: 'Test domain',
-        systemType: 'domain',
-        componentCounts: {
-          UI: 1,
-          API: 0,
-          UseCase: 0,
-          DomainOp: 0,
-          Event: 0,
-          EventHandler: 0,
-          Custom: 0,
-          total: 1,
-        },
-      },
-    ])
-  })
-
-  it('returns the external-service system type from metadata', () => {
-    const graph = createMinimalValidGraph()
-    graph.metadata.domains['alerts'] = {
-      description: 'External alert service',
-      systemType: 'external-service',
-    }
-    const query = new RiviereQuery(graph)
-
-    const result = query.domains()
-
-    expect(result.find((domain) => domain.name === 'alerts')?.systemType).toBe('external-service')
-  })
-
-  it('returns multiple domains with correct component counts per type', () => {
-    const graph = createMinimalValidGraph()
-    graph.metadata.domains['orders'] = {
-      description: 'Order management',
-      systemType: 'domain',
-    }
-    graph.metadata.domains['shipping'] = {
-      description: 'Shipping integration',
-      systemType: 'bff',
-    }
-    graph.components.push(
-      createAPIComponent({
-        id: 'orders:api:create',
-        name: 'Create Order',
-        domain: 'orders',
-      }),
-      createAPIComponent({
-        id: 'orders:api:get',
-        name: 'Get Order',
-        domain: 'orders',
-      }),
-      createUseCaseComponent({
-        id: 'orders:usecase:checkout',
-        name: 'Checkout',
-        domain: 'orders',
-      }),
-      createAPIComponent({
-        id: 'shipping:api:track',
-        name: 'Track',
-        domain: 'shipping',
-      }),
-    )
-    const query = new RiviereQuery(graph)
-
-    const result = query.domains()
-
-    const orders = result.find((d) => d.name === 'orders')
-    expect(orders).toStrictEqual({
-      name: 'orders',
-      description: 'Order management',
-      systemType: 'domain',
-      componentCounts: {
-        UI: 0,
-        API: 2,
-        UseCase: 1,
-        DomainOp: 0,
-        Event: 0,
-        EventHandler: 0,
-        Custom: 0,
-        total: 3,
-      },
-    })
-
-    const shipping = result.find((d) => d.name === 'shipping')
-    expect(shipping?.systemType).toBe('bff')
-    expect(shipping?.componentCounts.API).toBe(1)
-    expect(shipping?.componentCounts.total).toBe(1)
-  })
-
-  it('throws when graph has no domains (invalid per schema)', () => {
-    const graph = createMinimalValidGraph()
-    graph.metadata.domains = {}
-    graph.components = []
-
-    expect(() => new RiviereQuery(graph)).toThrow(/must NOT have fewer than 1 properties/i)
-  })
-
-  it('does not include external systems in domains (use externalSystems() instead)', () => {
-    const graph = createMinimalValidGraph()
-    graph.externalLinks = [
-      {
-        source: 'test:mod:ui:page',
-        target: { name: 'Stripe' },
-        type: 'sync',
-      },
-      {
-        source: 'test:mod:ui:page',
-        target: { name: 'Twilio' },
-        type: 'async',
-      },
-    ]
-    const query = new RiviereQuery(graph)
-
-    const result = query.domains()
-
-    expect(result.find((d) => d.name === 'external')).toBeUndefined()
-    expect(result.find((d) => d.name === 'Stripe')).toBeUndefined()
-    expect(result.find((d) => d.name === 'Twilio')).toBeUndefined()
-  })
-})
-
-describe('assertDefined', () => {
-  it('returns value when defined', () => {
-    const value = assertDefined('test')
-
-    expect(value).toBe('test')
-  })
-
-  it('throws when value is undefined', () => {
-    expect(() => assertDefined(undefined)).toThrow('Expected value to be defined')
-  })
-
-  it('throws when value is null', () => {
-    expect(() => assertDefined(null)).toThrow('Expected value to be defined')
-  })
-
-  it('throws with custom message', () => {
-    expect(() => assertDefined(null, 'Custom error')).toThrow('Custom error')
-  })
-})
diff --git a/packages/riviere-query/src/features/querying/queries/errors.spec.ts b/packages/riviere-query/src/features/querying/queries/errors.spec.ts
deleted file mode 100644
index 19befb5c1..000000000
--- a/packages/riviere-query/src/features/querying/queries/errors.spec.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import {
-  describe, it, expect 
-} from 'vitest'
-import { ComponentNotFoundError } from './errors'
-
-describe('ComponentNotFoundError', () => {
-  it('has message containing component ID', () => {
-    const error = new ComponentNotFoundError('orders:checkout:api:place-order')
-
-    expect(error.message).toBe("Component 'orders:checkout:api:place-order' not found")
-  })
-
-  it('exposes componentId property', () => {
-    const error = new ComponentNotFoundError('orders:checkout:api:place-order')
-
-    expect(error.componentId).toBe('orders:checkout:api:place-order')
-  })
-
-  it('defaults suggestions to empty array', () => {
-    const error = new ComponentNotFoundError('orders:checkout:api:place-order')
-
-    expect(error.suggestions).toStrictEqual([])
-  })
-
-  it('exposes provided suggestions', () => {
-    const suggestions = ['orders:checkout:api:create-order', 'orders:checkout:api:get-order']
-    const error = new ComponentNotFoundError('orders:checkout:api:place-ordr', suggestions)
-
-    expect(error.suggestions).toStrictEqual(suggestions)
-  })
-
-  it('has name ComponentNotFoundError', () => {
-    const error = new ComponentNotFoundError('any:id')
-
-    expect(error.name).toBe('ComponentNotFoundError')
-  })
-})
diff --git a/packages/riviere-query/src/features/querying/queries/errors.ts b/packages/riviere-query/src/features/querying/queries/errors.ts
deleted file mode 100644
index 178d14973..000000000
--- a/packages/riviere-query/src/features/querying/queries/errors.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/** @riviere-role query-model-error */
-export class ComponentNotFoundError extends Error {
-  readonly componentId: string
-  readonly suggestions: string[]
-
-  constructor(componentId: string, suggestions: string[] = []) {
-    super(`Component '${componentId}' not found`)
-    this.name = 'ComponentNotFoundError'
-    this.componentId = componentId
-    this.suggestions = suggestions
-  }
-}
diff --git a/packages/riviere-query/src/features/querying/queries/event-queries.ts b/packages/riviere-query/src/features/querying/queries/event-queries.ts
deleted file mode 100644
index a753086da..000000000
--- a/packages/riviere-query/src/features/querying/queries/event-queries.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import type {
-  RiviereGraph,
-  EventComponent,
-  EventHandlerComponent,
-} from '@living-architecture/riviere-schema'
-import type {
-  PublishedEvent,
-  EventSubscriber,
-  EventHandlerInfo,
-  KnownSourceEvent,
-  UnknownSourceEvent,
-} from './event-types'
-import {
-  parseDomainName,
-  parseEventId,
-  parseEventName,
-  parseHandlerId,
-  parseHandlerName,
-} from './domain-types'
-
-/** @riviere-role query-model */
-export function queryPublishedEvents(graph: RiviereGraph, domainName?: string): PublishedEvent[] {
-  const eventComponents = graph.components.filter((c): c is EventComponent => c.type === 'Event')
-  const filtered = domainName
-    ? eventComponents.filter((e) => e.domain === domainName)
-    : eventComponents
-  const handlers = graph.components.filter(
-    (c): c is EventHandlerComponent => c.type === 'EventHandler',
-  )
-
-  return filtered.map((event) => {
-    const subscribers: EventSubscriber[] = handlers
-      .filter((h) => h.subscribedEvents.includes(event.eventName))
-      .map((h) => ({
-        handlerId: parseHandlerId(h.id),
-        handlerName: parseHandlerName(h.name),
-        domain: parseDomainName(h.domain),
-      }))
-    return {
-      id: parseEventId(event.id),
-      eventName: parseEventName(event.eventName),
-      domain: parseDomainName(event.domain),
-      handlers: subscribers,
-    }
-  })
-}
-
-/** @riviere-role query-model */
-export function queryEventHandlers(graph: RiviereGraph, eventName?: string): EventHandlerInfo[] {
-  const eventByName = buildEventNameMap(graph)
-  const handlers = findEventHandlerComponents(graph)
-  const filtered = eventName
-    ? handlers.filter((h) => h.subscribedEvents.includes(eventName))
-    : handlers
-  return filtered.map((h) => buildEventHandlerInfo(h, eventByName))
-}
-
-function buildEventNameMap(graph: RiviereGraph): Map<string, EventComponent> {
-  return new Map(
-    graph.components
-      .filter((c): c is EventComponent => c.type === 'Event')
-      .map((e) => [e.eventName, e]),
-  )
-}
-
-function findEventHandlerComponents(graph: RiviereGraph): EventHandlerComponent[] {
-  return graph.components.filter((c): c is EventHandlerComponent => c.type === 'EventHandler')
-}
-
-function buildEventHandlerInfo(
-  handler: EventHandlerComponent,
-  eventByName: Map<string, EventComponent>,
-): EventHandlerInfo {
-  const subscribedEventsWithDomain = handler.subscribedEvents.map(
-    (name): KnownSourceEvent | UnknownSourceEvent => {
-      const event = eventByName.get(name)
-      if (event)
-        return {
-          eventName: parseEventName(name),
-          sourceDomain: parseDomainName(event.domain),
-          sourceKnown: true,
-        }
-      return {
-        eventName: parseEventName(name),
-        sourceKnown: false,
-      }
-    },
-  )
-  return {
-    id: parseHandlerId(handler.id),
-    handlerName: parseHandlerName(handler.name),
-    domain: parseDomainName(handler.domain),
-    subscribedEvents: handler.subscribedEvents.map(parseEventName),
-    subscribedEventsWithDomain,
-  }
-}
diff --git a/packages/riviere-query/src/features/querying/queries/event-types.ts b/packages/riviere-query/src/features/querying/queries/event-types.ts
deleted file mode 100644
index 92a6cca4e..000000000
--- a/packages/riviere-query/src/features/querying/queries/event-types.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import type { DomainOpComponent } from '@living-architecture/riviere-schema'
-import type {
-  EntityName,
-  DomainName,
-  State,
-  OperationName,
-  EventId,
-  EventName,
-  HandlerId,
-  HandlerName,
-} from './domain-types'
-
-/**
- * A domain entity with its associated operations, states, and business rules.
- * @riviere-role query-model
- */
-export class Entity {
-  constructor(
-    /** The entity name. */
-    public readonly name: EntityName,
-    /** The domain containing the entity. */
-    public readonly domain: DomainName,
-    /** All domain operations targeting this entity. */
-    public readonly operations: DomainOpComponent[],
-    /** Ordered states derived from state transitions (initial → terminal). */
-    public readonly states: State[],
-    /** State transitions with triggering operations. */
-    public readonly transitions: EntityTransition[],
-    /** Deduplicated business rules from all operations. */
-    public readonly businessRules: string[],
-  ) {}
-
-  hasStates(): boolean {
-    return this.states.length > 0
-  }
-
-  hasBusinessRules(): boolean {
-    return this.businessRules.length > 0
-  }
-
-  firstOperationId(): string | undefined {
-    return this.operations[0]?.id
-  }
-}
-
-/**
- * A state transition in an entity's state machine.
- * @riviere-role query-model
- */
-export interface EntityTransition {
-  /** The state before the transition. */
-  from: State
-  /** The state after the transition. */
-  to: State
-  /** The operation that triggers this transition. */
-  triggeredBy: OperationName
-}
-
-/**
- * An event handler that subscribes to an event.
- * @riviere-role query-model
- */
-export interface EventSubscriber {
-  /** The handler's component ID. */
-  handlerId: HandlerId
-  /** The handler's name. */
-  handlerName: HandlerName
-  /** The domain containing the handler. */
-  domain: DomainName
-}
-
-/**
- * A published event with its subscribers.
- * @riviere-role query-model
- */
-export interface PublishedEvent {
-  /** The event component's ID. */
-  id: EventId
-  /** The event name. */
-  eventName: EventName
-  /** The domain that publishes the event. */
-  domain: DomainName
-  /** Event handlers subscribed to this event. */
-  handlers: EventSubscriber[]
-}
-
-/**
- * A subscribed event where the source domain is known.
- * @riviere-role query-model
- */
-export interface KnownSourceEvent {
-  /** The event name. */
-  eventName: EventName
-  /** The domain that publishes this event. */
-  sourceDomain: DomainName
-  /** Indicates the source is known. */
-  sourceKnown: true
-}
-
-/**
- * A subscribed event where the source domain is unknown.
- * @riviere-role query-model
- */
-export interface UnknownSourceEvent {
-  /** The event name. */
-  eventName: EventName
-  /** Indicates the source is unknown. */
-  sourceKnown: false
-}
-
-/**
- * A subscribed event with optional source domain information.
- * @riviere-role query-model
- */
-export type SubscribedEventWithDomain = KnownSourceEvent | UnknownSourceEvent
-
-/**
- * Information about an event handler component.
- * @riviere-role query-model
- */
-export interface EventHandlerInfo {
-  /** The handler's component ID. */
-  id: HandlerId
-  /** The handler's name. */
-  handlerName: HandlerName
-  /** The domain containing the handler. */
-  domain: DomainName
-  /** List of event names this handler subscribes to. */
-  subscribedEvents: EventName[]
-  /** Subscribed events with source domain information. */
-  subscribedEventsWithDomain: SubscribedEventWithDomain[]
-}
diff --git a/packages/riviere-query/src/features/querying/queries/flow-constants.ts b/packages/riviere-query/src/features/querying/queries/flow-constants.ts
deleted file mode 100644
index a80b1c3aa..000000000
--- a/packages/riviere-query/src/features/querying/queries/flow-constants.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type { ComponentType } from '@living-architecture/riviere-schema'
-
-export const ENTRY_POINT_TYPES: ReadonlySet<ComponentType> = new Set<ComponentType>([
-  'UI',
-  'API',
-  'EventHandler',
-  'Custom',
-])
diff --git a/packages/riviere-query/src/features/querying/queries/flow-queries.ts b/packages/riviere-query/src/features/querying/queries/flow-queries.ts
deleted file mode 100644
index c69cd11d2..000000000
--- a/packages/riviere-query/src/features/querying/queries/flow-queries.ts
+++ /dev/null
@@ -1,185 +0,0 @@
-import type {
-  RiviereGraph,
-  Component,
-  ExternalLink,
-  Link,
-} from '@living-architecture/riviere-schema'
-import type {
-  ComponentId, LinkId, Flow, SearchWithFlowResult 
-} from './domain-types'
-import { parseComponentId } from './domain-types'
-import {
-  componentById, searchComponents 
-} from './component-queries'
-import { ComponentNotFoundError } from './errors'
-import { createLinkKey } from './link-key'
-import { ENTRY_POINT_TYPES } from './flow-constants'
-
-/** @riviere-role query-model */
-export function findEntryPoints(graph: RiviereGraph): Component[] {
-  const targets = new Set(graph.links.map((link) => link.target))
-  return graph.components.filter((c) => ENTRY_POINT_TYPES.has(c.type) && !targets.has(c.id))
-}
-
-/** @riviere-role query-model */
-export function traceFlowFrom(
-  graph: RiviereGraph,
-  startComponentId: ComponentId,
-): {
-  componentIds: ComponentId[]
-  linkIds: LinkId[]
-} {
-  const component = componentById(graph, startComponentId)
-  if (!component) {
-    throw new ComponentNotFoundError(startComponentId)
-  }
-
-  const visited = new Set<ComponentId>()
-  const visitedLinks = new Set<LinkId>()
-  const queue: ComponentId[] = [startComponentId]
-
-  while (queue.length > 0) {
-    const currentId = queue.shift()
-    if (currentId === undefined || visited.has(currentId)) continue
-    visited.add(currentId)
-
-    for (const link of graph.links) {
-      const sourceId = parseComponentId(link.source)
-      const targetId = parseComponentId(link.target)
-      if (link.source === currentId && !visited.has(targetId)) {
-        queue.push(targetId)
-        visitedLinks.add(createLinkKey(link))
-      }
-      if (link.target === currentId && !visited.has(sourceId)) {
-        queue.push(sourceId)
-        visitedLinks.add(createLinkKey(link))
-      }
-    }
-  }
-
-  return {
-    componentIds: Array.from(visited),
-    linkIds: Array.from(visitedLinks),
-  }
-}
-
-/** @riviere-role query-model */
-export function queryFlows(graph: RiviereGraph): Flow[] {
-  const componentByIdMap = new Map(graph.components.map((c) => [c.id, c]))
-  const outgoingEdges = buildOutgoingEdges(graph)
-  const externalLinksBySource = buildExternalLinksBySource(graph)
-
-  const traceForward = (entryPointId: string): Flow['steps'] => {
-    const steps: Flow['steps'] = []
-    const visited = new Set<string>()
-
-    const traverse = (nodeId: string, depth: number): void => {
-      if (visited.has(nodeId)) return
-      visited.add(nodeId)
-
-      const component = componentByIdMap.get(nodeId)
-      if (!component) return
-
-      const edges = outgoingEdges.get(nodeId) ?? []
-      const externalLinks = externalLinksBySource.get(nodeId) ?? []
-
-      steps.push({
-        component,
-        outgoingLinks: edges,
-        depth,
-        externalLinks,
-      })
-
-      for (const edge of edges) {
-        traverse(edge.target, depth + 1)
-      }
-    }
-
-    traverse(entryPointId, 0)
-    return steps
-  }
-
-  return findEntryPoints(graph).map((entryPoint) => ({
-    entryPoint,
-    steps: traceForward(entryPoint.id),
-  }))
-}
-
-function buildExternalLinksBySource(graph: RiviereGraph): Map<string, ExternalLink[]> {
-  const externalLinks = graph.externalLinks ?? []
-  const bySource = new Map<string, ExternalLink[]>()
-
-  for (const link of externalLinks) {
-    const existing = bySource.get(link.source)
-    if (existing) {
-      existing.push(link)
-    } else {
-      bySource.set(link.source, [link])
-    }
-  }
-
-  return bySource
-}
-
-function buildOutgoingEdges(graph: RiviereGraph): Map<string, Link[]> {
-  const edges = new Map<string, Link[]>()
-  for (const link of graph.links) {
-    const existing = edges.get(link.source)
-    if (existing) {
-      existing.push(link)
-    } else {
-      edges.set(link.source, [link])
-    }
-  }
-  return edges
-}
-
-/** @riviere-role query-model-use-case-input */
-export interface SearchWithFlowOptions {returnAllOnEmptyQuery: boolean}
-
-/** @riviere-role query-model */
-export function searchWithFlowContext(
-  graph: RiviereGraph,
-  query: string,
-  options: SearchWithFlowOptions,
-): SearchWithFlowResult {
-  const trimmedQuery = query.trim().toLowerCase()
-  const isEmptyQuery = trimmedQuery === ''
-
-  if (isEmptyQuery) {
-    if (options.returnAllOnEmptyQuery) {
-      const allIds = graph.components.map((c) => parseComponentId(c.id))
-      return {
-        matchingIds: allIds,
-        visibleIds: allIds,
-      }
-    }
-    return {
-      matchingIds: [],
-      visibleIds: [],
-    }
-  }
-
-  const matchingComponents = searchComponents(graph, query)
-  if (matchingComponents.length === 0) {
-    return {
-      matchingIds: [],
-      visibleIds: [],
-    }
-  }
-
-  const matchingIds = matchingComponents.map((c) => parseComponentId(c.id))
-  const visibleIds = new Set<ComponentId>()
-
-  for (const component of matchingComponents) {
-    const flow = traceFlowFrom(graph, parseComponentId(component.id))
-    for (const id of flow.componentIds) {
-      visibleIds.add(id)
-    }
-  }
-
-  return {
-    matchingIds,
-    visibleIds: Array.from(visibleIds),
-  }
-}
diff --git a/packages/riviere-query/src/features/querying/queries/graph-diff.ts b/packages/riviere-query/src/features/querying/queries/graph-diff.ts
deleted file mode 100644
index c370fcc4b..000000000
--- a/packages/riviere-query/src/features/querying/queries/graph-diff.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import type {
-  RiviereGraph, Component 
-} from '@living-architecture/riviere-schema'
-import type {
-  ComponentModification, GraphDiff 
-} from './domain-types'
-import { parseComponentId } from './domain-types'
-import { createLinkKey } from './link-key'
-
-/** @riviere-role query-model */
-export function diffGraphs(current: RiviereGraph, other: RiviereGraph): GraphDiff {
-  const thisIds = new Set(current.components.map((c) => c.id))
-  const otherIds = new Set(other.components.map((c) => c.id))
-  const otherById = new Map(other.components.map((c) => [c.id, c]))
-
-  const added = other.components.filter((c) => !thisIds.has(c.id))
-  const removed = current.components.filter((c) => !otherIds.has(c.id))
-  const modified: ComponentModification[] = []
-
-  for (const tc of current.components) {
-    const oc = otherById.get(tc.id)
-    if (oc === undefined) continue
-    const changedFields = findChangedFields(tc, oc)
-    if (changedFields.length > 0) {
-      modified.push({
-        id: parseComponentId(tc.id),
-        before: tc,
-        after: oc,
-        changedFields,
-      })
-    }
-  }
-
-  const thisLinkKeys = new Set(current.links.map((l) => createLinkKey(l)))
-  const otherLinkKeys = new Set(other.links.map((l) => createLinkKey(l)))
-  const linksAdded = other.links.filter((l) => !thisLinkKeys.has(createLinkKey(l)))
-  const linksRemoved = current.links.filter((l) => !otherLinkKeys.has(createLinkKey(l)))
-
-  return {
-    components: {
-      added,
-      removed,
-      modified,
-    },
-    links: {
-      added: linksAdded,
-      removed: linksRemoved,
-    },
-    stats: {
-      componentsAdded: added.length,
-      componentsRemoved: removed.length,
-      componentsModified: modified.length,
-      linksAdded: linksAdded.length,
-      linksRemoved: linksRemoved.length,
-    },
-  }
-}
-
-function findChangedFields(before: Component, after: Component): string[] {
-  const beforeEntries = new Map(Object.entries(before))
-  const afterEntries = new Map(Object.entries(after))
-  const changedFields: string[] = []
-  const allKeys = new Set([...beforeEntries.keys(), ...afterEntries.keys()])
-
-  for (const key of allKeys) {
-    if (key === 'id') continue
-    if (JSON.stringify(beforeEntries.get(key)) !== JSON.stringify(afterEntries.get(key))) {
-      changedFields.push(key)
-    }
-  }
-
-  return changedFields
-}
diff --git a/packages/riviere-query/src/features/querying/queries/graph-validation.ts b/packages/riviere-query/src/features/querying/queries/graph-validation.ts
deleted file mode 100644
index 0eab7d578..000000000
--- a/packages/riviere-query/src/features/querying/queries/graph-validation.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-import { createLinkId } from '@living-architecture/riviere-schema'
-import type {
-  RiviereGraph, CustomComponent 
-} from '@living-architecture/riviere-schema'
-import type {
-  ComponentId, ValidationError, ValidationResult 
-} from './domain-types'
-import { parseComponentId } from './domain-types'
-
-function isCustomComponent(component: { type: string }): component is CustomComponent {
-  return component.type === 'Custom'
-}
-
-/** @riviere-role query-model */
-export function validateGraph(graph: RiviereGraph): ValidationResult {
-  const errors: ValidationError[] = []
-
-  const componentIds = new Set(graph.components.map((c) => c.id))
-  graph.links.forEach((link, index) => {
-    if (!componentIds.has(link.source)) {
-      errors.push({
-        path: `/links/${index}/source`,
-        message: `Link references non-existent source: ${link.source}`,
-        code: 'INVALID_LINK_SOURCE',
-      })
-    }
-    if (!componentIds.has(link.target)) {
-      errors.push({
-        path: `/links/${index}/target`,
-        message: `Link references non-existent target: ${link.target}`,
-        code: 'INVALID_LINK_TARGET',
-      })
-    }
-  })
-
-  errors.push(...validateCustomTypes(graph))
-  errors.push(...validateRelationshipTypes(graph))
-  errors.push(...validateUniqueLinkIds(graph))
-  errors.push(...validateUniqueLinkOccurrences(graph))
-
-  return {
-    valid: errors.length === 0,
-    errors,
-  }
-}
-
-function validateRelationshipTypes(graph: RiviereGraph): ValidationError[] {
-  const errors: ValidationError[] = []
-  const relationshipTypes = graph.metadata.relationshipTypes
-
-  graph.links.forEach((link, index) => {
-    if (
-      link.relationshipType !== undefined &&
-      (relationshipTypes === undefined || !Object.hasOwn(relationshipTypes, link.relationshipType))
-    ) {
-      errors.push({
-        path: `/links/${index}/relationshipType`,
-        message: `Relationship type '${link.relationshipType}' is not defined in metadata.relationshipTypes`,
-        code: 'INVALID_RELATIONSHIP_TYPE',
-      })
-    }
-  })
-
-  return errors
-}
-
-function validateUniqueLinkIds(graph: RiviereGraph): ValidationError[] {
-  const errors: ValidationError[] = []
-  const seen = new Set<string>()
-
-  graph.links.forEach((link, index) => {
-    if (link.id === undefined) {
-      return
-    }
-    if (seen.has(link.id)) {
-      errors.push({
-        path: `/links/${index}/id`,
-        message: `Duplicate Link ID: ${link.id}`,
-        code: 'DUPLICATE_LINK_ID',
-      })
-      return
-    }
-    seen.add(link.id)
-  })
-
-  return errors
-}
-
-function validateUniqueLinkOccurrences(graph: RiviereGraph): ValidationError[] {
-  const errors: ValidationError[] = []
-  const seen = new Set<string>()
-
-  graph.links.forEach((link, index) => {
-    const occurrenceId = createLinkId(link)
-    if (seen.has(occurrenceId)) {
-      errors.push({
-        path: `/links/${index}`,
-        message: `Duplicate Link occurrence: ${occurrenceId}`,
-        code: 'DUPLICATE_LINK',
-      })
-      return
-    }
-    seen.add(occurrenceId)
-  })
-
-  return errors
-}
-
-function validateCustomTypes(graph: RiviereGraph): ValidationError[] {
-  const errors: ValidationError[] = []
-  const customTypes = graph.metadata.customTypes
-
-  graph.components.forEach((component, index) => {
-    if (!isCustomComponent(component)) {
-      return
-    }
-
-    const customTypeName = component.customTypeName
-
-    if (!customTypes || !(customTypeName in customTypes)) {
-      errors.push({
-        path: `/components/${index}/customTypeName`,
-        message: `Custom type '${customTypeName}' is not defined in metadata.customTypes`,
-        code: 'INVALID_TYPE',
-      })
-    }
-  })
-
-  return errors
-}
-
-/** @riviere-role query-model */
-export function detectOrphanComponents(graph: RiviereGraph): ComponentId[] {
-  const connectedComponentIds = new Set<string>()
-  graph.links.forEach((link) => {
-    connectedComponentIds.add(link.source)
-    connectedComponentIds.add(link.target)
-  })
-
-  return graph.components
-    .filter((c) => !connectedComponentIds.has(c.id))
-    .map((c) => parseComponentId(c.id))
-}
diff --git a/packages/riviere-query/src/features/querying/queries/index.ts b/packages/riviere-query/src/features/querying/queries/index.ts
deleted file mode 100644
index b915c8b6d..000000000
--- a/packages/riviere-query/src/features/querying/queries/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './RiviereQuery'
-export * from './event-types'
-export * from './domain-types'
-export * from './errors'
-export { compareByCodePoint } from './compare-by-code-point'
diff --git a/packages/riviere-query/src/features/querying/queries/link-key.ts b/packages/riviere-query/src/features/querying/queries/link-key.ts
deleted file mode 100644
index 521430e49..000000000
--- a/packages/riviere-query/src/features/querying/queries/link-key.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { Link } from '@living-architecture/riviere-schema'
-import type { LinkId } from './domain-types'
-import { parseLinkId } from './domain-types'
-
-/** @riviere-role query-model */
-export function createLinkKey(link: Link): LinkId {
-  if (link.id !== undefined) {
-    return parseLinkId(link.id)
-  }
-  return parseLinkId(`${link.source}->${link.target}`)
-}
diff --git a/packages/riviere-query/src/features/querying/queries/stats-queries.ts b/packages/riviere-query/src/features/querying/queries/stats-queries.ts
deleted file mode 100644
index 663864ad0..000000000
--- a/packages/riviere-query/src/features/querying/queries/stats-queries.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import type {
-  RiviereGraph, DomainOpComponent 
-} from '@living-architecture/riviere-schema'
-import type { GraphStats } from './domain-types'
-
-/** @riviere-role query-model */
-export function queryStats(graph: RiviereGraph): GraphStats {
-  const components = graph.components
-
-  const uniqueDomains = new Set(components.map((c) => c.domain))
-
-  const domainOps = components.filter((c): c is DomainOpComponent => c.type === 'DomainOp')
-  const uniqueEntities = new Set(domainOps.filter((c) => c.entity).map((c) => c.entity))
-
-  return {
-    componentCount: components.length,
-    linkCount: graph.links.length,
-    domainCount: uniqueDomains.size,
-    apiCount: components.filter((c) => c.type === 'API').length,
-    entityCount: uniqueEntities.size,
-    eventCount: components.filter((c) => c.type === 'Event').length,
-  }
-}
diff --git a/packages/riviere-query/src/features/querying/queries/traceFlow.spec.ts b/packages/riviere-query/src/features/querying/queries/traceFlow.spec.ts
deleted file mode 100644
index 910c23634..000000000
--- a/packages/riviere-query/src/features/querying/queries/traceFlow.spec.ts
+++ /dev/null
@@ -1,326 +0,0 @@
-import {
-  RiviereQuery, parseComponentId, ComponentNotFoundError 
-} from './RiviereQuery'
-import {
-  createMinimalValidGraph,
-  createAPIComponent,
-} from '../../../platform/__fixtures__/riviere-graph-fixtures'
-
-describe('RiviereQuery.traceFlow()', () => {
-  it('throws ComponentNotFoundError when startComponentId does not exist', () => {
-    const query = new RiviereQuery(createMinimalValidGraph())
-
-    expect(() => query.traceFlow(parseComponentId('nonexistent:mod:api:foo'))).toThrow(
-      ComponentNotFoundError,
-    )
-  })
-
-  it('includes componentId in ComponentNotFoundError', () => {
-    const query = new RiviereQuery(createMinimalValidGraph())
-
-    const captureError = (): ComponentNotFoundError | undefined => {
-      try {
-        query.traceFlow(parseComponentId('nonexistent:mod:api:foo'))
-        return undefined
-      } catch (error) {
-        if (error instanceof ComponentNotFoundError) {
-          return error
-        }
-        return undefined
-      }
-    }
-
-    const caughtError = captureError()
-    expect(caughtError).toBeDefined()
-    expect(caughtError?.componentId).toBe('nonexistent:mod:api:foo')
-  })
-
-  it('returns only starting component when component is isolated', () => {
-    const query = new RiviereQuery(createMinimalValidGraph())
-
-    const result = query.traceFlow(parseComponentId('test:mod:ui:page'))
-
-    expect(result.componentIds).toStrictEqual(['test:mod:ui:page'])
-    expect(result.linkIds).toStrictEqual([])
-  })
-
-  it('returns downstream components when starting from source', () => {
-    const graph = createMinimalValidGraph()
-    graph.components.push(
-      createAPIComponent({
-        id: 'test:api:create',
-        name: 'Create',
-        domain: 'test',
-      }),
-    )
-    graph.links = [
-      {
-        source: 'test:mod:ui:page',
-        target: 'test:api:create',
-      },
-    ]
-    const query = new RiviereQuery(graph)
-
-    const result = query.traceFlow(parseComponentId('test:mod:ui:page'))
-
-    expect(result.componentIds.slice().sort((a, b) => a.localeCompare(b))).toStrictEqual([
-      'test:api:create',
-      'test:mod:ui:page',
-    ])
-    expect(result.linkIds).toStrictEqual(['test:mod:ui:page->test:api:create'])
-  })
-
-  it('returns upstream components when starting from target', () => {
-    const graph = createMinimalValidGraph()
-    graph.components.push(
-      createAPIComponent({
-        id: 'test:api:create',
-        name: 'Create',
-        domain: 'test',
-      }),
-    )
-    graph.links = [
-      {
-        source: 'test:mod:ui:page',
-        target: 'test:api:create',
-      },
-    ]
-    const query = new RiviereQuery(graph)
-
-    const result = query.traceFlow(parseComponentId('test:api:create'))
-
-    expect(result.componentIds.slice().sort((a, b) => a.localeCompare(b))).toStrictEqual([
-      'test:api:create',
-      'test:mod:ui:page',
-    ])
-    expect(result.linkIds).toStrictEqual(['test:mod:ui:page->test:api:create'])
-  })
-
-  it('returns all branches when flow branches', () => {
-    const graph = createMinimalValidGraph()
-    graph.components.push(
-      createAPIComponent({
-        id: 'test:api:a',
-        name: 'API A',
-        domain: 'test',
-      }),
-      createAPIComponent({
-        id: 'test:api:b',
-        name: 'API B',
-        domain: 'test',
-      }),
-    )
-    graph.links = [
-      {
-        source: 'test:mod:ui:page',
-        target: 'test:api:a',
-      },
-      {
-        source: 'test:mod:ui:page',
-        target: 'test:api:b',
-      },
-    ]
-    const query = new RiviereQuery(graph)
-
-    const result = query.traceFlow(parseComponentId('test:mod:ui:page'))
-
-    expect(result.componentIds.slice().sort((a, b) => a.localeCompare(b))).toStrictEqual([
-      'test:api:a',
-      'test:api:b',
-      'test:mod:ui:page',
-    ])
-    expect(result.linkIds.slice().sort((a, b) => a.localeCompare(b))).toStrictEqual([
-      'test:mod:ui:page->test:api:a',
-      'test:mod:ui:page->test:api:b',
-    ])
-  })
-
-  it('handles cycles without infinite loop', () => {
-    const graph = createMinimalValidGraph()
-    graph.components.push(
-      createAPIComponent({
-        id: 'test:api:a',
-        name: 'API A',
-        domain: 'test',
-      }),
-    )
-    graph.links = [
-      {
-        source: 'test:mod:ui:page',
-        target: 'test:api:a',
-      },
-      {
-        source: 'test:api:a',
-        target: 'test:mod:ui:page',
-      },
-    ]
-    const query = new RiviereQuery(graph)
-
-    const result = query.traceFlow(parseComponentId('test:mod:ui:page'))
-
-    expect(result.componentIds.slice().sort((a, b) => a.localeCompare(b))).toStrictEqual([
-      'test:api:a',
-      'test:mod:ui:page',
-    ])
-    expect(result.linkIds.slice().sort((a, b) => a.localeCompare(b))).toStrictEqual([
-      'test:api:a->test:mod:ui:page',
-      'test:mod:ui:page->test:api:a',
-    ])
-  })
-
-  it('only includes components in connected subgraph', () => {
-    const graph = createMinimalValidGraph()
-    graph.metadata.domains['other'] = {
-      description: 'Other',
-      systemType: 'domain',
-    }
-    graph.components.push(
-      createAPIComponent({
-        id: 'test:api:a',
-        name: 'API A',
-        domain: 'test',
-      }),
-      createAPIComponent({
-        id: 'other:api:x',
-        name: 'API X',
-        domain: 'other',
-      }),
-      createAPIComponent({
-        id: 'other:api:y',
-        name: 'API Y',
-        domain: 'other',
-      }),
-    )
-    graph.links = [
-      {
-        source: 'test:mod:ui:page',
-        target: 'test:api:a',
-      },
-      {
-        source: 'other:api:x',
-        target: 'other:api:y',
-      },
-    ]
-    const query = new RiviereQuery(graph)
-
-    const result = query.traceFlow(parseComponentId('test:mod:ui:page'))
-
-    expect(result.componentIds.slice().sort((a, b) => a.localeCompare(b))).toStrictEqual([
-      'test:api:a',
-      'test:mod:ui:page',
-    ])
-    expect(result.linkIds).toStrictEqual(['test:mod:ui:page->test:api:a'])
-  })
-
-  it('traces full chain when starting from middle', () => {
-    const graph = createMinimalValidGraph()
-    graph.components.push(
-      createAPIComponent({
-        id: 'test:api:b',
-        name: 'API B',
-        domain: 'test',
-      }),
-      createAPIComponent({
-        id: 'test:api:c',
-        name: 'API C',
-        domain: 'test',
-      }),
-    )
-    graph.links = [
-      {
-        source: 'test:mod:ui:page',
-        target: 'test:api:b',
-      },
-      {
-        source: 'test:api:b',
-        target: 'test:api:c',
-      },
-    ]
-    const query = new RiviereQuery(graph)
-
-    const result = query.traceFlow(parseComponentId('test:api:b'))
-
-    expect(result.componentIds.slice().sort((a, b) => a.localeCompare(b))).toStrictEqual([
-      'test:api:b',
-      'test:api:c',
-      'test:mod:ui:page',
-    ])
-    expect(result.linkIds.slice().sort((a, b) => a.localeCompare(b))).toStrictEqual([
-      'test:api:b->test:api:c',
-      'test:mod:ui:page->test:api:b',
-    ])
-  })
-
-  it('uses explicit link ID when provided', () => {
-    const graph = createMinimalValidGraph()
-    graph.components.push(
-      createAPIComponent({
-        id: 'test:api:a',
-        name: 'API A',
-        domain: 'test',
-      }),
-    )
-    graph.links = [
-      {
-        id: 'custom-link-id',
-        source: 'test:mod:ui:page',
-        target: 'test:api:a',
-      },
-    ]
-    const query = new RiviereQuery(graph)
-
-    const result = query.traceFlow(parseComponentId('test:mod:ui:page'))
-
-    expect(result.linkIds).toStrictEqual(['custom-link-id'])
-  })
-
-  it('traverses full chain beyond immediate neighbors', () => {
-    const graph = createMinimalValidGraph()
-    graph.components.push(
-      createAPIComponent({
-        id: 'test:api:b',
-        name: 'API B',
-        domain: 'test',
-      }),
-      createAPIComponent({
-        id: 'test:api:c',
-        name: 'API C',
-        domain: 'test',
-      }),
-      createAPIComponent({
-        id: 'test:api:d',
-        name: 'API D',
-        domain: 'test',
-      }),
-    )
-    graph.links = [
-      {
-        source: 'test:mod:ui:page',
-        target: 'test:api:b',
-      },
-      {
-        source: 'test:api:b',
-        target: 'test:api:c',
-      },
-      {
-        source: 'test:api:c',
-        target: 'test:api:d',
-      },
-    ]
-    const query = new RiviereQuery(graph)
-
-    const result = query.traceFlow(parseComponentId('test:api:b'))
-
-    expect(result.componentIds.slice().sort((a, b) => a.localeCompare(b))).toStrictEqual([
-      'test:api:b',
-      'test:api:c',
-      'test:api:d',
-      'test:mod:ui:page',
-    ])
-    expect(result.linkIds.slice().sort((a, b) => a.localeCompare(b))).toStrictEqual([
-      'test:api:b->test:api:c',
-      'test:api:c->test:api:d',
-      'test:mod:ui:page->test:api:b',
-    ])
-  })
-})
diff --git a/packages/riviere-query/src/index.ts b/packages/riviere-query/src/index.ts
deleted file mode 100644
index c0ef21866..000000000
--- a/packages/riviere-query/src/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './features/querying/queries'
diff --git a/packages/riviere-query/tsconfig.json b/packages/riviere-query/tsconfig.json
deleted file mode 100644
index 62ebbd946..000000000
--- a/packages/riviere-query/tsconfig.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ]
-}
diff --git a/packages/riviere-query/tsconfig.lib.json b/packages/riviere-query/tsconfig.lib.json
deleted file mode 100644
index 661b04e8f..000000000
--- a/packages/riviere-query/tsconfig.lib.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "baseUrl": ".",
-    "rootDir": "src",
-    "outDir": "dist",
-    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
-    "emitDeclarationOnly": false,
-    "forceConsistentCasingInFileNames": true,
-    "types": ["node"]
-  },
-  "include": ["src/**/*.ts"],
-  "references": [
-    {
-      "path": "../riviere-schema/tsconfig.lib.json"
-    }
-  ],
-  "exclude": [
-    "vite.config.ts",
-    "vite.config.mts",
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx"
-  ]
-}
diff --git a/packages/riviere-query/tsconfig.spec.json b/packages/riviere-query/tsconfig.spec.json
deleted file mode 100644
index f68d9d3b8..000000000
--- a/packages/riviere-query/tsconfig.spec.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./out-tsc/vitest",
-    "types": [
-      "vitest/globals",
-      "vitest/importMeta",
-      "vite/client",
-      "node",
-      "vitest"
-    ],
-    "forceConsistentCasingInFileNames": true
-  },
-  "include": [
-    "vite.config.ts",
-    "vite.config.mts",
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx",
-    "src/**/*.d.ts"
-  ],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    }
-  ]
-}
diff --git a/packages/riviere-query/typedoc.json b/packages/riviere-query/typedoc.json
deleted file mode 100644
index 52455e79d..000000000
--- a/packages/riviere-query/typedoc.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "$schema": "https://typedoc.org/schema.json",
-  "entryPoints": ["./src/index.ts"],
-  "out": "../../apps/docs/reference/api/generated/riviere-query",
-  "plugin": ["typedoc-plugin-markdown", "typedoc-plugin-frontmatter"],
-  "frontmatterGlobals": {
-    "pageClass": "reference"
-  },
-  "name": "@living-architecture/riviere-query",
-  "readme": "none",
-  "excludePrivate": true,
-  "excludeProtected": true,
-  "excludeInternal": true,
-  "includeVersion": false,
-  "disableSources": false,
-  "sourceLinkTemplate": "https://github.com/NTCoding/living-architecture/blob/main/{path}#L{line}",
-  "tsconfig": "./tsconfig.lib.json",
-  "validation": {
-    "invalidLink": true,
-    "notExported": false
-  },
-  "hidePageHeader": true,
-  "hideBreadcrumbs": true
-}
diff --git a/packages/riviere-query/vite.config.ts b/packages/riviere-query/vite.config.ts
deleted file mode 100644
index c3c8750ac..000000000
--- a/packages/riviere-query/vite.config.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/// <reference types='vitest' />
-import { defineConfig } from 'vite'
-
-export default defineConfig(() => ({
-  root: import.meta.dirname,
-  cacheDir: '../../node_modules/.vite/packages/riviere-query',
-  plugins: [],
-  test: {
-    name: '@living-architecture/riviere-query',
-    watch: false,
-    globals: true,
-    environment: 'node',
-    include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    reporters: ['default'],
-    coverage: {
-      reportsDirectory: './test-output/vitest/coverage',
-      provider: 'v8' as const,
-    },
-  },
-}))
diff --git a/packages/riviere-query/vitest.config.mts b/packages/riviere-query/vitest.config.mts
deleted file mode 100644
index ce5013075..000000000
--- a/packages/riviere-query/vitest.config.mts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { defineConfig } from 'vitest/config';
-
-export default defineConfig(() => ({
-  root: __dirname,
-  cacheDir: '../../node_modules/.vite/packages/riviere-query',
-  test: {
-    name: '@living-architecture/riviere-query',
-    watch: false,
-    globals: true,
-    environment: 'node',
-    include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    reporters: ['default'],
-    coverage: {
-      enabled: true,
-      reportsDirectory: './test-output/vitest/coverage',
-      provider: 'v8' as const,
-      reporter: ['text', 'lcov'],
-      thresholds: {
-        lines: 100,
-        statements: 100,
-        functions: 100,
-        branches: 100,
-      },
-    },
-  },
-}));
diff --git a/packages/riviere-role-enforcement/domain-model/esbuild.config.mjs b/packages/riviere-role-enforcement/domain-model/esbuild.config.mjs
new file mode 100644
index 000000000..62c1b9dfd
--- /dev/null
+++ b/packages/riviere-role-enforcement/domain-model/esbuild.config.mjs
@@ -0,0 +1,22 @@
+import * as esbuild from 'esbuild'
+import { readFileSync } from 'node:fs'
+import {
+  dirname,
+  join,
+} from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const __dirname = dirname(fileURLToPath(import.meta.url))
+const pkg = JSON.parse(readFileSync(join(__dirname, 'package.json'), 'utf-8'))
+
+const externalDependencies = Object.keys(pkg.dependencies || {})
+
+await esbuild.build({
+  entryPoints: [join(__dirname, 'src/index.ts')],
+  bundle: true,
+  platform: 'node',
+  target: 'node18',
+  format: 'esm',
+  outfile: join(__dirname, 'dist/index.js'),
+  external: externalDependencies,
+})
diff --git a/packages/riviere-role-enforcement/domain-model/package.json b/packages/riviere-role-enforcement/domain-model/package.json
new file mode 100644
index 000000000..4404c83bd
--- /dev/null
+++ b/packages/riviere-role-enforcement/domain-model/package.json
@@ -0,0 +1,35 @@
+{
+  "name": "@living-architecture/riviere-role-enforcement-domain-model",
+  "version": "0.3.3",
+  "type": "module",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/NTCoding/living-architecture.git",
+    "directory": "packages/riviere-role-enforcement/domain-model"
+  },
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "@living-architecture/source": "./src/index.ts",
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
+    },
+    "./plugin": "./role-enforcement-plugin.mjs"
+  },
+  "files": [
+    "dist",
+    "!dist/**/__fixtures__/**",
+    "role-enforcement-plugin.mjs",
+    "!**/*.tsbuildinfo"
+  ],
+  "dependencies": {
+    "minimatch": "^10.0.1"
+  }
+}
diff --git a/packages/riviere-role-enforcement/domain-model/project.json b/packages/riviere-role-enforcement/domain-model/project.json
new file mode 100644
index 000000000..610618599
--- /dev/null
+++ b/packages/riviere-role-enforcement/domain-model/project.json
@@ -0,0 +1,28 @@
+{
+  "name": "riviere-role-enforcement-domain-model",
+  "targets": {
+    "build": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          "node esbuild.config.mjs",
+          "tsc -p tsconfig.lib.json --emitDeclarationOnly --declaration --declarationDir dist"
+        ],
+        "cwd": "{projectRoot}",
+        "parallel": false
+      },
+      "outputs": ["{projectRoot}/dist"]
+    },
+    "smoke-test": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          "node -e \"import('./dist/index.js').then(m => { if (!m.roleEnforcementConfiguration) process.exit(1) })\""
+        ],
+        "cwd": "{projectRoot}",
+        "parallel": false
+      },
+      "dependsOn": ["build"]
+    }
+  }
+}
diff --git a/packages/riviere-role-enforcement/domain-model/role-enforcement-plugin.mjs b/packages/riviere-role-enforcement/domain-model/role-enforcement-plugin.mjs
new file mode 100644
index 000000000..b23658c4b
--- /dev/null
+++ b/packages/riviere-role-enforcement/domain-model/role-enforcement-plugin.mjs
@@ -0,0 +1,1976 @@
+import fs from 'node:fs'
+import { createRequire } from 'node:module'
+import path from 'node:path'
+import { minimatch } from 'minimatch'
+
+const ROLE_TAG = /@riviere-role\s+(\S+)/g
+const DECORATOR_CONTEXT_TYPES = new Set([
+  'ClassAccessorDecoratorContext',
+  'ClassDecoratorContext',
+  'ClassFieldDecoratorContext',
+  'ClassGetterDecoratorContext',
+  'ClassMethodDecoratorContext',
+  'ClassSetterDecoratorContext',
+])
+
+function parseAllRoleNames(text) {
+  return [...text.matchAll(ROLE_TAG)].map((match) => match[1])
+}
+
+function parseSingleRoleName(text, errorContext) {
+  const roleNames = parseAllRoleNames(text)
+  if (roleNames.length === 0) {
+    return null
+  }
+  if (roleNames.length > 1) {
+    throw new Error(
+      `Expected exactly 1 @riviere-role annotation ${errorContext}. Got ${roleNames.length}: [${roleNames.join(', ')}]`,
+    )
+  }
+  return roleNames[0]
+}
+
+function referenceForUnknownRole(options) {
+  return `Browse ${options.roleDefinitionsDir}/ — each <role-name>.md file has a Purpose, Canonical Example, Common Misclassifications, and Anti-Patterns section. Read the canonical example + anti-patterns of EVERY candidate role before picking one. See ${options.configDisplayPath}.`
+}
+
+function referenceForKnownRole(options, roleName) {
+  return `Re-read ${options.roleDefinitionsDir}/${roleName}.md — check Purpose, Canonical Example, Anti-Patterns, and (if present) the Critical Naming Rule. See ${options.configDisplayPath}.`
+}
+
+export default {
+  meta: { name: 'riviere-role-enforcement' },
+  rules: {
+    'enforce-roles': {
+      meta: { schema: [{ type: 'object' }] },
+      create(context) {
+        const [options] = context.options
+        const roleMap = new Map(options.roles.map((role) => [role.name, role]))
+        const locationHierarchy = options.locationHierarchy ?? []
+        const sourceCode = context.sourceCode
+        const fileCache = new Map()
+        const importCache = new Map()
+        const relativeFilePath = normalizePath(
+          readRelativeFilePath(context.filename, options.configDir),
+        )
+        const filename = path.resolve(options.configDir, relativeFilePath)
+
+        if (!/\.tsx?$/.test(filename)) {
+          return {}
+        }
+
+        const isTestFile = /\.(spec|test)\.tsx?$/.test(filename)
+        const fileRoles = []
+        const roleDeclarations = []
+
+        const sourceLocationChain = resolveLocationChain(relativeFilePath, locationHierarchy)
+
+        return {
+          Program(node) {
+            validateConfiguredSubLocations(node, sourceLocationChain, relativeFilePath)
+          },
+          FunctionDeclaration(node) {
+            validateDeclaration(node, 'function')
+          },
+          ClassDeclaration(node) {
+            validateDeclaration(node, 'class')
+          },
+          TSInterfaceDeclaration(node) {
+            validateDeclaration(node, 'interface')
+          },
+          TSTypeAliasDeclaration(node) {
+            validateDeclaration(node, 'type-alias')
+          },
+          VariableDeclaration(node) {
+            validateVariableDeclaration(node)
+          },
+          ImportDeclaration(node) {
+            if (isTestFile) {
+              return
+            }
+            validateHierarchyImport(node, sourceLocationChain)
+          },
+          ExportNamedDeclaration(node) {
+            if (!isTestFile && node.source !== null) {
+              validateHierarchyImport(node, sourceLocationChain)
+            }
+          },
+          ExportAllDeclaration(node) {
+            if (!isTestFile) {
+              validateHierarchyImport(node, sourceLocationChain)
+            }
+          },
+          ImportExpression(node) {
+            if (!isTestFile) {
+              validateDependencyExpression(node, node.source, sourceLocationChain)
+            }
+          },
+          TSImportType(node) {
+            if (!isTestFile) {
+              validateDependencyExpression(node, node.source, sourceLocationChain)
+            }
+          },
+          CallExpression(node) {
+            if (
+              !isTestFile &&
+              node.callee.type === 'Identifier' &&
+              node.callee.name === 'require'
+            ) {
+              validateDependencyExpression(node, node.arguments[0], sourceLocationChain)
+            }
+          },
+          'Program:exit'() {
+            if (isTestFile) {
+              return
+            }
+            validateForbiddenDependencies()
+            validateForbiddenMethodCalls()
+          },
+        }
+
+        function validateVariableDeclaration(node) {
+          if (!isTopLevelExported(node)) {
+            return
+          }
+          if (node.declarations.length !== 1 || node.declarations[0]?.id.type !== 'Identifier') {
+            report(node, 'An exported variable declaration must declare exactly one named variable.')
+            return
+          }
+          validateDeclaration(node, 'variable')
+        }
+
+        function validateConfiguredSubLocations(node, locationChain, filePath) {
+          if (locationHierarchy.length === 0 || locationChain.length === 0) {
+            return
+          }
+          const deepest = locationChain.at(-1)
+          if (deepest.location.allowAnySubLocations) {
+            return
+          }
+          const fileDirectory = normalizePath(path.dirname(filePath))
+          const remainder = relativeSegments(fileDirectory, deepest.concretePath)
+          if (remainder.length > 0) {
+            report(
+              node,
+              `Unconfigured sub-location '${remainder[0]}' inside location '${deepest.location.name}'.`,
+            )
+          }
+        }
+
+        function validateHierarchyImport(node, sourceChain) {
+          if (locationHierarchy.length === 0 || sourceChain.length === 0) {
+            return
+          }
+          const importSource = node.source.value
+          if (typeof importSource !== 'string') {
+            return
+          }
+
+          const resolvedImport = resolveImportFile(
+            filename,
+            importSource,
+            options.configDir,
+            options.importAliases,
+          )
+          if (resolvedImport === null || !isInsideDirectory(resolvedImport, options.configDir)) {
+            return
+          }
+
+          for (const targetFile of resolveImportedFiles(node, resolvedImport)) {
+            const targetRelative = normalizePath(readRelativeFilePath(targetFile, options.configDir))
+            if (matchesAnyPattern(targetRelative, options.ignorePatterns ?? [])) {
+              report(node, `Production code cannot import ignored file '${targetRelative}'.`)
+              return
+            }
+            const targetChain = resolveLocationChain(targetRelative, locationHierarchy)
+            if (targetChain.length === 0) {
+              continue
+            }
+
+            if (
+              validateSourceLocationRules(node, sourceChain, targetChain, targetRelative, targetFile)
+            ) {
+              return
+            }
+            validateTargetLocationRules(node, targetChain)
+          }
+        }
+
+        function validateDependencyExpression(node, source, sourceChain) {
+          const importSource = readStringLiteralValue(source)
+          if (importSource === null) {
+            report(node, 'Dependency target must be a string literal so its location can be checked.')
+            return
+          }
+          validateHierarchyImport(
+            {
+              ...node,
+              source: { value: importSource },
+              specifiers: [],
+            },
+            sourceChain,
+          )
+        }
+
+        function resolveImportedFiles(node, resolvedImport) {
+          const files = []
+          for (const specifier of node.specifiers ?? []) {
+            if (specifier.type !== 'ImportSpecifier' && specifier.type !== 'ExportSpecifier') {
+              continue
+            }
+            const imported =
+              specifier.type === 'ImportSpecifier' ? specifier.imported : specifier.local
+            const importedName =
+              imported.type === 'Identifier' ? imported.name : imported.value
+            const exportedFile = resolveExportedFile(resolvedImport, importedName)
+            if (exportedFile !== null) {
+              files.push(exportedFile)
+            }
+          }
+          return files.length > 0 ? [...new Set(files)] : [resolvedImport]
+        }
+
+        function validateSourceLocationRules(node, sourceChain, targetChain, targetRelative, resolvedImport) {
+          return rejectsLocationImport(
+            node,
+            sourceChain,
+            targetChain,
+            targetRelative,
+            resolvedImport,
+          )
+        }
+
+        function rejectsLocationImport(node, sourceChain, targetChain, targetRelative, resolvedImport) {
+          const effectiveRules = effectiveImportRules(sourceChain)
+          if (
+            effectiveRules === null ||
+            isWithinPath(targetRelative, effectiveRules.restrictedLocation.concretePath)
+          ) {
+            return false
+          }
+          const permitted = effectiveRules.allowedImports.some(({ rule, source: ruleSource }) =>
+            locationRuleAllows(rule, ruleSource, targetChain, node, resolvedImport),
+          )
+          if (permitted) {
+            return false
+          }
+          const source = effectiveRules.restrictedLocation
+          const targetName = targetChain.at(-1).location.name
+          report(node, `Location '${source.location.name}' cannot import location '${targetName}'.`)
+          return true
+        }
+
+        function validateTargetLocationRules(node, targetChain) {
+          for (const target of targetChain) {
+            if (target.location.importRules?.importableFrom !== 'withinParentLocation') {
+              continue
+            }
+            const parentLocation = locationById(locationHierarchy, target.location.parentId)
+            const targetParent = targetChain.find(
+              (candidate) => candidate.location.pathTemplate === parentLocation?.pathTemplate,
+            )
+            if (targetParent !== undefined && !isWithinPath(relativeFilePath, targetParent.concretePath)) {
+              report(node, `Location '${target.location.name}' can only be imported from within its parent location.`)
+              return
+            }
+          }
+        }
+
+        function effectiveImportRules(sourceChain) {
+          let effectiveRules = null
+          for (const source of sourceChain) {
+            const importRules = source.location.importRules
+            if (importRules === undefined) {
+              continue
+            }
+            const inheritedImports =
+              importRules.inheritParentImportRules === false
+                ? []
+                : effectiveRules?.allowedImports ?? []
+            effectiveRules = {
+              allowedImports: [
+                ...inheritedImports,
+                ...expandAllowedImports(importRules.allow).map((rule) => ({ rule, source })),
+              ],
+              restrictedLocation: source,
+            }
+          }
+          return effectiveRules
+        }
+
+        function locationRuleAllows(rule, source, targetChain, node, resolvedImport) {
+          const candidates = targetChain.filter((target) =>
+            locationRuleMatches(rule, source, target, locationHierarchy),
+          )
+          if (candidates.length === 0) {
+            return false
+          }
+          if (!Array.isArray(rule.roles)) {
+            return true
+          }
+          const importedRoles = readImportedRoles(node, resolvedImport)
+          return importedRoles.length > 0 && importedRoles.every((role) => rule.roles.includes(role))
+        }
+
+        function readImportedRoles(node, resolvedImport) {
+          const roles = (node.specifiers ?? []).flatMap((specifier) =>
+            readSpecifierRoles(specifier, resolvedImport),
+          )
+          return [...new Set(roles.length === 0 ? readAllExportedRoles(resolvedImport) : roles)]
+        }
+
+        function readSpecifierRoles(specifier, resolvedImport) {
+          if (specifier.type === 'ImportNamespaceSpecifier') {
+            return readAllExportedRoles(resolvedImport)
+          }
+          if (specifier.type === 'ImportSpecifier') {
+            return readNamedExportRole(resolvedImport, specifier.imported)
+          }
+          if (specifier.type === 'ExportSpecifier') {
+            return readNamedExportRole(resolvedImport, specifier.local)
+          }
+          return []
+        }
+
+        function readNamedExportRole(resolvedImport, imported) {
+          if (imported === null || imported === undefined) {
+            return []
+          }
+          const importedName = imported.type === 'Identifier' ? imported.name : imported.value
+          const importedRole = readExportedRole(resolvedImport, importedName)
+          return importedRole === null ? [] : [importedRole]
+        }
+
+        function validateDeclaration(node, target) {
+          if (isTestFile) {
+            return
+          }
+          if (sourceLocationChain.some(({ location }) => location.roleEnforcement === false)) {
+            return
+          }
+          if (!isTopLevelExported(node)) {
+            return
+          }
+
+          const name = readDeclarationName(node)
+          if (name === null) {
+            return
+          }
+
+          const annotationNode = readAnnotationNode(node)
+          const roleNames = readRoleNames(sourceCode, annotationNode)
+          if (roleNames.length === 0) {
+            report(
+              node,
+              `Missing @riviere-role annotation for '${name}'. ${referenceForUnknownRole(options)}`,
+            )
+            return
+          }
+
+          if (roleNames.length > 1) {
+            report(
+              node,
+              `Multiple @riviere-role annotations found for '${name}'. ${referenceForUnknownRole(options)}`,
+            )
+            return
+          }
+
+          const [roleName] = roleNames
+          const role = roleMap.get(roleName)
+          if (role === undefined) {
+            report(
+              node,
+              `Unknown role '${roleName}' on '${name}'. ${referenceForUnknownRole(options)}`,
+            )
+            return
+          }
+
+          if (!role.targets.includes(target)) {
+            report(
+              node,
+              `Role '${roleName}' does not allow target '${target}'. ${referenceForKnownRole(options, roleName)}`,
+            )
+            return
+          }
+
+          if (!isRoleAllowedInFile(roleName, relativeFilePath)) {
+            report(
+              node,
+              `${roleName} cannot live in ${relativeFilePath}. ${referenceForKnownRole(options, roleName)}`,
+            )
+            return
+          }
+
+          if (!matchesName(name, role)) {
+            report(
+              node,
+              `Role '${roleName}' does not allow name '${name}'. ${referenceForKnownRole(options, roleName)}`,
+            )
+            return
+          }
+
+          validateForbiddenSupertypes(node, role, name)
+
+          const approvedResult = matchesApprovedInstances(name, role)
+          if (approvedResult.checked && !approvedResult.passed) {
+            report(node, approvedResult.reason)
+            return
+          }
+
+          fileRoles.push(roleName)
+          roleDeclarations.push({
+            node,
+            roleName,
+          })
+
+          validateRoleContract(node, target, role, name)
+        }
+
+        function validateRoleContract(node, target, role, name) {
+          if (target === 'function') {
+            validateFunctionContract(node, role, name)
+          } else if (target === 'class') {
+            validateClassContract(node, role, name)
+          } else if (target === 'variable') {
+            validateVariableContract(node, role, name)
+          } else if (target === 'interface') {
+            validateInterfaceContract(node, role, name)
+          } else if (target === 'type-alias') {
+            validateTypeAliasContract(node, role, name)
+          }
+        }
+
+        function validateForbiddenSupertypes(node, role, name) {
+          if (!Array.isArray(role.forbiddenSupertypes) || role.forbiddenSupertypes.length === 0) {
+            return
+          }
+
+          const declarationSupertypes = readDeclaredSupertypes(node)
+          for (const supertype of declarationSupertypes) {
+            if (role.forbiddenSupertypes.includes(supertype)) {
+              report(
+                node,
+                `Role '${role.name}' forbids supertype '${supertype}' on '${name}'. ${referenceForKnownRole(options, role.name)}`,
+              )
+            }
+          }
+        }
+
+        function readDeclaredSupertypes(node) {
+          const supertypes = []
+
+          if (node.type === 'ClassDeclaration') {
+            const superClassName = readNamedTypeReference(node.superClass)
+            if (superClassName !== null) {
+              supertypes.push(superClassName)
+            }
+
+            for (const implementedType of node.implements ?? []) {
+              const implementedName = readNamedTypeReference(implementedType.expression)
+              if (implementedName !== null) {
+                supertypes.push(implementedName)
+              }
+            }
+          }
+
+          if (node.type === 'TSInterfaceDeclaration') {
+            for (const extendedType of node.extends ?? []) {
+              const extendedName = readNamedTypeReference(extendedType.expression)
+              if (extendedName !== null) {
+                supertypes.push(extendedName)
+              }
+            }
+          }
+
+          return supertypes
+        }
+
+        function readNamedTypeReference(node) {
+          if (node?.type === 'Identifier') {
+            return node.name
+          }
+
+          return null
+        }
+
+        function isRoleAllowedInFile(roleName, filePath) {
+          const location = resolveLocationChain(filePath, locationHierarchy).at(-1)
+          return location?.location.allowedRoles.includes(roleName) === true
+        }
+
+        function validateForbiddenDependencies() {
+          if (fileRoles.length === 0) {
+            return
+          }
+
+          for (const statement of readRelativeImportStatements()) {
+            reportForbiddenImports(statement)
+          }
+        }
+
+        function validateForbiddenMethodCalls() {
+          const forbiddenMethodCallRoles = collectForbiddenMethodCallRoles(fileRoles, roleMap)
+          if (forbiddenMethodCallRoles.size === 0) {
+            return
+          }
+
+          const restrictedBindings = new Map()
+          for (const statement of readRelativeImportStatements()) {
+            const resolvedFile = resolveTypeFile(filename, statement.source.value)
+            if (resolvedFile === null) {
+              continue
+            }
+            const importedRoles = readAllExportedRoles(resolvedFile)
+            const matchedRole = importedRoles.find((r) => forbiddenMethodCallRoles.has(r))
+            if (matchedRole === undefined) {
+              continue
+            }
+            for (const specifier of statement.specifiers ?? []) {
+              if (specifier.type === 'ImportSpecifier' || specifier.type === 'ImportDefaultSpecifier') {
+                restrictedBindings.set(specifier.local.name, matchedRole)
+              }
+            }
+          }
+
+          if (restrictedBindings.size === 0) {
+            return
+          }
+
+          const nonImportBody = sourceCode.ast.body.filter(
+            (n) => n.type !== 'ImportDeclaration',
+          )
+          for (const node of nonImportBody) {
+            walkForNonConstructionUsages(node, restrictedBindings, false)
+          }
+        }
+
+        function walkForNonConstructionUsages(node, restrictedBindings, insideNew) {
+          if (node === null || node === undefined || typeof node !== 'object') {
+            return
+          }
+
+          if (node.type === 'NewExpression') {
+            walkForNonConstructionUsages(node.callee, restrictedBindings, true)
+            walkChildren(node.arguments ?? [], restrictedBindings)
+            return
+          }
+
+          if (isRestrictedNonConstructionUsage(node, restrictedBindings, insideNew)) {
+            return
+          }
+
+          walkNodeChildren(node, restrictedBindings)
+        }
+
+        function isRestrictedNonConstructionUsage(node, restrictedBindings, insideNew) {
+          if (node.type !== 'Identifier' || insideNew || !restrictedBindings.has(node.name)) {
+            return false
+          }
+          const roleName = restrictedBindings.get(node.name)
+          report(
+            node,
+            `Role '${fileRoles.join(', ')}' forbids non-construction usage of '${roleName}' imports. Only 'new' is allowed. ${referenceForKnownRole(options, roleName)}`,
+          )
+          return true
+        }
+
+        function walkNodeChildren(node, restrictedBindings) {
+          for (const key of Object.keys(node)) {
+            if (key === 'parent') {
+              continue
+            }
+            const child = node[key]
+            if (Array.isArray(child)) {
+              walkChildren(child, restrictedBindings)
+            } else if (child !== null && typeof child === 'object' && child.type !== undefined) {
+              walkForNonConstructionUsages(child, restrictedBindings, false)
+            }
+          }
+        }
+
+        function walkChildren(children, restrictedBindings) {
+          for (const item of children) {
+            walkForNonConstructionUsages(item, restrictedBindings, false)
+          }
+        }
+
+        function readRelativeImportStatements() {
+          return sourceCode.ast.body.filter(
+            (statement) =>
+              statement.type === 'ImportDeclaration' &&
+              typeof statement.source.value === 'string' &&
+              statement.source.value.startsWith('.'),
+          )
+        }
+
+        function reportForbiddenImports(statement) {
+          const resolvedFile = resolveTypeFile(filename, statement.source.value)
+          if (resolvedFile === null) {
+            return
+          }
+
+          for (const binding of readImportedRoleBindings(statement, resolvedFile)) {
+            const referencingRoles = readReferencingRoles(binding.localName)
+            for (const importedRole of binding.roles) {
+              const forbiddenByRoles = referencingRoles.filter((roleName) =>
+                roleMap.get(roleName)?.forbiddenDependencies?.includes(importedRole),
+              )
+              if (forbiddenByRoles.length === 0) {
+                continue
+              }
+              report(
+                statement,
+                `Forbidden dependency: this file (${forbiddenByRoles.join(', ')}) cannot import from a file exporting '${importedRole}'. ${referenceForKnownRole(options, importedRole)}`,
+              )
+            }
+          }
+        }
+
+        function readImportedRoleBindings(statement, resolvedFile) {
+          return (statement.specifiers ?? []).flatMap((specifier) => {
+            if (specifier.type === 'ImportSpecifier') {
+              const importedName =
+                specifier.imported.type === 'Identifier'
+                  ? specifier.imported.name
+                  : specifier.imported.value
+              const importedRole = readExportedRole(resolvedFile, importedName)
+              return importedRole === null
+                ? []
+                : [{
+                  localName: specifier.local.name,
+                  roles: [importedRole],
+                }]
+            }
+            if (
+              specifier.type === 'ImportNamespaceSpecifier' ||
+              specifier.type === 'ImportDefaultSpecifier'
+            ) {
+              return [{
+                localName: specifier.local.name,
+                roles: readAllExportedRoles(resolvedFile),
+              }]
+            }
+            return []
+          })
+        }
+
+        function readReferencingRoles(localName) {
+          const references = readImportReferences(localName)
+          if (references.length === 0) {
+            return []
+          }
+          const referencingRoles = roleDeclarations
+            .filter(({ node }) => declarationReachesReferences(node, references, new Set()))
+            .map(({ roleName }) => roleName)
+          return referencingRoles.length > 0
+            ? [...new Set(referencingRoles)]
+            : [...new Set(fileRoles)]
+        }
+
+        function declarationReachesReferences(node, targetReferences, visitedNodes) {
+          if (visitedNodes.has(node)) {
+            return false
+          }
+          visitedNodes.add(node)
+          if (targetReferences.some((reference) => isNodeInside(reference, node))) {
+            return true
+          }
+
+          for (const variable of readLocalVariables()) {
+            const isReferencedByDeclaration = variable.references.some((reference) =>
+              isNodeInside(reference.identifier, node),
+            )
+            if (!isReferencedByDeclaration) {
+              continue
+            }
+            for (const definition of variable.defs ?? []) {
+              const dependencyNode = definition.node
+              if (
+                dependencyNode?.range !== undefined &&
+                declarationReachesReferences(dependencyNode, targetReferences, visitedNodes)
+              ) {
+                return true
+              }
+            }
+          }
+          return false
+        }
+
+        function readLocalVariables() {
+          const variables = []
+          for (const scope of sourceCode.scopeManager?.scopes ?? []) {
+            for (const variable of scope.variables ?? []) {
+              if (variable.defs?.some((definition) => definition.type !== 'ImportBinding')) {
+                variables.push(variable)
+              }
+            }
+          }
+          return variables
+        }
+
+        function readImportReferences(localName) {
+          const references = []
+          for (const scope of sourceCode.scopeManager?.scopes ?? []) {
+            for (const variable of scope.variables ?? []) {
+              const isMatchingImport =
+                variable.name === localName &&
+                variable.defs?.some((definition) => definition.type === 'ImportBinding')
+              if (isMatchingImport) {
+                references.push(...variable.references.map((reference) => reference.identifier))
+              }
+            }
+          }
+          return references
+        }
+
+        function readAllExportedRoles(filePath) {
+          const sourceText = readFileText(filePath)
+          if (sourceText === null) {
+            return []
+          }
+
+          const roles = []
+          const lines = sourceText.split('\n')
+          for (let i = 0; i < lines.length; i++) {
+            const roleName = parseSingleRoleName(lines[i], `at ${filePath}:${i + 1}`)
+            if (roleName === null) {
+              continue
+            }
+
+            for (let j = i + 1; j < lines.length; j++) {
+              const trimmed = lines[j].trim()
+              if (trimmed === '' || trimmed.startsWith('*') || trimmed.startsWith('/**')) {
+                continue
+              }
+              if (/^export\s+(?:interface|type|function|class)\s+\w+/.test(trimmed)) {
+                roles.push(roleName)
+              }
+              break
+            }
+          }
+          return roles
+        }
+
+        function validateFunctionContract(node, role, name) {
+          if (role.requiresDecoratorSignature === true && !hasDecoratorSignature(node)) {
+            report(
+              node,
+              `Role '${role.name}' requires a decorator signature on '${name}'. ${referenceForKnownRole(options, role.name)}`,
+            )
+            return
+          }
+
+          if (Array.isArray(role.returns)) {
+            validateReturnShapes(node, role, name)
+          }
+
+          if (Array.isArray(role.allowedInputs)) {
+            if (node.params.length !== 1) {
+              report(
+                node,
+                `Role '${role.name}' must accept exactly one parameter on '${name}'. ${referenceForKnownRole(options, role.name)}`,
+              )
+              return
+            }
+
+            const inputRole = readTypeRole(node.params[0].typeAnnotation, filename)
+            if (inputRole === null || !role.allowedInputs.includes(inputRole)) {
+              report(
+                node,
+                `Role '${role.name}' only allows inputs [${role.allowedInputs.join(', ')}] on '${name}'. ${referenceForKnownRole(options, role.name)}`,
+              )
+              return
+            }
+          }
+
+          if (Array.isArray(role.allowedOutputs)) {
+            const outputRoles = readOutputTypeRoles(node.returnType, filename)
+            if (outputRoles === null || !outputRoles.every((r) => role.allowedOutputs.includes(r))) {
+              report(
+                node,
+                `Role '${role.name}' only allows outputs [${role.allowedOutputs.join(', ')}] on '${name}'. ${referenceForKnownRole(options, role.name)}`,
+              )
+            }
+          }
+        }
+
+        function validateReturnShapes(node, role, name) {
+          const returnType = unwrapTypeAnnotation(node.returnType)
+          if (returnType?.type !== 'TSUnionType') {
+            report(
+              node,
+              `Role '${role.name}' requires explicit success and failure return branches on '${name}'. ${referenceForKnownRole(options, role.name)}`,
+            )
+            return
+          }
+
+          for (const requiredShape of role.returns) {
+            const branch = returnType.types.find(
+              (member) => readSuccessDiscriminator(member) === requiredShape.success,
+            )
+            if (branch === undefined) {
+              report(
+                node,
+                `Role '${role.name}' requires explicit success and failure return branches on '${name}'. ${referenceForKnownRole(options, role.name)}`,
+              )
+              return
+            }
+
+            const values = readNonDiscriminatorProperties(branch)
+            if (values.length === 0) {
+              report(
+                node,
+                `Role '${role.name}' requires a value on its ${requiredShape.success ? 'success' : 'failure'} branch on '${name}'. ${referenceForKnownRole(options, role.name)}`,
+              )
+              return
+            }
+
+            const requiredRole = requiredShape['*']
+            if (
+              requiredRole !== '*' &&
+              !values.some((property) => readTypeRole(property.typeAnnotation, filename) === requiredRole)
+            ) {
+              report(
+                node,
+                `Role '${role.name}' requires its ${requiredShape.success ? 'success' : 'failure'} branch to return role '${requiredRole}' on '${name}'. ${referenceForKnownRole(options, role.name)}`,
+              )
+              return
+            }
+          }
+        }
+
+        function readSuccessDiscriminator(typeNode) {
+          if (typeNode.type !== 'TSTypeLiteral') {
+            return null
+          }
+          const successProperty = typeNode.members.find(
+            (member) => member.type === 'TSPropertySignature' && readMemberName(member.key) === 'success',
+          )
+          const successType = unwrapTypeAnnotation(successProperty?.typeAnnotation)
+          if (successType?.type !== 'TSLiteralType') {
+            return null
+          }
+          const literal = successType.literal
+          return literal?.type === 'Literal' && typeof literal.value === 'boolean'
+            ? literal.value
+            : null
+        }
+
+        function readNonDiscriminatorProperties(typeNode) {
+          if (typeNode.type !== 'TSTypeLiteral') {
+            return []
+          }
+          return typeNode.members.filter(
+            (member) =>
+              member.type === 'TSPropertySignature' && readMemberName(member.key) !== 'success',
+          )
+        }
+
+        function validateVariableContract(node, role, name) {
+          if (role.requiresStringLiteralConstant !== true) {
+            return
+          }
+          const initializer = unwrapExpression(node.declarations[0]?.init)
+          if (node.kind === 'const' && isStringLiteral(initializer)) {
+            return
+          }
+          report(
+            node,
+            `Role '${role.name}' requires a string-literal constant on '${name}'. ${referenceForKnownRole(options, role.name)}`,
+          )
+        }
+
+        function validateInterfaceContract(node, role, name) {
+          if (role.mustBeDataStructure !== true) {
+            return
+          }
+          const hasCallableMember = hasCallableTypeMembers(node.body.body)
+          if (hasCallableMember) {
+            report(
+              node,
+              `Role '${role.name}' does not allow methods on '${name}'. ${referenceForKnownRole(options, role.name)}`,
+            )
+          }
+        }
+
+        function validateTypeAliasContract(node, role, name) {
+          if (role.mustBeDataStructure === true) {
+            const result = inspectDataStructureType(node.typeAnnotation)
+            if (!result.isDataStructure) {
+              report(
+                node,
+                `Role '${role.name}' must be a data structure on '${name}'. ${referenceForKnownRole(options, role.name)}`,
+              )
+              return
+            }
+            if (result.hasCallableMember) {
+              report(
+                node,
+                `Role '${role.name}' does not allow methods on '${name}'. ${referenceForKnownRole(options, role.name)}`,
+              )
+              return
+            }
+          }
+          if (role.requiresUnion !== true || node.typeAnnotation.type === 'TSUnionType') {
+            return
+          }
+          report(
+            node,
+            `Role '${role.name}' requires a union type on '${name}'. ${referenceForKnownRole(options, role.name)}`,
+          )
+        }
+
+        function inspectDataStructureType(typeNode) {
+          if (typeNode.type === 'TSTypeLiteral') {
+            return {
+              isDataStructure: true,
+              hasCallableMember: hasCallableTypeMembers(typeNode.members),
+            }
+          }
+          if (typeNode.type === 'TSUnionType' || typeNode.type === 'TSIntersectionType') {
+            const members = typeNode.types.map(inspectDataStructureType)
+            return {
+              isDataStructure: members.every((member) => member.isDataStructure),
+              hasCallableMember: members.some((member) => member.hasCallableMember),
+            }
+          }
+          if (isZodInferType(typeNode)) {
+            return { isDataStructure: true, hasCallableMember: false }
+          }
+          return { isDataStructure: false, hasCallableMember: false }
+        }
+
+        function isZodInferType(typeNode) {
+          return (
+            typeNode.type === 'TSTypeReference' &&
+            typeNode.typeName?.type === 'TSQualifiedName' &&
+            typeNode.typeName.left?.type === 'Identifier' &&
+            typeNode.typeName.left.name === 'z' &&
+            typeNode.typeName.right?.type === 'Identifier' &&
+            typeNode.typeName.right.name === 'infer'
+          )
+        }
+
+        function hasCallableTypeMembers(members) {
+          return members.some((member) => {
+            if (
+              member.type === 'TSMethodSignature' ||
+              member.type === 'TSCallSignatureDeclaration' ||
+              member.type === 'TSConstructSignatureDeclaration'
+            ) {
+              return true
+            }
+            return (
+              member.type === 'TSPropertySignature' &&
+              isCallableTypeAnnotation(member.typeAnnotation)
+            )
+          })
+        }
+
+        function unwrapExpression(node) {
+          if (
+            node?.type === 'TSAsExpression' ||
+            node?.type === 'TSTypeAssertion' ||
+            node?.type === 'TSNonNullExpression' ||
+            node?.type === 'TSInstantiationExpression'
+          ) {
+            return unwrapExpression(node.expression)
+          }
+          return node
+        }
+
+        function isStringLiteral(node) {
+          return (
+            (node?.type === 'Literal' && typeof node.value === 'string') ||
+            (node?.type === 'StringLiteral' && typeof node.value === 'string')
+          )
+        }
+
+        function readStringLiteralValue(node) {
+          if (node?.type === 'TSLiteralType') {
+            return readStringLiteralValue(node.literal)
+          }
+          return isStringLiteral(node) ? node.value : null
+        }
+
+        function hasDecoratorSignature(node) {
+          if (hasDecoratorParameters(node.params)) {
+            return true
+          }
+
+          const returnType = unwrapTypeAnnotation(node.returnType)
+          return returnType?.type === 'TSFunctionType' && hasDecoratorParameters(returnType.params)
+        }
+
+        function hasDecoratorParameters(params) {
+          return params.length === 2 && containsDecoratorContextType(params[1]?.typeAnnotation)
+        }
+
+        function containsDecoratorContextType(typeAnnotation) {
+          const typeNode = unwrapTypeAnnotation(typeAnnotation)
+          if (typeNode?.type === 'TSUnionType') {
+            return typeNode.types.some(containsDecoratorContextType)
+          }
+          if (typeNode?.type !== 'TSTypeReference' || typeNode.typeName?.type !== 'Identifier') {
+            return false
+          }
+          return DECORATOR_CONTEXT_TYPES.has(typeNode.typeName.name)
+        }
+
+        function unwrapTypeAnnotation(typeAnnotation) {
+          return typeAnnotation?.type === 'TSTypeAnnotation'
+            ? typeAnnotation.typeAnnotation
+            : typeAnnotation
+        }
+
+        function validateClassContract(node, role, name) {
+          validatePublicMethodCount(node, role, name)
+          validateRequiredPrivateMembers(node, role, name)
+          validateRequiredPrivateConstructor(node, role, name)
+          validateRequiredStaticMethodNamePrefix(node, role, name)
+          validateCallableMemberConstraints(node, role, name)
+          validateDataMemberRequirements(node, role, name)
+          validateClassMethodContracts(node, role, name)
+        }
+
+        function validateRequiredPrivateConstructor(node, role, name) {
+          if (role.requiresPrivateConstructor !== true) {
+            return
+          }
+
+          const constructor = node.body.body.find(
+            (member) => member.type === 'MethodDefinition' && member.kind === 'constructor',
+          )
+          if (constructor?.accessibility === 'private') {
+            return
+          }
+
+          report(
+            node,
+            `Role '${role.name}' requires a private constructor on '${name}'. ${referenceForKnownRole(options, role.name)}`,
+          )
+        }
+
+        function validateRequiredStaticMethodNamePrefix(node, role, name) {
+          if (typeof role.requiredStaticMethodNamePrefix !== 'string') {
+            return
+          }
+
+          const hasRequiredStaticMethod = node.body.body.some(
+            (member) =>
+              member.type === 'MethodDefinition' &&
+              member.static === true &&
+              member.kind !== 'constructor' &&
+              readMemberName(member.key)?.startsWith(role.requiredStaticMethodNamePrefix) === true,
+          )
+          if (hasRequiredStaticMethod) {
+            return
+          }
+
+          report(
+            node,
+            `Role '${role.name}' requires at least one static method beginning with '${role.requiredStaticMethodNamePrefix}' on '${name}'. ${referenceForKnownRole(options, role.name)}`,
+          )
+        }
+
+        function validatePublicMethodCount(node, role, name) {
+          if (typeof role.minPublicMethods === 'number') {
+            const publicMethodCount = countPublicMethods(node)
+            if (publicMethodCount < role.minPublicMethods) {
+              report(
+                node,
+                `Role '${role.name}' requires at least ${role.minPublicMethods} public method(s) on '${name}'. ${referenceForKnownRole(options, role.name)}`,
+              )
+            }
+          }
+
+          if (typeof role.maxPublicMethods === 'number') {
+            const maxCount = countPublicMethods(node)
+            if (maxCount > role.maxPublicMethods) {
+              report(
+                node,
+                `Role '${role.name}' allows at most ${role.maxPublicMethods} public method(s) on '${name}'. ${referenceForKnownRole(options, role.name)}`,
+              )
+            }
+          }
+        }
+
+        function validateRequiredPrivateMembers(node, role, name) {
+          if (!Array.isArray(role.requiredPrivateMembers)) {
+            return
+          }
+
+          for (const privateMemberName of role.requiredPrivateMembers) {
+            if (!hasRequiredPrivateMember(node, privateMemberName)) {
+              report(
+                node,
+                `Role '${role.name}' requires private member '${privateMemberName}' on '${name}'. ${referenceForKnownRole(options, role.name)}`,
+              )
+            }
+          }
+        }
+
+        function validateClassMethodContracts(node, role, name) {
+          if (!hasClassMethodContracts(role)) {
+            return
+          }
+
+          for (const member of node.body.body) {
+            if (
+              member.type === 'MethodDefinition' &&
+              member.kind !== 'constructor' &&
+              (member.accessibility === 'public' || member.accessibility == null)
+            ) {
+              const methodName = member.key?.name ?? '?'
+              validateFunctionContract(member.value, role, `${name}.${methodName}`)
+            }
+          }
+        }
+
+        function hasClassMethodContracts(role) {
+          return Array.isArray(role.allowedInputs) || Array.isArray(role.allowedOutputs)
+        }
+
+        function validateCallableMemberConstraints(node, role, name) {
+          if (role.forbiddenCallableDataMembers !== true) {
+            return
+          }
+
+          const callableMemberNames = readCallableInstanceMemberNames(node)
+          if (callableMemberNames.length === 0) {
+            return
+          }
+
+          report(
+            node,
+            `Role '${role.name}' forbids callable instance data members on '${name}'. Found [${callableMemberNames.join(', ')}]. ${referenceForKnownRole(options, role.name)}`,
+          )
+        }
+
+        function validateDataMemberRequirements(node, role, name) {
+          if (role.requiresDataMembers !== true) {
+            return
+          }
+
+          const excludedMemberNames = new Set(normalizeRequiredPrivateMembers(role))
+          const hasDataMember = readInstanceDataMembers(node).some(
+            (member) => !member.callable && !excludedMemberNames.has(member.name),
+          )
+          if (hasDataMember) {
+            return
+          }
+
+          report(
+            node,
+            `Role '${role.name}' requires at least one non-callable instance data member on '${name}'. ${referenceForKnownRole(options, role.name)}`,
+          )
+        }
+
+        function countPublicMethods(classNode) {
+          return classNode.body.body.filter(
+            (member) =>
+              member.type === 'MethodDefinition' &&
+              member.kind !== 'constructor' &&
+              (member.accessibility === 'public' || member.accessibility == null),
+          ).length
+        }
+
+        function hasRequiredPrivateMember(classNode, privateMemberName) {
+          const normalizedPrivateMemberName = normalizeRequiredPrivateMemberName(privateMemberName)
+          return classNode.body.body.some(
+            (member) =>
+              isPrivateMember(member) &&
+              readMemberName(member.key) === normalizedPrivateMemberName,
+          )
+        }
+
+        function normalizeRequiredPrivateMemberName(privateMemberName) {
+          return privateMemberName.startsWith('#')
+            ? privateMemberName.slice(1)
+            : privateMemberName
+        }
+
+        function normalizeRequiredPrivateMembers(role) {
+          if (!Array.isArray(role.requiredPrivateMembers)) {
+            return []
+          }
+
+          return role.requiredPrivateMembers.map(normalizeRequiredPrivateMemberName)
+        }
+
+        function isPrivateMember(member) {
+          return (
+            member.accessibility === 'private' ||
+            member.key?.type === 'PrivateIdentifier'
+          )
+        }
+
+        function readCallableInstanceMemberNames(classNode) {
+          return readInstanceDataMembers(classNode)
+            .filter((member) => member.callable)
+            .map((member) => member.name)
+        }
+
+        function readInstanceDataMembers(classNode) {
+          return classNode.body.body.flatMap((member) => {
+            if (isStaticMember(member)) {
+              return []
+            }
+
+            if (isDataFieldMember(member)) {
+              const name = readMemberName(member.key)
+              return name === null
+                ? []
+                : [{
+                  callable: isCallableFieldMember(member),
+                  name,
+                }]
+            }
+
+            if (isConstructorDefinition(member)) {
+              return member.value.params.flatMap(readConstructorParameterProperty)
+            }
+
+            return []
+          })
+        }
+
+        function isStaticMember(member) {
+          return member.static === true
+        }
+
+        function isDataFieldMember(member) {
+          return (
+            member.type === 'PropertyDefinition' ||
+            member.type === 'AccessorProperty' ||
+            member.type === 'ClassProperty' ||
+            member.type === 'FieldDefinition'
+          )
+        }
+
+        function isConstructorDefinition(member) {
+          return member.type === 'MethodDefinition' && member.kind === 'constructor'
+        }
+
+        function readConstructorParameterProperty(param) {
+          if (param.type !== 'TSParameterProperty') {
+            return []
+          }
+
+          const parameter = unwrapParameterProperty(param.parameter)
+          if (parameter?.type !== 'Identifier') {
+            return []
+          }
+
+          return [{
+            callable: isCallableParameterProperty(param, parameter),
+            name: parameter.name,
+          }]
+        }
+
+        function unwrapParameterProperty(parameter) {
+          return parameter?.type === 'AssignmentPattern'
+            ? parameter.left
+            : parameter
+        }
+
+        function isCallableFieldMember(member) {
+          return (
+            isCallableTypeAnnotation(member.typeAnnotation) ||
+            isFunctionExpression(member.value)
+          )
+        }
+
+        function isCallableParameterProperty(param, parameter) {
+          return (
+            isCallableTypeAnnotation(parameter.typeAnnotation) ||
+            isFunctionExpression(param.parameter?.right)
+          )
+        }
+
+        function isCallableTypeAnnotation(typeAnnotation) {
+          return typeAnnotation?.type === 'TSTypeAnnotation' &&
+            typeAnnotation.typeAnnotation?.type === 'TSFunctionType'
+        }
+
+        function isFunctionExpression(node) {
+          return node?.type === 'ArrowFunctionExpression' || node?.type === 'FunctionExpression'
+        }
+
+        function readMemberName(key) {
+          if (key?.type === 'Identifier' || key?.type === 'PrivateIdentifier') {
+            return key.name
+          }
+
+          if (key?.type === 'Literal' && typeof key.value === 'string') {
+            return key.value
+          }
+
+          return null
+        }
+
+        function readOutputTypeRoles(typeAnnotation, currentFile) {
+          if (typeAnnotation === null || typeAnnotation === undefined) {
+            return null
+          }
+          if (typeAnnotation.type !== 'TSTypeAnnotation') {
+            return null
+          }
+          return resolveTypeNodeRoles(typeAnnotation.typeAnnotation, currentFile)
+        }
+
+        function resolveTypeNodeRoles(typeNode, currentFile) {
+          if (typeNode.type === 'TSUnionType') {
+            const memberRoleSets = typeNode.types.map((member) =>
+              resolveTypeNodeRoles(member, currentFile),
+            )
+            if (memberRoleSets.some((roles) => roles === null)) {
+              return null
+            }
+            return memberRoleSets.flat()
+          }
+
+          if (typeNode.type === 'TSArrayType') {
+            return resolveTypeNodeRoles(typeNode.elementType, currentFile)
+          }
+
+          if (
+            typeNode.type === 'TSTypeReference' &&
+            typeNode.typeName?.type === 'Identifier' &&
+            typeNode.typeName.name === 'Promise'
+          ) {
+            const typeArgs = typeNode.typeArguments?.params ?? typeNode.typeParameters?.params
+            if (!Array.isArray(typeArgs) || typeArgs.length !== 1) {
+              return null
+            }
+            return resolveTypeNodeRoles(typeArgs[0], currentFile)
+          }
+
+          if (typeNode.type === 'TSVoidKeyword') {
+            return []
+          }
+
+          if (typeNode.type === 'TSTypeReference' && typeNode.typeName?.type === 'Identifier') {
+            const localTypeName = typeNode.typeName.name
+            const importedReference = readImportedReference(localTypeName, currentFile)
+            const resolvedRole =
+              importedReference !== null
+                ? readExportedRole(importedReference.filePath, importedReference.exportedName)
+                : readExportedRole(currentFile, localTypeName)
+            return resolvedRole !== null ? [resolvedRole] : null
+          }
+
+          return null
+        }
+
+        function readTypeRole(typeAnnotation, currentFile) {
+          if (typeAnnotation === null || typeAnnotation === undefined) {
+            return null
+          }
+
+          if (typeAnnotation.type !== 'TSTypeAnnotation') {
+            return null
+          }
+
+          const innerType = unwrapSupportedTypeReference(typeAnnotation.typeAnnotation)
+          if (innerType === null) {
+            return null
+          }
+
+          const localTypeName = innerType.typeName.name
+          const importedReference = readImportedReference(localTypeName, currentFile)
+          if (importedReference !== null) {
+            return readExportedRole(importedReference.filePath, importedReference.exportedName)
+          }
+
+          return readExportedRole(currentFile, localTypeName)
+        }
+
+        function unwrapSupportedTypeReference(typeNode) {
+          if (typeNode.type !== 'TSTypeReference' || typeNode.typeName.type !== 'Identifier') {
+            return null
+          }
+
+          if (typeNode.typeName.name !== 'Promise') {
+            return typeNode
+          }
+
+          const promiseTypeArguments =
+            typeNode.typeArguments?.params ?? typeNode.typeParameters?.params
+          if (!Array.isArray(promiseTypeArguments) || promiseTypeArguments.length !== 1) {
+            return null
+          }
+
+          return unwrapSupportedTypeReference(promiseTypeArguments[0])
+        }
+
+        function readImportedReference(localTypeName, currentFile) {
+          const cacheKey = `${currentFile}::${localTypeName}`
+          if (importCache.has(cacheKey)) {
+            return importCache.get(cacheKey)
+          }
+
+          for (const statement of sourceCode.ast.body) {
+            const importedReference = readImportDeclarationReference(
+              statement,
+              localTypeName,
+              currentFile,
+              options.configDir,
+              options.importAliases,
+            )
+            if (importedReference !== undefined) {
+              importCache.set(cacheKey, importedReference)
+              return importedReference
+            }
+          }
+
+          importCache.set(cacheKey, null)
+          return null
+        }
+
+        function readExportedRole(filePath, exportedName) {
+          const exportedFile = resolveExportedFile(filePath, exportedName)
+          if (exportedFile === null) {
+            return null
+          }
+          return readDirectExportRole(exportedFile, exportedName)
+        }
+
+        function readDirectExportRole(filePath, exportedName) {
+          const sourceText = readFileText(filePath)
+          if (sourceText === null) {
+            return null
+          }
+          const escapedName = escapeRegExp(exportedName)
+          const exportPattern = new RegExp(
+            String.raw`export\s+(?:interface|type|function|class)\s+${escapedName}\b`,
+            'm',
+          )
+          const exportMatch = exportPattern.exec(sourceText)
+          if (exportMatch === null) {
+            return null
+          }
+          const prefix = sourceText.slice(0, exportMatch.index)
+          const jsDocComments = [...prefix.matchAll(/\/\*\*[\s\S]*?\*\//g)]
+          const commentMatch = jsDocComments.at(-1)
+          if (commentMatch?.[0] === undefined) {
+            return null
+          }
+          return parseSingleRoleName(commentMatch[0], `on '${exportedName}' in ${filePath}`)
+        }
+
+        function resolveExportedFile(filePath, exportedName, visited = new Set()) {
+          if (visited.has(filePath)) {
+            return null
+          }
+          visited.add(filePath)
+
+          const sourceText = readFileText(filePath)
+          if (sourceText === null) {
+            return null
+          }
+
+          const escapedName = escapeRegExp(exportedName)
+          const exportPattern = new RegExp(
+            String.raw`export\s+(?:interface|type|function|class)\s+${escapedName}\b`,
+            'm',
+          )
+          const exportMatch = exportPattern.exec(sourceText)
+          if (exportMatch !== null) {
+            return filePath
+          }
+
+          const namedReExportPattern = new RegExp(
+            String.raw`export\s*(?:type\s*)?\{[^}]*\b${escapedName}\b[^}]*\}\s*from\s*['"]([^'"]+)['"]`,
+            'm',
+          )
+          const namedReExportMatch = namedReExportPattern.exec(sourceText)
+          if (namedReExportMatch !== null) {
+            const resolvedPath = resolveTypeFile(filePath, namedReExportMatch[1])
+            if (resolvedPath !== null) {
+              return resolveExportedFile(resolvedPath, exportedName, visited)
+            }
+          }
+
+          const wildcardReExportPattern = /export\s*\*\s*from\s*['"]([^'"]+)['"]/gm
+          let wildcardMatch
+          while ((wildcardMatch = wildcardReExportPattern.exec(sourceText)) !== null) {
+            const resolvedPath = resolveTypeFile(filePath, wildcardMatch[1])
+            if (resolvedPath !== null) {
+              const exportedFile = resolveExportedFile(resolvedPath, exportedName, visited)
+              if (exportedFile !== null) {
+                return exportedFile
+              }
+            }
+          }
+
+          return null
+        }
+
+        function readFileText(filePath) {
+          if (fileCache.has(filePath)) {
+            return fileCache.get(filePath)
+          }
+
+          if (!fs.existsSync(filePath)) {
+            fileCache.set(filePath, null)
+            return null
+          }
+
+          const fileText = fs.readFileSync(filePath, 'utf8')
+          fileCache.set(filePath, fileText)
+          return fileText
+        }
+
+        function report(node, message) {
+          context.report({
+            message,
+            node,
+          })
+        }
+      },
+    },
+  },
+}
+
+function matchesAnyPattern(filePath, patterns) {
+  return patterns.some((pattern) => minimatch(filePath, pattern, { dot: true }))
+}
+
+function resolveLocationChain(filePath, locations) {
+  const fileDirectorySegments = normalizePath(path.dirname(filePath)).split('/')
+  const matches = locations
+    .map((location) => {
+      const templateSegments = location.pathTemplate.split('/')
+      if (fileDirectorySegments.length < templateSegments.length) {
+        return null
+      }
+      for (let index = 0; index < templateSegments.length; index += 1) {
+        const expected = templateSegments[index]
+        if (!isTemplateSegment(expected) && expected !== fileDirectorySegments[index]) {
+          return null
+        }
+      }
+      return {
+        concretePath: fileDirectorySegments.slice(0, templateSegments.length).join('/'),
+        location,
+      }
+    })
+    .filter((entry) => entry !== null)
+    .sort(
+      (left, right) =>
+        left.location.pathTemplate.split('/').length -
+        right.location.pathTemplate.split('/').length,
+    )
+  const mostSpecificByDepth = new Map()
+  for (const match of matches) {
+    const depth = match.location.pathTemplate.split('/').length
+    const existing = mostSpecificByDepth.get(depth)
+    if (
+      existing === undefined ||
+      templateSegmentCount(match.location.pathTemplate) <
+        templateSegmentCount(existing.location.pathTemplate)
+    ) {
+      mostSpecificByDepth.set(depth, match)
+    }
+  }
+  return [...mostSpecificByDepth.values()].sort(
+    (left, right) =>
+      left.location.pathTemplate.split('/').length -
+      right.location.pathTemplate.split('/').length,
+  )
+}
+
+function isTemplateSegment(segment) {
+  return segment.startsWith('{') && segment.endsWith('}')
+}
+
+function templateSegmentCount(template) {
+  return template.split('/').filter(isTemplateSegment).length
+}
+
+function relativeSegments(candidate, parent) {
+  if (candidate === parent) {
+    return []
+  }
+  if (!candidate.startsWith(`${parent}/`)) {
+    return []
+  }
+  return candidate.slice(parent.length + 1).split('/')
+}
+
+function isWithinPath(candidate, parent) {
+  return candidate === parent || candidate.startsWith(`${parent}/`)
+}
+
+function locationById(locations, id) {
+  if (id === undefined) {
+    return undefined
+  }
+  return locations.find((location) => location.id === id)
+}
+
+function locationRuleMatches(rule, source, target, locations) {
+  if (typeof rule.sibling === 'string') {
+    return siblingRuleMatches(rule.sibling, source, target, locations)
+  }
+  if (typeof rule.ownSubdomain === 'string') {
+    return ownSubdomainRuleMatches(rule.ownSubdomain, source, target)
+  }
+  if (typeof rule.anySubdomain === 'string') {
+    return anySubdomainRuleMatches(rule.anySubdomain, target)
+  }
+  return rootRuleMatches(rule.root, source, target, locations)
+}
+
+function expandAllowedImports(allowedScopes) {
+  return Object.entries(allowedScopes ?? {}).flatMap(([scope, allowedLocations]) =>
+    allowedLocations.flatMap((allowedLocation) => {
+      if (typeof allowedLocation === 'string') {
+        return [{ [scope]: allowedLocation }]
+      }
+      return Object.entries(allowedLocation).map(([location, roles]) => ({
+        [scope]: location,
+        roles,
+      }))
+    }),
+  )
+}
+
+function ownSubdomainRuleMatches(configuredLocation, source, target) {
+  if (!locationNameMatches(`/${configuredLocation}`, target.location.name)) {
+    return false
+  }
+  return haveSameSubdomain(source, target)
+}
+
+function anySubdomainRuleMatches(configuredLocation, target) {
+  if (!locationNameMatches(`/${configuredLocation}`, target.location.name)) {
+    return false
+  }
+  return readPackageBoundaries(
+    target.location.packagePath,
+    concretePackagePath(target),
+  ).has('subdomain')
+}
+
+function haveSameSubdomain(source, target) {
+  const sourceBoundaries = readPackageBoundaries(
+    source.location.packagePath,
+    concretePackagePath(source),
+  )
+  const targetBoundaries = readPackageBoundaries(
+    target.location.packagePath,
+    concretePackagePath(target),
+  )
+  const sourceSubdomain = sourceBoundaries.get('subdomain')
+  return (
+    sourceSubdomain !== undefined && sourceSubdomain === targetBoundaries.get('subdomain')
+  )
+}
+
+function readPackageBoundaries(packagePattern, concretePath) {
+  const patternSegments = packagePattern.split('/')
+  const concreteSegments = concretePath.split('/')
+  const boundaries = new Map()
+  for (const [index, segment] of patternSegments.entries()) {
+    if (!isTemplateSegment(segment)) {
+      continue
+    }
+    const concreteSegment = concreteSegments[index]
+    if (concreteSegment !== undefined) {
+      boundaries.set(segment.slice(1, -1), concreteSegment)
+    }
+  }
+  return boundaries
+}
+
+function siblingRuleMatches(configuredLocation, source, target, locations) {
+  if (!locationNameMatches(`/${configuredLocation}`, target.location.name)) {
+    return false
+  }
+  return hasSameConcreteParent(source, target, locations)
+}
+
+function rootRuleMatches(configuredLocation, source, target, locations) {
+  if (!locationNameMatches(`/${configuredLocation}`, target.location.name)) {
+    return false
+  }
+  return isRootLocationInSourcePackage(source, target, locations)
+}
+
+function hasSameConcreteParent(source, target, locations) {
+  const sourceParent = locationById(locations, source.location.parentId)
+  const targetParent = locationById(locations, target.location.parentId)
+  if (sourceParent?.pathTemplate !== targetParent?.pathTemplate) {
+    return false
+  }
+  const segmentCount = sourceParent.pathTemplate.split('/').length
+  const sourceParentPath = source.concretePath.split('/').slice(0, segmentCount).join('/')
+  const targetParentPath = target.concretePath.split('/').slice(0, segmentCount).join('/')
+  return sourceParentPath === targetParentPath
+}
+
+function isRootLocationInSourcePackage(source, target, locations) {
+  const targetParent = locationById(locations, target.location.parentId)
+  return (
+    concretePackagePath(target) === concretePackagePath(source) &&
+    targetParent?.pathTemplate === `${source.location.packagePath}/src`
+  )
+}
+
+function concretePackagePath(location) {
+  const segmentCount = location.location.packagePath.split('/').length
+  return location.concretePath.split('/').slice(0, segmentCount).join('/')
+}
+
+function locationNameMatches(configuredName, targetName) {
+  return targetName === configuredName || targetName.startsWith(`${configuredName}/`)
+}
+
+function collectForbiddenMethodCallRoles(fileRoles, roleMap) {
+  const forbiddenSet = new Set()
+  for (const roleName of fileRoles) {
+    const role = roleMap.get(roleName)
+    if (role !== undefined && Array.isArray(role.forbiddenMethodCalls)) {
+      for (const dep of role.forbiddenMethodCalls) {
+        forbiddenSet.add(dep)
+      }
+    }
+  }
+  return forbiddenSet
+}
+
+function isTopLevelExported(node) {
+  const exportParent = readAnnotationNode(node)
+  return (
+    exportParent.parent?.type === 'Program' &&
+    (exportParent.type === 'ExportNamedDeclaration' ||
+      exportParent.type === 'ExportDefaultDeclaration')
+  )
+}
+
+function readAnnotationNode(node) {
+  return node.parent?.type === 'ExportNamedDeclaration' ||
+    node.parent?.type === 'ExportDefaultDeclaration'
+    ? node.parent
+    : node
+}
+
+function readDeclarationName(node) {
+  if (node.type === 'VariableDeclaration') {
+    const declaration = node.declarations.length === 1 ? node.declarations[0] : undefined
+    return declaration?.id.type === 'Identifier' ? declaration.id.name : null
+  }
+
+  if ('id' in node && node.id != null) {
+    return node.id.name
+  }
+
+  if ('key' in node && node.key?.type === 'Identifier') {
+    return node.key.name
+  }
+
+  return 'id' in node && 'name' in node ? node.name : null
+}
+
+function readRoleNames(sourceCode, node) {
+  const comments = sourceCode.getCommentsBefore(node)
+  const roleNames = comments.flatMap((comment) => parseAllRoleNames(comment.value))
+  return [...new Set(roleNames)]
+}
+
+function matchesApprovedInstances(name, role) {
+  if (!Array.isArray(role.approvedInstances)) {
+    return { checked: false }
+  }
+
+  const entry = role.approvedInstances.find((instance) => instance.name === name)
+
+  if (!entry) {
+    return {
+      checked: true,
+      passed: false,
+      reason: `'${name}' is not in approvedInstances for role '${role.name}'. Add { name: '${name}', userHasApproved: true } to approvedInstances after getting user approval.`,
+    }
+  }
+
+  if (entry.userHasApproved !== true) {
+    return {
+      checked: true,
+      passed: false,
+      reason: `'${name}' has userHasApproved: false in approvedInstances for role '${role.name}'. Set userHasApproved to true after getting user approval.`,
+    }
+  }
+
+  return {
+    checked: true,
+    passed: true,
+  }
+}
+
+function matchesName(name, role) {
+  if (Array.isArray(role.allowedNames)) {
+    return role.allowedNames.includes(name)
+  }
+
+  if (typeof role.nameMatches === 'string') {
+    return new RegExp(role.nameMatches, 'u').test(name)
+  }
+
+  return true
+}
+
+function resolveTypeFile(currentFile, importSource) {
+  const sourceDir = path.dirname(currentFile)
+  const basePath = path.resolve(sourceDir, importSource)
+  return resolveFileFromBase(basePath)
+}
+
+function resolveImportFile(currentFile, importSource, configDir, importAliases = {}) {
+  if (importSource.startsWith('.')) {
+    return resolveTypeFile(currentFile, importSource)
+  }
+
+  const alias = Object.entries(importAliases).find(([prefix]) => importSource.startsWith(prefix))
+  if (alias !== undefined) {
+    const [prefix, target] = alias
+    const aliasedPath = path.resolve(configDir, target, importSource.slice(prefix.length))
+    return resolveFileFromBase(aliasedPath)
+  }
+
+  return resolveWorkspacePackageSource(currentFile, importSource)
+}
+
+function resolveFileFromBase(basePath) {
+  const candidates = [
+    basePath,
+    `${basePath}.ts`,
+    `${basePath}.tsx`,
+    path.join(basePath, 'index.ts'),
+    path.join(basePath, 'index.tsx'),
+  ]
+  return candidates.find(isFile) ?? null
+}
+
+function isFile(candidate) {
+  try {
+    return fs.statSync(candidate).isFile()
+  } catch {
+    return false
+  }
+}
+
+function resolveWorkspacePackageSource(currentFile, importSource) {
+  const packageName = readPackageName(importSource)
+  if (packageName === null) {
+    return null
+  }
+
+  try {
+    const packageJsonPath = createRequire(currentFile).resolve(`${packageName}/package.json`)
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'))
+    const packageSubpath = importSource.slice(packageName.length)
+    const exportKey = packageSubpath === '' ? '.' : `.${packageSubpath}`
+    const sourceEntry = resolvePackageSourceExport(packageJson.exports, exportKey)
+    if (typeof sourceEntry !== 'string') {
+      return null
+    }
+    return resolveTypeFile(packageJsonPath, sourceEntry)
+  } catch {
+    return null
+  }
+}
+
+function resolvePackageSourceExport(exports, exportKey) {
+  if (typeof exports !== 'object' || exports === null) {
+    return null
+  }
+
+  const directExport = exports[exportKey]
+  if (typeof directExport?.['@living-architecture/source'] === 'string') {
+    return directExport['@living-architecture/source']
+  }
+
+  for (const [pattern, value] of Object.entries(exports)) {
+    const wildcardIndex = pattern.indexOf('*')
+    if (wildcardIndex === -1 || typeof value?.['@living-architecture/source'] !== 'string') {
+      continue
+    }
+    const prefix = pattern.slice(0, wildcardIndex)
+    const suffix = pattern.slice(wildcardIndex + 1)
+    if (!exportKey.startsWith(prefix) || !exportKey.endsWith(suffix)) {
+      continue
+    }
+    const wildcardValue = exportKey.slice(prefix.length, exportKey.length - suffix.length)
+    return value['@living-architecture/source'].replaceAll('*', wildcardValue)
+  }
+
+  return null
+}
+
+function readPackageName(importSource) {
+  const segments = importSource.split('/')
+  if (importSource.startsWith('@')) {
+    return segments.length >= 2 ? `${segments[0]}/${segments[1]}` : null
+  }
+  return segments[0] ?? null
+}
+
+function isInsideDirectory(filePath, directoryPath) {
+  const relativePath = path.relative(directoryPath, filePath)
+  return relativePath !== '' && !relativePath.startsWith('..') && !path.isAbsolute(relativePath)
+}
+
+function isNodeInside(candidate, container) {
+  return candidate.range[0] >= container.range[0] && candidate.range[1] <= container.range[1]
+}
+
+function normalizePath(value) {
+  return value.replaceAll('\\', '/')
+}
+
+function readRelativeFilePath(filename, configDir) {
+  return path.isAbsolute(filename) ? path.relative(configDir, filename) : filename
+}
+
+function escapeRegExp(value) {
+  return value.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`)
+}
+
+function readImportDeclarationReference(
+  statement,
+  localTypeName,
+  currentFile,
+  configDir,
+  importAliases,
+) {
+  if (statement.type !== 'ImportDeclaration') {
+    return undefined
+  }
+
+  if (typeof statement.source.value !== 'string') {
+    return undefined
+  }
+
+  const importedSpecifier = (statement.specifiers ?? []).find(
+    (specifier) => specifier.type === 'ImportSpecifier' && specifier.local.name === localTypeName,
+  )
+  if (importedSpecifier === undefined) {
+    return undefined
+  }
+
+  const importedName =
+    importedSpecifier.imported.type === 'Identifier'
+      ? importedSpecifier.imported.name
+      : importedSpecifier.imported.value
+  const resolvedFile = resolveImportFile(currentFile, statement.source.value, configDir, importAliases)
+  if (resolvedFile === null) {
+    return null
+  }
+
+  return {
+    exportedName: importedName,
+    filePath: resolvedFile,
+  }
+}
diff --git a/packages/riviere-role-enforcement/skills/BATTLE-TEST-LOG.md b/packages/riviere-role-enforcement/domain-model/skills/BATTLE-TEST-LOG.md
similarity index 98%
rename from packages/riviere-role-enforcement/skills/BATTLE-TEST-LOG.md
rename to packages/riviere-role-enforcement/domain-model/skills/BATTLE-TEST-LOG.md
index 106d1b33a..ff2884270 100644
--- a/packages/riviere-role-enforcement/skills/BATTLE-TEST-LOG.md
+++ b/packages/riviere-role-enforcement/domain-model/skills/BATTLE-TEST-LOG.md
@@ -26,7 +26,7 @@ Each section represents one area of the codebase that was analyzed and annotated
 
 1. **`ApiComponent` → `value-object` not `external-client-model`**: `ApiComponent` is an internal domain concept (a subset of `Component` with API-specific fields), not a shape from an external API. The file is in `queries/` layer which maps to domain-service/value-object roles.
 
-2. **`queries/` layer addition to config**: The `src/features/builder/queries/` path was not in any configured layer. Added a new `queries` layer with `domain-service` and `value-object` as allowed roles. This is consistent with the separation-of-concerns skill's Q4: "Query/read side?" → queries/.
+2. **`queries/` location addition to config**: The `src/features/builder/queries/` path was not in any configured location. Added a new `queries` location with `domain-service` and `value-object` as allowed roles. This is consistent with ADR-002's read-side placement rule.
 
 3. **`addComponent` → `command-use-case` after refactoring**: The original function was a mixed responsibility — it loaded state, invoked domain behavior, AND formatted console output. This violates the `command-use-case` contract (which should return a typed result). Refactored to return `AddComponentResult` discriminated union and moved output formatting to the entrypoint. The entrypoint now follows the extract feature pattern.
 
@@ -58,7 +58,7 @@ Each section represents one area of the codebase that was analyzed and annotated
 ### What Should Be Improved
 1. **Add `Promise<T>` support to the enforcement tool**: The `readTypeRole()` function should unwrap `Promise<T>` and check the inner type `T` for its role annotation. This would enable `allowedOutputs` to work for async command-use-cases.
 2. **Document async command-use-cases in the skill and role definition**: The `command-use-case.md` definition should explicitly address async functions returning `Promise<CommandResult>`.
-3. **Add a `queries` layer to the standard config template**: The separation-of-concerns skill references a `queries/` layer but the initial config template didn't include it.
+3. **Add a `queries` location to the standard config template**: ADR-002 defines `queries/`, but the initial config template did not include it.
 4. **Entrypoint private function linter rule**: The linter rejects private functions in entrypoints, which is good. But the skill doesn't mention this constraint — it should note that helper logic must be in `commands/`, `queries/`, or `infra/` layers.
 
 ## platform/infra/cli-presentation — 2026-03-28
@@ -284,7 +284,7 @@ Each section represents one area of the codebase that was analyzed and annotated
 ### Config Changes
 - Added `'packages/riviere-extract-ts'` to packages array
 - Added `**/*-fixtures.ts` and `**/test-fixtures.ts` to ignorePatterns
-- Added `.subLocation('/infra/external-clients/{client}', externalClientRoles)` to `src/platform` location
+- Added the declarative `infra → external-clients → {client}` sublocation hierarchy with `externalClientRoles` on `{client}`
 
 ### Skill Gaps
 
diff --git a/packages/riviere-role-enforcement/skills/deep-analysis.md b/packages/riviere-role-enforcement/domain-model/skills/deep-analysis.md
similarity index 96%
rename from packages/riviere-role-enforcement/skills/deep-analysis.md
rename to packages/riviere-role-enforcement/domain-model/skills/deep-analysis.md
index 8d08539ed..7a5f83867 100644
--- a/packages/riviere-role-enforcement/skills/deep-analysis.md
+++ b/packages/riviere-role-enforcement/domain-model/skills/deep-analysis.md
@@ -9,7 +9,7 @@ When code has role enforcement violations, work through these steps in order.
 
 ## Step 1: Is the code used in a single location?
 
-If yes → would inlining the code into the caller be valid (passes all role enforcement AND dependency rules)?
+If yes → would inlining the code into the caller be valid (passes all role enforcement and import rules)?
 
 - If yes → inline it.
 - If no → which part of the inlined code causes the validation error?
@@ -39,7 +39,7 @@ For EACH solution, trace every import in the proposed code. Verify that NONE of
 
 ## Rules
 
-- Every proposed solution MUST result in code that passes all role enforcement rules AND all dependency rules.
+- Every proposed solution MUST result in code that passes all role enforcement rules and import rules.
 - If a solution would leave code in a location not defined in the config, it is INVALID.
 - Do NOT recommend changes to the role enforcement config unless it is IMPOSSIBLE to solve the problem without config changes. If you believe config changes are needed, you MUST first show your closest attempt at solving it without config changes and explain exactly why it fails. Receipts required.
 - If the only forbidden dependency is a data structure or options type, prefer a simple caller-side mapping layer over cross-layer type reuse.
diff --git a/packages/riviere-role-enforcement/skills/plan-review.md b/packages/riviere-role-enforcement/domain-model/skills/plan-review.md
similarity index 96%
rename from packages/riviere-role-enforcement/skills/plan-review.md
rename to packages/riviere-role-enforcement/domain-model/skills/plan-review.md
index dbcad0c78..657e748a1 100644
--- a/packages/riviere-role-enforcement/skills/plan-review.md
+++ b/packages/riviere-role-enforcement/domain-model/skills/plan-review.md
@@ -30,7 +30,7 @@ Do NOT use this skill for:
 3. **Gap-finding is the main value.** The biggest payoff is surfacing proposed code that doesn't fit existing conventions BEFORE it's written. Call gaps out loudly.
 4. **Never silently propose a new role.** New roles require explicit user approval. Flag them as proposals, not decisions.
 5. **Aggregates always require user approval.** Per `.riviere/role-selection-guide.md`, every aggregate must be listed in `approvedInstances` in `.riviere/roles.ts` with `userHasApproved: true`. If the plan proposes what looks like an aggregate, flag it for explicit user approval — do not assume.
-6. **Respect forbidden-import rules.** If the plan proposes code in a location that would violate `forbiddenImports` in the config, flag it immediately.
+6. **Respect import rules.** If the plan proposes an import outside a location's inherited or explicitly allowed `importRules.allow`, flag it immediately.
 7. **Remind, don't dictate.** The output always reminds the implementer to re-consult the enforcement config as code solidifies.
 
 ## Step 1: Load Context
@@ -39,7 +39,7 @@ Before reviewing the plan, read the full role enforcement context:
 
 1. **`.riviere/role-enforcement.config.ts`** — learn:
    - `packages` — the list of enforced package paths
-   - `locations` — each location's allowed roles, sublocations, and `forbiddenImports`
+   - `locations` — each location's allowed roles, sublocations, and import rules
    - `ignorePatterns`
 2. **`.riviere/roles.ts`** — the full role catalog with `targets`, `allowedInputs`, `allowedOutputs`, `forbiddenDependencies`, `minPublicMethods`, `maxPublicMethods`, `nameMatches`, and `approvedInstances`.
 3. **`.riviere/role-selection-guide.md`** — the classification decision process and the aggregate-approval rule.
@@ -101,7 +101,7 @@ Review the plan for plan-level signals of architectural problems:
 - **Mixed responsibilities in a single proposed element.** E.g. "a class that calls an HTTP service and also orchestrates domain logic and persists state." Propose splitting.
 - **Missing aggregate-repository concept.** The plan loads state without naming a repository, or loads via a free function directly from a database driver.
 - **Unapproved aggregate.** The plan proposes something that sounds like an aggregate (holds state, enforces invariants via state-modifying methods) without an explicit user-approval line. Flag for approval.
-- **Wrong-layer code.** The plan proposes code in `entrypoint/` that imports `infra/persistence/`, or code in `domain/` that imports an external library — would violate `forbiddenImports`.
+- **Wrong-location code.** The plan proposes an import not permitted by the source location's import rules.
 - **Consumer-owned mapping proposed as a domain abstraction.** The plan puts an adapter, presenter, formatter, write port, bridge, or translator in `domain/` even though its only job is to reshape domain results for a specific consumer such as CLI output, workflow updates, or builder writes. Flag it and show the simpler alternative where the use case performs its own mapping.
 - **Cross-role coupling.** The plan proposes a `command-use-case` that depends on another `command-use-case` — forbidden by the role's `forbiddenDependencies`.
 - **Repository calling another repository.** Same pattern — forbidden.
@@ -168,7 +168,7 @@ Before applying the annex, scan its contents and classify each finding:
 
 1. **New role proposed.** Any entry in the Gaps table whose "Suggested Action" is "Propose new role". New roles require explicit user approval per Principle 4.
 2. **New aggregate proposed.** Any Proposed Roles row with role `aggregate` whose name is not already in `approvedInstances` in `.riviere/roles.ts` with `userHasApproved: true`. Per Principle 5.
-3. **Forbidden-import violation.** Any Structural Concern where the plan would place code in a location whose `forbiddenImports` list would reject an import the plan requires.
+3. **Location dependency violation.** Any Structural Concern where the plan requires an import outside the source location's permitted locations.
 4. **Forbidden-dependency violation.** Any Structural Concern where a proposed role's `forbiddenDependencies` would reject a dependency the plan requires (e.g. `command-use-case` → `command-use-case`).
 5. **Missing aggregate-repository concept.** Any Structural Concern flagging that the plan loads/persists state without naming a repository.
 6. **Changes to existing roles or the enforcement config.** Any finding that would require editing `.riviere/roles.ts`, `.riviere/role-enforcement.config.ts`, or role definition files.
diff --git a/packages/riviere-role-enforcement/skills/role-enforcement.md b/packages/riviere-role-enforcement/domain-model/skills/role-enforcement.md
similarity index 97%
rename from packages/riviere-role-enforcement/skills/role-enforcement.md
rename to packages/riviere-role-enforcement/domain-model/skills/role-enforcement.md
index 715df71de..9f94a2e1d 100644
--- a/packages/riviere-role-enforcement/skills/role-enforcement.md
+++ b/packages/riviere-role-enforcement/domain-model/skills/role-enforcement.md
@@ -29,7 +29,7 @@ Before classifying any code:
    - `roles` — the full role catalog with targets, naming patterns, and constraints
    - `ignorePatterns` — which files are excluded
 
-2. **Read index.md**: Read `.riviere/role-definitions/index.md` to discover project-level architecture resources. Follow the links to read referenced documents (separation of concerns, tactical DDD, ADRs, conventions).
+2. **Read index.md**: Read `.riviere/role-definitions/index.md` to discover the repository's local architecture resources. Follow its links to the local role definitions, ADRs, and conventions.
 
 3. **Read role definitions**: For each role in the config, read `.riviere/role-definitions/{role-name}.md`. These contain:
    - Behavioral contracts (what the code DOES)
diff --git a/packages/riviere-role-enforcement/domain-model/src/domain/assign-package-configurations.ts b/packages/riviere-role-enforcement/domain-model/src/domain/assign-package-configurations.ts
new file mode 100644
index 000000000..b7cd5b5ec
--- /dev/null
+++ b/packages/riviere-role-enforcement/domain-model/src/domain/assign-package-configurations.ts
@@ -0,0 +1,26 @@
+import type { LocationConfiguration } from './location-configuration'
+
+interface LocationSet<R extends string> {
+  readonly locations: LocationConfiguration<R>
+}
+
+type PackageConfigurationAssignments<R extends string> = readonly (readonly [
+  string,
+  LocationSet<R>,
+])[]
+
+/** @riviere-role domain-service */
+export function assignPackageConfigurations<R extends string>(
+  configurations: Readonly<Record<string, LocationSet<R>>>,
+): PackageConfigurationAssignments<R> {
+  return Object.entries(configurations).map(
+    ([packagePattern, configuration]) =>
+      [directPackagePattern(packagePattern), configuration] as const,
+  )
+}
+
+function directPackagePattern(packagePattern: string): string {
+  return packagePattern.endsWith('/')
+    ? `${packagePattern.replace(/\/$/, '')}/{package}`
+    : packagePattern
+}
diff --git a/packages/riviere-role-enforcement/domain-model/src/domain/filter-config-by-package.spec.ts b/packages/riviere-role-enforcement/domain-model/src/domain/filter-config-by-package.spec.ts
new file mode 100644
index 000000000..2ec360ac9
--- /dev/null
+++ b/packages/riviere-role-enforcement/domain-model/src/domain/filter-config-by-package.spec.ts
@@ -0,0 +1,138 @@
+import { describe, expect, it } from 'vitest'
+import { filterConfigByPackage, PackageFilterError } from './filter-config-by-package'
+import {
+  location,
+  locationConfiguration,
+  role,
+  roleEnforcementConfiguration,
+  RoleEnforcementConfiguration,
+} from './role-enforcement-builder'
+
+const testRoles = [
+  role('cli-entrypoint', { targets: ['function'] }),
+  role('aggregate', { targets: ['class'] }),
+] as const
+
+function expectValidConfiguration(
+  result: ReturnType<typeof RoleEnforcementConfiguration.parse>,
+): RoleEnforcementConfiguration {
+  if (!result.success) throw result.error
+  return result.data
+}
+
+function createMultiPackageConfig(): RoleEnforcementConfiguration {
+  return roleEnforcementConfiguration({
+    configurations: {
+      'packages/{package}': {
+        locations: locationConfiguration(
+          location('/features/{feature}', {
+            domain: ['aggregate'],
+            entrypoint: ['cli-entrypoint'],
+          }),
+        ),
+      },
+    },
+    ignorePatterns: ['**/*.spec.ts'],
+    roleDefinitionsDir: '.riviere/role-definitions',
+    roles: testRoles,
+  })
+}
+
+describe('filterConfigByPackage', () => {
+  it('filters include patterns to the specified package', () => {
+    const config = createMultiPackageConfig()
+
+    const result = filterConfigByPackage(config, 'packages/riviere-cli')
+
+    expect(result.include).toStrictEqual([
+      'packages/riviere-cli/src/**/*.ts',
+      'packages/riviere-cli/src/**/*.tsx',
+    ])
+  })
+
+  it('filters the location hierarchy to the specified package', () => {
+    const config = createMultiPackageConfig()
+
+    const result = filterConfigByPackage(config, 'packages/riviere-cli')
+
+    expect(
+      result.locationHierarchy.every((location) => location.packagePath === 'packages/riviere-cli'),
+    ).toBe(true)
+  })
+
+  it('preserves ignorePatterns unchanged', () => {
+    const config = createMultiPackageConfig()
+
+    const result = filterConfigByPackage(config, 'packages/riviere-cli')
+
+    expect(result.ignorePatterns).toStrictEqual(['**/*.spec.ts'])
+  })
+
+  it('preserves roles unchanged', () => {
+    const config = createMultiPackageConfig()
+
+    const result = filterConfigByPackage(config, 'packages/riviere-cli')
+
+    expect(result.roles).toBe(testRoles)
+  })
+
+  it('preserves roleDefinitionsDir unchanged', () => {
+    const config = createMultiPackageConfig()
+
+    const result = filterConfigByPackage(config, 'packages/riviere-cli')
+
+    expect(result.roleDefinitionsDir).toBe('.riviere/role-definitions')
+  })
+
+  it('strips trailing slashes from package path', () => {
+    const config = createMultiPackageConfig()
+
+    const result = filterConfigByPackage(config, 'packages/riviere-cli/')
+
+    expect(result.include).toStrictEqual([
+      'packages/riviere-cli/src/**/*.ts',
+      'packages/riviere-cli/src/**/*.tsx',
+    ])
+  })
+
+  it('throws PackageFilterError when package matches no include patterns', () => {
+    const config = createMultiPackageConfig()
+
+    expect(() => filterConfigByPackage(config, 'apps/nonexistent')).toThrow(PackageFilterError)
+  })
+
+  it('includes available packages in error message', () => {
+    const config = createMultiPackageConfig()
+
+    expect(() => filterConfigByPackage(config, 'apps/nonexistent')).toThrow(/packages\/\{package\}/)
+  })
+
+  it('filters to the other package when specified', () => {
+    const config = createMultiPackageConfig()
+
+    const result = filterConfigByPackage(config, 'packages/riviere-extract-ts')
+
+    expect(result.include).toStrictEqual([
+      'packages/riviere-extract-ts/src/**/*.ts',
+      'packages/riviere-extract-ts/src/**/*.tsx',
+    ])
+    expect(
+      result.locationHierarchy.every(
+        (location) => location.packagePath === 'packages/riviere-extract-ts',
+      ),
+    ).toBe(true)
+  })
+
+  it('keeps an include pattern without a source folder unchanged', () => {
+    const config = expectValidConfiguration(
+      RoleEnforcementConfiguration.parse({
+        ...createMultiPackageConfig(),
+        include: ['packages/*'],
+      }),
+    )
+
+    const result = filterConfigByPackage(config, 'packages/riviere-cli')
+
+    expect(result.include).toStrictEqual(['packages/*'])
+  })
+})
diff --git a/packages/riviere-role-enforcement/domain-model/src/domain/filter-config-by-package.ts b/packages/riviere-role-enforcement/domain-model/src/domain/filter-config-by-package.ts
new file mode 100644
index 000000000..fd46b946e
--- /dev/null
+++ b/packages/riviere-role-enforcement/domain-model/src/domain/filter-config-by-package.ts
@@ -0,0 +1,114 @@
+import { RoleEnforcementConfiguration } from './role-enforcement-builder'
+
+/** @riviere-role domain-service */
+export function filterConfigByPackage(
+  config: RoleEnforcementConfiguration,
+  packagePath: string,
+): RoleEnforcementConfiguration {
+  const normalizedPath = stripTrailingSlashes(packagePath)
+  const packagePattern = config.assignedPackages.find((pattern) =>
+    packagePatternMatches(pattern, normalizedPath),
+  )
+
+  if (packagePattern === undefined) {
+    throw new PackageFilterError(
+      `No include patterns match package '${normalizedPath}'. Available packages: ${config.assignedPackages.join(', ')}`,
+    )
+  }
+
+  const replacements = placeholderReplacements(packagePattern, normalizedPath)
+  const filteredInclude = config.include
+    .filter((pattern) => extractPackagePath(pattern) === toGlobPattern(packagePattern))
+    .map((pattern) => replacePackageGlob(pattern, normalizedPath))
+  const matchingLocations = config.locationHierarchy.filter(
+    (location) => location.packagePath === packagePattern,
+  )
+
+  return RoleEnforcementConfiguration.parse({
+    ...config,
+    assignedPackages: [normalizedPath],
+    include: filteredInclude,
+    locationHierarchy: matchingLocations.map((location) => ({
+      ...location,
+      id: replacePlaceholders(location.id, replacements),
+      packagePath: normalizedPath,
+      ...(location.parentId === undefined
+        ? {}
+        : { parentId: replacePlaceholders(location.parentId, replacements) }),
+      pathTemplate: replacePlaceholders(location.pathTemplate, replacements),
+    })),
+  }).data
+}
+
+function packagePatternMatches(packagePattern: string, packagePath: string): boolean {
+  const patternSegments = packagePattern.split('/')
+  const pathSegments = packagePath.split('/')
+  return (
+    patternSegments.length === pathSegments.length &&
+    patternSegments.every(
+      (segment, index) =>
+        (segment.startsWith('{') && segment.endsWith('}')) || segment === pathSegments[index],
+    )
+  )
+}
+
+function placeholderReplacements(
+  packagePattern: string,
+  packagePath: string,
+): ReadonlyMap<string, string> {
+  const pathSegments = packagePath.split('/')
+  return new Map(
+    packagePattern.split('/').flatMap((segment, index) => {
+      const replacement = pathSegments[index]
+      return replacement !== undefined && segment.startsWith('{') && segment.endsWith('}')
+        ? [[segment, replacement]]
+        : []
+    }),
+  )
+}
+
+function replacePlaceholders(value: string, replacements: ReadonlyMap<string, string>): string {
+  return [...replacements].reduce(
+    (result, [placeholder, replacement]) => result.replaceAll(placeholder, replacement),
+    value,
+  )
+}
+
+function replacePackageGlob(includePattern: string, packagePath: string): string {
+  const srcIndex = includePattern.indexOf('/src/')
+  return srcIndex < 0 ? includePattern : `${packagePath}${includePattern.slice(srcIndex)}`
+}
+
+function toGlobPattern(packagePattern: string): string {
+  return packagePattern
+    .split('/')
+    .map((segment) => (segment.startsWith('{') && segment.endsWith('}') ? '*' : segment))
+    .join('/')
+}
+
+function extractPackagePath(includePattern: string): string {
+  const srcIndex = includePattern.indexOf('/src/')
+  if (srcIndex < 0) {
+    return includePattern
+  }
+  return includePattern.slice(0, srcIndex)
+}
+
+function stripTrailingSlashes(value: string): string {
+  if (!value.endsWith('/')) {
+    return value
+  }
+  const chars = [...value]
+  while (chars.length > 0 && chars[chars.length - 1] === '/') {
+    chars.pop()
+  }
+  return chars.join('')
+}
+
+/** @riviere-role domain-error */
+export class PackageFilterError extends Error {
+  constructor(message: string) {
+    super(message)
+    this.name = 'PackageFilterError'
+  }
+}
diff --git a/packages/riviere-role-enforcement/domain-model/src/domain/location-configuration.spec.ts b/packages/riviere-role-enforcement/domain-model/src/domain/location-configuration.spec.ts
new file mode 100644
index 000000000..a5abf6a5a
--- /dev/null
+++ b/packages/riviere-role-enforcement/domain-model/src/domain/location-configuration.spec.ts
@@ -0,0 +1,197 @@
+import { describe, expect, it } from 'vitest'
+import { location, locationConfiguration } from './location-configuration'
+import {
+  roleEnforcementConfiguration,
+  type RoleEnforcementConfiguration,
+} from './role-enforcement-builder'
+
+describe('location configuration', () => {
+  it('keeps location import rules and disabled role enforcement', () => {
+    const result = roleEnforcementConfiguration({
+      configurations: {
+        'packages/app': {
+          locations: locationConfiguration(
+            location('/published-language', [], {
+              'eslint-plugin': { roleEnforcement: false },
+              importRules: { allow: { sibling: ['infra'] } },
+            }),
+          ),
+        },
+      },
+      ignorePatterns: [],
+      roleDefinitionsDir: '.riviere/role-definitions',
+      roles: [],
+    })
+
+    expect(result.locationHierarchy).toStrictEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          importRules: { allow: { sibling: ['infra'] } },
+          name: '/published-language',
+        }),
+        expect.objectContaining({ name: '/eslint-plugin', roleEnforcement: false }),
+      ]),
+    )
+  })
+
+  it('rejects explicit children inside an unrestricted location', () => {
+    expect(() =>
+      location('/domain', [], {
+        allowAnySubLocations: true,
+        child: [],
+      }),
+    ).toThrow("Location '/domain' cannot define both allowAnySubLocations and subLocations")
+  })
+
+  it('rejects a nested unrestricted location with a separately declared descendant', () => {
+    expect(() =>
+      location('/features', {
+        domain: { allowAnySubLocations: true },
+        'domain/connection-detection': [],
+      }),
+    ).toThrow("Location 'domain' cannot define both allowAnySubLocations and subLocations")
+  })
+
+  it('rejects a sub-location without roles, rules or children', () => {
+    expect(() =>
+      location('/features', {
+        // @ts-expect-error runtime validation protects JavaScript configuration files
+        domain: 'invalid',
+      }),
+    ).toThrow("Sub-location 'domain' must define roles or sub-locations.")
+  })
+
+  it('accepts roles inside a sub-location object', () => {
+    const result = location<'aggregate'>('/features', {
+      domain: { roles: ['aggregate'] },
+    })
+
+    expect(result.subLocations[0]?.allowedRoles).toStrictEqual(['aggregate'])
+  })
+
+  it('exposes roles and import rules from a location definition', () => {
+    const result = location('/domain', ['aggregate'], {
+      importRules: { allow: { root: ['utilities'] } },
+    })
+
+    expect(result.allowedRoles).toStrictEqual(['aggregate'])
+    expect(result.importRules).toStrictEqual({ allow: { root: ['utilities'] } })
+  })
+
+  it('ignores empty path segments when checking nested unrestricted locations', () => {
+    expect(() =>
+      location('/features', {
+        '/domain/': { allowAnySubLocations: true },
+        '/domain//connection-detection': [],
+      }),
+    ).toThrow("Location '/domain/' cannot define both allowAnySubLocations and subLocations")
+  })
+
+  it('rejects a child import rule already allowed by its parent', () => {
+    expect(() =>
+      roleEnforcementConfiguration({
+        configurations: {
+          'packages/app': {
+            locations: locationConfiguration(
+              location('/areas/{area}', {
+                actions: {
+                  importRules: { allow: { root: ['utilities'] } },
+                },
+                importRules: { allow: { root: ['utilities'] } },
+              }),
+            ),
+          },
+        },
+        ignorePatterns: [],
+        roleDefinitionsDir: '.riviere/role-definitions',
+        roles: [],
+      }),
+    ).toThrow("Location '/actions' repeats inherited root import 'utilities'.")
+  })
+})
+
+describe('RoleEnforcementConfiguration.validateWorkspacePackages', () => {
+  function configuredWorkspace(
+    configurations: Readonly<
+      Record<string, { locations: ReturnType<typeof locationConfiguration> }>
+    >,
+    unassignedPackages: readonly string[] = [],
+  ): RoleEnforcementConfiguration {
+    return roleEnforcementConfiguration({
+      configurations,
+      ignorePatterns: [],
+      roleDefinitionsDir: '.riviere/role-definitions',
+      roles: [],
+      unassignedPackages,
+    })
+  }
+
+  it('accepts assigned and explicitly unassigned packages', () => {
+    const config = configuredWorkspace(
+      {
+        'packages/{package}': {
+          locations: locationConfiguration(location('/domain', [])),
+        },
+      },
+      ['apps/eclair'],
+    )
+
+    expect(() =>
+      config.validateWorkspacePackages(['packages/builder', 'apps/eclair']),
+    ).not.toThrow()
+  })
+
+  it('rejects an unassigned workspace package', () => {
+    const config = configuredWorkspace({
+      'packages/{package}': {
+        locations: locationConfiguration(location('/domain', [])),
+      },
+    })
+
+    expect(() => config.validateWorkspacePackages(['apps/cli'])).toThrow(
+      "Workspace package 'apps/cli' has no role-enforcement configuration",
+    )
+  })
+
+  it('rejects a package outside the explicitly configured package folders', () => {
+    const config = configuredWorkspace({
+      'modules/{group}/consumer': {
+        locations: locationConfiguration(location('/actions', [])),
+      },
+      'modules/{group}/provider': {
+        locations: locationConfiguration(location('/api', [])),
+      },
+    })
+
+    expect(() => config.validateWorkspacePackages(['modules/payments/random'])).toThrow(
+      "Workspace package 'modules/payments/random' has no role-enforcement configuration",
+    )
+  })
+
+  it.each(['domain-model', 'use-cases', 'published-language'])(
+    "rejects a nested '%s' package when only direct tool packages are configured",
+    (nestedPackage) => {
+      const config = configuredWorkspace({
+        'tools/': {
+          locations: locationConfiguration(location('/application', [])),
+        },
+      })
+
+      expect(() => config.validateWorkspacePackages([`tools/automation/${nestedPackage}`])).toThrow(
+        `Workspace package 'tools/automation/${nestedPackage}' has no role-enforcement configuration`,
+      )
+    },
+  )
+
+  it('rejects a workspace package assigned more than once', () => {
+    const locations = locationConfiguration(location('/domain', []))
+    const config = configuredWorkspace({
+      'packages/{package}': { locations },
+      'packages/builder': { locations },
+    })
+
+    expect(() => config.validateWorkspacePackages(['packages/builder'])).toThrow(
+      "Workspace package 'packages/builder' is assigned to more than one role-enforcement configuration.",
+    )
+  })
+})
diff --git a/packages/riviere-role-enforcement/domain-model/src/domain/location-configuration.ts b/packages/riviere-role-enforcement/domain-model/src/domain/location-configuration.ts
new file mode 100644
index 000000000..3e212f23b
--- /dev/null
+++ b/packages/riviere-role-enforcement/domain-model/src/domain/location-configuration.ts
@@ -0,0 +1,186 @@
+type AllowedLocation<R extends string> = string | Readonly<Record<string, readonly R[]>>
+
+interface AllowedImportScopes<R extends string> {
+  readonly anySubdomain?: readonly AllowedLocation<R>[]
+  readonly ownSubdomain?: readonly AllowedLocation<R>[]
+  readonly root?: readonly AllowedLocation<R>[]
+  readonly sibling?: readonly AllowedLocation<R>[]
+}
+
+interface LocationImportRules<R extends string> {
+  readonly allow?: AllowedImportScopes<R>
+  readonly inheritParentImportRules?: false
+  readonly importableFrom?: 'withinParentLocation'
+}
+
+interface LocationNodeOptions<R extends string> {
+  readonly allowAnySubLocations?: true
+  readonly importRules?: LocationImportRules<R>
+  readonly roleEnforcement?: false
+}
+
+interface LocationNodeInput<R extends string> extends LocationNodeOptions<R> {
+  readonly roles?: readonly R[]
+  readonly [key: string]:
+    | readonly R[]
+    | LocationImportRules<R>
+    | LocationNodeInput<R>
+    | boolean
+    | undefined
+}
+
+interface FluentLocationDefinition<R extends string> {
+  readonly allowAnySubLocations: boolean
+  readonly allowedRoles: readonly R[]
+  readonly importRules?: LocationImportRules<R>
+  readonly path: string
+  readonly roleEnforcement: boolean
+  readonly subLocations: readonly LocationBuilder<R>[]
+}
+
+/** @riviere-role value-object */
+export class LocationBuilder<R extends string> {
+  declare private readonly brand: 'LocationBuilder'
+
+  private constructor(private readonly definition: FluentLocationDefinition<R>) {}
+
+  static parse<R extends string>(definition: FluentLocationDefinition<R>): LocationBuilder<R> {
+    assertNoExplicitSubLocationsInsideUnrestrictedLocation(definition)
+    return new LocationBuilder(definition)
+  }
+
+  get allowAnySubLocations(): boolean {
+    return this.definition.allowAnySubLocations
+  }
+
+  get allowedRoles(): readonly R[] {
+    return this.definition.allowedRoles
+  }
+
+  get importRules(): LocationImportRules<R> | undefined {
+    return this.definition.importRules
+  }
+
+  get path(): string {
+    return this.definition.path
+  }
+
+  get roleEnforcement(): boolean {
+    return this.definition.roleEnforcement
+  }
+
+  get subLocations(): readonly LocationBuilder<R>[] {
+    return this.definition.subLocations
+  }
+}
+
+/** @riviere-role value-object */
+export class LocationConfiguration<R extends string> {
+  declare private readonly brand: 'LocationConfiguration'
+
+  private constructor(readonly locations: readonly LocationBuilder<R>[]) {}
+
+  static parse<R extends string>(
+    locations: readonly LocationBuilder<R>[],
+  ): LocationConfiguration<R> {
+    return new LocationConfiguration(locations)
+  }
+}
+
+export function location<R extends string>(path: string): LocationBuilder<R>
+export function location<R extends string>(
+  path: string,
+  roles: readonly R[],
+  node?: LocationNodeInput<R>,
+): LocationBuilder<R>
+export function location<R extends string>(
+  path: string,
+  node: LocationNodeInput<R>,
+): LocationBuilder<R>
+/** @riviere-role domain-service */
+export function location<R extends string>(
+  path: string,
+  rolesOrNode?: readonly R[] | LocationNodeInput<R>,
+  node?: LocationNodeInput<R>,
+): LocationBuilder<R> {
+  const hasRoles = isRoleList(rolesOrNode)
+  return buildLocation(path, hasRoles ? rolesOrNode : [], hasRoles ? node : rolesOrNode)
+}
+
+function isRoleList<R extends string>(value: unknown): value is readonly R[] {
+  return Array.isArray(value)
+}
+
+function buildLocation<R extends string>(
+  path: string,
+  roles: readonly R[],
+  node: LocationNodeInput<R> | undefined,
+): LocationBuilder<R> {
+  return LocationBuilder.parse({
+    allowAnySubLocations: node?.allowAnySubLocations === true,
+    allowedRoles: roles,
+    ...(node?.importRules === undefined ? {} : { importRules: node.importRules }),
+    path,
+    roleEnforcement: node?.roleEnforcement !== false,
+    subLocations: Object.entries(node ?? {})
+      .filter(([key]) => !reservedLocationKeys.has(key))
+      .map(([childPath, child]) => buildChildLocation(childPath, child)),
+  })
+}
+
+function buildChildLocation<R extends string>(path: string, child: unknown): LocationBuilder<R> {
+  if (isRoleList<R>(child)) {
+    return buildLocation(path, child, undefined)
+  }
+  if (!isLocationNodeInput<R>(child)) {
+    throw new TypeError(`Sub-location '${path}' must define roles or sub-locations.`)
+  }
+  return buildLocation(path, child.roles ?? [], child)
+}
+
+function isLocationNodeInput<R extends string>(value: unknown): value is LocationNodeInput<R> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+const reservedLocationKeys = new Set([
+  'allowAnySubLocations',
+  'importRules',
+  'roleEnforcement',
+  'roles',
+])
+
+/** @riviere-role domain-service */
+export function locationConfiguration<R extends string>(
+  ...locations: readonly LocationBuilder<R>[]
+): LocationConfiguration<R> {
+  return LocationConfiguration.parse(locations)
+}
+
+function assertNoExplicitSubLocationsInsideUnrestrictedLocation<R extends string>(
+  definition: FluentLocationDefinition<R>,
+): void {
+  if (definition.allowAnySubLocations && definition.subLocations.length > 0) {
+    throw new TypeError(
+      `Location '${definition.path}' cannot define both allowAnySubLocations and subLocations`,
+    )
+  }
+
+  const unrestrictedLocation = definition.subLocations.find(
+    (candidate) =>
+      candidate.allowAnySubLocations &&
+      definition.subLocations.some(
+        (possibleChild) =>
+          possibleChild !== candidate &&
+          normalizePath(possibleChild.path).startsWith(`${normalizePath(candidate.path)}/`),
+      ),
+  )
+  if (unrestrictedLocation !== undefined) {
+    throw new TypeError(
+      `Location '${unrestrictedLocation.path}' cannot define both allowAnySubLocations and subLocations`,
+    )
+  }
+}
+
+function normalizePath(path: string): string {
+  return path.split('/').filter(Boolean).join('/')
+}
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/domain/ports/role-enforcement-runner.ts b/packages/riviere-role-enforcement/domain-model/src/domain/ports/role-enforcement-runner.ts
similarity index 77%
rename from packages/riviere-role-enforcement/src/features/enforcement/domain/ports/role-enforcement-runner.ts
rename to packages/riviere-role-enforcement/domain-model/src/domain/ports/role-enforcement-runner.ts
index 220d9dfd6..4b0b7b67b 100644
--- a/packages/riviere-role-enforcement/src/features/enforcement/domain/ports/role-enforcement-runner.ts
+++ b/packages/riviere-role-enforcement/domain-model/src/domain/ports/role-enforcement-runner.ts
@@ -1,8 +1,8 @@
-import type { RoleEnforcementResult } from '../role-enforcement-builder'
+import type { RoleEnforcementConfiguration } from '../role-enforcement-builder'
 
 /** @riviere-role domain-port */
 export interface RoleEnforcementRunnerInput {
-  config: RoleEnforcementResult
+  config: RoleEnforcementConfiguration
   configDir: string
   lintTargets: readonly string[]
 }
diff --git a/packages/riviere-role-enforcement/domain-model/src/domain/role-configuration-completeness.spec.ts b/packages/riviere-role-enforcement/domain-model/src/domain/role-configuration-completeness.spec.ts
new file mode 100644
index 000000000..42bf00ae5
--- /dev/null
+++ b/packages/riviere-role-enforcement/domain-model/src/domain/role-configuration-completeness.spec.ts
@@ -0,0 +1,104 @@
+import { describe, expect, it } from 'vitest'
+import {
+  location,
+  locationConfiguration,
+  role,
+  roleEnforcementConfiguration,
+} from './role-enforcement-builder'
+
+describe('role configuration completeness', () => {
+  it('rejects duplicate role definitions', () => {
+    expect(() =>
+      roleEnforcementConfiguration({
+        configurations: {
+          'packages/app': {
+            locations: locationConfiguration(location('/domain', ['aggregate'])),
+          },
+        },
+        ignorePatterns: [],
+        roleDefinitionsDir: '.riviere/role-definitions',
+        roles: [
+          role('aggregate', { targets: ['class'] }),
+          role('aggregate', { targets: ['interface'] }),
+        ],
+      }),
+    ).toThrow("Role 'aggregate' is defined more than once.")
+  })
+
+  it('rejects a location role that has no definition', () => {
+    expect(() =>
+      roleEnforcementConfiguration({
+        configurations: {
+          'packages/app': {
+            locations: locationConfiguration(location('/domain', ['missing-role'])),
+          },
+        },
+        ignorePatterns: [],
+        roleDefinitionsDir: '.riviere/role-definitions',
+        roles: [role('known-role', { targets: ['class'] })],
+      }),
+    ).toThrow("Location '/domain' allows unknown role 'missing-role'.")
+  })
+
+  it('rejects a role rule that references an unknown role', () => {
+    expect(() =>
+      roleEnforcementConfiguration({
+        configurations: {
+          'packages/app': {
+            locations: locationConfiguration(location('/domain', ['known-role'])),
+          },
+        },
+        ignorePatterns: [],
+        roleDefinitionsDir: '.riviere/role-definitions',
+        roles: [
+          role('known-role', {
+            targets: ['class'],
+            forbiddenDependencies: ['missing-role'],
+          }),
+        ],
+      }),
+    ).toThrow("Role 'known-role' references unknown role 'missing-role'.")
+  })
+
+  it('rejects an unknown role in a role-filtered location import', () => {
+    expect(() =>
+      roleEnforcementConfiguration({
+        configurations: {
+          'packages/app': {
+            locations: locationConfiguration(
+              location('/actions', ['known-role'], {
+                importRules: { allow: { sibling: [{ records: ['missing-role'] }] } },
+              }),
+            ),
+          },
+        },
+        ignorePatterns: [],
+        roleDefinitionsDir: '.riviere/role-definitions',
+        roles: [role('known-role', { targets: ['class'] })],
+      }),
+    ).toThrow("Location '/actions' allows unknown role 'missing-role'.")
+  })
+
+  it('accepts a parser failure branch without a role-constrained result', () => {
+    expect(() =>
+      roleEnforcementConfiguration({
+        configurations: {
+          'packages/app': {
+            locations: locationConfiguration(location('/api', ['parser', 'schema'])),
+          },
+        },
+        ignorePatterns: [],
+        roleDefinitionsDir: '.riviere/role-definitions',
+        roles: [
+          role('parser', {
+            returns: [
+              { success: true, '*': 'schema' },
+              { success: false, '*': '*' },
+            ],
+          }),
+          role('schema', { mustBeDataStructure: true }),
+        ],
+      }),
+    ).not.toThrow()
+  })
+})
diff --git a/packages/riviere-role-enforcement/domain-model/src/domain/role-enforcement-builder.spec.ts b/packages/riviere-role-enforcement/domain-model/src/domain/role-enforcement-builder.spec.ts
new file mode 100644
index 000000000..e9b5d78f8
--- /dev/null
+++ b/packages/riviere-role-enforcement/domain-model/src/domain/role-enforcement-builder.spec.ts
@@ -0,0 +1,397 @@
+import { describe, expect, it } from 'vitest'
+import {
+  BuiltRole,
+  location,
+  locationConfiguration,
+  role,
+  roleEnforcementConfiguration,
+  RoleEnforcementConfiguration,
+} from './role-enforcement-builder'
+import { RoleEnforcementExecutionError } from './role-enforcement-execution-error'
+
+function expectBuiltRole(result: BuiltRole, expected: object): void {
+  expect(result).toBeInstanceOf(BuiltRole)
+  expect({ ...result }).toStrictEqual(expected)
+}
+
+describe('role', () => {
+  it('produces a role definition with the given name and options', () => {
+    const result = role('aggregate', { targets: ['interface', 'type-alias', 'class'] })
+
+    expectBuiltRole(result, {
+      name: 'aggregate',
+      targets: ['interface', 'type-alias', 'class'],
+    })
+  })
+
+  it('includes optional constraints when provided', () => {
+    const result = role('command-use-case', {
+      targets: ['function'],
+      allowedInputs: ['command-use-case-input'],
+      allowedOutputs: ['command-use-case-result'],
+      forbiddenDependencies: ['command-use-case'],
+      nameMatches: '.*UseCase$',
+    })
+
+    expectBuiltRole(result, {
+      name: 'command-use-case',
+      targets: ['function'],
+      allowedInputs: ['command-use-case-input'],
+      allowedOutputs: ['command-use-case-result'],
+      forbiddenDependencies: ['command-use-case'],
+      nameMatches: '.*UseCase$',
+    })
+  })
+
+  it('includes allowedNames when provided', () => {
+    const result = role('cli-entrypoint', {
+      targets: ['function'],
+      allowedNames: ['main', 'run'],
+    })
+
+    expectBuiltRole(result, {
+      name: 'cli-entrypoint',
+      targets: ['function'],
+      allowedNames: ['main', 'run'],
+    })
+  })
+
+  it('includes maxPublicMethods when provided', () => {
+    const result = role('command-use-case', {
+      targets: ['class'],
+      minPublicMethods: 1,
+      maxPublicMethods: 1,
+    })
+
+    expectBuiltRole(result, {
+      name: 'command-use-case',
+      targets: ['class'],
+      minPublicMethods: 1,
+      maxPublicMethods: 1,
+    })
+  })
+
+  it('includes approvedInstances when provided', () => {
+    const result = role('aggregate', {
+      targets: ['interface', 'type-alias', 'class'],
+      minPublicMethods: 1,
+      approvedInstances: [
+        {
+          name: 'ExtractionProject',
+          userHasApproved: true,
+        },
+      ],
+    })
+
+    expectBuiltRole(result, {
+      name: 'aggregate',
+      targets: ['interface', 'type-alias', 'class'],
+      minPublicMethods: 1,
+      approvedInstances: [
+        {
+          name: 'ExtractionProject',
+          userHasApproved: true,
+        },
+      ],
+    })
+  })
+
+  it('includes requiredPrivateMembers when provided', () => {
+    const result = role('role-b', {
+      targets: ['class'],
+      requiredPrivateMembers: ['brand'],
+    })
+
+    expectBuiltRole(result, {
+      name: 'role-b',
+      targets: ['class'],
+      requiredPrivateMembers: ['brand'],
+    })
+  })
+
+  it('includes generic class state constraints when provided', () => {
+    const result = role('role-b', {
+      targets: ['class'],
+      requiresDataMembers: true,
+      forbiddenCallableDataMembers: true,
+      requiresPrivateConstructor: true,
+      requiredStaticMethodNamePrefix: 'parse',
+    })
+
+    expectBuiltRole(result, {
+      name: 'role-b',
+      targets: ['class'],
+      requiresDataMembers: true,
+      forbiddenCallableDataMembers: true,
+      requiresPrivateConstructor: true,
+      requiredStaticMethodNamePrefix: 'parse',
+    })
+  })
+
+  it('includes forbiddenMethodCalls when provided', () => {
+    const result = role('main', {
+      targets: ['function'],
+      forbiddenMethodCalls: ['command-use-case', 'aggregate-repository'],
+    })
+
+    expectBuiltRole(result, {
+      name: 'main',
+      targets: ['function'],
+      forbiddenMethodCalls: ['command-use-case', 'aggregate-repository'],
+    })
+  })
+})
+
+describe('roleEnforcementConfiguration', () => {
+  const testRoles = [
+    role('cli-entrypoint', { targets: ['function'] }),
+    role('aggregate', { targets: ['class'] }),
+  ] as const
+
+  it('applies a package-pattern configuration to every matching package', () => {
+    const locations = locationConfiguration(
+      location('/features/{feature}', {
+        domain: ['aggregate'],
+        entrypoint: ['cli-entrypoint'],
+      }),
+    )
+    const result = roleEnforcementConfiguration({
+      configurations: {
+        'packages/{app}': { locations },
+      },
+      ignorePatterns: [],
+      roleDefinitionsDir: '.riviere/role-definitions',
+      roles: testRoles,
+    })
+
+    expect(result.locationHierarchy.map((location) => location.pathTemplate)).toStrictEqual([
+      'packages/{app}/src',
+      'packages/{app}/src/features/{feature}',
+      'packages/{app}/src/features/{feature}/domain',
+      'packages/{app}/src/features/{feature}/entrypoint',
+    ])
+  })
+
+  it('applies a package configuration to each package directly inside its configured folder', () => {
+    const locations = locationConfiguration(location('/features', []))
+
+    const result = roleEnforcementConfiguration({
+      configurations: {
+        'apps/': { locations },
+      },
+      ignorePatterns: [],
+      roleDefinitionsDir: '.riviere/role-definitions',
+      roles: testRoles,
+    })
+
+    expect(result.assignedPackages).toStrictEqual(['apps/{package}'])
+    expect(result.include).toStrictEqual(['apps/*/src/**/*.ts', 'apps/*/src/**/*.tsx'])
+  })
+
+  it('assigns explicitly named packages beneath the same parent pattern', () => {
+    const domainLocations = locationConfiguration(
+      location('/domain', { allowAnySubLocations: true }),
+    )
+    const useCaseLocations = locationConfiguration(location('/features', []))
+
+    const result = roleEnforcementConfiguration({
+      configurations: {
+        'packages/{subdomain}/domain-model': { locations: domainLocations },
+        'packages/{subdomain}/use-cases': { locations: useCaseLocations },
+      },
+      ignorePatterns: [],
+      roleDefinitionsDir: '.riviere/role-definitions',
+      roles: testRoles,
+    })
+
+    expect(result.assignedPackages).toStrictEqual([
+      'packages/{subdomain}/domain-model',
+      'packages/{subdomain}/use-cases',
+    ])
+    expect(result.include).toStrictEqual([
+      'packages/*/domain-model/src/**/*.ts',
+      'packages/*/domain-model/src/**/*.tsx',
+      'packages/*/use-cases/src/**/*.ts',
+      'packages/*/use-cases/src/**/*.tsx',
+    ])
+  })
+
+  it('derives TypeScript and TSX include patterns from every enforced package', () => {
+    const locations = locationConfiguration(location('/domain', { allowAnySubLocations: true }))
+    const result = roleEnforcementConfiguration({
+      configurations: {
+        'packages/my-app': { locations },
+        'apps/my-app': { locations },
+      },
+      ignorePatterns: [],
+      roleDefinitionsDir: '.riviere/role-definitions',
+      roles: testRoles,
+    })
+
+    expect(result.include).toStrictEqual([
+      'packages/my-app/src/**/*.ts',
+      'packages/my-app/src/**/*.tsx',
+      'apps/my-app/src/**/*.ts',
+      'apps/my-app/src/**/*.tsx',
+    ])
+  })
+
+  it('keeps configuration values needed by the runner', () => {
+    const result = roleEnforcementConfiguration({
+      configurations: {
+        'packages/my-app': {
+          locations: locationConfiguration(location('/domain', { allowAnySubLocations: true })),
+        },
+      },
+      ignorePatterns: ['**/__fixtures__/**'],
+      importAliases: { '@/': 'packages/my-app/src/' },
+      roleDefinitionsDir: '.riviere/role-definitions',
+      roles: testRoles,
+    })
+
+    expect(result).toMatchObject({
+      ignorePatterns: ['**/__fixtures__/**'],
+      importAliases: { '@/': 'packages/my-app/src/' },
+      roleDefinitionsDir: '.riviere/role-definitions',
+      roles: testRoles,
+    })
+  })
+
+  it('builds sub-locations relative to their actual parent', () => {
+    const locations = locationConfiguration(
+      location<(typeof testRoles)[number]['name']>('/features/{feature}', {
+        'data-access': {
+          roles: ['aggregate'],
+          'extraction-project': [],
+        },
+      }),
+    )
+
+    const result = roleEnforcementConfiguration({
+      configurations: {
+        'packages/app': { locations },
+      },
+      ignorePatterns: [],
+      roleDefinitionsDir: '.riviere/role-definitions',
+      roles: testRoles,
+    })
+
+    expect(
+      result.locationHierarchy.map(({ name, parentId, pathTemplate }) => ({
+        name,
+        parentId,
+        pathTemplate,
+      })),
+    ).toStrictEqual([
+      {
+        name: '/',
+        parentId: undefined,
+        pathTemplate: 'packages/app/src',
+      },
+      {
+        name: '/features/{feature}',
+        parentId: 'packages/app:packages/app/src',
+        pathTemplate: 'packages/app/src/features/{feature}',
+      },
+      {
+        name: '/data-access',
+        parentId: 'packages/app:packages/app/src/features/{feature}',
+        pathTemplate: 'packages/app/src/features/{feature}/data-access',
+      },
+      {
+        name: '/data-access/extraction-project',
+        parentId: 'packages/app:packages/app/src/features/{feature}/data-access',
+        pathTemplate: 'packages/app/src/features/{feature}/data-access/extraction-project',
+      },
+    ])
+  })
+
+  it('adds unassigned packages to ignored source paths', () => {
+    const result = roleEnforcementConfiguration({
+      configurations: {
+        'packages/app': {
+          locations: locationConfiguration(location('/domain', [])),
+        },
+      },
+      ignorePatterns: [],
+      roleDefinitionsDir: '.riviere/role-definitions',
+      roles: testRoles,
+      unassignedPackages: ['apps/eclair'],
+    })
+
+    expect(result.ignorePatterns).toStrictEqual(['apps/eclair/src/**'])
+  })
+})
+
+describe('RoleEnforcementConfiguration.parse', () => {
+  const completeConfiguration = {
+    assignedPackages: [],
+    ignorePatterns: [],
+    include: ['packages/app/src/**/*.ts'],
+    locationHierarchy: [],
+    roleDefinitionsDir: '.riviere/role-definitions',
+    roles: [],
+    unassignedPackages: [],
+  }
+
+  it('returns the configuration when all required values are present', () => {
+    const result = RoleEnforcementConfiguration.parse(completeConfiguration)
+
+    expect(result).toStrictEqual({
+      success: true,
+      data: expect.any(RoleEnforcementConfiguration),
+    })
+  })
+
+  it('returns an error when the configuration is not an object', () => {
+    const result = RoleEnforcementConfiguration.parse(undefined)
+
+    expect(result).toStrictEqual({
+      success: false,
+      error: new RoleEnforcementExecutionError('Role enforcement configuration must be an object.'),
+    })
+  })
+
+  it.each([
+    'assignedPackages',
+    'include',
+    'ignorePatterns',
+    'locationHierarchy',
+    'roles',
+    'roleDefinitionsDir',
+    'unassignedPackages',
+  ])("returns an error when '%s' is missing", (missingProperty) => {
+    const incompleteConfiguration: Record<string, unknown> = { ...completeConfiguration }
+    delete incompleteConfiguration[missingProperty]
+
+    const result = RoleEnforcementConfiguration.parse(incompleteConfiguration)
+
+    expect(result).toStrictEqual({
+      success: false,
+      error: new RoleEnforcementExecutionError(
+        `Role enforcement configuration is missing required property '${missingProperty}'.`,
+      ),
+    })
+  })
+})
+
+describe('semantic role rules', () => {
+  it.each([
+    [{ requiresDecoratorSignature: true }, ['function']],
+    [{ requiresStringLiteralConstant: true }, ['variable']],
+    [{ mustBeDataStructure: true }, ['interface', 'type-alias']],
+    [{ requiresUnion: true }, ['type-alias']],
+    [{ returns: [{ success: true, '*': 'semantic-role' }] }, ['function']],
+  ] as const)('infers the declaration target from a semantic role rule', (options, targets) => {
+    const result = role('semantic-role', options)
+
+    expect(result.targets).toStrictEqual(targets)
+  })
+
+  it('rejects a role without a declaration target or semantic rule', () => {
+    expect(() => {
+      // @ts-expect-error untyped JavaScript callers still require runtime protection
+      role('invalid-role', {})
+    }).toThrow('A role must declare a target or semantic rule.')
+  })
+})
diff --git a/packages/riviere-role-enforcement/domain-model/src/domain/role-enforcement-builder.ts b/packages/riviere-role-enforcement/domain-model/src/domain/role-enforcement-builder.ts
new file mode 100644
index 000000000..2c5d20f7e
--- /dev/null
+++ b/packages/riviere-role-enforcement/domain-model/src/domain/role-enforcement-builder.ts
@@ -0,0 +1,421 @@
+import { type LocationBuilder, type LocationConfiguration } from './location-configuration'
+import { assignPackageConfigurations } from './assign-package-configurations'
+import { RoleEnforcementExecutionError } from './role-enforcement-execution-error'
+import { validateRoleConfiguration } from './validate-role-configuration'
+import { validateNoRepeatedInheritedImports } from './validate-location-import-rules'
+
+export { location, locationConfiguration } from './location-configuration'
+export type { LocationBuilder, LocationConfiguration } from './location-configuration'
+
+type RoleTarget = 'class' | 'function' | 'interface' | 'type-alias' | 'variable'
+
+interface ApprovedInstance {
+  readonly name: string
+  readonly userHasApproved: true
+}
+
+interface RoleConstraints<R extends string = string> {
+  readonly allowedInputs?: readonly R[]
+  readonly allowedNames?: readonly string[]
+  readonly allowedOutputs?: readonly R[]
+  readonly approvedInstances?: readonly ApprovedInstance[]
+  readonly forbiddenCallableDataMembers?: true
+  readonly forbiddenSupertypes?: readonly string[]
+  readonly forbiddenDependencies?: readonly R[]
+  readonly forbiddenMethodCalls?: readonly R[]
+  readonly requiredPrivateMembers?: readonly string[]
+  readonly requiresPrivateConstructor?: true
+  readonly requiredStaticMethodNamePrefix?: string
+  readonly requiresDataMembers?: true
+  readonly nameMatches?: string
+  readonly maxPublicMethods?: number
+  readonly minPublicMethods?: number
+}
+
+interface ReturnShape<R extends string = string> {
+  readonly success: boolean
+  readonly '*': R | '*'
+}
+
+type RoleOptions<R extends string = string> = RoleConstraints<R> &
+  (
+    | {
+        readonly targets: readonly RoleTarget[]
+        readonly mustBeDataStructure?: never
+        readonly requiresDecoratorSignature?: never
+        readonly requiresStringLiteralConstant?: never
+        readonly requiresUnion?: never
+        readonly returns?: never
+      }
+    | {
+        readonly targets?: never
+        readonly mustBeDataStructure?: never
+        readonly requiresDecoratorSignature: true
+        readonly requiresStringLiteralConstant?: never
+        readonly requiresUnion?: never
+        readonly returns?: never
+      }
+    | {
+        readonly targets?: never
+        readonly requiresDecoratorSignature?: never
+        readonly requiresStringLiteralConstant: true
+        readonly mustBeDataStructure?: never
+        readonly requiresUnion?: never
+        readonly returns?: never
+      }
+    | {
+        readonly targets?: readonly ('interface' | 'type-alias')[]
+        readonly mustBeDataStructure: true
+        readonly requiresDecoratorSignature?: never
+        readonly requiresStringLiteralConstant?: never
+        readonly requiresUnion?: never
+        readonly returns?: never
+      }
+    | {
+        readonly targets?: never
+        readonly mustBeDataStructure?: never
+        readonly requiresDecoratorSignature?: never
+        readonly requiresStringLiteralConstant?: never
+        readonly requiresUnion: true
+        readonly returns?: never
+      }
+    | {
+        readonly mustBeDataStructure?: never
+        readonly requiresDecoratorSignature?: never
+        readonly requiresStringLiteralConstant?: never
+        readonly requiresUnion?: never
+        readonly returns: readonly ReturnShape<R>[]
+        readonly targets?: never
+      }
+  )
+
+interface BuiltRoleDefinition<N extends string = string> extends RoleConstraints {
+  readonly name: N
+  readonly requiresDecoratorSignature?: true
+  readonly mustBeDataStructure?: true
+  readonly requiresStringLiteralConstant?: true
+  readonly requiresUnion?: true
+  readonly returns?: readonly ReturnShape[]
+  readonly targets: readonly RoleTarget[]
+}
+
+/** @riviere-role value-object */
+export class BuiltRole<N extends string = string> {
+  declare private readonly brand: 'BuiltRole'
+
+  declare readonly name: N
+  declare readonly targets: readonly RoleTarget[]
+  declare readonly allowedInputs?: readonly string[]
+  declare readonly allowedNames?: readonly string[]
+  declare readonly allowedOutputs?: readonly string[]
+  declare readonly approvedInstances?: readonly ApprovedInstance[]
+  declare readonly forbiddenCallableDataMembers?: true
+  declare readonly forbiddenSupertypes?: readonly string[]
+  declare readonly forbiddenDependencies?: readonly string[]
+  declare readonly forbiddenMethodCalls?: readonly string[]
+  declare readonly requiredPrivateMembers?: readonly string[]
+  declare readonly requiresPrivateConstructor?: true
+  declare readonly requiredStaticMethodNamePrefix?: string
+  declare readonly requiresDecoratorSignature?: true
+  declare readonly mustBeDataStructure?: true
+  declare readonly requiresStringLiteralConstant?: true
+  declare readonly requiresUnion?: true
+  declare readonly returns?: readonly ReturnShape[]
+  declare readonly requiresDataMembers?: true
+  declare readonly maxPublicMethods?: number
+  declare readonly nameMatches?: string
+  declare readonly minPublicMethods?: number
+
+  private constructor(definition: BuiltRoleDefinition<N>) {
+    Object.assign(this, definition)
+  }
+
+  static parse<N extends string>(definition: BuiltRoleDefinition<N>): BuiltRole<N> {
+    return new BuiltRole(definition)
+  }
+}
+
+/** @riviere-role domain-service */
+export function role<const N extends string>(name: N, options: RoleOptions): BuiltRole<N> {
+  return BuiltRole.parse({
+    name,
+    ...options,
+    targets: inferredTargets(options),
+  })
+}
+
+function inferredTargets(options: RoleOptions): readonly RoleTarget[] {
+  if (options.requiresDecoratorSignature === true) {
+    return ['function']
+  }
+  if (options.requiresStringLiteralConstant === true) {
+    return ['variable']
+  }
+  if (options.mustBeDataStructure === true) {
+    return options.targets ?? ['interface', 'type-alias']
+  }
+  if (options.requiresUnion === true) {
+    return ['type-alias']
+  }
+  if (Array.isArray(options.returns)) {
+    return ['function']
+  }
+  if (options.targets !== undefined) {
+    return options.targets
+  }
+  throw new TypeError('A role must declare a target or semantic rule.')
+}
+
+interface RoleEnforcementConfigurationInput<R extends string> {
+  readonly configurations: Readonly<
+    Record<
+      string,
+      {
+        readonly locations: LocationConfiguration<R>
+      }
+    >
+  >
+  readonly ignorePatterns: readonly string[]
+  readonly importAliases?: Readonly<Record<string, string>>
+  readonly roleDefinitionsDir: string
+  readonly roles: readonly BuiltRole<R>[]
+  readonly unassignedPackages?: readonly string[]
+}
+
+interface BuiltLocationNode {
+  readonly allowAnySubLocations: boolean
+  readonly allowedRoles: readonly string[]
+  readonly importRules?: LocationBuilder<string>['importRules']
+  readonly id: string
+  readonly name: string
+  readonly packagePath: string
+  readonly parentId?: string
+  readonly pathTemplate: string
+  readonly roleEnforcement: boolean
+}
+
+interface RoleEnforcementConfigurationDefinition {
+  readonly assignedPackages: readonly string[]
+  readonly ignorePatterns: readonly string[]
+  readonly importAliases?: Readonly<Record<string, string>>
+  readonly include: readonly string[]
+  readonly locationHierarchy: readonly BuiltLocationNode[]
+  readonly roleDefinitionsDir: string
+  readonly roles: readonly BuiltRole[]
+  readonly unassignedPackages: readonly string[]
+}
+
+type RoleEnforcementConfigurationParseResult =
+  | { readonly success: true; readonly data: RoleEnforcementConfiguration }
+  | { readonly success: false; readonly error: RoleEnforcementExecutionError }
+
+type ValidRoleEnforcementConfigurationParseResult = {
+  readonly success: true
+  readonly data: RoleEnforcementConfiguration
+}
+
+/** @riviere-role value-object */
+export class RoleEnforcementConfiguration {
+  declare private readonly brand: 'RoleEnforcementConfiguration'
+
+  declare readonly assignedPackages: readonly string[]
+  declare readonly ignorePatterns: readonly string[]
+  declare readonly importAliases?: Readonly<Record<string, string>>
+  declare readonly include: readonly string[]
+  declare readonly locationHierarchy: readonly BuiltLocationNode[]
+  declare readonly roleDefinitionsDir: string
+  declare readonly roles: readonly BuiltRole[]
+  declare readonly unassignedPackages: readonly string[]
+
+  private constructor(definition: RoleEnforcementConfigurationDefinition | object) {
+    Object.assign(this, definition)
+  }
+
+  static parse(
+    value: RoleEnforcementConfigurationDefinition,
+  ): ValidRoleEnforcementConfigurationParseResult
+  static parse(value: unknown): RoleEnforcementConfigurationParseResult
+  static parse(value: unknown): RoleEnforcementConfigurationParseResult {
+    if (typeof value !== 'object' || value === null) {
+      return {
+        success: false,
+        error: new RoleEnforcementExecutionError(
+          'Role enforcement configuration must be an object.',
+        ),
+      }
+    }
+
+    const required = [
+      'assignedPackages',
+      'include',
+      'ignorePatterns',
+      'locationHierarchy',
+      'roles',
+      'roleDefinitionsDir',
+      'unassignedPackages',
+    ]
+    for (const key of required) {
+      if (!(key in value)) {
+        return {
+          success: false,
+          error: new RoleEnforcementExecutionError(
+            `Role enforcement configuration is missing required property '${key}'.`,
+          ),
+        }
+      }
+    }
+
+    return {
+      success: true,
+      data: new RoleEnforcementConfiguration(value),
+    }
+  }
+
+  validateWorkspacePackages(workspacePackages: readonly string[]): void {
+    for (const packagePath of workspacePackages) {
+      const isUnassigned = this.unassignedPackages.includes(packagePath)
+      if (isUnassigned) {
+        continue
+      }
+      const assignmentCount = this.assignedPackages.filter((assignedPackage) =>
+        packagePatternMatches(assignedPackage, packagePath),
+      ).length
+
+      if (assignmentCount === 0) {
+        throw new RoleEnforcementExecutionError(
+          `Workspace package '${packagePath}' has no role-enforcement configuration and is not explicitly unassigned.`,
+        )
+      }
+      if (assignmentCount > 1) {
+        throw new RoleEnforcementExecutionError(
+          `Workspace package '${packagePath}' is assigned to more than one role-enforcement configuration.`,
+        )
+      }
+    }
+  }
+}
+
+/** @riviere-role domain-service */
+export function roleEnforcementConfiguration<const R extends string>(
+  input: RoleEnforcementConfigurationInput<R>,
+): RoleEnforcementConfiguration {
+  const assignedConfigurations = assignPackageConfigurations(input.configurations)
+  const assignedPackages = assignedConfigurations.map(([packagePattern]) => packagePattern)
+  const unassignedPackages = input.unassignedPackages ?? []
+  const locationHierarchy = assignedConfigurations.flatMap(([packagePattern, configuration]) =>
+    buildFluentLocationHierarchy(packagePattern, configuration.locations),
+  )
+  validateNoRepeatedInheritedImports(locationHierarchy)
+  validateRoleConfiguration(input.roles, locationHierarchy)
+  return RoleEnforcementConfiguration.parse({
+    assignedPackages,
+    ignorePatterns: [
+      ...input.ignorePatterns,
+      ...unassignedPackages.map((packagePath) => `${packagePath}/src/**`),
+    ],
+    ...(input.importAliases !== undefined && { importAliases: input.importAliases }),
+    include: assignedConfigurations.flatMap(([packagePattern]) => [
+      `${toGlobPattern(packagePattern)}/src/**/*.ts`,
+      `${toGlobPattern(packagePattern)}/src/**/*.tsx`,
+    ]),
+    locationHierarchy,
+    roleDefinitionsDir: input.roleDefinitionsDir,
+    roles: input.roles,
+    unassignedPackages,
+  }).data
+}
+
+function buildFluentLocationHierarchy<R extends string>(
+  packagePattern: string,
+  configuration: LocationConfiguration<R>,
+): BuiltLocationNode[] {
+  const sourceRoot = buildSourceRoot(packagePattern)
+  return [
+    sourceRoot,
+    ...configuration.locations.flatMap((root) =>
+      buildFluentLocation(root, packagePattern, sourceRoot),
+    ),
+  ]
+}
+
+function buildFluentLocation<R extends string>(
+  root: LocationBuilder<R>,
+  packagePath: string,
+  sourceRoot: BuiltLocationNode,
+): BuiltLocationNode[] {
+  return buildFluentLocationNode(
+    root,
+    packagePath,
+    sourceRoot.pathTemplate,
+    `/${normalizeLocationPath(root.path)}`,
+    true,
+  )
+}
+
+function buildSourceRoot(packagePath: string): BuiltLocationNode {
+  const pathTemplate = `${packagePath}/src`
+  return {
+    allowAnySubLocations: false,
+    allowedRoles: [],
+    id: `${packagePath}:${pathTemplate}`,
+    name: '/',
+    packagePath,
+    pathTemplate,
+    roleEnforcement: true,
+  }
+}
+
+function buildFluentLocationNode<R extends string>(
+  definition: LocationBuilder<R>,
+  packagePath: string,
+  parentPathTemplate: string,
+  locationName: string,
+  isConfigurationRoot = false,
+): BuiltLocationNode[] {
+  const pathTemplate = `${parentPathTemplate}/${normalizeLocationPath(definition.path)}`
+  const id = `${packagePath}:${pathTemplate}`
+  const node: BuiltLocationNode = {
+    allowAnySubLocations: definition.allowAnySubLocations,
+    allowedRoles: definition.allowedRoles,
+    ...(definition.importRules !== undefined && {
+      importRules: definition.importRules,
+    }),
+    id,
+    name: locationName,
+    packagePath,
+    parentId: `${packagePath}:${parentPathTemplate}`,
+    pathTemplate,
+    roleEnforcement: definition.roleEnforcement,
+  }
+  return [
+    node,
+    ...definition.subLocations.flatMap((child) => {
+      const childPath = normalizeLocationPath(child.path)
+      const childName = isConfigurationRoot ? `/${childPath}` : `${locationName}/${childPath}`
+      return buildFluentLocationNode(child, packagePath, pathTemplate, childName)
+    }),
+  ]
+}
+
+function normalizeLocationPath(locationPath: string): string {
+  return locationPath.split('/').filter(Boolean).join('/')
+}
+
+function toGlobPattern(packagePattern: string): string {
+  return packagePattern
+    .split('/')
+    .map((segment) => (segment.startsWith('{') && segment.endsWith('}') ? '*' : segment))
+    .join('/')
+}
+
+function packagePatternMatches(packagePattern: string, packagePath: string): boolean {
+  const patternSegments = packagePattern.split('/')
+  const pathSegments = packagePath.split('/')
+  return (
+    patternSegments.length === pathSegments.length &&
+    patternSegments.every(
+      (segment, index) =>
+        (segment.startsWith('{') && segment.endsWith('}')) || segment === pathSegments[index],
+    )
+  )
+}
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/domain/role-enforcement-execution-error.ts b/packages/riviere-role-enforcement/domain-model/src/domain/role-enforcement-execution-error.ts
similarity index 100%
rename from packages/riviere-role-enforcement/src/features/enforcement/domain/role-enforcement-execution-error.ts
rename to packages/riviere-role-enforcement/domain-model/src/domain/role-enforcement-execution-error.ts
diff --git a/packages/riviere-role-enforcement/domain-model/src/domain/role-enforcement-project.spec.ts b/packages/riviere-role-enforcement/domain-model/src/domain/role-enforcement-project.spec.ts
new file mode 100644
index 000000000..3884734ea
--- /dev/null
+++ b/packages/riviere-role-enforcement/domain-model/src/domain/role-enforcement-project.spec.ts
@@ -0,0 +1,67 @@
+import { expect, it, vi } from 'vitest'
+import {
+  location,
+  locationConfiguration,
+  roleEnforcementConfiguration,
+  type RoleEnforcementConfiguration,
+} from './role-enforcement-builder'
+import { RoleEnforcementProject } from './role-enforcement-project'
+
+const config: RoleEnforcementConfiguration = roleEnforcementConfiguration({
+  configurations: {
+    'packages/{package}': {
+      locations: locationConfiguration(location('/domain', [])),
+    },
+  },
+  ignorePatterns: ['**/*.spec.ts'],
+  roleDefinitionsDir: '.riviere/role-definitions',
+  roles: [],
+})
+
+it('executes the complete project when no package filter is provided', () => {
+  const runner = vi.fn(() => ({
+    exitCode: 0,
+    stderr: '',
+    stdout: '',
+  }))
+  const project = new RoleEnforcementProject(config, '/repo', [
+    'packages/pkg-a/src/index.ts',
+    'packages/pkg-b/src/index.ts',
+  ])
+
+  project.execute(runner)
+
+  expect(runner).toHaveBeenCalledWith({
+    config,
+    configDir: '/repo',
+    lintTargets: ['packages/pkg-a/src/index.ts', 'packages/pkg-b/src/index.ts'],
+  })
+})
+
+it('selects package configuration and targets during execution', () => {
+  const runner = vi.fn(() => ({
+    exitCode: 0,
+    stderr: '',
+    stdout: '',
+  }))
+  const project = new RoleEnforcementProject(config, '/repo', [
+    'packages/pkg-a/src/index.ts',
+    'packages/pkg-a/src/index.spec.ts',
+    'packages/pkg-b/src/index.ts',
+  ])
+
+  project.execute(runner, 'packages/pkg-a')
+
+  expect(runner).toHaveBeenCalledWith({
+    config: {
+      ...config,
+      assignedPackages: ['packages/pkg-a'],
+      include: ['packages/pkg-a/src/**/*.ts', 'packages/pkg-a/src/**/*.tsx'],
+      locationHierarchy: expect.arrayContaining([
+        expect.objectContaining({ packagePath: 'packages/pkg-a' }),
+      ]),
+    },
+    configDir: '/repo',
+    lintTargets: ['packages/pkg-a/src/index.ts'],
+  })
+})
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/domain/role-enforcement-project.ts b/packages/riviere-role-enforcement/domain-model/src/domain/role-enforcement-project.ts
similarity index 87%
rename from packages/riviere-role-enforcement/src/features/enforcement/domain/role-enforcement-project.ts
rename to packages/riviere-role-enforcement/domain-model/src/domain/role-enforcement-project.ts
index 2ccbff2b3..86a9ead69 100644
--- a/packages/riviere-role-enforcement/src/features/enforcement/domain/role-enforcement-project.ts
+++ b/packages/riviere-role-enforcement/domain-model/src/domain/role-enforcement-project.ts
@@ -1,15 +1,15 @@
 import { minimatch } from 'minimatch'
 import { filterConfigByPackage } from './filter-config-by-package'
-import type { RoleEnforcementResult } from './role-enforcement-builder'
 import type {
   RoleEnforcementRunner,
   RoleEnforcementRunnerResult,
 } from './ports/role-enforcement-runner'
+import type { RoleEnforcementConfiguration } from './role-enforcement-builder'
 
 /** @riviere-role aggregate */
 export class RoleEnforcementProject {
   constructor(
-    private readonly config: RoleEnforcementResult,
+    private readonly config: RoleEnforcementConfiguration,
     private readonly configDir: string,
     private readonly lintTargets: readonly string[],
   ) {}
@@ -34,7 +34,7 @@ export class RoleEnforcementProject {
 
 function selectLintTargets(
   lintTargets: readonly string[],
-  config: RoleEnforcementResult,
+  config: RoleEnforcementConfiguration,
 ): string[] {
   return lintTargets
     .filter((filePath) => matchesAny(filePath, config.include))
diff --git a/packages/riviere-role-enforcement/domain-model/src/domain/validate-location-import-rules.spec.ts b/packages/riviere-role-enforcement/domain-model/src/domain/validate-location-import-rules.spec.ts
new file mode 100644
index 000000000..d5c1384e2
--- /dev/null
+++ b/packages/riviere-role-enforcement/domain-model/src/domain/validate-location-import-rules.spec.ts
@@ -0,0 +1,127 @@
+import { expect, it } from 'vitest'
+import { validateNoRepeatedInheritedImports } from './validate-location-import-rules'
+
+it('allows a child to add an import its parent does not allow', () => {
+  expect(() =>
+    validateNoRepeatedInheritedImports([
+      node('parent', '/parent'),
+      node('child', '/child', 'parent', { allow: { sibling: ['records'] } }),
+    ]),
+  ).not.toThrow()
+})
+
+it('allows a child to replace inherited rules explicitly', () => {
+  expect(() =>
+    validateNoRepeatedInheritedImports([
+      node('parent', '/parent', undefined, { allow: { root: ['utilities'] } }),
+      node('child', '/child', 'parent', {
+        allow: { root: ['utilities'] },
+        inheritParentImportRules: false,
+      }),
+    ]),
+  ).not.toThrow()
+})
+
+it('rejects an import inherited through more than one parent', () => {
+  expect(() =>
+    validateNoRepeatedInheritedImports([
+      node('grandparent', '/grandparent', undefined, {
+        allow: { ownSubdomain: ['api'] },
+      }),
+      node('parent', '/parent', 'grandparent'),
+      node('child', '/child', 'parent', { allow: { ownSubdomain: ['api'] } }),
+    ]),
+  ).toThrow("Location '/child' repeats inherited ownSubdomain import 'api'.")
+})
+
+it('stops inheriting beyond a parent that replaces its inherited rules', () => {
+  expect(() =>
+    validateNoRepeatedInheritedImports([
+      node('grandparent', '/grandparent', undefined, { allow: { root: ['utilities'] } }),
+      node('parent', '/parent', 'grandparent', {
+        allow: { sibling: ['records'] },
+        inheritParentImportRules: false,
+      }),
+      node('child', '/child', 'parent', { allow: { root: ['utilities'] } }),
+    ]),
+  ).not.toThrow()
+})
+
+it('rejects the same role-filtered import inherited from a parent', () => {
+  expect(() =>
+    validateNoRepeatedInheritedImports([
+      node('parent', '/parent', undefined, {
+        allow: { anySubdomain: [{ api: ['request', 'response'] }] },
+      }),
+      node('child', '/child', 'parent', {
+        allow: { anySubdomain: [{ api: ['request', 'response'] }] },
+      }),
+    ]),
+  ).toThrow("Location '/child' repeats inherited anySubdomain import 'api'.")
+})
+
+it('allows a different role filter for the same location', () => {
+  expect(() =>
+    validateNoRepeatedInheritedImports([
+      node('parent', '/parent', undefined, {
+        allow: { sibling: [{ records: ['summary'] }] },
+      }),
+      node('child', '/child', 'parent', {
+        allow: { sibling: [{ records: ['details'] }] },
+      }),
+    ]),
+  ).not.toThrow()
+})
+
+it('rejects a role filter when the parent already allows every role from that location', () => {
+  expect(() =>
+    validateNoRepeatedInheritedImports([
+      node('parent', '/parent', undefined, { allow: { sibling: ['records'] } }),
+      node('child', '/child', 'parent', {
+        allow: { sibling: [{ records: ['summary'] }] },
+      }),
+    ]),
+  ).toThrow("Location '/child' repeats inherited sibling import 'records'.")
+})
+
+it('allows a child to broaden a role-filtered parent import', () => {
+  expect(() =>
+    validateNoRepeatedInheritedImports([
+      node('parent', '/parent', undefined, {
+        allow: { sibling: [{ records: ['summary'] }] },
+      }),
+      node('child', '/child', 'parent', { allow: { sibling: ['records'] } }),
+    ]),
+  ).not.toThrow()
+})
+
+it('rejects an empty role-filtered import', () => {
+  expect(() =>
+    validateNoRepeatedInheritedImports([
+      node('parent', '/parent'),
+      node('child', '/child', 'parent', { allow: { sibling: [{}] } }),
+    ]),
+  ).toThrow('A role-filtered import must name a location.')
+})
+
+function node(
+  id: string,
+  name: string,
+  parentId?: string,
+  importRules?: {
+    readonly allow?: Partial<
+      Record<
+        'sibling' | 'root' | 'ownSubdomain' | 'anySubdomain',
+        readonly (string | Readonly<Record<string, readonly string[]>>)[]
+      >
+    >
+    readonly inheritParentImportRules?: false
+  },
+) {
+  return {
+    id,
+    name,
+    ...(parentId === undefined ? {} : { parentId }),
+    ...(importRules === undefined ? {} : { importRules }),
+  }
+}
diff --git a/packages/riviere-role-enforcement/domain-model/src/domain/validate-location-import-rules.ts b/packages/riviere-role-enforcement/domain-model/src/domain/validate-location-import-rules.ts
new file mode 100644
index 000000000..c753a7f05
--- /dev/null
+++ b/packages/riviere-role-enforcement/domain-model/src/domain/validate-location-import-rules.ts
@@ -0,0 +1,98 @@
+type AllowedImport = string | Readonly<Record<string, readonly string[]>>
+type ImportScope = 'sibling' | 'root' | 'ownSubdomain' | 'anySubdomain'
+
+interface ImportRules {
+  readonly allow?: Partial<Record<ImportScope, readonly AllowedImport[]>>
+  readonly inheritParentImportRules?: false
+}
+
+interface LocationImportNode {
+  readonly id: string
+  readonly importRules?: ImportRules | undefined
+  readonly name: string
+  readonly parentId?: string | undefined
+}
+
+/** @riviere-role domain-service */
+export function validateNoRepeatedInheritedImports(
+  locationHierarchy: readonly LocationImportNode[],
+): void {
+  const locationsById = new Map(locationHierarchy.map((location) => [location.id, location]))
+  for (const location of locationHierarchy) {
+    if (location.importRules?.allow !== undefined) {
+      validateNamedImports(location.importRules.allow)
+    }
+    if (
+      location.importRules?.allow !== undefined &&
+      location.importRules.inheritParentImportRules !== false
+    ) {
+      validateAgainstAncestors(location, parentOf(location, locationsById), locationsById)
+    }
+  }
+}
+
+function validateNamedImports(allow: NonNullable<ImportRules['allow']>): void {
+  for (const scope of ['sibling', 'root', 'ownSubdomain', 'anySubdomain'] as const) {
+    for (const allowedImport of allow[scope] ?? []) importName(allowedImport)
+  }
+}
+
+function validateAgainstAncestors(
+  location: LocationImportNode,
+  ancestor: LocationImportNode | undefined,
+  locationsById: ReadonlyMap<string, LocationImportNode>,
+): void {
+  if (ancestor === undefined) return
+  rejectRepeatedImports(location, ancestor)
+  if (ancestor.importRules?.inheritParentImportRules !== false) {
+    validateAgainstAncestors(location, parentOf(ancestor, locationsById), locationsById)
+  }
+}
+
+function parentOf(
+  location: LocationImportNode,
+  locationsById: ReadonlyMap<string, LocationImportNode>,
+): LocationImportNode | undefined {
+  return location.parentId === undefined ? undefined : locationsById.get(location.parentId)
+}
+
+function rejectRepeatedImports(location: LocationImportNode, ancestor: LocationImportNode): void {
+  const ownAllow = location.importRules?.allow
+  const inheritedAllow = ancestor.importRules?.allow
+  if (ownAllow === undefined || inheritedAllow === undefined) return
+  for (const scope of ['sibling', 'root', 'ownSubdomain', 'anySubdomain'] as const) {
+    for (const ownImport of ownAllow[scope] ?? []) {
+      const ownImportName = importName(ownImport)
+      if ((inheritedAllow[scope] ?? []).some((candidate) => sameImport(candidate, ownImport))) {
+        throw new TypeError(
+          `Location '${location.name}' repeats inherited ${scope} import '${ownImportName}'.`,
+        )
+      }
+    }
+  }
+}
+
+function sameImport(left: AllowedImport, right: AllowedImport): boolean {
+  if (typeof left === 'string') return left === importName(right)
+  if (typeof right === 'string') return false
+  const leftEntry = roleEntry(left)
+  const rightEntry = roleEntry(right)
+  return (
+    leftEntry[0] === rightEntry[0] &&
+    leftEntry[1].length === rightEntry[1].length &&
+    leftEntry[1].every((role) => rightEntry[1].includes(role))
+  )
+}
+
+function importName(value: AllowedImport): string {
+  if (typeof value === 'string') return value
+  return roleEntry(value)[0]
+}
+
+function roleEntry(
+  value: Readonly<Record<string, readonly string[]>>,
+): [string, readonly string[]] {
+  const entry = Object.entries(value)[0]
+  if (entry === undefined) throw new TypeError('A role-filtered import must name a location.')
+  return entry
+}
diff --git a/packages/riviere-role-enforcement/domain-model/src/domain/validate-role-configuration.ts b/packages/riviere-role-enforcement/domain-model/src/domain/validate-role-configuration.ts
new file mode 100644
index 000000000..4b556a44e
--- /dev/null
+++ b/packages/riviere-role-enforcement/domain-model/src/domain/validate-role-configuration.ts
@@ -0,0 +1,90 @@
+import type { BuiltRole, LocationBuilder } from './role-enforcement-builder'
+import { RoleEnforcementExecutionError } from './role-enforcement-execution-error'
+
+interface ConfiguredLocation {
+  readonly allowedRoles: readonly string[]
+  readonly importRules?: LocationBuilder<string>['importRules']
+  readonly name: string
+}
+
+const importScopes = ['sibling', 'root', 'ownSubdomain', 'anySubdomain'] as const
+
+/** @riviere-role domain-service */
+export function validateRoleConfiguration(
+  roles: readonly BuiltRole[],
+  locations: readonly ConfiguredLocation[],
+): void {
+  const roleNames = readUniqueRoleNames(roles)
+  validateLocationRoleReferences(locations, roleNames)
+  validateRoleRuleReferences(roles, roleNames)
+}
+
+function readUniqueRoleNames(roles: readonly BuiltRole[]): ReadonlySet<string> {
+  const roleNames = new Set<string>()
+  for (const roleDefinition of roles) {
+    if (roleNames.has(roleDefinition.name)) {
+      throw new RoleEnforcementExecutionError(
+        `Role '${roleDefinition.name}' is defined more than once.`,
+      )
+    }
+    roleNames.add(roleDefinition.name)
+  }
+  return roleNames
+}
+
+function validateLocationRoleReferences(
+  locations: readonly ConfiguredLocation[],
+  roleNames: ReadonlySet<string>,
+): void {
+  for (const configuredLocation of locations) {
+    const referencedRoles = [
+      ...configuredLocation.allowedRoles,
+      ...readImportRuleRoles(configuredLocation.importRules),
+    ]
+    for (const roleName of referencedRoles) {
+      if (!roleNames.has(roleName)) {
+        throw new RoleEnforcementExecutionError(
+          `Location '${configuredLocation.name}' allows unknown role '${roleName}'.`,
+        )
+      }
+    }
+  }
+}
+
+function readImportRuleRoles(importRules: ConfiguredLocation['importRules']): readonly string[] {
+  const referencedRoles: string[] = []
+  for (const scope of importScopes) {
+    for (const allowedLocation of importRules?.allow?.[scope] ?? []) {
+      if (typeof allowedLocation !== 'string') {
+        referencedRoles.push(...Object.values(allowedLocation).flat())
+      }
+    }
+  }
+  return referencedRoles
+}
+
+function validateRoleRuleReferences(
+  roles: readonly BuiltRole[],
+  roleNames: ReadonlySet<string>,
+): void {
+  for (const roleDefinition of roles) {
+    const references = readRoleRuleReferences(roleDefinition)
+    for (const referencedRole of references) {
+      if (!roleNames.has(referencedRole)) {
+        throw new RoleEnforcementExecutionError(
+          `Role '${roleDefinition.name}' references unknown role '${referencedRole}'.`,
+        )
+      }
+    }
+  }
+}
+
+function readRoleRuleReferences(roleDefinition: BuiltRole): readonly string[] {
+  return [
+    ...(roleDefinition.allowedInputs ?? []),
+    ...(roleDefinition.allowedOutputs ?? []),
+    ...(roleDefinition.forbiddenDependencies ?? []),
+    ...(roleDefinition.forbiddenMethodCalls ?? []),
+    ...(roleDefinition.returns ?? []).flatMap((shape) => (shape['*'] === '*' ? [] : [shape['*']])),
+  ]
+}
diff --git a/packages/riviere-role-enforcement/domain-model/src/index.ts b/packages/riviere-role-enforcement/domain-model/src/index.ts
new file mode 100644
index 000000000..e231c754a
--- /dev/null
+++ b/packages/riviere-role-enforcement/domain-model/src/index.ts
@@ -0,0 +1,17 @@
+export { PackageFilterError, filterConfigByPackage } from './domain/filter-config-by-package'
+export {
+  BuiltRole,
+  location,
+  locationConfiguration,
+  role,
+  RoleEnforcementConfiguration,
+  roleEnforcementConfiguration,
+} from './domain/role-enforcement-builder'
+export type { LocationBuilder, LocationConfiguration } from './domain/role-enforcement-builder'
+export type {
+  RoleEnforcementRunner,
+  RoleEnforcementRunnerInput,
+  RoleEnforcementRunnerResult,
+} from './domain/ports/role-enforcement-runner'
+export { RoleEnforcementExecutionError } from './domain/role-enforcement-execution-error'
+export { RoleEnforcementProject } from './domain/role-enforcement-project'
diff --git a/packages/riviere-role-enforcement/domain-model/tsconfig.json b/packages/riviere-role-enforcement/domain-model/tsconfig.json
new file mode 100644
index 000000000..667a3463d
--- /dev/null
+++ b/packages/riviere-role-enforcement/domain-model/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/packages/riviere-role-enforcement/domain-model/tsconfig.lib.json b/packages/riviere-role-enforcement/domain-model/tsconfig.lib.json
new file mode 100644
index 000000000..5930d1712
--- /dev/null
+++ b/packages/riviere-role-enforcement/domain-model/tsconfig.lib.json
@@ -0,0 +1,12 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "src",
+    "outDir": "dist",
+    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
+    "forceConsistentCasingInFileNames": true
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["vitest.config.ts", "vitest.config.mts", "src/**/*.test.ts", "src/**/*.spec.ts"]
+}
diff --git a/packages/riviere-role-enforcement/domain-model/tsconfig.spec.json b/packages/riviere-role-enforcement/domain-model/tsconfig.spec.json
new file mode 100644
index 000000000..4b2279cc1
--- /dev/null
+++ b/packages/riviere-role-enforcement/domain-model/tsconfig.spec.json
@@ -0,0 +1,20 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/vitest",
+    "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node", "vitest"],
+    "forceConsistentCasingInFileNames": true
+  },
+  "include": [
+    "vitest.config.ts",
+    "vitest.config.mts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.d.ts"
+  ],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    }
+  ]
+}
diff --git a/packages/riviere-role-enforcement/domain-model/vitest.config.mts b/packages/riviere-role-enforcement/domain-model/vitest.config.mts
new file mode 100644
index 000000000..1d0717017
--- /dev/null
+++ b/packages/riviere-role-enforcement/domain-model/vitest.config.mts
@@ -0,0 +1,32 @@
+import path from 'node:path'
+import { defineConfig } from 'vitest/config'
+
+const repoRoot = path.resolve(__dirname, '../../..')
+
+export default defineConfig(() => ({
+  root: __dirname,
+  cacheDir: '../../../node_modules/.vite/packages/riviere-role-enforcement',
+  test: {
+    name: '@living-architecture/riviere-role-enforcement-domain-model',
+    watch: false,
+    globals: true,
+    environment: 'node',
+    include: ['src/**/*.{test,spec}.{ts,mts}'],
+    reporters: ['default'],
+    coverage: {
+      enabled: true,
+      reportsDirectory: './test-output/vitest/coverage',
+      provider: 'v8' as const,
+      reporter: ['text', ['lcov', { projectRoot: repoRoot }]] as [
+        'text',
+        ['lcov', { projectRoot: string }],
+      ],
+      thresholds: {
+        lines: 100,
+        statements: 100,
+        functions: 100,
+        branches: 100,
+      },
+    },
+  },
+}))
diff --git a/packages/riviere-role-enforcement/esbuild.config.mjs b/packages/riviere-role-enforcement/esbuild.config.mjs
deleted file mode 100644
index fccaa6d6a..000000000
--- a/packages/riviere-role-enforcement/esbuild.config.mjs
+++ /dev/null
@@ -1,33 +0,0 @@
-import * as esbuild from 'esbuild'
-import { readFileSync } from 'node:fs'
-import {
-  dirname,
-  join,
-} from 'node:path'
-import { fileURLToPath } from 'node:url'
-
-const __dirname = dirname(fileURLToPath(import.meta.url))
-const pkg = JSON.parse(readFileSync(join(__dirname, 'package.json'), 'utf-8'))
-
-const externalDependencies = Object.keys(pkg.dependencies || {})
-
-await esbuild.build({
-  entryPoints: [join(__dirname, 'src/shell/bin.ts')],
-  bundle: true,
-  platform: 'node',
-  target: 'node18',
-  format: 'esm',
-  outfile: join(__dirname, 'dist/shell/bin.js'),
-  banner: {js: '#!/usr/bin/env node',},
-  external: externalDependencies,
-})
-
-await esbuild.build({
-  entryPoints: [join(__dirname, 'src/index.ts')],
-  bundle: true,
-  platform: 'node',
-  target: 'node18',
-  format: 'esm',
-  outfile: join(__dirname, 'dist/index.js'),
-  external: externalDependencies,
-})
diff --git a/packages/riviere-role-enforcement/package.json b/packages/riviere-role-enforcement/package.json
deleted file mode 100644
index f42bfd1c6..000000000
--- a/packages/riviere-role-enforcement/package.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "name": "@living-architecture/riviere-role-enforcement",
-  "version": "0.3.3",
-  "type": "module",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/NTCoding/living-architecture.git",
-    "directory": "packages/riviere-role-enforcement"
-  },
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "bin": {
-    "riviere-role-enforcement": "./dist/shell/bin.js"
-  },
-  "exports": {
-    "./package.json": "./package.json",
-    ".": {
-      "@living-architecture/source": "./src/index.ts",
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "default": "./dist/index.js"
-    },
-    "./plugin": "./role-enforcement-plugin.mjs"
-  },
-  "files": [
-    "dist",
-    "role-enforcement-plugin.mjs",
-    "!**/*.tsbuildinfo"
-  ],
-  "dependencies": {
-    "minimatch": "^10.0.1"
-  }
-}
diff --git a/packages/riviere-role-enforcement/project.json b/packages/riviere-role-enforcement/project.json
deleted file mode 100644
index 7c021bf9f..000000000
--- a/packages/riviere-role-enforcement/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "name": "riviere-role-enforcement",
-  "targets": {
-    "build": {
-      "executor": "nx:run-commands",
-      "options": {
-        "commands": [
-          "node esbuild.config.mjs",
-          "tsc -p tsconfig.lib.json --emitDeclarationOnly --declaration --declarationDir dist"
-        ],
-        "cwd": "{projectRoot}",
-        "parallel": false
-      },
-      "outputs": ["{projectRoot}/dist"]
-    },
-    "smoke-test": {
-      "executor": "nx:run-commands",
-      "options": {
-        "commands": [
-          "node -e \"import('./dist/index.js').then(m => { if (!m.roleEnforcement) process.exit(1) })\""
-        ],
-        "cwd": "{projectRoot}",
-        "parallel": false
-      },
-      "dependsOn": ["build"]
-    }
-  }
-}
diff --git a/packages/riviere-role-enforcement/role-enforcement-plugin.mjs b/packages/riviere-role-enforcement/role-enforcement-plugin.mjs
deleted file mode 100644
index 8472eca5e..000000000
--- a/packages/riviere-role-enforcement/role-enforcement-plugin.mjs
+++ /dev/null
@@ -1,1247 +0,0 @@
-import fs from 'node:fs'
-import { createRequire } from 'node:module'
-import path from 'node:path'
-import { minimatch } from 'minimatch'
-
-const ROLE_TAG = /@riviere-role\s+(\S+)/g
-
-function parseAllRoleNames(text) {
-  return [...text.matchAll(ROLE_TAG)].map((match) => match[1])
-}
-
-function parseSingleRoleName(text, errorContext) {
-  const roleNames = parseAllRoleNames(text)
-  if (roleNames.length === 0) {
-    return null
-  }
-  if (roleNames.length > 1) {
-    throw new Error(
-      `Expected exactly 1 @riviere-role annotation ${errorContext}. Got ${roleNames.length}: [${roleNames.join(', ')}]`,
-    )
-  }
-  return roleNames[0]
-}
-
-function referenceForUnknownRole(options) {
-  return `Browse ${options.roleDefinitionsDir}/ — each <role-name>.md file has a Purpose, Canonical Example, Common Misclassifications, and Anti-Patterns section. Read the canonical example + anti-patterns of EVERY candidate role before picking one. See ${options.configDisplayPath}.`
-}
-
-function referenceForKnownRole(options, roleName) {
-  return `Re-read ${options.roleDefinitionsDir}/${roleName}.md — check Purpose, Canonical Example, Anti-Patterns, and (if present) the Critical Naming Rule. See ${options.configDisplayPath}.`
-}
-
-export default {
-  meta: { name: 'riviere-role-enforcement' },
-  rules: {
-    'enforce-roles': {
-      meta: { schema: [{ type: 'object' }] },
-      create(context) {
-        const [options] = context.options
-        const roleMap = new Map(options.roles.map((role) => [role.name, role]))
-        const layerEntries = Object.entries(options.layers ?? {})
-        const importRuleLocations = layerEntries
-          .map(([, location]) => location)
-          .filter((location) => hasImportRules(location))
-          .sort((left, right) => longestPattern(right.paths) - longestPattern(left.paths))
-        const sourceCode = context.sourceCode
-        const fileCache = new Map()
-        const importCache = new Map()
-        const relativeFilePath = normalizePath(
-          readRelativeFilePath(context.filename, options.configDir),
-        )
-        const filename = path.resolve(options.configDir, relativeFilePath)
-
-        if (
-          !filename.endsWith('.ts') ||
-          filename.endsWith('.spec.ts') ||
-          filename.endsWith('.test.ts')
-        ) {
-          return {}
-        }
-
-        const fileRoles = []
-
-        return {
-          FunctionDeclaration(node) {
-            validateDeclaration(node, 'function')
-          },
-          ClassDeclaration(node) {
-            validateDeclaration(node, 'class')
-          },
-          TSInterfaceDeclaration(node) {
-            validateDeclaration(node, 'interface')
-          },
-          TSTypeAliasDeclaration(node) {
-            validateDeclaration(node, 'type-alias')
-          },
-          ImportDeclaration(node) {
-            validateForbiddenImports(node)
-            validateLocationImport(node)
-          },
-          'Program:exit'() {
-            validateForbiddenDependencies()
-            validateForbiddenMethodCalls()
-          },
-        }
-
-        function validateForbiddenImports(node) {
-          const importSource = node.source.value
-          if (typeof importSource !== 'string') {
-            return
-          }
-
-          const resolvedImport = resolveTypeFile(filename, importSource)
-          if (resolvedImport === null) {
-            return
-          }
-
-          const resolvedImportRelative = normalizePath(
-            readRelativeFilePath(resolvedImport, options.configDir),
-          )
-
-          const fileDir = normalizePath(path.dirname(relativeFilePath))
-          for (const [, layer] of layerEntries) {
-            if (!layer.paths.some((pattern) => matchesExpandedPattern(fileDir, pattern))) {
-              continue
-            }
-
-            if (!Array.isArray(layer.forbiddenImports)) {
-              continue
-            }
-
-            for (const forbiddenPattern of layer.forbiddenImports) {
-              if (
-                minimatch(resolvedImportRelative, forbiddenPattern, { dot: true }) ||
-                minimatch(resolvedImportRelative, `${forbiddenPattern}/**`, { dot: true })
-              ) {
-                report(
-                  node,
-                  `Forbidden import: files in this location cannot import from '${forbiddenPattern}'. ${referenceForUnknownRole(options)}`,
-                )
-              }
-            }
-          }
-        }
-
-        function validateLocationImport(node) {
-          const sourceLocation = importRuleLocations.find(
-            (location) =>
-              location.paths.some((pattern) => matchesExpandedPattern(relativeFilePath, pattern)),
-          )
-          if (sourceLocation === undefined) {
-            return
-          }
-
-          const importSource = node.source.value
-          if (typeof importSource !== 'string') {
-            return
-          }
-
-          const resolvedImport = resolveImportFile(filename, importSource)
-          if (resolvedImport === null || !isInsideDirectory(resolvedImport, options.configDir)) {
-            if (
-              sourceLocation.mayImportExternalPackages === false &&
-              isExternalImport(importSource)
-            ) {
-              report(
-                node,
-                `Forbidden external import: files in '${sourceLocation.paths.join(', ')}' cannot import external package '${importSource}'.`,
-              )
-            }
-            return
-          }
-
-          const resolvedImportRelative = normalizePath(
-            readRelativeFilePath(resolvedImport, options.configDir),
-          )
-          const importedRoles = readImportedRoles(node, resolvedImport)
-          if (
-            sourceLocation.paths.some((pattern) =>
-              matchesExpandedPattern(resolvedImportRelative, pattern),
-            )
-          ) {
-            return
-          }
-
-          if (!Array.isArray(sourceLocation.mayImportRoles)) {
-            return
-          }
-
-          const disallowedRole = importedRoles.find(
-            (role) => !sourceLocation.mayImportRoles.includes(role),
-          )
-          if (importedRoles.length > 0 && disallowedRole === undefined) {
-            return
-          }
-
-          const targetDescription =
-            importedRoles.length === 0 ? 'no classified role' : `[${importedRoles.join(', ')}]`
-          report(
-            node,
-            `Forbidden role import: files in '${sourceLocation.paths.join(', ')}' may only import roles [${sourceLocation.mayImportRoles.join(', ')}] across that location boundary, but '${resolvedImportRelative}' provides ${targetDescription}.`,
-          )
-        }
-
-        function readImportedRoles(node, resolvedImport) {
-          const roles = []
-          for (const specifier of node.specifiers ?? []) {
-            if (specifier.type === 'ImportSpecifier') {
-              const importedName =
-                specifier.imported.type === 'Identifier'
-                  ? specifier.imported.name
-                  : specifier.imported.value
-              const importedRole = readExportedRole(resolvedImport, importedName)
-              if (importedRole !== null) {
-                roles.push(importedRole)
-              }
-            } else if (specifier.type === 'ImportNamespaceSpecifier') {
-              roles.push(...readAllExportedRoles(resolvedImport))
-            }
-          }
-          return [...new Set(roles)]
-        }
-
-        function isExternalImport(importSource) {
-          return !importSource.startsWith('.') && !path.isAbsolute(importSource)
-        }
-
-        function validateDeclaration(node, target) {
-          if (!isTopLevelExported(node)) {
-            return
-          }
-
-          const name = readDeclarationName(node)
-          if (name === null) {
-            return
-          }
-
-          const annotationNode = readAnnotationNode(node)
-          const roleNames = readRoleNames(sourceCode, annotationNode)
-          if (roleNames.length === 0) {
-            report(
-              node,
-              `Missing @riviere-role annotation for '${name}'. ${referenceForUnknownRole(options)}`,
-            )
-            return
-          }
-
-          if (roleNames.length > 1) {
-            report(
-              node,
-              `Multiple @riviere-role annotations found for '${name}'. ${referenceForUnknownRole(options)}`,
-            )
-            return
-          }
-
-          const [roleName] = roleNames
-          const role = roleMap.get(roleName)
-          if (role === undefined) {
-            report(
-              node,
-              `Unknown role '${roleName}' on '${name}'. ${referenceForUnknownRole(options)}`,
-            )
-            return
-          }
-
-          if (!role.targets.includes(target)) {
-            report(
-              node,
-              `Role '${roleName}' does not allow target '${target}'. ${referenceForKnownRole(options, roleName)}`,
-            )
-            return
-          }
-
-          if (!isRoleAllowedInFile(roleName, relativeFilePath)) {
-            report(
-              node,
-              `${roleName} cannot live in ${relativeFilePath}. ${referenceForKnownRole(options, roleName)}`,
-            )
-            return
-          }
-
-          if (!matchesName(name, role)) {
-            report(
-              node,
-              `Role '${roleName}' does not allow name '${name}'. ${referenceForKnownRole(options, roleName)}`,
-            )
-            return
-          }
-
-          validateForbiddenSupertypes(node, role, name)
-
-          const approvedResult = matchesApprovedInstances(name, role)
-          if (approvedResult.checked && !approvedResult.passed) {
-            report(node, approvedResult.reason)
-            return
-          }
-
-          fileRoles.push(roleName)
-
-          if (target === 'function') {
-            validateFunctionContract(node, role, name)
-          }
-
-          if (target === 'class') {
-            validateClassContract(node, role, name)
-          }
-        }
-
-        function validateForbiddenSupertypes(node, role, name) {
-          if (!Array.isArray(role.forbiddenSupertypes) || role.forbiddenSupertypes.length === 0) {
-            return
-          }
-
-          const declarationSupertypes = readDeclaredSupertypes(node)
-          for (const supertype of declarationSupertypes) {
-            if (role.forbiddenSupertypes.includes(supertype)) {
-              report(
-                node,
-                `Role '${role.name}' forbids supertype '${supertype}' on '${name}'. ${referenceForKnownRole(options, role.name)}`,
-              )
-            }
-          }
-        }
-
-        function readDeclaredSupertypes(node) {
-          const supertypes = []
-
-          if (node.type === 'ClassDeclaration') {
-            const superClassName = readNamedTypeReference(node.superClass)
-            if (superClassName !== null) {
-              supertypes.push(superClassName)
-            }
-
-            for (const implementedType of node.implements ?? []) {
-              const implementedName = readNamedTypeReference(implementedType.expression)
-              if (implementedName !== null) {
-                supertypes.push(implementedName)
-              }
-            }
-          }
-
-          if (node.type === 'TSInterfaceDeclaration') {
-            for (const extendedType of node.extends ?? []) {
-              const extendedName = readNamedTypeReference(extendedType.expression)
-              if (extendedName !== null) {
-                supertypes.push(extendedName)
-              }
-            }
-          }
-
-          return supertypes
-        }
-
-        function readNamedTypeReference(node) {
-          if (node?.type === 'Identifier') {
-            return node.name
-          }
-
-          return null
-        }
-
-        function isRoleAllowedInFile(roleName, filePath) {
-          const fileDir = normalizePath(path.dirname(filePath))
-          return layerEntries.some(
-            ([, layer]) =>
-              layer.allowedRoles.includes(roleName) &&
-              layer.paths.some((pattern) => matchesExpandedPattern(fileDir, pattern)),
-          )
-        }
-
-        function validateForbiddenDependencies() {
-          const forbiddenSet = collectForbiddenRoles(fileRoles, roleMap)
-          if (forbiddenSet.size === 0) {
-            return
-          }
-
-          for (const statement of readRelativeImportStatements()) {
-            reportForbiddenImports(statement, forbiddenSet)
-          }
-        }
-
-        function validateForbiddenMethodCalls() {
-          const forbiddenMethodCallRoles = collectForbiddenMethodCallRoles(fileRoles, roleMap)
-          if (forbiddenMethodCallRoles.size === 0) {
-            return
-          }
-
-          const restrictedBindings = new Map()
-          for (const statement of readRelativeImportStatements()) {
-            const resolvedFile = resolveTypeFile(filename, statement.source.value)
-            if (resolvedFile === null) {
-              continue
-            }
-            const importedRoles = readAllExportedRoles(resolvedFile)
-            const matchedRole = importedRoles.find((r) => forbiddenMethodCallRoles.has(r))
-            if (matchedRole === undefined) {
-              continue
-            }
-            for (const specifier of statement.specifiers ?? []) {
-              if (specifier.type === 'ImportSpecifier' || specifier.type === 'ImportDefaultSpecifier') {
-                restrictedBindings.set(specifier.local.name, matchedRole)
-              }
-            }
-          }
-
-          if (restrictedBindings.size === 0) {
-            return
-          }
-
-          const nonImportBody = sourceCode.ast.body.filter(
-            (n) => n.type !== 'ImportDeclaration',
-          )
-          for (const node of nonImportBody) {
-            walkForNonConstructionUsages(node, restrictedBindings, false)
-          }
-        }
-
-        function walkForNonConstructionUsages(node, restrictedBindings, insideNew) {
-          if (node === null || node === undefined || typeof node !== 'object') {
-            return
-          }
-
-          if (node.type === 'NewExpression') {
-            walkForNonConstructionUsages(node.callee, restrictedBindings, true)
-            walkChildren(node.arguments ?? [], restrictedBindings)
-            return
-          }
-
-          if (isRestrictedNonConstructionUsage(node, restrictedBindings, insideNew)) {
-            return
-          }
-
-          walkNodeChildren(node, restrictedBindings)
-        }
-
-        function isRestrictedNonConstructionUsage(node, restrictedBindings, insideNew) {
-          if (node.type !== 'Identifier' || insideNew || !restrictedBindings.has(node.name)) {
-            return false
-          }
-          const roleName = restrictedBindings.get(node.name)
-          report(
-            node,
-            `Role '${fileRoles.join(', ')}' forbids non-construction usage of '${roleName}' imports. Only 'new' is allowed. ${referenceForKnownRole(options, roleName)}`,
-          )
-          return true
-        }
-
-        function walkNodeChildren(node, restrictedBindings) {
-          for (const key of Object.keys(node)) {
-            if (key === 'parent') {
-              continue
-            }
-            const child = node[key]
-            if (Array.isArray(child)) {
-              walkChildren(child, restrictedBindings)
-            } else if (child !== null && typeof child === 'object' && child.type !== undefined) {
-              walkForNonConstructionUsages(child, restrictedBindings, false)
-            }
-          }
-        }
-
-        function walkChildren(children, restrictedBindings) {
-          for (const item of children) {
-            walkForNonConstructionUsages(item, restrictedBindings, false)
-          }
-        }
-
-        function readRelativeImportStatements() {
-          return sourceCode.ast.body.filter(
-            (statement) =>
-              statement.type === 'ImportDeclaration' &&
-              typeof statement.source.value === 'string' &&
-              statement.source.value.startsWith('.'),
-          )
-        }
-
-        function reportForbiddenImports(statement, forbiddenSet) {
-          const resolvedFile = resolveTypeFile(filename, statement.source.value)
-          if (resolvedFile === null) {
-            return
-          }
-
-          const importedRoles = readAllExportedRoles(resolvedFile)
-          for (const importedRole of importedRoles) {
-            if (forbiddenSet.has(importedRole)) {
-              report(
-                statement,
-                `Forbidden dependency: this file (${fileRoles.join(', ')}) cannot import from a file exporting '${importedRole}'. ${referenceForKnownRole(options, importedRole)}`,
-              )
-            }
-          }
-        }
-
-        function readAllExportedRoles(filePath) {
-          const sourceText = readFileText(filePath)
-          if (sourceText === null) {
-            return []
-          }
-
-          const roles = []
-          const lines = sourceText.split('\n')
-          for (let i = 0; i < lines.length; i++) {
-            const roleName = parseSingleRoleName(lines[i], `at ${filePath}:${i + 1}`)
-            if (roleName === null) {
-              continue
-            }
-
-            for (let j = i + 1; j < lines.length; j++) {
-              const trimmed = lines[j].trim()
-              if (trimmed === '' || trimmed.startsWith('*') || trimmed.startsWith('/**')) {
-                continue
-              }
-              if (/^export\s+(?:interface|type|function|class)\s+\w+/.test(trimmed)) {
-                roles.push(roleName)
-              }
-              break
-            }
-          }
-          return roles
-        }
-
-        function validateFunctionContract(node, role, name) {
-          if (Array.isArray(role.allowedInputs)) {
-            if (node.params.length !== 1) {
-              report(
-                node,
-                `Role '${role.name}' must accept exactly one parameter on '${name}'. ${referenceForKnownRole(options, role.name)}`,
-              )
-              return
-            }
-
-            const inputRole = readTypeRole(node.params[0].typeAnnotation, filename)
-            if (inputRole === null || !role.allowedInputs.includes(inputRole)) {
-              report(
-                node,
-                `Role '${role.name}' only allows inputs [${role.allowedInputs.join(', ')}] on '${name}'. ${referenceForKnownRole(options, role.name)}`,
-              )
-              return
-            }
-          }
-
-          if (Array.isArray(role.allowedOutputs)) {
-            const outputRoles = readOutputTypeRoles(node.returnType, filename)
-            if (outputRoles === null || !outputRoles.every((r) => role.allowedOutputs.includes(r))) {
-              report(
-                node,
-                `Role '${role.name}' only allows outputs [${role.allowedOutputs.join(', ')}] on '${name}'. ${referenceForKnownRole(options, role.name)}`,
-              )
-            }
-          }
-        }
-
-        function validateClassContract(node, role, name) {
-          validatePublicMethodCount(node, role, name)
-          validateRequiredPrivateMembers(node, role, name)
-          validateCallableMemberConstraints(node, role, name)
-          validateDataMemberRequirements(node, role, name)
-          validateClassMethodContracts(node, role, name)
-        }
-
-        function validatePublicMethodCount(node, role, name) {
-          if (typeof role.minPublicMethods === 'number') {
-            const publicMethodCount = countPublicMethods(node)
-            if (publicMethodCount < role.minPublicMethods) {
-              report(
-                node,
-                `Role '${role.name}' requires at least ${role.minPublicMethods} public method(s) on '${name}'. ${referenceForKnownRole(options, role.name)}`,
-              )
-            }
-          }
-
-          if (typeof role.maxPublicMethods === 'number') {
-            const maxCount = countPublicMethods(node)
-            if (maxCount > role.maxPublicMethods) {
-              report(
-                node,
-                `Role '${role.name}' allows at most ${role.maxPublicMethods} public method(s) on '${name}'. ${referenceForKnownRole(options, role.name)}`,
-              )
-            }
-          }
-        }
-
-        function validateRequiredPrivateMembers(node, role, name) {
-          if (!Array.isArray(role.requiredPrivateMembers)) {
-            return
-          }
-
-          for (const privateMemberName of role.requiredPrivateMembers) {
-            if (!hasRequiredPrivateMember(node, privateMemberName)) {
-              report(
-                node,
-                `Role '${role.name}' requires private member '${privateMemberName}' on '${name}'. ${referenceForKnownRole(options, role.name)}`,
-              )
-            }
-          }
-        }
-
-        function validateClassMethodContracts(node, role, name) {
-          if (!hasClassMethodContracts(role)) {
-            return
-          }
-
-          for (const member of node.body.body) {
-            if (
-              member.type === 'MethodDefinition' &&
-              member.kind !== 'constructor' &&
-              (member.accessibility === 'public' || member.accessibility == null)
-            ) {
-              const methodName = member.key?.name ?? '?'
-              validateFunctionContract(member.value, role, `${name}.${methodName}`)
-            }
-          }
-        }
-
-        function hasClassMethodContracts(role) {
-          return Array.isArray(role.allowedInputs) || Array.isArray(role.allowedOutputs)
-        }
-
-        function validateCallableMemberConstraints(node, role, name) {
-          if (role.forbiddenCallableMembers !== true) {
-            return
-          }
-
-          const callableMemberNames = readCallableInstanceMemberNames(node)
-          if (callableMemberNames.length === 0) {
-            return
-          }
-
-          report(
-            node,
-            `Role '${role.name}' forbids callable instance members on '${name}'. Found [${callableMemberNames.join(', ')}]. ${referenceForKnownRole(options, role.name)}`,
-          )
-        }
-
-        function validateDataMemberRequirements(node, role, name) {
-          if (role.requiresDataMembers !== true) {
-            return
-          }
-
-          const excludedMemberNames = new Set(normalizeRequiredPrivateMembers(role))
-          const hasDataMember = readInstanceDataMembers(node).some(
-            (member) => !member.callable && !excludedMemberNames.has(member.name),
-          )
-          if (hasDataMember) {
-            return
-          }
-
-          report(
-            node,
-            `Role '${role.name}' requires at least one non-callable instance data member on '${name}'. ${referenceForKnownRole(options, role.name)}`,
-          )
-        }
-
-        function countPublicMethods(classNode) {
-          return classNode.body.body.filter(
-            (member) =>
-              member.type === 'MethodDefinition' &&
-              member.kind !== 'constructor' &&
-              (member.accessibility === 'public' || member.accessibility == null),
-          ).length
-        }
-
-        function hasRequiredPrivateMember(classNode, privateMemberName) {
-          const normalizedPrivateMemberName = normalizeRequiredPrivateMemberName(privateMemberName)
-          return classNode.body.body.some(
-            (member) =>
-              isPrivateMember(member) &&
-              readMemberName(member.key) === normalizedPrivateMemberName,
-          )
-        }
-
-        function normalizeRequiredPrivateMemberName(privateMemberName) {
-          return privateMemberName.startsWith('#')
-            ? privateMemberName.slice(1)
-            : privateMemberName
-        }
-
-        function normalizeRequiredPrivateMembers(role) {
-          if (!Array.isArray(role.requiredPrivateMembers)) {
-            return []
-          }
-
-          return role.requiredPrivateMembers.map(normalizeRequiredPrivateMemberName)
-        }
-
-        function isPrivateMember(member) {
-          return (
-            member.accessibility === 'private' ||
-            member.key?.type === 'PrivateIdentifier'
-          )
-        }
-
-        function readCallableInstanceMemberNames(classNode) {
-          return readInstanceDataMembers(classNode)
-            .filter((member) => member.callable)
-            .map((member) => member.name)
-        }
-
-        function readInstanceDataMembers(classNode) {
-          return classNode.body.body.flatMap((member) => {
-            if (isStaticMember(member)) {
-              return []
-            }
-
-            if (isDataFieldMember(member)) {
-              const name = readMemberName(member.key)
-              return name === null
-                ? []
-                : [{
-                  callable: isCallableFieldMember(member),
-                  name,
-                }]
-            }
-
-            if (isConstructorDefinition(member)) {
-              return member.value.params.flatMap(readConstructorParameterProperty)
-            }
-
-            return []
-          })
-        }
-
-        function isStaticMember(member) {
-          return member.static === true
-        }
-
-        function isDataFieldMember(member) {
-          return (
-            member.type === 'PropertyDefinition' ||
-            member.type === 'AccessorProperty' ||
-            member.type === 'ClassProperty' ||
-            member.type === 'FieldDefinition'
-          )
-        }
-
-        function isConstructorDefinition(member) {
-          return member.type === 'MethodDefinition' && member.kind === 'constructor'
-        }
-
-        function readConstructorParameterProperty(param) {
-          if (param.type !== 'TSParameterProperty') {
-            return []
-          }
-
-          const parameter = unwrapParameterProperty(param.parameter)
-          if (parameter?.type !== 'Identifier') {
-            return []
-          }
-
-          return [{
-            callable: isCallableParameterProperty(param, parameter),
-            name: parameter.name,
-          }]
-        }
-
-        function unwrapParameterProperty(parameter) {
-          return parameter?.type === 'AssignmentPattern'
-            ? parameter.left
-            : parameter
-        }
-
-        function isCallableFieldMember(member) {
-          return (
-            isCallableTypeAnnotation(member.typeAnnotation) ||
-            isFunctionExpression(member.value)
-          )
-        }
-
-        function isCallableParameterProperty(param, parameter) {
-          return (
-            isCallableTypeAnnotation(parameter.typeAnnotation) ||
-            isFunctionExpression(param.parameter?.right)
-          )
-        }
-
-        function isCallableTypeAnnotation(typeAnnotation) {
-          return typeAnnotation?.type === 'TSTypeAnnotation' &&
-            typeAnnotation.typeAnnotation?.type === 'TSFunctionType'
-        }
-
-        function isFunctionExpression(node) {
-          return node?.type === 'ArrowFunctionExpression' || node?.type === 'FunctionExpression'
-        }
-
-        function readMemberName(key) {
-          if (key?.type === 'Identifier' || key?.type === 'PrivateIdentifier') {
-            return key.name
-          }
-
-          if (key?.type === 'Literal' && typeof key.value === 'string') {
-            return key.value
-          }
-
-          return null
-        }
-
-        function readOutputTypeRoles(typeAnnotation, currentFile) {
-          if (typeAnnotation === null || typeAnnotation === undefined) {
-            return null
-          }
-          if (typeAnnotation.type !== 'TSTypeAnnotation') {
-            return null
-          }
-          return resolveTypeNodeRoles(typeAnnotation.typeAnnotation, currentFile)
-        }
-
-        function resolveTypeNodeRoles(typeNode, currentFile) {
-          if (typeNode.type === 'TSUnionType') {
-            const memberRoleSets = typeNode.types.map((member) =>
-              resolveTypeNodeRoles(member, currentFile),
-            )
-            if (memberRoleSets.some((roles) => roles === null)) {
-              return null
-            }
-            return memberRoleSets.flat()
-          }
-
-          if (typeNode.type === 'TSArrayType') {
-            return resolveTypeNodeRoles(typeNode.elementType, currentFile)
-          }
-
-          if (
-            typeNode.type === 'TSTypeReference' &&
-            typeNode.typeName?.type === 'Identifier' &&
-            typeNode.typeName.name === 'Promise'
-          ) {
-            const typeArgs = typeNode.typeArguments?.params ?? typeNode.typeParameters?.params
-            if (!Array.isArray(typeArgs) || typeArgs.length !== 1) {
-              return null
-            }
-            return resolveTypeNodeRoles(typeArgs[0], currentFile)
-          }
-
-          if (typeNode.type === 'TSVoidKeyword') {
-            return []
-          }
-
-          if (typeNode.type === 'TSTypeReference' && typeNode.typeName?.type === 'Identifier') {
-            const localTypeName = typeNode.typeName.name
-            const importedReference = readImportedReference(localTypeName, currentFile)
-            const resolvedRole =
-              importedReference !== null
-                ? readExportedRole(importedReference.filePath, importedReference.exportedName)
-                : readExportedRole(currentFile, localTypeName)
-            return resolvedRole !== null ? [resolvedRole] : null
-          }
-
-          return null
-        }
-
-        function readTypeRole(typeAnnotation, currentFile) {
-          if (typeAnnotation === null || typeAnnotation === undefined) {
-            return null
-          }
-
-          if (typeAnnotation.type !== 'TSTypeAnnotation') {
-            return null
-          }
-
-          const innerType = unwrapSupportedTypeReference(typeAnnotation.typeAnnotation)
-          if (innerType === null) {
-            return null
-          }
-
-          const localTypeName = innerType.typeName.name
-          const importedReference = readImportedReference(localTypeName, currentFile)
-          if (importedReference !== null) {
-            return readExportedRole(importedReference.filePath, importedReference.exportedName)
-          }
-
-          return readExportedRole(currentFile, localTypeName)
-        }
-
-        function unwrapSupportedTypeReference(typeNode) {
-          if (typeNode.type !== 'TSTypeReference' || typeNode.typeName.type !== 'Identifier') {
-            return null
-          }
-
-          if (typeNode.typeName.name !== 'Promise') {
-            return typeNode
-          }
-
-          const promiseTypeArguments =
-            typeNode.typeArguments?.params ?? typeNode.typeParameters?.params
-          if (!Array.isArray(promiseTypeArguments) || promiseTypeArguments.length !== 1) {
-            return null
-          }
-
-          return unwrapSupportedTypeReference(promiseTypeArguments[0])
-        }
-
-        function readImportedReference(localTypeName, currentFile) {
-          const cacheKey = `${currentFile}::${localTypeName}`
-          if (importCache.has(cacheKey)) {
-            return importCache.get(cacheKey)
-          }
-
-          for (const statement of sourceCode.ast.body) {
-            const importedReference = readImportDeclarationReference(
-              statement,
-              localTypeName,
-              currentFile,
-            )
-            if (importedReference !== undefined) {
-              importCache.set(cacheKey, importedReference)
-              return importedReference
-            }
-          }
-
-          const workspaceRef = readWorkspacePackageReference(localTypeName)
-          importCache.set(cacheKey, workspaceRef)
-          return workspaceRef
-        }
-
-        function readWorkspacePackageReference(localTypeName) {
-          const workspacePackageSources = options.workspacePackageSources ?? {}
-          for (const statement of sourceCode.ast.body) {
-            const ref = readWorkspaceImportStatement(statement, localTypeName, workspacePackageSources)
-            if (ref !== null) {
-              return ref
-            }
-          }
-          return null
-        }
-
-        function readWorkspaceImportStatement(statement, localTypeName, workspacePackageSources) {
-          if (statement.type !== 'ImportDeclaration') {
-            return null
-          }
-          const importSource = statement.source.value
-          if (typeof importSource !== 'string' || importSource.startsWith('.')) {
-            return null
-          }
-          const specifier = (statement.specifiers ?? []).find(
-            (s) => s.type === 'ImportSpecifier' && s.local.name === localTypeName,
-          )
-          if (specifier === undefined) {
-            return null
-          }
-          const sourceEntry = workspacePackageSources[importSource]
-          if (sourceEntry === undefined) {
-            return null
-          }
-          const resolvedSourcePath = resolveTypeFile(path.join(options.configDir, '_'), sourceEntry)
-          if (resolvedSourcePath === null) {
-            return null
-          }
-          const importedName =
-            specifier.imported.type === 'Identifier'
-              ? specifier.imported.name
-              : specifier.imported.value
-          return {
-            exportedName: importedName,
-            filePath: resolvedSourcePath,
-          }
-        }
-
-        function readExportedRole(filePath, exportedName, visited = new Set()) {
-          if (visited.has(filePath)) {
-            return null
-          }
-          visited.add(filePath)
-
-          const sourceText = readFileText(filePath)
-          if (sourceText === null) {
-            return null
-          }
-
-          const escapedName = escapeRegExp(exportedName)
-          const exportPattern = new RegExp(
-            String.raw`export\s+(?:interface|type|function|class)\s+${escapedName}\b`,
-            'm',
-          )
-          const exportMatch = exportPattern.exec(sourceText)
-          if (exportMatch !== null) {
-            const prefix = sourceText.slice(0, exportMatch.index)
-            const jsDocComments = [...prefix.matchAll(/\/\*\*[\s\S]*?\*\//g)]
-            const commentMatch = jsDocComments.at(-1)
-            if (commentMatch?.[0] === undefined) {
-              return null
-            }
-            return parseSingleRoleName(commentMatch[0], `on '${exportedName}' in ${filePath}`)
-          }
-
-          const namedReExportPattern = new RegExp(
-            String.raw`export\s*\{[^}]*\b${escapedName}\b[^}]*\}\s*from\s*['"]([^'"]+)['"]`,
-            'm',
-          )
-          const namedReExportMatch = namedReExportPattern.exec(sourceText)
-          if (namedReExportMatch !== null) {
-            const resolvedPath = resolveTypeFile(filePath, namedReExportMatch[1])
-            if (resolvedPath !== null) {
-              return readExportedRole(resolvedPath, exportedName, visited)
-            }
-          }
-
-          const wildcardReExportPattern = /export\s*\*\s*from\s*['"]([^'"]+)['"]/gm
-          let wildcardMatch
-          while ((wildcardMatch = wildcardReExportPattern.exec(sourceText)) !== null) {
-            const resolvedPath = resolveTypeFile(filePath, wildcardMatch[1])
-            if (resolvedPath !== null) {
-              const role = readExportedRole(resolvedPath, exportedName, visited)
-              if (role !== null) {
-                return role
-              }
-            }
-          }
-
-          return null
-        }
-
-        function readFileText(filePath) {
-          if (fileCache.has(filePath)) {
-            return fileCache.get(filePath)
-          }
-
-          if (!fs.existsSync(filePath)) {
-            fileCache.set(filePath, null)
-            return null
-          }
-
-          const fileText = fs.readFileSync(filePath, 'utf8')
-          fileCache.set(filePath, fileText)
-          return fileText
-        }
-
-        function report(node, message) {
-          context.report({
-            message,
-            node,
-          })
-        }
-      },
-    },
-  },
-}
-
-function matchesExpandedPattern(fileDir, pattern) {
-  return expandCommaPath(pattern).some(
-    (expanded) =>
-      minimatch(fileDir, expanded, { dot: true }) ||
-      minimatch(fileDir, `${expanded}/**`, { dot: true }),
-  )
-}
-
-function hasImportRules(location) {
-  return (
-    location.mayImportExternalPackages === false || Array.isArray(location.mayImportRoles)
-  )
-}
-
-function longestPattern(patterns) {
-  return Math.max(...patterns.map((pattern) => pattern.length))
-}
-
-function expandCommaPath(pattern) {
-  const segments = pattern.split('/')
-  const segmentAlternatives = segments.map((s) => s.split(','))
-  return cartesianProduct(segmentAlternatives).map((combo) => combo.join('/**/'))
-}
-
-function cartesianProduct(arrays) {
-  return arrays.reduce(
-    (acc, alternatives) => acc.flatMap((combo) => alternatives.map((alt) => [...combo, alt])),
-    [[]],
-  )
-}
-
-function collectForbiddenRoles(fileRoles, roleMap) {
-  const forbiddenSet = new Set()
-  for (const roleName of fileRoles) {
-    const role = roleMap.get(roleName)
-    if (role !== undefined && Array.isArray(role.forbiddenDependencies)) {
-      for (const dep of role.forbiddenDependencies) {
-        forbiddenSet.add(dep)
-      }
-    }
-  }
-  return forbiddenSet
-}
-
-function collectForbiddenMethodCallRoles(fileRoles, roleMap) {
-  const forbiddenSet = new Set()
-  for (const roleName of fileRoles) {
-    const role = roleMap.get(roleName)
-    if (role !== undefined && Array.isArray(role.forbiddenMethodCalls)) {
-      for (const dep of role.forbiddenMethodCalls) {
-        forbiddenSet.add(dep)
-      }
-    }
-  }
-  return forbiddenSet
-}
-
-function isTopLevelExported(node) {
-  const exportParent = readAnnotationNode(node)
-  return (
-    exportParent.parent?.type === 'Program' &&
-    (exportParent.type === 'ExportNamedDeclaration' ||
-      exportParent.type === 'ExportDefaultDeclaration')
-  )
-}
-
-function readAnnotationNode(node) {
-  return node.parent?.type === 'ExportNamedDeclaration' ||
-    node.parent?.type === 'ExportDefaultDeclaration'
-    ? node.parent
-    : node
-}
-
-function readDeclarationName(node) {
-  if ('id' in node && node.id != null) {
-    return node.id.name
-  }
-
-  if ('key' in node && node.key?.type === 'Identifier') {
-    return node.key.name
-  }
-
-  return 'id' in node && 'name' in node ? node.name : null
-}
-
-function readRoleNames(sourceCode, node) {
-  const comments = sourceCode.getCommentsBefore(node)
-  const roleNames = comments.flatMap((comment) => parseAllRoleNames(comment.value))
-  return [...new Set(roleNames)]
-}
-
-function matchesApprovedInstances(name, role) {
-  if (!Array.isArray(role.approvedInstances)) {
-    return { checked: false }
-  }
-
-  const entry = role.approvedInstances.find((instance) => instance.name === name)
-
-  if (!entry) {
-    return {
-      checked: true,
-      passed: false,
-      reason: `'${name}' is not in approvedInstances for role '${role.name}'. Add { name: '${name}', userHasApproved: true } to approvedInstances after getting user approval.`,
-    }
-  }
-
-  if (entry.userHasApproved !== true) {
-    return {
-      checked: true,
-      passed: false,
-      reason: `'${name}' has userHasApproved: false in approvedInstances for role '${role.name}'. Set userHasApproved to true after getting user approval.`,
-    }
-  }
-
-  return {
-    checked: true,
-    passed: true,
-  }
-}
-
-function matchesName(name, role) {
-  if (Array.isArray(role.allowedNames)) {
-    return role.allowedNames.includes(name)
-  }
-
-  if (typeof role.nameMatches === 'string') {
-    return new RegExp(role.nameMatches, 'u').test(name)
-  }
-
-  return true
-}
-
-function resolveTypeFile(currentFile, importSource) {
-  const sourceDir = path.dirname(currentFile)
-  const basePath = path.resolve(sourceDir, importSource)
-  const candidates = [basePath, `${basePath}.ts`, path.join(basePath, 'index.ts')]
-
-  return (
-    candidates.find((candidate) => {
-      try {
-        return fs.statSync(candidate).isFile()
-      } catch {
-        return false
-      }
-    }) ?? null
-  )
-}
-
-function resolveImportFile(currentFile, importSource) {
-  if (importSource.startsWith('.')) {
-    return resolveTypeFile(currentFile, importSource)
-  }
-
-  return resolveWorkspacePackageSource(currentFile, importSource)
-}
-
-function resolveWorkspacePackageSource(currentFile, importSource) {
-  const packageName = readPackageName(importSource)
-  if (packageName === null) {
-    return null
-  }
-
-  try {
-    const packageJsonPath = createRequire(currentFile).resolve(`${packageName}/package.json`)
-    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'))
-    const sourceEntry = packageJson.exports?.['.']?.['@living-architecture/source']
-    if (typeof sourceEntry !== 'string') {
-      return null
-    }
-    return resolveTypeFile(packageJsonPath, sourceEntry)
-  } catch {
-    return null
-  }
-}
-
-function readPackageName(importSource) {
-  const segments = importSource.split('/')
-  if (importSource.startsWith('@')) {
-    return segments.length >= 2 ? `${segments[0]}/${segments[1]}` : null
-  }
-  return segments[0] ?? null
-}
-
-function isInsideDirectory(filePath, directoryPath) {
-  const relativePath = path.relative(directoryPath, filePath)
-  return relativePath !== '' && !relativePath.startsWith('..') && !path.isAbsolute(relativePath)
-}
-
-function normalizePath(value) {
-  return value.replaceAll('\\', '/')
-}
-
-function readRelativeFilePath(filename, configDir) {
-  return path.isAbsolute(filename) ? path.relative(configDir, filename) : filename
-}
-
-function escapeRegExp(value) {
-  return value.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`)
-}
-
-function readImportDeclarationReference(statement, localTypeName, currentFile) {
-  if (statement.type !== 'ImportDeclaration') {
-    return undefined
-  }
-
-  if (typeof statement.source.value !== 'string' || !statement.source.value.startsWith('.')) {
-    return undefined
-  }
-
-  const importedSpecifier = (statement.specifiers ?? []).find(
-    (specifier) => specifier.type === 'ImportSpecifier' && specifier.local.name === localTypeName,
-  )
-  if (importedSpecifier === undefined) {
-    return undefined
-  }
-
-  const importedName =
-    importedSpecifier.imported.type === 'Identifier'
-      ? importedSpecifier.imported.name
-      : importedSpecifier.imported.value
-  const resolvedFile = resolveTypeFile(currentFile, statement.source.value)
-  if (resolvedFile === null) {
-    return null
-  }
-
-  return {
-    exportedName: importedName,
-    filePath: resolvedFile,
-  }
-}
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/adapters/oxlint/oxlint-role-enforcement-runner.spec.ts b/packages/riviere-role-enforcement/src/features/enforcement/adapters/oxlint/oxlint-role-enforcement-runner.spec.ts
deleted file mode 100644
index 2c4678ff4..000000000
--- a/packages/riviere-role-enforcement/src/features/enforcement/adapters/oxlint/oxlint-role-enforcement-runner.spec.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-import { expect, it, vi } from 'vitest'
-import { OxlintExecutionError } from '../../../../platform/infra/external-clients/oxlint/index'
-import type { RoleEnforcementRunnerInput } from '../../domain/ports/role-enforcement-runner'
-import { createOxlintRoleEnforcementRunner } from './oxlint-role-enforcement-runner'
-
-const input: RoleEnforcementRunnerInput = {
-  config: {
-    ignorePatterns: ['**/*.spec.ts'],
-    include: ['src/**/*.ts'],
-    layers: {},
-    roleDefinitionsDir: '.riviere/role-definitions',
-    roles: [],
-  },
-  configDir: '/repo/packages/pkg-a',
-  lintTargets: ['src/index.ts'],
-}
-
-it('translates the domain runner input into an Oxlint request', () => {
-  const client = vi.fn(() => ({
-    exitCode: 0,
-    stderr: '',
-    stdout: '',
-  }))
-  const runner = createOxlintRoleEnforcementRunner(
-    client,
-    '/repo/packages/riviere-role-enforcement/role-enforcement-plugin.mjs',
-  )
-
-  runner(input)
-
-  expect(client).toHaveBeenCalledWith({
-    config: {
-      ignorePatterns: ['**/*.spec.ts'],
-      jsPlugins: [
-        {
-          name: 'riviere-role-enforcement',
-          specifier: '../riviere-role-enforcement/role-enforcement-plugin.mjs',
-        },
-      ],
-      rules: {
-        'riviere-role-enforcement/enforce-roles': [
-          'error',
-          {
-            configDir: '/repo/packages/pkg-a',
-            configDisplayPath: 'role-enforcement.config.ts',
-            layers: {},
-            roleDefinitionsDir: '.riviere/role-definitions',
-            roles: [],
-          },
-        ],
-      },
-    },
-    configDir: '/repo/packages/pkg-a',
-    lintTargets: ['src/index.ts'],
-  })
-})
-
-it('returns a domain runner failure when Oxlint fails', () => {
-  const runner = createOxlintRoleEnforcementRunner(() => {
-    throw new OxlintExecutionError('spawn failed')
-  }, '/repo/role-enforcement-plugin.mjs')
-
-  expect(runner(input)).toStrictEqual({
-    exitCode: 1,
-    stderr: 'spawn failed\n',
-    stdout: '',
-  })
-})
-
-it('returns a domain runner failure when the plugin is unavailable', () => {
-  const runner = createOxlintRoleEnforcementRunner(vi.fn(), undefined)
-
-  expect(runner(input)).toStrictEqual({
-    exitCode: 1,
-    stderr: 'Cannot find role-enforcement-plugin.mjs\n',
-    stdout: '',
-  })
-})
-
-it('preserves optional enforcement configuration', () => {
-  const client = vi.fn(() => ({
-    exitCode: 0,
-    stderr: '',
-    stdout: '',
-  }))
-  const runner = createOxlintRoleEnforcementRunner(
-    client,
-    '/repo/packages/pkg-a/role-enforcement-plugin.mjs',
-  )
-
-  runner({
-    ...input,
-    config: {
-      ...input.config,
-      workspacePackageSources: { '@generic/package': 'packages/generic/src/index.ts' },
-    },
-  })
-
-  expect(client).toHaveBeenCalledWith(
-    expect.objectContaining({
-      config: expect.objectContaining({
-        jsPlugins: [
-          {
-            name: 'riviere-role-enforcement',
-            specifier: './role-enforcement-plugin.mjs',
-          },
-        ],
-        rules: {
-          'riviere-role-enforcement/enforce-roles': [
-            'error',
-            expect.objectContaining({workspacePackageSources: { '@generic/package': 'packages/generic/src/index.ts' },}),
-          ],
-        },
-      }),
-    }),
-  )
-})
-
-it('rethrows unexpected client failures', () => {
-  const unexpected = new TypeError('unexpected')
-  const runner = createOxlintRoleEnforcementRunner(() => {
-    throw unexpected
-  }, '/repo/role-enforcement-plugin.mjs')
-
-  expect(() => runner(input)).toThrow(unexpected)
-})
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/adapters/oxlint/oxlint-role-enforcement-runner.ts b/packages/riviere-role-enforcement/src/features/enforcement/adapters/oxlint/oxlint-role-enforcement-runner.ts
deleted file mode 100644
index 781ed4c35..000000000
--- a/packages/riviere-role-enforcement/src/features/enforcement/adapters/oxlint/oxlint-role-enforcement-runner.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import {
-  createOxlintImportSpecifier,
-  OxlintExecutionError,
-  type OxlintClient,
-  type OxlintConfig,
-} from '../../../../platform/infra/external-clients/oxlint/index'
-import type {
-  RoleEnforcementRunner,
-  RoleEnforcementRunnerInput,
-} from '../../domain/ports/role-enforcement-runner'
-
-/** @riviere-role domain-port-adapter */
-export function createOxlintRoleEnforcementRunner(
-  oxlintClient: OxlintClient,
-  pluginPath: string | undefined,
-): RoleEnforcementRunner {
-  return (input) => {
-    if (pluginPath === undefined) {
-      return failure('Cannot find role-enforcement-plugin.mjs')
-    }
-
-    try {
-      return oxlintClient({
-        config: createOxlintConfig(input.config, input.configDir, pluginPath),
-        configDir: input.configDir,
-        lintTargets: input.lintTargets,
-      })
-    } catch (error) {
-      if (error instanceof OxlintExecutionError) {
-        return failure(error.message)
-      }
-      throw error
-    }
-  }
-}
-
-function failure(message: string) {
-  return {
-    exitCode: 1,
-    stderr: `${message}\n`,
-    stdout: '',
-  }
-}
-
-function createOxlintConfig(
-  config: RoleEnforcementRunnerInput['config'],
-  configDir: string,
-  pluginPath: string,
-): OxlintConfig {
-  return {
-    ignorePatterns: config.ignorePatterns,
-    jsPlugins: [
-      {
-        name: 'riviere-role-enforcement',
-        specifier: createOxlintImportSpecifier(configDir, pluginPath),
-      },
-    ],
-    rules: {
-      'riviere-role-enforcement/enforce-roles': [
-        'error',
-        {
-          configDir,
-          configDisplayPath: 'role-enforcement.config.ts',
-          layers: config.layers,
-          roleDefinitionsDir: config.roleDefinitionsDir,
-          roles: config.roles,
-          ...(config.workspacePackageSources !== undefined && {workspacePackageSources: config.workspacePackageSources,}),
-        },
-      ],
-    },
-  }
-}
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/commands/forbidden-method-calls.spec.ts b/packages/riviere-role-enforcement/src/features/enforcement/commands/forbidden-method-calls.spec.ts
deleted file mode 100644
index d2b13d8e9..000000000
--- a/packages/riviere-role-enforcement/src/features/enforcement/commands/forbidden-method-calls.spec.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-import {
-  expect, it 
-} from 'vitest'
-import {
-  location, role, roleEnforcement 
-} from '../domain/role-enforcement-builder'
-import {
-  createTestRoleEnforcementApplication,
-  withWorkspaceFixture,
-  writeFixtureFile,
-} from './test-fixture-workspace'
-
-const testRoles = [
-  role('role-a', {
-    targets: ['class'],
-    minPublicMethods: 1,
-  }),
-  role('role-main', {
-    targets: ['function'],
-    forbiddenMethodCalls: ['role-a'],
-  }),
-] as const
-
-type TestRoleName = (typeof testRoles)[number]['name']
-
-const testLocations = [
-  location<TestRoleName>('src')
-    .subLocation('/commands', ['role-a'])
-    .subLocation('/shell', ['role-main']),
-]
-
-const testConfig = roleEnforcement({
-  packages: ['packages/pkg-a'],
-  canonicalConfigurationsFile: '.riviere/canonical-role-configurations.md',
-  ignorePatterns: ['**/*.spec.ts'],
-  roleDefinitionsDir: '.riviere/role-definitions',
-  roles: testRoles,
-  locations: testLocations,
-})
-
-const fixtureBootstrap = {
-  prefix: 'forbidden-method-calls-',
-  roles: testRoles,
-  files: {
-    'packages/pkg-a/src/commands/alpha.ts': `/** @riviere-role role-a */
-export class Alpha {
-  execute(): void {}
-}
-`,
-  },
-}
-
-function withFixtureWorkspace(fn: (workspaceDir: string) => void) {
-  withWorkspaceFixture(fixtureBootstrap, fn)
-}
-
-function writeShellFile(workspaceDir: string, content: string) {
-  writeFixtureFile(workspaceDir, 'packages/pkg-a/src/shell/main.ts', content)
-}
-
-it('rejects non-construction usage of imports with forbidden method call roles', () => {
-  withFixtureWorkspace((workspaceDir) => {
-    writeShellFile(
-      workspaceDir,
-      `import { Alpha } from '../commands/alpha'
-
-/** @riviere-role role-main */
-export function runRoleMain(): void {
-  Alpha.staticMethod()
-}
-`,
-    )
-    const result = createTestRoleEnforcementApplication().execute({
-      configDir: workspaceDir,
-      configModule: { config: testConfig },
-    })
-    expect(result.exitCode).toBe(1)
-    expect(result.stderr).toBe('')
-    expect(result.stdout).toContain('forbids non-construction usage')
-    expect(result.stdout).toContain('role-a')
-  })
-})
-
-it('rejects passing forbidden role import as function argument', () => {
-  withFixtureWorkspace((workspaceDir) => {
-    writeShellFile(
-      workspaceDir,
-      `import { Alpha } from '../commands/alpha'
-
-/** @riviere-role role-main */
-export function runRoleMain(): void {
-  console.log(Alpha)
-}
-`,
-    )
-    const result = createTestRoleEnforcementApplication().execute({
-      configDir: workspaceDir,
-      configModule: { config: testConfig },
-    })
-    expect(result.exitCode).toBe(1)
-    expect(result.stderr).toBe('')
-    expect(result.stdout).toContain('forbids non-construction usage')
-  })
-})
-
-it('accepts construction of imports with forbidden method call roles', () => {
-  withFixtureWorkspace((workspaceDir) => {
-    writeShellFile(
-      workspaceDir,
-      `import { Alpha } from '../commands/alpha'
-
-/** @riviere-role role-main */
-export function runRoleMain(): void {
-  const instance = new Alpha()
-}
-`,
-    )
-    const result = createTestRoleEnforcementApplication().execute({
-      configDir: workspaceDir,
-      configModule: { config: testConfig },
-    })
-    expect(result.exitCode).toBe(0)
-    expect(result.stderr).toBe('')
-  })
-})
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/commands/layer-dependency.spec.ts b/packages/riviere-role-enforcement/src/features/enforcement/commands/layer-dependency.spec.ts
deleted file mode 100644
index 610de7c53..000000000
--- a/packages/riviere-role-enforcement/src/features/enforcement/commands/layer-dependency.spec.ts
+++ /dev/null
@@ -1,309 +0,0 @@
-import assert from 'node:assert/strict'
-import * as fs from 'node:fs'
-import path from 'node:path'
-import { it } from 'vitest'
-import * as enforcementBuilder from '../domain/role-enforcement-builder'
-import * as fixtureWorkspace from './test-fixture-workspace'
-
-const layerTestRoles = [
-  enforcementBuilder.role('technical-service', {targets: ['function', 'interface', 'type-alias'],}),
-  enforcementBuilder.role('domain-port', { targets: ['interface', 'type-alias'] }),
-  enforcementBuilder.role('domain-port-adapter', {
-    targets: ['function'],
-    forbiddenDependencies: ['domain-port-adapter'],
-  }),
-  enforcementBuilder.role('command-use-case', {
-    targets: ['function'],
-    forbiddenDependencies: ['domain-port-adapter'],
-  }),
-  enforcementBuilder.role('external-client-service', { targets: ['function'] }),
-] as const
-
-const layerTestConfig = enforcementBuilder.roleEnforcement({
-  packages: ['packages/pkg-a'],
-  canonicalConfigurationsFile: '.riviere/canonical-role-configurations.md',
-  ignorePatterns: [],
-  roleDefinitionsDir: '.riviere/role-definitions',
-  roles: layerTestRoles,
-  locations: [
-    enforcementBuilder
-      .location<(typeof layerTestRoles)[number]['name']>('src')
-      .subLocation('/platform/infra', ['technical-service'], { mayImportRoles: [] }),
-  ],
-})
-
-const layerTestBootstrap = {
-  prefix: 'role-enforcement-layer-',
-  roles: layerTestRoles,
-  files: {
-    'packages/pkg-a/src/platform/infra/source.ts': `/** @riviere-role technical-service */
-export function source(): string {
-  return 'source'
-}
-`,
-  },
-}
-
-it('accepts imports within the infra layer', () => {
-  fixtureWorkspace.withWorkspaceFixture(layerTestBootstrap, (workspaceDir) => {
-    fixtureWorkspace.writeFixtureFile(
-      workspaceDir,
-      'packages/pkg-a/src/platform/infra/consumer.ts',
-      `import { source } from './source'
-
-/** @riviere-role technical-service */
-export function consume(): string {
-  return source()
-}
-`,
-    )
-
-    const result = runLayerEnforcement(workspaceDir)
-
-    assert.equal(result.exitCode, 0)
-    assert.equal(result.stderr, '')
-  })
-})
-
-it('accepts external library imports from infra', () => {
-  fixtureWorkspace.withWorkspaceFixture(layerTestBootstrap, (workspaceDir) => {
-    fixtureWorkspace.writeFixtureFile(
-      workspaceDir,
-      'packages/pkg-a/src/platform/infra/consumer.ts',
-      `import path from 'node:path'
-
-/** @riviere-role technical-service */
-export function consume(): string {
-  return path.basename('/tmp/example.txt')
-}
-`,
-    )
-
-    const result = runLayerEnforcement(workspaceDir)
-
-    assert.equal(result.exitCode, 0)
-    assert.equal(result.stderr, '')
-  })
-})
-
-it('rejects direct external package imports from adapters', () => {
-  fixtureWorkspace.withWorkspaceFixture(layerTestBootstrap, (workspaceDir) => {
-    const adapterConfig = createAdapterLayerConfig()
-    fixtureWorkspace.writeFixtureFile(
-      workspaceDir,
-      'packages/pkg-a/src/adapters/oxlint/oxlint-adapter.ts',
-      `import path from 'node:path'
-
-/** @riviere-role domain-port-adapter */
-export function run(): string {
-  return path.basename('/tmp/example.txt')
-}
-`,
-    )
-
-    const result = fixtureWorkspace.createTestRoleEnforcementApplication().execute({
-      configDir: workspaceDir,
-      configModule: { config: adapterConfig },
-    })
-
-    assert.equal(result.exitCode, 1)
-    assert.match(
-      result.stdout,
-      /Forbidden external import: files in 'packages\/pkg-a\/src\/adapters' cannot import external package 'node:path'/,
-    )
-  })
-})
-
-it('rejects imports between domain-port adapters', () => {
-  fixtureWorkspace.withWorkspaceFixture(layerTestBootstrap, (workspaceDir) => {
-    fixtureWorkspace.writeFixtureFile(
-      workspaceDir,
-      'packages/pkg-a/src/adapters/github/github-adapter.ts',
-      `/** @riviere-role domain-port-adapter */
-export function createGithubAdapter(): string {
-  return 'github'
-}
-`,
-    )
-    fixtureWorkspace.writeFixtureFile(
-      workspaceDir,
-      'packages/pkg-a/src/adapters/oxlint/oxlint-adapter.ts',
-      `import { createGithubAdapter } from '../github/github-adapter'
-
-/** @riviere-role domain-port-adapter */
-export function createOxlintAdapter(): string {
-  return createGithubAdapter()
-}
-`,
-    )
-
-    const result = fixtureWorkspace.createTestRoleEnforcementApplication().execute({
-      configDir: workspaceDir,
-      configModule: { config: createAdapterLayerConfig() },
-    })
-
-    assert.equal(result.exitCode, 1)
-    assert.match(
-      result.stdout,
-      /Forbidden dependency: this file \(domain-port-adapter\) cannot import from a file exporting 'domain-port-adapter'/,
-    )
-  })
-})
-
-it('rejects commands importing concrete domain-port adapters', () => {
-  fixtureWorkspace.withWorkspaceFixture(layerTestBootstrap, (workspaceDir) => {
-    fixtureWorkspace.writeFixtureFile(
-      workspaceDir,
-      'packages/pkg-a/src/adapters/oxlint/oxlint-adapter.ts',
-      `/** @riviere-role domain-port-adapter */
-export function createOxlintAdapter(): string {
-  return 'oxlint'
-}
-`,
-    )
-    fixtureWorkspace.writeFixtureFile(
-      workspaceDir,
-      'packages/pkg-a/src/commands/run.ts',
-      `import { createOxlintAdapter } from '../adapters/oxlint/oxlint-adapter'
-
-/** @riviere-role command-use-case */
-export function run(): string {
-  return createOxlintAdapter()
-}
-`,
-    )
-
-    const result = fixtureWorkspace.createTestRoleEnforcementApplication().execute({
-      configDir: workspaceDir,
-      configModule: { config: createAdapterLayerConfig() },
-    })
-
-    assert.equal(result.exitCode, 1)
-    assert.match(
-      result.stdout,
-      /Forbidden dependency: this file \(command-use-case\) cannot import from a file exporting 'domain-port-adapter'/,
-    )
-  })
-})
-
-it('rejects imports from infra to another internal layer', () => {
-  fixtureWorkspace.withWorkspaceFixture(layerTestBootstrap, (workspaceDir) => {
-    fixtureWorkspace.writeFixtureFile(
-      workspaceDir,
-      'packages/pkg-a/src/domain/domain-port.ts',
-      `/** @riviere-role domain-port */
-export interface DomainPort {
-  value(): string
-}
-`,
-    )
-    fixtureWorkspace.writeFixtureFile(
-      workspaceDir,
-      'packages/pkg-a/src/platform/infra/consumer.ts',
-      `import type { DomainPort } from '../../domain/domain-port'
-
-/** @riviere-role technical-service */
-export function consume(port: DomainPort): string {
-  return port.value()
-}
-`,
-    )
-
-    const result = runLayerEnforcement(workspaceDir)
-
-    assert.equal(result.exitCode, 1)
-    assert.equal(result.stderr, '')
-    assert.match(
-      result.stdout,
-      /Forbidden role import: files in 'packages\/pkg-a\/src\/platform\/infra' may only import roles \[\] across that location boundary/,
-    )
-    assert.match(result.stdout, /packages\/pkg-a\/src\/domain\/domain-port\.ts/)
-  })
-})
-
-it('rejects workspace package imports from infra when the target is not infra', () => {
-  fixtureWorkspace.withWorkspaceFixture(layerTestBootstrap, (workspaceDir) => {
-    const packageManifest = {
-      name: '@generic/pkg-domain',
-      exports: {
-        '.': { '@living-architecture/source': './src/index.ts' },
-        './package.json': './package.json',
-      },
-    }
-    fixtureWorkspace.writeFixtureFile(
-      workspaceDir,
-      'packages/pkg-domain/package.json',
-      JSON.stringify(packageManifest),
-    )
-    fixtureWorkspace.writeFixtureFile(
-      workspaceDir,
-      'packages/pkg-domain/src/index.ts',
-      `export type { DomainPort } from './domain/domain-port'
-`,
-    )
-    fixtureWorkspace.writeFixtureFile(
-      workspaceDir,
-      'packages/pkg-domain/src/domain/domain-port.ts',
-      `/** @riviere-role domain-port */
-export interface DomainPort {
-  value(): string
-}
-`,
-    )
-    fixtureWorkspace.writeFixtureFile(
-      workspaceDir,
-      'packages/pkg-a/src/platform/infra/consumer.ts',
-      `import type { DomainPort } from '@generic/pkg-domain'
-
-/** @riviere-role technical-service */
-export function consume(port: DomainPort): string {
-  return port.value()
-}
-`,
-    )
-    const packageScopeDir = path.join(workspaceDir, 'node_modules/@generic')
-    fs.mkdirSync(packageScopeDir, { recursive: true })
-    fs.symlinkSync(
-      path.join(workspaceDir, 'packages/pkg-domain'),
-      path.join(packageScopeDir, 'pkg-domain'),
-      'dir',
-    )
-
-    const result = runLayerEnforcement(workspaceDir)
-
-    assert.equal(result.exitCode, 1)
-    assert.equal(result.stderr, '')
-    assert.match(result.stdout, /packages\/pkg-domain\/src\/index\.ts/)
-  })
-})
-
-function runLayerEnforcement(workspaceDir: string) {
-  return fixtureWorkspace.createTestRoleEnforcementApplication().execute({
-    configDir: workspaceDir,
-    configModule: { config: layerTestConfig },
-  })
-}
-
-function createAdapterLayerConfig() {
-  return enforcementBuilder.roleEnforcement({
-    packages: ['packages/pkg-a'],
-    canonicalConfigurationsFile: '.riviere/canonical-role-configurations.md',
-    ignorePatterns: [],
-    roleDefinitionsDir: '.riviere/role-definitions',
-    roles: layerTestRoles,
-    locations: [
-      enforcementBuilder.location<(typeof layerTestRoles)[number]['name']>('src', [
-        'command-use-case',
-        'technical-service',
-      ]),
-      enforcementBuilder
-        .location<(typeof layerTestRoles)[number]['name']>('src')
-        .subLocation('/adapters', ['domain-port-adapter'], {
-          mayImportExternalPackages: false,
-          mayImportRoles: ['domain-port', 'external-client-service'],
-        })
-        .subLocation('/domain/ports', ['domain-port'])
-        .subLocation('/platform/infra', ['external-client-service']),
-    ],
-  })
-}
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/commands/run-role-enforcement-class-state.spec.ts b/packages/riviere-role-enforcement/src/features/enforcement/commands/run-role-enforcement-class-state.spec.ts
deleted file mode 100644
index 65bc5f9b3..000000000
--- a/packages/riviere-role-enforcement/src/features/enforcement/commands/run-role-enforcement-class-state.spec.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import {
-  expect, it 
-} from 'vitest'
-import {
-  configWithGenericClassStateConstraints, genericTestConfig 
-} from './test-fixture-config'
-import {
-  createTestRoleEnforcementApplication,
-  withGenericFixtureWorkspace,
-  writeDomainFile,
-} from './test-fixture-workspace'
-
-function runWith(config: typeof genericTestConfig, workspaceDir: string) {
-  return createTestRoleEnforcementApplication().execute({
-    configDir: workspaceDir,
-    configModule: { config },
-  })
-}
-
-it('rejects classes with callable instance members when role forbids them', () => {
-  withGenericFixtureWorkspace((workspaceDir) => {
-    writeDomainFile(
-      workspaceDir,
-      `/** @riviere-role role-b */
-export class Beta {
-  private readonly brand = 'Beta'
-  readonly matches: () => boolean = () => true
-
-  cancel(): void {}
-}
-`,
-    )
-    const result = runWith(configWithGenericClassStateConstraints(), workspaceDir)
-    expect(result.exitCode).toBe(1)
-    expect(result.stderr).toBe('')
-    expect(result.stdout).toContain("forbids callable instance members on 'Beta'")
-    expect(result.stdout).toContain('Found [matches]')
-  })
-})
-
-it('rejects classes without non-callable instance data members when role requires them', () => {
-  withGenericFixtureWorkspace((workspaceDir) => {
-    writeDomainFile(
-      workspaceDir,
-      `/** @riviere-role role-b */
-export class Beta {
-  private readonly brand = 'Beta'
-
-  cancel(): void {}
-}
-`,
-    )
-    const result = runWith(configWithGenericClassStateConstraints(), workspaceDir)
-    expect(result.exitCode).toBe(1)
-    expect(result.stderr).toBe('')
-    expect(result.stdout).toContain(
-      "requires at least one non-callable instance data member on 'Beta'",
-    )
-  })
-})
-
-it('accepts classes with non-callable instance data members when role requires them', () => {
-  withGenericFixtureWorkspace((workspaceDir) => {
-    writeDomainFile(
-      workspaceDir,
-      `/** @riviere-role role-b */
-export class Beta {
-  private readonly brand = 'Beta'
-  readonly label = 'beta'
-
-  cancel(): void {}
-}
-`,
-    )
-    const result = runWith(configWithGenericClassStateConstraints(), workspaceDir)
-    expect(result.exitCode).toBe(0)
-    expect(result.stderr).toBe('')
-  })
-})
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/commands/run-role-enforcement.ts b/packages/riviere-role-enforcement/src/features/enforcement/commands/run-role-enforcement.ts
deleted file mode 100644
index 9e9e3b546..000000000
--- a/packages/riviere-role-enforcement/src/features/enforcement/commands/run-role-enforcement.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { RoleEnforcementProjectRepository } from '../data-access/role-enforcement-project-repository'
-import { PackageFilterError } from '../domain/filter-config-by-package'
-import { RoleEnforcementExecutionError } from '../domain/role-enforcement-execution-error'
-import type { RoleEnforcementRunner } from '../domain/ports/role-enforcement-runner'
-import type { RunRoleEnforcementInput } from './run-role-enforcement-input'
-import type { RunRoleEnforcementResult } from './run-role-enforcement-result'
-
-interface RunRoleEnforcementDependencies {
-  now: () => number
-  projectRepository: RoleEnforcementProjectRepository
-  runner: RoleEnforcementRunner
-}
-
-/** @riviere-role command-use-case */
-export class RunRoleEnforcement {
-  private readonly deps: RunRoleEnforcementDependencies
-
-  constructor(deps: RunRoleEnforcementDependencies) {
-    this.deps = deps
-  }
-
-  execute(input: RunRoleEnforcementInput): RunRoleEnforcementResult {
-    const start = this.deps.now()
-    try {
-      const project = this.deps.projectRepository.load(input.configModule, input.configDir)
-      const adapterResult = project.execute(this.deps.runner, input.packageFilter)
-      return {
-        durationMs: this.deps.now() - start,
-        exitCode: adapterResult.exitCode,
-        stderr: adapterResult.stderr,
-        stdout: adapterResult.stdout,
-      }
-    } catch (error) {
-      if (error instanceof RoleEnforcementExecutionError || error instanceof PackageFilterError) {
-        return {
-          durationMs: this.deps.now() - start,
-          exitCode: 1,
-          stderr: `${error.message}\n`,
-          stdout: '',
-        }
-      }
-      throw error
-    }
-  }
-}
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/commands/test-fixture-config.ts b/packages/riviere-role-enforcement/src/features/enforcement/commands/test-fixture-config.ts
deleted file mode 100644
index f3dad16ff..000000000
--- a/packages/riviere-role-enforcement/src/features/enforcement/commands/test-fixture-config.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-import {
-  location, role, roleEnforcement 
-} from '../domain/role-enforcement-builder'
-
-export const genericTestRoles = [
-  role('role-a', {
-    targets: ['function'],
-    allowedInputs: ['role-a-input'],
-    allowedNames: ['doAlpha'],
-    allowedOutputs: ['role-a-result', 'role-c-error'],
-  }),
-  role('role-a-input', {
-    targets: ['interface'],
-    allowedNames: ['AlphaInput'],
-  }),
-  role('role-a-result', {
-    targets: ['interface'],
-    allowedNames: ['AlphaResult'],
-  }),
-  role('role-c-error', { targets: ['class'] }),
-  role('role-b', {
-    targets: ['class'],
-    minPublicMethods: 1,
-  }),
-  role('role-b-repository', {
-    targets: ['class'],
-    allowedOutputs: ['role-b'],
-  }),
-  role('role-entry', {
-    targets: ['function'],
-    allowedNames: ['createEntry'],
-  }),
-] as const
-
-type GenericTestRoleName = (typeof genericTestRoles)[number]['name']
-
-const genericTestLocations = [
-  location<GenericTestRoleName>('src')
-    .subLocation('/commands', ['role-a', 'role-a-input', 'role-a-result'])
-    .subLocation('/entrypoint', ['role-entry'])
-    .subLocation('/domain', ['role-b', 'role-c-error'])
-    .subLocation('/repositories', ['role-b-repository']),
-]
-
-export const genericTestConfig = roleEnforcement({
-  packages: ['packages/pkg-a'],
-  canonicalConfigurationsFile: '.riviere/canonical-role-configurations.md',
-  ignorePatterns: ['**/*.spec.ts'],
-  roleDefinitionsDir: '.riviere/role-definitions',
-  roles: genericTestRoles,
-  locations: genericTestLocations,
-})
-
-function configWithGenericAggregateOverride(aggregateOptions: Parameters<typeof role>[1]) {
-  return roleEnforcement({
-    packages: ['packages/pkg-a'],
-    canonicalConfigurationsFile: '.riviere/canonical-role-configurations.md',
-    ignorePatterns: ['**/*.spec.ts'],
-    roleDefinitionsDir: '.riviere/role-definitions',
-    roles: [
-      ...genericTestRoles.filter((r) => r.name !== 'role-b'),
-      role('role-b', aggregateOptions),
-    ],
-    locations: genericTestLocations,
-  })
-}
-
-export function configWithGenericMaxPublicMethods() {
-  return configWithGenericAggregateOverride({
-    targets: ['class'],
-    minPublicMethods: 1,
-    maxPublicMethods: 1,
-  })
-}
-
-export function configWithGenericApprovedAggregates(approvedNames: string[]) {
-  return configWithGenericAggregateOverride({
-    targets: ['class'],
-    minPublicMethods: 1,
-    approvedInstances: approvedNames.map((name) => ({
-      name,
-      userHasApproved: true as const,
-    })),
-  })
-}
-
-export function configWithGenericRequiredPrivateMembers(requiredPrivateMembers: string[]) {
-  return configWithGenericAggregateOverride({
-    targets: ['class'],
-    minPublicMethods: 1,
-    requiredPrivateMembers,
-  })
-}
-
-export function configWithGenericClassStateConstraints() {
-  return configWithGenericAggregateOverride({
-    targets: ['class'],
-    requiredPrivateMembers: ['brand'],
-    requiresDataMembers: true,
-    forbiddenCallableMembers: true,
-  })
-}
-
-export function configWithGenericRepositoryMethodInputs(allowedInputs: string[]) {
-  return roleEnforcement({
-    packages: ['packages/pkg-a'],
-    canonicalConfigurationsFile: '.riviere/canonical-role-configurations.md',
-    ignorePatterns: ['**/*.spec.ts'],
-    roleDefinitionsDir: '.riviere/role-definitions',
-    roles: [
-      ...genericTestRoles.filter((r) => r.name !== 'role-b-repository'),
-      role('role-b-repository', {
-        targets: ['class'],
-        allowedInputs,
-        allowedOutputs: ['role-b'],
-      }),
-    ],
-    locations: genericTestLocations,
-  })
-}
-
-export function configWithGenericRepositoryMethodInputsOnly(allowedInputs: string[]) {
-  return roleEnforcement({
-    packages: ['packages/pkg-a'],
-    canonicalConfigurationsFile: '.riviere/canonical-role-configurations.md',
-    ignorePatterns: ['**/*.spec.ts'],
-    roleDefinitionsDir: '.riviere/role-definitions',
-    roles: [
-      ...genericTestRoles.filter((r) => r.name !== 'role-b-repository'),
-      role('role-b-repository', {
-        targets: ['class'],
-        allowedInputs,
-      }),
-    ],
-    locations: genericTestLocations,
-  })
-}
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/commands/test-fixture-workspace.ts b/packages/riviere-role-enforcement/src/features/enforcement/commands/test-fixture-workspace.ts
deleted file mode 100644
index a4a28cdf4..000000000
--- a/packages/riviere-role-enforcement/src/features/enforcement/commands/test-fixture-workspace.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import {
-  mkdtempSync, mkdirSync, rmSync, writeFileSync 
-} from 'node:fs'
-import { tmpdir } from 'node:os'
-import path from 'node:path'
-import { fileURLToPath } from 'node:url'
-import { createOxlintRoleEnforcementRunner } from '../adapters/oxlint/oxlint-role-enforcement-runner'
-import { RoleEnforcementProjectRepository } from '../data-access/role-enforcement-project-repository'
-import { findFileUp } from '../../../platform/infra/external-clients/filesystem/find-file-up'
-import { runOxlint } from '../../../platform/infra/external-clients/oxlint/index'
-import { genericTestRoles } from './test-fixture-config'
-import { RunRoleEnforcement } from './run-role-enforcement'
-
-interface WorkspaceBootstrap {
-  readonly prefix: string
-  readonly roles: readonly { readonly name: string }[]
-  readonly files: Readonly<Record<string, string>>
-}
-
-export function createTestRoleEnforcementApplication(): RunRoleEnforcement {
-  const startDirectory = path.dirname(fileURLToPath(import.meta.url))
-  const pluginPath = findFileUp(startDirectory, 'role-enforcement-plugin.mjs')
-  return new RunRoleEnforcement({
-    now: () => 0,
-    projectRepository: new RoleEnforcementProjectRepository(),
-    runner: createOxlintRoleEnforcementRunner(runOxlint, pluginPath),
-  })
-}
-
-export function withWorkspaceFixture(
-  bootstrap: WorkspaceBootstrap,
-  fn: (workspaceDir: string) => void,
-): void {
-  const workspaceDir = createWorkspaceFixture(bootstrap)
-  try {
-    fn(workspaceDir)
-  } finally {
-    rmSync(workspaceDir, {
-      force: true,
-      recursive: true,
-    })
-  }
-}
-
-export function writeFixtureFile(
-  workspaceDir: string,
-  relativePath: string,
-  content: string,
-): void {
-  const fullPath = path.join(workspaceDir, relativePath)
-  mkdirSync(path.dirname(fullPath), { recursive: true })
-  writeFileSync(fullPath, content)
-}
-
-export function withGenericFixtureWorkspace(fn: (workspaceDir: string) => void): void {
-  withWorkspaceFixture(
-    {
-      prefix: 'role-enforcement-workspace-',
-      roles: genericTestRoles,
-      files: genericFixtureFiles,
-    },
-    fn,
-  )
-}
-
-export function writeCommandFile(workspaceDir: string, content: string): void {
-  writeFixtureFile(workspaceDir, 'packages/pkg-a/src/commands/doAlpha.ts', content)
-}
-
-export function writeDomainFile(workspaceDir: string, content: string): void {
-  writeFixtureFile(workspaceDir, 'packages/pkg-a/src/domain/beta.ts', content)
-}
-
-export function writeRepositoryFile(workspaceDir: string, content: string): void {
-  writeFixtureFile(workspaceDir, 'packages/pkg-a/src/repositories/betaRepository.ts', content)
-}
-
-function createWorkspaceFixture(bootstrap: WorkspaceBootstrap): string {
-  const workspaceDir = mkdtempSync(path.join(tmpdir(), bootstrap.prefix))
-  writeFixtureFile(
-    workspaceDir,
-    '.riviere/canonical-role-configurations.md',
-    '# Canonical Role Configurations',
-  )
-  for (const r of bootstrap.roles) {
-    writeFixtureFile(workspaceDir, `.riviere/role-definitions/${r.name}.md`, `# ${r.name}`)
-  }
-  for (const [relativePath, content] of Object.entries(bootstrap.files)) {
-    writeFixtureFile(workspaceDir, relativePath, content)
-  }
-  return workspaceDir
-}
-
-const genericFixtureFiles: Readonly<Record<string, string>> = {
-  'packages/pkg-a/src/commands/alphaInput.ts': `/** @riviere-role role-a-input */
-export interface AlphaInput {
-  configPath: string
-}
-`,
-  'packages/pkg-a/src/commands/alphaResult.ts': `/** @riviere-role role-a-result */
-export interface AlphaResult {
-  status: 'ok'
-}
-`,
-  'packages/pkg-a/src/commands/doAlpha.ts': `import type { AlphaInput } from './alphaInput'
-import type { AlphaResult } from './alphaResult'
-
-/** @riviere-role role-a */
-export function doAlpha(alphaInput: AlphaInput): AlphaResult {
-  return {
-    status: 'ok',
-  }
-}
-`,
-  'packages/pkg-a/src/entrypoint/entry.ts': `/** @riviere-role role-entry */
-export function createEntry(): void {}
-`,
-  'packages/pkg-a/src/domain/alphaError.ts': `/** @riviere-role role-c-error */
-export class AlphaError extends Error {}
-`,
-  'packages/pkg-a/src/domain/beta.ts': `/** @riviere-role role-b */
-export class Beta {
-  cancel(): void {}
-}
-`,
-  'packages/pkg-a/src/repositories/betaRepository.ts': `import type { Beta } from '../domain/beta'
-
-/** @riviere-role role-b-repository */
-export class BetaRepository {
-  findById(id: string): Beta {
-    return null as unknown as Beta
-  }
-}
-`,
-}
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/commands/workspace-package-resolution.spec.ts b/packages/riviere-role-enforcement/src/features/enforcement/commands/workspace-package-resolution.spec.ts
deleted file mode 100644
index 0451cef0a..000000000
--- a/packages/riviere-role-enforcement/src/features/enforcement/commands/workspace-package-resolution.spec.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import {
-  expect, it 
-} from 'vitest'
-import {
-  location, role, roleEnforcement 
-} from '../domain/role-enforcement-builder'
-import {
-  createTestRoleEnforcementApplication,
-  withWorkspaceFixture,
-  writeFixtureFile,
-} from './test-fixture-workspace'
-
-const workspacePackageTestRoles = [
-  role('role-b', {
-    targets: ['class'],
-    minPublicMethods: 1,
-  }),
-  role('role-b-repository', {
-    targets: ['class'],
-    allowedOutputs: ['role-b'],
-  }),
-] as const
-
-const workspacePackageConfig = roleEnforcement({
-  packages: ['packages/pkg-a'],
-  canonicalConfigurationsFile: '.riviere/canonical-role-configurations.md',
-  ignorePatterns: [],
-  roleDefinitionsDir: '.riviere/role-definitions',
-  roles: workspacePackageTestRoles,
-  workspacePackageSources: { '@generic/pkg-lib': 'packages/pkg-lib/src/index.ts' },
-  locations: [
-    location<(typeof workspacePackageTestRoles)[number]['name']>('src').subLocation(
-      '/repositories',
-      ['role-b-repository'],
-    ),
-  ],
-})
-
-const workspacePackageBootstrap = {
-  prefix: 'role-enforcement-pkg-',
-  roles: workspacePackageTestRoles,
-  files: {
-    'packages/pkg-lib/src/beta.ts': `/** @riviere-role role-b */
-export class Beta {
-  cancel(): void {}
-}
-`,
-    'packages/pkg-lib/src/index.ts': `export * from './beta'
-`,
-    'packages/pkg-a/src/repositories/betaRepository.ts': `import type { Beta } from '@generic/pkg-lib'
-
-/** @riviere-role role-b-repository */
-export class BetaRepository {
-  findById(id: string): Beta {
-    return null as unknown as Beta
-  }
-}
-`,
-  },
-}
-
-it('accepts aggregate-repository returning aggregate from workspace package via barrel export', () => {
-  withWorkspaceFixture(workspacePackageBootstrap, (workspaceDir) => {
-    const result = createTestRoleEnforcementApplication().execute({
-      configDir: workspaceDir,
-      configModule: { config: workspacePackageConfig },
-    })
-
-    expect(result.exitCode).toBe(0)
-    expect(result.stderr).toBe('')
-  })
-})
-
-it('rejects aggregate-repository returning unannotated class from workspace package', () => {
-  withWorkspaceFixture(workspacePackageBootstrap, (workspaceDir) => {
-    writeFixtureFile(
-      workspaceDir,
-      'packages/pkg-lib/src/beta.ts',
-      `export class Beta {
-  cancel(): void {}
-}
-`,
-    )
-
-    const result = createTestRoleEnforcementApplication().execute({
-      configDir: workspaceDir,
-      configModule: { config: workspacePackageConfig },
-    })
-
-    expect(result.exitCode).toBe(1)
-    expect(result.stderr).toBe('')
-    expect(result.stdout).toContain('only allows outputs [role-b]')
-  })
-})
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/data-access/role-enforcement-project-repository.spec.ts b/packages/riviere-role-enforcement/src/features/enforcement/data-access/role-enforcement-project-repository.spec.ts
deleted file mode 100644
index 4b2920cc9..000000000
--- a/packages/riviere-role-enforcement/src/features/enforcement/data-access/role-enforcement-project-repository.spec.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import { location, role, roleEnforcement } from '../domain/role-enforcement-builder'
-import { RoleEnforcementExecutionError } from '../domain/role-enforcement-execution-error'
-import { RoleEnforcementProject } from '../domain/role-enforcement-project'
-import { RoleEnforcementProjectRepository } from './role-enforcement-project-repository'
-
-const minimalConfig = roleEnforcement({
-  canonicalConfigurationsFile: '.riviere/canonical-role-configurations.md',
-  packages: ['packages/pkg-a'],
-  ignorePatterns: [],
-  roleDefinitionsDir: '.riviere/role-definitions',
-  roles: [role('role-entry', { targets: ['function'] })] as const,
-  locations: [location<'role-entry'>('src').subLocation('/entrypoint', ['role-entry'])],
-})
-
-function createRepository() {
-  return new RoleEnforcementProjectRepository({
-    findFilesMatchingPatterns: vi.fn((): string[] => []),
-    readDirectory: vi.fn((): [] => []),
-    realpath: vi.fn((filePath: string): string => filePath),
-  })
-}
-
-describe('RoleEnforcementProjectRepository', () => {
-  it('loads a project when the module exports config directly', () => {
-    expect(createRepository().load({ config: minimalConfig }, '/repo')).toBeInstanceOf(
-      RoleEnforcementProject,
-    )
-  })
-
-  it('loads a project when the module wraps config in a default export', () => {
-    expect(createRepository().load({ default: { config: minimalConfig } }, '/repo')).toBeInstanceOf(
-      RoleEnforcementProject,
-    )
-  })
-
-  it('prefers top-level config when both exports exist', () => {
-    const repository = createRepository()
-    const project = repository.load(
-      {
-        config: minimalConfig,
-        default: { config: {} },
-      },
-      '/repo',
-    )
-
-    expect(project).toBeInstanceOf(RoleEnforcementProject)
-  })
-
-  it.each([null, 'not-an-object', { other: 'value' }])(
-    'throws when the module does not export config',
-    (configModule) => {
-      expect(() => createRepository().load(configModule, '/repo')).toThrow(
-        "Config module must export a 'config' property.",
-      )
-    },
-  )
-
-  it.each(['not-an-object', null])('throws when config is not an object', (config) => {
-    expect(() => createRepository().load({ config }, '/repo')).toThrow(
-      "Config module 'config' export must be an object.",
-    )
-  })
-
-  it.each([['include'], ['ignorePatterns'], ['layers'], ['roles'], ['roleDefinitionsDir']])(
-    "throws when config is missing the '%s' property",
-    (missingKey) => {
-      const incomplete: Record<string, unknown> = {
-        include: minimalConfig.include,
-        ignorePatterns: minimalConfig.ignorePatterns,
-        layers: minimalConfig.layers,
-        roles: minimalConfig.roles,
-        roleDefinitionsDir: minimalConfig.roleDefinitionsDir,
-      }
-      delete incomplete[missingKey]
-
-      expect(() => createRepository().load({ config: incomplete }, '/repo')).toThrow(
-        new RoleEnforcementExecutionError(`Config is missing required property '${missingKey}'.`),
-      )
-    },
-  )
-})
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/data-access/role-enforcement-project-repository.ts b/packages/riviere-role-enforcement/src/features/enforcement/data-access/role-enforcement-project-repository.ts
deleted file mode 100644
index 8fed6e6b4..000000000
--- a/packages/riviere-role-enforcement/src/features/enforcement/data-access/role-enforcement-project-repository.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { readdirSync, realpathSync } from 'node:fs'
-import type { findFilesMatchingPatterns } from '../../../platform/infra/external-clients/filesystem/find-files-matching-patterns'
-import { findFilesMatchingPatterns as defaultFindFilesMatchingPatterns } from '../../../platform/infra/external-clients/filesystem/find-files-matching-patterns'
-import type { RoleEnforcementResult } from '../domain/role-enforcement-builder'
-import { RoleEnforcementExecutionError } from '../domain/role-enforcement-execution-error'
-import { RoleEnforcementProject } from '../domain/role-enforcement-project'
-
-type ReadDirectory = Parameters<typeof findFilesMatchingPatterns>[3]
-
-const defaultDependencies = {
-  findFilesMatchingPatterns: defaultFindFilesMatchingPatterns,
-  readDirectory: defaultReadDirectory,
-  realpath: (filePath: string) => realpathSync(filePath),
-}
-
-function defaultReadDirectory(
-  rootDir: Parameters<ReadDirectory>[0],
-  options: Parameters<ReadDirectory>[1],
-): ReturnType<ReadDirectory> {
-  return readdirSync(rootDir, options)
-}
-
-/** @riviere-role aggregate-repository */
-export class RoleEnforcementProjectRepository {
-  private readonly dependencies: typeof defaultDependencies
-
-  constructor(dependencies: Partial<typeof defaultDependencies> = {}) {
-    this.dependencies = {
-      ...defaultDependencies,
-      ...dependencies,
-    }
-  }
-
-  load(configModule: unknown, configDir: string): RoleEnforcementProject {
-    const config = readConfig(configModule)
-    const canonicalConfigDir = this.dependencies.realpath(configDir)
-    const lintTargets = this.dependencies.findFilesMatchingPatterns(
-      canonicalConfigDir,
-      config.include,
-      config.ignorePatterns,
-      this.dependencies.readDirectory,
-    )
-    return new RoleEnforcementProject(config, canonicalConfigDir, lintTargets)
-  }
-}
-
-function readConfig(configModule: unknown): RoleEnforcementResult {
-  const resolved = resolveModuleExports(configModule)
-  if (typeof resolved !== 'object' || resolved === null || !('config' in resolved)) {
-    throw new RoleEnforcementExecutionError("Config module must export a 'config' property.")
-  }
-
-  const { config } = resolved
-  assertRoleEnforcementResult(config)
-  return config
-}
-
-function resolveModuleExports(loaded: unknown): unknown {
-  if (typeof loaded !== 'object' || loaded === null) {
-    return loaded
-  }
-  if ('config' in loaded) {
-    return loaded
-  }
-  if ('default' in loaded) {
-    return loaded.default
-  }
-  return loaded
-}
-
-function assertRoleEnforcementResult(value: unknown): asserts value is RoleEnforcementResult {
-  if (typeof value !== 'object' || value === null) {
-    throw new RoleEnforcementExecutionError("Config module 'config' export must be an object.")
-  }
-
-  const required = ['include', 'ignorePatterns', 'layers', 'roles', 'roleDefinitionsDir']
-  for (const key of required) {
-    if (!(key in value)) {
-      throw new RoleEnforcementExecutionError(`Config is missing required property '${key}'.`)
-    }
-  }
-}
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/domain/filter-config-by-package.spec.ts b/packages/riviere-role-enforcement/src/features/enforcement/domain/filter-config-by-package.spec.ts
deleted file mode 100644
index 3c2ccac00..000000000
--- a/packages/riviere-role-enforcement/src/features/enforcement/domain/filter-config-by-package.spec.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { filterConfigByPackage, PackageFilterError } from './filter-config-by-package'
-import type { RoleEnforcementResult } from './role-enforcement-builder'
-import { role } from './role-enforcement-builder'
-
-const testRoles = [
-  role('cli-entrypoint', { targets: ['function'] }),
-  role('aggregate', { targets: ['class'] }),
-] as const
-
-function createMultiPackageConfig(): RoleEnforcementResult {
-  return {
-    ignorePatterns: ['**/*.spec.ts'],
-    include: ['packages/riviere-cli/src/**/*.ts', 'packages/riviere-extract-ts/src/**/*.ts'],
-    layers: {
-      'packages/riviere-cli/src/features/entrypoint': {
-        allowedRoles: ['cli-entrypoint'],
-        paths: ['packages/riviere-cli/src/features/entrypoint'],
-      },
-      'packages/riviere-cli/src/features/domain': {
-        allowedRoles: ['aggregate'],
-        paths: ['packages/riviere-cli/src/features/domain'],
-      },
-      'packages/riviere-extract-ts/src/features/entrypoint': {
-        allowedRoles: ['cli-entrypoint'],
-        paths: ['packages/riviere-extract-ts/src/features/entrypoint'],
-      },
-    },
-    roleDefinitionsDir: '.riviere/role-definitions',
-    roles: testRoles,
-  }
-}
-
-describe('filterConfigByPackage', () => {
-  it('filters include patterns to the specified package', () => {
-    const config = createMultiPackageConfig()
-
-    const result = filterConfigByPackage(config, 'packages/riviere-cli')
-
-    expect(result.include).toStrictEqual(['packages/riviere-cli/src/**/*.ts'])
-  })
-
-  it('filters layers to the specified package', () => {
-    const config = createMultiPackageConfig()
-
-    const result = filterConfigByPackage(config, 'packages/riviere-cli')
-
-    expect(Object.keys(result.layers)).toStrictEqual([
-      'packages/riviere-cli/src/features/entrypoint',
-      'packages/riviere-cli/src/features/domain',
-    ])
-  })
-
-  it('preserves ignorePatterns unchanged', () => {
-    const config = createMultiPackageConfig()
-
-    const result = filterConfigByPackage(config, 'packages/riviere-cli')
-
-    expect(result.ignorePatterns).toStrictEqual(['**/*.spec.ts'])
-  })
-
-  it('preserves roles unchanged', () => {
-    const config = createMultiPackageConfig()
-
-    const result = filterConfigByPackage(config, 'packages/riviere-cli')
-
-    expect(result.roles).toBe(testRoles)
-  })
-
-  it('preserves roleDefinitionsDir unchanged', () => {
-    const config = createMultiPackageConfig()
-
-    const result = filterConfigByPackage(config, 'packages/riviere-cli')
-
-    expect(result.roleDefinitionsDir).toBe('.riviere/role-definitions')
-  })
-
-  it('strips trailing slashes from package path', () => {
-    const config = createMultiPackageConfig()
-
-    const result = filterConfigByPackage(config, 'packages/riviere-cli/')
-
-    expect(result.include).toStrictEqual(['packages/riviere-cli/src/**/*.ts'])
-  })
-
-  it('throws PackageFilterError when package matches no include patterns', () => {
-    const config = createMultiPackageConfig()
-
-    expect(() => filterConfigByPackage(config, 'packages/nonexistent')).toThrow(PackageFilterError)
-  })
-
-  it('includes available packages in error message', () => {
-    const config = createMultiPackageConfig()
-
-    expect(() => filterConfigByPackage(config, 'packages/nonexistent')).toThrow(
-      /packages\/riviere-cli, packages\/riviere-extract-ts/,
-    )
-  })
-
-  it('uses full pattern as package name when include pattern has no /src/ segment', () => {
-    const config: RoleEnforcementResult = {
-      ...createMultiPackageConfig(),
-      include: ['custom-path/**/*.ts'],
-    }
-
-    expect(() => filterConfigByPackage(config, 'packages/nonexistent')).toThrow(
-      /custom-path\/\*\*\/\*\.ts/,
-    )
-  })
-
-  it('filters to the other package when specified', () => {
-    const config = createMultiPackageConfig()
-
-    const result = filterConfigByPackage(config, 'packages/riviere-extract-ts')
-
-    expect(result.include).toStrictEqual(['packages/riviere-extract-ts/src/**/*.ts'])
-    expect(Object.keys(result.layers)).toStrictEqual([
-      'packages/riviere-extract-ts/src/features/entrypoint',
-    ])
-  })
-
-  it('preserves workspacePackageSources when present', () => {
-    const sources = {'@living-architecture/riviere-builder': 'packages/riviere-builder/src/index.ts',}
-    const config: RoleEnforcementResult = {
-      ...createMultiPackageConfig(),
-      workspacePackageSources: sources,
-    }
-
-    const result = filterConfigByPackage(config, 'packages/riviere-cli')
-
-    expect(result.workspacePackageSources).toStrictEqual(sources)
-  })
-
-  it('preserves layer properties including forbiddenImports', () => {
-    const entrypointLayer = {
-      allowedRoles: ['cli-entrypoint'],
-      forbiddenImports: ['**/infra/persistence/**'],
-      paths: ['packages/riviere-cli/src/features/entrypoint'],
-    }
-    const config: RoleEnforcementResult = {
-      ...createMultiPackageConfig(),
-      layers: { 'packages/riviere-cli/src/features/entrypoint': entrypointLayer },
-    }
-
-    const result = filterConfigByPackage(config, 'packages/riviere-cli')
-
-    expect(result.layers['packages/riviere-cli/src/features/entrypoint']).toStrictEqual(
-      entrypointLayer,
-    )
-  })
-})
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/domain/filter-config-by-package.ts b/packages/riviere-role-enforcement/src/features/enforcement/domain/filter-config-by-package.ts
deleted file mode 100644
index 121fe8575..000000000
--- a/packages/riviere-role-enforcement/src/features/enforcement/domain/filter-config-by-package.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import type { RoleEnforcementResult } from './role-enforcement-builder'
-
-/** @riviere-role domain-service */
-export function filterConfigByPackage(
-  config: RoleEnforcementResult,
-  packagePath: string,
-): RoleEnforcementResult {
-  const normalizedPath = stripTrailingSlashes(packagePath)
-
-  const filteredInclude = config.include.filter((pattern) =>
-    pattern.startsWith(`${normalizedPath}/`),
-  )
-
-  if (filteredInclude.length === 0) {
-    throw new PackageFilterError(
-      `No include patterns match package '${normalizedPath}'. Available packages: ${config.include.map(extractPackagePath).join(', ')}`,
-    )
-  }
-
-  const filteredLayers: Record<string, RoleEnforcementResult['layers'][string]> = {}
-  for (const [key, layer] of Object.entries(config.layers)) {
-    if (key.startsWith(`${normalizedPath}/`)) {
-      filteredLayers[key] = layer
-    }
-  }
-
-  return {
-    ...config,
-    include: filteredInclude,
-    layers: filteredLayers,
-  }
-}
-
-function extractPackagePath(includePattern: string): string {
-  const srcIndex = includePattern.indexOf('/src/')
-  if (srcIndex < 0) {
-    return includePattern
-  }
-  return includePattern.slice(0, srcIndex)
-}
-
-function stripTrailingSlashes(value: string): string {
-  if (!value.endsWith('/')) {
-    return value
-  }
-  const chars = [...value]
-  while (chars.length > 0 && chars[chars.length - 1] === '/') {
-    chars.pop()
-  }
-  return chars.join('')
-}
-
-/** @riviere-role domain-error */
-export class PackageFilterError extends Error {
-  constructor(message: string) {
-    super(message)
-    this.name = 'PackageFilterError'
-  }
-}
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/domain/role-enforcement-builder.spec.ts b/packages/riviere-role-enforcement/src/features/enforcement/domain/role-enforcement-builder.spec.ts
deleted file mode 100644
index 8c1b3d159..000000000
--- a/packages/riviere-role-enforcement/src/features/enforcement/domain/role-enforcement-builder.spec.ts
+++ /dev/null
@@ -1,380 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { createRoleFactory, location, role, roleEnforcement } from './role-enforcement-builder'
-
-describe('role', () => {
-  it('produces a role definition with the given name and options', () => {
-    const result = role('aggregate', { targets: ['interface', 'type-alias', 'class'] })
-
-    expect(result).toStrictEqual({
-      name: 'aggregate',
-      targets: ['interface', 'type-alias', 'class'],
-    })
-  })
-
-  it('includes optional constraints when provided', () => {
-    const result = role('command-use-case', {
-      targets: ['function'],
-      allowedInputs: ['command-use-case-input'],
-      allowedOutputs: ['command-use-case-result'],
-      forbiddenDependencies: ['command-use-case'],
-      nameMatches: '.*UseCase$',
-    })
-
-    expect(result).toStrictEqual({
-      name: 'command-use-case',
-      targets: ['function'],
-      allowedInputs: ['command-use-case-input'],
-      allowedOutputs: ['command-use-case-result'],
-      forbiddenDependencies: ['command-use-case'],
-      nameMatches: '.*UseCase$',
-    })
-  })
-
-  it('includes allowedNames when provided', () => {
-    const result = role('cli-entrypoint', {
-      targets: ['function'],
-      allowedNames: ['main', 'run'],
-    })
-
-    expect(result).toStrictEqual({
-      name: 'cli-entrypoint',
-      targets: ['function'],
-      allowedNames: ['main', 'run'],
-    })
-  })
-
-  it('includes maxPublicMethods when provided', () => {
-    const result = role('command-use-case', {
-      targets: ['class'],
-      minPublicMethods: 1,
-      maxPublicMethods: 1,
-    })
-
-    expect(result).toStrictEqual({
-      name: 'command-use-case',
-      targets: ['class'],
-      minPublicMethods: 1,
-      maxPublicMethods: 1,
-    })
-  })
-
-  it('includes approvedInstances when provided', () => {
-    const result = role('aggregate', {
-      targets: ['interface', 'type-alias', 'class'],
-      minPublicMethods: 1,
-      approvedInstances: [
-        {
-          name: 'ExtractionProject',
-          userHasApproved: true,
-        },
-      ],
-    })
-
-    expect(result).toStrictEqual({
-      name: 'aggregate',
-      targets: ['interface', 'type-alias', 'class'],
-      minPublicMethods: 1,
-      approvedInstances: [
-        {
-          name: 'ExtractionProject',
-          userHasApproved: true,
-        },
-      ],
-    })
-  })
-
-  it('includes requiredPrivateMembers when provided', () => {
-    const result = role('role-b', {
-      targets: ['class'],
-      requiredPrivateMembers: ['brand'],
-    })
-
-    expect(result).toStrictEqual({
-      name: 'role-b',
-      targets: ['class'],
-      requiredPrivateMembers: ['brand'],
-    })
-  })
-
-  it('includes generic class state constraints when provided', () => {
-    const result = role('role-b', {
-      targets: ['class'],
-      requiresDataMembers: true,
-      forbiddenCallableMembers: true,
-    })
-
-    expect(result).toStrictEqual({
-      name: 'role-b',
-      targets: ['class'],
-      requiresDataMembers: true,
-      forbiddenCallableMembers: true,
-    })
-  })
-
-  it('includes forbiddenMethodCalls when provided', () => {
-    const result = role('main', {
-      targets: ['function'],
-      forbiddenMethodCalls: ['command-use-case', 'aggregate-repository'],
-    })
-
-    expect(result).toStrictEqual({
-      name: 'main',
-      targets: ['function'],
-      forbiddenMethodCalls: ['command-use-case', 'aggregate-repository'],
-    })
-  })
-})
-
-describe('createRoleFactory', () => {
-  it('produces a role with typed name constraint', () => {
-    type TestRole = 'aggregate' | 'aggregate-repository'
-    const typedRole = createRoleFactory<TestRole>()
-
-    const result = typedRole('aggregate', { targets: ['class'] })
-
-    expect(result).toStrictEqual({
-      name: 'aggregate',
-      targets: ['class'],
-    })
-  })
-
-  it('type-checks role references in options', () => {
-    type TestRole = 'command-use-case' | 'command-use-case-input' | 'command-use-case-result'
-    const typedRole = createRoleFactory<TestRole>()
-
-    const result = typedRole('command-use-case', {
-      targets: ['class'],
-      allowedInputs: ['command-use-case-input'],
-      allowedOutputs: ['command-use-case-result'],
-      forbiddenDependencies: ['command-use-case'],
-    })
-
-    expect(result.allowedInputs).toStrictEqual(['command-use-case-input'])
-    expect(result.forbiddenDependencies).toStrictEqual(['command-use-case'])
-  })
-})
-
-describe('location with direct roles', () => {
-  it('produces a location with a single sub-location at the base path', () => {
-    const result = location('src/shell', ['cli-entrypoint'])
-
-    expect(result).toStrictEqual({
-      basePath: 'src/shell',
-      subLocations: [
-        {
-          allowedRoles: ['cli-entrypoint'],
-          path: '',
-        },
-      ],
-    })
-  })
-})
-
-describe('location with subLocation builder', () => {
-  it('accumulates sub-locations via chaining', () => {
-    const result = location('src/features')
-      .subLocation('/entrypoint', ['cli-entrypoint'])
-      .subLocation('/commands', ['command-use-case', 'command-input-factory'])
-
-    expect(result.basePath).toBe('src/features')
-    expect(result.subLocations).toStrictEqual([
-      {
-        allowedRoles: ['cli-entrypoint'],
-        path: '/entrypoint',
-      },
-      {
-        allowedRoles: ['command-use-case', 'command-input-factory'],
-        path: '/commands',
-      },
-    ])
-  })
-
-  it('starts with empty sub-locations before chaining', () => {
-    const builder = location('src/features')
-
-    expect(builder.basePath).toBe('src/features')
-    expect(builder.subLocations).toStrictEqual([])
-  })
-
-  it('includes forbidden imports when provided', () => {
-    const builder = location('src/features').subLocation('/entrypoint', ['cli-entrypoint'], {forbiddenImports: ['**/infra/persistence/**'],})
-
-    expect(builder.subLocations).toStrictEqual([
-      {
-        allowedRoles: ['cli-entrypoint'],
-        forbiddenImports: ['**/infra/persistence/**'],
-        path: '/entrypoint',
-      },
-    ])
-  })
-
-  it('includes import rules in the location definition', () => {
-    const builder = location('src/platform').subLocation('/infra', [], { mayImportRoles: [] })
-
-    expect(builder.subLocations).toStrictEqual([
-      {
-        allowedRoles: [],
-        mayImportRoles: [],
-        path: '/infra',
-      },
-    ])
-  })
-
-  it('includes import rules on a root location', () => {
-    const result = location('src/shell', ['cli-entrypoint'], { mayImportExternalPackages: false })
-
-    expect(result.subLocations).toStrictEqual([
-      {
-        allowedRoles: ['cli-entrypoint'],
-        mayImportExternalPackages: false,
-        path: '',
-      },
-    ])
-  })
-})
-
-describe('roleEnforcement', () => {
-  const canonicalConfigurationsFile = '.riviere/canonical-role-configurations.md'
-  const testRoles = [
-    role('cli-entrypoint', { targets: ['function'] }),
-    role('aggregate', { targets: ['class'] }),
-  ] as const
-
-  type TestRoleName = (typeof testRoles)[number]['name']
-
-  it('expands locations across packages into layers', () => {
-    const result = roleEnforcement({
-      canonicalConfigurationsFile,
-      packages: ['packages/my-app'],
-      ignorePatterns: ['**/*.spec.ts'],
-      roleDefinitionsDir: '.riviere/role-definitions',
-      roles: testRoles,
-      locations: [
-        location<TestRoleName>('src/features').subLocation('/entrypoint', ['cli-entrypoint']),
-      ],
-    })
-
-    expect(result.layers).toStrictEqual({
-      'packages/my-app/src/features/entrypoint': {
-        allowedRoles: ['cli-entrypoint'],
-        paths: ['packages/my-app/src/features/entrypoint'],
-      },
-    })
-  })
-
-  it('derives include patterns from packages', () => {
-    const result = roleEnforcement({
-      canonicalConfigurationsFile,
-      packages: ['packages/my-app', 'packages/my-lib'],
-      ignorePatterns: [],
-      roleDefinitionsDir: '.riviere/role-definitions',
-      roles: testRoles,
-      locations: [],
-    })
-
-    expect(result.include).toStrictEqual([
-      'packages/my-app/src/**/*.ts',
-      'packages/my-lib/src/**/*.ts',
-    ])
-  })
-
-  it('expands locations for each package', () => {
-    const result = roleEnforcement({
-      canonicalConfigurationsFile,
-      packages: ['packages/app-a', 'packages/app-b'],
-      ignorePatterns: [],
-      roleDefinitionsDir: '.riviere/role-definitions',
-      roles: testRoles,
-      locations: [location('src/shell', ['cli-entrypoint'])],
-    })
-
-    expect(result.layers).toStrictEqual({
-      'packages/app-a/src/shell': {
-        allowedRoles: ['cli-entrypoint'],
-        paths: ['packages/app-a/src/shell'],
-      },
-      'packages/app-b/src/shell': {
-        allowedRoles: ['cli-entrypoint'],
-        paths: ['packages/app-b/src/shell'],
-      },
-    })
-  })
-
-  it('resolves path templates by replacing {name} with glob wildcard', () => {
-    const result = roleEnforcement({
-      canonicalConfigurationsFile,
-      packages: ['packages/my-app'],
-      ignorePatterns: [],
-      roleDefinitionsDir: '.riviere/role-definitions',
-      roles: testRoles,
-      locations: [
-        location<TestRoleName>('src/features').subLocation('/infra/external-clients/{client}', [
-          'aggregate',
-        ]),
-      ],
-    })
-
-    expect(
-      result.layers['packages/my-app/src/features/infra/external-clients/{client}'],
-    ).toStrictEqual({
-      allowedRoles: ['aggregate'],
-      paths: ['packages/my-app/src/features/infra/external-clients/*'],
-    })
-  })
-
-  it('passes through ignorePatterns, roleDefinitionsDir, and roles', () => {
-    const result = roleEnforcement({
-      canonicalConfigurationsFile,
-      packages: ['packages/my-app'],
-      ignorePatterns: ['**/*.spec.ts', '**/__fixtures__/**'],
-      roleDefinitionsDir: '.riviere/role-definitions',
-      roles: testRoles,
-      locations: [],
-    })
-
-    expect(result.ignorePatterns).toStrictEqual(['**/*.spec.ts', '**/__fixtures__/**'])
-    expect(result.roleDefinitionsDir).toBe('.riviere/role-definitions')
-    expect(result.roles).toBe(testRoles)
-  })
-
-  it('combines multiple locations into a single layers record', () => {
-    const result = roleEnforcement({
-      canonicalConfigurationsFile,
-      packages: ['packages/my-app'],
-      ignorePatterns: [],
-      roleDefinitionsDir: '.riviere/role-definitions',
-      roles: testRoles,
-      locations: [
-        location<TestRoleName>('src/features')
-          .subLocation('/entrypoint', ['cli-entrypoint'])
-          .subLocation('/domain', ['aggregate']),
-        location('src/shell', ['cli-entrypoint']),
-      ],
-    })
-
-    expect(Object.keys(result.layers)).toStrictEqual([
-      'packages/my-app/src/features/entrypoint',
-      'packages/my-app/src/features/domain',
-      'packages/my-app/src/shell',
-    ])
-  })
-
-  it('includes forbidden imports in generated layer entries', () => {
-    const result = roleEnforcement({
-      canonicalConfigurationsFile,
-      packages: ['packages/my-app'],
-      ignorePatterns: [],
-      roleDefinitionsDir: '.riviere/role-definitions',
-      roles: testRoles,
-      locations: [
-        location<TestRoleName>('src/features').subLocation('/entrypoint', ['cli-entrypoint'], {forbiddenImports: ['**/infra/persistence/**'],}),
-      ],
-    })
-
-    expect(result.layers['packages/my-app/src/features/entrypoint']).toStrictEqual({
-      allowedRoles: ['cli-entrypoint'],
-      forbiddenImports: ['**/infra/persistence/**'],
-      paths: ['packages/my-app/src/features/entrypoint'],
-    })
-  })
-})
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/domain/role-enforcement-builder.ts b/packages/riviere-role-enforcement/src/features/enforcement/domain/role-enforcement-builder.ts
deleted file mode 100644
index d76a65468..000000000
--- a/packages/riviere-role-enforcement/src/features/enforcement/domain/role-enforcement-builder.ts
+++ /dev/null
@@ -1,212 +0,0 @@
-/** @riviere-role value-object */
-export type RoleTarget = 'class' | 'function' | 'interface' | 'type-alias'
-
-interface ApprovedInstance {
-  readonly name: string
-  readonly userHasApproved: true
-}
-
-interface RoleOptions<R extends string = string> {
-  readonly targets: readonly RoleTarget[]
-  readonly allowedInputs?: readonly R[]
-  readonly allowedNames?: readonly string[]
-  readonly allowedOutputs?: readonly R[]
-  readonly approvedInstances?: readonly ApprovedInstance[]
-  readonly forbiddenCallableMembers?: true
-  readonly forbiddenSupertypes?: readonly string[]
-  readonly forbiddenDependencies?: readonly R[]
-  readonly forbiddenMethodCalls?: readonly R[]
-  readonly requiredPrivateMembers?: readonly string[]
-  readonly requiresDataMembers?: true
-  readonly nameMatches?: string
-  readonly maxPublicMethods?: number
-  readonly minPublicMethods?: number
-}
-
-/** @riviere-role value-object */
-export interface BuiltRole<N extends string = string> {
-  readonly name: N
-  readonly targets: readonly RoleTarget[]
-  readonly allowedInputs?: readonly string[]
-  readonly allowedNames?: readonly string[]
-  readonly allowedOutputs?: readonly string[]
-  readonly approvedInstances?: readonly ApprovedInstance[]
-  readonly forbiddenCallableMembers?: true
-  readonly forbiddenSupertypes?: readonly string[]
-  readonly forbiddenDependencies?: readonly string[]
-  readonly forbiddenMethodCalls?: readonly string[]
-  readonly requiredPrivateMembers?: readonly string[]
-  readonly requiresDataMembers?: true
-  readonly maxPublicMethods?: number
-  readonly nameMatches?: string
-  readonly minPublicMethods?: number
-}
-
-/** @riviere-role domain-service */
-export function role<const N extends string>(name: N, options: RoleOptions): BuiltRole<N> {
-  return {
-    name,
-    ...options,
-  }
-}
-
-/** @riviere-role domain-service */
-export function createRoleFactory<R extends string>() {
-  return <const N extends R>(name: N, options: RoleOptions<R>): BuiltRole<N> => ({
-    name,
-    ...options,
-  })
-}
-
-interface SubLocationEntry {
-  readonly allowedRoles: readonly string[]
-  readonly forbiddenImports?: readonly string[]
-  readonly mayImportExternalPackages?: boolean
-  readonly mayImportRoles?: readonly string[]
-  readonly path: string
-}
-
-/** @riviere-role value-object */
-export interface BuiltLocation {
-  readonly basePath: string
-  readonly subLocations: readonly SubLocationEntry[]
-}
-
-interface SubLocationOptions<R extends string> {
-  readonly forbiddenImports?: readonly string[]
-  readonly mayImportExternalPackages?: boolean
-  readonly mayImportRoles?: readonly R[]
-}
-
-/** @riviere-role value-object */
-export type LocationBuilder<R extends string> = BuiltLocation & {
-  readonly subLocation: (
-    path: string,
-    allowedRoles: readonly R[],
-    options?: SubLocationOptions<R>,
-  ) => LocationBuilder<R>
-}
-
-export function location<R extends string>(basePath: string): LocationBuilder<R>
-export function location<R extends string>(
-  basePath: string,
-  allowedRoles: readonly R[],
-  options?: SubLocationOptions<R>,
-): BuiltLocation
-/** @riviere-role domain-service */
-export function location<R extends string>(
-  basePath: string,
-  allowedRoles?: readonly R[],
-  options?: SubLocationOptions<R>,
-): BuiltLocation | LocationBuilder<R> {
-  if (allowedRoles !== undefined) {
-    return {
-      basePath,
-      subLocations: [buildSubLocation('', allowedRoles, options)],
-    }
-  }
-
-  return createLocationBuilder<R>(basePath, [])
-}
-
-function createLocationBuilder<R extends string>(
-  basePath: string,
-  subLocations: readonly SubLocationEntry[],
-): LocationBuilder<R> {
-  return {
-    basePath,
-    subLocations,
-    subLocation(
-      path: string,
-      allowedRoles: readonly R[],
-      options?: SubLocationOptions<R>,
-    ): LocationBuilder<R> {
-      return createLocationBuilder(basePath, [
-        ...subLocations,
-        buildSubLocation(path, allowedRoles, options),
-      ])
-    },
-  }
-}
-
-function buildSubLocation<R extends string>(
-  path: string,
-  allowedRoles: readonly R[],
-  options?: SubLocationOptions<R>,
-): SubLocationEntry {
-  return {
-    allowedRoles,
-    path,
-    ...(options?.forbiddenImports !== undefined && { forbiddenImports: options.forbiddenImports }),
-    ...(options?.mayImportExternalPackages !== undefined && {mayImportExternalPackages: options.mayImportExternalPackages,}),
-    ...(options?.mayImportRoles !== undefined && { mayImportRoles: options.mayImportRoles }),
-  }
-}
-
-interface RoleEnforcementInput<R extends string> {
-  readonly canonicalConfigurationsFile: string
-  readonly ignorePatterns: readonly string[]
-  readonly locations: readonly BuiltLocation[]
-  readonly packages: readonly string[]
-  readonly roleDefinitionsDir: string
-  readonly roles: readonly BuiltRole<R>[]
-  readonly workspacePackageSources?: Record<string, string>
-}
-
-interface LocationEntry {
-  readonly allowedRoles: readonly string[]
-  readonly forbiddenImports?: readonly string[]
-  readonly mayImportExternalPackages?: boolean
-  readonly mayImportRoles?: readonly string[]
-  readonly paths: readonly string[]
-}
-
-/** @riviere-role value-object */
-export interface RoleEnforcementResult {
-  readonly ignorePatterns: readonly string[]
-  readonly include: readonly string[]
-  readonly layers: Record<string, LocationEntry>
-  readonly roleDefinitionsDir: string
-  readonly roles: readonly BuiltRole[]
-  readonly workspacePackageSources?: Record<string, string>
-}
-
-/** @riviere-role domain-service */
-export function roleEnforcement<const R extends string>(
-  input: RoleEnforcementInput<R>,
-): RoleEnforcementResult {
-  const layers: Record<string, LocationEntry> = {}
-
-  for (const pkg of input.packages) {
-    for (const loc of input.locations) {
-      for (const sub of loc.subLocations) {
-        const relativePath = sub.path === '' ? loc.basePath : `${loc.basePath}${sub.path}`
-        const fullPath = `${pkg}/${relativePath}`
-        const resolvedPath = resolvePathTemplate(fullPath)
-        layers[fullPath] = {
-          allowedRoles: sub.allowedRoles,
-          paths: [resolvedPath],
-          ...(sub.forbiddenImports !== undefined && { forbiddenImports: sub.forbiddenImports }),
-          ...(sub.mayImportExternalPackages !== undefined && {mayImportExternalPackages: sub.mayImportExternalPackages,}),
-          ...(sub.mayImportRoles !== undefined && { mayImportRoles: sub.mayImportRoles }),
-        }
-      }
-    }
-  }
-
-  return {
-    ignorePatterns: input.ignorePatterns,
-    include: input.packages.map((pkg) => `${pkg}/src/**/*.ts`),
-    layers,
-    roleDefinitionsDir: input.roleDefinitionsDir,
-    roles: input.roles,
-    ...(input.workspacePackageSources !== undefined && {workspacePackageSources: input.workspacePackageSources,}),
-  }
-}
-
-function resolvePathTemplate(templatePath: string): string {
-  return templatePath
-    .split('/')
-    .map((segment) => (segment.startsWith('{') && segment.endsWith('}') ? '*' : segment))
-    .join('/')
-}
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/domain/role-enforcement-project.spec.ts b/packages/riviere-role-enforcement/src/features/enforcement/domain/role-enforcement-project.spec.ts
deleted file mode 100644
index 6b36b94d2..000000000
--- a/packages/riviere-role-enforcement/src/features/enforcement/domain/role-enforcement-project.spec.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { expect, it, vi } from 'vitest'
-import type { RoleEnforcementResult } from './role-enforcement-builder'
-import { RoleEnforcementProject } from './role-enforcement-project'
-
-const config: RoleEnforcementResult = {
-  ignorePatterns: ['**/*.spec.ts'],
-  include: ['packages/pkg-a/src/**/*.ts', 'packages/pkg-b/src/**/*.ts'],
-  layers: {
-    'packages/pkg-a/src/domain': {
-      allowedRoles: ['aggregate'],
-      paths: ['packages/pkg-a/src/domain'],
-    },
-    'packages/pkg-b/src/domain': {
-      allowedRoles: ['aggregate'],
-      paths: ['packages/pkg-b/src/domain'],
-    },
-  },
-  roleDefinitionsDir: '.riviere/role-definitions',
-  roles: [],
-}
-
-it('executes the complete project when no package filter is provided', () => {
-  const runner = vi.fn(() => ({
-    exitCode: 0,
-    stderr: '',
-    stdout: '',
-  }))
-  const project = new RoleEnforcementProject(config, '/repo', [
-    'packages/pkg-a/src/index.ts',
-    'packages/pkg-b/src/index.ts',
-  ])
-
-  project.execute(runner)
-
-  expect(runner).toHaveBeenCalledWith({
-    config,
-    configDir: '/repo',
-    lintTargets: ['packages/pkg-a/src/index.ts', 'packages/pkg-b/src/index.ts'],
-  })
-})
-
-it('selects package configuration and targets during execution', () => {
-  const runner = vi.fn(() => ({
-    exitCode: 0,
-    stderr: '',
-    stdout: '',
-  }))
-  const project = new RoleEnforcementProject(config, '/repo', [
-    'packages/pkg-a/src/index.ts',
-    'packages/pkg-a/src/index.spec.ts',
-    'packages/pkg-b/src/index.ts',
-  ])
-
-  project.execute(runner, 'packages/pkg-a')
-
-  expect(runner).toHaveBeenCalledWith({
-    config: {
-      ...config,
-      include: ['packages/pkg-a/src/**/*.ts'],
-      layers: { 'packages/pkg-a/src/domain': config.layers['packages/pkg-a/src/domain'] },
-    },
-    configDir: '/repo',
-    lintTargets: ['packages/pkg-a/src/index.ts'],
-  })
-})
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/entrypoint/cli/entrypoint.ts b/packages/riviere-role-enforcement/src/features/enforcement/entrypoint/cli/entrypoint.ts
deleted file mode 100644
index d9fe85190..000000000
--- a/packages/riviere-role-enforcement/src/features/enforcement/entrypoint/cli/entrypoint.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { RunRoleEnforcement } from '../../commands/run-role-enforcement'
-
-/** @riviere-role cli-entrypoint */
-export function main(
-  application: RunRoleEnforcement,
-  configModule: unknown,
-  configDir: string,
-  packageFilter?: string,
-): number {
-  const result = application.execute({
-    configDir,
-    configModule,
-    ...(packageFilter === undefined ? {} : { packageFilter }),
-  })
-  if (result.stdout !== '') {
-    process.stdout.write(result.stdout)
-  }
-  if (result.stderr !== '') {
-    process.stderr.write(result.stderr)
-  }
-  process.stderr.write(`Role enforcement completed in ${Math.round(result.durationMs)}ms\n`)
-  return result.exitCode
-}
diff --git a/packages/riviere-role-enforcement/src/index.ts b/packages/riviere-role-enforcement/src/index.ts
deleted file mode 100644
index d0712fd91..000000000
--- a/packages/riviere-role-enforcement/src/index.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export {
-  createRoleFactory,
-  location,
-  role,
-  roleEnforcement,
-} from './features/enforcement/domain/role-enforcement-builder'
-export type {
-  BuiltLocation,
-  BuiltRole,
-  LocationBuilder,
-  RoleEnforcementResult,
-  RoleTarget,
-} from './features/enforcement/domain/role-enforcement-builder'
-export {
-  filterConfigByPackage,
-  PackageFilterError,
-} from './features/enforcement/domain/filter-config-by-package'
-export { RunRoleEnforcement } from './features/enforcement/commands/run-role-enforcement'
-export type { RunRoleEnforcementInput } from './features/enforcement/commands/run-role-enforcement-input'
-export type { RunRoleEnforcementResult } from './features/enforcement/commands/run-role-enforcement-result'
-export { RoleEnforcementExecutionError } from './features/enforcement/domain/role-enforcement-execution-error'
diff --git a/packages/riviere-role-enforcement/src/platform/infra/external-clients/filesystem/find-files-matching-patterns.ts b/packages/riviere-role-enforcement/src/platform/infra/external-clients/filesystem/find-files-matching-patterns.ts
deleted file mode 100644
index d38c035a1..000000000
--- a/packages/riviere-role-enforcement/src/platform/infra/external-clients/filesystem/find-files-matching-patterns.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import type { PathLike } from 'node:fs'
-import path from 'node:path'
-import { minimatch } from 'minimatch'
-
-type ReadDirectory = (
-  rootDir: PathLike,
-  options: {
-    recursive: true
-    withFileTypes: true
-  },
-) => Array<{
-  isFile: () => boolean
-  name: string
-  parentPath: string
-}>
-
-/** @riviere-role external-client-service */
-export function findFilesMatchingPatterns(
-  rootDir: string,
-  includePatterns: readonly string[],
-  ignorePatterns: readonly string[],
-  readDirectory: ReadDirectory,
-): string[] {
-  const scanDirectories = includePatterns.map((pattern) => extractScanDirectory(pattern))
-  const files = scanDirectories.flatMap((scanDirectory) =>
-    walkFiles(rootDir, scanDirectory, readDirectory),
-  )
-  return files
-    .filter((filePath) => matchesAny(filePath, includePatterns))
-    .filter((filePath) => !matchesAny(filePath, ignorePatterns))
-}
-
-function extractScanDirectory(includePattern: string): string {
-  const segments = includePattern.split('/')
-  const staticSegments: string[] = []
-  for (const segment of segments) {
-    if (segment.includes('*') || segment.includes('{') || segment.includes('?')) {
-      break
-    }
-    staticSegments.push(segment)
-  }
-  return staticSegments.join('/')
-}
-
-function walkFiles(rootDir: string, scanDirectory: string, readDirectory: ReadDirectory): string[] {
-  const absoluteScanDirectory = path.join(rootDir, scanDirectory)
-  const entries = readDirectory(absoluteScanDirectory, {
-    recursive: true,
-    withFileTypes: true,
-  })
-  return entries
-    .filter((entry) => entry.isFile())
-    .map((entry) =>
-      normalizePath(
-        path.join(
-          scanDirectory,
-          path.relative(absoluteScanDirectory, path.join(entry.parentPath, entry.name)),
-        ),
-      ),
-    )
-}
-
-function matchesAny(filePath: string, patterns: readonly string[]): boolean {
-  return patterns.some((pattern) => minimatch(filePath, pattern, { dot: true }))
-}
-
-function normalizePath(value: string): string {
-  return value.replaceAll('\\', '/')
-}
diff --git a/packages/riviere-role-enforcement/src/platform/infra/external-clients/oxlint/index.spec.ts b/packages/riviere-role-enforcement/src/platform/infra/external-clients/oxlint/index.spec.ts
deleted file mode 100644
index 81bf67f48..000000000
--- a/packages/riviere-role-enforcement/src/platform/infra/external-clients/oxlint/index.spec.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { expect, it } from 'vitest'
-import { createOxlintImportSpecifier, OxlintExecutionError, runOxlint } from './index'
-
-it('exposes the complete Oxlint client capability', () => {
-  expect(runOxlint).toBeTypeOf('function')
-  expect(createOxlintImportSpecifier).toBeTypeOf('function')
-  expect(new OxlintExecutionError('failure')).toBeInstanceOf(Error)
-})
diff --git a/packages/riviere-role-enforcement/src/platform/infra/external-clients/oxlint/index.ts b/packages/riviere-role-enforcement/src/platform/infra/external-clients/oxlint/index.ts
deleted file mode 100644
index 20243561b..000000000
--- a/packages/riviere-role-enforcement/src/platform/infra/external-clients/oxlint/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export { runOxlint } from './oxlint-client'
-export type { OxlintClient, OxlintConfig } from './oxlint-config'
-export { OxlintExecutionError } from './oxlint-execution-error'
-export { createOxlintImportSpecifier } from './oxlint-path-resolution'
diff --git a/packages/riviere-role-enforcement/src/shell/bin.ts b/packages/riviere-role-enforcement/src/shell/bin.ts
deleted file mode 100644
index 8538247cb..000000000
--- a/packages/riviere-role-enforcement/src/shell/bin.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { performance } from 'node:perf_hooks'
-import path from 'node:path'
-import { fileURLToPath } from 'node:url'
-import { createOxlintRoleEnforcementRunner } from '../features/enforcement/adapters/oxlint/oxlint-role-enforcement-runner'
-import { RunRoleEnforcement } from '../features/enforcement/commands/run-role-enforcement'
-import { RoleEnforcementProjectRepository } from '../features/enforcement/data-access/role-enforcement-project-repository'
-import { main } from '../features/enforcement/entrypoint/cli/entrypoint'
-import { findFileUp } from '../platform/infra/external-clients/filesystem/find-file-up'
-import { runOxlint } from '../platform/infra/external-clients/oxlint/index'
-
-const configModulePath = process.argv[2]
-if (configModulePath === undefined) {
-  process.stderr.write(
-    'Usage: riviere-role-enforcement <config-module-path> [--package <package-path>]\n',
-  )
-  process.exitCode = 1
-} else {
-  const packageFilter = readPackageFilter(process.argv)
-  const absolutePath = path.resolve(configModulePath)
-  const startDirectory = path.dirname(fileURLToPath(import.meta.url))
-  const pluginPath = findFileUp(startDirectory, 'role-enforcement-plugin.mjs')
-  const application = new RunRoleEnforcement({
-    now: () => performance.now(),
-    projectRepository: new RoleEnforcementProjectRepository(),
-    runner: createOxlintRoleEnforcementRunner(runOxlint, pluginPath),
-  })
-  void import(absolutePath).then((loaded: unknown) => {
-    process.exitCode = main(application, loaded, process.cwd(), packageFilter)
-  })
-}
-
-function readPackageFilter(argv: readonly string[]): string | undefined {
-  const flagIndex = argv.indexOf('--package')
-  if (flagIndex < 0) {
-    return undefined
-  }
-  const value = argv[flagIndex + 1]
-  if (value === undefined) {
-    process.stderr.write('Error: --package requires a value\n')
-    process.exitCode = 1
-    return undefined
-  }
-  return value
-}
diff --git a/packages/riviere-role-enforcement/tsconfig.json b/packages/riviere-role-enforcement/tsconfig.json
deleted file mode 100644
index 62ebbd946..000000000
--- a/packages/riviere-role-enforcement/tsconfig.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ]
-}
diff --git a/packages/riviere-role-enforcement/tsconfig.lib.json b/packages/riviere-role-enforcement/tsconfig.lib.json
deleted file mode 100644
index 0913da81f..000000000
--- a/packages/riviere-role-enforcement/tsconfig.lib.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "baseUrl": ".",
-    "rootDir": "src",
-    "outDir": "dist",
-    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
-    "forceConsistentCasingInFileNames": true
-  },
-  "include": ["src/**/*.ts"],
-  "exclude": ["vitest.config.ts", "vitest.config.mts", "src/**/*.test.ts", "src/**/*.spec.ts"]
-}
diff --git a/packages/riviere-role-enforcement/tsconfig.spec.json b/packages/riviere-role-enforcement/tsconfig.spec.json
deleted file mode 100644
index 0e634845a..000000000
--- a/packages/riviere-role-enforcement/tsconfig.spec.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./out-tsc/vitest",
-    "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node", "vitest"],
-    "forceConsistentCasingInFileNames": true
-  },
-  "include": [
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.d.ts"
-  ],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    }
-  ]
-}
diff --git a/packages/riviere-role-enforcement/use-cases/package.json b/packages/riviere-role-enforcement/use-cases/package.json
new file mode 100644
index 000000000..350939f0e
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/package.json
@@ -0,0 +1,31 @@
+{
+  "name": "@living-architecture/riviere-role-enforcement-use-cases",
+  "version": "0.0.1",
+  "publishConfig": {
+    "access": "public"
+  },
+  "type": "module",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "@living-architecture/source": "./src/index.ts",
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
+    }
+  },
+  "files": [
+    "dist",
+    "!dist/**/__fixtures__/**",
+    "!**/*.tsbuildinfo"
+  ],
+  "dependencies": {
+    "@living-architecture/riviere-role-enforcement-domain-model": "workspace:*",
+    "minimatch": "^10.0.1",
+    "tsx": "^4.21.0",
+    "yaml": "^2.7.0"
+  }
+}
diff --git a/packages/riviere-role-enforcement/use-cases/project.json b/packages/riviere-role-enforcement/use-cases/project.json
new file mode 100644
index 000000000..fd0af420b
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/project.json
@@ -0,0 +1,18 @@
+{
+  "name": "@living-architecture/riviere-role-enforcement-use-cases",
+  "targets": {
+    "build": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          "node ../../../scripts/build-public-exports.mjs . --clean",
+          "tsc --build tsconfig.lib.json",
+          "node ../../../scripts/build-public-exports.mjs ."
+        ],
+        "cwd": "{projectRoot}",
+        "parallel": false
+      },
+      "outputs": ["{projectRoot}/dist"]
+    }
+  }
+}
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/adapters/oxlint/oxlint-role-enforcement-runner.spec.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/adapters/oxlint/oxlint-role-enforcement-runner.spec.ts
new file mode 100644
index 000000000..acf4ebef3
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/adapters/oxlint/oxlint-role-enforcement-runner.spec.ts
@@ -0,0 +1,144 @@
+import { expect, it, vi } from 'vitest'
+import { OxlintExecutionError } from '../../../../infra/external-clients/oxlint/oxlint-execution-error'
+import type { RoleEnforcementRunnerInput } from '@living-architecture/riviere-role-enforcement-domain-model'
+import { RoleEnforcementConfiguration } from '@living-architecture/riviere-role-enforcement-domain-model'
+import { createOxlintRoleEnforcementRunner } from './oxlint-role-enforcement-runner'
+
+function parseConfiguration(value: unknown): RoleEnforcementConfiguration {
+  const parsed = RoleEnforcementConfiguration.parse(value)
+  if (!parsed.success) {
+    throw parsed.error
+  }
+  return parsed.data
+}
+
+const input: RoleEnforcementRunnerInput = {
+  config: parseConfiguration({
+    assignedPackages: ['packages/pkg-a'],
+    ignorePatterns: ['**/*.spec.ts'],
+    include: ['src/**/*.ts'],
+    locationHierarchy: [],
+    roleDefinitionsDir: '.riviere/role-definitions',
+    roles: [],
+    unassignedPackages: [],
+  }),
+  configDir: '/repo/packages/pkg-a',
+  lintTargets: ['src/index.ts'],
+}
+
+it('translates the domain runner input into an Oxlint request', () => {
+  const client = vi.fn(() => ({
+    exitCode: 0,
+    stderr: '',
+    stdout: '',
+  }))
+  const runner = createOxlintRoleEnforcementRunner(
+    client,
+    '/repo/packages/riviere-role-enforcement/role-enforcement-plugin.mjs',
+  )
+
+  runner(input)
+
+  expect(client).toHaveBeenCalledWith({
+    config: {
+      ignorePatterns: ['**/*.spec.ts'],
+      jsPlugins: [
+        {
+          name: 'riviere-role-enforcement',
+          specifier: '../riviere-role-enforcement/role-enforcement-plugin.mjs',
+        },
+      ],
+      plugins: ['import'],
+      rules: {
+        'import/no-cycle': 'error',
+        'riviere-role-enforcement/enforce-roles': [
+          'error',
+          {
+            configDir: '/repo/packages/pkg-a',
+            configDisplayPath: 'role-enforcement.config.ts',
+            ignorePatterns: ['**/*.spec.ts'],
+            locationHierarchy: [],
+            roleDefinitionsDir: '.riviere/role-definitions',
+            roles: [],
+          },
+        ],
+      },
+    },
+    configDir: '/repo/packages/pkg-a',
+    lintTargets: ['src/index.ts'],
+  })
+})
+
+it('returns a domain runner failure when Oxlint fails', () => {
+  const runner = createOxlintRoleEnforcementRunner(() => {
+    throw new OxlintExecutionError('spawn failed')
+  }, '/repo/role-enforcement-plugin.mjs')
+
+  expect(runner(input)).toStrictEqual({
+    exitCode: 1,
+    stderr: 'spawn failed\n',
+    stdout: '',
+  })
+})
+
+it('returns a domain runner failure when the plugin is unavailable', () => {
+  const runner = createOxlintRoleEnforcementRunner(vi.fn(), undefined)
+
+  expect(runner(input)).toStrictEqual({
+    exitCode: 1,
+    stderr: 'Cannot find role-enforcement-plugin.mjs\n',
+    stdout: '',
+  })
+})
+
+it('preserves optional enforcement configuration', () => {
+  const client = vi.fn(() => ({
+    exitCode: 0,
+    stderr: '',
+    stdout: '',
+  }))
+  const runner = createOxlintRoleEnforcementRunner(
+    client,
+    '/repo/packages/pkg-a/role-enforcement-plugin.mjs',
+  )
+
+  runner({
+    ...input,
+    config: parseConfiguration({
+      ...input.config,
+      importAliases: { '@generic/*': 'packages/generic/src/*' },
+    }),
+  })
+
+  expect(client).toHaveBeenCalledWith(
+    expect.objectContaining({
+      config: expect.objectContaining({
+        jsPlugins: [
+          {
+            name: 'riviere-role-enforcement',
+            specifier: './role-enforcement-plugin.mjs',
+          },
+        ],
+        plugins: ['import'],
+        rules: {
+          'import/no-cycle': 'error',
+          'riviere-role-enforcement/enforce-roles': [
+            'error',
+            expect.objectContaining({
+              importAliases: { '@generic/*': 'packages/generic/src/*' },
+            }),
+          ],
+        },
+      }),
+    }),
+  )
+})
+
+it('rethrows unexpected client failures', () => {
+  const unexpected = new TypeError('unexpected')
+  const runner = createOxlintRoleEnforcementRunner(() => {
+    throw unexpected
+  }, '/repo/role-enforcement-plugin.mjs')
+
+  expect(() => runner(input)).toThrow(unexpected)
+})
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/adapters/oxlint/oxlint-role-enforcement-runner.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/adapters/oxlint/oxlint-role-enforcement-runner.ts
new file mode 100644
index 000000000..daf720f69
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/adapters/oxlint/oxlint-role-enforcement-runner.ts
@@ -0,0 +1,75 @@
+import {
+  type OxlintClient,
+  type OxlintConfig,
+} from '../../../../infra/external-clients/oxlint/oxlint-config'
+import { OxlintExecutionError } from '../../../../infra/external-clients/oxlint/oxlint-execution-error'
+import { createOxlintImportSpecifier } from '../../../../infra/external-clients/oxlint/oxlint-path-resolution'
+import type {
+  RoleEnforcementRunner,
+  RoleEnforcementRunnerInput,
+} from '@living-architecture/riviere-role-enforcement-domain-model'
+
+/** @riviere-role domain-port-adapter */
+export function createOxlintRoleEnforcementRunner(
+  oxlintClient: OxlintClient,
+  pluginPath: string | undefined,
+): RoleEnforcementRunner {
+  return (input) => {
+    if (pluginPath === undefined) {
+      return failure('Cannot find role-enforcement-plugin.mjs')
+    }
+
+    try {
+      return oxlintClient({
+        config: createOxlintConfig(input.config, input.configDir, pluginPath),
+        configDir: input.configDir,
+        lintTargets: input.lintTargets,
+      })
+    } catch (error) {
+      if (error instanceof OxlintExecutionError) {
+        return failure(error.message)
+      }
+      throw error
+    }
+  }
+}
+
+function failure(message: string) {
+  return {
+    exitCode: 1,
+    stderr: `${message}\n`,
+    stdout: '',
+  }
+}
+
+function createOxlintConfig(
+  config: RoleEnforcementRunnerInput['config'],
+  configDir: string,
+  pluginPath: string,
+): OxlintConfig {
+  return {
+    ignorePatterns: config.ignorePatterns,
+    jsPlugins: [
+      {
+        name: 'riviere-role-enforcement',
+        specifier: createOxlintImportSpecifier(configDir, pluginPath),
+      },
+    ],
+    plugins: ['import'],
+    rules: {
+      'import/no-cycle': 'error',
+      'riviere-role-enforcement/enforce-roles': [
+        'error',
+        {
+          configDir,
+          configDisplayPath: 'role-enforcement.config.ts',
+          ignorePatterns: config.ignorePatterns,
+          ...(config.importAliases !== undefined && { importAliases: config.importAliases }),
+          locationHierarchy: config.locationHierarchy,
+          roleDefinitionsDir: config.roleDefinitionsDir,
+          roles: config.roles,
+        },
+      ],
+    },
+  }
+}
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/__fixtures__/test-fixture-config.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/__fixtures__/test-fixture-config.ts
new file mode 100644
index 000000000..607a8c153
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/__fixtures__/test-fixture-config.ts
@@ -0,0 +1,149 @@
+import {
+  location,
+  locationConfiguration,
+  role,
+  roleEnforcementConfiguration,
+} from '@living-architecture/riviere-role-enforcement-domain-model'
+
+export const genericTestRoles = [
+  role('role-a', {
+    targets: ['function'],
+    allowedInputs: ['role-a-input'],
+    allowedNames: ['doAlpha'],
+    allowedOutputs: ['role-a-result', 'role-c-error'],
+  }),
+  role('role-a-input', {
+    targets: ['interface'],
+    allowedNames: ['AlphaInput'],
+  }),
+  role('role-a-result', {
+    targets: ['interface'],
+    allowedNames: ['AlphaResult'],
+  }),
+  role('role-c-error', { targets: ['class'] }),
+  role('role-b', {
+    targets: ['class'],
+    minPublicMethods: 1,
+  }),
+  role('role-b-repository', {
+    targets: ['class'],
+    allowedOutputs: ['role-b'],
+  }),
+  role('role-entry', {
+    targets: ['function'],
+    allowedNames: ['createEntry'],
+  }),
+] as const
+
+type GenericTestRoleName = (typeof genericTestRoles)[number]['name']
+
+const genericTestLocations = locationConfiguration(
+  location<GenericTestRoleName>('/commands', ['role-a', 'role-a-input', 'role-a-result']),
+  location<GenericTestRoleName>('/domain', ['role-b', 'role-c-error']),
+  location<GenericTestRoleName>('/entrypoint', ['role-entry']),
+  location<GenericTestRoleName>('/repositories', ['role-b-repository']),
+)
+
+export const genericTestConfig = roleEnforcementConfiguration({
+  configurations: {
+    'packages/pkg-a': {
+      locations: genericTestLocations,
+    },
+  },
+  ignorePatterns: ['**/*.spec.ts'],
+  roleDefinitionsDir: '.riviere/role-definitions',
+  roles: genericTestRoles,
+})
+
+function configWithGenericAggregateOverride(aggregateOptions: Parameters<typeof role>[1]) {
+  return roleEnforcementConfiguration({
+    configurations: {
+      'packages/pkg-a': {
+        locations: genericTestLocations,
+      },
+    },
+    ignorePatterns: ['**/*.spec.ts'],
+    roleDefinitionsDir: '.riviere/role-definitions',
+    roles: [
+      ...genericTestRoles.filter((r) => r.name !== 'role-b'),
+      role('role-b', aggregateOptions),
+    ],
+  })
+}
+
+export function configWithGenericMaxPublicMethods() {
+  return configWithGenericAggregateOverride({
+    targets: ['class'],
+    minPublicMethods: 1,
+    maxPublicMethods: 1,
+  })
+}
+
+export function configWithGenericApprovedAggregates(approvedNames: string[]) {
+  return configWithGenericAggregateOverride({
+    targets: ['class'],
+    minPublicMethods: 1,
+    approvedInstances: approvedNames.map((name) => ({
+      name,
+      userHasApproved: true as const,
+    })),
+  })
+}
+
+export function configWithGenericRequiredPrivateMembers(requiredPrivateMembers: string[]) {
+  return configWithGenericAggregateOverride({
+    targets: ['class'],
+    minPublicMethods: 1,
+    requiredPrivateMembers,
+  })
+}
+
+export function configWithGenericClassStateConstraints() {
+  return configWithGenericAggregateOverride({
+    targets: ['class'],
+    requiredPrivateMembers: ['brand'],
+    requiresDataMembers: true,
+    forbiddenCallableDataMembers: true,
+    requiresPrivateConstructor: true,
+    requiredStaticMethodNamePrefix: 'parse',
+  })
+}
+
+export function configWithGenericRepositoryMethodInputs(allowedInputs: string[]) {
+  return roleEnforcementConfiguration({
+    configurations: {
+      'packages/pkg-a': {
+        locations: genericTestLocations,
+      },
+    },
+    ignorePatterns: ['**/*.spec.ts'],
+    roleDefinitionsDir: '.riviere/role-definitions',
+    roles: [
+      ...genericTestRoles.filter((r) => r.name !== 'role-b-repository'),
+      role('role-b-repository', {
+        targets: ['class'],
+        allowedInputs,
+        allowedOutputs: ['role-b'],
+      }),
+    ],
+  })
+}
+
+export function configWithGenericRepositoryMethodInputsOnly(allowedInputs: string[]) {
+  return roleEnforcementConfiguration({
+    configurations: {
+      'packages/pkg-a': {
+        locations: genericTestLocations,
+      },
+    },
+    ignorePatterns: ['**/*.spec.ts'],
+    roleDefinitionsDir: '.riviere/role-definitions',
+    roles: [
+      ...genericTestRoles.filter((r) => r.name !== 'role-b-repository'),
+      role('role-b-repository', {
+        targets: ['class'],
+        allowedInputs,
+      }),
+    ],
+  })
+}
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/__fixtures__/test-fixture-workspace.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/__fixtures__/test-fixture-workspace.ts
new file mode 100644
index 000000000..e7132284b
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/__fixtures__/test-fixture-workspace.ts
@@ -0,0 +1,143 @@
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { runOxlint } from '../../../../infra/external-clients/oxlint/oxlint-client'
+import { createOxlintRoleEnforcementRunner } from '../../adapters/oxlint/oxlint-role-enforcement-runner'
+import { RoleEnforcementProjectRepository } from '../../data-access/role-enforcement/role-enforcement-project-repository'
+import { RunRoleEnforcement } from '../run-role-enforcement'
+import { genericTestRoles } from './test-fixture-config'
+
+interface WorkspaceBootstrap {
+  readonly prefix: string
+  readonly roles: readonly { readonly name: string }[]
+  readonly files: Readonly<Record<string, string>>
+}
+
+export function createTestRoleEnforcementApplication(configModule: unknown): RunRoleEnforcement {
+  const pluginPath = fileURLToPath(
+    import.meta.resolve('@living-architecture/riviere-role-enforcement-domain-model/plugin'),
+  )
+  return new RunRoleEnforcement({
+    now: () => 0,
+    projectRepository: new RoleEnforcementProjectRepository({
+      loadTypeScriptModule: () => configModule,
+    }),
+    runner: createOxlintRoleEnforcementRunner(runOxlint, pluginPath),
+  })
+}
+
+export function runTestRoleEnforcement(config: unknown, configDir: string, packageFilter?: string) {
+  return createTestRoleEnforcementApplication({ config }).execute({
+    configDir,
+    configModulePath: 'test-role-enforcement.config.ts',
+    ...(packageFilter === undefined ? {} : { packageFilter }),
+  })
+}
+
+export function withWorkspaceFixture<T>(
+  bootstrap: WorkspaceBootstrap,
+  fn: (workspaceDir: string) => T,
+): T {
+  const workspaceDir = createWorkspaceFixture(bootstrap)
+  try {
+    return fn(workspaceDir)
+  } finally {
+    rmSync(workspaceDir, {
+      force: true,
+      recursive: true,
+    })
+  }
+}
+
+export function writeFixtureFile(
+  workspaceDir: string,
+  relativePath: string,
+  content: string,
+): void {
+  const fullPath = path.join(workspaceDir, relativePath)
+  mkdirSync(path.dirname(fullPath), { recursive: true })
+  writeFileSync(fullPath, content)
+}
+
+export function withGenericFixtureWorkspace(fn: (workspaceDir: string) => void): void {
+  withWorkspaceFixture(
+    {
+      prefix: 'role-enforcement-workspace-',
+      roles: genericTestRoles,
+      files: genericFixtureFiles,
+    },
+    fn,
+  )
+}
+
+export function writeCommandFile(workspaceDir: string, content: string): void {
+  writeFixtureFile(workspaceDir, 'packages/pkg-a/src/commands/doAlpha.ts', content)
+}
+
+export function writeDomainFile(workspaceDir: string, content: string): void {
+  writeFixtureFile(workspaceDir, 'packages/pkg-a/src/domain/beta.ts', content)
+}
+
+export function writeRepositoryFile(workspaceDir: string, content: string): void {
+  writeFixtureFile(workspaceDir, 'packages/pkg-a/src/repositories/betaRepository.ts', content)
+}
+
+function createWorkspaceFixture(bootstrap: WorkspaceBootstrap): string {
+  const workspaceDir = mkdtempSync(path.join(tmpdir(), bootstrap.prefix))
+  writeFixtureFile(
+    workspaceDir,
+    '.riviere/canonical-role-configurations.md',
+    '# Canonical Role Configurations',
+  )
+  for (const r of bootstrap.roles) {
+    writeFixtureFile(workspaceDir, `.riviere/role-definitions/${r.name}.md`, `# ${r.name}`)
+  }
+  for (const [relativePath, content] of Object.entries(bootstrap.files)) {
+    writeFixtureFile(workspaceDir, relativePath, content)
+  }
+  return workspaceDir
+}
+
+const genericFixtureFiles: Readonly<Record<string, string>> = {
+  'packages/pkg-a/src/commands/alphaInput.ts': `/** @riviere-role role-a-input */
+export interface AlphaInput {
+  configPath: string
+}
+`,
+  'packages/pkg-a/src/commands/alphaResult.ts': `/** @riviere-role role-a-result */
+export interface AlphaResult {
+  status: 'ok'
+}
+`,
+  'packages/pkg-a/src/commands/doAlpha.ts': `import type { AlphaInput } from './alphaInput'
+import type { AlphaResult } from './alphaResult'
+
+/** @riviere-role role-a */
+export function doAlpha(alphaInput: AlphaInput): AlphaResult {
+  return {
+    status: 'ok',
+  }
+}
+`,
+  'packages/pkg-a/src/entrypoint/entry.ts': `/** @riviere-role role-entry */
+export function createEntry(): void {}
+`,
+  'packages/pkg-a/src/domain/alphaError.ts': `/** @riviere-role role-c-error */
+export class AlphaError extends Error {}
+`,
+  'packages/pkg-a/src/domain/beta.ts': `/** @riviere-role role-b */
+export class Beta {
+  cancel(): void {}
+}
+`,
+  'packages/pkg-a/src/repositories/betaRepository.ts': `import type { Beta } from '../domain/beta'
+
+/** @riviere-role role-b-repository */
+export class BetaRepository {
+  findById(id: string): Beta {
+    return null as unknown as Beta
+  }
+}
+`,
+}
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/circular-dependencies.spec.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/circular-dependencies.spec.ts
new file mode 100644
index 000000000..4dad375c5
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/circular-dependencies.spec.ts
@@ -0,0 +1,56 @@
+import assert from 'node:assert/strict'
+import { it } from 'vitest'
+import {
+  location,
+  locationConfiguration,
+  role,
+  roleEnforcementConfiguration,
+} from '@living-architecture/riviere-role-enforcement-domain-model'
+import * as fixtureWorkspace from './__fixtures__/test-fixture-workspace'
+
+const moduleFunction = role('module-function', { targets: ['function'] })
+
+it('rejects circular imports', () => {
+  fixtureWorkspace.withWorkspaceFixture(
+    {
+      prefix: 'role-enforcement-circular-imports-',
+      roles: [moduleFunction],
+      files: {
+        'packages/pkg-a/src/domain/first.ts': `import { second } from './second'
+
+/** @riviere-role module-function */
+export function first(): string {
+  return second()
+}
+`,
+        'packages/pkg-a/src/domain/second.ts': `import { first } from './first'
+
+/** @riviere-role module-function */
+export function second(): string {
+  return first()
+}
+`,
+      },
+    },
+    (workspaceDir) => {
+      const result = fixtureWorkspace.runTestRoleEnforcement(
+        roleEnforcementConfiguration({
+          configurations: {
+            'packages/pkg-a': {
+              locations: locationConfiguration(
+                location('/domain', ['module-function'], { allowAnySubLocations: true }),
+              ),
+            },
+          },
+          ignorePatterns: [],
+          roleDefinitionsDir: '.riviere/role-definitions',
+          roles: [moduleFunction],
+        }),
+        workspaceDir,
+      )
+
+      assert.equal(result.exitCode, 1)
+      assert.match(result.stdout, /Dependency cycle detected/)
+    },
+  )
+})
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/decorator-signature.spec.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/decorator-signature.spec.ts
new file mode 100644
index 000000000..8a66f4da7
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/decorator-signature.spec.ts
@@ -0,0 +1,75 @@
+import { expect, it } from 'vitest'
+import {
+  location,
+  locationConfiguration,
+  role,
+  roleEnforcementConfiguration,
+} from '@living-architecture/riviere-role-enforcement-domain-model'
+import { runTestRoleEnforcement, withWorkspaceFixture } from './__fixtures__/test-fixture-workspace'
+
+const annotationRole = role('annotation', {
+  requiresDecoratorSignature: true,
+})
+
+const config = roleEnforcementConfiguration({
+  configurations: {
+    'packages/pkg-a': {
+      locations: locationConfiguration(
+        location<'annotation'>('/published-language', ['annotation']),
+      ),
+    },
+  },
+  ignorePatterns: ['**/*.spec.ts'],
+  roleDefinitionsDir: '.riviere/role-definitions',
+  roles: [annotationRole],
+})
+
+function runWith(source: string) {
+  return withWorkspaceFixture(
+    {
+      prefix: 'role-enforcement-decorator-',
+      roles: [annotationRole],
+      files: {
+        'packages/pkg-a/src/published-language/annotation.ts': source,
+      },
+    },
+    (workspaceDir) => {
+      return runTestRoleEnforcement(config, workspaceDir)
+    },
+  )
+}
+
+it('allows an annotation implemented as a direct decorator', () => {
+  const result = runWith(`/** @riviere-role annotation */
+export function Mark<T>(target: T, context: ClassDecoratorContext): T {
+  return target
+}
+`)
+
+  expect(result.exitCode).toBe(0)
+})
+
+it('allows an annotation implemented as a decorator factory', () => {
+  const result = runWith(`/** @riviere-role annotation */
+export function Named(name: string): <T>(target: T, context: ClassDecoratorContext) => T {
+  return function <T>(target: T, context: ClassDecoratorContext): T {
+    return target
+  }
+}
+`)
+
+  expect(result.exitCode).toBe(0)
+})
+
+it('rejects an ordinary function labelled as an annotation', () => {
+  const result = runWith(`/** @riviere-role annotation */
+export function formatName(value: string): string {
+  return value.trim()
+}
+`)
+
+  expect(result.exitCode).toBe(1)
+  expect(result.stdout).toContain(
+    "Role 'annotation' requires a decorator signature on 'formatName'.",
+  )
+})
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/dependency-syntax.spec.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/dependency-syntax.spec.ts
new file mode 100644
index 000000000..e01340930
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/dependency-syntax.spec.ts
@@ -0,0 +1,101 @@
+import { expect, it } from 'vitest'
+import {
+  location,
+  locationConfiguration,
+  role,
+  roleEnforcementConfiguration,
+} from '@living-architecture/riviere-role-enforcement-domain-model'
+import { runTestRoleEnforcement, withWorkspaceFixture } from './__fixtures__/test-fixture-workspace'
+
+const roles = [
+  role('consumer', { targets: ['type-alias'] }),
+  role('provider', { targets: ['type-alias'] }),
+] as const
+
+function createConfig(ignorePatterns: readonly string[] = []) {
+  return roleEnforcementConfiguration({
+    configurations: {
+      'packages/pkg-a': {
+        locations: locationConfiguration(
+          location<(typeof roles)[number]['name']>('/source', ['consumer'], {
+            importRules: { allow: {} },
+          }),
+          location<(typeof roles)[number]['name']>('/target', ['provider']),
+        ),
+      },
+    },
+    ignorePatterns,
+    roleDefinitionsDir: '.riviere/role-definitions',
+    roles,
+  })
+}
+
+const config = createConfig()
+
+function runWith(source: string) {
+  return withWorkspaceFixture(
+    {
+      prefix: 'role-enforcement-dependency-syntax-',
+      roles,
+      files: {
+        'packages/pkg-a/src/source/source.ts': source,
+        'packages/pkg-a/src/target/target.ts': `/** @riviere-role provider */
+export type Target = { value: string }
+`,
+      },
+    },
+    (workspaceDir) => runTestRoleEnforcement(config, workspaceDir),
+  )
+}
+
+it.each([
+  ['a named re-export', `export type { Target } from '../target/target'\n`],
+  ['a wildcard re-export', `export * from '../target/target'\n`],
+  ['a dynamic import', `void import('../target/target')\n`],
+  ['a CommonJS require', `require('../target/target')\n`],
+  [
+    'a TypeScript import type',
+    `/** @riviere-role consumer */
+export type Source = import('../target/target').Target
+`,
+  ],
+])('checks %s against location import rules', (_description, source) => {
+  const result = runWith(source)
+
+  expect(result.exitCode).toBe(1)
+  expect(result.stdout).toContain("Location '/source' cannot import location '/target'.")
+})
+
+it.each([
+  ['dynamic import', `const target = '../target/target'\nvoid import(target)\n`],
+  ['CommonJS require', `const target = '../target/target'\nrequire(target)\n`],
+])('rejects a non-literal %s target', (_description, source) => {
+  const result = runWith(source)
+
+  expect(result.exitCode).toBe(1)
+  expect(result.stdout).toContain(
+    'Dependency target must be a string literal so its location can be checked.',
+  )
+})
+
+it('rejects a production import from an ignored fixture', () => {
+  const result = withWorkspaceFixture(
+    {
+      prefix: 'role-enforcement-ignored-fixture-',
+      roles,
+      files: {
+        'packages/pkg-a/src/source/source.ts': `import type { Fixture } from './__fixtures__/fixture'
+
+/** @riviere-role consumer */
+export type Source = Fixture
+`,
+        'packages/pkg-a/src/source/__fixtures__/fixture.ts': `export type Fixture = { value: string }
+`,
+      },
+    },
+    (workspaceDir) => runTestRoleEnforcement(createConfig(['**/__fixtures__/**']), workspaceDir),
+  )
+
+  expect(result.exitCode).toBe(1)
+  expect(result.stdout).toContain('Production code cannot import ignored file')
+})
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/exported-variable-roles.spec.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/exported-variable-roles.spec.ts
new file mode 100644
index 000000000..f8a2a297a
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/exported-variable-roles.spec.ts
@@ -0,0 +1,72 @@
+import { expect, it } from 'vitest'
+import {
+  location,
+  locationConfiguration,
+  role,
+  roleEnforcementConfiguration,
+} from '@living-architecture/riviere-role-enforcement-domain-model'
+import { runTestRoleEnforcement, withWorkspaceFixture } from './__fixtures__/test-fixture-workspace'
+
+const fieldNameRole = role('field-name', {
+  requiresStringLiteralConstant: true,
+})
+
+const config = roleEnforcementConfiguration({
+  configurations: {
+    'packages/pkg-a': {
+      locations: locationConfiguration(
+        location<'field-name'>('/published-language', ['field-name']),
+      ),
+    },
+  },
+  ignorePatterns: ['**/*.spec.ts'],
+  roleDefinitionsDir: '.riviere/role-definitions',
+  roles: [fieldNameRole],
+})
+
+function runWith(source: string) {
+  return withWorkspaceFixture(
+    {
+      prefix: 'role-enforcement-variable-',
+      roles: [fieldNameRole],
+      files: {
+        'packages/pkg-a/src/published-language/field-name.ts': source,
+      },
+    },
+    (workspaceDir) => runTestRoleEnforcement(config, workspaceDir),
+  )
+}
+
+it('allows a published field name declared as a string-literal constant', () => {
+  const result = runWith(`/** @riviere-role field-name */
+export const EVENT_NAME_FIELD = 'eventName' as const
+`)
+
+  expect(result.exitCode).toBe(0)
+})
+
+it('rejects a mutable published field name', () => {
+  const result = runWith(`/** @riviere-role field-name */
+export let EVENT_NAME_FIELD = 'eventName'
+`)
+
+  expect(result.exitCode).toBe(1)
+  expect(result.stdout).toContain("Role 'field-name' requires a string-literal constant")
+})
+
+it('rejects a computed published field name', () => {
+  const result = runWith(`/** @riviere-role field-name */
+export const EVENT_NAME_FIELD = String('eventName')
+`)
+
+  expect(result.exitCode).toBe(1)
+  expect(result.stdout).toContain("Role 'field-name' requires a string-literal constant")
+})
+
+it('requires an exported variable to declare its role', () => {
+  const result = runWith(`export const EVENT_NAME_FIELD = 'eventName' as const
+`)
+
+  expect(result.exitCode).toBe(1)
+  expect(result.stdout).toContain("Missing @riviere-role annotation for 'EVENT_NAME_FIELD'")
+})
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/forbidden-method-calls.spec.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/forbidden-method-calls.spec.ts
new file mode 100644
index 000000000..1c24a049f
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/forbidden-method-calls.spec.ts
@@ -0,0 +1,118 @@
+import { expect, it } from 'vitest'
+import {
+  location,
+  locationConfiguration,
+  role,
+  roleEnforcementConfiguration,
+} from '@living-architecture/riviere-role-enforcement-domain-model'
+import {
+  runTestRoleEnforcement,
+  withWorkspaceFixture,
+  writeFixtureFile,
+} from './__fixtures__/test-fixture-workspace'
+
+const testRoles = [
+  role('role-a', {
+    targets: ['class'],
+    minPublicMethods: 1,
+  }),
+  role('role-main', {
+    targets: ['function'],
+    forbiddenMethodCalls: ['role-a'],
+  }),
+] as const
+
+type TestRoleName = (typeof testRoles)[number]['name']
+
+const testLocations = locationConfiguration(
+  location<TestRoleName>('/commands', ['role-a']),
+  location<TestRoleName>('/shell', ['role-main']),
+)
+
+const testConfig = roleEnforcementConfiguration({
+  configurations: {
+    'packages/pkg-a': {
+      locations: testLocations,
+    },
+  },
+  ignorePatterns: ['**/*.spec.ts'],
+  roleDefinitionsDir: '.riviere/role-definitions',
+  roles: testRoles,
+})
+
+const fixtureBootstrap = {
+  prefix: 'forbidden-method-calls-',
+  roles: testRoles,
+  files: {
+    'packages/pkg-a/src/commands/alpha.ts': `/** @riviere-role role-a */
+export class Alpha {
+  execute(): void {}
+}
+`,
+  },
+}
+
+function withFixtureWorkspace(fn: (workspaceDir: string) => void) {
+  withWorkspaceFixture(fixtureBootstrap, fn)
+}
+
+function writeShellFile(workspaceDir: string, content: string) {
+  writeFixtureFile(workspaceDir, 'packages/pkg-a/src/shell/main.ts', content)
+}
+
+it('rejects non-construction usage of imports with forbidden method call roles', () => {
+  withFixtureWorkspace((workspaceDir) => {
+    writeShellFile(
+      workspaceDir,
+      `import { Alpha } from '../commands/alpha'
+
+/** @riviere-role role-main */
+export function runRoleMain(): void {
+  Alpha.staticMethod()
+}
+`,
+    )
+    const result = runTestRoleEnforcement(testConfig, workspaceDir)
+    expect(result.exitCode).toBe(1)
+    expect(result.stderr).toBe('')
+    expect(result.stdout).toContain('forbids non-construction usage')
+    expect(result.stdout).toContain('role-a')
+  })
+})
+
+it('rejects passing forbidden role import as function argument', () => {
+  withFixtureWorkspace((workspaceDir) => {
+    writeShellFile(
+      workspaceDir,
+      `import { Alpha } from '../commands/alpha'
+
+/** @riviere-role role-main */
+export function runRoleMain(): void {
+  console.log(Alpha)
+}
+`,
+    )
+    const result = runTestRoleEnforcement(testConfig, workspaceDir)
+    expect(result.exitCode).toBe(1)
+    expect(result.stderr).toBe('')
+    expect(result.stdout).toContain('forbids non-construction usage')
+  })
+})
+
+it('accepts construction of imports with forbidden method call roles', () => {
+  withFixtureWorkspace((workspaceDir) => {
+    writeShellFile(
+      workspaceDir,
+      `import { Alpha } from '../commands/alpha'
+
+/** @riviere-role role-main */
+export function runRoleMain(): void {
+  const instance = new Alpha()
+}
+`,
+    )
+    const result = runTestRoleEnforcement(testConfig, workspaceDir)
+    expect(result.exitCode).toBe(0)
+    expect(result.stderr).toBe('')
+  })
+})
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/layer-dependency.spec.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/layer-dependency.spec.ts
new file mode 100644
index 000000000..668334c8c
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/layer-dependency.spec.ts
@@ -0,0 +1,317 @@
+import assert from 'node:assert/strict'
+import * as fs from 'node:fs'
+import path from 'node:path'
+import { it } from 'vitest'
+import * as enforcementBuilder from '@living-architecture/riviere-role-enforcement-domain-model'
+import * as fixtureWorkspace from './__fixtures__/test-fixture-workspace'
+
+const layerTestRoles = [
+  enforcementBuilder.role('role-infra', { targets: ['function', 'interface', 'type-alias'] }),
+  enforcementBuilder.role('domain-port', { targets: ['interface', 'type-alias'] }),
+  enforcementBuilder.role('domain-port-adapter', {
+    targets: ['function'],
+    forbiddenDependencies: ['domain-port-adapter'],
+  }),
+  enforcementBuilder.role('command-use-case', {
+    targets: ['function'],
+    forbiddenDependencies: ['domain-port-adapter'],
+  }),
+  enforcementBuilder.role('external-client-service', { targets: ['function'] }),
+] as const
+
+const layerTestLocations = enforcementBuilder.locationConfiguration(
+  enforcementBuilder.location<(typeof layerTestRoles)[number]['name']>('/domain', ['domain-port']),
+  enforcementBuilder.location<(typeof layerTestRoles)[number]['name']>('/infra', ['role-infra'], {
+    importRules: { allow: {} },
+  }),
+)
+
+const layerTestConfig = enforcementBuilder.roleEnforcementConfiguration({
+  configurations: {
+    'packages/pkg-a': {
+      locations: layerTestLocations,
+    },
+  },
+  ignorePatterns: [],
+  roleDefinitionsDir: '.riviere/role-definitions',
+  roles: layerTestRoles,
+})
+
+const layerTestBootstrap = {
+  prefix: 'role-enforcement-layer-',
+  roles: layerTestRoles,
+  files: {
+    'packages/pkg-a/src/infra/source.ts': `/** @riviere-role role-infra */
+export function source(): string {
+  return 'source'
+}
+`,
+  },
+}
+
+const adapterLayerTestBootstrap = {
+  ...layerTestBootstrap,
+  files: {},
+}
+
+it('accepts imports within the infra layer', () => {
+  fixtureWorkspace.withWorkspaceFixture(layerTestBootstrap, (workspaceDir) => {
+    fixtureWorkspace.writeFixtureFile(
+      workspaceDir,
+      'packages/pkg-a/src/infra/consumer.ts',
+      `import { source } from './source'
+
+/** @riviere-role role-infra */
+export function consume(): string {
+  return source()
+}
+`,
+    )
+
+    const result = runLayerEnforcement(workspaceDir)
+
+    assert.equal(result.exitCode, 0)
+    assert.equal(result.stderr, '')
+  })
+})
+
+it('accepts external library imports from infra', () => {
+  fixtureWorkspace.withWorkspaceFixture(layerTestBootstrap, (workspaceDir) => {
+    fixtureWorkspace.writeFixtureFile(
+      workspaceDir,
+      'packages/pkg-a/src/infra/consumer.ts',
+      `import path from 'node:path'
+
+/** @riviere-role role-infra */
+export function consume(): string {
+  return path.basename('/tmp/example.txt')
+}
+`,
+    )
+
+    const result = runLayerEnforcement(workspaceDir)
+
+    assert.equal(result.exitCode, 0)
+    assert.equal(result.stderr, '')
+  })
+})
+
+it('rejects imports between domain-port adapters', () => {
+  fixtureWorkspace.withWorkspaceFixture(adapterLayerTestBootstrap, (workspaceDir) => {
+    fixtureWorkspace.writeFixtureFile(
+      workspaceDir,
+      'packages/pkg-a/src/adapters/github/github-adapter.ts',
+      `/** @riviere-role domain-port-adapter */
+export function createGithubAdapter(): string {
+  return 'github'
+}
+`,
+    )
+    fixtureWorkspace.writeFixtureFile(
+      workspaceDir,
+      'packages/pkg-a/src/adapters/oxlint/oxlint-adapter.ts',
+      `import { createGithubAdapter } from '../github/github-adapter'
+
+/** @riviere-role domain-port-adapter */
+export function createOxlintAdapter(): string {
+  return createGithubAdapter()
+}
+`,
+    )
+
+    const result = fixtureWorkspace.runTestRoleEnforcement(createAdapterLayerConfig(), workspaceDir)
+
+    assert.equal(result.exitCode, 1)
+    assert.match(
+      result.stdout,
+      /Forbidden dependency: this file \(domain-port-adapter\) cannot import from a file exporting 'domain-port-adapter'/,
+    )
+  })
+})
+
+it('rejects commands importing concrete domain-port adapters', () => {
+  fixtureWorkspace.withWorkspaceFixture(adapterLayerTestBootstrap, (workspaceDir) => {
+    fixtureWorkspace.writeFixtureFile(
+      workspaceDir,
+      'packages/pkg-a/src/adapters/oxlint/oxlint-adapter.ts',
+      `/** @riviere-role domain-port-adapter */
+export function createOxlintAdapter(): string {
+  return 'oxlint'
+}
+`,
+    )
+    fixtureWorkspace.writeFixtureFile(
+      workspaceDir,
+      'packages/pkg-a/src/commands/run.ts',
+      `import { createOxlintAdapter } from '../adapters/oxlint/oxlint-adapter'
+
+/** @riviere-role command-use-case */
+export function run(): string {
+  return createOxlintAdapter()
+}
+`,
+    )
+
+    const result = fixtureWorkspace.runTestRoleEnforcement(createAdapterLayerConfig(), workspaceDir)
+
+    assert.equal(result.exitCode, 1)
+    assert.match(
+      result.stdout,
+      /Forbidden dependency: this file \(command-use-case\) cannot import from a file exporting 'domain-port-adapter'/,
+    )
+  })
+})
+
+it('rejects imports from infra to another internal layer', () => {
+  fixtureWorkspace.withWorkspaceFixture(layerTestBootstrap, (workspaceDir) => {
+    fixtureWorkspace.writeFixtureFile(
+      workspaceDir,
+      'packages/pkg-a/src/domain/domain-port.ts',
+      `/** @riviere-role domain-port */
+export interface DomainPort {
+  value(): string
+}
+`,
+    )
+    fixtureWorkspace.writeFixtureFile(
+      workspaceDir,
+      'packages/pkg-a/src/infra/consumer.ts',
+      `import type { DomainPort } from '../domain/domain-port'
+
+/** @riviere-role role-infra */
+export function consume(port: DomainPort): string {
+  return port.value()
+}
+`,
+    )
+
+    const result = runLayerEnforcement(workspaceDir)
+
+    assert.equal(result.exitCode, 1)
+    assert.equal(result.stderr, '')
+    assert.match(result.stdout, /Location '\/infra' cannot import location '\/domain'/)
+  })
+})
+
+it('rejects workspace package imports from infra when the target is not infra', () => {
+  fixtureWorkspace.withWorkspaceFixture(layerTestBootstrap, (workspaceDir) => {
+    const packageManifest = {
+      name: '@generic/pkg-domain',
+      exports: {
+        '.': { '@living-architecture/source': './src/index.ts' },
+        './package.json': './package.json',
+      },
+    }
+    fixtureWorkspace.writeFixtureFile(
+      workspaceDir,
+      'packages/pkg-domain/package.json',
+      JSON.stringify(packageManifest),
+    )
+    fixtureWorkspace.writeFixtureFile(
+      workspaceDir,
+      'packages/pkg-domain/src/index.ts',
+      `export type { DomainPort } from './domain/domain-port'
+`,
+    )
+    fixtureWorkspace.writeFixtureFile(
+      workspaceDir,
+      'packages/pkg-domain/src/domain/domain-port.ts',
+      `/** @riviere-role domain-port */
+export interface DomainPort {
+  value(): string
+}
+`,
+    )
+    fixtureWorkspace.writeFixtureFile(
+      workspaceDir,
+      'packages/pkg-a/src/infra/consumer.ts',
+      `import type { DomainPort } from '@generic/pkg-domain'
+
+/** @riviere-role role-infra */
+export function consume(port: DomainPort): string {
+  return port.value()
+}
+`,
+    )
+    const packageScopeDir = path.join(workspaceDir, 'node_modules/@generic')
+    fs.mkdirSync(packageScopeDir, { recursive: true })
+    fs.symlinkSync(
+      path.join(workspaceDir, 'packages/pkg-domain'),
+      path.join(packageScopeDir, 'pkg-domain'),
+      'dir',
+    )
+
+    const result = fixtureWorkspace.runTestRoleEnforcement(
+      createCrossPackageLayerConfig(),
+      workspaceDir,
+    )
+
+    assert.equal(result.exitCode, 1)
+    assert.equal(result.stderr, '')
+    assert.match(result.stdout, /Location '\/infra' cannot import location '\/domain'/)
+  })
+})
+
+function runLayerEnforcement(workspaceDir: string) {
+  return fixtureWorkspace.runTestRoleEnforcement(layerTestConfig, workspaceDir)
+}
+
+function createAdapterLayerConfig() {
+  const locations = enforcementBuilder.locationConfiguration(
+    enforcementBuilder.location<(typeof layerTestRoles)[number]['name']>(
+      '/adapters/{adapter}',
+      ['domain-port-adapter'],
+      {
+        allowAnySubLocations: true,
+        importRules: {
+          allow: {
+            root: [{ domain: ['domain-port'] }, { infra: ['external-client-service'] }],
+          },
+        },
+      },
+    ),
+    enforcementBuilder.location<(typeof layerTestRoles)[number]['name']>('/commands', [
+      'command-use-case',
+    ]),
+    enforcementBuilder.location<(typeof layerTestRoles)[number]['name']>(
+      '/domain',
+      ['domain-port'],
+      { allowAnySubLocations: true },
+    ),
+    enforcementBuilder.location<(typeof layerTestRoles)[number]['name']>('/infra', [
+      'external-client-service',
+    ]),
+  )
+  return enforcementBuilder.roleEnforcementConfiguration({
+    configurations: {
+      'packages/pkg-a': {
+        locations,
+      },
+    },
+    ignorePatterns: [],
+    roleDefinitionsDir: '.riviere/role-definitions',
+    roles: layerTestRoles,
+  })
+}
+
+function createCrossPackageLayerConfig() {
+  return enforcementBuilder.roleEnforcementConfiguration({
+    configurations: {
+      'packages/pkg-a': {
+        locations: layerTestLocations,
+      },
+      'packages/pkg-domain': {
+        locations: enforcementBuilder.locationConfiguration(
+          enforcementBuilder.location<(typeof layerTestRoles)[number]['name']>(
+            '/domain',
+            ['domain-port'],
+            { allowAnySubLocations: true },
+          ),
+        ),
+      },
+    },
+    ignorePatterns: [],
+    roleDefinitionsDir: '.riviere/role-definitions',
+    roles: layerTestRoles,
+  })
+}
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/location-folder-rules.spec.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/location-folder-rules.spec.ts
new file mode 100644
index 000000000..a2313c9f9
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/location-folder-rules.spec.ts
@@ -0,0 +1,44 @@
+import assert from 'node:assert/strict'
+import { it } from 'vitest'
+import {
+  location,
+  locationConfiguration,
+  role,
+  roleEnforcementConfiguration,
+} from '@living-architecture/riviere-role-enforcement-domain-model'
+import * as fixtureWorkspace from './__fixtures__/test-fixture-workspace'
+
+it('a file cannot satisfy a required sub-location', () => {
+  const roles = [role('repository', { targets: ['class'] })] as const
+  const locations = locationConfiguration(
+    location<(typeof roles)[number]['name']>('/features/{feature}', {
+      'data-access/{concept}': ['repository'],
+    }),
+  )
+
+  fixtureWorkspace.withWorkspaceFixture(
+    {
+      prefix: 'role-enforcement-required-sub-location-',
+      roles,
+      files: {
+        'packages/pkg-a/src/features/orders/data-access/repository.ts': `/** @riviere-role repository */
+export class Repository {}
+`,
+      },
+    },
+    (workspaceDir) => {
+      const result = fixtureWorkspace.runTestRoleEnforcement(
+        roleEnforcementConfiguration({
+          configurations: { 'packages/pkg-a': { locations } },
+          ignorePatterns: [],
+          roleDefinitionsDir: '.riviere/role-definitions',
+          roles,
+        }),
+        workspaceDir,
+      )
+
+      assert.equal(result.exitCode, 1)
+      assert.match(result.stdout, /Unconfigured sub-location 'data-access'/)
+    },
+  )
+})
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/location-hierarchy.spec.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/location-hierarchy.spec.ts
new file mode 100644
index 000000000..5def4ce96
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/location-hierarchy.spec.ts
@@ -0,0 +1,325 @@
+import assert from 'node:assert/strict'
+import { it } from 'vitest'
+import {
+  location,
+  locationConfiguration,
+  role,
+  roleEnforcementConfiguration,
+  type LocationConfiguration,
+} from '@living-architecture/riviere-role-enforcement-domain-model'
+import * as fixtureWorkspace from './__fixtures__/test-fixture-workspace'
+
+const baseLocations = locationConfiguration<never>(
+  location<never>('/first', { alpha: [], beta: [], gamma: [] }),
+  location<never>('/second', { alpha: [], beta: [], gamma: [] }),
+)
+
+it('allows no roles when a location has no permitted roles', () => {
+  const roles = [role('role-a', { targets: ['function'] })] as const
+
+  fixtureWorkspace.withWorkspaceFixture(
+    {
+      prefix: 'role-enforcement-empty-location-roles-',
+      roles,
+      files: {
+        'packages/pkg-a/src/infra/source.ts': `/** @riviere-role role-a */
+export function source(): string {
+  return 'source'
+}
+`,
+      },
+    },
+    (workspaceDir) => {
+      const result = fixtureWorkspace.runTestRoleEnforcement(
+        roleEnforcementConfiguration({
+          configurations: {
+            'packages/pkg-a': {
+              locations: locationConfiguration(location<'role-a'>('/infra', [])),
+            },
+          },
+          ignorePatterns: [],
+          roleDefinitionsDir: '.riviere/role-definitions',
+          roles,
+        }),
+        workspaceDir,
+      )
+
+      assert.equal(result.exitCode, 1)
+      assert.match(result.stdout, /role-a cannot live in packages\/pkg-a\/src\/infra\/source.ts/)
+    },
+  )
+})
+
+it('a sub-location does not use roles permitted by its parent location', () => {
+  const roles = [role('role-a', { targets: ['function'] })] as const
+  const locations = locationConfiguration(
+    location<'role-a'>('/entrypoint', {
+      _platform: {
+        roles: ['role-a'],
+        cli: [],
+      },
+    }),
+  )
+
+  runRoleFixture(
+    roles,
+    locations,
+    {
+      'packages/pkg-a/src/entrypoint/_platform/cli/input.ts': `/** @riviere-role role-a */
+export function input(): string {
+  return 'input'
+}
+`,
+    },
+    (result) => {
+      assert.equal(result.exitCode, 1)
+      assert.match(result.stdout, /role-a cannot live/)
+    },
+  )
+})
+
+it('allows imports between locations by default', () => {
+  runFixture(
+    baseLocations,
+    {
+      'packages/pkg-a/src/first/alpha/source.ts': `import '../../second/gamma/target'\n`,
+      'packages/pkg-a/src/second/gamma/target.ts': `void 'target'\n`,
+    },
+    (result) => assert.equal(result.exitCode, 0, result.stdout),
+  )
+})
+
+it('applies declared import rules between different location instances', () => {
+  const locations = locationConfiguration<never>(
+    location<never>('/features/{feature}', {
+      commands: [],
+      domain: [],
+      importRules: { allow: { root: ['infra'] } },
+    }),
+    location<never>('/infra', []),
+  )
+
+  runFixture(
+    locations,
+    {
+      'packages/pkg-a/src/features/orders/commands/run.ts': `import '../../payments/domain/payment'\n`,
+      'packages/pkg-a/src/features/payments/domain/payment.ts': `void 'payment'\n`,
+    },
+    (result) => {
+      assert.equal(result.exitCode, 1)
+      assert.match(result.stdout, /cannot import location '\/domain'/)
+    },
+  )
+})
+
+it('allows only the named sibling location after import rules are declared', () => {
+  const locations = locationConfiguration<never>(
+    location<never>('/features/{feature}', {
+      commands: {
+        importRules: { allow: { sibling: ['data-access'] } },
+      },
+      'data-access': [],
+      entrypoint: [],
+    }),
+  )
+
+  runFixture(
+    locations,
+    {
+      'packages/pkg-a/src/features/orders/commands/run.ts': `import '../data-access/repository'\nimport '../entrypoint/handler'\n`,
+      'packages/pkg-a/src/features/orders/data-access/repository.ts': `void 'repository'\n`,
+      'packages/pkg-a/src/features/orders/entrypoint/handler.ts': `void 'handler'\n`,
+    },
+    (result) => {
+      assert.equal(result.exitCode, 1)
+      assert.match(result.stdout, /cannot import location '\/entrypoint'/)
+    },
+  )
+})
+
+it('a root import includes every sub-location below that root', () => {
+  const locations = locationConfiguration<never>(
+    location<never>('/features/{feature}', {
+      entrypoint: { importRules: { allow: { root: ['infra'] } } },
+    }),
+    location<never>('/infra', {
+      'cli/input': [],
+      'cli/presentation': [],
+    }),
+  )
+
+  runFixture(
+    locations,
+    {
+      'packages/pkg-a/src/features/orders/entrypoint/handler.ts': `import '../../../infra/cli/input/parser'\nimport '../../../infra/cli/presentation/output'\n`,
+      'packages/pkg-a/src/infra/cli/input/parser.ts': `void 'parser'\n`,
+      'packages/pkg-a/src/infra/cli/presentation/output.ts': `void 'output'\n`,
+    },
+    (result) => assert.equal(result.exitCode, 0, result.stdout),
+  )
+})
+
+it('inherits import restrictions in every sub-location', () => {
+  const locations = locationConfiguration<never>(
+    location<never>('/domain', []),
+    location<never>('/infra', {
+      'external-clients/{client}': [],
+      importRules: { allow: {} },
+    }),
+  )
+
+  runFixture(
+    locations,
+    {
+      'packages/pkg-a/src/domain/model.ts': `void 'domain'\n`,
+      'packages/pkg-a/src/infra/external-clients/http/client.tsx': `import '../../../domain/model'\n`,
+    },
+    (result) => {
+      assert.equal(result.exitCode, 1)
+      assert.match(result.stdout, /cannot import location '\/domain'/)
+    },
+  )
+})
+
+it('allows imports within a restricted location', () => {
+  const locations = locationConfiguration<never>(
+    location<never>('/infra', {
+      cli: [],
+      'external-clients': [],
+      importRules: { allow: {} },
+    }),
+  )
+
+  runFixture(
+    locations,
+    {
+      'packages/pkg-a/src/infra/cli/output.ts': `import '../external-clients/client'\n`,
+      'packages/pkg-a/src/infra/external-clients/client.ts': `void 'client'\n`,
+    },
+    (result) => assert.equal(result.exitCode, 0, result.stdout),
+  )
+})
+
+it('rejects folders that are not configured sub-locations', () => {
+  runFixture(
+    baseLocations,
+    { 'packages/pkg-a/src/first/unconfigured/file.ts': `void 'invalid folder'\n` },
+    (result) => {
+      assert.equal(result.exitCode, 1)
+      assert.match(result.stdout, /Unconfigured sub-location 'unconfigured'/)
+    },
+  )
+})
+
+it('rejects source folders that are not configured locations', () => {
+  runFixture(
+    locationConfiguration<never>(location<never>('/domain', [])),
+    { 'packages/pkg-a/src/other/file.ts': `void 'invalid location'\n` },
+    (result) => {
+      assert.equal(result.exitCode, 1)
+      assert.match(result.stdout, /Unconfigured sub-location 'other' inside location '\/'/)
+    },
+  )
+})
+
+it('allows any folder when allowAnySubLocations is enabled', () => {
+  runFixture(
+    locationConfiguration<never>(location<never>('/domain', [], { allowAnySubLocations: true })),
+    { 'packages/pkg-a/src/domain/connection-detection/deep/file.ts': `void 'domain'\n` },
+    (result) => assert.equal(result.exitCode, 0, result.stdout),
+  )
+})
+
+it('rejects combining allowAnySubLocations with explicit sub-locations', () => {
+  assert.throws(
+    () => location<never>('/domain', { invalid: [], allowAnySubLocations: true }),
+    /cannot define both allowAnySubLocations and subLocations/,
+  )
+})
+
+it('allows a private location to be imported from within its parent location', () => {
+  runFixture(
+    privateLocationConfiguration(),
+    {
+      'packages/pkg-a/src/entrypoint/_platform/shared.ts': `void 'shared'\n`,
+      'packages/pkg-a/src/entrypoint/http/handler.ts': `import '../_platform/shared'\n`,
+    },
+    (result) => assert.equal(result.exitCode, 0, result.stdout),
+  )
+})
+
+it('rejects importing a private location from outside its parent location', () => {
+  runFixture(
+    privateLocationConfiguration(),
+    {
+      'packages/pkg-a/src/entrypoint/_platform/shared.ts': `void 'shared'\n`,
+      'packages/pkg-a/src/commands/run.ts': `import '../entrypoint/_platform/shared'\n`,
+    },
+    (result) => {
+      assert.equal(result.exitCode, 1)
+      assert.match(result.stdout, /can only be imported from within its parent location/)
+    },
+  )
+})
+
+function privateLocationConfiguration(): LocationConfiguration<never> {
+  return locationConfiguration<never>(
+    location<never>('/commands', []),
+    location<never>('/entrypoint', {
+      _platform: { importRules: { importableFrom: 'withinParentLocation' } },
+      http: [],
+    }),
+  )
+}
+
+type FixtureResult = { exitCode: number; stderr: string; stdout: string }
+
+function runRoleFixture<R extends string>(
+  roles: readonly ReturnType<typeof role<R>>[],
+  locations: LocationConfiguration<R>,
+  files: Readonly<Record<string, string>>,
+  assertResult: (result: FixtureResult) => void,
+): void {
+  fixtureWorkspace.withWorkspaceFixture(
+    { prefix: 'role-enforcement-location-roles-', roles, files },
+    (workspaceDir) => {
+      const result = fixtureWorkspace.runTestRoleEnforcement(
+        roleEnforcementConfiguration({
+          configurations: { 'packages/pkg-a': { locations } },
+          ignorePatterns: [],
+          roleDefinitionsDir: '.riviere/role-definitions',
+          roles,
+        }),
+        workspaceDir,
+      )
+      assertResult(result)
+    },
+  )
+}
+
+function runFixture(
+  locations: LocationConfiguration<never>,
+  files: Readonly<Record<string, string>>,
+  assertResult: (result: FixtureResult) => void,
+): void {
+  fixtureWorkspace.withWorkspaceFixture(
+    {
+      prefix: 'role-enforcement-location-hierarchy-',
+      roles: [],
+      files: { '.riviere/role-definitions/.gitkeep': '', ...files },
+    },
+    (workspaceDir) => {
+      const result = fixtureWorkspace.runTestRoleEnforcement(createConfig(locations), workspaceDir)
+      assertResult(result)
+    },
+  )
+}
+
+function createConfig(locations: LocationConfiguration<never>) {
+  return roleEnforcementConfiguration({
+    configurations: { 'packages/pkg-a': { locations } },
+    ignorePatterns: [],
+    roleDefinitionsDir: '.riviere/role-definitions',
+    roles: [],
+  })
+}
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/location-import-rules.spec.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/location-import-rules.spec.ts
new file mode 100644
index 000000000..ca3f135de
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/location-import-rules.spec.ts
@@ -0,0 +1,171 @@
+import assert from 'node:assert/strict'
+import { it } from 'vitest'
+import {
+  location,
+  locationConfiguration,
+  role,
+  roleEnforcementConfiguration,
+} from '@living-architecture/riviere-role-enforcement-domain-model'
+import * as fixtureWorkspace from './__fixtures__/test-fixture-workspace'
+
+it("a sub-location inherits its parent location's allowed imports", () => {
+  const locations = locationConfiguration<never>(
+    location<never>('/features/{feature}', {
+      commands: {
+        importRules: { allow: { sibling: ['data-access'] } },
+      },
+      'data-access': [],
+      importRules: { allow: { root: ['infra'] } },
+    }),
+    location<never>('/infra', { cli: [] }),
+  )
+
+  runFixture(
+    locations,
+    {
+      'packages/pkg-a/src/features/orders/commands/run.ts': `import '../../../infra/cli/shared'\n`,
+      'packages/pkg-a/src/infra/cli/shared.ts': `void 'shared'\n`,
+    },
+    (result) => assert.equal(result.exitCode, 0, result.stdout),
+  )
+})
+
+it("a sub-location can stop inheriting its parent location's allowed imports", () => {
+  const locations = locationConfiguration<never>(
+    location<never>('/features/{feature}', {
+      commands: {
+        importRules: {
+          allow: { sibling: ['data-access'] },
+          inheritParentImportRules: false,
+        },
+      },
+      'data-access': [],
+      importRules: { allow: { root: ['infra'] } },
+    }),
+    location<never>('/infra', { cli: [] }),
+  )
+
+  runFixture(
+    locations,
+    {
+      'packages/pkg-a/src/features/orders/commands/run.ts': `import '../../../infra/cli/shared'\n`,
+      'packages/pkg-a/src/infra/cli/shared.ts': `void 'shared'\n`,
+    },
+    (result) => {
+      assert.equal(result.exitCode, 1)
+      assert.match(result.stdout, /cannot import location '\/cli'/)
+    },
+  )
+})
+
+it('an allowed location can be limited to selected roles', () => {
+  const roles = [
+    role('repository', { targets: ['class'] }),
+    role('aggregate', { targets: ['class'] }),
+    role('value-object', { targets: ['class'] }),
+    role('domain-service', { targets: ['function'] }),
+  ] as const
+  const locations = locationConfiguration(
+    location<(typeof roles)[number]['name']>('/features/{feature}', {
+      'data-access/{concept}': {
+        roles: ['repository'],
+        importRules: {
+          allow: {
+            sibling: [{ domain: ['aggregate', 'value-object'] }],
+          },
+        },
+      },
+      domain: {
+        roles: ['aggregate', 'value-object', 'domain-service'],
+        allowAnySubLocations: true,
+      },
+    }),
+  )
+
+  fixtureWorkspace.withWorkspaceFixture(
+    {
+      prefix: 'role-enforcement-selected-location-roles-',
+      roles,
+      files: {
+        'packages/pkg-a/src/features/orders/domain/resolve.ts': `/** @riviere-role domain-service */
+export function resolve(): string {
+  return 'resolved'
+}
+`,
+        'packages/pkg-a/src/features/orders/data-access/orders/repository.ts': `import { resolve } from '../../domain/resolve'
+
+/** @riviere-role repository */
+export class Repository {
+  load(): string {
+    return resolve()
+  }
+}
+`,
+      },
+    },
+    (workspaceDir) => {
+      const result = fixtureWorkspace.runTestRoleEnforcement(
+        roleEnforcementConfiguration({
+          configurations: { 'packages/pkg-a': { locations } },
+          ignorePatterns: [],
+          roleDefinitionsDir: '.riviere/role-definitions',
+          roles,
+        }),
+        workspaceDir,
+      )
+
+      assert.equal(result.exitCode, 1)
+      assert.match(result.stdout, /cannot import location '\/domain'/)
+    },
+  )
+})
+
+it("a file directly inside a location obeys that location's import rules", () => {
+  const locations = locationConfiguration<never>(
+    location<never>('/first', {
+      nested: [],
+      importRules: { allow: {} },
+    }),
+    location<never>('/second', []),
+  )
+
+  runFixture(
+    locations,
+    {
+      'packages/pkg-a/src/first/source.ts': `import '../second/target'\n`,
+      'packages/pkg-a/src/second/target.ts': `void 'target'\n`,
+    },
+    (result) => {
+      assert.equal(result.exitCode, 1)
+      assert.match(result.stdout, /cannot import location '\/second'/)
+    },
+  )
+})
+
+type FixtureResult = { exitCode: number; stderr: string; stdout: string }
+
+function runFixture(
+  locations: ReturnType<typeof locationConfiguration<never>>,
+  files: Readonly<Record<string, string>>,
+  assertResult: (result: FixtureResult) => void,
+): void {
+  fixtureWorkspace.withWorkspaceFixture(
+    {
+      prefix: 'role-enforcement-location-imports-',
+      roles: [],
+      files: { '.riviere/role-definitions/.gitkeep': '', ...files },
+    },
+    (workspaceDir) => {
+      const result = fixtureWorkspace.runTestRoleEnforcement(
+        roleEnforcementConfiguration({
+          configurations: { 'packages/pkg-a': { locations } },
+          ignorePatterns: [],
+          roleDefinitionsDir: '.riviere/role-definitions',
+          roles: [],
+        }),
+        workspaceDir,
+      )
+      assertResult(result)
+    },
+  )
+}
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/named-location-import-rules.spec.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/named-location-import-rules.spec.ts
new file mode 100644
index 000000000..a0bd0da2c
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/named-location-import-rules.spec.ts
@@ -0,0 +1,221 @@
+import assert from 'node:assert/strict'
+import { it } from 'vitest'
+import {
+  location,
+  locationConfiguration,
+  roleEnforcementConfiguration,
+  type LocationConfiguration,
+} from '@living-architecture/riviere-role-enforcement-domain-model'
+import * as fixtureWorkspace from './__fixtures__/test-fixture-workspace'
+
+it('a sibling import includes every sub-location below that sibling', () => {
+  const locations = locationConfiguration<never>(
+    location<never>('/features/{feature}', {
+      commands: { importRules: { allow: { sibling: ['data-access'] } } },
+      'data-access/{concept}': [],
+    }),
+  )
+
+  runFixture(
+    locations,
+    {
+      'packages/pkg-a/src/features/orders/commands/run.ts': `import '../data-access/orders/repository'\n`,
+      'packages/pkg-a/src/features/orders/data-access/orders/repository.ts': `void 'repository'\n`,
+    },
+    (result) => assert.equal(result.exitCode, 0, result.stdout),
+  )
+})
+
+it('a sibling import does not allow a root location with the same name', () => {
+  const locations = locationConfiguration<never>(
+    location<never>('/features/{feature}', {
+      commands: { importRules: { allow: { sibling: ['data-access'] } } },
+      'data-access/{concept}': [],
+    }),
+    location<never>('/data-access/{concept}', []),
+  )
+
+  runFixture(
+    locations,
+    {
+      'packages/pkg-a/src/features/orders/commands/run.ts': `import '../../../data-access/orders/repository'\n`,
+      'packages/pkg-a/src/data-access/orders/repository.ts': `void 'repository'\n`,
+    },
+    (result) => {
+      assert.equal(result.exitCode, 1)
+      assert.match(result.stdout, /cannot import location '\/data-access\/\{concept\}'/)
+    },
+  )
+})
+
+it('a root import does not allow another package with the same root location', () => {
+  const locations = locationConfiguration<never>(
+    location<never>('/features/{feature}', {
+      commands: { importRules: { allow: { root: ['data-access'] } } },
+    }),
+    location<never>('/data-access/{concept}', []),
+  )
+
+  runFixture(
+    locations,
+    {
+      'packages/pkg-a/src/features/orders/commands/run.ts': `import '../../../../../pkg-b/src/data-access/orders/repository'\n`,
+      'packages/pkg-b/src/data-access/orders/repository.ts': `void 'repository'\n`,
+    },
+    (result) => {
+      assert.equal(result.exitCode, 1)
+      assert.match(result.stdout, /cannot import location '\/data-access\/\{concept\}'/)
+    },
+    ['packages/pkg-a', 'packages/pkg-b'],
+  )
+})
+
+it("an own-subdomain import allows a named location in the subdomain's other package", () => {
+  const consumerLocations = locationConfiguration<never>(
+    location<never>('/actions', {
+      importRules: { allow: { ownSubdomain: ['api'] } },
+    }),
+  )
+  const providerLocations = locationConfiguration<never>(
+    location<never>('/api', { allowAnySubLocations: true }),
+  )
+
+  fixtureWorkspace.withWorkspaceFixture(
+    {
+      prefix: 'role-enforcement-own-subdomain-import-',
+      roles: [],
+      files: {
+        '.riviere/role-definitions/.gitkeep': '',
+        'modules/alpha/consumer/src/actions/run.ts': `import '../../../provider/src/api/value'\n`,
+        'modules/alpha/provider/src/api/value.ts': `void 'value'\n`,
+      },
+    },
+    (workspaceDir) => {
+      const result = fixtureWorkspace.runTestRoleEnforcement(
+        roleEnforcementConfiguration({
+          configurations: {
+            'modules/{subdomain}/consumer': { locations: consumerLocations },
+            'modules/{subdomain}/provider': { locations: providerLocations },
+          },
+          ignorePatterns: [],
+          roleDefinitionsDir: '.riviere/role-definitions',
+          roles: [],
+        }),
+        workspaceDir,
+      )
+
+      assert.equal(result.exitCode, 0, result.stdout)
+    },
+  )
+})
+
+it("an any-subdomain import allows another subdomain's named location", () => {
+  const consumerLocations = locationConfiguration<never>(
+    location<never>('/actions', {
+      importRules: { allow: { anySubdomain: ['contract'] } },
+    }),
+  )
+  const exporterLocations = locationConfiguration<never>(
+    location<never>('/contract', { allowAnySubLocations: true }),
+  )
+
+  fixtureWorkspace.withWorkspaceFixture(
+    {
+      prefix: 'role-enforcement-any-subdomain-import-',
+      roles: [],
+      files: {
+        '.riviere/role-definitions/.gitkeep': '',
+        'modules/alpha/consumer/src/actions/run.ts': `import '../../../../beta/exporter/src/contract/schema'\n`,
+        'modules/beta/exporter/src/contract/schema.ts': `void 'schema'\n`,
+      },
+    },
+    (workspaceDir) => {
+      const result = fixtureWorkspace.runTestRoleEnforcement(
+        roleEnforcementConfiguration({
+          configurations: {
+            'modules/{subdomain}/consumer': { locations: consumerLocations },
+            'modules/{subdomain}/exporter': { locations: exporterLocations },
+          },
+          ignorePatterns: [],
+          roleDefinitionsDir: '.riviere/role-definitions',
+          roles: [],
+        }),
+        workspaceDir,
+      )
+
+      assert.equal(result.exitCode, 0, result.stdout)
+    },
+  )
+})
+
+it('an any-subdomain import allows the named location in a different package group', () => {
+  const interfaceLocations = locationConfiguration<never>(
+    location<never>('/entry', {
+      importRules: { allow: { anySubdomain: ['actions'] } },
+    }),
+  )
+  const consumerLocations = locationConfiguration<never>(
+    location<never>('/actions', { allowAnySubLocations: true }),
+  )
+
+  fixtureWorkspace.withWorkspaceFixture(
+    {
+      prefix: 'role-enforcement-any-subdomain-import-',
+      roles: [],
+      files: {
+        '.riviere/role-definitions/.gitkeep': '',
+        'interfaces/cli/src/entry/run.ts': `import '../../../../modules/alpha/consumer/src/actions/run'\n`,
+        'modules/alpha/consumer/src/actions/run.ts': `void 'run'\n`,
+      },
+    },
+    (workspaceDir) => {
+      const interfacePackage = { locations: interfaceLocations }
+      const result = fixtureWorkspace.runTestRoleEnforcement(
+        roleEnforcementConfiguration({
+          configurations: {
+            'interfaces/': interfacePackage,
+            'modules/{subdomain}/consumer': { locations: consumerLocations },
+          },
+          ignorePatterns: [],
+          roleDefinitionsDir: '.riviere/role-definitions',
+          roles: [],
+        }),
+        workspaceDir,
+      )
+
+      assert.equal(result.exitCode, 0, result.stdout)
+    },
+  )
+})
+
+type FixtureResult = { exitCode: number; stderr: string; stdout: string }
+
+function runFixture(
+  locations: LocationConfiguration<never>,
+  files: Readonly<Record<string, string>>,
+  assertResult: (result: FixtureResult) => void,
+  packagePaths: readonly string[] = ['packages/pkg-a'],
+): void {
+  fixtureWorkspace.withWorkspaceFixture(
+    {
+      prefix: 'role-enforcement-named-location-import-',
+      roles: [],
+      files: { '.riviere/role-definitions/.gitkeep': '', ...files },
+    },
+    (workspaceDir) => {
+      const configurations = Object.fromEntries(
+        packagePaths.map((packagePath) => [packagePath, { locations }]),
+      )
+      const result = fixtureWorkspace.runTestRoleEnforcement(
+        roleEnforcementConfiguration({
+          configurations,
+          ignorePatterns: [],
+          roleDefinitionsDir: '.riviere/role-definitions',
+          roles: [],
+        }),
+        workspaceDir,
+      )
+      assertResult(result)
+    },
+  )
+}
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/published-language-parser.spec.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/published-language-parser.spec.ts
new file mode 100644
index 000000000..c436d2022
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/published-language-parser.spec.ts
@@ -0,0 +1,95 @@
+import { expect, it } from 'vitest'
+import {
+  location,
+  locationConfiguration,
+  role,
+  roleEnforcementConfiguration,
+} from '@living-architecture/riviere-role-enforcement-domain-model'
+import { runTestRoleEnforcement, withWorkspaceFixture } from './__fixtures__/test-fixture-workspace'
+
+type TestRole = 'parser' | 'schema'
+
+const schemaRole = role('schema', {
+  mustBeDataStructure: true,
+})
+const parserRole = role('parser', {
+  returns: [
+    { success: true, '*': 'schema' },
+    { success: false, '*': '*' },
+  ],
+})
+
+const config = roleEnforcementConfiguration({
+  configurations: {
+    'packages/pkg-a': {
+      locations: locationConfiguration(
+        location<TestRole>('/published-language', ['parser', 'schema']),
+      ),
+    },
+  },
+  ignorePatterns: ['**/*.spec.ts'],
+  roleDefinitionsDir: '.riviere/role-definitions',
+  roles: [schemaRole, parserRole],
+})
+
+function runWith(parserSource: string) {
+  return withWorkspaceFixture(
+    {
+      prefix: 'role-enforcement-parser-',
+      roles: [schemaRole, parserRole],
+      files: {
+        'packages/pkg-a/src/published-language/schema.ts': `/** @riviere-role schema */
+export interface Graph {
+  version: string
+}
+`,
+        'packages/pkg-a/src/published-language/parser.ts': parserSource,
+      },
+    },
+    (workspaceDir) => runTestRoleEnforcement(config, workspaceDir),
+  )
+}
+
+it('allows a parser returning the schema or failure details', () => {
+  const result = runWith(`import type { Graph } from './schema'
+
+/** @riviere-role parser */
+export function parseGraph(value: string):
+  | { success: true; graph: Graph }
+  | { success: false; issues: string[] } {
+  return { success: false, issues: [] }
+}
+`)
+
+  expect(result.exitCode).toBe(0)
+})
+
+it('rejects a parser whose success branch does not return the schema', () => {
+  const result = runWith(`/** @riviere-role parser */
+export function parseGraph(value: string):
+  | { success: true; graph: string }
+  | { success: false; issues: string[] } {
+  return { success: false, issues: [] }
+}
+`)
+
+  expect(result.exitCode).toBe(1)
+  expect(result.stdout).toContain(
+    "Role 'parser' requires its success branch to return role 'schema'",
+  )
+})
+
+it('rejects a parser without an explicit failure branch', () => {
+  const result = runWith(`import type { Graph } from './schema'
+
+/** @riviere-role parser */
+export function parseGraph(value: string): { success: true; graph: Graph } {
+  throw new Error(value)
+}
+`)
+
+  expect(result.exitCode).toBe(1)
+  expect(result.stdout).toContain(
+    "Role 'parser' requires explicit success and failure return branches",
+  )
+})
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/published-language-types.spec.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/published-language-types.spec.ts
new file mode 100644
index 000000000..cb942a7e5
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/published-language-types.spec.ts
@@ -0,0 +1,133 @@
+import { expect, it } from 'vitest'
+import {
+  location,
+  locationConfiguration,
+  role,
+  roleEnforcementConfiguration,
+} from '@living-architecture/riviere-role-enforcement-domain-model'
+import { runTestRoleEnforcement, withWorkspaceFixture } from './__fixtures__/test-fixture-workspace'
+
+const dataStructureRole = role('data-structure', {
+  mustBeDataStructure: true,
+})
+const unionRole = role('union', {
+  requiresUnion: true,
+})
+
+const config = roleEnforcementConfiguration({
+  configurations: {
+    'packages/pkg-a': {
+      locations: locationConfiguration(
+        location<'data-structure' | 'union'>('/published-language', ['data-structure', 'union']),
+      ),
+    },
+  },
+  ignorePatterns: ['**/*.spec.ts'],
+  roleDefinitionsDir: '.riviere/role-definitions',
+  roles: [dataStructureRole, unionRole],
+})
+
+function runWith(source: string) {
+  return withWorkspaceFixture(
+    {
+      prefix: 'role-enforcement-published-language-',
+      roles: [dataStructureRole, unionRole],
+      files: {
+        'packages/pkg-a/src/published-language/types.ts': source,
+      },
+    },
+    (workspaceDir) => runTestRoleEnforcement(config, workspaceDir),
+  )
+}
+
+it('allows a data structure containing values', () => {
+  const result = runWith(`/** @riviere-role data-structure */
+export interface Link {
+  source: string
+  target: string
+}
+`)
+
+  expect(result.exitCode).toBe(0)
+})
+
+it('rejects a method in a data structure', () => {
+  const result = runWith(`/** @riviere-role data-structure */
+export interface Link {
+  resolve(): string
+}
+`)
+
+  expect(result.exitCode).toBe(1)
+  expect(result.stdout).toContain("Role 'data-structure' does not allow methods")
+})
+
+it('rejects a function-valued field in a data structure', () => {
+  const result = runWith(`/** @riviere-role data-structure */
+export interface Link {
+  resolve: () => string
+}
+`)
+
+  expect(result.exitCode).toBe(1)
+  expect(result.stdout).toContain("Role 'data-structure' does not allow methods")
+})
+
+it('allows a type alias containing data', () => {
+  const result = runWith(`/** @riviere-role data-structure */
+export type Link = {
+  source: string
+  target: string
+}
+`)
+
+  expect(result.exitCode).toBe(0)
+})
+
+it('rejects a method in a type-alias data structure', () => {
+  const result = runWith(`/** @riviere-role data-structure */
+export type Link = {
+  resolve(): string
+}
+`)
+
+  expect(result.exitCode).toBe(1)
+  expect(result.stdout).toContain("Role 'data-structure' does not allow methods")
+})
+
+it('rejects a function-valued field in a type-alias data structure', () => {
+  const result = runWith(`/** @riviere-role data-structure */
+export type Link = {
+  resolve: () => string
+}
+`)
+
+  expect(result.exitCode).toBe(1)
+  expect(result.stdout).toContain("Role 'data-structure' does not allow methods")
+})
+
+it('rejects a callable type alias as a data structure', () => {
+  const result = runWith(`/** @riviere-role data-structure */
+export type Link = () => string
+`)
+
+  expect(result.exitCode).toBe(1)
+  expect(result.stdout).toContain("Role 'data-structure' must be a data structure")
+})
+
+it('allows a published union', () => {
+  const result = runWith(`/** @riviere-role union */
+export type LinkType = 'sync' | 'async'
+`)
+
+  expect(result.exitCode).toBe(0)
+})
+
+it('rejects a type alias that is not a union', () => {
+  const result = runWith(`/** @riviere-role union */
+export type LinkType = string
+`)
+
+  expect(result.exitCode).toBe(1)
+  expect(result.stdout).toContain("Role 'union' requires a union type")
+})
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/role-dependency-references.spec.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/role-dependency-references.spec.ts
new file mode 100644
index 000000000..90bca8694
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/role-dependency-references.spec.ts
@@ -0,0 +1,174 @@
+import assert from 'node:assert/strict'
+import { it } from 'vitest'
+import * as enforcementBuilder from '@living-architecture/riviere-role-enforcement-domain-model'
+import * as fixtureWorkspace from './__fixtures__/test-fixture-workspace'
+
+const roles = [
+  enforcementBuilder.role('role-value', {
+    targets: ['interface'],
+    forbiddenDependencies: ['role-service'],
+  }),
+  enforcementBuilder.role('role-service', { targets: ['function'] }),
+  enforcementBuilder.role('role-restricted-service', {
+    targets: ['function'],
+    forbiddenDependencies: ['role-service'],
+  }),
+] as const
+
+const config = enforcementBuilder.roleEnforcementConfiguration({
+  configurations: {
+    'packages/pkg-a': {
+      locations: enforcementBuilder.locationConfiguration(
+        enforcementBuilder.location('/domain', [
+          'role-value',
+          'role-service',
+          'role-restricted-service',
+        ]),
+      ),
+    },
+  },
+  ignorePatterns: [],
+  roleDefinitionsDir: '.riviere/role-definitions',
+  roles,
+})
+
+const bootstrap = {
+  prefix: 'role-enforcement-references-',
+  roles,
+  files: {},
+}
+
+it('ignores unreferenced roles in an imported file', () => {
+  fixtureWorkspace.withWorkspaceFixture(bootstrap, (workspaceDir) => {
+    fixtureWorkspace.writeFixtureFile(
+      workspaceDir,
+      'packages/pkg-a/src/domain/mixed.ts',
+      `/** @riviere-role role-value */
+export interface DomainValue {
+  readonly value: string
+}
+
+/** @riviere-role role-service */
+export function createDomainValue(value: string): DomainValue {
+  return { value }
+}
+`,
+    )
+    fixtureWorkspace.writeFixtureFile(
+      workspaceDir,
+      'packages/pkg-a/src/domain/consumer.ts',
+      `import type { DomainValue } from './mixed'
+
+/** @riviere-role role-value */
+export interface ConsumerValue {
+  readonly domainValue: DomainValue
+}
+`,
+    )
+
+    assertPasses(workspaceDir)
+  })
+})
+
+it('only validates roles that reference other roles', () => {
+  fixtureWorkspace.withWorkspaceFixture(bootstrap, (workspaceDir) => {
+    writeService(workspaceDir)
+    fixtureWorkspace.writeFixtureFile(
+      workspaceDir,
+      'packages/pkg-a/src/domain/consumer.ts',
+      `import { createValue } from './service'
+
+/** @riviere-role role-value */
+export interface DomainValue {
+  readonly value: string
+}
+
+/** @riviere-role role-service */
+export function createDomainValue(): DomainValue {
+  return { value: createValue() }
+}
+`,
+    )
+
+    assertPasses(workspaceDir)
+  })
+})
+
+it('follows an import through an internal function', () => {
+  fixtureWorkspace.withWorkspaceFixture(bootstrap, (workspaceDir) => {
+    writeService(workspaceDir)
+    fixtureWorkspace.writeFixtureFile(
+      workspaceDir,
+      'packages/pkg-a/src/domain/consumer.ts',
+      `import { createValue } from './service'
+
+/** @riviere-role role-value */
+export interface DomainValue {
+  readonly value: string
+}
+
+function buildValue(): string {
+  return createValue()
+}
+
+/** @riviere-role role-service */
+export function createDomainValue(): DomainValue {
+  return { value: buildValue() }
+}
+`,
+    )
+
+    assertPasses(workspaceDir)
+  })
+})
+
+it('rejects a forbidden role referenced through an internal function', () => {
+  fixtureWorkspace.withWorkspaceFixture(bootstrap, (workspaceDir) => {
+    writeService(workspaceDir)
+    fixtureWorkspace.writeFixtureFile(
+      workspaceDir,
+      'packages/pkg-a/src/domain/consumer.ts',
+      `import { createValue } from './service'
+
+function buildValue(): string {
+  return createValue()
+}
+
+/** @riviere-role role-restricted-service */
+export function createRestrictedValue(): string {
+  return buildValue()
+}
+`,
+    )
+
+    const result = runEnforcement(workspaceDir)
+
+    assert.equal(result.exitCode, 1)
+    assert.match(
+      result.stdout,
+      /Forbidden dependency: this file \(role-restricted-service\) cannot import from a file exporting 'role-service'/,
+    )
+  })
+})
+
+function writeService(workspaceDir: string): void {
+  fixtureWorkspace.writeFixtureFile(
+    workspaceDir,
+    'packages/pkg-a/src/domain/service.ts',
+    `/** @riviere-role role-service */
+export function createValue(): string {
+  return 'value'
+}
+`,
+  )
+}
+
+function assertPasses(workspaceDir: string): void {
+  const result = runEnforcement(workspaceDir)
+  assert.equal(result.exitCode, 0)
+  assert.equal(result.stderr, '')
+}
+
+function runEnforcement(workspaceDir: string) {
+  return fixtureWorkspace.runTestRoleEnforcement(config, workspaceDir)
+}
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/run-role-enforcement-class-state.spec.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/run-role-enforcement-class-state.spec.ts
new file mode 100644
index 000000000..a3b86df43
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/run-role-enforcement-class-state.spec.ts
@@ -0,0 +1,211 @@
+import { expect, it } from 'vitest'
+import {
+  configWithGenericClassStateConstraints,
+  genericTestConfig,
+} from './__fixtures__/test-fixture-config'
+import {
+  runTestRoleEnforcement,
+  withGenericFixtureWorkspace,
+  writeDomainFile,
+} from './__fixtures__/test-fixture-workspace'
+
+function runWith(config: typeof genericTestConfig, workspaceDir: string) {
+  return runTestRoleEnforcement(config, workspaceDir)
+}
+
+it('rejects classes with callable instance data members when role forbids them', () => {
+  withGenericFixtureWorkspace((workspaceDir) => {
+    writeDomainFile(
+      workspaceDir,
+      `/** @riviere-role role-b */
+export class Beta {
+  private readonly brand = 'Beta'
+  readonly label = 'beta'
+  readonly matches: () => boolean = () => true
+
+  static parse(): Beta {
+    return new Beta()
+  }
+}
+`,
+    )
+    const result = runWith(configWithGenericClassStateConstraints(), workspaceDir)
+    expect(result.exitCode).toBe(1)
+    expect(result.stderr).toBe('')
+    expect(result.stdout).toContain("forbids callable instance data members on 'Beta'")
+    expect(result.stdout).toContain('Found [matches]')
+  })
+})
+
+it('rejects classes without non-callable instance data members when role requires them', () => {
+  withGenericFixtureWorkspace((workspaceDir) => {
+    writeDomainFile(
+      workspaceDir,
+      `/** @riviere-role role-b */
+export class Beta {
+  private readonly brand = 'Beta'
+
+  static parse(): Beta {
+    return new Beta()
+  }
+}
+`,
+    )
+    const result = runWith(configWithGenericClassStateConstraints(), workspaceDir)
+    expect(result.exitCode).toBe(1)
+    expect(result.stderr).toBe('')
+    expect(result.stdout).toContain(
+      "requires at least one non-callable instance data member on 'Beta'",
+    )
+  })
+})
+
+it('accepts classes with non-callable instance data members when role requires them', () => {
+  withGenericFixtureWorkspace((workspaceDir) => {
+    writeDomainFile(
+      workspaceDir,
+      `/** @riviere-role role-b */
+export class Beta {
+  private readonly brand = 'Beta'
+  readonly label = 'beta'
+
+  private constructor() {}
+
+  static parse(): Beta {
+    return new Beta()
+  }
+
+  cancel(): void {}
+}
+`,
+    )
+    const result = runWith(configWithGenericClassStateConstraints(), workspaceDir)
+    expect(result.exitCode).toBe(0)
+    expect(result.stderr).toBe('')
+  })
+})
+
+it('accepts normal instance methods when callable instance data members are forbidden', () => {
+  withGenericFixtureWorkspace((workspaceDir) => {
+    writeDomainFile(
+      workspaceDir,
+      `/** @riviere-role role-b */
+export class Beta {
+  private readonly brand = 'Beta'
+  readonly label = 'beta'
+
+  private constructor() {}
+
+  static parse(): Beta {
+    return new Beta()
+  }
+
+  rename(): Beta {
+    return new Beta()
+  }
+}
+`,
+    )
+    const result = runWith(configWithGenericClassStateConstraints(), workspaceDir)
+    expect(result.exitCode).toBe(0)
+    expect(result.stderr).toBe('')
+  })
+})
+
+it('rejects a class without a static method beginning with the required prefix', () => {
+  withGenericFixtureWorkspace((workspaceDir) => {
+    writeDomainFile(
+      workspaceDir,
+      `/** @riviere-role role-b */
+export class Beta {
+  private readonly brand = 'Beta'
+  readonly label = 'beta'
+
+  static create(): Beta {
+    return new Beta()
+  }
+}
+`,
+    )
+    const result = runWith(configWithGenericClassStateConstraints(), workspaceDir)
+    expect(result.exitCode).toBe(1)
+    expect(result.stderr).toBe('')
+    expect(result.stdout).toContain(
+      "requires at least one static method beginning with 'parse' on 'Beta'",
+    )
+  })
+})
+
+it('accepts a static method whose name begins with the required prefix', () => {
+  withGenericFixtureWorkspace((workspaceDir) => {
+    writeDomainFile(
+      workspaceDir,
+      `/** @riviere-role role-b */
+export class Beta {
+  private readonly brand = 'Beta'
+  readonly label = 'beta'
+
+  private constructor() {}
+
+  static parseFromLabel(): Beta {
+    return new Beta()
+  }
+}
+`,
+    )
+    const result = runWith(configWithGenericClassStateConstraints(), workspaceDir)
+    expect(result.exitCode).toBe(0)
+    expect(result.stderr).toBe('')
+  })
+})
+
+it('rejects a class with a public constructor when the role requires a private constructor', () => {
+  withGenericFixtureWorkspace((workspaceDir) => {
+    writeDomainFile(
+      workspaceDir,
+      `/** @riviere-role role-b */
+export class Beta {
+  private readonly brand = 'Beta'
+  readonly label: string
+
+  constructor(label: string) {
+    this.label = label
+  }
+
+  static parse(label: string): Beta {
+    return new Beta(label)
+  }
+}
+`,
+    )
+    const result = runWith(configWithGenericClassStateConstraints(), workspaceDir)
+    expect(result.exitCode).toBe(1)
+    expect(result.stderr).toBe('')
+    expect(result.stdout).toContain("requires a private constructor on 'Beta'")
+  })
+})
+
+it('accepts a class with a private constructor when the role requires it', () => {
+  withGenericFixtureWorkspace((workspaceDir) => {
+    writeDomainFile(
+      workspaceDir,
+      `/** @riviere-role role-b */
+export class Beta {
+  private readonly brand = 'Beta'
+  readonly label: string
+
+  private constructor(label: string) {
+    this.label = label
+  }
+
+  static parse(label: string): Beta {
+    return new Beta(label)
+  }
+}
+`,
+    )
+    const result = runWith(configWithGenericClassStateConstraints(), workspaceDir)
+    expect(result.exitCode).toBe(0)
+    expect(result.stderr).toBe('')
+  })
+})
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/commands/run-role-enforcement-input.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/run-role-enforcement-input.ts
similarity index 83%
rename from packages/riviere-role-enforcement/src/features/enforcement/commands/run-role-enforcement-input.ts
rename to packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/run-role-enforcement-input.ts
index dea832155..fb693a3ed 100644
--- a/packages/riviere-role-enforcement/src/features/enforcement/commands/run-role-enforcement-input.ts
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/run-role-enforcement-input.ts
@@ -1,6 +1,6 @@
 /** @riviere-role command-use-case-input */
 export interface RunRoleEnforcementInput {
-  configModule: unknown
+  configModulePath: string
   configDir: string
   packageFilter?: string
 }
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/commands/run-role-enforcement-result.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/run-role-enforcement-result.ts
similarity index 100%
rename from packages/riviere-role-enforcement/src/features/enforcement/commands/run-role-enforcement-result.ts
rename to packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/run-role-enforcement-result.ts
diff --git a/packages/riviere-role-enforcement/src/features/enforcement/commands/run-role-enforcement.spec.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/run-role-enforcement.spec.ts
similarity index 91%
rename from packages/riviere-role-enforcement/src/features/enforcement/commands/run-role-enforcement.spec.ts
rename to packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/run-role-enforcement.spec.ts
index 972753414..1e81e0089 100644
--- a/packages/riviere-role-enforcement/src/features/enforcement/commands/run-role-enforcement.spec.ts
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/run-role-enforcement.spec.ts
@@ -1,38 +1,36 @@
-import {
-  expect, it, vi 
-} from 'vitest'
+import { expect, it, vi } from 'vitest'
 import { createOxlintRoleEnforcementRunner } from '../adapters/oxlint/oxlint-role-enforcement-runner'
-import { RoleEnforcementProjectRepository } from '../data-access/role-enforcement-project-repository'
-import { RoleEnforcementExecutionError } from '../domain/role-enforcement-execution-error'
+import { RoleEnforcementProjectRepository } from '../data-access/role-enforcement/role-enforcement-project-repository'
+import { RoleEnforcementExecutionError } from '@living-architecture/riviere-role-enforcement-domain-model'
 
+import { RunRoleEnforcement } from './run-role-enforcement'
 import {
   configWithGenericApprovedAggregates,
   configWithGenericMaxPublicMethods,
-  configWithGenericRequiredPrivateMembers,
   configWithGenericRepositoryMethodInputs,
   configWithGenericRepositoryMethodInputsOnly,
+  configWithGenericRequiredPrivateMembers,
   genericTestConfig,
-} from './test-fixture-config'
+} from './__fixtures__/test-fixture-config'
 import {
   createTestRoleEnforcementApplication,
+  runTestRoleEnforcement,
   withGenericFixtureWorkspace,
   writeCommandFile,
   writeDomainFile,
   writeRepositoryFile,
-} from './test-fixture-workspace'
-import { RunRoleEnforcement } from './run-role-enforcement'
+} from './__fixtures__/test-fixture-workspace'
 
 function runWith(config: typeof genericTestConfig, workspaceDir: string) {
-  return createTestRoleEnforcementApplication().execute({
-    configDir: workspaceDir,
-    configModule: { config },
-  })
+  return runTestRoleEnforcement(config, workspaceDir)
 }
 
 function createEmptyProjectRepository() {
   return new RoleEnforcementProjectRepository({
     findFilesMatchingPatterns: () => [],
+    loadTypeScriptModule: () => ({ config: genericTestConfig }),
     readDirectory: () => [],
+    readRoleDefinitionFileNames: () => genericTestConfig.roles.map((role) => `${role.name}.md`),
     realpath: (filePath) => filePath,
   })
 }
@@ -331,7 +329,7 @@ it('wraps RoleEnforcementExecutionError from the oxlint adapter into a failure r
       },
     }).execute({
       configDir: workspaceDir,
-      configModule: { config: genericTestConfig },
+      configModulePath: 'test-role-enforcement.config.ts',
     })
 
     expect(result.exitCode).toBe(1)
@@ -354,7 +352,7 @@ it('rethrows non-domain errors from the oxlint adapter', () => {
     expect(() =>
       runner.execute({
         configDir: workspaceDir,
-        configModule: { config: genericTestConfig },
+        configModulePath: 'test-role-enforcement.config.ts',
       }),
     ).toThrow(unexpected)
   })
@@ -374,31 +372,27 @@ it('returns failure when role-enforcement-plugin.mjs cannot be found', () => {
     ),
   }).execute({
     configDir: '/var/folders/fake-dir',
-    configModule: { config: genericTestConfig },
+    configModulePath: 'test-role-enforcement.config.ts',
   })
   expect(result.exitCode).toBe(1)
   expect(result.stderr).toContain('Cannot find role-enforcement-plugin.mjs')
 })
 
-it('wraps RoleEnforcementExecutionError from readConfig into a failure result', () => {
+it('wraps an invalid role enforcement configuration into a failure result', () => {
   withGenericFixtureWorkspace((workspaceDir) => {
-    const result = createTestRoleEnforcementApplication().execute({
+    const result = createTestRoleEnforcementApplication({}).execute({
       configDir: workspaceDir,
-      configModule: {},
+      configModulePath: 'test-role-enforcement.config.ts',
     })
     expect(result.exitCode).toBe(1)
-    expect(result.stderr).toBe("Config module must export a 'config' property.\n")
+    expect(result.stderr).toBe('Role enforcement configuration must be an object.\n')
     expect(result.stdout).toBe('')
   })
 })
 
 it('wraps RoleEnforcementExecutionError from readConfigForPackage into a failure result', () => {
   withGenericFixtureWorkspace((workspaceDir) => {
-    const result = createTestRoleEnforcementApplication().execute({
-      configDir: workspaceDir,
-      configModule: { config: genericTestConfig },
-      packageFilter: 'packages/pkg-missing',
-    })
+    const result = runTestRoleEnforcement(genericTestConfig, workspaceDir, 'packages/pkg-missing')
     expect(result.exitCode).toBe(1)
     expect(result.stderr).toContain("No include patterns match package 'packages/pkg-missing'")
     expect(result.stdout).toBe('')
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/run-role-enforcement.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/run-role-enforcement.ts
new file mode 100644
index 000000000..eb4c2d583
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/run-role-enforcement.ts
@@ -0,0 +1,52 @@
+import { RoleEnforcementProjectRepository } from '../data-access/role-enforcement/role-enforcement-project-repository'
+import {
+  PackageFilterError,
+  type RoleEnforcementRunner,
+  RoleEnforcementExecutionError,
+} from '@living-architecture/riviere-role-enforcement-domain-model'
+import type { RunRoleEnforcementInput } from './run-role-enforcement-input'
+import type { RunRoleEnforcementResult } from './run-role-enforcement-result'
+import { RoleEnforcementProjectLoadError } from '../data-access/role-enforcement/role-enforcement-project-load-error'
+
+interface RunRoleEnforcementDependencies {
+  now: () => number
+  projectRepository: RoleEnforcementProjectRepository
+  runner: RoleEnforcementRunner
+}
+
+/** @riviere-role command-use-case */
+export class RunRoleEnforcement {
+  private readonly deps: RunRoleEnforcementDependencies
+
+  constructor(deps: RunRoleEnforcementDependencies) {
+    this.deps = deps
+  }
+
+  execute(input: RunRoleEnforcementInput): RunRoleEnforcementResult {
+    const start = this.deps.now()
+    try {
+      const project = this.deps.projectRepository.load(input.configModulePath, input.configDir)
+      const adapterResult = project.execute(this.deps.runner, input.packageFilter)
+      return {
+        durationMs: this.deps.now() - start,
+        exitCode: adapterResult.exitCode,
+        stderr: adapterResult.stderr,
+        stdout: adapterResult.stdout,
+      }
+    } catch (error) {
+      if (
+        error instanceof RoleEnforcementExecutionError ||
+        error instanceof PackageFilterError ||
+        error instanceof RoleEnforcementProjectLoadError
+      ) {
+        return {
+          durationMs: this.deps.now() - start,
+          exitCode: 1,
+          stderr: `${error.message}\n`,
+          stdout: '',
+        }
+      }
+      throw error
+    }
+  }
+}
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/subdomain-boundary.spec.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/subdomain-boundary.spec.ts
new file mode 100644
index 000000000..45f2f6c41
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/subdomain-boundary.spec.ts
@@ -0,0 +1,273 @@
+import assert from 'node:assert/strict'
+import { it } from 'vitest'
+import {
+  location,
+  locationConfiguration,
+  role,
+  roleEnforcementConfiguration,
+} from '@living-architecture/riviere-role-enforcement-domain-model'
+import * as fixtureWorkspace from './__fixtures__/test-fixture-workspace'
+
+const roles = [role('example', { targets: ['function'] })] as const
+type RoleName = (typeof roles)[number]['name']
+
+it("ownSubdomain treats a path segment placeholder called '{subdomain}' as a subdomain", () => {
+  runBoundaryFixture(
+    'modules/alpha/consumer/src/actions/consume.ts',
+    `import { value } from '../../../provider/src/api/value'
+
+/** @riviere-role example */
+export function consume(): string { return value() }
+`,
+    (result) => assert.equal(result.exitCode, 0, result.stdout),
+  )
+})
+
+it('rejects an import that has not been allowed by its location', () => {
+  runBoundaryFixture(
+    'modules/alpha/provider/src/api/consume.ts',
+    `import { alpha } from '../../../consumer/src/actions/alpha'
+
+/** @riviere-role example */
+export function consume(): string { return alpha() }
+`,
+    (result) => {
+      assert.equal(result.exitCode, 1)
+      assert.match(result.stdout, /Location '\/api' cannot import location '\/actions'/)
+    },
+  )
+})
+
+it('does not apply an own-subdomain allowance to another subdomain', () => {
+  runBoundaryFixture(
+    'modules/alpha/consumer/src/actions/consume.ts',
+    `import { value } from '../../../../beta/provider/src/api/value'
+
+/** @riviere-role example */
+export function consume(): string { return value() }
+`,
+    (result) => {
+      assert.equal(result.exitCode, 1)
+      assert.match(result.stdout, /Location '\/actions' cannot import location '\/api'/)
+    },
+  )
+})
+
+it('ownSubdomain does not treat a differently named path segment placeholder as a subdomain', () => {
+  runGenericBoundaryFixture(
+    'groups/alpha/consumer/src/actions/consume.ts',
+    `import { value } from '../../../provider/src/api/value'
+
+/** @riviere-role example */
+export function consume(): string { return value() }
+`,
+    (result) => {
+      assert.equal(result.exitCode, 1)
+      assert.match(result.stdout, /Location '\/actions' cannot import location '\/api'/)
+    },
+  )
+})
+
+it("anySubdomain treats a path segment placeholder called '{subdomain}' as a subdomain", () => {
+  const consumerLocations = locationConfiguration(
+    location<RoleName>('/actions', ['example'], {
+      allowAnySubLocations: true,
+      importRules: { allow: { anySubdomain: ['api'] } },
+    }),
+  )
+  runBoundaryFixture(
+    'modules/alpha/consumer/src/actions/consume.ts',
+    `import { value } from '../../../../beta/provider/src/api/value'
+
+/** @riviere-role example */
+export function consume(): string { return value() }
+`,
+    (result) => assert.equal(result.exitCode, 0, result.stdout),
+    consumerLocations,
+  )
+})
+
+it('allows a package to import allowed packages from multiple subdomains', () => {
+  runBoundaryFixture(
+    'interfaces/cli/src/entry/consume.ts',
+    `import { alpha } from '../../../../modules/alpha/consumer/src/actions/alpha'
+import { beta } from '../../../../modules/beta/consumer/src/actions/beta'
+
+/** @riviere-role example */
+export function consume(): string { return alpha() + beta() }
+`,
+    (result) => assert.equal(result.exitCode, 0, result.stdout),
+  )
+})
+
+it('anySubdomain does not treat a differently named path segment placeholder as a subdomain', () => {
+  runGenericBoundaryFixture(
+    'interfaces/cli/src/entry/consume.ts',
+    `import { alpha } from '../../../../groups/alpha/consumer/src/actions/alpha'
+
+/** @riviere-role example */
+export function consume(): string { return alpha() }
+`,
+    (result) => {
+      assert.equal(result.exitCode, 1)
+      assert.match(result.stdout, /Location '\/entry' cannot import location '\/actions'/)
+    },
+  )
+})
+
+it('rejects a package importing a package type it was not allowed', () => {
+  runBoundaryFixture(
+    'interfaces/cli/src/entry/consume.ts',
+    `import { value } from '../../../../modules/alpha/provider/src/api/value'
+
+/** @riviere-role example */
+export function consume(): string { return value() }
+`,
+    (result) => {
+      assert.equal(result.exitCode, 1)
+      assert.match(result.stdout, /Location '\/entry' cannot import location '\/api'/)
+    },
+  )
+})
+
+it('rejects imports into a package that no package may import', () => {
+  runBoundaryFixture(
+    'modules/alpha/provider/src/api/consume.ts',
+    `import { main } from '../../../../../interfaces/cli/src/entry/main'
+
+/** @riviere-role example */
+export function consume(): void { main() }
+`,
+    (result) => {
+      assert.equal(result.exitCode, 1)
+      assert.match(result.stdout, /Location '\/api' cannot import location '\/entry'/)
+    },
+  )
+})
+
+function runBoundaryFixture(
+  filePath: string,
+  contents: string,
+  assertResult: (result: { exitCode: number; stderr: string; stdout: string }) => void,
+  configuredConsumerLocations = consumerLocations(),
+): void {
+  fixtureWorkspace.withWorkspaceFixture(
+    {
+      prefix: 'role-enforcement-package-boundary-',
+      roles,
+      files: {
+        'interfaces/cli/src/entry/main.ts': roleFunction('main', 'void'),
+        'modules/alpha/provider/src/api/value.ts': roleFunction('value', 'string'),
+        'modules/alpha/consumer/src/actions/alpha.ts': roleFunction('alpha', 'string'),
+        'modules/beta/provider/src/api/value.ts': roleFunction('value', 'string'),
+        'modules/beta/consumer/src/actions/beta.ts': roleFunction('beta', 'string'),
+        [filePath]: contents,
+      },
+    },
+    (workspaceDir) => {
+      const provider = {
+        locations: locationConfiguration(
+          location<RoleName>('/api', ['example'], {
+            allowAnySubLocations: true,
+            importRules: { allow: {} },
+          }),
+        ),
+      }
+      const consumer = {
+        locations: configuredConsumerLocations,
+      }
+      const interfacePackage = {
+        locations: locationConfiguration(
+          location<RoleName>('/entry', ['example'], {
+            allowAnySubLocations: true,
+            importRules: { allow: { anySubdomain: ['actions'] } },
+          }),
+        ),
+      }
+      const result = fixtureWorkspace.runTestRoleEnforcement(
+        roleEnforcementConfiguration({
+          configurations: {
+            'interfaces/': interfacePackage,
+            'modules/{subdomain}/consumer': consumer,
+            'modules/{subdomain}/provider': provider,
+          },
+          ignorePatterns: [],
+          roleDefinitionsDir: '.riviere/role-definitions',
+          roles,
+        }),
+        workspaceDir,
+      )
+      assertResult(result)
+    },
+  )
+}
+
+function runGenericBoundaryFixture(
+  filePath: string,
+  contents: string,
+  assertResult: (result: { exitCode: number; stderr: string; stdout: string }) => void,
+): void {
+  fixtureWorkspace.withWorkspaceFixture(
+    {
+      prefix: 'role-enforcement-generic-boundary-',
+      roles,
+      files: {
+        'interfaces/cli/src/entry/main.ts': roleFunction('main', 'void'),
+        'groups/alpha/provider/src/api/value.ts': roleFunction('value', 'string'),
+        'groups/alpha/consumer/src/actions/alpha.ts': roleFunction('alpha', 'string'),
+        [filePath]: contents,
+      },
+    },
+    (workspaceDir) => {
+      const provider = {
+        locations: locationConfiguration(
+          location<RoleName>('/api', ['example'], {
+            allowAnySubLocations: true,
+            importRules: { allow: {} },
+          }),
+        ),
+      }
+      const consumer = {
+        locations: consumerLocations(),
+      }
+      const interfacePackage = {
+        locations: locationConfiguration(
+          location<RoleName>('/entry', ['example'], {
+            allowAnySubLocations: true,
+            importRules: { allow: { anySubdomain: ['actions'] } },
+          }),
+        ),
+      }
+      const result = fixtureWorkspace.runTestRoleEnforcement(
+        roleEnforcementConfiguration({
+          configurations: {
+            'interfaces/': interfacePackage,
+            'groups/{boundary}/consumer': consumer,
+            'groups/{boundary}/provider': provider,
+          },
+          ignorePatterns: [],
+          roleDefinitionsDir: '.riviere/role-definitions',
+          roles,
+        }),
+        workspaceDir,
+      )
+      assertResult(result)
+    },
+  )
+}
+
+function consumerLocations() {
+  return locationConfiguration(
+    location<RoleName>('/actions', ['example'], {
+      allowAnySubLocations: true,
+      importRules: { allow: { ownSubdomain: ['api'] } },
+    }),
+  )
+}
+
+function roleFunction(name: string, returnType: 'string' | 'void'): string {
+  const body = returnType === 'string' ? `return '${name}'` : ''
+  return `/** @riviere-role example */
+export function ${name}(): ${returnType} { ${body} }
+`
+}
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/workspace-package-resolution.spec.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/workspace-package-resolution.spec.ts
new file mode 100644
index 000000000..28403e5dc
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/commands/workspace-package-resolution.spec.ts
@@ -0,0 +1,158 @@
+import { expect, it } from 'vitest'
+import {
+  location,
+  locationConfiguration,
+  role,
+  roleEnforcementConfiguration,
+} from '@living-architecture/riviere-role-enforcement-domain-model'
+import {
+  runTestRoleEnforcement,
+  withWorkspaceFixture,
+  writeFixtureFile,
+} from './__fixtures__/test-fixture-workspace'
+
+const workspacePackageTestRoles = [
+  role('role-b', {
+    targets: ['class'],
+    minPublicMethods: 1,
+  }),
+  role('role-b-repository', {
+    targets: ['class'],
+    allowedOutputs: ['role-b'],
+  }),
+] as const
+
+const workspacePackageConfig = roleEnforcementConfiguration({
+  configurations: {
+    'packages/pkg-a': {
+      locations: locationConfiguration(location('/repositories', ['role-b-repository'])),
+    },
+  },
+  ignorePatterns: [],
+  roleDefinitionsDir: '.riviere/role-definitions',
+  roles: workspacePackageTestRoles,
+})
+
+const workspacePackageBootstrap = {
+  prefix: 'role-enforcement-pkg-',
+  roles: workspacePackageTestRoles,
+  files: {
+    'node_modules/@generic/pkg-lib/package.json': JSON.stringify({
+      name: '@generic/pkg-lib',
+      exports: {
+        '.': { '@living-architecture/source': './src/index.ts' },
+        './package.json': './package.json',
+        './domain/*': { '@living-architecture/source': './src/domain/*.ts' },
+        './duplicated/*': { '@living-architecture/source': './src/*/domain/*.ts' },
+      },
+    }),
+    'node_modules/@generic/pkg-lib/src/beta.ts': `/** @riviere-role role-b */
+export class Beta {
+  cancel(): void {}
+}
+`,
+    'node_modules/@generic/pkg-lib/src/index.ts': `export * from './beta'
+`,
+    'packages/pkg-a/src/repositories/betaRepository.ts': `import type { Beta } from '@generic/pkg-lib'
+
+/** @riviere-role role-b-repository */
+export class BetaRepository {
+  findById(id: string): Beta {
+    return null as unknown as Beta
+  }
+}
+`,
+  },
+}
+
+it('accepts aggregate-repository returning aggregate from workspace package via barrel export', () => {
+  withWorkspaceFixture(workspacePackageBootstrap, (workspaceDir) => {
+    const result = runTestRoleEnforcement(workspacePackageConfig, workspaceDir)
+
+    expect(result.exitCode).toBe(0)
+    expect(result.stderr).toBe('')
+  })
+})
+
+it('resolves roles imported from a workspace package subpath', () => {
+  withWorkspaceFixture(workspacePackageBootstrap, (workspaceDir) => {
+    writeFixtureFile(
+      workspaceDir,
+      'node_modules/@generic/pkg-lib/src/domain/beta.ts',
+      `/** @riviere-role role-b */
+export class Beta {
+  cancel(): void {}
+}
+`,
+    )
+    writeFixtureFile(
+      workspaceDir,
+      'packages/pkg-a/src/repositories/betaRepository.ts',
+      `import type { Beta } from '@generic/pkg-lib/domain/beta'
+
+/** @riviere-role role-b-repository */
+export class BetaRepository {
+  findById(id: string): Beta {
+    return null as unknown as Beta
+  }
+}
+`,
+    )
+
+    const result = runTestRoleEnforcement(workspacePackageConfig, workspaceDir)
+
+    expect(result.exitCode).toBe(0)
+    expect(result.stderr).toBe('')
+  })
+})
+
+it('replaces every wildcard in a workspace package source path', () => {
+  withWorkspaceFixture(workspacePackageBootstrap, (workspaceDir) => {
+    writeFixtureFile(
+      workspaceDir,
+      'node_modules/@generic/pkg-lib/src/beta/domain/beta.ts',
+      `/** @riviere-role role-b */
+export class Beta {
+  cancel(): void {}
+}
+`,
+    )
+    writeFixtureFile(
+      workspaceDir,
+      'packages/pkg-a/src/repositories/betaRepository.ts',
+      `import type { Beta } from '@generic/pkg-lib/duplicated/beta'
+
+/** @riviere-role role-b-repository */
+export class BetaRepository {
+  findById(id: string): Beta {
+    return null as unknown as Beta
+  }
+}
+`,
+    )
+
+    const result = runTestRoleEnforcement(workspacePackageConfig, workspaceDir)
+
+    expect(result.exitCode).toBe(0)
+    expect(result.stderr).toBe('')
+  })
+})
+
+it('rejects aggregate-repository returning unannotated class from workspace package', () => {
+  withWorkspaceFixture(workspacePackageBootstrap, (workspaceDir) => {
+    writeFixtureFile(
+      workspaceDir,
+      'node_modules/@generic/pkg-lib/src/beta.ts',
+      `export class Beta {
+  cancel(): void {}
+}
+`,
+    )
+
+    const result = runTestRoleEnforcement(workspacePackageConfig, workspaceDir)
+
+    expect(result.exitCode).toBe(1)
+    expect(result.stderr).toBe('')
+    expect(result.stdout).toContain('only allows outputs [role-b]')
+  })
+})
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/data-access/role-enforcement/role-enforcement-project-load-error.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/data-access/role-enforcement/role-enforcement-project-load-error.ts
new file mode 100644
index 000000000..e5c00f00a
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/data-access/role-enforcement/role-enforcement-project-load-error.ts
@@ -0,0 +1,2 @@
+/** @riviere-role data-access-error */
+export class RoleEnforcementProjectLoadError extends Error {}
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/data-access/role-enforcement/role-enforcement-project-repository.spec.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/data-access/role-enforcement/role-enforcement-project-repository.spec.ts
new file mode 100644
index 000000000..e1faacfd0
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/data-access/role-enforcement/role-enforcement-project-repository.spec.ts
@@ -0,0 +1,254 @@
+import { describe, expect, it, vi } from 'vitest'
+import {
+  location,
+  locationConfiguration,
+  role,
+  roleEnforcementConfiguration,
+  RoleEnforcementConfiguration,
+  RoleEnforcementExecutionError,
+  RoleEnforcementProject,
+} from '@living-architecture/riviere-role-enforcement-domain-model'
+import { RoleEnforcementProjectRepository } from './role-enforcement-project-repository'
+
+const minimalConfig = roleEnforcementConfiguration({
+  configurations: {
+    'packages/pkg-a': {
+      locations: locationConfiguration(location('/entrypoint', ['role-entry'])),
+    },
+  },
+  ignorePatterns: [],
+  roleDefinitionsDir: '.riviere/role-definitions',
+  roles: [role('role-entry', { targets: ['function'] })] as const,
+})
+
+function createRepository(configModule: unknown = { config: minimalConfig }) {
+  return new RoleEnforcementProjectRepository({
+    findFilesMatchingPatterns: vi.fn((): string[] => []),
+    loadTypeScriptModule: vi.fn(() => configModule),
+    readDirectory: vi.fn((): [] => []),
+    readRoleDefinitionFileNames: vi.fn(() => ['role-entry.md']),
+    realpath: vi.fn((filePath: string): string => filePath),
+  })
+}
+
+function configurationWithPackageAssignments(params: {
+  assignedPackages: readonly string[]
+  unassignedPackages: readonly string[]
+}) {
+  const parsed = RoleEnforcementConfiguration.parse({
+    ...minimalConfig,
+    assignedPackages: params.assignedPackages,
+    unassignedPackages: params.unassignedPackages,
+  })
+  return parsed.data
+}
+
+describe('RoleEnforcementProjectRepository', () => {
+  it('discovers every package declared by the workspace', () => {
+    const findFilesMatchingPatterns = vi.fn((): string[] => [])
+    const repository = new RoleEnforcementProjectRepository({
+      findFilesMatchingPatterns,
+      loadTypeScriptModule: vi.fn(() => ({ config })),
+      readWorkspacePackagePatterns: vi.fn(() => ({
+        include: ['packages/*', 'packages/*/*', 'apps/*/', 'tools/*'],
+        ignore: ['tools/legacy'],
+      })),
+      readDirectory: vi.fn((): [] => []),
+      readRoleDefinitionFileNames: vi.fn(() => ['role-entry.md']),
+      realpath: vi.fn((filePath: string): string => filePath),
+    })
+    const config = configurationWithPackageAssignments({
+      assignedPackages: ['packages/alpha/domain-model'],
+      unassignedPackages: [],
+    })
+
+    repository.load('config.ts', '/repo')
+
+    expect(findFilesMatchingPatterns).toHaveBeenNthCalledWith(
+      1,
+      '/repo',
+      [
+        'packages/*/package.json',
+        'packages/*/*/package.json',
+        'apps/*/package.json',
+        'tools/*/package.json',
+      ],
+      ['tools/legacy/package.json'],
+      expect.any(Function),
+    )
+  })
+
+  it('rejects a workspace package that has no configuration or unassigned entry', () => {
+    const findFilesMatchingPatterns = vi
+      .fn()
+      .mockReturnValueOnce(['packages/pkg-a/package.json', 'packages/new-package/package.json'])
+      .mockReturnValueOnce([])
+    const repository = new RoleEnforcementProjectRepository({
+      findFilesMatchingPatterns,
+      loadTypeScriptModule: vi.fn(() => ({ config })),
+      readDirectory: vi.fn((): [] => []),
+      readRoleDefinitionFileNames: vi.fn(() => ['role-entry.md']),
+      realpath: vi.fn((filePath: string): string => filePath),
+    })
+    const config = configurationWithPackageAssignments({
+      assignedPackages: ['packages/pkg-a'],
+      unassignedPackages: [],
+    })
+
+    expect(() => repository.load('config.ts', '/repo')).toThrow(
+      "Workspace package 'packages/new-package' has no role-enforcement configuration and is not explicitly unassigned.",
+    )
+  })
+
+  it('accepts a workspace package explicitly marked as unassigned', () => {
+    const findFilesMatchingPatterns = vi
+      .fn()
+      .mockReturnValueOnce(['packages/pkg-a/package.json', 'apps/eclair/package.json'])
+      .mockReturnValueOnce([])
+    const repository = new RoleEnforcementProjectRepository({
+      findFilesMatchingPatterns,
+      loadTypeScriptModule: vi.fn(() => ({ config })),
+      readDirectory: vi.fn((): [] => []),
+      readRoleDefinitionFileNames: vi.fn(() => ['role-entry.md']),
+      realpath: vi.fn((filePath: string): string => filePath),
+    })
+    const config = configurationWithPackageAssignments({
+      assignedPackages: ['packages/pkg-a'],
+      unassignedPackages: ['apps/eclair'],
+    })
+
+    expect(() => repository.load('config.ts', '/repo')).not.toThrow()
+  })
+
+  it('rejects a workspace package assigned to more than one configuration', () => {
+    const findFilesMatchingPatterns = vi
+      .fn()
+      .mockReturnValueOnce(['packages/pkg-a/package.json'])
+      .mockReturnValueOnce([])
+    const repository = new RoleEnforcementProjectRepository({
+      findFilesMatchingPatterns,
+      loadTypeScriptModule: vi.fn(() => ({ config })),
+      readDirectory: vi.fn((): [] => []),
+      readRoleDefinitionFileNames: vi.fn(() => ['role-entry.md']),
+      realpath: vi.fn((filePath: string): string => filePath),
+    })
+    const config = configurationWithPackageAssignments({
+      assignedPackages: ['packages/pkg-a', 'packages/pkg-a'],
+      unassignedPackages: [],
+    })
+
+    expect(() => repository.load('config.ts', '/repo')).toThrow(
+      "Workspace package 'packages/pkg-a' is assigned to more than one role-enforcement configuration.",
+    )
+  })
+
+  it('does not enforce a package explicitly marked as unassigned', () => {
+    const findFilesMatchingPatterns = vi
+      .fn()
+      .mockReturnValueOnce(['packages/pkg-a/package.json'])
+      .mockReturnValueOnce([])
+    const repository = new RoleEnforcementProjectRepository({
+      findFilesMatchingPatterns,
+      loadTypeScriptModule: vi.fn(() => ({ config })),
+      readDirectory: vi.fn((): [] => []),
+      readRoleDefinitionFileNames: vi.fn(() => ['role-entry.md']),
+      realpath: vi.fn((filePath: string): string => filePath),
+    })
+    const config = configurationWithPackageAssignments({
+      assignedPackages: ['packages/pkg-a'],
+      unassignedPackages: ['packages/pkg-a'],
+    })
+
+    expect(() => repository.load('config.ts', '/repo')).not.toThrow()
+  })
+
+  it('loads a project when the module exports config directly', () => {
+    expect(createRepository().load('config.ts', '/repo')).toBeInstanceOf(RoleEnforcementProject)
+  })
+
+  it('loads a project when the module wraps config in a default export', () => {
+    expect(
+      createRepository({ default: { config: minimalConfig } }).load('config.ts', '/repo'),
+    ).toBeInstanceOf(RoleEnforcementProject)
+  })
+
+  it('prefers top-level config when both exports exist', () => {
+    const repository = createRepository({
+      config: minimalConfig,
+      default: { config: {} },
+    })
+    const project = repository.load('config.ts', '/repo')
+
+    expect(project).toBeInstanceOf(RoleEnforcementProject)
+  })
+
+  it.each([null, 'not-an-object', { other: 'value' }])(
+    'throws when the module does not export config',
+    (configModule) => {
+      expect(() => createRepository(configModule).load('config.ts', '/repo')).toThrow(
+        'Role enforcement configuration must be an object.',
+      )
+    },
+  )
+
+  it.each(['not-an-object', null])('throws when config is not an object', (config) => {
+    expect(() => createRepository({ config }).load('config.ts', '/repo')).toThrow(
+      'Role enforcement configuration must be an object.',
+    )
+  })
+
+  it.each([
+    ['assignedPackages'],
+    ['include'],
+    ['ignorePatterns'],
+    ['locationHierarchy'],
+    ['roles'],
+    ['roleDefinitionsDir'],
+    ['unassignedPackages'],
+  ])("throws when config is missing the '%s' property", (missingKey) => {
+    const incomplete: Record<string, unknown> = {
+      assignedPackages: minimalConfig.assignedPackages,
+      include: minimalConfig.include,
+      ignorePatterns: minimalConfig.ignorePatterns,
+      locationHierarchy: minimalConfig.locationHierarchy,
+      roles: minimalConfig.roles,
+      roleDefinitionsDir: minimalConfig.roleDefinitionsDir,
+      unassignedPackages: minimalConfig.unassignedPackages,
+    }
+    delete incomplete[missingKey]
+
+    expect(() => createRepository({ config: incomplete }).load('config.ts', '/repo')).toThrow(
+      new RoleEnforcementExecutionError(
+        `Role enforcement configuration is missing required property '${missingKey}'.`,
+      ),
+    )
+  })
+
+  it('rejects a role without a Markdown definition', () => {
+    const repository = new RoleEnforcementProjectRepository({
+      findFilesMatchingPatterns: vi.fn((): string[] => []),
+      loadTypeScriptModule: vi.fn(() => ({ config: minimalConfig })),
+      readDirectory: vi.fn((): [] => []),
+      readRoleDefinitionFileNames: vi.fn(() => []),
+      realpath: vi.fn((filePath: string): string => filePath),
+    })
+
+    expect(() => repository.load('config.ts', '/repo')).toThrow(
+      "Role 'role-entry' has no definition file at '.riviere/role-definitions/role-entry.md'.",
+    )
+  })
+
+  it('rejects a Markdown definition that has no configured role', () => {
+    const repository = new RoleEnforcementProjectRepository({
+      findFilesMatchingPatterns: vi.fn((): string[] => []),
+      loadTypeScriptModule: vi.fn(() => ({ config: minimalConfig })),
+      readDirectory: vi.fn((): [] => []),
+      readRoleDefinitionFileNames: vi.fn(() => ['role-entry.md', 'unused-role.md', 'index.md']),
+      realpath: vi.fn((filePath: string): string => filePath),
+    })
+
+    expect(() => repository.load('config.ts', '/repo')).toThrow(
+      "Role definition 'unused-role.md' has no configured role.",
+    )
+  })
+})
diff --git a/packages/riviere-role-enforcement/use-cases/src/features/enforcement/data-access/role-enforcement/role-enforcement-project-repository.ts b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/data-access/role-enforcement/role-enforcement-project-repository.ts
new file mode 100644
index 000000000..3308594a0
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/features/enforcement/data-access/role-enforcement/role-enforcement-project-repository.ts
@@ -0,0 +1,151 @@
+import { readdirSync, realpathSync } from 'node:fs'
+import path from 'node:path'
+import {
+  RoleEnforcementConfiguration,
+  RoleEnforcementProject,
+} from '@living-architecture/riviere-role-enforcement-domain-model'
+import type { findFilesMatchingPatterns } from '../../../../infra/external-clients/filesystem/find-files-matching-patterns'
+import { findFilesMatchingPatterns as defaultFindFilesMatchingPatterns } from '../../../../infra/external-clients/filesystem/find-files-matching-patterns'
+import { readWorkspacePackagePatterns as defaultReadWorkspacePackagePatterns } from '../../../../infra/external-clients/filesystem/read-workspace-package-patterns'
+import { loadTypeScriptModule as defaultLoadTypeScriptModule } from '../../../../infra/external-clients/typescript/load-typescript-module'
+import { RoleEnforcementProjectLoadError } from './role-enforcement-project-load-error'
+
+type ReadDirectory = Parameters<typeof findFilesMatchingPatterns>[3]
+
+const defaultDependencies = {
+  findFilesMatchingPatterns: defaultFindFilesMatchingPatterns,
+  loadTypeScriptModule: defaultLoadTypeScriptModule,
+  readDirectory: defaultReadDirectory,
+  readRoleDefinitionFileNames: defaultReadRoleDefinitionFileNames,
+  readWorkspacePackagePatterns: defaultReadWorkspacePackagePatterns,
+  realpath: (filePath: string) => realpathSync(filePath),
+}
+
+function defaultReadDirectory(
+  rootDir: Parameters<ReadDirectory>[0],
+  options: Parameters<ReadDirectory>[1],
+): ReturnType<ReadDirectory> {
+  return readdirSync(rootDir, options)
+}
+
+function defaultReadRoleDefinitionFileNames(directoryPath: string): readonly string[] {
+  return readdirSync(directoryPath, { withFileTypes: true })
+    .filter((entry) => entry.isFile())
+    .map((entry) => entry.name)
+}
+
+/** @riviere-role aggregate-repository */
+export class RoleEnforcementProjectRepository {
+  private readonly dependencies: typeof defaultDependencies
+
+  constructor(dependencies: Partial<typeof defaultDependencies> = {}) {
+    this.dependencies = {
+      ...defaultDependencies,
+      ...dependencies,
+    }
+  }
+
+  load(configModulePath: string, configDir: string): RoleEnforcementProject {
+    const canonicalConfigDir = this.dependencies.realpath(configDir)
+    const config = readConfig(
+      this.dependencies.loadTypeScriptModule(path.resolve(canonicalConfigDir, configModulePath)),
+    )
+    validateRoleDefinitionFiles(
+      config,
+      this.dependencies.readRoleDefinitionFileNames(
+        path.resolve(canonicalConfigDir, config.roleDefinitionsDir),
+      ),
+    )
+    const workspacePatterns = this.dependencies.readWorkspacePackagePatterns(canonicalConfigDir)
+    const packagePatterns = workspacePatterns ?? packagePatternsFromConfiguration(config)
+    const workspacePackageManifests = this.dependencies.findFilesMatchingPatterns(
+      canonicalConfigDir,
+      packagePatterns.include.map((pattern) => `${withoutTrailingSlash(pattern)}/package.json`),
+      packagePatterns.ignore.map((pattern) => `${withoutTrailingSlash(pattern)}/package.json`),
+      this.dependencies.readDirectory,
+    )
+    config.validateWorkspacePackages(
+      workspacePackageManifests.map((manifestPath) => path.posix.dirname(manifestPath)),
+    )
+    const lintTargets = this.dependencies.findFilesMatchingPatterns(
+      canonicalConfigDir,
+      config.include,
+      config.ignorePatterns,
+      this.dependencies.readDirectory,
+    )
+    return new RoleEnforcementProject(config, canonicalConfigDir, lintTargets)
+  }
+}
+
+function validateRoleDefinitionFiles(
+  config: RoleEnforcementConfiguration,
+  fileNames: readonly string[],
+): void {
+  const definitionFiles = fileNames.filter(
+    (fileName) => fileName.endsWith('.md') && fileName !== 'index.md',
+  )
+  const definedRoles = new Set(definitionFiles.map((fileName) => fileName.slice(0, -3)))
+  for (const configuredRole of config.roles) {
+    if (!definedRoles.has(configuredRole.name)) {
+      throw new RoleEnforcementProjectLoadError(
+        `Role '${configuredRole.name}' has no definition file at '${config.roleDefinitionsDir}/${configuredRole.name}.md'.`,
+      )
+    }
+  }
+  const configuredRoles = new Set(config.roles.map((role) => role.name))
+  for (const definitionFile of definitionFiles) {
+    const roleName = definitionFile.slice(0, -3)
+    if (!configuredRoles.has(roleName)) {
+      throw new RoleEnforcementProjectLoadError(
+        `Role definition '${definitionFile}' has no configured role.`,
+      )
+    }
+  }
+}
+
+function packagePatternsFromConfiguration(config: RoleEnforcementConfiguration) {
+  const packageRoots = [
+    ...new Set(
+      [...config.assignedPackages, ...config.unassignedPackages].map(
+        (packagePath) => packagePath.split('/')[0],
+      ),
+    ),
+  ].filter((root): root is string => root !== undefined && root.length > 0)
+  return {
+    include: packageRoots.flatMap((root) => [`${root}/*`, `${root}/*/*`]),
+    ignore: [],
+  }
+}
+
+function withoutTrailingSlash(value: string): string {
+  return value.endsWith('/') ? value.slice(0, -1) : value
+}
+
+function readConfig(configModule: unknown): RoleEnforcementConfiguration {
+  const exportedConfiguration = readConfigExport(resolveModuleExports(configModule))
+  const parsed = RoleEnforcementConfiguration.parse(exportedConfiguration)
+  if (!parsed.success) {
+    throw parsed.error
+  }
+  return parsed.data
+}
+
+function resolveModuleExports(loaded: unknown): unknown {
+  if (typeof loaded !== 'object' || loaded === null) {
+    return loaded
+  }
+  if ('config' in loaded) {
+    return loaded
+  }
+  if ('default' in loaded) {
+    return loaded.default
+  }
+  return loaded
+}
+
+function readConfigExport(moduleExports: unknown): unknown {
+  if (typeof moduleExports === 'object' && moduleExports !== null && 'config' in moduleExports) {
+    return moduleExports.config
+  }
+  return undefined
+}
diff --git a/packages/riviere-role-enforcement/use-cases/src/index.ts b/packages/riviere-role-enforcement/use-cases/src/index.ts
new file mode 100644
index 000000000..3fea2f27a
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/index.ts
@@ -0,0 +1,6 @@
+export { createOxlintRoleEnforcementRunner } from './features/enforcement/adapters/oxlint/oxlint-role-enforcement-runner'
+export { RunRoleEnforcement } from './features/enforcement/commands/run-role-enforcement'
+export type { RunRoleEnforcementInput } from './features/enforcement/commands/run-role-enforcement-input'
+export type { RunRoleEnforcementResult } from './features/enforcement/commands/run-role-enforcement-result'
+export { RoleEnforcementProjectRepository } from './features/enforcement/data-access/role-enforcement/role-enforcement-project-repository'
+export { runOxlint } from './infra/external-clients/oxlint/oxlint-client'
diff --git a/packages/riviere-role-enforcement/src/platform/infra/external-clients/filesystem/find-file-up.spec.ts b/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/filesystem/find-file-up.spec.ts
similarity index 100%
rename from packages/riviere-role-enforcement/src/platform/infra/external-clients/filesystem/find-file-up.spec.ts
rename to packages/riviere-role-enforcement/use-cases/src/infra/external-clients/filesystem/find-file-up.spec.ts
diff --git a/packages/riviere-role-enforcement/src/platform/infra/external-clients/filesystem/find-file-up.ts b/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/filesystem/find-file-up.ts
similarity index 100%
rename from packages/riviere-role-enforcement/src/platform/infra/external-clients/filesystem/find-file-up.ts
rename to packages/riviere-role-enforcement/use-cases/src/infra/external-clients/filesystem/find-file-up.ts
diff --git a/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/filesystem/find-files-matching-patterns.spec.ts b/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/filesystem/find-files-matching-patterns.spec.ts
new file mode 100644
index 000000000..36a517f33
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/filesystem/find-files-matching-patterns.spec.ts
@@ -0,0 +1,39 @@
+import type { PathLike } from 'node:fs'
+import { expect, it, vi } from 'vitest'
+import { findFilesMatchingPatterns } from './find-files-matching-patterns'
+
+function directory(name: string, symbolicLink = false) {
+  return {
+    isDirectory: () => true,
+    isFile: () => false,
+    isSymbolicLink: () => symbolicLink,
+    name,
+  }
+}
+
+function file(name: string) {
+  return {
+    isDirectory: () => false,
+    isFile: () => true,
+    isSymbolicLink: () => false,
+    name,
+  }
+}
+
+it('does not follow symbolic-link directories while finding files', () => {
+  const readDirectory = vi.fn((directoryPath: PathLike) => {
+    const path = directoryPath.toString()
+    if (path === '/repo/packages') {
+      return [directory('pkg-a'), directory('linked-package', true)]
+    }
+    if (path === '/repo/packages/pkg-a') {
+      return [file('package.json')]
+    }
+    return []
+  })
+
+  const files = findFilesMatchingPatterns('/repo', ['packages/*/package.json'], [], readDirectory)
+
+  expect(files).toStrictEqual(['packages/pkg-a/package.json'])
+  expect(readDirectory).not.toHaveBeenCalledWith('/repo/packages/linked-package', expect.anything())
+})
diff --git a/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/filesystem/find-files-matching-patterns.ts b/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/filesystem/find-files-matching-patterns.ts
new file mode 100644
index 000000000..7bcedced3
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/filesystem/find-files-matching-patterns.ts
@@ -0,0 +1,74 @@
+import { minimatch } from 'minimatch'
+import type { PathLike } from 'node:fs'
+import path from 'node:path'
+
+type ReadDirectory = (
+  rootDir: PathLike,
+  options: {
+    withFileTypes: true
+  },
+) => Array<{
+  isDirectory: () => boolean
+  isFile: () => boolean
+  isSymbolicLink: () => boolean
+  name: string
+}>
+
+/** @riviere-role external-client-service */
+export function findFilesMatchingPatterns(
+  rootDir: string,
+  includePatterns: readonly string[],
+  ignorePatterns: readonly string[],
+  readDirectory: ReadDirectory,
+): string[] {
+  const scanDirectories = includePatterns.map((pattern) => extractScanDirectory(pattern))
+  const files = scanDirectories.flatMap((scanDirectory) =>
+    walkFiles(rootDir, scanDirectory, readDirectory),
+  )
+  return files
+    .filter((filePath) => matchesAny(filePath, includePatterns))
+    .filter((filePath) => !matchesAny(filePath, ignorePatterns))
+}
+
+function extractScanDirectory(includePattern: string): string {
+  const segments = includePattern.split('/')
+  const staticSegments: string[] = []
+  for (const segment of segments) {
+    if (segment.includes('*') || segment.includes('{') || segment.includes('?')) {
+      break
+    }
+    staticSegments.push(segment)
+  }
+  return staticSegments.join('/')
+}
+
+function walkFiles(rootDir: string, scanDirectory: string, readDirectory: ReadDirectory): string[] {
+  const absoluteScanDirectory = path.join(rootDir, scanDirectory)
+  return walkDirectory(absoluteScanDirectory, scanDirectory, readDirectory)
+}
+
+function walkDirectory(
+  absoluteDirectory: string,
+  relativeDirectory: string,
+  readDirectory: ReadDirectory,
+): string[] {
+  return readDirectory(absoluteDirectory, { withFileTypes: true }).flatMap((entry) => {
+    const absolutePath = path.join(absoluteDirectory, entry.name)
+    const relativePath = normalizePath(path.join(relativeDirectory, entry.name))
+    if (entry.isFile()) {
+      return [relativePath]
+    }
+    if (entry.isDirectory() && !entry.isSymbolicLink()) {
+      return walkDirectory(absolutePath, relativePath, readDirectory)
+    }
+    return []
+  })
+}
+
+function matchesAny(filePath: string, patterns: readonly string[]): boolean {
+  return patterns.some((pattern) => minimatch(filePath, pattern, { dot: true }))
+}
+
+function normalizePath(value: string): string {
+  return value.replaceAll('\\', '/')
+}
diff --git a/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/filesystem/read-workspace-package-patterns.spec.ts b/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/filesystem/read-workspace-package-patterns.spec.ts
new file mode 100644
index 000000000..2dde908a7
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/filesystem/read-workspace-package-patterns.spec.ts
@@ -0,0 +1,48 @@
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import path from 'node:path'
+import { afterEach, expect, it } from 'vitest'
+import { readWorkspacePackagePatterns } from './read-workspace-package-patterns'
+
+const temporaryDirectories: string[] = []
+
+afterEach(() => {
+  for (const directory of temporaryDirectories.splice(0)) {
+    rmSync(directory, { force: true, recursive: true })
+  }
+})
+
+it('reads package and exclusion patterns from the pnpm workspace', () => {
+  const workspaceDir = createWorkspace(`packages:
+  - packages/*
+  - tools/*
+  - '!tools/legacy'
+`)
+
+  expect(readWorkspacePackagePatterns(workspaceDir)).toStrictEqual({
+    include: ['packages/*', 'tools/*'],
+    ignore: ['tools/legacy'],
+  })
+})
+
+it('returns null when the directory has no pnpm workspace', () => {
+  const workspaceDir = mkdtempSync(path.join(tmpdir(), 'role-enforcement-no-workspace-'))
+  temporaryDirectories.push(workspaceDir)
+
+  expect(readWorkspacePackagePatterns(workspaceDir)).toBeNull()
+})
+
+it('rejects a pnpm workspace without package paths', () => {
+  const workspaceDir = createWorkspace('packages: invalid\n')
+
+  expect(() => readWorkspacePackagePatterns(workspaceDir)).toThrow(
+    "pnpm-workspace.yaml must contain a 'packages' array of paths.",
+  )
+})
+
+function createWorkspace(contents: string): string {
+  const workspaceDir = mkdtempSync(path.join(tmpdir(), 'role-enforcement-workspace-'))
+  temporaryDirectories.push(workspaceDir)
+  writeFileSync(path.join(workspaceDir, 'pnpm-workspace.yaml'), contents)
+  return workspaceDir
+}
diff --git a/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/filesystem/read-workspace-package-patterns.ts b/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/filesystem/read-workspace-package-patterns.ts
new file mode 100644
index 000000000..e2467c220
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/filesystem/read-workspace-package-patterns.ts
@@ -0,0 +1,34 @@
+import { existsSync, readFileSync } from 'node:fs'
+import path from 'node:path'
+import { parse } from 'yaml'
+
+type WorkspacePackagePatterns = {
+  readonly ignore: readonly string[]
+  readonly include: readonly string[]
+}
+
+/** @riviere-role external-client-service */
+export function readWorkspacePackagePatterns(
+  workspaceDir: string,
+): WorkspacePackagePatterns | null {
+  const workspaceFile = path.join(workspaceDir, 'pnpm-workspace.yaml')
+  if (!existsSync(workspaceFile)) {
+    return null
+  }
+  const document: unknown = parse(readFileSync(workspaceFile, 'utf8'))
+  if (
+    typeof document !== 'object' ||
+    document === null ||
+    !('packages' in document) ||
+    !Array.isArray(document.packages) ||
+    !document.packages.every((pattern) => typeof pattern === 'string')
+  ) {
+    throw new TypeError("pnpm-workspace.yaml must contain a 'packages' array of paths.")
+  }
+  return {
+    ignore: document.packages
+      .filter((pattern) => pattern.startsWith('!'))
+      .map((pattern) => pattern.slice(1)),
+    include: document.packages.filter((pattern) => !pattern.startsWith('!')),
+  }
+}
diff --git a/packages/riviere-role-enforcement/src/platform/infra/external-clients/oxlint/oxlint-client.spec.ts b/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/oxlint/oxlint-client.spec.ts
similarity index 82%
rename from packages/riviere-role-enforcement/src/platform/infra/external-clients/oxlint/oxlint-client.spec.ts
rename to packages/riviere-role-enforcement/use-cases/src/infra/external-clients/oxlint/oxlint-client.spec.ts
index 31c836009..993bf5ea4 100644
--- a/packages/riviere-role-enforcement/src/platform/infra/external-clients/oxlint/oxlint-client.spec.ts
+++ b/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/oxlint/oxlint-client.spec.ts
@@ -1,6 +1,7 @@
+import { existsSync } from 'node:fs'
 import { expect, it, vi } from 'vitest'
-import type { OxlintConfig } from './oxlint-config'
 import { runOxlint } from './oxlint-client'
+import type { OxlintConfig } from './oxlint-config'
 import { OxlintExecutionError } from './oxlint-execution-error'
 
 vi.mock('node:fs', async (importOriginal) => {
@@ -14,6 +15,7 @@ vi.mock('node:fs', async (importOriginal) => {
 const config: OxlintConfig = {
   ignorePatterns: [],
   jsPlugins: [],
+  plugins: [],
   rules: {},
 }
 
@@ -70,6 +72,29 @@ it('removes the temporary configuration after execution', () => {
   )
 })
 
+it('captures complete output from a large enforcement run', () => {
+  const clientDependencies = dependencies({
+    status: 1,
+    stderr: '',
+    stdout: '',
+  })
+
+  runOxlint(
+    {
+      config,
+      configDir: '/var/folders/fake-dir',
+      lintTargets: ['packages/example/src/domain/example.ts'],
+    },
+    clientDependencies,
+  )
+
+  expect(clientDependencies.spawnSync).toHaveBeenCalledWith(
+    expect.any(String),
+    expect.any(Array),
+    expect.objectContaining({ maxBuffer: 50 * 1024 * 1024 }),
+  )
+})
+
 it('defaults the exit code to one when the process has no status', () => {
   const result = runOxlint(
     {
@@ -108,4 +133,3 @@ it('throws OxlintExecutionError when the binary is unavailable', () => {
     vi.mocked(existsSync).mockRestore()
   }
 })
-import { existsSync } from 'node:fs'
diff --git a/packages/riviere-role-enforcement/src/platform/infra/external-clients/oxlint/oxlint-client.ts b/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/oxlint/oxlint-client.ts
similarity index 97%
rename from packages/riviere-role-enforcement/src/platform/infra/external-clients/oxlint/oxlint-client.ts
rename to packages/riviere-role-enforcement/use-cases/src/infra/external-clients/oxlint/oxlint-client.ts
index 4cfcfba1e..8b882f791 100644
--- a/packages/riviere-role-enforcement/src/platform/infra/external-clients/oxlint/oxlint-client.ts
+++ b/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/oxlint/oxlint-client.ts
@@ -14,6 +14,7 @@ interface OxlintClientDependencies {
     options: {
       cwd: string
       encoding: 'utf8'
+      maxBuffer: number
     },
   ) => {
     error?: Error
@@ -50,6 +51,7 @@ export function runOxlint(
       {
         cwd: input.configDir,
         encoding: 'utf8',
+        maxBuffer: 50 * 1024 * 1024,
       },
     )
 
diff --git a/packages/riviere-role-enforcement/src/platform/infra/external-clients/oxlint/oxlint-config.ts b/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/oxlint/oxlint-config.ts
similarity index 94%
rename from packages/riviere-role-enforcement/src/platform/infra/external-clients/oxlint/oxlint-config.ts
rename to packages/riviere-role-enforcement/use-cases/src/infra/external-clients/oxlint/oxlint-config.ts
index b1c9cc7b7..3e5975fab 100644
--- a/packages/riviere-role-enforcement/src/platform/infra/external-clients/oxlint/oxlint-config.ts
+++ b/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/oxlint/oxlint-config.ts
@@ -5,6 +5,7 @@ export interface OxlintConfig {
     name: string
     specifier: string
   }>
+  plugins: readonly string[]
   rules: Record<string, unknown>
 }
 
diff --git a/packages/riviere-role-enforcement/src/platform/infra/external-clients/oxlint/oxlint-execution-error.ts b/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/oxlint/oxlint-execution-error.ts
similarity index 100%
rename from packages/riviere-role-enforcement/src/platform/infra/external-clients/oxlint/oxlint-execution-error.ts
rename to packages/riviere-role-enforcement/use-cases/src/infra/external-clients/oxlint/oxlint-execution-error.ts
diff --git a/packages/riviere-role-enforcement/src/platform/infra/external-clients/oxlint/oxlint-path-resolution.ts b/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/oxlint/oxlint-path-resolution.ts
similarity index 100%
rename from packages/riviere-role-enforcement/src/platform/infra/external-clients/oxlint/oxlint-path-resolution.ts
rename to packages/riviere-role-enforcement/use-cases/src/infra/external-clients/oxlint/oxlint-path-resolution.ts
diff --git a/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/typescript/load-typescript-module.spec.ts b/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/typescript/load-typescript-module.spec.ts
new file mode 100644
index 000000000..43a821355
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/typescript/load-typescript-module.spec.ts
@@ -0,0 +1,21 @@
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import path from 'node:path'
+import { describe, expect, it } from 'vitest'
+import { loadTypeScriptModule } from './load-typescript-module'
+
+describe('loadTypeScriptModule', () => {
+  it('loads the exports from a TypeScript module', () => {
+    const directory = mkdtempSync(path.join(tmpdir(), 'typescript-module-'))
+    const modulePath = path.join(directory, 'config.ts')
+    writeFileSync(modulePath, 'export const config: { name: string } = { name: "example" }')
+
+    try {
+      expect(loadTypeScriptModule(modulePath)).toMatchObject({
+        config: { name: 'example' },
+      })
+    } finally {
+      rmSync(directory, { force: true, recursive: true })
+    }
+  })
+})
diff --git a/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/typescript/load-typescript-module.ts b/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/typescript/load-typescript-module.ts
new file mode 100644
index 000000000..9b46bd6e2
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/src/infra/external-clients/typescript/load-typescript-module.ts
@@ -0,0 +1,8 @@
+import { require as requireTypeScript } from 'tsx/cjs/api'
+
+const loadModule: (id: string, fromFile: string | URL) => unknown = requireTypeScript
+
+/** @riviere-role external-client-service */
+export function loadTypeScriptModule(modulePath: string): unknown {
+  return loadModule(modulePath, import.meta.url)
+}
diff --git a/packages/riviere-role-enforcement/use-cases/tsconfig.json b/packages/riviere-role-enforcement/use-cases/tsconfig.json
new file mode 100644
index 000000000..667a3463d
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/packages/riviere-role-enforcement/use-cases/tsconfig.lib.json b/packages/riviere-role-enforcement/use-cases/tsconfig.lib.json
new file mode 100644
index 000000000..84a212a0b
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/tsconfig.lib.json
@@ -0,0 +1,24 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "src",
+    "outDir": "dist",
+    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
+    "emitDeclarationOnly": false,
+    "forceConsistentCasingInFileNames": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "references": [
+    {
+      "path": "../domain-model/tsconfig.lib.json"
+    }
+  ],
+  "exclude": [
+    "vitest.config.ts",
+    "vitest.config.mts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts"
+  ]
+}
diff --git a/packages/riviere-role-enforcement/use-cases/tsconfig.spec.json b/packages/riviere-role-enforcement/use-cases/tsconfig.spec.json
new file mode 100644
index 000000000..4b2279cc1
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/tsconfig.spec.json
@@ -0,0 +1,20 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/vitest",
+    "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node", "vitest"],
+    "forceConsistentCasingInFileNames": true
+  },
+  "include": [
+    "vitest.config.ts",
+    "vitest.config.mts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.d.ts"
+  ],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    }
+  ]
+}
diff --git a/packages/riviere-role-enforcement/use-cases/vitest.config.mts b/packages/riviere-role-enforcement/use-cases/vitest.config.mts
new file mode 100644
index 000000000..ce6adfcc0
--- /dev/null
+++ b/packages/riviere-role-enforcement/use-cases/vitest.config.mts
@@ -0,0 +1,32 @@
+import path from 'node:path'
+import { defineConfig } from 'vitest/config'
+
+const repoRoot = path.resolve(__dirname, '../../..')
+
+export default defineConfig(() => ({
+  root: __dirname,
+  cacheDir: '../../../node_modules/.vite/packages/riviere-role-enforcement-use-cases',
+  test: {
+    name: '@living-architecture/riviere-role-enforcement-use-cases',
+    watch: false,
+    globals: true,
+    environment: 'node',
+    include: ['src/**/*.{test,spec}.{ts,mts}'],
+    reporters: ['default'],
+    coverage: {
+      enabled: true,
+      reportsDirectory: './test-output/vitest/coverage',
+      provider: 'v8' as const,
+      reporter: ['text', ['lcov', { projectRoot: repoRoot }]] as [
+        'text',
+        ['lcov', { projectRoot: string }],
+      ],
+      thresholds: {
+        lines: 100,
+        statements: 100,
+        functions: 100,
+        branches: 100,
+      },
+    },
+  },
+}))
diff --git a/packages/riviere-role-enforcement/vitest.config.mts b/packages/riviere-role-enforcement/vitest.config.mts
deleted file mode 100644
index 362f555bc..000000000
--- a/packages/riviere-role-enforcement/vitest.config.mts
+++ /dev/null
@@ -1,32 +0,0 @@
-import path from 'node:path'
-import { defineConfig } from 'vitest/config'
-
-const repoRoot = path.resolve(__dirname, '../..')
-
-export default defineConfig(() => ({
-  root: __dirname,
-  cacheDir: '../../node_modules/.vite/packages/riviere-role-enforcement',
-  test: {
-    name: '@living-architecture/riviere-role-enforcement',
-    watch: false,
-    globals: true,
-    environment: 'node',
-    include: ['src/**/*.{test,spec}.{ts,mts}'],
-    reporters: ['default'],
-    coverage: {
-      enabled: true,
-      reportsDirectory: './test-output/vitest/coverage',
-      provider: 'v8' as const,
-      reporter: ['text', ['lcov', { projectRoot: repoRoot }]] as [
-        'text',
-        ['lcov', { projectRoot: string }],
-      ],
-      thresholds: {
-        lines: 100,
-        statements: 100,
-        functions: 100,
-        branches: 100,
-      },
-    },
-  },
-}))
diff --git a/packages/riviere-schema/README.md b/packages/riviere-schema/README.md
deleted file mode 100644
index 7a1efc91c..000000000
--- a/packages/riviere-schema/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# @living-architecture/riviere-schema
-
-Riviere schema definition with TypeScript types and validation.
-
-## Install
-
-```bash
-npm install @living-architecture/riviere-schema
-```
-
-## Documentation
-
-See [Schema Reference](../../apps/docs/reference/schema).
diff --git a/packages/riviere-schema/package.json b/packages/riviere-schema/package.json
deleted file mode 100644
index 8d45fa9bb..000000000
--- a/packages/riviere-schema/package.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "name": "@living-architecture/riviere-schema",
-  "version": "0.8.3",
-  "type": "module",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/NTCoding/living-architecture.git",
-    "directory": "packages/riviere-schema"
-  },
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    "./package.json": "./package.json",
-    ".": {
-      "@living-architecture/source": "./src/index.ts",
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "default": "./dist/index.js"
-    },
-    "./schema.json": "./riviere.schema.json"
-  },
-  "files": [
-    "dist",
-    "riviere.schema.json",
-    "!**/*.tsbuildinfo"
-  ],
-  "dependencies": {
-    "ajv": "^8.17.1",
-    "ajv-formats": "^3.0.1"
-  }
-}
diff --git a/packages/riviere-schema/project.json b/packages/riviere-schema/project.json
deleted file mode 100644
index a240c5fa7..000000000
--- a/packages/riviere-schema/project.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "name": "riviere-schema"
-}
diff --git a/packages/riviere-schema/CLAUDE.md b/packages/riviere-schema/published-language/CLAUDE.md
similarity index 100%
rename from packages/riviere-schema/CLAUDE.md
rename to packages/riviere-schema/published-language/CLAUDE.md
diff --git a/packages/riviere-schema/published-language/README.md b/packages/riviere-schema/published-language/README.md
new file mode 100644
index 000000000..6ce71b3fe
--- /dev/null
+++ b/packages/riviere-schema/published-language/README.md
@@ -0,0 +1,13 @@
+# @living-architecture/riviere-schema-published-language
+
+Riviere schema definition with TypeScript types and validation.
+
+## Install
+
+```bash
+npm install @living-architecture/riviere-schema-published-language
+```
+
+## Documentation
+
+See [Schema Reference](../../apps/docs/reference/schema).
diff --git a/packages/riviere-schema/examples/ecommerce-complete-v2.json b/packages/riviere-schema/published-language/examples/ecommerce-complete-v2.json
similarity index 100%
rename from packages/riviere-schema/examples/ecommerce-complete-v2.json
rename to packages/riviere-schema/published-language/examples/ecommerce-complete-v2.json
diff --git a/packages/riviere-schema/examples/ecommerce-complete.json b/packages/riviere-schema/published-language/examples/ecommerce-complete.json
similarity index 100%
rename from packages/riviere-schema/examples/ecommerce-complete.json
rename to packages/riviere-schema/published-language/examples/ecommerce-complete.json
diff --git a/packages/riviere-schema/published-language/package.json b/packages/riviere-schema/published-language/package.json
new file mode 100644
index 000000000..3712bef39
--- /dev/null
+++ b/packages/riviere-schema/published-language/package.json
@@ -0,0 +1,72 @@
+{
+  "name": "@living-architecture/riviere-schema-published-language",
+  "version": "0.8.3",
+  "type": "module",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/NTCoding/living-architecture.git",
+    "directory": "packages/riviere-schema/published-language"
+  },
+  "main": "./dist/published-language/schema.js",
+  "module": "./dist/published-language/schema.js",
+  "types": "./dist/published-language/schema.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "@living-architecture/source": "./src/published-language/schema.ts",
+      "types": "./dist/published-language/schema.d.ts",
+      "import": "./dist/published-language/schema.js",
+      "default": "./dist/published-language/schema.js"
+    },
+    "./schema": {
+      "@living-architecture/source": "./src/published-language/schema.ts",
+      "types": "./dist/published-language/schema.d.ts",
+      "import": "./dist/published-language/schema.js",
+      "default": "./dist/published-language/schema.js"
+    },
+    "./validation": {
+      "@living-architecture/source": "./src/published-language/validation.ts",
+      "types": "./dist/published-language/validation.d.ts",
+      "import": "./dist/published-language/validation.js",
+      "default": "./dist/published-language/validation.js"
+    },
+    "./graph-validation": {
+      "@living-architecture/source": "./src/published-language/graph-validation.ts",
+      "types": "./dist/published-language/graph-validation.d.ts",
+      "import": "./dist/published-language/graph-validation.js",
+      "default": "./dist/published-language/graph-validation.js"
+    },
+    "./component-id": {
+      "@living-architecture/source": "./src/published-language/component-id.ts",
+      "types": "./dist/published-language/component-id.d.ts",
+      "import": "./dist/published-language/component-id.js",
+      "default": "./dist/published-language/component-id.js"
+    },
+    "./custom-property-type": {
+      "@living-architecture/source": "./src/published-language/custom-property-type.ts",
+      "types": "./dist/published-language/custom-property-type.d.ts",
+      "import": "./dist/published-language/custom-property-type.js",
+      "default": "./dist/published-language/custom-property-type.js"
+    },
+    "./link-id": {
+      "@living-architecture/source": "./src/published-language/link-id.ts",
+      "types": "./dist/published-language/link-id.d.ts",
+      "import": "./dist/published-language/link-id.js",
+      "default": "./dist/published-language/link-id.js"
+    },
+    "./schema.json": "./riviere.schema.json"
+  },
+  "files": [
+    "dist",
+    "!dist/**/__fixtures__/**",
+    "riviere.schema.json",
+    "!**/*.tsbuildinfo"
+  ],
+  "dependencies": {
+    "ajv": "^8.17.1",
+    "ajv-formats": "^3.0.1"
+  }
+}
diff --git a/packages/riviere-schema/published-language/project.json b/packages/riviere-schema/published-language/project.json
new file mode 100644
index 000000000..65d9522b9
--- /dev/null
+++ b/packages/riviere-schema/published-language/project.json
@@ -0,0 +1,18 @@
+{
+  "name": "riviere-schema-published-language",
+  "targets": {
+    "build": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          "node ../../../scripts/build-public-exports.mjs . --clean",
+          "tsc --build tsconfig.lib.json",
+          "node ../../../scripts/build-public-exports.mjs ."
+        ],
+        "cwd": "{projectRoot}",
+        "parallel": false
+      },
+      "outputs": ["{projectRoot}/dist"]
+    }
+  }
+}
diff --git a/packages/riviere-schema/riviere.schema.json b/packages/riviere-schema/published-language/riviere.schema.json
similarity index 100%
rename from packages/riviere-schema/riviere.schema.json
rename to packages/riviere-schema/published-language/riviere.schema.json
diff --git a/packages/riviere-schema/published-language/src/component-id.spec.ts b/packages/riviere-schema/published-language/src/component-id.spec.ts
new file mode 100644
index 000000000..6964a34a6
--- /dev/null
+++ b/packages/riviere-schema/published-language/src/component-id.spec.ts
@@ -0,0 +1,57 @@
+import { ComponentId } from './published-language/component-id'
+
+describe('ComponentId', () => {
+  describe('parseFromParts', () => {
+    it('parses an ID from its parts', () => {
+      const componentId = ComponentId.parseFromParts({
+        domain: 'orders',
+        module: 'checkout',
+        type: 'domainop',
+        name: 'Place Order',
+      })
+
+      expect(componentId.toString()).toBe('orders:checkout:domainop:place-order')
+    })
+
+    it('lowercases and hyphenates the component name', () => {
+      const componentId = ComponentId.parseFromParts({
+        domain: 'orders',
+        module: 'checkout',
+        type: 'usecase',
+        name: 'Handle Customer Request',
+      })
+
+      expect(componentId.toString()).toBe('orders:checkout:usecase:handle-customer-request')
+      expect(componentId.name()).toBe('handle-customer-request')
+    })
+  })
+
+  describe('parse', () => {
+    it('returns a component ID for a valid value', () => {
+      const result = ComponentId.parse('orders:checkout:domainop:place-order')
+
+      expect(result).toStrictEqual({
+        componentId: ComponentId.parseFromParts({
+          domain: 'orders',
+          module: 'checkout',
+          type: 'domainop',
+          name: 'place-order',
+        }),
+        success: true,
+      })
+    })
+
+    it.each(['orders:checkout', 'orders:checkout:domainop:place:order', ''])(
+      'returns the validation failure for invalid value %j',
+      (value) => {
+        const result = ComponentId.parse(value)
+
+        expect(result).toStrictEqual({
+          success: false,
+          invalidValue: value,
+          message: `Invalid component ID format: '${value}'. Expected 'domain:module:type:name'`,
+        })
+      },
+    )
+  })
+})
diff --git a/packages/riviere-schema/published-language/src/link-id.spec.ts b/packages/riviere-schema/published-language/src/link-id.spec.ts
new file mode 100644
index 000000000..6ab8e625e
--- /dev/null
+++ b/packages/riviere-schema/published-language/src/link-id.spec.ts
@@ -0,0 +1,133 @@
+import { LinkId } from './published-language/link-id'
+
+describe('LinkId', () => {
+  it('uses source and target when source location is absent', () => {
+    expect(LinkId.parseFromLink({ source: 'source', target: 'target' }).toString()).toBe(
+      'source->target',
+    )
+  })
+
+  it('adds file path when line and column are absent', () => {
+    expect(
+      LinkId.parseFromLink({
+        source: 'source',
+        target: 'target',
+        sourceLocation: { repository: 'repo', filePath: 'src/file.ts' },
+      }).toString(),
+    ).toBe('source->target@src/file.ts')
+  })
+
+  it('adds an empty line segment when only column is present', () => {
+    expect(
+      LinkId.parseFromLink({
+        source: 'source',
+        target: 'target',
+        sourceLocation: {
+          repository: 'repo',
+          filePath: 'src/file.ts',
+          columnNumber: 5,
+        },
+      }).toString(),
+    ).toBe('source->target@src/file.ts::5')
+  })
+
+  it('adds line when column is absent', () => {
+    expect(
+      LinkId.parseFromLink({
+        source: 'source',
+        target: 'target',
+        sourceLocation: { repository: 'repo', filePath: 'src/file.ts', lineNumber: 12 },
+      }).toString(),
+    ).toBe('source->target@src/file.ts:12')
+  })
+
+  it('adds line and column when both are present', () => {
+    expect(
+      LinkId.parseFromLink({
+        source: 'source',
+        target: 'target',
+        sourceLocation: {
+          repository: 'repo',
+          filePath: 'src/file.ts',
+          lineNumber: 12,
+          columnNumber: 5,
+        },
+      }).toString(),
+    ).toBe('source->target@src/file.ts:12:5')
+  })
+
+  it('escapes identity delimiters so distinct occurrences cannot collide', () => {
+    const targetContainingLocation = LinkId.parseFromLink({
+      source: 'source',
+      target: 'target@src/file.ts:12:5',
+    }).toString()
+    const targetAtLocation = LinkId.parseFromLink({
+      source: 'source',
+      target: 'target',
+      sourceLocation: {
+        repository: 'repo',
+        filePath: 'src/file.ts',
+        lineNumber: 12,
+        columnNumber: 5,
+      },
+    }).toString()
+    const sourceContainingArrow = LinkId.parseFromLink({
+      source: 'source->target',
+      target: 'target',
+    }).toString()
+
+    expect(targetContainingLocation).toBe('source->target%40src/file.ts:12:5')
+    expect(targetContainingLocation).not.toBe(targetAtLocation)
+    expect(sourceContainingArrow).toBe('source%2D%3Etarget->target')
+  })
+
+  it('escapes file-path delimiters so line and column segments remain distinct', () => {
+    const colonInFilePath = LinkId.parseFromLink({
+      source: 'source',
+      target: 'target',
+      sourceLocation: {
+        repository: 'repo',
+        filePath: 'src/file.ts:12',
+        lineNumber: 5,
+      },
+    }).toString()
+    const lineAndColumn = LinkId.parseFromLink({
+      source: 'source',
+      target: 'target',
+      sourceLocation: {
+        repository: 'repo',
+        filePath: 'src/file.ts',
+        lineNumber: 12,
+        columnNumber: 5,
+      },
+    }).toString()
+
+    expect(colonInFilePath).toBe('source->target@src/file.ts%3A12:5')
+    expect(colonInFilePath).not.toBe(lineAndColumn)
+  })
+
+  it('does not include repository in the link identity', () => {
+    const first = LinkId.parseFromLink({
+      source: 'source',
+      target: 'target',
+      sourceLocation: {
+        repository: 'repo-a',
+        filePath: 'src/file.ts',
+        lineNumber: 12,
+        columnNumber: 5,
+      },
+    }).toString()
+    const second = LinkId.parseFromLink({
+      source: 'source',
+      target: 'target',
+      sourceLocation: {
+        repository: 'repo-b',
+        filePath: 'src/file.ts',
+        lineNumber: 12,
+        columnNumber: 5,
+      },
+    }).toString()
+
+    expect(first).toBe(second)
+  })
+})
diff --git a/packages/riviere-schema/src/minlength-component-fields.spec.ts b/packages/riviere-schema/published-language/src/minlength-component-fields.spec.ts
similarity index 80%
rename from packages/riviere-schema/src/minlength-component-fields.spec.ts
rename to packages/riviere-schema/published-language/src/minlength-component-fields.spec.ts
index 1af4eefcc..dfdada18c 100644
--- a/packages/riviere-schema/src/minlength-component-fields.spec.ts
+++ b/packages/riviere-schema/published-language/src/minlength-component-fields.spec.ts
@@ -1,6 +1,16 @@
-import {
-  parseRiviereGraph, RiviereSchemaValidationError 
-} from './validation'
+import { parseRiviereGraph } from './published-language/validation'
+
+function expectInvalid(input: unknown, fieldName: string): void {
+  const result = parseRiviereGraph(input)
+  expect(result.success).toBe(false)
+  if (!result.success) {
+    expect(result.issues.join('\n')).toContain(fieldName)
+  }
+}
+
+function expectValid(input: unknown): void {
+  expect(parseRiviereGraph(input).success).toBe(true)
+}
 
 describe('minLength validation: component fields', () => {
   const baseGraph = {
@@ -38,8 +48,7 @@ describe('minLength validation: component fields', () => {
           },
         ],
       }
-      expect(() => parseRiviereGraph(input)).toThrow(RiviereSchemaValidationError)
-      expect(() => parseRiviereGraph(input)).toThrow(/path/)
+      expectInvalid(input, 'path')
     })
 
     it('rejects path with length < 3', () => {
@@ -62,8 +71,7 @@ describe('minLength validation: component fields', () => {
           },
         ],
       }
-      expect(() => parseRiviereGraph(input)).toThrow(RiviereSchemaValidationError)
-      expect(() => parseRiviereGraph(input)).toThrow(/path/)
+      expectInvalid(input, 'path')
     })
 
     it('accepts path with length >= 3', () => {
@@ -86,7 +94,7 @@ describe('minLength validation: component fields', () => {
           },
         ],
       }
-      expect(() => parseRiviereGraph(input)).not.toThrow()
+      expectValid(input)
     })
   })
 
@@ -110,8 +118,7 @@ describe('minLength validation: component fields', () => {
           },
         ],
       }
-      expect(() => parseRiviereGraph(input)).toThrow(RiviereSchemaValidationError)
-      expect(() => parseRiviereGraph(input)).toThrow(/operationName/)
+      expectInvalid(input, 'operationName')
     })
 
     it('rejects operationName with length < 2', () => {
@@ -133,8 +140,7 @@ describe('minLength validation: component fields', () => {
           },
         ],
       }
-      expect(() => parseRiviereGraph(input)).toThrow(RiviereSchemaValidationError)
-      expect(() => parseRiviereGraph(input)).toThrow(/operationName/)
+      expectInvalid(input, 'operationName')
     })
 
     it('accepts operationName with length >= 2', () => {
@@ -156,7 +162,7 @@ describe('minLength validation: component fields', () => {
           },
         ],
       }
-      expect(() => parseRiviereGraph(input)).not.toThrow()
+      expectValid(input)
     })
   })
 
@@ -179,8 +185,7 @@ describe('minLength validation: component fields', () => {
           },
         ],
       }
-      expect(() => parseRiviereGraph(input)).toThrow(RiviereSchemaValidationError)
-      expect(() => parseRiviereGraph(input)).toThrow(/operationName/)
+      expectInvalid(input, 'operationName')
     })
 
     it('rejects operationName with length < 2', () => {
@@ -201,8 +206,7 @@ describe('minLength validation: component fields', () => {
           },
         ],
       }
-      expect(() => parseRiviereGraph(input)).toThrow(RiviereSchemaValidationError)
-      expect(() => parseRiviereGraph(input)).toThrow(/operationName/)
+      expectInvalid(input, 'operationName')
     })
 
     it('accepts operationName with length >= 2', () => {
@@ -223,7 +227,7 @@ describe('minLength validation: component fields', () => {
           },
         ],
       }
-      expect(() => parseRiviereGraph(input)).not.toThrow()
+      expectValid(input)
     })
   })
 
@@ -246,8 +250,7 @@ describe('minLength validation: component fields', () => {
           },
         ],
       }
-      expect(() => parseRiviereGraph(input)).toThrow(RiviereSchemaValidationError)
-      expect(() => parseRiviereGraph(input)).toThrow(/eventName/)
+      expectInvalid(input, 'eventName')
     })
 
     it('rejects eventName with length < 3', () => {
@@ -268,8 +271,7 @@ describe('minLength validation: component fields', () => {
           },
         ],
       }
-      expect(() => parseRiviereGraph(input)).toThrow(RiviereSchemaValidationError)
-      expect(() => parseRiviereGraph(input)).toThrow(/eventName/)
+      expectInvalid(input, 'eventName')
     })
 
     it('accepts eventName with length >= 3', () => {
@@ -290,7 +292,7 @@ describe('minLength validation: component fields', () => {
           },
         ],
       }
-      expect(() => parseRiviereGraph(input)).not.toThrow()
+      expectValid(input)
     })
   })
 })
diff --git a/packages/riviere-schema/published-language/src/minlength-repository-domain.spec.ts b/packages/riviere-schema/published-language/src/minlength-repository-domain.spec.ts
new file mode 100644
index 000000000..a0303444b
--- /dev/null
+++ b/packages/riviere-schema/published-language/src/minlength-repository-domain.spec.ts
@@ -0,0 +1,176 @@
+import { parseRiviereGraph } from './published-language/validation'
+
+function expectInvalid(input: unknown, fieldName: string): void {
+  const result = parseRiviereGraph(input)
+  expect(result.success).toBe(false)
+  if (!result.success) {
+    expect(result.issues.join('\n')).toContain(fieldName)
+  }
+}
+
+function expectValid(input: unknown): void {
+  expect(parseRiviereGraph(input).success).toBe(true)
+}
+
+describe('minLength validation: metadata fields', () => {
+  const baseGraph = {
+    version: '1.0',
+    metadata: {
+      domains: {
+        test: {
+          description: 'Test domain',
+          systemType: 'domain' as const,
+        },
+      },
+    },
+    components: [],
+    links: [],
+  }
+
+  describe('metadata.sources[].repository', () => {
+    it('rejects empty repository', () => {
+      const input = {
+        ...baseGraph,
+        metadata: {
+          ...baseGraph.metadata,
+          sources: [{ repository: '' }],
+        },
+      }
+      expectInvalid(input, 'repository')
+    })
+
+    it('rejects repository with length < 3', () => {
+      const input = {
+        ...baseGraph,
+        metadata: {
+          ...baseGraph.metadata,
+          sources: [{ repository: 'ab' }],
+        },
+      }
+      expectInvalid(input, 'repository')
+    })
+
+    it('accepts repository with length >= 3', () => {
+      const input = {
+        ...baseGraph,
+        metadata: {
+          ...baseGraph.metadata,
+          sources: [{ repository: 'abc' }],
+        },
+      }
+      expectValid(input)
+    })
+  })
+
+  describe('sourceLocation.repository', () => {
+    it('rejects empty repository', () => {
+      const input = {
+        ...baseGraph,
+        components: [
+          {
+            id: 'test:mod:ui:page',
+            type: 'UI',
+            name: 'Page',
+            domain: 'test',
+            module: 'mod',
+            route: '/test',
+            sourceLocation: {
+              repository: '',
+              filePath: 'src/page.tsx',
+            },
+          },
+        ],
+      }
+      expectInvalid(input, 'repository')
+    })
+
+    it('rejects repository with length < 3', () => {
+      const input = {
+        ...baseGraph,
+        components: [
+          {
+            id: 'test:mod:ui:page',
+            type: 'UI',
+            name: 'Page',
+            domain: 'test',
+            module: 'mod',
+            route: '/test',
+            sourceLocation: {
+              repository: 'ab',
+              filePath: 'src/page.tsx',
+            },
+          },
+        ],
+      }
+      expectInvalid(input, 'repository')
+    })
+
+    it('accepts repository with length >= 3', () => {
+      const input = {
+        ...baseGraph,
+        components: [
+          {
+            id: 'test:mod:ui:page',
+            type: 'UI',
+            name: 'Page',
+            domain: 'test',
+            module: 'mod',
+            route: '/test',
+            sourceLocation: {
+              repository: 'abc',
+              filePath: 'src/page.tsx',
+            },
+          },
+        ],
+      }
+      expectValid(input)
+    })
+  })
+
+  describe('domainMetadata.description', () => {
+    it('rejects empty description', () => {
+      const input = {
+        ...baseGraph,
+        metadata: {
+          domains: {
+            test: {
+              description: '',
+              systemType: 'domain' as const,
+            },
+          },
+        },
+      }
+      expectInvalid(input, 'description')
+    })
+
+    it('rejects description with length < 3', () => {
+      const input = {
+        ...baseGraph,
+        metadata: {
+          domains: {
+            test: {
+              description: 'ab',
+              systemType: 'domain' as const,
+            },
+          },
+        },
+      }
+      expectInvalid(input, 'description')
+    })
+
+    it('accepts description with length >= 3', () => {
+      const input = {
+        ...baseGraph,
+        metadata: {
+          domains: {
+            test: {
+              description: 'abc',
+              systemType: 'domain' as const,
+            },
+          },
+        },
+      }
+      expectValid(input)
+    })
+  })
+})
diff --git a/packages/riviere-schema/published-language/src/published-language/component-id.ts b/packages/riviere-schema/published-language/src/published-language/component-id.ts
new file mode 100644
index 000000000..7f0599aff
--- /dev/null
+++ b/packages/riviere-schema/published-language/src/published-language/component-id.ts
@@ -0,0 +1,51 @@
+type ComponentIdParseResult =
+  | { success: true; componentId: ComponentId }
+  | { success: false; invalidValue: string; message: string }
+
+/** @riviere-role value-object */
+export class ComponentId {
+  declare private readonly brand: 'ComponentId'
+
+  private constructor(
+    private readonly value: string,
+    private readonly componentName: string,
+  ) {}
+
+  static parse(value: string): ComponentIdParseResult {
+    const parts = value.split(':')
+    const componentName = parts[3]
+    if (parts.length !== 4 || componentName === undefined || componentName.length === 0) {
+      return {
+        success: false,
+        invalidValue: value,
+        message: `Invalid component ID format: '${value}'. Expected 'domain:module:type:name'`,
+      }
+    }
+
+    return {
+      componentId: new ComponentId(value, componentName),
+      success: true as const,
+    }
+  }
+
+  static parseFromParts(parts: {
+    domain: string
+    module: string
+    type: string
+    name: string
+  }): ComponentId {
+    const componentName = parts.name.toLowerCase().replaceAll(/\s+/g, '-')
+    return new ComponentId(
+      `${parts.domain}:${parts.module}:${parts.type}:${componentName}`,
+      componentName,
+    )
+  }
+
+  toString(): string {
+    return this.value
+  }
+
+  name(): string {
+    return this.componentName
+  }
+}
diff --git a/packages/riviere-schema/published-language/src/published-language/custom-property-type.spec.ts b/packages/riviere-schema/published-language/src/published-language/custom-property-type.spec.ts
new file mode 100644
index 000000000..04db1a26e
--- /dev/null
+++ b/packages/riviere-schema/published-language/src/published-language/custom-property-type.spec.ts
@@ -0,0 +1,34 @@
+import assert from 'node:assert/strict'
+import { CustomPropertyType } from './custom-property-type'
+
+function parsePropertyType(value: string): CustomPropertyType {
+  const result = CustomPropertyType.parse(value)
+  assert.equal(result.success, true)
+  return result.propertyType
+}
+
+describe('CustomPropertyType', () => {
+  it.each(['string', 'number', 'boolean', 'array', 'object'])(
+    'parses the published property type %s',
+    (value) => {
+      expect(parsePropertyType(value).name()).toBe(value)
+    },
+  )
+
+  it('returns the invalid value when parsing fails', () => {
+    expect(CustomPropertyType.parse('date')).toStrictEqual({
+      success: false,
+      invalidValue: 'date',
+    })
+  })
+
+  it('lists every supported property type name', () => {
+    expect(CustomPropertyType.names()).toStrictEqual([
+      'string',
+      'number',
+      'boolean',
+      'array',
+      'object',
+    ])
+  })
+})
diff --git a/packages/riviere-schema/published-language/src/published-language/custom-property-type.ts b/packages/riviere-schema/published-language/src/published-language/custom-property-type.ts
new file mode 100644
index 000000000..1a8c281a4
--- /dev/null
+++ b/packages/riviere-schema/published-language/src/published-language/custom-property-type.ts
@@ -0,0 +1,36 @@
+/** @riviere-role published-language-union */
+export type CustomPropertyTypeName = 'string' | 'number' | 'boolean' | 'array' | 'object'
+
+type CustomPropertyTypeParseResult =
+  | { success: true; propertyType: CustomPropertyType }
+  | { success: false; invalidValue: string }
+
+const CUSTOM_PROPERTY_TYPE_NAMES: readonly CustomPropertyTypeName[] = [
+  'string',
+  'number',
+  'boolean',
+  'array',
+  'object',
+]
+
+/** @riviere-role value-object */
+export class CustomPropertyType {
+  declare private readonly brand: 'CustomPropertyType'
+
+  private constructor(private readonly propertyTypeName: CustomPropertyTypeName) {}
+
+  static parse(value: string): CustomPropertyTypeParseResult {
+    const propertyTypeName = CUSTOM_PROPERTY_TYPE_NAMES.find((candidate) => candidate === value)
+    return propertyTypeName === undefined
+      ? { success: false, invalidValue: value }
+      : { success: true, propertyType: new CustomPropertyType(propertyTypeName) }
+  }
+
+  name(): CustomPropertyTypeName {
+    return this.propertyTypeName
+  }
+
+  static names(): readonly CustomPropertyTypeName[] {
+    return CUSTOM_PROPERTY_TYPE_NAMES
+  }
+}
diff --git a/packages/riviere-schema/published-language/src/published-language/graph-validation.ts b/packages/riviere-schema/published-language/src/published-language/graph-validation.ts
new file mode 100644
index 000000000..d142ab5b3
--- /dev/null
+++ b/packages/riviere-schema/published-language/src/published-language/graph-validation.ts
@@ -0,0 +1,152 @@
+import type { CustomComponent, RiviereGraph } from './schema'
+import { LinkId } from './link-id'
+
+type ValidationErrorCode =
+  | 'INVALID_LINK_SOURCE'
+  | 'INVALID_LINK_TARGET'
+  | 'INVALID_TYPE'
+  | 'INVALID_RELATIONSHIP_TYPE'
+  | 'DUPLICATE_LINK_ID'
+  | 'DUPLICATE_LINK'
+
+/** @riviere-role value-object */
+export class ValidationError {
+  declare private readonly brand: 'ValidationError'
+
+  private constructor(
+    readonly path: string,
+    readonly message: string,
+    readonly code: ValidationErrorCode,
+  ) {}
+
+  static parse(input: {
+    readonly path: string
+    readonly message: string
+    readonly code: ValidationErrorCode
+  }): ValidationError {
+    return new ValidationError(input.path, input.message, input.code)
+  }
+}
+
+/** @riviere-role value-object */
+export class ValidationResult {
+  declare private readonly brand: 'ValidationResult'
+
+  private constructor(
+    readonly valid: boolean,
+    readonly errors: readonly ValidationError[],
+  ) {}
+
+  static parse(graph: RiviereGraph): ValidationResult {
+    const errors = validateLinks(graph)
+    errors.push(...validateCustomTypes(graph))
+    errors.push(...validateRelationshipTypes(graph))
+    errors.push(...validateUniqueLinkIds(graph))
+    errors.push(...validateUniqueLinkOccurrences(graph))
+    return new ValidationResult(errors.length === 0, errors)
+  }
+}
+
+function validateLinks(graph: RiviereGraph): ValidationError[] {
+  const errors: ValidationError[] = []
+  const componentIds = new Set(graph.components.map((component) => component.id))
+  graph.links.forEach((link, index) => {
+    if (!componentIds.has(link.source)) {
+      errors.push(linkReferenceError(index, 'source', link.source, 'INVALID_LINK_SOURCE'))
+    }
+    if (!componentIds.has(link.target)) {
+      errors.push(linkReferenceError(index, 'target', link.target, 'INVALID_LINK_TARGET'))
+    }
+  })
+  return errors
+}
+
+function linkReferenceError(
+  index: number,
+  end: 'source' | 'target',
+  componentId: string,
+  code: 'INVALID_LINK_SOURCE' | 'INVALID_LINK_TARGET',
+): ValidationError {
+  return ValidationError.parse({
+    path: `/links/${index}/${end}`,
+    message: `Link references non-existent ${end}: ${componentId}`,
+    code,
+  })
+}
+
+function validateCustomTypes(graph: RiviereGraph): ValidationError[] {
+  const customTypes = graph.metadata.customTypes
+  return graph.components.flatMap((component, index) => {
+    if (!isCustomComponent(component) || (customTypes && component.customTypeName in customTypes)) {
+      return []
+    }
+    return [
+      ValidationError.parse({
+        path: `/components/${index}/customTypeName`,
+        message: `Custom type '${component.customTypeName}' is not defined in metadata.customTypes`,
+        code: 'INVALID_TYPE',
+      }),
+    ]
+  })
+}
+
+function isCustomComponent(component: { type: string }): component is CustomComponent {
+  return component.type === 'Custom'
+}
+
+function validateRelationshipTypes(graph: RiviereGraph): ValidationError[] {
+  const relationshipTypes = graph.metadata.relationshipTypes
+  return graph.links.flatMap((link, index) => {
+    if (
+      link.relationshipType === undefined ||
+      (relationshipTypes && Object.hasOwn(relationshipTypes, link.relationshipType))
+    ) {
+      return []
+    }
+    return [
+      ValidationError.parse({
+        path: `/links/${index}/relationshipType`,
+        message: `Relationship type '${link.relationshipType}' is not defined in metadata.relationshipTypes`,
+        code: 'INVALID_RELATIONSHIP_TYPE',
+      }),
+    ]
+  })
+}
+
+function validateUniqueLinkIds(graph: RiviereGraph): ValidationError[] {
+  const errors: ValidationError[] = []
+  const seen = new Set<string>()
+  graph.links.forEach((link, index) => {
+    if (link.id === undefined) return
+    if (seen.has(link.id)) {
+      errors.push(
+        ValidationError.parse({
+          path: `/links/${index}/id`,
+          message: `Duplicate Link ID: ${link.id}`,
+          code: 'DUPLICATE_LINK_ID',
+        }),
+      )
+    }
+    seen.add(link.id)
+  })
+  return errors
+}
+
+function validateUniqueLinkOccurrences(graph: RiviereGraph): ValidationError[] {
+  const errors: ValidationError[] = []
+  const seen = new Set<string>()
+  graph.links.forEach((link, index) => {
+    const occurrenceId = LinkId.parseFromLink(link).toString()
+    if (seen.has(occurrenceId)) {
+      errors.push(
+        ValidationError.parse({
+          path: `/links/${index}`,
+          message: `Duplicate Link occurrence: ${occurrenceId}`,
+          code: 'DUPLICATE_LINK',
+        }),
+      )
+    }
+    seen.add(occurrenceId)
+  })
+  return errors
+}
diff --git a/packages/riviere-schema/published-language/src/published-language/link-id.ts b/packages/riviere-schema/published-language/src/published-language/link-id.ts
new file mode 100644
index 000000000..87fe14089
--- /dev/null
+++ b/packages/riviere-schema/published-language/src/published-language/link-id.ts
@@ -0,0 +1,43 @@
+import type { SourceLocation } from './schema'
+
+/** @riviere-role value-object */
+export class LinkId {
+  declare private readonly brand: 'LinkId'
+
+  private constructor(private readonly value: string) {}
+
+  static parseFromLink(link: {
+    source: string
+    target: string
+    sourceLocation?: SourceLocation
+  }): LinkId {
+    const source = escapePercent(link.source).replaceAll('->', '%2D%3E')
+    const target = escapePercent(link.target).replaceAll('@', '%40')
+    const baseId = `${source}->${target}`
+    const sourceLocation = link.sourceLocation
+    if (sourceLocation === undefined) return new LinkId(baseId)
+
+    const filePath = escapePercent(sourceLocation.filePath).replaceAll(':', '%3A')
+    const line = sourceLocation.lineNumber
+    const column = sourceLocation.columnNumber
+    if (line === undefined) {
+      const value =
+        column === undefined ? `${baseId}@${filePath}` : `${baseId}@${filePath}::${column}`
+      return new LinkId(value)
+    }
+
+    const value =
+      column === undefined
+        ? `${baseId}@${filePath}:${line}`
+        : `${baseId}@${filePath}:${line}:${column}`
+    return new LinkId(value)
+  }
+
+  toString(): string {
+    return this.value
+  }
+}
+
+function escapePercent(value: string): string {
+  return value.replaceAll('%', '%25')
+}
diff --git a/packages/riviere-schema/published-language/src/published-language/schema.ts b/packages/riviere-schema/published-language/src/published-language/schema.ts
new file mode 100644
index 000000000..54905219a
--- /dev/null
+++ b/packages/riviere-schema/published-language/src/published-language/schema.ts
@@ -0,0 +1,227 @@
+/** @riviere-role published-language-data-structure */
+export interface SourceLocation {
+  repository: string
+  filePath: string
+  lineNumber?: number
+  columnNumber?: number
+  endLineNumber?: number
+  methodName?: string
+  url?: string
+}
+
+/** @riviere-role published-language-data-structure */
+export interface OperationParameter {
+  name: string
+  type: string
+  description?: string
+}
+
+/** @riviere-role published-language-data-structure */
+export interface OperationSignature {
+  parameters?: OperationParameter[]
+  returnType?: string
+}
+
+/** @riviere-role published-language-data-structure */
+export interface OperationBehavior {
+  reads?: string[]
+  validates?: string[]
+  modifies?: string[]
+  emits?: string[]
+}
+
+/** @riviere-role published-language-data-structure */
+export interface StateTransition {
+  from: string
+  to: string
+  trigger?: string
+}
+
+/** @riviere-role published-language-union */
+export type ComponentType =
+  | 'UI'
+  | 'API'
+  | 'UseCase'
+  | 'DomainOp'
+  | 'Event'
+  | 'EventHandler'
+  | 'Custom'
+
+interface ComponentBase {
+  id: string
+  name: string
+  domain: string
+  module: string
+  description?: string
+  sourceLocation: SourceLocation
+}
+
+/** @riviere-role published-language-data-structure */
+export interface UIComponent extends ComponentBase {
+  type: 'UI'
+  route: string
+}
+
+/** @riviere-role published-language-union */
+export type ApiType = 'REST' | 'GraphQL' | 'other'
+/** @riviere-role published-language-union */
+export type HttpMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'HEAD' | 'OPTIONS'
+
+/** @riviere-role published-language-data-structure */
+export interface APIComponent extends ComponentBase {
+  type: 'API'
+  apiType: ApiType
+  httpMethod?: HttpMethod
+  path?: string
+  operationName?: string
+}
+
+/** @riviere-role published-language-data-structure */
+export interface UseCaseComponent extends ComponentBase {
+  type: 'UseCase'
+}
+
+/** @riviere-role published-language-data-structure */
+export interface DomainOpComponent extends ComponentBase {
+  type: 'DomainOp'
+  operationName: string
+  entity?: string
+  signature?: OperationSignature
+  behavior?: OperationBehavior
+  stateChanges?: StateTransition[]
+  businessRules?: string[]
+}
+
+/** Metadata field name on EventComponent holding the event's canonical name. */
+/** @riviere-role published-language-field-name */
+export const EVENT_NAME_FIELD = 'eventName' as const
+
+/** Metadata field name on EventHandlerComponent holding the list of subscribed event names. */
+/** @riviere-role published-language-field-name */
+export const SUBSCRIBED_EVENTS_FIELD = 'subscribedEvents' as const
+
+/** @riviere-role published-language-data-structure */
+export interface EventComponent extends ComponentBase {
+  type: 'Event'
+  eventName: string
+  eventSchema?: string
+}
+
+/** @riviere-role published-language-data-structure */
+export interface EventHandlerComponent extends ComponentBase {
+  type: 'EventHandler'
+  subscribedEvents: string[]
+}
+
+/** @riviere-role published-language-data-structure */
+export interface CustomComponent extends ComponentBase {
+  type: 'Custom'
+  customTypeName: string
+  [key: string]: unknown
+}
+
+/** @riviere-role published-language-union */
+export type Component =
+  | UIComponent
+  | APIComponent
+  | UseCaseComponent
+  | DomainOpComponent
+  | EventComponent
+  | EventHandlerComponent
+  | CustomComponent
+
+/** @riviere-role published-language-union */
+export type LinkType = 'sync' | 'async'
+
+/** @riviere-role published-language-data-structure */
+export interface PayloadDefinition {
+  type?: string
+  schema?: Record<string, unknown>
+}
+
+/** @riviere-role published-language-data-structure */
+export interface Link {
+  id?: string
+  source: string
+  target: string
+  type?: LinkType
+  relationshipType?: string
+  condition?: string
+  payload?: PayloadDefinition
+  sourceLocation?: SourceLocation
+}
+
+/** @riviere-role published-language-data-structure */
+export interface ExternalTarget {
+  name: string
+  route?: string
+  domain?: string
+  repository?: string
+  url?: string
+  [key: string]: string | undefined
+}
+
+/** @riviere-role published-language-data-structure */
+export interface ExternalLink {
+  id?: string
+  source: string
+  target: ExternalTarget
+  type?: LinkType
+  description?: string
+  sourceLocation?: SourceLocation
+}
+
+/** @riviere-role published-language-union */
+export type SystemType = 'domain' | 'bff' | 'ui' | 'external-service' | 'other'
+
+/** @riviere-role published-language-data-structure */
+export interface DomainMetadata {
+  description: string
+  systemType: SystemType
+}
+
+/** @riviere-role published-language-data-structure */
+export interface CustomPropertyDefinition {
+  type: CustomPropertyTypeName
+  description?: string
+}
+
+/** @riviere-role published-language-data-structure */
+export interface CustomTypeDefinition {
+  description?: string
+  requiredProperties?: Record<string, CustomPropertyDefinition>
+  optionalProperties?: Record<string, CustomPropertyDefinition>
+}
+
+/** @riviere-role published-language-data-structure */
+export interface RelationshipTypeDefinition {
+  description: string
+}
+
+/** @riviere-role published-language-data-structure */
+export interface SourceInfo {
+  repository: string
+  commit?: string
+  extractedAt?: string
+}
+
+/** @riviere-role published-language-data-structure */
+export interface GraphMetadata {
+  name?: string
+  description?: string
+  generated?: string
+  sources?: SourceInfo[]
+  domains: Record<string, DomainMetadata>
+  customTypes?: Record<string, CustomTypeDefinition>
+  relationshipTypes?: Record<string, RelationshipTypeDefinition>
+}
+
+/** @riviere-role published-language-schema */
+export interface RiviereGraph {
+  version: string
+  metadata: GraphMetadata
+  components: Component[]
+  links: Link[]
+  externalLinks?: ExternalLink[]
+}
+import type { CustomPropertyTypeName } from './custom-property-type'
diff --git a/packages/riviere-schema/published-language/src/published-language/validation.ts b/packages/riviere-schema/published-language/src/published-language/validation.ts
new file mode 100644
index 000000000..92b322d2f
--- /dev/null
+++ b/packages/riviere-schema/published-language/src/published-language/validation.ts
@@ -0,0 +1,24 @@
+import Ajv from 'ajv'
+import addFormats from 'ajv-formats'
+import type { RiviereGraph } from './schema'
+import rawSchema from '../../riviere.schema.json' with { type: 'json' }
+
+const ajv = new Ajv()
+addFormats(ajv)
+
+const validate = ajv.compile<RiviereGraph>(rawSchema)
+
+/** @riviere-role published-language-parser */
+export function parseRiviereGraph(
+  value: unknown,
+): { success: true; graph: RiviereGraph } | { success: false; issues: string[] } {
+  if (validate(value)) {
+    return { success: true, graph: value }
+  }
+  return {
+    success: false,
+    issues: validate.errors?.map(
+      (issue) => `${issue.instancePath}: ${issue.message ?? 'invalid value'}`,
+    ) ?? ['validation failed without specific issues'],
+  }
+}
diff --git a/packages/riviere-schema/published-language/src/schema.spec.ts b/packages/riviere-schema/published-language/src/schema.spec.ts
new file mode 100644
index 000000000..a73ecdb89
--- /dev/null
+++ b/packages/riviere-schema/published-language/src/schema.spec.ts
@@ -0,0 +1,320 @@
+import type {
+  RiviereGraph,
+  Component,
+  UIComponent,
+  APIComponent,
+  Link,
+  GraphMetadata,
+} from './published-language/schema'
+import { parseRiviereGraph } from './published-language/validation'
+
+function parseValidGraph(input: unknown): RiviereGraph {
+  const result = parseRiviereGraph(input)
+  expect(result.success).toBe(true)
+  if (!result.success) {
+    expect.fail(result.issues.join('\n'))
+  }
+  return result.graph
+}
+
+function expectInvalidGraph(input: unknown, expectedIssue: string): void {
+  const result = parseRiviereGraph(input)
+  expect(result.success).toBe(false)
+  if (!result.success) {
+    expect(result.issues.join('\n')).toContain(expectedIssue)
+  }
+}
+
+describe('parseRiviereGraph()', () => {
+  it('parses valid graph and returns typed RiviereGraph', () => {
+    const input = {
+      version: '1.0',
+      metadata: {
+        domains: {
+          test: {
+            description: 'Test',
+            systemType: 'domain',
+          },
+        },
+      },
+      components: [],
+      links: [],
+    }
+
+    const result = parseValidGraph(input)
+
+    expect(result.version).toBe('1.0')
+    expect(result.components).toHaveLength(0)
+  })
+
+  it('parses a domain with the external-service system type', () => {
+    const input = {
+      version: '1.0',
+      metadata: {
+        domains: {
+          alerts: {
+            description: 'External alert service',
+            systemType: 'external-service',
+          },
+        },
+      },
+      components: [],
+      links: [],
+    }
+
+    const result = parseValidGraph(input)
+
+    expect(result.metadata.domains['alerts']?.systemType).toBe('external-service')
+  })
+
+  it('parses relationship types and a Link source occurrence', () => {
+    const input = {
+      version: '1.0',
+      metadata: {
+        domains: {
+          orders: {
+            description: 'Orders',
+            systemType: 'domain',
+          },
+        },
+        relationshipTypes: { executes: { description: 'Invokes the target during execution' } },
+      },
+      components: [],
+      links: [
+        {
+          id: 'component-a->component-b@src/a.ts:12:5',
+          source: 'component-a',
+          target: 'component-b',
+          relationshipType: 'executes',
+          condition: 'success',
+          sourceLocation: {
+            repository: 'test-repo',
+            filePath: 'src/a.ts',
+            lineNumber: 12,
+            columnNumber: 5,
+          },
+        },
+      ],
+    }
+
+    const result = parseValidGraph(input)
+
+    expect(result.metadata.relationshipTypes?.['executes']?.description).toBe(
+      'Invokes the target during execution',
+    )
+    expect(result.links[0]).toStrictEqual(input.links[0])
+  })
+
+  it('returns validation issues for an invalid component type', () => {
+    const input = {
+      version: '1.0',
+      metadata: {
+        domains: {
+          test: {
+            description: 'Test',
+            systemType: 'domain',
+          },
+        },
+      },
+      components: [
+        {
+          id: 'x',
+          type: 'InvalidType',
+          name: 'X',
+          domain: 'test',
+          module: 'mod',
+          sourceLocation: {
+            repository: 'r',
+            filePath: 'f',
+          },
+        },
+      ],
+      links: [],
+    }
+
+    expectInvalidGraph(input, '/components/0/type')
+  })
+
+  it('returns validation issues for a missing required field', () => {
+    const input = {
+      metadata: {
+        domains: {
+          test: {
+            description: 'Test',
+            systemType: 'domain',
+          },
+        },
+      },
+      components: [],
+      links: [],
+    }
+
+    expectInvalidGraph(input, 'version')
+  })
+
+  it('returns validation issues for an invalid version format', () => {
+    const input = {
+      version: 'not-a-version',
+      metadata: {
+        domains: {
+          test: {
+            description: 'Test',
+            systemType: 'domain',
+          },
+        },
+      },
+      components: [],
+      links: [],
+    }
+
+    expectInvalidGraph(input, '/version')
+  })
+
+  it('parses external link target with optional route', () => {
+    const input = {
+      version: '1.0',
+      metadata: {
+        domains: {
+          test: {
+            description: 'Test',
+            systemType: 'domain',
+          },
+        },
+      },
+      components: [],
+      links: [],
+      externalLinks: [
+        {
+          source: 'orders:useCase:PlaceOrder',
+          target: {
+            name: 'Fraud Detection Service',
+            route: '/api/check',
+          },
+        },
+      ],
+    }
+
+    const result = parseValidGraph(input)
+
+    expect(result.externalLinks?.[0]?.target).toStrictEqual({
+      name: 'Fraud Detection Service',
+      route: '/api/check',
+    })
+  })
+})
+
+describe('riviere-schema types', () => {
+  it('compiles a minimal valid graph structure', () => {
+    const graph: RiviereGraph = {
+      version: '1.0',
+      metadata: {
+        domains: {
+          test: {
+            description: 'Test domain',
+            systemType: 'domain',
+          },
+        },
+      },
+      components: [
+        {
+          id: 'test:mod:ui:page',
+          type: 'UI',
+          name: 'Test Page',
+          domain: 'test',
+          module: 'mod',
+          route: '/test',
+          sourceLocation: {
+            repository: 'test-repo',
+            filePath: 'src/page.tsx',
+          },
+        },
+      ],
+      links: [],
+    }
+
+    expect(graph.version).toBe('1.0')
+    expect(graph.components).toHaveLength(1)
+  })
+
+  it('enforces discriminated union for component types', () => {
+    const uiComponent: UIComponent = {
+      id: 'test:mod:ui:page',
+      type: 'UI',
+      name: 'Page',
+      domain: 'test',
+      module: 'mod',
+      route: '/page',
+      sourceLocation: {
+        repository: 'repo',
+        filePath: 'file.ts',
+      },
+    }
+
+    const apiComponent: APIComponent = {
+      id: 'test:mod:api:endpoint',
+      type: 'API',
+      name: 'Endpoint',
+      domain: 'test',
+      module: 'mod',
+      apiType: 'REST',
+      httpMethod: 'POST',
+      path: '/api/test',
+      sourceLocation: {
+        repository: 'repo',
+        filePath: 'api.ts',
+      },
+    }
+
+    const components: Component[] = [uiComponent, apiComponent]
+    expect(components).toHaveLength(2)
+  })
+
+  it('enforces link structure', () => {
+    const link: Link = {
+      id: 'component-a->component-b@src/a.ts:12:5',
+      source: 'component-a',
+      target: 'component-b',
+      type: 'sync',
+      relationshipType: 'executes',
+      condition: 'success',
+      sourceLocation: {
+        repository: 'test-repo',
+        filePath: 'src/a.ts',
+        lineNumber: 12,
+        columnNumber: 5,
+      },
+    }
+
+    expect(link).toStrictEqual({
+      id: 'component-a->component-b@src/a.ts:12:5',
+      source: 'component-a',
+      target: 'component-b',
+      type: 'sync',
+      relationshipType: 'executes',
+      condition: 'success',
+      sourceLocation: {
+        repository: 'test-repo',
+        filePath: 'src/a.ts',
+        lineNumber: 12,
+        columnNumber: 5,
+      },
+    })
+  })
+
+  it('enforces metadata structure with required domains', () => {
+    const metadata: GraphMetadata = {
+      domains: {
+        orders: {
+          description: 'Order management',
+          systemType: 'domain',
+        },
+      },
+      relationshipTypes: { executes: { description: 'Invokes the target during execution' } },
+    }
+
+    expect(metadata.domains['orders']?.systemType).toBe('domain')
+    expect(metadata.relationshipTypes?.['executes']?.description).toBe(
+      'Invokes the target during execution',
+    )
+  })
+})
diff --git a/packages/riviere-schema/published-language/src/validation-without-issues.spec.ts b/packages/riviere-schema/published-language/src/validation-without-issues.spec.ts
new file mode 100644
index 000000000..d25c2d2f9
--- /dev/null
+++ b/packages/riviere-schema/published-language/src/validation-without-issues.spec.ts
@@ -0,0 +1,40 @@
+import { expect, it, vi } from 'vitest'
+
+interface MockValidate {
+  (value: unknown): false
+  errors: null | { instancePath: string }[]
+}
+
+vi.mock('ajv', () => ({
+  default: class {
+    compile() {
+      const validate: MockValidate = Object.assign(
+        (value: unknown) => {
+          validate.errors = value === 'missing-message' ? [{ instancePath: '/version' }] : null
+          return false
+        },
+        { errors: null },
+      )
+      return validate
+    }
+  },
+}))
+vi.mock('ajv-formats', () => ({ default: vi.fn() }))
+
+it('returns a generic issue when validation fails without details', async () => {
+  const { parseRiviereGraph } = await import('./published-language/validation')
+
+  expect(parseRiviereGraph({})).toStrictEqual({
+    success: false,
+    issues: ['validation failed without specific issues'],
+  })
+})
+
+it('uses a fallback for an issue without a message', async () => {
+  const { parseRiviereGraph } = await import('./published-language/validation')
+
+  expect(parseRiviereGraph('missing-message')).toStrictEqual({
+    success: false,
+    issues: ['/version: invalid value'],
+  })
+})
diff --git a/packages/riviere-schema/published-language/tsconfig.json b/packages/riviere-schema/published-language/tsconfig.json
new file mode 100644
index 000000000..667a3463d
--- /dev/null
+++ b/packages/riviere-schema/published-language/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/packages/riviere-schema/published-language/tsconfig.lib.json b/packages/riviere-schema/published-language/tsconfig.lib.json
new file mode 100644
index 000000000..9194b850b
--- /dev/null
+++ b/packages/riviere-schema/published-language/tsconfig.lib.json
@@ -0,0 +1,28 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "src",
+    "outDir": "dist",
+    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
+    "emitDeclarationOnly": false,
+    "forceConsistentCasingInFileNames": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "references": [],
+  "exclude": [
+    "vite.config.ts",
+    "vite.config.mts",
+    "vitest.config.ts",
+    "vitest.config.mts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx"
+  ]
+}
diff --git a/packages/riviere-schema/published-language/tsconfig.spec.json b/packages/riviere-schema/published-language/tsconfig.spec.json
new file mode 100644
index 000000000..dd6f5b59d
--- /dev/null
+++ b/packages/riviere-schema/published-language/tsconfig.spec.json
@@ -0,0 +1,34 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/vitest",
+    "types": [
+      "vitest/globals",
+      "vitest/importMeta",
+      "vite/client",
+      "node",
+      "vitest"
+    ],
+    "forceConsistentCasingInFileNames": true
+  },
+  "include": [
+    "vite.config.ts",
+    "vite.config.mts",
+    "vitest.config.ts",
+    "vitest.config.mts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx",
+    "src/**/*.d.ts"
+  ],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    }
+  ]
+}
diff --git a/packages/riviere-schema/published-language/vite.config.ts b/packages/riviere-schema/published-language/vite.config.ts
new file mode 100644
index 000000000..ce896e2de
--- /dev/null
+++ b/packages/riviere-schema/published-language/vite.config.ts
@@ -0,0 +1,20 @@
+/// <reference types='vitest' />
+import { defineConfig } from 'vite'
+
+export default defineConfig(() => ({
+  root: import.meta.dirname,
+  cacheDir: '../../../node_modules/.vite/riviere-schema',
+  plugins: [],
+  test: {
+    name: '@living-architecture/riviere-schema-published-language/schema',
+    watch: false,
+    globals: true,
+    environment: 'node',
+    include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+    reporters: ['default'],
+    coverage: {
+      reportsDirectory: './test-output/vitest/coverage',
+      provider: 'v8' as const,
+    },
+  },
+}))
diff --git a/packages/riviere-schema/published-language/vitest.config.mts b/packages/riviere-schema/published-language/vitest.config.mts
new file mode 100644
index 000000000..8dcb03fcc
--- /dev/null
+++ b/packages/riviere-schema/published-language/vitest.config.mts
@@ -0,0 +1,32 @@
+import path from 'node:path'
+import { defineConfig } from 'vitest/config'
+
+const repoRoot = path.resolve(__dirname, '../../..')
+
+export default defineConfig(() => ({
+  root: __dirname,
+  cacheDir: '../../../node_modules/.vite/packages/riviere-schema',
+  test: {
+    name: '@living-architecture/riviere-schema-published-language/schema',
+    watch: false,
+    globals: true,
+    environment: 'node',
+    include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+    reporters: ['default'],
+    coverage: {
+      enabled: true,
+      reportsDirectory: './test-output/vitest/coverage',
+      provider: 'v8' as const,
+      reporter: ['text', ['lcov', { projectRoot: repoRoot }]] as [
+        'text',
+        ['lcov', { projectRoot: string }],
+      ],
+      thresholds: {
+        lines: 100,
+        statements: 100,
+        functions: 100,
+        branches: 100,
+      },
+    },
+  },
+}))
diff --git a/packages/riviere-schema/src/component-id.spec.ts b/packages/riviere-schema/src/component-id.spec.ts
deleted file mode 100644
index 21701a30d..000000000
--- a/packages/riviere-schema/src/component-id.spec.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import {
-  ComponentId, InvalidComponentIdError 
-} from './component-id'
-
-describe('ComponentId', () => {
-  describe('create', () => {
-    it('creates ID from parts with correct format', () => {
-      const id = ComponentId.create({
-        domain: 'orders',
-        module: 'checkout',
-        type: 'domainop',
-        name: 'Place Order',
-      })
-
-      expect(id.toString()).toBe('orders:checkout:domainop:place-order')
-    })
-
-    it('lowercases and hyphenates name', () => {
-      const id = ComponentId.create({
-        domain: 'orders',
-        module: 'checkout',
-        type: 'usecase',
-        name: 'Handle Customer Request',
-      })
-
-      expect(id.toString()).toBe('orders:checkout:usecase:handle-customer-request')
-    })
-
-    it('exposes name segment', () => {
-      const id = ComponentId.create({
-        domain: 'orders',
-        module: 'checkout',
-        type: 'domainop',
-        name: 'Place Order',
-      })
-
-      expect(id.name()).toBe('place-order')
-    })
-  })
-
-  describe('parse', () => {
-    it('parses valid ID string', () => {
-      const id = ComponentId.parse('orders:checkout:domainop:place-order')
-
-      expect(id.name()).toBe('place-order')
-      expect(id.toString()).toBe('orders:checkout:domainop:place-order')
-    })
-
-    it('throws InvalidComponentIdError on invalid format with too few segments', () => {
-      expect(() => ComponentId.parse('orders:checkout')).toThrow(InvalidComponentIdError)
-      expect(() => ComponentId.parse('orders:checkout')).toThrow(
-        "Invalid component ID format: 'orders:checkout'. Expected 'domain:module:type:name'",
-      )
-    })
-
-    it('throws InvalidComponentIdError on invalid format with too many segments', () => {
-      expect(() => ComponentId.parse('orders:checkout:domainop:place:order')).toThrow(
-        InvalidComponentIdError,
-      )
-      expect(() => ComponentId.parse('orders:checkout:domainop:place:order')).toThrow(
-        "Invalid component ID format: 'orders:checkout:domainop:place:order'. Expected 'domain:module:type:name'",
-      )
-    })
-
-    it('throws InvalidComponentIdError on empty string', () => {
-      expect(() => ComponentId.parse('')).toThrow(InvalidComponentIdError)
-      expect(() => ComponentId.parse('')).toThrow(
-        "Invalid component ID format: ''. Expected 'domain:module:type:name'",
-      )
-    })
-  })
-})
diff --git a/packages/riviere-schema/src/component-id.ts b/packages/riviere-schema/src/component-id.ts
deleted file mode 100644
index 9c1be350c..000000000
--- a/packages/riviere-schema/src/component-id.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * Parts that make up a component ID.
- */
-export interface ComponentIdParts {
-  domain: string
-  module: string
-  type: string
-  name: string
-}
-
-/**
- * Error thrown when parsing an invalid component ID string.
- */
-export class InvalidComponentIdError extends Error {
-  constructor(public readonly invalidId: string) {
-    super(`Invalid component ID format: '${invalidId}'. Expected 'domain:module:type:name'`)
-    this.name = 'InvalidComponentIdError'
-  }
-}
-
-/**
- * Represents a structured component identifier.
- *
- * Component IDs follow the format `{domain}:{module}:{type}:{name}` in kebab-case.
- *
- * @example
- * ```typescript
- * const id = ComponentId.create({
- *   domain: 'orders',
- *   module: 'checkout',
- *   type: 'api',
- *   name: 'Create Order'
- * })
- * id.toString() // 'orders:checkout:api:create-order'
- * ```
- */
-export class ComponentId {
-  private readonly _name: string
-  private readonly value: string
-
-  private constructor(name: string, value: string) {
-    this._name = name
-    this.value = value
-  }
-
-  /**
-   * Creates a ComponentId from individual parts.
-   *
-   * @param parts - Domain, module, type, and name segments
-   * @returns A new ComponentId instance
-   *
-   * @example
-   * ```typescript
-   * const id = ComponentId.create({
-   *   domain: 'orders',
-   *   module: 'checkout',
-   *   type: 'api',
-   *   name: 'Create Order'
-   * })
-   * ```
-   */
-  static create(parts: ComponentIdParts): ComponentId {
-    const nameSegment = parts.name.toLowerCase().replaceAll(/\s+/g, '-')
-    const value = `${parts.domain}:${parts.module}:${parts.type}:${nameSegment}`
-    return new ComponentId(nameSegment, value)
-  }
-
-  /**
-   * Parses a string ID into a ComponentId instance.
-   *
-   * @param id - String in format `domain:module:type:name`
-   * @returns A ComponentId instance
-   * @throws If the format is invalid
-   *
-   * @example
-   * ```typescript
-   * const id = ComponentId.parse('orders:checkout:api:create-order')
-   * id.name() // 'create-order'
-   * ```
-   */
-  static parse(id: string): ComponentId {
-    const parts = id.split(':')
-    const name = parts[3]
-    if (parts.length !== 4 || name === undefined) {
-      throw new InvalidComponentIdError(id)
-    }
-    return new ComponentId(name, id)
-  }
-
-  /**
-   * Returns the full component ID string.
-   *
-   * @returns Full ID in format `domain:module:type:name`
-   */
-  toString(): string {
-    return this.value
-  }
-
-  /**
-   * Returns the name segment of the component ID.
-   *
-   * @returns The kebab-case name portion
-   */
-  name(): string {
-    return this._name
-  }
-}
diff --git a/packages/riviere-schema/src/index.ts b/packages/riviere-schema/src/index.ts
deleted file mode 100644
index 880a1b2ee..000000000
--- a/packages/riviere-schema/src/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export * from './schema'
-export {
-  parseRiviereGraph,
-  isRiviereGraph,
-  formatValidationErrors,
-  RiviereSchemaValidationError,
-} from './validation'
-export {
-  ComponentId, InvalidComponentIdError, type ComponentIdParts 
-} from './component-id'
-export {
-  createLinkId, type LinkIdentity 
-} from './link-id'
diff --git a/packages/riviere-schema/src/link-id.spec.ts b/packages/riviere-schema/src/link-id.spec.ts
deleted file mode 100644
index abb801a12..000000000
--- a/packages/riviere-schema/src/link-id.spec.ts
+++ /dev/null
@@ -1,141 +0,0 @@
-import { createLinkId } from './link-id'
-
-describe('createLinkId()', () => {
-  it('uses source and target when source location is absent', () => {
-    expect(
-      createLinkId({
-        source: 'source',
-        target: 'target',
-      }),
-    ).toBe('source->target')
-  })
-
-  it('adds file path when line and column are absent', () => {
-    expect(
-      createLinkId({
-        source: 'source',
-        target: 'target',
-        sourceLocation: {
-          repository: 'repo',
-          filePath: 'src/file.ts',
-        },
-      }),
-    ).toBe('source->target@src/file.ts')
-  })
-
-  it('adds an empty line segment when only column is present', () => {
-    expect(
-      createLinkId({
-        source: 'source',
-        target: 'target',
-        sourceLocation: {
-          repository: 'repo',
-          filePath: 'src/file.ts',
-          columnNumber: 5,
-        },
-      }),
-    ).toBe('source->target@src/file.ts::5')
-  })
-
-  it('adds line when column is absent', () => {
-    expect(
-      createLinkId({
-        source: 'source',
-        target: 'target',
-        sourceLocation: {
-          repository: 'repo',
-          filePath: 'src/file.ts',
-          lineNumber: 12,
-        },
-      }),
-    ).toBe('source->target@src/file.ts:12')
-  })
-
-  it('adds line and column when both are present', () => {
-    expect(
-      createLinkId({
-        source: 'source',
-        target: 'target',
-        sourceLocation: {
-          repository: 'repo',
-          filePath: 'src/file.ts',
-          lineNumber: 12,
-          columnNumber: 5,
-        },
-      }),
-    ).toBe('source->target@src/file.ts:12:5')
-  })
-
-  it('escapes identity delimiters so distinct occurrences cannot collide', () => {
-    const targetContainingLocation = createLinkId({
-      source: 'source',
-      target: 'target@src/file.ts:12:5',
-    })
-    const targetAtLocation = createLinkId({
-      source: 'source',
-      target: 'target',
-      sourceLocation: {
-        repository: 'repo',
-        filePath: 'src/file.ts',
-        lineNumber: 12,
-        columnNumber: 5,
-      },
-    })
-    const sourceContainingArrow = createLinkId({
-      source: 'source->target',
-      target: 'target',
-    })
-
-    expect(targetContainingLocation).toBe('source->target%40src/file.ts:12:5')
-    expect(targetContainingLocation).not.toBe(targetAtLocation)
-    expect(sourceContainingArrow).toBe('source%2D%3Etarget->target')
-  })
-
-  it('escapes file-path delimiters so line and column segments remain distinct', () => {
-    const colonInFilePath = createLinkId({
-      source: 'source',
-      target: 'target',
-      sourceLocation: {
-        repository: 'repo',
-        filePath: 'src/file.ts:12',
-        lineNumber: 5,
-      },
-    })
-    const lineAndColumn = createLinkId({
-      source: 'source',
-      target: 'target',
-      sourceLocation: {
-        repository: 'repo',
-        filePath: 'src/file.ts',
-        lineNumber: 12,
-        columnNumber: 5,
-      },
-    })
-
-    expect(colonInFilePath).toBe('source->target@src/file.ts%3A12:5')
-    expect(colonInFilePath).not.toBe(lineAndColumn)
-  })
-
-  it('does not include repository in Link identity', () => {
-    const identity = {
-      source: 'source',
-      target: 'target',
-      sourceLocation: {
-        repository: 'repo-a',
-        filePath: 'src/file.ts',
-        lineNumber: 12,
-        columnNumber: 5,
-      },
-    }
-
-    expect(createLinkId(identity)).toBe(
-      createLinkId({
-        ...identity,
-        sourceLocation: {
-          ...identity.sourceLocation,
-          repository: 'repo-b',
-        },
-      }),
-    )
-  })
-})
diff --git a/packages/riviere-schema/src/link-id.ts b/packages/riviere-schema/src/link-id.ts
deleted file mode 100644
index f16faf546..000000000
--- a/packages/riviere-schema/src/link-id.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import type { SourceLocation } from './schema'
-
-export interface LinkIdentity {
-  source: string
-  target: string
-  sourceLocation?: SourceLocation
-}
-
-export function createLinkId(link: LinkIdentity): string {
-  const source = escapePercent(link.source).replaceAll('->', '%2D%3E')
-  const target = escapePercent(link.target).replaceAll('@', '%40')
-  const baseId = `${source}->${target}`
-  const sourceLocation = link.sourceLocation
-  if (sourceLocation === undefined) {
-    return baseId
-  }
-
-  const filePath = escapePercent(sourceLocation.filePath).replaceAll(':', '%3A')
-  const line = sourceLocation.lineNumber
-  const column = sourceLocation.columnNumber
-  if (line === undefined) {
-    return column === undefined ? `${baseId}@${filePath}` : `${baseId}@${filePath}::${column}`
-  }
-
-  return column === undefined
-    ? `${baseId}@${filePath}:${line}`
-    : `${baseId}@${filePath}:${line}:${column}`
-}
-
-function escapePercent(value: string): string {
-  return value.replaceAll('%', '%25')
-}
diff --git a/packages/riviere-schema/src/minlength-repository-domain.spec.ts b/packages/riviere-schema/src/minlength-repository-domain.spec.ts
deleted file mode 100644
index 10601a348..000000000
--- a/packages/riviere-schema/src/minlength-repository-domain.spec.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-import {
-  parseRiviereGraph, RiviereSchemaValidationError 
-} from './validation'
-
-describe('minLength validation: metadata fields', () => {
-  const baseGraph = {
-    version: '1.0',
-    metadata: {
-      domains: {
-        test: {
-          description: 'Test domain',
-          systemType: 'domain' as const,
-        },
-      },
-    },
-    components: [],
-    links: [],
-  }
-
-  describe('metadata.sources[].repository', () => {
-    it('rejects empty repository', () => {
-      const input = {
-        ...baseGraph,
-        metadata: {
-          ...baseGraph.metadata,
-          sources: [{ repository: '' }],
-        },
-      }
-      expect(() => parseRiviereGraph(input)).toThrow(RiviereSchemaValidationError)
-      expect(() => parseRiviereGraph(input)).toThrow(/repository/)
-    })
-
-    it('rejects repository with length < 3', () => {
-      const input = {
-        ...baseGraph,
-        metadata: {
-          ...baseGraph.metadata,
-          sources: [{ repository: 'ab' }],
-        },
-      }
-      expect(() => parseRiviereGraph(input)).toThrow(RiviereSchemaValidationError)
-      expect(() => parseRiviereGraph(input)).toThrow(/repository/)
-    })
-
-    it('accepts repository with length >= 3', () => {
-      const input = {
-        ...baseGraph,
-        metadata: {
-          ...baseGraph.metadata,
-          sources: [{ repository: 'abc' }],
-        },
-      }
-      expect(() => parseRiviereGraph(input)).not.toThrow()
-    })
-  })
-
-  describe('sourceLocation.repository', () => {
-    it('rejects empty repository', () => {
-      const input = {
-        ...baseGraph,
-        components: [
-          {
-            id: 'test:mod:ui:page',
-            type: 'UI',
-            name: 'Page',
-            domain: 'test',
-            module: 'mod',
-            route: '/test',
-            sourceLocation: {
-              repository: '',
-              filePath: 'src/page.tsx',
-            },
-          },
-        ],
-      }
-      expect(() => parseRiviereGraph(input)).toThrow(RiviereSchemaValidationError)
-      expect(() => parseRiviereGraph(input)).toThrow(/repository/)
-    })
-
-    it('rejects repository with length < 3', () => {
-      const input = {
-        ...baseGraph,
-        components: [
-          {
-            id: 'test:mod:ui:page',
-            type: 'UI',
-            name: 'Page',
-            domain: 'test',
-            module: 'mod',
-            route: '/test',
-            sourceLocation: {
-              repository: 'ab',
-              filePath: 'src/page.tsx',
-            },
-          },
-        ],
-      }
-      expect(() => parseRiviereGraph(input)).toThrow(RiviereSchemaValidationError)
-      expect(() => parseRiviereGraph(input)).toThrow(/repository/)
-    })
-
-    it('accepts repository with length >= 3', () => {
-      const input = {
-        ...baseGraph,
-        components: [
-          {
-            id: 'test:mod:ui:page',
-            type: 'UI',
-            name: 'Page',
-            domain: 'test',
-            module: 'mod',
-            route: '/test',
-            sourceLocation: {
-              repository: 'abc',
-              filePath: 'src/page.tsx',
-            },
-          },
-        ],
-      }
-      expect(() => parseRiviereGraph(input)).not.toThrow()
-    })
-  })
-
-  describe('domainMetadata.description', () => {
-    it('rejects empty description', () => {
-      const input = {
-        ...baseGraph,
-        metadata: {
-          domains: {
-            test: {
-              description: '',
-              systemType: 'domain' as const,
-            },
-          },
-        },
-      }
-      expect(() => parseRiviereGraph(input)).toThrow(RiviereSchemaValidationError)
-      expect(() => parseRiviereGraph(input)).toThrow(/description/)
-    })
-
-    it('rejects description with length < 3', () => {
-      const input = {
-        ...baseGraph,
-        metadata: {
-          domains: {
-            test: {
-              description: 'ab',
-              systemType: 'domain' as const,
-            },
-          },
-        },
-      }
-      expect(() => parseRiviereGraph(input)).toThrow(RiviereSchemaValidationError)
-      expect(() => parseRiviereGraph(input)).toThrow(/description/)
-    })
-
-    it('accepts description with length >= 3', () => {
-      const input = {
-        ...baseGraph,
-        metadata: {
-          domains: {
-            test: {
-              description: 'abc',
-              systemType: 'domain' as const,
-            },
-          },
-        },
-      }
-      expect(() => parseRiviereGraph(input)).not.toThrow()
-    })
-  })
-})
diff --git a/packages/riviere-schema/src/schema.spec.ts b/packages/riviere-schema/src/schema.spec.ts
deleted file mode 100644
index 61e028288..000000000
--- a/packages/riviere-schema/src/schema.spec.ts
+++ /dev/null
@@ -1,350 +0,0 @@
-import type {
-  RiviereGraph,
-  Component,
-  UIComponent,
-  APIComponent,
-  Link,
-  GraphMetadata,
-} from './schema'
-import {
-  parseRiviereGraph,
-  formatValidationErrors,
-  RiviereSchemaValidationError,
-} from './validation'
-
-describe('formatValidationErrors()', () => {
-  it('returns generic message when errors is null', () => {
-    const result = formatValidationErrors(null)
-    expect(result).toBe('validation failed without specific errors')
-  })
-
-  it('returns generic message when errors is empty array', () => {
-    const result = formatValidationErrors([])
-    expect(result).toBe('validation failed without specific errors')
-  })
-
-  it('formats single error with path and message', () => {
-    const errors = [
-      {
-        instancePath: '/version',
-        message: 'must match pattern',
-      },
-    ]
-    const result = formatValidationErrors(errors)
-    expect(result).toBe('/version: must match pattern')
-  })
-
-  it('formats multiple errors joined by newlines', () => {
-    const errors = [
-      {
-        instancePath: '/version',
-        message: 'must match pattern',
-      },
-      {
-        instancePath: '/components/0/type',
-        message: 'must be equal to one of the allowed values',
-      },
-    ]
-    const result = formatValidationErrors(errors)
-    expect(result).toBe(
-      '/version: must match pattern\n/components/0/type: must be equal to one of the allowed values',
-    )
-  })
-})
-
-describe('parseRiviereGraph()', () => {
-  it('parses valid graph and returns typed RiviereGraph', () => {
-    const input = {
-      version: '1.0',
-      metadata: {
-        domains: {
-          test: {
-            description: 'Test',
-            systemType: 'domain',
-          },
-        },
-      },
-      components: [],
-      links: [],
-    }
-
-    const result = parseRiviereGraph(input)
-
-    expect(result.version).toBe('1.0')
-    expect(result.components).toHaveLength(0)
-  })
-
-  it('parses a domain with the external-service system type', () => {
-    const input = {
-      version: '1.0',
-      metadata: {
-        domains: {
-          alerts: {
-            description: 'External alert service',
-            systemType: 'external-service',
-          },
-        },
-      },
-      components: [],
-      links: [],
-    }
-
-    const result = parseRiviereGraph(input)
-
-    expect(result.metadata.domains['alerts']?.systemType).toBe('external-service')
-  })
-
-  it('parses relationship types and a Link source occurrence', () => {
-    const input = {
-      version: '1.0',
-      metadata: {
-        domains: {
-          orders: {
-            description: 'Orders',
-            systemType: 'domain',
-          },
-        },
-        relationshipTypes: { executes: { description: 'Invokes the target during execution' } },
-      },
-      components: [],
-      links: [
-        {
-          id: 'component-a->component-b@src/a.ts:12:5',
-          source: 'component-a',
-          target: 'component-b',
-          relationshipType: 'executes',
-          condition: 'success',
-          sourceLocation: {
-            repository: 'test-repo',
-            filePath: 'src/a.ts',
-            lineNumber: 12,
-            columnNumber: 5,
-          },
-        },
-      ],
-    }
-
-    const result = parseRiviereGraph(input)
-
-    expect(result.metadata.relationshipTypes?.['executes']?.description).toBe(
-      'Invokes the target during execution',
-    )
-    expect(result.links[0]).toStrictEqual(input.links[0])
-  })
-
-  it('throws RiviereSchemaValidationError on invalid component type', () => {
-    const input = {
-      version: '1.0',
-      metadata: {
-        domains: {
-          test: {
-            description: 'Test',
-            systemType: 'domain',
-          },
-        },
-      },
-      components: [
-        {
-          id: 'x',
-          type: 'InvalidType',
-          name: 'X',
-          domain: 'test',
-          module: 'mod',
-          sourceLocation: {
-            repository: 'r',
-            filePath: 'f',
-          },
-        },
-      ],
-      links: [],
-    }
-
-    expect(() => parseRiviereGraph(input)).toThrow(RiviereSchemaValidationError)
-    expect(() => parseRiviereGraph(input)).toThrow(/Invalid RiviereGraph/)
-  })
-
-  it('throws RiviereSchemaValidationError on missing required field', () => {
-    const input = {
-      metadata: {
-        domains: {
-          test: {
-            description: 'Test',
-            systemType: 'domain',
-          },
-        },
-      },
-      components: [],
-      links: [],
-    }
-
-    expect(() => parseRiviereGraph(input)).toThrow(RiviereSchemaValidationError)
-    expect(() => parseRiviereGraph(input)).toThrow(/version|Invalid RiviereGraph/i)
-  })
-
-  it('throws RiviereSchemaValidationError on invalid version format', () => {
-    const input = {
-      version: 'not-a-version',
-      metadata: {
-        domains: {
-          test: {
-            description: 'Test',
-            systemType: 'domain',
-          },
-        },
-      },
-      components: [],
-      links: [],
-    }
-
-    expect(() => parseRiviereGraph(input)).toThrow(RiviereSchemaValidationError)
-    expect(() => parseRiviereGraph(input)).toThrow(/Invalid RiviereGraph/)
-  })
-
-  it('parses external link target with optional route', () => {
-    const input = {
-      version: '1.0',
-      metadata: {
-        domains: {
-          test: {
-            description: 'Test',
-            systemType: 'domain',
-          },
-        },
-      },
-      components: [],
-      links: [],
-      externalLinks: [
-        {
-          source: 'orders:useCase:PlaceOrder',
-          target: {
-            name: 'Fraud Detection Service',
-            route: '/api/check',
-          },
-        },
-      ],
-    }
-
-    const result = parseRiviereGraph(input)
-
-    expect(result.externalLinks?.[0]?.target).toStrictEqual({
-      name: 'Fraud Detection Service',
-      route: '/api/check',
-    })
-  })
-})
-
-describe('riviere-schema types', () => {
-  it('compiles a minimal valid graph structure', () => {
-    const graph: RiviereGraph = {
-      version: '1.0',
-      metadata: {
-        domains: {
-          test: {
-            description: 'Test domain',
-            systemType: 'domain',
-          },
-        },
-      },
-      components: [
-        {
-          id: 'test:mod:ui:page',
-          type: 'UI',
-          name: 'Test Page',
-          domain: 'test',
-          module: 'mod',
-          route: '/test',
-          sourceLocation: {
-            repository: 'test-repo',
-            filePath: 'src/page.tsx',
-          },
-        },
-      ],
-      links: [],
-    }
-
-    expect(graph.version).toBe('1.0')
-    expect(graph.components).toHaveLength(1)
-  })
-
-  it('enforces discriminated union for component types', () => {
-    const uiComponent: UIComponent = {
-      id: 'test:mod:ui:page',
-      type: 'UI',
-      name: 'Page',
-      domain: 'test',
-      module: 'mod',
-      route: '/page',
-      sourceLocation: {
-        repository: 'repo',
-        filePath: 'file.ts',
-      },
-    }
-
-    const apiComponent: APIComponent = {
-      id: 'test:mod:api:endpoint',
-      type: 'API',
-      name: 'Endpoint',
-      domain: 'test',
-      module: 'mod',
-      apiType: 'REST',
-      httpMethod: 'POST',
-      path: '/api/test',
-      sourceLocation: {
-        repository: 'repo',
-        filePath: 'api.ts',
-      },
-    }
-
-    const components: Component[] = [uiComponent, apiComponent]
-    expect(components).toHaveLength(2)
-  })
-
-  it('enforces link structure', () => {
-    const link: Link = {
-      id: 'component-a->component-b@src/a.ts:12:5',
-      source: 'component-a',
-      target: 'component-b',
-      type: 'sync',
-      relationshipType: 'executes',
-      condition: 'success',
-      sourceLocation: {
-        repository: 'test-repo',
-        filePath: 'src/a.ts',
-        lineNumber: 12,
-        columnNumber: 5,
-      },
-    }
-
-    expect(link).toStrictEqual({
-      id: 'component-a->component-b@src/a.ts:12:5',
-      source: 'component-a',
-      target: 'component-b',
-      type: 'sync',
-      relationshipType: 'executes',
-      condition: 'success',
-      sourceLocation: {
-        repository: 'test-repo',
-        filePath: 'src/a.ts',
-        lineNumber: 12,
-        columnNumber: 5,
-      },
-    })
-  })
-
-  it('enforces metadata structure with required domains', () => {
-    const metadata: GraphMetadata = {
-      domains: {
-        orders: {
-          description: 'Order management',
-          systemType: 'domain',
-        },
-      },
-      relationshipTypes: { executes: { description: 'Invokes the target during execution' } },
-    }
-
-    expect(metadata.domains['orders']?.systemType).toBe('domain')
-    expect(metadata.relationshipTypes?.['executes']?.description).toBe(
-      'Invokes the target during execution',
-    )
-  })
-})
diff --git a/packages/riviere-schema/src/schema.ts b/packages/riviere-schema/src/schema.ts
deleted file mode 100644
index 75a70ba59..000000000
--- a/packages/riviere-schema/src/schema.ts
+++ /dev/null
@@ -1,194 +0,0 @@
-export interface SourceLocation {
-  repository: string
-  filePath: string
-  lineNumber?: number
-  columnNumber?: number
-  endLineNumber?: number
-  methodName?: string
-  url?: string
-}
-
-export interface OperationParameter {
-  name: string
-  type: string
-  description?: string
-}
-
-export interface OperationSignature {
-  parameters?: OperationParameter[]
-  returnType?: string
-}
-
-export interface OperationBehavior {
-  reads?: string[]
-  validates?: string[]
-  modifies?: string[]
-  emits?: string[]
-}
-
-export interface StateTransition {
-  from: string
-  to: string
-  trigger?: string
-}
-
-export type ComponentType =
-  | 'UI'
-  | 'API'
-  | 'UseCase'
-  | 'DomainOp'
-  | 'Event'
-  | 'EventHandler'
-  | 'Custom'
-
-interface ComponentBase {
-  id: string
-  name: string
-  domain: string
-  module: string
-  description?: string
-  sourceLocation: SourceLocation
-}
-
-export interface UIComponent extends ComponentBase {
-  type: 'UI'
-  route: string
-}
-
-export type ApiType = 'REST' | 'GraphQL' | 'other'
-export type HttpMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'HEAD' | 'OPTIONS'
-
-export interface APIComponent extends ComponentBase {
-  type: 'API'
-  apiType: ApiType
-  httpMethod?: HttpMethod
-  path?: string
-  operationName?: string
-}
-
-export interface UseCaseComponent extends ComponentBase {type: 'UseCase'}
-
-export interface DomainOpComponent extends ComponentBase {
-  type: 'DomainOp'
-  operationName: string
-  entity?: string
-  signature?: OperationSignature
-  behavior?: OperationBehavior
-  stateChanges?: StateTransition[]
-  businessRules?: string[]
-}
-
-/** Metadata field name on EventComponent holding the event's canonical name. */
-export const EVENT_NAME_FIELD = 'eventName' as const
-
-/** Metadata field name on EventHandlerComponent holding the list of subscribed event names. */
-export const SUBSCRIBED_EVENTS_FIELD = 'subscribedEvents' as const
-
-export interface EventComponent extends ComponentBase {
-  type: 'Event'
-  eventName: string
-  eventSchema?: string
-}
-
-export interface EventHandlerComponent extends ComponentBase {
-  type: 'EventHandler'
-  subscribedEvents: string[]
-}
-
-export interface CustomComponent extends ComponentBase {
-  type: 'Custom'
-  customTypeName: string
-  [key: string]: unknown
-}
-
-export type Component =
-  | UIComponent
-  | APIComponent
-  | UseCaseComponent
-  | DomainOpComponent
-  | EventComponent
-  | EventHandlerComponent
-  | CustomComponent
-
-export type LinkType = 'sync' | 'async'
-
-export interface PayloadDefinition {
-  type?: string
-  schema?: Record<string, unknown>
-}
-
-export interface Link {
-  id?: string
-  source: string
-  target: string
-  type?: LinkType
-  relationshipType?: string
-  condition?: string
-  payload?: PayloadDefinition
-  sourceLocation?: SourceLocation
-}
-
-export interface ExternalTarget {
-  name: string
-  route?: string
-  domain?: string
-  repository?: string
-  url?: string
-  [key: string]: string | undefined
-}
-
-export interface ExternalLink {
-  id?: string
-  source: string
-  target: ExternalTarget
-  type?: LinkType
-  description?: string
-  sourceLocation?: SourceLocation
-}
-
-export type SystemType = 'domain' | 'bff' | 'ui' | 'external-service' | 'other'
-
-export interface DomainMetadata {
-  description: string
-  systemType: SystemType
-  [key: string]: unknown
-}
-
-export type CustomPropertyType = 'string' | 'number' | 'boolean' | 'array' | 'object'
-
-export interface CustomPropertyDefinition {
-  type: CustomPropertyType
-  description?: string
-}
-
-export interface CustomTypeDefinition {
-  description?: string
-  requiredProperties?: Record<string, CustomPropertyDefinition>
-  optionalProperties?: Record<string, CustomPropertyDefinition>
-}
-
-export interface RelationshipTypeDefinition {description: string}
-
-export interface SourceInfo {
-  repository: string
-  commit?: string
-  extractedAt?: string
-}
-
-export interface GraphMetadata {
-  name?: string
-  description?: string
-  generated?: string
-  sources?: SourceInfo[]
-  domains: Record<string, DomainMetadata>
-  customTypes?: Record<string, CustomTypeDefinition>
-  relationshipTypes?: Record<string, RelationshipTypeDefinition>
-}
-
-export interface RiviereGraph {
-  version: string
-  metadata: GraphMetadata
-  components: Component[]
-  links: Link[]
-  externalLinks?: ExternalLink[]
-}
diff --git a/packages/riviere-schema/src/validation.ts b/packages/riviere-schema/src/validation.ts
deleted file mode 100644
index 96428d7e0..000000000
--- a/packages/riviere-schema/src/validation.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import Ajv from 'ajv'
-import addFormats from 'ajv-formats'
-import type { RiviereGraph } from './schema'
-import rawSchema from '../riviere.schema.json' with { type: 'json' }
-
-const ajv = new Ajv({ allErrors: true })
-addFormats(ajv)
-
-const validate = ajv.compile(rawSchema)
-
-export function isRiviereGraph(data: unknown): data is RiviereGraph {
-  return validate(data) === true
-}
-
-interface ValidationErrorLike {
-  instancePath: string
-  message?: string
-}
-
-/**
- * Error thrown when RiviereGraph validation fails.
- */
-export class RiviereSchemaValidationError extends Error {
-  constructor(public readonly validationErrors: ValidationErrorLike[] | null | undefined) {
-    super(`Invalid RiviereGraph:\n${formatValidationErrorsInternal(validationErrors)}`)
-    this.name = 'RiviereSchemaValidationError'
-  }
-}
-
-function formatValidationErrorsInternal(errors: ValidationErrorLike[] | null | undefined): string {
-  if (!errors || errors.length === 0) {
-    return 'validation failed without specific errors'
-  }
-  return errors.map((e) => `${e.instancePath}: ${e.message}`).join('\n')
-}
-
-export function formatValidationErrors(errors: ValidationErrorLike[] | null | undefined): string {
-  return formatValidationErrorsInternal(errors)
-}
-
-export function parseRiviereGraph(data: unknown): RiviereGraph {
-  if (isRiviereGraph(data)) {
-    return data
-  }
-  throw new RiviereSchemaValidationError(validate.errors)
-}
diff --git a/packages/riviere-schema/tsconfig.json b/packages/riviere-schema/tsconfig.json
deleted file mode 100644
index 62ebbd946..000000000
--- a/packages/riviere-schema/tsconfig.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ]
-}
diff --git a/packages/riviere-schema/tsconfig.lib.json b/packages/riviere-schema/tsconfig.lib.json
deleted file mode 100644
index d30b75b5a..000000000
--- a/packages/riviere-schema/tsconfig.lib.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "baseUrl": ".",
-    "rootDir": "src",
-    "outDir": "dist",
-    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
-    "emitDeclarationOnly": false,
-    "forceConsistentCasingInFileNames": true,
-    "types": ["node"]
-  },
-  "include": ["src/**/*.ts"],
-  "references": [],
-  "exclude": [
-    "vite.config.ts",
-    "vite.config.mts",
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx"
-  ]
-}
diff --git a/packages/riviere-schema/tsconfig.spec.json b/packages/riviere-schema/tsconfig.spec.json
deleted file mode 100644
index f68d9d3b8..000000000
--- a/packages/riviere-schema/tsconfig.spec.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./out-tsc/vitest",
-    "types": [
-      "vitest/globals",
-      "vitest/importMeta",
-      "vite/client",
-      "node",
-      "vitest"
-    ],
-    "forceConsistentCasingInFileNames": true
-  },
-  "include": [
-    "vite.config.ts",
-    "vite.config.mts",
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx",
-    "src/**/*.d.ts"
-  ],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    }
-  ]
-}
diff --git a/packages/riviere-schema/vite.config.ts b/packages/riviere-schema/vite.config.ts
deleted file mode 100644
index f8e4904b9..000000000
--- a/packages/riviere-schema/vite.config.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/// <reference types='vitest' />
-import { defineConfig } from 'vite'
-
-export default defineConfig(() => ({
-  root: import.meta.dirname,
-  cacheDir: '../node_modules/.vite/riviere-schema',
-  plugins: [],
-  test: {
-    name: '@living-architecture/riviere-schema',
-    watch: false,
-    globals: true,
-    environment: 'node',
-    include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    reporters: ['default'],
-    coverage: {
-      reportsDirectory: './test-output/vitest/coverage',
-      provider: 'v8' as const,
-    },
-  },
-}))
diff --git a/packages/riviere-schema/vitest.config.mts b/packages/riviere-schema/vitest.config.mts
deleted file mode 100644
index 84f26b9d6..000000000
--- a/packages/riviere-schema/vitest.config.mts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { defineConfig } from 'vitest/config';
-
-export default defineConfig(() => ({
-  root: __dirname,
-  cacheDir: '../../node_modules/.vite/packages/riviere-schema',
-  test: {
-    name: '@living-architecture/riviere-schema',
-    watch: false,
-    globals: true,
-    environment: 'node',
-    include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    reporters: ['default'],
-    coverage: {
-      enabled: true,
-      reportsDirectory: './test-output/vitest/coverage',
-      provider: 'v8' as const,
-      reporter: ['text', 'lcov'],
-      thresholds: {
-        lines: 100,
-        statements: 100,
-        functions: 100,
-        branches: 100,
-      },
-    },
-  },
-}));
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 903e5797b..8d8464927 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4,6 +4,11 @@ settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
+overrides:
+  '@typescript-eslint/project-service@8.53.0>@typescript-eslint/tsconfig-utils': 8.53.0
+  '@typescript-eslint/project-service@8.53.0>@typescript-eslint/types': 8.54.0
+  nanoid@: 3.3.17
+
 importers:
 
   .:
@@ -19,28 +24,25 @@ importers:
         version: 4.6.0(eslint@9.39.4(jiti@2.6.1)(supports-color@7.2.0))
       '@nx/esbuild':
         specifier: 22.5.2
-        version: 22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0))(esbuild@0.27.2)(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))
+        version: 22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0))(esbuild@0.27.2)(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))
       '@nx/eslint':
         specifier: 22.5.2
-        version: 22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(@zkochan/js-yaml@0.0.7)(debug@4.4.3(supports-color@7.2.0))(eslint@9.39.4(jiti@2.6.1)(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))
+        version: 22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(@zkochan/js-yaml@0.0.7)(debug@4.4.3(supports-color@7.2.0))(eslint@9.39.4(jiti@2.6.1)(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))
       '@nx/eslint-plugin':
         specifier: ^22.5.2
-        version: 22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(@typescript-eslint/parser@8.53.0(eslint@9.39.4(jiti@2.6.1)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3))(debug@4.4.3(supports-color@7.2.0))(eslint@9.39.4(jiti@2.6.1)(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(typescript@5.9.3)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))
+        version: 22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(@typescript-eslint/parser@8.53.0(eslint@9.39.4(jiti@2.6.1)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3))(debug@4.4.3(supports-color@7.2.0))(eslint@9.39.4(jiti@2.6.1)(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(typescript@5.9.3)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))
       '@nx/js':
         specifier: 22.5.2
-        version: 22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))
+        version: 22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))
       '@nx/vitest':
         specifier: 22.5.2
-        version: 22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(typescript@5.9.3)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))(vite@7.3.6(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17)
-      '@stylistic/eslint-plugin':
-        specifier: ^5.6.1
-        version: 5.7.1(eslint@9.39.4(jiti@2.6.1)(supports-color@7.2.0))
+        version: 22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(typescript@5.9.3)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))(vite@7.3.6(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17)
       '@swc-node/register':
         specifier: ~1.11.0
-        version: 1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3)
+        version: 1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3)
       '@swc/core':
         specifier: ~1.15.0
-        version: 1.15.33
+        version: 1.15.33(@swc/helpers@0.5.23)
       '@types/node':
         specifier: ^24.10.1
         version: 24.10.9
@@ -97,7 +99,7 @@ importers:
         version: 1.1.0
       nx:
         specifier: 22.5.2
-        version: 22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0))
+        version: 22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0))
       oxlint:
         specifier: ^1.19.0
         version: 1.53.0
@@ -140,6 +142,30 @@ importers:
       vue:
         specifier: ^3.5.0
         version: 3.5.41(typescript@5.9.3)
+
+  apps/cli:
+    dependencies:
+      '@living-architecture/riviere-builder-use-cases':
+        specifier: workspace:*
+        version: link:../../packages/riviere-builder/use-cases
+      '@living-architecture/riviere-extract-ts-domain-model':
+        specifier: workspace:*
+        version: link:../../packages/riviere-extract-ts/domain-model
+      '@living-architecture/riviere-extract-ts-use-cases':
+        specifier: workspace:*
+        version: link:../../packages/riviere-extract-ts/use-cases
+      '@living-architecture/riviere-role-enforcement-domain-model':
+        specifier: workspace:*
+        version: link:../../packages/riviere-role-enforcement/domain-model
+      '@living-architecture/riviere-role-enforcement-use-cases':
+        specifier: workspace:*
+        version: link:../../packages/riviere-role-enforcement/use-cases
+      '@living-architecture/riviere-schema-published-language':
+        specifier: workspace:*
+        version: link:../../packages/riviere-schema/published-language
+      commander:
+        specifier: ^14.0.2
+        version: 14.0.3
       zod:
         specifier: ^4.3.5
         version: 4.3.5
@@ -156,12 +182,12 @@ importers:
 
   apps/eclair:
     dependencies:
-      '@living-architecture/riviere-query':
+      '@living-architecture/riviere-builder-domain-model':
         specifier: workspace:*
-        version: link:../../packages/riviere-query
-      '@living-architecture/riviere-schema':
+        version: link:../../packages/riviere-builder/domain-model
+      '@living-architecture/riviere-schema-published-language':
         specifier: workspace:*
-        version: link:../../packages/riviere-schema
+        version: link:../../packages/riviere-schema/published-language
       '@xyflow/react':
         specifier: ^12.9.3
         version: 12.10.2(@types/react@19.2.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
@@ -230,110 +256,169 @@ importers:
         specifier: ^4.1.17
         version: 4.1.18
 
-  packages/riviere-builder:
+  packages/dev-workflow-v2/domain-model:
     dependencies:
-      '@living-architecture/riviere-query':
-        specifier: workspace:*
-        version: link:../riviere-query
-      '@living-architecture/riviere-schema':
-        specifier: workspace:*
-        version: link:../riviere-schema
+      '@nt-ai-lab/deterministic-agent-workflow-dsl':
+        specifier: 0.3.6
+        version: 0.3.6
+      '@nt-ai-lab/deterministic-agent-workflow-engine':
+        specifier: 0.3.6
+        version: 0.3.6
+      zod:
+        specifier: ^3.23.0
+        version: 3.25.76
+    devDependencies:
+      '@types/node':
+        specifier: ^22.0.0
+        version: 22.19.7
+      '@vitest/coverage-v8':
+        specifier: ^2.0.0
+        version: 2.1.9(@vitest/browser@4.0.17(vite@7.3.6(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17))(supports-color@7.2.0)(vitest@2.1.9(@types/node@22.19.7)(@vitest/browser@4.0.17(vite@7.3.6(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17))(jsdom@27.4.0(supports-color@7.2.0))(lightningcss@1.30.2)(supports-color@7.2.0))
+      typescript:
+        specifier: ^5.6.0
+        version: 5.9.3
+      vitest:
+        specifier: ^2.0.0
+        version: 2.1.9(@types/node@22.19.7)(@vitest/browser@4.0.17(vite@7.3.6(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17))(jsdom@27.4.0(supports-color@7.2.0))(lightningcss@1.30.2)(supports-color@7.2.0)
 
-  packages/riviere-cli:
+  packages/dev-workflow-v2/use-cases:
     dependencies:
-      '@living-architecture/riviere-builder':
-        specifier: workspace:*
-        version: link:../riviere-builder
-      '@living-architecture/riviere-extract-config':
+      '@living-architecture/dev-workflow-v2-domain-model':
         specifier: workspace:*
-        version: link:../riviere-extract-config
-      '@living-architecture/riviere-extract-ts':
+        version: link:../domain-model
+      '@nt-ai-lab/deterministic-agent-workflow-dsl':
+        specifier: 0.3.6
+        version: 0.3.6
+      '@nt-ai-lab/deterministic-agent-workflow-engine':
+        specifier: 0.3.6
+        version: 0.3.6
+      zod:
+        specifier: ^3.23.0
+        version: 3.25.76
+    devDependencies:
+      '@types/node':
+        specifier: ^22.0.0
+        version: 22.19.7
+      '@vitest/coverage-v8':
+        specifier: ^2.0.0
+        version: 2.1.9(@vitest/browser@4.0.17(vite@7.3.6(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17))(supports-color@7.2.0)(vitest@2.1.9(@types/node@22.19.7)(@vitest/browser@4.0.17(vite@7.3.6(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17))(jsdom@27.4.0(supports-color@7.2.0))(lightningcss@1.30.2)(supports-color@7.2.0))
+      typescript:
+        specifier: ^5.6.0
+        version: 5.9.3
+      vitest:
+        specifier: ^2.0.0
+        version: 2.1.9(@types/node@22.19.7)(@vitest/browser@4.0.17(vite@7.3.6(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17))(jsdom@27.4.0(supports-color@7.2.0))(lightningcss@1.30.2)(supports-color@7.2.0)
+
+  packages/riviere-builder/domain-model:
+    dependencies:
+      '@living-architecture/riviere-schema-published-language':
         specifier: workspace:*
-        version: link:../riviere-extract-ts
-      '@living-architecture/riviere-query':
+        version: link:../../riviere-schema/published-language
+      zod:
+        specifier: ^4.2.1
+        version: 4.3.5
+
+  packages/riviere-builder/use-cases:
+    dependencies:
+      '@living-architecture/riviere-builder-domain-model':
         specifier: workspace:*
-        version: link:../riviere-query
-      '@living-architecture/riviere-schema':
+        version: link:../domain-model
+      '@living-architecture/riviere-schema-published-language':
         specifier: workspace:*
-        version: link:../riviere-schema
-      commander:
-        specifier: ^14.0.2
-        version: 14.0.3
-      glob:
-        specifier: ^11.0.2
-        version: 11.1.0
-      ts-morph:
-        specifier: ^24.0.0
-        version: 24.0.0
-      yaml:
-        specifier: ^2.7.0
-        version: 2.9.0
+        version: link:../../riviere-schema/published-language
 
-  packages/riviere-extract-config:
+  packages/riviere-extract-config/published-language:
     dependencies:
       ajv:
         specifier: ^8.17.1
-        version: 8.17.1
+        version: 8.18.0
       ajv-formats:
         specifier: ^3.0.1
-        version: 3.0.1(ajv@8.17.1)
+        version: 3.0.1(ajv@8.18.0)
 
-  packages/riviere-extract-conventions:
+  packages/riviere-extract-conventions/published-language:
     dependencies:
-      '@living-architecture/riviere-extract-config':
+      '@living-architecture/riviere-extract-config-published-language':
         specifier: workspace:*
-        version: link:../riviere-extract-config
+        version: link:../../riviere-extract-config/published-language
+      '@typescript-eslint/utils':
+        specifier: 8.53.0
+        version: 8.53.0(eslint@9.39.4(jiti@2.6.1)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3)
 
-  packages/riviere-extract-ts:
+  packages/riviere-extract-ts/domain-model:
     dependencies:
-      '@living-architecture/riviere-extract-config':
+      '@living-architecture/riviere-extract-config-published-language':
         specifier: workspace:*
-        version: link:../riviere-extract-config
-      '@living-architecture/riviere-schema':
+        version: link:../../riviere-extract-config/published-language
+      '@living-architecture/riviere-schema-published-language':
         specifier: workspace:*
-        version: link:../riviere-schema
-      minimatch:
-        specifier: ^10.0.1
-        version: 10.2.5
+        version: link:../../riviere-schema/published-language
       ts-morph:
         specifier: ^24.0.0
         version: 24.0.0
 
-  packages/riviere-query:
+  packages/riviere-extract-ts/use-cases:
     dependencies:
-      '@living-architecture/riviere-schema':
+      '@living-architecture/riviere-extract-config-published-language':
         specifier: workspace:*
-        version: link:../riviere-schema
-      zod:
-        specifier: ^4.2.1
-        version: 4.3.5
+        version: link:../../riviere-extract-config/published-language
+      '@living-architecture/riviere-extract-ts-domain-model':
+        specifier: workspace:*
+        version: link:../domain-model
+      '@living-architecture/riviere-schema-published-language':
+        specifier: workspace:*
+        version: link:../../riviere-schema/published-language
+      glob:
+        specifier: ^11.0.2
+        version: 11.1.0
+      ts-morph:
+        specifier: ^24.0.0
+        version: 24.0.0
+      yaml:
+        specifier: ^2.7.0
+        version: 2.9.0
 
-  packages/riviere-role-enforcement:
+  packages/riviere-role-enforcement/domain-model:
     dependencies:
       minimatch:
         specifier: ^10.0.1
-        version: 10.2.5
+        version: 10.2.6
 
-  packages/riviere-schema:
+  packages/riviere-role-enforcement/use-cases:
+    dependencies:
+      '@living-architecture/riviere-role-enforcement-domain-model':
+        specifier: workspace:*
+        version: link:../domain-model
+      minimatch:
+        specifier: ^10.0.1
+        version: 10.2.6
+      tsx:
+        specifier: ^4.21.0
+        version: 4.21.0
+      yaml:
+        specifier: ^2.7.0
+        version: 2.9.0
+
+  packages/riviere-schema/published-language:
     dependencies:
       ajv:
         specifier: ^8.17.1
-        version: 8.17.1
+        version: 8.18.0
       ajv-formats:
         specifier: ^3.0.1
-        version: 3.0.1(ajv@8.17.1)
+        version: 3.0.1(ajv@8.18.0)
 
   tools/dev-workflow-v2:
     dependencies:
+      '@living-architecture/dev-workflow-v2-use-cases':
+        specifier: workspace:*
+        version: link:../../packages/dev-workflow-v2/use-cases
       '@nt-ai-lab/deterministic-agent-workflow-claude-code':
         specifier: 0.3.7
         version: 0.3.7
       '@nt-ai-lab/deterministic-agent-workflow-cli':
         specifier: 0.3.7
         version: 0.3.7
-      '@nt-ai-lab/deterministic-agent-workflow-dsl':
-        specifier: 0.3.6
-        version: 0.3.6
       '@nt-ai-lab/deterministic-agent-workflow-engine':
         specifier: 0.3.6
         version: 0.3.6
@@ -347,9 +432,6 @@ importers:
         specifier: ^3.23.0
         version: 3.25.76
     devDependencies:
-      '@types/better-sqlite3':
-        specifier: ^7.6.0
-        version: 7.6.13
       '@types/node':
         specifier: ^22.0.0
         version: 22.19.7
@@ -583,11 +665,6 @@ packages:
     engines: {node: '>=6.0.0'}
     hasBin: true
 
-  '@babel/parser@7.29.3':
-    resolution: {integrity: sha512-b3ctpQwp+PROvU/cttc4OYl4MzfJUWy6FZg+PMXfzmt/+39iHVF0sDfqay8TQM3JA2EUOyKcFZt75jWriQijsA==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-
   '@babel/parser@7.29.8':
     resolution: {integrity: sha512-E8lTAYNB1KW+FH+VGJuZM1ioAx2E6oVlvQFRrf5P8ZZmsiJXYAD9vTFV7yyEURNzgh1dFqMZuO6tUwcARbqFCA==}
     engines: {node: '>=6.0.0'}
@@ -1038,10 +1115,6 @@ packages:
     resolution: {integrity: sha512-0ZrskXVEHSWIqZM/sQZ4EV3jZJXRkio/WCxaqKZP1g//CEWEPSfeZFcms4XeKBCHU0ZKnIkdJeU/kF+eRp5lBg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/types@7.29.0':
-    resolution: {integrity: sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/types@7.29.8':
     resolution: {integrity: sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==}
     engines: {node: '>=6.9.0'}
@@ -2381,12 +2454,6 @@ packages:
   '@standard-schema/spec@1.1.0':
     resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
 
-  '@stylistic/eslint-plugin@5.7.1':
-    resolution: {integrity: sha512-zjTUwIsEfT+k9BmXwq1QEFYsb4afBlsI1AXFyWQBgggMzwBFOuu92pGrE5OFx90IOjNl+lUbQoTG7f8S0PkOdg==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      eslint: '>=9.0.0'
-
   '@swc-node/core@1.14.1':
     resolution: {integrity: sha512-jrt5GUaZUU6cmMS+WTJEvGvaB6j1YNKPHPzC2PUi2BjaFbtxURHj6641Az6xN7b665hNniAIdvjxWcRml5yCnw==}
     engines: {node: '>= 10'}
@@ -2493,6 +2560,9 @@ packages:
   '@swc/counter@0.1.3':
     resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==}
 
+  '@swc/helpers@0.5.23':
+    resolution: {integrity: sha512-5lSsMOTXURePglDfvuAQUqkGek9Hg2kksOYay2m0+XR++b2NWYL/4sWyuvVBIs8oKnJaxkdi9whaL/sqN13afw==}
+
   '@swc/types@0.1.26':
     resolution: {integrity: sha512-lyMwd7WGgG79RS7EERZV3T8wMdmPq3xwyg+1nmAM64kIhx5yl+juO2PYIHb7vTiPgPCj8LYjsNV2T5wiQHUEaw==}
 
@@ -2647,9 +2717,6 @@ packages:
   '@types/babel__traverse@7.28.0':
     resolution: {integrity: sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==}
 
-  '@types/better-sqlite3@7.6.13':
-    resolution: {integrity: sha512-NMv9ASNARoKksWtsq/SHakpYAYnhBrQgGD8zkLYk/jaK8jUGn08CfEdTRgYhMypUQAfzSP8W6gNLe0q19/t4VA==}
-
   '@types/chai@5.2.3':
     resolution: {integrity: sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==}
 
@@ -3533,10 +3600,6 @@ packages:
   brace-expansion@2.1.0:
     resolution: {integrity: sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==}
 
-  brace-expansion@5.0.5:
-    resolution: {integrity: sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==}
-    engines: {node: 18 || 20 || >=22}
-
   brace-expansion@5.0.9:
     resolution: {integrity: sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==}
     engines: {node: 20 || >=22}
@@ -5671,10 +5734,6 @@ packages:
     resolution: {integrity: sha512-fu656aJ0n2kcXwsnwnv9g24tkU5uSmOlTjd6WyyaKm2Z+h1qmY6bAjrcaIxF/BslFqbZ8UBtbJi7KgQOZD2PTw==}
     engines: {node: 20 || >=22}
 
-  minimatch@10.2.5:
-    resolution: {integrity: sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==}
-    engines: {node: 18 || 20 || >=22}
-
   minimatch@10.2.6:
     resolution: {integrity: sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==}
     engines: {node: 18 || 20 || >=22}
@@ -5729,8 +5788,8 @@ packages:
     resolution: {integrity: sha512-tacvGzUY5o2D8CBh2rrwxyNojUsZNU2zjNTzKQrkgGJQTbGAfArVWXSKMBokBeeg6C7OLRGUEyoFlYbfeWQIqw==}
     engines: {node: '>=20.17'}
 
-  nanoid@3.3.18:
-    resolution: {integrity: sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==}
+  nanoid@3.3.17:
+    resolution: {integrity: sha512-xQLf0A3HOMlgHq0n247/LRuAOYmB7dXJ/DvAxGvsSBij45XtBSmQycu+F8ODbHwns/XyFZagyL1+J0Offw1E0g==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
@@ -6825,6 +6884,12 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4'
 
+  ts-api-utils@2.5.0:
+    resolution: {integrity: sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==}
+    engines: {node: '>=18.12'}
+    peerDependencies:
+      typescript: '>=4.8.4'
+
   ts-morph@24.0.0:
     resolution: {integrity: sha512-2OAOg/Ob5yx9Et7ZX4CvTCc0UFoZHwLEJ+dpDPSUi5TgwwlTlX47w+iFRrEwzUZwYACjq83cgjS/Da50Ga37uw==}
 
@@ -7579,10 +7644,10 @@ snapshots:
       '@babel/helper-compilation-targets': 7.28.6
       '@babel/helper-module-transforms': 7.28.6(@babel/core@7.28.6(supports-color@7.2.0))(supports-color@7.2.0)
       '@babel/helpers': 7.28.6
-      '@babel/parser': 7.29.3
+      '@babel/parser': 7.29.8
       '@babel/template': 7.28.6
       '@babel/traverse': 7.28.6(supports-color@7.2.0)
-      '@babel/types': 7.29.0
+      '@babel/types': 7.29.8
       '@jridgewell/remapping': 2.3.5
       convert-source-map: 2.0.0
       debug: 4.4.3(supports-color@7.2.0)
@@ -7594,15 +7659,15 @@ snapshots:
 
   '@babel/generator@7.28.6':
     dependencies:
-      '@babel/parser': 7.29.3
-      '@babel/types': 7.29.0
+      '@babel/parser': 7.29.8
+      '@babel/types': 7.29.8
       '@jridgewell/gen-mapping': 0.3.13
       '@jridgewell/trace-mapping': 0.3.31
       jsesc: 3.1.0
 
   '@babel/helper-annotate-as-pure@7.27.3':
     dependencies:
-      '@babel/types': 7.29.0
+      '@babel/types': 7.29.8
 
   '@babel/helper-compilation-targets@7.28.6':
     dependencies:
@@ -7648,7 +7713,7 @@ snapshots:
   '@babel/helper-member-expression-to-functions@7.28.5(supports-color@7.2.0)':
     dependencies:
       '@babel/traverse': 7.28.6(supports-color@7.2.0)
-      '@babel/types': 7.29.0
+      '@babel/types': 7.29.8
     transitivePeerDependencies:
       - supports-color
 
@@ -7670,7 +7735,7 @@ snapshots:
 
   '@babel/helper-optimise-call-expression@7.27.1':
     dependencies:
-      '@babel/types': 7.29.0
+      '@babel/types': 7.29.8
 
   '@babel/helper-plugin-utils@7.28.6': {}
 
@@ -7695,7 +7760,7 @@ snapshots:
   '@babel/helper-skip-transparent-expression-wrappers@7.27.1(supports-color@7.2.0)':
     dependencies:
       '@babel/traverse': 7.28.6(supports-color@7.2.0)
-      '@babel/types': 7.29.0
+      '@babel/types': 7.29.8
     transitivePeerDependencies:
       - supports-color
 
@@ -7713,23 +7778,19 @@ snapshots:
     dependencies:
       '@babel/template': 7.28.6
       '@babel/traverse': 7.28.6(supports-color@7.2.0)
-      '@babel/types': 7.29.0
+      '@babel/types': 7.29.8
     transitivePeerDependencies:
       - supports-color
 
   '@babel/helpers@7.28.6':
     dependencies:
       '@babel/template': 7.28.6
-      '@babel/types': 7.29.0
+      '@babel/types': 7.29.8
 
   '@babel/parser@7.28.6':
     dependencies:
       '@babel/types': 7.28.6
 
-  '@babel/parser@7.29.3':
-    dependencies:
-      '@babel/types': 7.29.0
-
   '@babel/parser@7.29.8':
     dependencies:
       '@babel/types': 7.29.8
@@ -8280,17 +8341,17 @@ snapshots:
   '@babel/template@7.28.6':
     dependencies:
       '@babel/code-frame': 7.29.7
-      '@babel/parser': 7.29.3
-      '@babel/types': 7.29.0
+      '@babel/parser': 7.29.8
+      '@babel/types': 7.29.8
 
   '@babel/traverse@7.28.6(supports-color@7.2.0)':
     dependencies:
       '@babel/code-frame': 7.29.7
       '@babel/generator': 7.28.6
       '@babel/helper-globals': 7.28.0
-      '@babel/parser': 7.29.3
+      '@babel/parser': 7.29.8
       '@babel/template': 7.28.6
-      '@babel/types': 7.29.0
+      '@babel/types': 7.29.8
       debug: 4.4.3(supports-color@7.2.0)
     transitivePeerDependencies:
       - supports-color
@@ -8300,11 +8361,6 @@ snapshots:
       '@babel/helper-string-parser': 7.27.1
       '@babel/helper-validator-identifier': 7.28.5
 
-  '@babel/types@7.29.0':
-    dependencies:
-      '@babel/helper-string-parser': 7.27.1
-      '@babel/helper-validator-identifier': 7.29.7
-
   '@babel/types@7.29.8':
     dependencies:
       '@babel/helper-string-parser': 7.29.7
@@ -8507,7 +8563,7 @@ snapshots:
   '@es-joy/jsdoccomment@0.78.0':
     dependencies:
       '@types/estree': 1.0.8
-      '@typescript-eslint/types': 8.53.0
+      '@typescript-eslint/types': 8.54.0
       comment-parser: 1.4.1
       esquery: 1.7.0
       jsdoc-type-pratt-parser: 7.0.0
@@ -8931,21 +8987,21 @@ snapshots:
       - '@opentui/core'
       - '@opentui/solid'
 
-  '@nx/devkit@22.5.2(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0)))':
+  '@nx/devkit@22.5.2(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0)))':
     dependencies:
       '@zkochan/js-yaml': 0.0.7
       ejs: 3.1.10
       enquirer: 2.3.6
       minimatch: 10.1.1
-      nx: 22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0))
+      nx: 22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0))
       semver: 7.8.5
       tslib: 2.8.1
       yargs-parser: 21.1.1
 
-  '@nx/esbuild@22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0))(esbuild@0.27.2)(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))':
+  '@nx/esbuild@22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0))(esbuild@0.27.2)(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))':
     dependencies:
-      '@nx/devkit': 22.5.2(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0)))
-      '@nx/js': 22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))
+      '@nx/devkit': 22.5.2(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0)))
+      '@nx/js': 22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))
       picocolors: 1.1.1
       tinyglobby: 0.2.15
       tsconfig-paths: 4.2.0
@@ -8961,10 +9017,10 @@ snapshots:
       - supports-color
       - verdaccio
 
-  '@nx/eslint-plugin@22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(@typescript-eslint/parser@8.53.0(eslint@9.39.4(jiti@2.6.1)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3))(debug@4.4.3(supports-color@7.2.0))(eslint@9.39.4(jiti@2.6.1)(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(typescript@5.9.3)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))':
+  '@nx/eslint-plugin@22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(@typescript-eslint/parser@8.53.0(eslint@9.39.4(jiti@2.6.1)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3))(debug@4.4.3(supports-color@7.2.0))(eslint@9.39.4(jiti@2.6.1)(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(typescript@5.9.3)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))':
     dependencies:
-      '@nx/devkit': 22.5.2(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0)))
-      '@nx/js': 22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))
+      '@nx/devkit': 22.5.2(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0)))
+      '@nx/js': 22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))
       '@phenomnomnominal/tsquery': 6.1.4(typescript@5.9.3)
       '@typescript-eslint/parser': 8.53.0(eslint@9.39.4(jiti@2.6.1)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3)
       '@typescript-eslint/type-utils': 8.53.0(eslint@9.39.4(jiti@2.6.1)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3)
@@ -8986,10 +9042,10 @@ snapshots:
       - typescript
       - verdaccio
 
-  '@nx/eslint@22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(@zkochan/js-yaml@0.0.7)(debug@4.4.3(supports-color@7.2.0))(eslint@9.39.4(jiti@2.6.1)(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))':
+  '@nx/eslint@22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(@zkochan/js-yaml@0.0.7)(debug@4.4.3(supports-color@7.2.0))(eslint@9.39.4(jiti@2.6.1)(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))':
     dependencies:
-      '@nx/devkit': 22.5.2(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0)))
-      '@nx/js': 22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))
+      '@nx/devkit': 22.5.2(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0)))
+      '@nx/js': 22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))
       eslint: 9.39.4(jiti@2.6.1)(supports-color@7.2.0)
       semver: 7.7.3
       tslib: 2.8.1
@@ -9005,7 +9061,7 @@ snapshots:
       - supports-color
       - verdaccio
 
-  '@nx/js@22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))':
+  '@nx/js@22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))':
     dependencies:
       '@babel/core': 7.28.6(supports-color@7.2.0)
       '@babel/plugin-proposal-decorators': 7.28.6(@babel/core@7.28.6(supports-color@7.2.0))(supports-color@7.2.0)
@@ -9014,8 +9070,8 @@ snapshots:
       '@babel/preset-env': 7.28.6(@babel/core@7.28.6(supports-color@7.2.0))(supports-color@7.2.0)
       '@babel/preset-typescript': 7.28.5(@babel/core@7.28.6(supports-color@7.2.0))(supports-color@7.2.0)
       '@babel/runtime': 7.28.6
-      '@nx/devkit': 22.5.2(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0)))
-      '@nx/workspace': 22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0))
+      '@nx/devkit': 22.5.2(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0)))
+      '@nx/workspace': 22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0))
       '@zkochan/js-yaml': 0.0.7
       babel-plugin-const-enum: 1.2.0(@babel/core@7.28.6(supports-color@7.2.0))(supports-color@7.2.0)
       babel-plugin-macros: 3.1.0
@@ -9073,10 +9129,10 @@ snapshots:
   '@nx/nx-win32-x64-msvc@22.5.2':
     optional: true
 
-  '@nx/vitest@22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(typescript@5.9.3)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))(vite@7.3.6(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17)':
+  '@nx/vitest@22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(typescript@5.9.3)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))(vite@7.3.6(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17)':
     dependencies:
-      '@nx/devkit': 22.5.2(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0)))
-      '@nx/js': 22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))
+      '@nx/devkit': 22.5.2(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0)))
+      '@nx/js': 22.5.2(@babel/traverse@7.28.6(supports-color@7.2.0))(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0))(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0)))(supports-color@7.2.0)(verdaccio@6.2.4(supports-color@7.2.0)(typanion@3.14.0))
       '@phenomnomnominal/tsquery': 6.1.4(typescript@5.9.3)
       semver: 7.7.3
       tslib: 2.8.1
@@ -9093,15 +9149,15 @@ snapshots:
       - typescript
       - verdaccio
 
-  '@nx/workspace@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0))':
+  '@nx/workspace@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0))':
     dependencies:
-      '@nx/devkit': 22.5.2(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0)))
+      '@nx/devkit': 22.5.2(nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0)))
       '@zkochan/js-yaml': 0.0.7
       chalk: 4.1.2
       enquirer: 2.3.6
-      nx: 22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0))
+      nx: 22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0))
       picomatch: 4.0.2
-      semver: 7.7.3
+      semver: 7.8.5
       tslib: 2.8.1
       yargs-parser: 21.1.1
     transitivePeerDependencies:
@@ -9397,26 +9453,16 @@ snapshots:
 
   '@standard-schema/spec@1.1.0': {}
 
-  '@stylistic/eslint-plugin@5.7.1(eslint@9.39.4(jiti@2.6.1)(supports-color@7.2.0))':
-    dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.4(jiti@2.6.1)(supports-color@7.2.0))
-      '@typescript-eslint/types': 8.54.0
-      eslint: 9.39.4(jiti@2.6.1)(supports-color@7.2.0)
-      eslint-visitor-keys: 4.2.1
-      espree: 10.4.0
-      estraverse: 5.3.0
-      picomatch: 4.0.3
-
-  '@swc-node/core@1.14.1(@swc/core@1.15.33)(@swc/types@0.1.26)':
+  '@swc-node/core@1.14.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)':
     dependencies:
-      '@swc/core': 1.15.33
+      '@swc/core': 1.15.33(@swc/helpers@0.5.23)
       '@swc/types': 0.1.26
 
-  '@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3)':
+  '@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3)':
     dependencies:
-      '@swc-node/core': 1.14.1(@swc/core@1.15.33)(@swc/types@0.1.26)
+      '@swc-node/core': 1.14.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)
       '@swc-node/sourcemap-support': 0.6.1
-      '@swc/core': 1.15.33
+      '@swc/core': 1.15.33(@swc/helpers@0.5.23)
       colorette: 2.0.20
       debug: 4.4.3(supports-color@7.2.0)
       oxc-resolver: 11.16.3
@@ -9468,7 +9514,7 @@ snapshots:
   '@swc/core-win32-x64-msvc@1.15.33':
     optional: true
 
-  '@swc/core@1.15.33':
+  '@swc/core@1.15.33(@swc/helpers@0.5.23)':
     dependencies:
       '@swc/counter': 0.1.3
       '@swc/types': 0.1.26
@@ -9485,9 +9531,15 @@ snapshots:
       '@swc/core-win32-arm64-msvc': 1.15.33
       '@swc/core-win32-ia32-msvc': 1.15.33
       '@swc/core-win32-x64-msvc': 1.15.33
+      '@swc/helpers': 0.5.23
 
   '@swc/counter@0.1.3': {}
 
+  '@swc/helpers@0.5.23':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
   '@swc/types@0.1.26':
     dependencies:
       '@swc/counter': 0.1.3
@@ -9636,10 +9688,6 @@ snapshots:
     dependencies:
       '@babel/types': 7.28.6
 
-  '@types/better-sqlite3@7.6.13':
-    dependencies:
-      '@types/node': 24.10.9
-
   '@types/chai@5.2.3':
     dependencies:
       '@types/deep-eql': 4.0.2
@@ -9927,7 +9975,7 @@ snapshots:
       minimatch: 9.0.9
       semver: 7.8.5
       tinyglobby: 0.2.17
-      ts-api-utils: 2.4.0(typescript@5.9.3)
+      ts-api-utils: 2.5.0(typescript@5.9.3)
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
@@ -10247,7 +10295,7 @@ snapshots:
       '@vitest/spy': 4.0.17
       '@vitest/utils': 4.0.17
       chai: 6.2.2
-      tinyrainbow: 3.0.3
+      tinyrainbow: 3.1.1
 
   '@vitest/expect@4.1.10':
     dependencies:
@@ -10296,7 +10344,7 @@ snapshots:
 
   '@vitest/pretty-format@4.0.17':
     dependencies:
-      tinyrainbow: 3.0.3
+      tinyrainbow: 3.1.1
 
   '@vitest/pretty-format@4.1.10':
     dependencies:
@@ -10544,9 +10592,9 @@ snapshots:
 
   agent-base@7.1.4: {}
 
-  ajv-formats@3.0.1(ajv@8.17.1):
+  ajv-formats@3.0.1(ajv@8.18.0):
     optionalDependencies:
-      ajv: 8.17.1
+      ajv: 8.18.0
 
   ajv@6.12.6:
     dependencies:
@@ -10844,10 +10892,6 @@ snapshots:
     dependencies:
       balanced-match: 1.0.2
 
-  brace-expansion@5.0.5:
-    dependencies:
-      balanced-match: 4.0.4
-
   brace-expansion@5.0.9:
     dependencies:
       balanced-match: 4.0.4
@@ -12251,7 +12295,7 @@ snapshots:
     dependencies:
       foreground-child: 3.3.1
       jackspeak: 4.1.1
-      minimatch: 10.1.1
+      minimatch: 10.2.6
       minipass: 7.1.2
       package-json-from-dist: 1.0.1
       path-scurry: 2.0.1
@@ -12808,7 +12852,7 @@ snapshots:
       acorn: 8.18.0
       eslint-visitor-keys: 3.4.3
       espree: 9.6.1
-      semver: 7.7.3
+      semver: 7.8.5
 
   jsonc-parser@3.2.0: {}
 
@@ -12827,7 +12871,7 @@ snapshots:
       lodash.isstring: 4.0.1
       lodash.once: 4.1.1
       ms: 2.1.3
-      semver: 7.7.3
+      semver: 7.8.5
 
   jsprim@2.0.2:
     dependencies:
@@ -13069,8 +13113,8 @@ snapshots:
 
   magicast@0.3.5:
     dependencies:
-      '@babel/parser': 7.28.6
-      '@babel/types': 7.28.6
+      '@babel/parser': 7.29.8
+      '@babel/types': 7.29.8
       source-map-js: 1.2.1
 
   magicast@0.5.1:
@@ -13372,10 +13416,6 @@ snapshots:
     dependencies:
       '@isaacs/brace-expansion': 5.0.1
 
-  minimatch@10.2.5:
-    dependencies:
-      brace-expansion: 5.0.5
-
   minimatch@10.2.6:
     dependencies:
       brace-expansion: 5.0.9
@@ -13418,7 +13458,7 @@ snapshots:
 
   nano-spawn@2.0.0: {}
 
-  nanoid@3.3.18: {}
+  nanoid@3.3.17: {}
 
   natural-compare@1.4.0: {}
 
@@ -13444,7 +13484,7 @@ snapshots:
 
   nwsapi@2.2.23: {}
 
-  nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33)(debug@4.4.3(supports-color@7.2.0)):
+  nx@22.5.2(@swc-node/register@1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3(supports-color@7.2.0)):
     dependencies:
       '@napi-rs/wasm-runtime': 0.2.4
       '@yarnpkg/lockfile': 1.1.0
@@ -13493,8 +13533,8 @@ snapshots:
       '@nx/nx-linux-x64-musl': 22.5.2
       '@nx/nx-win32-arm64-msvc': 22.5.2
       '@nx/nx-win32-x64-msvc': 22.5.2
-      '@swc-node/register': 1.11.1(@swc/core@1.15.33)(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3)
-      '@swc/core': 1.15.33
+      '@swc-node/register': 1.11.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(supports-color@7.2.0)(typescript@5.9.3)
+      '@swc/core': 1.15.33(@swc/helpers@0.5.23)
     transitivePeerDependencies:
       - debug
 
@@ -13813,7 +13853,7 @@ snapshots:
 
   postcss@8.5.26:
     dependencies:
-      nanoid: 3.3.18
+      nanoid: 3.3.17
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
@@ -14535,7 +14575,7 @@ snapshots:
     dependencies:
       '@istanbuljs/schema': 0.1.3
       glob: 10.5.0
-      minimatch: 10.2.5
+      minimatch: 10.2.6
 
   text-decoder@1.2.3:
     dependencies:
@@ -14637,6 +14677,10 @@ snapshots:
     dependencies:
       typescript: 5.9.3
 
+  ts-api-utils@2.5.0(typescript@5.9.3):
+    dependencies:
+      typescript: 5.9.3
+
   ts-morph@24.0.0:
     dependencies:
       '@ts-morph/common': 0.25.0
@@ -15042,7 +15086,7 @@ snapshots:
       '@vitest/utils': 2.1.9
       chai: 5.3.3
       debug: 4.4.3(supports-color@7.2.0)
-      expect-type: 1.3.0
+      expect-type: 1.4.0
       magic-string: 0.30.21
       pathe: 1.1.2
       std-env: 3.10.0
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index ca556a460..4c3b40b77 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,9 +1,17 @@
 packages:
   - packages/*
+  - packages/*/*
   - apps/*
   - tools/*
 
 autoInstallPeers: true
+engineStrict: true
+minimumReleaseAge: 10080
+
+overrides:
+  '@typescript-eslint/project-service@8.53.0>@typescript-eslint/tsconfig-utils': 8.53.0
+  '@typescript-eslint/project-service@8.53.0>@typescript-eslint/types': 8.54.0
+  'nanoid@': 3.3.17
 
 allowBuilds:
   '@swc/core': true
diff --git a/project-memory/architecture/memories/design-query-models-from-concrete-queries.md b/project-memory/architecture/memories/design-query-models-from-concrete-queries.md
new file mode 100644
index 000000000..d9ae4cb9f
--- /dev/null
+++ b/project-memory/architecture/memories/design-query-models-from-concrete-queries.md
@@ -0,0 +1,91 @@
+---
+status: approved
+dateAdded: 2026-08-11
+systemAreas:
+  - global
+  - riviere-cli
+architectureConcepts:
+  - boundary-placement
+  - component-responsibility
+  - riviere-role-understanding
+  - trade-off-reasoning
+source: conversation: query-model design during role-enforcement architecture migration
+---
+
+# Design query models from concrete queries
+
+## Memory
+
+Start with the user query and its required result.
+
+For example, when a user runs:
+
+```text
+riviere components --domain payments --type API
+```
+
+the `ListComponents` use case must return only API components from the `payments` domain. Its query model is therefore a component list shaped for that read, and its loader builds that list using the relevant domain objects and behaviour.
+
+```typescript
+/** @riviere-role query-model */
+export interface ComponentList {
+  components: Component[]
+}
+
+/** @riviere-role query-model-loader */
+export class ComponentListLoader {
+  load(criteria: ComponentListCriteria): ComponentList {
+    const graph = this.loadGraph(criteria.graphPath)
+    const query = new RiviereQuery(graph)
+    return { components: filterComponents(query.components(), criteria) }
+  }
+}
+```
+
+Usually there is one query model per query use case because each read can be shaped and optimised independently. Share one only when concrete use cases genuinely need the same read shape.
+
+Do not add `Model` or `QueryModel` suffixes. The role annotation already communicates that technical classification; name the type after the information it represents.
+
+## Why this matters
+
+Starting from an existing shared repository produced this incorrect design:
+
+```typescript
+/** @riviere-role query-model-loader */
+export class RiviereQueryRepository {
+  load(): RiviereQuery
+}
+```
+
+The persisted state is a graph. `RiviereQuery` is domain behaviour used to build query-specific reads; returning it from a query-model loader does not make it a query model.
+
+Trying to preserve that repository then produced another false abstraction:
+
+```typescript
+export class GraphQueryModel {}
+```
+
+There is no use case called “query graph”. The generic wrapper hid the actual queries and prevented their query models from being independently shaped.
+
+## Consider this when
+
+- Designing a query use case, query model, or query-model loader.
+- An existing repository or loader returns a shared domain service.
+- A proposed query model has a generic name unrelated to a user query.
+- Several query use cases are being forced through one query model.
+
+## Do not apply automatically when
+
+- Concrete query use cases genuinely require the same read shape and sharing it keeps each use case clear.
+
+## Clarify with the user when
+
+- The user query and required result have not been stated concretely.
+- A shared query model is proposed without examples of the use cases that share it.
+
+## Related references
+
+- `.riviere/role-definitions/query-model.md`
+- `.riviere/role-definitions/query-model-loader.md`
+- `.riviere/role-definitions/query-model-use-case.md`
+- `docs/architecture/adr/ADR-002-allowed-folder-structures.md`
diff --git a/project-memory/architecture/memories/prefer-layer-based-rules.md b/project-memory/architecture/memories/prefer-layer-based-rules.md
index c375e3f07..80f945f19 100644
--- a/project-memory/architecture/memories/prefer-layer-based-rules.md
+++ b/project-memory/architecture/memories/prefer-layer-based-rules.md
@@ -23,20 +23,23 @@ A `_platform` folder is a private internal package within its containing layer.
 
 Prefer a small number of broad, target-based layer rules with minimal configuration. Do not replace a layer boundary with lists of projects, locations, roles, or forbidden dependencies when one generic layer rule can express it.
 
-A layer dependency rule is a location rule. Define it on the existing `location(...)` or `subLocation(...)` that owns the boundary. Do not create a separate collection of path matchers that classifies the same files again. Source and target locations must both be resolved from the configured location tree, otherwise role placement and dependency enforcement can drift apart.
+A layer import rule is a location rule. Define it in the owning location's `importRules`. Do not create a separate collection of path matchers that classifies the same files again. Source and target locations must both be resolved from the configured location tree, otherwise role placement and import enforcement can drift apart.
 
 For example, generic infrastructure is defined once as the parent location of its more specific role locations:
 
 ```ts
-location<RoleName>('src/platform')
-  .subLocation('/infra', [], {
-    mayImportRoles: [],
+location<RoleName>('/platform').subLocation(
+  location<RoleName>('/infra', [], {
+    importRules: { allow: [] },
   })
-  .subLocation('/infra/external-clients/{client}', externalClientRoles)
-  .subLocation('/infra/cli/input', ['generic-cli-input-parser'])
+    .subLocation('/external-clients/{client}', externalClientRoles)
+    .subLocation(
+      location<RoleName>('/cli', []).subLocation('/input', ['generic-cli-input-parser']),
+    ),
+)
 ```
 
-The `/infra` location owns the import rule directly. Imports within that location, including its child locations, are allowed normally. `mayImportRoles: []` says that no application-owned role may cross into infra from outside that location; external packages remain allowed. Its child locations refine role placement without redefining the infra path in a second rule system. A nested `dependencyRule`, a repeated `locationName: 'infra'`, or a separate `layerRule('infra', { matches: ['**/infra/**'] })` is invalid because each duplicates information already expressed by the location.
+The `infra` location owns the import rule directly. Imports within that location, including its sublocations, are allowed normally. `allow: []` says that infra cannot import another internal location; external packages remain allowed. Its sublocations refine role placement without redefining the infra path in a second rule system. A repeated path matcher or separate layer-rule collection is invalid because it duplicates information already expressed by the location hierarchy.
 
 A file-size limit is not an architectural role. Do not create helper/component roles, unannotated-export exemptions, barrel-based privacy, or `_platform` folders solely to split a large file. First extract genuinely generic technical capabilities into infra, then re-evaluate the remaining code against the actual lint limit. If it fits, keep it inside the existing role. If it does not, identify the genuinely separate responsibilities and give each a real role.
 
diff --git a/project.json b/project.json
index d7252f956..a43598927 100644
--- a/project.json
+++ b/project.json
@@ -1,5 +1,6 @@
 {
   "name": "@living-architecture/source",
+  "implicitDependencies": ["@living-architecture/riviere-role-enforcement-use-cases"],
   "targets": {
     "lint-md": {
       "executor": "nx:run-commands",
@@ -8,10 +9,10 @@
         "cwd": "{workspaceRoot}"
       }
     },
-    "depcruise": {
+    "depcruise-eclair": {
       "executor": "nx:run-commands",
       "options": {
-        "command": "pnpm depcruise",
+        "command": "pnpm depcruise:eclair",
         "cwd": "{workspaceRoot}"
       }
     },
@@ -22,12 +23,13 @@
         "cwd": "{workspaceRoot}"
       }
     },
-   "role-check": {
-        "executor": "nx:run-commands",
-        "options": {
-          "command": "pnpm exec tsx packages/riviere-role-enforcement/src/shell/bin.ts .riviere/role-enforcement.config.ts",
-          "cwd": "{workspaceRoot}"
-        }
+    "role-check": {
+      "executor": "nx:run-commands",
+      "dependsOn": ["^build"],
+      "options": {
+          "command": "pnpm exec tsx apps/cli/src/shell/role-enforcement-bin.ts .riviere/role-enforcement.config.ts",
+        "cwd": "{workspaceRoot}"
       }
+    }
   }
 }
diff --git a/scripts/build-public-exports.mjs b/scripts/build-public-exports.mjs
new file mode 100644
index 000000000..0738ec681
--- /dev/null
+++ b/scripts/build-public-exports.mjs
@@ -0,0 +1,78 @@
+import { readdir, readFile, rm } from 'node:fs/promises'
+import { join, relative, resolve } from 'node:path'
+import { build } from 'esbuild'
+
+const packageRoot = resolve(process.argv[2] ?? '.')
+
+if (process.argv.includes('--clean')) {
+  await rm(resolve(packageRoot, 'dist'), { recursive: true, force: true })
+  process.exit(0)
+}
+
+const packageJson = JSON.parse(await readFile(resolve(packageRoot, 'package.json'), 'utf8'))
+
+const sourceTargets = new Set()
+
+for (const exported of Object.values(packageJson.exports ?? {})) {
+  if (
+    typeof exported === 'object' &&
+    exported !== null &&
+    '@living-architecture/source' in exported
+  ) {
+    sourceTargets.add(exported['@living-architecture/source'])
+  }
+}
+
+async function filesBelow(directory) {
+  const entries = await readdir(directory, { withFileTypes: true })
+  return (
+    await Promise.all(
+      entries.map((entry) => {
+        const path = join(directory, entry.name)
+        return entry.isDirectory() ? filesBelow(path) : [path]
+      }),
+    )
+  ).flat()
+}
+
+function sourceTargetPattern(sourceTarget) {
+  const escaped = sourceTarget
+    .slice(2)
+    .replace(/[.+?^${}()|[\]\\]/g, '\\$&')
+    .replaceAll('*', '.*')
+  return new RegExp(`^${escaped}$`)
+}
+
+const sourcePatterns = [...sourceTargets]
+  .filter((target) => target.endsWith('.ts'))
+  .map(sourceTargetPattern)
+const sourceFiles = (await filesBelow(resolve(packageRoot, 'src')))
+  .map((sourceFile) => relative(packageRoot, sourceFile))
+  .filter(
+    (sourceFile) =>
+      !sourceFile.includes('/__fixtures__/') &&
+      !/\.(spec|test)\.tsx?$/.test(sourceFile) &&
+      sourcePatterns.some((pattern) => pattern.test(sourceFile)),
+  )
+
+const entryPoints = Object.fromEntries(
+  [...new Set(sourceFiles)].map((sourceFile) => [
+    sourceFile.replace(/^src\//, '').replace(/\.ts$/, ''),
+    resolve(packageRoot, sourceFile),
+  ]),
+)
+
+if (Object.keys(entryPoints).length > 0) {
+  await rm(resolve(packageRoot, 'dist/_chunks'), { recursive: true, force: true })
+  await build({
+    entryPoints,
+    outdir: resolve(packageRoot, 'dist'),
+    bundle: true,
+    splitting: true,
+    chunkNames: '_chunks/[name]-[hash]',
+    packages: 'external',
+    platform: 'node',
+    target: 'node18',
+    format: 'esm',
+  })
+}
diff --git a/sonar-project.properties b/sonar-project.properties
index 193d12413..e6b666db2 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -6,10 +6,10 @@ sonar.host.url=https://sonarcloud.io
 sonar.sources=packages,apps
 sonar.tests=packages,apps
 sonar.test.inclusions=**/*.spec.ts,**/*.test.ts,**/*.spec.tsx,**/*.test.tsx
-sonar.exclusions=**/node_modules/**,**/dist/**,**/test-output/**,apps/docs/scripts/**,packages/*/scripts/**,**/*-test-fixtures.ts,**/*-fixtures.ts,**/vitest.config.mts,**/vitest.browser.config.mts
+sonar.exclusions=**/node_modules/**,**/dist/**,**/test-output/**,apps/docs/scripts/**,packages/*/scripts/**,packages/*/*/scripts/**,**/*-test-fixtures.ts,**/*-fixtures.ts,**/vitest.config.mts,**/vitest.browser.config.mts
 sonar.coverage.exclusions=packages/riviere-extract-config/src/types.ts,packages/riviere-role-enforcement/role-enforcement-plugin.mjs,**/index.ts,**/vitest.config.mts,**/vitest.browser.config.mts,**/test/**,**/esbuild.config.mjs
 sonar.cpd.exclusions=**/vitest.config.mts,**/vitest.browser.config.mts,**/vite.config.ts
 
-sonar.javascript.lcov.reportPaths=packages/*/test-output/vitest/coverage/lcov.info,apps/*/test-output/vitest/coverage/lcov.info
+sonar.javascript.lcov.reportPaths=packages/*/test-output/vitest/coverage/lcov.info,packages/*/*/test-output/vitest/coverage/lcov.info,apps/*/test-output/vitest/coverage/lcov.info
 
 sonar.typescript.tsconfigPaths=tsconfig.base.json
diff --git a/tools/dev-workflow-v2/agents/architecture-review.md b/tools/dev-workflow-v2/agents/architecture-review.md
index 3bf1e123e..77734bf27 100644
--- a/tools/dev-workflow-v2/agents/architecture-review.md
+++ b/tools/dev-workflow-v2/agents/architecture-review.md
@@ -3,9 +3,6 @@ name: architecture-review
 description: Architecture and layer responsibility review with zero tolerance enforcement
 model: opus
 color: red
-skills:
-  - development-skills:separation-of-concerns
-  - development-skills:tactical-ddd
 ---
 
 You will return structured JSON output with these fields:
@@ -19,31 +16,32 @@ You love failing things. Every FAIL you write is a violation you just caught bef
 
 ## Instructions
 
-1. The [`development-skills:separation-of-concerns`](https://github.com/NTCoding/claude-skillz/blob/main/separation-of-concerns/SKILL.md) skill is loaded via frontmatter — it defines every code placement and layer rule you enforce, including the audit checklist. Read its audit checklist to identify all rule codes. If the skill is not loaded, fetch it from the URL.
-   Read the following:
+1. Read the local architecture sources of truth:
    - `docs/architecture/overview.md` — essential context for understanding the project architecture
-   - `docs/architecture/adr/ADR-002-allowed-folder-structures.md` — allowed folder structures per package type
+   - `docs/architecture/adr/ADR-002-allowed-folder-structures.md` — location responsibilities and dependency rules
+   - `.riviere/role-enforcement.config.ts` — executable location, dependency, and role rules
+   - `.riviere/role-definitions/index.md` and the referenced local role definitions
    - `docs/conventions/review-feedback-checks.md` — especially consumer-mapping ownership checks learned from prior review failures
 2. Skip test files (`.spec.ts`, `.test.ts`) — architecture review applies to production code only.
-3. For each production file under review, read its contents and audit against every rule in the skill's audit checklist.
+3. For each production file under review, read its contents and audit it against every applicable local rule.
 4. Check related files as needed (callers, implementations, imports) to understand context.
 5. Return only review JSON with `verdict`, `summary`, and `findings`.
 
 ## Enforcement Method
 
-Apply the rules from the loaded separation-of-concerns skill mechanically. Do not interpret, contextualize, or weigh circumstances. The rules define what belongs where — your job is to check whether the code matches.
+Apply ADR-002, the role-enforcement configuration, and local role definitions mechanically. Do not invent or import rules from elsewhere.
 
-The skill's audit checklist is the single source of truth. Do not paraphrase, soften, or add criteria beyond what it states.
+The local files listed above are the sources of truth. Do not paraphrase, soften, or add criteria beyond what they state.
 
 **Burden of proof:** Code must satisfy every criterion the skill defines. If it fails any criterion, it fails the rule. There is no "overall it's fine" — each criterion is independently required.
 
-**No judgment calls.** If you find yourself weighing pros and cons, you are doing it wrong. The skill already made the judgment call. Apply it.
+**No judgment calls.** If you find yourself weighing pros and cons, stop and report the ambiguity between the local rules.
 
 When in doubt, FAIL. The burden of proof is on the code to demonstrate it belongs, not on the reviewer to prove it doesn't.
 
 Do not suggest "this could be improved" — state the rule code and mark FAIL.
 
-**Fix suggestions must comply with the same rules.** Never suggest moving code into a layer where it would also violate. Use the loaded separation-of-concerns skill to determine the correct destination.
+**Fix suggestions must comply with the same local rules.** Never suggest moving code into a location where it would also violate.
 
 ## External-Client Domain-Leak Check
 
@@ -86,7 +84,7 @@ Before generating your response, verify:
 - [ ] External-Client Domain-Leak Check performed on every reviewed file
 - [ ] Consumer-Mapping Ownership Check performed on every reviewed `domain/` file
 - [ ] Findings section lists only failures (or "No findings" if PASS)
-- [ ] Audit trail has a section for EVERY file, each with a row for EVERY rule code from the skill's audit checklist
+- [ ] Audit trail has a section for every file and every applicable local rule
 - [ ] Audit summary totals match row counts
 - [ ] Full report written to the file path specified in "Report Path"
 - [ ] JSON verdict returned: `{"verdict": "PASS"}` or `{"verdict": "FAIL"}`
diff --git a/tools/dev-workflow-v2/agents/component-design-architect.md b/tools/dev-workflow-v2/agents/component-design-architect.md
index c4bc60423..a5534e82d 100644
--- a/tools/dev-workflow-v2/agents/component-design-architect.md
+++ b/tools/dev-workflow-v2/agents/component-design-architect.md
@@ -126,10 +126,9 @@ Additional required references for this codebase:
 Codebase examples and anchors:
 
 - Rivière's core graph terminology includes `Component`, `Link`, `Flow`, `Entry Point`, `Domain`, `Draft Component`, `Extraction Config`, `Strict Mode`, `Lenient Mode`, and `Connection Detection`. Use these terms when they fit. If a new concept is needed, say it is proposed rather than pretending it already exists.
-- `@living-architecture/riviere-schema` owns the central graph representation.
-- `@living-architecture/riviere-builder` owns programmatic graph construction.
-- `@living-architecture/riviere-query` owns browser-safe graph querying.
-- `@living-architecture/riviere-extract-ts` owns deterministic TypeScript extraction.
+- `@living-architecture/riviere-schema-published-language` owns the central graph representation.
+- `@living-architecture/riviere-builder-domain-model` owns programmatic graph construction and querying.
+- `@living-architecture/riviere-extract-ts-domain-model` owns deterministic TypeScript extraction.
 - `@living-architecture/riviere-cli` owns CLI feature orchestration and CLI-specific input/output concerns.
 - A typical CLI command flow is: entrypoint translates raw CLI input, command input factory creates typed input, command use case orchestrates load/invoke/save, repository loads and saves the aggregate, output formatter formats the result.
 - `ExtractionProject` is an approved aggregate example in `riviere-cli` extraction. It owns extraction, enrichment, and connection-detection behaviour over module contexts and resolved extraction config.
diff --git a/tools/dev-workflow-v2/docs/factory/factory-map.md b/tools/dev-workflow-v2/docs/factory/factory-map.md
index 4d322e949..7449ada4b 100644
--- a/tools/dev-workflow-v2/docs/factory/factory-map.md
+++ b/tools/dev-workflow-v2/docs/factory/factory-map.md
@@ -8,7 +8,7 @@ Source files are authoritative. This map is an index to those sources.
 
 - Generated or AI-assisted code must be shaped by mechanisms that are reviewable and repeatable.
 - Deterministic checks are preferred when a rule can be expressed accurately.
-- Tests prove behavior; lint, roles, and dependency rules prove structure.
+- Tests prove behaviour; lint, roles, and import rules prove structure.
 - Documentation explains intent, but source files and executable checks define enforcement.
 - Review agents and conventions handle semantic judgment that is not safe to encode mechanically.
 - Local hooks and CI decide when existing checks run; they are not substitutes for the checks themselves.
@@ -22,7 +22,7 @@ developer change
      -> package scripts and Nx targets
         -> ESLint/custom rules
         -> Riviere role enforcement
-        -> dependency-cruiser
+        -> Eclair dependency-cruiser check
         -> tests and coverage
         -> generated-artifact checks
   -> pull request CI gate
@@ -38,8 +38,8 @@ Factory surfaces relate in these ways:
 
 - Hooks and CI decide when checks run.
 - ESLint checks local syntax, AST, naming, import declarations, and test-shape patterns.
-- Riviere role enforcement checks exported declaration roles, role contracts, and role-specific locations.
-- Dependency-cruiser checks path shape and import graph direction.
+- Riviere role enforcement checks location structure, import direction, circular imports, exported declaration roles, and role contracts for standard packages.
+- Rivière role enforcement owns location structure and import graph rules for standard packages. Eclair remains outside role enforcement and retains its frontend Dependency Cruiser check.
 - Tests and coverage prove behavior.
 - Generated-artifact checks keep generated output synchronized with source files.
 - Architecture docs define placement semantics that deterministic checks and agents refer to.
@@ -58,7 +58,7 @@ Definition files:
 Related surfaces:
 
 - Runs package scripts that call Nx targets.
-- Pulls lint, role-check, dependency-cruiser, tests, generated-doc checks, and dead-code checks into the local path when those scripts include them.
+- Pulls lint, role-check, the Eclair dependency check, tests, generated-doc checks, and dead-code checks into the local path when those scripts include them.
 - Commit-message enforcement is separate from code quality enforcement.
 
 Mechanism examples:
@@ -125,8 +125,8 @@ Mechanism examples:
 Relationship boundaries:
 
 - ESLint is for file-local syntax and AST patterns.
-- Dependency-cruiser is for resolved path graph rules.
-- Riviere role enforcement is for annotated declaration roles and role contracts.
+- Riviere role enforcement is for location structure, resolved import paths, annotated declaration roles, and role contracts in standard packages.
+- Eclair's Dependency Cruiser configuration checks its frontend import graph because Eclair is not yet covered by Rivière role enforcement.
 - Review agents are for semantic judgments that are not deterministic enough for lint.
 
 Verification entrypoints:
@@ -144,7 +144,8 @@ Definition files:
 - `.riviere/role-selection-guide.md`
 - `.riviere/role-definitions/**`
 - `.riviere/canonical-role-configurations.md`
-- `packages/riviere-role-enforcement/src/**`
+- `packages/riviere-role-enforcement/domain-model/src/**`
+- `packages/riviere-role-enforcement/use-cases/src/**`
 - `packages/riviere-role-enforcement/role-enforcement-plugin.mjs`
 
 Surface shape:
@@ -172,10 +173,16 @@ role('command-use-case', {
 Illustrative location concept:
 
 ```typescript
-location<RoleName>('src/features/{feature}')
-  .subLocation('/entrypoint', ['cli-entrypoint'])
-  .subLocation('/commands', commandRoles)
-  .subLocation('/domain', domainRoles)
+location<RoleName>('/features/{feature}', {
+  entrypoint: {
+    '{entrypoint}': entrypointRoles,
+  },
+  importRules: {
+    allow: {
+      root: ['infra'],
+    },
+  },
+})
 ```
 
 These snippets explain the concept only. Inspect `.riviere/roles.ts` and `.riviere/role-enforcement.config.ts` for actual role and location definitions.
@@ -224,48 +231,19 @@ Relationship boundaries:
 
 - Role enforcement owns annotated exported declaration responsibility.
 - Role selection and role definitions answer the ownership question before code reaches oxlint.
-- Dependency-cruiser owns path graph direction when no role semantics are needed.
+- Location rules own folder structure and import direction; Oxlint's native import rule rejects circular dependencies during the same run.
 - Architecture docs explain the intent behind role and folder boundaries.
 - Output formatting, adapters, and consumer-specific translation are ownership questions that may require role-definition analysis even when the code is pure and path-correct.
 
 Verification entrypoints:
 
 - `pnpm exec nx run @living-architecture/source:role-check`
-- `pnpm exec tsx packages/riviere-role-enforcement/src/shell/bin.ts .riviere/role-enforcement.config.ts --package <package-path>`
+- `pnpm exec tsx apps/cli/src/shell/role-enforcement-bin.ts .riviere/role-enforcement.config.ts --package <package-path>`
 - `pnpm exec nx test riviere-role-enforcement`
 
-## Dependency Cruiser
-
-Definition files:
-
-- `.dependency-cruiser.mjs`
-- `.dependency-cruiser.frontend.mjs`
-- `.dependency-cruiser.specs.mjs`
-- `package.json`
-
-Surface shape:
-
-- Backend/package import graph rules live in `.dependency-cruiser.mjs`.
-- Frontend import graph rules live in `.dependency-cruiser.frontend.mjs`.
-- Spec placement rules live in `.dependency-cruiser.specs.mjs`.
-- The package script connects those configs to the repository verification path.
-
-Mechanism examples:
-
-- A path rule can reject domain code importing infrastructure code.
-- A path rule can reject one feature importing another feature directly.
-- A spec-placement rule can keep tests colocated with production code rather than detached at a package root.
-- Separate configs let frontend structure differ from backend package structure.
-
-Relationship boundaries:
-
-- Dependency-cruiser owns resolved import path relationships.
-- Riviere role enforcement owns declaration-role relationships.
-- ADR-002 describes the intended folder semantics that these configs encode.
-
-Verification entrypoint:
+## Eclair Dependency Cruiser
 
-- `pnpm depcruise`
+Eclair remains outside Rivière role enforcement. Its frontend import graph is enforced by `.dependency-cruiser.frontend.mjs`; run it with `pnpm depcruise:eclair` or the `depcruise-eclair` Nx target. Standard packages do not have a separate Dependency Cruiser configuration: their location structure, import direction, and circular dependencies are enforced by Rivière role enforcement.
 
 ## Architecture Documentation
 
@@ -289,13 +267,13 @@ Mechanism examples:
 Relationship boundaries:
 
 - Architecture docs define intent.
-- Role enforcement and dependency-cruiser enforce mechanical parts of that intent.
+- Role enforcement enforces the mechanical parts of that intent for standard packages. Eclair's separate frontend Dependency Cruiser check covers Eclair.
 - Review agents handle semantic parts that cannot be encoded safely.
 
 Verification entrypoints:
 
 - `pnpm lint:md`
-- related role-check or dependency-cruiser command when architecture docs and deterministic checks change together
+- the related role-check and, for Eclair changes, `pnpm depcruise:eclair` when architecture docs and deterministic checks change together
 
 ## Tests and Coverage
 
@@ -401,11 +379,11 @@ Definition files:
 - `tools/dev-workflow-v2/commands/*.md`
 - `tools/dev-workflow-v2/states/*.md`
 - `tools/dev-workflow-v2/hooks/**`
-- `tools/dev-workflow-v2/src/features/workflow/domain/workflow.ts`
-- `tools/dev-workflow-v2/src/features/workflow/domain/states/*.ts`
-- `tools/dev-workflow-v2/src/features/workflow/domain/registry.ts`
-- `tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow-cli.ts`
-- `tools/dev-workflow-v2/src/features/workflow/infra/persistence/workflow-definition.ts`
+- `packages/dev-workflow-v2/domain-model/src/domain/workflow.ts`
+- `packages/dev-workflow-v2/domain-model/src/domain/states/*.ts`
+- `packages/dev-workflow-v2/domain-model/src/domain/registry.ts`
+- `packages/dev-workflow-v2/use-cases/src/features/workflow/**`
+- `tools/dev-workflow-v2/src/features/workflow/entrypoint/**`
 - `tools/dev-workflow-v2/src/shell/opencode-plugin.ts`
 - `tools/dev-workflow-v2/.claude-plugin/plugin.json`
 
diff --git a/tools/dev-workflow-v2/package.json b/tools/dev-workflow-v2/package.json
index 1c5f08cc0..95bb0014d 100644
--- a/tools/dev-workflow-v2/package.json
+++ b/tools/dev-workflow-v2/package.json
@@ -8,16 +8,15 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
+    "@living-architecture/dev-workflow-v2-use-cases": "workspace:*",
     "@nt-ai-lab/deterministic-agent-workflow-claude-code": "0.3.7",
     "@nt-ai-lab/deterministic-agent-workflow-cli": "0.3.7",
-    "@nt-ai-lab/deterministic-agent-workflow-dsl": "0.3.6",
     "@nt-ai-lab/deterministic-agent-workflow-engine": "0.3.6",
     "@nt-ai-lab/deterministic-agent-workflow-event-store": "0.3.6",
     "@nt-ai-lab/deterministic-agent-workflow-opencode": "0.3.7",
     "zod": "^3.23.0"
   },
   "devDependencies": {
-    "@types/better-sqlite3": "^7.6.0",
     "@types/node": "^22.0.0",
     "@vitest/coverage-v8": "^2.0.0",
     "typescript": "^5.6.0",
diff --git a/tools/dev-workflow-v2/src/features/workflow/adapters/git/workflow-git-status-reader.ts b/tools/dev-workflow-v2/src/features/workflow/adapters/git/workflow-git-status-reader.ts
deleted file mode 100644
index 6284efbf1..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/adapters/git/workflow-git-status-reader.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import type { GitRepositoryStatus } from '../../../../platform/infra/external-clients/git/index'
-import type { ReadWorkflowGitStatus } from '../../domain/ports/read-git-status'
-
-/** @riviere-role domain-port-adapter */
-export function createWorkflowGitStatusReader(
-  readGitRepositoryStatus: () => GitRepositoryStatus,
-): ReadWorkflowGitStatus {
-  return () => {
-    const status = readGitRepositoryStatus()
-    return {
-      changedFilesVsDefault: status.changedFilesVsDefault,
-      currentBranch: status.currentBranch,
-      hasCommitsVsDefault: status.hasCommitsVsDefault,
-      headCommit: status.headCommit,
-      workingTreeClean: status.workingTreeClean,
-    }
-  }
-}
diff --git a/tools/dev-workflow-v2/src/features/workflow/adapters/github/workflow-pull-request-creator.ts b/tools/dev-workflow-v2/src/features/workflow/adapters/github/workflow-pull-request-creator.ts
deleted file mode 100644
index 2b4fec8c0..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/adapters/github/workflow-pull-request-creator.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import type {
-  GithubPullRequest,
-  GithubPullRequestCreationInput,
-} from '../../../../platform/infra/external-clients/github/index'
-import type { CreateWorkflowPullRequest } from '../../domain/ports/create-pull-request'
-
-/** @riviere-role domain-port-adapter */
-export function createWorkflowPullRequestCreator(
-  createGithubPullRequest: (input: GithubPullRequestCreationInput) => GithubPullRequest,
-): CreateWorkflowPullRequest {
-  return (request) => {
-    const pullRequest = createGithubPullRequest({
-      body: request.body,
-      title: request.title,
-    })
-    return {
-      isDraft: pullRequest.isDraft,
-      prNumber: pullRequest.prNumber,
-      prUrl: pullRequest.prUrl,
-    }
-  }
-}
diff --git a/tools/dev-workflow-v2/src/features/workflow/commands/workflow-cli-definition.ts b/tools/dev-workflow-v2/src/features/workflow/commands/workflow-cli-definition.ts
deleted file mode 100644
index 9eec0b80a..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/commands/workflow-cli-definition.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import {
-  defineRoutes, arg 
-} from '@nt-ai-lab/deterministic-agent-workflow-cli'
-import type { Workflow } from '../domain/workflow'
-import type { WorkflowState } from '../domain/workflow-types'
-import { STATE_NAME_SCHEMA } from '../domain/workflow-types'
-import { BASH_FORBIDDEN } from '../domain/registry'
-import { isWriteAllowed } from '../domain/workflow-predicates'
-
-export const ROUTES = defineRoutes<Workflow, WorkflowState>({
-  init: { type: 'session-start' },
-  transition: {
-    type: 'transition',
-    args: [arg.state('STATE', STATE_NAME_SCHEMA)],
-  },
-
-  'record-issue': {
-    type: 'transaction',
-    args: [arg.number('number')],
-    handler: (w, n) => w.executeRecording('record-issue', n),
-  },
-  'record-branch': {
-    type: 'transaction',
-    args: [arg.string('branch')],
-    handler: (w, b) => w.executeRecording('record-branch', b),
-  },
-  'record-pr': {
-    type: 'transaction',
-    args: [arg.number('number'), arg.string('url').optional()],
-    handler: (w, n, url) => w.executeRecording('record-pr', n, url),
-  },
-  'create-pr': {
-    type: 'transaction',
-    args: [arg.rest()],
-    handler: (w, createArgs) => w.createPr(createArgs),
-  },
-  'record-ci-passed': {
-    type: 'transaction',
-    args: [],
-    handler: (w) => w.executeRecording('record-ci-passed'),
-  },
-  'record-ci-failed': {
-    type: 'transaction',
-    args: [arg.string('output')],
-    handler: (w, o) => w.executeRecording('record-ci-failed', o),
-  },
-  'verify-feedback-addressed': {
-    type: 'transaction',
-    args: [],
-    handler: (w) => w.verifyFeedbackAddressed(),
-  },
-})
-
-export const PRE_TOOL_USE_POLICY = {
-  bashForbidden: BASH_FORBIDDEN,
-  isWriteAllowed,
-} as const
diff --git a/tools/dev-workflow-v2/src/features/workflow/data-access/workflow-definition.spec.ts b/tools/dev-workflow-v2/src/features/workflow/data-access/workflow-definition.spec.ts
deleted file mode 100644
index 06191edc2..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/data-access/workflow-definition.spec.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-import { WORKFLOW_DEFINITION } from './workflow-definition'
-import { Workflow } from '../domain/workflow'
-import type { BaseEvent } from '@nt-ai-lab/deterministic-agent-workflow-engine'
-import { WorkflowStateError } from '@nt-ai-lab/deterministic-agent-workflow-engine'
-import type {
-  WorkflowState, StateName 
-} from '../domain/workflow-types'
-
-type WorkflowDeps = Parameters<typeof Workflow.rehydrate>[1]
-
-function makeWorkflowDeps(): WorkflowDeps {
-  return {
-    getGitInfo: () => ({
-      currentBranch: 'main',
-      workingTreeClean: true,
-      headCommit: 'abc123',
-      changedFilesVsDefault: [],
-      hasCommitsVsDefault: false,
-    }),
-    getPrFeedback: () => ({
-      reviewDecision: null,
-      coderabbitReviewSeen: true,
-      unresolvedCount: 0,
-      threads: [],
-    }),
-    createPullRequest: () => ({
-      prNumber: 1,
-      prUrl: 'https://github.com/example/repo/pull/1',
-      isDraft: false,
-    }),
-    listSessionReviews: () => [],
-    sleepMs: () => undefined,
-    now: () => '2026-01-01T00:00:00Z',
-  }
-}
-
-function buildTransitionEvent(
-  from: StateName,
-  to: StateName,
-  stateBefore: WorkflowState,
-  stateAfter: WorkflowState,
-  now: string,
-): BaseEvent {
-  const fn = WORKFLOW_DEFINITION.buildTransitionEvent
-  if (fn === undefined) throw new WorkflowStateError('buildTransitionEvent not defined')
-  return fn(from, to, stateBefore, stateAfter, now)
-}
-
-describe('WORKFLOW_DEFINITION', () => {
-  it('builds a Workflow in IMPLEMENTING state from initial state', () => {
-    const workflow = WORKFLOW_DEFINITION.buildWorkflow(
-      WORKFLOW_DEFINITION.initialState(),
-      makeWorkflowDeps(),
-    )
-    expect(workflow.getState().currentStateMachineState).toStrictEqual('IMPLEMENTING')
-  })
-
-  it('builds a Workflow from initial state (pass-through, no events folded)', () => {
-    const state = WORKFLOW_DEFINITION.initialState()
-    const workflow = WORKFLOW_DEFINITION.buildWorkflow(state, makeWorkflowDeps())
-    expect(workflow.getState().currentStateMachineState).toStrictEqual('IMPLEMENTING')
-  })
-
-  it('folds a valid event onto state', () => {
-    const event: BaseEvent & Record<string, unknown> = {
-      type: 'issue-recorded',
-      at: '2026-01-01T00:00:00Z',
-      issueNumber: 42,
-    }
-    const state = WORKFLOW_DEFINITION.fold(WORKFLOW_DEFINITION.initialState(), event)
-    const workflow = WORKFLOW_DEFINITION.buildWorkflow(state, makeWorkflowDeps())
-    expect(workflow.getState().githubIssue).toStrictEqual(42)
-  })
-
-  it('folds session-started event and makes transcriptPath available', () => {
-    const event: BaseEvent & Record<string, unknown> = {
-      type: 'session-started',
-      at: '2026-01-01T00:00:00Z',
-      transcriptPath: 'some/transcript.jsonl',
-    }
-    const state = WORKFLOW_DEFINITION.fold(WORKFLOW_DEFINITION.initialState(), event)
-    const workflow = WORKFLOW_DEFINITION.buildWorkflow(state, makeWorkflowDeps())
-    expect(workflow.getTranscriptPath()).toBe('some/transcript.jsonl')
-  })
-
-  it('returns state unchanged for unknown event types (e.g. platform observation events)', () => {
-    const event: BaseEvent = {
-      type: 'identity-verified',
-      at: '2026-01-01T00:00:00Z',
-    }
-    const state = WORKFLOW_DEFINITION.initialState()
-    const result = WORKFLOW_DEFINITION.fold(state, event)
-    expect(result).toStrictEqual(state)
-  })
-
-  it('throws when a known event type has a malformed payload', () => {
-    const malformed: BaseEvent & Record<string, unknown> = {
-      type: 'issue-recorded',
-      at: '2026-01-01T00:00:00Z',
-      issueNumber: 'not-a-number',
-    }
-    expect(() => WORKFLOW_DEFINITION.fold(WORKFLOW_DEFINITION.initialState(), malformed)).toThrow(
-      'Malformed workflow event "issue-recorded"',
-    )
-  })
-
-  it('returns initial state with IMPLEMENTING', () => {
-    const initial = WORKFLOW_DEFINITION.initialState()
-    expect(initial.currentStateMachineState).toStrictEqual('IMPLEMENTING')
-  })
-
-  it('stateSchema parses valid state name', () => {
-    expect(WORKFLOW_DEFINITION.stateSchema.parse('IMPLEMENTING')).toStrictEqual('IMPLEMENTING')
-  })
-
-  it('stateSchema throws on invalid state name', () => {
-    expect(() => WORKFLOW_DEFINITION.stateSchema.parse('UNKNOWN_STATE')).toThrow(
-      'Invalid enum value',
-    )
-  })
-
-  describe('getRegistry', () => {
-    it('returns the workflow registry', () => {
-      const registry = WORKFLOW_DEFINITION.getRegistry()
-      expect(registry.IMPLEMENTING).toBeDefined()
-      expect(registry.REVIEWING).toBeDefined()
-      expect(registry.COMPLETE).toBeDefined()
-    })
-
-    it('marks COMPLETE and BLOCKED as write-forbidden states', () => {
-      const registry = WORKFLOW_DEFINITION.getRegistry()
-      expect(registry.BLOCKED.forbidden).toStrictEqual({ write: true })
-      expect(registry.COMPLETE.forbidden).toStrictEqual({ write: true })
-    })
-  })
-
-  describe('buildTransitionContext', () => {
-    it('builds context with state and transition info', () => {
-      const state: WorkflowState = {
-        currentStateMachineState: 'IMPLEMENTING',
-        architectureReviewPassed: false,
-        codeReviewPassed: false,
-        bugScannerPassed: false,
-        taskCheckPassed: false,
-        ciPassed: false,
-        feedbackClean: false,
-        feedbackAddressed: false,
-        prNumber: 42,
-      }
-      const deps = makeWorkflowDeps()
-      const ctx = WORKFLOW_DEFINITION.buildTransitionContext(
-        state,
-        'IMPLEMENTING',
-        'REVIEWING',
-        deps,
-      )
-      expect(ctx.state).toBe(state)
-      expect(ctx.from).toStrictEqual('IMPLEMENTING')
-      expect(ctx.to).toStrictEqual('REVIEWING')
-    })
-  })
-
-  describe('buildTransitionEvent', () => {
-    const baseBefore: WorkflowState = {
-      currentStateMachineState: 'IMPLEMENTING',
-      architectureReviewPassed: true,
-      codeReviewPassed: true,
-      bugScannerPassed: true,
-      taskCheckPassed: false,
-      ciPassed: true,
-      feedbackClean: true,
-      feedbackAddressed: true,
-    }
-
-    it('produces event without stateOverrides when no state changes', () => {
-      const event = buildTransitionEvent(
-        'IMPLEMENTING',
-        'REVIEWING',
-        baseBefore,
-        baseBefore,
-        '2026-01-01T00:00:00Z',
-      )
-      expect(event).toStrictEqual({
-        type: 'transitioned',
-        at: '2026-01-01T00:00:00Z',
-        from: 'IMPLEMENTING',
-        to: 'REVIEWING',
-      })
-    })
-
-    it('produces event with stateOverrides when onEntry mutates state', () => {
-      const stateAfter: WorkflowState = {
-        ...baseBefore,
-        architectureReviewPassed: false,
-        codeReviewPassed: false,
-        bugScannerPassed: false,
-        ciPassed: false,
-        feedbackClean: false,
-        feedbackAddressed: false,
-      }
-      const event = buildTransitionEvent(
-        'REVIEWING',
-        'IMPLEMENTING',
-        baseBefore,
-        stateAfter,
-        '2026-01-01T00:00:00Z',
-      )
-      expect(event).toHaveProperty('stateOverrides', {
-        architectureReviewPassed: false,
-        codeReviewPassed: false,
-        bugScannerPassed: false,
-        ciPassed: false,
-        feedbackClean: false,
-        feedbackAddressed: false,
-      })
-    })
-
-    it('does not include currentStateMachineState in stateOverrides', () => {
-      const stateAfter: WorkflowState = {
-        ...baseBefore,
-        currentStateMachineState: 'REVIEWING',
-      }
-      const event = buildTransitionEvent(
-        'IMPLEMENTING',
-        'REVIEWING',
-        baseBefore,
-        stateAfter,
-        '2026-01-01T00:00:00Z',
-      )
-      expect(event).not.toHaveProperty('stateOverrides')
-    })
-  })
-})
diff --git a/tools/dev-workflow-v2/src/features/workflow/data-access/workflow-definition.ts b/tools/dev-workflow-v2/src/features/workflow/data-access/workflow-definition.ts
deleted file mode 100644
index fef10fb61..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/data-access/workflow-definition.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import type {
-  WorkflowDefinition, BaseEvent 
-} from '@nt-ai-lab/deterministic-agent-workflow-engine'
-import { WorkflowStateError } from '@nt-ai-lab/deterministic-agent-workflow-engine'
-import type { TransitionContext } from '@nt-ai-lab/deterministic-agent-workflow-dsl'
-import type {
-  WorkflowState, StateName, WorkflowOperation 
-} from '../domain/workflow-types'
-import { Workflow } from '../domain/workflow'
-import {
-  INITIAL_STATE, STATE_NAME_SCHEMA 
-} from '../domain/workflow-types'
-import {
-  getOperationBody, getTransitionTitle 
-} from '../domain/output-messages'
-import { applyEvent } from '../domain/fold'
-import {
-  getKnownWorkflowEventTypes, parseWorkflowEvent 
-} from '../domain/workflow-events'
-import { WORKFLOW_REGISTRY } from '../domain/registry'
-
-type WorkflowDeps = Parameters<typeof Workflow.rehydrate>[1]
-const KNOWN_EVENT_TYPES: ReadonlySet<string> = new Set(getKnownWorkflowEventTypes())
-
-function diffStateOverrides(
-  stateBefore: WorkflowState,
-  stateAfter: WorkflowState,
-): Record<string, unknown> {
-  const overrides: Record<string, unknown> = {}
-  const beforeEntries = new Map(Object.entries(stateBefore))
-  for (const [key, value] of Object.entries(stateAfter)) {
-    if (key === 'currentStateMachineState') continue
-    if (value !== beforeEntries.get(key)) {
-      overrides[key] = value
-    }
-  }
-  return overrides
-}
-
-export const WORKFLOW_DEFINITION: WorkflowDefinition<
-  Workflow,
-  WorkflowState,
-  WorkflowDeps,
-  StateName,
-  WorkflowOperation
-> = {
-  fold(state: WorkflowState, event: BaseEvent): WorkflowState {
-    try {
-      return applyEvent(state, parseWorkflowEvent(event))
-    } catch (error) {
-      if (KNOWN_EVENT_TYPES.has(event.type)) {
-        throw new WorkflowStateError(`Malformed workflow event "${event.type}": ${String(error)}`)
-      }
-      return state
-    }
-  },
-  buildWorkflow(state: WorkflowState, deps: WorkflowDeps): Workflow {
-    return Workflow.rehydrate(state, deps)
-  },
-  stateSchema: STATE_NAME_SCHEMA,
-  initialState(): typeof INITIAL_STATE {
-    return INITIAL_STATE
-  },
-  getRegistry: () => WORKFLOW_REGISTRY,
-  buildTransitionContext(
-    state: WorkflowState,
-    from: StateName,
-    to: StateName,
-    deps: WorkflowDeps,
-  ): TransitionContext<WorkflowState, StateName> {
-    return {
-      state,
-      gitInfo: deps.getGitInfo(),
-      from,
-      to,
-    }
-  },
-  buildTransitionEvent(
-    from: StateName,
-    to: StateName,
-    stateBefore: WorkflowState,
-    stateAfter: WorkflowState,
-    now: string,
-  ): BaseEvent {
-    const overrides = diffStateOverrides(stateBefore, stateAfter)
-    const event = {
-      type: 'transitioned',
-      at: now,
-      from,
-      to,
-      ...(Object.keys(overrides).length > 0 ? { stateOverrides: overrides } : {}),
-    }
-    return event
-  },
-  getOperationBody(op) {
-    return getOperationBody(op)
-  },
-  getTransitionTitle(to) {
-    return getTransitionTitle(to)
-  },
-}
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/fold.ts b/tools/dev-workflow-v2/src/features/workflow/domain/fold.ts
deleted file mode 100644
index b91bb4b64..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/domain/fold.ts
+++ /dev/null
@@ -1,152 +0,0 @@
-import type { WorkflowEvent } from './workflow-events'
-import {
-  LIVING_ARCHITECTURE_REVIEW_TYPE_SCHEMA, type WorkflowState 
-} from './workflow-types'
-
-function applyRecordedReviewVerdict(
-  state: WorkflowState,
-  event: Extract<WorkflowEvent, { type: 'review-recorded' }>,
-): WorkflowState {
-  const parsedReviewType = LIVING_ARCHITECTURE_REVIEW_TYPE_SCHEMA.safeParse(event.reviewType)
-  if (!parsedReviewType.success) {
-    return state
-  }
-
-  const passed = event.verdict === 'PASS'
-
-  switch (parsedReviewType.data) {
-    case 'architecture-review':
-      return {
-        ...state,
-        architectureReviewPassed: passed,
-      }
-    case 'code-review':
-      return {
-        ...state,
-        codeReviewPassed: passed,
-      }
-    case 'bug-scanner':
-      return {
-        ...state,
-        bugScannerPassed: passed,
-      }
-    case 'task-check':
-      return {
-        ...state,
-        taskCheckPassed: passed,
-      }
-  }
-}
-
-export const EMPTY_STATE: WorkflowState = {
-  currentStateMachineState: 'IMPLEMENTING',
-  architectureReviewPassed: false,
-  codeReviewPassed: false,
-  bugScannerPassed: false,
-  taskCheckPassed: false,
-  ciPassed: false,
-  feedbackClean: false,
-  feedbackAddressed: false,
-}
-
-function applyTransitioned(
-  state: WorkflowState,
-  event: Extract<WorkflowEvent, { type: 'transitioned' }>,
-): WorkflowState {
-  const newPreBlockedState = event.to === 'BLOCKED' ? event.from : undefined
-  return {
-    ...state,
-    ...event.stateOverrides,
-    currentStateMachineState: event.to,
-    preBlockedState: newPreBlockedState,
-  }
-}
-
-function applyReviewEvent(state: WorkflowState, event: WorkflowEvent): WorkflowState | undefined {
-  switch (event.type) {
-    case 'architecture-review-completed':
-      return {
-        ...state,
-        architectureReviewPassed: event.passed,
-      }
-    case 'code-review-completed':
-      return {
-        ...state,
-        codeReviewPassed: event.passed,
-      }
-    case 'bug-scanner-completed':
-      return {
-        ...state,
-        bugScannerPassed: event.passed,
-      }
-    case 'ci-completed':
-      return {
-        ...state,
-        ciPassed: event.passed,
-      }
-    case 'feedback-checked':
-      return {
-        ...state,
-        feedbackClean: event.clean,
-        feedbackUnresolvedCount: event.unresolvedCount,
-      }
-    case 'feedback-addressed':
-      return {
-        ...state,
-        feedbackAddressed: true,
-      }
-    case 'pr-feedback-verification-failed':
-      return {
-        ...state,
-        prFeedbackVerificationFailedReason: event.reason,
-      }
-    case 'review-recorded':
-      return applyRecordedReviewVerdict(state, event)
-  }
-}
-
-function applyRecordingEvent(state: WorkflowState, event: WorkflowEvent): WorkflowState {
-  const reviewResult = applyReviewEvent(state, event)
-  if (reviewResult !== undefined) return reviewResult
-  switch (event.type) {
-    case 'issue-recorded':
-      return {
-        ...state,
-        githubIssue: event.issueNumber,
-      }
-    case 'branch-recorded':
-      return {
-        ...state,
-        featureBranch: event.branch,
-      }
-    case 'pr-recorded':
-      return {
-        ...state,
-        prNumber: event.prNumber,
-        prUrl: event.prUrl,
-      }
-    case 'task-check-passed':
-      return {
-        ...state,
-        taskCheckPassed: true,
-      }
-    case 'session-started':
-      return {
-        ...state,
-        ...(event.transcriptPath !== undefined && { transcriptPath: event.transcriptPath }),
-      }
-    default:
-      return state
-  }
-}
-
-/** @riviere-role domain-service */
-export function applyEvent(state: WorkflowState, event: WorkflowEvent): WorkflowState {
-  if (event.type === 'transitioned') return applyTransitioned(state, event)
-  return applyRecordingEvent(state, event)
-}
-
-/** @riviere-role domain-service */
-export function applyEvents(events: readonly WorkflowEvent[]): WorkflowState {
-  return events.reduce(applyEvent, EMPTY_STATE)
-}
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/git-status.ts b/tools/dev-workflow-v2/src/features/workflow/domain/git-status.ts
deleted file mode 100644
index b2be5fb4b..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/domain/git-status.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/** @riviere-role value-object */
-export interface WorkflowGitStatus {
-  readonly changedFilesVsDefault: readonly string[]
-  readonly currentBranch: string
-  readonly hasCommitsVsDefault: boolean
-  readonly headCommit: string
-  readonly workingTreeClean: boolean
-}
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/ports/create-pull-request.ts b/tools/dev-workflow-v2/src/features/workflow/domain/ports/create-pull-request.ts
deleted file mode 100644
index 980904a04..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/domain/ports/create-pull-request.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import type { PullRequestCreationRequest } from '../pull-request-description'
-import type { WorkflowPullRequest } from '../pull-request'
-
-/** @riviere-role domain-port */
-export type CreateWorkflowPullRequest = (request: PullRequestCreationRequest) => WorkflowPullRequest
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/ports/read-git-status.ts b/tools/dev-workflow-v2/src/features/workflow/domain/ports/read-git-status.ts
deleted file mode 100644
index ab13cb2eb..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/domain/ports/read-git-status.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import type { WorkflowGitStatus } from '../git-status'
-
-/** @riviere-role domain-port */
-export type ReadWorkflowGitStatus = () => WorkflowGitStatus
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/ports/read-pull-request-feedback.ts b/tools/dev-workflow-v2/src/features/workflow/domain/ports/read-pull-request-feedback.ts
deleted file mode 100644
index 0d58e08fd..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/domain/ports/read-pull-request-feedback.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import type { WorkflowPullRequestFeedback } from '../pull-request-feedback'
-
-/** @riviere-role domain-port */
-export type ReadWorkflowPullRequestFeedback = (prNumber: number) => WorkflowPullRequestFeedback
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/pull-request-feedback.ts b/tools/dev-workflow-v2/src/features/workflow/domain/pull-request-feedback.ts
deleted file mode 100644
index 6af5b7c6b..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/domain/pull-request-feedback.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/** @riviere-role value-object */
-export interface WorkflowUnresolvedPullRequestThread {
-  readonly id: string
-  readonly isResolved: boolean
-  readonly isOutdated: boolean
-  readonly path: string | null
-  readonly line: number | null
-  readonly comments: readonly {
-    author: { login: string } | null
-    body: string
-    url?: string
-  }[]
-}
-
-/** @riviere-role value-object */
-export interface WorkflowPullRequestFeedback {
-  readonly reviewDecision: string | null
-  readonly coderabbitReviewSeen: boolean
-  readonly unresolvedCount: number
-  readonly threads: readonly WorkflowUnresolvedPullRequestThread[]
-}
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/pull-request.ts b/tools/dev-workflow-v2/src/features/workflow/domain/pull-request.ts
deleted file mode 100644
index a6dc1066a..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/domain/pull-request.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/** @riviere-role value-object */
-export interface WorkflowPullRequest {
-  readonly prNumber: number
-  readonly prUrl: string
-  readonly isDraft: boolean
-}
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/registry.ts b/tools/dev-workflow-v2/src/features/workflow/domain/registry.ts
deleted file mode 100644
index dbf86f0d7..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/domain/registry.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import type { BashForbiddenConfig } from '@nt-ai-lab/deterministic-agent-workflow-dsl'
-import type {
-  ConcreteRegistry, ConcreteStateDefinition 
-} from './workflow-types'
-import { parseStateName } from './workflow-types'
-import { implementingState } from './states/implementing'
-import { reviewingState } from './states/reviewing'
-import { submittingPrState } from './states/submitting-pr'
-import { awaitingCiState } from './states/awaiting-ci'
-import { awaitingPrFeedbackState } from './states/awaiting-pr-feedback'
-import { addressingFeedbackState } from './states/addressing-feedback'
-import { reflectingState } from './states/reflecting'
-import { completeState } from './states/complete'
-import { blockedState } from './states/blocked'
-
-export const BASH_FORBIDDEN: BashForbiddenConfig = {
-  commands: ['git push', 'gh pr'],
-  flags: ['--no-verify', '--force', '--hard'],
-}
-
-/** @riviere-role domain-service */
-export function getStateDefinition(state: string): ConcreteStateDefinition {
-  return WORKFLOW_REGISTRY[parseStateName(state)]
-}
-
-export const WORKFLOW_REGISTRY: ConcreteRegistry = {
-  IMPLEMENTING: implementingState,
-  REVIEWING: reviewingState,
-  SUBMITTING_PR: submittingPrState,
-  AWAITING_CI: awaitingCiState,
-  AWAITING_PR_FEEDBACK: awaitingPrFeedbackState,
-  ADDRESSING_FEEDBACK: addressingFeedbackState,
-  REFLECTING: reflectingState,
-  COMPLETE: completeState,
-  BLOCKED: blockedState,
-}
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/states/addressing-feedback.ts b/tools/dev-workflow-v2/src/features/workflow/domain/states/addressing-feedback.ts
deleted file mode 100644
index 135d751b0..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/domain/states/addressing-feedback.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import type {
-  ConcreteStateDefinition, WorkflowState 
-} from '../workflow-types'
-import {
-  pass, fail 
-} from '@nt-ai-lab/deterministic-agent-workflow-dsl'
-
-export const addressingFeedbackState: ConcreteStateDefinition = {
-  emoji: '🔧',
-  agentInstructions: 'states/addressing_feedback.md',
-  canTransitionTo: ['REVIEWING', 'BLOCKED'],
-  allowedWorkflowOperations: ['verify-feedback-addressed'],
-  forbidden: { write: true },
-
-  transitionGuard: (ctx) => {
-    if (ctx.to === 'BLOCKED') return pass()
-    if (!ctx.state.feedbackAddressed)
-      return fail('Feedback not addressed. Run verify-feedback-addressed first.')
-    if (!ctx.state.feedbackClean)
-      return fail(
-        'PR feedback is not yet clear. Resolve all feedback, ensure no CHANGES_REQUESTED review remains, then run verify-feedback-addressed again.',
-      )
-    return pass()
-  },
-
-  onEntry: (state: WorkflowState): WorkflowState => ({
-    ...state,
-    feedbackAddressed: false,
-    feedbackClean: false,
-  }),
-}
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/states/awaiting-ci.ts b/tools/dev-workflow-v2/src/features/workflow/domain/states/awaiting-ci.ts
deleted file mode 100644
index 676836d69..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/domain/states/awaiting-ci.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import type { ConcreteStateDefinition } from '../workflow-types'
-import {
-  pass, fail 
-} from '@nt-ai-lab/deterministic-agent-workflow-dsl'
-
-export const awaitingCiState: ConcreteStateDefinition = {
-  emoji: '⏳',
-  agentInstructions: 'states/awaiting_ci.md',
-  canTransitionTo: ['AWAITING_PR_FEEDBACK', 'IMPLEMENTING', 'BLOCKED'],
-  allowedWorkflowOperations: ['record-ci-passed', 'record-ci-failed'],
-  forbidden: { write: true },
-  allowForbidden: { bash: ['gh pr checks'] },
-
-  transitionGuard: (ctx) => {
-    if (ctx.to === 'AWAITING_PR_FEEDBACK' && !ctx.state.ciPassed)
-      return fail('CI not passed. Run record-ci-passed first.')
-    if (ctx.to === 'IMPLEMENTING' && ctx.state.ciPassed)
-      return fail('CI passed. Transition to AWAITING_PR_FEEDBACK, not IMPLEMENTING.')
-    return pass()
-  },
-}
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/states/awaiting-pr-feedback.ts b/tools/dev-workflow-v2/src/features/workflow/domain/states/awaiting-pr-feedback.ts
deleted file mode 100644
index 6690ff32d..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/domain/states/awaiting-pr-feedback.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { ConcreteStateDefinition } from '../workflow-types'
-
-export const awaitingPrFeedbackState: ConcreteStateDefinition = {
-  emoji: '💬',
-  agentInstructions: 'states/awaiting_pr_feedback.md',
-  canTransitionTo: ['ADDRESSING_FEEDBACK', 'REFLECTING'],
-  allowedWorkflowOperations: [],
-  forbidden: { write: true },
-}
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/states/blocked.ts b/tools/dev-workflow-v2/src/features/workflow/domain/states/blocked.ts
deleted file mode 100644
index 5d499ac49..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/domain/states/blocked.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import type { ConcreteStateDefinition } from '../workflow-types'
-import {
-  pass, fail 
-} from '@nt-ai-lab/deterministic-agent-workflow-dsl'
-
-export const blockedState: ConcreteStateDefinition = {
-  emoji: '⚠️',
-  agentInstructions: 'states/blocked.md',
-  allowIdle: true,
-  forbidden: { write: true },
-  canTransitionTo: [
-    'IMPLEMENTING',
-    'REVIEWING',
-    'SUBMITTING_PR',
-    'AWAITING_CI',
-    'AWAITING_PR_FEEDBACK',
-    'ADDRESSING_FEEDBACK',
-    'REFLECTING',
-  ],
-  allowedWorkflowOperations: [],
-
-  transitionGuard: (ctx) => {
-    const preBlockedState = ctx.state.preBlockedState
-    if (ctx.to !== preBlockedState) {
-      /* v8 ignore next 4 */
-      return fail(
-        `Cannot transition from BLOCKED to ${ctx.to}. Must return to pre-blocked state: ${preBlockedState ?? 'unknown'}.`,
-      )
-    }
-    return pass()
-  },
-}
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/states/complete.ts b/tools/dev-workflow-v2/src/features/workflow/domain/states/complete.ts
deleted file mode 100644
index 0105ba82b..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/domain/states/complete.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { ConcreteStateDefinition } from '../workflow-types'
-
-export const completeState: ConcreteStateDefinition = {
-  emoji: '✅',
-  agentInstructions: 'states/complete.md',
-  allowIdle: true,
-  canTransitionTo: [],
-  allowedWorkflowOperations: [],
-  forbidden: { write: true },
-}
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/states/implementing.ts b/tools/dev-workflow-v2/src/features/workflow/domain/states/implementing.ts
deleted file mode 100644
index d1f875934..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/domain/states/implementing.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import type {
-  ConcreteStateDefinition, WorkflowState 
-} from '../workflow-types'
-import {
-  pass, fail 
-} from '@nt-ai-lab/deterministic-agent-workflow-dsl'
-
-export const implementingState: ConcreteStateDefinition = {
-  emoji: '🔨',
-  agentInstructions: 'states/implementing.md',
-  canTransitionTo: ['REVIEWING', 'BLOCKED'],
-  allowedWorkflowOperations: ['record-issue', 'record-branch'],
-  forbidden: { write: true },
-
-  transitionGuard: (ctx) => {
-    /* v8 ignore next */
-    if (ctx.to === 'BLOCKED') return pass()
-    if (!ctx.gitInfo.hasCommitsVsDefault)
-      return fail('No commits beyond default branch. Write code and commit before reviewing.')
-    if (!ctx.gitInfo.workingTreeClean)
-      return fail('Working tree is not clean. Commit all changes before transitioning.')
-    if (!ctx.state.githubIssue) return fail('No issue recorded. Run record-issue first.')
-    return pass()
-  },
-
-  onEntry: (state: WorkflowState): WorkflowState => ({
-    ...state,
-    architectureReviewPassed: false,
-    codeReviewPassed: false,
-    bugScannerPassed: false,
-    taskCheckPassed: false,
-    ciPassed: false,
-    feedbackClean: false,
-    feedbackAddressed: false,
-  }),
-}
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/states/reflecting.ts b/tools/dev-workflow-v2/src/features/workflow/domain/states/reflecting.ts
deleted file mode 100644
index 2eda177d8..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/domain/states/reflecting.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { ConcreteStateDefinition } from '../workflow-types'
-
-export const reflectingState: ConcreteStateDefinition = {
-  emoji: '🪞',
-  agentInstructions: 'states/reflecting.md',
-  canTransitionTo: ['COMPLETE', 'BLOCKED'],
-  allowedWorkflowOperations: [],
-  forbidden: { write: true },
-}
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/states/reviewing.ts b/tools/dev-workflow-v2/src/features/workflow/domain/states/reviewing.ts
deleted file mode 100644
index 059a4b697..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/domain/states/reviewing.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import type { ConcreteStateDefinition } from '../workflow-types'
-import {
-  pass, fail 
-} from '@nt-ai-lab/deterministic-agent-workflow-dsl'
-
-export const reviewingState: ConcreteStateDefinition = {
-  emoji: '📋',
-  agentInstructions: 'states/reviewing.md',
-  canTransitionTo: ['SUBMITTING_PR', 'IMPLEMENTING', 'BLOCKED'],
-  forbidden: { write: true },
-  allowedWorkflowOperations: ['record-review'],
-
-  transitionGuard: (ctx) => {
-    const taskCheckRequired = ctx.state.githubIssue !== undefined
-    const allPassed =
-      ctx.state.architectureReviewPassed &&
-      ctx.state.codeReviewPassed &&
-      ctx.state.bugScannerPassed &&
-      (!taskCheckRequired || ctx.state.taskCheckPassed)
-
-    if (ctx.to === 'SUBMITTING_PR' && !allPassed)
-      return fail(
-        taskCheckRequired
-          ? 'Not all reviews passed. Each of architecture-review, code-review, bug-scanner, and task-check must pass.'
-          : 'Not all reviews passed. Each of architecture-review, code-review, and bug-scanner must pass.',
-      )
-    if (ctx.to === 'IMPLEMENTING' && allPassed)
-      return fail('All reviews passed. Transition to SUBMITTING_PR, not IMPLEMENTING.')
-    return pass()
-  },
-}
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/states/submitting-pr.ts b/tools/dev-workflow-v2/src/features/workflow/domain/states/submitting-pr.ts
deleted file mode 100644
index 75d9cecb1..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/domain/states/submitting-pr.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import type { ConcreteStateDefinition } from '../workflow-types'
-import {
-  pass, fail 
-} from '@nt-ai-lab/deterministic-agent-workflow-dsl'
-
-export const submittingPrState: ConcreteStateDefinition = {
-  emoji: '🚀',
-  agentInstructions: 'states/submitting_pr.md',
-  canTransitionTo: ['AWAITING_CI', 'BLOCKED'],
-  allowedWorkflowOperations: ['record-pr', 'create-pr'],
-  forbidden: { write: true },
-
-  allowForbidden: { bash: ['git push'] },
-
-  transitionGuard: (ctx) => {
-    if (!ctx.state.prNumber) return fail('prNumber not set. Run record-pr first.')
-    return pass()
-  },
-}
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/workflow-events.spec.ts b/tools/dev-workflow-v2/src/features/workflow/domain/workflow-events.spec.ts
deleted file mode 100644
index cdbafc104..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/domain/workflow-events.spec.ts
+++ /dev/null
@@ -1,435 +0,0 @@
-import {
-  WORKFLOW_EVENT_SCHEMA, parseWorkflowEvent, type WorkflowEvent 
-} from './workflow-events'
-
-const AT = '2026-01-01T00:00:00Z'
-
-describe('WORKFLOW_EVENT_SCHEMA — session-started', () => {
-  it('accepts valid payload', () => {
-    const result: WorkflowEvent = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'session-started',
-      at: AT,
-    })
-    expect(result.type).toStrictEqual('session-started')
-  })
-
-  it('accepts optional repository', () => {
-    const result = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'session-started',
-      at: AT,
-      repository: 'owner/repo',
-    })
-    expect(result.type).toStrictEqual('session-started')
-  })
-})
-
-describe('WORKFLOW_EVENT_SCHEMA — issue-recorded', () => {
-  it('accepts valid payload', () => {
-    const result = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'issue-recorded',
-      at: AT,
-      issueNumber: 42,
-    })
-    expect(result.type).toStrictEqual('issue-recorded')
-  })
-
-  it('rejects missing issueNumber', () => {
-    expect(() =>
-      WORKFLOW_EVENT_SCHEMA.parse({
-        type: 'issue-recorded',
-        at: AT,
-      }),
-    ).toThrow('Required')
-  })
-})
-
-describe('WORKFLOW_EVENT_SCHEMA — branch-recorded', () => {
-  it('accepts valid payload', () => {
-    const result = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'branch-recorded',
-      at: AT,
-      branch: 'feature/foo',
-    })
-    expect(result.type).toStrictEqual('branch-recorded')
-  })
-
-  it('rejects missing branch', () => {
-    expect(() =>
-      WORKFLOW_EVENT_SCHEMA.parse({
-        type: 'branch-recorded',
-        at: AT,
-      }),
-    ).toThrow('Required')
-  })
-})
-
-describe('WORKFLOW_EVENT_SCHEMA — architecture-review-completed', () => {
-  it('accepts passed payload', () => {
-    const result = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'architecture-review-completed',
-      at: AT,
-      passed: true,
-    })
-    expect(result.type).toStrictEqual('architecture-review-completed')
-  })
-
-  it('rejects missing passed', () => {
-    expect(() =>
-      WORKFLOW_EVENT_SCHEMA.parse({
-        type: 'architecture-review-completed',
-        at: AT,
-      }),
-    ).toThrow('Required')
-  })
-})
-
-describe('WORKFLOW_EVENT_SCHEMA — code-review-completed', () => {
-  it('accepts passed payload', () => {
-    const result = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'code-review-completed',
-      at: AT,
-      passed: true,
-    })
-    expect(result.type).toStrictEqual('code-review-completed')
-  })
-
-  it('rejects missing passed', () => {
-    expect(() =>
-      WORKFLOW_EVENT_SCHEMA.parse({
-        type: 'code-review-completed',
-        at: AT,
-      }),
-    ).toThrow('Required')
-  })
-})
-
-describe('WORKFLOW_EVENT_SCHEMA — bug-scanner-completed', () => {
-  it('accepts passed payload', () => {
-    const result = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'bug-scanner-completed',
-      at: AT,
-      passed: true,
-    })
-    expect(result.type).toStrictEqual('bug-scanner-completed')
-  })
-
-  it('rejects missing passed', () => {
-    expect(() =>
-      WORKFLOW_EVENT_SCHEMA.parse({
-        type: 'bug-scanner-completed',
-        at: AT,
-      }),
-    ).toThrow('Required')
-  })
-})
-
-describe('WORKFLOW_EVENT_SCHEMA — pr-recorded', () => {
-  it('accepts valid payload', () => {
-    const result = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'pr-recorded',
-      at: AT,
-      prNumber: 7,
-    })
-    expect(result.type).toStrictEqual('pr-recorded')
-  })
-
-  it('accepts optional prUrl', () => {
-    const result = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'pr-recorded',
-      at: AT,
-      prNumber: 7,
-      prUrl: 'https://github.com/x/y/pull/7',
-    })
-    expect(result.type).toStrictEqual('pr-recorded')
-  })
-
-  it('rejects missing prNumber', () => {
-    expect(() =>
-      WORKFLOW_EVENT_SCHEMA.parse({
-        type: 'pr-recorded',
-        at: AT,
-      }),
-    ).toThrow('Required')
-  })
-})
-
-describe('WORKFLOW_EVENT_SCHEMA — ci-completed', () => {
-  it('accepts passed payload', () => {
-    const result = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'ci-completed',
-      at: AT,
-      passed: true,
-    })
-    expect(result.type).toStrictEqual('ci-completed')
-  })
-
-  it('accepts failed payload with output', () => {
-    const result = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'ci-completed',
-      at: AT,
-      passed: false,
-      output: 'test failures',
-    })
-    expect(result.type).toStrictEqual('ci-completed')
-  })
-
-  it('rejects missing passed', () => {
-    expect(() =>
-      WORKFLOW_EVENT_SCHEMA.parse({
-        type: 'ci-completed',
-        at: AT,
-      }),
-    ).toThrow('Required')
-  })
-})
-
-describe('WORKFLOW_EVENT_SCHEMA — feedback-checked', () => {
-  it('accepts clean payload', () => {
-    const result = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'feedback-checked',
-      at: AT,
-      clean: true,
-    })
-    expect(result.type).toStrictEqual('feedback-checked')
-  })
-
-  it('accepts dirty payload with unresolvedCount', () => {
-    const result = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'feedback-checked',
-      at: AT,
-      clean: false,
-      unresolvedCount: 3,
-      reviewDecision: 'CHANGES_REQUESTED',
-    })
-    expect(result.type).toStrictEqual('feedback-checked')
-  })
-
-  it('accepts dirty payload with null reviewDecision', () => {
-    const result = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'feedback-checked',
-      at: AT,
-      clean: false,
-      unresolvedCount: 0,
-      reviewDecision: null,
-    })
-    expect(result.type).toStrictEqual('feedback-checked')
-  })
-
-  it('rejects missing clean', () => {
-    expect(() =>
-      WORKFLOW_EVENT_SCHEMA.parse({
-        type: 'feedback-checked',
-        at: AT,
-      }),
-    ).toThrow('Required')
-  })
-})
-
-describe('WORKFLOW_EVENT_SCHEMA — feedback-addressed', () => {
-  it('accepts valid payload', () => {
-    const result = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'feedback-addressed',
-      at: AT,
-    })
-    expect(result.type).toStrictEqual('feedback-addressed')
-  })
-
-  it('rejects missing at', () => {
-    expect(() => WORKFLOW_EVENT_SCHEMA.parse({ type: 'feedback-addressed' })).toThrow('Required')
-  })
-})
-
-describe('WORKFLOW_EVENT_SCHEMA — task-check-passed', () => {
-  it('accepts valid payload', () => {
-    const result = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'task-check-passed',
-      at: AT,
-    })
-    expect(result.type).toStrictEqual('task-check-passed')
-  })
-
-  it('rejects missing at', () => {
-    expect(() => WORKFLOW_EVENT_SCHEMA.parse({ type: 'task-check-passed' })).toThrow('Required')
-  })
-})
-
-describe('parseWorkflowEvent — review-recorded', () => {
-  it('accepts pass verdict payload', () => {
-    const result = parseWorkflowEvent({
-      type: 'review-recorded',
-      at: AT,
-      reviewId: 1,
-      reviewType: 'task-check',
-      verdict: 'PASS',
-    })
-    expect(result.type).toStrictEqual('review-recorded')
-  })
-
-  it('accepts fail verdict payload', () => {
-    const result = parseWorkflowEvent({
-      type: 'review-recorded',
-      at: AT,
-      reviewId: 2,
-      reviewType: 'code-review',
-      verdict: 'FAIL',
-    })
-    expect(result.type).toStrictEqual('review-recorded')
-  })
-
-  it('rejects missing reviewType', () => {
-    expect(() =>
-      parseWorkflowEvent({
-        type: 'review-recorded',
-        at: AT,
-        reviewId: 1,
-        verdict: 'PASS',
-      }),
-    ).toThrow('Required')
-  })
-
-  it('rejects unknown verdict', () => {
-    expect(() =>
-      parseWorkflowEvent({
-        type: 'review-recorded',
-        at: AT,
-        reviewId: 1,
-        reviewType: 'task-check',
-        verdict: 'MAYBE',
-      }),
-    ).toThrow('Invalid enum value')
-  })
-})
-
-describe('WORKFLOW_EVENT_SCHEMA — bash-checked', () => {
-  it('accepts valid payload', () => {
-    const result = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'bash-checked',
-      at: AT,
-      tool: 'Bash',
-      command: 'pnpm test',
-      allowed: true,
-    })
-    expect(result.type).toStrictEqual('bash-checked')
-  })
-
-  it('accepts optional reason', () => {
-    const result = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'bash-checked',
-      at: AT,
-      tool: 'Bash',
-      command: 'git push',
-      allowed: false,
-      reason: 'forbidden',
-    })
-    expect(result.type).toStrictEqual('bash-checked')
-  })
-
-  it('rejects missing command', () => {
-    expect(() =>
-      WORKFLOW_EVENT_SCHEMA.parse({
-        type: 'bash-checked',
-        at: AT,
-        tool: 'Bash',
-        allowed: true,
-      }),
-    ).toThrow('Required')
-  })
-})
-
-describe('WORKFLOW_EVENT_SCHEMA — write-checked', () => {
-  it('accepts valid payload', () => {
-    const result = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'write-checked',
-      at: AT,
-      tool: 'Write',
-      filePath: '/test-output/x.ts',
-      allowed: true,
-    })
-    expect(result.type).toStrictEqual('write-checked')
-  })
-
-  it('accepts optional reason', () => {
-    const result = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'write-checked',
-      at: AT,
-      tool: 'Write',
-      filePath: '/test-output/x.ts',
-      allowed: false,
-      reason: 'blocked',
-    })
-    expect(result.type).toStrictEqual('write-checked')
-  })
-
-  it('rejects missing filePath', () => {
-    expect(() =>
-      WORKFLOW_EVENT_SCHEMA.parse({
-        type: 'write-checked',
-        at: AT,
-        tool: 'Write',
-        allowed: true,
-      }),
-    ).toThrow('Required')
-  })
-})
-
-describe('WORKFLOW_EVENT_SCHEMA — transitioned', () => {
-  it('accepts valid payload', () => {
-    const result = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'transitioned',
-      at: AT,
-      from: 'IMPLEMENTING',
-      to: 'REVIEWING',
-    })
-    expect(result.type).toStrictEqual('transitioned')
-  })
-
-  it('accepts optional preBlockedState', () => {
-    const result = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'transitioned',
-      at: AT,
-      from: 'IMPLEMENTING',
-      to: 'BLOCKED',
-      preBlockedState: 'IMPLEMENTING',
-    })
-    expect(result.type).toStrictEqual('transitioned')
-  })
-
-  it('rejects missing from', () => {
-    expect(() =>
-      WORKFLOW_EVENT_SCHEMA.parse({
-        type: 'transitioned',
-        at: AT,
-        to: 'REVIEWING',
-      }),
-    ).toThrow('Required')
-  })
-
-  it('rejects missing to', () => {
-    expect(() =>
-      WORKFLOW_EVENT_SCHEMA.parse({
-        type: 'transitioned',
-        at: AT,
-        from: 'IMPLEMENTING',
-      }),
-    ).toThrow('Required')
-  })
-})
-
-describe('WORKFLOW_EVENT_SCHEMA — discriminant validation', () => {
-  it('rejects unknown type discriminant', () => {
-    expect(() =>
-      WORKFLOW_EVENT_SCHEMA.parse({
-        type: 'unknown-event',
-        at: AT,
-      }),
-    ).toThrow('Invalid discriminator value')
-  })
-
-  it('rejects missing type field', () => {
-    expect(() => WORKFLOW_EVENT_SCHEMA.parse({ at: AT })).toThrow('Invalid discriminator value')
-  })
-
-  it('rejects missing at when type is present', () => {
-    expect(() => WORKFLOW_EVENT_SCHEMA.parse({ type: 'session-started' })).toThrow('Required')
-  })
-})
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/workflow-pr-feedback-verification-events.spec.ts b/tools/dev-workflow-v2/src/features/workflow/domain/workflow-pr-feedback-verification-events.spec.ts
deleted file mode 100644
index 5c638d7c2..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/domain/workflow-pr-feedback-verification-events.spec.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { WORKFLOW_EVENT_SCHEMA } from './workflow-events'
-
-const AT = '2026-01-01T00:00:00Z'
-
-describe('WORKFLOW_EVENT_SCHEMA — pr-feedback-verification-failed', () => {
-  it('accepts failure reason payload', () => {
-    const result = WORKFLOW_EVENT_SCHEMA.parse({
-      type: 'pr-feedback-verification-failed',
-      at: AT,
-      reason: 'CodeRabbit feedback did not appear.',
-    })
-
-    expect(result).toStrictEqual({
-      type: 'pr-feedback-verification-failed',
-      at: AT,
-      reason: 'CodeRabbit feedback did not appear.',
-    })
-  })
-
-  it('rejects missing reason', () => {
-    expect(() =>
-      WORKFLOW_EVENT_SCHEMA.parse({
-        type: 'pr-feedback-verification-failed',
-        at: AT,
-      }),
-    ).toThrow('Required')
-  })
-})
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/workflow-types.ts b/tools/dev-workflow-v2/src/features/workflow/domain/workflow-types.ts
deleted file mode 100644
index 6185c3e1c..000000000
--- a/tools/dev-workflow-v2/src/features/workflow/domain/workflow-types.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import { z } from 'zod'
-import type {
-  WorkflowStateDefinition,
-  WorkflowRegistry,
-} from '@nt-ai-lab/deterministic-agent-workflow-dsl'
-
-export const STATE_NAMES = [
-  'IMPLEMENTING',
-  'REVIEWING',
-  'SUBMITTING_PR',
-  'AWAITING_CI',
-  'AWAITING_PR_FEEDBACK',
-  'ADDRESSING_FEEDBACK',
-  'REFLECTING',
-  'COMPLETE',
-  'BLOCKED',
-] as const
-
-/** @riviere-role value-object */
-export type StateName = (typeof STATE_NAMES)[number]
-
-export const STATE_NAME_SCHEMA = z.enum(STATE_NAMES)
-
-const LIVING_ARCHITECTURE_REVIEW_TYPES = [
-  'architecture-review',
-  'code-review',
-  'bug-scanner',
-  'task-check',
-] as const
-
-export const LIVING_ARCHITECTURE_REVIEW_TYPE_SCHEMA = z.enum(LIVING_ARCHITECTURE_REVIEW_TYPES)
-
-/** @riviere-role value-object */
-export type LivingArchitectureReviewType = (typeof LIVING_ARCHITECTURE_REVIEW_TYPES)[number]
-
-/** @riviere-role domain-service */
-export function createWorkflowStateSchema<T extends readonly [string, ...string[]]>(stateNames: T) {
-  const stateNameSchema = z.enum(stateNames)
-  return z.object({
-    currentStateMachineState: stateNameSchema,
-    githubIssue: z.number().int().positive().optional(),
-    featureBranch: z.string().optional(),
-    prNumber: z.number().int().positive().optional(),
-    prUrl: z.string().optional(),
-    architectureReviewPassed: z.boolean(),
-    codeReviewPassed: z.boolean(),
-    bugScannerPassed: z.boolean(),
-    taskCheckPassed: z.boolean(),
-    ciPassed: z.boolean(),
-    feedbackClean: z.boolean(),
-    feedbackAddressed: z.boolean(),
-    feedbackUnresolvedCount: z.number().optional(),
-    prFeedbackVerificationFailedReason: z.string().optional(),
-    preBlockedState: z.string().optional(),
-    transcriptPath: z.string().optional(),
-  })
-}
-
-export const WORKFLOW_STATE_SCHEMA = createWorkflowStateSchema(STATE_NAMES)
-
-/** @riviere-role value-object */
-export type WorkflowState = {
-  currentStateMachineState: StateName
-  githubIssue?: number | undefined
-  featureBranch?: string | undefined
-  prNumber?: number | undefined
-  prUrl?: string | undefined
-  architectureReviewPassed: boolean
-  codeReviewPassed: boolean
-  bugScannerPassed: boolean
-  taskCheckPassed: boolean
-  ciPassed: boolean
-  feedbackClean: boolean
-  feedbackAddressed: boolean
-  feedbackUnresolvedCount?: number | undefined
-  prFeedbackVerificationFailedReason?: string | undefined
-  preBlockedState?: string | undefined
-  transcriptPath?: string | undefined
-}
-
-/** @riviere-role value-object */
-export type WorkflowOperation =
-  | 'record-issue'
-  | 'record-branch'
-  | 'record-review'
-  | 'record-pr'
-  | 'record-ci-passed'
-  | 'record-ci-failed'
-  | 'create-pr'
-  | 'verify-feedback-addressed'
-
-/** @riviere-role value-object */
-export type ConcreteStateDefinition = WorkflowStateDefinition<
-  WorkflowState,
-  StateName,
-  WorkflowOperation
-> & { allowIdle?: boolean }
-
-/** @riviere-role value-object */
-export type ConcreteRegistry = WorkflowRegistry<WorkflowState, StateName, WorkflowOperation>
-
-export const INITIAL_STATE: WorkflowState = {
-  currentStateMachineState: 'IMPLEMENTING',
-  architectureReviewPassed: false,
-  codeReviewPassed: false,
-  bugScannerPassed: false,
-  taskCheckPassed: false,
-  ciPassed: false,
-  feedbackClean: false,
-  feedbackAddressed: false,
-}
-
-/** @riviere-role domain-service */
-export function parseStateName(value: string): StateName {
-  return STATE_NAME_SCHEMA.parse(value)
-}
diff --git a/tools/dev-workflow-v2/src/features/workflow/entrypoint/_platform/cli/workflow-route-inputs.ts b/tools/dev-workflow-v2/src/features/workflow/entrypoint/_platform/cli/workflow-route-inputs.ts
new file mode 100644
index 000000000..92ae3d335
--- /dev/null
+++ b/tools/dev-workflow-v2/src/features/workflow/entrypoint/_platform/cli/workflow-route-inputs.ts
@@ -0,0 +1,23 @@
+/** @riviere-role entrypoint-cli-input-parser */
+export function parseNumberArgument(value: unknown): number {
+  if (typeof value !== 'number') throw new TypeError('Expected parsed number')
+  return value
+}
+
+/** @riviere-role entrypoint-cli-input-parser */
+export function parseStringArgument(value: unknown): string {
+  if (typeof value !== 'string') throw new TypeError('Expected parsed string')
+  return value
+}
+
+/** @riviere-role entrypoint-cli-input-parser */
+export function parseOptionalStringArgument(value: unknown): string | undefined {
+  if (value === undefined || typeof value === 'string') return value
+  throw new TypeError('Expected parsed optional string')
+}
+
+/** @riviere-role entrypoint-cli-input-parser */
+export function parseStringArguments(value: unknown): readonly string[] {
+  if (Array.isArray(value) && value.every((item) => typeof item === 'string')) return value
+  throw new TypeError('Expected parsed string arguments')
+}
diff --git a/tools/dev-workflow-v2/src/features/workflow/domain/fixtures/review-command-test-fixtures.ts b/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/__fixtures__/review-command-test-fixtures.ts
similarity index 83%
rename from tools/dev-workflow-v2/src/features/workflow/domain/fixtures/review-command-test-fixtures.ts
rename to tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/__fixtures__/review-command-test-fixtures.ts
index 1eab20bf3..3950137fa 100644
--- a/tools/dev-workflow-v2/src/features/workflow/domain/fixtures/review-command-test-fixtures.ts
+++ b/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/__fixtures__/review-command-test-fixtures.ts
@@ -1,6 +1,6 @@
 import type { ReviewPayload } from '@nt-ai-lab/deterministic-agent-workflow-engine'
-import type { TestContext } from '../../entrypoint/workflow/fixtures/workflow-cli-test-fixtures'
-import { runReviewCommand } from '../../entrypoint/workflow/fixtures/workflow-cli-test-fixtures'
+import type { TestContext } from './workflow-cli-test-fixtures'
+import { runReviewCommand } from './workflow-cli-test-fixtures'
 
 type TaskCheckVerdict = 'PASS' | 'FAIL'
 
diff --git a/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/fixtures/workflow-cli-state-steps-test-fixtures.ts b/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/__fixtures__/workflow-cli-state-steps-test-fixtures.ts
similarity index 100%
rename from tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/fixtures/workflow-cli-state-steps-test-fixtures.ts
rename to tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/__fixtures__/workflow-cli-state-steps-test-fixtures.ts
diff --git a/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/fixtures/workflow-cli-test-fixtures.ts b/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/__fixtures__/workflow-cli-test-fixtures.ts
similarity index 85%
rename from tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/fixtures/workflow-cli-test-fixtures.ts
rename to tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/__fixtures__/workflow-cli-test-fixtures.ts
index c53a2176e..ee718305e 100644
--- a/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/fixtures/workflow-cli-test-fixtures.ts
+++ b/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/__fixtures__/workflow-cli-test-fixtures.ts
@@ -1,6 +1,4 @@
-import {
-  unlinkSync, existsSync, mkdtempSync 
-} from 'node:fs'
+import { unlinkSync, existsSync, mkdtempSync } from 'node:fs'
 import { join } from 'node:path'
 import { tmpdir } from 'node:os'
 import type {
@@ -12,20 +10,22 @@ import { WorkflowStateError } from '@nt-ai-lab/deterministic-agent-workflow-engi
 import { createStore } from '@nt-ai-lab/deterministic-agent-workflow-event-store'
 import { createWorkflowRunner } from '@nt-ai-lab/deterministic-agent-workflow-cli'
 import type { RunnerResult } from '@nt-ai-lab/deterministic-agent-workflow-cli'
-import type { Workflow } from '../../../domain/workflow'
-import { WORKFLOW_DEFINITION } from '../../../data-access/workflow-definition'
-import {
-  ROUTES, PRE_TOOL_USE_POLICY 
-} from '../entrypoint'
+import { configureWorkflow } from '@living-architecture/dev-workflow-v2-use-cases/commands/configure-workflow'
+import { createWorkflowRoutes } from '../entrypoint'
 import { STATE_STEPS } from './workflow-cli-state-steps-test-fixtures'
 
-type WorkflowDeps = Parameters<typeof Workflow.rehydrate>[1]
+const workflowConfiguration = configureWorkflow({})
+const workflowDefinition = workflowConfiguration
+type WorkflowDeps = Parameters<typeof workflowDefinition.buildWorkflow>[1]
 
 const runner = createWorkflowRunner({
-  workflowDefinition: WORKFLOW_DEFINITION,
-  routes: ROUTES,
-  bashForbidden: PRE_TOOL_USE_POLICY.bashForbidden,
-  isWriteAllowed: PRE_TOOL_USE_POLICY.isWriteAllowed,
+  workflowDefinition,
+  routes: createWorkflowRoutes(workflowDefinition.stateSchema),
+  bashForbidden: {
+    commands: ['git push', 'gh pr'],
+    flags: ['--no-verify', '--force', '--hard'],
+  },
+  isWriteAllowed: workflowConfiguration.isWriteAllowed,
 })
 
 export type TestContext = {
@@ -102,7 +102,9 @@ export function runReviewCommandWithJson(
   reviewType: ReviewType,
   reviewJson: string,
 ): RunnerResult {
-  return runner(['record-review', reviewType, reviewJson], ctx.engineDeps, ctx.workflowDeps, {getSessionId: () => ctx.sessionId,})
+  return runner(['record-review', reviewType, reviewJson], ctx.engineDeps, ctx.workflowDeps, {
+    getSessionId: () => ctx.sessionId,
+  })
 }
 
 export function runReviewCommand(
diff --git a/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/entrypoint.ts b/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/entrypoint.ts
index ef1e2473b..aa95b6f9e 100644
--- a/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/entrypoint.ts
+++ b/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/entrypoint.ts
@@ -1,9 +1,74 @@
+import { arg, defineRoutes } from '@nt-ai-lab/deterministic-agent-workflow-cli'
+import type { ZodType } from 'zod'
+import { CreatePullRequest } from '@living-architecture/dev-workflow-v2-use-cases/commands/create-pull-request'
+import { RecordBranch } from '@living-architecture/dev-workflow-v2-use-cases/commands/record-branch'
+import { RecordCiFailed } from '@living-architecture/dev-workflow-v2-use-cases/commands/record-ci-failed'
+import { RecordCiPassed } from '@living-architecture/dev-workflow-v2-use-cases/commands/record-ci-passed'
+import { RecordIssue } from '@living-architecture/dev-workflow-v2-use-cases/commands/record-issue'
+import { RecordPullRequest } from '@living-architecture/dev-workflow-v2-use-cases/commands/record-pull-request'
+import { VerifyFeedbackAddressed } from '@living-architecture/dev-workflow-v2-use-cases/commands/verify-feedback-addressed'
 import {
-  ROUTES,
-  PRE_TOOL_USE_POLICY as WORKFLOW_PRE_TOOL_USE_POLICY,
-} from '../../commands/workflow-cli-definition'
+  parseNumberArgument,
+  parseOptionalStringArgument,
+  parseStringArgument,
+  parseStringArguments,
+} from '../_platform/cli/workflow-route-inputs'
 
-export { ROUTES }
+type RoutedWorkflow = ConstructorParameters<typeof RecordIssue>[0]
+type RoutedWorkflowState = ReturnType<RoutedWorkflow['getState']>
 
 /** @riviere-role cli-entrypoint */
-export const PRE_TOOL_USE_POLICY = WORKFLOW_PRE_TOOL_USE_POLICY
+export function createWorkflowRoutes(
+  stateNameSchema: ZodType<RoutedWorkflowState['currentStateMachineState']>,
+) {
+  return defineRoutes<RoutedWorkflow, RoutedWorkflowState>({
+    init: { type: 'session-start' },
+    transition: {
+      type: 'transition',
+      args: [arg.state('STATE', stateNameSchema)],
+    },
+    'record-issue': {
+      type: 'transaction',
+      args: [arg.number('number')],
+      handler: (workflow, issueNumber) =>
+        new RecordIssue(workflow).execute({ issueNumber: parseNumberArgument(issueNumber) }),
+    },
+    'record-branch': {
+      type: 'transaction',
+      args: [arg.string('branch')],
+      handler: (workflow, branch) =>
+        new RecordBranch(workflow).execute({ branch: parseStringArgument(branch) }),
+    },
+    'record-pr': {
+      type: 'transaction',
+      args: [arg.number('number'), arg.string('url').optional()],
+      handler: (workflow, number, url) =>
+        new RecordPullRequest(workflow).execute({
+          number: parseNumberArgument(number),
+          url: parseOptionalStringArgument(url),
+        }),
+    },
+    'create-pr': {
+      type: 'transaction',
+      args: [arg.rest()],
+      handler: (workflow, args) =>
+        new CreatePullRequest(workflow).execute({ arguments: parseStringArguments(args) }),
+    },
+    'record-ci-passed': {
+      type: 'transaction',
+      args: [],
+      handler: (workflow) => new RecordCiPassed(workflow).execute({}),
+    },
+    'record-ci-failed': {
+      type: 'transaction',
+      args: [arg.string('output')],
+      handler: (workflow, output) =>
+        new RecordCiFailed(workflow).execute({ output: parseStringArgument(output) }),
+    },
+    'verify-feedback-addressed': {
+      type: 'transaction',
+      args: [],
+      handler: (workflow) => new VerifyFeedbackAddressed(workflow).execute({}),
+    },
+  })
+}
diff --git a/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/workflow-cli-hooks.spec.ts b/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/workflow-cli-hooks.spec.ts
index de46687e2..d35fc2853 100644
--- a/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/workflow-cli-hooks.spec.ts
+++ b/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/workflow-cli-hooks.spec.ts
@@ -1,13 +1,11 @@
-import {
-  describe, it, expect, afterEach 
-} from 'vitest'
-import type { TestContext } from './fixtures/workflow-cli-test-fixtures'
+import { describe, it, expect, afterEach } from 'vitest'
+import type { TestContext } from './__fixtures__/workflow-cli-test-fixtures'
 import {
   buildTestContext,
   cleanupDb,
   runCommand,
   runHook,
-} from './fixtures/workflow-cli-test-fixtures'
+} from './__fixtures__/workflow-cli-test-fixtures'
 
 describe('workflow-cli hooks', () => {
   const dbPaths: string[] = []
diff --git a/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/workflow-cli-transitions.spec.ts b/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/workflow-cli-transitions.spec.ts
index 5cb6a0f21..f89962582 100644
--- a/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/workflow-cli-transitions.spec.ts
+++ b/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/workflow-cli-transitions.spec.ts
@@ -1,18 +1,16 @@
-import {
-  describe, it, expect, afterEach 
-} from 'vitest'
-import type { TestContext } from './fixtures/workflow-cli-test-fixtures'
+import { describe, it, expect, afterEach } from 'vitest'
+import type { TestContext } from './__fixtures__/workflow-cli-test-fixtures'
 import {
   buildTestContext,
   cleanupDb,
   progressToState,
   runCommand,
   runReviewCommand,
-} from './fixtures/workflow-cli-test-fixtures'
+} from './__fixtures__/workflow-cli-test-fixtures'
 import {
   recordPassingPreReviews,
   recordTaskCheck,
-} from '../../domain/fixtures/review-command-test-fixtures'
+} from './__fixtures__/review-command-test-fixtures'
 
 describe('workflow-cli transitions', () => {
   const dbPaths: string[] = []
diff --git a/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/workflow-cli.spec.ts b/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/workflow-cli.spec.ts
index 6d67f57d4..d0f8a9261 100644
--- a/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/workflow-cli.spec.ts
+++ b/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/workflow-cli.spec.ts
@@ -1,8 +1,6 @@
-import {
-  describe, it, expect, afterEach 
-} from 'vitest'
+import { describe, it, expect, afterEach } from 'vitest'
 import { flattenStoredEvent } from '@nt-ai-lab/deterministic-agent-workflow-engine'
-import type { TestContext } from './fixtures/workflow-cli-test-fixtures'
+import type { TestContext } from './__fixtures__/workflow-cli-test-fixtures'
 import {
   buildTestContext,
   cleanupDb,
@@ -10,7 +8,7 @@ import {
   runCommand,
   runReviewCommand,
   runReviewCommandWithJson,
-} from './fixtures/workflow-cli-test-fixtures'
+} from './__fixtures__/workflow-cli-test-fixtures'
 
 describe('workflow-cli commands', () => {
   const dbPaths: string[] = []
diff --git a/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/workflow-route-inputs.spec.ts b/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/workflow-route-inputs.spec.ts
new file mode 100644
index 000000000..22c6c86e1
--- /dev/null
+++ b/tools/dev-workflow-v2/src/features/workflow/entrypoint/workflow/workflow-route-inputs.spec.ts
@@ -0,0 +1,74 @@
+import { configureWorkflow } from '@living-architecture/dev-workflow-v2-use-cases/commands/configure-workflow'
+import { createWorkflowRoutes } from './entrypoint'
+
+type WorkflowDeps = Parameters<ReturnType<typeof configureWorkflow>['buildWorkflow']>[1]
+
+function buildWorkflow(
+  definition: ReturnType<typeof configureWorkflow>,
+): ReturnType<typeof definition.buildWorkflow> {
+  const deps: WorkflowDeps = {
+    getGitInfo: () => ({
+      currentBranch: 'main',
+      workingTreeClean: true,
+      headCommit: 'abc123',
+      changedFilesVsDefault: [],
+      hasCommitsVsDefault: false,
+    }),
+    getPrFeedback: () => ({
+      reviewDecision: null,
+      coderabbitReviewSeen: true,
+      unresolvedCount: 0,
+      threads: [],
+    }),
+    createPullRequest: () => ({
+      prNumber: 1,
+      prUrl: 'https://github.com/example/repo/pull/1',
+      isDraft: false,
+    }),
+    listSessionReviews: () => [],
+    sleepMs: () => undefined,
+    now: () => '2026-01-01T00:00:00Z',
+  }
+  return definition.buildWorkflow(definition.initialState(), deps)
+}
+
+function transactionHandler(definition: ReturnType<typeof configureWorkflow>, routeName: string) {
+  const route = createWorkflowRoutes(definition.stateSchema)[routeName]
+  if (route?.type !== 'transaction') return expect.fail(`Expected transaction route: ${routeName}`)
+  return route.handler
+}
+
+describe('workflow route input boundary', () => {
+  const definition = configureWorkflow({})
+  const workflow = buildWorkflow(definition)
+
+  it('rejects a non-number received for a numeric argument', () => {
+    const handler = transactionHandler(definition, 'record-issue')
+
+    expect(() => handler(workflow, 'not-a-number')).toThrow('Expected parsed number')
+  })
+
+  it('rejects a non-string received for a string argument', () => {
+    const handler = transactionHandler(definition, 'record-branch')
+
+    expect(() => handler(workflow, 2)).toThrow('Expected parsed string')
+  })
+
+  it('rejects a non-string optional URL received from the framework', () => {
+    const handler = transactionHandler(definition, 'record-pr')
+
+    expect(() => handler(workflow, 1, 2)).toThrow('Expected parsed optional string')
+  })
+
+  it('rejects non-array rest arguments received from the framework', () => {
+    const handler = transactionHandler(definition, 'create-pr')
+
+    expect(() => handler(workflow, 'not-an-array')).toThrow('Expected parsed string arguments')
+  })
+
+  it('rejects non-string values inside rest arguments received from the framework', () => {
+    const handler = transactionHandler(definition, 'create-pr')
+
+    expect(() => handler(workflow, ['valid', 2])).toThrow('Expected parsed string arguments')
+  })
+})
diff --git a/tools/dev-workflow-v2/src/platform/infra/external-clients/git/index.ts b/tools/dev-workflow-v2/src/platform/infra/external-clients/git/index.ts
deleted file mode 100644
index 8fd14d82b..000000000
--- a/tools/dev-workflow-v2/src/platform/infra/external-clients/git/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { readGitRepositoryStatus, type GitRepositoryStatus } from './git-client'
diff --git a/tools/dev-workflow-v2/src/platform/infra/external-clients/github/index.ts b/tools/dev-workflow-v2/src/platform/infra/external-clients/github/index.ts
deleted file mode 100644
index 2151582ae..000000000
--- a/tools/dev-workflow-v2/src/platform/infra/external-clients/github/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export {
-  createGithubPullRequestClient,
-  type GithubPullRequest,
-  type GithubPullRequestCreationInput,
-} from './create-pull-request'
-export {
-  createGithubPullRequestFeedbackClient,
-  type GithubPullRequestFeedback,
-} from './get-pr-feedback'
-export { runGh } from './github-cli'
diff --git a/tools/dev-workflow-v2/src/shell/cli.ts b/tools/dev-workflow-v2/src/shell/cli.ts
index 1cce0840d..4094de2ba 100644
--- a/tools/dev-workflow-v2/src/shell/cli.ts
+++ b/tools/dev-workflow-v2/src/shell/cli.ts
@@ -1,18 +1,22 @@
 import { createDefaultProcessDeps } from '@nt-ai-lab/deterministic-agent-workflow-cli'
 import { createClaudeCodeWorkflowCli } from '@nt-ai-lab/deterministic-agent-workflow-claude-code'
-import { WORKFLOW_DEFINITION } from '../features/workflow/data-access/workflow-definition'
-import {
-  ROUTES, PRE_TOOL_USE_POLICY 
-} from '../features/workflow/entrypoint/workflow/entrypoint'
-import { createWorkflowGitStatusReader } from '../features/workflow/adapters/git/workflow-git-status-reader'
-import { createWorkflowPullRequestCreator } from '../features/workflow/adapters/github/workflow-pull-request-creator'
-import { createWorkflowPullRequestFeedbackReader } from '../features/workflow/adapters/github/workflow-pull-request-feedback-reader'
-import { readGitRepositoryStatus } from '../platform/infra/external-clients/git/index'
-import {
-  createGithubPullRequestClient,
-  createGithubPullRequestFeedbackClient,
-  runGh,
-} from '../platform/infra/external-clients/github/index'
+import { createWorkflowGitStatusReader } from '@living-architecture/dev-workflow-v2-use-cases/adapters/git/workflow-git-status-reader'
+import { createWorkflowPullRequestCreator } from '@living-architecture/dev-workflow-v2-use-cases/adapters/github/workflow-pull-request-creator'
+import { createWorkflowPullRequestFeedbackReader } from '@living-architecture/dev-workflow-v2-use-cases/adapters/github/workflow-pull-request-feedback-reader'
+import { configureWorkflow } from '@living-architecture/dev-workflow-v2-use-cases/commands/configure-workflow'
+import { readGitRepositoryStatus } from '@living-architecture/dev-workflow-v2-use-cases/external-clients/git/git-client'
+import { createGithubPullRequestClient } from '@living-architecture/dev-workflow-v2-use-cases/external-clients/github/create-pull-request'
+import { createGithubPullRequestFeedbackClient } from '@living-architecture/dev-workflow-v2-use-cases/external-clients/github/get-pr-feedback'
+import { runGh } from '@living-architecture/dev-workflow-v2-use-cases/external-clients/github/github-cli'
+import { createWorkflowRoutes } from '../features/workflow/entrypoint/workflow/entrypoint'
+
+const workflowConfiguration = configureWorkflow({})
+const workflowDefinition = workflowConfiguration
+const routes = createWorkflowRoutes(workflowDefinition.stateSchema)
+const bashForbidden = {
+  commands: ['git push', 'gh pr'],
+  flags: ['--no-verify', '--force', '--hard'],
+}
 
 /**
  * Performs an intentionally synchronous sleep for CLI polling.
@@ -27,14 +31,12 @@ function sleepMs(ms: number): void {
 }
 
 /** @riviere-role main */
-// WorkflowCliConfig drops TStateName/TOperation (defaults to string).
-// Safe — StateName ⊂ string, WorkflowOperation ⊂ string.
 createClaudeCodeWorkflowCli({
-  // @ts-expect-error WorkflowCliConfig widens StateName/WorkflowOperation to string
-  workflowDefinition: WORKFLOW_DEFINITION,
-  routes: ROUTES,
-  bashForbidden: PRE_TOOL_USE_POLICY.bashForbidden,
-  isWriteAllowed: PRE_TOOL_USE_POLICY.isWriteAllowed,
+  // @ts-expect-error ClaudeCodeWorkflowCliConfig widens StateName and WorkflowOperation to string.
+  workflowDefinition,
+  routes,
+  bashForbidden,
+  isWriteAllowed: workflowConfiguration.isWriteAllowed,
   processDeps: createDefaultProcessDeps(),
   buildWorkflowDeps: (platform) => ({
     getGitInfo: createWorkflowGitStatusReader(readGitRepositoryStatus),
diff --git a/tools/dev-workflow-v2/src/shell/opencode-plugin.ts b/tools/dev-workflow-v2/src/shell/opencode-plugin.ts
index 1ad5630eb..7f9c94af1 100644
--- a/tools/dev-workflow-v2/src/shell/opencode-plugin.ts
+++ b/tools/dev-workflow-v2/src/shell/opencode-plugin.ts
@@ -1,30 +1,30 @@
 import { createOpenCodeWorkflowPlugin } from '@nt-ai-lab/deterministic-agent-workflow-opencode'
+import { createWorkflowGitStatusReader } from '@living-architecture/dev-workflow-v2-use-cases/adapters/git/workflow-git-status-reader'
+import { createWorkflowPullRequestCreator } from '@living-architecture/dev-workflow-v2-use-cases/adapters/github/workflow-pull-request-creator'
+import { createWorkflowPullRequestFeedbackReader } from '@living-architecture/dev-workflow-v2-use-cases/adapters/github/workflow-pull-request-feedback-reader'
+import { configureWorkflow } from '@living-architecture/dev-workflow-v2-use-cases/commands/configure-workflow'
+import { readGitRepositoryStatus } from '@living-architecture/dev-workflow-v2-use-cases/external-clients/git/git-client'
+import { createGithubPullRequestClient } from '@living-architecture/dev-workflow-v2-use-cases/external-clients/github/create-pull-request'
+import { createGithubPullRequestFeedbackClient } from '@living-architecture/dev-workflow-v2-use-cases/external-clients/github/get-pr-feedback'
+import { runGh } from '@living-architecture/dev-workflow-v2-use-cases/external-clients/github/github-cli'
 import { readFileSync } from 'node:fs'
 import { fileURLToPath } from 'node:url'
-import {
-  dirname, join 
-} from 'node:path'
-import type { Workflow } from '../features/workflow/domain/workflow'
-import type {
-  WorkflowState,
-  StateName,
-  WorkflowOperation,
-} from '../features/workflow/domain/workflow-types'
-import { WORKFLOW_DEFINITION } from '../features/workflow/data-access/workflow-definition'
-import {
-  ROUTES, PRE_TOOL_USE_POLICY 
-} from '../features/workflow/entrypoint/workflow/entrypoint'
-import { createWorkflowGitStatusReader } from '../features/workflow/adapters/git/workflow-git-status-reader'
-import { createWorkflowPullRequestCreator } from '../features/workflow/adapters/github/workflow-pull-request-creator'
-import { createWorkflowPullRequestFeedbackReader } from '../features/workflow/adapters/github/workflow-pull-request-feedback-reader'
-import { readGitRepositoryStatus } from '../platform/infra/external-clients/git/index'
-import {
-  createGithubPullRequestClient,
-  createGithubPullRequestFeedbackClient,
-  runGh,
-} from '../platform/infra/external-clients/github/index'
-
-type WorkflowDeps = Parameters<typeof Workflow.rehydrate>[1]
+import { dirname, join } from 'node:path'
+import { createWorkflowRoutes } from '../features/workflow/entrypoint/workflow/entrypoint'
+
+const workflowConfiguration = configureWorkflow({})
+const workflowDefinition = workflowConfiguration
+const routes = createWorkflowRoutes(workflowDefinition.stateSchema)
+const bashForbidden = {
+  commands: ['git push', 'gh pr'],
+  flags: ['--no-verify', '--force', '--hard'],
+}
+
+type Workflow = ReturnType<typeof workflowDefinition.buildWorkflow>
+type WorkflowState = ReturnType<typeof workflowDefinition.initialState>
+type WorkflowDeps = Parameters<typeof workflowDefinition.buildWorkflow>[1]
+type StateName = Parameters<typeof workflowDefinition.buildTransitionContext>[1]
+type WorkflowOperation = Parameters<NonNullable<typeof workflowDefinition.getOperationBody>>[0]
 
 function sleepMs(ms: number): void {
   Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms)
@@ -117,10 +117,10 @@ const basePlugin = createOpenCodeWorkflowPlugin<
   StateName,
   WorkflowOperation
 >({
-  workflowDefinition: WORKFLOW_DEFINITION,
-  routes: ROUTES,
-  bashForbidden: PRE_TOOL_USE_POLICY.bashForbidden,
-  isWriteAllowed: PRE_TOOL_USE_POLICY.isWriteAllowed,
+  workflowDefinition,
+  routes,
+  bashForbidden,
+  isWriteAllowed: workflowConfiguration.isWriteAllowed,
   pluginRoot,
   commandDirectories: [join(pluginRoot, 'commands')],
   commandPrefix: 'dev-workflow-v2:',
diff --git a/tools/dev-workflow-v2/tsconfig.json b/tools/dev-workflow-v2/tsconfig.json
index ceb36b2e8..83840c386 100644
--- a/tools/dev-workflow-v2/tsconfig.json
+++ b/tools/dev-workflow-v2/tsconfig.json
@@ -12,8 +12,14 @@
     "esModuleInterop": true,
     "skipLibCheck": true,
     "resolveJsonModule": true,
-    "types": ["vitest/globals", "node"]
+    "types": ["vitest/globals", "node"],
+    "customConditions": ["@living-architecture/source"]
   },
   "include": ["src/**/*"],
-  "exclude": ["node_modules", "dist"]
+  "exclude": ["node_modules", "dist"],
+  "references": [
+    {
+      "path": "../../packages/dev-workflow-v2/use-cases"
+    }
+  ]
 }
diff --git a/tsconfig.json b/tsconfig.json
index a375684f7..60deb34e7 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,13 +4,10 @@
   "files": [],
   "references": [
     {
-      "path": "./packages/riviere-query"
+      "path": "./packages/riviere-builder/domain-model"
     },
     {
-      "path": "./packages/riviere-builder"
-    },
-    {
-      "path": "./packages/riviere-cli"
+      "path": "./apps/cli"
     },
     {
       "path": "./apps/eclair"
@@ -19,19 +16,34 @@
       "path": "./apps/docs"
     },
     {
-      "path": "./packages/riviere-schema"
+      "path": "./packages/riviere-schema/published-language"
+    },
+    {
+      "path": "./packages/riviere-extract-config/published-language"
+    },
+    {
+      "path": "./packages/riviere-extract-conventions/published-language"
+    },
+    {
+      "path": "./packages/riviere-extract-ts/domain-model"
+    },
+    {
+      "path": "./packages/riviere-role-enforcement/domain-model"
+    },
+    {
+      "path": "./packages/riviere-builder/use-cases"
     },
     {
-      "path": "./packages/riviere-extract-config"
+      "path": "./packages/riviere-extract-ts/use-cases"
     },
     {
-      "path": "./packages/riviere-extract-conventions"
+      "path": "./packages/riviere-role-enforcement/use-cases"
     },
     {
-      "path": "./packages/riviere-extract-ts"
+      "path": "./packages/dev-workflow-v2/domain-model"
     },
     {
-      "path": "./packages/riviere-role-enforcement"
+      "path": "./packages/dev-workflow-v2/use-cases"
     }
   ]
 }