coderouter-cli 2.8.1__py3-none-any.whl → 2.9.0__py3-none-any.whl

coderouter/adapters/registry.py

@@ -18,12 +18,27 @@ 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
+#
+# 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]:
@@ -33,36 +48,6 @@ 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,
@@ -72,27 +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
-
-        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:
             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/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/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.1.dist-info → coderouter_cli-2.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coderouter-cli
-Version: 2.8.1
+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.1.dist-info → coderouter_cli-2.9.0.dist-info}/RECORD

@@ -3,7 +3,7 @@ coderouter/__main__.py,sha256=-LCgxJnvgUV240HjQKv7ly-mn2NuKHpC4nCpvTHjeSU,130
 coderouter/cli.py,sha256=7zxt6riKPTpHGiDms9SVaPbe-n4ytfCrhIVtuPII-oU,30173
 coderouter/cli_stats.py,sha256=CCjzc1G4hTRHZ2gG1XhxhDpUkJnnl3NXbcbp1T18jpg,29894
 coderouter/cost.py,sha256=32h6uzb4nxh2eA5d2Hn3kD9yJbtis6CFDAbeIy5KRkM,7431
-coderouter/doctor.py,sha256=2luNk6BHSRvpQStJnHcqzNvNi-SKdOuKV0WZdorZhVk,82854
+coderouter/doctor.py,sha256=x0OqWUMGPzYaX2poWSH2UA90sEr4Z69-gVYLXYQFCFU,85483
 coderouter/doctor_apply.py,sha256=r_J6xbu5-HivofPNriw4_vjNYs_VRs7GsGTS0oMEX10,24209
 coderouter/env_security.py,sha256=FEBZnXfJ0xE39kmMMn39zk0W_DRRnmcB_REmP9f4xWo,14796
 coderouter/errors.py,sha256=Xmq67lheyw8iv3Ox39jh2c4tvNI5RcUR4QkoxVDN6l4,1130
@@ -16,16 +16,15 @@ coderouter/output_filters.py,sha256=0ry_rPiS_kC-FnHgaNVP6v7e6Al2djxzu9vBzZ8kEkE,
 coderouter/token_estimation.py,sha256=iz22vZEEW2P7uKLB2pYvPNpIbZGbgXRO5MtfkS_-9Sk,7531
 coderouter/token_estimation_accurate.py,sha256=GTfzrBVnvAGjeVzmzAeUdOYZvWZKLAxcxPpFiJGlzjk,4609
 coderouter/adapters/__init__.py,sha256=7dIDSZ-FE_0iSqLSDc_lK1idRdLTKcM2hP9tCJipgPI,463
-coderouter/adapters/agent_cli.py,sha256=0g0V92drEQLJACXq-Dn0hE-J6e3vmsuBr5UdnAkXJyk,52430
 coderouter/adapters/anthropic_native.py,sha256=CT9Hitun-c3z83YHT2zZXgwZpY3_t6eRnOfAmNud2aw,23610
 coderouter/adapters/base.py,sha256=ykKMaiIVVGr23oFFXilK2iP_YhI8-CtsEiJyFXaC9bE,10396
 coderouter/adapters/openai_compat.py,sha256=wcrd_UpV7N6ISpUyKvdFPGU-YjCrX5oMqGpjAFEeWfg,20356
-coderouter/adapters/registry.py,sha256=hwMhdBg-wurjJKa4MJIuDoMn1ClOOsorGppJ-s5pnF0,4311
+coderouter/adapters/registry.py,sha256=XNc1wmFv_oZlqKS0rA693TRDdbq1sZ-OIcofXOVOtq0,3680
 coderouter/config/__init__.py,sha256=FODEn74fN-qZnt4INPSHswqhOlEgpL6-_onxsitSx8g,274
 coderouter/config/capability_registry.py,sha256=RZgzHF54dXy0CCDocRCz2ee21qXGbbgTSKTkRI9iLL4,16936
 coderouter/config/env_file.py,sha256=CoMK27fuAXm-NtoLzXb8yN2E-wDFjHQuFwiIlmgTBQw,10356
 coderouter/config/loader.py,sha256=FUEe8m4Tnmj_aul0vSctD8vKvNW-oLRoMRbTpSKqSmc,4077
-coderouter/config/schemas.py,sha256=AJIJ-zrEgI5czTlcD6YxWQe9rnJFsr6AcKSwwlCaLk8,89447
+coderouter/config/schemas.py,sha256=PUx-WwjFfa4UVaBd0dt3s7mCwE5D2Vp0hPD2S4mOcH4,90894
 coderouter/data/__init__.py,sha256=uNyfD9jaCvTWsBAWtaw1Fr25OSxzv3psGMfBjT1z0Cc,328
 coderouter/data/model-capabilities.yaml,sha256=S9jt6SC6-3s2-icZ_n-a14iEMnc2yB1C2R6q-N_tZWQ,19309
 coderouter/guards/__init__.py,sha256=5qliYBqygvVPneej7nx0uSjxDKsz7t8VzvrDgVBJlvU,1170
@@ -69,8 +68,8 @@ coderouter/translation/__init__.py,sha256=PYXN7XVEwpG1uC8RLy6fvnGbzEZhhrEuUapH8I
 coderouter/translation/anthropic.py,sha256=aZkcYH4x82b0x7efJgJb9RWn9Hbyc9pEOthXe4vjUdU,11113
 coderouter/translation/convert.py,sha256=VV4kpu4dvLmGBmJfQnCLY5ryy_AnQcV2NuwjqRtaR8Q,52633
 coderouter/translation/tool_repair.py,sha256=DGOKArM53yfVbIfiAveoul1vGq9NEKmjagf43Qh4IkM,57630
-coderouter_cli-2.8.1.dist-info/METADATA,sha256=qRLxuyz0gjzAwHy4eSWMXl_E23g7fwG6AYuVonimdlg,15546
-coderouter_cli-2.8.1.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-coderouter_cli-2.8.1.dist-info/entry_points.txt,sha256=-dnLfD1YZ2WjH2zSdNCvlO65wYltM9bsHt9Fhg3yGss,51
-coderouter_cli-2.8.1.dist-info/licenses/LICENSE,sha256=wkEzoR86jFw33jvfOHjULqmkGEfxTFMgMaJnpR8mPRw,1065
-coderouter_cli-2.8.1.dist-info/RECORD,,
+coderouter_cli-2.9.0.dist-info/METADATA,sha256=REKGn1AQx-as9IHvUBwA0ApEzwcrgKQCyQekxiqJOXo,15546
+coderouter_cli-2.9.0.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+coderouter_cli-2.9.0.dist-info/entry_points.txt,sha256=-dnLfD1YZ2WjH2zSdNCvlO65wYltM9bsHt9Fhg3yGss,51
+coderouter_cli-2.9.0.dist-info/licenses/LICENSE,sha256=wkEzoR86jFw33jvfOHjULqmkGEfxTFMgMaJnpR8mPRw,1065
+coderouter_cli-2.9.0.dist-info/RECORD,,