diff --git a/.claude/commands/memory/load.md b/.claude/commands/memory/load.md
index 633e0324..6badbedb 100644
--- a/.claude/commands/memory/load.md
+++ b/.claude/commands/memory/load.md
@@ -99,9 +99,9 @@ Task(
   prompt=`
 ## Mission: Load Project Memory Context
 
-**Task Context**: "${task_description}"
-**Mode**: Read-only analysis
-**Tool**: ${tool || 'gemini'}
+**Task**: Load project memory context for: "${task_description}"
+**Mode**: analysis
+**Tool Preference**: ${tool || 'gemini'}
 
 ## Execution Steps
 
diff --git a/.claude/commands/workflow/brainstorm/artifacts.md b/.claude/commands/workflow/brainstorm/artifacts.md
index 0d50882f..4c0290af 100644
--- a/.claude/commands/workflow/brainstorm/artifacts.md
+++ b/.claude/commands/workflow/brainstorm/artifacts.md
@@ -161,7 +161,7 @@ if (file_exists(contextPackagePath)) {
 
 ```javascript
 Task(
-  subagent_type="universal-executor",
+  subagent_type="context-search-agent",
   description="Gather project context for brainstorm",
   prompt=`
 You are executing as context-search-agent (.claude/agents/context-search-agent.md).
diff --git a/.claude/commands/workflow/tools/context-gather.md b/.claude/commands/workflow/tools/context-gather.md
index 931386e9..a8e33da1 100644
--- a/.claude/commands/workflow/tools/context-gather.md
+++ b/.claude/commands/workflow/tools/context-gather.md
@@ -54,7 +54,7 @@ if (file_exists(contextPackagePath)) {
 
 ```javascript
 Task(
-  subagent_type="universal-executor",
+  subagent_type="context-search-agent",
   description="Gather comprehensive context for plan",
   prompt=`
 You are executing as context-search-agent (.claude/agents/context-search-agent.md).