diff --git a/.github/skills/code-review/SKILL.md b/.github/skills/code-review/SKILL.md
index a5ffba02..36bf6d3d 100644
--- a/.github/skills/code-review/SKILL.md
+++ b/.github/skills/code-review/SKILL.md
@@ -1,14 +1,13 @@
 ---
 description: Review pull requests, diffs, and code changes using repository contracts and checks, or assess review readiness during repository-health evaluations. Produce evidence-based findings without authorizing fixes or external writes.
 metadata:
-  github-path: .github/skills/code-review
-  github-pinned: 23fb0c86e7794a7da49cc161dc4ea8e6c9d00e9a
-  github-ref: 23fb0c86e7794a7da49cc161dc4ea8e6c9d00e9a
-  github-repo: https://github.com/z-shell/.github
-  github-tree-sha: a4e535bccfd3d2d4035e332030d08deda0d91632
+    github-path: .github/skills/code-review
+    github-pinned: e1f8f6c1c9dd61e87f2e5f44ef6285992b8b892d
+    github-ref: e1f8f6c1c9dd61e87f2e5f44ef6285992b8b892d
+    github-repo: https://github.com/z-shell/.github
+    github-tree-sha: a4e535bccfd3d2d4035e332030d08deda0d91632
 name: code-review
 ---
-
 # Code review
 
 Keep reviews read-only. Do not edit files, install dependencies, run autofix,
diff --git a/.github/workflows/org-routing.yml b/.github/workflows/org-routing.yml
new file mode 100644
index 00000000..616f4a30
--- /dev/null
+++ b/.github/workflows/org-routing.yml
@@ -0,0 +1,20 @@
+---
+name: Org Routing
+
+# ADR-0031: verify generated routing and approved organization skills.
+on:
+  pull_request:
+    branches: [main, next]
+  push:
+    branches: [main, next]
+
+permissions:
+  contents: read
+
+# The reusable workflow owns concurrency; a duplicate caller group can deadlock.
+jobs:
+  org-routing:
+    name: Org Routing
+    permissions:
+      contents: read
+    uses: z-shell/.github/.github/workflows/org-routing.yml@1becebb7b98dab717d82897428afafd792d4fb97 # main
diff --git a/AGENTS.md b/AGENTS.md
index 846ee166..c59413e4 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,5 +1,22 @@
 # Zi repository guidance
 
+<!-- BEGIN org-routing -->
+<!-- Generated by z-shell/.github scripts/org-routing.py (decisions/0031). Do not edit between these markers. -->
+
+## Organization instruction routing
+
+Organization policy is owned by [`z-shell/.github` `AGENTS.md`](https://github.com/z-shell/.github/blob/main/AGENTS.md). Read it before non-trivial work. Repository guidance in this file and in the surfaces below narrows implementation detail and never overrides organization policy.
+
+Before acting, select every surface below whose tasks and file patterns both match the work, and read each one. If your runtime does not load a listed file automatically, open it explicitly.
+
+- `AGENTS.md` (this file): tasks `all`; files `**`
+- `.github/copilot-instructions.md`: tasks `all`; files `**`
+- `.github/skills/code-review/SKILL.md`: tasks `code-review`, `review-readiness`, `organization-review`, `project-health`, `repository-health`, `repository-health-audit`, `repository-health-check`; files `**`; organization skill vendored at approved revision `e1f8f6c1c9dd`
+
+Organization-wide surfaces are routed by the [organization manifest](https://github.com/z-shell/.github/blob/main/.github/instruction-surfaces.json). This block is delivered and verified under [decision 0031](https://github.com/z-shell/.github/blob/main/decisions/0031-per-repository-instruction-routing-delivery.md).
+
+<!-- END org-routing -->
+
 This repository follows the [Z-Shell organization guidelines](https://github.com/z-shell/.github/blob/main/AGENTS.md).
 
 Zi is the canonical Zsh plugin manager for the organization. Changes can affect annexes, plugins, documentation, installers, and test environments.