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

coderouter/adapters/registry.py

@@ -2,14 +2,79 @@
 
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 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."""
+    if plugin_registry is None:
+        return []
+    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,
+) -> BaseAdapter:
+    """Construct an adapter from a ProviderConfig.
 
-def build_adapter(provider: ProviderConfig) -> BaseAdapter:
-    """Construct an adapter from a ProviderConfig."""
+    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``).
+    """
     if provider.kind == "openai_compat":
         return OpenAICompatAdapter(provider)
     if provider.kind == "anthropic":
@@ -19,5 +84,19 @@ def build_adapter(provider: ProviderConfig) -> BaseAdapter:
         # 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)
-    raise ValueError(f"Unknown adapter kind: {provider.kind!r}")
+    if plugin_registry is not None:
+        for factory in plugin_registry.adapters:
+            if factory.kind == provider.kind:
+                return factory.build(provider)
+    raise ValueError(
+        f"Unknown adapter kind {provider.kind!r}. "
+        f"in-core kinds: {', '.join(_IN_CORE_KINDS)}; "
+        f"plugin-provided kinds: {_plugin_kinds(plugin_registry)}. "
+        f"If a plugin should provide {provider.kind!r}, ensure it is "
+        f"installed AND listed in plugins.enabled."
+    )

coderouter/config/schemas.py

@@ -342,13 +342,23 @@ class ProviderConfig(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
     name: str = Field(..., description="Unique identifier used in profiles.yaml")
-    kind: Literal["openai_compat", "anthropic", "agent_cli"] = Field(
+    # v2.8.0: widened from Literal["openai_compat", "anthropic", "agent_cli"]
+    # to str so a provider can name a kind served by an adapter plugin
+    # (docs/designs/agent-cli-plugin-extraction.md §3). Config loading
+    # happens before plugin discovery (coderouter/ingress/app.py
+    # ``load_config`` then ``discover_and_load``), so pydantic can't know
+    # the full set of valid kinds at this point — an unknown kind still
+    # fails fast, just one step later, in ``build_adapter`` when the
+    # engine builds its adapter cache at startup.
+    kind: str = Field(
         default="openai_compat",
         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)."
+            "invokes an external coding-agent CLI one-shot (see AgentCliConfig). "
+            "Other values must be served by an adapter plugin listed in "
+            "plugins.enabled."
         ),
     )
     # base_url is required for HTTP-backed adapters (openai_compat / anthropic)

coderouter/plugins/base.py

@@ -1,11 +1,13 @@
-"""Plugin SDK Protocol contracts (v2.3.0).
+"""Plugin SDK Protocol contracts (v2.3.0, Adapter wired in v2.8.0).
 
-Six extension points are defined here. Two are wired into the engine
-in v2.3.0 (:class:`InputFilter`, :class:`Observer`); four are
-Protocol-only (:class:`Frontend`, :class:`Guard`, :class:`OutputFilter`,
-:class:`Adapter`) and will get engine integration when a real plugin
-drives the requirement — see ``docs/inside/plugin-architecture-draft.md``
-§3 for the full design rationale.
+Six extension points are defined here. Three are wired into the engine
+(:class:`InputFilter`, :class:`Observer` since v2.3.0; :class:`Adapter`
+since v2.8.0 — see ``docs/designs/agent-cli-plugin-extraction.md`` §2);
+three remain Protocol-only (:class:`Frontend`, :class:`Guard`,
+:class:`OutputFilter`) and will get engine integration when a real
+plugin drives the requirement — see
+``docs/inside/plugin-architecture-draft.md`` §3 for the full design
+rationale.
 
 Why declare contracts ahead of integration? It lets a plugin author
 build against the SDK *now* (and ship a working ``coderouter.frontend``
@@ -14,9 +16,11 @@ backward-incompatible Protocol revision later. ``runtime_checkable``
 is used so :func:`isinstance` checks work in the loader for clearer
 error messages.
 
-All hooks are async. Failures must NEVER block the engine response —
-the engine wraps every hook call in try/except and degrades gracefully
-(see ``coderouter/routing/fallback.py`` integration site).
+InputFilter / Observer are async and run repeatedly on the hot path;
+failures must NEVER block the engine response, so the engine wraps
+every hook call in try/except and degrades gracefully (see
+``coderouter/routing/fallback.py`` integration site). Adapter is
+different in shape — see its docstring below.
 """
 from __future__ import annotations
 
@@ -25,7 +29,8 @@ from typing import TYPE_CHECKING, Any, Protocol, runtime_checkable
 if TYPE_CHECKING:
     # Avoid circular imports at runtime — Protocol typing only needs
     # these for documentation and static analysis.
-    from coderouter.config.schemas import CodeRouterConfig
+    from coderouter.adapters.base import BaseAdapter
+    from coderouter.config.schemas import CodeRouterConfig, ProviderConfig
     from coderouter.translation.anthropic import (
         AnthropicRequest,
         AnthropicResponse,
@@ -93,6 +98,44 @@ class Observer(Protocol):
     async def on_event(self, event_type: str, payload: dict[str, Any]) -> None: ...
 
 
+# ====================================================================
+# Adapter hook (engine integration in v2.8.0)
+# ====================================================================
+
+
+@runtime_checkable
+class Adapter(Protocol):
+    """New ``kind`` value in providers.yaml, backed by a plugin.
+
+    The plugin declares the ``kind`` string it serves and a factory
+    that turns a matching :class:`~coderouter.config.schemas.ProviderConfig`
+    into a :class:`~coderouter.adapters.base.BaseAdapter` instance —
+    the same surface :func:`coderouter.adapters.registry.build_adapter`
+    uses for in-core kinds, so the engine treats plugin adapters
+    indistinguishably from built-ins once registered. See
+    ``docs/designs/agent-cli-plugin-extraction.md`` §2 for the design
+    rationale.
+
+    Shape-wise this hook differs from :class:`InputFilter` /
+    :class:`Observer`: those are instances the engine calls repeatedly
+    on the hot path, so they're async. An adapter provider is instead
+    a **factory** consulted once per provider at engine startup (and
+    again if the provider is re-registered at runtime) — construction
+    is I/O-free, so :meth:`build` is synchronous, matching
+    ``build_adapter``.
+    """
+
+    name: str
+    # The ``kind`` value this plugin serves in providers.yaml. Distinct
+    # from ``name`` (the plugin's own identifier, used in
+    # ``plugins.enabled`` / logs) — kept 1:1 for now; a future
+    # ``kinds: tuple[str, ...]`` can generalize this if a real plugin
+    # needs to serve more than one kind.
+    kind: str
+
+    def build(self, config: ProviderConfig) -> BaseAdapter: ...
+
+
 # ====================================================================
 # Future hooks (Protocol-only, engine integration in v2.4+)
 # ====================================================================
@@ -151,18 +194,3 @@ class OutputFilter(Protocol):
     async def transform(
         self, response: AnthropicResponse
     ) -> AnthropicResponse: ...
-
-
-@runtime_checkable
-class Adapter(Protocol):
-    """New ``kind`` value in providers.yaml (e.g. ``bedrock-native``).
-
-    Plugins implement the same async surface as
-    :class:`coderouter.adapters.base.BaseAdapter` so the engine can
-    treat them indistinguishably from built-in adapters once the
-    loader registers the new ``kind`` mapping.
-
-    Not yet integrated — Protocol contract only.
-    """
-
-    name: str

coderouter/plugins/loader.py

@@ -38,10 +38,14 @@ if TYPE_CHECKING:
 
 logger = get_logger(__name__)
 
-# Active hook groups in v2.3.0. The engine wires these into the
-# request flow; plugins targeting them will see their methods called
-# at runtime.
-PLUGIN_GROUPS_V2_3: tuple[str, ...] = ("input_filter", "observer")
+# Active hook groups. The engine wires these into the request flow;
+# plugins targeting them will see their methods called at runtime.
+# ``input_filter`` / ``observer`` since v2.3.0; ``adapter`` joined in
+# v2.8.0 (docs/designs/agent-cli-plugin-extraction.md §2.4) — its
+# factories are consulted from ``build_adapter``, not iterated on the
+# hot path like the other two, but it goes through the same
+# discover-then-enable-gate machinery below.
+PLUGIN_GROUPS_V2_3: tuple[str, ...] = ("input_filter", "observer", "adapter")
 
 # Hook groups whose Protocol contracts are stable but whose engine
 # integration is deferred. Listing them here means a plugin author
@@ -51,7 +55,6 @@ PLUGIN_GROUPS_FUTURE: tuple[str, ...] = (
     "frontend",
     "guard",
     "output_filter",
-    "adapter",
 )
 
 

coderouter/plugins/registry.py

@@ -20,8 +20,8 @@ from typing import Any
 class PluginRegistry:
     """In-memory registry of loaded plugin instances grouped by hook kind.
 
-    Use the typed ``input_filters`` / ``observers`` properties on the
-    hot path; plugin code should not iterate ``_by_group`` directly.
+    Use the typed ``input_filters`` / ``observers`` / ``adapters``
+    properties; plugin code should not iterate ``_by_group`` directly.
     """
 
     def __init__(self) -> None:
@@ -65,6 +65,17 @@ class PluginRegistry:
         """Plugins registered as ``coderouter.observer``."""
         return list(self._by_group.get("observer", ()))
 
+    @property
+    def adapters(self) -> list[Any]:
+        """Plugins registered as ``coderouter.adapter`` (kind factories).
+
+        Unlike ``input_filters`` / ``observers``, these aren't called
+        repeatedly on the hot path — :func:`coderouter.adapters.registry.build_adapter`
+        consults this list once per provider to resolve a plugin-served
+        ``kind`` (v2.8.0, docs/designs/agent-cli-plugin-extraction.md §2.4).
+        """
+        return list(self._by_group.get("adapter", ()))
+
     def is_empty(self) -> bool:
         """True iff no plugin instance has been registered, in any group.
 

coderouter/routing/fallback.py

@@ -1104,9 +1104,13 @@ class FallbackEngine:
         # via ``add_done_callback(_observer_tasks.discard)`` in
         # :meth:`_fanout_observers`.
         self._observer_tasks: set[asyncio.Task[None]] = set()
-        # Cache adapters so we don't re-instantiate per request
+        # Cache adapters so we don't re-instantiate per request. v2.8.0:
+        # pass the plugin registry through so a provider whose ``kind``
+        # is served by an enabled adapter plugin resolves via
+        # ``build_adapter``'s plugin lookup (agent-cli-plugin-extraction
+        # §3.5) instead of raising "Unknown adapter kind".
         self._adapters: dict[str, BaseAdapter] = {
-            p.name: build_adapter(p) for p in config.providers
+            p.name: build_adapter(p, self._plugin_registry) for p in config.providers
         }
         # v1.9-C: per-process adaptive routing adjuster (rolling-window
         # latency + error-rate observations, debounced rank changes).
@@ -1217,7 +1221,7 @@ class FallbackEngine:
                 break
         if not replaced:
             self.config.providers.append(provider)
-        self._adapters[provider.name] = build_adapter(provider)
+        self._adapters[provider.name] = build_adapter(provider, self._plugin_registry)
 
         try:
             chain = self.config.profile_by_name(profile_name)

{coderouter_cli-2.7.10.dist-info → coderouter_cli-2.8.1.dist-info}/METADATA

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

@@ -20,12 +20,12 @@ coderouter/adapters/agent_cli.py,sha256=0g0V92drEQLJACXq-Dn0hE-J6e3vmsuBr5UdnAkX
 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=A2LNhp70LOSNodM_iKO6EL-MBadB3kli-YPWRe1U7pQ,979
+coderouter/adapters/registry.py,sha256=hwMhdBg-wurjJKa4MJIuDoMn1ClOOsorGppJ-s5pnF0,4311
 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=sizuuxBgavGWaxBi7MtbLi0al-Ba72H7iVgI7CRYgMY,88835
+coderouter/config/schemas.py,sha256=AJIJ-zrEgI5czTlcD6YxWQe9rnJFsr6AcKSwwlCaLk8,89447
 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
@@ -50,15 +50,15 @@ coderouter/metrics/__init__.py,sha256=7Es351DPS7yLM0yVF_F0eesmiD83n7Zzhie44chht3
 coderouter/metrics/collector.py,sha256=wdGuX5yOBWEHCz1KVIfaUBZP5NXW3U34yyYlLGwgoCE,61212
 coderouter/metrics/prometheus.py,sha256=THYkvrcpQK3ZNW-BV0h3O-PoT2ppNZ0dapQuu1nyHwE,24410
 coderouter/plugins/__init__.py,sha256=76hMLe5dV_ilripHXzWn3HSYoIALjzlw4EJVyI-GyIM,1974
-coderouter/plugins/base.py,sha256=n9hsck2NCSqi6oeHIumKC5zhQ8JGwCXUz7J5AZQCQss,5772
-coderouter/plugins/loader.py,sha256=xAIf6bIuth0QXCzwxO_ja6aSUlLzIqZNbrbQNJDgSE8,6841
-coderouter/plugins/registry.py,sha256=Tx0QHJHozZ5LTUliGylBdNVcdzHTBV0nedCUwGlbLMM,3236
+coderouter/plugins/base.py,sha256=HACgppdfPyQRlHWXgwSvUeImaG_KRB0uLjhhQr1Ohyk,7267
+coderouter/plugins/loader.py,sha256=KLnKgO6_GE7OJulwo292cTYPvxqWZlLL8S0k_O3ZDcg,7139
+coderouter/plugins/registry.py,sha256=8UDmRpHnRdB-ES_xpprvrvbDlhIhonOvFFXobR6MGJA,3739
 coderouter/routing/__init__.py,sha256=g2vhutbozRx5QBThReqwPN3imk5qXdpDiaogILd3IRc,257
 coderouter/routing/adaptive.py,sha256=G2o377twGSjbUh65wiIFx6klnpFGjsD_nI3oDvcBwhY,21257
 coderouter/routing/auto_router.py,sha256=y4v0c8u5F9f98Vmhx1vRcKPiOgAvpzbFqr6TIh058h0,13341
 coderouter/routing/budget.py,sha256=PblmVKJGs_BwNa9uDHAA8hmZ4XIVKv38mHAeU0V3OMs,8451
 coderouter/routing/capability.py,sha256=rRQhzTgQYFTFDNYcSLKvq3xjdw6B1w7T-3jS7PTMI14,27864
-coderouter/routing/fallback.py,sha256=WNfDT9XDfKk584rQYHwSesq8-n3Axvp4j_e7qQ5ghuQ,144789
+coderouter/routing/fallback.py,sha256=x3Y_LHA1NZhW4L1e7E0okuYpQn6-HNw5An7f7HX547M,145111
 coderouter/state/__init__.py,sha256=XoGcPmmBQSiZWML2S0juSveQ78xfhtdeCliNnVyzu7E,1088
 coderouter/state/audit_log.py,sha256=n7vuDsTfd5iuNUJhlRQPakJ2tMSsT9EfgPCzs1GEaac,10941
 coderouter/state/replay.py,sha256=Z_YHKroTKZdrL8qObFxcoLOAQWWXZvXFdLfxzvBhEJg,11230
@@ -69,8 +69,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.7.10.dist-info/METADATA,sha256=4AzX8XCERv5Hd1iywyybjR1gjsyfBh72bFF24YLH85U,15547
-coderouter_cli-2.7.10.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-coderouter_cli-2.7.10.dist-info/entry_points.txt,sha256=-dnLfD1YZ2WjH2zSdNCvlO65wYltM9bsHt9Fhg3yGss,51
-coderouter_cli-2.7.10.dist-info/licenses/LICENSE,sha256=wkEzoR86jFw33jvfOHjULqmkGEfxTFMgMaJnpR8mPRw,1065
-coderouter_cli-2.7.10.dist-info/RECORD,,
+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,,