oh-my-customcode 0.18.4 → 0.19.0

package/dist/cli/index.js

@@ -14083,9 +14083,6 @@ async function installComponent(targetDir, component, options) {
     return false;
   }
   const templatePath = getComponentPath(component);
-  if (!templatePath) {
-    return false;
-  }
   const destPath = join4(targetDir, templatePath);
   const destExists = await fileExists(destPath);
   if (destExists && !options.force && !options.backup) {

package/dist/index.js

@@ -980,9 +980,6 @@ async function installComponent(targetDir, component, options) {
     return false;
   }
   const templatePath = getComponentPath(component);
-  if (!templatePath) {
-    return false;
-  }
   const destPath = join3(targetDir, templatePath);
   const destExists = await fileExists(destPath);
   if (destExists && !options.force && !options.backup) {

package/package.json

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

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

@@ -72,9 +72,25 @@
           {
             "type": "command",
             "command": "bash .claude/hooks/scripts/git-delegation-guard.sh"
+          },
+          {
+            "type": "command",
+            "command": "bash .claude/hooks/scripts/agent-teams-advisor.sh"
+          }
+        ],
+        "description": "HUD statusline + R010 git delegation guard + R018 Agent Teams advisor on Task spawn"
+      }
+    ],
+    "SessionStart": [
+      {
+        "matcher": "*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash .claude/hooks/scripts/session-env-check.sh"
           }
         ],
-        "description": "HUD statusline + R010 git delegation guard on Task spawn"
+        "description": "Check codex CLI and Agent Teams availability at session start"
       }
     ],
     "PostToolUse": [
@@ -155,10 +171,10 @@
         "hooks": [
           {
             "type": "command",
-            "command": "#!/bin/bash\ninput=$(cat)\n\nif git rev-parse --git-dir > /dev/null 2>&1; then\n  modified_files=$(git diff --name-only HEAD 2>/dev/null | grep -E '\\.(ts|tsx|js|jsx)$' || true)\n  \n  if [ -n \"$modified_files\" ]; then\n    has_console=false\n    while IFS= read -r file; do\n      if [ -f \"$file\" ]; then\n        if grep -q \"console\\.log\" \"$file\" 2>/dev/null; then\n          echo \"[Hook] WARNING: console.log found in $file\" >&2\n          has_console=true\n        fi\n      fi\n    done <<< \"$modified_files\"\n    \n    if [ \"$has_console\" = true ]; then\n      echo \"[Hook] Remove console.log statements before committing\" >&2\n    fi\n  fi\nfi\n\necho \"$input\""
+            "command": "bash .claude/hooks/scripts/stop-console-audit.sh"
           }
         ],
-        "description": "Final audit for console.log in modified files before session ends"
+        "description": "Final console.log audit and session diagnostics before session ends"
       }
     ]
   }

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

@@ -0,0 +1,41 @@
+#!/bin/bash
+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
+# Protocol: stdin JSON -> process -> stdout pass-through, exit 0 always (advisory only)
+
+input=$(cat)
+
+# Extract task info from input
+agent_type=$(echo "$input" | jq -r '.tool_input.subagent_type // "unknown"')
+prompt_preview=$(echo "$input" | jq -r '.tool_input.description // ""' | head -c 60)
+
+# Session-scoped counter using parent PID as session identifier
+COUNTER_FILE="/tmp/.claude-task-count-${PPID}"
+
+# Read and increment counter
+if [ -f "$COUNTER_FILE" ]; then
+  COUNT=$(cat "$COUNTER_FILE")
+  COUNT=$((COUNT + 1))
+else
+  COUNT=1
+fi
+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 "  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 "-----------------------------------------------------------" >&2
+fi
+
+# Always pass through -- advisory only, never blocks
+echo "$input"
+exit 0

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

@@ -0,0 +1,36 @@
+#!/bin/bash
+# R010 git-delegation-guard hook
+# Warns when git operations are delegated to a non-mgr-gitnerd agent via Task tool.
+# WARN only - does NOT block (exit 0, passes input through).
+
+input=$(cat)
+
+agent_type=$(echo "$input" | jq -r '.tool_input.subagent_type // ""')
+prompt=$(echo "$input" | jq -r '.tool_input.prompt // ""')
+
+# Only warn when the delegated agent is NOT mgr-gitnerd
+if [ "$agent_type" != "mgr-gitnerd" ]; then
+  git_keywords=(
+    "git commit"
+    "git push"
+    "git revert"
+    "git merge"
+    "git rebase"
+    "git checkout"
+    "git branch"
+    "git reset"
+    "git cherry-pick"
+    "git tag"
+  )
+
+  for keyword in "${git_keywords[@]}"; do
+    if echo "$prompt" | grep -qi "$keyword"; then
+      echo "[Hook] WARNING: R010 violation detected - git operation ('$keyword') delegated to '$agent_type' instead of 'mgr-gitnerd'" >&2
+      echo "[Hook] Per R010, all git operations (commit/push/branch/merge/etc.) MUST be delegated to mgr-gitnerd" >&2
+      break
+    fi
+  done
+fi
+
+# Always pass through - this hook is advisory only
+echo "$input"

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

@@ -0,0 +1,44 @@
+#!/bin/bash
+set -euo pipefail
+
+# Session Environment Check Hook
+# Trigger: SessionStart
+# Purpose: Check availability of codex CLI and Agent Teams, report via stderr
+# Protocol: stdin JSON -> stdout pass-through, exit 0 always
+
+input=$(cat)
+
+echo "" >&2
+echo "--- [Session Environment Check] ---" >&2
+
+# Check codex CLI availability
+CODEX_STATUS="unavailable"
+if command -v codex >/dev/null 2>&1; then
+  if [ -n "${OPENAI_API_KEY:-}" ]; then
+    CODEX_STATUS="available (authenticated)"
+  else
+    CODEX_STATUS="installed but OPENAI_API_KEY not set"
+  fi
+fi
+
+# Check Agent Teams availability
+AGENT_TEAMS_STATUS="disabled"
+if [ "${CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS:-0}" = "1" ]; then
+  AGENT_TEAMS_STATUS="enabled"
+fi
+
+# Write status to file for other hooks to reference
+STATUS_FILE="/tmp/.claude-env-status-${PPID}"
+cat > "$STATUS_FILE" << ENVEOF
+codex=${CODEX_STATUS}
+agent_teams=${AGENT_TEAMS_STATUS}
+ENVEOF
+
+# Report to stderr (visible in conversation)
+echo "  codex CLI: ${CODEX_STATUS}" >&2
+echo "  Agent Teams: ${AGENT_TEAMS_STATUS}" >&2
+echo "------------------------------------" >&2
+
+# Pass through
+echo "$input"
+exit 0

package/templates/.claude/hooks/scripts/stop-console-audit.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+# Stop hook: Final audit for console.log and session diagnostics
+# Always exits 0 (never blocks session termination)
+# Ref: https://github.com/baekenough/oh-my-customcode/issues/206
+
+set -euo pipefail
+
+input=$(cat)
+
+# --- Session diagnostics ---
+# Output session status for debugging stop evaluator false positives
+echo "[Stop] Session termination audit starting..." >&2
+
+# Check for background task output files (helps diagnose evaluator false positives)
+bg_task_files=$(find /tmp -maxdepth 1 -name "claude-*.output" 2>/dev/null | wc -l | tr -d ' ')
+if [ "$bg_task_files" -gt 0 ]; then
+  echo "[Stop] Background task output files found: ${bg_task_files} (informational only — these are normal)" >&2
+fi
+
+# --- Console.log audit ---
+if git rev-parse --git-dir > /dev/null 2>&1; then
+  modified_files=$(git diff --name-only HEAD 2>/dev/null | grep -E '\.(ts|tsx|js|jsx)$' || true)
+
+  if [ -n "$modified_files" ]; then
+    has_console=false
+    while IFS= read -r file; do
+      if [ -f "$file" ]; then
+        if grep -q "console\.log" "$file" 2>/dev/null; then
+          echo "[Stop] WARNING: console.log found in $file" >&2
+          has_console=true
+        fi
+      fi
+    done <<< "$modified_files"
+
+    if [ "$has_console" = true ]; then
+      echo "[Stop] Remove console.log statements before committing" >&2
+    fi
+  fi
+fi
+
+echo "[Stop] Audit complete. Session safe to terminate." >&2
+
+# CRITICAL: Always pass through input and exit 0
+# This hook MUST NEVER block session termination
+echo "$input"
+exit 0

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

@@ -35,16 +35,16 @@ BEFORE using Task tool for 2+ agent tasks, this check is **ENFORCED**:
 ║     YES → MUST check criteria #2-#5                              ║
 ║     NO  → Proceed with Task tool                                ║
 ║                                                                   ║
-║  2. Do 2+ agents need to coordinate? → Agent Teams              ║
-║  3. Is there a review/fix/iterate cycle? → Agent Teams          ║
-║  4. Do agents need shared state? → Agent Teams                   ║
-║  5. Is research requiring synthesis? → Agent Teams              ║
+║  2. Will 3+ agents be involved?                                  ║
+║     YES → MUST use Agent Teams                                   ║
+║     NO  → Check #3                                               ║
 ║                                                                   ║
-║  If YES to #1 AND any of #2-#5:                                  ║
-║  → MUST use Agent Teams                                          ║
-║  → Using Task tool instead is a VIOLATION                        ║
+║  3. Is there a review → fix → re-review cycle?                  ║
+║     YES → MUST use Agent Teams                                   ║
+║     NO  → Proceed with Task tool                                 ║
 ║                                                                   ║
-║  Exception: Cost-sensitive batch ops with no inter-agent need    ║
+║  Simple rule: 3+ agents OR review cycle → Agent Teams            ║
+║  Everything else → Task tool                                     ║
 ╚══════════════════════════════════════════════════════════════════╝
 ```
 
@@ -156,12 +156,14 @@ TeamCreate → TaskCreate → Task(spawn members) → SendMessage(coordinate)
 
 ## Fallback
 
-When Agent Teams unavailable: use Task tool with R009/R010 rules. Both approaches produce results; Agent Teams adds coordination richness.
+When Agent Teams unavailable: use Task tool with R009/R010 rules.
+When Agent Teams available: actively prefer it for qualifying tasks. This is not optional.
 
 ## Cost Awareness
 
-Agent Teams uses more tokens (full context per member + message passing). Use Task tool when:
-- Task takes < 3 minutes
-- No inter-agent communication needed
-- Simple independent subtasks only
-- Cost is the primary concern
+Agent Teams actively preferred for qualifying collaborative tasks. Use Task tool only when:
+- 1-2 agents with no inter-dependency
+- No review → fix cycles
+- Simple independent subtasks
+
+Do NOT avoid Agent Teams solely for cost reasons when criteria are met.

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

@@ -15,12 +15,30 @@ Independent (MUST parallelize):
 
 Examples: creating multiple agents, reviewing multiple files, batch operations on different resources.
 
+## Agent Teams Gate (R018 Integration)
+
+Before spawning parallel Task instances, evaluate Agent Teams eligibility:
+
+```
+2+ independent tasks detected
+  ↓
+Is Agent Teams available? (env or tools check)
+  ├─ NO → Proceed with Task tool (standard R009)
+  └─ YES → Check eligibility:
+       ├─ 3+ agents needed? → Agent Teams (MUST)
+       ├─ Review → fix cycle? → Agent Teams (MUST)
+       └─ Neither → Task tool (standard R009)
+```
+
+This gate is MANDATORY when Agent Teams is enabled. Skipping it is a violation of both R009 and R018.
+
 ## Self-Check
 
 Before writing/editing multiple files:
 1. Are files independent? → YES: spawn parallel Task 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
 
 ### Common Violations to Avoid
 

package/templates/.claude/skills/codex-exec/SKILL.md

@@ -134,7 +134,7 @@ codex-exec requires the Codex CLI binary to be installed and authenticated. The
 
 If either check fails, this skill cannot be used. Fall back to Claude agents for the task.
 
-> **Note**: `disable-model-invocation: true` is set intentionally. This skill must be explicitly invoked via `/codex-exec` or delegated by the orchestrator. It is NOT auto-invoked by the model.
+> **Note**: This skill is invoked via `/codex-exec` command, delegated by the orchestrator, or suggested by routing skills when codex is available. The intent-detection system can trigger it for research (xhigh) and code generation (hybrid) workflows.
 
 ## Agent Teams Integration
 
@@ -154,7 +154,7 @@ Orchestrator delegates generation task
 
 ## Research Workflow
 
-When the orchestrator detects a research/information gathering request:
+When the orchestrator or intent-detection detects a research/information gathering request (routing_rule in agent-triggers.yaml):
 
 1. **Check Codex availability**: Verify `codex` binary and `OPENAI_API_KEY`
 2. **If available**: Execute with xhigh reasoning effort for thorough research
@@ -175,3 +175,30 @@ When the orchestrator detects a research/information gathering request:
 | medium | General tasks | Balanced | Standard |
 | high | Complex analysis | Slower | Deep |
 | xhigh | Research & investigation | Slowest | Maximum |
+
+## Code Generation Workflow
+
+When routing skills detect a code generation task and codex is available:
+
+1. **Check availability**: Verify codex CLI via `/tmp/.claude-env-status-*`
+2. **If available + new file creation**: Suggest hybrid workflow
+3. **Hybrid pattern**:
+   - codex-exec generates initial code (fast, broad generation)
+   - Claude expert reviews for quality, patterns, best practices
+   - Iterate if needed
+
+### Suitable Tasks
+- New file scaffolding
+- Boilerplate generation
+- Test stub creation
+- Documentation generation
+
+### Unsuitable Tasks
+- Modifying existing code (Claude expert better at understanding context)
+- Architecture decisions (requires reasoning, not generation)
+- Bug fixes (requires deep code understanding)
+
+### Code Generation Command Pattern
+```
+/codex-exec "Generate {description} following {framework} best practices" --effort high --full-auto
+```

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

@@ -45,6 +45,33 @@ Routes data engineering tasks to appropriate DE expert agents. This skill contai
 | Kafka configs, `*.properties` (Kafka), `streams/*.java` | de-kafka-expert |
 | Snowflake SQL, warehouse DDL | de-snowflake-expert |
 
+## Routing Decision (Priority Order)
+
+Before routing via Task 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 |
+| Multi-tool pipeline design (3+ tools) | Agent Teams |
+| Cross-tool data quality analysis | Agent Teams |
+| Quick DAG/model validation | Task Tool |
+
+### Step 2: Codex-Exec Hybrid (Code Generation)
+For **new pipeline code**, **DAG scaffolding**, or **SQL model generation**:
+
+1. Check `/tmp/.claude-env-status-*` for codex availability
+2. If codex available → suggest hybrid workflow for code generation
+3. If codex unavailable → use DE expert directly
+
+**Suitable**: New DAG files, dbt model scaffolding, SQL template generation
+**Unsuitable**: Existing pipeline modification, architecture decisions, data quality analysis
+
+### Step 3: Expert Selection
+Route to appropriate DE expert based on tool/framework detection.
+
 ## Command Routing
 
 ```
@@ -242,19 +269,6 @@ Delegate to mgr-creator with context:
 - Unfamiliar data formats or connectors
 - Data tool detected in project but no specialist agent
 
-## Agent Teams Awareness
-
-Before routing via Task tool, check if Agent Teams is available (`CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1` or TeamCreate/SendMessage tools present).
-
-**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.
-
-| Scenario | Preferred |
-|----------|-----------|
-| Single-tool DE task | Task Tool |
-| Multi-tool pipeline design (3+ tools) | Agent Teams |
-| Cross-tool data quality analysis | Agent Teams |
-| Quick DAG/model validation | Task Tool |
-
 ## Usage
 
 This skill is NOT user-invocable. It should be automatically triggered when the main conversation detects data engineering intent.

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

@@ -73,6 +73,36 @@ user-invocable: false
 | Code review/implementation | sonnet |
 | Quick validation/search | haiku |
 
+## Routing Decision (Priority Order)
+
+Before selecting an expert agent, 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-language review | Task Tool |
+| Multi-language code review (3+) | Agent Teams |
+| Code review + fix cycle | Agent Teams |
+| Cross-layer debugging (FE + BE + DB) | Agent Teams |
+| Simple file search/validation | Task Tool |
+
+### Step 2: Codex-Exec Hybrid (Implementation Tasks)
+For **new file creation**, **boilerplate**, or **test code generation**:
+
+1. Check `/tmp/.claude-env-status-*` for codex availability
+2. If codex available → suggest hybrid workflow:
+   - codex-exec generates initial code (strength: fast generation)
+   - Claude expert reviews and refines (strength: reasoning, quality)
+3. If codex unavailable → use Claude expert directly
+
+**Suitable**: New file creation, boilerplate, scaffolding, test code
+**Unsuitable**: Existing code modification, architecture decisions, bug fixes
+
+### Step 3: Expert Agent Selection
+Route to appropriate language/framework expert based on file extension and keyword mapping.
+
 ## Routing Rules
 
 Multi-language: detect all languages, route to parallel experts (max 4). Single-language: route to matching expert. Cross-layer (frontend + backend): multiple experts in parallel.
@@ -100,18 +130,4 @@ Delegate to mgr-creator with context:
 - New framework keyword (e.g., "Flutter 앱 리뷰해줘", "Rails API 만들어줘")
 - Language detected but no specialist exists
 
-## Agent Teams Awareness
-
-Before routing via Task tool, check if Agent Teams is available (`CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1` or TeamCreate/SendMessage tools present).
-
-**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.
-
-| Scenario | Preferred |
-|----------|-----------|
-| Single-language review | Task Tool |
-| Multi-language code review (3+) | Agent Teams |
-| Code review + fix cycle | Agent Teams |
-| Cross-layer debugging (FE + BE + DB) | Agent Teams |
-| Simple file search/validation | Task Tool |
-
 Not user-invocable. Auto-triggered on development intent.

package/templates/.claude/skills/intent-detection/patterns/agent-triggers.yaml

@@ -322,7 +322,36 @@ agents:
       - gather
     base_confidence: 50
     action_weight: 30
-    routing_note: "Uses codex-exec skill with xhigh effort when available, falls back to WebFetch/WebSearch"
+    routing_rule: "MUST use codex-exec --effort xhigh when codex available, fallback to WebFetch/WebSearch"
+
+  # ---------------------------------------------------------------------------
+  # Code Generation (hybrid workflow, skill-based)
+  # ---------------------------------------------------------------------------
+  code-generation-workflow:
+    keywords:
+      korean:
+        - 구현
+        - 만들어
+        - 생성해
+        - 작성해
+        - 스캐폴딩
+        - 보일러플레이트
+      english:
+        - implement
+        - create
+        - generate
+        - scaffold
+        - boilerplate
+        - "write code"
+    file_patterns: []
+    supported_actions:
+      - implement
+      - create
+      - generate
+      - scaffold
+    base_confidence: 30
+    action_weight: 25
+    routing_rule: "Suggest codex-exec hybrid when codex available and task is new file creation"
 
   # Managers (continued)
   mgr-gitnerd:
@@ -374,4 +403,3 @@ agents:
     file_patterns: []
     supported_actions: [manage, create, coordinate]
     base_confidence: 40
-

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

@@ -18,6 +18,19 @@ Coordinates QA team activities by routing tasks to qa-planner, qa-writer, and qa
 | qa-writer | Documentation | Test cases, test reports, templates |
 | qa-engineer | Execution | Test results, defect reports, coverage reports |
 
+## Routing Decision (Priority Order)
+
+Before routing via Task 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.
+
+| Scenario | Preferred |
+|----------|-----------|
+| Single QA phase (plan/write/execute) | Task Tool |
+| Full QA cycle (plan + write + execute + report) | Agent Teams |
+| Quality analysis (parallel strategy + results) | Agent Teams |
+| Quick test validation | Task Tool |
+
 ## Command Routing
 
 ```
@@ -287,19 +300,6 @@ Delegate to mgr-creator with context:
 - Specialized QA methodologies (e.g., "뮤테이션 테스트 전략 만들어줘")
 - Performance/security testing tools not covered by existing agents
 
-## Agent Teams Awareness
-
-Before routing via Task tool, check if Agent Teams is available (`CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1` or TeamCreate/SendMessage tools present).
-
-**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.
-
-| Scenario | Preferred |
-|----------|-----------|
-| Single QA phase (plan/write/execute) | Task Tool |
-| Full QA cycle (plan + write + execute + report) | Agent Teams |
-| Quality analysis (parallel strategy + results) | Agent Teams |
-| Quick test validation | Task Tool |
-
 ## Usage
 
 This skill is NOT user-invocable. It should be automatically triggered when the main conversation detects QA intent.

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

@@ -23,6 +23,19 @@ Routes agent management tasks to the appropriate manager agent. This skill conta
 | sys-memory-keeper | Memory operations | "save memory", "recall", "memory search" |
 | sys-naggy | TODO management | "todo", "track tasks", "task list" |
 
+## Routing Decision (Priority Order)
+
+Before routing via Task 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.
+
+| Scenario | Preferred |
+|----------|-----------|
+| Single manager task | Task Tool |
+| Batch agent creation (3+) | Agent Teams |
+| Multi-round verification (sauron) | Task Tool |
+| Agent audit + fix cycle | Agent Teams |
+
 ## Command Routing
 
 ```
@@ -76,19 +89,6 @@ When command requires multiple independent operations:
 | sys-memory-keeper | sonnet | Memory operations, search |
 | sys-naggy | haiku | Simple TODO tracking |
 
-## Agent Teams Awareness
-
-Before routing via Task tool, check if Agent Teams is available (`CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1` or TeamCreate/SendMessage tools present).
-
-**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.
-
-| Scenario | Preferred |
-|----------|-----------|
-| Single manager task | Task Tool |
-| Batch agent creation (3+) | Agent Teams |
-| Multi-round verification (sauron) | Task Tool |
-| Agent audit + fix cycle | Agent Teams |
-
 ## No Match Fallback
 
 When no manager agent matches the request but the task is clearly management-related:

package/templates/.claude/skills/structured-dev-cycle/SKILL.md

@@ -77,6 +77,15 @@ A PreToolUse hook in `.claude/hooks/hooks.json` checks this marker and blocks Wr
 └── Output: Implementation complete
 ```
 
+**Codex-Exec Hybrid Option**: When entering Stage 3:
+1. Check `/tmp/.claude-env-status-*` for codex CLI availability
+2. If available AND task involves new file creation:
+   - Suggest: `[Codex Hybrid Available] New file generation can use codex-exec for faster scaffolding. Orchestrator may delegate initial code generation to codex-exec, then have Claude expert review.`
+3. If unavailable → proceed with standard implementation via Claude experts
+
+Suitable for codex hybrid: new files, boilerplate, test stubs, scaffolding
+Not suitable: modifying existing code, architecture-dependent changes
+
 **Exit criteria**: All planned files created/modified, tests written.
 
 ### Stage 4: Verify Implementation
@@ -127,12 +136,14 @@ Stage 2 (Verify Plan) and Stage 4 (Verify Implementation) can invoke the `multi-
 The stage marker file (`/tmp/.claude-dev-stage`) is read by a PreToolUse hook that enforces tool restrictions. This provides a safety net beyond instruction-based compliance.
 
 ### With Agent Teams
-For complex tasks, each stage can be handled by specialized team members:
+For complex tasks, Agent Teams is **preferred** when available (R018):
 - Plan: architect agent
-- Verify: reviewer agent(s)
-- Implement: domain expert agent
+- Verify: reviewer agent(s) — multi-model-verification via Agent Teams
+- Implement: domain expert agent (+ codex-exec hybrid if available)
 - Compound: QA agent
 
+When Agent Teams is enabled AND task involves 3+ agents or review→fix cycles, using Agent Teams is MANDATORY per R018.
+
 ## When to Use
 
 | Task Complexity | Recommended Cycle |