Agent Zero AI framework
Own fallback turn retry in Context Doctor
linkliti19da9a07e3f8
diff --git a/extensions/python/_functions/agent/Agent/hist_add_warning/end/_90_stop_unusable_response_loop.py b/extensions/python/_functions/agent/Agent/hist_add_warning/end/_90_stop_unusable_response_loop.pyindex e28abfcf9..868e2df28 100644--- a/extensions/python/_functions/agent/Agent/hist_add_warning/end/_90_stop_unusable_response_loop.py+++ b/extensions/python/_functions/agent/Agent/hist_add_warning/end/_90_stop_unusable_response_loop.py@@ -24,7 +24,6 @@ class StopUnusableResponseLoop(Extension):self.agent.read_prompt("fw.msg_repeat.md"),self.agent.read_prompt("fw.msg_empty_response.md"),self.agent.read_prompt("fw.msg_reasoning_only.md"),- self.agent.read_prompt("fw.msg_thoughts_fallback.md"),}:returndiff --git a/plugins/_context_doctor/AGENTS.md b/plugins/_context_doctor/AGENTS.mdindex e0cf7b724..8a3bd7113 100644--- a/plugins/_context_doctor/AGENTS.md+++ b/plugins/_context_doctor/AGENTS.md@@ -10,7 +10,7 @@- `hooks.py` installs the exact root-pinned repair dependency in the framework runtime.- `extensions/python/startup_migration/` prepares that dependency after startup and self-update.- `extensions/python/message_loop_result/` normalizes completed model output before default processing.-- `prompts/` owns fallback warning texts.+- `prompts/` owns fallback warning texts (`fw.msg_thoughts_fallback.md`, `fw.msg_thoughts_fallback_response.md`).- `webui/config.html` exposes debug and repair-strategy settings.## Local Contracts@@ -18,8 +18,8 @@- Repaired and fallback JSON is always minified.- Nonempty non-tool output becomes `{"thoughts":[raw]}`; XML-like output becomes `{}` only when suppression is enabled.- Blank-line-separated thoughts expand into separate entries after repair when the split strategy is enabled (default on).-- A raw-text fallback conversion owns the turn: `fw.msg_thoughts_fallback.md` history warning, separate `fw.msg_thoughts_fallback_response.md` user notice, one unusable-response failure counted by the stop-unusable-response-loop extension, and `skip_default_processing` set.-- Log kvps retain streamed `reasoning` and add transformed output; `update_log` controls only View Details content.+- A raw-text fallback conversion emits a `fw.msg_thoughts_fallback.md` history warning and a separate `fw.msg_thoughts_fallback_response.md` user notice, refreshes the generating log and response item with the transformed thoughts JSON, then sets `skip_default_processing` so the retry advances the unusable-response counter. The warning prompts are plugin-owned and are not counted by the core stop-unusable-response loop.+- Log kvps retain streamed `reasoning` and `thoughts`, then 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.@@ -34,4 +34,4 @@## Child DOX Index-No child DOX files.\ No newline at end of file+No child DOX files.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 3d38dd719..62d69a524 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@@ -36,8 +36,16 @@ class ContextDoctor(Extension):)llm_result.response = transformed- # Claim raw-text fallback turns with clear warnings before log refresh+ # Check if response is a plain textif is_thoughts_fallback(response, transformed):+ # Manually add ai response and warnings+ log_item = self.agent.loop_data.params_temporary.get("log_item_generating")+ self.agent.hist_add_ai_response(+ transformed,+ id=log_item.id if log_item else "",+ llm_result=llm_result,+ )+warning = self.agent.read_prompt("fw.msg_thoughts_fallback.md")warning_message = self.agent.hist_add_warning(message=warning)PrintStyle(font_color="orange", padding=True).print(warning)diff --git a/plugins/_context_doctor/helpers/context_doctor.py b/plugins/_context_doctor/helpers/context_doctor.pyindex bff9557e2..c95671dfe 100644--- a/plugins/_context_doctor/helpers/context_doctor.py+++ b/plugins/_context_doctor/helpers/context_doctor.py@@ -136,21 +136,16 @@ def transform_response(def is_thoughts_fallback(response: str, transformed: str) -> bool:- """Check whether transform wrapped raw output as its only thoughts entry."""+ """Check whether transform produced no usable tool call."""if not response:return Falsetry:parsed = json.loads(transformed)except ValueError:return False- if (- not isinstance(parsed, dict)- or set(parsed.keys()) != {"thoughts"}- or not isinstance(parsed.get("thoughts"), list)- or len(parsed["thoughts"]) != 1- ):+ if not isinstance(parsed, dict) or not parsed:return False- return parsed["thoughts"][0] == response+ return "tool_name" not in parseddef update_log_item(@@ -168,11 +163,10 @@ def update_log_item(returncurrent_kvps = getattr(log_item, "kvps", None)- kvps = (- {"reasoning": current_kvps["reasoning"]}- if isinstance(current_kvps, dict) and "reasoning" in current_kvps- else {}- )+ kvps = {}+ if isinstance(current_kvps, dict):+ if "reasoning" in current_kvps:+ kvps["reasoning"] = current_kvps["reasoning"]kvps.update(parsed)heading = parsed.get("headline")diff --git a/plugins/_context_doctor/tests/test_context_doctor.py b/plugins/_context_doctor/tests/test_context_doctor.pyindex ce78ac2be..bf3d551bc 100644--- a/plugins/_context_doctor/tests/test_context_doctor.py+++ b/plugins/_context_doctor/tests/test_context_doctor.py@@ -104,13 +104,24 @@ def test_updates_log_kvps_and_heading_while_preserving_raw_content():def test_converted_to_thoughts_detects_plain_text_wrap():assert is_thoughts_fallback("plain text", '{"thoughts":["plain text"]}')- assert not is_thoughts_fallback("plain text", "{}")-def test_converted_to_thoughts_ignores_native_thoughts_json():+def test_converted_to_thoughts_detects_split_multi_paragraph_wrap():+ response = "first\n\nsecond"+ transformed = '{"thoughts":["first","second"]}'+ assert is_thoughts_fallback(response, transformed)+++def test_transform_and_fallback_agree_on_multi_paragraph_raw_text():+ response = "first\n\nsecond"+ transformed = transform_response(response, suppress_xml=False)+ assert is_thoughts_fallback(response, transformed)+++def test_converted_to_thoughts_detects_native_thoughts_json():response = '{"thoughts":["only thoughts"]}'- assert not is_thoughts_fallback(response, response)+ assert is_thoughts_fallback(response, response)def test_converted_to_thoughts_ignores_tool_calls():@@ -186,3 +197,36 @@ def test_extension_does_not_use_legacy_response_message_key(monkeypatch):ContextDoctor(agent).execute({"llm_result": llm_result})assert "log_item_response" not in agent.loop_data.params_temporary+++def test_extension_handles_fallback_with_warning_and_skip(monkeypatch):+ monkeypatch.setattr(+ "plugins._context_doctor.extensions.python.message_loop_result._10_context_doctor.get_plugin_config",+ lambda *args, **kwargs: {"suppress_xml": True, "update_log": False},+ )+ log_item = SimpleNamespace(id="generating", update=lambda **kwargs: None)+ logs = []+ warnings = []+ ai_responses = []+ agent = SimpleNamespace(+ agent_name="A0",+ context=SimpleNamespace(log=SimpleNamespace(log=lambda **kwargs: logs.append(kwargs))),+ loop_data=SimpleNamespace(params_temporary={"log_item_generating": log_item}),+ read_prompt=lambda name, **kwargs: {+ "fw.msg_thoughts_fallback.md": "fallback warning",+ "fw.msg_thoughts_fallback_response.md": "fallback notice",+ }[name],+ hist_add_ai_response=lambda message, **kwargs: ai_responses.append(message) or SimpleNamespace(id="ai"),+ hist_add_warning=lambda message: warnings.append(message) or SimpleNamespace(id="warning"),+ )+ llm_result = SimpleNamespace(response="plain text")+ result_data = {"llm_result": llm_result}++ ContextDoctor(agent).execute(result_data)++ assert result_data["skip_default_processing"] is True+ assert llm_result.response == '{"thoughts":["plain text"]}'+ assert ai_responses == ['{"thoughts":["plain text"]}']+ assert warnings == ["fallback warning"]+ assert logs[0]["content"] == "A0: fallback notice"+ assert logs[0]["id"] == "warning"diff --git a/tests/test_unusable_response_loop.py b/tests/test_unusable_response_loop.pyindex 51c46d26f..83bc19322 100644--- a/tests/test_unusable_response_loop.py+++ b/tests/test_unusable_response_loop.py@@ -101,21 +101,6 @@ def test_reasoning_only_warning_counts_toward_the_limit(monkeypatch):assert agent.loop_data.params_persistent[response_loop.STATE_KEY]["count"] == 1-def test_thoughts_fallback_warning_counts_toward_the_limit(monkeypatch):- monkeypatch.setattr(- response_loop,- "get_settings",- lambda: {"max_consecutive_unusable_responses": 1},- )- agent = _agent()- extension = response_loop.StopUnusableResponseLoop(agent=agent)-- data = _run(extension, agent, "thoughts fallback")-- assert isinstance(data["exception"], HandledException)- assert agent.loop_data.params_persistent[response_loop.STATE_KEY]["count"] == 1--def test_general_settings_expose_the_default_failure_limit():settings = get_default_settings()assert settings["max_consecutive_unusable_responses"] == 5