coderouter-cli 2.8.0__tar.gz → 2.9.0__tar.gz

{coderouter_cli-2.8.0 → coderouter_cli-2.9.0}/CHANGELOG.md

@@ -9,6 +9,111 @@ are kept verbatim where the Japanese text itself is the subject).
 
 ---
 
+## [v2.9.0] — 2026-07-11 (agent_cli extraction Phase 2c — in-core adapter removed)
+
+**BREAKING.** Phase 2c of the agent_cli plugin extraction
+(`docs/designs/agent-cli-plugin-extraction.md` §5/§7): the in-core
+`agent_cli` adapter branch is **removed** from `coderouter/adapters/registry.py`.
+`kind: agent_cli` now resolves exclusively through the external plugin
+**`coderouter-plugin-agents`** — the Phase 2b grace period, during which the
+in-core copy still won resolution, has ended.
+
+**Who is affected**: anyone with one or more `kind: agent_cli` providers in
+`providers.yaml`. If the plugin isn't installed and enabled, `coderouter
+serve` now fails at startup.
+
+**What to do**: install the plugin and enable it —
+
+```bash
+uv pip install "coderouter-plugin-agents @ git+https://github.com/zephel01/coderouter-plugin-agents"
+# or: pip install "coderouter-plugin-agents @ git+https://github.com/zephel01/coderouter-plugin-agents"
+# uv-tool installs of coderouter-cli need the plugin in the same tool env:
+#   uv tool install coderouter-cli \
+#     --with "coderouter-plugin-agents @ git+https://github.com/zephel01/coderouter-plugin-agents"
+```
+
+```yaml
+plugins:
+  enabled: [agents]
+```
+
+**What is unchanged**: existing `kind: agent_cli` provider entries and the
+`agent_cli:` sub-config (`AgentCliConfig` — schema, fields, defaults) need no
+edits; they remain a stable Core contract per the design's §4.4 case (b).
+Per-CLI behavior (claude/codex/antigravity/grok argv, auth, output parsing)
+is unaffected — only the adapter's Core-vs-plugin wiring changed.
+
+**Safety nets**: a `kind: agent_cli` provider without the plugin installed
+and enabled now fails `serve` at startup with a targeted migration hint
+(install command + `plugins.enabled` snippet) rather than a generic
+unknown-kind error, and `coderouter doctor` independently emits a
+config-level warning with the same fix snippet for configs that would hit
+this at startup.
+
+### Removed
+
+- **In-core `agent_cli` adapter** (`coderouter/adapters/agent_cli.py`, ~1181
+  lines) and the `build_adapter` in-core branch for `kind == "agent_cli"`
+  (`coderouter/adapters/registry.py`) — the adapter body, fully moved to
+  `coderouter-plugin-agents` 0.1.0 in Phase 2b, is deleted from Core. `kind:
+  agent_cli` now resolves only via the plugin-provided-kind lookup path.
+- **`agent-cli-in-core-deprecated` warning** (introduced in Phase 2b,
+  `docs/designs/agent-cli-plugin-extraction.md` §5.1) — removed along with
+  the in-core branch it guarded; there is nothing left for it to warn about.
+
+### Added
+
+- **`coderouter doctor` migration check** — detects a config with one or
+  more `kind: agent_cli` providers where `plugins.enabled` does not include
+  `agents` (or the plugin isn't installed/discoverable), and emits a
+  config-level warning with a ready-to-paste fix snippet
+  (`plugins:\n  enabled: [agents]` plus the install command).
+- **Targeted unknown-kind / migration hint at `serve` startup** — when
+  `build_adapter` cannot resolve `kind: agent_cli` (plugin missing or not
+  enabled), the raised error now names the specific migration steps (install
+  `coderouter-plugin-agents`, add `plugins.enabled: [agents]`) instead of
+  the generic "unknown kind" listing used for arbitrary typos.
+
+### Changed
+
+- **`ProviderConfig` / `AgentCliConfig` docstrings and error text**
+  (`coderouter/config/schemas.py`) — updated to state plainly that
+  `agent_cli` is plugin-served as of v2.9.0 and that the schema itself is
+  unaffected.
+- **`Adapter` plugin Protocol docstrings** (`coderouter/plugins/base.py`) —
+  updated to drop transitional Phase 2b language (in-core shadowing,
+  deprecation warning) now that `agent_cli` resolves solely through the
+  plugin path, same as any other plugin-provided `kind`.
+
+## [v2.8.1] — 2026-07-11 (agent_cli moved to coderouter-plugin-agents — Phase 2b)
+
+**PR #72**. Phase 2b of the agent_cli plugin extraction
+(`docs/designs/agent-cli-plugin-extraction.md` §4/§5/§7): the adapter body
+and its behavior tests now live in the new external package
+**`coderouter-plugin-agents`** (0.1.0, entry point `coderouter.adapter` →
+`agents`, pins `coderouter-cli>=2.8,<3.0`). Core still bundles the in-core
+`agent_cli` adapter unchanged during the transition — providers.yaml needs
+no edits yet — and the in-core copy keeps winning resolution until Phase 2c
+removes it.
+
+### Added
+
+- **`agent-cli-in-core-deprecated` warning** (`adapters/registry.py`) —
+  fires once per process when the in-core `agent_cli` branch serves a
+  request while the plugin is also installed and enabled, signalling that
+  the plugin path takes over at Phase 2c.
+
+### Changed
+
+- **`tests/test_agent_cli.py` slimmed 91 → 9** — the 82 adapter-behavior
+  tests (argv snapshots, parsers, env isolation, prompt-delivery
+  lifecycles, E2E, gemini rejection) moved verbatim to the plugin repo per
+  the design's §4.5 split map; the 9 retained tests cover the
+  `ProviderConfig`/`AgentCliConfig` pydantic validation that stays in Core
+  under §4.4 案(b) (AgentCliConfig remains a stable Core contract).
+- `tests/test_plugin_adapter.py` +1 (deprecation-log semantics: in-core
+  still serves by identity, warning fires exactly once).
+
 ## [v2.8.0] — 2026-07-11 (Plugin SDK: Adapter hook wired — Phase 2a of the agent_cli extraction)
 
 Opens the Plugin SDK's Adapter surface: the previously dead-end `Adapter`

{coderouter_cli-2.8.0 → coderouter_cli-2.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coderouter-cli
-Version: 2.8.0
+Version: 2.9.0
 Summary: Local-first, free-first, fallback-built-in LLM router. Claude Code / OpenAI compatible.
 Project-URL: Homepage, https://github.com/zephel01/CodeRouter
 Project-URL: Repository, https://github.com/zephel01/CodeRouter

{coderouter_cli-2.8.0 → coderouter_cli-2.9.0}/coderouter/adapters/registry.py

@@ -8,14 +8,37 @@ from coderouter.adapters.anthropic_native import AnthropicAdapter
 from coderouter.adapters.base import BaseAdapter
 from coderouter.adapters.openai_compat import OpenAICompatAdapter
 from coderouter.config.schemas import ProviderConfig
+from coderouter.logging import get_logger
 
 if TYPE_CHECKING:
     from coderouter.plugins.registry import PluginRegistry
 
+logger = get_logger(__name__)
+
 # in-core kinds, in resolution order. Kept as a tuple (not derived from
 # the if-chain below) so the "Unknown adapter kind" error message and
 # the plugin-shadow guard have a single source of truth.
-_IN_CORE_KINDS: tuple[str, ...] = ("openai_compat", "anthropic", "agent_cli")
+#
+# Phase 2c (docs/designs/agent-cli-plugin-extraction.md §7 row "2c"):
+# "agent_cli" is no longer in this tuple. It is served exclusively by
+# the coderouter-plugin-agents adapter plugin now that the in-core
+# AgentCliAdapter and its build_adapter branch have been removed.
+_IN_CORE_KINDS: tuple[str, ...] = ("openai_compat", "anthropic")
+
+# Phase 2c migration hint (docs/designs/agent-cli-plugin-extraction.md
+# §5.2): shown ONLY for kind="agent_cli" when no plugin resolves it, so
+# operators upgrading from pre-2c configs get a targeted fix instead of
+# the generic unknown-kind message.
+_AGENT_CLI_MIGRATION_HINT = (
+    "kind='agent_cli' is served by the coderouter-plugin-agents plugin "
+    "(Core no longer ships an in-core agent_cli adapter as of Phase 2c). "
+    'Install it with: pip install "coderouter-plugin-agents @ '
+    'git+https://github.com/zephel01/coderouter-plugin-agents" and add '
+    "'agents' to plugins.enabled in providers.yaml, e.g.:\n"
+    "plugins:\n"
+    "  enabled:\n"
+    "    - agents"
+)
 
 
 def _plugin_kinds(plugin_registry: PluginRegistry | None) -> list[str]:
@@ -34,23 +57,25 @@ def build_adapter(
     Resolution order (docs/designs/agent-cli-plugin-extraction.md §3.2):
     in-core kinds first, then plugin-provided kinds, then a fail-fast
     error. In-core kinds are checked first so a plugin can never shadow
-    a kind Core itself guarantees (``openai_compat`` / ``anthropic`` /,
-    during the Phase 2b migration window, ``agent_cli``).
+    a kind Core itself guarantees (``openai_compat`` / ``anthropic``).
+
+    As of Phase 2c, ``agent_cli`` is no longer an in-core kind — it
+    resolves ONLY via the plugin path (``coderouter-plugin-agents``).
     """
     if provider.kind == "openai_compat":
         return OpenAICompatAdapter(provider)
     if provider.kind == "anthropic":
         return AnthropicAdapter(provider)
-    if provider.kind == "agent_cli":
-        # Imported lazily so the external-agent adapter (and its subprocess /
-        # os plumbing) is only pulled in when a config actually uses it.
-        from coderouter.adapters.agent_cli import AgentCliAdapter
-
-        return AgentCliAdapter(provider)
     if plugin_registry is not None:
         for factory in plugin_registry.adapters:
             if factory.kind == provider.kind:
                 return factory.build(provider)
+    if provider.kind == "agent_cli":
+        # Targeted migration hint (§5.2) instead of the generic message
+        # below — this is the single most common post-2c misconfiguration
+        # (an un-migrated providers.yaml that still relies on the removed
+        # in-core adapter).
+        raise ValueError(f"Unknown adapter kind {provider.kind!r}. {_AGENT_CLI_MIGRATION_HINT}")
     raise ValueError(
         f"Unknown adapter kind {provider.kind!r}. "
         f"in-core kinds: {', '.join(_IN_CORE_KINDS)}; "

{coderouter_cli-2.8.0 → coderouter_cli-2.9.0}/coderouter/config/schemas.py

@@ -166,8 +166,21 @@ class CostConfig(BaseModel):
 class AgentCliConfig(BaseModel):
     """External coding-agent CLI settings for ``kind="agent_cli"`` providers.
 
-    Introduced by the external-agents-adapter design (Phase 1). One
-    ``agent_cli`` sub-config drives the :class:`AgentCliAdapter`, which
+    Introduced by the external-agents-adapter design (Phase 1). As of the
+    agent_cli plugin extraction's Phase 2c
+    (``docs/designs/agent-cli-plugin-extraction.md`` §4.4 case (b), §7),
+    the adapter that actually invokes the CLI (``AgentCliAdapter``,
+    argv construction / output parsing / sandbox flag tables) has moved
+    to the separately-distributed ``coderouter-plugin-agents`` plugin
+    (``pip install coderouter-plugin-agents`` + ``plugins.enabled:
+    [agents]``) — Core no longer ships it in-core. ``AgentCliConfig``
+    itself REMAINS in Core: it is a stable schema contract that has not
+    changed since Phase 1 (unlike the adapter body, which absorbs
+    per-CLI churn), so keeping it here preserves ``extra="forbid"``
+    fail-fast validation at config-load time regardless of whether the
+    plugin is installed.
+
+    One ``agent_cli`` sub-config drives the plugin's adapter, which
     invokes an external coding-agent CLI (codex / gemini / grok / claude /
     antigravity) in a single one-shot ``exec`` and returns the final answer
     as one ``prompt in → text out`` transformation. ``claude`` (Claude Code
@@ -355,10 +368,13 @@ class ProviderConfig(BaseModel):
         description=(
             "Adapter type. 'openai_compat' covers llama.cpp / Ollama / "
             "OpenRouter / LM Studio / Together / Groq. 'anthropic' is the "
-            "native Anthropic Messages API passthrough (v0.3.x). 'agent_cli' "
-            "invokes an external coding-agent CLI one-shot (see AgentCliConfig). "
-            "Other values must be served by an adapter plugin listed in "
-            "plugins.enabled."
+            "native Anthropic Messages API passthrough (v0.3.x). These two "
+            "are Core's only in-core kinds. 'agent_cli' invokes an external "
+            "coding-agent CLI one-shot (see AgentCliConfig) but, as of "
+            "Phase 2c, is served by the coderouter-plugin-agents adapter "
+            "plugin — install it and list 'agents' in plugins.enabled. "
+            "Any other value must likewise be served by an adapter plugin "
+            "listed in plugins.enabled."
         ),
     )
     # base_url is required for HTTP-backed adapters (openai_compat / anthropic)
@@ -428,9 +444,18 @@ class ProviderConfig(BaseModel):
     # kind="agent_cli": required external coding-agent CLI settings. Opt-in
     # (default None) exactly like ``restart_command`` — only meaningful when
     # ``kind == "agent_cli"``, and enforced by ``_check_kind_requirements``.
+    # The schema (this field + AgentCliConfig + the kind literal) stays in
+    # Core; the adapter that consumes it is the coderouter-plugin-agents
+    # plugin as of Phase 2c (docs/designs/agent-cli-plugin-extraction.md
+    # §4.4 case (b)).
     agent_cli: AgentCliConfig | None = Field(
         default=None,
-        description="Required when kind='agent_cli': external agent CLI settings.",
+        description=(
+            "Required when kind='agent_cli': external agent CLI settings. "
+            "Served by the coderouter-plugin-agents adapter plugin — "
+            "`pip install coderouter-plugin-agents` and add 'agents' to "
+            "plugins.enabled."
+        ),
     )
 
     cost: CostConfig | None = Field(

{coderouter_cli-2.8.0 → coderouter_cli-2.9.0}/coderouter/doctor.py

@@ -1834,6 +1834,56 @@ async def _probe_cache(
     )
 
 
+# ---------------------------------------------------------------------------
+# Phase 2c migration guard (docs/designs/agent-cli-plugin-extraction.md §5.2,
+# §7 "2c" row): a config-level pre-check, not an HTTP probe. Core removed
+# its in-core agent_cli adapter in Phase 2c — kind="agent_cli" now resolves
+# ONLY via the coderouter-plugin-agents adapter plugin
+# (coderouter/adapters/registry.py's build_adapter). A provider that still
+# declares kind="agent_cli" without the plugin enabled will fail at engine
+# startup with a ValueError; surfacing it here lets `coderouter doctor`
+# catch it ahead of `coderouter serve`, with a copy-paste-able fix.
+# ---------------------------------------------------------------------------
+
+
+def _check_agent_cli_plugin_migration(
+    config: CodeRouterConfig, provider: ProviderConfig
+) -> ProbeResult | None:
+    """Warn when ``provider`` needs the agent_cli plugin but it isn't enabled.
+
+    Returns ``None`` (no finding) when ``provider.kind`` isn't
+    ``"agent_cli"``, or when ``"agents"`` is already listed in
+    ``plugins.enabled`` — i.e. nothing actionable to report.
+    """
+    if provider.kind != "agent_cli":
+        return None
+    enabled = config.plugins.enabled if config.plugins is not None else []
+    if "agents" in enabled:
+        return None
+    return ProbeResult(
+        name="agent-cli-plugin-migration",
+        verdict=ProbeVerdict.NEEDS_TUNING,
+        detail=(
+            f"provider {provider.name!r} declares kind='agent_cli', but the "
+            "coderouter-plugin-agents adapter plugin is not enabled. As of "
+            "v2.9.0 (Phase 2c), Core no longer ships an in-core agent_cli "
+            "adapter — this provider cannot serve requests until the "
+            "plugin is installed and listed in plugins.enabled."
+        ),
+        target_file="providers.yaml",
+        suggested_patch=(
+            "# install the plugin:\n"
+            'pip install "coderouter-plugin-agents @ '
+            'git+https://github.com/zephel01/coderouter-plugin-agents"\n'
+            "\n"
+            "# providers.yaml — enable it (merge into any existing list):\n"
+            "plugins:\n"
+            "  enabled:\n"
+            "    - agents\n"
+        ),
+    )
+
+
 # ---------------------------------------------------------------------------
 # Orchestration
 # ---------------------------------------------------------------------------
@@ -1872,6 +1922,14 @@ async def check_model(
         resolved_caps=resolved,
     )
 
+    migration = _check_agent_cli_plugin_migration(config, provider)
+    if migration is not None:
+        # Nothing to probe over HTTP — the provider has no adapter until
+        # the plugin is enabled. Report the finding and stop here rather
+        # than sending HTTP probes at a (kind-wise meaningless) base_url.
+        report.results.append(migration)
+        return report
+
     auth_result = await _probe_auth_and_basic_chat(provider)
     report.results.append(auth_result)
 

{coderouter_cli-2.8.0 → coderouter_cli-2.9.0}/docs/backends/external-agents.en.md

@@ -4,6 +4,8 @@
 
 `kind: "agent_cli"` is an adapter that registers an external coding-agent CLI, such as the Claude Code CLI, as a single CodeRouter provider. It was newly added in v2.7.7 (Phase 1a: claude), v2.7.8 added grok (Phase 1d), v2.7.9 added codex (Phase 1b), and v2.7.10 added antigravity (Phase 1c). **Phase 1 (all four backends) is now complete.** See [`docs/designs/external-agents-adapter.md`](../designs/external-agents-adapter.md) for the full design.
 
+> **Breaking change in v2.9.0 (agent_cli plugin extraction, Phase 2c)** — the in-core `agent_cli` adapter was removed in v2.9.0. Using `kind: "agent_cli"` now **requires** installing the external plugin **`coderouter-plugin-agents`** and adding `plugins.enabled: [agents]` to `providers.yaml`. Through v2.8.x there was a transition period (Phase 2b) where the in-core implementation still won; that grace period ended with v2.9.0. See the [Quickstart](#quickstart) below for the exact steps. Without the plugin, a `kind: agent_cli` provider now makes `coderouter serve` fail at startup with an error that includes a targeted migration hint; `coderouter doctor` also detects and warns about the same misconfiguration. The `agent_cli:` sub-config schema (`AgentCliConfig`) itself and existing provider entries are unchanged — nothing there needs editing.
+
 ---
 
 ## Overview
@@ -12,6 +14,7 @@ A coding-agent CLI is normally a stateful control loop that runs many turns auto
 
 - **Supported CLIs**: the `agent` field can declare `claude` / `codex` / `antigravity` / `grok`. `gemini` also remains in the schema's `Literal`, but it is always rejected (see below).
 - **Implementation status (as of v2.7.10)**: **Phase 1 is complete — `claude` (Claude Code CLI, Phase 1a), `codex` (OpenAI Codex CLI, Phase 1b), `antigravity` (Google Antigravity CLI, Phase 1c), and `grok` (Grok CLI, Phase 1d) are all implemented**. `gemini` fell out of scope because Google discontinued the Gemini CLI for individual accounts in June 2026; constructing the adapter with it always raises a dedicated migration error:
+- **Prerequisite as of v2.9.0**: the adapter bodies for the four backends above moved to `coderouter-plugin-agents` in Phase 2b (v2.8.1), and the in-core copy was removed in Phase 2c (v2.9.0). As of v2.9.0, using `kind: agent_cli` therefore requires installing `coderouter-plugin-agents` and setting `plugins.enabled: [agents]`. The `agent_cli:` sub-config (`AgentCliConfig`), each CLI's argv/behavior, and how provider entries are written are all unchanged (see the per-CLI sections below).
 
   ```
   AdapterError: Google discontinued Gemini CLI for individual accounts (June 2026).
@@ -43,15 +46,36 @@ Google's stated successor is the **Antigravity CLI** (command name `agy`). It is
 
 ## Quickstart
 
-1. **Install the Claude Code CLI** (verify with `claude --version`).
-2. **Log in** — either run `claude` interactively and complete `/login`, or, on a headless machine, follow the [platform-specific authentication](#platform-specific-authentication) steps using `claude setup-token`.
-3. **Start with the example config**:
+1. **Install `coderouter-plugin-agents` and enable it** (required as of v2.9.0 — skipping this makes `coderouter serve` fail at startup whenever a `kind: agent_cli` provider is present):
+
+   ```bash
+   # with uv
+   uv pip install "coderouter-plugin-agents @ git+https://github.com/zephel01/coderouter-plugin-agents"
+
+   # with pip
+   pip install "coderouter-plugin-agents @ git+https://github.com/zephel01/coderouter-plugin-agents"
+
+   # if CodeRouter itself is installed via uv tool install, the plugin must live in the same tool environment
+   uv tool install coderouter-cli \
+     --with "coderouter-plugin-agents @ git+https://github.com/zephel01/coderouter-plugin-agents"
+   ```
+
+   Add `plugins.enabled: [agents]` to `providers.yaml` (a two-stage gate — installing the package alone does not activate it):
+
+   ```yaml
+   plugins:
+     enabled: [agents]
+   ```
+
+2. **Install the Claude Code CLI** (verify with `claude --version`).
+3. **Log in** — either run `claude` interactively and complete `/login`, or, on a headless machine, follow the [platform-specific authentication](#platform-specific-authentication) steps using `claude setup-token`.
+4. **Start with the example config** (`examples/providers-agent-cli.yaml` already has `plugins.enabled: [agents]` set):
 
    ```bash
    uv run coderouter serve --config examples/providers-agent-cli.yaml --port 8088
    ```
 
-4. **Verify it works**:
+5. **Verify it works**:
 
    ```bash
    curl http://localhost:8088/v1/chat/completions \
@@ -109,6 +133,8 @@ Because the child process does not inherit the parent environment, exporting `AN
 
 ## Configuration reference
 
+> The `agent_cli:` sub-config schema (`AgentCliConfig`) is unchanged in v2.9.0. The only change is "install `coderouter-plugin-agents` and add `plugins.enabled: [agents]` to `providers.yaml`" — existing provider entries need no edits (see [Quickstart](#quickstart)).
+
 All fields of the `agent_cli:` sub-config (`AgentCliConfig`) in `providers.yaml`. `extra: forbid` applies, so an unknown key fails immediately at config load.
 
 | Field | Type | Default | Description |
@@ -445,6 +471,8 @@ The grok CLI is early beta (v0.2.93 [stable] channel as of 2026-07-10). Its JSON
 | `agent: gemini` raises an `AdapterError` / you see `IneligibleTierError` | Google discontinued the Gemini CLI for individual accounts in June 2026 (field-verified: `IneligibleTierError: This client is no longer supported for Gemini Code Assist for individuals...`) | Switch to `agent: antigravity`. See the [antigravity (Google Antigravity CLI)](#antigravity-google-antigravity-cli) section for a working example |
 | `agy` hangs and never responds | Something is being piped into agy's stdin (e.g. `printf '...' \| agy -p "..."`) | Don't pipe stdin — write nothing and redirect from `</dev/null`. Calls made through CodeRouter already do this (the adapter closes stdin immediately) |
 | CLI fails to launch (`failed to launch ...`) | `command` (defaults to the same name as `agent`, except antigravity which defaults to `agy`) isn't on `PATH` | Confirm `claude --version` / `codex --version` / `agy --version` / `grok --version` works. You can also point `command` at a full path |
+| `coderouter serve` fails at startup even though a `kind: agent_cli` provider is configured | v2.9.0 (Phase 2c) removed the in-core `agent_cli` adapter; `coderouter-plugin-agents` plus `plugins.enabled: [agents]` are now required | Run `uv pip install "coderouter-plugin-agents @ git+https://github.com/zephel01/coderouter-plugin-agents"` (or the pip / `uv tool install coderouter-cli --with "coderouter-plugin-agents @ git+https://github.com/zephel01/coderouter-plugin-agents"` variant), then add `plugins.enabled: [agents]` to `providers.yaml`. The startup error message itself includes the same migration steps (install + `plugins.enabled`) |
+| `coderouter doctor` reports an `agent_cli`-related config warning | A `kind: agent_cli` provider exists but `plugins.enabled` doesn't list `agents` (or the plugin isn't installed) | Same install command as above plus adding `plugins.enabled: [agents]`. `doctor`'s output also prints a fix snippet |
 
 ---
 

{coderouter_cli-2.8.0 → coderouter_cli-2.9.0}/docs/backends/external-agents.md

@@ -4,6 +4,8 @@
 
 `kind: "agent_cli"` は、Claude Code CLI のような外部コーディングエージェントを CodeRouter の 1 プロバイダとして登録するアダプタである。v2.7.7 で新規追加され(Phase 1a: claude)、v2.7.8 で grok が追加され(Phase 1d)、v2.7.9 で codex が追加され(Phase 1b)、v2.7.10 で antigravity が追加された(Phase 1c)。これにより **Phase 1(4バックエンド)は完了**した。詳細設計は [`docs/designs/external-agents-adapter.md`](../designs/external-agents-adapter.md) を参照。
 
+> **重要: v2.9.0 で破壊的変更(agent_cli plugin 切り出し Phase 2c)** — in-core の `agent_cli` アダプタは v2.9.0 で削除された。`kind: "agent_cli"` を使うには外部プラグイン **`coderouter-plugin-agents`** のインストールと、`providers.yaml` への `plugins.enabled: [agents]` の指定が **必須**になった。v2.8.x までは in-core 実装が優先して動く猶予期間(Phase 2b)があったが、v2.9.0 でその猶予は終了している。手順は下記の[クイックスタート](#クイックスタート)を参照。プラグイン未導入のまま `kind: agent_cli` を書くと `coderouter serve` は起動時にエラーで停止し、移行手順を示すメッセージが表示される。`coderouter doctor` も同じ設定ミスを検出して警告する。`agent_cli:` サブ設定(`AgentCliConfig`)のスキーマ自体および各プロバイダのエントリは無変更であり、書き換える必要はない。
+
 ---
 
 ## 概要
@@ -12,6 +14,7 @@
 
 - **対象 CLI**: `agent` フィールドで `claude` / `codex` / `antigravity` / `grok` の4種を宣言できる。`gemini` もスキーマの `Literal` には残っているが、常に拒否される(下記参照)。
 - **実装状況(v2.7.10 時点)**: **Phase 1 が完了し、`claude`(Claude Code CLI・Phase 1a)・`codex`(OpenAI Codex CLI・Phase 1b)・`antigravity`(Google Antigravity CLI・Phase 1c)・`grok`(Grok CLI・Phase 1d)の4バックエンドすべてが実装済み**。`gemini` は Google が2026年6月に個人アカウント向け Gemini CLI の提供を終了したため実装対象から外れ、アダプタ構築時に必ず次のような専用メッセージ付きの AdapterError で拒否される:
+- **v2.9.0 以降の前提条件**: 上記4バックエンドのアダプタ本体は Phase 2b(v2.8.1)で `coderouter-plugin-agents` へ移設され、Phase 2c(v2.9.0)で in-core コピーが削除された。したがって v2.9.0 以降、`kind: agent_cli` を使うには `coderouter-plugin-agents` のインストール + `plugins.enabled: [agents]` が必須である。`agent_cli:` サブ設定(`AgentCliConfig`)・各 CLI の argv/挙動・provider エントリの書き方はいずれも無変更(下記の各セクション参照)。
 
   ```
   AdapterError: Google discontinued Gemini CLI for individual accounts (June 2026).
@@ -43,15 +46,36 @@ Google が後継として案内しているのは **Antigravity CLI**(コマン
 
 ## クイックスタート
 
-1. **Claude Code CLI をインストールする**(`claude --version` で確認できること)。
-2. **ログインを済ませる** — 対話起動して `claude` を実行し `/login` を通すか、ヘッドレス環境なら [プラットフォーム別の認証](#プラットフォーム別の認証) の手順で `claude setup-token` を使う。
-3. **サンプル設定で起動する**:
+1. **`coderouter-plugin-agents` をインストールし、有効化する**(v2.9.0 以降必須。未実施だと `kind: agent_cli` の provider がある状態で `coderouter serve` が起動時エラーになる):
+
+   ```bash
+   # uv の場合
+   uv pip install "coderouter-plugin-agents @ git+https://github.com/zephel01/coderouter-plugin-agents"
+
+   # pip の場合
+   pip install "coderouter-plugin-agents @ git+https://github.com/zephel01/coderouter-plugin-agents"
+
+   # CodeRouter 本体を uv tool install で入れている場合は同じツール環境に同居させる
+   uv tool install coderouter-cli \
+     --with "coderouter-plugin-agents @ git+https://github.com/zephel01/coderouter-plugin-agents"
+   ```
+
+   `providers.yaml` に `plugins.enabled: [agents]` を追記する(二段ゲート — インストールしただけでは有効にならない):
+
+   ```yaml
+   plugins:
+     enabled: [agents]
+   ```
+
+2. **Claude Code CLI をインストールする**(`claude --version` で確認できること)。
+3. **ログインを済ませる** — 対話起動して `claude` を実行し `/login` を通すか、ヘッドレス環境なら [プラットフォーム別の認証](#プラットフォーム別の認証) の手順で `claude setup-token` を使う。
+4. **サンプル設定で起動する**(`examples/providers-agent-cli.yaml` には既に `plugins.enabled: [agents]` が入っている):
 
    ```bash
    uv run coderouter serve --config examples/providers-agent-cli.yaml --port 8088
    ```
 
-4. **動作確認**:
+5. **動作確認**:
 
    ```bash
    curl http://localhost:8088/v1/chat/completions \
@@ -109,6 +133,8 @@ Claude Code CLI は Keychain からトークンを解決する際に `USER` 環
 
 ## 設定リファレンス
 
+> `agent_cli:` サブ設定(`AgentCliConfig`)のスキーマは v2.9.0 でも変更されていない。変更点は「`coderouter-plugin-agents` のインストール + `providers.yaml` への `plugins.enabled: [agents]` の追加」のみであり、既存の provider エントリ自体を書き換える必要はない([クイックスタート](#クイックスタート)参照)。
+
 `providers.yaml` の `agent_cli:` サブ設定(`AgentCliConfig`)の全フィールド。`extra: forbid` なので未知のキーは設定読み込み時に即座にエラーになる。
 
 | フィールド | 型 | 既定値 | 説明 |
@@ -445,6 +471,8 @@ grok CLI は early beta である(v0.2.93 [stable] チャネル、2026-07-10 時
 | `agent: gemini` を指定すると `AdapterError` になる/`IneligibleTierError` が出る | Google が2026年6月に個人アカウント向け Gemini CLI 提供を終了したため(実機で `IneligibleTierError: This client is no longer supported for Gemini Code Assist for individuals...` を確認) | `agent: antigravity` に切り替える。設定例は [antigravity(Google Antigravity CLI)](#antigravitygoogle-antigravity-cli) セクションを参照 |
 | `agy` が応答を返さずハングする | agy に stdin をパイプしている(例: `printf '...' \| agy -p "..."`) | stdin をパイプしない。何も書かず `</dev/null` にリダイレクトする。CodeRouter 経由の呼び出しではアダプタが既にこの対策(stdin 即クローズ)を取っている |
 | CLI 起動に失敗する(`failed to launch ...`) | `command`(既定は `agent` と同名。ただし antigravity のみ既定 `agy`)が `PATH` 上に無い | `claude --version` / `codex --version` / `agy --version` / `grok --version` が通ることを確認する。フルパスを `command` に指定してもよい |
+| `kind: agent_cli` の provider があるのに `coderouter serve` が起動時にエラーで停止する | v2.9.0(Phase 2c)で in-core `agent_cli` アダプタが削除され、`coderouter-plugin-agents` の導入 + `plugins.enabled: [agents]` が必須になった | `uv pip install "coderouter-plugin-agents @ git+https://github.com/zephel01/coderouter-plugin-agents"`(または pip、あるいは `uv tool install coderouter-cli --with "coderouter-plugin-agents @ git+https://github.com/zephel01/coderouter-plugin-agents"`)を実行し、`providers.yaml` に `plugins.enabled: [agents]` を追記する。起動時のエラーメッセージ自体にも同じ移行手順(インストール + `plugins.enabled`)が案内される |
+| `coderouter doctor` が `agent_cli` 関連の設定警告を出す | `kind: agent_cli` の provider があるのに `plugins.enabled` に `agents` が含まれていない(または plugin 未インストール) | 上記と同じインストールコマンド + `plugins.enabled: [agents]` の追記で解消する。`doctor` の出力にも修正用の yaml スニペットが表示される |
 
 ---
 

{coderouter_cli-2.8.0 → coderouter_cli-2.9.0}/docs/designs/agent-cli-plugin-extraction.md

@@ -2,7 +2,7 @@
 
 > 対象バージョン: CodeRouter v2.8+ 系 / Phase 2（Adapter hook 配線 + 別リポ移設）
 > 関連: [`external-agents-adapter.md`](./external-agents-adapter.md) §9.3・§11.3〜§11.5、[`docs/inside/future.md`](../inside/future.md) §1.2・§2.5、[`plan.md`](../../plan.md)
-> ステータス: 設計中（レビュー前）
+> ステータス: Phase 2a/2b/2c すべて実装済み（設計完了）
 
 本設計書は、現在 CodeRouter 本体に in-core 実装されている外部コーディングエージェント CLI アダプタ（`kind="agent_cli"`、`coderouter/adapters/agent_cli.py`、1168 行）を、別配布の plugin パッケージ `coderouter-plugin-agents` へ前方互換で切り出す方式を定義するものである。切り出しの前提として、現状デッドエンド（`name: str` のみ）である Adapter Protocol（`coderouter/plugins/base.py` L156-168）を engine に配線する設計を併せて確定する。CLI 固有仕様はすべて `external-agents-adapter.md` §11.3〜§11.5 の実 CLI 検証結果を、拡張点のコード上の根拠はすべて本体実装の該当行を典拠とする。
 
@@ -408,3 +408,7 @@ Literal による静的保証は不要と判断した。
 - [`docs/inside/future.md`](../inside/future.md) — §1.2 三層モデル・Core 5 deps 不変条件（L187-253）、§2.5 方向性（L368+）、タスク #15（L112）
 - [`plan.md`](../../plan.md) — Core 5 deps 方針 / プラグイン制による外部委譲（L689）
 - 実装典拠: `coderouter/plugins/base.py` L156-168 / `coderouter/plugins/loader.py` L44-134 / `coderouter/plugins/registry.py` L43-66 / `coderouter/adapters/registry.py` L11-23 / `coderouter/adapters/agent_cli.py` L204-1168 / `coderouter/adapters/base.py` L162-263 / `coderouter/config/schemas.py` L166-329・L342-505・L1477-1519・L1674-1684 / `coderouter/routing/fallback.py` L1100-1110・L1178-1220 / `tests/test_agent_cli.py`（91 件）
+
+### 9.1 完了記録（2026-07-11）
+
+本設計の Phase 2a・2b・2c はすべて 2026-07-11 に実装完了した（v2.8.0 = Phase 2a、v2.8.1 = Phase 2b、v2.9.0 = Phase 2c、`coderouter-plugin-agents` 0.1.0）。§5.1・§7 が想定していた「2b の in-core 猶予期間」は、owner 判断により意図的にスキップされ、2b→2c を同日中に連続実施する形になった（当初想定していたような複数リリースにまたがる猶予期間は設けられていない）。この短縮に対する緩和策は次の3点である: (1) plugin 未導入のまま `kind: agent_cli` を使うと `serve` 起動時に移行手順込みのエラーで即座に停止する（§3.3 のエラーメッセージを 2c でさらに具体化)、(2) `coderouter doctor` が同じ設定ミスを config-level warning として検出し修正スニペットを提示する、(3) v2.9.0 の CHANGELOG エントリで本変更を **BREAKING** として先頭に明記し、影響範囲・対処コマンド・不変点・上記2つの安全網を明示している。

{coderouter_cli-2.8.0 → coderouter_cli-2.9.0}/docs/guides/language-tax.en.md

@@ -31,7 +31,7 @@ Two distinct axes:
 
 ## 2. Measured data
 
-Measured with real production tokenizers (reproduce: `_OUTPUTS/CodeRouter-language-tax/measure/`).
+Measured with real production tokenizers (reproduce: `_OUTPUTS/01-機能実装/language-tax/measure/`).
 
 ### Economic tax — same meaning, JA vs EN (avg of 5 translation pairs)
 

{coderouter_cli-2.8.0 → coderouter_cli-2.9.0}/docs/guides/language-tax.md

@@ -31,7 +31,7 @@ English version: [`language-tax.en.md`](./language-tax.en.md)
 
 ## 2. 実測データ
 
-実在の本番トークナイザで計測した結果です（再現スクリプト: `_OUTPUTS/CodeRouter-language-tax/measure/`）。
+実在の本番トークナイザで計測した結果です（再現スクリプト: `_OUTPUTS/01-機能実装/language-tax/measure/`）。
 
 ### 経済的な税 — 同じ意味で JA vs EN（対訳5ペアの平均）
 

{coderouter_cli-2.8.0 → coderouter_cli-2.9.0}/examples/providers-agent-cli.yaml

@@ -2,8 +2,14 @@
 # CodeRouter providers.yaml — 外部コーディングエージェント CLI (agent_cli)
 # 【カテゴリ】 kind="agent_cli" アダプタ / Phase 1 完了 — claude (1a)・codex (1b)・
 #              antigravity (1c)・grok (1d) の4バックエンドすべて実装済み
+#              / agent_cli plugin 切り出し Phase 2c 完了(v2.9.0) —
+#              in-core アダプタは削除済み。kind: agent_cli を使うには
+#              coderouter-plugin-agents のインストール +
+#              plugins.enabled: [agents] が必須 (破壊的変更。下記
+#              plugins: ブロックと「使い方」節を参照)。
 #
-# 出典: docs/designs/external-agents-adapter.md
+# 出典: docs/designs/external-agents-adapter.md,
+#       docs/designs/agent-cli-plugin-extraction.md
 # 目的: Claude Code CLI (`claude -p --output-format json`)、Codex CLI、
 #       Antigravity CLI (`agy`)、Grok CLI を CodeRouter の1プロバイダとして
 #       登録し、他のオーケストレータ (別の Claude Code / Cursor 等) から
@@ -34,14 +40,24 @@
 #     (既定 true のため上書き必須)。
 #
 # 使い方:
-#   1. claude CLI がインストール済み・`claude` が PATH 上にあること
+#   1. coderouter-plugin-agents をインストールする (v2.9.0 以降必須。
+#      未実施だと下記 provider 群がある状態で `coderouter serve` が
+#      起動時エラーで止まる):
+#        uv pip install "coderouter-plugin-agents @ git+https://github.com/zephel01/coderouter-plugin-agents"
+#        # または pip install "coderouter-plugin-agents @ git+https://github.com/zephel01/coderouter-plugin-agents"
+#        # uv tool install 構成の場合は同じツール環境に同居させる:
+#        #   uv tool install coderouter-cli \
+#        #     --with "coderouter-plugin-agents @ git+https://github.com/zephel01/coderouter-plugin-agents"
+#      このファイルには下記に `plugins: enabled: [agents]` を既に
+#      含めてある (二段ゲート — インストールしただけでは有効にならない)。
+#   2. claude CLI がインストール済み・`claude` が PATH 上にあること
 #      (`claude --version` で確認)。
-#   2. サブスクリプション認証を済ませておく (`claude` を対話起動して
+#   3. サブスクリプション認証を済ませておく (`claude` を対話起動して
 #      ログイン、または `claude setup-token` で1年トークンを発行し
 #      CLAUDE_CODE_OAUTH_TOKEN として環境変数に設定)。
-#   3. cp examples/providers-agent-cli.yaml ~/.coderouter/providers.yaml
-#   4. coderouter serve --port 8088
-#   5. 動作確認:
+#   4. cp examples/providers-agent-cli.yaml ~/.coderouter/providers.yaml
+#   5. coderouter serve --port 8088
+#   6. 動作確認:
 #        curl http://localhost:8088/v1/chat/completions \
 #          -H 'Content-Type: application/json' \
 #          -H 'X-CodeRouter-Profile: claude-agent' \
@@ -72,6 +88,19 @@
 
 default_profile: claude-agent
 
+# v2.9.0 以降必須: kind: agent_cli の provider を使うには
+# coderouter-plugin-agents をインストールした上で、ここに "agents" を
+# 列挙して有効化する必要がある (二段ゲート)。インストールコマンド:
+#   uv pip install "coderouter-plugin-agents @ git+https://github.com/zephel01/coderouter-plugin-agents"
+#   # または: pip install "coderouter-plugin-agents @ git+https://github.com/zephel01/coderouter-plugin-agents"
+#   # uv tool install 構成なら:
+#   #   uv tool install coderouter-cli \
+#   #     --with "coderouter-plugin-agents @ git+https://github.com/zephel01/coderouter-plugin-agents"
+# 未インストール/未列挙のままだと coderouter serve は起動時エラーで
+# 停止する (docs/backends/external-agents.md のトラブルシューティング参照)。
+plugins:
+  enabled: [agents]
+
 providers:
   # ---- Claude Code CLI (Phase 1a・実装済み) ----
   - name: agent-claude

{coderouter_cli-2.8.0 → coderouter_cli-2.9.0}/pyproject.toml

@@ -11,7 +11,7 @@
 # in plan.md §11.B; once granted, this name will become an alias and
 # `coderouter` will become the canonical distribution name.
 name = "coderouter-cli"
-version = "2.8.0"
+version = "2.9.0"
 description = "Local-first, free-first, fallback-built-in LLM router. Claude Code / OpenAI compatible."
 readme = "README.md"
 requires-python = ">=3.12"