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

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/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.dist-info → coderouter_cli-1.8.3.dist-info}/METADATA

@@ -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.dist-info → coderouter_cli-1.8.3.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=atYOr73LLI3lKHjhFDY0lea41_0jolfiY2zb15La_O8,68116
+coderouter/doctor.py,sha256=F6f9vl99KTGgCja6N9w_QlDIFFCEqY0mxoAhKEI5yTI,69643
 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
@@ -11,7 +11,7 @@ coderouter/output_filters.py,sha256=rI4YgKVv5vviDBl3Xkf7rp6LaSSkdWyEV004q6HrkB0,
 coderouter/adapters/__init__.py,sha256=7dIDSZ-FE_0iSqLSDc_lK1idRdLTKcM2hP9tCJipgPI,463
 coderouter/adapters/anthropic_native.py,sha256=qfdjxy4YyLt-0Fj7hUYn1oi1SFjEEbSvpaRBUC2hMf4,21903
 coderouter/adapters/base.py,sha256=H4uM6r_-95Xs1hCM_X4Zv3tq-xN3cXWLj83F-QjPNLw,8265
-coderouter/adapters/openai_compat.py,sha256=EC9zNYPGgSOVZyaH1dXRXO1VMN1RjBX5FZ2vEgTkVD8,17100
+coderouter/adapters/openai_compat.py,sha256=9qoJfLR2vVnyM8isb9G4j-Dk5QBHFlneOaBSY-P4UAg,17941
 coderouter/adapters/registry.py,sha256=Syt3eDljWZAK5mfiJGvUMKaZYAfCRScp7PvV6pYt7mc,683
 coderouter/config/__init__.py,sha256=FODEn74fN-qZnt4INPSHswqhOlEgpL6-_onxsitSx8g,274
 coderouter/config/capability_registry.py,sha256=oypl6Z-YjvNoC87AdSIm1C7XE_MZoFq_7Ivm3eRH3cI,14379
@@ -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.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,,
+coderouter_cli-1.8.3.dist-info/METADATA,sha256=Nm6kOVjXop9D5aISl3H0OcH-gi4fkGT0fmhuyoKTcHU,44221
+coderouter_cli-1.8.3.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+coderouter_cli-1.8.3.dist-info/entry_points.txt,sha256=-dnLfD1YZ2WjH2zSdNCvlO65wYltM9bsHt9Fhg3yGss,51
+coderouter_cli-1.8.3.dist-info/licenses/LICENSE,sha256=wkEzoR86jFw33jvfOHjULqmkGEfxTFMgMaJnpR8mPRw,1065
+coderouter_cli-1.8.3.dist-info/RECORD,,