Fix double think tag when resuming think

chat_template.jinja

@@ -21,19 +21,16 @@ For each function call, output the function name and arguments within the follow
 ...
 </tool_call>
 {%- endif -%}
-
 {%- set ns = namespace(has_system=false) %}
-{%- for m in messages %}
-    {%- if m.role == 'system' %}
+{%- for message in messages %}
+    {%- if message.role == 'system' %}
         {%- set ns.has_system = true %}
     {%- endif %}
 {%- endfor %}
-
 {%- if not ns.has_system and not tools -%}
 <|system|>
 You are INTELLECT-3, a helpful assistant developed by Prime Intellect.
 {%- endif -%}
-
 {%- macro visible_text(content) -%}
     {%- if content is string -%}
         {{- content }}
@@ -49,42 +46,31 @@ You are INTELLECT-3, a helpful assistant developed by Prime Intellect.
         {{- content }}
     {%- endif -%}
 {%- endmacro -%}
-
 {%- set ns = namespace(last_user_index=-1) %}
-{%- for m in messages %}
-    {%- if m.role == 'user' %}
+{%- for message in messages %}
+    {%- if message.role == 'user' %}
         {% set ns.last_user_index = loop.index0 -%}
     {%- endif %}
 {%- endfor %}
-
-{% for m in messages %}
-
-{%- if m.role == 'user' -%}<|user|>
-{{ visible_text(m.content) }}
-
-{%- elif m.role == 'assistant' -%}
+{% for message in messages %}
+{%- if message.role == 'user' -%}<|user|>
+{{ visible_text(message.content) }}
+{%- elif message.role == 'assistant' -%}
 <|assistant|>
-{%- set reasoning_content = '' %}
-{%- set content = visible_text(m.content) %}
-{%- if m.reasoning_content is string %}
-    {%- set reasoning_content = m.reasoning_content %}
+{%- if message.reasoning_content is defined -%}
+    {%- if message.reasoning_content -%}
+        {{ '\n<think>' + message.reasoning_content.strip() + '</think>' }}
+    {%- else -%}
+        {{ '\n<think></think>' }}
+    {%- endif -%}
+    {%- if message.content.strip() -%}
+        {{ '\n' + message.content.strip() }}
+    {%- endif -%}
 {%- else %}
-    {%- if '</think>' in content %}
-        {%- set reasoning_content = content.split('</think>')[0].rstrip('\n').split('<think>')[-1].lstrip('\n') %}
-        {%- set content = content.split('</think>')[-1].lstrip('\n') %}
-    {%- endif %}
-{%- endif %}
-{%- if reasoning_content -%}
-{{ '\n<think>' + reasoning_content.strip() + '</think>' }}
-{%- else -%}
-{{ '\n<think></think>' }}
-{%- endif -%}
-{%- if content.strip() -%}
-{{ '\n' + content.strip() }}
+    {{ '\n' + message.content.strip() }}
 {%- endif -%}
-
-{% if m.tool_calls %}
-{% for tc in m.tool_calls %}
+{% if message.tool_calls %}
+{% for tc in message.tool_calls %}
 {%- if tc.function %}
     {%- set tc = tc.function %}
 {%- endif %}
@@ -96,13 +82,13 @@ You are INTELLECT-3, a helpful assistant developed by Prime Intellect.
 {% endfor %}
 </tool_call>{% endfor %}
 {% endif %}
-{%- elif m.role == 'tool' -%}
-{%- if m.content is string -%}
+{%- elif message.role == 'tool' -%}
+{%- if message.content is string -%}
 {%- if loop.first or (messages[loop.index0 - 1].role != "tool") %}
     {{- '<|observation|>' }}
 {%- endif %}
 {{- '\n<tool_response>\n' }}
-{{- m.content }}
+{{- message.content }}
 {{- '\n</tool_response>' }}
 {%- else -%}
 <|observation|>{% for tr in m.content %}
@@ -111,9 +97,9 @@ You are INTELLECT-3, a helpful assistant developed by Prime Intellect.
 </tool_response>{% endfor -%}
 {% endif -%}
 
-{%- elif m.role == 'system' -%}
+{%- elif message.role == 'system' -%}
 <|system|>
-{{ visible_text(m.content) }}
+{{ visible_text(message.content) }}
 {%- endif -%}
 
 {%- endfor -%}