Fix universal.jinja: remove dead _terse_on set referencing is_explicit_regular before definition (crashes under StrictUndefined)

templates/universal.jinja

@@ -1,4 +1,76 @@
 {%- set template_version = template_version if template_version is defined else "protium-v1.0.0-objective-gated" %}
+
+{#- ========================================================================== -#}
+{#- PROTIUM-1.0 — OBJECTIVE-GATED COGNITIVE ARCHITECTURE                        -#}
+{#- Solstice-AI Zero-Waste Protocol for High-Efficiency Reasoning Models       -#}
+{#- Named after Protium (1H): Zero Neutrons. Zero Dead Weight. Pure Thrust.    -#}
+{#- Lineage: qwen3.8-froggeric-v22.5.0 (DavidAU, MIT) -> Solstice-AI           -#}
+{#-                                                                             -#}
+{#- CORE TENETS:                                                                -#}
+{#-   1. TOKEN 1 TARGET ANCHOR: Lock the termination condition at step 1.       -#}
+{#-   2. FORWARD-ONLY SOLVE: Advance directly toward the target. Eliminate      -#}
+{#-      conversational filler ("let's see", "hmm", "wait"). No rhetorical     -#}
+{#-      hesitation; execute pure continuous deduction.                         -#}
+{#-   3. EARLY EXIT GATE: Terminate thinking the instant the target condition   -#}
+{#-      is satisfied and verified. Never dwell, stall, or manufacture doubt.   -#}
+{#-   4. DELTA-ONLY CORRECTION: Fix only the broken variable upon contradiction;-#}
+{#-      never regress into full restarts or circular overthinking loops.       -#}
+{#-   5. ABSOLUTE RESOLVE: Decisive, unhedged final delivery. Zero preamble.    -#}
+{#-                                                                             -#}
+{#- THE SPECTRUM (governed purely by problem constraints & verification):       -#}
+{#-   [L0] Mortal     - thinking off; execute directly.                         -#}
+{#-   [L1] Hermes     - rapid instinct; immediate verification pass.            -#}
+{#-   [L2] Apollo     - disciplined deduction; linear constraint trace.         -#}
+{#-   [L3] Artemis    - edge-case & boundary vulnerability audit.               -#}
+{#-   [L4] Athena     - strategic synthesis; architectural trade-offs.          -#}
+{#-   [L5] Prometheus - defensive engineering; second-order failure modeling.   -#}
+{#-   [L6] Solstice   - axiomatic derivation; multi-hypothesis stress testing.  -#}
+{#-   [L7] Hyperion   - ground-up first-principles decomposition.               -#}
+{#-   [L8] Einstein   - theoretical mastery; unified invariant reduction.       -#}
+{#-   [L9] Oracle     - proof-grade formal authority; zero placeholders.        -#}
+{#-   [L10] Proteus   - dynamic cognitive adaptation (Default); auto-calibrated -#}
+{#-                     impedance matching across all levels with early exit.   -#}
+{#-   swarm            - 20-perspective divergent swarm, verdict line.           -#}
+{#-   council          - adversarial research council, verdict line.             -#}
+{#-                                                                             -#}
+{#- CONTINUOUS DEPTH MAP (10-100):  1-14 L1 | 15-29 L2 | 30-44 L3 | 45-59 L4 |  -#}
+{#-    60-69 L5 | 70-79 L6 | 80-89 L7 | 90-96 L8 | 97-100 L9 | 0 = off.         -#}
+{#-                                                                             -#}
+{#- INLINE SYNTAX (case-insensitive, stripped before model sees them):          -#}
+{#-    [L0]..[L9] | {REASON:level|name|number} | [MODE:level|name|number]       -#}
+{#-    [regular] | [vanilla] | [standard] | [default]                           -#}
+{#-    Prefix 'i' = silent variant: {REASON:i8} runs L8 rigor, thinking hidden. -#}
+{#- PRECEDENCE: default L7  <  runtime kwarg  <  inline signals (last wins).    -#}
+{#- ========================================================================== -#}
+
+{#- ------------------------------------------------------------------ -#}
+{#- RUNTIME KWARGS                                                      -#}
+{#- ------------------------------------------------------------------ -#}
+{%- set _tool_format = tool_call_format if tool_call_format is defined else 'xml' %}
+{%- 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 %}
+{%- 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 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 _has_budget = (thinking_budget is defined and thinking_budget and (thinking_budget | int) > 0) or (max_thinking_tokens is defined and max_thinking_tokens and (max_thinking_tokens | int) > 0) %}
+{%- set _budget_val = (thinking_budget | int) if (thinking_budget is defined and thinking_budget and (thinking_budget | int) > 0) else ((max_thinking_tokens | int) if (max_thinking_tokens is defined and max_thinking_tokens) else 0) %}
+{%- set suppress_tool_instructions = suppress_tool_instructions if suppress_tool_instructions is defined else none %}
+
+{#- ================================================================== -#}
+{#- S3 PRIMITIVES — render & scan helpers (no cognitive content).       -#}
+{#- ================================================================== -#}
+
+{#- Content renderer with vision support (render loop only). -#}
 {%- macro render_content(content, do_vision_count, is_system_content=false) %}
     {%- if content is string %}
         {{- content }}
@@ -42,6 +114,9 @@
         {{- raise_exception('Unexpected content type.') }}
     {%- endif %}
 {%- endmacro %}
+
+{#- Text-only scanner renderer: images/videos render as '' so the S1 scan -#}
+{#- pass never raises on multimodal messages (v2.x vision bug fixed).     -#}
 {%- macro scan_text(content) %}
     {%- if content is string %}
         {{- content }}
@@ -55,6 +130,7 @@
         {%- endfor %}
     {%- endif %}
 {%- endmacro %}
+
 {#- Strip every inline control tag from visible text. -#}
 {%- macro strip_control_tags(text) %}
     {%- set t = text %}
@@ -73,6 +149,8 @@
     {%- set out = t3 | replace('[regular]', '') | replace('[REGULAR]', '') | replace('[vanilla]', '') | replace('[standard]', '') | replace('[default]', '') | replace('[L10]', '') | replace('[l10]', '') | replace('[L0]', '') | replace('[l0]', '') | replace('[L1]', '') | replace('[l1]', '') | replace('[L2]', '') | replace('[l2]', '') | replace('[L3]', '') | replace('[l3]', '') | replace('[L4]', '') | replace('[l4]', '') | replace('[L5]', '') | replace('[l5]', '') | replace('[L6]', '') | replace('[l6]', '') | replace('[L7]', '') | replace('[l7]', '') | replace('[L8]', '') | replace('[l8]', '') | replace('[L9]', '') | replace('[l9]', '') %}
     {{- out }}
 {%- endmacro %}
+
+{#- Remove only a {REASON:...} / [MODE:...] tag (assistant history path). -#}
 {%- macro strip_mode_tag(text) %}
     {%- set t = text %}
     {%- if '{REASON:' in t %}
@@ -84,6 +162,9 @@
     {%- endif %}
     {{- t }}
 {%- endmacro %}
+
+{#- Tool output error classifier → 'error' | 'ok'. Shares ONE definition -#}
+{#- with the S1 failure pre-pass and the render-loop warning counter.     -#}
 {%- macro classify_tool_output(content) %}
     {%- set _lower = content | lower %}
     {%- set _head = _lower[:120] %}
@@ -99,6 +180,12 @@
         {{- 'ok' }}
     {%- endif %}
 {%- endmacro %}
+
+{#- ================================================================== -#}
+{#- S2 COGNITIVE PROFILES — pure text. Soft shares only; there are no   -#}
+{#- token counts, word floors or ceilings anywhere in this section.     -#}
+{#- ================================================================== -#}
+
 {%- set soft_budget_contract -%}
 PROTIUM OBJECTIVE-GATED REASONING CONTRACT:
 1. Target Anchor: At token 1, isolate the exact termination criteria — define what a completed, verified solution requires before executing.
@@ -109,6 +196,7 @@ PROTIUM OBJECTIVE-GATED REASONING CONTRACT:
 6. Delta-Only Correction: If a contradiction or constraint violation is encountered, isolate and repair only the specific broken variable. Never regress into circular overthinking loops or full restarts.
 7. Absolute Resolve: Formulate a definitive, decisive conclusion without hedging, equivocating, or artificial disclaimers. Correctness and crisp utility are the sole metrics.
 {%- endset %}
+
 {%- set terse_core -%}
 Operational Directives:
 - Zero preamble, pleasantries, or question restatements.
@@ -116,6 +204,7 @@ Operational Directives:
 - Retain all essential mathematical, programmatic, and logical technical rigor.
 - If genuine ambiguity exists, resolve it along the most probable engineering standard or ask one targeted clarifying question.
 {%- endset %}
+
 {%- set inst_hermes -%}
 Reasoning effort: Hermes — [L1] (rapid instinct).
 Mindset: High-velocity execution. Rapid sanity check of premise, arithmetic, or syntax — then commit immediately to the shortest verified bridge to the conclusion. Conclude immediately once obvious.
@@ -169,7 +258,14 @@ Reasoning effort: Council — adversarial research council (specialized mode).
 Mindset: Five-protocol institutional deliberation. Protocol 1: Parameter calibration and success criteria. Protocol 2: Multi-specialist panel assembly. Protocol 3: Adversarial debate and stress-testing. Protocol 4: Trade-off scoring matrix. Protocol 5: Master architecture.
 Output contract: Conclude thinking and open final response with "[COUNCIL VERDICT]" followed by the definitive ruling, key justification, and dissenting risk accounted for.
 {%- endset %}
+
+{#- ================================================================== -#}
+{#- S1 RESOLUTION CORE — one pass, one state, one resolver.             -#}
+{#- ================================================================== -#}
+
+{#- Baseline: runtime kwarg (session default). thinking_level supported. -#}
 {%- set _kwarg_effort = '' %}
+
 {%- set reg_ns = namespace(active=false) %}
 {%- if (regular is defined and regular) or (mode is defined and mode in ('regular', 'vanilla', 'standard', 'default', 'clean')) %}
     {%- set reg_ns.active = true %}
@@ -203,6 +299,9 @@ Output contract: Conclude thinking and open final response with "[COUNCIL VERDIC
 {%- if auto_disable_thinking_with_tools and _has_tools %}
     {%- set ns_state.thinking = false %}
 {%- endif %}
+
+{#- Unified scan pass: collect mode tags, inline signals, cleaned messages. -#}
+{#- Later signals override earlier ones (mid-chat re-escalation works).     -#}
 {%- set store = namespace(messages=[], raw_mode='', saw_inline=false) %}
 {%- if not messages %}
     {{- raise_exception('No messages provided.') }}
@@ -228,6 +327,7 @@ Output contract: Conclude thinking and open final response with "[COUNCIL VERDIC
         {%- endfor %}
     {%- endif %}
     {%- set _has_inline = _hi.v %}
+    {#- Inline think-tags + [L#] (steering roles only). Later messages win. -#}
     {%- if _is_steering %}
         {%- if '<|think_off|>' in _low %}
             {%- set ns_state.thinking = false %}
@@ -291,6 +391,7 @@ Output contract: Conclude thinking and open final response with "[COUNCIL VERDIC
             {%- endfor %}
         {%- endif %}
     {%- endif %}
+    {#- {REASON:...} / [MODE:...] extraction (any role). -#}
     {%- set _tagged = ('{REASON:' in _txt) or ('[MODE:' in _txt) %}
     {%- if _tagged %}
         {%- set _raw_reason = '' %}
@@ -320,10 +421,13 @@ Output contract: Conclude thinking and open final response with "[COUNCIL VERDIC
             {%- endif %}
         {%- endif %}
     {%- endif %}
+    {#- Build cleaned message store. Messages WITHOUT inline signals pass -#}
+    {#- through untouched, so multi-modal parts (images/videos) survive.     -#}
     {%- if _tagged and _role == 'assistant' %}
         {%- set _clean = strip_mode_tag(_txt) | trim %}
         {%- set store.messages = store.messages + [{'role': _role, 'content': _clean, 'tool_calls': (msg.tool_calls if msg.tool_calls is defined else none), 'reasoning_content': (msg.reasoning_content if msg.reasoning_content is defined else none), 'thinking': (msg.thinking if msg.thinking is defined else none), 'reasoning': (msg.reasoning if msg.reasoning is defined else none)}] %}
     {%- elif _is_steering and _has_inline %}
+        {#- Multi-modal aware strip: clean text items, keep image/video parts. -#}
         {%- if msg.content is string %}
             {%- set _clean = strip_control_tags(_txt) | trim %}
             {%- set store.messages = store.messages + [{'role': _role, 'content': _clean}] %}
@@ -346,6 +450,11 @@ Output contract: Conclude thinking and open final response with "[COUNCIL VERDIC
 {%- endfor %}
 {%- set messages = store.messages %}
 {%- set _depth_explicit = (_depth_explicit or store.saw_inline) %}
+
+{#- Continuous depth: pure integers 10-100 map onto the spectrum band. -#}
+{#- 0-9 stay legacy level numbers so old clients keep exact behaviour.  -#}
+{#- NB: int-filter round-trip instead of .isdigit() — minja (llama.cpp) -#}
+{#- does not implement string.isdigit().                                -#}
 {%- set _eff_int = ns_state.effort | int %}
 {%- if ns_state.mode == 'level' and ns_state.effort is string and (_eff_int | string) == ns_state.effort and _eff_int >= 11 %}
     {%- set _n = ns_state.effort | int %}
@@ -370,6 +479,8 @@ Output contract: Conclude thinking and open final response with "[COUNCIL VERDIC
         {%- set ns_state.effort = '9' %}
     {%- endif %}
 {%- endif %}
+
+{#- Depth-tool coupling, part A: trailing tool-failure streak pre-pass. -#}
 {%- set _streak = namespace(value=0) %}
 {%- for msg in messages %}
     {%- if msg.role == 'tool' %}
@@ -383,6 +494,11 @@ Output contract: Conclude thinking and open final response with "[COUNCIL VERDIC
         {%- set _streak.value = 0 %}
     {%- endif %}
 {%- endfor %}
+
+{#- Depth-tool coupling, part B: state adjustment BEFORE rendering. -#}
+{#- Collapse: tools attached, no explicit depth signal → [L4].          -#}
+{#- Escalate: 2+ consecutive tool failures → +1 band, capped at [L7].   -#}
+{#- Swarm/council profiles are never auto-tuned (non-numeric effort).   -#}
 {%- if _has_tools and not _depth_explicit and ns_state.thinking %}
     {%- set ns_state.effort = '4' %}
 {%- endif %}
@@ -404,6 +520,12 @@ Output contract: Conclude thinking and open final response with "[COUNCIL VERDIC
         {%- set ns_state.effort = '7' %}
     {%- endif %}
 {%- endif %}
+
+{#- Alias resolver: number / name / compat alias → profile. Runs AFTER -#}
+{#- coupling, so the rendered profile always matches the final effort.  -#}
+{#- Unknown input degrades gracefully to [L7]; it never hard-fails.     -#}
+{#- Silent modes (i-prefix) still inject the depth profile: the model   -#}
+{#- reasons at that quality internally while thinking tags stay closed. -#}
 {%- set reasoning_instructions = '' %}
 {%- if ns_state.thinking or ns_state.silent_profile %}
     {%- set target_mode = ns_state.effort if ns_state.effort else '10' %}
@@ -435,6 +557,11 @@ Output contract: Conclude thinking and open final response with "[COUNCIL VERDIC
         {%- set reasoning_instructions = inst_proteus %}
     {%- endif %}
 {%- endif %}
+
+{#- ================================================================== -#}
+{#- S3 RENDER PIPELINE — ChatML emission.                               -#}
+{#- ================================================================== -#}
+
 {#- Leading system-message grouping. -#}
 {%- set head = namespace(count=0, seen_non_system=false) %}
 {%- for message in messages %}
@@ -467,12 +594,16 @@ Output contract: Conclude thinking and open final response with "[COUNCIL VERDIC
         {%- set _sc = (_sc | trim) ~ '\n\n' ~ (terse_core | trim) %}
     {%- endif %}
 {%- endif %}
+
+{#- Some runtimes prepend their own tool protocol; stand down if seen. -#}
 {%- set _runtime_tool_protocol = (_sc is defined and _sc and '[TOOL_REQUEST]' in _sc) %}
 {%- if suppress_tool_instructions is not none %}
     {%- set _suppress_tools = suppress_tool_instructions %}
 {%- else %}
     {%- set _suppress_tools = _runtime_tool_protocol %}
 {%- endif %}
+
+{#- System emission: profile + soft contract + tools. -#}
 {%- if reasoning_instructions or _sc or (_has_tools and not _suppress_tools) %}
     {{- '<|im_start|>system\n' }}
     {%- if reasoning_instructions %}
@@ -516,6 +647,8 @@ Output contract: Conclude thinking and open final response with "[COUNCIL VERDIC
         {%- endif %}
     {%- endif %}
 {%- endif %}
+
+{#- Last real user turn (for preserve_thinking tail logic). -#}
 {%- set _last_idx = _msgs | length - 1 %}
 {%- set ns = namespace(multi_step_tool=true, last_query_index=_last_idx) %}
 {%- for message in _msgs[::-1] %}
@@ -535,6 +668,8 @@ Output contract: Conclude thinking and open final response with "[COUNCIL VERDIC
         {%- set ns.last_query_index = 0 %}
     {%- endif %}
 {%- endif %}
+
+{#- Message render loop. -#}
 {%- set ns2 = namespace(prev_role='', consecutive_failures=0) %}
 {%- for message in _msgs %}
     {%- set is_system = (message.role == "system" or message.role == "developer") %}
@@ -727,6 +862,7 @@ Output contract: Conclude thinking and open final response with "[COUNCIL VERDIC
     {%- endif %}
     {%- set ns2.prev_role = message.role %}
 {%- endfor %}
+
 {#- Generation prompt: open thinking when active (variable depth, the model -#}
 {#- decides how far to run), or pre-close it when disabled. -#}
 {%- if add_generation_prompt %}
@@ -738,4 +874,4 @@ Output contract: Conclude thinking and open final response with "[COUNCIL VERDIC
     {%- else %}
         {{- '<think>\n' }}
     {%- endif %}
-{%- endif %}
+{%- endif %}