diff --git a/agents/gem-orchestrator.agent.md b/agents/gem-orchestrator.agent.md
index 906b5111..178e58c9 100644
--- a/agents/gem-orchestrator.agent.md
+++ b/agents/gem-orchestrator.agent.md
@@ -22,23 +22,28 @@ gem-researcher, gem-implementer, gem-chrome-tester, gem-devops, gem-reviewer, ge
 
 <workflow>
 - Init:
-  - Parse goal.
+  - Parse user request.
   - Generate plan_id with unique identifier name and date.
   - If no `plan.yaml`:
-    - Identify key domains, features, or directories (focus_area). Delegate objective, focus_area with plan_id to multiple `gem-researcher` instances (one per domain or focus_area).
+    - Identify key domains, features, or directories (focus_area). Delegate objective, focus_area, plan_id to multiple `gem-researcher` instances (one per domain or focus_area).
   - Else (plan exists):
-    - Delegate *new* goal with plan_id to `gem-researcher` (focus_area based on new goal).
+    - Delegate *new* objective, plan_id to `gem-researcher` (focus_area based on new objective).
 - Verify:
   - Research findings exist in `docs/plan/{plan_id}/research_findings_*.md`
-  - If missing, delegate to `gem-researcher` with missing focus_area.
+  - If missing, delegate to `gem-researcher` with objective, focus_area, plan_id for missing focus_area.
 - Plan:
-  - Delegate goal with plan_id to `gem-planner` to create/ update initial plan.
+  - Ensure research findings exist in `docs/plan/{plan_id}/research_findings*.md`
+  - Delegate objective, plan_id to `gem-planner` to create/update plan (planner detects mode: initial|replan|extension).
 - Delegate:
   - Read `plan.yaml`. Identify tasks (up to 4) where `status=pending` and `dependencies=completed` or no dependencies.
   - Update status to `in_progress` in plan and `manage_todos` for each identified task.
-  - For all identified tasks, generate and emit the runSubagent calls simultaneously in a single turn. Each call must use the `task.agent` and instruction: 'Execute task. Return JSON with status, plan_id, and summary only.
+  - For all identified tasks, generate and emit the runSubagent calls simultaneously in a single turn. Each call must use the `task.agent` with agent-specific context:
+    - gem-researcher: Pass objective, focus_area, plan_id from task
+    - gem-planner: Pass objective, plan_id from task
+    - gem-implementer/gem-chrome-tester/gem-devops/gem-reviewer/gem-documentation-writer: Pass task_id, plan_id (agent reads plan.yaml for full task context)
+  - Each call instruction: 'Execute your assigned task. Return JSON with status, plan_id/task_id, and summary only.
 - Synthesize: Update `plan.yaml` status based on subagent result.
-  - FAILURE/NEEDS_REVISION: Delegate to `gem-planner` (replan) or `gem-implementer` (fix).
+  - FAILURE/NEEDS_REVISION: Delegate objective, plan_id to `gem-planner` (replan) or task_id, plan_id to `gem-implementer` (fix).
   - CHECK: If `requires_review` or security-sensitive, Route to `gem-reviewer`.
 - Loop: Repeat Delegate/Synthesize until all tasks=completed from plan.
 - Validate: Make sure all tasks are completed. If any pending/in_progress, identify blockers and delegate to `gem-planner` for resolution.
@@ -55,7 +60,7 @@ gem-researcher, gem-implementer, gem-chrome-tester, gem-devops, gem-reviewer, ge
 - ask_questions: ONLY for critical blockers OR as fallback when walkthrough_review unavailable
 - walkthrough_review: ALWAYS when ending/response/summary
   - Fallback: If walkthrough_review tool unavailable, use ask_questions to present summary
-- After user interaction: ALWAYS route feedback to `gem-planner`
+- After user interaction: ALWAYS route objective, plan_id to `gem-planner`
 - Stay as orchestrator, no mode switching
 - Be autonomous between pause points
 - Context Hygiene: Discard sub-agent output details (code, diffs). Only retain status/summary.