coderouter-cli 1.8.0__py3-none-any.whl → 1.8.2__py3-none-any.whl

coderouter/config/loader.py

@@ -49,8 +49,35 @@ def load_config(path: str | os.PathLike[str] | None = None) -> CodeRouterConfig:
     # fail can be rescued by an explicit env-set mode, and (b) the model-
     # validator's "default_profile must exist in profiles" check applies to the
     # *effective* mode the engine will see, not the pre-override YAML value.
+    #
+    # v1.8.0+: also resolve env_mode through ``mode_aliases`` before assigning,
+    # so that startup-time ``--mode coding`` (env CODEROUTER_MODE=coding)
+    # behaves symmetrically with the runtime ``X-CodeRouter-Mode: coding``
+    # header — both should accept short intent names like ``coding`` /
+    # ``general`` / ``reasoning`` and resolve them to the underlying profile
+    # (e.g. ``claude-code-nim`` in providers.nvidia-nim.yaml). Without this,
+    # users on the NIM example yaml hit
+    #   "default_profile 'coding' is not declared in profiles:
+    #    known=['claude-code-nim', ...]"
+    # because mode_aliases only fired at request time, not at startup.
     env_mode = os.environ.get("CODEROUTER_MODE", "").strip()
     if env_mode:
+        # Pre-validation alias resolution: if env_mode isn't directly a
+        # profile name but matches an entry in raw["mode_aliases"], swap it
+        # for the underlying profile name. This avoids forcing every example
+        # yaml to mirror the v1.8.0 four-profile names (multi/coding/general
+        # /reasoning) just to accept the canonical short --mode flags.
+        raw_profiles = raw.get("profiles", []) or []
+        profile_names = {
+            p.get("name") for p in raw_profiles if isinstance(p, dict)
+        }
+        raw_aliases = raw.get("mode_aliases", {}) or {}
+        if (
+            env_mode not in profile_names
+            and isinstance(raw_aliases, dict)
+            and env_mode in raw_aliases
+        ):
+            env_mode = raw_aliases[env_mode]
         raw["default_profile"] = env_mode
 
     config = CodeRouterConfig.model_validate(raw)

coderouter/data/model-capabilities.yaml

@@ -168,45 +168,67 @@ rules:
       claude_code_suitability: ok
 
   # ------------------------------------------------------------------
-  # Qwen3.6 family (v1.7-B 追加)
+  # Qwen3.6 family (v1.7-B 追加、v1.8.1 で suitability 撤回)
   #
   # 2026-04 リリースの Qwen3.6 シリーズ。Ollama 公式 tag は
-  # qwen3.6:27b / qwen3.6:35b、全 variant が tools+vision+thinking 対応、
-  # 256K context。note 記事 (r/LocalLLaMA 2026-04 Megathread) で
-  # 「Claude Code 代替として最高」「local champ」と評価。
-  # Qwen3-Coder と並んで Claude Sonnet 互換性が高い。
+  # qwen3.6:27b / qwen3.6:35b、metadata 上は tools+vision+thinking 対応、
+  # 256K context を宣言。note 記事 (r/LocalLLaMA 2026-04 Megathread) で
+  # 「Claude Code 代替として最高」「local champ」と評価されている。
+  #
+  # ただし v1.8.0 までで `claude_code_suitability: ok` を declare していた
+  # のは note 記事の伝聞ベースの先回り宣言で、v1.8.1 〜 v1.8.2
+  # (2026-04-26) の実機検証 (M3 Max 64GB / Ollama 0.21.2) で:
+  #   - num_ctx と streaming の NEEDS_TUNING は v1.8.2 で thinking モデル
+  #     用 probe バジェット拡大により偽陽性と判明 (doctor 側の課題)
+  #   - tool_calls probe が native tool_calls / 修復可能 JSON のいずれも
+  #     返さない真の課題が残る (Qwen3.6 系の Ollama 経由 tool 仕様未成熟)
+  # tool_calls 不全が解消されるまで `claude_code_suitability` は撤回。
+  # 実機で動いたユーザーは `~/.coderouter/model-capabilities.yaml` で
+  # `claude_code_suitability: ok` を上書きできる。
   # ------------------------------------------------------------------
 
+  # v1.8.2: thinking: true は doctor probe (num_ctx / streaming) が reasoning
+  # トークン消費分の max_tokens 余裕を確保するためのヒント。Qwen3 系は
+  # /think モードで thinking トークンを吐く設計なので true 宣言。
   - match: "qwen3.6:*"
     kind: openai_compat
     capabilities:
       tools: true
-      claude_code_suitability: ok
+      thinking: true
 
   - match: "qwen/qwen3.6-*"
     kind: openai_compat
     capabilities:
       tools: true
-      claude_code_suitability: ok
+      thinking: true
 
   # ------------------------------------------------------------------
-  # Gemma 4 family (v1.7-B 追加)
+  # Gemma 4 family (v1.7-B 追加、v1.8.2 で thinking: true 宣言)
   #
   # Google 公式 Gemma 4。Ollama 公式 tag は gemma4:e2b / e4b / 26b / 31b、
   # 全 variant が tools+vision+thinking 対応、E2B/E4B は audio もサポート。
   # MoE (26b は active 3.8B / total 25.2B)。note 記事で「日常・バランスの
   # 王者」と評価。Claude Haiku 互換性に近い簡潔な応答スタイル。
+  #
+  # v1.8.2 (2026-04-26): 実機検証 (M3 Max 64GB / Ollama 0.21.2 / gemma4:26b)
+  # で `reasoning` フィールドにかなりの量のトークンを吐く thinking モデル
+  # と確認。doctor probe の max_tokens=32 / 128 が thinking トークンに
+  # 食い切られて偽陽性 NEEDS_TUNING を出していた。registry で
+  # `thinking: true` を宣言すると doctor が probe バジェットを 1024 まで
+  # 引き上げて偽陽性を回避する。
   # ------------------------------------------------------------------
 
   - match: "gemma4:*"
     kind: openai_compat
     capabilities:
       tools: true
+      thinking: true
 
   - match: "google/gemma-4*"
     kind: openai_compat
     capabilities:
       tools: true
+      thinking: true
 
   # ------------------------------------------------------------------
   # GLM family (Z.AI / Zhipu AI、v1.7-B 追加)
@@ -233,3 +255,99 @@ rules:
     kind: openai_compat
     capabilities:
       tools: true
+
+  # ------------------------------------------------------------------
+  # Kimi K2 family (Moonshot AI、v1.8.0 追加)
+  #
+  # NVIDIA NIM 経由で実機検証済み (2026-04-23) の tool-capable モデル。
+  # examples/providers.nvidia-nim.yaml の `nim-kimi-k2` / `nim-kimi-k2-thinking`
+  # で運用実績あり。Unsloth tool-calling guide にも tool calling 対応モデル
+  # として掲載 (Kimi K2.5 / K2 Thinking)。providers.yaml 側で個別の
+  # `capabilities.tools: true` 宣言を省略可能にするのが目的。
+  # ------------------------------------------------------------------
+
+  - match: "moonshotai/kimi-k2*"
+    kind: openai_compat
+    capabilities:
+      tools: true
+
+  - match: "moonshotai/Kimi-K2*"
+    kind: openai_compat
+    capabilities:
+      tools: true
+
+  # ------------------------------------------------------------------
+  # gpt-oss family (OpenAI 117B MoE オープンウェイト、v1.8.0 追加)
+  #
+  # OpenRouter free 経由で実機検証済み (`openai/gpt-oss-120b:free` を
+  # examples/providers.yaml の `openrouter-gpt-oss-free` で運用)。
+  # native tool calling 設計、131K context、Unsloth tool-calling guide
+  # にも tool calling 対応モデルとして掲載 (gpt-oss)。
+  # ------------------------------------------------------------------
+
+  - match: "openai/gpt-oss-*"
+    kind: openai_compat
+    capabilities:
+      tools: true
+
+  - match: "gpt-oss-*"
+    kind: openai_compat
+    capabilities:
+      tools: true
+
+  # ------------------------------------------------------------------
+  # 先回り宣言 family (Unsloth tool-calling guide 掲載、v1.8.0 追加)
+  #
+  # Unsloth のローカル LLM tool-calling ガイド
+  # (https://unsloth.ai/docs/jp/ji-ben/tool-calling-guide-for-local-llms)
+  # で tool-calling 対応モデルとして掲載されているが、CodeRouter 側で
+  # 実機検証は未実施。tools=true の事前宣言だけ入れて、providers.yaml で
+  # これらを使う際の `capabilities.tools: true` 明示宣言を不要にする。
+  # claude_code_suitability は実機検証後に追加判断 — それまでは "意見なし"。
+  # 不具合があれば user-side の `~/.coderouter/model-capabilities.yaml` で
+  # `tools: false` を declare して上書き可能 (first-match-per-flag)。
+  # ------------------------------------------------------------------
+
+  # DeepSeek-V3.x — DeepSeek-AI の主力 (V3.1 / V3.2 等)
+  - match: "deepseek-ai/DeepSeek-V3*"
+    kind: openai_compat
+    capabilities:
+      tools: true
+
+  - match: "deepseek/deepseek-v3*"
+    kind: openai_compat
+    capabilities:
+      tools: true
+
+  # MiniMax — MiniMaxAI の MoE 系
+  - match: "MiniMaxAI/MiniMax-*"
+    kind: openai_compat
+    capabilities:
+      tools: true
+
+  - match: "minimax/minimax-*"
+    kind: openai_compat
+    capabilities:
+      tools: true
+
+  # NVIDIA Nemotron 3 — Nano 系の小型モデル
+  - match: "nvidia/nemotron-3-*"
+    kind: openai_compat
+    capabilities:
+      tools: true
+
+  - match: "nvidia/Nemotron-3-*"
+    kind: openai_compat
+    capabilities:
+      tools: true
+
+  # Devstral 2 — Mistral AI の coding 特化 fine-tune
+  - match: "mistralai/Devstral-*"
+    kind: openai_compat
+    capabilities:
+      tools: true
+
+  - match: "mistral/devstral*"
+    kind: openai_compat
+    capabilities:
+      tools: true

coderouter/doctor.py

@@ -433,6 +433,31 @@ _STREAMING_PROBE_USER_PROMPT = (
 # truncated". "1\n2\n...\n30" is ~80 chars; 40 chars covers the halfway
 # mark (1..20) which is already obviously-truncated territory.
 _STREAMING_PROBE_MIN_EXPECTED_CHARS = 40
+
+# v1.8.2: probe response budgets.
+#
+# Both num_ctx and streaming probes ask the model for a *short* answer
+# (the canary token / "1..30"). The original budgets (32 / 128 tokens)
+# assumed a non-thinking model that emits the answer immediately. On a
+# thinking model — Gemma 4 26B, Qwen3.6, gpt-oss, deepseek-r1 — the
+# upstream burns the entire budget on a hidden ``reasoning`` field
+# *before* emitting any visible ``content``, producing a false-positive
+# NEEDS_TUNING (canary missing / 0 chars streamed). Bumping the budget
+# is the cleanest fix: non-thinking models stop early at their natural
+# stop token (no waste), thinking models get headroom for the reasoning
+# trace plus the actual answer.
+#
+# Numbers picked from the v1.8.1 reality-check session
+# (docs/articles/note-v1-8-1-reality-check.md):
+#   * Gemma 4 26B reasoning prefix observed at ~150-300 tokens before
+#     content starts → 1024 covers reasoning + 30-line count comfortably.
+#   * Non-thinking baseline kept conservative-but-non-tight (256/512) to
+#     absorb stylistic preambles ("Sure, the answer is...") without
+#     burning extra cloud quota when the operator probes a paid endpoint.
+_NUM_CTX_PROBE_MAX_TOKENS_DEFAULT = 256
+_NUM_CTX_PROBE_MAX_TOKENS_THINKING = 1024
+_STREAMING_PROBE_MAX_TOKENS_DEFAULT = 512
+_STREAMING_PROBE_MAX_TOKENS_THINKING = 1024
 # Default ``num_predict`` suggested in the emitted patch. -1 would be
 # optimal (uncapped) but "4096" communicates intent more clearly to
 # operators unfamiliar with Ollama's sentinel value, and covers Claude
@@ -475,6 +500,42 @@ def _declared_num_ctx(provider: ProviderConfig) -> int | None:
     return val if isinstance(val, int) else None
 
 
+def _is_reasoning_model(
+    provider: ProviderConfig, resolved: ResolvedCapabilities
+) -> bool:
+    """v1.8.2: True iff the model is known to emit a hidden reasoning trace.
+
+    Thinking models (Gemma 4, Qwen3-with-/think, gpt-oss, deepseek-r1,
+    Claude Sonnet 4.5+ in extended-thinking mode) burn output tokens on a
+    ``reasoning`` field before any visible ``content`` is produced. The
+    num_ctx / streaming probes use small response budgets that get fully
+    consumed by the reasoning prefix, producing a false-positive
+    NEEDS_TUNING. Callers use this to choose a generous probe budget.
+
+    Three signals fire:
+      * provider declared ``capabilities.thinking: true`` in providers.yaml
+      * provider declared ``capabilities.reasoning_passthrough: true``
+        (the operator opted in to passing the raw reasoning to the client,
+        which is only meaningful for models that emit it)
+      * registry resolved ``thinking: true`` for this (kind, model) pair
+
+    Conservative bias — when both provider declaration and registry are
+    silent, treat as non-reasoning. The probe still completes for thinking
+    models in that case (they just hit ``finish_reason='length'`` like
+    they did pre-v1.8.2), but at least the new generous default budget
+    (256 / 512) gives more headroom than the old 32 / 128.
+    """
+    if provider.capabilities.thinking is True:
+        return True
+    if provider.capabilities.reasoning_passthrough is True:
+        return True
+    if resolved.thinking is True:
+        return True
+    if resolved.reasoning_passthrough is True:
+        return True
+    return False
+
+
 _PROBE_BASIC_USER_PROMPT = "Reply with exactly the single word: PONG"
 _PROBE_TOOLS_USER_PROMPT = (
     "You have one tool named `echo`. Call it with the argument "
@@ -617,7 +678,9 @@ def _extract_openai_assistant_choice(
     return msg if isinstance(msg, dict) else None
 
 
-async def _probe_num_ctx(provider: ProviderConfig) -> ProbeResult:
+async def _probe_num_ctx(
+    provider: ProviderConfig, resolved: ResolvedCapabilities
+) -> ProbeResult:
     """v1.0-B Probe — direct detection of Ollama ``num_ctx`` truncation.
 
     Addresses plan.md §9.4 symptom #1 (空応答 / 意味不明応答). Prior to
@@ -683,11 +746,21 @@ async def _probe_num_ctx(provider: ProviderConfig) -> ProbeResult:
     # whatever ``options.num_ctx`` the operator has declared. Request
     # fields win over extra_body, matching the adapter's merge order.
     body: dict[str, Any] = dict(provider.extra_body)
+    # v1.8.2: thinking models burn output tokens on a hidden ``reasoning``
+    # trace before emitting any ``content``. The pre-v1.8.2 default of 32
+    # was tight for any preamble at all; on Gemma 4 26B it caused
+    # ``finish_reason='length'`` with content="" before the canary could
+    # surface, producing a false-positive NEEDS_TUNING.
+    max_tokens = (
+        _NUM_CTX_PROBE_MAX_TOKENS_THINKING
+        if _is_reasoning_model(provider, resolved)
+        else _NUM_CTX_PROBE_MAX_TOKENS_DEFAULT
+    )
     body.update(
         {
             "model": provider.model,
             "messages": [{"role": "user", "content": user_prompt}],
-            "max_tokens": 32,
+            "max_tokens": max_tokens,
             "temperature": 0,
         }
     )
@@ -799,7 +872,9 @@ async def _probe_num_ctx(provider: ProviderConfig) -> ProbeResult:
     )
 
 
-async def _probe_streaming(provider: ProviderConfig) -> ProbeResult:
+async def _probe_streaming(
+    provider: ProviderConfig, resolved: ResolvedCapabilities
+) -> ProbeResult:
     """v1.0-C Probe — streaming completion path integrity.
 
     Addresses plan.md §9.4 symptom #1 from the **output** side. The v1.0-B
@@ -868,11 +943,18 @@ async def _probe_streaming(provider: ProviderConfig) -> ProbeResult:
     # probing. Top-level probe fields win on collision, matching adapter
     # merge order.
     body: dict[str, Any] = dict(provider.extra_body)
+    # v1.8.2: same thinking-model rationale as num_ctx probe — give
+    # reasoning a budget so the visible content has a chance to surface.
+    max_tokens = (
+        _STREAMING_PROBE_MAX_TOKENS_THINKING
+        if _is_reasoning_model(provider, resolved)
+        else _STREAMING_PROBE_MAX_TOKENS_DEFAULT
+    )
     body.update(
         {
             "model": provider.model,
             "messages": [{"role": "user", "content": _STREAMING_PROBE_USER_PROMPT}],
-            "max_tokens": 128,
+            "max_tokens": max_tokens,
             "temperature": 0,
             "stream": True,
         }
@@ -1506,11 +1588,11 @@ async def check_model(
     # declaration probes (tool_calls / thinking / reasoning-leak) should
     # dominate the report — streaming is the output-side sibling of
     # num_ctx and its NEEDS_TUNING verdict is orthogonal to the others.
-    report.results.append(await _probe_num_ctx(provider))
+    report.results.append(await _probe_num_ctx(provider, resolved))
     report.results.append(await _probe_tool_calls(provider, resolved))
     report.results.append(await _probe_thinking(provider, resolved))
     report.results.append(await _probe_reasoning_leak(provider, resolved))
-    report.results.append(await _probe_streaming(provider))
+    report.results.append(await _probe_streaming(provider, resolved))
     return report
 
 

{coderouter_cli-1.8.0.dist-info → coderouter_cli-1.8.2.dist-info}/METADATA

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

@@ -2,7 +2,7 @@ coderouter/__init__.py,sha256=ghdjPrLtnRzY8fyQ4CJZI1UJKADyNTLtA3G7se8H7Ns,696
 coderouter/__main__.py,sha256=-LCgxJnvgUV240HjQKv7ly-mn2NuKHpC4nCpvTHjeSU,130
 coderouter/cli.py,sha256=vI1-dv10t4-xG6Zpt7zi_3U8xGgq54Qa8XIMUYpfOV8,19859
 coderouter/cli_stats.py,sha256=ae20xUr_hjX09Ms3fBZGZsUS52o44JC57EpbWLBOCO0,27750
-coderouter/doctor.py,sha256=Uf4R1t2-50hRx6UpV9UBe_UeiJ2UYBg7e7zkPUHegWE,64217
+coderouter/doctor.py,sha256=atYOr73LLI3lKHjhFDY0lea41_0jolfiY2zb15La_O8,68116
 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,10 +16,10 @@ coderouter/adapters/registry.py,sha256=Syt3eDljWZAK5mfiJGvUMKaZYAfCRScp7PvV6pYt7
 coderouter/config/__init__.py,sha256=FODEn74fN-qZnt4INPSHswqhOlEgpL6-_onxsitSx8g,274
 coderouter/config/capability_registry.py,sha256=oypl6Z-YjvNoC87AdSIm1C7XE_MZoFq_7Ivm3eRH3cI,14379
 coderouter/config/env_file.py,sha256=CoMK27fuAXm-NtoLzXb8yN2E-wDFjHQuFwiIlmgTBQw,10356
-coderouter/config/loader.py,sha256=MIrUDfK8JfrWZqrMa1R8MFX1-A9sflwOCQq-hz7oVc4,2614
+coderouter/config/loader.py,sha256=FUEe8m4Tnmj_aul0vSctD8vKvNW-oLRoMRbTpSKqSmc,4077
 coderouter/config/schemas.py,sha256=NMWKstAzDKc6DT7qKr-GKlUFrsfE4HtEG7zkz9Pnq78,21597
 coderouter/data/__init__.py,sha256=uNyfD9jaCvTWsBAWtaw1Fr25OSxzv3psGMfBjT1z0Cc,328
-coderouter/data/model-capabilities.yaml,sha256=Z-mCubuwvfJa_Uw7M8PL9B1F-ojy1ulVgd6-fQtPjbU,9771
+coderouter/data/model-capabilities.yaml,sha256=9f9CDIoWBJYtppMRh1BOS8FzRKzICV4uT-uANovGmzs,14718
 coderouter/ingress/__init__.py,sha256=WQsCH2CGJCAhy0mS6GSEdeYZRkkQu2OHDsP4CJWTLug,155
 coderouter/ingress/anthropic_routes.py,sha256=vuylsn7klFN-Dz3cBS7LrhnnSRGr6agipgMrr9gxq7k,8261
 coderouter/ingress/app.py,sha256=b9s6NpBGckaTQJCaw-6MZaY7Eq3rxgtX_cCkgWq-0Ig,6620
@@ -37,8 +37,8 @@ coderouter/translation/__init__.py,sha256=PYXN7XVEwpG1uC8RLy6fvnGbzEZhhrEuUapH8I
 coderouter/translation/anthropic.py,sha256=JpvIWNXHUPVqOGvps7o_6ZADhXuJuvpU7RdMqQFtwwM,6421
 coderouter/translation/convert.py,sha256=-qyzFzmmr9hhQV6_Sg75kJnvCZvHe3n7vRdaZtk_JqQ,47269
 coderouter/translation/tool_repair.py,sha256=fyxDb4kWHytO5JWq5y0i4tinJUtWqhMCkyfoCf5BjeM,8314
-coderouter_cli-1.8.0.dist-info/METADATA,sha256=JMAdfoBKRz0Igv2bNLc2bKTS3-E__qT3yGRRbiHcMjQ,44136
-coderouter_cli-1.8.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-coderouter_cli-1.8.0.dist-info/entry_points.txt,sha256=-dnLfD1YZ2WjH2zSdNCvlO65wYltM9bsHt9Fhg3yGss,51
-coderouter_cli-1.8.0.dist-info/licenses/LICENSE,sha256=wkEzoR86jFw33jvfOHjULqmkGEfxTFMgMaJnpR8mPRw,1065
-coderouter_cli-1.8.0.dist-info/RECORD,,
+coderouter_cli-1.8.2.dist-info/METADATA,sha256=MBkIOwnySR2wfw-JhBtGFipk_MqbV8J_4aAqWZ65A7g,44136
+coderouter_cli-1.8.2.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+coderouter_cli-1.8.2.dist-info/entry_points.txt,sha256=-dnLfD1YZ2WjH2zSdNCvlO65wYltM9bsHt9Fhg3yGss,51
+coderouter_cli-1.8.2.dist-info/licenses/LICENSE,sha256=wkEzoR86jFw33jvfOHjULqmkGEfxTFMgMaJnpR8mPRw,1065
+coderouter_cli-1.8.2.dist-info/RECORD,,