diff --git a/agents/gem-chrome-tester.agent.md b/agents/gem-chrome-tester.agent.md
index 8282b870..58ed3ce7 100644
--- a/agents/gem-chrome-tester.agent.md
+++ b/agents/gem-chrome-tester.agent.md
@@ -2,7 +2,7 @@
 description: "Automates browser testing, UI/UX validation via Chrome DevTools"
 name: gem-chrome-tester
 disable-model-invocation: false
-user-invokable: true
+user-invocable: true
 ---
 
 <agent>
diff --git a/agents/gem-devops.agent.md b/agents/gem-devops.agent.md
index 30af165c..02600642 100644
--- a/agents/gem-devops.agent.md
+++ b/agents/gem-devops.agent.md
@@ -2,7 +2,7 @@
 description: "Manages containers, CI/CD pipelines, and infrastructure deployment"
 name: gem-devops
 disable-model-invocation: false
-user-invokable: true
+user-invocable: true
 ---
 
 <agent>
diff --git a/agents/gem-documentation-writer.agent.md b/agents/gem-documentation-writer.agent.md
index 3274ae4e..cd8cfc68 100644
--- a/agents/gem-documentation-writer.agent.md
+++ b/agents/gem-documentation-writer.agent.md
@@ -2,7 +2,7 @@
 description: "Generates technical docs, diagrams, maintains code-documentation parity"
 name: gem-documentation-writer
 disable-model-invocation: false
-user-invokable: true
+user-invocable: true
 ---
 
 <agent>
diff --git a/agents/gem-implementer.agent.md b/agents/gem-implementer.agent.md
index e9c2a9dd..76c69a9b 100644
--- a/agents/gem-implementer.agent.md
+++ b/agents/gem-implementer.agent.md
@@ -2,7 +2,7 @@
 description: "Executes TDD code changes, ensures verification, maintains quality"
 name: gem-implementer
 disable-model-invocation: false
-user-invokable: true
+user-invocable: true
 ---
 
 <agent>
diff --git a/agents/gem-orchestrator.agent.md b/agents/gem-orchestrator.agent.md
index bb2862c1..05d86a3b 100644
--- a/agents/gem-orchestrator.agent.md
+++ b/agents/gem-orchestrator.agent.md
@@ -2,7 +2,7 @@
 description: "Coordinates multi-agent workflows, delegates tasks, synthesizes results via runSubagent"
 name: gem-orchestrator
 disable-model-invocation: true
-user-invokable: true
+user-invocable: true
 ---
 
 <agent>
@@ -26,10 +26,10 @@ gem-researcher, gem-planner, gem-implementer, gem-chrome-tester, gem-devops, gem
   - Generate PLAN_ID with unique identifier name and date.
   - If no `plan.yaml`:
     - Identify key domains, features, or directories (focus_area). Delegate goal with PLAN_ID to multiple `gem-researcher` instances (one per domain or focus_area).
-    - Delegate goal with PLAN_ID to `gem-planner` to create initial plan.
   - Else (plan exists):
     - Delegate *new* goal with PLAN_ID to `gem-researcher` (focus_area based on new goal).
-    - Delegate *new* goal with PLAN_ID to `gem-planner` with instruction: "Extend existing plan with new tasks for this goal."
+- Plan:
+  - Delegate goal with PLAN_ID to `gem-planner` to create/ update initial plan.
 - 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.
diff --git a/agents/gem-planner.agent.md b/agents/gem-planner.agent.md
index fdfd3c83..a22d7fcc 100644
--- a/agents/gem-planner.agent.md
+++ b/agents/gem-planner.agent.md
@@ -2,7 +2,7 @@
 description: "Creates DAG-based plans with pre-mortem analysis and task decomposition from research findings"
 name: gem-planner
 disable-model-invocation: false
-user-invokable: true
+user-invocable: true
 ---
 
 <agent>
diff --git a/agents/gem-researcher.agent.md b/agents/gem-researcher.agent.md
index bf763bf3..c69f2491 100644
--- a/agents/gem-researcher.agent.md
+++ b/agents/gem-researcher.agent.md
@@ -2,7 +2,7 @@
 description: "Research specialist: gathers codebase context, identifies relevant files/patterns, returns structured findings"
 name: gem-researcher
 disable-model-invocation: false
-user-invokable: true
+user-invocable: true
 ---
 
 <agent>
@@ -36,7 +36,7 @@ Codebase navigation and discovery, Pattern recognition (conventions, architectur
   - level: high | medium | low
   - coverage: percentage of relevant files examined
   - gaps: list of missing information
-- Save report to `docs/plan/{PLAN_ID}/research_findings_{focus_area_normalized}.md` (or `_main.md` if no focus area).
+- Save report to `docs/plan/{PLAN_ID}/research_findings_{focus_area_normalized}.md`.
 - Return simple JSON: {"status": "success|failed|needs_revision", "task_id": "[task_id]", "summary": "[brief summary]"}
 </workflow>
 
diff --git a/agents/gem-reviewer.agent.md b/agents/gem-reviewer.agent.md
index 379fcafa..aa219216 100644
--- a/agents/gem-reviewer.agent.md
+++ b/agents/gem-reviewer.agent.md
@@ -2,7 +2,7 @@
 description: "Security gatekeeper for critical tasks—OWASP, secrets, compliance"
 name: gem-reviewer
 disable-model-invocation: false
-user-invokable: true
+user-invocable: true
 ---
 
 <agent>