feat: runtime-split-mcp-plugins MCP plugins

.agents/plugins/marketplace.json

@@ -15,6 +15,156 @@
       "interface": {
         "displayName": "NDF"
       }
+    },
+    {
+      "name": "mcp-playwright",
+      "source": {
+        "source": "local",
+        "path": "./plugins/mcp/codex/mcp-playwright"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "Productivity",
+      "interface": {
+        "displayName": "Playwright MCP"
+      }
+    },
+    {
+      "name": "mcp-chrome-devtools",
+      "source": {
+        "source": "local",
+        "path": "./plugins/mcp/codex/mcp-chrome-devtools"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "Productivity",
+      "interface": {
+        "displayName": "Chrome DevTools MCP"
+      }
+    },
+    {
+      "name": "mcp-bigquery",
+      "source": {
+        "source": "local",
+        "path": "./plugins/mcp/codex/mcp-bigquery"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "Productivity",
+      "interface": {
+        "displayName": "BigQuery MCP"
+      }
+    },
+    {
+      "name": "mcp-aws-docs",
+      "source": {
+        "source": "local",
+        "path": "./plugins/mcp/codex/mcp-aws-docs"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "Productivity",
+      "interface": {
+        "displayName": "AWS Docs MCP"
+      }
+    },
+    {
+      "name": "mcp-dbhub",
+      "source": {
+        "source": "local",
+        "path": "./plugins/mcp/codex/mcp-dbhub"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "Productivity",
+      "interface": {
+        "displayName": "DBHub MCP"
+      }
+    },
+    {
+      "name": "mcp-notion",
+      "source": {
+        "source": "local",
+        "path": "./plugins/mcp/codex/mcp-notion"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "Productivity",
+      "interface": {
+        "displayName": "Notion MCP"
+      }
+    },
+    {
+      "name": "mcp-devin",
+      "source": {
+        "source": "local",
+        "path": "./plugins/mcp/codex/mcp-devin"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "Productivity",
+      "interface": {
+        "displayName": "Devin MCP"
+      }
+    },
+    {
+      "name": "mcp-redash",
+      "source": {
+        "source": "local",
+        "path": "./plugins/mcp/codex/mcp-redash"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "Productivity",
+      "interface": {
+        "displayName": "Redash MCP"
+      }
+    },
+    {
+      "name": "mcp-markitdown",
+      "source": {
+        "source": "local",
+        "path": "./plugins/mcp/codex/mcp-markitdown"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "Productivity",
+      "interface": {
+        "displayName": "MarkItDown MCP"
+      }
+    },
+    {
+      "name": "mcp-serena",
+      "source": {
+        "source": "local",
+        "path": "./plugins/mcp/codex/mcp-serena"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "Productivity",
+      "interface": {
+        "displayName": "Serena MCP"
+      }
     }
   ]
 }

.claude-plugin/marketplace.json

@@ -13,52 +13,52 @@
     },
     {
       "name": "mcp-playwright",
-      "source": "./plugins/mcp-playwright",
+      "source": "./plugins/mcp/claude/mcp-playwright",
       "description": "Playwright MCP auto-setup plugin with Chromium browser installation and configuration"
     },
     {
       "name": "mcp-chrome-devtools",
-      "source": "./plugins/mcp-chrome-devtools",
+      "source": "./plugins/mcp/claude/mcp-chrome-devtools",
       "description": "Chrome DevTools MCP server for browser automation and testing"
     },
     {
       "name": "mcp-bigquery",
-      "source": "./plugins/mcp-bigquery",
+      "source": "./plugins/mcp/claude/mcp-bigquery",
       "description": "BigQuery MCP server for data analysis and SQL queries"
     },
     {
       "name": "mcp-aws-docs",
-      "source": "./plugins/mcp-aws-docs",
+      "source": "./plugins/mcp/claude/mcp-aws-docs",
       "description": "AWS Documentation MCP server for accessing official AWS documentation"
     },
     {
       "name": "mcp-dbhub",
-      "source": "./plugins/mcp-dbhub",
+      "source": "./plugins/mcp/claude/mcp-dbhub",
       "description": "DBHub MCP server for database operations and SQL queries"
     },
     {
       "name": "mcp-notion",
-      "source": "./plugins/mcp-notion",
+      "source": "./plugins/mcp/claude/mcp-notion",
       "description": "Notion MCP server for note management and knowledge base operations"
     },
     {
       "name": "mcp-devin",
-      "source": "./plugins/mcp-devin",
+      "source": "./plugins/mcp/claude/mcp-devin",
       "description": "Devin MCP server for accessing repository documentation and code knowledge via DeepWiki"
     },
     {
       "name": "mcp-redash",
-      "source": "./plugins/mcp-redash",
+      "source": "./plugins/mcp/claude/mcp-redash",
       "description": "Redash MCP server with multi-environment support (arbitrary suffix)"
     },
     {
       "name": "mcp-markitdown",
-      "source": "./plugins/mcp-markitdown",
+      "source": "./plugins/mcp/claude/mcp-markitdown",
       "description": "MarkItDown MCP server for converting documents (PDF, Office, images, etc.) to Markdown"
     },
     {
       "name": "mcp-serena",
-      "source": "./plugins/mcp-serena",
+      "source": "./plugins/mcp/claude/mcp-serena",
       "description": "Serena MCP server for semantic code intelligence (symbol search, reference search, refactoring)"
     }
   ]

CLAUDE.md

@@ -17,7 +17,7 @@ Serena MCPは**mcp-serena**プラグインとして提供されます（NDFと
 
 **Serena memoryは使用禁止**。知識は `docs/` に、手順は `skills/` に配置してください。
 
-詳細は `plugins/mcp-serena/docs/serena-guide.md` を参照。
+詳細は `plugins/mcp/shared/mcp-serena/docs/serena-guide.md` を参照。
 
 ## 知識アーキテクチャ
 

docs/project-overview.md

@@ -28,12 +28,15 @@ ai-plugins/
 ├── .claude-plugin/
 │   └── marketplace.json          # Claude Codeマーケットプレイスメタデータ
 ├── plugins/
-│   ├── ndf/                      # NDFプラグイン（メイン）
-│   │   ├── skills/               # 全Skill実体（Claude Code/Kiroはmanifest配列で公開対象を指定）
-│   │   ├── skills-codex/         # Codex向け公開Skill（実ディレクトリ）
-│   │   └── skills-optional/      # ランタイム別除外候補リスト
-│   ├── mcp-serena/               # Serena MCPプラグイン
-│   └── {plugin-name}/            # その他のプラグイン
+│   ├── ndf-shared/               # NDF共通ソース
+│   ├── ndf-claude/               # Claude Code版NDF
+│   ├── ndf-codex/                # Codex版NDF
+│   ├── ndf-kiro/                 # Kiro CLI版NDF
+│   └── mcp/
+│       ├── shared/               # MCPプラグイン共通ソース
+│       ├── claude/               # Claude Code版MCPプラグイン
+│       ├── codex/                # Codex版MCPプラグイン
+│       └── kiro/                 # Kiro CLI版MCPプラグイン
 ├── docs/                         # リポジトリ知識
 ├── AGENTS.md                     # 共通エントリポイント
 ├── CLAUDE.md                     # Claude Code固有設定

docs/specifications/ndf-knowledge-and-kiro.md

@@ -59,6 +59,6 @@ Codex 連携は MCP サーバではなく `/ndf:codex` skill と `corder` エー
 
 ## 関連リンク
 
-- [mcp-serena README](../../plugins/mcp-serena/README.md)
+- [mcp-serena README](../../plugins/mcp/shared/mcp-serena/README.md)
 - [NDF Plugin リファレンス](../ndf-plugin-reference.md)
 - [NDF README](../../plugins/ndf/README.md)

issues/agent-runtime-plugin-split.md

@@ -540,27 +540,27 @@ base branch: `main`
 
 ## 実装進捗
 
-2026-07-06 時点の進捗。
+2026-07-07 時点の進捗。
 
 | 状態 | PR | branch | 内容 | 備考 |
 |---|---:|---|---|---|
 | 完了 | #45 | `release/runtime-plugin-split` | release PR | Draft のまま。個別 PR を release branch へ集約中 |
 | merge 済み | #46 | `feature/runtime-split-shared-builder` | Task 1: `ndf-shared` と `scripts/build-runtime-plugins.sh` を追加 | cross-review approved。`release/runtime-plugin-split` へ merge 済み。worktree / local branch cleanup 済み |
 | merge 済み | #47 | `feature/runtime-split-claude` | Task 2: `plugins/ndf-claude` を追加し、Claude marketplace を切替 | cross-review approved。`release/runtime-plugin-split` へ merge 済み。worktree / local branch cleanup 済み |
 | merge 済み | #48 | `feature/runtime-split-codex` | Task 3: `plugins/ndf-codex` を追加し、Codex marketplace を切替 | cross-review approved。`release/runtime-plugin-split` へ merge 済み。worktree / local branch cleanup 済み |
-| 実装中 | #49 | `feature/runtime-split-kiro` | Task 4: `plugins/ndf-kiro` を作成し、Kiro installer / docs / templates を移動 | installer の Claude manifest 依存を除去し、Kiro runtime 生成物を追加中 |
+| merge 済み | #49 | `feature/runtime-split-kiro` | Task 4: `plugins/ndf-kiro` を作成し、Kiro installer / docs / templates を移動 | cross-review approved。`release/runtime-plugin-split` へ merge 済み。worktree / local branch cleanup 済み |
 | 未着手 | #50 | `feature/runtime-split-docs-cleanup` | Task 5: README / AGENTS / docs / specs 更新、旧 `plugins/ndf` の stub 化または削除 | PR2, PR3, PR4 merge 後 |
-| 未着手 | #51 | `feature/runtime-split-mcp-plugins` | Task 6: MCP plugin を runtime 別に分離 | PR1 merge 後なので着手可能だが、Kiro との接続方針確認後が安全 |
+| 実装中 | #51 | `feature/runtime-split-mcp-plugins` | Task 6: MCP plugin を runtime 別に分離 | MCP plugin を `plugins/mcp/shared` へ移動し、Claude / Codex / Kiro runtime 生成物を追加中 |
 | 未着手 | #52 | `feature/runtime-split-validation` | Task 7: validate script、dev hook、CI、リンク検証 | PR2, PR3, PR4, PR6 merge 後 |
 | 未着手 | #53 | `feature/runtime-split-container-smoke` | Task 8: runtime smoke test | PR7 merge 後 |
 
 再開時の前提:
 
-- 現在の作業ブランチは `feature/runtime-split-kiro`。
+- 現在の作業ブランチは `feature/runtime-split-mcp-plugins`。
 - `main` は `origin/main` と同期済み。
 - `release/runtime-plugin-split` は `origin/release/runtime-plugin-split` と同期済み。
-- PR #46 / #47 / #48 用の一時 worktree は削除済み。
-- 次は PR #49 `feature/runtime-split-kiro` の実装差分をレビューし、必要な修正後に push / Draft PR 更新を行う。
+- PR #46 / #47 / #48 / #49 用の一時 worktree は削除済み。
+- 次は PR #51 `feature/runtime-split-mcp-plugins` の実装差分をレビューし、必要な修正後に push / Draft PR 更新と cross-review を行う。
 
 ## 影響範囲
 

plugins/mcp-aws-docs/README.md → plugins/mcp/claude/mcp-aws-docs/README.md

@@ -15,10 +15,30 @@ AWS公式ドキュメントにアクセスするためのMCPサーバープラ
 
 ## インストール
 
+### Claude Code
+
 ```bash
 /plugin install mcp-aws-docs@ai-plugins
 ```
 
+### Codex
+
+```bash
+codex plugin add mcp-aws-docs@ai-plugins
+```
+
+### Kiro CLI
+
+Kiro では repository clone 後、対象 plugin の installer を project root で実行します。
+
+```bash
+bash plugins/mcp/kiro/mcp-aws-docs/install.sh
+```
+
+### 必要な環境変数
+
+- 追加の環境変数は不要です。
+
 ## 使用方法
 
 ### 基本的な使用例

plugins/mcp-bigquery/README.md → plugins/mcp/claude/mcp-bigquery/README.md

@@ -40,10 +40,33 @@ BIGQUERY_KEY_FILE=/path/to/service-account-key.json
 
 ## インストール
 
+### Claude Code
+
 ```bash
 /plugin install mcp-bigquery@ai-plugins
 ```
 
+### Codex
+
+```bash
+codex plugin add mcp-bigquery@ai-plugins
+```
+
+### Kiro CLI
+
+Kiro では repository clone 後、対象 plugin の installer を project root で実行します。
+
+```bash
+bash plugins/mcp/kiro/mcp-bigquery/install.sh
+```
+
+### 必要な環境変数
+
+- `BIGQUERY_DATASET`
+- `BIGQUERY_KEY_FILE`
+- `BIGQUERY_LOCATION`
+- `BIGQUERY_PROJECT`
+
 ## 使用方法
 
 ### 基本的な使用例

plugins/mcp-chrome-devtools/README.md → plugins/mcp/claude/mcp-chrome-devtools/README.md

@@ -17,10 +17,30 @@ Chrome DevTools MCPサーバーをClaude Codeで利用するためのプラグ
 
 ## インストール
 
+### Claude Code
+
 ```bash
 /plugin install mcp-chrome-devtools@ai-plugins
 ```
 
+### Codex
+
+```bash
+codex plugin add mcp-chrome-devtools@ai-plugins
+```
+
+### Kiro CLI
+
+Kiro では repository clone 後、対象 plugin の installer を project root で実行します。
+
+```bash
+bash plugins/mcp/kiro/mcp-chrome-devtools/install.sh
+```
+
+### 必要な環境変数
+
+- 追加の環境変数は不要です。
+
 ## 使用方法
 
 ### 基本的な使用例