oh-my-customcode 0.22.0 → 0.23.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-customcode",
-  "version": "0.22.0",
+  "version": "0.23.0",
   "description": "Batteries-included agent harness for Claude Code",
   "type": "module",
   "bin": {

package/templates/.claude/agents/sys-memory-keeper.md

@@ -47,8 +47,8 @@ Provider: claude-mem | Collection: claude_memories | Archive: ~/.claude-mem/arch
 When triggered by session-end signal from orchestrator:
 
 1. **Collect** session summary: completed tasks, key decisions, open items
-2. **Save to claude-mem** (if available): `mcp__claude-mem__save_memory` with project name, session date, and summary
-3. **Verify episodic-memory** (if available): `mcp__episodic-memory__search` to confirm session is indexed
+2. **Save to claude-mem** (if available): `mcp__plugin_claude-mem_mcp-search__save_memory` with project name, session date, and summary
+3. **Verify episodic-memory** (if available): `mcp__plugin_episodic-memory_episodic-memory__search` to confirm session is indexed
 4. **Report** results to orchestrator: saved/skipped/failed per system
 
 ### Failure Handling

package/templates/.claude/hooks/hooks.json

@@ -63,7 +63,7 @@
         "description": "Suggest manual compaction at logical intervals"
       },
       {
-        "matcher": "tool == \"Task\"",
+        "matcher": "tool == \"Task\" || tool == \"Agent\"",
         "hooks": [
           {
             "type": "command",
@@ -82,7 +82,7 @@
             "command": "bash .claude/hooks/scripts/model-escalation-advisor.sh"
           }
         ],
-        "description": "HUD statusline + R010 git delegation guard + R018 Agent Teams advisor on Task spawn"
+        "description": "HUD statusline + R010 git delegation guard + R018 Agent Teams advisor on Agent/Task spawn"
       }
     ],
     "SessionStart": [
@@ -97,6 +97,30 @@
         "description": "Check codex CLI and Agent Teams availability at session start"
       }
     ],
+    "SubagentStart": [
+      {
+        "matcher": "*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "#!/bin/bash\ninput=$(cat)\nagent_type=$(echo \"$input\" | jq -r '.agent_type // \"unknown\"')\nmodel=$(echo \"$input\" | jq -r '.model // \"inherit\"')\ndesc=$(echo \"$input\" | jq -r '.description // \"\"' | head -c 40)\necho \"─── [SubagentStart] ${agent_type}:${model} | ${desc} ───\" >&2\necho \"$input\""
+          }
+        ],
+        "description": "HUD display when a subagent starts (complements PreToolUse Agent matcher)"
+      }
+    ],
+    "SubagentStop": [
+      {
+        "matcher": "*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash .claude/hooks/scripts/task-outcome-recorder.sh"
+          }
+        ],
+        "description": "Record agent outcomes on subagent completion (complements PostToolUse Agent matcher)"
+      }
+    ],
     "PostToolUse": [
       {
         "matcher": "tool == \"Bash\"",
@@ -169,17 +193,17 @@
         "description": "Type check Python files with ty after edits"
       },
       {
-        "matcher": "tool == \"Task\"",
+        "matcher": "tool == \"Task\" || tool == \"Agent\"",
         "hooks": [
           {
             "type": "command",
             "command": "bash .claude/hooks/scripts/task-outcome-recorder.sh"
           }
         ],
-        "description": "Record task outcomes (success/failure) for model escalation decisions"
+        "description": "Record agent/task outcomes (success/failure) for model escalation decisions"
       },
       {
-        "matcher": "tool == \"Edit\" || tool == \"Write\" || tool == \"Bash\" || tool == \"Task\"",
+        "matcher": "tool == \"Edit\" || tool == \"Write\" || tool == \"Bash\" || tool == \"Task\" || tool == \"Agent\"",
         "hooks": [
           {
             "type": "command",

package/templates/.claude/hooks/scripts/agent-teams-advisor.sh

@@ -2,8 +2,8 @@
 set -euo pipefail
 
 # Agent Teams Advisor Hook
-# Trigger: PreToolUse, tool == "Task"
-# Purpose: Track Task tool usage count per session and warn when Agent Teams may be more appropriate
+# Trigger: PreToolUse, tool == "Task" || tool == "Agent"
+# Purpose: Track Agent/Task tool usage count per session and warn when Agent Teams may be more appropriate
 # Protocol: stdin JSON -> process -> stdout pass-through, exit 0 always (advisory only)
 
 input=$(cat)
@@ -27,12 +27,12 @@ echo "$COUNT" > "$COUNTER_FILE"
 # Warn from 2nd Task call onward -- Agent Teams may be more appropriate
 if [ "$COUNT" -ge 2 ]; then
   echo "" >&2
-  echo "--- [R018 Advisor] Task tool call #${COUNT} in this session ---" >&2
+  echo "--- [R018 Advisor] Agent/Task tool call #${COUNT} in this session ---" >&2
   echo "  WARNING: Multiple Task calls detected. Consider Agent Teams if:" >&2
   echo "    * 3+ agents needed for this work" >&2
   echo "    * Review -> fix -> re-review cycle exists" >&2
   echo "    * Agents need shared state or coordination" >&2
-  echo "  Current: Task(${agent_type}) -- ${prompt_preview}" >&2
+  echo "  Current: Agent(${agent_type}) -- ${prompt_preview}" >&2
   echo "-----------------------------------------------------------" >&2
 fi
 

package/templates/.claude/hooks/scripts/git-delegation-guard.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # R010 git-delegation-guard hook
-# Warns when git operations are delegated to a non-mgr-gitnerd agent via Task tool.
+# Warns when git operations are delegated to a non-mgr-gitnerd agent via Agent/Task tool.
 # WARN only - does NOT block (exit 0, passes input through).
 
 input=$(cat)

package/templates/.claude/hooks/scripts/model-escalation-advisor.sh

@@ -2,7 +2,7 @@
 set -euo pipefail
 
 # Model Escalation Advisor Hook
-# Trigger: PreToolUse, tool == "Task"
+# Trigger: PreToolUse, tool == "Task" || tool == "Agent"
 # Purpose: Advise model escalation when failure patterns detected
 # Protocol: stdin JSON -> process -> stdout pass-through, exit 0 always
 

package/templates/.claude/hooks/scripts/session-env-check.sh

@@ -27,6 +27,23 @@ if [ "${CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS:-0}" = "1" ]; then
   AGENT_TEAMS_STATUS="enabled"
 fi
 
+# Claude Code version detection
+CLAUDE_VERSION="unknown"
+if command -v claude >/dev/null 2>&1; then
+  CLAUDE_VERSION=$(claude --version 2>/dev/null | head -1 | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' || echo "unknown")
+fi
+
+# Version compatibility check
+MIN_COMPAT_VERSION="2.1.63"
+COMPAT_STATUS="unknown"
+if [ "$CLAUDE_VERSION" != "unknown" ]; then
+  if printf '%s\n' "$MIN_COMPAT_VERSION" "$CLAUDE_VERSION" | sort -V | head -1 | grep -q "^${MIN_COMPAT_VERSION}$"; then
+    COMPAT_STATUS="compatible"
+  else
+    COMPAT_STATUS="outdated"
+  fi
+fi
+
 # Git workflow reminder
 CURRENT_BRANCH="unknown"
 if command -v git >/dev/null 2>&1 && git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
@@ -39,11 +56,17 @@ cat > "$STATUS_FILE" << ENVEOF
 codex=${CODEX_STATUS}
 agent_teams=${AGENT_TEAMS_STATUS}
 git_branch=${CURRENT_BRANCH}
+claude_version=${CLAUDE_VERSION}
+compat_status=${COMPAT_STATUS}
 ENVEOF
 
 # Report to stderr (visible in conversation)
 echo "  codex CLI: ${CODEX_STATUS}" >&2
 echo "  Agent Teams: ${AGENT_TEAMS_STATUS}" >&2
+echo "  Claude Code: v${CLAUDE_VERSION} (${COMPAT_STATUS})" >&2
+if [ "$COMPAT_STATUS" = "outdated" ]; then
+  echo "  ⚠ Claude Code v${MIN_COMPAT_VERSION}+ recommended for full hook compatibility" >&2
+fi
 echo "" >&2
 echo "  [Git Workflow Reminder]" >&2
 echo "  Current branch: ${CURRENT_BRANCH}" >&2

package/templates/.claude/hooks/scripts/stuck-detector.sh

@@ -2,7 +2,7 @@
 set -euo pipefail
 
 # Stuck Detector Hook
-# Trigger: PostToolUse, tool matches "Edit|Write|Bash|Task"
+# Trigger: PostToolUse, tool matches "Edit|Write|Bash|Task|Agent"
 # Purpose: Detect repetitive failure loops and advise recovery
 # Protocol: stdin JSON -> process -> stdout pass-through, exit 0 always
 

package/templates/.claude/hooks/scripts/task-outcome-recorder.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 set -euo pipefail
 
-# Task Outcome Recorder Hook
-# Trigger: PostToolUse, tool == "Task"
+# Task/Agent Outcome Recorder Hook
+# Trigger: PostToolUse, tool == "Task" || tool == "Agent"
 # Purpose: Record task outcomes for model escalation decisions
 # Protocol: stdin JSON -> process -> stdout pass-through, exit 0 always
 
@@ -52,7 +52,7 @@ fi
 # Report failures to stderr
 if [ "$outcome" = "failure" ]; then
   echo "" >&2
-  echo "--- [Task Outcome] FAILURE: ${agent_type}:${model} ---" >&2
+  echo "--- [Agent Outcome] FAILURE: ${agent_type}:${model} ---" >&2
   echo "  ${description}" >&2
   echo "  Error: $(echo "$error_summary" | head -c 100)" >&2
   echo "-----------------------------------------------" >&2

package/templates/.claude/rules/MUST-agent-design.md

@@ -30,8 +30,20 @@ escalation:              # Model escalation policy (optional)
   enabled: true          # Enable auto-escalation advisory
   path: haiku → sonnet → opus  # Escalation sequence
   threshold: 2           # Failures before advisory
+isolation: worktree        # Run in isolated git worktree
+background: true           # Run in background
+maxTurns: 10               # Max conversation turns
+mcpServers: [server-1]     # MCP servers available
+hooks:                     # Agent-specific hooks
+  PreToolUse:
+    - matcher: "Edit"
+      command: "echo hook"
+permissionMode: bypassPermissions  # Permission mode
+disallowedTools: [Bash]    # Tools to disallow
 ```
 
+> **Note**: `isolation`, `background`, `maxTurns`, `mcpServers`, `hooks`, `permissionMode`, `disallowedTools` are supported in Claude Code v2.1.63+.
+
 ### Escalation Policy
 
 When `escalation.enabled: true`, the model-escalation hooks will track outcomes for this agent type and advise escalation when failures exceed the threshold. This is advisory-only — the orchestrator decides whether to accept the recommendation.

package/templates/.claude/rules/MUST-agent-teams.md

@@ -12,28 +12,28 @@ Available when `CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1` or TeamCreate/SendMessag
 
 | Scenario | Preferred | Reason |
 |----------|-----------|--------|
-| Simple independent subtasks | Task Tool | Lower cost, no coordination overhead |
+| Simple independent subtasks | Agent Tool | Lower cost, no coordination overhead |
 | Multi-step with shared state | **Agent Teams** | Shared task list, peer messaging |
 | Research requiring discussion | **Agent Teams** | Iterative discovery, synthesis |
-| Cost-sensitive batch ops | Task Tool | Minimal token overhead |
+| Cost-sensitive batch ops | Agent Tool | Minimal token overhead |
 | Complex debugging across modules | **Agent Teams** | Cross-module state sharing |
 | Code review + fix cycle | **Agent Teams** | Review → fix → re-review loop |
-| Single file operations | Task Tool | Overkill for simple tasks |
+| Single file operations | Agent Tool | Overkill for simple tasks |
 | Dynamic agent creation + usage | **Agent Teams** | Create → test → iterate cycle |
 
 **When Agent Teams is enabled and criteria are met, usage is MANDATORY.**
 
-## Self-Check (MANDATORY Before Task Tool)
+## Self-Check (MANDATORY Before Agent Tool)
 
-BEFORE using Task tool for 2+ agent tasks, this check is **ENFORCED**:
+BEFORE using Agent tool for 2+ agent tasks, this check is **ENFORCED**:
 
 ```
 ╔══════════════════════════════════════════════════════════════════╗
-║  BEFORE USING Task TOOL FOR 2+ AGENTS:                          ║
+║  BEFORE USING Agent TOOL FOR 2+ AGENTS:                          ║
 ║                                                                   ║
 ║  1. Is Agent Teams available?                                    ║
 ║     YES → MUST check criteria #2-#5                              ║
-║     NO  → Proceed with Task tool                                ║
+║     NO  → Proceed with Agent tool                               ║
 ║                                                                   ║
 ║  2. Will 3+ agents be involved?                                  ║
 ║     YES → MUST use Agent Teams                                   ║
@@ -41,10 +41,10 @@ BEFORE using Task tool for 2+ agent tasks, this check is **ENFORCED**:
 ║                                                                   ║
 ║  3. Is there a review → fix → re-review cycle?                  ║
 ║     YES → MUST use Agent Teams                                   ║
-║     NO  → Proceed with Task tool                                 ║
+║     NO  → Proceed with Agent tool                                ║
 ║                                                                   ║
 ║  Simple rule: 3+ agents OR review cycle → Agent Teams            ║
-║  Everything else → Task tool                                     ║
+║  Everything else → Agent tool                                    ║
 ╚══════════════════════════════════════════════════════════════════╝
 ```
 
@@ -73,60 +73,60 @@ When spawning Agent Teams members:
 ## Common Violations
 
 ```
-❌ WRONG: Agent Teams enabled, 3+ research tasks using Task tool
-   Task(Explore):haiku → Analysis 1
-   Task(Explore):haiku → Analysis 2
-   Task(Explore):haiku → Analysis 3
+❌ WRONG: Agent Teams enabled, 3+ research tasks using Agent tool
+   Agent(Explore):haiku → Analysis 1
+   Agent(Explore):haiku → Analysis 2
+   Agent(Explore):haiku → Analysis 3
 
 ✓ CORRECT: TeamCreate → spawn researchers → coordinate via shared task list
    TeamCreate("research-team")
-   Task(researcher-1) → Analysis 1  ┐
-   Task(researcher-2) → Analysis 2  ├─ Spawned as team members
-   Task(researcher-3) → Analysis 3  ┘
+   Agent(researcher-1) → Analysis 1  ┐
+   Agent(researcher-2) → Analysis 2  ├─ Spawned as team members
+   Agent(researcher-3) → Analysis 3  ┘
    SendMessage(coordinate)
 
-❌ WRONG: Code review + fix as independent Tasks
-   Task(reviewer) → "Review code"
+❌ WRONG: Code review + fix as independent Agents
+   Agent(reviewer) → "Review code"
    (receive result)
-   Task(implementer) → "Fix issues"
+   Agent(implementer) → "Fix issues"
    (receive result)
-   Task(reviewer) → "Re-review"
+   Agent(reviewer) → "Re-review"
 
 ✓ CORRECT: Agent Teams for review-fix cycle
    TeamCreate("review-fix")
-   Task(reviewer) + Task(implementer) → team members
+   Agent(reviewer) + Agent(implementer) → team members
    reviewer → SendMessage(implementer, "issues found")
    implementer → fixes → SendMessage(reviewer, "fixed")
    reviewer → re-reviews → done
 
 ❌ WRONG: Multi-expert task without coordination
-   Task(lang-typescript-expert) → "Implement frontend"
-   Task(be-express-expert) → "Implement API"
+   Agent(lang-typescript-expert) → "Implement frontend"
+   Agent(be-express-expert) → "Implement API"
    (no shared state, results manually combined)
 
 ✓ CORRECT: Agent Teams for cross-domain work
    TeamCreate("fullstack")
-   Task(frontend-dev) + Task(backend-dev) → team members
+   Agent(frontend-dev) + Agent(backend-dev) → team members
    Shared TaskList for interface contracts
    SendMessage for API schema coordination
 
 ❌ WRONG: Spawning team members one at a time
    TeamCreate("research-team")
-   Message 1: Task(researcher-1) → Analysis 1   (only 1/3 spawned)
-   Message 2: Task(researcher-2) → Analysis 2   (late spawn)
-   Message 3: Task(researcher-3) → Analysis 3   (late spawn)
+   Message 1: Agent(researcher-1) → Analysis 1   (only 1/3 spawned)
+   Message 2: Agent(researcher-2) → Analysis 2   (late spawn)
+   Message 3: Agent(researcher-3) → Analysis 3   (late spawn)
 
 ✓ CORRECT: All members in a single message
    TeamCreate("research-team")
    Single message:
-     Task(researcher-1) → Analysis 1  ┐
-     Task(researcher-2) → Analysis 2  ├─ ALL spawned together
-     Task(researcher-3) → Analysis 3  ┘
+     Agent(researcher-1) → Analysis 1  ┐
+     Agent(researcher-2) → Analysis 2  ├─ ALL spawned together
+     Agent(researcher-3) → Analysis 3  ┘
 ```
 
 ## Cost Guidelines
 
-| Criteria | Task Tool | Agent Teams |
+| Criteria | Agent Tool | Agent Teams |
 |----------|-----------|-------------|
 | Agent count | 1-2 | 3+ |
 | Inter-task dependency | None | Present |
@@ -185,18 +185,18 @@ When Agent Teams creates a new agent via mgr-creator:
 ## Lifecycle
 
 ```
-TeamCreate → TaskCreate → Task(spawn members) → SendMessage(coordinate)
+TeamCreate → TaskCreate → Agent(spawn members) → SendMessage(coordinate)
   → TaskUpdate(progress) → ... → shutdown members → TeamDelete
 ```
 
 ## Fallback
 
-When Agent Teams unavailable: use Task tool with R009/R010 rules.
+When Agent Teams unavailable: use Agent tool with R009/R010 rules.
 When Agent Teams available: actively prefer it for qualifying tasks. This is not optional.
 
 ## Cost Awareness
 
-Agent Teams actively preferred for qualifying collaborative tasks. Use Task tool only when:
+Agent Teams actively preferred for qualifying collaborative tasks. Use Agent tool only when:
 - 1-2 agents with no inter-dependency
 - No review → fix cycles
 - Simple independent subtasks

package/templates/.claude/rules/MUST-orchestrator-coordination.md

@@ -4,7 +4,7 @@
 
 ## Core Rule
 
-The main conversation is the **sole orchestrator**. It uses routing skills to delegate tasks to subagents via the Task tool. Subagents CANNOT spawn other subagents.
+The main conversation is the **sole orchestrator**. It uses routing skills to delegate tasks to subagents via the Agent tool (formerly Task tool). Subagents CANNOT spawn other subagents.
 
 **The orchestrator MUST NEVER directly write, edit, or create files. ALL file modifications MUST be delegated to appropriate subagents.**
 
@@ -19,7 +19,7 @@ The main conversation is the **sole orchestrator**. It uses routing skills to de
 ║     NO  → I am a subagent, proceed with task                    ║
 ║                                                                   ║
 ║  2. Have I identified the correct specialized agent?             ║
-║     YES → Delegate via Task tool                                 ║
+║     YES → Delegate via Agent tool                                ║
 ║     NO  → Check delegation table below                          ║
 ║                                                                   ║
 ║  3. Am I about to use Write/Edit tool from orchestrator?         ║
@@ -65,7 +65,7 @@ Main Conversation (orchestrator)
   ├─ de-lead-routing   → de-* experts
   └─ qa-lead-routing   → qa-planner, qa-writer, qa-engineer
       ↓
-  Task tool spawns subagents (flat, no hierarchy)
+  Agent tool spawns subagents (flat, no hierarchy)
 ```
 
 ## Common Violations
@@ -76,44 +76,44 @@ Main Conversation (orchestrator)
    Main conversation → Edit("package.json", old, new)
 
 ✓ CORRECT: Orchestrator delegates to specialist
-   Main conversation → Task(lang-golang-expert) → Write("src/main.go", content)
-   Main conversation → Task(tool-npm-expert) → Edit("package.json", old, new)
+   Main conversation → Agent(lang-golang-expert) → Write("src/main.go", content)
+   Main conversation → Agent(tool-npm-expert) → Edit("package.json", old, new)
 
 ❌ WRONG: Orchestrator runs git commands directly
    Main conversation → Bash("git commit -m 'fix'")
    Main conversation → Bash("git push origin main")
 
 ✓ CORRECT: Orchestrator delegates to mgr-gitnerd
-   Main conversation → Task(mgr-gitnerd) → git commit
-   Main conversation → Task(mgr-gitnerd) → git push
+   Main conversation → Agent(mgr-gitnerd) → git commit
+   Main conversation → Agent(mgr-gitnerd) → git push
 
 ❌ WRONG: Using general-purpose when specialist exists
-   Main conversation → Task(general-purpose) → "Write Go code"
+   Main conversation → Agent(general-purpose) → "Write Go code"
 
 ✓ CORRECT: Using the right specialist
-   Main conversation → Task(lang-golang-expert) → "Write Go code"
+   Main conversation → Agent(lang-golang-expert) → "Write Go code"
 
 ❌ WRONG: Orchestrator creates files "just this once"
    "It's just a small config file, I'll write it directly..."
 
 ✓ CORRECT: Always delegate, no matter how small
-   Task(appropriate-agent) → create config file
+   Agent(appropriate-agent) → create config file
 
 ❌ WRONG: Bundling git operations with file editing in non-gitnerd agent
-   Main conversation → Task(general-purpose) → "git revert + edit file + git commit"
-   Main conversation → Task(lang-typescript-expert) → "fix bug and commit"
+   Main conversation → Agent(general-purpose) → "git revert + edit file + git commit"
+   Main conversation → Agent(lang-typescript-expert) → "fix bug and commit"
 
 ✓ CORRECT: Separate file editing from git operations
-   Main conversation → Task(lang-typescript-expert) → "fix bug" (file edit only)
-   Main conversation → Task(mgr-gitnerd) → "git commit" (git operation only)
+   Main conversation → Agent(lang-typescript-expert) → "fix bug" (file edit only)
+   Main conversation → Agent(mgr-gitnerd) → "git commit" (git operation only)
 
 ❌ WRONG: Including git commands in non-gitnerd agent prompt for "convenience"
-   Task(general-purpose, prompt="revert the last commit, edit the file, then commit the fix")
+   Agent(general-purpose, prompt="revert the last commit, edit the file, then commit the fix")
 
 ✓ CORRECT: Split into separate delegations
-   Task(mgr-gitnerd, prompt="revert the last commit")
-   Task(appropriate-expert, prompt="edit the file to fix the issue")
-   Task(mgr-gitnerd, prompt="commit the fix")
+   Agent(mgr-gitnerd, prompt="revert the last commit")
+   Agent(appropriate-expert, prompt="edit the file to fix the issue")
+   Agent(mgr-gitnerd, prompt="commit the fix")
 ```
 
 ## Session Continuity
@@ -190,7 +190,7 @@ Available models:
   - inherit: Use parent conversation's model
 
 Usage:
-  Task(
+  Agent(
     subagent_type: "general-purpose",
     prompt: "Analyze architecture",
     model: "opus"
@@ -217,10 +217,10 @@ Internal rules ALWAYS take precedence over external skills.
 Translation:
   External skill says          → Internal rule requires
   ─────────────────────────────────────────────────────
-  "git commit -m ..."          → Task(mgr-gitnerd) commit
-  "git push ..."               → Task(mgr-gitnerd) push
-  "gh pr create ..."           → Task(mgr-gitnerd) create PR
-  "git merge ..."              → Task(mgr-gitnerd) merge
+  "git commit -m ..."          → Agent(mgr-gitnerd) commit
+  "git push ..."               → Agent(mgr-gitnerd) push
+  "gh pr create ..."           → Agent(mgr-gitnerd) create PR
+  "git merge ..."              → Agent(mgr-gitnerd) merge
 
 WRONG:
   [Using external skill]
@@ -228,7 +228,7 @@ WRONG:
 
 CORRECT:
   [Using external skill]
-  Main conversation → Task(mgr-gitnerd) → git push
+  Main conversation → Agent(mgr-gitnerd) → git push
 
 The skill's WORKFLOW is followed, but git EXECUTION is delegated to mgr-gitnerd per R010.
 ```
@@ -241,24 +241,24 @@ When `CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1`: Agent Teams is **MANDATORY** for
 
 ```
 Main Conversation (orchestrator)
-  ├─ Simple/independent tasks → Task tool (R009)
+  ├─ Simple/independent tasks → Agent tool (R009)
   └─ Collaborative/iterative tasks → Agent Teams (R018)
       ├─ TeamCreate
       ├─ TaskCreate (shared tasks)
-      ├─ Task(spawn members)
+      ├─ Agent(spawn members)
       └─ SendMessage(coordinate)
 ```
 
-### When to Use Agent Teams vs Task Tool
+### When to Use Agent Teams vs Agent Tool
 
-| Criteria | Task Tool | Agent Teams (MUST) |
+| Criteria | Agent Tool | Agent Teams (MUST) |
 |----------|-----------|-------------------|
 | Agent count | 1-2 | 3+ |
 | Coordination needed | No | Yes |
 | Review/fix cycles | No | Yes |
 | Shared state | No | Yes |
 
-Using Task tool when Agent Teams criteria are met is a **VIOLATION** of R018.
+Using Agent tool when Agent Teams criteria are met is a **VIOLATION** of R018.
 
 ## Announcement Format
 

package/templates/.claude/rules/MUST-parallel-execution.md

@@ -17,17 +17,17 @@ Examples: creating multiple agents, reviewing multiple files, batch operations o
 
 ## Agent Teams Gate (R018 Integration)
 
-Before spawning parallel Task instances, evaluate Agent Teams eligibility:
+Before spawning parallel Agent instances, evaluate Agent Teams eligibility:
 
 ```
 2+ independent tasks detected
   ↓
 Is Agent Teams available? (env or tools check)
-  ├─ NO → Proceed with Task tool (standard R009)
+  ├─ NO → Proceed with Agent tool (standard R009)
   └─ YES → Check eligibility:
        ├─ 3+ agents needed? → Agent Teams (MUST)
        ├─ Review → fix cycle? → Agent Teams (MUST)
-       └─ Neither → Task tool (standard R009)
+       └─ Neither → Agent tool (standard R009)
 ```
 
 This gate is MANDATORY when Agent Teams is enabled. Skipping it is a violation of both R009 and R018.
@@ -35,10 +35,10 @@ This gate is MANDATORY when Agent Teams is enabled. Skipping it is a violation o
 ## Self-Check
 
 Before writing/editing multiple files:
-1. Are files independent? → YES: spawn parallel Task agents
+1. Are files independent? → YES: spawn parallel agents
 2. Using Write/Edit sequentially for 2+ files? → STOP, parallelize
 3. Specialized agent available? → Use it (not general-purpose)
-4. Agent Teams available + 3+ agents or review cycle? → YES: use Agent Teams instead of Task
+4. Agent Teams available + 3+ agents or review cycle? → YES: use Agent Teams instead of Agent tool
 5. Agent Teams members? → ALL members MUST spawn in a single message (no partial spawning)
 
 ### Common Violations to Avoid
@@ -48,50 +48,50 @@ Before writing/editing multiple files:
    Write(file1.kt) → Write(file2.kt) → Write(file3.kt) → Write(file4.kt)
 
 ✓ CORRECT: Spawn parallel agents
-   Task(agent1 → file1.kt)  ┐
-   Task(agent2 → file2.kt)  ├─ All in single message
-   Task(agent3 → file3.kt)  │
-   Task(agent4 → file4.kt)  ┘
+   Agent(agent1 → file1.kt)  ┐
+   Agent(agent2 → file2.kt)  ├─ All in single message
+   Agent(agent3 → file3.kt)  │
+   Agent(agent4 → file4.kt)  ┘
 
 ❌ WRONG: Project scaffolding sequentially
    Write(package.json) → Write(tsconfig.json) → Write(src/index.ts) → ...
 
 ✓ CORRECT: Parallel scaffolding
-   Task(agent1 → "Create package.json, tsconfig.json")  ┐
-   Task(agent2 → "Create src/cli.ts, src/index.ts")     ├─ Parallel
-   Task(agent3 → "Create src/analyzer/*.ts")            │
-   Task(agent4 → "Create src/converter/*.ts")           ┘
+   Agent(agent1 → "Create package.json, tsconfig.json")  ┐
+   Agent(agent2 → "Create src/cli.ts, src/index.ts")     ├─ Parallel
+   Agent(agent3 → "Create src/analyzer/*.ts")            │
+   Agent(agent4 → "Create src/converter/*.ts")           ┘
 
 ❌ WRONG: Secretary doing all the work
    Secretary writes domain/, usecase/, infrastructure/ sequentially
 
 ✓ CORRECT: Delegate to specialists
-   Task(lang-kotlin-expert → domain layer)
-   Task(be-springboot-expert → infrastructure layer)
-   Task(lang-kotlin-expert → usecase layer)
+   Agent(lang-kotlin-expert → domain layer)
+   Agent(be-springboot-expert → infrastructure layer)
+   Agent(lang-kotlin-expert → usecase layer)
 
-❌ WRONG: Single Task delegating to multiple agents
-   Task(dev-lead → "coordinate lang-kotlin-expert and be-springboot-expert")
+❌ WRONG: Single Agent delegating to multiple agents
+   Agent(dev-lead → "coordinate lang-kotlin-expert and be-springboot-expert")
 
-   This creates a SEQUENTIAL bottleneck inside the Task!
+   This creates a SEQUENTIAL bottleneck inside the Agent!
 
-✓ CORRECT: Multiple Tasks in parallel, one per agent
-   Task(lang-kotlin-expert → usecase commands)    ┐
-   Task(lang-kotlin-expert → usecase queries)     ├─ All spawned together
-   Task(be-springboot-expert → persistence)       │
-   Task(be-springboot-expert → security)          ┘
+✓ CORRECT: Multiple Agents in parallel, one per agent
+   Agent(lang-kotlin-expert → usecase commands)    ┐
+   Agent(lang-kotlin-expert → usecase queries)     ├─ All spawned together
+   Agent(be-springboot-expert → persistence)       │
+   Agent(be-springboot-expert → security)          ┘
 
 ❌ WRONG: Agent Teams partial spawn (1 of N members)
    TeamCreate("feature-team")
-   Message 1: Task(member-1)  ← only 1/3 spawned, VIOLATION
-   Message 2: Task(member-2)  ← sequential, VIOLATION
-   Message 3: Task(member-3)  ← sequential, VIOLATION
+   Message 1: Agent(member-1)  ← only 1/3 spawned, VIOLATION
+   Message 2: Agent(member-2)  ← sequential, VIOLATION
+   Message 3: Agent(member-3)  ← sequential, VIOLATION
 
 ✓ CORRECT: All Agent Teams members in single message
    TeamCreate("feature-team")
-   Task(member-1)  ┐
-   Task(member-2)  ├─ Single message, all at once
-   Task(member-3)  ┘
+   Agent(member-1)  ┐
+   Agent(member-2)  ├─ Single message, all at once
+   Agent(member-3)  ┘
 ```
 
 ## Execution Rules
@@ -103,21 +103,21 @@ Before writing/editing multiple files:
 | Instance independence | Isolated context, no shared state |
 | Large tasks (>3 min) | MUST split into parallel sub-tasks |
 
-## Task Tool Requirements
+## Agent Tool Requirements
 
 - Use specific `subagent_type` (not "general-purpose" when specialist exists)
 - Use `model` parameter for cost optimization (haiku for search, sonnet for code, opus for reasoning)
-- Each independent unit = separate Task tool call in the SAME message
+- Each independent unit = separate Agent tool call in the SAME message
 
 ## Display Format
 
 ```
-[Instance 1] Task(mgr-creator):sonnet → Create Go agent
-[Instance 2] Task(lang-python-expert):sonnet → Review Python code
-[Instance 3] Task(Explore):haiku → Search codebase
+[Instance 1] Agent(mgr-creator):sonnet → Create Go agent
+[Instance 2] Agent(lang-python-expert):sonnet → Review Python code
+[Instance 3] Agent(Explore):haiku → Search codebase
 ```
 
-Must use `Task({subagent_type}):{model}` format. Custom names not allowed.
+Must use `Agent({subagent_type}):{model}` format. Custom names not allowed.
 
 ## Result Aggregation
 

package/templates/.claude/rules/MUST-tool-identification.md

@@ -62,21 +62,23 @@ For parallel calls: list ALL identifications BEFORE the tool calls.
 | File Read | Read, Glob, Grep | Reading / Searching |
 | File Write | Write, Edit | Writing / Editing |
 | Network | WebFetch | Fetching |
-| Execution | Bash, Task | Running / Spawning |
+| Execution | Bash, Agent | Running / Spawning |
 
-## Task Tool Format
+## Agent Tool Format
 
 ```
-Task(subagent_type):model → description
+Agent(subagent_type):model → description
 ```
 
-`subagent_type` MUST match actual Task tool parameter. Custom names not allowed.
+`subagent_type` MUST match actual Agent tool parameter. Custom names not allowed.
+
+> **Note**: Claude Code v2.1.63+ renamed the Task tool to Agent tool. Both names refer to the same tool; `Agent(...)` is the current canonical form.
 
 ## Example
 
 ```
 [mgr-creator][sonnet] → Write: .claude/agents/new-agent.md
 [secretary][opus] → Spawning:
-  [1] Task(lang-golang-expert):sonnet → Go code review
-  [2] Task(lang-python-expert):sonnet → Python code review
+  [1] Agent(lang-golang-expert):sonnet → Go code review
+  [2] Agent(lang-python-expert):sonnet → Python code review
 ```

package/templates/.claude/rules/SHOULD-hud-statusline.md

@@ -8,7 +8,7 @@
 |--------|-----------|----------------|
 | Channel | stderr (hooks) | stdout (dedicated statusline) |
 | Location | Inline in conversation log | Persistent bar at screen bottom |
-| Trigger | PreToolUse (Task matcher) | Message update cycle (~300ms) |
+| Trigger | PreToolUse (Agent/Task matcher) | Message update cycle (~300ms) |
 | Role | Event notifications | Persistent session status |
 
 ## HUD Events (Hook-based)
@@ -26,14 +26,14 @@ Multi-step tasks, parallel execution, long-running operations. Skip for single b
 
 ### Implementation
 
-Implemented in `.claude/hooks/hooks.json` (PreToolUse → Task matcher).
+Implemented in `.claude/hooks/hooks.json` (PreToolUse → Agent/Task matcher).
 
 ### Parallel Display
 
 ```
 ─── [Agent] secretary | [Parallel] 4 ───
-  [1] Task(mgr-creator):sonnet → Create agent
-  [2] Task(lang-golang-expert):haiku → Code review
+  [1] Agent(mgr-creator):sonnet → Create agent
+  [2] Agent(lang-golang-expert):haiku → Code review
 ```
 
 ## Statusline API (Command-based)

package/templates/.claude/rules/SHOULD-memory-integration.md

@@ -60,8 +60,8 @@ User signals session end
 
 | System | Tool | Action | Required |
 |--------|------|--------|----------|
-| claude-mem | `mcp__claude-mem__save_memory` | Save session summary with project, tasks, decisions | No (best-effort) |
-| episodic-memory | `mcp__episodic-memory__search` | Verify session is indexed for future retrieval | No (best-effort) |
+| claude-mem | `mcp__plugin_claude-mem_mcp-search__save_memory` | Save session summary with project, tasks, decisions | No (best-effort) |
+| episodic-memory | `mcp__plugin_episodic-memory_episodic-memory__search` | Verify session is indexed for future retrieval | No (best-effort) |
 
 ### Failure Policy
 

package/templates/.claude/skills/dag-orchestration/SKILL.md

@@ -1,6 +1,7 @@
 ---
 name: dag-orchestration
 description: YAML-based DAG workflow engine with topological execution and failure strategies
+context: fork
 ---
 
 # DAG Orchestration Skill

package/templates/.claude/skills/de-lead-routing/SKILL.md

@@ -2,6 +2,7 @@
 name: de-lead-routing
 description: Routes data engineering tasks to the correct DE expert agent. Use when user requests data pipeline design, DAG authoring, SQL modeling, stream processing, or warehouse optimization.
 user-invocable: false
+context: fork
 ---
 
 # DE Lead Routing Skill
@@ -47,17 +48,17 @@ Routes data engineering tasks to appropriate DE expert agents. This skill contai
 
 ## Routing Decision (Priority Order)
 
-Before routing via Task tool, evaluate in this order:
+Before routing via Agent tool, evaluate in this order:
 
 ### Step 1: Agent Teams Eligibility (R018)
 Check if Agent Teams is available (`CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1` or TeamCreate/SendMessage tools present).
 
 | Scenario | Preferred |
 |----------|-----------|
-| Single-tool DE task | Task Tool |
+| Single-tool DE task | Agent Tool |
 | Multi-tool pipeline design (3+ tools) | Agent Teams |
 | Cross-tool data quality analysis | Agent Teams |
-| Quick DAG/model validation | Task Tool |
+| Quick DAG/model validation | Agent Tool |
 
 ### Step 2: Codex-Exec Hybrid (Code Generation)
 For **new pipeline code**, **DAG scaffolding**, or **SQL model generation**:
@@ -116,10 +117,10 @@ Detection:
   - Pipeline architecture → de-pipeline-expert
 
 Route (parallel where independent):
-  Task(de-pipeline-expert → overall architecture design)
-  Task(de-airflow-expert → DAG structure)
-  Task(de-dbt-expert → model design)
-  Task(de-snowflake-expert → warehouse setup)
+  Agent(de-pipeline-expert → overall architecture design)
+  Agent(de-airflow-expert → DAG structure)
+  Agent(de-dbt-expert → model design)
+  Agent(de-snowflake-expert → warehouse setup)
 
 Aggregate:
   Pipeline architecture defined
@@ -174,25 +175,25 @@ For projects spanning multiple DE tools:
 | de-kafka-expert | `sonnet` | `opus` for topology design |
 | de-snowflake-expert | `sonnet` | `opus` for warehouse design |
 
-### Task Call Examples
+### Agent Call Examples
 
 ```
 # Complex pipeline architecture
-Task(
+Agent(
   subagent_type: "general-purpose",
   prompt: "Design end-to-end pipeline architecture following de-pipeline-expert guidelines",
   model: "opus"
 )
 
 # Standard DAG review
-Task(
+Agent(
   subagent_type: "general-purpose",
   prompt: "Review Airflow DAGs in dags/ following de-airflow-expert guidelines",
   model: "sonnet"
 )
 
 # Quick dbt test validation
-Task(
+Agent(
   subagent_type: "Explore",
   prompt: "Find all dbt models missing schema tests",
   model: "haiku"
@@ -216,9 +217,9 @@ Detection:
   - kafka/ → de-kafka-expert
 
 Route (parallel):
-  Task(de-airflow-expert role → review dags/, model: "sonnet")
-  Task(de-dbt-expert role → review models/, model: "sonnet")
-  Task(de-kafka-expert role → review kafka/, model: "sonnet")
+  Agent(de-airflow-expert role → review dags/, model: "sonnet")
+  Agent(de-dbt-expert role → review models/, model: "sonnet")
+  Agent(de-kafka-expert role → review kafka/, model: "sonnet")
 ```
 
 ## Display Format

package/templates/.claude/skills/dev-lead-routing/SKILL.md

@@ -2,6 +2,7 @@
 name: dev-lead-routing
 description: Routes development tasks to the correct language or framework expert agent. Use when user requests code review, implementation, refactoring, or debugging.
 user-invocable: false
+context: fork
 ---
 
 # Dev Lead Routing

package/templates/.claude/skills/multi-model-verification/SKILL.md

@@ -33,15 +33,15 @@ Inspired by Pi Coding Agent Workflow Extension's multi-model verification patter
 
 ### Prerequisites
 - Agent Teams enabled (`CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1`) for full parallel execution
-- Falls back to sequential Task tool execution if Agent Teams unavailable
+- Falls back to sequential Agent tool execution if Agent Teams unavailable
 
 ### Execution Flow
 
 1. **Input**: File path(s) or diff to verify
 2. **Spawn Parallel Reviewers**:
-   - `Task(opus)` → Architecture & design review
-   - `Task(sonnet)` → Code quality & correctness review
-   - `Task(haiku)` → Style & convention review
+   - `Agent(opus)` → Architecture & design review
+   - `Agent(sonnet)` → Code quality & correctness review
+   - `Agent(haiku)` → Style & convention review
 3. **Collect Results**: Each reviewer returns findings with severity
 4. **Aggregate**: Merge and deduplicate findings
 5. **Report**: Unified report sorted by severity
@@ -59,14 +59,14 @@ TeamCreate("verification-team")
 
 Members communicate findings via SendMessage for cross-cutting concerns.
 
-### Task Tool Fallback
+### Agent Tool Fallback
 
-When Agent Teams is unavailable, spawn parallel Task agents:
+When Agent Teams is unavailable, spawn parallel agents:
 
 ```
-[1] Task(general-purpose):opus → Architecture review
-[2] Task(general-purpose):sonnet → Code quality review
-[3] Task(general-purpose):haiku → Style & convention review
+[1] Agent(general-purpose):opus → Architecture review
+[2] Agent(general-purpose):sonnet → Code quality review
+[3] Agent(general-purpose):haiku → Style & convention review
 ```
 
 ## Output Format

package/templates/.claude/skills/qa-lead-routing/SKILL.md

@@ -2,6 +2,7 @@
 name: qa-lead-routing
 description: Coordinates QA workflow across planning, writing, and execution agents. Use when user requests testing, quality assurance, or test documentation.
 user-invocable: false
+context: fork
 ---
 
 # QA Lead Routing Skill
@@ -20,16 +21,16 @@ Coordinates QA team activities by routing tasks to qa-planner, qa-writer, and qa
 
 ## Routing Decision (Priority Order)
 
-Before routing via Task tool, evaluate Agent Teams eligibility first:
+Before routing via Agent tool, evaluate Agent Teams eligibility first:
 
-**Self-check:** Does this task need 3+ agents, shared state, or inter-agent communication? If yes, prefer Agent Teams over Task tool. See R018 for the full decision matrix.
+**Self-check:** Does this task need 3+ agents, shared state, or inter-agent communication? If yes, prefer Agent Teams over Agent tool. See R018 for the full decision matrix.
 
 | Scenario | Preferred |
 |----------|-----------|
-| Single QA phase (plan/write/execute) | Task Tool |
+| Single QA phase (plan/write/execute) | Agent Tool |
 | Full QA cycle (plan + write + execute + report) | Agent Teams |
 | Quality analysis (parallel strategy + results) | Agent Teams |
-| Quick test validation | Task Tool |
+| Quick test validation | Agent Tool |
 
 ## Command Routing
 
@@ -51,7 +52,7 @@ full_qa_cycle      → all agents (sequential)
 User: "Create test plan for feature X"
 
 Route:
-  Task(qa-planner role → create test plan, model: "sonnet")
+  Agent(qa-planner role → create test plan, model: "sonnet")
 
 Output:
   - Test scenarios
@@ -66,7 +67,7 @@ Output:
 User: "Document test cases for API"
 
 Route:
-  Task(qa-writer role → document test cases, model: "sonnet")
+  Agent(qa-writer role → document test cases, model: "sonnet")
 
 Output:
   - Test case specifications
@@ -81,7 +82,7 @@ Output:
 User: "Execute tests for module Y"
 
 Route:
-  Task(qa-engineer role → execute tests, model: "sonnet")
+  Agent(qa-engineer role → execute tests, model: "sonnet")
 
 Output:
   - Test execution results
@@ -98,8 +99,8 @@ When analysis is needed (parallel execution):
 User: "Analyze quality metrics"
 
 Route (parallel):
-  Task(qa-planner role → analyze strategy, model: "sonnet")
-  Task(qa-engineer role → analyze results, model: "sonnet")
+  Agent(qa-planner role → analyze strategy, model: "sonnet")
+  Agent(qa-engineer role → analyze results, model: "sonnet")
 
 Aggregate:
   Strategy insights + execution data
@@ -113,10 +114,10 @@ For complete quality assurance workflow:
 User: "Run full QA cycle for feature Z"
 
 Route (sequential):
-  1. Task(qa-planner role → create test plan, model: "sonnet")
-  2. Task(qa-writer role → document test cases, model: "sonnet")
-  3. Task(qa-engineer role → execute tests, model: "sonnet")
-  4. Task(qa-writer role → generate report, model: "sonnet")
+  1. Agent(qa-planner role → create test plan, model: "sonnet")
+  2. Agent(qa-writer role → document test cases, model: "sonnet")
+  3. Agent(qa-engineer role → execute tests, model: "sonnet")
+  4. Agent(qa-writer role → generate report, model: "sonnet")
 
 Aggregate and present final report
 ```
@@ -176,9 +177,9 @@ Only when tasks are truly independent:
 
 ```
 Example:
-  Task(qa-engineer role → test module A, model: "sonnet")
-  Task(qa-engineer role → test module B, model: "sonnet")
-  Task(qa-engineer role → test module C, model: "sonnet")
+  Agent(qa-engineer role → test module A, model: "sonnet")
+  Agent(qa-engineer role → test module B, model: "sonnet")
+  Agent(qa-engineer role → test module C, model: "sonnet")
 ```
 
 ## Sub-agent Model Selection
@@ -193,25 +194,25 @@ Example:
 
 All QA agents typically use `sonnet` for balanced quality output.
 
-### Task Call Examples
+### Agent Call Examples
 
 ```
 # Test planning
-Task(
+Agent(
   subagent_type: "general-purpose",
   prompt: "Create comprehensive test plan for authentication feature following qa-planner guidelines",
   model: "sonnet"
 )
 
 # Test documentation
-Task(
+Agent(
   subagent_type: "general-purpose",
   prompt: "Document test cases for API endpoints following qa-writer guidelines",
   model: "sonnet"
 )
 
 # Test execution
-Task(
+Agent(
   subagent_type: "general-purpose",
   prompt: "Execute integration tests and report results following qa-engineer guidelines",
   model: "sonnet"

package/templates/.claude/skills/secretary-routing/SKILL.md

@@ -2,6 +2,7 @@
 name: secretary-routing
 description: Routes agent management tasks to the correct manager agent. Use when user requests agent creation, updates, audits, git operations, or verification.
 user-invocable: false
+context: fork
 ---
 
 # Secretary Routing Skill

package/templates/.claude/skills/worker-reviewer-pipeline/SKILL.md

@@ -91,9 +91,9 @@ TeamCreate("review-pipeline")
   Shared TaskList for tracking issues
 ```
 
-When Agent Teams is NOT available, falls back to sequential Task tool calls:
+When Agent Teams is NOT available, falls back to sequential Agent tool calls:
 ```
-Task(worker) → result → Task(reviewer) → verdict → Task(worker) → ...
+Agent(worker) → result → Agent(reviewer) → verdict → Agent(worker) → ...
 ```
 
 ## Display Format