Agent Zero AI framework
Context Doctor polish
linkliti51a02bd4f530
diff --git a/plugins/_context_doctor/AGENTS.md b/plugins/_context_doctor/AGENTS.mdindex 0cf6a6e97..65429146e 100644--- a/plugins/_context_doctor/AGENTS.md+++ b/plugins/_context_doctor/AGENTS.md@@ -16,7 +16,7 @@- Repaired and fallback JSON is always minified.- Nonempty non-tool output becomes `{"thoughts":[raw]}`; XML-like output becomes `{}` only when suppression is enabled.-- Log kvps and heading always reflect transformed output; `update_log` controls only View Details content.+- Log kvps retain streamed `reasoning` and add transformed output; `update_log` controls only View Details content.- A repaired `response` tool call refreshes the response log item when streaming did not create it.- Runtime setup reads the `json_repair` pin from root `requirements.txt`; do not duplicate its version in plugin code.diff --git a/plugins/_context_doctor/README.md b/plugins/_context_doctor/README.mdindex 5ae705be2..fc024d3ca 100644--- a/plugins/_context_doctor/README.md+++ b/plugins/_context_doctor/README.md@@ -6,5 +6,5 @@ Repairs model tool call JSON before sending it to history and tool processing.- Uses `json_repair` after native parsing has completed.- Accepts only complete Agent Zero tool calls (`tool_name` and object `tool_args`).-- Stores and displays repaired tool calls as compact JSON.+- Stores repaired tool calls as compact JSON; log kvps retain streamed reasoning and add transformed fields.- Optionally replaces XML-like output with `{}` in cases where model uses native XML tool calls.diff --git a/plugins/_context_doctor/extensions/python/message_loop_result/_10_context_doctor.py b/plugins/_context_doctor/extensions/python/message_loop_result/_10_context_doctor.pyindex e0505613d..fb04dd935 100644--- a/plugins/_context_doctor/extensions/python/message_loop_result/_10_context_doctor.py+++ b/plugins/_context_doctor/extensions/python/message_loop_result/_10_context_doctor.py@@ -7,7 +7,10 @@ from typing import Any, overridefrom helpers.extension import Extensionfrom helpers.plugins import get_plugin_config-from plugins._context_doctor.helpers.context_doctor import transform_response, update_log_item+from plugins._context_doctor.helpers.context_doctor import (+ transform_response,+ update_log_item,+)class ContextDoctor(Extension):@@ -16,21 +19,27 @@ class ContextDoctor(Extension):if not self.agent or not isinstance(result_data, dict):return+ # Extract LLM responsellm_result = result_data.get("llm_result")response = getattr(llm_result, "response", None)if not isinstance(response, str) or not response:return+ # Repair response before default processingconfig = get_plugin_config("_context_doctor", agent=self.agent) or {}transformed = transform_response(response, suppress_xml=config.get("suppress_xml", True))llm_result.response = transformed- params = getattr(getattr(self.agent, "loop_data", None), "params_temporary", None)+ # Suppressed XML does not update the generating log+ params = getattr(+ getattr(self.agent, "loop_data", None), "params_temporary", None+ )if not isinstance(params, dict) or transformed == "{}":return+ # Refresh log itemlog_item = params.get("log_item_generating")if log_item is not None:update_log_item(@@ -41,15 +50,19 @@ class ContextDoctor(Extension):raw_response=response,)+ # Extract final text from a response tool calltry:parsed = json.loads(transformed)tool_args = parsed.get("tool_args", {}) if isinstance(parsed, dict) else {}- response_text = tool_args.get("text") if parsed.get("tool_name") == "response" else None+ response_text = (+ tool_args.get("text") if parsed.get("tool_name") == "response" else None+ )except (AttributeError, TypeError, ValueError):response_text = Noneif not isinstance(response_text, str) or not response_text.strip():return+ # Create a response log item when streaming did not create oneresponse_item = params.get("log_item_response")if response_item is None and log_item is not None:response_item = self.agent.context.log.log(diff --git a/plugins/_context_doctor/helpers/context_doctor.py b/plugins/_context_doctor/helpers/context_doctor.pyindex 57bcea233..30c85bff4 100644--- a/plugins/_context_doctor/helpers/context_doctor.py+++ b/plugins/_context_doctor/helpers/context_doctor.py@@ -1,12 +1,34 @@-"""Repair completed model output into compact JSON."""+"""Repair completed model output and refresh its log entry."""from __future__ import annotationsimport json+from collections.abc import Iterablefrom typing import Any+from json_repair import repair_json++from plugins._context_doctor.helpers.json_repair_patch import apply_patch+++# One-time, idempotent parser patch on plugin import.+apply_patch()+++_A0_SALVAGE_SCHEMA = {+ "type": "object",+ "properties": {+ "thoughts": {"type": "array", "items": {"type": "string"}},+ "headline": {"type": "string"},+ "tool_name": {"type": "string"},+ "tool_args": {"type": "object"},+ },+ "required": [],+}+def _is_tool_call(value: Any) -> bool:+ """Check required tool-call fields and optional display fields."""return (isinstance(value, dict)and isinstance(value.get("tool_name"), str)@@ -22,80 +44,70 @@ def _is_tool_call(value: Any) -> bool:)-_A0_SALVAGE_SCHEMA = {- "type": "object",- "properties": {- "thoughts": {"type": "array", "items": {"type": "string"}},- "headline": {"type": "string"},- "tool_name": {"type": "string"},- "tool_args": {"type": "object"},- },- "required": [],-}+def _is_partial_response(value: Any) -> bool:+ """Check whether repair found thoughts or a headline without a tool call."""+ return isinstance(value, dict) and any(+ key in value for key in ("thoughts", "headline")+ )++def _objects(value: Any) -> Iterable[dict[str, Any]]:+ """Yield dictionary candidates from one repair result."""+ if isinstance(value, dict):+ yield value+ elif isinstance(value, list):+ yield from (item for item in value if isinstance(item, dict))-def _a0_completeness_score(value: dict[str, Any]) -> int:- return sum(field in value for field in ("thoughts", "headline", "tool_name", "tool_args")) + bool(- value.get("tool_args")++def _score_tool_call(value: dict[str, Any]) -> int:+ """Rank candidates by populated A0 tool-call fields."""+ return sum(+ key in value for key in ("thoughts", "headline", "tool_name", "tool_args")+ ) + bool(value.get("tool_args"))+++def _repair(response: str) -> tuple[dict[str, Any] | None, dict[str, Any] | None]:+ """Repair response and select its best tool or partial result."""+ try:+ salvage = repair_json(+ response,+ return_objects=True,+ schema=_A0_SALVAGE_SCHEMA,+ schema_repair_mode="salvage",+ )+ except Exception:+ salvage = None+ try:+ unstructured = repair_json(response, return_objects=True)+ except Exception:+ unstructured = None++ candidates = [*_objects(salvage), *_objects(unstructured)]+ tool_calls = [candidate for candidate in candidates if _is_tool_call(candidate)]+ if tool_calls:+ return max(tool_calls, key=_score_tool_call), None+ return None, next(+ (candidate for candidate in candidates if _is_partial_response(candidate)), None)-def transform_response(response: str, *, suppress_xml: bool) -> str:- """Return compact repaired tool JSON or a compact raw-text fallback."""- if response:- try:- from plugins._context_doctor.helpers.json_repair_patch import apply_patch- from json_repair import repair_json-- apply_patch()- try:- salvage_repaired = repair_json(- response,- return_objects=True,- schema=_A0_SALVAGE_SCHEMA,- schema_repair_mode="salvage",- )- except Exception:- salvage_repaired = repair_json(response, return_objects=True)-- candidates = (- salvage_repaired- if isinstance(salvage_repaired, list)- else [salvage_repaired]- )- try:- no_schema = repair_json(response, return_objects=True)- except Exception:- no_schema = None- if isinstance(no_schema, list):- valid = [item for item in no_schema if _is_tool_call(item)]- if len(valid) > 1 or (- len(valid) == 1 and not _is_tool_call(salvage_repaired)- ):- candidates = no_schema- repaired = max(- (item for item in candidates if _is_tool_call(item)),- key=_a0_completeness_score,- default=None,- )- except Exception:- repaired = None- salvage_repaired = None+def _compact_json(value: dict[str, Any]) -> str:+ """Serialize JSON without ASCII escaping or whitespace."""+ return json.dumps(value, ensure_ascii=False, separators=(",", ":"))- if _is_tool_call(repaired):- return json.dumps(repaired, ensure_ascii=False, separators=(",", ":"))- for candidate in (repaired, salvage_repaired):- if isinstance(candidate, dict) and (- "thoughts" in candidate or "headline" in candidate- ):- return json.dumps(- candidate, ensure_ascii=False, separators=(",", ":")- )+def transform_response(response: str, *, suppress_xml: bool) -> str:+ """Repair model output, falling back to compact thoughts JSON for raw text."""+ if response:+ tool_call, partial_response = _repair(response)+ if tool_call is not None:+ return _compact_json(tool_call)+ if partial_response is not None:+ return _compact_json(partial_response)if suppress_xml and "<" in response and ">" in response:return "{}"- return json.dumps({"thoughts": [response]}, ensure_ascii=False, separators=(",", ":"))+ return _compact_json({"thoughts": [response]})def update_log_item(@@ -106,19 +118,31 @@ def update_log_item(update_log: bool,raw_response: str,) -> None:- """Refresh log fields from transformed JSON; optionally replace raw details."""+ """Update generated log fields while retaining streamed reasoning."""try:parsed = json.loads(response)if not isinstance(parsed, dict):return++ current_kvps = getattr(log_item, "kvps", None)+ kvps = (+ {"reasoning": current_kvps["reasoning"]}+ if isinstance(current_kvps, dict) and "reasoning" in current_kvps+ else {}+ )+ kvps.update(parsed)+heading = parsed.get("headline")if not isinstance(heading, str) or not heading:tool_name = parsed.get("tool_name")heading = f"Using {tool_name}" if isinstance(tool_name, str) else ""- kwargs: dict[str, Any] = {"kvps": parsed}++ kwargs: dict[str, Any] = {+ "content": response if update_log else raw_response,+ "kvps": kvps,+ }if heading:kwargs["heading"] = f"{getattr(agent, 'agent_name', 'A0')}: {heading}"- kwargs["content"] = response if update_log else raw_responselog_item.update(**kwargs)except (AttributeError, TypeError, ValueError):passdiff --git a/plugins/_context_doctor/tests/test_context_doctor.py b/plugins/_context_doctor/tests/test_context_doctor.pyindex 40bd7a4ee..9d680a6a6 100644--- a/plugins/_context_doctor/tests/test_context_doctor.py+++ b/plugins/_context_doctor/tests/test_context_doctor.py@@ -3,7 +3,10 @@ from types import SimpleNamespacefrom plugins._context_doctor.extensions.python.message_loop_result._10_context_doctor import (ContextDoctor,)-from plugins._context_doctor.helpers.context_doctor import transform_response, update_log_item+from plugins._context_doctor.helpers.context_doctor import (+ transform_response,+ update_log_item,+)def test_repairs_and_minifies_tool_call():@@ -57,7 +60,10 @@ def test_suppresses_xml_when_enabled():def test_updates_log_kvps_and_heading_while_preserving_raw_content():- log_item = SimpleNamespace(update=lambda **kwargs: setattr(log_item, "data", kwargs))+ log_item = SimpleNamespace(+ kvps={"reasoning": "because"},+ update=lambda **kwargs: setattr(log_item, "data", kwargs),+ )raw = '{"tool_name":"response","tool_args":{"text":"ok",},}'repaired = '{"headline":"Done","tool_name":"response","tool_args":{"text":"ok"}}'@@ -70,6 +76,7 @@ def test_updates_log_kvps_and_heading_while_preserving_raw_content():)assert log_item.data["content"] == raw+ assert log_item.data["kvps"]["reasoning"] == "because"assert log_item.data["kvps"]["tool_name"] == "response"assert log_item.data["heading"] == "A0: Done"@@ -85,7 +92,9 @@ def test_extension_replaces_result_refreshes_log_and_response_item(monkeypatch):log_item = SimpleNamespace(id="generating", update=lambda **kwargs: setattr(log_item, "data", kwargs))- response_item = SimpleNamespace(update=lambda **kwargs: setattr(response_item, "data", kwargs))+ response_item = SimpleNamespace(+ update=lambda **kwargs: setattr(response_item, "data", kwargs)+ )context = SimpleNamespace(log=SimpleNamespace(log=lambda **kwargs: response_item))agent = SimpleNamespace(agent_name="A0",diff --git a/requirements.txt b/requirements.txtindex 7c3e78fdc..f98491147 100644--- a/requirements.txt+++ b/requirements.txt@@ -12,7 +12,7 @@ flaredantic==0.1.5GitPython==3.1.43giturlparse==0.14.0inputimeout==1.0.4-json_repair==0.63.3+json_repair==0.63.4kokoro>=0.9.2simpleeval==1.0.3langchain-core==0.3.49