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

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

@@ -9,9 +9,176 @@ are kept verbatim where the Japanese text itself is the subject).
 
 ---
 
+## [v2.9.1] — 2026-07-12 (launcher model swap Phase 1 — llama-swap-style on-demand models)
+
+**New: `launcher.swap`** — an opt-in, dependency-free equivalent of
+[llama-swap](https://github.com/mostlygeek/llama-swap)'s core loop, built on
+the existing embedded Launcher. Declare a static model catalog and CodeRouter
+will **spawn the backing `llama-server` on demand** when a request names the
+model, **hold the request until the backend passes its readiness probe**, and
+**auto-unload the process after an idle TTL** (`swap-unload`, memory returns
+to zero). Only cataloged models can ever be spawned; `model_path` is resolved
+against `launcher.model_dirs` both at config load (fail-fast) and again at
+spawn (defense in depth). Design + as-built record:
+`docs/designs/launcher-model-swap.md`. Sample: `examples/providers.swap.yaml`.
+Verified end-to-end on macOS (M3 Max, Metal): cold spawn → warm reuse →
+catalog-miss fallthrough → TTL unload → respawn, all green
+(`_run/swap-test/` kit).
+
+### Added
+
+- **`launcher.swap` config block** (`LauncherSwapConfig` / `SwapModelSpec`):
+  `enabled` (default `false` — zero impact until opted in), global
+  `ttl_seconds` (default 1800; `null` = never, `0` = unload at last release),
+  `readiness_timeout_s`, `sweep_interval_s`, `inject_auto_router_rules`, and
+  the static `models:` catalog (`name` / `backend` / `model_path` / fixed
+  `port` recommended / `num_ctx` / `extra_args` / speculative fields). Phase 2
+  fields (`group`, `est_weights_gb`, `memory_budget_gb`, `max_loaded`) are
+  schema-declared but not yet acted on.
+- **`SwapManager`** (`coderouter/launcher_swap.py`): per-model
+  `asyncio.Lock` + lease accounting — concurrent requests for the same model
+  trigger exactly one spawn; streaming responses hold a lease for their whole
+  lifetime (a mid-stream process is never TTL-evicted); a failed spawn resets
+  to idle (no poisoning) and the next request retries.
+- **Auto-generated routing**: with `default_profile: auto` and no explicit
+  `auto_router:` block, one exact-match rule per catalog model
+  (`id: swap:<name>`, `model_pattern = re.escape(name)`) is merged **ahead of
+  the bundled heuristics** (an explicitly named swap model beats
+  code-fence/image heuristics) while keeping the bundled rules and their
+  fallthrough intact. A user-declared `auto_router:` block keeps its full-
+  replacement semantics — swap rules are appended after user rules.
+- **`FallbackEngine.deregister_provider`** — the long-missing inverse of
+  `register_provider`; TTL unload now removes the provider from its chain,
+  drops the cached adapter (closing its HTTP client), and leaves no dead-port
+  entries behind.
+- **Launcher readiness gating** — spawned processes now report a new
+  `"loading"` status and are only registered as providers **after** the
+  backend passes a readiness probe (`GET /health` for llama.cpp/vllm, TCP
+  connect fallback otherwise; `launcher.readiness_timeout_s`, default 300 s).
+  Requests can no longer race a model that is still loading.
+  *Behavior change*: `POST /api/launcher/start` no longer performs the
+  provider sync synchronously (`provider_sync` in the response is always
+  `null`); watch `/api/launcher/processes` or the `provider sync:` log line.
+- **Launcher auto-restart (opt-in)** — `launcher.auto_restart: true` enables
+  crash recovery with exponential backoff (`auto_restart_max_attempts`,
+  default 3); intentional stops (Stop button, shutdown, TTL unload) are
+  marked via `ManagedProcess.stopping` and never trigger a restart. Default
+  **off**, matching the opt-in stance of `restart_command`. Swap-managed
+  processes are excluded — `SwapManager` is their sole supervisor.
+- Tests: `tests/test_launcher_readiness_restart.py` (21),
+  `tests/test_launcher_swap.py` (31), `tests/test_launcher_swap_review.py`
+  (15 regression tests from the adversarial review). Full suite: 1725 passed.
+
+### Fixed
+
+- **Launcher-spawned providers were registered before the model finished
+  loading**, so early requests failed against a half-up backend (readiness
+  gating above).
+- **Crashed launcher processes stayed `status="error"` forever** with no
+  recovery path other than manual restart (auto-restart above).
+- Adversarial-review fixes folded into the initial swap release: enabling
+  swap no longer silently discards the bundled auto-router rules; TTL unload
+  no longer leaks the generic `launcher-<backend>-<port>` provider (generic
+  registration is suppressed for swap-managed processes); swap processes are
+  exempt from launcher auto-restart (no dueling supervisors on a fixed
+  port); on-demand spawn keys off the **resolved profile**, not the raw
+  model string (no wasted spawns when routing goes elsewhere, and
+  catalog-mismatched model names hitting a swap profile still take a lease
+  so they cannot be unloaded mid-flight).
+
+### Docs
+
+- `docs/guides/subagent-routing.md` / `.en.md` — §6.1 measured-verification
+  results updated against the 2026-07-11/12 E2E artifacts (3/4 sub-agent
+  round trip + rerun evidence, `c6096ed` grok-fix reference, expected-log
+  notes), new §5(e) on running the main orchestrator on a 9B-class local
+  model (tool-support prerequisite, 9b→30b fallback chain, autocompact
+  caveat), §7 UNCONFIRMED items resolved as measured.
+- `docs/designs/launcher-model-swap.md` — full design (phases, concurrency
+  model, security posture, §10 review decisions, §10.5 as-built record).
+- `examples/providers.swap.yaml` + `examples/README.md` index row.
+
+---
+
+## [v2.9.0] — 2026-07-11 (agent_cli extraction Phase 2c — in-core adapter removed)
+
+**PR #73**. **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)
 
-Phase 2b of the agent_cli plugin extraction
+**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` →

{coderouter_cli-2.8.1 → coderouter_cli-2.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coderouter-cli
-Version: 2.8.1
+Version: 2.9.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
@@ -66,7 +66,7 @@ Description-Content-Type: text/markdown
 ## 何ができるか — 30 秒で
 
 ```
-あなたのエージェント (Claude Code / gemini-cli / codex)
+あなたのエージェント (Claude Code / codex / agy)
         │
         ▼
   ┌─ CodeRouter ─┐
@@ -141,7 +141,7 @@ ANTHROPIC_BASE_URL=http://localhost:8088 ANTHROPIC_AUTH_TOKEN=dummy claude
 | Claude Code + ローカル Ollama で tool calling が壊れる | **必須** — tool 修復 (+ 必要なら wire 変換) |
 | Claude Code + ローカルで長時間回すと止まる | **必須級** — 6 系統ガード + self-healing |
 | Ollama v0.14+ / LM Studio にネイティブ直結で動いてる | **便利** — 直結に無い fallback / ガード / 診断を追加 (passthrough で翻訳ゼロ) |
-| codex / gemini-cli + Ollama 直繋ぎで動いてる | オプション — フォールバックが欲しいなら |
+| codex / agy + Ollama 直繋ぎで動いてる | オプション — フォールバックが欲しいなら |
 | Claude API を直接叩いてて問題ない | 不要 |
 
 詳細は → [要否判定ガイド](./docs/start/when-do-i-need-coderouter.md)
@@ -311,6 +311,8 @@ English: [Quickstart](./docs/start/quickstart.en.md) · [Usage guide](./docs/gui
 - **テスト**: 1,500+ 本(ランタイム依存 5 個は v1 系から不変)
 - **対応 OS**: macOS (Apple Silicon 推奨) / Linux / Windows WSL2
 - **対応 backend**: Ollama / llama.cpp / LM Studio / vLLM / MLX-LM / OpenRouter / NVIDIA NIM / Anthropic API
+- **外部エージェント CLI**: `agent_cli` provider として Claude Code / codex / grok / antigravity の4種を束ねて呼び出せる(要 `coderouter-plugin-agents`。詳細 → [external-agents ガイド](./docs/backends/external-agents.md))
+- **プラグイン**: compress / memory / agents の3種を opt-in で追加可能(コアの依存は増えない。一覧・導入方法 → [docs/README.md](./docs/README.md#対応プラグイン--plugins))
 - **ライセンス**: MIT
 
 ---

{coderouter_cli-2.8.1 → coderouter_cli-2.9.1}/README.en.md

@@ -21,7 +21,7 @@
 ## What it does — in 30 seconds
 
 ```
-Your agent (Claude Code / gemini-cli / codex)
+Your agent (Claude Code / codex / agy)
         │
         ▼
   ┌─ CodeRouter ──┐
@@ -77,7 +77,7 @@ That's it. Claude Code works as usual, but your local Ollama is answering behind
 |---|---|
 | Claude Code + local Ollama, tool calling breaks | **Yes** — wire translation + tool repair |
 | Claude Code + local, dies after long sessions | **Helpful** — 6 guards + self-healing |
-| codex / gemini-cli + Ollama works fine | Optional — if you want fallback |
+| codex / agy + Ollama works fine | Optional — if you want fallback |
 | Using Claude API directly, no issues | Not needed |
 
 Full decision matrix → [Do I need CodeRouter?](./docs/start/when-do-i-need-coderouter.en.md)
@@ -247,6 +247,8 @@ Open `http://localhost:8088/dashboard` while debugging — most issues become vi
 - **Tests**: 1,500+ (the 5 runtime deps have never grown since v1)
 - **OS**: macOS (Apple Silicon recommended) / Linux / Windows WSL2
 - **Backends**: Ollama / llama.cpp / LM Studio / vLLM / MLX-LM / OpenRouter / NVIDIA NIM / Anthropic API
+- **External agent CLIs**: bundle Claude Code / codex / grok / antigravity as a single `agent_cli` provider (requires `coderouter-plugin-agents`; details → [external-agents guide](./docs/backends/external-agents.en.md))
+- **Plugins**: compress / memory / agents, all opt-in with zero impact on core dependencies (list & install → [docs/README.en.md](./docs/README.en.md#plugins))
 - **License**: MIT
 
 ---

{coderouter_cli-2.8.1 → coderouter_cli-2.9.1}/README.md

@@ -21,7 +21,7 @@
 ## 何ができるか — 30 秒で
 
 ```
-あなたのエージェント (Claude Code / gemini-cli / codex)
+あなたのエージェント (Claude Code / codex / agy)
         │
         ▼
   ┌─ CodeRouter ─┐
@@ -96,7 +96,7 @@ ANTHROPIC_BASE_URL=http://localhost:8088 ANTHROPIC_AUTH_TOKEN=dummy claude
 | Claude Code + ローカル Ollama で tool calling が壊れる | **必須** — tool 修復 (+ 必要なら wire 変換) |
 | Claude Code + ローカルで長時間回すと止まる | **必須級** — 6 系統ガード + self-healing |
 | Ollama v0.14+ / LM Studio にネイティブ直結で動いてる | **便利** — 直結に無い fallback / ガード / 診断を追加 (passthrough で翻訳ゼロ) |
-| codex / gemini-cli + Ollama 直繋ぎで動いてる | オプション — フォールバックが欲しいなら |
+| codex / agy + Ollama 直繋ぎで動いてる | オプション — フォールバックが欲しいなら |
 | Claude API を直接叩いてて問題ない | 不要 |
 
 詳細は → [要否判定ガイド](./docs/start/when-do-i-need-coderouter.md)
@@ -266,6 +266,8 @@ English: [Quickstart](./docs/start/quickstart.en.md) · [Usage guide](./docs/gui
 - **テスト**: 1,500+ 本(ランタイム依存 5 個は v1 系から不変)
 - **対応 OS**: macOS (Apple Silicon 推奨) / Linux / Windows WSL2
 - **対応 backend**: Ollama / llama.cpp / LM Studio / vLLM / MLX-LM / OpenRouter / NVIDIA NIM / Anthropic API
+- **外部エージェント CLI**: `agent_cli` provider として Claude Code / codex / grok / antigravity の4種を束ねて呼び出せる(要 `coderouter-plugin-agents`。詳細 → [external-agents ガイド](./docs/backends/external-agents.md))
+- **プラグイン**: compress / memory / agents の3種を opt-in で追加可能(コアの依存は増えない。一覧・導入方法 → [docs/README.md](./docs/README.md#対応プラグイン--plugins))
 - **ライセンス**: MIT
 
 ---

{coderouter_cli-2.8.1 → coderouter_cli-2.9.1}/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)}; "