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

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

@@ -9,6 +9,35 @@ are kept verbatim where the Japanese text itself is the subject).
 
 ---
 
+## [v2.8.1] — 2026-07-11 (agent_cli moved to coderouter-plugin-agents — Phase 2b)
+
+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.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coderouter-cli
-Version: 2.8.0
+Version: 2.8.1
 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.8.1}/coderouter/adapters/registry.py

@@ -8,15 +8,23 @@ 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")
 
+# Module-level flag so the Phase 2b in-core agent_cli deprecation warning
+# (docs/designs/agent-cli-plugin-extraction.md §5.1) fires at most once per
+# process, regardless of how many agent_cli providers are built.
+_agent_cli_deprecation_logged = False
+
 
 def _plugin_kinds(plugin_registry: PluginRegistry | None) -> list[str]:
     """``kind`` values served by enabled adapter plugins, for error text."""
@@ -25,6 +33,36 @@ def _plugin_kinds(plugin_registry: PluginRegistry | None) -> list[str]:
     return [factory.kind for factory in plugin_registry.adapters]
 
 
+def _warn_agent_cli_in_core_deprecated_once() -> None:
+    """Log ``agent-cli-in-core-deprecated`` once per process (§5.1).
+
+    Only called when the in-core ``agent_cli`` branch is taken AND an
+    adapter plugin has also registered a ``kind="agent_cli"`` factory —
+    i.e. the operator already has ``coderouter-plugin-agents`` installed
+    and enabled, but Core's in-core copy still wins resolution order
+    (§3.2) during the Phase 2b migration window. Nudges them toward the
+    plugin path ahead of its Phase 2c removal from Core.
+    """
+    global _agent_cli_deprecation_logged
+    if _agent_cli_deprecation_logged:
+        return
+    _agent_cli_deprecation_logged = True
+    logger.warning(
+        "agent-cli-in-core-deprecated",
+        extra={
+            "hint": (
+                "an 'agent_cli' adapter plugin is installed and enabled, "
+                "but Core's in-core agent_cli implementation still served "
+                "this request (in-core wins resolution during the Phase 2b "
+                "migration window). The in-core copy will be removed in "
+                "Phase 2c — no action is required yet, but new setups "
+                "should already be relying on the plugin path "
+                "(coderouter-plugin-agents)."
+            ),
+        },
+    )
+
+
 def build_adapter(
     provider: ProviderConfig,
     plugin_registry: PluginRegistry | None = None,
@@ -46,6 +84,10 @@ def build_adapter(
         # os plumbing) is only pulled in when a config actually uses it.
         from coderouter.adapters.agent_cli import AgentCliAdapter
 
+        if plugin_registry is not None and any(
+            factory.kind == "agent_cli" for factory in plugin_registry.adapters
+        ):
+            _warn_agent_cli_in_core_deprecated_once()
         return AgentCliAdapter(provider)
     if plugin_registry is not None:
         for factory in plugin_registry.adapters:

{coderouter_cli-2.8.0 → coderouter_cli-2.8.1}/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.8.1}/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.8.1}/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.8.1"
 description = "Local-first, free-first, fallback-built-in LLM router. Claude Code / OpenAI compatible."
 readme = "README.md"
 requires-python = ">=3.12"

coderouter_cli-2.8.1/tests/test_agent_cli.py

@@ -0,0 +1,81 @@
+"""Config-schema validation tests for ``kind="agent_cli"`` providers.
+
+Phase 2b of the agent_cli plugin extraction
+(``docs/designs/agent-cli-plugin-extraction.md`` §4.4 案(b), §4.5, §7)
+moved the adapter-behavior tests (argv construction, output parsing,
+subprocess stubbing, env isolation, timeouts, recursion limits, and the
+TestClient E2E flows — ~82 of the original 91 tests) to the
+``coderouter-plugin-agents`` plugin package, alongside the
+``AgentCliAdapter`` implementation itself
+(``coderouter/adapters/agent_cli.py``, kept in-core only as a
+backward-compatible copy through Phase 2c — see
+``coderouter/adapters/registry.py``'s ``agent-cli-in-core-deprecated``
+log).
+
+What stays in Core, and stays here, is the schema contract: ``kind:
+agent_cli`` and the ``agent_cli:`` sub-config (``AgentCliConfig``) are
+recognized by ``ProviderConfig`` regardless of whether the adapter
+plugin is installed, because Core owns config validation (fail-fast at
+config-load time, ``extra="forbid"``). These 9 tests are that contract's
+regression guard.
+"""
+
+from __future__ import annotations
+
+import pytest
+from pydantic import ValidationError
+
+from coderouter.config.schemas import AgentCliConfig, ProviderConfig
+
+
+def test_schema_agent_cli_required_for_kind() -> None:
+    with pytest.raises(ValidationError, match="agent_cli sub-config is required"):
+        ProviderConfig(name="x", kind="agent_cli", model="opus")
+
+
+def test_schema_base_url_optional_for_agent_cli() -> None:
+    p = ProviderConfig(
+        name="x",
+        kind="agent_cli",
+        model="opus",
+        agent_cli=AgentCliConfig(agent="claude"),
+    )
+    assert p.base_url is None
+
+
+def test_schema_base_url_required_for_openai_compat() -> None:
+    with pytest.raises(ValidationError, match="base_url is required"):
+        ProviderConfig(name="x", kind="openai_compat", model="m")
+
+
+def test_schema_command_defaults_to_agent() -> None:
+    cfg = AgentCliConfig(agent="claude")
+    assert cfg.command == "claude"
+
+
+def test_schema_command_defaults_to_agy_for_antigravity() -> None:
+    # antigravity is the one agent whose binary name differs from the
+    # ``agent`` value (product "Antigravity CLI", command "agy").
+    cfg = AgentCliConfig(agent="antigravity")
+    assert cfg.command == "agy"
+
+
+def test_schema_command_still_defaults_to_agent_for_others() -> None:
+    for agent in ("claude", "codex", "grok"):
+        cfg = AgentCliConfig(agent=agent)  # type: ignore[arg-type]
+        assert cfg.command == agent
+
+
+def test_schema_antigravity_accepted_by_literal() -> None:
+    cfg = AgentCliConfig(agent="antigravity")
+    assert cfg.agent == "antigravity"
+
+
+def test_schema_antigravity_explicit_command_not_overridden() -> None:
+    cfg = AgentCliConfig(agent="antigravity", command="/opt/bin/agy")
+    assert cfg.command == "/opt/bin/agy"
+
+
+def test_schema_write_conflict_rejected() -> None:
+    with pytest.raises(ValidationError, match="conflicts with"):
+        AgentCliConfig(agent="claude", allow_file_writes=True, sandbox_mode="read_only")

{coderouter_cli-2.8.0 → coderouter_cli-2.8.1}/tests/test_plugin_adapter.py

@@ -67,9 +67,7 @@ class _FakeAgentAdapter(BaseAdapter):
     async def healthcheck(self) -> bool:
         return True
 
-    async def generate(
-        self, request: ChatRequest, *, overrides: Any = None
-    ) -> ChatResponse:
+    async def generate(self, request: ChatRequest, *, overrides: Any = None) -> ChatResponse:
         return ChatResponse(
             id="fake-agent-1",
             created=int(time.time()),
@@ -121,9 +119,7 @@ class _ShadowOpenAICompatProvider:
         pass
 
     def build(self, config: ProviderConfig) -> BaseAdapter:
-        raise AssertionError(
-            "plugin factory must not be consulted for an in-core kind"
-        )
+        raise AssertionError("plugin factory must not be consulted for an in-core kind")
 
 
 def _fake_agent_provider_config(**overrides: object) -> ProviderConfig:
@@ -222,6 +218,57 @@ def test_in_core_agent_cli_kind_is_not_shadowed_by_plugin() -> None:
     assert isinstance(adapter, AgentCliAdapter)
 
 
+def test_in_core_agent_cli_deprecation_logged_once_per_process(
+    monkeypatch: pytest.MonkeyPatch, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Phase 2b (docs/designs/agent-cli-plugin-extraction.md §5.1):
+
+    when the in-core ``agent_cli`` branch is taken *and* an adapter
+    plugin has also registered a ``kind="agent_cli"`` factory,
+    ``build_adapter`` must log ``agent-cli-in-core-deprecated`` exactly
+    once per process — not once per call — while still resolving to the
+    in-core :class:`AgentCliAdapter` (in-core keeps winning resolution
+    order, §3.2).
+    """
+    import coderouter.adapters.registry as registry_mod
+
+    # The module-level once-per-process flag may already be set by
+    # another test in this session (e.g.
+    # test_in_core_agent_cli_kind_is_not_shadowed_by_plugin above, which
+    # also exercises the agent_cli + plugin-present combination) — reset
+    # it so this test's assertions are deterministic regardless of
+    # ordering.
+    monkeypatch.setattr(registry_mod, "_agent_cli_deprecation_logged", False)
+
+    class _AgentCliLikeProvider:
+        name = "agents"
+        kind = "agent_cli"
+
+        def __init__(self, **_config: object) -> None:
+            pass
+
+        def build(self, config: ProviderConfig) -> BaseAdapter:  # pragma: no cover
+            raise AssertionError("in-core must win; plugin factory unused")
+
+    reg = PluginRegistry()
+    reg.add("adapter", _AgentCliLikeProvider())
+
+    provider = ProviderConfig(
+        name="agent",
+        kind="agent_cli",
+        model="opus",
+        agent_cli=AgentCliConfig(agent="claude"),
+    )
+
+    with caplog.at_level("WARNING"):
+        first = build_adapter(provider, reg)
+        second = build_adapter(provider, reg)
+
+    assert isinstance(first, AgentCliAdapter)
+    assert isinstance(second, AgentCliAdapter)
+    assert sum(1 for rec in caplog.records if rec.msg == "agent-cli-in-core-deprecated") == 1
+
+
 def test_unknown_kind_error_lists_in_core_and_plugin_kinds() -> None:
     reg = PluginRegistry()
     reg.add("adapter", _FakeAgentProvider())
@@ -291,9 +338,7 @@ def test_adapter_group_is_active_not_future(
 
     assert reg.count("adapter") == 1
     assert reg.adapters[0].kind == "fake_agent"
-    assert not any(
-        rec.msg == "plugin-group-not-yet-active" for rec in caplog.records
-    )
+    assert not any(rec.msg == "plugin-group-not-yet-active" for rec in caplog.records)
 
 
 def test_installed_but_not_enabled_adapter_is_unavailable(