feat(orchestrator): move state to .claude/orchestrator, disallow TaskOutput

- Relocate orchestrator state from .orchestrator/ to .claude/orchestrator/
  so write scope hook doesn't block normal interactive sessions
- Add disallowedTools: ["TaskOutput"] to orchestrator frontmatter
- Hook only enforces write restrictions when .claude/orchestrator/ dir exists
- Update all hook scripts and build_dispatch_prompt.py for new path

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: emmahyde

agents/orchestrator.md

@@ -34,7 +34,8 @@ description: >
 
 model: inherit
 color: yellow
-tools: ["Read", "Write", "Edit", "Bash", "Grep", "Glob", "Task", "TaskCreate", "TaskGet", "TaskUpdate", "TaskList", "TaskOutput", "TaskStop", "AskUserQuestion", "WebSearch", "WebFetch", "LSP", "Skill", "ToolSearch", "EnterPlanMode", "ExitPlanMode", "ListMcpResourcesTool", "ReadMcpResourceTool"]
+tools: ["Read", "Write", "Edit", "Bash", "Grep", "Glob", "Task", "TaskCreate", "TaskGet", "TaskUpdate", "TaskList", "TaskStop", "AskUserQuestion", "WebSearch", "WebFetch", "LSP", "Skill", "ToolSearch", "EnterPlanMode", "ExitPlanMode", "ListMcpResourcesTool", "ReadMcpResourceTool"]
+disallowedTools: ["TaskOutput"]
 ---
 
 You are ORCHESTRATOR-AGENT. Follow this contract exactly.
@@ -56,13 +57,14 @@ You are ORCHESTRATOR-AGENT. Follow this contract exactly.
 [ROLE]
 You are the sole planner and coordinator.
 You own decomposition, assignment, lock management, context packaging, validation, and integration decisions.
+You HAVE the Task tool — use it to dispatch subagents. Do not claim otherwise.
 
 [INITIALIZATION]
-Before any other action, create `.orchestrator/active_locks.json` with your own lock entry:
+Before any other action, create `.claude/orchestrator/active_locks.json` with your own lock entry:
 ```bash
-mkdir -p .orchestrator
-cat > .orchestrator/active_locks.json << 'LOCKS'
-[{"task_id":"orchestrator","owner":"orchestrator","resource":[".claude/","docs/",".orchestrator/"],"active":true}]
+mkdir -p .claude/orchestrator
+cat > .claude/orchestrator/active_locks.json << 'LOCKS'
+[{"task_id":"orchestrator","owner":"orchestrator","resource":[".claude/","docs/"],"active":true}]
 LOCKS
 ```
 This registers the orchestrator's own write scope. All subsequent lock entries for subagents are appended to this file. The PreToolUse hook enforces these scopes on every Write/Edit call.

hooks/scripts/post_task_dispatch_marker.py

@@ -62,7 +62,7 @@ def deduplicate_locks(locks: list[dict]) -> list[dict]:
 
 def merge_and_update_locks(cwd: Path, packet: dict):
     try:
-        locks_file = cwd / '.orchestrator' / 'active_locks.json'
+        locks_file = cwd / '.claude/orchestrator' / 'active_locks.json'
 
         existing_locks = []
         if locks_file.is_file():
@@ -103,7 +103,7 @@ def main():
         sys.exit(0)
 
     cwd = Path(cwd_str)
-    orchestrator_dir = cwd / '.orchestrator'
+    orchestrator_dir = cwd / '.claude/orchestrator'
     orchestrator_dir.mkdir(exist_ok=True)
 
     active_dispatch_marker = orchestrator_dir / '.active_dispatch'

hooks/scripts/pre_task_validate_tools.py

@@ -104,7 +104,7 @@ def main() -> None:
         f"{', '.join(missing)}. The subagent contract requires these for "
         f"writing task reports and worklogs."
     )
-    orchestrated = (cwd / ".orchestrator").is_dir()
+    orchestrated = (cwd / '.claude/orchestrator').is_dir()
 
     if orchestrated:
         print(

hooks/scripts/pre_write_scope_check.py

@@ -14,7 +14,7 @@
 def is_always_allowed(rel_path: str) -> bool:
     """Check if path is in always-allowed directories."""
     return (
-        rel_path.startswith(".orchestrator/outputs/") or
+        rel_path.startswith(".claude/orchestrator/outputs/") or
         rel_path.startswith("worklogs/")
     )
 
@@ -86,10 +86,15 @@ def main():
     if is_always_allowed(rel_path):
         sys.exit(0)
 
-    locks_file = Path(cwd) / ".orchestrator" / "active_locks.json"
+    orchestrator_dir = Path(cwd) / ".claude" / "orchestrator"
+    locks_file = orchestrator_dir / "active_locks.json"
+
+    # No .claude/orchestrator/ dir = normal interactive session, no restrictions
+    if not orchestrator_dir.exists():
+        sys.exit(0)
+
+    # Dir exists but no lock file = orchestrator hasn't initialized yet
     if not locks_file.exists():
-        # No lock file = orchestrator or main session context
-        # Restrict writes to allowed directories only
         if any(rel_path.startswith(p) for p in ORCHESTRATOR_ALLOWED):
             sys.exit(0)
         dirs = ", ".join(ORCHESTRATOR_ALLOWED)

hooks/scripts/subagent_stop_gate.py

@@ -24,8 +24,8 @@ def has_recent_task_report(outputs_dir: Path, seconds: int = 60) -> bool:
 
 def is_orchestrated_subagent(cwd: Path) -> bool:
     """Check if this is an orchestrated subagent context."""
-    outputs_dir = cwd / ".orchestrator" / "outputs"
-    active_dispatch = cwd / ".orchestrator" / ".active_dispatch"
+    outputs_dir = cwd / '.claude/orchestrator' / "outputs"
+    active_dispatch = cwd / '.claude/orchestrator' / ".active_dispatch"
 
     return outputs_dir.exists() and active_dispatch.exists()
 
@@ -45,7 +45,7 @@ def main():
     if not is_orchestrated_subagent(cwd):
         sys.exit(0)
 
-    outputs_dir = cwd / ".orchestrator" / "outputs"
+    outputs_dir = cwd / '.claude/orchestrator' / "outputs"
     if not has_recent_task_report(outputs_dir, seconds=60):
         error_response = {
             "decision": "block",

hooks/scripts/subagent_stop_summary.py

@@ -170,7 +170,7 @@ def main():
     if not cwd:
         sys.exit(0)
 
-    outputs_dir = Path(cwd) / '.orchestrator' / 'outputs'
+    outputs_dir = Path(cwd) / '.claude/orchestrator' / 'outputs'
     if not outputs_dir.is_dir():
         sys.exit(0)
 
@@ -190,7 +190,7 @@ def main():
     task_id = frontmatter.get('task_id', '')
     status = frontmatter.get('status', '')
     report_basename = report.name
-    report_relpath = f'.orchestrator/outputs/{report_basename}'
+    report_relpath = f'.claude/orchestrator/outputs/{report_basename}'
 
     files_touched = frontmatter.get('files_touched', [])
     acceptance_check = frontmatter.get('acceptance_check', [])

skills/multi-agent-operator-guide/scripts/build_dispatch_prompt.py

@@ -78,7 +78,7 @@ def main() -> int:
         # Convert title to snake_case descriptor
         descriptor = "_".join(title.lower().split())
         descriptor = re.sub(r"[^a-z0-9_]", "", descriptor)
-        task["report_path"] = f".orchestrator/outputs/task__{descriptor}.md"
+        task["report_path"] = f".claude/orchestrator/outputs/task__{descriptor}.md"
         packet["task"] = task
 
     # Build prompt