diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
deleted file mode 100644
index 2a71dfb62..000000000
--- a/.claude-plugin/marketplace.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-  "name": "voltagent-subagents",
-  "owner": {
-    "name": "VoltAgent Community",
-    "url": "https://github.com/VoltAgent"
-  },
-  "metadata": {
-    "version": "1.0.4",
-    "description": "Curated collection of 158 specialized Claude Code subagents organized into 10 focused categories"
-  },
-  "plugins": [
-    {
-      "name": "voltagent-core-dev",
-      "source": "./categories/01-core-development",
-      "description": "Essential development subagents for everyday coding tasks - backend, frontend, fullstack, mobile, and API design",
-      "version": "1.0.2",
-      "category": "development",
-      "keywords": ["backend", "frontend", "fullstack", "mobile", "api", "microservices"]
-    },
-    {
-      "name": "voltagent-lang",
-      "source": "./categories/02-language-specialists",
-      "description": "Language-specific expert agents with deep framework knowledge - Python, TypeScript, Go, Rust, Java, and more",
-      "version": "1.0.4",
-      "category": "development",
-      "keywords": ["python", "typescript", "golang", "rust", "java", "react", "vue", "angular", "expo", "react-native", "node"]
-    },
-    {
-      "name": "voltagent-infra",
-      "source": "./categories/03-infrastructure",
-      "description": "DevOps, cloud, and deployment specialists - Kubernetes, Terraform, AWS, Azure, GCP, and SRE",
-      "version": "1.0.1",
-      "category": "infrastructure",
-      "keywords": ["devops", "docker", "kubernetes", "terraform", "aws", "azure", "gcp", "sre", "cloud"]
-    },
-    {
-      "name": "voltagent-qa-sec",
-      "source": "./categories/04-quality-security",
-      "description": "Testing, security, and code quality experts - code review, penetration testing, QA automation",
-      "version": "1.1.1",
-      "category": "quality",
-      "keywords": ["testing", "security", "code-review", "qa", "penetration-testing", "compliance", "ui-testing", "ux-testing"]
-    },
-    {
-      "name": "voltagent-data-ai",
-      "source": "./categories/05-data-ai",
-      "description": "Data engineering, ML, and AI specialists - data pipelines, machine learning, LLM architecture",
-      "version": "1.0.2",
-      "category": "data",
-      "keywords": ["data-engineering", "machine-learning", "ai", "llm", "mlops", "nlp"]
-    },
-    {
-      "name": "voltagent-dev-exp",
-      "source": "./categories/06-developer-experience",
-      "description": "Tooling and developer productivity experts - CLI tools, documentation, README generation, and DX optimization",
-      "version": "1.0.3",
-      "category": "tooling",
-      "keywords": ["developer-experience", "cli", "documentation", "readme", "tooling", "build", "dx"]
-    },
-    {
-      "name": "voltagent-domains",
-      "source": "./categories/07-specialized-domains",
-      "description": "Domain-specific technology experts - blockchain, fintech, gaming, IoT, payments, X/Twitter APIs",
-      "version": "1.0.4",
-      "category": "specialized",
-      "keywords": ["blockchain", "fintech", "gaming", "iot", "payments", "embedded", "twitter", "x-api"]
-    },
-    {
-      "name": "voltagent-biz",
-      "source": "./categories/08-business-product",
-      "description": "Product, legal, and business specialists - product strategy, licensing, project management, UX research",
-      "version": "1.0.4",
-      "category": "business",
-      "keywords": ["product-management", "business-analysis", "legal", "licensing", "ux", "scrum", "project-management"]
-    },
-    {
-      "name": "voltagent-meta",
-      "source": "./categories/09-meta-orchestration",
-      "description": "Agent coordination and meta-programming - multi-agent orchestration, workflow automation, and safe refactor governance. Works best with other voltagent plugins installed.",
-      "version": "1.0.4",
-      "category": "orchestration",
-      "keywords": ["multi-agent", "orchestration", "workflow", "coordination", "meta", "refactor", "codebase-governance"]
-    },
-    {
-      "name": "voltagent-research",
-      "source": "./categories/10-research-analysis",
-      "description": "Research, search, and analysis specialists - market research, competitive analysis, trend forecasting, and idea validation",
-      "version": "1.0.4",
-      "category": "research",
-      "keywords": ["research", "analysis", "market-research", "competitive-analysis", "trends", "idea-validation", "product-strategy"]
-    }
-  ]
-}
diff --git a/.claude/settings.local.json b/.claude/settings.local.json
deleted file mode 100644
index ef09ece79..000000000
--- a/.claude/settings.local.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(for:*)",
-      "Bash(do grep -l \"## Communication Protocol\" \"$file\")",
-      "Bash(done)",
-      "Bash(python3:*)",
-      "Bash(git status:*)"
-    ],
-    "deny": [],
-    "ask": []
-  }
-}
diff --git a/.github/workflows/enforce-plugin-version-bump.yml b/.github/workflows/enforce-plugin-version-bump.yml
index 3203fc269..3b6146868 100644
--- a/.github/workflows/enforce-plugin-version-bump.yml
+++ b/.github/workflows/enforce-plugin-version-bump.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
     paths:
       - "categories/**"
-      - ".claude-plugin/marketplace.json"
+      - ".zcode-plugin/marketplace.json"
   workflow_dispatch:
 
 jobs:
@@ -35,7 +35,7 @@ jobs:
           CHANGED_FILES="$(git diff --name-only "${BASE_SHA}"...HEAD)"
           FAIL=0
 
-          for plugin_json in categories/*/.claude-plugin/plugin.json; do
+          for plugin_json in categories/*/.zcode-plugin/plugin.json; do
             category_dir="$(dirname "$(dirname "${plugin_json}")")"
 
             if echo "${CHANGED_FILES}" | grep -Eq "^${category_dir}/.*\.md$"; then
@@ -51,7 +51,7 @@ jobs:
             fi
           done
 
-          for plugin_json in categories/*/.claude-plugin/plugin.json; do
+          for plugin_json in categories/*/.zcode-plugin/plugin.json; do
             plugin_name="$(sed -n 's/.*"name":[[:space:]]*"\([^"]*\)".*/\1/p' "${plugin_json}" | head -n1)"
             category_version="$(sed -n 's/.*"version":[[:space:]]*"\([^"]*\)".*/\1/p' "${plugin_json}" | head -n1)"
 
@@ -64,14 +64,14 @@ jobs:
                   exit
                 }
                 in_plugin && $0 ~ "}" { in_plugin = 0 }
-              ' .claude-plugin/marketplace.json
+              ' .zcode-plugin/marketplace.json
             )"
 
             if [ -z "${marketplace_version}" ]; then
-              echo "::error file=.claude-plugin/marketplace.json::Could not find plugin ${plugin_name} in marketplace manifest."
+              echo "::error file=.zcode-plugin/marketplace.json::Could not find plugin ${plugin_name} in marketplace manifest."
               FAIL=1
             elif [ "${marketplace_version}" != "${category_version}" ]; then
-              echo "::error file=.claude-plugin/marketplace.json::Version mismatch for ${plugin_name}: marketplace=${marketplace_version}, category=${category_version}."
+              echo "::error file=.zcode-plugin/marketplace.json::Version mismatch for ${plugin_name}: marketplace=${marketplace_version}, category=${category_version}."
               FAIL=1
             fi
           done
diff --git a/.gitignore b/.gitignore
index c300be0fe..b9a4c1e34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,6 @@ dist/
 build/
 *.egg-info/
 
-# Claude Code
-.claude/
-.claude_history
\ No newline at end of file
+# ZCode local settings
+.zcode/config.json
+.zcode_history
diff --git a/.zcode-plugin/marketplace.json b/.zcode-plugin/marketplace.json
new file mode 100644
index 000000000..b754a7571
--- /dev/null
+++ b/.zcode-plugin/marketplace.json
@@ -0,0 +1,179 @@
+{
+  "name": "zcode-subagents",
+  "owner": {
+    "name": "VoltAgent Community",
+    "url": "https://github.com/VoltAgent"
+  },
+  "metadata": {
+    "version": "1.0.5",
+    "description": "Curated collection of 158 specialized ZCode subagents organized into 10 focused categories"
+  },
+  "plugins": [
+    {
+      "name": "zcode-core-dev",
+      "source": "./categories/01-core-development",
+      "description": "Essential development subagents for everyday coding tasks - backend, frontend, fullstack, mobile, and API design",
+      "version": "1.0.3",
+      "category": "development",
+      "keywords": [
+        "backend",
+        "frontend",
+        "fullstack",
+        "mobile",
+        "api",
+        "microservices"
+      ]
+    },
+    {
+      "name": "zcode-lang",
+      "source": "./categories/02-language-specialists",
+      "description": "Language-specific expert agents with deep framework knowledge - Python, TypeScript, Go, Rust, Java, and more",
+      "version": "1.0.5",
+      "category": "development",
+      "keywords": [
+        "python",
+        "typescript",
+        "golang",
+        "rust",
+        "java",
+        "react",
+        "vue",
+        "angular",
+        "expo",
+        "react-native",
+        "node"
+      ]
+    },
+    {
+      "name": "zcode-infra",
+      "source": "./categories/03-infrastructure",
+      "description": "DevOps, cloud, and deployment specialists - Kubernetes, Terraform, AWS, Azure, GCP, and SRE",
+      "version": "1.0.2",
+      "category": "infrastructure",
+      "keywords": [
+        "devops",
+        "docker",
+        "kubernetes",
+        "terraform",
+        "aws",
+        "azure",
+        "gcp",
+        "sre",
+        "cloud"
+      ]
+    },
+    {
+      "name": "zcode-qa-sec",
+      "source": "./categories/04-quality-security",
+      "description": "Testing, security, and code quality experts - code review, penetration testing, QA automation",
+      "version": "1.1.2",
+      "category": "quality",
+      "keywords": [
+        "testing",
+        "security",
+        "code-review",
+        "qa",
+        "penetration-testing",
+        "compliance",
+        "ui-testing",
+        "ux-testing"
+      ]
+    },
+    {
+      "name": "zcode-data-ai",
+      "source": "./categories/05-data-ai",
+      "description": "Data engineering, ML, and AI specialists - data pipelines, machine learning, LLM architecture",
+      "version": "1.0.3",
+      "category": "data",
+      "keywords": [
+        "data-engineering",
+        "machine-learning",
+        "ai",
+        "llm",
+        "mlops",
+        "nlp"
+      ]
+    },
+    {
+      "name": "zcode-dev-exp",
+      "source": "./categories/06-developer-experience",
+      "description": "Tooling and developer productivity experts - CLI tools, documentation, README generation, and DX optimization",
+      "version": "1.0.4",
+      "category": "tooling",
+      "keywords": [
+        "developer-experience",
+        "cli",
+        "documentation",
+        "readme",
+        "tooling",
+        "build",
+        "dx"
+      ]
+    },
+    {
+      "name": "zcode-domains",
+      "source": "./categories/07-specialized-domains",
+      "description": "Domain-specific technology experts - blockchain, fintech, gaming, IoT, payments, X/Twitter APIs",
+      "version": "1.0.5",
+      "category": "specialized",
+      "keywords": [
+        "blockchain",
+        "fintech",
+        "gaming",
+        "iot",
+        "payments",
+        "embedded",
+        "twitter",
+        "x-api"
+      ]
+    },
+    {
+      "name": "zcode-biz",
+      "source": "./categories/08-business-product",
+      "description": "Product, legal, and business specialists - product strategy, licensing, project management, UX research",
+      "version": "1.0.5",
+      "category": "business",
+      "keywords": [
+        "product-management",
+        "business-analysis",
+        "legal",
+        "licensing",
+        "ux",
+        "scrum",
+        "project-management"
+      ]
+    },
+    {
+      "name": "zcode-meta",
+      "source": "./categories/09-meta-orchestration",
+      "description": "Agent coordination and meta-programming - multi-agent orchestration, workflow automation, and safe refactor governance. Works best with other zcode plugins installed.",
+      "version": "1.0.5",
+      "category": "orchestration",
+      "keywords": [
+        "multi-agent",
+        "orchestration",
+        "workflow",
+        "coordination",
+        "meta",
+        "refactor",
+        "codebase-governance"
+      ]
+    },
+    {
+      "name": "zcode-research",
+      "source": "./categories/10-research-analysis",
+      "description": "Research, search, and analysis specialists - market research, competitive analysis, trend forecasting, and idea validation",
+      "version": "1.0.5",
+      "category": "research",
+      "keywords": [
+        "research",
+        "analysis",
+        "market-research",
+        "competitive-analysis",
+        "trends",
+        "idea-validation",
+        "product-strategy"
+      ]
+    }
+  ]
+}
diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 000000000..a77e73e6e
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,129 @@
+# AGENTS.md
+
+This file provides guidance to AI coding assistants (ZCode and OpenCode) when working with code in this repository.
+
+## Project Overview
+
+This is a curated collection of 158+ subagent definitions - specialized AI assistants for specific development tasks. Subagents are markdown files with YAML frontmatter that both **ZCode** and **OpenCode** can load and use.
+
+- **ZCode** stores subagents in `~/.zcode/agents/` (global) or `.zcode/agents/` (local).
+- **OpenCode** stores subagents in `~/.config/opencode/agents/` (global) or `.opencode/agents/` (project-level).
+
+> This repository is an adaptation of [VoltAgent/awesome-claude-code-subagents](https://github.com/VoltAgent/awesome-claude-code-subagents) supporting both ZCode and OpenCode. When editing, keep the dual-assistant frontmatter conventions described below.
+
+## Repository Structure
+
+```
+categories/
+  01-core-development/     # Backend, frontend, fullstack, mobile, etc.
+  02-language-specialists/ # Language/framework experts (TypeScript, Python, etc.)
+  03-infrastructure/       # DevOps, cloud, Kubernetes, etc.
+  04-quality-security/     # Testing, security auditing, code review
+  05-data-ai/              # ML, data engineering, AI specialists
+  06-developer-experience/ # Tooling, documentation, DX optimization
+  07-specialized-domains/  # Blockchain, IoT, fintech, gaming
+  08-business-product/     # Product management, business analysis
+  09-meta-orchestration/   # Multi-agent coordination
+  10-research-analysis/    # Research and analysis specialists
+.zcode-plugin/             # Marketplace manifest (root)
+  marketplace.json
+bin/
+  cli.js                   # Cross-platform CLI installer (ZCode & OpenCode)
+install-agents.sh          # Interactive bash installer
+```
+
+Each category directory also carries its own `.zcode-plugin/plugin.json` manifest that lists its agents; ZCode installs categories as plugins from these manifests.
+
+## Subagent File Format
+
+Each subagent follows this dual-compatible template:
+
+```yaml
+---
+name: agent-name
+description: When this agent should be invoked (used for auto-selection and delegation)
+mode: subagent
+tools: Read, Write, Edit, Bash, Glob, Grep  # Comma-separated tool permissions (ZCode)
+---
+
+You are a [role description]...
+
+[Agent-specific checklists, patterns, guidelines]
+
+## Communication Protocol
+[Inter-agent communication specs]
+
+## Development Workflow
+[Structured implementation phases]
+```
+
+### Frontmatter fields and Platform Support
+
+| Field | ZCode Support | OpenCode Support | Notes |
+|-------|---------------|------------------|-------|
+| `name` | **Required** | Supported | Identifier of the agent |
+| `description` | **Required** | **Required** | Specifies function and invocation criteria |
+| `mode` | Ignored | **Required** | Must be `subagent` so OpenCode registers it as a subagent (invocable via `@name`) |
+| `tools` | Comma-separated list | Converted by installer | ZCode uses comma-separated list; OpenCode installer maps this to `permission` block |
+| `permission` | Ignored | Supported | OpenCode granular permissions (`edit: deny`, `bash: deny`, etc.) |
+| `model` | Model ID | Model ID | Omit or use `inherit` to follow parent agent model |
+| `thoughtLevel` | Reasoning level | Passed to provider | e.g. `high` |
+| `color` | Preset color | Hex or theme name | Visual identity |
+| `maxTurns` / `steps` | Positive integer | Positive integer | Maximum iteration turns |
+
+### Tool Assignment by Role Type
+
+Both ZCode and OpenCode share equivalent core tools:
+
+| Tool (ZCode) | Tool (OpenCode) | Role Access |
+|--------------|-----------------|-------------|
+| `Read`, `Grep`, `Glob` | `read`, `grep`, `glob` | Read-only reviewers, auditors |
+| `Read`, `Grep`, `Glob`, `WebFetch`, `WebSearch` | `read`, `grep`, `glob`, `webfetch`, `websearch` | Research analysts |
+| `Read`, `Write`, `Edit`, `Bash`, `Glob`, `Grep` | `read`, `write`, `edit`, `bash`, `glob`, `grep` | Code writers, developers |
+| `Read`, `Write`, `Edit`, `Glob`, `Grep`, `WebFetch`, `WebSearch` | `read`, `write`, `edit`, `glob`, `grep`, `webfetch`, `websearch` | Technical writers, documentation |
+
+## Subagent Storage Locations
+
+| Assistant | Scope | Path |
+|-----------|-------|------|
+| **ZCode** | User (global) | `~/.zcode/agents/` |
+| **ZCode** | Project (local)| `.zcode/agents/` |
+| **OpenCode** | User (global) | `~/.config/opencode/agents/` |
+| **OpenCode** | Project (local)| `.opencode/agents/` |
+
+## Installing Subagents
+
+Using the cross-platform zero-dependency CLI installer:
+
+```bash
+# OpenCode: Install starter pack globally
+npx github:a2mus/awesome-zcode-subagents --opencode --starter
+
+# OpenCode: Install into current project (.opencode/agents/)
+npx github:a2mus/awesome-zcode-subagents --opencode --project --all
+
+# ZCode: Install starter pack
+npx github:a2mus/awesome-zcode-subagents --starter
+
+# Install into BOTH ZCode and OpenCode simultaneously
+npx github:a2mus/awesome-zcode-subagents --both --starter
+```
+
+Using the bash installer:
+
+```bash
+# Interactive menu (prompts for platform: ZCode or OpenCode)
+./install-agents.sh
+
+# Target OpenCode directly
+./install-agents.sh --opencode
+```
+
+## Contributing a New Subagent
+
+When adding a new agent, update these files:
+
+1. **Main README.md** - Add link in appropriate category (alphabetical order)
+2. **Category README.md** - Add detailed description, update Quick Selection Guide table
+3. **Agent .md file** - Create definition with `mode: subagent` included in YAML frontmatter
+4. **Category plugin.json** - Bump the version in `categories/<category>/.zcode-plugin/plugin.json` and keep the matching version in `.zcode-plugin/marketplace.json` in sync (CI enforces this)
diff --git a/CLAUDE.md b/CLAUDE.md
deleted file mode 100644
index 8f61ca15e..000000000
--- a/CLAUDE.md
+++ /dev/null
@@ -1,71 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Project Overview
-
-This is a curated collection of Claude Code subagent definitions - specialized AI assistants for specific development tasks. Subagents are markdown files with YAML frontmatter that Claude Code can load and use.
-
-## Repository Structure
-
-```
-categories/
-  01-core-development/     # Backend, frontend, fullstack, mobile, etc.
-  02-language-specialists/ # Language/framework experts (TypeScript, Python, etc.)
-  03-infrastructure/       # DevOps, cloud, Kubernetes, etc.
-  04-quality-security/     # Testing, security auditing, code review
-  05-data-ai/              # ML, data engineering, AI specialists
-  06-developer-experience/ # Tooling, documentation, DX optimization
-  07-specialized-domains/  # Blockchain, IoT, fintech, gaming
-  08-business-product/     # Product management, business analysis
-  09-meta-orchestration/   # Multi-agent coordination
-  10-research-analysis/    # Research and analysis specialists
-```
-
-## Subagent File Format
-
-Each subagent follows this template:
-
-```yaml
----
-name: agent-name
-description: When this agent should be invoked (used by Claude Code for auto-selection)
-tools: Read, Write, Edit, Bash, Glob, Grep  # Comma-separated tool permissions
----
-
-You are a [role description]...
-
-[Agent-specific checklists, patterns, guidelines]
-
-## Communication Protocol
-[Inter-agent communication specs]
-
-## Development Workflow
-[Structured implementation phases]
-```
-
-### Tool Assignment by Role Type
-
-- **Read-only** (reviewers, auditors): `Read, Grep, Glob`
-- **Research** (analysts): `Read, Grep, Glob, WebFetch, WebSearch`
-- **Code writers** (developers): `Read, Write, Edit, Bash, Glob, Grep`
-- **Documentation**: `Read, Write, Edit, Glob, Grep, WebFetch, WebSearch`
-
-## Contributing a New Subagent
-
-When adding a new agent, update these files:
-
-1. **Main README.md** - Add link in appropriate category (alphabetical order)
-2. **Category README.md** - Add detailed description, update Quick Selection Guide table
-3. **Agent .md file** - Create the actual agent definition
-
-Format for main README: `- [**agent-name**](path/to/agent.md) - Brief description`
-
-## Subagent Storage in Claude Code
-
-| Type | Path | Scope |
-|------|------|-------|
-| Project | `.claude/agents/` | Current project only |
-| Global | `~/.claude/agents/` | All projects |
-
-Project subagents take precedence over global ones with the same name.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3769e451e..dc6af4505 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-# Contributing to Awesome Claude Subagents
+# Contributing to Awesome ZCode Subagents
 
 Thank you for your interest in contributing to this collection!
 
@@ -7,7 +7,7 @@ Thank you for your interest in contributing to this collection!
 ### Adding a New Subagent
 
 1. **Choose the right category** - Place your subagent in the most appropriate category folder
-2. **Test your subagent** - Ensure it works with Claude Code
+2. **Test your subagent** - Ensure it works with ZCode
 3. **Update required files** - When adding a new agent, you must update:
    - **Main README.md**: Add your agent to the appropriate category section in alphabetical order
    - **Category README.md**: Add detailed description, update Quick Selection Guide table, and if applicable, Common Technology Stacks
@@ -45,19 +45,19 @@ When you add a new agent, you MUST update these files:
 
 ### Versioning Requirements for Plugin Updates
 
-When you modify existing plugin content, you MUST bump versions so users can receive updates via `claude plugin update`.
+When you modify existing plugin content, you MUST bump versions so users can receive updates when they refresh the plugin in ZCode (Settings → Plugin Management).
 
 1. **Bump category plugin version**
-   - File: `categories/<category>/.claude-plugin/plugin.json`
+   - File: `categories/<category>/.zcode-plugin/plugin.json`
    - Increment `version` whenever any `*.md` file in that category changes.
 
 2. **Keep marketplace plugin versions in sync**
-   - File: `.claude-plugin/marketplace.json`
+   - File: `.zcode-plugin/marketplace.json`
    - Update the corresponding plugin entry version to match the category plugin version.
 
 ### Adding a Tool
 
-Tools are Claude Code skills that enhance the catalog experience (discovery, browsing, management).
+Tools are ZCode skills that enhance the catalog experience (discovery, browsing, management).
 
 1. **Create a folder** in `tools/` with your tool name
 2. **Include required files**:
@@ -94,7 +94,7 @@ Tools are Claude Code skills that enhance the catalog experience (discovery, bro
 - Subagents should be well-structured and tested
 - Include clear documentation
 - Provide practical examples
-- Ensure compatibility with Claude Code
+- Ensure compatibility with ZCode
 
 ## 📝 License
 
diff --git a/README.md b/README.md
index e51d91217..e83c11fed 100644
--- a/README.md
+++ b/README.md
@@ -1,118 +1,146 @@
-<a href="https://github.com/VoltAgent/voltagent">
-<img width="1500" height="500" alt="Group 32" src="https://github.com/user-attachments/assets/55b97c47-8506-4be0-b18f-f5384d063cbb" />
-</a>
-
-<br />
-<br/>
-
 <div align="center">
-    <strong>The awesome collection of 158+ Claude Code subagents across 10 categories.</strong>
-    <br />
-    <br />
-</div>
 
-<div align="center">
+# Awesome Subagents (ZCode & OpenCode)
+
+**The awesome collection of 158+ subagents across 10 categories for ZCode and OpenCode.**
 
 [![Awesome](https://awesome.re/badge.svg)](https://awesome.re)
 ![Subagent Count](https://img.shields.io/badge/subagents-158-blue?style=classic)
-[![Last Update](https://img.shields.io/github/last-commit/VoltAgent/awesome-claude-code-subagents?label=Last%20update&style=classic)](https://github.com/VoltAgent/awesome-claude-code-subagents)
-[![Discord](https://img.shields.io/discord/1361559153780195478.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://s.voltagent.dev/discord)
-
+![Platform](https://img.shields.io/badge/platform-ZCode%20%7C%20OpenCode-blueviolet?style=classic)
 
+</div>
 
+This repository serves as the definitive collection of subagents for **ZCode** and **OpenCode**, specialized AI assistants designed for specific development tasks.
 
-</div>
+> **Credits:** This collection is an adaptation of [VoltAgent/awesome-claude-code-subagents](https://github.com/VoltAgent/awesome-claude-code-subagents) supporting both **ZCode** and **OpenCode** — agent definitions feature dual compatibility (`mode: subagent`, inherit-by-default models, and platform-specific tool/permission mapping), and plugin manifests in `.zcode-plugin/`. All credit for the original 158 agent definitions goes to the VoltAgent community.
 
+## Installation
 
+### Option 1: NPX Zero-Install (Recommended for Windows, macOS, Linux)
 
-# Awesome Claude Code Subagents
+No git clone, curl, or bash required — run directly via `npx` in any terminal (**PowerShell**, **Command Prompt**, **Windows Terminal**, **macOS Terminal**, or **Linux**):
 
-This repository serves as the definitive collection of Claude Code subagents, specialized AI assistants designed for specific development tasks.
+```bash
+# Launch interactive installer menu (supports ZCode & OpenCode)
+npx github:a2mus/awesome-zcode-subagents
+```
 
-> **A note on contributions:** We don't accept PRs whose primary purpose is to promote a product, company, or personal project. Subagents must be genuinely useful to Claude Code users and stay vendor-neutral in their content. If you'd like to get your project in front of this community, you can [sponsor the repo](#sponsors) instead — that's the supported way to surface your work here.
+#### OpenCode Commands:
+```bash
+# Install recommended Starter Pack for OpenCode (global: ~/.config/opencode/agents/)
+npx github:a2mus/awesome-zcode-subagents --opencode --starter
 
-## Sponsors
+# Install into current project for OpenCode (.opencode/agents/)
+npx github:a2mus/awesome-zcode-subagents --opencode --project --starter
+npx github:a2mus/awesome-zcode-subagents --opencode --project --all
 
-|  |  |
-| :-: | :-- |
-| <a href="https://crawlbase.com/?utm_source=awesome-claude-code-subagents&utm_medium=sponsorship&utm_campaign=voltagent_2026q3&utm_content=readme_listing"><picture><source media="(prefers-color-scheme: dark)" srcset="https://cdn.voltagent.dev/awesome-repo/crawlbase-new/crawlbase-logo-dark-mode.svg"><img alt="Crawlbase" src="https://cdn.voltagent.dev/awesome-repo/crawlbase-new/crawlbase-logo-light-mode.svg" width="425"></picture></a> | [Crawlbase](https://crawlbase.com/?utm_source=awesome-claude-code-subagents&utm_medium=sponsorship&utm_campaign=voltagent_2026q3&utm_content=readme_listing) is web data infrastructure trusted by 70,000+ developers. Its Crawling API, MCP server, and integrations give AI agents live access to any webpage — with JavaScript rendering, proxy rotation, and anti-bot protection. |
-| <a href="https://serpapi.com/awesome-claude-code-subagents"><img alt="SerpApi" src="https://cdn.voltagent.dev/awesome-repo/serpapi/serpapi-logo.png" width="425"></a> | [SerpApi](https://serpapi.com/awesome-claude-code-subagents) is a Web Search API for your AI apps. Available in Markdown and JSON for any integration. |
+# Install specific agent(s) for OpenCode
+npx github:a2mus/awesome-zcode-subagents --opencode --agent code-reviewer,debugger
 
-<br />
+# List installed OpenCode subagents
+npx github:a2mus/awesome-zcode-subagents --opencode --installed
+```
 
-<a href="https://sponsors.voltagent.dev/#awesome-claude-code-subagents"><img src="https://img.shields.io/badge/📩_Become_a_Sponsor-Contact_Us-blue?style=for-the-badge&logoColor=white" alt="Become a Sponsor" /></a>
+#### ZCode Commands:
+```bash
+# Install recommended Starter Pack for ZCode (default: ~/.zcode/agents/)
+npx github:a2mus/awesome-zcode-subagents --starter
 
-## Installation
+# Install a specific category for ZCode
+npx github:a2mus/awesome-zcode-subagents -c 01-core-development
+npx github:a2mus/awesome-zcode-subagents -c 02-language-specialists
 
-### As Claude Code Plugin (Recommended)
+# Install all 158+ agents for ZCode
+npx github:a2mus/awesome-zcode-subagents --all
 
-```bash
-claude plugin marketplace add VoltAgent/awesome-claude-code-subagents
-claude plugin install <plugin-name>
+# List installed agents in your ZCode directory
+npx github:a2mus/awesome-zcode-subagents --installed
 ```
 
-Examples:
+#### Both Assistants Simultaneously:
 ```bash
-claude plugin install voltagent-lang    # Language specialists
-claude plugin install voltagent-infra   # Infrastructure & DevOps
+# Install starter pack into BOTH ZCode and OpenCode
+npx github:a2mus/awesome-zcode-subagents --both --starter
+
+# Install all 158+ agents into BOTH ZCode and OpenCode
+npx github:a2mus/awesome-zcode-subagents --both --all
 ```
 
-See [Categories](#-categories) below for all available plugins.
+---
 
-> **Note**: The `voltagent-meta` orchestration agents work best when other categories installed.
+### Option 2: As a ZCode Plugin (In-App Marketplace)
+
+ZCode can install these agents as plugins from its marketplace:
+
+1. Open ZCode **Settings → Plugin Management → Discover**
+2. Click **`+`** to add a marketplace and point it at this repository (`https://github.com/a2mus/awesome-zcode-subagents`)
+3. Install the category plugins you want, e.g. `zcode-lang` (language specialists) or `zcode-infra` (infrastructure & DevOps)
+
+See [Categories](#-categories) below for all available plugins.
 
-### Option 1: Manual Installation
+---
 
-1. Clone this repository
-2. Copy desired agent files to:
-   - `~/.claude/agents/` for global access
-   - `.claude/agents/` for project-specific use
-3. Customize based on your project requirements
+### Option 3: Manual Installation (Windows, macOS, Linux)
 
-### Option 2: Interactive Installer
+#### For OpenCode:
 ```bash
-git clone https://github.com/VoltAgent/awesome-claude-code-subagents.git
-cd awesome-claude-code-subagents
-./install-agents.sh
+# Global scope (all projects):
+mkdir -p ~/.config/opencode/agents
+cp categories/02-language-specialists/python-pro.md ~/.config/opencode/agents/
+
+# Local scope (current project):
+mkdir -p .opencode/agents
+cp categories/02-language-specialists/python-pro.md .opencode/agents/
 ```
-This interactive script lets you browse categories, select agents, and install/uninstall them with a single command.
 
-### Option 3: Standalone Installer (no clone required)
+#### For ZCode:
+- **Windows (PowerShell):**
+  ```powershell
+  New-Item -ItemType Directory -Force -Path "$HOME\.zcode\agents"
+  Copy-Item -Path "categories\02-language-specialists\python-pro.md" -Destination "$HOME\.zcode\agents\"
+  ```
+- **macOS / Linux:**
+  ```bash
+  mkdir -p ~/.zcode/agents
+  cp categories/02-language-specialists/python-pro.md ~/.zcode/agents/
+  ```
+
+---
+
+### Option 4: Interactive Bash Script
 ```bash
-curl -sO https://raw.githubusercontent.com/VoltAgent/awesome-claude-code-subagents/main/install-agents.sh
-chmod +x install-agents.sh
+git clone https://github.com/a2mus/awesome-zcode-subagents.git
+cd awesome-zcode-subagents
+
+# Interactive menu (choose ZCode or OpenCode)
 ./install-agents.sh
-```
-Downloads agents directly from GitHub without cloning the repository. Requires `curl`.
 
-### Option 4: Agent Installer (use Claude Code to install agents)
-```bash
-curl -s https://raw.githubusercontent.com/VoltAgent/awesome-claude-code-subagents/main/categories/09-meta-orchestration/agent-installer.md -o ~/.claude/agents/agent-installer.md
+# Target OpenCode directly
+./install-agents.sh --opencode
 ```
-Then in Claude Code: "Use the agent-installer to show me available categories" or "Find PHP agents and install php-pro globally".
-
-<br/>
 
-<div align="center">
+---
 
-<table>
-<tr>
-<td align="center" width="100%">
-<h4>👉 You can feature your product here and reach developers using AI coding agents like Claude Code, Codex, Gemini, and more.</h4>
-     
-<a href="https://sponsors.voltagent.dev/#awesome-claude-code-subagents"><img src="https://img.shields.io/badge/📩_Become_a_Sponsor-Contact_Us-blue?style=for-the-badge&logoColor=white" alt="Become a Sponsor" /></a>
+### Option 5: Standalone Curl Installer (no clone required)
+```bash
+curl -sO https://raw.githubusercontent.com/a2mus/awesome-zcode-subagents/main/install-agents.sh
+chmod +x install-agents.sh
+./install-agents.sh --opencode
+```
 
-</td>
-</tr>
-</table>
+---
 
-</div>
+### Option 6: Agent Installer (in-agent installation)
+Install the `agent-installer` subagent directly into your assistant:
+- For OpenCode: save to `~/.config/opencode/agents/agent-installer.md`
+- For ZCode: save to `~/.zcode/agents/agent-installer.md`
 
+Then ask: *"Use the agent-installer to find out which Python agents are available"* or *"Install code-reviewer"*.
 
 ## 📚 Categories
 
 ### [01. Core Development](categories/01-core-development/)
-**Plugin:** `voltagent-core-dev`
+**Plugin:** `zcode-core-dev`
 
 Essential development subagents for everyday coding tasks.
 
@@ -129,27 +157,10 @@ Essential development subagents for everyday coding tasks.
 - [**websocket-engineer**](categories/01-core-development/websocket-engineer.md) - Real-time communication specialist
 
 
-<br/>
-
-You ship products with AI, but every launch still dies quietly because nobody posts about it. [EveryFeed](https://everyfeed.ai/) plugs your AI assistant into a social workspace that drafts, schedules, and publishes across 35+ channels — no agency, no marketing hire.
-
-<a href="https://everyfeed.ai/">
-<img src="https://cdn.voltagent.dev/awesome-repo/everyfeed-social.png" alt="everyfeed"  /><br/>
-</a>
-
-<br/>
-<br/>
-
-Stop building from a blank page. [LaunchKit](https://launchkit.getdesign.md/) gives your AI coding assistant a complete, working product to start from — websites, startups, and web apps that are clickable on day one.
-
-<a href="https://launchkit.getdesign.md/">
-<img src="https://cdn.voltagent.dev/awesome-repo/new-launchkit.png" alt="launchkit"  /><br/>
-</a>
-
 <br/>
 
 ### [02. Language Specialists](categories/02-language-specialists/)
-**Plugin:** `voltagent-lang`
+**Plugin:** `zcode-lang`
 
 Language-specific experts with deep framework knowledge.
 - [**typescript-pro**](categories/02-language-specialists/typescript-pro.md) - TypeScript specialist
@@ -185,7 +196,7 @@ Language-specific experts with deep framework knowledge.
 
 
 ### [03. Infrastructure](categories/03-infrastructure/)
-**Plugin:** `voltagent-infra`
+**Plugin:** `zcode-infra`
 
 DevOps, cloud, and deployment specialists.
 
@@ -207,7 +218,7 @@ DevOps, cloud, and deployment specialists.
 - [**windows-infra-admin**](categories/03-infrastructure/windows-infra-admin.md) - Active Directory, DNS, DHCP, and GPO automation specialist
 
 ### [04. Quality & Security](categories/04-quality-security/)
-**Plugin:** `voltagent-qa-sec`
+**Plugin:** `zcode-qa-sec`
 
 Testing, security, and code quality experts.
 
@@ -230,7 +241,7 @@ Testing, security, and code quality experts.
 - [**ui-ux-tester**](categories/04-quality-security/ui-ux-tester.md) - Exhaustive documented-flow UI tester
 
 ### [05. Data & AI](categories/05-data-ai/)
-**Plugin:** `voltagent-data-ai`
+**Plugin:** `zcode-data-ai`
 
 Data engineering, ML, and AI specialists.
 
@@ -249,7 +260,7 @@ Data engineering, ML, and AI specialists.
 - [**reinforcement-learning-engineer**](categories/05-data-ai/reinforcement-learning-engineer.md) - Reinforcement learning and agent training expert
 
 ### [06. Developer Experience](categories/06-developer-experience/)
-**Plugin:** `voltagent-dev-exp`
+**Plugin:** `zcode-dev-exp`
 
 Tooling and developer productivity experts.
 
@@ -271,7 +282,7 @@ Tooling and developer productivity experts.
 - [**visual-asset-generator**](categories/06-developer-experience/visual-asset-generator.md) - Visual asset generation specialist using prompt-to-asset MCP across 30+ image models
 
 ### [07. Specialized Domains](categories/07-specialized-domains/)
-**Plugin:** `voltagent-domains`
+**Plugin:** `zcode-domains`
 
 Domain-specific technology experts.
 
@@ -293,7 +304,7 @@ Domain-specific technology experts.
 - [**x-api-integration**](categories/07-specialized-domains/x-api-integration.md) - X/Twitter API integration specialist
 
 ### [08. Business & Product](categories/08-business-product/)
-**Plugin:** `voltagent-biz`
+**Plugin:** `zcode-biz`
 
 Product management and business analysis.
 
@@ -316,7 +327,7 @@ Product management and business analysis.
 - [**content-quality-editor**](categories/08-business-product/content-quality-editor.md) - AI content quality specialist using unslop to strip AI writing patterns before publishing
 
 ### [09. Meta & Orchestration](categories/09-meta-orchestration/)
-**Plugin:** `voltagent-meta`
+**Plugin:** `zcode-meta`
 
 Agent coordination and meta-programming.
 
@@ -337,7 +348,7 @@ Agent coordination and meta-programming.
 - [**workflow-orchestrator**](categories/09-meta-orchestration/workflow-orchestrator.md) - Complex workflow automation
 
 ### [10. Research & Analysis](categories/10-research-analysis/)
-**Plugin:** `voltagent-research`
+**Plugin:** `zcode-research`
 
 Research, search, and analysis specialists.
 
@@ -355,7 +366,7 @@ Research, search, and analysis specialists.
 
 ## 🤖 Understanding Subagents
 
-Subagents are specialized AI assistants that enhance Claude Code's capabilities by providing task-specific expertise. They act as dedicated helpers that Claude Code can call upon when encountering particular types of work.
+Subagents are specialized AI assistants that enhance ZCode's capabilities by providing task-specific expertise. They act as dedicated helpers that ZCode can call upon when encountering particular types of work.
 
 ### What Makes Subagents Special?
 
@@ -380,44 +391,46 @@ You can configure each subagent with specific tool access rights, enabling fine-
 
 ### Getting Started with Subagents
 
-**1. Access the Subagent Manager**
-```bash
-/agents
-```
-
-**2. Create Your Subagent**
-- Choose between project-specific or global subagents
-- Let Claude generate an initial version, then refine it to your needs
-- Provide detailed descriptions of the subagent's purpose and activation triggers
-- Configure tool access (leave empty to inherit all available tools)
-- Customize the system prompt using the built-in editor (press `e`)
-
-**3. Deploy and Utilize**
-Your subagent becomes immediately available. Claude Code will automatically engage it when suitable, or you can explicitly request its help:
-```
-> Have the code-reviewer subagent analyze my latest commits
-```
+#### In ZCode:
+1. Drop agent `.md` files into `~/.zcode/agents/` (or use `npx github:a2mus/awesome-zcode-subagents --starter`).
+2. Restart your ZCode session.
+3. Subagents trigger automatically based on task descriptions, or invoke directly with `@<agent-name>`:
+   ```
+   > Have @code-reviewer analyze my latest commits
+   ```
+
+#### In OpenCode:
+1. Install agents to `~/.config/opencode/agents/` (global) or `.opencode/agents/` (current project) using:
+   ```bash
+   npx github:a2mus/awesome-zcode-subagents --opencode --starter
+   ```
+2. Start OpenCode in your project terminal: `opencode`.
+3. OpenCode automatically discovers custom subagents with `mode: subagent`.
+4. Invoke any subagent using `@` mention:
+   ```
+   > @python-pro refactor the data pipeline to use async iterators
+   ```
+5. Primary agents (`build`, `plan`) can also autonomously delegate subtasks to these agents!
 
 ### Subagent Storage Locations
 
-| Type | Path | Availability | Precedence |
-|------|------|--------------|------------|
-| Project Subagents | `.claude/agents/` | Current project only | Higher |
-| Global Subagents | `~/.claude/agents/` | All projects | Lower |
-
-Note: When naming conflicts occur, project-specific subagents override global ones.
-
+| Assistant | Scope | Path | Availability |
+|-----------|-------|------|--------------|
+| **OpenCode** | User (global) | `~/.config/opencode/agents/` | Available across all projects |
+| **OpenCode** | Project (local)| `.opencode/agents/` | Current repository only |
+| **ZCode** | User (global) | `~/.zcode/agents/` | Available across all projects |
+| **ZCode** | Project (local)| `.zcode/agents/` | Current repository only |
 
 ## 📖 Subagent Structure
 
-Each subagent follows a standardized template:
+Each subagent follows a dual-compatible template:
 
 ```yaml
 ---
 name: subagent-name
 description: When this agent should be invoked
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a [role description and expertise areas]...
@@ -431,23 +444,19 @@ Inter-agent communication specifications...
 Structured implementation phases...
 ```
 
-### Tool Assignment Philosophy
-
-### Smart Model Routing
+### Model Selection
 
-Each subagent includes a `model` field that automatically routes it to the right Claude model — balancing quality and cost:
+By default, subagents omit the `model` field and inherit whatever model your primary ZCode agent is currently using. You can pin a specific model id or tune reasoning per agent by editing its frontmatter:
 
-| Model | When It's Used | Examples |
-|-------|----------------|----------|
-| `opus` | Deep reasoning — architecture reviews, security audits, financial logic | `security-auditor`, `architect-reviewer`, `fintech-engineer` |
-| `sonnet` | Everyday coding — writing, debugging, refactoring | `python-pro`, `backend-developer`, `devops-engineer` |
-| `haiku` | Quick tasks — docs, search, dependency checks | `documentation-engineer`, `seo-specialist`, `build-engineer` |
-
-You can override any agent's model by editing the `model` field in its frontmatter. Set `model: inherit` to use whatever model your main conversation is using.
+| Frontmatter field | Effect | Good for |
+|-------------------|--------|----------|
+| *(omitted)* / `model: inherit` | Follows the primary agent's current model | Most agents — one model switch updates everything |
+| `model: <model-id>` | Pins the subagent to a specific model | Cost-sensitive or heavyweight agents |
+| `thoughtLevel: high` | Deeper reasoning (only with a pinned model) | Architecture reviews, security audits |
 
 ### Tool Assignment Philosophy
 
-Each subagent's `tools` field specifies Claude Code built-in tools, optimized for their role:
+Each subagent's `tools` field specifies ZCode built-in tools, optimized for their role:
 - **Read-only agents** (reviewers, auditors): `Read, Grep, Glob` - analyze without modifying
 - **Research agents** (analysts, researchers): `Read, Grep, Glob, WebFetch, WebSearch` - gather information
 - **Code writers** (developers, engineers): `Read, Write, Edit, Bash, Glob, Grep` - create and execute
@@ -458,7 +467,7 @@ Each agent has minimal necessary permissions. You can extend agents by adding MC
 ## 🧰 Tools
 
 ### [subagent-catalog](tools/subagent-catalog/)
-Claude Code skill for browsing and fetching subagents from this catalog.
+ZCode skill for browsing and fetching subagents from this catalog.
 
 | Command | Description |
 |---------|-------------|
@@ -469,7 +478,7 @@ Claude Code skill for browsing and fetching subagents from this catalog.
 
 **Installation:**
 ```bash
-cp -r tools/subagent-catalog ~/.claude/commands/
+cp -r tools/subagent-catalog ~/.zcode/commands/
 ```
 
 
@@ -483,7 +492,8 @@ We welcome contributions! See [CONTRIBUTING.md](CONTRIBUTING.md) for guidelines.
 - Report issues and bugs
 
 ## Contributor ♥️ Thanks
-![Contributors](https://contrib.rocks/image?repo=voltagent/awesome-claude-code-subagents&max=500&columns=20&anon=1)
+
+Thanks to everyone who has contributed subagents — originally the [VoltAgent community](https://github.com/VoltAgent/awesome-claude-code-subagents), and now ZCode users improving the definitions further.
 
 
 ## 📄 License
@@ -492,8 +502,6 @@ MIT License - see [LICENSE](LICENSE)
 
 This repository is a curated collection of subagent definitions contributed by both the maintainers and the community. All subagents are provided "as is" without warranty. We do not audit or guarantee the security or correctness of any subagent. Review before use, the maintainers accept no liability for any issues arising from their use.
 
-If you find an issue with a listed subagent or want your contribution removed, please [open an issue](https://github.com/VoltAgent/awesome-claude-code-subagents/issues) and we'll address it promptly.
+If you find an issue with a listed subagent or want your contribution removed, please [open an issue](https://github.com/a2mus/awesome-zcode-subagents/issues) and we'll address it promptly.
 
 
-[codex-badge]: https://img.shields.io/github/stars/VoltAgent/awesome-codex-subagents?style=classic&label=Codex%20Subagents&color=000000&logo=data:image/svg%2bxml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0id2hpdGUiPjxwYXRoIGQ9Ik0yMi4yODIgOS44MjFhNS45ODUgNS45ODUgMCAwIDAtLjUxNi00LjkxIDYuMDQ2IDYuMDQ2IDAgMCAwLTYuNTEtMi45QTYuMDY1IDYuMDY1IDAgMCAwIDQuOTgxIDQuMThhNS45ODUgNS45ODUgMCAwIDAtMy45OTggMi45IDYuMDQ2IDYuMDQ2IDAgMCAwIC43NDMgNy4wOTcgNS45OCA1Ljk4IDAgMCAwIC41MSA0LjkxMSA2LjA1MSA2LjA1MSAwIDAgMCA2LjUxNSAyLjlBNS45ODUgNS45ODUgMCAwIDAgMTMuMjYgMjRhNi4wNTYgNi4wNTYgMCAwIDAgNS43NzItNC4yMDYgNS45OSA1Ljk5IDAgMCAwIDMuOTk3LTIuOSA2LjA1NiA2LjA1NiAwIDAgMC0uNzQ3LTcuMDczek0xMy4yNiAyMi40M2E0LjQ3NiA0LjQ3NiAwIDAgMS0yLjg3Ni0xLjA0bC4xNDEtLjA4MSA0Ljc3OS0yLjc1OGEuNzk1Ljc5NSAwIDAgMCAuMzkyLS42ODF2LTYuNzM3bDIuMDIgMS4xNjhhLjA3MS4wNzEgMCAwIDEgLjAzOC4wNTJ2NS41ODNhNC41MDQgNC41MDQgMCAwIDEtNC40OTQgNC40OTR6TTMuNiAxOC4zMDRhNC40NyA0LjQ3IDAgMCAxLS41MzUtMy4wMTRsLjE0Mi4wODUgNC43ODMgMi43NTlhLjc3MS43NzEgMCAwIDAgLjc4IDBsNS44NDMtMy4zNjl2Mi4zMzJhLjA4LjA4IDAgMCAxLS4wMzMuMDYyTDkuNzQgMTkuOTVhNC41IDQuNSAwIDAgMS02LjE0LTEuNjQ2ek0yLjM0IDcuODk2YTQuNDg1IDQuNDg1IDAgMCAxIDIuMzY2LTEuOTczVjExLjZhLjc2Ni43NjYgMCAwIDAgLjM4OC42NzZsNS44MTUgMy4zNTUtMi4wMiAxLjE2OGEuMDc2LjA3NiAwIDAgMS0uMDcxIDBsLTQuODMtMi43ODZBNC41MDQgNC41MDQgMCAwIDEgMi4zNCA3Ljg3MnptMTYuNTk3IDMuODU1bC01LjgzMy0zLjM4N0wxNS4xMTkgNy4yYS4wNzYuMDc2IDAgMCAxIC4wNzEgMGw0LjgzIDIuNzkxYTQuNDk0IDQuNDk0IDAgMCAxLS42NzYgOC4xMDV2LTUuNjc4YS43OS43OSAwIDAgMC0uNDA3LS42Njd6bTIuMDEtMy4wMjNsLS4xNDEtLjA4NS00Ljc3NC0yLjc4MmEuNzc2Ljc3NiAwIDAgMC0uNzg1IDBMOS40MDkgOS4yM1Y2Ljg5N2EuMDY2LjA2NiAwIDAgMSAuMDI4LS4wNjFsNC44My0yLjc4N2E0LjUgNC41IDAgMCAxIDYuNjggNC42NnptLTEyLjY0IDQuMTM1bC0yLjAyLTEuMTY0YS4wOC4wOCAwIDAgMS0uMDM4LS4wNTdWNi4wNzVhNC41IDQuNSAwIDAgMSA3LjM3NS0zLjQ1M2wtLjE0Mi4wOEw4LjcwNCA1LjQ2YS43OTUuNzk1IDAgMCAwLS4zOTMuNjgxem0xLjA5Ny0yLjM2NWwyLjYwMi0xLjUgMi42MDcgMS41djIuOTk5bC0yLjU5NyAxLjUtMi42MDctMS41eiIvPjwvc3ZnPg==
-[codex-link]: https://github.com/VoltAgent/awesome-codex-subagents
diff --git a/bin/cli.js b/bin/cli.js
new file mode 100644
index 000000000..b156cfb5b
--- /dev/null
+++ b/bin/cli.js
@@ -0,0 +1,724 @@
+#!/usr/bin/env node
+
+/**
+ * Awesome Subagents CLI Installer
+ * Zero-dependency installer for ZCode and OpenCode subagents on Windows, macOS, and Linux.
+ * 
+ * Usage:
+ *   npx github:a2mus/awesome-zcode-subagents [options]
+ *   node bin/cli.js [options]
+ */
+
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const readline = require('readline');
+
+// Color helpers using ANSI escape codes
+const colors = {
+  reset: '\x1b[0m',
+  bold: '\x1b[1m',
+  dim: '\x1b[2m',
+  red: '\x1b[31m',
+  green: '\x1b[32m',
+  yellow: '\x1b[33m',
+  blue: '\x1b[34m',
+  magenta: '\x1b[35m',
+  cyan: '\x1b[36m',
+  white: '\x1b[37m',
+  gray: '\x1b[90m'
+};
+
+const c = {
+  bold: (text) => `${colors.bold}${text}${colors.reset}`,
+  green: (text) => `${colors.green}${text}${colors.reset}`,
+  cyan: (text) => `${colors.cyan}${text}${colors.reset}`,
+  yellow: (text) => `${colors.yellow}${text}${colors.reset}`,
+  red: (text) => `${colors.red}${text}${colors.reset}`,
+  dim: (text) => `${colors.dim}${text}${colors.reset}`,
+  magenta: (text) => `${colors.magenta}${text}${colors.reset}`,
+  blue: (text) => `${colors.blue}${text}${colors.reset}`
+};
+
+// Root directories
+const CATEGORIES_DIR = path.resolve(__dirname, '..', 'categories');
+
+// Resolve standard platform directories
+function getHomeDir() {
+  return process.env.USERPROFILE || process.env.HOME || os.homedir();
+}
+
+function getZCodeDefaultDir(isProject = false) {
+  if (isProject) {
+    return path.resolve('.zcode', 'agents');
+  }
+  return path.join(getHomeDir(), '.zcode', 'agents');
+}
+
+function getOpenCodeDefaultDir(isProject = false) {
+  if (isProject) {
+    return path.resolve('.opencode', 'agents');
+  }
+  return path.join(getHomeDir(), '.config', 'opencode', 'agents');
+}
+
+// Curated starter pack (10 essential development subagents)
+const STARTER_PACK = [
+  'fullstack-developer',
+  'frontend-developer',
+  'backend-developer',
+  'typescript-pro',
+  'python-pro',
+  'docker-expert',
+  'devops-engineer',
+  'code-reviewer',
+  'debugger',
+  'agent-installer'
+];
+
+// Helper to scan all categories and subagents
+function getCatalog() {
+  if (!fs.existsSync(CATEGORIES_DIR)) {
+    console.error(c.red(`Error: Categories directory not found at ${CATEGORIES_DIR}`));
+    process.exit(1);
+  }
+
+  const entries = fs.readdirSync(CATEGORIES_DIR, { withFileTypes: true });
+  const categories = entries
+    .filter((e) => e.isDirectory() && !e.name.startsWith('.'))
+    .map((e) => e.name)
+    .sort();
+
+  const catalog = {};
+  let totalAgents = 0;
+
+  for (const cat of categories) {
+    const catDir = path.join(CATEGORIES_DIR, cat);
+    const files = fs.readdirSync(catDir, { withFileTypes: true });
+    const agents = files
+      .filter((f) => f.isFile() && f.name.endsWith('.md') && f.name.toLowerCase() !== 'readme.md')
+      .map((f) => {
+        const name = f.name.replace(/\.md$/, '');
+        const filePath = path.join(catDir, f.name);
+        return { name, file: f.name, path: filePath, category: cat };
+      })
+      .sort((a, b) => a.name.localeCompare(b.name));
+
+    catalog[cat] = agents;
+    totalAgents += agents.length;
+  }
+
+  return { categories, catalog, totalAgents };
+}
+
+// Find an agent by name across all categories
+function findAgentByName(name, catalog) {
+  const cleanName = name.replace(/\.md$/, '').toLowerCase();
+  for (const cat of Object.keys(catalog)) {
+    const match = catalog[cat].find((a) => a.name.toLowerCase() === cleanName);
+    if (match) return match;
+  }
+  return null;
+}
+
+// Match category by prefix number or partial name
+function findCategory(query, categories) {
+  const q = query.toLowerCase();
+  // Exact match
+  let found = categories.find((c) => c.toLowerCase() === q);
+  if (found) return found;
+
+  // Number match e.g. "1" or "01"
+  found = categories.find((c) => c.startsWith(q.padStart(2, '0')) || c.startsWith(q));
+  if (found) return found;
+
+  // Partial substring match
+  found = categories.find((c) => c.toLowerCase().includes(q));
+  return found || null;
+}
+
+// Format markdown content for OpenCode subagent compatibility
+function formatForOpenCode(content, agentName) {
+  const match = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
+  if (!match) return content;
+
+  const frontmatter = match[1];
+  const body = content.slice(match[0].length);
+
+  // Extract description
+  const descMatch = frontmatter.match(/^description:\s*(.*)$/m);
+  const desc = descMatch ? descMatch[1].trim() : `"${agentName} subagent"`;
+
+  // Extract tools to determine permissions
+  const toolsMatch = frontmatter.match(/^tools:\s*(.*)$/m);
+  const toolsStr = toolsMatch ? toolsMatch[1].trim() : "";
+  const tools = toolsStr.split(",").map((t) => t.trim().toLowerCase());
+
+  const hasEdit = tools.some((t) => t === "write" || t === "edit");
+  const hasBash = tools.some((t) => t === "bash");
+
+  // Build clean OpenCode frontmatter
+  let newFm = `name: ${agentName}\ndescription: ${desc}\nmode: subagent`;
+
+  // Enforce read-only / execution restrictions if tools restricted
+  if (!hasEdit || !hasBash) {
+    newFm += `\npermission:`;
+    if (!hasEdit) newFm += `\n  edit: deny`;
+    if (!hasBash) newFm += `\n  bash: deny`;
+  }
+
+  return `---\n${newFm}\n---${body}`;
+}
+
+// Determine if destination directory is for OpenCode
+function isOpenCodeDestination(targetDir) {
+  const normalized = targetDir.replace(/\\/g, '/').toLowerCase();
+  return normalized.includes('opencode');
+}
+
+// Copy and adapt an agent file to target directory
+function installAgentFile(agent, targetDir, quiet = false) {
+  fs.mkdirSync(targetDir, { recursive: true });
+  const destPath = path.join(targetDir, `${agent.name}.md`);
+  const isOverwriting = fs.existsSync(destPath);
+  const isOpenCode = isOpenCodeDestination(targetDir);
+
+  let content = fs.readFileSync(agent.path, 'utf8');
+  if (isOpenCode) {
+    content = formatForOpenCode(content, agent.name);
+  }
+
+  fs.writeFileSync(destPath, content, 'utf8');
+
+  if (!quiet) {
+    const action = isOverwriting ? c.yellow('updated') : c.green('installed');
+    const platformLabel = isOpenCode ? c.magenta('[OpenCode]') : c.blue('[ZCode]');
+    console.log(`  ${c.cyan('•')} ${c.bold(agent.name)} (${agent.category}) ${platformLabel} ${action}`);
+  }
+  return isOverwriting ? 'updated' : 'installed';
+}
+
+// Print header banner
+function printHeader(targetDirs) {
+  console.log();
+  console.log(c.cyan('╔════════════════════════════════════════════════════════════════════════╗'));
+  console.log(c.cyan('║') + c.bold('               Awesome Subagents Installer (ZCode & OpenCode)          ') + c.cyan('║'));
+  console.log(c.cyan('╚════════════════════════════════════════════════════════════════════════╝'));
+  console.log(`  ${c.dim('OS:')} ${process.platform} (${os.arch()})`);
+  targetDirs.forEach((td) => {
+    const label = isOpenCodeDestination(td.dir) ? c.magenta('OpenCode:') : c.blue('ZCode:   ');
+    console.log(`  ${c.dim(label)} ${c.cyan(td.dir)}`);
+  });
+  console.log();
+}
+
+// Print usage help
+function printHelp(targetDirs) {
+  printHeader(targetDirs);
+  console.log(`${c.bold('USAGE:')}`);
+  console.log(`  npx github:a2mus/awesome-zcode-subagents [options]`);
+  console.log(`  node bin/cli.js [options]`);
+  console.log();
+  console.log(`${c.bold('TARGET PLATFORM OPTIONS:')}`);
+  console.log(`  ${c.cyan('-o, --opencode')}          Target OpenCode (${c.dim('default global: ~/.config/opencode/agents')})`);
+  console.log(`  ${c.cyan('-z, --zcode')}             Target ZCode (${c.dim('default global: ~/.zcode/agents')})`);
+  console.log(`  ${c.cyan('-b, --both')}              Target BOTH ZCode and OpenCode simultaneously`);
+  console.log(`  ${c.cyan('--target <platform>')}     Set target: "zcode", "opencode", or "both" (default: zcode)`);
+  console.log(`  ${c.cyan('-p, --project')}           Install into local project directory (.opencode/agents or .zcode/agents)`);
+  console.log(`  ${c.cyan('--global')}                Install into user global directory (default)`);
+  console.log(`  ${c.cyan('-d, --dest <path>')}       Custom destination directory`);
+  console.log();
+  console.log(`${c.bold('INSTALLATION OPTIONS:')}`);
+  console.log(`  ${c.cyan('-s, --starter')}           Install the recommended starter pack (10 essential agents)`);
+  console.log(`  ${c.cyan('-a, --all')}               Install ALL 158+ subagents into your agent directory`);
+  console.log(`  ${c.cyan('-c, --category <name>')}   Install all agents from a category (e.g. -c 01, -c infra)`);
+  console.log(`  ${c.cyan('-g, --agent <names>')}     Install specific agent(s), comma-separated (e.g. -g python-pro,debugger)`);
+  console.log(`  ${c.cyan('-l, --list')}              List all available categories and agents`);
+  console.log(`  ${c.cyan('--installed')}             List subagents currently installed in target directory`);
+  console.log(`  ${c.cyan('-u, --uninstall <name>')}  Uninstall an agent, or "all" to remove all`);
+  console.log(`  ${c.cyan('-h, --help')}              Show this help menu`);
+  console.log();
+  console.log(`${c.bold('EXAMPLES (Windows / macOS / Linux):')}`);
+  console.log(`  ${c.dim('# Install for OpenCode (starter pack)')}`);
+  console.log(`  npx github:a2mus/awesome-zcode-subagents --opencode --starter`);
+  console.log();
+  console.log(`  ${c.dim('# Install for OpenCode into current project (.opencode/agents)')}`);
+  console.log(`  npx github:a2mus/awesome-zcode-subagents --opencode --project --all`);
+  console.log();
+  console.log(`  ${c.dim('# Install for ZCode (default)')}`);
+  console.log(`  npx github:a2mus/awesome-zcode-subagents --starter`);
+  console.log();
+  console.log(`  ${c.dim('# Install for BOTH ZCode and OpenCode')}`);
+  console.log(`  npx github:a2mus/awesome-zcode-subagents --both --starter`);
+  console.log();
+  console.log(`  ${c.dim('# Install a specific agent for OpenCode')}`);
+  console.log(`  npx github:a2mus/awesome-zcode-subagents --opencode --agent code-reviewer,debugger`);
+  console.log();
+}
+
+// Print catalog listing
+function printCatalog(catalogData) {
+  console.log(c.bold(`Catalog: ${catalogData.totalAgents} Subagents across ${catalogData.categories.length} Categories\n`));
+  for (const cat of catalogData.categories) {
+    const agents = catalogData.catalog[cat];
+    console.log(`${c.magenta(c.bold(cat))} ${c.dim(`(${agents.length} agents)`)}`);
+    const agentNames = agents.map((a) => a.name).join(', ');
+    console.log(`  ${c.dim(agentNames)}\n`);
+  }
+}
+
+// List installed agents
+function listInstalled(targetDirs) {
+  for (const td of targetDirs) {
+    const targetDir = td.dir;
+    const platform = isOpenCodeDestination(targetDir) ? 'OpenCode' : 'ZCode';
+
+    if (!fs.existsSync(targetDir)) {
+      console.log(c.yellow(`${platform} directory does not exist yet: ${targetDir}`));
+      console.log(`No subagents currently installed.`);
+      console.log();
+      continue;
+    }
+
+    const files = fs.readdirSync(targetDir)
+      .filter((f) => f.endsWith('.md') && f.toLowerCase() !== 'readme.md')
+      .map((f) => f.replace(/\.md$/, ''))
+      .sort();
+
+    console.log(c.bold(`Installed subagents in ${platform} (${c.cyan(targetDir)}): [${files.length} installed]\n`));
+    if (files.length === 0) {
+      console.log(c.dim('  (None installed yet)\n'));
+    } else {
+      for (let i = 0; i < files.length; i += 4) {
+        const slice = files.slice(i, i + 4);
+        console.log(`  ${slice.map((name) => c.green(name)).join(', ')}`);
+      }
+      console.log();
+    }
+  }
+}
+
+// Uninstall agents
+function uninstallAgents(targetArg, targetDirs) {
+  for (const td of targetDirs) {
+    const targetDir = td.dir;
+    const platform = isOpenCodeDestination(targetDir) ? 'OpenCode' : 'ZCode';
+
+    if (!fs.existsSync(targetDir)) {
+      console.log(c.yellow(`Nothing to uninstall: ${targetDir} does not exist.`));
+      continue;
+    }
+
+    const installed = fs.readdirSync(targetDir)
+      .filter((f) => f.endsWith('.md') && f.toLowerCase() !== 'readme.md');
+
+    if (targetArg === 'all') {
+      if (installed.length === 0) {
+        console.log(c.dim(`No agents to remove from ${platform}.`));
+        continue;
+      }
+      for (const f of installed) {
+        fs.unlinkSync(path.join(targetDir, f));
+      }
+      console.log(c.green(`✓ Removed all ${installed.length} subagents from ${platform} (${targetDir})`));
+    } else {
+      const names = targetArg.split(',').map((s) => s.trim());
+      let removed = 0;
+      for (const name of names) {
+        const fileName = name.endsWith('.md') ? name : `${name}.md`;
+        const filePath = path.join(targetDir, fileName);
+        if (fs.existsSync(filePath)) {
+          fs.unlinkSync(filePath);
+          console.log(`  ${c.red('✕')} Removed ${name} from ${platform}`);
+          removed++;
+        } else {
+          console.log(`  ${c.yellow('?')} Agent not found in ${platform}: ${name}`);
+        }
+      }
+      console.log(c.green(`✓ Uninstalled ${removed} subagent(s) from ${platform}.`));
+    }
+  }
+}
+
+// Install starter pack
+function installStarterPack(catalogData, targetDirs) {
+  console.log(c.bold(`Installing Popular Starter Pack (10 subagents)...`));
+  for (const td of targetDirs) {
+    const targetDir = td.dir;
+    const platform = isOpenCodeDestination(targetDir) ? 'OpenCode' : 'ZCode';
+    console.log(c.dim(`\nTarget (${platform}): ${targetDir}`));
+
+    let installedCount = 0;
+    for (const name of STARTER_PACK) {
+      const agent = findAgentByName(name, catalogData.catalog);
+      if (agent) {
+        installAgentFile(agent, targetDir);
+        installedCount++;
+      } else {
+        console.log(`  ${c.yellow('?')} Warning: ${name} not found in catalog.`);
+      }
+    }
+    console.log(c.green(`✓ Successfully installed ${installedCount} starter subagents to ${platform}!`));
+  }
+  printPostInstallInstructions(targetDirs);
+}
+
+// Install category
+function installCategory(catName, catalogData, targetDirs) {
+  const category = findCategory(catName, catalogData.categories);
+  if (!category) {
+    console.error(c.red(`Error: Category "${catName}" not found.`));
+    console.log(`Available categories:\n  ${catalogData.categories.join('\n  ')}`);
+    process.exit(1);
+  }
+
+  const agents = catalogData.catalog[category];
+  console.log(c.bold(`Installing category ${c.cyan(category)} (${agents.length} subagents)...`));
+
+  for (const td of targetDirs) {
+    const targetDir = td.dir;
+    const platform = isOpenCodeDestination(targetDir) ? 'OpenCode' : 'ZCode';
+    console.log(c.dim(`\nTarget (${platform}): ${targetDir}`));
+
+    for (const agent of agents) {
+      installAgentFile(agent, targetDir);
+    }
+    console.log(c.green(`✓ Successfully installed ${agents.length} subagents from ${category} to ${platform}!`));
+  }
+  printPostInstallInstructions(targetDirs);
+}
+
+// Install specific agents
+function installSpecificAgents(names, catalogData, targetDirs) {
+  console.log(c.bold(`Installing selected subagents...`));
+
+  for (const td of targetDirs) {
+    const targetDir = td.dir;
+    const platform = isOpenCodeDestination(targetDir) ? 'OpenCode' : 'ZCode';
+    console.log(c.dim(`\nTarget (${platform}): ${targetDir}`));
+
+    let successCount = 0;
+    for (const rawName of names) {
+      const name = rawName.trim();
+      if (!name) continue;
+      const agent = findAgentByName(name, catalogData.catalog);
+      if (agent) {
+        installAgentFile(agent, targetDir);
+        successCount++;
+      } else {
+        console.log(`  ${c.red('✕')} Agent "${name}" not found in catalog.`);
+      }
+    }
+    console.log(c.green(`✓ Successfully installed ${successCount} subagent(s) to ${platform}!`));
+  }
+  printPostInstallInstructions(targetDirs);
+}
+
+// Install all agents
+function installAllAgents(catalogData, targetDirs) {
+  console.log(c.bold(`Installing ALL ${catalogData.totalAgents} subagents across ${catalogData.categories.length} categories...`));
+
+  for (const td of targetDirs) {
+    const targetDir = td.dir;
+    const platform = isOpenCodeDestination(targetDir) ? 'OpenCode' : 'ZCode';
+    console.log(c.bold(`\nInstalling to ${platform} (${targetDir})...`));
+
+    let installedCount = 0;
+    for (const cat of catalogData.categories) {
+      console.log(`${c.magenta(c.bold(`Category: ${cat}`))}`);
+      for (const agent of catalogData.catalog[cat]) {
+        installAgentFile(agent, targetDir);
+        installedCount++;
+      }
+    }
+    console.log(c.green(`✓ Successfully installed all ${installedCount} subagents to ${platform}!`));
+  }
+  printPostInstallInstructions(targetDirs);
+}
+
+// Post-install message
+function printPostInstallInstructions(targetDirs) {
+  console.log();
+  const hasZCode = targetDirs.some((td) => !isOpenCodeDestination(td.dir));
+  const hasOpenCode = targetDirs.some((td) => isOpenCodeDestination(td.dir));
+
+  if (hasZCode) {
+    console.log(c.bold('Next steps in ZCode:'));
+    console.log(`  1. Restart your ZCode session or start a new conversation`);
+    console.log(`  2. In ZCode, check ${c.cyan('Settings → Subagents')} to see your installed agents`);
+    console.log(`  3. Subagents trigger automatically based on task descriptions, or invoke directly:`);
+    console.log(`     ${c.dim('> Have @code-reviewer inspect my recent changes')}`);
+    console.log();
+  }
+
+  if (hasOpenCode) {
+    console.log(c.bold('Next steps in OpenCode:'));
+    console.log(`  1. Run OpenCode in your project terminal: ${c.cyan('opencode')}`);
+    console.log(`  2. OpenCode discovers custom subagents from ${c.cyan('~/.config/opencode/agents/')} or ${c.cyan('.opencode/agents/')}`);
+    console.log(`  3. Invoke subagents in messages using @ mention:`);
+    console.log(`     ${c.dim('> @code-reviewer inspect recent changes for security issues')}`);
+    console.log(`  4. Primary agents can also automatically delegate tasks to these subagents!`);
+    console.log();
+  }
+}
+
+// Interactive prompt runner
+async function runInteractive(catalogData, initialTargetDirs) {
+  let targetDirs = initialTargetDirs;
+  printHeader(targetDirs);
+
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+
+  const question = (q) => new Promise((resolve) => rl.question(q, resolve));
+
+  while (true) {
+    console.log(c.bold('What would you like to do?'));
+    console.log(`  ${c.cyan('1)')} Install Popular Starter Pack ${c.dim('(10 curated essential agents)')}`);
+    console.log(`  ${c.cyan('2)')} Install by Category ${c.dim('(choose from 10 categories)')}`);
+    console.log(`  ${c.cyan('3)')} Install Specific Subagent(s)`);
+    console.log(`  ${c.cyan('4)')} Install ALL Subagents ${c.dim(`(${catalogData.totalAgents} agents)`)}`);
+    console.log(`  ${c.cyan('5)')} Switch Target Platform ${c.dim(`(Current: ${targetDirs.map((t) => isOpenCodeDestination(t.dir) ? 'OpenCode' : 'ZCode').join(', ')})`)}`);
+    console.log(`  ${c.cyan('6)')} List Installed Subagents`);
+    console.log(`  ${c.cyan('7)')} Uninstall Subagents`);
+    console.log(`  ${c.cyan('0)')} Exit`);
+    console.log();
+
+    const answer = (await question(c.bold('Enter choice [0-7]: '))).trim();
+    console.log();
+
+    if (answer === '0' || answer.toLowerCase() === 'exit' || answer.toLowerCase() === 'q') {
+      console.log('Goodbye!');
+      rl.close();
+      return;
+    } else if (answer === '1') {
+      installStarterPack(catalogData, targetDirs);
+    } else if (answer === '2') {
+      console.log(c.bold('Available categories:'));
+      catalogData.categories.forEach((cat, idx) => {
+        console.log(`  ${c.cyan(`${idx + 1})`)} ${cat} ${c.dim(`(${catalogData.catalog[cat].length} agents)`)}`);
+      });
+      console.log();
+      const catChoice = (await question(c.bold('Select category number or name (or 0 to cancel): '))).trim();
+      console.log();
+      if (catChoice !== '0' && catChoice !== '') {
+        const num = parseInt(catChoice, 10);
+        if (!isNaN(num) && num >= 1 && num <= catalogData.categories.length) {
+          installCategory(catalogData.categories[num - 1], catalogData, targetDirs);
+        } else {
+          installCategory(catChoice, catalogData, targetDirs);
+        }
+      }
+    } else if (answer === '3') {
+      const agentInput = (await question(c.bold('Enter subagent name(s) (comma-separated, e.g. python-pro, debugger): '))).trim();
+      console.log();
+      if (agentInput) {
+        installSpecificAgents(agentInput.split(','), catalogData, targetDirs);
+      }
+    } else if (answer === '4') {
+      const confirm = (await question(c.yellow(`Install all ${catalogData.totalAgents} subagents? [y/N]: `))).trim().toLowerCase();
+      console.log();
+      if (confirm === 'y' || confirm === 'yes') {
+        installAllAgents(catalogData, targetDirs);
+      } else {
+        console.log('Cancelled.');
+      }
+    } else if (answer === '5') {
+      console.log(c.bold('Choose target platform:'));
+      console.log(`  ${c.cyan('1)')} OpenCode Global ${c.dim(`(~/.config/opencode/agents)`)}`);
+      console.log(`  ${c.cyan('2)')} OpenCode Project ${c.dim(`(.opencode/agents)`)}`);
+      console.log(`  ${c.cyan('3)')} ZCode Global ${c.dim(`(~/.zcode/agents)`)}`);
+      console.log(`  ${c.cyan('4)')} Both ZCode & OpenCode`);
+      console.log();
+      const targetChoice = (await question(c.bold('Select [1-4]: '))).trim();
+      if (targetChoice === '1') {
+        targetDirs = [{ platform: 'opencode', dir: getOpenCodeDefaultDir(false) }];
+      } else if (targetChoice === '2') {
+        targetDirs = [{ platform: 'opencode', dir: getOpenCodeDefaultDir(true) }];
+      } else if (targetChoice === '3') {
+        targetDirs = [{ platform: 'zcode', dir: getZCodeDefaultDir(false) }];
+      } else if (targetChoice === '4') {
+        targetDirs = [
+          { platform: 'zcode', dir: getZCodeDefaultDir(false) },
+          { platform: 'opencode', dir: getOpenCodeDefaultDir(false) }
+        ];
+      }
+      console.log(c.green(`✓ Active target set to: ${targetDirs.map((t) => t.dir).join(', ')}\n`));
+    } else if (answer === '6') {
+      listInstalled(targetDirs);
+    } else if (answer === '7') {
+      const unChoice = (await question(c.bold('Enter subagent name to uninstall, or "all" to remove all (or 0 to cancel): '))).trim();
+      console.log();
+      if (unChoice && unChoice !== '0') {
+        uninstallAgents(unChoice, targetDirs);
+      }
+    } else {
+      console.log(c.red('Invalid choice. Please enter 0-7.\n'));
+    }
+
+    const continueChoice = (await question(c.dim('Press Enter to return to menu (or type "q" to exit): '))).trim().toLowerCase();
+    if (continueChoice === 'q' || continueChoice === 'exit') {
+      console.log('Goodbye!');
+      rl.close();
+      return;
+    }
+    console.log();
+  }
+}
+
+// Main CLI parsing
+async function main() {
+  const args = process.argv.slice(2);
+
+  let targetPlatform = 'zcode'; // default
+  let isProject = false;
+  let customDest = null;
+
+  // Extract platform and destination flags first
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+
+    if (arg === '--opencode' || arg === '-o') {
+      targetPlatform = 'opencode';
+      args.splice(i, 1);
+      i--;
+    } else if (arg === '--zcode' || arg === '-z') {
+      targetPlatform = 'zcode';
+      args.splice(i, 1);
+      i--;
+    } else if (arg === '--both' || arg === '-b') {
+      targetPlatform = 'both';
+      args.splice(i, 1);
+      i--;
+    } else if (arg === '--target') {
+      const val = (args[i + 1] || '').toLowerCase();
+      if (val === 'opencode' || val === 'zcode' || val === 'both') {
+        targetPlatform = val;
+        args.splice(i, 2);
+        i--;
+      }
+    } else if (arg === '--project' || arg === '-p') {
+      isProject = true;
+      args.splice(i, 1);
+      i--;
+    } else if (arg === '--global') {
+      isProject = false;
+      args.splice(i, 1);
+      i--;
+    } else if (arg === '--dest' || arg === '-d') {
+      if (args[i + 1]) {
+        customDest = path.resolve(args[i + 1]);
+        args.splice(i, 2);
+        i--;
+      }
+    }
+  }
+
+  // Resolve target directories
+  let targetDirs = [];
+  if (customDest) {
+    targetDirs = [{ platform: targetPlatform, dir: customDest }];
+  } else if (targetPlatform === 'both') {
+    targetDirs = [
+      { platform: 'zcode', dir: getZCodeDefaultDir(isProject) },
+      { platform: 'opencode', dir: getOpenCodeDefaultDir(isProject) }
+    ];
+  } else if (targetPlatform === 'opencode') {
+    targetDirs = [{ platform: 'opencode', dir: getOpenCodeDefaultDir(isProject) }];
+  } else {
+    targetDirs = [{ platform: 'zcode', dir: getZCodeDefaultDir(isProject) }];
+  }
+
+  const catalogData = getCatalog();
+
+  // If no arguments, launch interactive mode
+  if (args.length === 0) {
+    if (process.stdin.isTTY) {
+      await runInteractive(catalogData, targetDirs);
+      return;
+    } else {
+      printHelp(targetDirs);
+      return;
+    }
+  }
+
+  // Parse command line actions
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+
+    if (arg === '--help' || arg === '-h') {
+      printHelp(targetDirs);
+      return;
+    }
+
+    if (arg === '--list' || arg === '-l') {
+      printCatalog(catalogData);
+      return;
+    }
+
+    if (arg === '--installed') {
+      listInstalled(targetDirs);
+      return;
+    }
+
+    if (arg === '--starter' || arg === '-s') {
+      installStarterPack(catalogData, targetDirs);
+      return;
+    }
+
+    if (arg === '--all' || arg === '-a') {
+      installAllAgents(catalogData, targetDirs);
+      return;
+    }
+
+    if (arg === '--category' || arg === '-c') {
+      const catArg = args[i + 1];
+      if (!catArg) {
+        console.error(c.red('Error: --category requires a category name or number.'));
+        process.exit(1);
+      }
+      installCategory(catArg, catalogData, targetDirs);
+      return;
+    }
+
+    if (arg === '--agent' || arg === '-g' || arg === '--agents') {
+      const agentArg = args[i + 1];
+      if (!agentArg) {
+        console.error(c.red('Error: --agent requires agent name(s).'));
+        process.exit(1);
+      }
+      installSpecificAgents(agentArg.split(','), catalogData, targetDirs);
+      return;
+    }
+
+    if (arg === '--uninstall' || arg === '-u') {
+      const unArg = args[i + 1] || 'all';
+      uninstallAgents(unArg, targetDirs);
+      return;
+    }
+
+    // Direct category or agent name match shorthand
+    const matchedCategory = findCategory(arg, catalogData.categories);
+    if (matchedCategory) {
+      installCategory(matchedCategory, catalogData, targetDirs);
+      return;
+    }
+
+    const matchedAgent = findAgentByName(arg, catalogData.catalog);
+    if (matchedAgent) {
+      installSpecificAgents([arg], catalogData, targetDirs);
+      return;
+    }
+
+    console.error(c.red(`Unknown option or argument: ${arg}`));
+    console.log(`Run ${c.cyan('npx github:a2mus/awesome-zcode-subagents --help')} for usage instructions.`);
+    process.exit(1);
+  }
+}
+
+main().catch((err) => {
+  console.error(c.red(`Unexpected error: ${err.message}`));
+  process.exit(1);
+});
diff --git a/categories/01-core-development/.claude-plugin/plugin.json b/categories/01-core-development/.zcode-plugin/plugin.json
similarity index 92%
rename from categories/01-core-development/.claude-plugin/plugin.json
rename to categories/01-core-development/.zcode-plugin/plugin.json
index 9c8082389..79e77a372 100644
--- a/categories/01-core-development/.claude-plugin/plugin.json
+++ b/categories/01-core-development/.zcode-plugin/plugin.json
@@ -1,6 +1,6 @@
 {
-  "name": "voltagent-core-dev",
-  "version": "1.0.2",
+  "name": "zcode-core-dev",
+  "version": "1.0.3",
   "description": "Essential development subagents for everyday coding tasks - backend, frontend, fullstack, mobile, and API design",
   "author": {
     "name": "VoltAgent Community",
diff --git a/categories/01-core-development/api-designer.md b/categories/01-core-development/api-designer.md
index 46a05f5e7..764cdf51f 100644
--- a/categories/01-core-development/api-designer.md
+++ b/categories/01-core-development/api-designer.md
@@ -1,8 +1,8 @@
 ---
 name: api-designer
 description: "Use this agent when designing new APIs, creating API specifications, or refactoring existing API architecture for scalability and developer experience. Invoke when you need REST/GraphQL endpoint design, OpenAPI documentation, authentication patterns, or API versioning strategies."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior API designer specializing in creating intuitive, scalable API architectures with expertise in REST and GraphQL design patterns. Your primary focus is delivering well-documented, consistent APIs that developers love to use while ensuring performance and maintainability.
diff --git a/categories/01-core-development/backend-developer.md b/categories/01-core-development/backend-developer.md
index be68307f1..400af7499 100644
--- a/categories/01-core-development/backend-developer.md
+++ b/categories/01-core-development/backend-developer.md
@@ -1,8 +1,8 @@
 ---
 name: backend-developer
 description: "Use this agent when building server-side APIs, microservices, and backend systems that require robust architecture, scalability planning, and production-ready implementation."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior backend developer specializing in server-side applications with deep expertise in Node.js 18+, Python 3.11+, and Go 1.21+. Your primary focus is building scalable, secure, and performant backend systems.
diff --git a/categories/01-core-development/design-bridge.md b/categories/01-core-development/design-bridge.md
index a7d0de738..d654b18c9 100644
--- a/categories/01-core-development/design-bridge.md
+++ b/categories/01-core-development/design-bridge.md
@@ -1,11 +1,12 @@
 ---
 name: design-bridge
-description: "Use this agent when you need to translate a DESIGN.md from the VoltAgent/awesome-design-md repository into polished Claude Code instructions for building user interfaces that faithfully match the chosen brand. Invoke this agent whenever a developer or designer asks to replicate the look and feel of an existing product or website."
+description: "Use this agent when you need to translate a DESIGN.md from the VoltAgent/awesome-design-md repository into polished ZCode instructions for building user interfaces that faithfully match the chosen brand. Invoke this agent whenever a developer or designer asks to replicate the look and feel of an existing product or website."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep, WebFetch, WebSearch
 model: inherit
 ---
 
-You are a senior design translator who bridges design system documents and code. Your expertise lies in reading detailed DESIGN.md files, extracting their essential visual language, and converting that information into clear, actionable instructions for other Claude Code subagents (such as ui-designer, frontend-developer, or prompt-engineer). You ensure that every color, typographic nuance, layout rule and elevation treatment from the source design is preserved when other agents build the final UI.
+You are a senior design translator who bridges design system documents and code. Your expertise lies in reading detailed DESIGN.md files, extracting their essential visual language, and converting that information into clear, actionable instructions for other ZCode subagents (such as ui-designer, frontend-developer, or prompt-engineer). You ensure that every color, typographic nuance, layout rule and elevation treatment from the source design is preserved when other agents build the final UI.
 
 When invoked:
 1. Ask for the target site and confirm its availability in the awesome-design-md repo.
@@ -75,7 +76,7 @@ Status reporting:
 
 ### 1. Site Identification & Acquisition
 
-Validate the site’s presence in the VoltAgent/awesome-design-md repository. If missing, offer alternatives. Fetch the DESIGN.md and save it locally to `.claude/design/`.
+Validate the site’s presence in the VoltAgent/awesome-design-md repository. If missing, offer alternatives. Fetch the DESIGN.md and save it locally to `.zcode/design/`.
 
 ### 2. Analysis & Extraction
 
@@ -99,7 +100,7 @@ Convert notes into clear instructions:
 
 ### 4. Deliverables & Handoff
 
-Save output to `.claude/design/instructions-<site>.md`. Notify user and suggest next steps with agents like:
+Save output to `.zcode/design/instructions-<site>.md`. Notify user and suggest next steps with agents like:
 - ui-designer
 - frontend-developer
 - prompt-engineer
@@ -117,7 +118,7 @@ Final status update:
 ```
 
 Completion message:
-"Design translation completed successfully. Extracted 35 colors, 12 typography rules, 7 component styles, and 5 ready-to-use prompts. Saved instructions to .claude/design/instructions-stripe.md. Ready for implementation."
+"Design translation completed successfully. Extracted 35 colors, 12 typography rules, 7 component styles, and 5 ready-to-use prompts. Saved instructions to .zcode/design/instructions-stripe.md. Ready for implementation."
 
 Integration with other agents:
 - ui-designer: Uses instructions for UI and system design
diff --git a/categories/01-core-development/electron-pro.md b/categories/01-core-development/electron-pro.md
index 4282a4556..13f882dcf 100644
--- a/categories/01-core-development/electron-pro.md
+++ b/categories/01-core-development/electron-pro.md
@@ -1,8 +1,8 @@
 ---
 name: electron-pro
 description: "Use this agent when building Electron desktop applications that require native OS integration, cross-platform distribution, security hardening, and performance optimization. Use electron-pro for complete desktop app development from architecture to signed, distributable installers."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Electron developer specializing in cross-platform desktop applications with deep expertise in Electron 27+ and native OS integrations. Your primary focus is building secure, performant desktop apps that feel native while maintaining code efficiency across Windows, macOS, and Linux.
diff --git a/categories/01-core-development/frontend-developer.md b/categories/01-core-development/frontend-developer.md
index 7e6a8b0d4..0b694c525 100644
--- a/categories/01-core-development/frontend-developer.md
+++ b/categories/01-core-development/frontend-developer.md
@@ -1,8 +1,8 @@
 ---
 name: frontend-developer
 description: "Use when building complete frontend applications across React, Vue, and Angular frameworks requiring multi-framework expertise and full-stack integration."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior frontend developer specializing in modern web applications with deep expertise in React 18+, Vue 3+, and Angular 15+. Your primary focus is building performant, accessible, and maintainable user interfaces.
diff --git a/categories/01-core-development/fullstack-developer.md b/categories/01-core-development/fullstack-developer.md
index e393fe056..9742745ce 100644
--- a/categories/01-core-development/fullstack-developer.md
+++ b/categories/01-core-development/fullstack-developer.md
@@ -1,8 +1,8 @@
 ---
 name: fullstack-developer
 description: "Use this agent when you need to build complete features spanning database, API, and frontend layers together as a cohesive unit."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior fullstack developer specializing in complete feature development with expertise across backend and frontend technologies. Your primary focus is delivering cohesive, end-to-end solutions that work seamlessly from database to user interface.
diff --git a/categories/01-core-development/graphql-architect.md b/categories/01-core-development/graphql-architect.md
index ea7dc0c98..4cefa5e1b 100644
--- a/categories/01-core-development/graphql-architect.md
+++ b/categories/01-core-development/graphql-architect.md
@@ -1,6 +1,7 @@
 ---
 name: graphql-architect
 description: "Use this agent when designing or evolving GraphQL schemas across microservices, implementing federation architectures, or optimizing query performance in distributed graphs."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
 model: inherit
 ---
diff --git a/categories/01-core-development/microservices-architect.md b/categories/01-core-development/microservices-architect.md
index e4bae4a90..544afea34 100644
--- a/categories/01-core-development/microservices-architect.md
+++ b/categories/01-core-development/microservices-architect.md
@@ -1,6 +1,7 @@
 ---
 name: microservices-architect
 description: "Use when designing distributed system architecture, decomposing monolithic applications into independent microservices, or establishing communication patterns between services at scale."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
 model: inherit
 ---
diff --git a/categories/01-core-development/mobile-developer.md b/categories/01-core-development/mobile-developer.md
index e6da4edd5..d6dbcdfff 100644
--- a/categories/01-core-development/mobile-developer.md
+++ b/categories/01-core-development/mobile-developer.md
@@ -1,8 +1,8 @@
 ---
 name: mobile-developer
 description: "Use this agent when building cross-platform mobile applications requiring native performance optimization, platform-specific features, and offline-first architecture. Use for React Native and Flutter projects where code sharing must exceed 80% while maintaining iOS and Android native excellence."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior mobile developer specializing in cross-platform applications with deep expertise in React Native 0.82+. 
diff --git a/categories/01-core-development/ui-designer.md b/categories/01-core-development/ui-designer.md
index b378dfc05..f1c53ddb6 100644
--- a/categories/01-core-development/ui-designer.md
+++ b/categories/01-core-development/ui-designer.md
@@ -1,8 +1,8 @@
 ---
 name: ui-designer
 description: "Use this agent when designing visual interfaces, creating design systems, building component libraries, or refining user-facing aesthetics requiring expert visual design, interaction patterns, and accessibility considerations."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior UI designer with expertise in visual design, interaction design, and design systems. Your focus spans creating beautiful, functional interfaces that delight users while maintaining consistency, accessibility, and brand alignment across all touchpoints.
diff --git a/categories/01-core-development/websocket-engineer.md b/categories/01-core-development/websocket-engineer.md
index 8885cdcd6..b26ed508a 100644
--- a/categories/01-core-development/websocket-engineer.md
+++ b/categories/01-core-development/websocket-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: websocket-engineer
 description: "Use this agent when implementing real-time bidirectional communication features using WebSockets, Socket.IO, or similar technologies at scale."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior WebSocket engineer specializing in real-time communication systems with deep expertise in WebSocket protocols, Socket.IO, and scalable messaging architectures. Your primary focus is building low-latency, high-throughput bidirectional communication systems that handle millions of concurrent connections.
diff --git a/categories/02-language-specialists/.claude-plugin/plugin.json b/categories/02-language-specialists/.zcode-plugin/plugin.json
similarity index 95%
rename from categories/02-language-specialists/.claude-plugin/plugin.json
rename to categories/02-language-specialists/.zcode-plugin/plugin.json
index 9c591c83d..1701f1812 100644
--- a/categories/02-language-specialists/.claude-plugin/plugin.json
+++ b/categories/02-language-specialists/.zcode-plugin/plugin.json
@@ -1,6 +1,6 @@
 {
-  "name": "voltagent-lang",
-  "version": "1.0.4",
+  "name": "zcode-lang",
+  "version": "1.0.5",
   "description": "Language-specific expert agents with deep framework knowledge - Python, TypeScript, Go, Rust, Java, and more",
   "author": {
     "name": "VoltAgent Community",
diff --git a/categories/02-language-specialists/angular-architect.md b/categories/02-language-specialists/angular-architect.md
index 1da0dde06..f23635edf 100644
--- a/categories/02-language-specialists/angular-architect.md
+++ b/categories/02-language-specialists/angular-architect.md
@@ -1,8 +1,8 @@
 ---
 name: angular-architect
 description: "Use when architecting enterprise Angular 15+ applications with complex state management, optimizing RxJS patterns, designing micro-frontend systems, or solving performance and scalability challenges in large codebases."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Angular architect with expertise in Angular 15+ and enterprise application development. Your focus spans advanced RxJS patterns, state management, micro-frontend architecture, and performance optimization with emphasis on creating maintainable, scalable enterprise solutions.
diff --git a/categories/02-language-specialists/cpp-pro.md b/categories/02-language-specialists/cpp-pro.md
index 10b279671..add9330b6 100644
--- a/categories/02-language-specialists/cpp-pro.md
+++ b/categories/02-language-specialists/cpp-pro.md
@@ -1,8 +1,8 @@
 ---
 name: cpp-pro
 description: "Use this agent when building high-performance C++ systems requiring modern C++20/23 features, template metaprogramming, or zero-overhead abstractions for systems programming, embedded systems, or performance-critical applications."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior C++ developer with deep expertise in modern C++20/23 and systems programming, specializing in high-performance applications, template metaprogramming, and low-level optimization. Your focus emphasizes zero-overhead abstractions, memory safety, and leveraging cutting-edge C++ features while maintaining code clarity and maintainability.
diff --git a/categories/02-language-specialists/csharp-developer.md b/categories/02-language-specialists/csharp-developer.md
index 1d4a029d8..e127bf56f 100644
--- a/categories/02-language-specialists/csharp-developer.md
+++ b/categories/02-language-specialists/csharp-developer.md
@@ -1,8 +1,8 @@
 ---
 name: csharp-developer
 description: "Use this agent when building ASP.NET Core web APIs, cloud-native .NET solutions, or modern C# applications requiring async patterns, dependency injection, Entity Framework optimization, and clean architecture."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior C# developer with mastery of .NET 8+ and the Microsoft ecosystem, specializing in building high-performance web applications, cloud-native solutions, and cross-platform development. Your expertise spans ASP.NET Core, Blazor, Entity Framework Core, and modern C# language features with focus on clean code and architectural patterns.
diff --git a/categories/02-language-specialists/django-developer.md b/categories/02-language-specialists/django-developer.md
index e6f1aab90..a8f2a4d70 100644
--- a/categories/02-language-specialists/django-developer.md
+++ b/categories/02-language-specialists/django-developer.md
@@ -1,8 +1,8 @@
 ---
 name: django-developer
 description: "Use when building Django 4+ web applications, REST APIs, or modernizing existing Django projects with async views and enterprise patterns."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Django developer with expertise in Django 4+ and modern Python web development. Your focus spans Django's batteries-included philosophy, ORM optimization, REST API development, and async capabilities with emphasis on building secure, scalable applications that leverage Django's rapid development strengths.
diff --git a/categories/02-language-specialists/dotnet-core-expert.md b/categories/02-language-specialists/dotnet-core-expert.md
index 696362f11..77c822b6a 100644
--- a/categories/02-language-specialists/dotnet-core-expert.md
+++ b/categories/02-language-specialists/dotnet-core-expert.md
@@ -1,8 +1,8 @@
 ---
 name: dotnet-core-expert
 description: "Use when building .NET Core applications requiring cloud-native architecture, high-performance microservices, modern C# patterns, or cross-platform deployment with minimal APIs and advanced ASP.NET Core features."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior .NET Core expert with expertise in .NET 10 and modern C# development. Your focus spans minimal APIs, cloud-native patterns, microservices architecture, and cross-platform development with emphasis on building high-performance applications that leverage the latest .NET innovations.
diff --git a/categories/02-language-specialists/dotnet-framework-4.8-expert.md b/categories/02-language-specialists/dotnet-framework-4.8-expert.md
index b84994993..f72e36fb8 100644
--- a/categories/02-language-specialists/dotnet-framework-4.8-expert.md
+++ b/categories/02-language-specialists/dotnet-framework-4.8-expert.md
@@ -1,8 +1,8 @@
 ---
 name: dotnet-framework-4.8-expert
 description: "Use this agent when working on legacy .NET Framework 4.8 enterprise applications that require maintenance, modernization, or integration with Windows-based infrastructure."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior .NET Framework 4.8 expert with expertise in maintaining and modernizing legacy enterprise applications. Your focus spans Web Forms, WCF services, Windows services, and enterprise integration patterns with emphasis on stability, security, and gradual modernization of existing systems.
diff --git a/categories/02-language-specialists/elixir-expert.md b/categories/02-language-specialists/elixir-expert.md
index 4ddbc9062..94fbdb21a 100644
--- a/categories/02-language-specialists/elixir-expert.md
+++ b/categories/02-language-specialists/elixir-expert.md
@@ -1,8 +1,8 @@
 ---
 name: elixir-expert
 description: "Use this agent when you need to build fault-tolerant, concurrent systems leveraging OTP patterns, GenServer architectures, and Phoenix framework for real-time applications."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Elixir developer with deep expertise in Elixir 1.15+ and the OTP ecosystem, specializing in building fault-tolerant, concurrent, and distributed systems. Your focus spans Phoenix web applications, real-time features with LiveView, and leveraging the BEAM VM for maximum reliability and scalability.
diff --git a/categories/02-language-specialists/expo-react-native-expert.md b/categories/02-language-specialists/expo-react-native-expert.md
index 33d81a118..97fc0ea89 100644
--- a/categories/02-language-specialists/expo-react-native-expert.md
+++ b/categories/02-language-specialists/expo-react-native-expert.md
@@ -1,8 +1,8 @@
 ---
 name: expo-react-native-expert
 description: "Use when building mobile applications with Expo and React Native that require native module integration, navigation setup, performant animations, push notifications, OTA updates, or App Store/Play Store deployment."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Expo and React Native expert with deep expertise in the Expo SDK 52+, React Native 0.76+, and the modern mobile development ecosystem. Your focus spans app architecture, navigation patterns, native module integration, performance optimization, and production deployment with emphasis on building polished mobile experiences that feel truly native on both iOS and Android.
diff --git a/categories/02-language-specialists/fastapi-developer.md b/categories/02-language-specialists/fastapi-developer.md
index 6a6da354c..a7eea2d0f 100644
--- a/categories/02-language-specialists/fastapi-developer.md
+++ b/categories/02-language-specialists/fastapi-developer.md
@@ -1,8 +1,8 @@
 ---
 name: fastapi-developer
 description: "Use when building modern async Python APIs with FastAPI, implementing Pydantic v2 validation, dependency injection patterns, or deploying high-performance ASGI applications."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior FastAPI developer with expertise in FastAPI 0.100+ and modern async Python API development. Your focus spans high-performance ASGI applications, Pydantic v2 data validation, dependency injection patterns, and automatic OpenAPI documentation with emphasis on building type-safe, production-ready APIs that leverage Python's async capabilities.
diff --git a/categories/02-language-specialists/flutter-expert.md b/categories/02-language-specialists/flutter-expert.md
index 8d806a4a8..648e862aa 100644
--- a/categories/02-language-specialists/flutter-expert.md
+++ b/categories/02-language-specialists/flutter-expert.md
@@ -1,8 +1,8 @@
 ---
 name: flutter-expert
 description: "Use when building cross-platform mobile applications with Flutter 3+ that require custom UI implementation, complex state management, native platform integrations, or performance optimization across iOS/Android/Web."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Flutter expert with expertise in Flutter 3+ and cross-platform mobile development. Your focus spans architecture patterns, state management, platform-specific implementations, and performance optimization with emphasis on creating applications that feel truly native on every platform.
diff --git a/categories/02-language-specialists/golang-pro.md b/categories/02-language-specialists/golang-pro.md
index 3b20424b1..1d010b725 100644
--- a/categories/02-language-specialists/golang-pro.md
+++ b/categories/02-language-specialists/golang-pro.md
@@ -1,8 +1,8 @@
 ---
 name: golang-pro
 description: "Use when building Go applications requiring concurrent programming, high-performance systems, microservices, or cloud-native architectures where idiomatic patterns, error handling excellence, and efficiency are critical."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Go developer with deep expertise in Go 1.21+ and its ecosystem, specializing in building efficient, concurrent, and scalable systems. Your focus spans microservices architecture, CLI tools, system programming, and cloud-native applications with emphasis on performance and idiomatic code.
diff --git a/categories/02-language-specialists/java-architect.md b/categories/02-language-specialists/java-architect.md
index 841484ed6..127f6e881 100644
--- a/categories/02-language-specialists/java-architect.md
+++ b/categories/02-language-specialists/java-architect.md
@@ -1,8 +1,8 @@
 ---
 name: java-architect
 description: "Use this agent when designing enterprise Java architectures, migrating Spring Boot applications, or establishing microservices patterns for scalable cloud-native systems."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Java architect with deep expertise in Java 17+ LTS and the enterprise Java ecosystem, specializing in building scalable, cloud-native applications using Spring Boot, microservices architecture, and reactive programming. Your focus emphasizes clean architecture, SOLID principles, and production-ready solutions.
diff --git a/categories/02-language-specialists/javascript-pro.md b/categories/02-language-specialists/javascript-pro.md
index 2f45e0561..5ddf8ffb1 100644
--- a/categories/02-language-specialists/javascript-pro.md
+++ b/categories/02-language-specialists/javascript-pro.md
@@ -1,8 +1,8 @@
 ---
 name: javascript-pro
 description: "Use this agent when you need to build, optimize, or refactor modern JavaScript code for browser, Node.js, or full-stack applications requiring ES2023+ features, async patterns, or performance-critical implementations."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior JavaScript developer with mastery of modern JavaScript ES2023+ and Node.js 20+, specializing in both frontend vanilla JavaScript and Node.js backend development. Your expertise spans asynchronous patterns, functional programming, performance optimization, and the entire JavaScript ecosystem with focus on writing clean, maintainable code.
diff --git a/categories/02-language-specialists/kotlin-specialist.md b/categories/02-language-specialists/kotlin-specialist.md
index ad33bb366..62a004986 100644
--- a/categories/02-language-specialists/kotlin-specialist.md
+++ b/categories/02-language-specialists/kotlin-specialist.md
@@ -1,8 +1,8 @@
 ---
 name: kotlin-specialist
 description: "Use when building Kotlin applications requiring advanced coroutine patterns, multiplatform code sharing, or Android/server-side development with functional programming principles."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Kotlin developer with deep expertise in Kotlin 1.9+ and its ecosystem, specializing in coroutines, Kotlin Multiplatform, Android development, and server-side applications with Ktor. Your focus emphasizes idiomatic Kotlin code, functional programming patterns, and leveraging Kotlin's expressive syntax for building robust applications.
diff --git a/categories/02-language-specialists/laravel-specialist.md b/categories/02-language-specialists/laravel-specialist.md
index c806dd002..709d3db82 100644
--- a/categories/02-language-specialists/laravel-specialist.md
+++ b/categories/02-language-specialists/laravel-specialist.md
@@ -1,8 +1,8 @@
 ---
 name: laravel-specialist
 description: "Use when building Laravel 10+ applications, architecting Eloquent models with complex relationships, implementing queue systems for async processing, or optimizing API performance."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Laravel specialist with expertise in Laravel 10+ and modern PHP development. Your focus spans Laravel's elegant syntax, powerful ORM, extensive ecosystem, and enterprise features with emphasis on building applications that are both beautiful in code and powerful in functionality.
diff --git a/categories/02-language-specialists/nextjs-developer.md b/categories/02-language-specialists/nextjs-developer.md
index 18958c3ec..43a7b0a94 100644
--- a/categories/02-language-specialists/nextjs-developer.md
+++ b/categories/02-language-specialists/nextjs-developer.md
@@ -1,8 +1,8 @@
 ---
 name: nextjs-developer
 description: "Use this agent when building production Next.js 14+ applications that require full-stack development with App Router, server components, and advanced performance optimization. Invoke when you need to architect or implement complete Next.js applications, optimize Core Web Vitals, implement server actions and mutations, or deploy SEO-optimized applications."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Next.js developer with expertise in Next.js 14+ App Router and full-stack development. Your focus spans server components, edge runtime, performance optimization, and production deployment with emphasis on creating blazing-fast applications that excel in SEO and user experience.
diff --git a/categories/02-language-specialists/node-specialist.md b/categories/02-language-specialists/node-specialist.md
index d8face0a5..e5234b1b1 100644
--- a/categories/02-language-specialists/node-specialist.md
+++ b/categories/02-language-specialists/node-specialist.md
@@ -1,8 +1,8 @@
 ---
 name: node-specialist
 description: "Use this agent when you need to build, optimize, or debug Node.js backend applications, APIs, CLIs, or microservices requiring deep ecosystem knowledge and server-side JavaScript expertise."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Node.js backend developer with mastery of the Node.js runtime, V8 engine, and backend JavaScript architecture. Your expertise spans building highly scalable APIs, microservices, CLI tools, and background workers using core Node.js features and ecosystem tools.
diff --git a/categories/02-language-specialists/php-pro.md b/categories/02-language-specialists/php-pro.md
index 9b72dea21..7e7ef7697 100644
--- a/categories/02-language-specialists/php-pro.md
+++ b/categories/02-language-specialists/php-pro.md
@@ -1,8 +1,8 @@
 ---
 name: php-pro
 description: "Use this agent when working with PHP 8.3+ projects that require strict typing, modern language features, and enterprise framework expertise (Laravel or Symfony). Use when building scalable applications, optimizing performance, or requiring async/Fiber patterns."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior PHP developer with deep expertise in PHP 8.3+ and modern PHP ecosystem, specializing in enterprise applications using Laravel and Symfony frameworks. Your focus emphasizes strict typing, PSR standards compliance, async programming patterns, and building scalable, maintainable PHP applications.
diff --git a/categories/02-language-specialists/powershell-5.1-expert.md b/categories/02-language-specialists/powershell-5.1-expert.md
index d841e4b1f..0ab32bae3 100644
--- a/categories/02-language-specialists/powershell-5.1-expert.md
+++ b/categories/02-language-specialists/powershell-5.1-expert.md
@@ -1,8 +1,8 @@
 ---
 name: powershell-5.1-expert
 description: "Use when automating Windows infrastructure tasks requiring PowerShell 5.1 scripts with RSAT modules for Active Directory, DNS, DHCP, GPO management, or when building safe, enterprise-grade automation workflows in legacy .NET Framework environments."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a PowerShell 5.1 specialist focused on Windows-only automation. You ensure scripts
diff --git a/categories/02-language-specialists/powershell-7-expert.md b/categories/02-language-specialists/powershell-7-expert.md
index f1d0afbb7..14d3baa07 100644
--- a/categories/02-language-specialists/powershell-7-expert.md
+++ b/categories/02-language-specialists/powershell-7-expert.md
@@ -1,8 +1,8 @@
 ---
 name: powershell-7-expert
 description: "Use when building cross-platform cloud automation scripts, Azure infrastructure orchestration, or CI/CD pipelines requiring PowerShell 7+ with modern .NET interop, idempotent operations, and enterprise-grade error handling."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a PowerShell 7+ specialist who builds advanced, cross-platform automation
diff --git a/categories/02-language-specialists/python-pro.md b/categories/02-language-specialists/python-pro.md
index 7a6ee971a..887f2775a 100644
--- a/categories/02-language-specialists/python-pro.md
+++ b/categories/02-language-specialists/python-pro.md
@@ -1,8 +1,8 @@
 ---
 name: python-pro
 description: "Use this agent when you need to build type-safe, production-ready Python code for web APIs, system utilities, or complex applications requiring modern async patterns and extensive type coverage."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Python developer with mastery of Python 3.11+ and its ecosystem, specializing in writing idiomatic, type-safe, and performant Python code. Your expertise spans web development, data science, automation, and system programming with a focus on modern best practices and production-ready solutions.
diff --git a/categories/02-language-specialists/rails-expert.md b/categories/02-language-specialists/rails-expert.md
index d5976cb3f..0db08ed05 100644
--- a/categories/02-language-specialists/rails-expert.md
+++ b/categories/02-language-specialists/rails-expert.md
@@ -1,8 +1,8 @@
 ---
 name: rails-expert
 description: "Use when building or modernizing Rails applications requiring API development, Hotwire reactivity, real-time features, background job processing, deployment automation, or Rails-idiomatic patterns for maximum productivity. Version-aware: adapts to Rails 7.x and 8.x projects."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a principal Rails engineer with deep expertise across Rails 7.x through 8.1, Ruby 3.2 through 3.4, and the modern Rails ecosystem. Your focus spans convention-driven architecture, Hotwire for reactive UIs, API-only applications, and production deployment. You build applications that leverage Rails' full power while staying idiomatic and maintainable.
diff --git a/categories/02-language-specialists/react-specialist.md b/categories/02-language-specialists/react-specialist.md
index bdebc8053..ea4dd358a 100644
--- a/categories/02-language-specialists/react-specialist.md
+++ b/categories/02-language-specialists/react-specialist.md
@@ -1,8 +1,8 @@
 ---
 name: react-specialist
 description: "Use when optimizing existing React applications for performance, implementing advanced React 18+ features, or solving complex state management and architectural challenges within React codebases."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior React specialist with expertise in React 18+ and the modern React ecosystem. Your focus spans advanced patterns, performance optimization, state management, and production architectures with emphasis on creating scalable applications that deliver exceptional user experiences.
diff --git a/categories/02-language-specialists/rust-engineer.md b/categories/02-language-specialists/rust-engineer.md
index d4a6c562e..6f8d94147 100644
--- a/categories/02-language-specialists/rust-engineer.md
+++ b/categories/02-language-specialists/rust-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: rust-engineer
 description: "Use when building Rust systems where memory safety, ownership patterns, zero-cost abstractions, and performance optimization are critical for systems programming, embedded development, async applications, or high-performance services."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Rust engineer with deep expertise in Rust 2021 edition and its ecosystem, specializing in systems programming, embedded development, and high-performance applications. Your focus emphasizes memory safety, zero-cost abstractions, and leveraging Rust's ownership system for building reliable and efficient software.
diff --git a/categories/02-language-specialists/spring-boot-engineer.md b/categories/02-language-specialists/spring-boot-engineer.md
index 728eddb80..d0b2596e2 100644
--- a/categories/02-language-specialists/spring-boot-engineer.md
+++ b/categories/02-language-specialists/spring-boot-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: spring-boot-engineer
 description: "Use this agent when building enterprise Spring Boot 3+ applications requiring microservices architecture, cloud-native deployment, or reactive programming patterns."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Spring Boot engineer with expertise in Spring Boot 3+ and cloud-native Java development. Your focus spans microservices architecture, reactive programming, Spring Cloud ecosystem, and enterprise integration with emphasis on creating robust, scalable applications that excel in production environments.
diff --git a/categories/02-language-specialists/sql-pro.md b/categories/02-language-specialists/sql-pro.md
index 2b5502800..d156b0aa0 100644
--- a/categories/02-language-specialists/sql-pro.md
+++ b/categories/02-language-specialists/sql-pro.md
@@ -1,8 +1,8 @@
 ---
 name: sql-pro
 description: "Use this agent when you need to optimize complex SQL queries, design efficient database schemas, or solve performance issues across PostgreSQL, MySQL, SQL Server, and Oracle requiring advanced query optimization, index strategies, or data warehouse patterns."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior SQL developer with mastery across major database systems (PostgreSQL, MySQL, SQL Server, Oracle), specializing in complex query design, performance optimization, and database architecture. Your expertise spans ANSI SQL standards, platform-specific optimizations, and modern data patterns with focus on efficiency and scalability.
diff --git a/categories/02-language-specialists/swift-expert.md b/categories/02-language-specialists/swift-expert.md
index be9e08f74..f431ea2cf 100644
--- a/categories/02-language-specialists/swift-expert.md
+++ b/categories/02-language-specialists/swift-expert.md
@@ -1,8 +1,8 @@
 ---
 name: swift-expert
 description: "Use this agent when building native iOS, macOS, or server-side Swift applications requiring advanced concurrency patterns, protocol-oriented architecture, and Swift-specific optimizations. Invoke for SwiftUI modernization, async/await implementation, actor-based state management, or memory safety concerns."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Swift developer with mastery of Swift 5.9+ and Apple's development ecosystem, specializing in iOS/macOS development, SwiftUI, async/await concurrency, and server-side Swift. Your expertise emphasizes protocol-oriented design, type safety, and leveraging Swift's expressive syntax for building robust applications.
diff --git a/categories/02-language-specialists/symfony-specialist.md b/categories/02-language-specialists/symfony-specialist.md
index 93664cc28..cae63e3f5 100644
--- a/categories/02-language-specialists/symfony-specialist.md
+++ b/categories/02-language-specialists/symfony-specialist.md
@@ -1,8 +1,8 @@
 ---
 name: symfony-specialist
 description: "Use when building Symfony 6+/7+/8+ applications, architecting Doctrine ORM entities with complex relationships, implementing Messenger component for async processing, or optimizing API Platform performance."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Symfony specialist with expertise in Symfony 6+/7+/8+ and modern PHP development. Your focus spans Symfony's component-based architecture, Doctrine ORM, extensive ecosystem, and enterprise features with emphasis on building applications that are robust in design, maintainable at scale, and powerful in functionality.
diff --git a/categories/02-language-specialists/typescript-pro.md b/categories/02-language-specialists/typescript-pro.md
index dc87923e1..961299faa 100644
--- a/categories/02-language-specialists/typescript-pro.md
+++ b/categories/02-language-specialists/typescript-pro.md
@@ -1,8 +1,8 @@
 ---
 name: typescript-pro
 description: "Use when implementing TypeScript code requiring advanced type system patterns, complex generics, type-level programming, or end-to-end type safety across full-stack applications."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior TypeScript developer with mastery of TypeScript 5.0+ and its ecosystem, specializing in advanced type system features, full-stack type safety, and modern build tooling. Your expertise spans frontend frameworks, Node.js backends, and cross-platform development with focus on type safety and developer productivity.
diff --git a/categories/02-language-specialists/vue-expert.md b/categories/02-language-specialists/vue-expert.md
index 9d8fff8b5..3e816012a 100644
--- a/categories/02-language-specialists/vue-expert.md
+++ b/categories/02-language-specialists/vue-expert.md
@@ -1,8 +1,8 @@
 ---
 name: vue-expert
 description: "Use this agent when building Vue 3 applications that require Composition API mastery, reactivity optimization, or Nuxt 3 development with enterprise-scale performance concerns."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Vue expert with expertise in Vue 3 Composition API and the modern Vue ecosystem. Your focus spans reactivity mastery, component architecture, performance optimization, and full-stack development with emphasis on creating maintainable applications that leverage Vue's elegant simplicity.
diff --git a/categories/03-infrastructure/.claude-plugin/plugin.json b/categories/03-infrastructure/.zcode-plugin/plugin.json
similarity index 94%
rename from categories/03-infrastructure/.claude-plugin/plugin.json
rename to categories/03-infrastructure/.zcode-plugin/plugin.json
index 8694e21fe..f89bfa1a5 100644
--- a/categories/03-infrastructure/.claude-plugin/plugin.json
+++ b/categories/03-infrastructure/.zcode-plugin/plugin.json
@@ -1,6 +1,6 @@
 {
-  "name": "voltagent-infra",
-  "version": "1.0.1",
+  "name": "zcode-infra",
+  "version": "1.0.2",
   "description": "DevOps, cloud, and deployment specialists - Kubernetes, Terraform, AWS, Azure, GCP, and SRE",
   "author": {
     "name": "VoltAgent Community",
diff --git a/categories/03-infrastructure/azure-infra-engineer.md b/categories/03-infrastructure/azure-infra-engineer.md
index be9698d7c..629b828b7 100644
--- a/categories/03-infrastructure/azure-infra-engineer.md
+++ b/categories/03-infrastructure/azure-infra-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: azure-infra-engineer
 description: "Use when designing, deploying, or managing Azure infrastructure with focus on network architecture, Entra ID integration, PowerShell automation, and Bicep IaC."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are an Azure infrastructure specialist who designs scalable, secure, and
diff --git a/categories/03-infrastructure/cloud-architect.md b/categories/03-infrastructure/cloud-architect.md
index f434a6b06..d3a0b554e 100644
--- a/categories/03-infrastructure/cloud-architect.md
+++ b/categories/03-infrastructure/cloud-architect.md
@@ -1,6 +1,7 @@
 ---
 name: cloud-architect
 description: "Use this agent when you need to design, evaluate, or optimize cloud infrastructure architecture at scale. Invoke when designing multi-cloud strategies, planning cloud migrations, implementing disaster recovery, optimizing cloud costs, or ensuring security/compliance across cloud platforms."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
 model: inherit
 ---
diff --git a/categories/03-infrastructure/database-administrator.md b/categories/03-infrastructure/database-administrator.md
index 37fc0dc7c..c3e8195f5 100644
--- a/categories/03-infrastructure/database-administrator.md
+++ b/categories/03-infrastructure/database-administrator.md
@@ -1,8 +1,8 @@
 ---
 name: database-administrator
 description: "Use this agent when optimizing database performance, implementing high-availability architectures, setting up disaster recovery, or managing database infrastructure for production systems."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior database administrator with mastery across major database systems (PostgreSQL, MySQL, MongoDB, Redis), specializing in high-availability architectures, performance tuning, and disaster recovery. Your expertise spans installation, configuration, monitoring, and automation with focus on achieving 99.99% uptime and sub-second query performance.
diff --git a/categories/03-infrastructure/deployment-engineer.md b/categories/03-infrastructure/deployment-engineer.md
index 5f06e9d02..cde8c02ba 100644
--- a/categories/03-infrastructure/deployment-engineer.md
+++ b/categories/03-infrastructure/deployment-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: deployment-engineer
 description: "Use this agent when designing, building, or optimizing CI/CD pipelines and deployment automation strategies."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: haiku
 ---
 
 You are a senior deployment engineer with expertise in designing and implementing sophisticated CI/CD pipelines, deployment automation, and release orchestration. Your focus spans multiple deployment strategies, artifact management, and GitOps workflows with emphasis on reliability, speed, and safety in production deployments.
diff --git a/categories/03-infrastructure/devops-engineer.md b/categories/03-infrastructure/devops-engineer.md
index fab183831..85e2f19a8 100644
--- a/categories/03-infrastructure/devops-engineer.md
+++ b/categories/03-infrastructure/devops-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: devops-engineer
 description: "Use this agent when building or optimizing infrastructure automation, CI/CD pipelines, containerization strategies, and deployment workflows to accelerate software delivery while maintaining reliability and security."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior DevOps engineer with expertise in building and maintaining scalable, automated infrastructure and deployment pipelines. Your focus spans the entire software delivery lifecycle with emphasis on automation, monitoring, security integration, and fostering collaboration between development and operations teams.
diff --git a/categories/03-infrastructure/devops-incident-responder.md b/categories/03-infrastructure/devops-incident-responder.md
index a01cbd67a..defb1338e 100644
--- a/categories/03-infrastructure/devops-incident-responder.md
+++ b/categories/03-infrastructure/devops-incident-responder.md
@@ -1,8 +1,8 @@
 ---
 name: devops-incident-responder
 description: "Use when actively responding to production incidents, diagnosing critical service failures, or conducting incident postmortems to implement permanent fixes and preventative measures."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior DevOps incident responder with expertise in managing critical production incidents, performing rapid diagnostics, and implementing permanent fixes. Your focus spans incident detection, response coordination, root cause analysis, and continuous improvement with emphasis on reducing MTTR and building resilient systems.
diff --git a/categories/03-infrastructure/docker-expert.md b/categories/03-infrastructure/docker-expert.md
index d7fbd50da..b4679e580 100644
--- a/categories/03-infrastructure/docker-expert.md
+++ b/categories/03-infrastructure/docker-expert.md
@@ -1,8 +1,8 @@
 ---
 name: docker-expert
 description: "Use this agent when you need to build, optimize, or secure Docker container images and orchestration for production environments."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Docker containerization specialist with deep expertise in building, optimizing, and securing production-grade container images and orchestration. Your focus spans multi-stage builds, image optimization, security hardening, and CI/CD integration with emphasis on build efficiency, minimal image sizes, and enterprise deployment patterns.
diff --git a/categories/03-infrastructure/incident-responder.md b/categories/03-infrastructure/incident-responder.md
index 8333571e8..89f6863d1 100644
--- a/categories/03-infrastructure/incident-responder.md
+++ b/categories/03-infrastructure/incident-responder.md
@@ -1,8 +1,8 @@
 ---
 name: incident-responder
 description: "Use this agent when an active security breach, service outage, or operational incident requires immediate response, evidence preservation, and coordinated recovery."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior incident responder with expertise in managing both security breaches and operational incidents. Your focus spans rapid response, evidence preservation, impact analysis, and recovery coordination with emphasis on thorough investigation, clear communication, and continuous improvement of incident response capabilities.
diff --git a/categories/03-infrastructure/kubernetes-specialist.md b/categories/03-infrastructure/kubernetes-specialist.md
index b3492e85f..183360983 100644
--- a/categories/03-infrastructure/kubernetes-specialist.md
+++ b/categories/03-infrastructure/kubernetes-specialist.md
@@ -1,8 +1,8 @@
 ---
 name: kubernetes-specialist
 description: "Use this agent when you need to design, deploy, configure, or troubleshoot Kubernetes clusters and workloads in production environments."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Kubernetes specialist with deep expertise in designing, deploying, and managing production Kubernetes clusters. Your focus spans cluster architecture, workload orchestration, security hardening, and performance optimization with emphasis on enterprise-grade reliability, multi-tenancy, and cloud-native best practices.
diff --git a/categories/03-infrastructure/network-engineer.md b/categories/03-infrastructure/network-engineer.md
index 3d8617e41..37061d118 100644
--- a/categories/03-infrastructure/network-engineer.md
+++ b/categories/03-infrastructure/network-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: network-engineer
 description: "Use this agent when designing, optimizing, or troubleshooting cloud and hybrid network infrastructures, or when addressing network security, performance, or reliability challenges."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior network engineer with expertise in designing and managing complex network infrastructures across cloud and on-premise environments. Your focus spans network architecture, security implementation, performance optimization, and troubleshooting with emphasis on high availability, low latency, and comprehensive security.
diff --git a/categories/03-infrastructure/platform-engineer.md b/categories/03-infrastructure/platform-engineer.md
index 0a4664779..b4009fb57 100644
--- a/categories/03-infrastructure/platform-engineer.md
+++ b/categories/03-infrastructure/platform-engineer.md
@@ -1,6 +1,7 @@
 ---
 name: platform-engineer
 description: "Use when building or improving internal developer platforms (IDPs), designing self-service infrastructure, or optimizing developer workflows to reduce friction and accelerate delivery. The platform-engineer agent specializes in designing platform architecture, implementing golden paths, and maximizing developer self-service capabilities."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
 model: inherit
 ---
diff --git a/categories/03-infrastructure/security-engineer.md b/categories/03-infrastructure/security-engineer.md
index 1bdc34016..b829d9244 100644
--- a/categories/03-infrastructure/security-engineer.md
+++ b/categories/03-infrastructure/security-engineer.md
@@ -1,6 +1,7 @@
 ---
 name: security-engineer
 description: "Use this agent when implementing comprehensive security solutions across infrastructure, building automated security controls into CI/CD pipelines, or establishing compliance and vulnerability management programs. Invoke for threat modeling, zero-trust architecture design, security automation implementation, and shifting security left into development workflows."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
 model: inherit
 ---
diff --git a/categories/03-infrastructure/sre-engineer.md b/categories/03-infrastructure/sre-engineer.md
index 5439eab60..56c54eef6 100644
--- a/categories/03-infrastructure/sre-engineer.md
+++ b/categories/03-infrastructure/sre-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: sre-engineer
 description: "Use this agent when you need to establish or improve system reliability through SLO definition, error budget management, and automation. Invoke when implementing SLI/SLO frameworks, reducing operational toil, designing fault-tolerant systems, conducting chaos engineering, or optimizing incident response processes."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Site Reliability Engineer with expertise in building and maintaining highly reliable, scalable systems. Your focus spans SLI/SLO management, error budgets, capacity planning, and automation with emphasis on reducing toil, improving reliability, and enabling sustainable on-call practices.
diff --git a/categories/03-infrastructure/terraform-engineer.md b/categories/03-infrastructure/terraform-engineer.md
index 0e07309a6..cda5d1b01 100644
--- a/categories/03-infrastructure/terraform-engineer.md
+++ b/categories/03-infrastructure/terraform-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: terraform-engineer
 description: "Use when building, refactoring, or scaling infrastructure as code using Terraform with focus on multi-cloud deployments, module architecture, and enterprise-grade state management."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Terraform engineer with expertise in designing and implementing infrastructure as code across multiple cloud providers. Your focus spans module development, state management, security compliance, and CI/CD integration with emphasis on creating reusable, maintainable, and secure infrastructure code.
diff --git a/categories/03-infrastructure/terragrunt-expert.md b/categories/03-infrastructure/terragrunt-expert.md
index dee9ee3fc..793ef8e72 100644
--- a/categories/03-infrastructure/terragrunt-expert.md
+++ b/categories/03-infrastructure/terragrunt-expert.md
@@ -1,8 +1,8 @@
 ---
 name: terragrunt-expert
 description: Expert Terragrunt specialist mastering infrastructure orchestration, DRY configurations, and multi-environment deployments. Masters stacks, units, dependency management, and scalable IaC patterns with focus on code reuse, maintainability, and enterprise-grade infrastructure automation.
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior Terragrunt expert with deep expertise in orchestrating OpenTofu/Terraform infrastructure at scale. Your focus spans stack architecture, unit composition, dependency management, DRY configuration patterns, and enterprise deployment strategies with emphasis on creating maintainable, reusable, and scalable infrastructure code.
diff --git a/categories/03-infrastructure/windows-infra-admin.md b/categories/03-infrastructure/windows-infra-admin.md
index 78973aebf..bdd65f5ee 100644
--- a/categories/03-infrastructure/windows-infra-admin.md
+++ b/categories/03-infrastructure/windows-infra-admin.md
@@ -1,8 +1,8 @@
 ---
 name: windows-infra-admin
 description: "Use when managing Windows Server infrastructure, Active Directory, DNS, DHCP, and Group Policy configurations, especially for enterprise-scale deployments requiring safe automation and compliance validation."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a Windows Server and Active Directory automation expert. You design safe,
diff --git a/categories/04-quality-security/.claude-plugin/plugin.json b/categories/04-quality-security/.zcode-plugin/plugin.json
similarity index 94%
rename from categories/04-quality-security/.claude-plugin/plugin.json
rename to categories/04-quality-security/.zcode-plugin/plugin.json
index 7eb3d61c8..f5918e208 100644
--- a/categories/04-quality-security/.claude-plugin/plugin.json
+++ b/categories/04-quality-security/.zcode-plugin/plugin.json
@@ -1,6 +1,6 @@
 {
-  "name": "voltagent-qa-sec",
-  "version": "1.1.1",
+  "name": "zcode-qa-sec",
+  "version": "1.1.2",
   "description": "Testing, security, and code quality experts - code review, penetration testing, QA automation, and UI flow validation",
   "author": {
     "name": "VoltAgent Community",
diff --git a/categories/04-quality-security/accessibility-tester.md b/categories/04-quality-security/accessibility-tester.md
index 9e5f5b96f..b6c3f8502 100644
--- a/categories/04-quality-security/accessibility-tester.md
+++ b/categories/04-quality-security/accessibility-tester.md
@@ -1,8 +1,8 @@
 ---
 name: accessibility-tester
 description: "Use this agent when you need comprehensive accessibility testing, WCAG compliance verification, or assessment of assistive technology support."
+mode: subagent
 tools: Read, Grep, Glob, Bash
-model: haiku
 ---
 
 You are a senior accessibility tester with deep expertise in WCAG 2.1/3.0 standards, assistive technologies, and inclusive design principles. Your focus spans visual, auditory, motor, and cognitive accessibility with emphasis on creating universally accessible digital experiences that work for everyone.
diff --git a/categories/04-quality-security/ad-security-reviewer.md b/categories/04-quality-security/ad-security-reviewer.md
index b08671ac5..e765e5516 100644
--- a/categories/04-quality-security/ad-security-reviewer.md
+++ b/categories/04-quality-security/ad-security-reviewer.md
@@ -1,6 +1,7 @@
 ---
 name: ad-security-reviewer
 description: "Use this agent when you need to audit Active Directory security posture, evaluate privilege escalation risks, review identity delegation patterns, or assess authentication protocol hardening."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
 model: inherit
 ---
diff --git a/categories/04-quality-security/ai-writing-auditor.md b/categories/04-quality-security/ai-writing-auditor.md
index 00a90fed0..d2338e98f 100644
--- a/categories/04-quality-security/ai-writing-auditor.md
+++ b/categories/04-quality-security/ai-writing-auditor.md
@@ -1,6 +1,7 @@
 ---
 name: ai-writing-auditor
 description: "Use this agent when you need to audit content for AI writing patterns and rewrite text to remove them."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
 model: inherit
 ---
diff --git a/categories/04-quality-security/architect-reviewer.md b/categories/04-quality-security/architect-reviewer.md
index c80495c05..1702ba35c 100644
--- a/categories/04-quality-security/architect-reviewer.md
+++ b/categories/04-quality-security/architect-reviewer.md
@@ -1,6 +1,7 @@
 ---
 name: architect-reviewer
 description: "Use this agent when you need to evaluate system design decisions, architectural patterns, and technology choices at the macro level."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
 model: inherit
 ---
diff --git a/categories/04-quality-security/chaos-engineer.md b/categories/04-quality-security/chaos-engineer.md
index 84137ca63..65d203633 100644
--- a/categories/04-quality-security/chaos-engineer.md
+++ b/categories/04-quality-security/chaos-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: chaos-engineer
 description: "Use this agent when you need to design and execute controlled failure experiments, validate system resilience before incidents occur, or conduct game day exercises to test your team's incident response capabilities."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior chaos engineer with deep expertise in resilience testing, controlled failure injection, and building systems that get stronger under stress. Your focus spans infrastructure chaos, application failures, and organizational resilience with emphasis on scientific experimentation and continuous learning from controlled failures.
diff --git a/categories/04-quality-security/code-reviewer.md b/categories/04-quality-security/code-reviewer.md
index 0d3fcfac3..5337fb8a8 100644
--- a/categories/04-quality-security/code-reviewer.md
+++ b/categories/04-quality-security/code-reviewer.md
@@ -1,6 +1,7 @@
 ---
 name: code-reviewer
 description: "Use this agent when you need to conduct comprehensive code reviews focusing on code quality, security vulnerabilities, and best practices."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
 model: inherit
 ---
diff --git a/categories/04-quality-security/compliance-auditor.md b/categories/04-quality-security/compliance-auditor.md
index b398cd118..bfc10b460 100644
--- a/categories/04-quality-security/compliance-auditor.md
+++ b/categories/04-quality-security/compliance-auditor.md
@@ -1,6 +1,7 @@
 ---
 name: compliance-auditor
 description: "Use this agent when you need to achieve regulatory compliance, implement compliance controls, or prepare for audits across frameworks like GDPR, HIPAA, PCI DSS, SOC 2, and ISO standards."
+mode: subagent
 tools: Read, Grep, Glob
 model: inherit
 ---
diff --git a/categories/04-quality-security/debugger.md b/categories/04-quality-security/debugger.md
index f7449e056..874985d88 100644
--- a/categories/04-quality-security/debugger.md
+++ b/categories/04-quality-security/debugger.md
@@ -1,8 +1,8 @@
 ---
 name: debugger
 description: "Use this agent when you need to diagnose and fix bugs, identify root causes of failures, or analyze error logs and stack traces to resolve issues."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior debugging specialist with expertise in diagnosing complex software issues, analyzing system behavior, and identifying root causes. Your focus spans debugging techniques, tool mastery, and systematic problem-solving with emphasis on efficient issue resolution and knowledge transfer to prevent recurrence.
diff --git a/categories/04-quality-security/error-detective.md b/categories/04-quality-security/error-detective.md
index c5399f38a..bf6f24c07 100644
--- a/categories/04-quality-security/error-detective.md
+++ b/categories/04-quality-security/error-detective.md
@@ -1,8 +1,8 @@
 ---
 name: error-detective
 description: "Use this agent when you need to diagnose why errors are occurring in your system, correlate errors across services, identify root causes, and prevent future failures."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior error detective with expertise in analyzing complex error patterns, correlating distributed system failures, and uncovering hidden root causes. Your focus spans log analysis, error correlation, anomaly detection, and predictive error prevention with emphasis on understanding error cascades and system-wide impacts.
diff --git a/categories/04-quality-security/gdpr-ccpa-compliance.md b/categories/04-quality-security/gdpr-ccpa-compliance.md
index 7c27228f2..e4d59cb4f 100644
--- a/categories/04-quality-security/gdpr-ccpa-compliance.md
+++ b/categories/04-quality-security/gdpr-ccpa-compliance.md
@@ -1,6 +1,7 @@
 ---
 name: gdpr-ccpa-compliance
 description: Use when the user needs to understand GDPR or CCPA compliance, review data practices, or assess privacy requirements. Triggers on: 'GDPR', 'CCPA', 'privacy compliance', 'data privacy', 'right to deletion', 'consent', 'data subject rights', 'California privacy'.
+mode: subagent
 tools: Read, Grep, Glob, WebFetch, WebSearch
 ---
 
diff --git a/categories/04-quality-security/penetration-tester.md b/categories/04-quality-security/penetration-tester.md
index f2d60c959..11c82ccb2 100644
--- a/categories/04-quality-security/penetration-tester.md
+++ b/categories/04-quality-security/penetration-tester.md
@@ -1,6 +1,7 @@
 ---
 name: penetration-tester
 description: "Use this agent when you need to conduct authorized security penetration tests to identify real vulnerabilities through active exploitation and validation. Use penetration-tester for offensive security testing, vulnerability exploitation, and hands-on risk demonstration."
+mode: subagent
 tools: Read, Grep, Glob, Bash
 model: inherit
 ---
diff --git a/categories/04-quality-security/performance-engineer.md b/categories/04-quality-security/performance-engineer.md
index 0629612bc..b302a3d67 100644
--- a/categories/04-quality-security/performance-engineer.md
+++ b/categories/04-quality-security/performance-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: performance-engineer
 description: "Use this agent when you need to identify and eliminate performance bottlenecks in applications, databases, or infrastructure systems, and when baseline performance metrics need improvement."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior performance engineer with expertise in optimizing system performance, identifying bottlenecks, and ensuring scalability. Your focus spans application profiling, load testing, database optimization, and infrastructure tuning with emphasis on delivering exceptional user experience through superior performance.
diff --git a/categories/04-quality-security/powershell-security-hardening.md b/categories/04-quality-security/powershell-security-hardening.md
index 818a6f333..323939657 100644
--- a/categories/04-quality-security/powershell-security-hardening.md
+++ b/categories/04-quality-security/powershell-security-hardening.md
@@ -1,6 +1,7 @@
 ---
 name: powershell-security-hardening
 description: "Use this agent when you need to harden PowerShell automation, secure remoting configuration, enforce least-privilege design, or align scripts with enterprise security baselines and compliance frameworks."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
 model: inherit
 ---
diff --git a/categories/04-quality-security/qa-expert.md b/categories/04-quality-security/qa-expert.md
index b98c9ac57..9f64ed257 100644
--- a/categories/04-quality-security/qa-expert.md
+++ b/categories/04-quality-security/qa-expert.md
@@ -1,8 +1,8 @@
 ---
 name: qa-expert
 description: "Use this agent when you need comprehensive quality assurance strategy, test planning across the entire development cycle, or quality metrics analysis to improve overall software quality."
+mode: subagent
 tools: Read, Grep, Glob, Bash
-model: sonnet
 ---
 
 You are a senior QA expert with expertise in comprehensive quality assurance strategies, test methodologies, and quality metrics. Your focus spans test planning, execution, automation, and quality advocacy with emphasis on preventing defects, ensuring user satisfaction, and maintaining high quality standards throughout the development lifecycle.
diff --git a/categories/04-quality-security/security-auditor.md b/categories/04-quality-security/security-auditor.md
index 6e83d981c..5dad5d321 100644
--- a/categories/04-quality-security/security-auditor.md
+++ b/categories/04-quality-security/security-auditor.md
@@ -1,6 +1,7 @@
 ---
 name: security-auditor
 description: "Use this agent when conducting comprehensive security audits, compliance assessments, or risk evaluations across systems, infrastructure, and processes. Invoke when you need systematic vulnerability analysis, compliance gap identification, or evidence-based security findings."
+mode: subagent
 tools: Read, Grep, Glob
 model: inherit
 ---
diff --git a/categories/04-quality-security/test-automator.md b/categories/04-quality-security/test-automator.md
index 4ab4275a9..c99dfefdb 100644
--- a/categories/04-quality-security/test-automator.md
+++ b/categories/04-quality-security/test-automator.md
@@ -1,8 +1,8 @@
 ---
 name: test-automator
 description: "Use this agent when you need to build, implement, or enhance automated test frameworks, create test scripts, or integrate testing into CI/CD pipelines."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior test automation engineer with expertise in designing and implementing comprehensive test automation strategies. Your focus spans framework development, test script creation, CI/CD integration, and test maintenance with emphasis on achieving high coverage, fast feedback, and reliable test execution.
diff --git a/categories/04-quality-security/ui-ux-tester.md b/categories/04-quality-security/ui-ux-tester.md
index 56e7d013d..d142a858f 100644
--- a/categories/04-quality-security/ui-ux-tester.md
+++ b/categories/04-quality-security/ui-ux-tester.md
@@ -1,8 +1,8 @@
 ---
 name: ui-ux-tester
 description: "Use this agent when you need exhaustive UI and UX functionality testing driven by documented user flows, with browser or desktop interaction tooling and structured defect reporting."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep, WebSearch, chrome-mcp, computer-use
-model: sonnet
 ---
 
 You are a senior QA Automation Engineer and UX Researcher. Your primary directive is to hunt down broken user flows, confusing logic, and visual inconsistencies by rigorously testing every documented functionality unless the user explicitly excludes it. **You must pay extra attention to visual spacing—specifically identifying excessive or insufficient white space—and examine every micro-interaction and granular detail with exhaustive focus unless a specific flow is isolated.**
diff --git a/categories/05-data-ai/.claude-plugin/plugin.json b/categories/05-data-ai/.zcode-plugin/plugin.json
similarity index 92%
rename from categories/05-data-ai/.claude-plugin/plugin.json
rename to categories/05-data-ai/.zcode-plugin/plugin.json
index 27124ca17..bef74020b 100644
--- a/categories/05-data-ai/.claude-plugin/plugin.json
+++ b/categories/05-data-ai/.zcode-plugin/plugin.json
@@ -1,6 +1,6 @@
 {
-  "name": "voltagent-data-ai",
-  "version": "1.0.2",
+  "name": "zcode-data-ai",
+  "version": "1.0.3",
   "description": "Data engineering, ML, and AI specialists - data pipelines, machine learning, LLM architecture",
   "author": {
     "name": "VoltAgent Community",
diff --git a/categories/05-data-ai/ai-engineer.md b/categories/05-data-ai/ai-engineer.md
index 13287a7c1..c59c96331 100644
--- a/categories/05-data-ai/ai-engineer.md
+++ b/categories/05-data-ai/ai-engineer.md
@@ -1,6 +1,7 @@
 ---
 name: ai-engineer
 description: "Use this agent when architecting, implementing, or optimizing end-to-end AI systems—from model selection and training pipelines to production deployment and monitoring."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
 model: inherit
 ---
diff --git a/categories/05-data-ai/data-analyst.md b/categories/05-data-ai/data-analyst.md
index 5462ee681..52ecef125 100644
--- a/categories/05-data-ai/data-analyst.md
+++ b/categories/05-data-ai/data-analyst.md
@@ -1,8 +1,8 @@
 ---
 name: data-analyst
 description: "Use when you need to extract insights from business data, create dashboards and reports, or perform statistical analysis to support decision-making."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: haiku
 ---
 
 You are a senior data analyst with expertise in business intelligence, statistical analysis, and data visualization. Your focus spans SQL mastery, dashboard development, and translating complex data into clear business insights with emphasis on driving data-driven decision making and measurable business outcomes.
diff --git a/categories/05-data-ai/data-engineer.md b/categories/05-data-ai/data-engineer.md
index 91a5b1813..49c8e5c49 100644
--- a/categories/05-data-ai/data-engineer.md
+++ b/categories/05-data-ai/data-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: data-engineer
 description: "Use this agent when you need to design, build, or optimize data pipelines, ETL/ELT processes, and data infrastructure. Invoke when designing data platforms, implementing pipeline orchestration, handling data quality issues, or optimizing data processing costs."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior data engineer with expertise in designing and implementing comprehensive data platforms. Your focus spans pipeline architecture, ETL/ELT development, data lake/warehouse design, and stream processing with emphasis on scalability, reliability, and cost optimization.
diff --git a/categories/05-data-ai/data-scientist.md b/categories/05-data-ai/data-scientist.md
index 27c5d26c6..0a980505c 100644
--- a/categories/05-data-ai/data-scientist.md
+++ b/categories/05-data-ai/data-scientist.md
@@ -1,8 +1,8 @@
 ---
 name: data-scientist
 description: "Use this agent when you need to analyze data patterns, build predictive models, or extract statistical insights from datasets. Invoke this agent for exploratory analysis, hypothesis testing, machine learning model development, and translating findings into business recommendations."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior data scientist with expertise in statistical analysis, machine learning, and translating complex data into business insights. Your focus spans exploratory analysis, model development, experimentation, and communication with emphasis on rigorous methodology and actionable recommendations.
diff --git a/categories/05-data-ai/database-optimizer.md b/categories/05-data-ai/database-optimizer.md
index 134222013..5f822902a 100644
--- a/categories/05-data-ai/database-optimizer.md
+++ b/categories/05-data-ai/database-optimizer.md
@@ -1,8 +1,8 @@
 ---
 name: database-optimizer
 description: "Use this agent when you need to analyze slow queries, optimize database performance across multiple systems, or implement indexing strategies to improve query execution."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior database optimizer with expertise in performance tuning across multiple database systems. Your focus spans query optimization, index design, execution plan analysis, and system configuration with emphasis on achieving sub-second query performance and optimal resource utilization.
diff --git a/categories/05-data-ai/llm-architect.md b/categories/05-data-ai/llm-architect.md
index b9e75e246..1b47aa84c 100644
--- a/categories/05-data-ai/llm-architect.md
+++ b/categories/05-data-ai/llm-architect.md
@@ -1,6 +1,7 @@
 ---
 name: llm-architect
 description: "Use when designing LLM systems for production, implementing fine-tuning or RAG architectures, optimizing inference serving infrastructure, or managing multi-model deployments."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
 model: inherit
 ---
diff --git a/categories/05-data-ai/machine-learning-engineer.md b/categories/05-data-ai/machine-learning-engineer.md
index 5cebc6186..e47dd71da 100644
--- a/categories/05-data-ai/machine-learning-engineer.md
+++ b/categories/05-data-ai/machine-learning-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: machine-learning-engineer
 description: "Use this agent when you need to deploy, optimize, or serve machine learning models at scale in production environments."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior machine learning engineer with deep expertise in deploying and serving ML models at scale. Your focus spans model optimization, inference infrastructure, real-time serving, and edge deployment with emphasis on building reliable, performant ML systems that handle production workloads efficiently.
diff --git a/categories/05-data-ai/ml-engineer.md b/categories/05-data-ai/ml-engineer.md
index e07cdc91b..0463e9bdd 100644
--- a/categories/05-data-ai/ml-engineer.md
+++ b/categories/05-data-ai/ml-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: ml-engineer
 description: "Use this agent when building production ML systems requiring model training pipelines, model serving infrastructure, performance optimization, and automated retraining."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior ML engineer with expertise in the complete machine learning lifecycle. Your focus spans pipeline development, model training, validation, deployment, and monitoring with emphasis on building production-ready ML systems that deliver reliable predictions at scale.
diff --git a/categories/05-data-ai/mlops-engineer.md b/categories/05-data-ai/mlops-engineer.md
index 0c673e1d8..1f93a7f70 100644
--- a/categories/05-data-ai/mlops-engineer.md
+++ b/categories/05-data-ai/mlops-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: mlops-engineer
 description: "Use this agent when you need to design and implement ML infrastructure, set up CI/CD for machine learning models, establish model versioning systems, or optimize ML platforms for reliability and automation. Invoke this agent to build production-grade experiment tracking, implement automated training pipelines, configure GPU resource orchestration, and establish operational monitoring for ML systems."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior MLOps engineer with expertise in building and maintaining ML platforms. Your focus spans infrastructure automation, CI/CD pipelines, model versioning, and operational excellence with emphasis on creating scalable, reliable ML infrastructure that enables data scientists and ML engineers to work efficiently.
diff --git a/categories/05-data-ai/nlp-engineer.md b/categories/05-data-ai/nlp-engineer.md
index 331afaca5..e1fc21ab1 100644
--- a/categories/05-data-ai/nlp-engineer.md
+++ b/categories/05-data-ai/nlp-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: nlp-engineer
 description: "Use when building production NLP systems, implementing text processing pipelines, developing language models, or solving domain-specific NLP tasks like named entity recognition, sentiment analysis, or machine translation."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior NLP engineer with deep expertise in natural language processing, transformer architectures, and production NLP systems. Your focus spans text preprocessing, model fine-tuning, and building scalable NLP applications with emphasis on accuracy, multilingual support, and real-time processing capabilities.
diff --git a/categories/05-data-ai/postgres-pro.md b/categories/05-data-ai/postgres-pro.md
index 8ef81a3e2..2122a133b 100644
--- a/categories/05-data-ai/postgres-pro.md
+++ b/categories/05-data-ai/postgres-pro.md
@@ -1,8 +1,8 @@
 ---
 name: postgres-pro
 description: "Use when you need to optimize PostgreSQL performance, design high-availability replication, or troubleshoot database issues at scale. Invoke this agent for query optimization, configuration tuning, replication setup, backup strategies, and mastering advanced PostgreSQL features for enterprise deployments."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior PostgreSQL expert with mastery of database administration and optimization. Your focus spans performance tuning, replication strategies, backup procedures, and advanced PostgreSQL features with emphasis on achieving maximum reliability, performance, and scalability.
diff --git a/categories/05-data-ai/prompt-engineer.md b/categories/05-data-ai/prompt-engineer.md
index 2f06f4c29..f94db4e1a 100644
--- a/categories/05-data-ai/prompt-engineer.md
+++ b/categories/05-data-ai/prompt-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: prompt-engineer
 description: "Use this agent when you need to design, optimize, test, or evaluate prompts for large language models in production systems."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior prompt engineer with expertise in crafting and optimizing prompts for maximum effectiveness. Your focus spans prompt design patterns, evaluation methodologies, A/B testing, and production prompt management with emphasis on achieving consistent, reliable outputs while minimizing token usage and costs.
diff --git a/categories/05-data-ai/reinforcement-learning-engineer.md b/categories/05-data-ai/reinforcement-learning-engineer.md
index 962093b39..52ed30c54 100644
--- a/categories/05-data-ai/reinforcement-learning-engineer.md
+++ b/categories/05-data-ai/reinforcement-learning-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: reinforcement-learning-engineer
 description: "Use when designing RL environments, training agents with reward optimization, implementing policy gradient methods, or deploying decision-making systems for robotics, gaming, and autonomous operations."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior reinforcement learning engineer with expertise in designing, training, and deploying RL agents for complex decision-making tasks. Your focus spans environment design, reward engineering, policy optimization algorithms, and sim-to-real transfer with emphasis on building RL systems that learn optimal strategies through interaction and generalize to real-world applications.
diff --git a/categories/06-developer-experience/.claude-plugin/plugin.json b/categories/06-developer-experience/.zcode-plugin/plugin.json
similarity index 93%
rename from categories/06-developer-experience/.claude-plugin/plugin.json
rename to categories/06-developer-experience/.zcode-plugin/plugin.json
index be469fcf2..3aa694b69 100644
--- a/categories/06-developer-experience/.claude-plugin/plugin.json
+++ b/categories/06-developer-experience/.zcode-plugin/plugin.json
@@ -1,6 +1,6 @@
 {
-  "name": "voltagent-dev-exp",
-  "version": "1.0.3",
+  "name": "zcode-dev-exp",
+  "version": "1.0.4",
   "description": "Tooling and developer productivity experts - CLI tools, documentation, README generation, and DX optimization",
   "author": {
     "name": "VoltAgent Community",
diff --git a/categories/06-developer-experience/build-engineer.md b/categories/06-developer-experience/build-engineer.md
index 0db9fa2fd..fb42836e9 100644
--- a/categories/06-developer-experience/build-engineer.md
+++ b/categories/06-developer-experience/build-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: build-engineer
 description: "Use this agent when you need to optimize build performance, reduce compilation times, or scale build systems across growing teams."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: haiku
 ---
 You are a senior build engineer with expertise in optimizing build systems, reducing compilation times, and maximizing developer productivity. Your focus spans build tool configuration, caching strategies, and creating scalable build pipelines with emphasis on speed, reliability, and excellent developer experience.
 
diff --git a/categories/06-developer-experience/cli-developer.md b/categories/06-developer-experience/cli-developer.md
index fe131ed2e..c77c455c6 100644
--- a/categories/06-developer-experience/cli-developer.md
+++ b/categories/06-developer-experience/cli-developer.md
@@ -1,8 +1,8 @@
 ---
 name: cli-developer
 description: "Use this agent when building command-line tools and terminal applications that require intuitive command design, cross-platform compatibility, and optimized developer experience."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 You are a senior CLI developer with expertise in creating intuitive, efficient command-line interfaces and developer tools. Your focus spans argument parsing, interactive prompts, terminal UI, and cross-platform compatibility with emphasis on developer experience, performance, and building tools that integrate seamlessly into workflows.
 
diff --git a/categories/06-developer-experience/dependency-manager.md b/categories/06-developer-experience/dependency-manager.md
index 515d03cd8..6e68cf35e 100644
--- a/categories/06-developer-experience/dependency-manager.md
+++ b/categories/06-developer-experience/dependency-manager.md
@@ -1,8 +1,8 @@
 ---
 name: dependency-manager
 description: "Use this agent when you need to audit dependencies for vulnerabilities, resolve version conflicts, optimize bundle sizes, or implement automated dependency updates."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: haiku
 ---
 You are a senior dependency manager with expertise in managing complex dependency ecosystems. Your focus spans security vulnerability scanning, version conflict resolution, update strategies, and optimization with emphasis on maintaining secure, stable, and performant dependency management across multiple language ecosystems.
 
diff --git a/categories/06-developer-experience/docs-drift-editor.md b/categories/06-developer-experience/docs-drift-editor.md
index 582cbcbdb..f6bfa2aab 100644
--- a/categories/06-developer-experience/docs-drift-editor.md
+++ b/categories/06-developer-experience/docs-drift-editor.md
@@ -1,8 +1,8 @@
 ---
 name: docs-drift-editor
 description: "Use this agent to update Markdown documentation pages that have drifted out of sync with a code change, inside an isolated git worktree, without inventing commands, URLs, or features not present in the diff."
+mode: subagent
 tools: Read, Edit, Grep, Glob, Bash
-model: sonnet
 ---
 
 You are a precise documentation-drift editor. Your job is to update specific Markdown pages so they reflect the code changes described in a diff — nothing more. You are the execution step of a drift-detection pipeline: an upstream agent has already identified which pages drifted and why; you make the minimal edit that fixes it.
diff --git a/categories/06-developer-experience/documentation-engineer.md b/categories/06-developer-experience/documentation-engineer.md
index 74a88379d..7d93aa42b 100644
--- a/categories/06-developer-experience/documentation-engineer.md
+++ b/categories/06-developer-experience/documentation-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: documentation-engineer
 description: "Use this agent when you need to create, architect, or overhaul comprehensive documentation systems including API docs, tutorials, guides, and developer-friendly content that keeps pace with code changes."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep, WebFetch, WebSearch
-model: haiku
 ---
 You are a senior documentation engineer with expertise in creating comprehensive, maintainable, and developer-friendly documentation systems. Your focus spans API documentation, tutorials, architecture guides, and documentation automation with emphasis on clarity, searchability, and keeping docs in sync with code.
 
diff --git a/categories/06-developer-experience/dx-optimizer.md b/categories/06-developer-experience/dx-optimizer.md
index a34f3c075..7f2c5e48d 100644
--- a/categories/06-developer-experience/dx-optimizer.md
+++ b/categories/06-developer-experience/dx-optimizer.md
@@ -1,8 +1,8 @@
 ---
 name: dx-optimizer
 description: "Use this agent when optimizing the complete developer workflow including build times, feedback loops, testing efficiency, and developer satisfaction metrics across the entire development environment."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 You are a senior DX optimizer with expertise in enhancing developer productivity and happiness. Your focus spans build optimization, development server performance, IDE configuration, and workflow automation with emphasis on creating frictionless development experiences that enable developers to focus on writing code.
 
diff --git a/categories/06-developer-experience/git-workflow-manager.md b/categories/06-developer-experience/git-workflow-manager.md
index 38f2bcb8a..fb606f4f3 100644
--- a/categories/06-developer-experience/git-workflow-manager.md
+++ b/categories/06-developer-experience/git-workflow-manager.md
@@ -1,8 +1,8 @@
 ---
 name: git-workflow-manager
 description: "Use this agent when you need to design, establish, or optimize Git workflows, branching strategies, and merge management for a project or team."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: haiku
 ---
 You are a senior Git workflow manager with expertise in designing and implementing efficient version control workflows. Your focus spans branching strategies, automation, merge conflict resolution, and team collaboration with emphasis on maintaining clean history, enabling parallel development, and ensuring code quality.
 
diff --git a/categories/06-developer-experience/legacy-modernizer.md b/categories/06-developer-experience/legacy-modernizer.md
index 26ad491c5..30948dedb 100644
--- a/categories/06-developer-experience/legacy-modernizer.md
+++ b/categories/06-developer-experience/legacy-modernizer.md
@@ -1,8 +1,8 @@
 ---
 name: legacy-modernizer
 description: "Use this agent when modernizing legacy systems that need incremental migration strategies, technical debt reduction, and risk mitigation while maintaining business continuity."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 You are a senior legacy modernizer with expertise in transforming aging systems into modern architectures. Your focus spans assessment, planning, incremental migration, and risk mitigation with emphasis on maintaining business continuity while achieving technical modernization goals.
 
diff --git a/categories/06-developer-experience/mcp-developer.md b/categories/06-developer-experience/mcp-developer.md
index 045c70714..e36e9ca20 100644
--- a/categories/06-developer-experience/mcp-developer.md
+++ b/categories/06-developer-experience/mcp-developer.md
@@ -1,8 +1,8 @@
 ---
 name: mcp-developer
 description: "Use this agent when you need to build, debug, or optimize Model Context Protocol (MCP) servers and clients that connect AI systems to external tools and data sources."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 You are a senior MCP (Model Context Protocol) developer with deep expertise in building servers and clients that connect AI systems with external tools and data sources. Your focus spans protocol implementation, SDK usage, integration patterns, and production deployment with emphasis on security, performance, and developer experience.
 
diff --git a/categories/06-developer-experience/powershell-module-architect.md b/categories/06-developer-experience/powershell-module-architect.md
index 436959fc1..44058c9b9 100644
--- a/categories/06-developer-experience/powershell-module-architect.md
+++ b/categories/06-developer-experience/powershell-module-architect.md
@@ -1,8 +1,8 @@
 ---
 name: powershell-module-architect
 description: "Use this agent when architecting and refactoring PowerShell modules, designing profile systems, or creating cross-version compatible automation libraries. Invoke it for module design reviews, profile optimization, packaging reusable code, and standardizing function structure across teams."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 You are a PowerShell module and profile architect. You transform fragmented scripts
 into clean, documented, testable, reusable tooling for enterprise operations.
diff --git a/categories/06-developer-experience/powershell-ui-architect.md b/categories/06-developer-experience/powershell-ui-architect.md
index 8e1a4f756..39ee46af2 100644
--- a/categories/06-developer-experience/powershell-ui-architect.md
+++ b/categories/06-developer-experience/powershell-ui-architect.md
@@ -1,8 +1,8 @@
 ---
 name: powershell-ui-architect
 description: "Use when designing or building desktop graphical interfaces (WinForms, WPF, Metro-style dashboards) or terminal user interfaces (TUIs) for PowerShell automation tools that need clean separation between UI and business logic."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 You are a PowerShell UI architect who designs graphical and terminal interfaces
 for automation tools. You understand how to layer WinForms, WPF, TUIs, and modern
diff --git a/categories/06-developer-experience/readme-generator.md b/categories/06-developer-experience/readme-generator.md
index 64d01cdc3..33e7791d7 100644
--- a/categories/06-developer-experience/readme-generator.md
+++ b/categories/06-developer-experience/readme-generator.md
@@ -1,8 +1,8 @@
 ---
 name: readme-generator
 description: "Use this agent when you need a maintainer-ready README built from exact repository reality, with deep codebase scanning, zero hallucination, and optional git commit/push only when explicitly requested."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep, WebFetch, WebSearch
-model: sonnet
 ---
 You are a senior Developer Experience advocate and technical writer. Your primary directive is to eliminate poor, inaccurate, or lazy repository documentation. You operate on a zero-hallucination protocol: never guess an API endpoint, CLI flag, environment variable, configuration key, or setup step.
 
diff --git a/categories/06-developer-experience/refactoring-specialist.md b/categories/06-developer-experience/refactoring-specialist.md
index c8c4fdeec..ff76b3912 100644
--- a/categories/06-developer-experience/refactoring-specialist.md
+++ b/categories/06-developer-experience/refactoring-specialist.md
@@ -1,8 +1,8 @@
 ---
 name: refactoring-specialist
 description: "Use when you need to transform poorly structured, complex, or duplicated code into clean, maintainable systems while preserving all existing behavior."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 You are a senior refactoring specialist with expertise in transforming complex, poorly structured code into clean, maintainable systems. Your focus spans code smell detection, refactoring pattern application, and safe transformation techniques with emphasis on preserving behavior while dramatically improving code quality.
 
diff --git a/categories/06-developer-experience/slack-expert.md b/categories/06-developer-experience/slack-expert.md
index ae57e0fc4..538336df4 100644
--- a/categories/06-developer-experience/slack-expert.md
+++ b/categories/06-developer-experience/slack-expert.md
@@ -1,8 +1,8 @@
 ---
 name: slack-expert
 description: "Use this agent when developing Slack applications, implementing Slack API integrations, or reviewing Slack bot code for security and best practices."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep, WebFetch, WebSearch
-model: sonnet
 ---
 You are an elite Slack Platform Expert and Developer Advocate with deep expertise in the Slack API ecosystem. You have extensive hands-on experience with @slack/bolt, the Slack Web API, Events API, and the latest platform features. You're genuinely passionate about Slack's potential to transform team collaboration.
 
diff --git a/categories/06-developer-experience/tooling-engineer.md b/categories/06-developer-experience/tooling-engineer.md
index 8e485362f..bfa8e13ad 100644
--- a/categories/06-developer-experience/tooling-engineer.md
+++ b/categories/06-developer-experience/tooling-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: tooling-engineer
 description: "Use this agent when you need to build or enhance developer tools including CLIs, code generators, build tools, and IDE extensions."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 You are a senior tooling engineer with expertise in creating developer tools that enhance productivity. Your focus spans CLI development, build tools, code generators, and IDE extensions with emphasis on performance, usability, and extensibility to empower developers with efficient workflows.
 
diff --git a/categories/06-developer-experience/visual-asset-generator.md b/categories/06-developer-experience/visual-asset-generator.md
index 03f356b1b..3609622f7 100644
--- a/categories/06-developer-experience/visual-asset-generator.md
+++ b/categories/06-developer-experience/visual-asset-generator.md
@@ -1,8 +1,8 @@
 ---
 name: visual-asset-generator
 description: "Use this agent when you need to generate production-ready visual assets for a project — app icons, favicons, OG images, logos, wordmarks, or social media images. Invokes the prompt-to-asset MCP server to route generation requests across 30+ image models."
+mode: subagent
 tools: Read, Write, Bash, mcp__prompt-to-asset
-model: sonnet
 ---
 You are a visual asset generation specialist. You create production-ready visual assets by crafting precise prompts and routing them through the prompt-to-asset MCP server, which spans 30+ image generation models including Stable Diffusion, FLUX, and free-tier providers.
 
diff --git a/categories/07-specialized-domains/.claude-plugin/plugin.json b/categories/07-specialized-domains/.zcode-plugin/plugin.json
similarity index 93%
rename from categories/07-specialized-domains/.claude-plugin/plugin.json
rename to categories/07-specialized-domains/.zcode-plugin/plugin.json
index 8aee14e97..5c4668f34 100644
--- a/categories/07-specialized-domains/.claude-plugin/plugin.json
+++ b/categories/07-specialized-domains/.zcode-plugin/plugin.json
@@ -1,6 +1,6 @@
 {
-  "name": "voltagent-domains",
-  "version": "1.0.4",
+  "name": "zcode-domains",
+  "version": "1.0.5",
   "description": "Domain-specific technology experts - blockchain, fintech, gaming, IoT, payments, X/Twitter APIs",
   "author": {
     "name": "VoltAgent Community",
diff --git a/categories/07-specialized-domains/api-documenter.md b/categories/07-specialized-domains/api-documenter.md
index 2190f31e6..ef0926434 100644
--- a/categories/07-specialized-domains/api-documenter.md
+++ b/categories/07-specialized-domains/api-documenter.md
@@ -1,8 +1,8 @@
 ---
 name: api-documenter
 description: "Use this agent when creating or improving API documentation, writing OpenAPI specifications, building interactive documentation portals, or generating code examples for APIs."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep, WebFetch, WebSearch
-model: haiku
 ---
 
 You are a senior API documenter with expertise in creating world-class API documentation. Your focus spans OpenAPI specification writing, interactive documentation portals, code example generation, and documentation automation with emphasis on making APIs easy to understand, integrate, and use successfully.
diff --git a/categories/07-specialized-domains/blockchain-developer.md b/categories/07-specialized-domains/blockchain-developer.md
index b284e9658..38dc3b06b 100644
--- a/categories/07-specialized-domains/blockchain-developer.md
+++ b/categories/07-specialized-domains/blockchain-developer.md
@@ -1,8 +1,8 @@
 ---
 name: blockchain-developer
 description: "Use this agent when building smart contracts, DApps, and blockchain protocols that require expertise in Solidity, gas optimization, security auditing, and Web3 integration."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior blockchain developer with expertise in decentralized application development. Your focus spans smart contract creation, DeFi protocol design, NFT implementations, and cross-chain solutions with emphasis on security, gas optimization, and delivering innovative blockchain solutions.
diff --git a/categories/07-specialized-domains/email-deliverability-engineer.md b/categories/07-specialized-domains/email-deliverability-engineer.md
index f8fd46a83..0473e5109 100644
--- a/categories/07-specialized-domains/email-deliverability-engineer.md
+++ b/categories/07-specialized-domains/email-deliverability-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: email-deliverability-engineer
 description: "Use this agent when configuring email authentication, integrating transactional or marketing email providers, diagnosing deliverability problems, or building compliant sending infrastructure."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior email deliverability engineer with expertise in getting mail into the inbox reliably at scale. Your focus spans authentication standards, sending infrastructure, provider integration, and compliance, with emphasis on measurable inbox placement, low complaint rates, and sender reputation that survives ISP scrutiny over time.
diff --git a/categories/07-specialized-domains/embedded-systems.md b/categories/07-specialized-domains/embedded-systems.md
index 8e05ae892..ae5df0022 100644
--- a/categories/07-specialized-domains/embedded-systems.md
+++ b/categories/07-specialized-domains/embedded-systems.md
@@ -1,8 +1,8 @@
 ---
 name: embedded-systems
 description: "Use when developing firmware for resource-constrained microcontrollers, implementing RTOS-based applications, or optimizing real-time systems where hardware constraints, latency guarantees, and reliability are critical."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior embedded systems engineer with expertise in developing firmware for resource-constrained devices. Your focus spans microcontroller programming, RTOS implementation, hardware abstraction, and power optimization with emphasis on meeting real-time requirements while maximizing reliability and efficiency.
diff --git a/categories/07-specialized-domains/fintech-engineer.md b/categories/07-specialized-domains/fintech-engineer.md
index 146bf8ec4..5c13280df 100644
--- a/categories/07-specialized-domains/fintech-engineer.md
+++ b/categories/07-specialized-domains/fintech-engineer.md
@@ -1,6 +1,7 @@
 ---
 name: fintech-engineer
 description: "Use when building payment systems, financial integrations, or compliance-heavy financial applications that require secure transaction processing, regulatory adherence, and high transaction accuracy."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
 model: inherit
 ---
diff --git a/categories/07-specialized-domains/game-developer.md b/categories/07-specialized-domains/game-developer.md
index 9a62a32b6..a0bf2592f 100644
--- a/categories/07-specialized-domains/game-developer.md
+++ b/categories/07-specialized-domains/game-developer.md
@@ -1,8 +1,8 @@
 ---
 name: game-developer
 description: "Use this agent when implementing game systems, optimizing graphics rendering, building multiplayer networking, or developing gameplay mechanics for games targeting specific platforms."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior game developer with expertise in creating high-performance gaming experiences. Your focus spans engine architecture, graphics programming, gameplay systems, and multiplayer networking with emphasis on optimization, player experience, and cross-platform compatibility.
diff --git a/categories/07-specialized-domains/healthcare-admin.md b/categories/07-specialized-domains/healthcare-admin.md
index 7a556d3d5..830f12d70 100644
--- a/categories/07-specialized-domains/healthcare-admin.md
+++ b/categories/07-specialized-domains/healthcare-admin.md
@@ -1,6 +1,7 @@
 ---
 name: healthcare-admin
 description: "Use when working on healthcare administration tasks including revenue cycle management, HIPAA/compliance auditing, medical coding (ICD-10, CPT, DRGs), CMS cost reports, payer contract analysis, quality improvement, clinical operations, health IT/interoperability, population health, and pharmacy benefits."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
 model: inherit
 ---
diff --git a/categories/07-specialized-domains/hipaa-compliance.md b/categories/07-specialized-domains/hipaa-compliance.md
index 6295b2caa..ee66edf53 100644
--- a/categories/07-specialized-domains/hipaa-compliance.md
+++ b/categories/07-specialized-domains/hipaa-compliance.md
@@ -1,6 +1,7 @@
 ---
 name: hipaa-compliance
 description: Use when the user is building a healthcare product and needs to understand HIPAA compliance. Triggers on: 'HIPAA', 'protected health information', 'PHI', 'healthcare compliance', 'covered entity', 'business associate', 'BAA', 'HITECH', 'health data'.
+mode: subagent
 tools: Read, Grep, Glob, WebFetch, WebSearch
 ---
 
diff --git a/categories/07-specialized-domains/iot-engineer.md b/categories/07-specialized-domains/iot-engineer.md
index 6f16fc144..305b2b916 100644
--- a/categories/07-specialized-domains/iot-engineer.md
+++ b/categories/07-specialized-domains/iot-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: iot-engineer
 description: "Use when designing and deploying IoT solutions requiring expertise in device management, edge computing, cloud integration, and handling challenges like massive device scale, complex connectivity scenarios, or real-time data pipelines."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior IoT engineer with expertise in designing and implementing comprehensive IoT solutions. Your focus spans device connectivity, edge computing, cloud integration, and data analytics with emphasis on scalability, security, and reliability for massive IoT deployments.
diff --git a/categories/07-specialized-domains/m365-admin.md b/categories/07-specialized-domains/m365-admin.md
index 3fb9b5a93..92ff5e2d5 100644
--- a/categories/07-specialized-domains/m365-admin.md
+++ b/categories/07-specialized-domains/m365-admin.md
@@ -1,8 +1,8 @@
 ---
 name: m365-admin
 description: "Use when automating Microsoft 365 administrative tasks including Exchange Online mailbox provisioning, Teams collaboration management, SharePoint site configuration, license lifecycle management, and Graph API-driven identity automation."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are an M365 automation and administration expert responsible for designing,
diff --git a/categories/07-specialized-domains/mobile-app-developer.md b/categories/07-specialized-domains/mobile-app-developer.md
index 63f0b81c9..a834fe112 100644
--- a/categories/07-specialized-domains/mobile-app-developer.md
+++ b/categories/07-specialized-domains/mobile-app-developer.md
@@ -1,8 +1,8 @@
 ---
 name: mobile-app-developer
 description: "Use this agent when developing iOS and Android mobile applications with focus on native or cross-platform implementation, performance optimization, and platform-specific user experience."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are a senior mobile app developer with expertise in building high-performance native and cross-platform applications. Your focus spans iOS, Android, and cross-platform frameworks with emphasis on user experience, performance optimization, and adherence to platform guidelines while delivering apps that delight users.
diff --git a/categories/07-specialized-domains/payment-integration.md b/categories/07-specialized-domains/payment-integration.md
index 5cd9f9c69..e8cdb7fbb 100644
--- a/categories/07-specialized-domains/payment-integration.md
+++ b/categories/07-specialized-domains/payment-integration.md
@@ -1,6 +1,7 @@
 ---
 name: payment-integration
 description: "Use this agent when implementing payment systems, integrating payment gateways, or handling financial transactions that require PCI compliance, fraud prevention, and secure transaction processing."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
 model: inherit
 ---
diff --git a/categories/07-specialized-domains/quant-analyst.md b/categories/07-specialized-domains/quant-analyst.md
index a94375646..3ab95a290 100644
--- a/categories/07-specialized-domains/quant-analyst.md
+++ b/categories/07-specialized-domains/quant-analyst.md
@@ -1,6 +1,7 @@
 ---
 name: quant-analyst
 description: "Use this agent when you need to develop quantitative trading strategies, build financial models with rigorous mathematical foundations, or conduct advanced risk analytics for derivatives and portfolios. Invoke this agent for statistical arbitrage strategy development, backtesting with historical validation, derivatives pricing models, and portfolio risk assessment."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
 model: inherit
 ---
diff --git a/categories/07-specialized-domains/risk-manager.md b/categories/07-specialized-domains/risk-manager.md
index 748895c62..5e4c24cfa 100644
--- a/categories/07-specialized-domains/risk-manager.md
+++ b/categories/07-specialized-domains/risk-manager.md
@@ -1,6 +1,7 @@
 ---
 name: risk-manager
 description: "Use this agent when you need to identify, quantify, and mitigate enterprise-level risks across financial, operational, regulatory, and strategic domains. Invoke this agent when you need to assess risk exposure, design control frameworks, validate risk models, or ensure regulatory compliance."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
 model: inherit
 ---
diff --git a/categories/07-specialized-domains/seo-specialist.md b/categories/07-specialized-domains/seo-specialist.md
index 7952ba671..c55c2bbd0 100644
--- a/categories/07-specialized-domains/seo-specialist.md
+++ b/categories/07-specialized-domains/seo-specialist.md
@@ -1,8 +1,8 @@
 ---
 name: seo-specialist
 description: "Use this agent when you need comprehensive SEO optimization encompassing technical audits, keyword strategy, content optimization, and search rankings improvement."
+mode: subagent
 tools: Read, Grep, Glob, WebFetch, WebSearch
-model: haiku
 ---
 
 You are a senior SEO specialist with deep expertise in search engine optimization, technical SEO, content strategy, and digital marketing. Your focus spans improving organic search rankings, enhancing site architecture for crawlability, implementing structured data, and driving measurable traffic growth through data-driven SEO strategies.
diff --git a/categories/07-specialized-domains/x-api-integration.md b/categories/07-specialized-domains/x-api-integration.md
index 2d3aab59c..466841b99 100644
--- a/categories/07-specialized-domains/x-api-integration.md
+++ b/categories/07-specialized-domains/x-api-integration.md
@@ -1,8 +1,8 @@
 ---
 name: x-api-integration
 description: "Use this agent when building X/Twitter data products, integrating X API alternatives, designing tweet search workflows, or documenting social data API usage."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep, WebFetch, WebSearch
-model: haiku
 ---
 
 You are an X/Twitter API integration specialist focused on reliable social data workflows, developer-facing API design, and production-ready ingestion patterns. You help teams build search, monitoring, analytics, enrichment, and automation features around public X data while keeping authentication, rate limits, compliance, and user-facing documentation clear.
diff --git a/categories/08-business-product/.claude-plugin/plugin.json b/categories/08-business-product/.zcode-plugin/plugin.json
similarity index 94%
rename from categories/08-business-product/.claude-plugin/plugin.json
rename to categories/08-business-product/.zcode-plugin/plugin.json
index 4baa0a422..bddcaa9a7 100644
--- a/categories/08-business-product/.claude-plugin/plugin.json
+++ b/categories/08-business-product/.zcode-plugin/plugin.json
@@ -1,6 +1,6 @@
 {
-  "name": "voltagent-biz",
-  "version": "1.0.4",
+  "name": "zcode-biz",
+  "version": "1.0.5",
   "description": "Product, legal, and business specialists - product strategy, licensing, project management, UX research",
   "author": {
     "name": "VoltAgent Community",
diff --git a/categories/08-business-product/assumption-mapping.md b/categories/08-business-product/assumption-mapping.md
index d68fb642d..c3c94bbee 100644
--- a/categories/08-business-product/assumption-mapping.md
+++ b/categories/08-business-product/assumption-mapping.md
@@ -1,6 +1,7 @@
 ---
 name: assumption-mapping
 description: Use when the user needs to identify and prioritize risky assumptions in a product idea, feature, or strategy. Triggers on: 'assumptions', 'what could go wrong', 'validate', 'riskiest assumption', 'de-risk', 'assumption map'.
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep, WebFetch, WebSearch
 ---
 
diff --git a/categories/08-business-product/backlog-grooming.md b/categories/08-business-product/backlog-grooming.md
index 6eea3e5f4..cba8f2239 100644
--- a/categories/08-business-product/backlog-grooming.md
+++ b/categories/08-business-product/backlog-grooming.md
@@ -1,6 +1,7 @@
 ---
 name: backlog-grooming
 description: Use when the user needs to groom, refine, or clean up a product backlog. Triggers on: 'groom backlog', 'backlog refinement', 'backlog grooming', 'clean up backlog', 'refine stories', 'sprint refinement', 'backlog management'.
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep, WebFetch, WebSearch
 ---
 
diff --git a/categories/08-business-product/business-analyst.md b/categories/08-business-product/business-analyst.md
index 6453a32f9..b05b1b143 100644
--- a/categories/08-business-product/business-analyst.md
+++ b/categories/08-business-product/business-analyst.md
@@ -1,8 +1,8 @@
 ---
 name: business-analyst
 description: "Use when analyzing business processes, gathering requirements from stakeholders, or identifying process improvement opportunities to drive operational efficiency and measurable business value."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep, WebFetch, WebSearch
-model: sonnet
 ---
 
 You are a senior business analyst with expertise in bridging business needs and technical solutions. Your focus spans requirements elicitation, process analysis, data insights, and stakeholder management with emphasis on driving organizational efficiency and delivering tangible business outcomes.
diff --git a/categories/08-business-product/content-marketer.md b/categories/08-business-product/content-marketer.md
index bb5e043da..52f6a2349 100644
--- a/categories/08-business-product/content-marketer.md
+++ b/categories/08-business-product/content-marketer.md
@@ -1,8 +1,8 @@
 ---
 name: content-marketer
 description: "Use this agent when you need to develop comprehensive content strategies, create SEO-optimized marketing content, or execute multi-channel content campaigns to drive engagement and conversions. Invoke this agent for content planning, content creation, audience analysis, and measuring content ROI."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep, WebFetch, WebSearch
-model: haiku
 ---
 
 You are a senior content marketer with expertise in creating compelling content that drives engagement and conversions. Your focus spans content strategy, SEO, social media, and campaign management with emphasis on data-driven optimization and delivering measurable ROI through content marketing.
diff --git a/categories/08-business-product/content-quality-editor.md b/categories/08-business-product/content-quality-editor.md
index 20371ccb7..cea534a4e 100644
--- a/categories/08-business-product/content-quality-editor.md
+++ b/categories/08-business-product/content-quality-editor.md
@@ -1,8 +1,8 @@
 ---
 name: content-quality-editor
 description: "Use this agent before publishing any AI-generated content — blog posts, READMEs, release notes, commit messages, PR descriptions, documentation, or social posts. Strips AI writing patterns using unslop, then performs a final quality pass."
+mode: subagent
 tools: Read, Write, Edit, Bash
-model: haiku
 ---
 You are a content quality specialist. Your job is to take AI-generated or AI-assisted text and make it indistinguishable from writing by a thoughtful human. You use the unslop CLI to remove mechanical patterns, then apply editorial judgment for anything remaining.
 
diff --git a/categories/08-business-product/customer-success-manager.md b/categories/08-business-product/customer-success-manager.md
index 004b0dd55..b4de270fd 100644
--- a/categories/08-business-product/customer-success-manager.md
+++ b/categories/08-business-product/customer-success-manager.md
@@ -1,8 +1,8 @@
 ---
 name: customer-success-manager
 description: "Use this agent when you need to assess customer health, develop retention strategies, identify upsell opportunities, or maximize customer lifetime value. Invoke this agent for account health analysis, churn prevention, product adoption optimization, and customer success planning."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep, WebFetch, WebSearch
-model: sonnet
 ---
 
 You are a senior customer success manager with expertise in building strong customer relationships, driving product adoption, and maximizing customer lifetime value. Your focus spans onboarding, retention, and growth strategies with emphasis on proactive engagement, data-driven insights, and creating mutual success outcomes.
diff --git a/categories/08-business-product/growth-loops.md b/categories/08-business-product/growth-loops.md
index 94e592eb9..c289e00cc 100644
--- a/categories/08-business-product/growth-loops.md
+++ b/categories/08-business-product/growth-loops.md
@@ -1,6 +1,7 @@
 ---
 name: growth-loops
 description: Use when the user wants to design a growth loop, understand PLG mechanics, or build sustainable acquisition. Triggers on: 'growth loop', 'flywheel', 'viral loop', 'PLG growth', 'product-led growth', 'growth mechanics', 'how do we grow', 'word of mouth'.
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep, WebFetch, WebSearch
 ---
 
diff --git a/categories/08-business-product/landing-page-copywriter.md b/categories/08-business-product/landing-page-copywriter.md
index b15eebbcd..2a42775f4 100644
--- a/categories/08-business-product/landing-page-copywriter.md
+++ b/categories/08-business-product/landing-page-copywriter.md
@@ -1,8 +1,8 @@
 ---
 name: landing-page-copywriter
 description: "Use this agent when writing or optimizing landing page copy, hero sections, CTAs, or conversion-focused funnel content for a specific audience and offer."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep, WebFetch, WebSearch
-model: sonnet
 ---
 
 You are a senior conversion copywriter specializing in landing pages and funnel copy. Your focus spans headline strategy, above-the-fold clarity, objection handling, and microcopy, with emphasis on measurable conversion lift, message-market fit, and copy that reads as credible rather than hype-driven.
diff --git a/categories/08-business-product/legal-advisor.md b/categories/08-business-product/legal-advisor.md
index a2f4dec54..dcfb792ae 100644
--- a/categories/08-business-product/legal-advisor.md
+++ b/categories/08-business-product/legal-advisor.md
@@ -1,8 +1,8 @@
 ---
 name: legal-advisor
 description: "Use this agent when you need to draft contracts, review compliance requirements, develop IP protection strategies, or assess legal risks for technology businesses."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep, WebFetch, WebSearch
-model: sonnet
 ---
 
 You are a senior legal advisor with expertise in technology law and business protection. Your focus spans contract management, compliance frameworks, intellectual property, and risk mitigation with emphasis on providing practical legal guidance that enables business objectives while minimizing legal exposure.
diff --git a/categories/08-business-product/license-engineer.md b/categories/08-business-product/license-engineer.md
index f2a9d2040..5f03403f3 100644
--- a/categories/08-business-product/license-engineer.md
+++ b/categories/08-business-product/license-engineer.md
@@ -1,6 +1,7 @@
 ---
 name: license-engineer
 description: "Use this agent when architecting, implementing, or optimizing end-to-end legal licensing systems—from OSI standard selection and dependency compliance pipelines to proprietary deployment and risk monitoring."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep, WebFetch, WebSearch
 model: inherit
 ---
diff --git a/categories/08-business-product/product-manager.md b/categories/08-business-product/product-manager.md
index 56a95bcfb..dd8bd32b5 100644
--- a/categories/08-business-product/product-manager.md
+++ b/categories/08-business-product/product-manager.md
@@ -1,8 +1,8 @@
 ---
 name: product-manager
 description: "Use this agent when you need to make product strategy decisions, prioritize features, or define roadmap plans based on user needs and business goals."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep, WebFetch, WebSearch
-model: haiku
 ---
 
 You are a senior product manager with expertise in building successful products that delight users and achieve business objectives. Your focus spans product strategy, user research, feature prioritization, and go-to-market execution with emphasis on data-driven decisions and continuous iteration.
diff --git a/categories/08-business-product/project-manager.md b/categories/08-business-product/project-manager.md
index e2f0d71f1..38c98dc73 100644
--- a/categories/08-business-product/project-manager.md
+++ b/categories/08-business-product/project-manager.md
@@ -1,8 +1,8 @@
 ---
 name: project-manager
 description: "Use this agent when you need to establish project plans, track execution progress, manage risks, control budget/schedule, and coordinate stakeholders across complex initiatives."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep, WebFetch, WebSearch
-model: haiku
 ---
 
 You are a senior project manager with expertise in leading complex projects to successful completion. Your focus spans project planning, team coordination, risk management, and stakeholder communication with emphasis on delivering value while maintaining quality, timeline, and budget constraints.
diff --git a/categories/08-business-product/sales-engineer.md b/categories/08-business-product/sales-engineer.md
index 91a6177c5..8fdab0c7a 100644
--- a/categories/08-business-product/sales-engineer.md
+++ b/categories/08-business-product/sales-engineer.md
@@ -1,8 +1,8 @@
 ---
 name: sales-engineer
 description: "Use this agent when you need to conduct technical pre-sales activities including solution architecture, proof-of-concept development, and technical demonstrations for complex sales deals."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep, WebFetch, WebSearch
-model: sonnet
 ---
 
 You are a senior sales engineer with expertise in technical sales, solution design, and customer success enablement. Your focus spans pre-sales activities, technical validation, and architectural guidance with emphasis on demonstrating value, solving technical challenges, and accelerating the sales cycle through technical expertise.
diff --git a/categories/08-business-product/scrum-master.md b/categories/08-business-product/scrum-master.md
index 2020808d1..8a3626a46 100644
--- a/categories/08-business-product/scrum-master.md
+++ b/categories/08-business-product/scrum-master.md
@@ -1,8 +1,8 @@
 ---
 name: scrum-master
 description: "Use when teams need facilitation, process optimization, velocity improvement, or agile ceremony management—especially for sprint planning, retrospectives, impediment removal, and scaling agile practices across multiple teams."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep, WebFetch, WebSearch
-model: haiku
 ---
 
 You are a certified Scrum Master with expertise in facilitating agile teams, removing impediments, and driving continuous improvement. Your focus spans team dynamics, process optimization, and stakeholder management with emphasis on creating psychological safety, enabling self-organization, and maximizing value delivery through the Scrum framework.
diff --git a/categories/08-business-product/technical-writer.md b/categories/08-business-product/technical-writer.md
index 9cf3240e1..cecf55f94 100644
--- a/categories/08-business-product/technical-writer.md
+++ b/categories/08-business-product/technical-writer.md
@@ -1,8 +1,8 @@
 ---
 name: technical-writer
 description: "Use this agent when you need to create, improve, or maintain technical documentation including API references, user guides, SDK documentation, and getting-started guides."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep, WebFetch, WebSearch
-model: haiku
 ---
 
 You are a senior technical writer with expertise in creating comprehensive, user-friendly documentation. Your focus spans API references, user guides, tutorials, and technical content with emphasis on clarity, accuracy, and helping users succeed with technical products and services.
diff --git a/categories/08-business-product/ux-researcher.md b/categories/08-business-product/ux-researcher.md
index 43b798df2..b0c9746c6 100644
--- a/categories/08-business-product/ux-researcher.md
+++ b/categories/08-business-product/ux-researcher.md
@@ -1,8 +1,8 @@
 ---
 name: ux-researcher
 description: "Use this agent when you need to conduct user research, analyze user behavior, or generate actionable insights to validate design decisions and uncover user needs. Invoke when you need usability testing, user interviews, survey design, analytics interpretation, persona development, or competitive research to inform product strategy."
+mode: subagent
 tools: Read, Grep, Glob, WebFetch, WebSearch
-model: sonnet
 ---
 
 You are a senior UX researcher with expertise in uncovering deep user insights through mixed-methods research. Your focus spans user interviews, usability testing, and behavioral analytics with emphasis on translating research findings into actionable design recommendations that improve user experience and business outcomes.
diff --git a/categories/08-business-product/wordpress-master.md b/categories/08-business-product/wordpress-master.md
index 1c329edc3..e8bdd00c5 100644
--- a/categories/08-business-product/wordpress-master.md
+++ b/categories/08-business-product/wordpress-master.md
@@ -1,8 +1,8 @@
 ---
 name: wordpress-master
 description: "Use this agent when you need to architect, optimize, or troubleshoot WordPress implementations ranging from custom theme/plugin development to enterprise-scale multisite platforms. Invoke this agent for performance optimization, security hardening, headless WordPress APIs, WooCommerce solutions, and scaling WordPress to handle millions of visitors."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep, WebFetch, WebSearch
-model: sonnet
 ---
 
 You are a senior WordPress architect with 15+ years of expertise spanning core development, custom solutions, performance engineering, and enterprise deployments. Your mastery covers PHP/MySQL optimization, Javascript/React/Vue/Gutenberg development, REST API architecture, and turning WordPress into a powerful application framework beyond traditional CMS capabilities.
diff --git a/categories/09-meta-orchestration/.claude-plugin/plugin.json b/categories/09-meta-orchestration/.zcode-plugin/plugin.json
similarity index 85%
rename from categories/09-meta-orchestration/.claude-plugin/plugin.json
rename to categories/09-meta-orchestration/.zcode-plugin/plugin.json
index 7f5216c8d..72ad86ce3 100644
--- a/categories/09-meta-orchestration/.claude-plugin/plugin.json
+++ b/categories/09-meta-orchestration/.zcode-plugin/plugin.json
@@ -1,7 +1,7 @@
 {
-  "name": "voltagent-meta",
-  "version": "1.0.4",
-  "description": "Agent coordination and meta-programming - multi-agent orchestration, workflow automation, and safe refactor governance. Works best with other voltagent plugins installed.",
+  "name": "zcode-meta",
+  "version": "1.0.5",
+  "description": "Agent coordination and meta-programming - multi-agent orchestration, workflow automation, and safe refactor governance. Works best with other zcode plugins installed.",
   "author": {
     "name": "VoltAgent Community",
     "url": "https://github.com/VoltAgent"
diff --git a/categories/09-meta-orchestration/README.md b/categories/09-meta-orchestration/README.md
index ccf2ac3bd..91238955f 100644
--- a/categories/09-meta-orchestration/README.md
+++ b/categories/09-meta-orchestration/README.md
@@ -62,9 +62,9 @@ Task distribution expert optimizing work allocation across agents. Masters load
 **Use when:** Distributing tasks among agents, implementing load balancing, optimizing task queues, managing priorities, or scheduling agent work.
 
 ### [**taskade**](https://github.com/taskade/mcp) - AI-powered workspace with autonomous agents and MCP integration
-AI-powered workspace featuring autonomous agents, real-time collaboration, and workflow automation. Provides an MCP server for Claude Code integration, enabling task management, project orchestration, and multi-agent workflows directly from your development environment.
+AI-powered workspace featuring autonomous agents, real-time collaboration, and workflow automation. Provides an MCP server for ZCode integration, enabling task management, project orchestration, and multi-agent workflows directly from your development environment.
 
-**Use when:** Managing tasks and projects with AI agents, automating workflows across teams, orchestrating multi-agent collaboration, or integrating AI-powered project management into Claude Code via MCP. Website: [taskade.com](https://www.taskade.com)
+**Use when:** Managing tasks and projects with AI agents, automating workflows across teams, orchestrating multi-agent collaboration, or integrating AI-powered project management into ZCode via MCP. Website: [taskade.com](https://www.taskade.com)
 
 ### [**workflow-orchestrator**](workflow-orchestrator.md) - Complex workflow automation
 Workflow specialist designing and executing sophisticated AI workflows. Expert in workflow patterns, state management, and process automation. Transforms complex processes into smooth operations.
diff --git a/categories/09-meta-orchestration/agent-installer.md b/categories/09-meta-orchestration/agent-installer.md
index 7b9dc1023..acd522b2c 100644
--- a/categories/09-meta-orchestration/agent-installer.md
+++ b/categories/09-meta-orchestration/agent-installer.md
@@ -1,11 +1,11 @@
 ---
 name: agent-installer
-description: "Use this agent when the user wants to discover, browse, or install Claude Code agents from the awesome-claude-code-subagents repository."
+description: "Use this agent when the user wants to discover, browse, or install ZCode or OpenCode subagents from the awesome-zcode-subagents repository."
+mode: subagent
 tools: Bash, WebFetch, Read, Write, Glob
-model: haiku
 ---
 
-You are an agent installer that helps users browse and install Claude Code agents from the awesome-claude-code-subagents repository on GitHub.
+You are an agent installer that helps users browse and install subagents for both ZCode and OpenCode from the awesome-zcode-subagents repository on GitHub.
 
 ## Your Capabilities
 
@@ -13,15 +13,16 @@ You can:
 1. List all available agent categories
 2. List agents within a category
 3. Search for agents by name or description
-4. Install agents to global (`~/.claude/agents/`) or local (`.claude/agents/`) directory
-5. Show details about a specific agent before installing
-6. Uninstall agents
+4. Install agents to ZCode directories (`~/.zcode/agents/` or `.zcode/agents/`)
+5. Install agents to OpenCode directories (`~/.config/opencode/agents/` or `.opencode/agents/`)
+6. Show details about a specific agent before installing
+7. Uninstall agents from ZCode or OpenCode
 
 ## GitHub API Endpoints
 
-- Categories list: `https://api.github.com/repos/VoltAgent/awesome-claude-code-subagents/contents/categories`
-- Agents in category: `https://api.github.com/repos/VoltAgent/awesome-claude-code-subagents/contents/categories/{category-name}`
-- Raw agent file: `https://raw.githubusercontent.com/VoltAgent/awesome-claude-code-subagents/main/categories/{category-name}/{agent-name}.md`
+- Categories list: `https://api.github.com/repos/a2mus/awesome-zcode-subagents/contents/categories`
+- Agents in category: `https://api.github.com/repos/a2mus/awesome-zcode-subagents/contents/categories/{category-name}`
+- Raw agent file: `https://raw.githubusercontent.com/a2mus/awesome-zcode-subagents/main/categories/{category-name}/{agent-name}.md`
 
 ## Workflow
 
@@ -32,11 +33,16 @@ You can:
 4. When user selects a category, fetch and list agents in that category
 
 ### When user wants to install an agent:
-1. Ask if they want global installation (`~/.claude/agents/`) or local (`.claude/agents/`)
-2. For local: Check if `.claude/` directory exists, create `.claude/agents/` if needed
-3. Download the agent .md file from GitHub raw URL
+1. Ask for target platform if unspecified:
+   - **ZCode**: Global (`~/.zcode/agents/`) or Local (`.zcode/agents/`)
+   - **OpenCode**: Global (`~/.config/opencode/agents/`) or Project (`.opencode/agents/`)
+   - **Both**: Install into both assistants
+2. Download the agent .md file from GitHub raw URL
+3. Sanitize frontmatter:
+   - For ZCode: Ensure `name`, `description`, and `tools` are present; strip any legacy `model: sonnet|opus|haiku` lines so it inherits the primary model.
+   - For OpenCode: Ensure `mode: subagent` is set. If the agent is read-only (tools lack write/edit/bash), set `permission: { edit: deny, bash: deny }` and drop the comma-separated `tools:` string so OpenCode's schema decodes cleanly.
 4. Save to the appropriate directory
-5. Confirm successful installation
+5. Confirm successful installation and explain how to invoke it (`@<agent-name>`)
 
 ### When user wants to search:
 1. Fetch the README.md which contains all agent listings
@@ -55,12 +61,13 @@ Available categories:
 ...
 ```
 
-**User:** "Install the python-pro agent"
+**User:** "Install the python-pro agent for OpenCode"
 **You:**
-1. Ask: "Install globally (~/.claude/agents/) or locally (.claude/agents/)?"
+1. Check destination (`~/.config/opencode/agents/` or `.opencode/agents/`)
 2. Download from GitHub
-3. Save to chosen directory
-4. Confirm: "✓ Installed python-pro.md to ~/.claude/agents/"
+3. Adapt frontmatter for OpenCode (`mode: subagent`)
+4. Save to destination directory
+5. Confirm: "✓ Installed python-pro.md to ~/.config/opencode/agents/ (invoke with @python-pro)"
 
 **User:** "Search for typescript"
 **You:** Search and present matching agents with descriptions
@@ -71,7 +78,7 @@ Available categories:
 - Show the agent's description before installing if possible
 - Handle GitHub API rate limits gracefully (60 requests/hour without auth)
 - Use `curl -s` for silent downloads
-- Preserve exact file content when downloading (don't modify agent files)
+- Preserve file content when downloading and apply target-specific frontmatter formatting
 
 ## Communication Protocol
 
@@ -79,19 +86,3 @@ Available categories:
 - Use checkmarks (✓) for successful operations
 - Use clear error messages if something fails
 - Offer next steps after each action
-
-## Usage Example
-
-**User prompt:** "Use the agent installer to find out which PHP agents are available"
-
-**Agent response:**
-
-Found 3 PHP-related agents in the repository:
-
-| Agent | Description | Category |
-|-------|-------------|----------|
-| php-pro | PHP web development expert for core PHP | Language Specialists |
-| laravel-specialist | Laravel 10+ framework expert (Eloquent, Blade, etc.) | Language Specialists |
-| wordpress-master | WordPress development and optimization | Business & Product |
-
-Would you like me to install any of these agents?
diff --git a/categories/09-meta-orchestration/agent-organizer.md b/categories/09-meta-orchestration/agent-organizer.md
index 0bda250d5..c0d9970ba 100644
--- a/categories/09-meta-orchestration/agent-organizer.md
+++ b/categories/09-meta-orchestration/agent-organizer.md
@@ -1,8 +1,8 @@
 ---
 name: agent-organizer
 description: "Use when you need to break a complex task into subtasks, match each to the capabilities of available subagents, and write a concrete team/workflow plan as Markdown."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep
-model: sonnet
 ---
 
 You are an agent organizer. Given a task and a set of available agent definitions, you decompose the work, match each subtask to the agent best suited to it, and write a clear team and workflow plan. You produce a plan document — you do not execute the work, spawn agents, or run a live runtime. The orchestrator (or a human) that invokes the agents in your plan is what actually runs them.
@@ -17,7 +17,7 @@ You are an agent organizer. Given a task and a set of available agent definition
 ## Required inputs
 
 - The task or project to organize, in enough detail to decompose.
-- A glob or explicit list of available agent definition files (e.g. `categories/**/*.md`, `.claude/agents/*.md`) so you can read their `name`, `description`, and capabilities.
+- A glob or explicit list of available agent definition files (e.g. `categories/**/*.md`, `.zcode/agents/*.md`) so you can read their `name`, `description`, and capabilities.
 - Optionally, constraints that matter to the plan: ordering requirements, dependencies, or which subtasks can run in parallel.
 
 If the available-agents scope is not provided, ask for it — do not guess which agents exist.
@@ -59,7 +59,7 @@ Write the team and workflow plan as Markdown, containing:
 
 ## How coordination actually works
 
-The agents you assign are ordinary Claude Code subagents. There is no message bus, no request/response protocol, and no live service to query. Coordination happens through:
+The agents you assign are ordinary ZCode subagents. There is no message bus, no request/response protocol, and no live service to query. Coordination happens through:
 
 - **Shared files** — one agent writes an output file (a report, a `knowledge.md`, generated code) that the next agent reads. Name these handoff files explicitly in the plan.
 - **The invoking orchestrator** — whatever invokes the agents (a human, or a workflow-orchestrator) runs them in the order your plan specifies and passes the outputs along.
diff --git a/categories/09-meta-orchestration/codebase-orchestrator.md b/categories/09-meta-orchestration/codebase-orchestrator.md
index b9bb9ae34..fefcb08a8 100644
--- a/categories/09-meta-orchestration/codebase-orchestrator.md
+++ b/categories/09-meta-orchestration/codebase-orchestrator.md
@@ -1,6 +1,7 @@
 ---
 name: codebase-orchestrator
 description: "Use this agent when you need repository-wide refactor governance with explicit approval loops, weighted risk prioritization, diff previews, and deterministic fallback strategies."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep, WebFetch, airis-mcp-gateway, context-manager, error-coordinator, pied-piper, subagent-catalog:search, subagent-catalog:fetch
 model: inherit
 ---
diff --git a/categories/09-meta-orchestration/context-manager.md b/categories/09-meta-orchestration/context-manager.md
index 14d7a3b21..294186701 100644
--- a/categories/09-meta-orchestration/context-manager.md
+++ b/categories/09-meta-orchestration/context-manager.md
@@ -1,11 +1,11 @@
 ---
 name: context-manager
 description: "Use to organize the shared context and state that a multi-agent workflow keeps in files — deciding directory/file structure, naming conventions, what goes where, and how agents read and update it."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep
-model: sonnet
 ---
 
-You are a context manager for a multi-agent workflow. Agents in a Claude Code project share state through files — session notes, task history, decision logs, metadata. Your job is to keep that shared context organized, findable, and consistent: decide where things live, name them predictably, and make it clear how other agents read and update them. You work only with files.
+You are a context manager for a multi-agent workflow. Agents in a ZCode project share state through files — session notes, task history, decision logs, metadata. Your job is to keep that shared context organized, findable, and consistent: decide where things live, name them predictably, and make it clear how other agents read and update them. You work only with files.
 
 ## Scope and honesty rules
 
@@ -26,7 +26,7 @@ If the scope is not provided, ask — do not guess which files are authoritative
 
 Using only Read/Glob/Grep/Write/Edit:
 
-- **Design the layout.** Decide the directory and file structure for shared context (e.g. `.claude/context/` with `state.md`, `decisions.md`, `task-history.md`).
+- **Design the layout.** Decide the directory and file structure for shared context (e.g. `.zcode/context/` with `state.md`, `decisions.md`, `task-history.md`).
 - **Set naming conventions.** Predictable, sortable names (dates as `YYYY-MM-DD`, agent-scoped prefixes) so agents can find files by pattern.
 - **Define the schema.** Document what each file contains and the shape of each entry (headings, front matter, or a small JSON block), so every agent writes in the same format.
 - **Write the access rules.** State plainly how agents read (which file to consult for what) and update (append vs. edit-in-place, newest-first ordering, who owns which file).
@@ -37,7 +37,7 @@ Using only Read/Glob/Grep/Write/Edit:
 A simple, honest starting structure — adapt to the project:
 
 ```
-.claude/context/
+.zcode/context/
   README.md          # what each file is for and how to update it
   state.md           # current shared state / working set
   task-history.md    # completed tasks, newest first
@@ -84,7 +84,7 @@ When done, summarize: which context files exist, what each is for, the conventio
 
 ## Integration with other agents
 
-These are ordinary Claude Code subagents you may be invoked alongside. There is no message bus — coordination happens through the shared files you organize and the orchestrator that invokes each agent.
+These are ordinary ZCode subagents you may be invoked alongside. There is no message bus — coordination happens through the shared files you organize and the orchestrator that invokes each agent.
 
 - Give **agent-organizer** and **workflow-orchestrator** a clear place to read current state and record decisions.
 - Point **task-distributor** at the task-history file so workload context is in one known location.
diff --git a/categories/09-meta-orchestration/error-coordinator.md b/categories/09-meta-orchestration/error-coordinator.md
index 6c5ac7314..f60d293be 100644
--- a/categories/09-meta-orchestration/error-coordinator.md
+++ b/categories/09-meta-orchestration/error-coordinator.md
@@ -1,8 +1,8 @@
 ---
 name: error-coordinator
 description: "Use when you need to mine error logs and agent output for recurring failure and cascade patterns, then document grounded recovery and cascade-prevention strategies (as Markdown specs) that other agents or humans can act on."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep
-model: sonnet
 ---
 
 You are an error coordination specialist. You read the error output a distributed or multi-agent system leaves behind — logs, stack traces, session transcripts, CI output, incident notes — and you distill recurring failure and cascade patterns into concise, evidence-backed analysis and recovery playbooks. You work only from what is in the files. You never invent counts, recovery rates, or outcomes you did not compute yourself.
@@ -17,7 +17,7 @@ You are an error coordination specialist. You read the error output a distribute
 
 ## Required inputs
 
-- A glob or explicit list of error sources to mine (e.g. `logs/**/*.log`, `.claude/sessions/*.md`, CI output, stack-trace dumps).
+- A glob or explicit list of error sources to mine (e.g. `logs/**/*.log`, `.zcode/sessions/*.md`, CI output, stack-trace dumps).
 - Optionally, a focus (a specific error class, a suspected cascade, a time window) and the path of the recovery/playbook Markdown file to update.
 
 If the source scope is not provided, ask for it — do not guess which files to read.
@@ -91,7 +91,7 @@ When done, summarize: how many files were scanned, how many distinct failure pat
 
 ## Integration with other agents
 
-These are ordinary Claude Code subagents you can be invoked alongside; there is no message bus — coordination happens through shared files and the orchestrator that calls you.
+These are ordinary ZCode subagents you can be invoked alongside; there is no message bus — coordination happens through shared files and the orchestrator that calls you.
 
 - Read the output that **performance-monitor** produces to correlate failures with resource or latency signals.
 - Hand your recovery playbooks to **workflow-orchestrator** and **agent-organizer** so they can adjust future runs and error handling.
diff --git a/categories/09-meta-orchestration/it-ops-orchestrator.md b/categories/09-meta-orchestration/it-ops-orchestrator.md
index 5f2273e42..600e6d00f 100644
--- a/categories/09-meta-orchestration/it-ops-orchestrator.md
+++ b/categories/09-meta-orchestration/it-ops-orchestrator.md
@@ -1,8 +1,8 @@
 ---
 name: it-ops-orchestrator
 description: "Use for orchestrating complex IT operations tasks that span multiple domains (PowerShell automation, .NET development, infrastructure management, Azure, M365) by intelligently routing work to specialized agents."
+mode: subagent
 tools: Read, Write, Edit, Bash, Glob, Grep
-model: sonnet
 ---
 
 You are the central coordinator for tasks that cross multiple IT domains.  
diff --git a/categories/09-meta-orchestration/knowledge-synthesizer.md b/categories/09-meta-orchestration/knowledge-synthesizer.md
index 45849df96..7b6b10725 100644
--- a/categories/09-meta-orchestration/knowledge-synthesizer.md
+++ b/categories/09-meta-orchestration/knowledge-synthesizer.md
@@ -1,8 +1,8 @@
 ---
 name: knowledge-synthesizer
 description: "Use when you need to mine recurring patterns from agent logs, session transcripts, and workflow history, then write grounded, evidence-cited findings that other agents or humans can act on."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep
-model: sonnet
 ---
 
 You are a knowledge synthesis specialist. You read the artifacts a multi-agent system leaves behind — logs, session transcripts, error output, workflow records — and distill recurring patterns into a concise, evidence-backed knowledge file. You work only from what is in the files. You never invent metrics, counts, or outcomes you did not compute yourself.
@@ -17,7 +17,7 @@ You are a knowledge synthesis specialist. You read the artifacts a multi-agent s
 
 ## Required inputs
 
-- A glob or explicit list of source files to mine (e.g. `logs/**/*.log`, `.claude/sessions/*.md`, CI output).
+- A glob or explicit list of source files to mine (e.g. `logs/**/*.log`, `.zcode/sessions/*.md`, CI output).
 - Optionally, a focus (errors, successful workflows, tool usage) and the path of the `knowledge.md` file to update.
 
 If the source scope is not provided, ask for it — do not guess which files to read.
@@ -77,7 +77,7 @@ When done, summarize: how many files were scanned, how many distinct patterns we
 
 ## Integration with other agents
 
-These are ordinary Claude Code subagents you can be invoked alongside; there is no message bus — coordination happens through shared files and the orchestrator that calls you.
+These are ordinary ZCode subagents you can be invoked alongside; there is no message bus — coordination happens through shared files and the orchestrator that calls you.
 
 - Read the logs and outputs that **performance-monitor** and **error-coordinator** produce, and mine them for recurring signatures.
 - Hand your `knowledge.md` findings to **agent-organizer** or **workflow-orchestrator** so they can adjust future runs.
diff --git a/categories/09-meta-orchestration/multi-agent-coordinator.md b/categories/09-meta-orchestration/multi-agent-coordinator.md
index 3f4ceb29e..ec3a41794 100644
--- a/categories/09-meta-orchestration/multi-agent-coordinator.md
+++ b/categories/09-meta-orchestration/multi-agent-coordinator.md
@@ -1,16 +1,17 @@
 ---
 name: multi-agent-coordinator
 description: "Use when you need to plan how multiple concurrent subagents should communicate, sequence their work, share state through files, and handle failures — written up as a coordination plan or convention in Markdown."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep
 model: inherit
 ---
 
-You are a multi-agent coordination planner. You design how several Claude Code subagents should work together on a shared task, and you write that design down as a plan other agents (and the human orchestrator) can follow. You work from the files and requirements you are given. You do not run a live system, so you never report runtime metrics you did not observe.
+You are a multi-agent coordination planner. You design how several ZCode subagents should work together on a shared task, and you write that design down as a plan other agents (and the human orchestrator) can follow. You work from the files and requirements you are given. You do not run a live system, so you never report runtime metrics you did not observe.
 
 ## Scope and honesty rules
 
 - Your tools are `Read, Glob, Grep, Write, Edit`. You can read requirements and existing artifacts, search text, and write Markdown. You cannot run a message bus, spawn processes, open sockets, or execute a workflow engine. Do not claim to.
-- There is **no runtime message bus in this repo**. Subagents in Claude Code coordinate two ways: through shared files (one agent writes, another reads) and through the orchestrator (the agent or human that invokes subagents and passes context between them). Plan around those two mechanisms, not an imagined RPC/queue/WebSocket layer.
+- There is **no runtime message bus in this repo**. Subagents in ZCode coordinate two ways: through shared files (one agent writes, another reads) and through the orchestrator (the agent or human that invokes subagents and passes context between them). Plan around those two mechanisms, not an imagined RPC/queue/WebSocket layer.
 - Do not invent throughput, latency, efficiency, or agent-count numbers. If you have not measured something, do not state it as a fact. Describe expected behavior qualitatively and flag what is uncertain.
 - A coordination plan is a proposal. Say clearly which parts are assumptions that the orchestrator must validate against the real task.
 
@@ -55,7 +56,7 @@ When done, summarize: the agents involved, the execution order (what is sequenti
 
 ## Integration with other agents
 
-These are ordinary Claude Code subagents you can be invoked alongside; coordination happens through shared files and the orchestrator that calls them, not a message bus.
+These are ordinary ZCode subagents you can be invoked alongside; coordination happens through shared files and the orchestrator that calls them, not a message bus.
 
 - Work with **agent-organizer** on which agents to assemble for a task.
 - Support **context-manager** on where shared state files live and how they are handed off.
diff --git a/categories/09-meta-orchestration/performance-monitor.md b/categories/09-meta-orchestration/performance-monitor.md
index 6cd2312a3..9d290389b 100644
--- a/categories/09-meta-orchestration/performance-monitor.md
+++ b/categories/09-meta-orchestration/performance-monitor.md
@@ -1,8 +1,8 @@
 ---
 name: performance-monitor
 description: "Use when you need to analyze existing metric, log, and output files to spot performance patterns and anomalies, then write a grounded, evidence-cited observability plan (what to measure, thresholds, dashboards) as Markdown."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep
-model: haiku
 ---
 
 You are a performance analysis specialist. You read the metric dumps, logs, and command output a multi-agent system leaves behind, spot performance patterns and anomalies, and write a grounded observability plan in Markdown. You work only from what is in the files. You never invent latencies, throughput numbers, cost savings, or availability figures you did not read or compute yourself.
@@ -84,7 +84,7 @@ When done, summarize: how many files were scanned, how many distinct findings yo
 
 ## Integration with other agents
 
-These are ordinary Claude Code subagents you may be invoked alongside; there is no message bus — coordination happens through shared files and the orchestrator that calls you.
+These are ordinary ZCode subagents you may be invoked alongside; there is no message bus — coordination happens through shared files and the orchestrator that calls you.
 
 - Analyze the logs and output that **error-coordinator** and **workflow-orchestrator** produce, and surface the performance signatures in them.
 - Feed your findings to **knowledge-synthesizer** via shared files so it can mine recurring patterns across runs.
diff --git a/categories/09-meta-orchestration/task-distributor.md b/categories/09-meta-orchestration/task-distributor.md
index 32b55ac28..55bae93b4 100644
--- a/categories/09-meta-orchestration/task-distributor.md
+++ b/categories/09-meta-orchestration/task-distributor.md
@@ -1,8 +1,8 @@
 ---
 name: task-distributor
 description: "Use when you need to design and document a task-distribution strategy across multiple agents or workers — how to split work, order queues, respect priorities and deadlines, and balance load — written as a clear Markdown plan."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep
-model: haiku
 ---
 
 You are a task-distribution strategist. You design how work should be split across a set of agents or workers and write that plan as Markdown: queue conventions, priority rules, a load-balancing approach, and deadline handling. You reason about workloads from files you can read; you do not run a live scheduler.
@@ -75,7 +75,7 @@ Keep the plan concrete and reviewable. A short, honest strategy that names its a
 
 ## Integration with other agents
 
-These are ordinary Claude Code subagents you may be invoked alongside; there is no message bus — coordination happens through shared files and the orchestrator that calls you.
+These are ordinary ZCode subagents you may be invoked alongside; there is no message bus — coordination happens through shared files and the orchestrator that calls you.
 
 - Give your distribution plan to **multi-agent-coordinator** or **workflow-orchestrator** so they can dispatch work according to it.
 - Work with **agent-organizer** on which agents exist and what each can handle.
diff --git a/categories/09-meta-orchestration/workflow-orchestrator.md b/categories/09-meta-orchestration/workflow-orchestrator.md
index d0095491a..25aa7d93c 100644
--- a/categories/09-meta-orchestration/workflow-orchestrator.md
+++ b/categories/09-meta-orchestration/workflow-orchestrator.md
@@ -1,6 +1,7 @@
 ---
 name: workflow-orchestrator
 description: "Use when you need to design workflow and state-machine definitions — states, transitions, error handling, and compensation/rollback logic — and write them as specs or config that other agents or a runtime can execute."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep
 model: inherit
 ---
@@ -76,7 +77,7 @@ When done, summarize: what process was modeled, the states/transitions defined,
 
 ## Integration with other agents
 
-These are ordinary Claude Code subagents you may be invoked alongside; there is no message bus — coordination happens through shared files and the orchestrator that calls you.
+These are ordinary ZCode subagents you may be invoked alongside; there is no message bus — coordination happens through shared files and the orchestrator that calls you.
 
 - Take process requirements and task breakdowns from **agent-organizer** and **task-distributor**, and hand your workflow spec back for allocation.
 - Give your state/transition definitions to **multi-agent-coordinator** when the workflow spans distributed agents.
diff --git a/categories/10-research-analysis/.claude-plugin/plugin.json b/categories/10-research-analysis/.zcode-plugin/plugin.json
similarity index 92%
rename from categories/10-research-analysis/.claude-plugin/plugin.json
rename to categories/10-research-analysis/.zcode-plugin/plugin.json
index 043d102b5..30fea6792 100644
--- a/categories/10-research-analysis/.claude-plugin/plugin.json
+++ b/categories/10-research-analysis/.zcode-plugin/plugin.json
@@ -1,6 +1,6 @@
 {
-  "name": "voltagent-research",
-  "version": "1.0.4",
+  "name": "zcode-research",
+  "version": "1.0.5",
   "description": "Research, search, and analysis specialists - market research, competitive analysis, trend forecasting, and idea validation",
   "author": {
     "name": "VoltAgent Community",
diff --git a/categories/10-research-analysis/ab-test-analysis.md b/categories/10-research-analysis/ab-test-analysis.md
index 1b6a450bf..ad33456ca 100644
--- a/categories/10-research-analysis/ab-test-analysis.md
+++ b/categories/10-research-analysis/ab-test-analysis.md
@@ -1,6 +1,7 @@
 ---
 name: ab-test-analysis
 description: Use when the user wants to analyze A/B test results, interpret p-values, determine statistical significance, or make a ship/no-ship decision. Triggers on: 'analyze A/B test', 'p-value', 'statistical significance', 'confidence interval', 'ship or no ship', 'test results', 'did it work'.
+mode: subagent
 tools: Read, Grep, Glob, WebFetch, WebSearch
 ---
 
diff --git a/categories/10-research-analysis/cohort-analysis.md b/categories/10-research-analysis/cohort-analysis.md
index 296551e78..34eeae129 100644
--- a/categories/10-research-analysis/cohort-analysis.md
+++ b/categories/10-research-analysis/cohort-analysis.md
@@ -1,6 +1,7 @@
 ---
 name: cohort-analysis
 description: Use when the user wants to analyze retention, cohort behavior, engagement trends, or understand how different user groups perform over time. Triggers on: 'cohort analysis', 'retention analysis', 'user retention', 'cohort retention', 'week 1 retention', 'retention curve'.
+mode: subagent
 tools: Read, Grep, Glob, WebFetch, WebSearch
 ---
 
diff --git a/categories/10-research-analysis/competitive-analyst.md b/categories/10-research-analysis/competitive-analyst.md
index 9f8998317..8fc4ae8db 100644
--- a/categories/10-research-analysis/competitive-analyst.md
+++ b/categories/10-research-analysis/competitive-analyst.md
@@ -1,8 +1,8 @@
 ---
 name: competitive-analyst
 description: "Use when you need to analyze direct and indirect competitors, benchmark against market leaders, or develop strategies to strengthen competitive positioning and market advantage."
+mode: subagent
 tools: Read, Grep, Glob, WebFetch, WebSearch
-model: sonnet
 ---
 
 You are a senior competitive analyst with expertise in gathering and analyzing competitive intelligence. Your focus spans competitor monitoring, strategic analysis, market positioning, and opportunity identification with emphasis on providing actionable insights that drive competitive strategy and market success.
diff --git a/categories/10-research-analysis/data-researcher.md b/categories/10-research-analysis/data-researcher.md
index 8678d8d4e..b1375064e 100644
--- a/categories/10-research-analysis/data-researcher.md
+++ b/categories/10-research-analysis/data-researcher.md
@@ -1,8 +1,8 @@
 ---
 name: data-researcher
 description: "Use this agent when you need to discover, collect, and validate data from multiple sources to fuel analysis and decision-making. Invoke this agent for identifying data sources, gathering raw datasets, performing quality checks, and preparing data for downstream analysis or modeling."
+mode: subagent
 tools: Read, Grep, Glob, WebFetch, WebSearch
-model: sonnet
 ---
 
 You are a senior data researcher with expertise in discovering and analyzing data from multiple sources. Your focus spans data collection, cleaning, analysis, and visualization with emphasis on uncovering hidden patterns and delivering data-driven insights that drive strategic decisions.
diff --git a/categories/10-research-analysis/first-principles-thinking.md b/categories/10-research-analysis/first-principles-thinking.md
index 92827c1fe..97c990897 100644
--- a/categories/10-research-analysis/first-principles-thinking.md
+++ b/categories/10-research-analysis/first-principles-thinking.md
@@ -1,6 +1,7 @@
 ---
 name: first-principles-thinking
 description: Use when the user wants to challenge assumptions, break down a complex problem from scratch, or approach something with first principles reasoning. Triggers on: 'first principles', 'challenge assumptions', 'why do we do it this way', 'rethink', 'from scratch', 'fundamental truths'.
+mode: subagent
 tools: Read, Grep, Glob, WebFetch, WebSearch
 ---
 
diff --git a/categories/10-research-analysis/market-researcher.md b/categories/10-research-analysis/market-researcher.md
index 024cb9280..9bbd411e4 100644
--- a/categories/10-research-analysis/market-researcher.md
+++ b/categories/10-research-analysis/market-researcher.md
@@ -1,8 +1,8 @@
 ---
 name: market-researcher
 description: "Use this agent when you need to analyze markets, understand consumer behavior, assess competitive landscapes, and size opportunities to inform business strategy and market entry decisions."
+mode: subagent
 tools: Read, Grep, Glob, WebFetch, WebSearch
-model: sonnet
 ---
 
 You are a senior market researcher with expertise in comprehensive market analysis and consumer behavior research. Your focus spans market dynamics, customer insights, competitive landscapes, and trend identification with emphasis on delivering actionable intelligence that drives business strategy and growth.
diff --git a/categories/10-research-analysis/project-idea-validator.md b/categories/10-research-analysis/project-idea-validator.md
index 30cf90794..b50c31ce8 100644
--- a/categories/10-research-analysis/project-idea-validator.md
+++ b/categories/10-research-analysis/project-idea-validator.md
@@ -1,8 +1,8 @@
 ---
 name: project-idea-validator
 description: "Use this agent when you need an idea pressure-tested with brutal honesty, competitor teardown, market validation, and clear go/no-go guidance before building."
+mode: subagent
 tools: Read, Write, Edit, Glob, Grep, WebFetch, WebSearch
-model: sonnet
 ---
 
 You are a senior product strategist, Y Combinator-style partner, and ruthless idea validator. Your primary directive is to save developers from building products nobody wants. You operate on the fatal flaw hypothesis: assume every idea contains a market flaw, weak differentiation, hidden competitor, or adoption barrier until evidence proves otherwise.
diff --git a/categories/10-research-analysis/research-analyst.md b/categories/10-research-analysis/research-analyst.md
index b30efa27f..f64d687cd 100644
--- a/categories/10-research-analysis/research-analyst.md
+++ b/categories/10-research-analysis/research-analyst.md
@@ -1,8 +1,8 @@
 ---
 name: research-analyst
 description: "Use this agent when you need comprehensive research across multiple sources with synthesis of findings into actionable insights, trend identification, and detailed reporting."
+mode: subagent
 tools: Read, Grep, Glob, WebFetch, WebSearch
-model: sonnet
 ---
 
 You are a senior research analyst with expertise in conducting thorough research across diverse domains. Your focus spans information discovery, data synthesis, trend analysis, and insight generation with emphasis on delivering comprehensive, accurate research that enables strategic decisions.
diff --git a/categories/10-research-analysis/scientific-literature-researcher.md b/categories/10-research-analysis/scientific-literature-researcher.md
index 754bb720f..d2249d15c 100644
--- a/categories/10-research-analysis/scientific-literature-researcher.md
+++ b/categories/10-research-analysis/scientific-literature-researcher.md
@@ -1,8 +1,8 @@
 ---
 name: scientific-literature-researcher
 description: "Use when you need to search scientific literature and retrieve structured experimental data from published studies. Invoke this agent when the task requires evidence-grounded answers from full-text research papers, including methods, results, sample sizes, and quality scores."
+mode: subagent
 tools: Read, WebFetch, WebSearch, mcp__bgpt__search_papers
-model: sonnet
 ---
 
 You are a senior scientific literature researcher with expertise in evidence-based analysis and systematic review. Your focus is searching, retrieving, and synthesizing structured experimental data from published scientific studies to provide evidence-grounded answers.
diff --git a/categories/10-research-analysis/search-specialist.md b/categories/10-research-analysis/search-specialist.md
index 2fec689f8..7ef25b8de 100644
--- a/categories/10-research-analysis/search-specialist.md
+++ b/categories/10-research-analysis/search-specialist.md
@@ -1,8 +1,8 @@
 ---
 name: search-specialist
 description: "Use when you need to find specific information across multiple sources using advanced search strategies, query optimization, and targeted information retrieval. Invoke this agent when the priority is locating precise, relevant results efficiently rather than analyzing or synthesizing content."
+mode: subagent
 tools: Read, Grep, Glob, WebFetch, WebSearch
-model: sonnet
 ---
 
 You are a senior search specialist with expertise in advanced information retrieval and knowledge discovery. Your focus spans search strategy design, query optimization, source selection, and result curation with emphasis on finding precise, relevant information efficiently across any domain or source type.
diff --git a/categories/10-research-analysis/trend-analyst.md b/categories/10-research-analysis/trend-analyst.md
index cc069549b..ef2399d87 100644
--- a/categories/10-research-analysis/trend-analyst.md
+++ b/categories/10-research-analysis/trend-analyst.md
@@ -1,8 +1,8 @@
 ---
 name: trend-analyst
 description: "Use when analyzing emerging patterns, predicting industry shifts, or developing future scenarios to inform strategic planning and competitive positioning."
+mode: subagent
 tools: Read, Grep, Glob, WebFetch, WebSearch
-model: sonnet
 ---
 
 You are a senior trend analyst with expertise in detecting and analyzing emerging trends across industries and domains. Your focus spans pattern recognition, future forecasting, impact assessment, and strategic foresight with emphasis on helping organizations stay ahead of change and capitalize on emerging opportunities.
diff --git a/install-agents.sh b/install-agents.sh
index d7838c6e9..705814396 100755
--- a/install-agents.sh
+++ b/install-agents.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Claude Code Agents Installer
+# Subagents Installer for ZCode & OpenCode
 # Interactive script to install/uninstall agents from this repository
 
 set -e
@@ -11,37 +11,73 @@ GREEN='\033[0;32m'
 YELLOW='\033[1;33m'
 BLUE='\033[0;34m'
 CYAN='\033[0;36m'
+MAGENTA='\033[0;35m'
 NC='\033[0m' # No Color
 BOLD='\033[1m'
 
 # Configuration
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 CATEGORIES_DIR="$SCRIPT_DIR/categories"
-GLOBAL_AGENTS_DIR="$HOME/.claude/agents"
-LOCAL_AGENTS_DIR=".claude/agents"
-CLAUDE_AGENTS_DIR=""  # Will be set by select_install_mode
-INSTALL_MODE=""  # "global" or "local"
-SOURCE_MODE=""  # "local" or "remote"
+
+# Default directories
+ZCODE_GLOBAL_DIR="$HOME/.zcode/agents"
+ZCODE_LOCAL_DIR=".zcode/agents"
+OPENCODE_GLOBAL_DIR="$HOME/.config/opencode/agents"
+OPENCODE_LOCAL_DIR=".opencode/agents"
+
+TARGET_PLATFORM="zcode" # "zcode" or "opencode"
+TARGET_AGENTS_DIR=""    # Will be set by select_install_mode
+INSTALL_MODE=""         # "global" or "local"
+SOURCE_MODE=""          # "local" or "remote"
 
 # GitHub API configuration
-GITHUB_API_BASE="https://api.github.com/repos/VoltAgent/awesome-claude-code-subagents/contents"
-GITHUB_RAW_BASE="https://raw.githubusercontent.com/VoltAgent/awesome-claude-code-subagents/main"
+GITHUB_API_BASE="https://api.github.com/repos/a2mus/awesome-zcode-subagents/contents"
+GITHUB_RAW_BASE="https://raw.githubusercontent.com/a2mus/awesome-zcode-subagents/main"
 
 # Cache for remote data
 REMOTE_CATEGORIES=()
 REMOTE_AGENTS=()
 
-# Function to check if local .claude directory exists
-has_local_claude_dir() {
-    [[ -d ".claude" ]]
+# Parse CLI arguments
+for arg in "$@"; do
+    case "$arg" in
+        --opencode|-o)
+            TARGET_PLATFORM="opencode"
+            ;;
+        --zcode|-z)
+            TARGET_PLATFORM="zcode"
+            ;;
+        --global)
+            INSTALL_MODE="global"
+            ;;
+        --local|-p|--project)
+            INSTALL_MODE="local"
+            ;;
+        --help|-h)
+            echo "Usage: ./install-agents.sh [options]"
+            echo "Options:"
+            echo "  --opencode, -o    Target OpenCode (~/.config/opencode/agents/ or .opencode/agents/)"
+            echo "  --zcode, -z       Target ZCode (~/.zcode/agents/ or .zcode/agents/)"
+            echo "  --global          Install to user global directory"
+            echo "  --local, -p       Install to project local directory"
+            echo "  --help, -h        Show this help message"
+            exit 0
+            ;;
+    esac
+done
+
+has_local_zcode_dir() {
+    [[ -d ".zcode" ]]
+}
+
+has_local_opencode_dir() {
+    [[ -d ".opencode" ]]
 }
 
-# Function to check if local categories directory exists
 has_local_categories() {
     [[ -d "$CATEGORIES_DIR" ]]
 }
 
-# Function to check if curl is available
 check_curl() {
     if ! command -v curl &> /dev/null; then
         echo -e "${RED}Error: curl is required for remote mode but not installed.${NC}"
@@ -49,12 +85,10 @@ check_curl() {
     fi
 }
 
-# Function to fetch categories from GitHub API
 fetch_categories_remote() {
     local response
     response=$(curl -s "$GITHUB_API_BASE/categories")
 
-    # Check for rate limiting or errors
     if echo "$response" | grep -q "API rate limit exceeded"; then
         echo -e "${RED}GitHub API rate limit exceeded. Please try again later or use local mode.${NC}"
         sleep 3
@@ -67,7 +101,6 @@ fetch_categories_remote() {
         return 1
     fi
 
-    # Parse JSON response - extract directory names starting with numbers
     REMOTE_CATEGORIES=()
     while IFS= read -r line; do
         if [[ -n "$line" ]]; then
@@ -78,18 +111,15 @@ fetch_categories_remote() {
     return 0
 }
 
-# Function to fetch agents from a category via GitHub API
 fetch_agents_remote() {
     local category="$1"
     local response
     response=$(curl -s "$GITHUB_API_BASE/categories/$category")
 
-    # Check for errors
     if echo "$response" | grep -q '"message"'; then
         return 1
     fi
 
-    # Parse JSON response - extract .md files excluding README.md
     REMOTE_AGENTS=()
     while IFS= read -r line; do
         if [[ -n "$line" && "$line" != "README.md" ]]; then
@@ -100,7 +130,43 @@ fetch_agents_remote() {
     return 0
 }
 
-# Function to download an agent file from GitHub
+# Transform an agent file for OpenCode compatibility if targeting OpenCode
+format_agent_for_destination() {
+    local file_path="$1"
+    if [[ "$TARGET_PLATFORM" == "opencode" ]]; then
+        # Create temp file
+        local tmp_file="${file_path}.tmp"
+        node -e '
+        const fs = require("fs");
+        const path = process.argv[1];
+        let content = fs.readFileSync(path, "utf8");
+        const match = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
+        if (match) {
+            const fm = match[1];
+            const body = content.slice(match[0].length);
+            const descMatch = fm.match(/^description:\s*(.*)$/m);
+            const desc = descMatch ? descMatch[1].trim() : "\"Subagent\"";
+            const nameMatch = fm.match(/^name:\s*(.*)$/m);
+            const name = nameMatch ? nameMatch[1].trim() : "agent";
+            const toolsMatch = fm.match(/^tools:\s*(.*)$/m);
+            const tools = toolsMatch ? toolsMatch[1].toLowerCase() : "";
+            
+            const hasEdit = tools.includes("write") || tools.includes("edit");
+            const hasBash = tools.includes("bash");
+            
+            let newFm = `name: ${name}\ndescription: ${desc}\nmode: subagent`;
+            if (!hasEdit || !hasBash) {
+                newFm += `\npermission:`;
+                if (!hasEdit) newFm += `\n  edit: deny`;
+                if (!hasBash) newFm += `\n  bash: deny`;
+            }
+            content = `---\n${newFm}\n---${body}`;
+            fs.writeFileSync(path, content, "utf8");
+        }
+        ' "$file_path" 2>/dev/null || true
+    fi
+}
+
 download_agent() {
     local category="$1"
     local agent_file="$2"
@@ -108,15 +174,46 @@ download_agent() {
     local url="$GITHUB_RAW_BASE/categories/$category/$agent_file"
 
     if curl -sS "$url" -o "$dest_path" 2>/dev/null; then
+        sed -i.bak '/^model: \(sonnet\|opus\|haiku\)$/d' "$dest_path" 2>/dev/null && rm -f "$dest_path.bak"
+        format_agent_for_destination "$dest_path"
         return 0
     else
         return 1
     fi
 }
 
-# Function to select source mode (local or remote)
+select_platform() {
+    show_header
+    echo -e "${BOLD}Select Target Assistant Platform:${NC}\n"
+
+    echo -e "  ${YELLOW}1)${NC} ${CYAN}ZCode${NC}     - ~/.zcode/agents/ (or .zcode/agents/)"
+    echo -e "  ${YELLOW}2)${NC} ${MAGENTA}OpenCode${NC}  - ~/.config/opencode/agents/ (or .opencode/agents/)"
+    echo ""
+    echo -e "  ${YELLOW}q)${NC} Quit"
+    echo ""
+
+    read -p "Enter your choice [1-2]: " choice
+
+    case "$choice" in
+        1)
+            TARGET_PLATFORM="zcode"
+            ;;
+        2)
+            TARGET_PLATFORM="opencode"
+            ;;
+        q|Q)
+            echo -e "\n${GREEN}Goodbye!${NC}"
+            exit 0
+            ;;
+        *)
+            echo -e "${RED}Invalid choice. Defaulting to ZCode.${NC}"
+            TARGET_PLATFORM="zcode"
+            sleep 1
+            ;;
+    esac
+}
+
 select_source_mode() {
-    # If no local categories, automatically use remote
     if ! has_local_categories; then
         SOURCE_MODE="remote"
         check_curl
@@ -159,21 +256,44 @@ select_source_mode() {
     esac
 }
 
-# Function to select installation mode
 select_install_mode() {
+    local global_dir=""
+    local local_dir=""
+    local has_local=0
+
+    if [[ "$TARGET_PLATFORM" == "opencode" ]]; then
+        global_dir="$OPENCODE_GLOBAL_DIR"
+        local_dir="$OPENCODE_LOCAL_DIR"
+        has_local_opencode_dir && has_local=1
+    else
+        global_dir="$ZCODE_GLOBAL_DIR"
+        local_dir="$ZCODE_LOCAL_DIR"
+        has_local_zcode_dir && has_local=1
+    fi
+
+    if [[ -n "$INSTALL_MODE" ]]; then
+        if [[ "$INSTALL_MODE" == "local" ]]; then
+            TARGET_AGENTS_DIR="$local_dir"
+        else
+            TARGET_AGENTS_DIR="$global_dir"
+        fi
+        mkdir -p "$TARGET_AGENTS_DIR"
+        return
+    fi
+
     show_header
-    echo -e "${BOLD}Select installation mode:${NC}\n"
+    echo -e "${BOLD}Select installation mode for ${CYAN}${TARGET_PLATFORM}${NC}:${NC}\n"
 
-    echo -e "  ${YELLOW}1)${NC} Global installation ${CYAN}(~/.claude/agents/)${NC}"
+    echo -e "  ${YELLOW}1)${NC} Global installation ${CYAN}($global_dir)${NC}"
     echo -e "     Available for all projects"
     echo ""
 
-    if has_local_claude_dir; then
-        echo -e "  ${YELLOW}2)${NC} Local installation ${CYAN}(.claude/agents/)${NC}"
+    if [[ $has_local -eq 1 ]]; then
+        echo -e "  ${YELLOW}2)${NC} Local project installation ${CYAN}($local_dir)${NC}"
         echo -e "     Only for current project"
     else
-        echo -e "  ${BLUE}2)${NC} Local installation ${CYAN}(not available)${NC}"
-        echo -e "     ${YELLOW}No .claude/ directory found in current directory${NC}"
+        echo -e "  ${YELLOW}2)${NC} Local project installation ${CYAN}($local_dir)${NC}"
+        echo -e "     ${YELLOW}(Will create directory in current project)${NC}"
     fi
     echo ""
     echo -e "  ${YELLOW}q)${NC} Quit"
@@ -183,82 +303,49 @@ select_install_mode() {
 
     case "$choice" in
         1)
-            CLAUDE_AGENTS_DIR="$GLOBAL_AGENTS_DIR"
+            TARGET_AGENTS_DIR="$global_dir"
             INSTALL_MODE="global"
-            mkdir -p "$CLAUDE_AGENTS_DIR"
+            mkdir -p "$TARGET_AGENTS_DIR"
             ;;
         2)
-            if has_local_claude_dir; then
-                CLAUDE_AGENTS_DIR="$LOCAL_AGENTS_DIR"
-                INSTALL_MODE="local"
-                mkdir -p "$CLAUDE_AGENTS_DIR"
-            else
-                echo -e "\n${RED}Local installation not available. No .claude/ directory found.${NC}"
-                sleep 2
-                select_install_mode
-                return
-            fi
+            TARGET_AGENTS_DIR="$local_dir"
+            INSTALL_MODE="local"
+            mkdir -p "$TARGET_AGENTS_DIR"
             ;;
         q|Q)
             echo -e "\n${GREEN}Goodbye!${NC}"
             exit 0
             ;;
         *)
-            echo -e "${RED}Invalid choice. Please try again.${NC}"
+            echo -e "${RED}Invalid choice. Defaulting to global.${NC}"
+            TARGET_AGENTS_DIR="$global_dir"
+            INSTALL_MODE="global"
+            mkdir -p "$TARGET_AGENTS_DIR"
             sleep 1
-            select_install_mode
             ;;
     esac
 }
 
-# Function to display a header
 show_header() {
     clear
     echo -e "${BOLD}${CYAN}"
     echo "╔══════════════════════════════════════════════════════════════╗"
-    echo "║           Claude Code Agents Installer                       ║"
+    echo "║       Awesome Subagents Installer (ZCode & OpenCode)         ║"
     echo "╚══════════════════════════════════════════════════════════════╝"
     echo -e "${NC}"
-    if [[ -n "$INSTALL_MODE" ]]; then
-        local mode_str=""
-        if [[ "$INSTALL_MODE" == "global" ]]; then
-            mode_str="Global (~/.claude/agents/)"
-        else
-            mode_str="Local (.claude/agents/)"
-        fi
-
-        local source_str=""
-        if [[ "$SOURCE_MODE" == "remote" ]]; then
-            source_str=" | Source: GitHub"
-        else
-            source_str=" | Source: Local"
-        fi
-
-        echo -e "${BLUE}Mode: ${mode_str}${source_str}${NC}\n"
+    if [[ -n "$TARGET_AGENTS_DIR" ]]; then
+        local platform_color="${CYAN}"
+        [[ "$TARGET_PLATFORM" == "opencode" ]] && platform_color="${MAGENTA}"
+        echo -e "Platform: ${platform_color}${BOLD}${TARGET_PLATFORM}${NC} | Target: ${BLUE}${TARGET_AGENTS_DIR}${NC}"
+        echo ""
     fi
 }
 
-# Function to get category display name (remove number prefix)
-# Uses awk for Title Case conversion (compatible with macOS and Linux)
 get_category_name() {
     local dir="$1"
     echo "$dir" | sed 's/^[0-9]*-//' | tr '-' ' ' | awk '{for(i=1;i<=NF;i++) $i=toupper(substr($i,1,1)) tolower(substr($i,2))}1'
 }
 
-# Function to check if an agent is installed
-is_agent_installed() {
-    local agent_file="$1"
-    local agent_name=$(basename "$agent_file")
-    [[ -f "$CLAUDE_AGENTS_DIR/$agent_name" ]]
-}
-
-# Function to get agent description from frontmatter
-get_agent_description() {
-    local agent_file="$1"
-    grep -A1 "^description:" "$agent_file" 2>/dev/null | head -1 | sed 's/^description: *//' | cut -c1-60
-}
-
-# Function to display category selection menu
 select_category() {
     show_header
     echo -e "${BOLD}Select a category:${NC}\n"
@@ -267,7 +354,6 @@ select_category() {
     local i=1
 
     if [[ "$SOURCE_MODE" == "remote" ]]; then
-        # Remote mode: fetch from GitHub API
         echo -e "${CYAN}Fetching categories from GitHub...${NC}\n"
         if ! fetch_categories_remote; then
             echo -e "${RED}Failed to fetch categories. Press Enter to retry.${NC}"
@@ -283,11 +369,9 @@ select_category() {
             ((i++))
         done
     else
-        # Local mode: read from filesystem
         for dir in "$CATEGORIES_DIR"/*/; do
             if [[ -d "$dir" && $(basename "$dir") != "." ]]; then
                 local dirname=$(basename "$dir")
-                # Skip if it's not a category directory (doesn't start with number)
                 if [[ "$dirname" =~ ^[0-9]+ ]]; then
                     categories+=("$dirname")
                     local display_name=$(get_category_name "$dirname")
@@ -320,17 +404,14 @@ select_category() {
     fi
 }
 
-# Function to display agent selection menu with multi-select
 select_agents() {
     local category="$1"
     local category_name=$(get_category_name "$category")
 
-    # Build list of agents (excluding README.md)
     local agents=()
     local agent_states=()
 
     if [[ "$SOURCE_MODE" == "remote" ]]; then
-        # Remote mode: fetch from GitHub API
         show_header
         echo -e "${BOLD}Category: ${CYAN}$category_name${NC}\n"
         echo -e "${CYAN}Fetching agents from GitHub...${NC}\n"
@@ -343,21 +424,19 @@ select_agents() {
 
         for agent_file in "${REMOTE_AGENTS[@]}"; do
             agents+=("$agent_file")
-            # Check if installed (by filename)
-            if [[ -f "$CLAUDE_AGENTS_DIR/$agent_file" ]]; then
+            if [[ -f "$TARGET_AGENTS_DIR/$agent_file" ]]; then
                 agent_states+=(1)
             else
                 agent_states+=(0)
             fi
         done
     else
-        # Local mode: read from filesystem
         local category_path="$CATEGORIES_DIR/$category"
         for agent_file in "$category_path"/*.md; do
             local basename=$(basename "$agent_file")
             if [[ "$basename" != "README.md" ]]; then
                 agents+=("$basename")
-                if [[ -f "$CLAUDE_AGENTS_DIR/$basename" ]]; then
+                if [[ -f "$TARGET_AGENTS_DIR/$basename" ]]; then
                     agent_states+=(1)
                 else
                     agent_states+=(0)
@@ -366,9 +445,6 @@ select_agents() {
         done
     fi
 
-    # Store original states to calculate changes
-    local original_states=("${agent_states[@]}")
-
     while true; do
         show_header
         echo -e "${BOLD}Category: ${CYAN}$category_name${NC}\n"
@@ -381,7 +457,7 @@ select_agents() {
             local status_icon=""
             local status_color=""
 
-            if [[ -f "$CLAUDE_AGENTS_DIR/$agent_file" ]]; then
+            if [[ -f "$TARGET_AGENTS_DIR/$agent_file" ]]; then
                 is_installed=" ${BLUE}(installed)${NC}"
             fi
 
@@ -410,7 +486,6 @@ select_agents() {
         case "$choice" in
             [0-9]*)
                 if (( choice >= 1 && choice <= ${#agents[@]} )); then
-                    # Toggle selection
                     local idx=$((choice-1))
                     if [[ ${agent_states[$idx]} -eq 1 ]]; then
                         agent_states[$idx]=0
@@ -430,17 +505,14 @@ select_agents() {
                 done
                 ;;
             c|C)
-                # Calculate changes
                 local to_install=()
                 local to_uninstall=()
 
                 for i in "${!agents[@]}"; do
                     local agent_file="${agents[$i]}"
                     local is_selected=${agent_states[$i]}
-
-                    # Check if currently installed
                     local was_installed=0
-                    if [[ -f "$CLAUDE_AGENTS_DIR/$agent_file" ]]; then
+                    if [[ -f "$TARGET_AGENTS_DIR/$agent_file" ]]; then
                         was_installed=1
                     fi
 
@@ -465,17 +537,14 @@ select_agents() {
     done
 }
 
-# Function to confirm and apply changes
 confirm_and_apply() {
     local category="$1"
     local install_list="$2"
     local uninstall_list="$3"
 
-    # Convert space-separated strings back to arrays
     IFS=' ' read -ra to_install <<< "$install_list"
     IFS=' ' read -ra to_uninstall <<< "$uninstall_list"
 
-    # Filter out empty entries
     local install_count=0
     local uninstall_count=0
 
@@ -525,33 +594,30 @@ confirm_and_apply() {
     if [[ "$confirm" == "y" || "$confirm" == "Y" ]]; then
         echo ""
 
-        # Perform installations
         for agent_file in "${to_install[@]}"; do
             if [[ -n "$agent_file" ]]; then
                 if [[ "$SOURCE_MODE" == "remote" ]]; then
-                    # Download from GitHub
                     echo -e "${CYAN}Downloading $agent_file...${NC}"
-                    if download_agent "$category" "$agent_file" "$CLAUDE_AGENTS_DIR/$agent_file"; then
+                    if download_agent "$category" "$agent_file" "$TARGET_AGENTS_DIR/$agent_file"; then
                         echo -e "${GREEN}✓${NC} Installed: $agent_file"
                     else
                         echo -e "${RED}✗${NC} Failed to download: $agent_file"
                     fi
                 else
-                    # Copy from local
                     local source_path="$CATEGORIES_DIR/$category/$agent_file"
                     if [[ -f "$source_path" ]]; then
-                        cp "$source_path" "$CLAUDE_AGENTS_DIR/$agent_file"
+                        cp "$source_path" "$TARGET_AGENTS_DIR/$agent_file"
+                        format_agent_for_destination "$TARGET_AGENTS_DIR/$agent_file"
                         echo -e "${GREEN}✓${NC} Installed: $agent_file"
                     fi
                 fi
             fi
         done
 
-        # Perform uninstallations
         for agent_file in "${to_uninstall[@]}"; do
             if [[ -n "$agent_file" ]]; then
-                if [[ -f "$CLAUDE_AGENTS_DIR/$agent_file" ]]; then
-                    rm "$CLAUDE_AGENTS_DIR/$agent_file"
+                if [[ -f "$TARGET_AGENTS_DIR/$agent_file" ]]; then
+                    rm "$TARGET_AGENTS_DIR/$agent_file"
                     echo -e "${RED}✓${NC} Uninstalled: $agent_file"
                 fi
             fi
@@ -567,8 +633,8 @@ confirm_and_apply() {
     read -p "Press Enter to continue..."
 }
 
-# Main loop
 main() {
+    select_platform
     select_install_mode
     select_source_mode
     while true; do
@@ -579,5 +645,4 @@ main() {
     done
 }
 
-# Run main function
 main
diff --git a/package.json b/package.json
new file mode 100644
index 000000000..a4ed57605
--- /dev/null
+++ b/package.json
@@ -0,0 +1,44 @@
+{
+  "name": "awesome-zcode-subagents",
+  "version": "1.1.0",
+  "description": "Interactive installer and catalog for 158+ curated subagents across 10 categories for ZCode and OpenCode",
+  "bin": {
+    "awesome-zcode-subagents": "./bin/cli.js",
+    "zcode-subagents": "./bin/cli.js",
+    "opencode-subagents": "./bin/cli.js"
+  },
+  "files": [
+    "bin",
+    "categories",
+    "README.md",
+    "LICENSE"
+  ],
+  "scripts": {
+    "start": "node ./bin/cli.js"
+  },
+  "keywords": [
+    "zcode",
+    "opencode",
+    "opencode-agents",
+    "opencode-subagents",
+    "subagents",
+    "ai",
+    "installer",
+    "cli",
+    "agents"
+  ],
+  "author": "a2mus",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/a2mus/awesome-zcode-subagents.git"
+  },
+  "bugs": {
+    "url": "https://github.com/a2mus/awesome-zcode-subagents/issues"
+  },
+  "homepage": "https://github.com/a2mus/awesome-zcode-subagents#readme",
+  "engines": {
+    "node": ">=16.0.0"
+  },
+  "preferGlobal": true
+}
diff --git a/tools/subagent-catalog/README.md b/tools/subagent-catalog/README.md
index bb79871de..b7820ddf7 100644
--- a/tools/subagent-catalog/README.md
+++ b/tools/subagent-catalog/README.md
@@ -1,13 +1,13 @@
 # subagent-catalog
 
-A Claude Code skill for browsing and fetching subagents from the [awesome-claude-code-subagents](https://github.com/VoltAgent/awesome-claude-code-subagents) catalog.
+A ZCode skill for browsing and fetching subagents from the awesome-zcode-subagents catalog.
 
 ## Installation
 
-Copy the `subagent-catalog/` folder to `~/.claude/commands/`:
+Copy the `subagent-catalog/` folder to `~/.zcode/commands/`:
 
 ```bash
-cp -r tools/subagent-catalog ~/.claude/commands/
+cp -r tools/subagent-catalog ~/.zcode/commands/
 ```
 
 ## Usage
@@ -41,11 +41,11 @@ cp -r tools/subagent-catalog ~/.claude/commands/
 - **Smart caching**: 12-hour TTL with graceful fallback on network failure
 - **Atomic updates**: Uses tmp file + mv pattern to prevent partial writes
 - **Cross-platform**: Works on macOS and Linux
-- **Best practices**: Follows Anthropic skill authoring guidelines
+- **Best practices**: Follows ZCode command authoring conventions
 
 ## Cache
 
-- **Location**: `~/.claude/cache/subagent-catalog.md`
+- **Location**: `~/.zcode/cache/subagent-catalog.md`
 - **TTL**: 12 hours (configurable in `config.sh`)
 - **Behavior**: Auto-refreshes when stale, falls back to old cache on network failure
 
diff --git a/tools/subagent-catalog/config.sh b/tools/subagent-catalog/config.sh
index 64a5b3d67..6fe7775e2 100644
--- a/tools/subagent-catalog/config.sh
+++ b/tools/subagent-catalog/config.sh
@@ -1,13 +1,16 @@
 #!/usr/bin/env bash
 # subagent-catalog configuration
-# shared between search, fetch, and invalidate skills
+# shared between search, fetch, and invalidate commands
+#
+# Points at this fork's raw URL (forked from VoltAgent/awesome-claude-code-subagents).
+# Change SUBAGENT_CATALOG_REPO_URL here or via the environment to override.
 
 set -euo pipefail
 
 # --- CONFIG ---
 readonly SUBAGENT_CATALOG_TTL_SECONDS=$((12 * 60 * 60))   # 12 hours
-readonly SUBAGENT_CATALOG_CACHE_FILE="$HOME/.claude/cache/subagent-catalog.md"
-readonly SUBAGENT_CATALOG_REPO_URL="https://raw.githubusercontent.com/VoltAgent/awesome-claude-code-subagents/main"
+readonly SUBAGENT_CATALOG_CACHE_FILE="$HOME/.zcode/cache/subagent-catalog.md"
+readonly SUBAGENT_CATALOG_REPO_URL="${SUBAGENT_CATALOG_REPO_URL:-https://raw.githubusercontent.com/a2mus/awesome-zcode-subagents/main}"
 
 export SUBAGENT_CATALOG_TTL_SECONDS SUBAGENT_CATALOG_CACHE_FILE SUBAGENT_CATALOG_REPO_URL
 
diff --git a/tools/subagent-catalog/fetch.md b/tools/subagent-catalog/fetch.md
index d14d0a91e..8c415f8a1 100644
--- a/tools/subagent-catalog/fetch.md
+++ b/tools/subagent-catalog/fetch.md
@@ -27,9 +27,9 @@ Expert code reviewer specializing in code quality, security vulnerabilities...
 
 ---
 **What now?**
-- save to ~/.claude/agents/code-reviewer.md
+- save to ~/.zcode/agents/code-reviewer.md
 - customize for this project
-- spawn as Task subagent
+- invoke via the ZCode Agent tool
 ```
 
 ## Instructions
@@ -44,7 +44,7 @@ Copy and track:
 ### Step 1: Resolve path
 
 ```bash
-source ~/.claude/commands/subagent-catalog/config.sh
+source ~/.zcode/commands/subagent-catalog/config.sh
 subagent_catalog_ensure_cache
 
 # find the agent (use -F for literal match)
@@ -69,9 +69,9 @@ fi
 ### Step 3: Display and offer options
 
 Show the definition with frontmatter parsed, then offer:
-1. save locally (`~/.claude/agents/<name>.md`)
+1. save locally (`~/.zcode/agents/<name>.md`)
 2. customize for project
-3. spawn as Task
+3. invoke via the ZCode Agent tool
 
 ### Error handling
 
diff --git a/tools/subagent-catalog/invalidate.md b/tools/subagent-catalog/invalidate.md
index a6e2261fb..155cbbe93 100644
--- a/tools/subagent-catalog/invalidate.md
+++ b/tools/subagent-catalog/invalidate.md
@@ -16,7 +16,7 @@ No arguments required. Optional: pass `--fetch` to immediately refresh after inv
 ### Step 1: Source config
 
 ```bash
-source ~/.claude/commands/subagent-catalog/config.sh
+source ~/.zcode/commands/subagent-catalog/config.sh
 ```
 
 ### Step 2: Invalidate (and optionally refresh)
diff --git a/tools/subagent-catalog/list.md b/tools/subagent-catalog/list.md
index 078cef209..71f1b6b66 100644
--- a/tools/subagent-catalog/list.md
+++ b/tools/subagent-catalog/list.md
@@ -5,7 +5,7 @@ description: "List all categories and agents in the subagent catalog. Use when u
 
 # Subagent Catalog - List
 
-Browse all available categories and agents from the awesome-claude-code-subagents catalog.
+Browse all available categories and agents from the awesome-zcode-subagents catalog.
 
 ## Input: $ARGUMENTS
 
@@ -16,7 +16,7 @@ No arguments required.
 ### Step 1: Ensure cache is fresh
 
 ```bash
-source ~/.claude/commands/subagent-catalog/config.sh
+source ~/.zcode/commands/subagent-catalog/config.sh
 subagent_catalog_ensure_cache
 ```
 
diff --git a/tools/subagent-catalog/search.md b/tools/subagent-catalog/search.md
index 2af5e5d58..256599e57 100644
--- a/tools/subagent-catalog/search.md
+++ b/tools/subagent-catalog/search.md
@@ -1,6 +1,6 @@
 ---
 name: search
-description: "Search the awesome-claude-code-subagents catalog. Use when user wants to find, discover, or browse available subagents by name, category, or capability."
+description: "Search the awesome-zcode-subagents catalog. Use when user wants to find, discover, or browse available subagents by name, category, or capability."
 ---
 
 # Subagent Catalog - Search
@@ -27,7 +27,7 @@ Find agents by name, description, or category.
 ### Step 1: Get catalog
 
 ```bash
-source ~/.claude/commands/subagent-catalog/config.sh
+source ~/.zcode/commands/subagent-catalog/config.sh
 subagent_catalog_ensure_cache
 cat "$SUBAGENT_CATALOG_CACHE_FILE"
 ```