Enable reasoning-effort tiers and preserve-thinking in chat_template.jinja

chat_template.jinja

@@ -46,10 +46,51 @@
     {{- raise_exception('Unexpected content type.') }}
   {%- endif %}
 {%- endmacro %}
+
 {%- if not messages %}
   {{- raise_exception('No messages provided.') }}
 {%- endif %}
-{%- if tools and tools is iterable and tools is not mapping %}
+
+{# --- 1. REASONING EFFORT RESOLUTION & PRESERVE-THINKING DISCOVERY --- #}
+{%- if preserve_reasoning is defined and preserve_reasoning is not none %}
+  {%- set _preserve_thinking = preserve_reasoning %}
+{%- elif preserve_thinking is defined and preserve_thinking is not none %}
+  {%- set _preserve_thinking = preserve_thinking %}
+{%- else %}
+  {%- set _preserve_thinking = true %}
+{%- endif %}
+
+{%- set _raw_effort = (reasoning_effort | string | lower) if reasoning_effort is defined and reasoning_effort is not none else ((thinking_effort | string | lower) if thinking_effort is defined and thinking_effort is not none else 'medium') %}
+{%- set _enable_thinking = true %}
+{%- if enable_thinking is defined and enable_thinking is false %}
+  {%- set _enable_thinking = false %}
+{%- elif _raw_effort in ['none', 'off', 'false', '0'] %}
+  {%- set _enable_thinking = false %}
+{%- endif %}
+
+{%- set _resolved_effort = 'medium' %}
+{%- if _raw_effort in ['minimal', 'min', 'low', '1'] %}
+  {%- set _resolved_effort = 'low' %}
+{%- elif _raw_effort in ['high', '3'] %}
+  {%- set _resolved_effort = 'high' %}
+{%- elif _raw_effort in ['xhigh', 'max', 'extreme', 'ultracode', '4'] %}
+  {%- set _resolved_effort = 'xhigh' %}
+{%- endif %}
+
+{%- set _effort_prompt = '' %}
+{%- if _enable_thinking %}
+  {%- if _resolved_effort == 'low' %}
+    {%- set _effort_prompt = 'Reasoning effort is set to low. Keep your thinking concise, efficient, and direct to the point.' %}
+  {%- elif _resolved_effort == 'high' %}
+    {%- set _effort_prompt = 'Reasoning effort is set to high. Think thoroughly through all steps, verify logic, and test potential edge cases.' %}
+  {%- elif _resolved_effort == 'xhigh' %}
+    {%- set _effort_prompt = 'Reasoning effort is set to xhigh. Please think exhaustively through the task, systematically exploring alternative hypotheses and proving edge cases before answering.' %}
+  {%- endif %}
+{%- endif %}
+
+{# --- 2. SYSTEM PROMPT & TOOL DECLARATIONS --- #}
+{%- set _has_tools = (tools and tools is iterable and tools is not mapping) %}
+{%- if _has_tools %}
   {{- '<|im_start|>system\n' }}
   {{- "# Tools\n\nYou have access to the following functions:\n\n<tools>" }}
   {%- for tool in tools %}
@@ -64,13 +105,23 @@
       {{- '\n\n' + content }}
     {%- endif %}
   {%- endif %}
+  {%- if _effort_prompt %}
+    {{- '\n\n' + _effort_prompt }}
+  {%- endif %}
   {{- '<|im_end|>\n' }}
 {%- else %}
   {%- if messages[0].role == 'system' %}
     {%- set content = render_content(messages[0].content, false, true)|trim %}
+    {%- if _effort_prompt %}
+      {%- set content = content + ('\n\n' + _effort_prompt if content else _effort_prompt) %}
+    {%- endif %}
     {{- '<|im_start|>system\n' + content + '<|im_end|>\n' }}
+  {%- elif _effort_prompt %}
+    {{- '<|im_start|>system\n' + _effort_prompt + '<|im_end|>\n' }}
   {%- endif %}
 {%- endif %}
+
+{# --- 3. MULTI-TURN MESSAGE EXTRACTION & REASONING PRESERVATION --- #}
 {%- set ns = namespace(multi_step_tool=true, last_query_index=messages|length - 1) %}
 {%- for message in messages[::-1] %}
   {%- set index = (messages|length - 1) - loop.index0 %}
@@ -85,6 +136,7 @@
 {%- if ns.multi_step_tool %}
   {{- raise_exception('No user query found in messages.') }}
 {%- endif %}
+
 {%- for message in messages %}
   {%- set content = render_content(message.content, true)|trim %}
   {%- if message.role == "system" %}
@@ -104,11 +156,19 @@
       {%- endif %}
     {%- endif %}
     {%- set reasoning_content = reasoning_content|trim %}
-    {%- if loop.index0 > ns.last_query_index %}
-      {{- '<|im_start|>' + message.role + '\n<think>\n' + reasoning_content + '\n</think>\n\n' + content }}
+    
+    {# Honor preserve_thinking: keep prior thoughts if true, strip older thoughts if false #}
+    {%- if _preserve_thinking or loop.index0 > ns.last_query_index %}
+      {%- if reasoning_content %}
+        {{- '<|im_start|>' + message.role + '\n<think>\n' + reasoning_content + '\n</think>\n\n' + content }}
+      {%- else %}
+        {{- '<|im_start|>' + message.role + '\n' + content }}
+      {%- endif %}
     {%- else %}
       {{- '<|im_start|>' + message.role + '\n' + content }}
     {%- endif %}
+
+    {# Function call serialization #}
     {%- 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 %}
@@ -151,9 +211,11 @@
     {{- raise_exception('Unexpected message role: ' ~ message.role) }}
   {%- endif %}
 {%- endfor %}
+
+{# --- 4. GENERATION PROMPT PREFILL --- #}
 {%- if add_generation_prompt %}
   {{- '<|im_start|>assistant\n' }}
-  {%- if enable_thinking is defined and enable_thinking is false %}
+  {%- if not _enable_thinking %}
     {{- '<think>\n\n</think>\n\n' }}
   {%- else %}
     {{- '<think>\n' }}