From fdbca0c8dc894d08c7988d60de354b19a1145dfa Mon Sep 17 00:00:00 2001
From: Sal <59910950+ss-o@users.noreply.github.com>
Date: Sun, 27 Sep 2026 13:23:54 +0100
Subject: [PATCH] chore(policy): adopt organization instruction routing

---
 .github/skills/code-review/SKILL.md |  4 ++--
 .github/workflows/org-routing.yml   | 20 ++++++++++++++++++++
 AGENTS.md                           | 16 ++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/org-routing.yml

diff --git a/.github/skills/code-review/SKILL.md b/.github/skills/code-review/SKILL.md
index 7b17d8a..36bf6d3 100644
--- a/.github/skills/code-review/SKILL.md
+++ b/.github/skills/code-review/SKILL.md
@@ -2,8 +2,8 @@
 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: ce74af22db3af827eed9558596275cdf3fb07505
-    github-ref: ce74af22db3af827eed9558596275cdf3fb07505
+    github-pinned: e1f8f6c1c9dd61e87f2e5f44ef6285992b8b892d
+    github-ref: e1f8f6c1c9dd61e87f2e5f44ef6285992b8b892d
     github-repo: https://github.com/z-shell/.github
     github-tree-sha: a4e535bccfd3d2d4035e332030d08deda0d91632
 name: code-review
diff --git a/.github/workflows/org-routing.yml b/.github/workflows/org-routing.yml
new file mode 100644
index 0000000..d5b6a7a
--- /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]
+  push:
+    branches: [main]
+
+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 272c38f..892faad 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,5 +1,21 @@
 # Project guidelines - zi-setup
 
+<!-- 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/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 project follows the organization-wide [Z-Shell Organization Guidelines](https://github.com/z-shell/.github/blob/main/AGENTS.md).
 
 ## Scope