feat: Upgrade to v20 (The Architect Patch) with C++ AST optimization and deep agent loop fallbacks

README.md

@@ -14,9 +14,16 @@ tags:
   - thinking
 ---
 
-# Fixed jinja chat templates for Qwen 3.5 & 3.6 (v19)
+# Fixed jinja chat templates for Qwen 3.5 & 3.6 (v20)
 
 <details open>
+<summary><b>Update History & Changelog (v20)</b></summary>
+
+> **2026-06-05 Update (v20): The Architect Patch.** A monumental structural overhaul targeting deep agentic loops and C++ inference engine compatibility. (1) **Minja AST Flattening:** Dramatically optimized Jinja nesting depths to resolve severe parsing bottlenecks that were dropping inference throughput by 80% on `llama.cpp`. (2) **Auto-disable Thinking:** Introduced `auto_disable_thinking_with_tools` kwarg (default `false`) that allows users to instantly shut off reasoning blocks during tool use to completely prevent `<tool_call>` hallucinations inside `<think>` tags. (3) **Deep Agent Fallbacks:** Resolved exceptions triggered by mid-conversation system prompts or loops lacking human `user` messages. (4) **Payload Truncation:** Implemented `max_tool_arg_chars` and `max_tool_response_chars` configurations to definitively stop context-window explosions from massive data returns. *(Huge thanks to `barubary` / `spiritbuun` for their contributions to these C++ architecture optimizations!)*
+
+</details>
+
+<details>
 <summary><b>Update History & Changelog (v19)</b></summary>
 
 > **2026-05-18 Update (v19): The Agentic Loop Cure.** (1) **Abolished "Empty Think" Poisoning:** Rewrote the AST history rendering to completely remove the injection of empty `<think>\n</think>` blocks. This cures a severe in-context learning bias where the model assumed tools could only be called if it didn't think first, which was causing 80%+ of premature `<|im_end|>` turn aborts. (2) **System Prompt Logic Trap Removed:** Softened the absolute tool mandate in the `<IMPORTANT>` block and restored Universal Synthesis instructions. The model is now explicitly permitted to transition from `</think>` to a conversational answer without panicking. (3) **True 100% KV Cache & Amnesia Fix:** `preserve_thinking` now defaults to `true`. Past thoughts are retained chronologically, permanently curing "amnesia stalls" during multi-step tool loops while mathematically guaranteeing 100% KV Cache prefix matching out-of-the-box.
@@ -211,10 +218,10 @@ Python-only Jinja2 features crash on `minijinja` (the C++ runtime used by llama.
 ## Running the test suite
 
 ```bash
-python3 scripts/test_v18.py
+python3 scripts/test_v20.py
 ```
 
-Tests cover: XML tool format, tool instructions, thinking bypass, `<|think_off|>` / `<|think_on|>`, Tier 1 & 2 escalation, length-gated detection, shell/search false positives, `--reasoning off` + errors, counter reset, historical think stripping, `preserve_thinking`, developer role, mid-conversation system, tool response wrapping, and string argument passthrough.
+Tests cover: `auto_disable_thinking_with_tools`, payload truncation logic, parallel tool spacing, mid-conversation system rendering, deep agent loop fallback, XML tool format, `<|think_off|>` / `<|think_on|>` inline overrides, and all legacy v19 regression tests.
 
 ---
 
@@ -224,6 +231,7 @@ Tests cover: XML tool format, tool instructions, thinking bypass, `<|think_off|>
 |------|--------|
 | Original models | Alibaba Cloud (Qwen team) |
 | Template fixes | [froggeric](https://huggingface.co/froggeric) |
+| C++ AST optimizations | [barubary](https://github.com/spiritbuun/buun-llama-cpp) / `spiritbuun` |
 
 ## License
 

archive/v19_chat_template.jinja

@@ -0,0 +1,265 @@
+{%- set image_count = namespace(value=0) %}
+{%- set video_count = namespace(value=0) %}
+{%- macro render_content(content, do_vision_count, is_system_content=false) %}
+    {%- if content is string %}
+        {{- content }}
+    {%- elif content is iterable and content is not mapping %}
+        {%- for item in content %}
+            {%- if 'image' in item or 'image_url' in item or item.type == 'image' %}
+                {%- if is_system_content %}
+                    {{- raise_exception('System message cannot contain images.') }}
+                {%- endif %}
+                {%- if do_vision_count %}
+                    {%- set image_count.value = image_count.value + 1 %}
+                {%- endif %}
+                {%- if add_vision_id is defined and add_vision_id %}
+                    {{- 'Picture ' ~ image_count.value ~ ': ' }}
+                {%- endif %}
+                {{- '<|vision_start|><|image_pad|><|vision_end|>' }}
+            {%- elif 'video' in item or item.type == 'video' %}
+                {%- if is_system_content %}
+                    {{- raise_exception('System message cannot contain videos.') }}
+                {%- endif %}
+                {%- if do_vision_count %}
+                    {%- set video_count.value = video_count.value + 1 %}
+                {%- endif %}
+                {%- if add_vision_id is defined and add_vision_id %}
+                    {{- 'Video ' ~ video_count.value ~ ': ' }}
+                {%- endif %}
+                {{- '<|vision_start|><|video_pad|><|vision_end|>' }}
+            {%- elif 'text' in item %}
+                {{- item.text }}
+            {%- else %}
+                {{- raise_exception('Unexpected item type in content.') }}
+            {%- endif %}
+        {%- endfor %}
+    {%- elif content is none or content is undefined %}
+        {{- '' }}
+    {%- else %}
+        {{- raise_exception('Unexpected content type.') }}
+    {%- endif %}
+{%- endmacro %}
+{%- set ns_flags = namespace(enable_thinking=true, has_tools=false, last_tool_failed=false, consecutive_failures=0) %}
+{%- if enable_thinking is defined %}
+    {%- set ns_flags.enable_thinking = enable_thinking %}
+{%- endif %}
+{%- if not messages %}
+    {{- raise_exception('No messages provided.') }}
+{%- endif %}
+{%- set system_content = '' %}
+{%- set has_system = false %}
+{%- if messages[0].role == 'system' or messages[0].role == 'developer' %}
+    {%- set has_system = true %}
+    {%- set system_content = render_content(messages[0].content, false, true)|trim %}
+    {%- if '<|think_off|>' in system_content %}
+        {%- set ns_flags.enable_thinking = false %}
+        {%- set system_content = system_content | replace('<|think_off|>', '') %}
+    {%- endif %}
+    {%- if '<|think_on|>' in system_content %}
+        {%- set ns_flags.enable_thinking = true %}
+        {%- set system_content = system_content | replace('<|think_on|>', '') %}
+    {%- endif %}
+    {%- set system_content = system_content | trim %}
+{%- endif %}
+{%- if tools and tools is iterable and tools is not mapping %}
+    {%- set ns_flags.has_tools = true %}
+    {{- '<|im_start|>system\n' }}
+    {{- "# Tools\n\nYou have access to the following functions:\n\n<tools>" }}
+    {%- for tool in tools %}
+        {{- '\n' }}
+        {%- set fn = tool.function if tool.function is defined else tool %}
+        {{- fn | tojson }}
+    {%- endfor %}
+    {{- "\n</tools>" }}
+    {%- set tool_instructions %}
+If you choose to call a function ONLY reply in the following format with NO suffix:
+
+<think>
+Brief explanation of tool call
+</think>
+<tool_call>
+<function=example_function_name>
+<parameter=example_parameter_1>
+value_1
+</parameter>
+<parameter=example_parameter_2>
+This is the value for the second parameter
+that can span
+multiple lines
+</parameter>
+</function>
+</tool_call>
+
+<IMPORTANT>
+Reminder:
+- You can use the <think></think> block to plan your next tool call OR to synthesize data and formulate your final response to the user.
+- ALL explanation and reasoning MUST be placed strictly inside the <think></think> block.
+- Function calls MUST follow the specified format: an inner <function=...></function> block must be nested within <tool_call></tool_call> XML tags.
+- If you choose to call a tool, you MUST output the <tool_call> block IMMEDIATELY after closing </think>. Do NOT output any conversational text before the tool call.
+- The <tool_call> and <function> tags MUST be at the very beginning of a new line, with NO spaces or indentation before them.
+- To call multiple functions, output a separate, completely closed <tool_call></tool_call> block for EACH function. Do NOT nest <tool_call> blocks.
+- If you have gathered all necessary data and do not need to call a tool, answer the question like normal and provide your final response to the user IMMEDIATELY after closing </think>.
+</IMPORTANT>
+    {%- endset %}
+    {{- '\n\n' ~ tool_instructions | trim }}
+    {%- if has_system and system_content %}
+        {{- '\n\n' + system_content }}
+    {%- endif %}
+    {{- '<|im_end|>\n' }}
+{%- elif has_system and system_content %}
+    {{- '<|im_start|>system\n' + system_content + '<|im_end|>\n' }}
+{%- endif %}
+{%- for message in messages %}
+    {%- set is_system = (message.role == "system" or message.role == "developer") %}
+    {%- set content = render_content(message.content, true, is_system)|trim %}
+    {%- if '<|think_off|>' in content %}
+        {%- set ns_flags.enable_thinking = false %}
+        {%- set content = content | replace('<|think_off|>', '') | trim %}
+    {%- elif '<|think_on|>' in content %}
+        {%- set ns_flags.enable_thinking = true %}
+        {%- set content = content | replace('<|think_on|>', '') | trim %}
+    {%- endif %}
+    {%- if is_system %}
+        {%- if not loop.first and content %}
+            {{- '<|im_start|>system\n' + content + '<|im_end|>\n' }}
+        {%- endif %}
+    {%- elif message.role == "user" %}
+        {{- '<|im_start|>' + message.role + '\n' + content + '<|im_end|>\n' }}
+        {%- set ns_flags.last_tool_failed = false %}
+        {%- set ns_flags.consecutive_failures = 0 %}
+    {%- elif message.role == "assistant" %}
+        {%- set ns_flags.last_tool_failed = false %}
+        {%- set reasoning_content = '' %}
+        {%- if message.reasoning_content is string %}
+            {%- set reasoning_content = message.reasoning_content %}
+        {%- else %}
+            {%- set think_end_token = '' %}
+            {%- if '</think>' in content %}
+                {%- set think_end_token = '</think>' %}
+            {%- elif '</thinking>' in content %}
+                {%- set think_end_token = '</thinking>' %}
+            {%- elif '</ think>' in content %}
+                {%- set think_end_token = '</ think>' %}
+            {%- elif '</think >' in content %}
+                {%- set think_end_token = '</think >' %}
+            {%- endif %}
+            {%- if think_end_token %}
+                {%- set reasoning_parts = content.split(think_end_token) %}
+                {%- set reasoning_content = reasoning_parts[0] %}
+                {%- set content = reasoning_parts[1:] | join(think_end_token) %}
+                {%- if '<think>' in reasoning_content %}
+                    {%- set r_prefix = reasoning_content.split('<think>')[0] | trim %}
+                    {%- set reasoning_content = reasoning_content.split('<think>')[1:] | join('<think>') | trim %}
+                    {%- set content = (r_prefix ~ '\n' ~ content) | trim %}
+                {%- endif %}
+            {%- elif '<think>' in content %}
+                {%- set prefix = content.split('<think>')[0] %}
+                {%- set think_part = content.split('<think>')[1:] | join('<think>') %}
+                {%- if '<tool_call>' in think_part %}
+                    {%- set reasoning_content = think_part.split('<tool_call>')[0] %}
+                    {%- set content = prefix ~ '\n<tool_call>' ~ think_part.split('<tool_call>')[1:] | join('<tool_call>') %}
+                {%- else %}
+                    {%- set reasoning_content = think_part %}
+                    {%- set content = prefix %}
+                {%- endif %}
+            {%- endif %}
+        {%- endif %}
+        {%- set reasoning_content = reasoning_content | trim %}
+        {%- set content = content | trim %}
+        {%- if message.tool_calls and message.tool_calls is iterable and message.tool_calls is not mapping %}
+            {%- if '<tool_call>' in content %}
+                {%- set content = content.split('<tool_call>')[0] | trim %}
+            {%- endif %}
+        {%- endif %}
+        {%- set show_think = true %}
+        {%- if preserve_thinking is defined and preserve_thinking == false %}
+            {%- set show_think = false %}
+        {%- endif %}
+        {%- if not reasoning_content %}
+            {%- set show_think = false %}
+        {%- endif %}
+        
+        {%- if show_think and ns_flags.enable_thinking is not false %}
+            {%- if content %}
+                {{- '<|im_start|>' + message.role + '\n<think>\n' + reasoning_content + '\n</think>\n' + content }}
+            {%- else %}
+                {{- '<|im_start|>' + message.role + '\n<think>\n' + reasoning_content + '\n</think>' }}
+            {%- endif %}
+        {%- else %}
+            {%- if content %}
+                {{- '<|im_start|>' + message.role + '\n' + content }}
+            {%- else %}
+                {{- '<|im_start|>' + message.role }}
+            {%- endif %}
+        {%- endif %}
+        {%- if message.tool_calls and message.tool_calls is iterable and message.tool_calls is not mapping %}
+            {%- for tool_call in message.tool_calls %}
+                {%- if tool_call.function is defined %}
+                    {%- set tool_call = tool_call.function %}
+                {%- endif %}
+                {{- '\n<tool_call>\n' }}
+                {{- '<function=' ~ tool_call.name ~ '>\n' }}
+                {%- if tool_call.arguments is defined and tool_call.arguments is mapping %}
+                    {%- if tool_call.arguments | length > 0 %}
+                        {%- for args_name in tool_call.arguments %}
+                            {%- set args_value = tool_call.arguments[args_name] %}
+                            {{- '<parameter=' ~ args_name ~ '>\n' }}
+                            {%- set args_value = args_value | tojson if args_value is mapping or (args_value is iterable and args_value is not string) else args_value | string %}
+                            {{- args_value }}
+                            {{- '\n</parameter>\n' }}
+                        {%- endfor %}
+                    {%- endif %}
+                {%- elif tool_call.arguments is defined and tool_call.arguments is string %}
+                    {%- if tool_call.arguments | trim | length > 0 %}
+                        {{- tool_call.arguments }}
+                        {{- '\n' }}
+                    {%- endif %}
+                {%- endif %}
+                {{- '</function>\n</tool_call>' }}
+            {%- endfor %}
+        {%- endif %}
+        {{- '<|im_end|>\n' }}
+    {%- elif message.role == "tool" %}
+        {%- set content_lower = content | lower %}
+        {%- if content | length < 500
+            and '$ ' not in content
+            and 'took ' not in content_lower
+            and ('"error":' in content_lower or 'error:' in content_lower or 'exception:' in content_lower or 'traceback' in content_lower or 'command not found' in content_lower or 'invalid syntax' in content_lower or 'failed to' in content_lower) %}
+            {%- set ns_flags.last_tool_failed = true %}
+            {%- set ns_flags.consecutive_failures = ns_flags.consecutive_failures + 1 %}
+        {%- else %}
+            {%- set ns_flags.last_tool_failed = false %}
+            {%- set ns_flags.consecutive_failures = 0 %}
+        {%- endif %}
+        {%- if loop.index0 > 0 and messages[loop.index0 - 1].role != "tool" %}
+            {{- '<|im_start|>user' }}
+        {%- endif %}
+        {{- '\n<tool_response>\n' }}
+        {{- content }}
+        {%- if ns_flags.last_tool_failed %}
+            {%- if ns_flags.consecutive_failures >= 2 %}
+                {{- '\n\n⚠️ SYSTEM WARNING: ' ~ ns_flags.consecutive_failures ~ ' consecutive tool errors detected. Your previous approach is incorrect. You MUST use a fundamentally different approach or corrected arguments.' }}
+            {%- else %}
+                {{- '\n\n⚠️ SYSTEM WARNING: The previous tool call returned an error. Diagnose the failure and retry with completely corrected arguments.' }}
+            {%- endif %}
+        {%- endif %}
+        {{- '\n</tool_response>' }}
+        {%- if not loop.last and messages[loop.index0 + 1].role != "tool" %}
+            {{- '<|im_end|>\n' }}
+        {%- elif loop.last %}
+            {{- '<|im_end|>\n' }}
+        {%- endif %}
+    {%- else %}
+        {{- raise_exception('Unexpected message role.') }}
+    {%- endif %}
+{%- endfor %}
+{%- if add_generation_prompt %}
+    {{- '<|im_start|>assistant\n' }}
+    {%- if ns_flags.enable_thinking is false %}
+        {{- '<think>\n</think>\n' }}
+    {%- elif ns_flags.last_tool_failed and ns_flags.consecutive_failures >= 2 %}
+        {{- '<think>\n</think>\n' }}
+    {%- else %}
+        {{- '<think>\n' }}
+    {%- endif %}
+{%- endif %}

archive/v19_chat_template_oneline.txt

@@ -0,0 +1 @@
+{%- set image_count = namespace(value=0) %}{%- set video_count = namespace(value=0) %}{%- macro render_content(content, do_vision_count, is_system_content=false) %}{%- if content is string %}{{- content }}{%- elif content is iterable and content is not mapping %}{%- for item in content %}{%- if 'image' in item or 'image_url' in item or item.type == 'image' %}{%- if is_system_content %}{{- raise_exception('System message cannot contain images.') }}{%- endif %}{%- if do_vision_count %}{%- set image_count.value = image_count.value + 1 %}{%- endif %}{%- if add_vision_id is defined and add_vision_id %}{{- 'Picture ' ~ image_count.value ~ ': ' }}{%- endif %}{{- '<|vision_start|><|image_pad|><|vision_end|>' }}{%- elif 'video' in item or item.type == 'video' %}{%- if is_system_content %}{{- raise_exception('System message cannot contain videos.') }}{%- endif %}{%- if do_vision_count %}{%- set video_count.value = video_count.value + 1 %}{%- endif %}{%- if add_vision_id is defined and add_vision_id %}{{- 'Video ' ~ video_count.value ~ ': ' }}{%- endif %}{{- '<|vision_start|><|video_pad|><|vision_end|>' }}{%- elif 'text' in item %}{{- item.text }}{%- else %}{{- raise_exception('Unexpected item type in content.') }}{%- endif %}{%- endfor %}{%- elif content is none or content is undefined %}{{- '' }}{%- else %}{{- raise_exception('Unexpected content type.') }}{%- endif %}{%- endmacro %}{%- set ns_flags = namespace(enable_thinking=true, has_tools=false, last_tool_failed=false, consecutive_failures=0) %}{%- if enable_thinking is defined %}{%- set ns_flags.enable_thinking = enable_thinking %}{%- endif %}{%- if not messages %}{{- raise_exception('No messages provided.') }}{%- endif %}{%- set system_content = '' %}{%- set has_system = false %}{%- if messages[0].role == 'system' or messages[0].role == 'developer' %}{%- set has_system = true %}{%- set system_content = render_content(messages[0].content, false, true)|trim %}{%- if '<|think_off|>' in system_content %}{%- set ns_flags.enable_thinking = false %}{%- set system_content = system_content | replace('<|think_off|>', '') %}{%- endif %}{%- if '<|think_on|>' in system_content %}{%- set ns_flags.enable_thinking = true %}{%- set system_content = system_content | replace('<|think_on|>', '') %}{%- endif %}{%- set system_content = system_content | trim %}{%- endif %}{%- if tools and tools is iterable and tools is not mapping %}{%- set ns_flags.has_tools = true %}{{- '<|im_start|>system\n' }}{{- "# Tools\n\nYou have access to the following functions:\n\n<tools>" }}{%- for tool in tools %}{{- '\n' }}{%- set fn = tool.function if tool.function is defined else tool %}{{- fn | tojson }}{%- endfor %}{{- "\n</tools>" }}{%- set tool_instructions %} If you choose to call a function ONLY reply in the following format with NO suffix: <think> Brief explanation of tool call </think> <tool_call> <function=example_function_name> <parameter=example_parameter_1> value_1 </parameter> <parameter=example_parameter_2> This is the value for the second parameter that can span multiple lines </parameter> </function> </tool_call> <IMPORTANT> Reminder: - You can use the <think></think> block to plan your next tool call OR to synthesize data and formulate your final response to the user. - ALL explanation and reasoning MUST be placed strictly inside the <think></think> block. - Function calls MUST follow the specified format: an inner <function=...></function> block must be nested within <tool_call></tool_call> XML tags. - If you choose to call a tool, you MUST output the <tool_call> block IMMEDIATELY after closing </think>. Do NOT output any conversational text before the tool call. - The <tool_call> and <function> tags MUST be at the very beginning of a new line, with NO spaces or indentation before them. - To call multiple functions, output a separate, completely closed <tool_call></tool_call> block for EACH function. Do NOT nest <tool_call> blocks. - If you have gathered all necessary data and do not need to call a tool, answer the question like normal and provide your final response to the user IMMEDIATELY after closing </think>. </IMPORTANT> {%- endset %}{{- '\n\n' ~ tool_instructions | trim }}{%- if has_system and system_content %}{{- '\n\n' + system_content }}{%- endif %}{{- '<|im_end|>\n' }}{%- elif has_system and system_content %}{{- '<|im_start|>system\n' + system_content + '<|im_end|>\n' }}{%- endif %}{%- for message in messages %}{%- set is_system = (message.role == "system" or message.role == "developer") %}{%- set content = render_content(message.content, true, is_system)|trim %}{%- if '<|think_off|>' in content %}{%- set ns_flags.enable_thinking = false %}{%- set content = content | replace('<|think_off|>', '') | trim %}{%- elif '<|think_on|>' in content %}{%- set ns_flags.enable_thinking = true %}{%- set content = content | replace('<|think_on|>', '') | trim %}{%- endif %}{%- if is_system %}{%- if not loop.first and content %}{{- '<|im_start|>system\n' + content + '<|im_end|>\n' }}{%- endif %}{%- elif message.role == "user" %}{{- '<|im_start|>' + message.role + '\n' + content + '<|im_end|>\n' }}{%- set ns_flags.last_tool_failed = false %}{%- set ns_flags.consecutive_failures = 0 %}{%- elif message.role == "assistant" %}{%- set ns_flags.last_tool_failed = false %}{%- set reasoning_content = '' %}{%- if message.reasoning_content is string %}{%- set reasoning_content = message.reasoning_content %}{%- else %}{%- set think_end_token = '' %}{%- if '</think>' in content %}{%- set think_end_token = '</think>' %}{%- elif '</thinking>' in content %}{%- set think_end_token = '</thinking>' %}{%- elif '</ think>' in content %}{%- set think_end_token = '</ think>' %}{%- elif '</think >' in content %}{%- set think_end_token = '</think >' %}{%- endif %}{%- if think_end_token %}{%- set reasoning_parts = content.split(think_end_token) %}{%- set reasoning_content = reasoning_parts[0] %}{%- set content = reasoning_parts[1:] | join(think_end_token) %}{%- if '<think>' in reasoning_content %}{%- set r_prefix = reasoning_content.split('<think>')[0] | trim %}{%- set reasoning_content = reasoning_content.split('<think>')[1:] | join('<think>') | trim %}{%- set content = (r_prefix ~ '\n' ~ content) | trim %}{%- endif %}{%- elif '<think>' in content %}{%- set prefix = content.split('<think>')[0] %}{%- set think_part = content.split('<think>')[1:] | join('<think>') %}{%- if '<tool_call>' in think_part %}{%- set reasoning_content = think_part.split('<tool_call>')[0] %}{%- set content = prefix ~ '\n<tool_call>' ~ think_part.split('<tool_call>')[1:] | join('<tool_call>') %}{%- else %}{%- set reasoning_content = think_part %}{%- set content = prefix %}{%- endif %}{%- endif %}{%- endif %}{%- set reasoning_content = reasoning_content | trim %}{%- set content = content | trim %}{%- if message.tool_calls and message.tool_calls is iterable and message.tool_calls is not mapping %}{%- if '<tool_call>' in content %}{%- set content = content.split('<tool_call>')[0] | trim %}{%- endif %}{%- endif %}{%- set show_think = true %}{%- if preserve_thinking is defined and preserve_thinking == false %}{%- set show_think = false %}{%- endif %}{%- if not reasoning_content %}{%- set show_think = false %}{%- endif %}{%- if show_think and ns_flags.enable_thinking is not false %}{%- if content %}{{- '<|im_start|>' + message.role + '\n<think>\n' + reasoning_content + '\n</think>\n' + content }}{%- else %}{{- '<|im_start|>' + message.role + '\n<think>\n' + reasoning_content + '\n</think>' }}{%- endif %}{%- else %}{%- if content %}{{- '<|im_start|>' + message.role + '\n' + content }}{%- else %}{{- '<|im_start|>' + message.role }}{%- endif %}{%- endif %}{%- if message.tool_calls and message.tool_calls is iterable and message.tool_calls is not mapping %}{%- for tool_call in message.tool_calls %}{%- if tool_call.function is defined %}{%- set tool_call = tool_call.function %}{%- endif %}{{- '\n<tool_call>\n' }}{{- '<function=' ~ tool_call.name ~ '>\n' }}{%- if tool_call.arguments is defined and tool_call.arguments is mapping %}{%- if tool_call.arguments | length > 0 %}{%- for args_name in tool_call.arguments %}{%- set args_value = tool_call.arguments[args_name] %}{{- '<parameter=' ~ args_name ~ '>\n' }}{%- set args_value = args_value | tojson if args_value is mapping or (args_value is iterable and args_value is not string) else args_value | string %}{{- args_value }}{{- '\n</parameter>\n' }}{%- endfor %}{%- endif %}{%- elif tool_call.arguments is defined and tool_call.arguments is string %}{%- if tool_call.arguments | trim | length > 0 %}{{- tool_call.arguments }}{{- '\n' }}{%- endif %}{%- endif %}{{- '</function>\n</tool_call>' }}{%- endfor %}{%- endif %}{{- '<|im_end|>\n' }}{%- elif message.role == "tool" %}{%- set content_lower = content | lower %}{%- if content | length < 500 and '$ ' not in content and 'took ' not in content_lower and ('"error":' in content_lower or 'error:' in content_lower or 'exception:' in content_lower or 'traceback' in content_lower or 'command not found' in content_lower or 'invalid syntax' in content_lower or 'failed to' in content_lower) %}{%- set ns_flags.last_tool_failed = true %}{%- set ns_flags.consecutive_failures = ns_flags.consecutive_failures + 1 %}{%- else %}{%- set ns_flags.last_tool_failed = false %}{%- set ns_flags.consecutive_failures = 0 %}{%- endif %}{%- if loop.index0 > 0 and messages[loop.index0 - 1].role != "tool" %}{{- '<|im_start|>user' }}{%- endif %}{{- '\n<tool_response>\n' }}{{- content }}{%- if ns_flags.last_tool_failed %}{%- if ns_flags.consecutive_failures >= 2 %}{{- '\n\n⚠️ SYSTEM WARNING: ' ~ ns_flags.consecutive_failures ~ ' consecutive tool errors detected. Your previous approach is incorrect. You MUST use a fundamentally different approach or corrected arguments.' }}{%- else %}{{- '\n\n⚠️ SYSTEM WARNING: The previous tool call returned an error. Diagnose the failure and retry with completely corrected arguments.' }}{%- endif %}{%- endif %}{{- '\n</tool_response>' }}{%- if not loop.last and messages[loop.index0 + 1].role != "tool" %}{{- '<|im_end|>\n' }}{%- elif loop.last %}{{- '<|im_end|>\n' }}{%- endif %}{%- else %}{{- raise_exception('Unexpected message role.') }}{%- endif %}{%- endfor %}{%- if add_generation_prompt %}{{- '<|im_start|>assistant\n' }}{%- if ns_flags.enable_thinking is false %}{{- '<think>\n</think>\n' }}{%- elif ns_flags.last_tool_failed and ns_flags.consecutive_failures >= 2 %}{{- '<think>\n</think>\n' }}{%- else %}{{- '<think>\n' }}{%- endif %}{%- endif %}

chat_template.jinja

@@ -1,36 +1,52 @@
+{%- set template_version = "qwen3.6-froggeric-v20" %}
 {%- set image_count = namespace(value=0) %}
 {%- set video_count = namespace(value=0) %}
+{%- set add_vision_id = add_vision_id if add_vision_id is defined else false %}
+{%- set enable_thinking = enable_thinking if enable_thinking is defined else true %}
+{%- set auto_disable_thinking_with_tools = auto_disable_thinking_with_tools if auto_disable_thinking_with_tools is defined else false %}
+{%- set _preserve_thinking = preserve_thinking if preserve_thinking is defined else false %}
+{%- set max_tool_arg_chars = max_tool_arg_chars if max_tool_arg_chars is defined else 0 %}
+{%- set max_tool_response_chars = max_tool_response_chars if max_tool_response_chars is defined else 0 %}
+{%- set _has_tools = (tools is defined and tools and tools is iterable and tools is not mapping) %}
+{%- set ns_state = namespace(thinking=enable_thinking) %}
+{%- if auto_disable_thinking_with_tools and _has_tools %}
+    {%- set ns_state.thinking = false %}
+{%- endif %}
 {%- macro render_content(content, do_vision_count, is_system_content=false) %}
     {%- if content is string %}
         {{- content }}
     {%- elif content is iterable and content is not mapping %}
         {%- for item in content %}
-            {%- if 'image' in item or 'image_url' in item or item.type == 'image' %}
-                {%- if is_system_content %}
-                    {{- raise_exception('System message cannot contain images.') }}
-                {%- endif %}
-                {%- if do_vision_count %}
-                    {%- set image_count.value = image_count.value + 1 %}
-                {%- endif %}
-                {%- if add_vision_id is defined and add_vision_id %}
-                    {{- 'Picture ' ~ image_count.value ~ ': ' }}
-                {%- endif %}
-                {{- '<|vision_start|><|image_pad|><|vision_end|>' }}
-            {%- elif 'video' in item or item.type == 'video' %}
-                {%- if is_system_content %}
-                    {{- raise_exception('System message cannot contain videos.') }}
-                {%- endif %}
-                {%- if do_vision_count %}
-                    {%- set video_count.value = video_count.value + 1 %}
-                {%- endif %}
-                {%- if add_vision_id is defined and add_vision_id %}
-                    {{- 'Video ' ~ video_count.value ~ ': ' }}
+            {%- if item is mapping %}
+                {%- if item.type == 'image' or 'image' in item or 'image_url' in item %}
+                    {%- if is_system_content %}
+                        {{- raise_exception('System message cannot contain images.') }}
+                    {%- endif %}
+                    {%- if do_vision_count %}
+                        {%- set image_count.value = image_count.value + 1 %}
+                    {%- endif %}
+                    {%- if add_vision_id %}
+                        {{- 'Picture ' ~ image_count.value ~ ': ' }}
+                    {%- endif %}
+                    {{- '<|vision_start|><|image_pad|><|vision_end|>' }}
+                {%- elif item.type == 'video' or 'video' in item %}
+                    {%- if is_system_content %}
+                        {{- raise_exception('System message cannot contain videos.') }}
+                    {%- endif %}
+                    {%- if do_vision_count %}
+                        {%- set video_count.value = video_count.value + 1 %}
+                    {%- endif %}
+                    {%- if add_vision_id %}
+                        {{- 'Video ' ~ video_count.value ~ ': ' }}
+                    {%- endif %}
+                    {{- '<|vision_start|><|video_pad|><|vision_end|>' }}
+                {%- elif 'text' in item %}
+                    {{- item.text }}
+                {%- else %}
+                    {{- raise_exception('Unexpected item type in content.') }}
                 {%- endif %}
-                {{- '<|vision_start|><|video_pad|><|vision_end|>' }}
-            {%- elif 'text' in item %}
-                {{- item.text }}
             {%- else %}
-                {{- raise_exception('Unexpected item type in content.') }}
+                {{- item | string }}
             {%- endif %}
         {%- endfor %}
     {%- elif content is none or content is undefined %}
@@ -39,38 +55,36 @@
         {{- raise_exception('Unexpected content type.') }}
     {%- endif %}
 {%- endmacro %}
-{%- set ns_flags = namespace(enable_thinking=true, has_tools=false, last_tool_failed=false, consecutive_failures=0) %}
-{%- if enable_thinking is defined %}
-    {%- set ns_flags.enable_thinking = enable_thinking %}
-{%- endif %}
 {%- if not messages %}
     {{- raise_exception('No messages provided.') }}
 {%- endif %}
-{%- set system_content = '' %}
-{%- set has_system = false %}
-{%- if messages[0].role == 'system' or messages[0].role == 'developer' %}
-    {%- set has_system = true %}
-    {%- set system_content = render_content(messages[0].content, false, true)|trim %}
-    {%- if '<|think_off|>' in system_content %}
-        {%- set ns_flags.enable_thinking = false %}
-        {%- set system_content = system_content | replace('<|think_off|>', '') %}
-    {%- endif %}
-    {%- if '<|think_on|>' in system_content %}
-        {%- set ns_flags.enable_thinking = true %}
-        {%- set system_content = system_content | replace('<|think_on|>', '') %}
+{%- set _first_role = messages[0].role %}
+{%- if _first_role == 'system' or _first_role == 'developer' %}
+    {%- set _sys_msg = messages[0] %}
+    {%- set _msgs = messages[1:] %}
+{%- else %}
+    {%- set _sys_msg = none %}
+    {%- set _msgs = messages %}
+{%- endif %}
+{%- set _sc = '' %}
+{%- if _sys_msg is not none %}
+    {%- set _sc = render_content(_sys_msg.content, false, true) | trim %}
+    {%- if '<|think_off|>' in _sc %}
+        {%- set ns_state.thinking = false %}
+        {%- set _sc = _sc | replace('<|think_off|>', '') | trim %}
+    {%- elif '<|think_on|>' in _sc %}
+        {%- set ns_state.thinking = true %}
+        {%- set _sc = _sc | replace('<|think_on|>', '') | trim %}
     {%- endif %}
-    {%- set system_content = system_content | trim %}
 {%- endif %}
-{%- if tools and tools is iterable and tools is not mapping %}
-    {%- set ns_flags.has_tools = true %}
+{%- if _has_tools %}
     {{- '<|im_start|>system\n' }}
-    {{- "# Tools\n\nYou have access to the following functions:\n\n<tools>" }}
+    {{- '# Tools\n\nYou have access to the following functions:\n\n<tools>' }}
     {%- for tool in tools %}
         {{- '\n' }}
-        {%- set fn = tool.function if tool.function is defined else tool %}
-        {{- fn | tojson }}
+        {{- tool | tojson }}
     {%- endfor %}
-    {{- "\n</tools>" }}
+    {{- '\n</tools>' }}
     {%- set tool_instructions %}
 If you choose to call a function ONLY reply in the following format with NO suffix:
 
@@ -102,162 +116,170 @@ Reminder:
 </IMPORTANT>
     {%- endset %}
     {{- '\n\n' ~ tool_instructions | trim }}
-    {%- if has_system and system_content %}
-        {{- '\n\n' + system_content }}
+    {%- if _sc %}
+        {{- '\n\n' + _sc }}
     {%- endif %}
     {{- '<|im_end|>\n' }}
-{%- elif has_system and system_content %}
-    {{- '<|im_start|>system\n' + system_content + '<|im_end|>\n' }}
+{%- else %}
+    {%- if _sc %}
+        {{- '<|im_start|>system\n' + _sc + '<|im_end|>\n' }}
+    {%- endif %}
+{%- endif %}
+{%- set _last_idx = _msgs | length - 1 %}
+{%- set ns = namespace(multi_step_tool=true, last_query_index=_last_idx) %}
+{%- for message in _msgs[::-1] %}
+    {%- set index = (_msgs | length - 1) - loop.index0 %}
+    {%- if ns.multi_step_tool and message.role == 'user' %}
+        {%- set _rc = render_content(message.content, false) | trim %}
+        {%- if not (_rc.startswith('<tool_response>') and _rc.endswith('</tool_response>')) %}
+            {%- set ns.multi_step_tool = false %}
+            {%- set ns.last_query_index = index %}
+        {%- endif %}
+    {%- endif %}
+{%- endfor %}
+{%- if ns.multi_step_tool %}
+    {%- if _last_idx > 50 %}
+        {%- set ns.last_query_index = _last_idx %}
+    {%- else %}
+        {%- set ns.last_query_index = 0 %}
+    {%- endif %}
 {%- endif %}
-{%- for message in messages %}
+{%- set ns2 = namespace(prev_role='', consecutive_failures=0) %}
+{%- for message in _msgs %}
     {%- set is_system = (message.role == "system" or message.role == "developer") %}
-    {%- set content = render_content(message.content, true, is_system)|trim %}
+    {%- set content = render_content(message.content, true, is_system) | trim %}
     {%- if '<|think_off|>' in content %}
-        {%- set ns_flags.enable_thinking = false %}
+        {%- set ns_state.thinking = false %}
         {%- set content = content | replace('<|think_off|>', '') | trim %}
     {%- elif '<|think_on|>' in content %}
-        {%- set ns_flags.enable_thinking = true %}
+        {%- set ns_state.thinking = true %}
         {%- set content = content | replace('<|think_on|>', '') | trim %}
     {%- endif %}
     {%- if is_system %}
-        {%- if not loop.first and content %}
-            {{- '<|im_start|>system\n' + content + '<|im_end|>\n' }}
-        {%- endif %}
-    {%- elif message.role == "user" %}
-        {{- '<|im_start|>' + message.role + '\n' + content + '<|im_end|>\n' }}
-        {%- set ns_flags.last_tool_failed = false %}
-        {%- set ns_flags.consecutive_failures = 0 %}
-    {%- elif message.role == "assistant" %}
-        {%- set ns_flags.last_tool_failed = false %}
+        {{- '<|im_start|>system\n' + content + '<|im_end|>\n' }}
+    {%- elif message.role == 'user' %}
+        {%- set ns2.consecutive_failures = 0 %}
+        {{- '<|im_start|>user\n' + content + '<|im_end|>\n' }}
+    {%- elif message.role == 'assistant' %}
         {%- set reasoning_content = '' %}
-        {%- if message.reasoning_content is string %}
-            {%- set reasoning_content = message.reasoning_content %}
+        {%- if message.reasoning_content is defined and message.reasoning_content is not none %}
+            {%- if message.reasoning_content is string %}
+                {%- set reasoning_content = message.reasoning_content %}
+            {%- else %}
+                {%- set reasoning_content = message.reasoning_content | string %}
+            {%- endif %}
         {%- else %}
-            {%- set think_end_token = '' %}
+            {%- set _think_end = '' %}
             {%- if '</think>' in content %}
-                {%- set think_end_token = '</think>' %}
+                {%- set _think_end = '</think>' %}
             {%- elif '</thinking>' in content %}
-                {%- set think_end_token = '</thinking>' %}
+                {%- set _think_end = '</thinking>' %}
             {%- elif '</ think>' in content %}
-                {%- set think_end_token = '</ think>' %}
+                {%- set _think_end = '</ think>' %}
             {%- elif '</think >' in content %}
-                {%- set think_end_token = '</think >' %}
+                {%- set _think_end = '</think >' %}
             {%- endif %}
-            {%- if think_end_token %}
-                {%- set reasoning_parts = content.split(think_end_token) %}
-                {%- set reasoning_content = reasoning_parts[0] %}
-                {%- set content = reasoning_parts[1:] | join(think_end_token) %}
-                {%- if '<think>' in reasoning_content %}
-                    {%- set r_prefix = reasoning_content.split('<think>')[0] | trim %}
-                    {%- set reasoning_content = reasoning_content.split('<think>')[1:] | join('<think>') | trim %}
-                    {%- set content = (r_prefix ~ '\n' ~ content) | trim %}
-                {%- endif %}
-            {%- elif '<think>' in content %}
-                {%- set prefix = content.split('<think>')[0] %}
-                {%- set think_part = content.split('<think>')[1:] | join('<think>') %}
-                {%- if '<tool_call>' in think_part %}
-                    {%- set reasoning_content = think_part.split('<tool_call>')[0] %}
-                    {%- set content = prefix ~ '\n<tool_call>' ~ think_part.split('<tool_call>')[1:] | join('<tool_call>') %}
+            {%- if _think_end %}
+                {%- if _think_end == '</thinking>' %}
+                    {%- set _think_start = '<thinking>' %}
                 {%- else %}
-                    {%- set reasoning_content = think_part %}
-                    {%- set content = prefix %}
+                    {%- set _think_start = '<think>' %}
                 {%- endif %}
+                {%- set reasoning_content = content.split(_think_end)[0].rstrip('\n') %}
+                {%- if _think_start in reasoning_content %}
+                    {%- set reasoning_content = reasoning_content.split(_think_start)[-1].lstrip('\n') %}
+                {%- endif %}
+                {%- set content = content.split(_think_end)[-1].lstrip('\n') %}
             {%- endif %}
         {%- endif %}
         {%- set reasoning_content = reasoning_content | trim %}
-        {%- set content = content | trim %}
-        {%- if message.tool_calls and message.tool_calls is iterable and message.tool_calls is not mapping %}
-            {%- if '<tool_call>' in content %}
-                {%- set content = content.split('<tool_call>')[0] | trim %}
-            {%- endif %}
-        {%- endif %}
-        {%- set show_think = true %}
-        {%- if preserve_thinking is defined and preserve_thinking == false %}
-            {%- set show_think = false %}
-        {%- endif %}
-        {%- if not reasoning_content %}
-            {%- set show_think = false %}
-        {%- endif %}
-        
-        {%- if show_think and ns_flags.enable_thinking is not false %}
-            {%- if content %}
-                {{- '<|im_start|>' + message.role + '\n<think>\n' + reasoning_content + '\n</think>\n' + content }}
-            {%- else %}
-                {{- '<|im_start|>' + message.role + '\n<think>\n' + reasoning_content + '\n</think>' }}
-            {%- endif %}
+        {%- if (_preserve_thinking or loop.index0 > ns.last_query_index) and reasoning_content %}
+            {{- '<|im_start|>assistant\n<think>\n' + reasoning_content + '\n</think>\n\n' + content }}
         {%- else %}
-            {%- if content %}
-                {{- '<|im_start|>' + message.role + '\n' + content }}
-            {%- else %}
-                {{- '<|im_start|>' + message.role }}
-            {%- endif %}
+            {{- '<|im_start|>assistant\n' + content }}
         {%- endif %}
-        {%- if message.tool_calls and message.tool_calls is iterable and message.tool_calls is not mapping %}
+        {%- if message.tool_calls is defined and message.tool_calls and message.tool_calls is iterable and message.tool_calls is not mapping %}
             {%- for tool_call in message.tool_calls %}
-                {%- if tool_call.function is defined %}
-                    {%- set tool_call = tool_call.function %}
+                {%- if tool_call.function is defined and tool_call.function is not none %}
+                    {%- set tc = tool_call.function %}
+                {%- else %}
+                    {%- set tc = tool_call %}
                 {%- endif %}
-                {{- '\n<tool_call>\n' }}
-                {{- '<function=' ~ tool_call.name ~ '>\n' }}
-                {%- if tool_call.arguments is defined and tool_call.arguments is mapping %}
-                    {%- if tool_call.arguments | length > 0 %}
-                        {%- for args_name in tool_call.arguments %}
-                            {%- set args_value = tool_call.arguments[args_name] %}
-                            {{- '<parameter=' ~ args_name ~ '>\n' }}
-                            {%- set args_value = args_value | tojson if args_value is mapping or (args_value is iterable and args_value is not string) else args_value | string %}
-                            {{- args_value }}
+                {%- if loop.first %}
+                    {%- if content | trim %}
+                        {{- '\n\n<tool_call>\n<function=' + tc.name + '>\n' }}
+                    {%- else %}
+                        {{- '<tool_call>\n<function=' + tc.name + '>\n' }}
+                    {%- endif %}
+                {%- else %}
+                    {{- '\n\n<tool_call>\n<function=' + tc.name + '>\n' }}
+                {%- endif %}
+                {%- if tc.arguments is defined and tc.arguments is not none %}
+                    {%- if tc.arguments is mapping %}
+                        {%- for args_name, args_value in tc.arguments.items() %}
+                            {{- '<parameter=' + args_name + '>\n' }}
+                            {%- if args_value is mapping or (args_value is sequence and args_value is not string) %}
+                                {%- set _av = args_value | tojson %}
+                            {%- else %}
+                                {%- set _av = args_value | string %}
+                            {%- endif %}
+                            {%- if max_tool_arg_chars > 0 and _av | length > max_tool_arg_chars %}
+                                {{- _av[:max_tool_arg_chars] + '\n[TRUNCATED — original length ' ~ (_av | length | string) ~ ' chars]' }}
+                            {%- else %}
+                                {{- _av }}
+                            {%- endif %}
                             {{- '\n</parameter>\n' }}
                         {%- endfor %}
-                    {%- endif %}
-                {%- elif tool_call.arguments is defined and tool_call.arguments is string %}
-                    {%- if tool_call.arguments | trim | length > 0 %}
-                        {{- tool_call.arguments }}
-                        {{- '\n' }}
+                    {%- elif tc.arguments is string and tc.arguments %}
+                        {{- tc.arguments }}
                     {%- endif %}
                 {%- endif %}
-                {{- '</function>\n</tool_call>' }}
+                {%- if loop.last %}
+                    {{- '</function>\n</tool_call>\n' }}
+                {%- else %}
+                    {{- '</function>\n</tool_call>' }}
+                {%- endif %}
             {%- endfor %}
         {%- endif %}
         {{- '<|im_end|>\n' }}
-    {%- elif message.role == "tool" %}
-        {%- set content_lower = content | lower %}
-        {%- if content | length < 500
-            and '$ ' not in content
-            and 'took ' not in content_lower
-            and ('"error":' in content_lower or 'error:' in content_lower or 'exception:' in content_lower or 'traceback' in content_lower or 'command not found' in content_lower or 'invalid syntax' in content_lower or 'failed to' in content_lower) %}
-            {%- set ns_flags.last_tool_failed = true %}
-            {%- set ns_flags.consecutive_failures = ns_flags.consecutive_failures + 1 %}
+    {%- elif message.role == 'tool' %}
+        {%- set _content_lower = content | lower %}
+        {%- if content | length < 500 and '$ ' not in content and 'took ' not in _content_lower and ('"error":' in _content_lower or 'error:' in _content_lower or 'exception:' in _content_lower or 'traceback' in _content_lower or 'command not found' in _content_lower or 'invalid syntax' in _content_lower or 'failed to' in _content_lower) %}
+            {%- set ns2.consecutive_failures = ns2.consecutive_failures + 1 %}
         {%- else %}
-            {%- set ns_flags.last_tool_failed = false %}
-            {%- set ns_flags.consecutive_failures = 0 %}
+            {%- set ns2.consecutive_failures = 0 %}
         {%- endif %}
-        {%- if loop.index0 > 0 and messages[loop.index0 - 1].role != "tool" %}
+        {%- if ns2.prev_role != 'tool' %}
             {{- '<|im_start|>user' }}
         {%- endif %}
-        {{- '\n<tool_response>\n' }}
-        {{- content }}
-        {%- if ns_flags.last_tool_failed %}
-            {%- if ns_flags.consecutive_failures >= 2 %}
-                {{- '\n\n⚠️ SYSTEM WARNING: ' ~ ns_flags.consecutive_failures ~ ' consecutive tool errors detected. Your previous approach is incorrect. You MUST use a fundamentally different approach or corrected arguments.' }}
-            {%- else %}
-                {{- '\n\n⚠️ SYSTEM WARNING: The previous tool call returned an error. Diagnose the failure and retry with completely corrected arguments.' }}
-            {%- endif %}
+        {%- if max_tool_response_chars > 0 and content | length > max_tool_response_chars %}
+            {%- set content = content[:max_tool_response_chars] + '\n[TRUNCATED — original length ' ~ (content | length | string) ~ ' chars]' %}
+        {%- endif %}
+        {{- '\n<tool_response>\n' + content }}
+        {%- if ns2.consecutive_failures >= 2 %}
+            {{- '\n\n⚠️ SYSTEM WARNING: ' ~ ns2.consecutive_failures ~ ' consecutive tool errors detected. Your previous approach is incorrect. You MUST use a fundamentally different approach or corrected arguments.' }}
+        {%- elif ns2.consecutive_failures == 1 %}
+            {{- '\n\n⚠️ SYSTEM WARNING: The previous tool call returned an error. Diagnose the failure and retry with completely corrected arguments.' }}
         {%- endif %}
         {{- '\n</tool_response>' }}
-        {%- if not loop.last and messages[loop.index0 + 1].role != "tool" %}
-            {{- '<|im_end|>\n' }}
-        {%- elif loop.last %}
+        {%- if loop.last %}
             {{- '<|im_end|>\n' }}
+        {%- else %}
+            {%- set _next_role = _msgs[loop.index0 + 1].role %}
+            {%- if _next_role != 'tool' %}
+                {{- '<|im_end|>\n' }}
+            {%- endif %}
         {%- endif %}
     {%- else %}
-        {{- raise_exception('Unexpected message role.') }}
+        {{- '<|im_start|>user\n[' + message.role + ']: ' + content + '<|im_end|>\n' }}
     {%- endif %}
+    {%- set ns2.prev_role = message.role %}
 {%- endfor %}
 {%- if add_generation_prompt %}
     {{- '<|im_start|>assistant\n' }}
-    {%- if ns_flags.enable_thinking is false %}
+    {%- if not ns_state.thinking %}
         {{- '<think>\n</think>\n' }}
-    {%- elif ns_flags.last_tool_failed and ns_flags.consecutive_failures >= 2 %}
+    {%- elif ns2.consecutive_failures >= 2 %}
         {{- '<think>\n</think>\n' }}
     {%- else %}
         {{- '<think>\n' }}

chat_template_oneline.txt

@@ -1 +1 @@
-{%- set image_count = namespace(value=0) %}{%- set video_count = namespace(value=0) %}{%- macro render_content(content, do_vision_count, is_system_content=false) %}{%- if content is string %}{{- content }}{%- elif content is iterable and content is not mapping %}{%- for item in content %}{%- if 'image' in item or 'image_url' in item or item.type == 'image' %}{%- if is_system_content %}{{- raise_exception('System message cannot contain images.') }}{%- endif %}{%- if do_vision_count %}{%- set image_count.value = image_count.value + 1 %}{%- endif %}{%- if add_vision_id is defined and add_vision_id %}{{- 'Picture ' ~ image_count.value ~ ': ' }}{%- endif %}{{- '<|vision_start|><|image_pad|><|vision_end|>' }}{%- elif 'video' in item or item.type == 'video' %}{%- if is_system_content %}{{- raise_exception('System message cannot contain videos.') }}{%- endif %}{%- if do_vision_count %}{%- set video_count.value = video_count.value + 1 %}{%- endif %}{%- if add_vision_id is defined and add_vision_id %}{{- 'Video ' ~ video_count.value ~ ': ' }}{%- endif %}{{- '<|vision_start|><|video_pad|><|vision_end|>' }}{%- elif 'text' in item %}{{- item.text }}{%- else %}{{- raise_exception('Unexpected item type in content.') }}{%- endif %}{%- endfor %}{%- elif content is none or content is undefined %}{{- '' }}{%- else %}{{- raise_exception('Unexpected content type.') }}{%- endif %}{%- endmacro %}{%- set ns_flags = namespace(enable_thinking=true, has_tools=false, last_tool_failed=false, consecutive_failures=0) %}{%- if enable_thinking is defined %}{%- set ns_flags.enable_thinking = enable_thinking %}{%- endif %}{%- if not messages %}{{- raise_exception('No messages provided.') }}{%- endif %}{%- set system_content = '' %}{%- set has_system = false %}{%- if messages[0].role == 'system' or messages[0].role == 'developer' %}{%- set has_system = true %}{%- set system_content = render_content(messages[0].content, false, true)|trim %}{%- if '<|think_off|>' in system_content %}{%- set ns_flags.enable_thinking = false %}{%- set system_content = system_content | replace('<|think_off|>', '') %}{%- endif %}{%- if '<|think_on|>' in system_content %}{%- set ns_flags.enable_thinking = true %}{%- set system_content = system_content | replace('<|think_on|>', '') %}{%- endif %}{%- set system_content = system_content | trim %}{%- endif %}{%- if tools and tools is iterable and tools is not mapping %}{%- set ns_flags.has_tools = true %}{{- '<|im_start|>system\n' }}{{- "# Tools\n\nYou have access to the following functions:\n\n<tools>" }}{%- for tool in tools %}{{- '\n' }}{%- set fn = tool.function if tool.function is defined else tool %}{{- fn | tojson }}{%- endfor %}{{- "\n</tools>" }}{%- set tool_instructions %} If you choose to call a function ONLY reply in the following format with NO suffix: <think> Brief explanation of tool call </think> <tool_call> <function=example_function_name> <parameter=example_parameter_1> value_1 </parameter> <parameter=example_parameter_2> This is the value for the second parameter that can span multiple lines </parameter> </function> </tool_call> <IMPORTANT> Reminder: - You can use the <think></think> block to plan your next tool call OR to synthesize data and formulate your final response to the user. - ALL explanation and reasoning MUST be placed strictly inside the <think></think> block. - Function calls MUST follow the specified format: an inner <function=...></function> block must be nested within <tool_call></tool_call> XML tags. - If you choose to call a tool, you MUST output the <tool_call> block IMMEDIATELY after closing </think>. Do NOT output any conversational text before the tool call. - The <tool_call> and <function> tags MUST be at the very beginning of a new line, with NO spaces or indentation before them. - To call multiple functions, output a separate, completely closed <tool_call></tool_call> block for EACH function. Do NOT nest <tool_call> blocks. - If you have gathered all necessary data and do not need to call a tool, answer the question like normal and provide your final response to the user IMMEDIATELY after closing </think>. </IMPORTANT> {%- endset %}{{- '\n\n' ~ tool_instructions | trim }}{%- if has_system and system_content %}{{- '\n\n' + system_content }}{%- endif %}{{- '<|im_end|>\n' }}{%- elif has_system and system_content %}{{- '<|im_start|>system\n' + system_content + '<|im_end|>\n' }}{%- endif %}{%- for message in messages %}{%- set is_system = (message.role == "system" or message.role == "developer") %}{%- set content = render_content(message.content, true, is_system)|trim %}{%- if '<|think_off|>' in content %}{%- set ns_flags.enable_thinking = false %}{%- set content = content | replace('<|think_off|>', '') | trim %}{%- elif '<|think_on|>' in content %}{%- set ns_flags.enable_thinking = true %}{%- set content = content | replace('<|think_on|>', '') | trim %}{%- endif %}{%- if is_system %}{%- if not loop.first and content %}{{- '<|im_start|>system\n' + content + '<|im_end|>\n' }}{%- endif %}{%- elif message.role == "user" %}{{- '<|im_start|>' + message.role + '\n' + content + '<|im_end|>\n' }}{%- set ns_flags.last_tool_failed = false %}{%- set ns_flags.consecutive_failures = 0 %}{%- elif message.role == "assistant" %}{%- set ns_flags.last_tool_failed = false %}{%- set reasoning_content = '' %}{%- if message.reasoning_content is string %}{%- set reasoning_content = message.reasoning_content %}{%- else %}{%- set think_end_token = '' %}{%- if '</think>' in content %}{%- set think_end_token = '</think>' %}{%- elif '</thinking>' in content %}{%- set think_end_token = '</thinking>' %}{%- elif '</ think>' in content %}{%- set think_end_token = '</ think>' %}{%- elif '</think >' in content %}{%- set think_end_token = '</think >' %}{%- endif %}{%- if think_end_token %}{%- set reasoning_parts = content.split(think_end_token) %}{%- set reasoning_content = reasoning_parts[0] %}{%- set content = reasoning_parts[1:] | join(think_end_token) %}{%- if '<think>' in reasoning_content %}{%- set r_prefix = reasoning_content.split('<think>')[0] | trim %}{%- set reasoning_content = reasoning_content.split('<think>')[1:] | join('<think>') | trim %}{%- set content = (r_prefix ~ '\n' ~ content) | trim %}{%- endif %}{%- elif '<think>' in content %}{%- set prefix = content.split('<think>')[0] %}{%- set think_part = content.split('<think>')[1:] | join('<think>') %}{%- if '<tool_call>' in think_part %}{%- set reasoning_content = think_part.split('<tool_call>')[0] %}{%- set content = prefix ~ '\n<tool_call>' ~ think_part.split('<tool_call>')[1:] | join('<tool_call>') %}{%- else %}{%- set reasoning_content = think_part %}{%- set content = prefix %}{%- endif %}{%- endif %}{%- endif %}{%- set reasoning_content = reasoning_content | trim %}{%- set content = content | trim %}{%- if message.tool_calls and message.tool_calls is iterable and message.tool_calls is not mapping %}{%- if '<tool_call>' in content %}{%- set content = content.split('<tool_call>')[0] | trim %}{%- endif %}{%- endif %}{%- set show_think = true %}{%- if preserve_thinking is defined and preserve_thinking == false %}{%- set show_think = false %}{%- endif %}{%- if not reasoning_content %}{%- set show_think = false %}{%- endif %}{%- if show_think and ns_flags.enable_thinking is not false %}{%- if content %}{{- '<|im_start|>' + message.role + '\n<think>\n' + reasoning_content + '\n</think>\n' + content }}{%- else %}{{- '<|im_start|>' + message.role + '\n<think>\n' + reasoning_content + '\n</think>' }}{%- endif %}{%- else %}{%- if content %}{{- '<|im_start|>' + message.role + '\n' + content }}{%- else %}{{- '<|im_start|>' + message.role }}{%- endif %}{%- endif %}{%- if message.tool_calls and message.tool_calls is iterable and message.tool_calls is not mapping %}{%- for tool_call in message.tool_calls %}{%- if tool_call.function is defined %}{%- set tool_call = tool_call.function %}{%- endif %}{{- '\n<tool_call>\n' }}{{- '<function=' ~ tool_call.name ~ '>\n' }}{%- if tool_call.arguments is defined and tool_call.arguments is mapping %}{%- if tool_call.arguments | length > 0 %}{%- for args_name in tool_call.arguments %}{%- set args_value = tool_call.arguments[args_name] %}{{- '<parameter=' ~ args_name ~ '>\n' }}{%- set args_value = args_value | tojson if args_value is mapping or (args_value is iterable and args_value is not string) else args_value | string %}{{- args_value }}{{- '\n</parameter>\n' }}{%- endfor %}{%- endif %}{%- elif tool_call.arguments is defined and tool_call.arguments is string %}{%- if tool_call.arguments | trim | length > 0 %}{{- tool_call.arguments }}{{- '\n' }}{%- endif %}{%- endif %}{{- '</function>\n</tool_call>' }}{%- endfor %}{%- endif %}{{- '<|im_end|>\n' }}{%- elif message.role == "tool" %}{%- set content_lower = content | lower %}{%- if content | length < 500 and '$ ' not in content and 'took ' not in content_lower and ('"error":' in content_lower or 'error:' in content_lower or 'exception:' in content_lower or 'traceback' in content_lower or 'command not found' in content_lower or 'invalid syntax' in content_lower or 'failed to' in content_lower) %}{%- set ns_flags.last_tool_failed = true %}{%- set ns_flags.consecutive_failures = ns_flags.consecutive_failures + 1 %}{%- else %}{%- set ns_flags.last_tool_failed = false %}{%- set ns_flags.consecutive_failures = 0 %}{%- endif %}{%- if loop.index0 > 0 and messages[loop.index0 - 1].role != "tool" %}{{- '<|im_start|>user' }}{%- endif %}{{- '\n<tool_response>\n' }}{{- content }}{%- if ns_flags.last_tool_failed %}{%- if ns_flags.consecutive_failures >= 2 %}{{- '\n\n⚠️ SYSTEM WARNING: ' ~ ns_flags.consecutive_failures ~ ' consecutive tool errors detected. Your previous approach is incorrect. You MUST use a fundamentally different approach or corrected arguments.' }}{%- else %}{{- '\n\n⚠️ SYSTEM WARNING: The previous tool call returned an error. Diagnose the failure and retry with completely corrected arguments.' }}{%- endif %}{%- endif %}{{- '\n</tool_response>' }}{%- if not loop.last and messages[loop.index0 + 1].role != "tool" %}{{- '<|im_end|>\n' }}{%- elif loop.last %}{{- '<|im_end|>\n' }}{%- endif %}{%- else %}{{- raise_exception('Unexpected message role.') }}{%- endif %}{%- endfor %}{%- if add_generation_prompt %}{{- '<|im_start|>assistant\n' }}{%- if ns_flags.enable_thinking is false %}{{- '<think>\n</think>\n' }}{%- elif ns_flags.last_tool_failed and ns_flags.consecutive_failures >= 2 %}{{- '<think>\n</think>\n' }}{%- else %}{{- '<think>\n' }}{%- endif %}{%- endif %}
+{%- set template_version = "qwen3.6-froggeric-v20" %}{%- set image_count = namespace(value=0) %}{%- set video_count = namespace(value=0) %}{%- set add_vision_id = add_vision_id if add_vision_id is defined else false %}{%- set enable_thinking = enable_thinking if enable_thinking is defined else true %}{%- set auto_disable_thinking_with_tools = auto_disable_thinking_with_tools if auto_disable_thinking_with_tools is defined else false %}{%- set _preserve_thinking = preserve_thinking if preserve_thinking is defined else false %}{%- set max_tool_arg_chars = max_tool_arg_chars if max_tool_arg_chars is defined else 0 %}{%- set max_tool_response_chars = max_tool_response_chars if max_tool_response_chars is defined else 0 %}{%- set _has_tools = (tools is defined and tools and tools is iterable and tools is not mapping) %}{%- set ns_state = namespace(thinking=enable_thinking) %}{%- if auto_disable_thinking_with_tools and _has_tools %}{%- set ns_state.thinking = false %}{%- endif %}{%- macro render_content(content, do_vision_count, is_system_content=false) %}{%- if content is string %}{{- content }}{%- elif content is iterable and content is not mapping %}{%- for item in content %}{%- if item is mapping %}{%- if item.type == 'image' or 'image' in item or 'image_url' in item %}{%- if is_system_content %}{{- raise_exception('System message cannot contain images.') }}{%- endif %}{%- if do_vision_count %}{%- set image_count.value = image_count.value + 1 %}{%- endif %}{%- if add_vision_id %}{{- 'Picture ' ~ image_count.value ~ ': ' }}{%- endif %}{{- '<|vision_start|><|image_pad|><|vision_end|>' }}{%- elif item.type == 'video' or 'video' in item %}{%- if is_system_content %}{{- raise_exception('System message cannot contain videos.') }}{%- endif %}{%- if do_vision_count %}{%- set video_count.value = video_count.value + 1 %}{%- endif %}{%- if add_vision_id %}{{- 'Video ' ~ video_count.value ~ ': ' }}{%- endif %}{{- '<|vision_start|><|video_pad|><|vision_end|>' }}{%- elif 'text' in item %}{{- item.text }}{%- else %}{{- raise_exception('Unexpected item type in content.') }}{%- endif %}{%- else %}{{- item | string }}{%- endif %}{%- endfor %}{%- elif content is none or content is undefined %}{{- '' }}{%- else %}{{- raise_exception('Unexpected content type.') }}{%- endif %}{%- endmacro %}{%- if not messages %}{{- raise_exception('No messages provided.') }}{%- endif %}{%- set _first_role = messages[0].role %}{%- if _first_role == 'system' or _first_role == 'developer' %}{%- set _sys_msg = messages[0] %}{%- set _msgs = messages[1:] %}{%- else %}{%- set _sys_msg = none %}{%- set _msgs = messages %}{%- endif %}{%- set _sc = '' %}{%- if _sys_msg is not none %}{%- set _sc = render_content(_sys_msg.content, false, true) | trim %}{%- if '<|think_off|>' in _sc %}{%- set ns_state.thinking = false %}{%- set _sc = _sc | replace('<|think_off|>', '') | trim %}{%- elif '<|think_on|>' in _sc %}{%- set ns_state.thinking = true %}{%- set _sc = _sc | replace('<|think_on|>', '') | trim %}{%- endif %}{%- endif %}{%- if _has_tools %}{{- '<|im_start|>system\n' }}{{- '# Tools\n\nYou have access to the following functions:\n\n<tools>' }}{%- for tool in tools %}{{- '\n' }}{{- tool | tojson }}{%- endfor %}{{- '\n</tools>' }}{%- set tool_instructions %} If you choose to call a function ONLY reply in the following format with NO suffix: <think> Brief explanation of tool call </think> <tool_call> <function=example_function_name> <parameter=example_parameter_1> value_1 </parameter> <parameter=example_parameter_2> This is the value for the second parameter that can span multiple lines </parameter> </function> </tool_call> <IMPORTANT> Reminder: - You can use the <think></think> block to plan your next tool call OR to synthesize data and formulate your final response to the user. - ALL explanation and reasoning MUST be placed strictly inside the <think></think> block. - Function calls MUST follow the specified format: an inner <function=...></function> block must be nested within <tool_call></tool_call> XML tags. - If you choose to call a tool, you MUST output the <tool_call> block IMMEDIATELY after closing </think>. Do NOT output any conversational text before the tool call. - The <tool_call> and <function> tags MUST be at the very beginning of a new line, with NO spaces or indentation before them. - To call multiple functions, output a separate, completely closed <tool_call></tool_call> block for EACH function. Do NOT nest <tool_call> blocks. - If you have gathered all necessary data and do not need to call a tool, answer the question like normal and provide your final response to the user IMMEDIATELY after closing </think>. </IMPORTANT> {%- endset %}{{- '\n\n' ~ tool_instructions | trim }}{%- if _sc %}{{- '\n\n' + _sc }}{%- endif %}{{- '<|im_end|>\n' }}{%- else %}{%- if _sc %}{{- '<|im_start|>system\n' + _sc + '<|im_end|>\n' }}{%- endif %}{%- endif %}{%- set _last_idx = _msgs | length - 1 %}{%- set ns = namespace(multi_step_tool=true, last_query_index=_last_idx) %}{%- for message in _msgs[::-1] %}{%- set index = (_msgs | length - 1) - loop.index0 %}{%- if ns.multi_step_tool and message.role == 'user' %}{%- set _rc = render_content(message.content, false) | trim %}{%- if not (_rc.startswith('<tool_response>') and _rc.endswith('</tool_response>')) %}{%- set ns.multi_step_tool = false %}{%- set ns.last_query_index = index %}{%- endif %}{%- endif %}{%- endfor %}{%- if ns.multi_step_tool %}{%- if _last_idx > 50 %}{%- set ns.last_query_index = _last_idx %}{%- else %}{%- set ns.last_query_index = 0 %}{%- endif %}{%- endif %}{%- set ns2 = namespace(prev_role='', consecutive_failures=0) %}{%- for message in _msgs %}{%- set is_system = (message.role == "system" or message.role == "developer") %}{%- set content = render_content(message.content, true, is_system) | trim %}{%- if '<|think_off|>' in content %}{%- set ns_state.thinking = false %}{%- set content = content | replace('<|think_off|>', '') | trim %}{%- elif '<|think_on|>' in content %}{%- set ns_state.thinking = true %}{%- set content = content | replace('<|think_on|>', '') | trim %}{%- endif %}{%- if is_system %}{{- '<|im_start|>system\n' + content + '<|im_end|>\n' }}{%- elif message.role == 'user' %}{%- set ns2.consecutive_failures = 0 %}{{- '<|im_start|>user\n' + content + '<|im_end|>\n' }}{%- elif message.role == 'assistant' %}{%- set reasoning_content = '' %}{%- if message.reasoning_content is defined and message.reasoning_content is not none %}{%- if message.reasoning_content is string %}{%- set reasoning_content = message.reasoning_content %}{%- else %}{%- set reasoning_content = message.reasoning_content | string %}{%- endif %}{%- else %}{%- set _think_end = '' %}{%- if '</think>' in content %}{%- set _think_end = '</think>' %}{%- elif '</thinking>' in content %}{%- set _think_end = '</thinking>' %}{%- elif '</ think>' in content %}{%- set _think_end = '</ think>' %}{%- elif '</think >' in content %}{%- set _think_end = '</think >' %}{%- endif %}{%- if _think_end %}{%- if _think_end == '</thinking>' %}{%- set _think_start = '<thinking>' %}{%- else %}{%- set _think_start = '<think>' %}{%- endif %}{%- set reasoning_content = content.split(_think_end)[0].rstrip('\n') %}{%- if _think_start in reasoning_content %}{%- set reasoning_content = reasoning_content.split(_think_start)[-1].lstrip('\n') %}{%- endif %}{%- set content = content.split(_think_end)[-1].lstrip('\n') %}{%- endif %}{%- endif %}{%- set reasoning_content = reasoning_content | trim %}{%- if (_preserve_thinking or loop.index0 > ns.last_query_index) and reasoning_content %}{{- '<|im_start|>assistant\n<think>\n' + reasoning_content + '\n</think>\n\n' + content }}{%- else %}{{- '<|im_start|>assistant\n' + content }}{%- endif %}{%- if message.tool_calls is defined and message.tool_calls and message.tool_calls is iterable and message.tool_calls is not mapping %}{%- for tool_call in message.tool_calls %}{%- if tool_call.function is defined and tool_call.function is not none %}{%- set tc = tool_call.function %}{%- else %}{%- set tc = tool_call %}{%- endif %}{%- if loop.first %}{%- if content | trim %}{{- '\n\n<tool_call>\n<function=' + tc.name + '>\n' }}{%- else %}{{- '<tool_call>\n<function=' + tc.name + '>\n' }}{%- endif %}{%- else %}{{- '\n\n<tool_call>\n<function=' + tc.name + '>\n' }}{%- endif %}{%- if tc.arguments is defined and tc.arguments is not none %}{%- if tc.arguments is mapping %}{%- for args_name, args_value in tc.arguments.items() %}{{- '<parameter=' + args_name + '>\n' }}{%- if args_value is mapping or (args_value is sequence and args_value is not string) %}{%- set _av = args_value | tojson %}{%- else %}{%- set _av = args_value | string %}{%- endif %}{%- if max_tool_arg_chars > 0 and _av | length > max_tool_arg_chars %}{{- _av[:max_tool_arg_chars] + '\n[TRUNCATED — original length ' ~ (_av | length | string) ~ ' chars]' }}{%- else %}{{- _av }}{%- endif %}{{- '\n</parameter>\n' }}{%- endfor %}{%- elif tc.arguments is string and tc.arguments %}{{- tc.arguments }}{%- endif %}{%- endif %}{%- if loop.last %}{{- '</function>\n</tool_call>\n' }}{%- else %}{{- '</function>\n</tool_call>' }}{%- endif %}{%- endfor %}{%- endif %}{{- '<|im_end|>\n' }}{%- elif message.role == 'tool' %}{%- set _content_lower = content | lower %}{%- if content | length < 500 and '$ ' not in content and 'took ' not in _content_lower and ('"error":' in _content_lower or 'error:' in _content_lower or 'exception:' in _content_lower or 'traceback' in _content_lower or 'command not found' in _content_lower or 'invalid syntax' in _content_lower or 'failed to' in _content_lower) %}{%- set ns2.consecutive_failures = ns2.consecutive_failures + 1 %}{%- else %}{%- set ns2.consecutive_failures = 0 %}{%- endif %}{%- if ns2.prev_role != 'tool' %}{{- '<|im_start|>user' }}{%- endif %}{%- if max_tool_response_chars > 0 and content | length > max_tool_response_chars %}{%- set content = content[:max_tool_response_chars] + '\n[TRUNCATED — original length ' ~ (content | length | string) ~ ' chars]' %}{%- endif %}{{- '\n<tool_response>\n' + content }}{%- if ns2.consecutive_failures >= 2 %}{{- '\n\n⚠️ SYSTEM WARNING: ' ~ ns2.consecutive_failures ~ ' consecutive tool errors detected. Your previous approach is incorrect. You MUST use a fundamentally different approach or corrected arguments.' }}{%- elif ns2.consecutive_failures == 1 %}{{- '\n\n⚠️ SYSTEM WARNING: The previous tool call returned an error. Diagnose the failure and retry with completely corrected arguments.' }}{%- endif %}{{- '\n</tool_response>' }}{%- if loop.last %}{{- '<|im_end|>\n' }}{%- else %}{%- set _next_role = _msgs[loop.index0 + 1].role %}{%- if _next_role != 'tool' %}{{- '<|im_end|>\n' }}{%- endif %}{%- endif %}{%- else %}{{- '<|im_start|>user\n[' + message.role + ']: ' + content + '<|im_end|>\n' }}{%- endif %}{%- set ns2.prev_role = message.role %}{%- endfor %}{%- if add_generation_prompt %}{{- '<|im_start|>assistant\n' }}{%- if not ns_state.thinking %}{{- '<think>\n</think>\n' }}{%- elif ns2.consecutive_failures >= 2 %}{{- '<think>\n</think>\n' }}{%- else %}{{- '<think>\n' }}{%- endif %}{%- endif %}

scripts/test_v18.py

@@ -1,404 +0,0 @@
-#!/usr/bin/env python3
-"""
-Test suite for Qwen v18 chat templates.
-Tests logical correctness using Python Jinja2 (minijinja compatibility verified separately).
-
-Usage:
-    python3 scripts/test_v18.py
-    python3 scripts/test_v18.py qwen3.6   # test one variant
-"""
-
-import sys
-import os
-from pathlib import Path
-from jinja2 import Environment
-
-# ── Setup ──────────────────────────────────────────────────────────────────────
-
-ROOT = Path(__file__).parent.parent
-VARIANTS = ["root"]
-VERSION = "v18"
-
-def load_template() -> str:
-    path = ROOT / "chat_template.jinja"
-    return path.read_text(encoding="utf-8")
-
-def render(template_src: str, messages: list, tools=None,
-           add_generation_prompt: bool = True,
-           enable_thinking=None, preserve_thinking=None) -> str:
-    env = Environment(keep_trailing_newline=False)
-    env.globals["raise_exception"] = lambda msg: (_ for _ in ()).throw(ValueError(msg))
-    tmpl = env.from_string(template_src)
-    kwargs = dict(messages=messages, tools=tools, add_generation_prompt=add_generation_prompt)
-    if enable_thinking is not None:
-        kwargs["enable_thinking"] = enable_thinking
-    if preserve_thinking is not None:
-        kwargs["preserve_thinking"] = preserve_thinking
-    return tmpl.render(**kwargs)
-
-# ── Test helpers ───────────────────────────────────────────────────────────────
-
-PASS = "\033[92m✓\033[0m"
-FAIL = "\033[91m✗\033[0m"
-
-results = []
-
-def check(name: str, condition: bool, detail: str = ""):
-    status = PASS if condition else FAIL
-    results.append(condition)
-    suffix = f"  ({detail})" if detail and not condition else ""
-    print(f"  {status}  {name}{suffix}")
-
-# ── Tests ──────────────────────────────────────────────────────────────────────
-
-def test_xml_tool_call_format(t: str):
-    """Tool calls in history must use XML <function=...> format, not JSON."""
-    messages = [
-        {"role": "user", "content": "Get weather for Paris"},
-        {"role": "assistant", "content": "",
-         "tool_calls": [{"function": {"name": "get_weather",
-                                      "arguments": {"city": "Paris", "units": "celsius"}}}]},
-        {"role": "tool", "content": "Sunny, 22°C"},
-    ]
-    tools = [{"name": "get_weather", "description": "Get weather",
-              "parameters": {"type": "object",
-                             "properties": {"city": {"type": "string"},
-                                            "units": {"type": "string"}},
-                             "required": ["city"]}}]
-    out = render(t, messages, tools=tools)
-    check("XML format: <function=...> present", "<function=get_weather>" in out,
-          f"got: {repr(out[out.find('<tool_call>'):out.find('<tool_call>')+120] if '<tool_call>' in out else 'no <tool_call>')}")
-    check("XML format: <parameter=city> present", "<parameter=city>" in out)
-    check("XML format: <parameter=units> present", "<parameter=units>" in out)
-    check("XML format: </function> present", "</function>" in out)
-    check("XML format: JSON {\"name\": absent in tool_call section",
-          '{"name":' not in out[out.rfind('<tool_call>'):] if '<tool_call>' in out else True,
-          f"tool_call section: {repr(out[out.rfind('<tool_call>'):out.rfind('<tool_call>')+120] if '<tool_call>' in out else 'none')}")
-    check("XML format: tool_instructions mention <function=", "<function=" in out)
-
-def test_tool_instructions_format(t: str):
-    """System prompt tool instructions must show XML example, not JSON."""
-    messages = [{"role": "user", "content": "Hello"}]
-    tools = [{"name": "noop", "description": "no-op",
-              "parameters": {"type": "object", "properties": {}, "required": []}}]
-    out = render(t, messages, tools=tools)
-    check("Instructions: XML example present", "<function=example_function_name>" in out)
-    check("Instructions: JSON example absent", '{"name": "tool_name"' not in out)
-    check("Instructions: <parameter= in example", "<parameter=example_parameter_1>" in out)
-
-def test_normal_generation_prompt(t: str):
-    """Normal generation prompt opens <think> block."""
-    messages = [{"role": "user", "content": "Hello"}]
-    out = render(t, messages)
-    check("Normal gen-prompt: ends with <think>\\n", out.endswith("<think>\n"),
-          f"tail: {repr(out[-30:])}")
-
-def test_thinking_bypass(t: str):
-    """When thinking disabled via enable_thinking=False, bypass is injected."""
-    messages = [{"role": "user", "content": "Hello"}]
-    out = render(t, messages, enable_thinking=False)
-    check("Think bypass: <think>\\n\\n</think>\\n\\n present",
-          "<think>\n\n</think>\n\n" in out, f"tail: {repr(out[-60:])}")
-    check("Think bypass: no open-only <think>\\n at end",
-          not out.endswith("<think>\n"))
-
-def test_think_off_token(t: str):
-    """<|think_off|> in system message disables thinking."""
-    messages = [
-        {"role": "system", "content": "You are helpful.<|think_off|>"},
-        {"role": "user", "content": "Hello"},
-    ]
-    out = render(t, messages)
-    check("<|think_off|> disables thinking", "<think>\n\n</think>\n\n" in out)
-    check("<|think_off|> token stripped from output", "<|think_off|>" not in out)
-
-def test_think_on_after_off(t: str):
-    """<|think_on|> re-enables thinking after <|think_off|>."""
-    messages = [
-        {"role": "system", "content": "<|think_off|>"},
-        {"role": "user", "content": "Step 1"},
-        {"role": "assistant", "content": "Done."},
-        {"role": "user", "content": "<|think_on|>Now think"},
-    ]
-    out = render(t, messages)
-    check("<|think_on|> re-enables thinking", out.endswith("<think>\n"),
-          f"tail: {repr(out[-40:])}")
-
-def test_tier1_error_escalation(t: str):
-    """First tool error injects Tier 1 correction hint."""
-    messages = [
-        {"role": "user", "content": "Read a file"},
-        {"role": "assistant", "content": "",
-         "tool_calls": [{"function": {"name": "read_file",
-                                      "arguments": {"path": "/foo", "pages": "1-30"}}}]},
-        {"role": "tool", "content": "Pages range exceeds maximum of 20 pages per request."},
-    ]
-    tools = [{"name": "read_file", "description": "Read",
-              "parameters": {"type": "object", "properties": {"path": {"type": "string"}},
-                             "required": ["path"]}}]
-    out = render(t, messages, tools=tools)
-    check("Tier 1: correction hint in gen-prompt",
-          "The previous tool call returned an error" in out,
-          f"tail: {repr(out[-120:])}")
-    check("Tier 1: think block still open (not bypassed)", out.endswith("\n"))
-
-def test_tier2_error_escalation(t: str):
-    """Two consecutive tool errors trigger Tier 2 bypass."""
-    tool_error = "Pages range exceeds maximum of 20 pages per request."
-    messages = [
-        {"role": "user", "content": "Read a file"},
-        {"role": "assistant", "content": "",
-         "tool_calls": [{"function": {"name": "read_file",
-                                      "arguments": {"path": "/foo", "pages": "1-30"}}}]},
-        {"role": "tool", "content": tool_error},
-        {"role": "assistant", "content": "",
-         "tool_calls": [{"function": {"name": "read_file",
-                                      "arguments": {"path": "/foo", "pages": "1-25"}}}]},
-        {"role": "tool", "content": tool_error},
-    ]
-    tools = [{"name": "read_file", "description": "Read",
-              "parameters": {"type": "object", "properties": {"path": {"type": "string"}},
-                             "required": ["path"]}}]
-    out = render(t, messages, tools=tools)
-    check("Tier 2: think bypass injected", "<think>\n\n</think>\n\n" in out,
-          f"tail: {repr(out[-200:])}")
-    check("Tier 2: escalation warning present",
-          "consecutive tool errors" in out or "consecutive" in out,
-          f"tail: {repr(out[-200:])}")
-
-def test_length_gated_detection(t: str):
-    """Long tool response (code content with 'error') must NOT trigger error flag."""
-    long_content = ("// Error handling\nfunction handleError(e) {\n"
-                    "  throw new Error('invalid input');\n}\n") * 30  # >> 500 chars
-    messages = [
-        {"role": "user", "content": "Read the code"},
-        {"role": "assistant", "content": "",
-         "tool_calls": [{"function": {"name": "read_file",
-                                      "arguments": {"path": "app.js"}}}]},
-        {"role": "tool", "content": long_content},
-    ]
-    tools = [{"name": "read_file", "description": "Read",
-              "parameters": {"type": "object", "properties": {"path": {"type": "string"}},
-                             "required": ["path"]}}]
-    out = render(t, messages, tools=tools)
-    check("Length gate: long response with 'error' does NOT trigger hint",
-          "The previous tool call returned an error" not in out,
-          f"tail: {repr(out[-80:])}")
-    check("Length gate: normal gen-prompt after long response",
-          out.endswith("<think>\n"), f"tail: {repr(out[-40:])}")
-
-def test_error_counter_resets_on_success(t: str):
-    """After a successful tool call, the consecutive failure counter resets."""
-    tool_error = "Error: file not found."
-    messages = [
-        {"role": "user", "content": "Do something"},
-        {"role": "assistant", "content": "",
-         "tool_calls": [{"function": {"name": "read_file", "arguments": {"path": "/bad"}}}]},
-        {"role": "tool", "content": tool_error},  # error → cf=1
-        {"role": "assistant", "content": "",
-         "tool_calls": [{"function": {"name": "read_file", "arguments": {"path": "/good"}}}]},
-        {"role": "tool", "content": "file content here " * 30},  # success, long → cf=0
-        {"role": "assistant", "content": "",
-         "tool_calls": [{"function": {"name": "read_file", "arguments": {"path": "/bad2"}}}]},
-        {"role": "tool", "content": tool_error},  # error → cf=1 again (not 2)
-    ]
-    tools = [{"name": "read_file", "description": "Read",
-              "parameters": {"type": "object", "properties": {"path": {"type": "string"}},
-                             "required": ["path"]}}]
-    out = render(t, messages, tools=tools)
-    # Should be Tier 1 (cf=1), not Tier 2 (cf>=2)
-    check("Counter reset: Tier 1 after success+new error (not Tier 2)",
-          "The previous tool call returned an error" in out and
-          "consecutive tool errors" not in out,
-          f"tail: {repr(out[-200:])}")
-
-def test_historical_thinking_stripped(t: str):
-    """Historical assistant <think> blocks are stripped (not last message)."""
-    messages = [
-        {"role": "user", "content": "Q1"},
-        {"role": "assistant", "content": "<think>\nmy thoughts\n</think>\n\nAnswer 1"},
-        {"role": "user", "content": "Q2"},
-    ]
-    out = render(t, messages)
-    check("Historical think stripped by default", "my thoughts" not in out)
-
-def test_preserve_thinking(t: str):
-    """With preserve_thinking=True, historical <think> blocks are kept."""
-    messages = [
-        {"role": "user", "content": "Q1"},
-        {"role": "assistant", "content": "<think>\nmy thoughts\n</think>\n\nAnswer 1"},
-        {"role": "user", "content": "Q2"},
-    ]
-    out = render(t, messages, preserve_thinking=True)
-    check("preserve_thinking=True keeps historical thoughts", "my thoughts" in out)
-
-def test_developer_role(t: str):
-    """developer role is accepted (same as system)."""
-    messages = [
-        {"role": "developer", "content": "You are a coder."},
-        {"role": "user", "content": "Write code"},
-    ]
-    try:
-        out = render(t, messages)
-        check("developer role: no crash", True)
-        check("developer role: content rendered", "You are a coder." in out)
-    except Exception as e:
-        check("developer role: no crash", False, str(e))
-
-def test_mid_conversation_system(t: str):
-    """System messages mid-conversation are rendered chronologically."""
-    messages = [
-        {"role": "user", "content": "Hello"},
-        {"role": "assistant", "content": "Hi"},
-        {"role": "system", "content": "You must now speak in French."},
-        {"role": "user", "content": "What's up?"},
-    ]
-    try:
-        out = render(t, messages)
-        check("Mid-conv system: no crash", True)
-        check("Mid-conv system: content present", "You must now speak in French." in out)
-    except Exception as e:
-        check("Mid-conv system: no crash", False, str(e))
-
-def test_tool_response_wrapping(t: str):
-    """Tool responses are wrapped in <tool_response> tags."""
-    messages = [
-        {"role": "user", "content": "Get data"},
-        {"role": "assistant", "content": "",
-         "tool_calls": [{"function": {"name": "fetch", "arguments": {"url": "https://example.com"}}}]},
-        {"role": "tool", "content": "data here"},
-    ]
-    tools = [{"name": "fetch", "description": "Fetch URL",
-              "parameters": {"type": "object", "properties": {"url": {"type": "string"}},
-                             "required": ["url"]}}]
-    out = render(t, messages, tools=tools)
-    check("Tool response: <tool_response> wrapper present", "<tool_response>" in out)
-    check("Tool response: content inside wrapper", "data here" in out)
-
-def test_no_tools_no_crash(t: str):
-    """Template works without any tools passed."""
-    messages = [{"role": "user", "content": "What is 2+2?"}]
-    try:
-        out = render(t, messages)
-        check("No tools: no crash", True)
-        check("No tools: normal gen-prompt", out.endswith("<think>\n"))
-    except Exception as e:
-        check("No tools: no crash", False, str(e))
-
-def test_string_arguments_passthrough(t: str):
-    """String tool arguments (pre-serialized JSON) are passed through as-is."""
-    messages = [
-        {"role": "user", "content": "Search"},
-        {"role": "assistant", "content": "",
-         "tool_calls": [{"function": {"name": "search",
-                                      "arguments": '{"query": "python", "limit": 5}'}}]},
-        {"role": "tool", "content": "results"},
-    ]
-    tools = [{"name": "search", "description": "Search",
-              "parameters": {"type": "object", "properties": {"query": {"type": "string"}},
-                             "required": ["query"]}}]
-    out = render(t, messages, tools=tools)
-    check("String args: passthrough without crash", "search" in out)
-
-# ── New tests for v16 fixes ────────────────────────────────────────────────────
-
-def test_shell_result_false_positive(t: str):
-    """Short grep results containing 'error' in identifiers must NOT trigger error flag."""
-    shell_result = '$ grep -n "error_message" orchestrator.go (timeout 5s)\n\n661: "error_message": "",\n\nTook 0.1s'
-    messages = [
-        {"role": "user", "content": "Search for error_message"},
-        {"role": "assistant", "content": "",
-         "tool_calls": [{"function": {"name": "shell",
-                                      "arguments": {"cmd": "grep -n error_message file.go"}}}]},
-        {"role": "tool", "content": shell_result},
-    ]
-    tools = [{"name": "shell", "description": "Run shell command",
-              "parameters": {"type": "object", "properties": {"cmd": {"type": "string"}},
-                             "required": ["cmd"]}}]
-    out = render(t, messages, tools=tools)
-    check("Shell false-positive: grep with 'error_message' not flagged",
-          "The previous tool call returned an error" not in out,
-          f"tail: {repr(out[-80:])}")
-    check("Shell false-positive: normal gen-prompt after grep result",
-          out.endswith("<think>\n"), f"tail: {repr(out[-40:])}")
-
-
-def test_no_thinking_with_error_escalation(t: str):
-    """When enable_thinking=False and a tool errors, correction hint must NOT open a <think> block."""
-    tool_error = "Pages range exceeds maximum of 20 pages per request."
-    messages = [
-        {"role": "user", "content": "Read a file"},
-        {"role": "assistant", "content": "",
-         "tool_calls": [{"function": {"name": "read_file",
-                                      "arguments": {"path": "/foo", "pages": "1-30"}}}]},
-        {"role": "tool", "content": tool_error},
-    ]
-    tools = [{"name": "read_file", "description": "Read",
-              "parameters": {"type": "object", "properties": {"path": {"type": "string"}},
-                             "required": ["path"]}}]
-    out = render(t, messages, tools=tools, enable_thinking=False)
-    check("No-think + error: correction hint present",
-          "The previous tool call returned an error" in out,
-          f"tail: {repr(out[-120:])}")
-    check("No-think + error: does not end with open think block",
-          not out.rstrip().endswith("<think>"),
-          f"tail: {repr(out[-80:])}")
-    check("No-think + error: no unclosed <think> in error section",
-          "<think>\nThe previous" not in out,
-          f"tail: {repr(out[-120:])}")
-
-
-# ── Runner ─────────────────────────────────────────────────────────────────────
-
-TESTS = [
-    test_xml_tool_call_format,
-    test_tool_instructions_format,
-    test_normal_generation_prompt,
-    test_thinking_bypass,
-    test_think_off_token,
-    test_think_on_after_off,
-    test_tier1_error_escalation,
-    test_tier2_error_escalation,
-    test_length_gated_detection,
-    test_error_counter_resets_on_success,
-    test_historical_thinking_stripped,
-    test_preserve_thinking,
-    test_developer_role,
-    test_mid_conversation_system,
-    test_tool_response_wrapping,
-    test_no_tools_no_crash,
-    test_string_arguments_passthrough,
-    test_shell_result_false_positive,
-    test_no_thinking_with_error_escalation,
-]
-results: list[bool] = []
-
-def run_tests():
-    print(f"\n{'═'*60}")
-    print(f"  Testing v17 Chat Template")
-    print(f"{'═'*60}")
-    try:
-        tmpl = load_template()
-    except FileNotFoundError:
-        print(f"  Template not found: chat_template.jinja")
-        return
-    for fn in TESTS:
-        label = fn.__name__.replace("test_", "").replace("_", " ").title()
-        print(f"\n  [{label}]")
-        fn(tmpl)
-
-if __name__ == "__main__":
-    results.clear()
-    run_tests()
-
-    total = len(results)
-    passed = sum(results)
-    failed = total - passed
-    print(f"\n{'═'*60}")
-    print(f"  Results: {passed}/{total} passed", end="")
-    if failed:
-        print(f"  \033[91m({failed} failed)\033[0m")
-    else:
-        print(f"  \033[92m(all passed)\033[0m")
-    print(f"{'═'*60}\n")
-    sys.exit(0 if failed == 0 else 1)

scripts/test_v20.py

@@ -0,0 +1,173 @@
+import os
+import sys
+import json
+import traceback
+
+try:
+    from jinja2 import Environment, FileSystemLoader, StrictUndefined
+except ImportError:
+    print("Error: jinja2 is required to run tests. Please install it using 'pip install jinja2'")
+    sys.exit(1)
+
+TEMPLATE_FILE = 'chat_template.jinja'
+TEMPLATE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+env = Environment(
+    loader=FileSystemLoader(TEMPLATE_DIR),
+    undefined=StrictUndefined,
+    keep_trailing_newline=True,
+    lstrip_blocks=True,
+    trim_blocks=True
+)
+
+def raise_exception(msg):
+    raise Exception(msg)
+
+env.globals['raise_exception'] = raise_exception
+
+try:
+    template = env.get_template(TEMPLATE_FILE)
+except Exception as e:
+    print(f"Error loading template: {e}")
+    sys.exit(1)
+
+def run_test(name, messages, tools=None, kwargs=None, expected_in=None, expected_not_in=None, expect_error=False):
+    if kwargs is None:
+        kwargs = {}
+    
+    print(f"\n--- Running Test: {name} ---")
+    
+    try:
+        render_kwargs = {'messages': messages, 'add_generation_prompt': True}
+        if tools is not None:
+            render_kwargs['tools'] = tools
+        render_kwargs.update(kwargs)
+        
+        rendered = template.render(**render_kwargs)
+        
+        if expect_error:
+            print("❌ FAILED: Expected an exception but got none.")
+            return False
+            
+        success = True
+        
+        if expected_in:
+            for ex in expected_in:
+                if ex not in rendered:
+                    print(f"❌ FAILED: Missing expected string:\n'''{ex}'''")
+                    print(f"Rendered:\n{rendered}")
+                    success = False
+        
+        if expected_not_in:
+            for n_ex in expected_not_in:
+                if n_ex in rendered:
+                    print(f"❌ FAILED: Found string that should NOT be present:\n'''{n_ex}'''")
+                    print(f"Rendered:\n{rendered}")
+                    success = False
+                    
+        if success:
+            print("✅ PASSED")
+            return True
+        return False
+        
+    except Exception as e:
+        if expect_error:
+            print(f"✅ PASSED (Caught expected error: {e})")
+            return True
+        print(f"❌ FAILED with exception:\n{traceback.format_exc()}")
+        return False
+
+# Tests
+tests_passed = 0
+tests_total = 0
+
+def execute_test(*args, **kwargs):
+    global tests_passed, tests_total
+    tests_total += 1
+    if run_test(*args, **kwargs):
+        tests_passed += 1
+
+# 1. auto_disable_thinking_with_tools (Default logic)
+execute_test(
+    "auto_disable_thinking_with_tools (enabled via kwarg)",
+    messages=[{"role": "user", "content": "Hello!"}],
+    tools=[{"name": "test_tool"}],
+    kwargs={"auto_disable_thinking_with_tools": True},
+    expected_in=["<think>\n</think>\n"], # Should be stripped
+)
+
+execute_test(
+    "auto_disable_thinking_with_tools (disabled via kwarg -> allows thinking)",
+    messages=[{"role": "user", "content": "Hello!"}],
+    tools=[{"name": "test_tool"}],
+    kwargs={"auto_disable_thinking_with_tools": False},
+    expected_in=["<think>\n"],
+    expected_not_in=["<think>\n</think>\n"]
+)
+
+# 2. inline <|think_on|> overrides auto_disable_thinking_with_tools
+execute_test(
+    "inline <|think_on|> overrides auto_disable",
+    messages=[{"role": "user", "content": "Hello! <|think_on|>"}],
+    tools=[{"name": "test_tool"}],
+    kwargs={"auto_disable_thinking_with_tools": True},
+    expected_in=["<think>\n"],
+    expected_not_in=["<think>\n</think>\n", "<|think_on|>"] # Tag must be stripped
+)
+
+# 3. Payload truncation
+execute_test(
+    "max_tool_arg_chars truncation",
+    messages=[{"role": "user", "content": "Call tool"}, {"role": "assistant", "content": "", "tool_calls": [{"function": {"name": "test", "arguments": {"param": "1234567890"}}}]}],
+    kwargs={"max_tool_arg_chars": 5},
+    expected_in=["12345\n[TRUNCATED"]
+)
+
+execute_test(
+    "max_tool_response_chars truncation",
+    messages=[{"role": "user", "content": "Do it"}, {"role": "assistant", "content": "calling", "tool_calls": [{"name": "test"}]}, {"role": "tool", "content": "1234567890"}],
+    kwargs={"max_tool_response_chars": 5},
+    expected_in=["<tool_response>\n12345\n[TRUNCATED"]
+)
+
+# 4. Mid-conversation System Prompt
+execute_test(
+    "mid-conversation system prompt",
+    messages=[{"role": "user", "content": "Hello"}, {"role": "system", "content": "Reminder: Be polite"}],
+    expected_in=["<|im_start|>system\nReminder: Be polite<|im_end|>"]
+)
+
+# 5. Parallel tools delimiter
+execute_test(
+    "parallel tools delimiter",
+    messages=[{"role": "user", "content": "x"}, {"role": "assistant", "content": "", "tool_calls": [{"name": "t1"}, {"name": "t2"}]}],
+    expected_in=["</tool_call>\n\n<tool_call>"]
+)
+
+# 6. Deep Agent Fallback
+execute_test(
+    "deep agent fallback (no user message)",
+    messages=[{"role": "system", "content": "Sys"}, {"role": "tool", "content": "test"}],
+    expected_in=["<|im_start|>system\nSys", "<|im_start|>user\n<tool_response>"]
+)
+
+# 7. Error Escalation
+execute_test(
+    "error escalation warnings",
+    messages=[
+        {"role": "user", "content": "Do it"}, 
+        {"role": "tool", "content": "error: something failed"},
+        {"role": "assistant", "content": "calling"},
+        {"role": "tool", "content": "error: failed again"}
+    ],
+    expected_in=["⚠️ SYSTEM WARNING: 2 consecutive tool errors", "<think>\n</think>\n"]
+)
+
+print(f"\n=============================")
+print(f"Test Summary: {tests_passed} / {tests_total} passed.")
+if tests_passed == tests_total:
+    print("All tests passed successfully! 🎉")
+    sys.exit(0)
+else:
+    print("Some tests failed.")
+    sys.exit(1)