diff --git a/.claude/skills/team-lifecycle-v2/SKILL.md b/.claude/skills/team-lifecycle-v2/SKILL.md
index 1c24cc7f..caa3b2ad 100644
--- a/.claude/skills/team-lifecycle-v2/SKILL.md
+++ b/.claude/skills/team-lifecycle-v2/SKILL.md
@@ -34,8 +34,8 @@ Optimized lifecycle: specification → implementation → testing → review. Bu
                                         | fe-qa  |
                                         +--------+
 
-  Subagent (callable by analyst, writer, reviewer):
-    [discuss-subagent]  - multi-perspective critique (3 rounds)
+  ⚠️ ARCHITECTURAL CONSTRAINT: Workers CANNOT spawn subagents.
+  Workers use CLI tools for complex analysis (see "CLI Tool Usage in Workers" section).
 ```
 
 ## Role Router
diff --git a/.claude/skills/team-lifecycle-v2/role-specs/executor.md b/.claude/skills/team-lifecycle-v2/role-specs/executor.md
index 2bde3195..03a2d274 100644
--- a/.claude/skills/team-lifecycle-v2/role-specs/executor.md
+++ b/.claude/skills/team-lifecycle-v2/role-specs/executor.md
@@ -3,7 +3,6 @@ role: executor
 prefix: IMPL
 inner_loop: true
 discuss_rounds: []
-subagents: []
 message_types:
   success: impl_complete
   progress: impl_progress
diff --git a/.claude/skills/team-lifecycle-v2/role-specs/fe-developer.md b/.claude/skills/team-lifecycle-v2/role-specs/fe-developer.md
index 6bc6811d..162095c1 100644
--- a/.claude/skills/team-lifecycle-v2/role-specs/fe-developer.md
+++ b/.claude/skills/team-lifecycle-v2/role-specs/fe-developer.md
@@ -3,7 +3,6 @@ role: fe-developer
 prefix: DEV-FE
 inner_loop: false
 discuss_rounds: []
-subagents: []
 message_types:
   success: dev_fe_complete
   progress: dev_fe_progress
diff --git a/.claude/skills/team-lifecycle-v2/role-specs/fe-qa.md b/.claude/skills/team-lifecycle-v2/role-specs/fe-qa.md
index b28d1c8a..94103f20 100644
--- a/.claude/skills/team-lifecycle-v2/role-specs/fe-qa.md
+++ b/.claude/skills/team-lifecycle-v2/role-specs/fe-qa.md
@@ -3,7 +3,6 @@ role: fe-qa
 prefix: QA-FE
 inner_loop: false
 discuss_rounds: []
-subagents: []
 message_types:
   success: qa_fe_passed
   result: qa_fe_result
diff --git a/.claude/skills/team-lifecycle-v2/role-specs/planner.md b/.claude/skills/team-lifecycle-v2/role-specs/planner.md
index cfbe4d05..9ad9a84c 100644
--- a/.claude/skills/team-lifecycle-v2/role-specs/planner.md
+++ b/.claude/skills/team-lifecycle-v2/role-specs/planner.md
@@ -3,7 +3,6 @@ role: planner
 prefix: PLAN
 inner_loop: true
 discuss_rounds: []
-subagents: []
 message_types:
   success: plan_ready
   revision: plan_revision
diff --git a/.claude/skills/team-lifecycle-v2/role-specs/tester.md b/.claude/skills/team-lifecycle-v2/role-specs/tester.md
index 3b60e434..073e2847 100644
--- a/.claude/skills/team-lifecycle-v2/role-specs/tester.md
+++ b/.claude/skills/team-lifecycle-v2/role-specs/tester.md
@@ -3,7 +3,6 @@ role: tester
 prefix: TEST
 inner_loop: false
 discuss_rounds: []
-subagents: []
 message_types:
   success: test_result
   fix: fix_required
diff --git a/.claude/skills/team-lifecycle-v2/specs/team-config.json b/.claude/skills/team-lifecycle-v2/specs/team-config.json
index 75f85ff4..36e87335 100644
--- a/.claude/skills/team-lifecycle-v2/specs/team-config.json
+++ b/.claude/skills/team-lifecycle-v2/specs/team-config.json
@@ -6,12 +6,18 @@
   "architecture": "team-worker agent + role-specs",
   "role_structure": "role-specs/{name}.md (Phase 2-4 only)",
   "worker_agent": "team-worker",
-
   "roles": {
     "coordinator": {
       "task_prefix": null,
       "responsibility": "Pipeline orchestration, requirement clarification, task chain creation",
-      "message_types": ["plan_approved", "plan_revision", "task_unblocked", "fix_required", "error", "shutdown"]
+      "message_types": [
+        "plan_approved",
+        "plan_revision",
+        "task_unblocked",
+        "fix_required",
+        "error",
+        "shutdown"
+      ]
     },
     "analyst": {
       "task_prefix": "RESEARCH",
@@ -19,45 +25,76 @@
       "responsibility": "Seed analysis, codebase exploration, context gathering + discuss",
       "inline_discuss": "DISCUSS-001",
       "inner_loop": false,
-      "message_types": ["research_ready", "research_progress", "error"]
+      "message_types": [
+        "research_ready",
+        "research_progress",
+        "error"
+      ]
     },
     "writer": {
       "task_prefix": "DRAFT",
       "role_spec": "role-specs/writer.md",
       "responsibility": "Product Brief / PRD / Architecture / Epics generation. Discuss at PRD only, self-validate others",
       "inner_loop": true,
-      "inline_discuss": ["DISCUSS-002"],
-      "message_types": ["draft_ready", "draft_revision", "error"]
+      "inline_discuss": [
+        "DISCUSS-002"
+      ],
+      "message_types": [
+        "draft_ready",
+        "draft_revision",
+        "error"
+      ]
     },
     "planner": {
       "task_prefix": "PLAN",
       "role_spec": "role-specs/planner.md",
       "responsibility": "Multi-angle exploration and structured implementation planning",
       "inner_loop": true,
-      "message_types": ["plan_ready", "plan_revision", "error"]
+      "message_types": [
+        "plan_ready",
+        "plan_revision",
+        "error"
+      ]
     },
     "executor": {
       "task_prefix": "IMPL",
       "role_spec": "role-specs/executor.md",
       "responsibility": "Code implementation following approved plans",
       "inner_loop": true,
-      "message_types": ["impl_complete", "impl_progress", "error"]
+      "message_types": [
+        "impl_complete",
+        "impl_progress",
+        "error"
+      ]
     },
     "tester": {
       "task_prefix": "TEST",
       "role_spec": "role-specs/tester.md",
       "responsibility": "Adaptive test-fix cycles, progressive testing",
       "inner_loop": false,
-      "message_types": ["test_result", "fix_required", "error"]
+      "message_types": [
+        "test_result",
+        "fix_required",
+        "error"
+      ]
     },
     "reviewer": {
       "task_prefix": "REVIEW",
-      "additional_prefixes": ["QUALITY", "IMPROVE"],
+      "additional_prefixes": [
+        "QUALITY",
+        "IMPROVE"
+      ],
       "role_spec": "role-specs/reviewer.md",
       "responsibility": "Code review (REVIEW-*) + Spec quality (QUALITY-*) + Improvement (IMPROVE-*) + final discuss",
       "inline_discuss": "DISCUSS-003",
       "inner_loop": false,
-      "message_types": ["review_result", "quality_result", "quality_recheck", "fix_required", "error"]
+      "message_types": [
+        "review_result",
+        "quality_result",
+        "quality_recheck",
+        "fix_required",
+        "error"
+      ]
     },
     "architect": {
       "task_prefix": "ARCH",
@@ -65,7 +102,11 @@
       "responsibility": "Architecture assessment, tech feasibility. Consulting role",
       "role_type": "consulting",
       "inner_loop": false,
-      "message_types": ["arch_ready", "arch_concern", "error"]
+      "message_types": [
+        "arch_ready",
+        "arch_concern",
+        "error"
+      ]
     },
     "fe-developer": {
       "task_prefix": "DEV-FE",
@@ -73,7 +114,11 @@
       "responsibility": "Frontend implementation",
       "role_type": "frontend-pipeline",
       "inner_loop": false,
-      "message_types": ["dev_fe_complete", "dev_fe_progress", "error"]
+      "message_types": [
+        "dev_fe_complete",
+        "dev_fe_progress",
+        "error"
+      ]
     },
     "fe-qa": {
       "task_prefix": "QA-FE",
@@ -81,19 +126,14 @@
       "responsibility": "5-dimension frontend review, GC loop",
       "role_type": "frontend-pipeline",
       "inner_loop": false,
-      "message_types": ["qa_fe_passed", "qa_fe_result", "fix_required", "error"]
+      "message_types": [
+        "qa_fe_passed",
+        "qa_fe_result",
+        "fix_required",
+        "error"
+      ]
     }
   },
-
-  "subagents": {
-    "discuss": {
-      "spec": "subagents/discuss-subagent.md",
-      "type": "cli-discuss-agent",
-      "callable_by": ["analyst", "writer", "reviewer"],
-      "purpose": "Multi-perspective critique (3 rounds: direction, requirements, final gate)"
-    }
-  },
-
   "checkpoint_commands": {
     "revise": {
       "handler": "handleRevise",
@@ -116,17 +156,32 @@
       "cascade": false
     }
   },
-
   "pipelines": {
     "spec-only": {
       "description": "Spec pipeline: research(+D1) -> brief -> prd(+D2) -> arch -> epics -> quality(+D3)",
-      "task_chain": ["RESEARCH-001", "DRAFT-001", "DRAFT-002", "DRAFT-003", "DRAFT-004", "QUALITY-001"],
-      "discuss_points": ["RESEARCH-001", "DRAFT-002", "QUALITY-001"],
+      "task_chain": [
+        "RESEARCH-001",
+        "DRAFT-001",
+        "DRAFT-002",
+        "DRAFT-003",
+        "DRAFT-004",
+        "QUALITY-001"
+      ],
+      "discuss_points": [
+        "RESEARCH-001",
+        "DRAFT-002",
+        "QUALITY-001"
+      ],
       "beats": 6
     },
     "impl-only": {
       "description": "Implementation pipeline: plan -> implement -> test + review",
-      "task_chain": ["PLAN-001", "IMPL-001", "TEST-001", "REVIEW-001"],
+      "task_chain": [
+        "PLAN-001",
+        "IMPL-001",
+        "TEST-001",
+        "REVIEW-001"
+      ],
       "beats": 3
     },
     "full-lifecycle": {
@@ -136,28 +191,50 @@
     },
     "fe-only": {
       "description": "Frontend-only: plan -> dev -> qa",
-      "task_chain": ["PLAN-001", "DEV-FE-001", "QA-FE-001"],
-      "gc_loop": { "max_rounds": 2, "convergence": "score >= 8 && critical === 0" }
+      "task_chain": [
+        "PLAN-001",
+        "DEV-FE-001",
+        "QA-FE-001"
+      ],
+      "gc_loop": {
+        "max_rounds": 2,
+        "convergence": "score >= 8 && critical === 0"
+      }
     },
     "fullstack": {
       "description": "Fullstack: plan -> backend + frontend parallel -> test + qa -> review",
-      "task_chain": ["PLAN-001", "IMPL-001||DEV-FE-001", "TEST-001||QA-FE-001", "REVIEW-001"]
+      "task_chain": [
+        "PLAN-001",
+        "IMPL-001||DEV-FE-001",
+        "TEST-001||QA-FE-001",
+        "REVIEW-001"
+      ]
     },
     "full-lifecycle-fe": {
       "description": "Full lifecycle with frontend",
       "task_chain": "spec-only + fullstack (PLAN-001 blockedBy QUALITY-001)"
     }
   },
-
   "frontend_detection": {
-    "keywords": ["component", "page", "UI", "frontend", "CSS", "HTML", "React", "Vue", "Tailwind", "Svelte", "Next.js"],
+    "keywords": [
+      "component",
+      "page",
+      "UI",
+      "frontend",
+      "CSS",
+      "HTML",
+      "React",
+      "Vue",
+      "Tailwind",
+      "Svelte",
+      "Next.js"
+    ],
     "routing_rules": {
       "frontend_only": "All tasks match frontend keywords",
       "fullstack": "Mix of frontend and backend tasks",
       "backend_only": "No frontend keywords (default impl-only)"
     }
   },
-
   "session_dirs": {
     "base": ".workflow/.team/TLS-{slug}-{YYYY-MM-DD}/",
     "spec": "spec/",
diff --git a/.claude/skills/team-lifecycle-v3/SKILL.md b/.claude/skills/team-lifecycle-v3/SKILL.md
index d83f60d9..cccd0887 100644
--- a/.claude/skills/team-lifecycle-v3/SKILL.md
+++ b/.claude/skills/team-lifecycle-v3/SKILL.md
@@ -78,12 +78,25 @@ Workers use CLI tools for complex analysis:
 
 ### Coordinator-Only Utility Members
 
+**⚠️ COORDINATOR ONLY**: Utility members can only be spawned by Coordinator.
+Workers CANNOT call Agent() to spawn utility members.
+
 Coordinator can spawn utility members for team-level orchestration:
 
-| Utility Member | Purpose | When |
-|----------------|---------|------|
-| explorer | Parallel multi-angle exploration | High complexity analysis |
-| discussant | Aggregate multi-CLI critique | Critical decision points |
+| Utility Member | Purpose | When | Callable By |
+|----------------|---------|------|-------------|
+| explorer | Parallel multi-angle exploration | High complexity analysis | **Coordinator only** |
+| discussant | Aggregate multi-CLI critique | Critical decision points | **Coordinator only** |
+
+### Worker Alternatives
+
+Workers needing similar capabilities must use CLI tools:
+
+| Capability | CLI Command | Example |
+|------------|-------------|---------|
+| Codebase exploration | `ccw cli --tool gemini --mode analysis` | Explore architecture patterns |
+| Multi-perspective critique | Parallel CLI calls | Security + performance + quality reviews |
+| Document generation | `ccw cli --tool gemini --mode write` | Generate PRD from research |
 
 ### Dynamic Role Injection
 
diff --git a/docs/agents/builtin.md b/docs/agents/builtin.md
index 18cdc269..fd8615a3 100644
--- a/docs/agents/builtin.md
+++ b/docs/agents/builtin.md
@@ -396,10 +396,10 @@ Task({
 
 **Capabilities**:
 - Orchestrates parallel CLAUDE.md updates
-- Uses ccw tool exec update_module_claude
+- Uses MCP tools directly for module documentation
 - Processes every module path
 
-**Tools**: `Bash`, `ccw tool exec`, `TodoWrite`
+**Tools**: `Bash`, `mcp__ccw-tools__*`, `TodoWrite`
 
 ```javascript
 Task({
@@ -511,7 +511,7 @@ Specialized agents use: `mcp__ace-tool__search_context`, `mcp__ccw-tools__smart_
 
 ### CLI Tools
 
-CLI-capable agents use: `ccw cli`, `ccw tool exec`
+CLI-capable agents use: `ccw cli`, MCP tools directly
 
 ### Workflow Tools
 
diff --git a/docs/features/codexlens.md b/docs/features/codexlens.md
index 26cbb87e..93ef9c4c 100644
--- a/docs/features/codexlens.md
+++ b/docs/features/codexlens.md
@@ -41,21 +41,17 @@
 
 ## Usage
 
-### Indexing Project
+### Via MCP Tool (Recommended)
 
-```bash
-ccw index
-ccw index --watch  # Continuous indexing
+```typescript
+// ACE semantic search
+mcp__ace-tool__search_context({
+  project_root_path: "/path/to/project",
+  query: "authentication logic"
+})
 ```
 
-### Searching
-
-```bash
-ccw search "authentication logic"
-ccw search "where is user validation" --top 10
-```
-
-### Via MCP Tool
+> **Note**: The CLI commands `ccw index` and `ccw search` are deprecated. Use MCP tools directly for semantic search.
 
 ```typescript
 // ACE semantic search
diff --git a/docs/guide/ch01-what-is-claude-dms3.md b/docs/guide/ch01-what-is-claude-dms3.md
index 4a83eb01..b7fba8c6 100644
--- a/docs/guide/ch01-what-is-claude-dms3.md
+++ b/docs/guide/ch01-what-is-claude-dms3.md
@@ -37,13 +37,13 @@
 
 | Concept | Description | Location/Command |
 |---------|-------------|------------------|
-| **CodexLens** | Semantic code indexing and search engine | `ccw search` |
+| **CodexLens** | Semantic code indexing and search engine | `mcp__ace-tool__search_context(project_root_path="...", query="...")` |
 | **CCW** | Unified CLI tool invocation framework | `ccw cli` |
-| **Memory** | Cross-session knowledge persistence | `ccw memory` |
+| **Memory** | Cross-session knowledge persistence | `mcp__ccw-tools__core_memory(operation="list")` |
 | **Spec** | Project specification and constraint system | `.workflow/specs/` |
 | **Hook** | Auto-triggered context injection scripts | `.claude/hooks/` |
 | **Agent** | Specialized AI subprocess for specific roles | `.claude/agents/` |
-| **Skill** | Reusable AI capability modules | `.claude/skills/` |
+| **Skill** | Reusable AI capability modules | `Skill(skill="<name>")` |
 | **Workflow** | Multi-phase development orchestration | `/workflow:*` |
 
 ---
diff --git a/docs/guide/ch02-getting-started.md b/docs/guide/ch02-getting-started.md
index 76102b68..0ec14b4b 100644
--- a/docs/guide/ch02-getting-started.md
+++ b/docs/guide/ch02-getting-started.md
@@ -164,16 +164,16 @@ Multi-perspective brainstorming for diverse viewpoints:
 
 ### 2.5.1 View Project Memory
 
-```bash
-ccw memory list
+```typescript
+mcp__ccw-tools__core_memory(operation="list")
 ```
 
 Display all project memories, including learnings, decisions, conventions, and issues.
 
 ### 2.5.2 Search Related Memory
 
-```bash
-ccw memory search "authentication"
+```typescript
+mcp__ccw-tools__core_memory(operation="search", query="authentication")
 ```
 
 Semantic search for memories related to "authentication".
@@ -192,20 +192,16 @@ Interactively capture important knowledge points from the current session.
 
 ### 2.6.1 Semantic Search
 
-Use CodexLens search in VS Code:
+Use ACE semantic search via MCP tool:
 
-```bash
-# Search via CodexLens MCP endpoint
-ccw search "user login logic"
+```typescript
+mcp__ace-tool__search_context(
+  project_root_path="/path/to/project",
+  query="user login logic"
+)
 ```
 
-### 2.6.2 Call Chain Tracing
-
-Search function definitions and all call locations:
-
-```bash
-ccw search --trace "authenticateUser"
-```
+> **Note**: The CLI commands `ccw search` and `ccw memory` are deprecated. Use MCP tools directly.
 
 ---
 
@@ -297,7 +293,7 @@ npm install
 | `/workflow-plan` | Planning workflow |
 | `/brainstorm` | Brainstorming |
 | `/review-code` | Code review |
-| `ccw memory list` | View Memory |
+| `mcp__ccw-tools__core_memory(operation="list")` | View Memory |
 | `ccw cli -p "..."` | CLI invocation |
 
 ---
diff --git a/docs/guide/ch03-core-concepts.md b/docs/guide/ch03-core-concepts.md
index df8fb8bd..c84acfca 100644
--- a/docs/guide/ch03-core-concepts.md
+++ b/docs/guide/ch03-core-concepts.md
@@ -185,7 +185,7 @@ graph LR
 | **Prompt** | Codex prompt templates | `.codex/prompts/` |
 | **Workflow** | Team collaboration process | `/workflow:*` |
 | **Session** | Session context management | `/workflow:session:*` |
-| **Memory** | Cross-session knowledge persistence | `ccw memory` |
+| **Memory** | Cross-session knowledge persistence | `mcp__ccw-tools__core_memory(operation="list")` |
 | **Spec** | Project specification constraints | `.workflow/specs/` |
 | **CodexLens** | Semantic code indexing | `.codex-lens/` |
 | **CCW** | CLI invocation framework | `ccw` directory |
diff --git a/docs/guide/ch05-advanced-tips.md b/docs/guide/ch05-advanced-tips.md
index f677dee8..5a4286c1 100644
--- a/docs/guide/ch05-advanced-tips.md
+++ b/docs/guide/ch05-advanced-tips.md
@@ -192,7 +192,7 @@ Configure in `.claude/hooks.json`:
     {
       "name": "save-decisions",
       "description": "Save important decisions",
-      "command": "ccw memory import \"{content}\""
+      "command": "mcp__ccw-tools__core_memory(operation=\"import\", text=\"{content}\")"
     }
   ]
 }
diff --git a/docs/guide/ch06-best-practices.md b/docs/guide/ch06-best-practices.md
index 85f07e1f..1dc09ce3 100644
--- a/docs/guide/ch06-best-practices.md
+++ b/docs/guide/ch06-best-practices.md
@@ -301,12 +301,14 @@ graph LR
 
 ### Memory Maintenance
 
-| Operation | Command |
+| Operation | MCP Tool |
 | --- | --- |
-| List memories | `ccw memory list` |
-| Search memories | `ccw memory search "..."` |
-| Import memory | `ccw memory import "..."` |
-| Export memory | `ccw memory export <id>` |
+| List memories | `mcp__ccw-tools__core_memory(operation="list")` |
+| Search memories | `mcp__ccw-tools__core_memory(operation="search", query="...")` |
+| Import memory | `mcp__ccw-tools__core_memory(operation="import", text="...")` |
+| Export memory | `mcp__ccw-tools__core_memory(operation="export", id="...")` |
+
+> **Note**: The CLI commands `ccw memory *` are deprecated. Use MCP tools directly.
 
 ---
 
diff --git a/docs/guide/workflows.md b/docs/guide/workflows.md
index 8965980a..b3d0d9b4 100644
--- a/docs/guide/workflows.md
+++ b/docs/guide/workflows.md
@@ -50,8 +50,8 @@ The workflow executes automatically:
 
 After a checkpoint, resume the workflow:
 
-```bash
-ccw workflow resume
+```javascript
+Skill(skill="workflow-execute", args="--resume")
 ```
 
 ## Workflow Tasks
@@ -163,21 +163,21 @@ Always review checkpoints:
 
 Provide feedback during workflow:
 
-```bash
-# Add feedback during review
-ccw workflow feedback --task REVIEW-001 --message "Tests need more edge cases"
+```javascript
+// Add feedback during review
+Skill(skill="workflow-execute", args="--feedback --task REVIEW-001")
 ```
 
 ### 4. Monitor Progress
 
 Track workflow status:
 
-```bash
-# Check workflow status
-ccw workflow status
+```javascript
+// Check workflow status
+Skill(skill="workflow-execute", args="--status")
 
-# View task details
-ccw workflow task IMPL-001
+// View task details
+Skill(skill="workflow-execute", args="--task IMPL-001")
 ```
 
 ## Troubleshooting
@@ -186,21 +186,21 @@ ccw workflow task IMPL-001
 
 If a workflow stalls:
 
-```bash
-# Check for blocked tasks
-ccw workflow status --blocked
+```javascript
+// Check for blocked tasks
+Skill(skill="workflow-execute", args="--status --blocked")
 
-# Reset stuck tasks
-ccw workflow reset --task IMPL-001
+// Reset stuck tasks
+Skill(skill="workflow-execute", args="--reset --task IMPL-001")
 ```
 
 ### Failed Tasks
 
 Retry failed tasks:
 
-```bash
-# Retry with new prompt
-ccw workflow retry --task IMPL-001 --prompt "Fix the TypeScript errors"
+```javascript
+// Retry with new prompt
+Skill(skill="workflow-execute", args="--retry --task IMPL-001")
 ```
 
 ::: info See Also
diff --git a/docs/skills/custom.md b/docs/skills/custom.md
index 28fdeaba..71a697bf 100644
--- a/docs/skills/custom.md
+++ b/docs/skills/custom.md
@@ -257,13 +257,15 @@ describe('my-skill', () => {
 
 ## Debugging
 
-Enable debug logging:
+Enable debug logging and invoke skill directly:
 
 ```bash
 export CCW_DEBUG=1
-ccw skill run my-skill "test input"
+Skill(skill="my-skill", args="test input")
 ```
 
+> **Note**: The CLI command `ccw skill run` is deprecated. Use `Skill()` tool directly.
+
 ::: info See Also
 - [Core Skills](./core-skills.md) - Built-in skill reference
 - [Skills Library](./index.md) - All available skills
diff --git a/docs/skills/index.md b/docs/skills/index.md
index 674fcf51..852de1f4 100644
--- a/docs/skills/index.md
+++ b/docs/skills/index.md
@@ -246,8 +246,8 @@ Skill(skill="team-roadmap-dev", args="--epic ts-migration")
 **Scenario**: Generate API documentation
 
 ```bash
-# Step 1: Capture existing patterns
-ccw memory:capture "API patterns: REST, versioning, error handling"
+# Step 1: Capture existing patterns via memory skill
+Skill(skill="memory-capture", args="API patterns: REST, versioning, error handling")
 
 # Step 2: Generate docs
 ccw software-manual --output ./docs/api/
diff --git a/docs/workflows/examples.md b/docs/workflows/examples.md
index 5bb72464..6b70a3c9 100644
--- a/docs/workflows/examples.md
+++ b/docs/workflows/examples.md
@@ -51,9 +51,9 @@ This is an output from `workflow-lite-planex` command.
 
 ### Execution Steps
 
-```shell
-# Execute the plan
-ccw workflow-execute --session WFS-001
+```javascript
+// Execute the plan
+Skill(skill="workflow-execute", args="--session WFS-001")
 ```
 
 ---
@@ -388,7 +388,7 @@ To use these examples in your own projects:
 1. **Copy the structure** that matches your needs
 2. **Modify fields** to fit your requirements
 3. **Remove sensitive information**
-4. **Test the output** with `ccw workflow-execute`
+4. **Test the output** with `Skill(skill="workflow-execute")`
 
 ::: tip
 These examples are generated by CCW workflow tools. Run relevant commands to generate similar outputs for your projects.
diff --git a/docs/zh/skills/custom.md b/docs/zh/skills/custom.md
index 32a209d8..4e16e4e1 100644
--- a/docs/zh/skills/custom.md
+++ b/docs/zh/skills/custom.md
@@ -261,7 +261,7 @@ describe('my-skill', () => {
 
 ```bash
 export CCW_DEBUG=1
-ccw skill run my-skill "test input"
+Skill(skill="my-skill", args="\"test input\"")
 ```
 
 ::: info 参见
diff --git a/docs/zh/skills/index.md b/docs/zh/skills/index.md
index 83c34012..5644954f 100644
--- a/docs/zh/skills/index.md
+++ b/docs/zh/skills/index.md
@@ -219,11 +219,11 @@ Skill(skill="review-code")
 ccw cli -p "Analyze /api/users endpoint for N+1 query issues" --tool gemini --mode analysis
 
 # 步骤 2：深度调查（如需要）
-ccw workflow:debug-with-file
+Skill(skill="workflow:debug-with-file")
 # 创建假设、植入代码、分析日志
 
 # 步骤 3：应用修复
-ccw workflow-execute --task "Fix N+1 query in user endpoint"
+Skill(skill="workflow-execute", args="--task \"Fix N+1 query in user endpoint\"")
 ```
 
 ### 示例 3：代码迁移
@@ -247,10 +247,10 @@ Skill(skill="team-roadmap-dev", args="--epic ts-migration")
 
 ```bash
 # 步骤 1：捕获现有模式
-ccw memory:capture "API patterns: REST, versioning, error handling"
+Skill(skill="memory-capture", args="\"API patterns: REST, versioning, error handling\"")
 
 # 步骤 2：生成文档
-ccw software-manual --output ./docs/api/
+Skill(skill="software-manual", args="--output ./docs/api/")
 ```
 
 ### 示例 5：代码审查流水线
@@ -259,10 +259,10 @@ ccw software-manual --output ./docs/api/
 
 ```bash
 # 全面审查
-ccw review-code --focus security,performance
+Skill(skill="review-code", args="--focus security,performance")
 
 # 或使用循环自动修复
-ccw review-cycle --max-iterations 3
+Skill(skill="review-cycle", args="--max-iterations 3")
 ```
 
 ### 最佳效果提示