From 5f1d85277a1a7e324b8e13deb773cdc5c517a6f6 Mon Sep 17 00:00:00 2001
From: nrslib <38722970+nrslib@users.noreply.github.com>
Date: Sat, 7 Feb 2026 20:09:52 +0900
Subject: [PATCH] update hybrid

---
 builtins/en/pieces/coding-hybrid-codex.yaml   | 21 +++++-----
 builtins/en/pieces/default-hybrid-codex.yaml  | 34 +++++++++-------
 .../en/pieces/expert-cqrs-hybrid-codex.yaml   | 36 ++++++++++-------
 builtins/en/pieces/expert-hybrid-codex.yaml   | 36 ++++++++++-------
 builtins/en/pieces/minimal-hybrid-codex.yaml  | 17 ++++----
 .../en/pieces/passthrough-hybrid-codex.yaml   |  6 +--
 .../review-fix-minimal-hybrid-codex.yaml      | 17 ++++----
 builtins/ja/pieces/coding-hybrid-codex.yaml   | 23 ++++++-----
 builtins/ja/pieces/default-hybrid-codex.yaml  | 38 +++++++++---------
 .../ja/pieces/expert-cqrs-hybrid-codex.yaml   | 40 ++++++++++---------
 builtins/ja/pieces/expert-hybrid-codex.yaml   | 40 ++++++++++---------
 builtins/ja/pieces/minimal-hybrid-codex.yaml  | 20 +++++-----
 .../ja/pieces/passthrough-hybrid-codex.yaml   |  6 +--
 .../review-fix-minimal-hybrid-codex.yaml      | 20 +++++-----
 14 files changed, 194 insertions(+), 160 deletions(-)

diff --git a/builtins/en/pieces/coding-hybrid-codex.yaml b/builtins/en/pieces/coding-hybrid-codex.yaml
index 064bdab..09b5091 100644
--- a/builtins/en/pieces/coding-hybrid-codex.yaml
+++ b/builtins/en/pieces/coding-hybrid-codex.yaml
@@ -4,10 +4,6 @@
 name: coding-hybrid-codex
 description: Lightweight development piece with planning and parallel reviews (plan -> implement -> parallel review -> complete)
 max_iterations: 20
-policies:
-  coding: ../policies/coding.md
-  review: ../policies/review.md
-  testing: ../policies/testing.md
 knowledge:
   architecture: ../knowledge/architecture.md
 personas:
@@ -21,10 +17,6 @@ instructions:
   ai-review: ../instructions/ai-review.md
   review-arch: ../instructions/review-arch.md
   fix: ../instructions/fix.md
-output_contracts:
-  plan: ../output-contracts/plan.md
-  ai-review: ../output-contracts/ai-review.md
-  architecture-review: ../output-contracts/architecture-review.md
 initial_movement: plan
 movements:
   - name: plan
@@ -87,7 +79,9 @@ movements:
       - name: ai_review
         edit: false
         persona: ai-antipattern-reviewer
-        policy: review
+        policy:
+          - review
+          - ai-antipattern
         report:
           name: 04-ai-review.md
           format: ai-review
@@ -148,3 +142,12 @@ movements:
       - condition: Cannot determine, insufficient information
         next: ABORT
     instruction: fix
+policies:
+  coding: ../policies/coding.md
+  review: ../policies/review.md
+  testing: ../policies/testing.md
+  ai-antipattern: ../policies/ai-antipattern.md
+output_contracts:
+  plan: ../output-contracts/plan.md
+  ai-review: ../output-contracts/ai-review.md
+  architecture-review: ../output-contracts/architecture-review.md
diff --git a/builtins/en/pieces/default-hybrid-codex.yaml b/builtins/en/pieces/default-hybrid-codex.yaml
index ffddf9c..a265547 100644
--- a/builtins/en/pieces/default-hybrid-codex.yaml
+++ b/builtins/en/pieces/default-hybrid-codex.yaml
@@ -4,10 +4,6 @@
 name: default-hybrid-codex
 description: Standard development piece with planning and specialized reviews
 max_iterations: 30
-policies:
-  coding: ../policies/coding.md
-  review: ../policies/review.md
-  testing: ../policies/testing.md
 knowledge:
   backend: ../knowledge/backend.md
   architecture: ../knowledge/architecture.md
@@ -30,14 +26,6 @@ instructions:
   review-qa: ../instructions/review-qa.md
   fix: ../instructions/fix.md
   supervise: ../instructions/supervise.md
-output_contracts:
-  plan: ../output-contracts/plan.md
-  architecture-design: ../output-contracts/architecture-design.md
-  ai-review: ../output-contracts/ai-review.md
-  architecture-review: ../output-contracts/architecture-review.md
-  qa-review: ../output-contracts/qa-review.md
-  validation: ../output-contracts/validation.md
-  summary: ../output-contracts/summary.md
 initial_movement: plan
 loop_monitors:
   - cycle:
@@ -149,7 +137,9 @@ movements:
   - name: ai_review
     edit: false
     persona: ai-antipattern-reviewer
-    policy: review
+    policy:
+      - review
+      - ai-antipattern
     report:
       name: 04-ai-review.md
       format: ai-review
@@ -233,7 +223,9 @@ movements:
       - name: qa-review
         edit: false
         persona: qa-reviewer
-        policy: review
+        policy:
+          - review
+          - qa
         report:
           name: 06-qa-review.md
           format: qa-review
@@ -298,3 +290,17 @@ movements:
       - condition: Requirements unmet, tests failing, build errors
         next: plan
     instruction: supervise
+policies:
+  coding: ../policies/coding.md
+  review: ../policies/review.md
+  testing: ../policies/testing.md
+  ai-antipattern: ../policies/ai-antipattern.md
+  qa: ../policies/qa.md
+output_contracts:
+  plan: ../output-contracts/plan.md
+  architecture-design: ../output-contracts/architecture-design.md
+  ai-review: ../output-contracts/ai-review.md
+  architecture-review: ../output-contracts/architecture-review.md
+  qa-review: ../output-contracts/qa-review.md
+  validation: ../output-contracts/validation.md
+  summary: ../output-contracts/summary.md
diff --git a/builtins/en/pieces/expert-cqrs-hybrid-codex.yaml b/builtins/en/pieces/expert-cqrs-hybrid-codex.yaml
index 0c58552..3ece1cb 100644
--- a/builtins/en/pieces/expert-cqrs-hybrid-codex.yaml
+++ b/builtins/en/pieces/expert-cqrs-hybrid-codex.yaml
@@ -4,10 +4,6 @@
 name: expert-cqrs-hybrid-codex
 description: CQRS+ES, Frontend, Security, QA Expert Review
 max_iterations: 30
-policies:
-  coding: ../policies/coding.md
-  review: ../policies/review.md
-  testing: ../policies/testing.md
 knowledge:
   frontend: ../knowledge/frontend.md
   backend: ../knowledge/backend.md
@@ -37,15 +33,6 @@ instructions:
   fix: ../instructions/fix.md
   supervise: ../instructions/supervise.md
   fix-supervisor: ../instructions/fix-supervisor.md
-output_contracts:
-  plan: ../output-contracts/plan.md
-  ai-review: ../output-contracts/ai-review.md
-  cqrs-es-review: ../output-contracts/cqrs-es-review.md
-  frontend-review: ../output-contracts/frontend-review.md
-  security-review: ../output-contracts/security-review.md
-  qa-review: ../output-contracts/qa-review.md
-  validation: ../output-contracts/validation.md
-  summary: ../output-contracts/summary.md
 initial_movement: plan
 movements:
   - name: plan
@@ -108,7 +95,9 @@ movements:
   - name: ai_review
     edit: false
     persona: ai-antipattern-reviewer
-    policy: review
+    policy:
+      - review
+      - ai-antipattern
     report:
       name: 03-ai-review.md
       format: ai-review
@@ -230,7 +219,9 @@ movements:
       - name: qa-review
         edit: false
         persona: qa-reviewer
-        policy: review
+        policy:
+          - review
+          - qa
         report:
           name: 07-qa-review.md
           format: qa-review
@@ -325,3 +316,18 @@ movements:
         next: supervise
       - condition: Unable to proceed with fixes
         next: plan
+policies:
+  coding: ../policies/coding.md
+  review: ../policies/review.md
+  testing: ../policies/testing.md
+  ai-antipattern: ../policies/ai-antipattern.md
+  qa: ../policies/qa.md
+output_contracts:
+  plan: ../output-contracts/plan.md
+  ai-review: ../output-contracts/ai-review.md
+  cqrs-es-review: ../output-contracts/cqrs-es-review.md
+  frontend-review: ../output-contracts/frontend-review.md
+  security-review: ../output-contracts/security-review.md
+  qa-review: ../output-contracts/qa-review.md
+  validation: ../output-contracts/validation.md
+  summary: ../output-contracts/summary.md
diff --git a/builtins/en/pieces/expert-hybrid-codex.yaml b/builtins/en/pieces/expert-hybrid-codex.yaml
index c81b27d..d91089a 100644
--- a/builtins/en/pieces/expert-hybrid-codex.yaml
+++ b/builtins/en/pieces/expert-hybrid-codex.yaml
@@ -4,10 +4,6 @@
 name: expert-hybrid-codex
 description: Architecture, Frontend, Security, QA Expert Review
 max_iterations: 30
-policies:
-  coding: ../policies/coding.md
-  review: ../policies/review.md
-  testing: ../policies/testing.md
 knowledge:
   frontend: ../knowledge/frontend.md
   backend: ../knowledge/backend.md
@@ -35,15 +31,6 @@ instructions:
   fix: ../instructions/fix.md
   supervise: ../instructions/supervise.md
   fix-supervisor: ../instructions/fix-supervisor.md
-output_contracts:
-  plan: ../output-contracts/plan.md
-  ai-review: ../output-contracts/ai-review.md
-  architecture-review: ../output-contracts/architecture-review.md
-  frontend-review: ../output-contracts/frontend-review.md
-  security-review: ../output-contracts/security-review.md
-  qa-review: ../output-contracts/qa-review.md
-  validation: ../output-contracts/validation.md
-  summary: ../output-contracts/summary.md
 initial_movement: plan
 movements:
   - name: plan
@@ -105,7 +92,9 @@ movements:
   - name: ai_review
     edit: false
     persona: ai-antipattern-reviewer
-    policy: review
+    policy:
+      - review
+      - ai-antipattern
     report:
       name: 03-ai-review.md
       format: ai-review
@@ -226,7 +215,9 @@ movements:
       - name: qa-review
         edit: false
         persona: qa-reviewer
-        policy: review
+        policy:
+          - review
+          - qa
         report:
           name: 07-qa-review.md
           format: qa-review
@@ -319,3 +310,18 @@ movements:
         next: supervise
       - condition: Unable to proceed with fixes
         next: plan
+policies:
+  coding: ../policies/coding.md
+  review: ../policies/review.md
+  testing: ../policies/testing.md
+  ai-antipattern: ../policies/ai-antipattern.md
+  qa: ../policies/qa.md
+output_contracts:
+  plan: ../output-contracts/plan.md
+  ai-review: ../output-contracts/ai-review.md
+  architecture-review: ../output-contracts/architecture-review.md
+  frontend-review: ../output-contracts/frontend-review.md
+  security-review: ../output-contracts/security-review.md
+  qa-review: ../output-contracts/qa-review.md
+  validation: ../output-contracts/validation.md
+  summary: ../output-contracts/summary.md
diff --git a/builtins/en/pieces/minimal-hybrid-codex.yaml b/builtins/en/pieces/minimal-hybrid-codex.yaml
index cc70324..26eecbb 100644
--- a/builtins/en/pieces/minimal-hybrid-codex.yaml
+++ b/builtins/en/pieces/minimal-hybrid-codex.yaml
@@ -4,10 +4,6 @@
 name: minimal-hybrid-codex
 description: Minimal development piece (implement -> parallel review -> fix if needed -> complete)
 max_iterations: 20
-policies:
-  coding: ../policies/coding.md
-  review: ../policies/review.md
-  testing: ../policies/testing.md
 personas:
   coder: ../personas/coder.md
   ai-antipattern-reviewer: ../personas/ai-antipattern-reviewer.md
@@ -18,8 +14,6 @@ instructions:
   ai-fix: ../instructions/ai-fix.md
   supervise: ../instructions/supervise.md
   fix-supervisor: ../instructions/fix-supervisor.md
-output_contracts:
-  ai-review: ../output-contracts/ai-review.md
 initial_movement: implement
 movements:
   - name: implement
@@ -57,7 +51,9 @@ movements:
       - name: ai_review
         edit: false
         persona: ai-antipattern-reviewer
-        policy: review
+        policy:
+          - review
+          - ai-antipattern
         report:
           name: 03-ai-review.md
           format: ai-review
@@ -194,3 +190,10 @@ movements:
       - condition: Cannot proceed, insufficient info
         next: implement
     instruction: fix-supervisor
+policies:
+  coding: ../policies/coding.md
+  review: ../policies/review.md
+  testing: ../policies/testing.md
+  ai-antipattern: ../policies/ai-antipattern.md
+output_contracts:
+  ai-review: ../output-contracts/ai-review.md
diff --git a/builtins/en/pieces/passthrough-hybrid-codex.yaml b/builtins/en/pieces/passthrough-hybrid-codex.yaml
index 7b8cf71..4f7a451 100644
--- a/builtins/en/pieces/passthrough-hybrid-codex.yaml
+++ b/builtins/en/pieces/passthrough-hybrid-codex.yaml
@@ -4,9 +4,6 @@
 name: passthrough-hybrid-codex
 description: Single-agent thin wrapper. Pass task directly to coder as-is.
 max_iterations: 10
-policies:
-  coding: ../policies/coding.md
-  testing: ../policies/testing.md
 personas:
   coder: ../personas/coder.md
 initial_movement: execute
@@ -41,3 +38,6 @@ movements:
         interactive_only: true
     instruction_template: |
       Do the task.
+policies:
+  coding: ../policies/coding.md
+  testing: ../policies/testing.md
diff --git a/builtins/en/pieces/review-fix-minimal-hybrid-codex.yaml b/builtins/en/pieces/review-fix-minimal-hybrid-codex.yaml
index 3c62744..76bdc66 100644
--- a/builtins/en/pieces/review-fix-minimal-hybrid-codex.yaml
+++ b/builtins/en/pieces/review-fix-minimal-hybrid-codex.yaml
@@ -4,10 +4,6 @@
 name: review-fix-minimal-hybrid-codex
 description: Review and fix piece for existing code (starts with review, no implementation)
 max_iterations: 20
-policies:
-  coding: ../policies/coding.md
-  review: ../policies/review.md
-  testing: ../policies/testing.md
 personas:
   coder: ../personas/coder.md
   ai-antipattern-reviewer: ../personas/ai-antipattern-reviewer.md
@@ -18,8 +14,6 @@ instructions:
   ai-fix: ../instructions/ai-fix.md
   supervise: ../instructions/supervise.md
   fix-supervisor: ../instructions/fix-supervisor.md
-output_contracts:
-  ai-review: ../output-contracts/ai-review.md
 initial_movement: reviewers
 movements:
   - name: implement
@@ -57,7 +51,9 @@ movements:
       - name: ai_review
         edit: false
         persona: ai-antipattern-reviewer
-        policy: review
+        policy:
+          - review
+          - ai-antipattern
         report:
           name: 03-ai-review.md
           format: ai-review
@@ -194,3 +190,10 @@ movements:
       - condition: Cannot proceed, insufficient info
         next: implement
     instruction: fix-supervisor
+policies:
+  coding: ../policies/coding.md
+  review: ../policies/review.md
+  testing: ../policies/testing.md
+  ai-antipattern: ../policies/ai-antipattern.md
+output_contracts:
+  ai-review: ../output-contracts/ai-review.md
diff --git a/builtins/ja/pieces/coding-hybrid-codex.yaml b/builtins/ja/pieces/coding-hybrid-codex.yaml
index 82dfdc3..25677d9 100644
--- a/builtins/ja/pieces/coding-hybrid-codex.yaml
+++ b/builtins/ja/pieces/coding-hybrid-codex.yaml
@@ -4,13 +4,8 @@
 name: coding-hybrid-codex
 description: Lightweight development piece with planning and parallel reviews (plan -> implement -> parallel review -> complete)
 max_iterations: 20
-policies:
-  coding: ../policies/coding.md
-  review: ../policies/review.md
-  testing: ../policies/testing.md
 knowledge:
   architecture: ../knowledge/architecture.md
-  ai-antipattern: ../knowledge/ai-antipattern.md
 personas:
   architect-planner: ../personas/architect-planner.md
   coder: ../personas/coder.md
@@ -22,10 +17,6 @@ instructions:
   ai-review: ../instructions/ai-review.md
   review-arch: ../instructions/review-arch.md
   fix: ../instructions/fix.md
-output_contracts:
-  plan: ../output-contracts/plan.md
-  ai-review: ../output-contracts/ai-review.md
-  architecture-review: ../output-contracts/architecture-review.md
 initial_movement: plan
 movements:
   - name: plan
@@ -88,8 +79,9 @@ movements:
       - name: ai_review
         edit: false
         persona: ai-antipattern-reviewer
-        policy: review
-        knowledge: ai-antipattern
+        policy:
+          - review
+          - ai-antipattern
         report:
           name: 04-ai-review.md
           format: ai-review
@@ -150,3 +142,12 @@ movements:
       - condition: 判断できない、情報不足
         next: ABORT
     instruction: fix
+policies:
+  coding: ../policies/coding.md
+  review: ../policies/review.md
+  testing: ../policies/testing.md
+  ai-antipattern: ../policies/ai-antipattern.md
+output_contracts:
+  plan: ../output-contracts/plan.md
+  ai-review: ../output-contracts/ai-review.md
+  architecture-review: ../output-contracts/architecture-review.md
diff --git a/builtins/ja/pieces/default-hybrid-codex.yaml b/builtins/ja/pieces/default-hybrid-codex.yaml
index 097852f..cb5ee6a 100644
--- a/builtins/ja/pieces/default-hybrid-codex.yaml
+++ b/builtins/ja/pieces/default-hybrid-codex.yaml
@@ -4,15 +4,9 @@
 name: default-hybrid-codex
 description: Standard development piece with planning and specialized reviews
 max_iterations: 30
-policies:
-  coding: ../policies/coding.md
-  review: ../policies/review.md
-  testing: ../policies/testing.md
 knowledge:
   architecture: ../knowledge/architecture.md
   backend: ../knowledge/backend.md
-  ai-antipattern: ../knowledge/ai-antipattern.md
-  qa: ../knowledge/qa.md
 personas:
   planner: ../personas/planner.md
   architect-planner: ../personas/architect-planner.md
@@ -32,14 +26,6 @@ instructions:
   review-qa: ../instructions/review-qa.md
   fix: ../instructions/fix.md
   supervise: ../instructions/supervise.md
-output_contracts:
-  plan: ../output-contracts/plan.md
-  architecture-design: ../output-contracts/architecture-design.md
-  ai-review: ../output-contracts/ai-review.md
-  architecture-review: ../output-contracts/architecture-review.md
-  qa-review: ../output-contracts/qa-review.md
-  validation: ../output-contracts/validation.md
-  summary: ../output-contracts/summary.md
 initial_movement: plan
 loop_monitors:
   - cycle:
@@ -151,8 +137,9 @@ movements:
   - name: ai_review
     edit: false
     persona: ai-antipattern-reviewer
-    policy: review
-    knowledge: ai-antipattern
+    policy:
+      - review
+      - ai-antipattern
     report:
       name: 04-ai-review.md
       format: ai-review
@@ -236,8 +223,9 @@ movements:
       - name: qa-review
         edit: false
         persona: qa-reviewer
-        policy: review
-        knowledge: qa
+        policy:
+          - review
+          - qa
         report:
           name: 06-qa-review.md
           format: qa-review
@@ -302,3 +290,17 @@ movements:
       - condition: 要求未達成、テスト失敗、ビルドエラー
         next: plan
     instruction: supervise
+policies:
+  coding: ../policies/coding.md
+  review: ../policies/review.md
+  testing: ../policies/testing.md
+  ai-antipattern: ../policies/ai-antipattern.md
+  qa: ../policies/qa.md
+output_contracts:
+  plan: ../output-contracts/plan.md
+  architecture-design: ../output-contracts/architecture-design.md
+  ai-review: ../output-contracts/ai-review.md
+  architecture-review: ../output-contracts/architecture-review.md
+  qa-review: ../output-contracts/qa-review.md
+  validation: ../output-contracts/validation.md
+  summary: ../output-contracts/summary.md
diff --git a/builtins/ja/pieces/expert-cqrs-hybrid-codex.yaml b/builtins/ja/pieces/expert-cqrs-hybrid-codex.yaml
index 7aafc08..e78d071 100644
--- a/builtins/ja/pieces/expert-cqrs-hybrid-codex.yaml
+++ b/builtins/ja/pieces/expert-cqrs-hybrid-codex.yaml
@@ -4,18 +4,12 @@
 name: expert-cqrs-hybrid-codex
 description: CQRS+ES・フロントエンド・セキュリティ・QA専門家レビュー
 max_iterations: 30
-policies:
-  coding: ../policies/coding.md
-  review: ../policies/review.md
-  testing: ../policies/testing.md
 knowledge:
   frontend: ../knowledge/frontend.md
   backend: ../knowledge/backend.md
   cqrs-es: ../knowledge/cqrs-es.md
   security: ../knowledge/security.md
   architecture: ../knowledge/architecture.md
-  ai-antipattern: ../knowledge/ai-antipattern.md
-  qa: ../knowledge/qa.md
 personas:
   planner: ../personas/planner.md
   coder: ../personas/coder.md
@@ -39,15 +33,6 @@ instructions:
   fix: ../instructions/fix.md
   supervise: ../instructions/supervise.md
   fix-supervisor: ../instructions/fix-supervisor.md
-output_contracts:
-  plan: ../output-contracts/plan.md
-  ai-review: ../output-contracts/ai-review.md
-  cqrs-es-review: ../output-contracts/cqrs-es-review.md
-  frontend-review: ../output-contracts/frontend-review.md
-  security-review: ../output-contracts/security-review.md
-  qa-review: ../output-contracts/qa-review.md
-  validation: ../output-contracts/validation.md
-  summary: ../output-contracts/summary.md
 initial_movement: plan
 movements:
   - name: plan
@@ -110,8 +95,9 @@ movements:
   - name: ai_review
     edit: false
     persona: ai-antipattern-reviewer
-    policy: review
-    knowledge: ai-antipattern
+    policy:
+      - review
+      - ai-antipattern
     report:
       name: 03-ai-review.md
       format: ai-review
@@ -233,8 +219,9 @@ movements:
       - name: qa-review
         edit: false
         persona: qa-reviewer
-        policy: review
-        knowledge: qa
+        policy:
+          - review
+          - qa
         report:
           name: 07-qa-review.md
           format: qa-review
@@ -329,3 +316,18 @@ movements:
         next: supervise
       - condition: 修正を進行できない
         next: plan
+policies:
+  coding: ../policies/coding.md
+  review: ../policies/review.md
+  testing: ../policies/testing.md
+  ai-antipattern: ../policies/ai-antipattern.md
+  qa: ../policies/qa.md
+output_contracts:
+  plan: ../output-contracts/plan.md
+  ai-review: ../output-contracts/ai-review.md
+  cqrs-es-review: ../output-contracts/cqrs-es-review.md
+  frontend-review: ../output-contracts/frontend-review.md
+  security-review: ../output-contracts/security-review.md
+  qa-review: ../output-contracts/qa-review.md
+  validation: ../output-contracts/validation.md
+  summary: ../output-contracts/summary.md
diff --git a/builtins/ja/pieces/expert-hybrid-codex.yaml b/builtins/ja/pieces/expert-hybrid-codex.yaml
index c8e638c..d3cf95b 100644
--- a/builtins/ja/pieces/expert-hybrid-codex.yaml
+++ b/builtins/ja/pieces/expert-hybrid-codex.yaml
@@ -4,17 +4,11 @@
 name: expert-hybrid-codex
 description: アーキテクチャ・フロントエンド・セキュリティ・QA専門家レビュー
 max_iterations: 30
-policies:
-  coding: ../policies/coding.md
-  review: ../policies/review.md
-  testing: ../policies/testing.md
 knowledge:
   frontend: ../knowledge/frontend.md
   backend: ../knowledge/backend.md
   security: ../knowledge/security.md
   architecture: ../knowledge/architecture.md
-  ai-antipattern: ../knowledge/ai-antipattern.md
-  qa: ../knowledge/qa.md
 personas:
   planner: ../personas/planner.md
   coder: ../personas/coder.md
@@ -37,15 +31,6 @@ instructions:
   fix: ../instructions/fix.md
   supervise: ../instructions/supervise.md
   fix-supervisor: ../instructions/fix-supervisor.md
-output_contracts:
-  plan: ../output-contracts/plan.md
-  ai-review: ../output-contracts/ai-review.md
-  architecture-review: ../output-contracts/architecture-review.md
-  frontend-review: ../output-contracts/frontend-review.md
-  security-review: ../output-contracts/security-review.md
-  qa-review: ../output-contracts/qa-review.md
-  validation: ../output-contracts/validation.md
-  summary: ../output-contracts/summary.md
 initial_movement: plan
 movements:
   - name: plan
@@ -107,8 +92,9 @@ movements:
   - name: ai_review
     edit: false
     persona: ai-antipattern-reviewer
-    policy: review
-    knowledge: ai-antipattern
+    policy:
+      - review
+      - ai-antipattern
     report:
       name: 03-ai-review.md
       format: ai-review
@@ -229,8 +215,9 @@ movements:
       - name: qa-review
         edit: false
         persona: qa-reviewer
-        policy: review
-        knowledge: qa
+        policy:
+          - review
+          - qa
         report:
           name: 07-qa-review.md
           format: qa-review
@@ -323,3 +310,18 @@ movements:
         next: supervise
       - condition: 修正を進行できない
         next: plan
+policies:
+  coding: ../policies/coding.md
+  review: ../policies/review.md
+  testing: ../policies/testing.md
+  ai-antipattern: ../policies/ai-antipattern.md
+  qa: ../policies/qa.md
+output_contracts:
+  plan: ../output-contracts/plan.md
+  ai-review: ../output-contracts/ai-review.md
+  architecture-review: ../output-contracts/architecture-review.md
+  frontend-review: ../output-contracts/frontend-review.md
+  security-review: ../output-contracts/security-review.md
+  qa-review: ../output-contracts/qa-review.md
+  validation: ../output-contracts/validation.md
+  summary: ../output-contracts/summary.md
diff --git a/builtins/ja/pieces/minimal-hybrid-codex.yaml b/builtins/ja/pieces/minimal-hybrid-codex.yaml
index 12cae5d..1b5d3ec 100644
--- a/builtins/ja/pieces/minimal-hybrid-codex.yaml
+++ b/builtins/ja/pieces/minimal-hybrid-codex.yaml
@@ -4,12 +4,6 @@
 name: minimal-hybrid-codex
 description: Minimal development piece (implement -> parallel review -> fix if needed -> complete)
 max_iterations: 20
-policies:
-  coding: ../policies/coding.md
-  review: ../policies/review.md
-  testing: ../policies/testing.md
-knowledge:
-  ai-antipattern: ../knowledge/ai-antipattern.md
 personas:
   coder: ../personas/coder.md
   ai-antipattern-reviewer: ../personas/ai-antipattern-reviewer.md
@@ -20,8 +14,6 @@ instructions:
   ai-fix: ../instructions/ai-fix.md
   supervise: ../instructions/supervise.md
   fix-supervisor: ../instructions/fix-supervisor.md
-output_contracts:
-  ai-review: ../output-contracts/ai-review.md
 initial_movement: implement
 movements:
   - name: implement
@@ -59,8 +51,9 @@ movements:
       - name: ai_review
         edit: false
         persona: ai-antipattern-reviewer
-        policy: review
-        knowledge: ai-antipattern
+        policy:
+          - review
+          - ai-antipattern
         report:
           name: 03-ai-review.md
           format: ai-review
@@ -197,3 +190,10 @@ movements:
       - condition: 修正を進行できない
         next: implement
     instruction: fix-supervisor
+policies:
+  coding: ../policies/coding.md
+  review: ../policies/review.md
+  testing: ../policies/testing.md
+  ai-antipattern: ../policies/ai-antipattern.md
+output_contracts:
+  ai-review: ../output-contracts/ai-review.md
diff --git a/builtins/ja/pieces/passthrough-hybrid-codex.yaml b/builtins/ja/pieces/passthrough-hybrid-codex.yaml
index d73c9dd..6d209aa 100644
--- a/builtins/ja/pieces/passthrough-hybrid-codex.yaml
+++ b/builtins/ja/pieces/passthrough-hybrid-codex.yaml
@@ -4,9 +4,6 @@
 name: passthrough-hybrid-codex
 description: Single-agent thin wrapper. Pass task directly to coder as-is.
 max_iterations: 10
-policies:
-  coding: ../policies/coding.md
-  testing: ../policies/testing.md
 personas:
   coder: ../personas/coder.md
 initial_movement: execute
@@ -41,3 +38,6 @@ movements:
         interactive_only: true
     instruction_template: |
       タスクをこなしてください。
+policies:
+  coding: ../policies/coding.md
+  testing: ../policies/testing.md
diff --git a/builtins/ja/pieces/review-fix-minimal-hybrid-codex.yaml b/builtins/ja/pieces/review-fix-minimal-hybrid-codex.yaml
index 4b7798f..7ff4e3e 100644
--- a/builtins/ja/pieces/review-fix-minimal-hybrid-codex.yaml
+++ b/builtins/ja/pieces/review-fix-minimal-hybrid-codex.yaml
@@ -4,12 +4,6 @@
 name: review-fix-minimal-hybrid-codex
 description: 既存コードのレビューと修正ピース（レビュー開始、実装なし）
 max_iterations: 20
-policies:
-  coding: ../policies/coding.md
-  review: ../policies/review.md
-  testing: ../policies/testing.md
-knowledge:
-  ai-antipattern: ../knowledge/ai-antipattern.md
 personas:
   coder: ../personas/coder.md
   ai-antipattern-reviewer: ../personas/ai-antipattern-reviewer.md
@@ -20,8 +14,6 @@ instructions:
   ai-fix: ../instructions/ai-fix.md
   supervise: ../instructions/supervise.md
   fix-supervisor: ../instructions/fix-supervisor.md
-output_contracts:
-  ai-review: ../output-contracts/ai-review.md
 initial_movement: reviewers
 movements:
   - name: implement
@@ -59,8 +51,9 @@ movements:
       - name: ai_review
         edit: false
         persona: ai-antipattern-reviewer
-        policy: review
-        knowledge: ai-antipattern
+        policy:
+          - review
+          - ai-antipattern
         report:
           name: 03-ai-review.md
           format: ai-review
@@ -197,3 +190,10 @@ movements:
       - condition: 修正を進行できない
         next: implement
     instruction: fix-supervisor
+policies:
+  coding: ../policies/coding.md
+  review: ../policies/review.md
+  testing: ../policies/testing.md
+  ai-antipattern: ../policies/ai-antipattern.md
+output_contracts:
+  ai-review: ../output-contracts/ai-review.md