diff --git a/src/repo_manager/commands/rapp.py b/src/repo_manager/commands/rapp.py
index 93f9b1c..8567702 100644
--- a/src/repo_manager/commands/rapp.py
+++ b/src/repo_manager/commands/rapp.py
@@ -89,7 +89,10 @@ def init(
         ),
         "AGENTS.md": (
             f"# Repository agent guide\n\nWorkplans use the prefix "
-            f"`{rapp_id.upper()}-WP-`.\n"
+            f"`{rapp_id.upper()}-WP-`.\n\n"
+            "Cross-repo waits: attach to a `prj-` driver "
+            "(`coordination-engine` `spec/cross-owner-wait-mode-v0.1.md`). "
+            "Do not strand a `wait` or implement residual flavor.\n"
         ),
         "CLAUDE.md": f"# {rapp_id}\n\n@SCOPE.md\n@AGENTS.md\n",
         "Makefile": (
diff --git a/src/repo_manager/commands/scaffold.py b/src/repo_manager/commands/scaffold.py
index 709027d..182a945 100644
--- a/src/repo_manager/commands/scaffold.py
+++ b/src/repo_manager/commands/scaffold.py
@@ -124,7 +124,12 @@ def scaffold_repository(
         f"Orient: {'GOAL.md' if prj else 'INTENT.md'} → SCOPE.md → workplans/.\n"
         f"Workplan prefix: `{prefix}-`.\n\n"
         "## State Hub Integration\n\n"
-        f"{render_hub_access_block()}\n",
+        f"{render_hub_access_block()}\n\n"
+        "## Cross-repo waits\n\n"
+        "If blocked on another repo, look for a `prj-` driver workplan and "
+        "follow `coordination-engine` `spec/cross-owner-wait-mode-v0.1.md`. "
+        "Do not mint a stranded `wait`, implement `flavor: residual`, or "
+        "message `ops-warden` for secrets.\n",
     )
     if prj:
         today = utc_today().isoformat()