diff --git a/registry/index.json b/registry/index.json
index 20efb717..9c2ee295 100644
--- a/registry/index.json
+++ b/registry/index.json
@@ -1,6 +1,6 @@
 {
   "schema_version": "2.0",
-  "generated_at": "2026-06-13",
+  "generated_at": "2026-06-15",
   "package_count": 1,
   "packages": [
     {
@@ -16,7 +16,7 @@
         "vscode"
       ],
       "package_metadata": "registry/packages/yao-meta-skill.json",
-      "package_sha256": "4660a11db94947ab603dca42eddc447698785d08f0df2972bf2ca43454683306"
+      "package_sha256": "76edc3f9936da8966eff0e0f689568c7d6d787691a45773a3e86bb38be6b0cc4"
     }
   ]
 }
diff --git a/registry/packages/yao-meta-skill.json b/registry/packages/yao-meta-skill.json
index 63277823..7bb7f39d 100644
--- a/registry/packages/yao-meta-skill.json
+++ b/registry/packages/yao-meta-skill.json
@@ -16,8 +16,8 @@
   "trust_level": "local",
   "license": "MIT",
   "checksums": {
-    "package_sha256": "4660a11db94947ab603dca42eddc447698785d08f0df2972bf2ca43454683306",
-    "archive_sha256": "6852cf91a74d232c32d732b7c159c971827abf23af50153987193b084ad3b5cc"
+    "package_sha256": "76edc3f9936da8966eff0e0f689568c7d6d787691a45773a3e86bb38be6b0cc4",
+    "archive_sha256": "798153ff8e1569408e8f658be5aea1f144ee44bfe4edf658c71d6a2f0275c1c8"
   },
   "compatibility": {
     "openai": "pass",
@@ -48,10 +48,10 @@
   },
   "distribution": {
     "archive_verified": true,
-    "archive_sha256": "6852cf91a74d232c32d732b7c159c971827abf23af50153987193b084ad3b5cc",
+    "archive_sha256": "798153ff8e1569408e8f658be5aea1f144ee44bfe4edf658c71d6a2f0275c1c8",
     "package_verification": "reports/package_verification.json",
     "install_simulated": true,
     "install_simulation": "reports/install_simulation.json"
   },
-  "generated_at": "2026-06-13"
+  "generated_at": "2026-06-15"
 }
diff --git a/reports/adoption_drift_report.json b/reports/adoption_drift_report.json
index 2d9d86fc..0796c3a3 100644
--- a/reports/adoption_drift_report.json
+++ b/reports/adoption_drift_report.json
@@ -1,7 +1,7 @@
 {
   "ok": true,
   "schema_version": "2.0",
-  "generated_at": "2026-06-15T14:17:52Z",
+  "generated_at": "2026-06-15T14:35:15Z",
   "skill_dir": ".",
   "privacy_contract": {
     "storage": "local-first",
diff --git a/reports/architecture_maintainability.json b/reports/architecture_maintainability.json
index 12fd0d1d..8117c3ac 100644
--- a/reports/architecture_maintainability.json
+++ b/reports/architecture_maintainability.json
@@ -4,15 +4,17 @@
   "generated_at": "2026-06-15",
   "skill_dir": ".",
   "summary": {
-    "python_file_count": 170,
-    "script_file_count": 107,
+    "python_file_count": 172,
+    "script_file_count": 109,
     "test_file_count": 63,
-    "internal_module_count": 29,
+    "internal_module_count": 31,
     "cli_script_count": 80,
-    "command_handler_count": 34,
+    "command_handler_count": 63,
+    "entrypoint_command_handler_count": 18,
+    "command_module_count": 6,
     "warn_line_threshold": 900,
     "block_line_threshold": 1500,
-    "largest_file_lines": 896,
+    "largest_file_lines": 897,
     "hotspot_count": 0,
     "blocker_count": 0,
     "decision": "pass"
@@ -20,18 +22,11 @@
   "largest_files": [
     {
       "path": "tests/verify_yao_cli.py",
-      "lines": 896,
+      "lines": 897,
       "kind": "test",
       "severity": "pass",
       "recommendation": "Break broad integration assertions into focused verifier helpers when the next behavior change lands."
     },
-    {
-      "path": "scripts/yao.py",
-      "lines": 889,
-      "kind": "cli-script",
-      "severity": "pass",
-      "recommendation": "Split command handlers by domain while keeping scripts/yao.py as the thin CLI orchestrator."
-    },
     {
       "path": "scripts/skill_report_layout.py",
       "lines": 808,
@@ -101,6 +96,13 @@
       "kind": "cli-script",
       "severity": "pass",
       "recommendation": "Split viewer data assembly from HTML section rendering."
+    },
+    {
+      "path": "scripts/cross_packager.py",
+      "lines": 650,
+      "kind": "cli-script",
+      "severity": "pass",
+      "recommendation": "Watch this file before adding new responsibilities; extract a helper module when one concern dominates."
     }
   ],
   "hotspots": [],
diff --git a/reports/architecture_maintainability.md b/reports/architecture_maintainability.md
index 86e9fe46..1f9437fe 100644
--- a/reports/architecture_maintainability.md
+++ b/reports/architecture_maintainability.md
@@ -5,13 +5,15 @@ Generated at: `2026-06-15`
 ## Summary
 
 - decision: `pass`
-- python files: `170`
-- scripts: `107`
+- python files: `172`
+- scripts: `109`
 - tests: `63`
-- internal modules: `29`
+- internal modules: `31`
 - CLI scripts: `80`
-- Yao CLI command handlers: `34`
-- largest file lines: `896`
+- Yao CLI command handlers: `63`
+- entrypoint command handlers: `18`
+- command modules: `6`
+- largest file lines: `897`
 - hotspots: `0`
 - blockers: `0`
 
@@ -25,8 +27,7 @@ No file-size hotspots found.
 
 | File | Lines | Kind | Severity |
 | --- | ---: | --- | --- |
-| `tests/verify_yao_cli.py` | `896` | `test` | `pass` |
-| `scripts/yao.py` | `889` | `cli-script` | `pass` |
+| `tests/verify_yao_cli.py` | `897` | `test` | `pass` |
 | `scripts/skill_report_layout.py` | `808` | `internal-module` | `pass` |
 | `scripts/skill_report_model.py` | `801` | `internal-module` | `pass` |
 | `scripts/yao_cli_parser.py` | `784` | `internal-module` | `pass` |
@@ -37,6 +38,7 @@ No file-size hotspots found.
 | `scripts/trust_check.py` | `714` | `internal-module` | `pass` |
 | `scripts/review_studio_layout.py` | `694` | `internal-module` | `pass` |
 | `scripts/render_review_viewer.py` | `685` | `cli-script` | `pass` |
+| `scripts/cross_packager.py` | `650` | `cli-script` | `pass` |
 
 ## Release Rule
 
diff --git a/reports/conformance_matrix.json b/reports/conformance_matrix.json
index 17ac0e94..722a8ef7 100644
--- a/reports/conformance_matrix.json
+++ b/reports/conformance_matrix.json
@@ -32,6 +32,7 @@
         "Skill IR description matches frontmatter",
         "references resource resolves: references/artifact-design-doctrine.md",
         "references resource resolves: references/authoring-discipline.md",
+        "references resource resolves: references/autonomous-adaptation.md",
         "references resource resolves: references/distribution-registry-method.md",
         "references resource resolves: references/eval-playbook.md",
         "references resource resolves: references/gate-selection.md",
@@ -40,8 +41,7 @@
         "references resource resolves: references/intent-dialogue.md",
         "references resource resolves: references/iteration-philosophy.md",
         "references resource resolves: references/non-skill-decision-tree.md",
-        "references resource resolves: references/operating-modes.md",
-        "references resource resolves: references/output-eval-method.md"
+        "references resource resolves: references/operating-modes.md"
       ],
       "failures": [],
       "warnings": []
@@ -76,6 +76,7 @@
         "Skill IR description matches frontmatter",
         "references resource resolves: references/artifact-design-doctrine.md",
         "references resource resolves: references/authoring-discipline.md",
+        "references resource resolves: references/autonomous-adaptation.md",
         "references resource resolves: references/distribution-registry-method.md",
         "references resource resolves: references/eval-playbook.md",
         "references resource resolves: references/gate-selection.md",
@@ -84,8 +85,7 @@
         "references resource resolves: references/intent-dialogue.md",
         "references resource resolves: references/iteration-philosophy.md",
         "references resource resolves: references/non-skill-decision-tree.md",
-        "references resource resolves: references/operating-modes.md",
-        "references resource resolves: references/output-eval-method.md"
+        "references resource resolves: references/operating-modes.md"
       ],
       "failures": [],
       "warnings": []
@@ -99,7 +99,7 @@
         "frontmatter description exists",
         "description length <= 1024",
         "name is runtime-safe",
-        "directory name matches skill name",
+        "package identity derives from skill name",
         "manifest.name exists",
         "manifest.version exists",
         "manifest.owner exists",
@@ -120,6 +120,7 @@
         "Skill IR description matches frontmatter",
         "references resource resolves: references/artifact-design-doctrine.md",
         "references resource resolves: references/authoring-discipline.md",
+        "references resource resolves: references/autonomous-adaptation.md",
         "references resource resolves: references/distribution-registry-method.md",
         "references resource resolves: references/eval-playbook.md",
         "references resource resolves: references/gate-selection.md",
@@ -128,8 +129,7 @@
         "references resource resolves: references/intent-dialogue.md",
         "references resource resolves: references/iteration-philosophy.md",
         "references resource resolves: references/non-skill-decision-tree.md",
-        "references resource resolves: references/operating-modes.md",
-        "references resource resolves: references/output-eval-method.md"
+        "references resource resolves: references/operating-modes.md"
       ],
       "failures": [],
       "warnings": [
@@ -145,7 +145,7 @@
         "frontmatter description exists",
         "description length <= 1024",
         "name is runtime-safe",
-        "directory name matches skill name",
+        "package identity derives from skill name",
         "manifest.name exists",
         "manifest.version exists",
         "manifest.owner exists",
@@ -166,6 +166,7 @@
         "Skill IR description matches frontmatter",
         "references resource resolves: references/artifact-design-doctrine.md",
         "references resource resolves: references/authoring-discipline.md",
+        "references resource resolves: references/autonomous-adaptation.md",
         "references resource resolves: references/distribution-registry-method.md",
         "references resource resolves: references/eval-playbook.md",
         "references resource resolves: references/gate-selection.md",
@@ -174,8 +175,7 @@
         "references resource resolves: references/intent-dialogue.md",
         "references resource resolves: references/iteration-philosophy.md",
         "references resource resolves: references/non-skill-decision-tree.md",
-        "references resource resolves: references/operating-modes.md",
-        "references resource resolves: references/output-eval-method.md"
+        "references resource resolves: references/operating-modes.md"
       ],
       "failures": [],
       "warnings": [
@@ -212,6 +212,7 @@
         "Skill IR description matches frontmatter",
         "references resource resolves: references/artifact-design-doctrine.md",
         "references resource resolves: references/authoring-discipline.md",
+        "references resource resolves: references/autonomous-adaptation.md",
         "references resource resolves: references/distribution-registry-method.md",
         "references resource resolves: references/eval-playbook.md",
         "references resource resolves: references/gate-selection.md",
@@ -220,8 +221,7 @@
         "references resource resolves: references/intent-dialogue.md",
         "references resource resolves: references/iteration-philosophy.md",
         "references resource resolves: references/non-skill-decision-tree.md",
-        "references resource resolves: references/operating-modes.md",
-        "references resource resolves: references/output-eval-method.md"
+        "references resource resolves: references/operating-modes.md"
       ],
       "failures": [],
       "warnings": []
diff --git a/reports/context_budget.json b/reports/context_budget.json
index f5087100..2d55b911 100644
--- a/reports/context_budget.json
+++ b/reports/context_budget.json
@@ -6,16 +6,16 @@
     "context_budget_tier": "production",
     "context_budget_limit": 1000,
     "skill_body_tokens": 767,
-    "other_text_tokens": 1334221,
+    "other_text_tokens": 1334868,
     "estimated_initial_load_tokens": 960,
-    "estimated_total_text_tokens": 1334988,
-    "deferred_resource_tokens": 421829,
+    "estimated_total_text_tokens": 1335635,
+    "deferred_resource_tokens": 421932,
     "deferred_resource_warn_threshold": 120000,
     "deferred_resource_dirs": [
       {
         "path": "scripts",
-        "estimated_tokens": 373239,
-        "file_count": 107
+        "estimated_tokens": 373342,
+        "file_count": 109
       },
       {
         "path": "references",
@@ -31,8 +31,8 @@
     "large_deferred_resource_dirs": [
       {
         "path": "scripts",
-        "estimated_tokens": 373239,
-        "file_count": 107
+        "estimated_tokens": 373342,
+        "file_count": 109
       }
     ],
     "deferred_resource_governance": {
@@ -54,14 +54,14 @@
           ],
           "missing": [],
           "path": "scripts",
-          "estimated_tokens": 373239,
-          "file_count": 107,
+          "estimated_tokens": 373342,
+          "file_count": 109,
           "rationale": "Script resources are deterministic deferred tools, not initial-load prompt context."
         }
       ],
       "summary": "Large deferred resources are indexed and backed by evidence."
     },
-    "relevant_file_count": 549,
+    "relevant_file_count": 554,
     "unused_resource_dirs": [],
     "quality_signal_points": 130,
     "quality_density": 135.4
diff --git a/reports/context_budget.md b/reports/context_budget.md
index 8f365dd1..26cce1bc 100644
--- a/reports/context_budget.md
+++ b/reports/context_budget.md
@@ -2,7 +2,7 @@
 
 | Target | Path | Tier | Limit | Initial | SKILL | Deferred | Resource Governance | Large Deferred Dirs | Quality Density | Unused Dirs | Status |
 | --- | --- | --- | ---: | ---: | ---: | ---: | --- | --- | ---: | --- | --- |
-| root | `.` | `production` | 1000 | 960 | 767 | 421829 | `governed` | scripts:373239 | 135.4 | - | ok |
+| root | `.` | `production` | 1000 | 960 | 767 | 421932 | `governed` | scripts:373342 | 135.4 | - | ok |
 | complex-release-orchestrator | `examples/complex-release-orchestrator/generated-skill` | `production` | 1000 | 790 | 718 | 1657 | `not-required` | - | 164.6 | - | ok |
 | governed-incident-command | `examples/governed-incident-command/generated-skill` | `production` | 1000 | 760 | 658 | 1030 | `not-required` | - | 171.1 | - | ok |
 
diff --git a/reports/context_budget_summary.json b/reports/context_budget_summary.json
index 4da74d6e..1bcc662e 100644
--- a/reports/context_budget_summary.json
+++ b/reports/context_budget_summary.json
@@ -8,12 +8,12 @@
       "budget_limit": 1000,
       "initial_tokens": 960,
       "skill_body_tokens": 767,
-      "deferred_resource_tokens": 421829,
+      "deferred_resource_tokens": 421932,
       "large_deferred_resource_dirs": [
         {
           "path": "scripts",
-          "estimated_tokens": 373239,
-          "file_count": 107
+          "estimated_tokens": 373342,
+          "file_count": 109
         }
       ],
       "deferred_resource_governance": {
@@ -35,8 +35,8 @@
             ],
             "missing": [],
             "path": "scripts",
-            "estimated_tokens": 373239,
-            "file_count": 107,
+            "estimated_tokens": 373342,
+            "file_count": 109,
             "rationale": "Script resources are deterministic deferred tools, not initial-load prompt context."
           }
         ],
diff --git a/reports/install_simulation.json b/reports/install_simulation.json
index e57c37e7..9c4f85ef 100644
--- a/reports/install_simulation.json
+++ b/reports/install_simulation.json
@@ -1,14 +1,14 @@
 {
   "ok": true,
   "schema_version": "2.0",
-  "generated_at": "2026-06-13",
+  "generated_at": "2026-06-15",
   "skill_dir": ".",
-  "package_dir": "tests/tmp_review_studio/dist",
-  "install_root": "tests/tmp_review_studio/install-root/simulate-yao-meta-skill",
-  "installed_skill_dir": "tests/tmp_review_studio/install-root/simulate-yao-meta-skill/yao-meta-skill",
+  "package_dir": "dist",
+  "install_root": "[temporary-install-root]",
+  "installed_skill_dir": "[temporary-install-root]/yao-meta-skill",
   "summary": {
     "archive_present": true,
-    "archive_entry_count": 607,
+    "archive_entry_count": 609,
     "archive_extracted": true,
     "entrypoint_loaded": true,
     "manifest_loaded": true,
@@ -18,7 +18,7 @@
     "installer_permission_failure_count": 0,
     "permission_target_count": 4,
     "permission_capability_count": 3,
-    "install_root_is_temp": false,
+    "install_root_is_temp": true,
     "failure_count": 0,
     "warning_count": 0
   },
@@ -26,7 +26,7 @@
     {
       "id": "archive-present",
       "status": "pass",
-      "detail": "Package archive exists: tests/tmp_review_studio/dist/yao-meta-skill.zip"
+      "detail": "Package archive exists: dist/yao-meta-skill.zip"
     },
     {
       "id": "archive-safe-paths",
@@ -272,9 +272,9 @@
   "failures": [],
   "warnings": [],
   "artifacts": {
-    "archive": "tests/tmp_review_studio/dist/yao-meta-skill.zip",
-    "package_manifest": "tests/tmp_review_studio/dist/manifest.json",
-    "json": "tests/tmp_review_studio/install_simulation.json",
-    "markdown": "tests/tmp_review_studio/install_simulation.md"
+    "archive": "dist/yao-meta-skill.zip",
+    "package_manifest": "dist/manifest.json",
+    "json": "reports/install_simulation.json",
+    "markdown": "reports/install_simulation.md"
   }
 }
diff --git a/reports/install_simulation.md b/reports/install_simulation.md
index b0d16dae..6750e007 100644
--- a/reports/install_simulation.md
+++ b/reports/install_simulation.md
@@ -1,7 +1,7 @@
 # Install Simulation
 
 - OK: `True`
-- Package directory: `tests/tmp_review_studio/dist`
+- Package directory: `dist`
 - Archive extracted: `True`
 - Entrypoint loaded: `True`
 - Manifest loaded: `True`
@@ -16,7 +16,7 @@
 
 | Check | Status | Detail |
 | --- | --- | --- |
-| `archive-present` | `pass` | Package archive exists: tests/tmp_review_studio/dist/yao-meta-skill.zip |
+| `archive-present` | `pass` | Package archive exists: dist/yao-meta-skill.zip |
 | `archive-safe-paths` | `pass` | Archive has no absolute or parent-traversal entries |
 | `single-top-level` | `pass` | Archive top-level directory is yao-meta-skill |
 | `entrypoint-load` | `pass` | Installed SKILL.md frontmatter is readable |
diff --git a/reports/output_execution_runs.json b/reports/output_execution_runs.json
index 0bb21340..5c72d7a7 100644
--- a/reports/output_execution_runs.json
+++ b/reports/output_execution_runs.json
@@ -34,7 +34,7 @@
       "execution_mode": "command",
       "model_executed": false,
       "command_executed": true,
-      "duration_ms": 28.57,
+      "duration_ms": 35.01,
       "provider": "local-output-eval-runner",
       "model": "",
       "usage": {
@@ -62,7 +62,7 @@
       "execution_mode": "command",
       "model_executed": false,
       "command_executed": true,
-      "duration_ms": 28.87,
+      "duration_ms": 34.89,
       "provider": "local-output-eval-runner",
       "model": "",
       "usage": {
@@ -85,7 +85,7 @@
       "execution_mode": "command",
       "model_executed": false,
       "command_executed": true,
-      "duration_ms": 27.45,
+      "duration_ms": 36.42,
       "provider": "local-output-eval-runner",
       "model": "",
       "usage": {
@@ -113,7 +113,7 @@
       "execution_mode": "command",
       "model_executed": false,
       "command_executed": true,
-      "duration_ms": 26.35,
+      "duration_ms": 39.48,
       "provider": "local-output-eval-runner",
       "model": "",
       "usage": {
@@ -136,7 +136,7 @@
       "execution_mode": "command",
       "model_executed": false,
       "command_executed": true,
-      "duration_ms": 26.57,
+      "duration_ms": 36.04,
       "provider": "local-output-eval-runner",
       "model": "",
       "usage": {
@@ -164,7 +164,7 @@
       "execution_mode": "command",
       "model_executed": false,
       "command_executed": true,
-      "duration_ms": 26.15,
+      "duration_ms": 36.06,
       "provider": "local-output-eval-runner",
       "model": "",
       "usage": {
@@ -187,7 +187,7 @@
       "execution_mode": "command",
       "model_executed": false,
       "command_executed": true,
-      "duration_ms": 25.93,
+      "duration_ms": 34.85,
       "provider": "local-output-eval-runner",
       "model": "",
       "usage": {
@@ -214,7 +214,7 @@
       "execution_mode": "command",
       "model_executed": false,
       "command_executed": true,
-      "duration_ms": 25.88,
+      "duration_ms": 40.88,
       "provider": "local-output-eval-runner",
       "model": "",
       "usage": {
@@ -237,7 +237,7 @@
       "execution_mode": "command",
       "model_executed": false,
       "command_executed": true,
-      "duration_ms": 26.71,
+      "duration_ms": 42.57,
       "provider": "local-output-eval-runner",
       "model": "",
       "usage": {
@@ -266,7 +266,7 @@
       "execution_mode": "command",
       "model_executed": false,
       "command_executed": true,
-      "duration_ms": 26.73,
+      "duration_ms": 42.98,
       "provider": "local-output-eval-runner",
       "model": "",
       "usage": {
diff --git a/reports/output_execution_runs.md b/reports/output_execution_runs.md
index a7596c88..e2e61939 100644
--- a/reports/output_execution_runs.md
+++ b/reports/output_execution_runs.md
@@ -23,16 +23,16 @@ Command runner evidence is present. This proves the eval harness executed an ext
 
 | Case | Variant | Mode | Model | Duration ms | Tokens | Score | Status |
 | --- | --- | --- | --- | ---: | ---: | ---: | --- |
-| skill-package-contract | baseline | command | local-output-eval-runner | 28.57 | 33 | 0.0 | pass |
-| skill-package-contract | with_skill | command | local-output-eval-runner | 28.87 | 73 | 100.0 | pass |
-| output-eval-expectation | baseline | command | local-output-eval-runner | 27.45 | 36 | 0.0 | pass |
-| output-eval-expectation | with_skill | command | local-output-eval-runner | 26.35 | 80 | 100.0 | pass |
-| ir-before-packaging | baseline | command | local-output-eval-runner | 26.57 | 33 | 0.0 | pass |
-| ir-before-packaging | with_skill | command | local-output-eval-runner | 26.15 | 80 | 100.0 | pass |
-| near-neighbor-boundary | baseline | command | local-output-eval-runner | 25.93 | 36 | 0.0 | pass |
-| near-neighbor-boundary | with_skill | command | local-output-eval-runner | 25.88 | 65 | 100.0 | pass |
-| file-backed-governed-package | baseline | command | local-output-eval-runner | 26.71 | 37 | 0.0 | pass |
-| file-backed-governed-package | with_skill | command | local-output-eval-runner | 26.73 | 98 | 100.0 | pass |
+| skill-package-contract | baseline | command | local-output-eval-runner | 35.01 | 33 | 0.0 | pass |
+| skill-package-contract | with_skill | command | local-output-eval-runner | 34.89 | 73 | 100.0 | pass |
+| output-eval-expectation | baseline | command | local-output-eval-runner | 36.42 | 36 | 0.0 | pass |
+| output-eval-expectation | with_skill | command | local-output-eval-runner | 39.48 | 80 | 100.0 | pass |
+| ir-before-packaging | baseline | command | local-output-eval-runner | 36.04 | 33 | 0.0 | pass |
+| ir-before-packaging | with_skill | command | local-output-eval-runner | 36.06 | 80 | 100.0 | pass |
+| near-neighbor-boundary | baseline | command | local-output-eval-runner | 34.85 | 36 | 0.0 | pass |
+| near-neighbor-boundary | with_skill | command | local-output-eval-runner | 40.88 | 65 | 100.0 | pass |
+| file-backed-governed-package | baseline | command | local-output-eval-runner | 42.57 | 37 | 0.0 | pass |
+| file-backed-governed-package | with_skill | command | local-output-eval-runner | 42.98 | 98 | 100.0 | pass |
 
 ## Next Fixes
 
diff --git a/reports/package_verification.json b/reports/package_verification.json
index bc968929..c07d74ef 100644
--- a/reports/package_verification.json
+++ b/reports/package_verification.json
@@ -8,8 +8,8 @@
     "target_count": 4,
     "adapter_count": 4,
     "archive_present": true,
-    "archive_sha256": "6852cf91a74d232c32d732b7c159c971827abf23af50153987193b084ad3b5cc",
-    "archive_entry_count": 586,
+    "archive_sha256": "798153ff8e1569408e8f658be5aea1f144ee44bfe4edf658c71d6a2f0275c1c8",
+    "archive_entry_count": 609,
     "failure_count": 0,
     "warning_count": 0
   },
diff --git a/reports/package_verification.md b/reports/package_verification.md
index d7c20b74..3694e622 100644
--- a/reports/package_verification.md
+++ b/reports/package_verification.md
@@ -4,7 +4,7 @@
 - Package directory: `dist`
 - Targets: `4 / 4` adapters present
 - Archive present: `True`
-- Archive SHA256: `6852cf91a74d232c32d732b7c159c971827abf23af50153987193b084ad3b5cc`
+- Archive SHA256: `798153ff8e1569408e8f658be5aea1f144ee44bfe4edf658c71d6a2f0275c1c8`
 - Failures: `0`
 - Warnings: `0`
 
diff --git a/reports/python_compatibility.json b/reports/python_compatibility.json
index 3a194308..dff01de0 100644
--- a/reports/python_compatibility.json
+++ b/reports/python_compatibility.json
@@ -5,7 +5,7 @@
   "root": ".",
   "summary": {
     "target_python": "3.11",
-    "file_count": 173,
+    "file_count": 175,
     "issue_count": 0,
     "syntax_error_count": 0,
     "fstring_311_violation_count": 0,
@@ -658,6 +658,18 @@
       "issue_count": 0,
       "issues": []
     },
+    {
+      "path": "scripts/yao_cli_distribution_commands.py",
+      "ok": true,
+      "issue_count": 0,
+      "issues": []
+    },
+    {
+      "path": "scripts/yao_cli_output_commands.py",
+      "ok": true,
+      "issue_count": 0,
+      "issues": []
+    },
     {
       "path": "scripts/yao_cli_parser.py",
       "ok": true,
diff --git a/reports/python_compatibility.md b/reports/python_compatibility.md
index 8fcded0e..bd33500f 100644
--- a/reports/python_compatibility.md
+++ b/reports/python_compatibility.md
@@ -6,7 +6,7 @@ Generated at: `2026-06-15`
 
 - decision: `pass`
 - target python: `3.11`
-- files scanned: `173`
+- files scanned: `175`
 - issues: `0`
 - syntax errors: `0`
 - f-string 3.11 violations: `0`
diff --git a/reports/registry_audit.json b/reports/registry_audit.json
index 9beb4118..d57bcfc7 100644
--- a/reports/registry_audit.json
+++ b/reports/registry_audit.json
@@ -21,8 +21,8 @@
     "trust_level": "local",
     "license": "MIT",
     "checksums": {
-      "package_sha256": "4660a11db94947ab603dca42eddc447698785d08f0df2972bf2ca43454683306",
-      "archive_sha256": "6852cf91a74d232c32d732b7c159c971827abf23af50153987193b084ad3b5cc"
+      "package_sha256": "76edc3f9936da8966eff0e0f689568c7d6d787691a45773a3e86bb38be6b0cc4",
+      "archive_sha256": "798153ff8e1569408e8f658be5aea1f144ee44bfe4edf658c71d6a2f0275c1c8"
     },
     "compatibility": {
       "openai": "pass",
@@ -53,16 +53,16 @@
     },
     "distribution": {
       "archive_verified": true,
-      "archive_sha256": "6852cf91a74d232c32d732b7c159c971827abf23af50153987193b084ad3b5cc",
+      "archive_sha256": "798153ff8e1569408e8f658be5aea1f144ee44bfe4edf658c71d6a2f0275c1c8",
       "package_verification": "reports/package_verification.json",
       "install_simulated": true,
       "install_simulation": "reports/install_simulation.json"
     },
-    "generated_at": "2026-06-13"
+    "generated_at": "2026-06-15"
   },
   "index": {
     "schema_version": "2.0",
-    "generated_at": "2026-06-13",
+    "generated_at": "2026-06-15",
     "package_count": 1,
     "packages": [
       {
@@ -78,7 +78,7 @@
           "vscode"
         ],
         "package_metadata": "registry/packages/yao-meta-skill.json",
-        "package_sha256": "4660a11db94947ab603dca42eddc447698785d08f0df2972bf2ca43454683306"
+        "package_sha256": "76edc3f9936da8966eff0e0f689568c7d6d787691a45773a3e86bb38be6b0cc4"
       }
     ]
   },
diff --git a/reports/registry_audit.md b/reports/registry_audit.md
index 0482d283..5b95bb55 100644
--- a/reports/registry_audit.md
+++ b/reports/registry_audit.md
@@ -6,8 +6,8 @@
 - Maturity: `governed`
 - Owner: `Yao Team`
 - License: `MIT`
-- Package SHA256: `4660a11db94947ab603dca42eddc447698785d08f0df2972bf2ca43454683306`
-- Archive SHA256: `6852cf91a74d232c32d732b7c159c971827abf23af50153987193b084ad3b5cc`
+- Package SHA256: `76edc3f9936da8966eff0e0f689568c7d6d787691a45773a3e86bb38be6b0cc4`
+- Archive SHA256: `798153ff8e1569408e8f658be5aea1f144ee44bfe4edf658c71d6a2f0275c1c8`
 - Install simulated: `True`
 
 ## Compatibility
diff --git a/reports/runtime_permission_probes.json b/reports/runtime_permission_probes.json
index 59c9a1a4..9c2ffd6e 100644
--- a/reports/runtime_permission_probes.json
+++ b/reports/runtime_permission_probes.json
@@ -2,7 +2,7 @@
   "schema_version": "1.0",
   "ok": true,
   "skill_dir": ".",
-  "package_dir": "tests/tmp_review_studio/dist",
+  "package_dir": "dist",
   "expected_capabilities": [
     "file_write",
     "network",
@@ -42,7 +42,7 @@
     {
       "target": "openai",
       "status": "pass",
-      "adapter": "tests/tmp_review_studio/dist/targets/openai/adapter.json",
+      "adapter": "dist/targets/openai/adapter.json",
       "permission_model": "metadata-only",
       "native_enforcement": false,
       "metadata_fallback_explicit": true,
@@ -139,7 +139,7 @@
     {
       "target": "claude",
       "status": "pass",
-      "adapter": "tests/tmp_review_studio/dist/targets/claude/adapter.json",
+      "adapter": "dist/targets/claude/adapter.json",
       "permission_model": "neutral-source-plus-adapter",
       "native_enforcement": false,
       "metadata_fallback_explicit": true,
@@ -221,7 +221,7 @@
     {
       "target": "generic",
       "status": "pass",
-      "adapter": "tests/tmp_review_studio/dist/targets/generic/adapter.json",
+      "adapter": "dist/targets/generic/adapter.json",
       "permission_model": "agent-skills-compatible-metadata",
       "native_enforcement": false,
       "metadata_fallback_explicit": true,
@@ -303,7 +303,7 @@
     {
       "target": "vscode",
       "status": "pass",
-      "adapter": "tests/tmp_review_studio/dist/targets/vscode/adapter.json",
+      "adapter": "dist/targets/vscode/adapter.json",
       "permission_model": "vscode-workspace-trust-plus-metadata",
       "native_enforcement": false,
       "metadata_fallback_explicit": true,
diff --git a/reports/security_trust_report.json b/reports/security_trust_report.json
index 8097d91c..820ce0c2 100644
--- a/reports/security_trust_report.json
+++ b/reports/security_trust_report.json
@@ -2,9 +2,9 @@
   "ok": true,
   "skill_dir": ".",
   "summary": {
-    "scanned_files": 194,
-    "script_count": 107,
-    "internal_module_count": 26,
+    "scanned_files": 196,
+    "script_count": 109,
+    "internal_module_count": 28,
     "secret_findings": 0,
     "dependency_files": [
       "requirements-ci.txt"
@@ -22,8 +22,8 @@
     "help_smoke_failed_count": 0,
     "interactive_script_count": 0,
     "package_hash_scope": "source-contract-without-generated-reports",
-    "package_hash_file_count": 194,
-    "package_sha256": "4660a11db94947ab603dca42eddc447698785d08f0df2972bf2ca43454683306"
+    "package_hash_file_count": 196,
+    "package_sha256": "76edc3f9936da8966eff0e0f689568c7d6d787691a45773a3e86bb38be6b0cc4"
   },
   "failures": [],
   "warnings": [],
@@ -1488,6 +1488,34 @@
       "network_urls": [],
       "network_hosts": []
     },
+    {
+      "path": "scripts/yao_cli_distribution_commands.py",
+      "interface": "internal-module",
+      "interface_declared": true,
+      "interface_reason": "Imported by yao.py to keep distribution and runtime gate handlers outside the thin CLI orchestrator.",
+      "has_argparse": true,
+      "has_main_guard": false,
+      "uses_input": false,
+      "uses_network": false,
+      "uses_file_write": false,
+      "uses_subprocess": false,
+      "network_urls": [],
+      "network_hosts": []
+    },
+    {
+      "path": "scripts/yao_cli_output_commands.py",
+      "interface": "internal-module",
+      "interface_declared": true,
+      "interface_reason": "Imported by yao.py to keep output evaluation and review handlers outside the thin CLI orchestrator.",
+      "has_argparse": true,
+      "has_main_guard": false,
+      "uses_input": false,
+      "uses_network": false,
+      "uses_file_write": false,
+      "uses_subprocess": false,
+      "network_urls": [],
+      "network_hosts": []
+    },
     {
       "path": "scripts/yao_cli_parser.py",
       "interface": "internal-module",
@@ -1579,7 +1607,7 @@
     "checked_count": 81,
     "passed_count": 81,
     "failed_count": 0,
-    "skipped_count": 26,
+    "skipped_count": 28,
     "failed_scripts": [],
     "results": [
       {
@@ -2482,6 +2510,14 @@
         "path": "scripts/yao_cli_create_commands.py",
         "reason": "internal module"
       },
+      {
+        "path": "scripts/yao_cli_distribution_commands.py",
+        "reason": "internal module"
+      },
+      {
+        "path": "scripts/yao_cli_output_commands.py",
+        "reason": "internal module"
+      },
       {
         "path": "scripts/yao_cli_parser.py",
         "reason": "internal module"
diff --git a/reports/security_trust_report.md b/reports/security_trust_report.md
index 7812e006..161a793a 100644
--- a/reports/security_trust_report.md
+++ b/reports/security_trust_report.md
@@ -1,9 +1,9 @@
 # Security Trust Report
 
 - OK: `True`
-- Scanned files: `194`
-- Scripts: `107`
-- Internal script modules: `26`
+- Scanned files: `196`
+- Scripts: `109`
+- Internal script modules: `28`
 - Secret findings: `0`
 - Network-capable scripts: `3`
 - Network policy covered scripts: `3`
@@ -15,8 +15,8 @@
 - CLI help smoke failures: `0`
 - Interactive scripts: `0`
 - Package hash scope: `source-contract-without-generated-reports`
-- Package hash files: `194`
-- Package SHA256: `4660a11db94947ab603dca42eddc447698785d08f0df2972bf2ca43454683306`
+- Package hash files: `196`
+- Package SHA256: `76edc3f9936da8966eff0e0f689568c7d6d787691a45773a3e86bb38be6b0cc4`
 
 ## Failures
 
@@ -165,6 +165,8 @@
 | scripts/yao_cli_adaptation_commands.py | internal-module | True | True | False | False | False | False | False | Imported by yao.py to keep adaptive scan/proposal command handlers outside the thin CLI orchestrator. |
 | scripts/yao_cli_config.py | internal-module | True | False | False | False | False | False | False | Imported by yao.py for CLI target maps and side-effect-free shaping helpers. |
 | scripts/yao_cli_create_commands.py | internal-module | True | True | False | False | False | False | False | Imported by yao.py to keep skill creation and quickstart command handlers out of the CLI orchestrator. |
+| scripts/yao_cli_distribution_commands.py | internal-module | True | True | False | False | False | False | False | Imported by yao.py to keep distribution and runtime gate handlers outside the thin CLI orchestrator. |
+| scripts/yao_cli_output_commands.py | internal-module | True | True | False | False | False | False | False | Imported by yao.py to keep output evaluation and review handlers outside the thin CLI orchestrator. |
 | scripts/yao_cli_parser.py | internal-module | True | True | False | False | False | False | False | Imported by yao.py to keep CLI parser declarations separate from command orchestration. |
 | scripts/yao_cli_report_commands.py | internal-module | True | True | False | False | False | False | False | Imported by yao.py to keep report and evidence command handlers out of the CLI orchestrator. |
 | scripts/yao_cli_runtime.py | internal-module | True | False | False | False | False | False | True | Imported by yao.py and command modules for shared subprocess execution and JSON payload parsing. |
diff --git a/reports/skill_os2_audit.json b/reports/skill_os2_audit.json
index 3b95eab3..2875b4fa 100644
--- a/reports/skill_os2_audit.json
+++ b/reports/skill_os2_audit.json
@@ -1,7 +1,7 @@
 {
   "schema_version": "1.0",
   "ok": true,
-  "generated_at": "2026-06-13",
+  "generated_at": "2026-06-15",
   "skill_dir": ".",
   "summary": {
     "item_count": 15,
@@ -197,7 +197,7 @@
       "key": "trust-security",
       "label": "Trust Security",
       "status": "pass",
-      "current": "secrets 0; scripts 107; help failures 0",
+      "current": "secrets 0; scripts 109; help failures 0",
       "target": "Secrets, scripts, dependencies, permissions, and package hash are reviewable",
       "evidence": [
         {
@@ -285,7 +285,7 @@
       "key": "registry-distribution",
       "label": "Registry Distribution",
       "status": "pass",
-      "current": "zip entries 586; install failures 0; permission failures 0",
+      "current": "zip entries 609; install failures 0; permission failures 0",
       "target": "Package metadata, archive checksum, package verification, and install simulation pass",
       "evidence": [
         {
@@ -351,7 +351,7 @@
       "key": "native-client-telemetry",
       "label": "Native Client Telemetry",
       "status": "external_required",
-      "current": "external source events 0; adoption samples 1",
+      "current": "external source events 0; adoption samples 0",
       "target": "A real Browser/Chrome/provider client sends production metadata events",
       "evidence": [
         {
@@ -433,7 +433,7 @@
       "key": "native-client-telemetry",
       "label": "Native Client Telemetry",
       "status": "external_required",
-      "current": "external source events 0; adoption samples 1",
+      "current": "external source events 0; adoption samples 0",
       "target": "A real Browser/Chrome/provider client sends production metadata events",
       "evidence": [
         {
diff --git a/reports/skill_os2_audit.md b/reports/skill_os2_audit.md
index db2fca16..4e889bb1 100644
--- a/reports/skill_os2_audit.md
+++ b/reports/skill_os2_audit.md
@@ -1,6 +1,6 @@
 # Skill OS 2.0 Audit
 
-Generated at: `2026-06-13`
+Generated at: `2026-06-15`
 
 ## Summary
 
@@ -23,14 +23,14 @@ Generated at: `2026-06-13`
 | Human Adjudication | human-required | 0/5 decisions; pending 5 | Real reviewer decisions recorded before claiming output review completion | Record real A/B choices in the decision template, then regenerate adjudication. |
 | Benchmark Reproducibility | pass | artifacts 24; missing 0; failures 3 | Public methodology, reproducible commands, required artifacts, and failure disclosure are machine-checkable | Keep the manifest current with every benchmark, package, and release evidence change. |
 | Runtime Conformance | pass | 5/5 targets pass | Target package structure, metadata, relative paths, and degradation notes pass | Keep target conformance fixtures updated as platform contracts change. |
-| Trust Security | pass | secrets 0; scripts 107; help failures 0 | Secrets, scripts, dependencies, permissions, and package hash are reviewable | Keep high-permission approvals scoped, expiring, and target-mapped. |
+| Trust Security | pass | secrets 0; scripts 109; help failures 0 | Secrets, scripts, dependencies, permissions, and package hash are reviewable | Keep high-permission approvals scoped, expiring, and target-mapped. |
 | Permission Metadata | pass | 4/4 target probes pass; metadata fallback 4; installer enforcement 4 | Packaged adapters expose explicit permission metadata, residual risks, and installer enforcement evidence when available | Preserve residual-risk notes until real native enforcement exists. |
 | Native Permission Enforcement | external-required | native-enforced targets 0; installer-enforced targets 4 | At least one target/client enforces approved permissions at runtime | Integrate a real target-client or external installer runtime guard before claiming native permission enforcement. |
 | Skill Atlas | pass | 12 skills; actionable collisions 0 | Workspace catalog, route overlap, stale/owner gaps, drift, and no-route opportunities | Feed real drift data into Atlas once client telemetry is installed. |
-| Registry Distribution | pass | zip entries 586; install failures 0; permission failures 0 | Package metadata, archive checksum, package verification, and install simulation pass | Regenerate registry after package verification so checksums stay aligned. |
+| Registry Distribution | pass | zip entries 609; install failures 0; permission failures 0 | Package metadata, archive checksum, package verification, and install simulation pass | Regenerate registry after package verification so checksums stay aligned. |
 | Review Studio | pass | decision review; warnings 3; score 91 | One page shows gates, evidence paths, blockers, warnings, actions, waivers, and annotations | Resolve human/external warning gates before claiming full release readiness. |
 | Telemetry Drift | pass | events 1; risk low; recipes 5 | Local-first metadata-only event contract, aggregate drift report, hook recipes, and import path | Keep raw JSONL out of distributed packages and use aggregate reports for Atlas. |
-| Native Client Telemetry | external-required | external source events 0; adoption samples 1 | A real Browser/Chrome/provider client sends production metadata events | Install a real client against the native host and import production metadata-only events. |
+| Native Client Telemetry | external-required | external source events 0; adoption samples 0 | A real Browser/Chrome/provider client sends production metadata events | Install a real client against the native host and import production metadata-only events. |
 
 ## Open Highest-Leverage Gaps
 
diff --git a/reports/skill_os2_coverage.json b/reports/skill_os2_coverage.json
index 4cb1f40a..97e5bb11 100644
--- a/reports/skill_os2_coverage.json
+++ b/reports/skill_os2_coverage.json
@@ -131,7 +131,7 @@
       "label": "Trust Security",
       "status": "pass",
       "objective": "Scripts, dependencies, permissions, secrets, and package hash are reviewable for team distribution.",
-      "current": "107 scripts; secrets 0; help failures 0",
+      "current": "109 scripts; secrets 0; help failures 0",
       "command": "python3 scripts/yao.py trust .",
       "test": "python3 tests/verify_trust_check.py",
       "evidence": [
@@ -205,7 +205,7 @@
       "label": "Registry Distribution",
       "status": "pass",
       "objective": "Skill packages are installable, versioned, checksumed, and upgrade-reviewable.",
-      "current": "archive entries 586; install failures 0",
+      "current": "archive entries 609; install failures 0",
       "command": "python3 scripts/yao.py package . --platform openai --platform claude --platform generic --platform vscode --output-dir dist --zip && python3 scripts/yao.py registry-audit .",
       "test": "python3 tests/verify_registry_audit.py",
       "evidence": [
diff --git a/reports/skill_os2_coverage.md b/reports/skill_os2_coverage.md
index a3023eec..ddc72276 100644
--- a/reports/skill_os2_coverage.md
+++ b/reports/skill_os2_coverage.md
@@ -26,9 +26,9 @@ This report maps the Skill OS 2.0 upgrade blueprint to concrete local artifacts,
 | Skill IR | `pass` | schema 2.0.0; targets 5 | `python3 scripts/yao.py skill-ir .` | `python3 tests/verify_skill_ir.py` |
 | Output Eval Lab | `pass` | 5 cases; delta 100.0; execution 10 | `python3 scripts/yao.py output-exec . && python3 scripts/yao.py output-review .` | `python3 tests/verify_output_eval_lab.py` |
 | Runtime Conformance | `pass` | 5/5 targets pass | `python3 scripts/yao.py conformance .` | `python3 tests/verify_conformance_suite.py` |
-| Trust Security | `pass` | 107 scripts; secrets 0; help failures 0 | `python3 scripts/yao.py trust .` | `python3 tests/verify_trust_check.py` |
+| Trust Security | `pass` | 109 scripts; secrets 0; help failures 0 | `python3 scripts/yao.py trust .` | `python3 tests/verify_trust_check.py` |
 | Skill Atlas | `pass` | 12 scanned skills; actionable collisions 0 | `python3 scripts/yao.py skill-atlas --workspace-root .` | `python3 tests/verify_skill_atlas.py` |
-| Registry Distribution | `pass` | archive entries 586; install failures 0 | `python3 scripts/yao.py package . --platform openai --platform claude --platform generic --platform vscode --output-dir dist --zip && python3 scripts/yao.py registry-audit .` | `python3 tests/verify_registry_audit.py` |
+| Registry Distribution | `pass` | archive entries 609; install failures 0 | `python3 scripts/yao.py package . --platform openai --platform claude --platform generic --platform vscode --output-dir dist --zip && python3 scripts/yao.py registry-audit .` | `python3 tests/verify_registry_audit.py` |
 | Review Studio | `pass` | 16 gates; decision review; warnings 3 | `python3 scripts/yao.py review-studio .` | `python3 tests/verify_review_studio.py` |
 | Telemetry Drift | `pass` | events 1; recipes 5; risk low | `python3 scripts/yao.py telemetry-hooks . && python3 scripts/yao.py adoption-drift .` | `python3 tests/verify_telemetry_hooks.py` |