feat(ai): prompt-anchor native harness for the fast CPU model

Optimize the native tool-calling loop for qwen2.5:3b on CPU, where it
previously invented paths (/ai/bin/bash), ran scripts it never wrote, and
silently dropped valid actions. Three changes:

- NATIVE_SYSTEM rewritten directive: explicit write→chmod→run workflow,
  relative paths only, never run an uncreated file, never guess interpreter
  paths, fix the cause on non-zero exit.
- New _sandbox_facts() probe injects LIVE SANDBOX STATE (real cwd, bash
  path, current files) into the system prompt so the model anchors to
  ground truth instead of guessing.
- OllamaProvider recovers tool calls qwen emits as <tool_call>{json}</…>
  TEXT in content (brace-balanced JSON scan), so a correct action isn't lost.
- Bump Ollama timeout 120→240s: the tool turn is non-streaming and a long
  write_file can exceed a tighter cap on a contended CPU box.

Live-validated (podman/Kali): 0/3 incoherent → reliable write/run with
self-correction on exit=126 for both single- and multi-script tasks.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
leetcrypt
2026-06-09 17:02:39 -07:00
parent 0c04ac74ee
commit 70d6e26b24
2 changed files with 93 additions and 11 deletions
+55 -1
View File
@@ -47,11 +47,14 @@ class OllamaProvider:
name = "ollama"
def __init__(self, model: str = "llama3", host: str | None = None, timeout: int = 120,
def __init__(self, model: str = "llama3", host: str | None = None, timeout: int = 240,
num_ctx: int = 4096, num_predict: int = 512, num_thread: int | None = None,
keep_alive: str = "30m"):
self.model = model
self.host = (host or os.environ.get("OLLAMA_HOST", "http://localhost:11434")).rstrip("/")
# Default 240s: the native tool-calling turn is NON-streaming, so on a
# contended CPU box a long write_file turn can exceed a tighter cap and
# surface as `[ai error: read timed out]`. Generous here, bounded loop above.
self.timeout = timeout
# On CPU, time-to-first-token is O(num_ctx) prefill, so keep the window
# modest (4096) rather than a GPU-mindset 8192. keep_alive pins the model
@@ -160,6 +163,57 @@ class OllamaProvider:
except ValueError:
args = {}
calls.append({"name": fn.get("name", ""), "arguments": args or {}})
# Small/quantized models (notably qwen2.5 on CPU) intermittently emit a valid
# tool call as literal `<tool_call>{…}</tool_call>` text in `content` instead
# of the structured `tool_calls` field. Recover those so a correct action
# isn't silently dropped (and strip the tags from the chat-facing text).
if not calls and "<tool_call>" in text:
text, calls = self._extract_text_tool_calls(text)
return text, calls
@staticmethod
def _extract_text_tool_calls(text: str) -> tuple[str, list[dict]]:
"""Pull `<tool_call>{json}</tool_call>` blocks out of model text (qwen's
text-mode tool calls). Uses a JSON decoder (not regex) so nested braces in
arguments parse correctly; tolerates a missing closing tag. Returns the text
with the blocks removed and the recovered calls."""
dec = json.JSONDecoder()
calls: list[dict] = []
spans: list[tuple[int, int]] = []
idx = 0
while True:
tag = text.find("<tool_call>", idx)
if tag == -1:
break
brace = text.find("{", tag)
if brace == -1:
break
try:
obj, end = dec.raw_decode(text, brace)
except ValueError:
idx = tag + len("<tool_call>")
continue
if isinstance(obj, dict) and obj.get("name"):
args = obj.get("arguments")
if args is None:
args = obj.get("parameters")
if isinstance(args, str):
try:
args = json.loads(args)
except ValueError:
args = {}
calls.append({"name": obj["name"], "arguments": args or {}})
close = text.find("</tool_call>", end)
span_end = close + len("</tool_call>") if close != -1 else end
spans.append((tag, span_end))
idx = span_end
if spans:
kept, last = [], 0
for start, stop in spans:
kept.append(text[last:start])
last = stop
kept.append(text[last:])
text = "".join(kept).strip()
return text, calls
def stream(self, system: str, messages: list[Msg]):