feat(ai): calibrate native pruning against real Ollama token counts

Phase 4 (final) of the native-harness working-memory sprint. OllamaProvider
.complete_with_tools now returns (text, calls, usage), surfacing the response's
real prompt_eval_count/eval_count (free — already in the payload). The native loop
EMA-smooths real/estimate into self._tok_ratio (clamped [0.5,3.0]) and prunes
against native_token_budget / ratio, so context budgeting tracks the TRUE window
instead of the systematic bias of the len//4 char estimate. Providers that omit
counts leave the ratio at 1.0, so behaviour is unchanged where unavailable — a
free correctness win, no regression. RAM-only, no disk, no new network frames.

Scope note: touches only cmd_chat/agent/ + providers — disjoint from the parallel
feat(operator) work on this branch, so it merges/reverts independently by path.

Sprint: native-harness-working-memory (Phase 4/4) — see also 46e5620, dc6317f
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
leetcrypt
2026-06-26 12:27:59 -07:00
parent cb345e5725
commit 2b66da71c5
2 changed files with 41 additions and 9 deletions
+14 -6
View File
@@ -128,13 +128,16 @@ class OllamaProvider:
def complete_with_tools(
self, system: str, messages: list[dict], tools: list[dict]
) -> tuple[str, list[dict]]:
) -> tuple[str, list[dict], dict]:
"""One non-streaming ``/api/chat`` turn carrying a ``tools`` schema. Used by
the native harness loop. ``messages`` are raw Ollama wire dicts (so the
caller can round-trip assistant ``tool_calls`` and ``tool`` results across
turns); ``system`` is prepended. Returns ``(text, tool_calls)`` where each
call is ``{"name": str, "arguments": dict}``. Raises ``ToolsUnsupported`` if
the model can't do function calling so the bridge can fall back to simple."""
turns); ``system`` is prepended. Returns ``(text, tool_calls, usage)`` where
each call is ``{"name": str, "arguments": dict}`` and ``usage`` carries
Ollama's real token counts (``prompt_eval_count`` / ``eval_count``) so the
caller can budget context against TRUE tokens instead of a char estimate
(``{}`` if the server omits them). Raises ``ToolsUnsupported`` if the model
can't do function calling so the bridge can fall back to simple."""
# Greedy decode (temperature 0) for the tool loop: at Ollama's default 0.8 a
# weak model "creatively" narrates the next step in prose or fabricates file
# content instead of emitting a deterministic structured call. The nudge loop
@@ -161,7 +164,12 @@ class OllamaProvider:
raise ToolsUnsupported(detail or f"{self.model} does not support tools")
self._raise_for_status(r)
self._tools_ok = True
msg = r.json().get("message", {}) or {}
data = r.json()
msg = data.get("message", {}) or {}
# Real token counts straight from Ollama — exact, free (already in the
# response), and used to calibrate the native loop's char-based estimate.
usage = {k: data[k] for k in ("prompt_eval_count", "eval_count")
if isinstance(data.get(k), int)}
text = (msg.get("content") or "").strip()
calls: list[dict] = []
for tc in msg.get("tool_calls") or []:
@@ -188,7 +196,7 @@ class OllamaProvider:
recovered_text, recovered = self._extract_text_tool_calls(text, valid)
if recovered:
text, calls = recovered_text, recovered
return text, calls
return text, calls, usage
# Wrapper tags a weak model wraps a leaked call (or its prose) in; stripped
# from the chat-facing text once the JSON inside is recovered.