diff --git a/agents/architect.md b/agents/architect.md
index 141dc3b..665029d 100644
--- a/agents/architect.md
+++ b/agents/architect.md
@@ -5,7 +5,7 @@ model: opus
 effort: max
 permissionMode: plan
 tools: Read, Glob, Grep, WebFetch, WebSearch, Bash, Write
-disallowedTools: Edit
+disallowedTools: Edit, NotebookEdit
 maxTurns: 35
 skills:
   - conventions
diff --git a/agents/documenter.md b/agents/documenter.md
index da5a203..9e578b0 100644
--- a/agents/documenter.md
+++ b/agents/documenter.md
@@ -4,7 +4,6 @@ description: Use when asked to write or update documentation — READMEs, API re
 model: sonnet
 effort: high
 memory: project
-permissionMode: acceptEdits
 tools: Read, Write, Edit, Glob, Grep, Bash
 maxTurns: 20
 skills:
diff --git a/skills/orchestrate/SKILL.md b/skills/orchestrate/SKILL.md
index 9085dde..b789b0d 100644
--- a/skills/orchestrate/SKILL.md
+++ b/skills/orchestrate/SKILL.md
@@ -228,6 +228,7 @@ All agent communication uses typed YAML frontmatter envelopes defined in the `me
 | `signal: triage_complete` | architect → you | Check `research_needed`, spawn researchers or resume architect |
 | `signal: plan_complete` | architect → you | Read plan file, begin wave dispatch |
 | `signal: research_complete` | researcher → you | Collect, assemble into Research Context |
-| `signal: blocked` / `signal: escalate` | any → you | Investigate or escalate to user |
+| `signal: blocked` | architect/worker → you | If from `plan_result`: escalate to user before dispatching workers. Otherwise: investigate or unblock. |
+| `signal: escalate` | any → you | Escalate to user with context |
 
 When dispatching agents, use the orchestrator→agent envelope types (`task_assignment`, `revision_request`, `approval`, `triage_request`, `architecture_request`, `research_request`) from the message-schema skill.
diff --git a/skills/project/SKILL.md b/skills/project/SKILL.md
index 83fa1a0..b11876d 100644
--- a/skills/project/SKILL.md
+++ b/skills/project/SKILL.md
@@ -1,6 +1,7 @@
 ---
 name: project
 description: Instructs agents to check for and ingest a project-specific skill file before starting work.
+when_to_use: Loaded by all agents. Checks for .claude/skills/project.md in the working directory and ingests project-local conventions.
 ---
 
 Before starting any work, check for a project-specific skill file at `.claude/skills/project.md` in the current working directory.
diff --git a/skills/qa-checklist/SKILL.md b/skills/qa-checklist/SKILL.md
index fb4caec..3ebcf34 100644
--- a/skills/qa-checklist/SKILL.md
+++ b/skills/qa-checklist/SKILL.md
@@ -1,6 +1,7 @@
 ---
 name: qa-checklist
 description: Self-validation checklist. All workers run this against their own output before returning results.
+when_to_use: Loaded by all agents that produce output envelopes. Run before returning results to validate factual accuracy, scope, security, and schema compliance.
 ---
 
 ## Self-QA checklist
diff --git a/skills/worker-protocol/SKILL.md b/skills/worker-protocol/SKILL.md
index b2a4581..4a73b6f 100644
--- a/skills/worker-protocol/SKILL.md
+++ b/skills/worker-protocol/SKILL.md
@@ -1,6 +1,7 @@
 ---
 name: worker-protocol
 description: Standard output format, feedback handling, and operational procedures for all worker agents.
+when_to_use: Loaded by worker, debugger, and documenter agents. Defines the worker_submission envelope format and commit workflow.
 ---
 
 ## Output format