coderouter-cli 1.8.2__tar.gz → 1.8.3__tar.gz

{coderouter_cli-1.8.2 → coderouter_cli-1.8.3}/CHANGELOG.md

@@ -6,6 +6,72 @@ versioning follows [SemVer](https://semver.org/).
 
 ---
 
+## [v1.8.3] — 2026-04-26 (tool_calls probe も thinking モデル対応 + adapter で `reasoning_content` strip — llama.cpp 直叩き対応)
+
+**Theme: v1.8.2 と同日リリースの第 2 弾 patch。Qwen3.6:35b-a3b on llama.cpp の実機検証で発見した 2 つの追加課題 — `tool_calls` probe の thinking モデル偽陽性 + llama.cpp が emit する `reasoning_content` フィールドの adapter strip 不足 — を解消。**
+
+v1.8.2 リリース直後、note 記事 v1.8.2「自分が作った診断ツールに自分が騙された話」の続編として **「Ollama 経由で詰んだ Qwen3.6 を Unsloth GGUF + llama.cpp 直叩きで動かしたら native tool_calls が完璧に出た」** を実機検証中、CodeRouter doctor で `tool_calls [NEEDS TUNING]` が依然として出る矛盾に直面。深掘りで `tool_calls` probe の `max_tokens=64` が thinking モデルで `reasoning_content` トークン消費に食い切られる **v1.8.2 で num_ctx / streaming に対して直したのと完全に同じバグ pattern が tool_calls probe にも残っていた** ことが判明。あわせて llama.cpp の `reasoning_content` フィールド (Ollama / OpenRouter は `reasoning`) が openai_compat adapter の strip 対象に入っていなかった事実も発見。両者を v1.8.3 として 1 patch に統合。
+
+**Ollama 経由詰みの真因が完全確定**: Ollama の chat template / tool 仕様未成熟、モデル本体は健全。llama.cpp 直叩きでは Qwen3.6 系の `tool_calls` が native で動作。
+
+- Tests: 733 → **737** (+4: tool_calls probe budget thinking variant / reasoning_content strip 3 件)
+- Runtime deps: 5 → 5 (21 sub-release 連続据え置き)
+- Backward compat: 完全互換、`providers.yaml` / `~/.coderouter/model-capabilities.yaml` 編集不要
+
+### Changes
+
+#### Doctor `tool_calls` probe: thinking モデル対応バジェット
+
+- **`coderouter/doctor.py`**: `_probe_tool_calls` の `max_tokens` を `64` 固定から **thinking 検出付きの動的選択** (256 default / 1024 thinking) に変更。`_TOOL_CALLS_PROBE_MAX_TOKENS_DEFAULT/_THINKING` 定数を新設、既存の `_is_reasoning_model(provider, resolved)` ヘルパで分岐。
+  - 旧 64 では Qwen3.6:35b-a3b on llama.cpp が `reasoning_content` で 64 token 食い切り → `tool_calls` 出力前に length cap → **NEEDS_TUNING + suggested patch 「`tools: false` にしろ」という真逆の推奨** を出していた
+  - 新 1024 で thinking + tool_call が両方収まる headroom
+
+#### Adapter: `reasoning_content` フィールド strip 追加
+
+- **`coderouter/adapters/openai_compat.py`**: `_strip_reasoning_field` を `_NON_STANDARD_REASONING_KEYS = ("reasoning", "reasoning_content")` の両方を strip するように拡張。
+  - `reasoning` (Ollama / OpenRouter 命名) と `reasoning_content` (llama.cpp `llama-server` 命名) は同じ概念で、ベンダー命名が違うだけ
+  - 厳格な OpenAI client はどちらも unknown key として reject するので、両方 strip するのが正しい
+  - `capability-degraded` log の `dropped` フィールドも `["reasoning", "reasoning_content"]` に更新 (両方 strip し得ることを表現)
+
+#### Doctor `reasoning-leak` probe: `reasoning_content` 検出
+
+- **`coderouter/doctor.py`**: `_probe_reasoning_leak` の `has_reasoning` 判定を `"reasoning" in msg or "reasoning_content" in msg` に拡張。llama.cpp 経由 provider でも reasoning leak を informational に検出可能に。
+
+#### Tests
+
+- **`tests/test_doctor.py`** + 1: `test_tool_calls_max_tokens_bumped_for_thinking_provider` (thinking provider で tool_calls probe が 1024 を要求、native tool_calls 応答で OK 判定)
+- **`tests/test_reasoning_strip.py`** + 3: `test_strip_helper_removes_reasoning_content_field` / `test_strip_helper_removes_both_reasoning_and_reasoning_content` / `test_strip_helper_removes_reasoning_content_from_delta` (各 layer で `reasoning_content` 除去確認)
+- 既存 `tests/test_reasoning_strip.py` の `recs[0].dropped == ["reasoning"]` を `["reasoning", "reasoning_content"]` に更新 (log の表現変更に追従)
+
+### Why
+
+v1.8.2 で「diagnostic ツール自身も diagnostic され続ける必要がある」というメタ教訓を書いた直後、まさにそのことを実証する形で残バグが発見された。`tool_calls` probe は num_ctx / streaming probe と同じ「thinking モデルの reasoning トークン消費を考慮していない `max_tokens=64`」問題を抱えていて、しかも doctor の出した suggested patch (`tools: false` に倒せ) は **完全に逆の対処を勧めていた** — false-positive どころか、誠実なユーザーが従うと healthy なモデルを抑制してしまう **active-harmful な誤診断**。
+
+これは v1.8.2 の patch を当てる時点で見つけるべきだった見落としで、note 記事 v1.8.2 のメタ教訓「diagnostic ツール自身も diagnostic され続ける」が現実に試された格好。素早く v1.8.3 で潰す。
+
+`reasoning_content` strip 追加は llama.cpp 直叩き経路を CodeRouter から綺麗に使えるようにする ergonomic 改善で、`v1.8.x` patch 候補で plan.md に記録済みだった項目を実機発見と同時に消化。
+
+### Migration
+
+`pyproject.toml version 1.8.2 → 1.8.3`、`coderouter --version` は 1.8.3 を返す。**手元の `~/.coderouter/providers.yaml` は触らない限り完全に変化なし**。
+
+v1.8.2 で Qwen3.6 / Gemma 4 系 thinking provider に対して `tool_calls [NEEDS TUNING]` が出ていたユーザーは v1.8.3 で再実行すると **OK** 判定 (実機で動いていた provider が doctor 上でも妥当に評価される)。llama.cpp 直叩き provider を使っているユーザーは `reasoning_content` が client に流れることなく綺麗に strip される。
+
+### Files touched
+
+```
+M  CHANGELOG.md
+M  coderouter/adapters/openai_compat.py
+M  coderouter/doctor.py
+M  pyproject.toml
+M  plan.md
+M  docs/troubleshooting.md
+M  tests/test_doctor.py
+M  tests/test_reasoning_strip.py
+```
+
+---
+
 ## [v1.8.2] — 2026-04-26 (doctor probe を thinking モデル対応に — Gemma 4 偽陽性の解消)
 
 **Theme: v1.8.1 リリース直後の深掘りで `doctor` の `num_ctx` / `streaming` probe が thinking モデルに対して偽陽性 NEEDS_TUNING を出していた事実を発見、probe の `max_tokens` バジェットを reasoning トークン消費分込みで設計し直した patch。**

{coderouter_cli-1.8.2 → coderouter_cli-1.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coderouter-cli
-Version: 1.8.2
+Version: 1.8.3
 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
@@ -60,7 +60,7 @@ Description-Content-Type: text/markdown
 <p align="center">
   <a href="https://github.com/zephel01/CodeRouter/actions/workflows/ci.yml"><img src="https://github.com/zephel01/CodeRouter/actions/workflows/ci.yml/badge.svg?branch=main" alt="CI"></a>
   <a href=""><img src="https://img.shields.io/badge/status-stable-brightgreen" alt="status"></a>
-  <a href=""><img src="https://img.shields.io/badge/version-1.8.0-blue" alt="version"></a>
+  <a href=""><img src="https://img.shields.io/badge/version-1.8.3-blue" alt="version"></a>
   <a href=""><img src="https://img.shields.io/badge/python-3.12%2B-blue" alt="python"></a>
   <a href=""><img src="https://img.shields.io/badge/runtime%20deps-5-brightgreen" alt="deps"></a>
   <a href=""><img src="https://img.shields.io/badge/license-MIT-yellow" alt="license"></a>
@@ -100,7 +100,7 @@ Description-Content-Type: text/markdown
 | **要るか判断する** | [要否判定ガイド](./docs/when-do-i-need-coderouter.md) | エージェント × モデルの詳細マトリクスで「そもそも自分に必要か」を決める |
 | **詰まったとき** | [トラブルシューティング](./docs/troubleshooting.md) | `doctor` の使い方、`.env` の export 必須、Ollama サイレント失敗 5 症状、Claude Code 連携の罠 |
 | **安全に使う** | [セキュリティ方針](./docs/security.md) | 脅威モデル・秘密情報の扱い・脆弱性報告経路 |
-| **履歴** | [CHANGELOG](./CHANGELOG.md) | 全リリース履歴（最新: v1.8.0 — 用途別 4 プロファイル + GLM/Gemma 4/Qwen3.6 公式化 + apply 自動化） |
+| **履歴** | [CHANGELOG](./CHANGELOG.md) | 全リリース履歴（最新: v1.8.3 — tool_calls probe も thinking 対応 + adapter で `reasoning_content` strip / llama.cpp 直叩き対応） |
 | **設計を追う** | [plan.md](./plan.md) | 設計不変項・マイルストーン・今後のロードマップ |
 
 English versions: [Quickstart](./docs/quickstart.en.md) · [Usage guide](./docs/usage-guide.en.md) · [Free-tier guide](./docs/free-tier-guide.en.md) · [When you need it](./docs/when-do-i-need-coderouter.en.md) · [Troubleshooting](./docs/troubleshooting.en.md) · [Security](./docs/security.en.md)
@@ -175,7 +175,7 @@ OpenAI 互換エージェント + お行儀の良いモデル + フォールバ
 
 ## クイックスタート（3 コマンド）
 
-**v1.7.0 で PyPI 公開**、**v1.8.0 で用途別 4 プロファイル + Z.AI/GLM 連携**を追加しました。`uvx` 一発で動きます (Python 3.12 以上必須):
+**v1.7.0 で PyPI 公開**、**v1.8.0 で用途別 4 プロファイル + Z.AI/GLM 連携**を追加、**v1.8.2 で doctor probe を thinking モデル対応**にしました。`uvx` 一発で動きます (Python 3.12 以上必須):
 
 ```bash
 # 1. サンプル設定を置く
@@ -205,7 +205,7 @@ uv run coderouter serve --port 8088
 
 > **注**: PyPI 上のパッケージ名は `coderouter-cli` ですが、コマンド名と Python import 名は `coderouter` のままです。詳しくは [CHANGELOG `[v1.7.0]`](./CHANGELOG.md#v170--2026-04-25-pypi-公開-uvx-coderouter-cli-一発で動く) 参照。
 >
-> **v1.8.0 の `--apply` 自動化を使う場合**: `ruamel.yaml` を optional dep として一緒に入れます (`pip install 'coderouter-cli[doctor]'` または `uv pip install ruamel.yaml`)。基本機能には不要です。
+> **`--apply` 自動化を使う場合** (v1.8.0+): `ruamel.yaml` を optional dep として一緒に入れます (`pip install 'coderouter-cli[doctor]'` または `uv pip install ruamel.yaml`)。基本機能には不要です。
 
 あとは任意の OpenAI クライアントを `http://127.0.0.1:8088` に向けるだけです:
 

{coderouter_cli-1.8.2 → coderouter_cli-1.8.3}/README.en.md

@@ -20,7 +20,7 @@
 <p align="center">
   <a href="https://github.com/zephel01/CodeRouter/actions/workflows/ci.yml"><img src="https://github.com/zephel01/CodeRouter/actions/workflows/ci.yml/badge.svg?branch=main" alt="CI"></a>
   <a href=""><img src="https://img.shields.io/badge/status-stable-brightgreen" alt="status"></a>
-  <a href=""><img src="https://img.shields.io/badge/version-1.8.0-blue" alt="version"></a>
+  <a href=""><img src="https://img.shields.io/badge/version-1.8.3-blue" alt="version"></a>
   <a href=""><img src="https://img.shields.io/badge/python-3.12%2B-blue" alt="python"></a>
   <a href=""><img src="https://img.shields.io/badge/runtime%20deps-5-brightgreen" alt="deps"></a>
   <a href=""><img src="https://img.shields.io/badge/license-MIT-yellow" alt="license"></a>
@@ -59,7 +59,7 @@
 | **Decide if you need it** | [Decision guide](./docs/when-do-i-need-coderouter.en.md) | Agent × model matrix to figure out whether CodeRouter fits your setup at all |
 | **When stuck** | [Troubleshooting](./docs/troubleshooting.en.md) | How to use `doctor`, why `.env` needs `export`, the 5 Ollama silent-fail symptoms, Claude Code integration gotchas |
 | **Operate safely** | [Security](./docs/security.en.md) | Threat model, secret handling, vulnerability reporting |
-| **History** | [CHANGELOG](./CHANGELOG.md) | All releases (latest: v1.8.0 — use-case-aware 4 profiles + GLM/Gemma 4/Qwen3.6 official tags + apply automation) |
+| **History** | [CHANGELOG](./CHANGELOG.md) | All releases (latest: v1.8.3 — tool_calls probe also thinking-aware + adapter strips `reasoning_content` / llama.cpp direct backend supported) |
 | **Track the design** | [plan.md](./plan.md) | Design invariants, milestones, roadmap |
 
 日本語版: [Quickstart](./docs/quickstart.md) · [利用ガイド](./docs/usage-guide.md) · [無料枠ガイド](./docs/free-tier-guide.md) · [要否判定](./docs/when-do-i-need-coderouter.md) · [トラブルシューティング](./docs/troubleshooting.md) · [Security](./docs/security.md)
@@ -134,7 +134,7 @@ Design invariants and the roadmap are in [`plan.md`](./plan.md). Beginner-friend
 
 ## Quickstart (2 commands)
 
-**v1.7.0 published to PyPI**, **v1.8.0 added use-case-aware 4 profiles + Z.AI/GLM integration**. `uvx` installs and runs in one shot (Python 3.12+ required):
+**v1.7.0 published to PyPI**, **v1.8.0 added use-case-aware 4 profiles + Z.AI/GLM integration**, **v1.8.2 made the `doctor` probe thinking-model-aware**. `uvx` installs and runs in one shot (Python 3.12+ required):
 
 ```bash
 # 1. Drop a sample config
@@ -164,7 +164,7 @@ uv run coderouter serve --port 8088
 
 > **Note**: the PyPI distribution name is `coderouter-cli`, but the command and Python import name are both `coderouter`. See [CHANGELOG `[v1.7.0]`](./CHANGELOG.md#v170--2026-04-25-pypi-公開-uvx-coderouter-cli-一発で動く) for details.
 >
-> **For the v1.8.0 `--apply` automation**: install `ruamel.yaml` as the optional dependency (`pip install 'coderouter-cli[doctor]'` or `uv pip install ruamel.yaml`). Not required for the base feature set.
+> **For the `--apply` automation** (v1.8.0+): install `ruamel.yaml` as the optional dependency (`pip install 'coderouter-cli[doctor]'` or `uv pip install ruamel.yaml`). Not required for the base feature set.
 
 Then point any OpenAI client at `http://127.0.0.1:8088`:
 

{coderouter_cli-1.8.2 → coderouter_cli-1.8.3}/README.md

@@ -19,7 +19,7 @@
 <p align="center">
   <a href="https://github.com/zephel01/CodeRouter/actions/workflows/ci.yml"><img src="https://github.com/zephel01/CodeRouter/actions/workflows/ci.yml/badge.svg?branch=main" alt="CI"></a>
   <a href=""><img src="https://img.shields.io/badge/status-stable-brightgreen" alt="status"></a>
-  <a href=""><img src="https://img.shields.io/badge/version-1.8.0-blue" alt="version"></a>
+  <a href=""><img src="https://img.shields.io/badge/version-1.8.3-blue" alt="version"></a>
   <a href=""><img src="https://img.shields.io/badge/python-3.12%2B-blue" alt="python"></a>
   <a href=""><img src="https://img.shields.io/badge/runtime%20deps-5-brightgreen" alt="deps"></a>
   <a href=""><img src="https://img.shields.io/badge/license-MIT-yellow" alt="license"></a>
@@ -59,7 +59,7 @@
 | **要るか判断する** | [要否判定ガイド](./docs/when-do-i-need-coderouter.md) | エージェント × モデルの詳細マトリクスで「そもそも自分に必要か」を決める |
 | **詰まったとき** | [トラブルシューティング](./docs/troubleshooting.md) | `doctor` の使い方、`.env` の export 必須、Ollama サイレント失敗 5 症状、Claude Code 連携の罠 |
 | **安全に使う** | [セキュリティ方針](./docs/security.md) | 脅威モデル・秘密情報の扱い・脆弱性報告経路 |
-| **履歴** | [CHANGELOG](./CHANGELOG.md) | 全リリース履歴（最新: v1.8.0 — 用途別 4 プロファイル + GLM/Gemma 4/Qwen3.6 公式化 + apply 自動化） |
+| **履歴** | [CHANGELOG](./CHANGELOG.md) | 全リリース履歴（最新: v1.8.3 — tool_calls probe も thinking 対応 + adapter で `reasoning_content` strip / llama.cpp 直叩き対応） |
 | **設計を追う** | [plan.md](./plan.md) | 設計不変項・マイルストーン・今後のロードマップ |
 
 English versions: [Quickstart](./docs/quickstart.en.md) · [Usage guide](./docs/usage-guide.en.md) · [Free-tier guide](./docs/free-tier-guide.en.md) · [When you need it](./docs/when-do-i-need-coderouter.en.md) · [Troubleshooting](./docs/troubleshooting.en.md) · [Security](./docs/security.en.md)
@@ -134,7 +134,7 @@ OpenAI 互換エージェント + お行儀の良いモデル + フォールバ
 
 ## クイックスタート（3 コマンド）
 
-**v1.7.0 で PyPI 公開**、**v1.8.0 で用途別 4 プロファイル + Z.AI/GLM 連携**を追加しました。`uvx` 一発で動きます (Python 3.12 以上必須):
+**v1.7.0 で PyPI 公開**、**v1.8.0 で用途別 4 プロファイル + Z.AI/GLM 連携**を追加、**v1.8.2 で doctor probe を thinking モデル対応**にしました。`uvx` 一発で動きます (Python 3.12 以上必須):
 
 ```bash
 # 1. サンプル設定を置く
@@ -164,7 +164,7 @@ uv run coderouter serve --port 8088
 
 > **注**: PyPI 上のパッケージ名は `coderouter-cli` ですが、コマンド名と Python import 名は `coderouter` のままです。詳しくは [CHANGELOG `[v1.7.0]`](./CHANGELOG.md#v170--2026-04-25-pypi-公開-uvx-coderouter-cli-一発で動く) 参照。
 >
-> **v1.8.0 の `--apply` 自動化を使う場合**: `ruamel.yaml` を optional dep として一緒に入れます (`pip install 'coderouter-cli[doctor]'` または `uv pip install ruamel.yaml`)。基本機能には不要です。
+> **`--apply` 自動化を使う場合** (v1.8.0+): `ruamel.yaml` を optional dep として一緒に入れます (`pip install 'coderouter-cli[doctor]'` または `uv pip install ruamel.yaml`)。基本機能には不要です。
 
 あとは任意の OpenAI クライアントを `http://127.0.0.1:8088` に向けるだけです:
 

{coderouter_cli-1.8.2 → coderouter_cli-1.8.3}/coderouter/adapters/openai_compat.py

@@ -48,14 +48,25 @@ logger = get_logger(__name__)
 _RETRYABLE_STATUSES = {404, 408, 425, 429, 500, 502, 503, 504}
 
 
+# v1.8.3: non-standard reasoning fields emitted by various upstreams.
+# Different runtimes use different field names for the same concept:
+#   * ``reasoning``         — OpenRouter free models (gpt-oss-120b:free
+#                             confirmed 2026-04-20), Ollama
+#   * ``reasoning_content`` — llama.cpp ``llama-server`` (Qwen3.6 etc.,
+#                             confirmed 2026-04-26 with Unsloth GGUF)
+# Strict OpenAI clients reject either as an unknown key. The strip
+# function below removes both at the adapter boundary so downstream
+# layers never see them, regardless of which runtime fronts the model.
+_NON_STANDARD_REASONING_KEYS = ("reasoning", "reasoning_content")
+
+
 def _strip_reasoning_field(choices: list[dict[str, Any]] | None, *, delta_key: bool) -> bool:
-    """Remove non-standard ``reasoning`` keys from a choices list, in place.
+    """Remove non-standard reasoning keys from a choices list, in place.
 
-    v0.5-C: Some OpenRouter free models (confirmed on
-    ``openai/gpt-oss-120b:free`` 2026-04-20) return a ``reasoning`` field
-    alongside ``content`` on each choice. The field is not in the OpenAI
-    Chat Completions spec and strict clients can reject the unknown key.
-    We strip it at the adapter boundary so downstream layers never see it.
+    v0.5-C originally targeted OpenRouter's ``reasoning`` field. v1.8.3
+    extends the strip to ``reasoning_content`` (llama.cpp ``llama-server``
+    naming) since both denote the same hidden chain-of-thought trace and
+    neither is part of the OpenAI Chat Completions spec.
 
     Args:
         choices: The ``choices`` list from the response body or stream chunk.
@@ -64,7 +75,7 @@ def _strip_reasoning_field(choices: list[dict[str, Any]] | None, *, delta_key: b
             ``False`` for non-streaming responses (look in ``choice["message"]``).
 
     Returns:
-        True iff at least one ``reasoning`` key was removed. Callers use
+        True iff at least one reasoning key was removed. Callers use
         this to decide whether to emit a one-shot log line.
     """
     if not choices:
@@ -75,9 +86,12 @@ def _strip_reasoning_field(choices: list[dict[str, Any]] | None, *, delta_key: b
         if not isinstance(choice, dict):
             continue
         inner = choice.get(inner_key)
-        if isinstance(inner, dict) and "reasoning" in inner:
-            inner.pop("reasoning", None)
-            stripped = True
+        if not isinstance(inner, dict):
+            continue
+        for key in _NON_STANDARD_REASONING_KEYS:
+            if key in inner:
+                inner.pop(key, None)
+                stripped = True
     return stripped
 
 
@@ -235,15 +249,17 @@ class OpenAICompatAdapter(BaseAdapter):
                 retryable=False,
             ) from exc
 
-        # v0.5-C: passive strip of non-standard `reasoning` field on choices.
-        # No-op when the provider opted into passthrough.
+        # v0.5-C / v1.8.3: passive strip of non-standard reasoning fields
+        # on choices (covers both Ollama/OpenRouter ``reasoning`` and
+        # llama.cpp ``reasoning_content``). No-op when the provider opted
+        # into passthrough.
         if not self.config.capabilities.reasoning_passthrough and _strip_reasoning_field(
             data.get("choices"), delta_key=False
         ):
             log_capability_degraded(
                 logger,
                 provider=self.name,
-                dropped=["reasoning"],
+                dropped=list(_NON_STANDARD_REASONING_KEYS),
                 reason="non-standard-field",
             )
 
@@ -344,7 +360,7 @@ class OpenAICompatAdapter(BaseAdapter):
                             log_capability_degraded(
                                 logger,
                                 provider=self.name,
-                                dropped=["reasoning"],
+                                dropped=list(_NON_STANDARD_REASONING_KEYS),
                                 reason="non-standard-field",
                             )
                             reasoning_logged = True

{coderouter_cli-1.8.2 → coderouter_cli-1.8.3}/coderouter/doctor.py

@@ -458,6 +458,18 @@ _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
+# v1.8.3: tool_calls probe also needs thinking-aware budget. The
+# pre-v1.8.3 default of 64 was tight even for non-thinking models
+# (the assistant often emits a brief preamble before the JSON tool
+# call), and on thinking models (Qwen3.6, Gemma 4, gpt-oss, deepseek-r1)
+# the entire 64-token budget gets consumed by ``reasoning_content``
+# before any ``tool_calls`` can surface — producing a false-positive
+# NEEDS_TUNING with the WRONG remediation (suggested patch flips
+# ``tools`` to false even though the model supports them perfectly).
+# 256/1024 brings the budget into line with the num_ctx / streaming
+# probes (same _is_reasoning_model gate).
+_TOOL_CALLS_PROBE_MAX_TOKENS_DEFAULT = 256
+_TOOL_CALLS_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
@@ -531,9 +543,7 @@ def _is_reasoning_model(
         return True
     if resolved.thinking is True:
         return True
-    if resolved.reasoning_passthrough is True:
-        return True
-    return False
+    return resolved.reasoning_passthrough is True
 
 
 _PROBE_BASIC_USER_PROMPT = "Reply with exactly the single word: PONG"
@@ -1093,6 +1103,16 @@ async def _probe_tool_calls(
           If declaration says True → NEEDS_TUNING (flip to False). If
           False → OK.
     """
+    # v1.8.3: thinking-aware budget — the pre-v1.8.3 default of 64 was
+    # consumed by ``reasoning_content`` on thinking models (Qwen3.6,
+    # Gemma 4, gpt-oss, deepseek-r1) before any ``tool_calls`` could
+    # surface, producing a false-positive NEEDS_TUNING that recommended
+    # flipping ``tools`` to false — the exact opposite of what's needed.
+    max_tokens = (
+        _TOOL_CALLS_PROBE_MAX_TOKENS_THINKING
+        if _is_reasoning_model(provider, resolved)
+        else _TOOL_CALLS_PROBE_MAX_TOKENS_DEFAULT
+    )
     if provider.kind == "anthropic":
         # Anthropic native tools use a different wire shape; we probe
         # via the messages API. A capable model returns content blocks
@@ -1104,7 +1124,7 @@ async def _probe_tool_calls(
             "messages": [
                 {"role": "user", "content": _PROBE_TOOLS_USER_PROMPT},
             ],
-            "max_tokens": 64,
+            "max_tokens": max_tokens,
             "tools": [_PROBE_TOOL_SPEC_ANTHROPIC],
         }
     else:
@@ -1115,7 +1135,7 @@ async def _probe_tool_calls(
             "messages": [
                 {"role": "user", "content": _PROBE_TOOLS_USER_PROMPT},
             ],
-            "max_tokens": 64,
+            "max_tokens": max_tokens,
             "temperature": 0,
             "tools": [_PROBE_TOOL_SPEC_OPENAI],
         }
@@ -1439,7 +1459,12 @@ async def _probe_reasoning_leak(
         )
 
     msg = _extract_openai_assistant_choice(parsed)
-    has_reasoning = bool(msg and "reasoning" in msg)
+    # v1.8.3: detect llama.cpp's ``reasoning_content`` alongside Ollama /
+    # OpenRouter's ``reasoning`` — they're the same concept under different
+    # field names, and the openai_compat adapter strips both since v1.8.3.
+    has_reasoning = bool(
+        msg and ("reasoning" in msg or "reasoning_content" in msg)
+    )
 
     # v1.0-A: content-embedded marker detection.
     content = (msg.get("content") if isinstance(msg, dict) else None) or ""

{coderouter_cli-1.8.2 → coderouter_cli-1.8.3}/docs/troubleshooting.en.md

@@ -282,7 +282,28 @@ profiles:
 
 > **Background on per-model tool-call behavior**: Llama-3.3-70B's tendency to rewrite plain text into tool calls comes from its aggressive agentic-tuning RLHF signal interacting with Claude Code's system prompt. Unsloth's [Tool calling guide for local LLMs](https://unsloth.ai/docs/jp/ji-ben/tool-calling-guide-for-local-llms) (Japanese) covers this and other model-specific quirks well — useful background for the v1.8.0 `claude_code_suitability` heuristic.
 
-### 4-2. `UserPromptSubmit hook error` (third-party Claude Code plugins)
+### 4-2. Local Ollama known pitfalls (added in v1.8.1, revised in v1.8.2)
+
+A 2026-04-26 real-machine session (M3 Max 64GB / Ollama 0.21.2 / CodeRouter v1.8.0 → v1.8.2) surfaced three classes of "highly-rated on note / HF, doesn't actually work via Ollama" cases. The Japanese troubleshooting doc has the full breakdown — this is a brief summary for English readers.
+
+**4-2-A. Qwen3.6:27b / 35b — `tool_calls [NEEDS TUNING]` is the real issue.**
+After v1.8.2's thinking-aware probe budgets, `num_ctx` and `streaming` clear, but Ollama's Qwen3.6 chat-template / tool-spec is still immature and produces neither native `tool_calls` nor repairable JSON. Bundled `model-capabilities.yaml` withdrew the `claude_code_suitability: ok` declaration in v1.8.1; keep Qwen3.6 out of the `coding` profile primary slot until upstream tooling stabilizes.
+
+**4-2-B. Qwen3.5-based HF distillations (e.g. Qwopus3.5) won't load.**
+`ollama pull` succeeds but `ollama run` returns 500 with `unknown model architecture: 'qwen35'` because llama.cpp doesn't yet support Qwen3.5's hybrid Transformer-SSM architecture. Wait for upstream framework support; not addressable from CodeRouter.
+
+**4-2-C. Gemma 4 26B works end-to-end (confirmed in v1.8.2).**
+The doctor probe NEEDS_TUNING readings on `num_ctx` / `streaming` reported in v1.8.1 turned out to be **probe false positives** — Gemma 4 is a thinking model that emits a `reasoning` field, and the v1.8.1 probe budgets (`max_tokens=32` / `128`) were consumed entirely by the reasoning trace before any visible `content` could surface. Real-machine `/v1/messages` round-trip returns "Hello." in 2 seconds; `tool_calls` work natively. v1.8.2 widened the probe budget to 1024 tokens for thinking-flagged models.
+
+**4-2-D. Best practice — "boring models + observation tools."**
+Lead the `coding` chain with `qwen2.5-coder:14b` / `gemma4:26b`, run `coderouter doctor --check-model <name>` for a 6-probe sanity pass, and let the fallback chain pick up paid / cloud free for spillover.
+
+**4-2-E. Doctor probe limits — thinking model awareness (v1.8.2).**
+Pre-v1.8.2 `num_ctx` / `streaming` probes used `max_tokens=32` / `128`, sufficient for non-thinking models but consumed entirely by `reasoning` token output on thinking models. v1.8.2 introduced `_is_reasoning_model(provider, resolved)` which checks `provider.capabilities.thinking`, `provider.capabilities.reasoning_passthrough`, and the registry-resolved equivalents — when any signals true, the probe budget bumps to 1024. Bundled `model-capabilities.yaml` declares `thinking: true` for `gemma4:*` and `qwen3.6:*`, so users see the corrected behavior without editing their `providers.yaml`. **Meta lesson**: diagnostic tools themselves need to keep being diagnosed (a corollary of plan.md §5.4's "real-machine evidence first" principle).
+
+For full detail and curl reproductions see [`troubleshooting.md` §4-2](./troubleshooting.md#4-2).
+
+### 4-3. `UserPromptSubmit hook error` (third-party Claude Code plugins)
 
 ```
 ❯ hello
@@ -305,7 +326,7 @@ This is a structural mismatch on the plugin side, not a CodeRouter bug.
 
 If the error vanishes, it's the plugin. The proper fix is upstream — file feedback asking the plugin author to support OpenAI-compat / non-Anthropic backends.
 
-### 4-3. "Compacting conversation…" takes ages
+### 4-4. "Compacting conversation…" takes ages
 
 ```
 ✻ Compacting conversation… (34s)
@@ -315,7 +336,7 @@ Claude Code's auto-compact (summarize old turns to compress context) being slow
 
 `DISABLE_CLAUDE_CODE_SM_COMPACT=1` disables the LLM-based smart compact, but a truncate-based fallback still runs. Manual `/compact` / `/clear` is the most reliable workaround.
 
-### 4-4. Open the dashboard, every gotcha becomes visible in 10 seconds
+### 4-5. Open the dashboard, every gotcha becomes visible in 10 seconds
 
 Open `http://localhost:8088/dashboard` in a separate tab while you work. All of the above become directly visible:
 

{coderouter_cli-1.8.2 → coderouter_cli-1.8.3}/docs/troubleshooting.md

@@ -303,6 +303,46 @@ v1.8.2 の偽陽性除去後、`coderouter doctor --check-model ollama-qwen3-6-2
 
 **回避**: `claude-code-nim` profile の primary に Qwen3.6 を置かず、**Gemma 4 26B または Qwen2.5-Coder 14b を上位に**。bundled `model-capabilities.yaml` も v1.8.1 で `qwen3.6:*` の `claude_code_suitability: ok` を撤回 (declaration 過信の例)、v1.8.2 で `thinking: true` 追加 (doctor probe 偽陽性除去のため)。
 
+> **コミュニティ証拠 (2026-04-26 偵察)**: X / Reddit (r/ollama, r/LocalLLaMA) で **Qwen3.6 + Ollama の組み合わせは現状コミュニティ全体で詰んでいる** ことが確認できた:
+>
+> - Qwen3.6 35B-A3B で hard crash / リブート (Mac Metal、複数報告)
+> - 「available memory 不足」でロード失敗 (Ollama 側の memory 計算バグ)、最新 Ollama で一部改善
+> - Claude Code / OpenCode 連携でタイムアウト・コンテキスト切れ・loop
+> - `think=False` 時の構造化出力バグ
+>
+> 回避策として複数経路：
+>
+> 1. **Modelfile `PARAMETER num_ctx 131072`** で context を焼き込み (Ollama 経由維持の最小変更)
+> 2. **Unsloth GGUF + llama.cpp / llama-server で直叩き** (最有力、複数の「これで解決した」報告あり) — CodeRouter は `kind: openai_compat` + `base_url: http://localhost:8080/v1` で接続可能
+> 3. 低 quant (Q4_K_M) / coding 特化 tag を試す
+> 4. Ollama 最新版へアップデート (memory bug 部分改善)
+>
+> CodeRouter として **Unsloth GGUF + llama.cpp 直叩きの providers.yaml 例** を追加するロードマップは plan.md 「v1.8.x patch 候補 — llama.cpp 直叩き backend 検証」に記録済 (実機検証で動いたら有効化)。
+
+> **v1.8.3 update (2026-04-26)**: 実機検証完了。**Qwen3.6:35b-a3b + llama.cpp 直叩きで native `tool_calls` 完璧動作確認**。`finish_reason: "tool_calls"` + 正規 OpenAI `tool_calls[]` array が返る。**Ollama 経由詰みの真因 = Ollama chat template / tool 仕様未成熟、モデル本体は健全** が完全確定。検証済み recipe:
+>
+> ```bash
+> # 1. llama.cpp build (Metal)
+> git clone https://github.com/ggml-org/llama.cpp ~/llama.cpp
+> cd ~/llama.cpp && cmake -B build -DGGML_METAL=ON -DLLAMA_CURL=ON
+> cmake --build build --config Release -j
+>
+> # 2. Unsloth Dynamic Quantization GGUF (~22GB)
+> huggingface-cli download unsloth/Qwen3.6-35B-A3B-GGUF \
+>   --include "*UD-Q4_K_M*" "*tokenizer*" "*chat_template*" \
+>   --local-dir ~/models/qwen3.6-35b-a3b-unsloth
+>
+> # 3. llama-server 起動
+> ./build/bin/llama-server \
+>   --model ~/models/qwen3.6-35b-a3b-unsloth/Qwen3.6-35B-A3B-UD-Q4_K_M.gguf \
+>   --port 8080 --ctx-size 32768 --n-predict 4096 \
+>   --jinja --threads 8 -ngl 999 --host 127.0.0.1
+> ```
+>
+> CodeRouter `providers.yaml` で `kind: openai_compat` + `base_url: http://localhost:8080/v1` で接続可能。`capabilities.thinking: true` を宣言すると doctor probe が thinking-aware budget (1024) を使うので `tool_calls [OK]` が出る。
+>
+> v1.8.3 では (a) **`tool_calls` probe も thinking 対応** (旧 `max_tokens=64` で偽陽性 NEEDS_TUNING、suggested patch も真逆 `tools: false` を出していた active-harmful 誤診断を解消)、(b) **adapter で `reasoning_content` (llama.cpp 命名) を `reasoning` と並んで strip** を実装。これで llama.cpp 直叩き経路が CodeRouter の正規サポート対象に。
+
 #### 4-2-B. **Qwen3.5 系の HF 蒸留モデル** (Qwopus3.5 等) は llama.cpp 未対応
 
 例えば `Jackrong/Qwopus3.5-9B-v3-GGUF` (Qwen3.5-VL ベース + Claude Opus 蒸留、Apache-2.0、Vision) を `ollama pull` すると **blob は完全に落ちてくる**が `ollama run` で：

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

{coderouter_cli-1.8.2 → coderouter_cli-1.8.3}/tests/test_doctor.py

@@ -882,6 +882,84 @@ async def test_num_ctx_max_tokens_bumped_when_registry_says_thinking(
     assert num_ctx_body["max_tokens"] == 1024
 
 
+@pytest.mark.asyncio
+async def test_tool_calls_max_tokens_bumped_for_thinking_provider(
+    httpx_mock: HTTPXMock,
+) -> None:
+    """v1.8.3: tool_calls probe uses thinking-aware budget too.
+
+    Pre-v1.8.3 the probe sent ``max_tokens=64``, which thinking models
+    (Qwen3.6, Gemma 4, gpt-oss, deepseek-r1) consume entirely on the
+    ``reasoning_content`` field before any ``tool_calls`` can surface —
+    producing a false-positive NEEDS_TUNING that recommended flipping
+    ``tools`` to false despite the model supporting tools perfectly
+    (observed 2026-04-26 with Qwen3.6:35b-a3b on llama-server).
+    """
+    thinking_caps = Capabilities(thinking=True, tools=True)
+    provider = _oa_provider(
+        name="llamacpp-qwen3-6-35b-a3b",
+        base_url="http://localhost:8080/v1",
+        model="qwen3.6",
+        caps=thinking_caps,
+    )
+    captured: list[httpx.Request] = []
+
+    def _capture(request: httpx.Request) -> httpx.Response:
+        captured.append(request)
+        body = json.loads(request.content.decode("utf-8"))
+        if "tools" in body:
+            # tool_calls probe — return a native tool_calls structure.
+            return httpx.Response(
+                200,
+                json={
+                    "id": "chatcmpl-probe",
+                    "object": "chat.completion",
+                    "created": 0,
+                    "model": "probe",
+                    "choices": [
+                        {
+                            "index": 0,
+                            "message": {
+                                "role": "assistant",
+                                "content": "",
+                                "tool_calls": [
+                                    {
+                                        "id": "call_1",
+                                        "type": "function",
+                                        "function": {
+                                            "name": "echo",
+                                            "arguments": '{"message":"probe"}',
+                                        },
+                                    }
+                                ],
+                            },
+                            "finish_reason": "tool_calls",
+                        }
+                    ],
+                    "usage": {"prompt_tokens": 8, "completion_tokens": 1},
+                },
+            )
+        return httpx.Response(200, json=_openai_ok_response(content="PONG"))
+
+    httpx_mock.add_callback(
+        _capture,
+        url="http://localhost:8080/v1/chat/completions",
+        method="POST",
+        is_reusable=True,
+    )
+    await check_model(
+        _config_for([provider]), provider.name, registry=_empty_registry()
+    )
+    # Identify the tool_calls probe request by the presence of ``tools``.
+    tool_calls_bodies = [
+        json.loads(req.content.decode("utf-8"))
+        for req in captured
+        if "tools" in json.loads(req.content.decode("utf-8"))
+    ]
+    assert len(tool_calls_bodies) == 1
+    assert tool_calls_bodies[0]["max_tokens"] == 1024
+
+
 @pytest.mark.asyncio
 async def test_streaming_max_tokens_bumped_for_thinking_provider(
     httpx_mock: HTTPXMock,

{coderouter_cli-1.8.2 → coderouter_cli-1.8.3}/tests/test_reasoning_strip.py

@@ -117,6 +117,72 @@ def test_strip_helper_handles_multiple_choices() -> None:
     assert "reasoning" not in choices[2]["message"]
 
 
+def test_strip_helper_removes_reasoning_content_field() -> None:
+    """v1.8.3: llama.cpp's ``reasoning_content`` is treated the same as
+    ``reasoning`` — both are non-standard chain-of-thought fields with
+    different vendor naming.
+
+    Confirmed 2026-04-26 with Qwen3.6:35b-a3b on llama-server: the
+    response shape is::
+
+        {"message": {"role": "assistant", "content": "...",
+                     "reasoning_content": "<thinking trace>"}}
+
+    Strict OpenAI clients reject the unknown ``reasoning_content`` key
+    just as they would reject ``reasoning``.
+    """
+    choices = [
+        {
+            "index": 0,
+            "message": {
+                "role": "assistant",
+                "content": "Hello",
+                "reasoning_content": "Here's a thinking process: ...",
+            },
+            "finish_reason": "stop",
+        }
+    ]
+    stripped = _strip_reasoning_field(choices, delta_key=False)
+    assert stripped is True
+    assert choices[0]["message"] == {"role": "assistant", "content": "Hello"}
+
+
+def test_strip_helper_removes_both_reasoning_and_reasoning_content() -> None:
+    """When a single message carries both keys (defensive — unlikely in
+    practice but possible if a proxy merges OpenRouter + llama.cpp
+    upstreams), the strip removes both in one pass.
+    """
+    choices = [
+        {
+            "index": 0,
+            "message": {
+                "role": "assistant",
+                "content": "answer",
+                "reasoning": "ollama-style trace",
+                "reasoning_content": "llama-cpp-style trace",
+            },
+        }
+    ]
+    stripped = _strip_reasoning_field(choices, delta_key=False)
+    assert stripped is True
+    assert choices[0]["message"] == {"role": "assistant", "content": "answer"}
+
+
+def test_strip_helper_removes_reasoning_content_from_delta() -> None:
+    """Stream chunks may carry ``reasoning_content`` in ``delta`` too —
+    llama-server's streaming path emits it incrementally.
+    """
+    choices = [
+        {
+            "index": 0,
+            "delta": {"content": "tok", "reasoning_content": "thinking..."},
+        }
+    ]
+    stripped = _strip_reasoning_field(choices, delta_key=True)
+    assert stripped is True
+    assert choices[0]["delta"] == {"content": "tok"}
+
+
 # ======================================================================
 # Adapter tests — generate() (non-streaming)
 # ======================================================================
@@ -181,7 +247,9 @@ async def test_generate_strips_reasoning_from_message(
     ]
     assert len(recs) == 1
     assert recs[0].provider == "openrouter-gpt-oss-free"
-    assert recs[0].dropped == ["reasoning"]
+    # v1.8.3: log dropped now lists both Ollama/OpenRouter (`reasoning`)
+    # and llama.cpp (`reasoning_content`) since the same strip handles both.
+    assert recs[0].dropped == ["reasoning", "reasoning_content"]
 
 
 @pytest.mark.asyncio
@@ -357,7 +425,9 @@ async def test_stream_strips_reasoning_from_each_delta(
     ]
     assert len(recs) == 1
     assert recs[0].provider == "openrouter-gpt-oss-free"
-    assert recs[0].dropped == ["reasoning"]
+    # v1.8.3: log dropped now lists both Ollama/OpenRouter (`reasoning`)
+    # and llama.cpp (`reasoning_content`) since the same strip handles both.
+    assert recs[0].dropped == ["reasoning", "reasoning_content"]
 
 
 @pytest.mark.asyncio