fix(terminal): expand thinking tag stripping to cover commentary and tool_output

stripThinkingTags only removed <think> and <thinking> tags. Models
also leak <commentary>, <tool_output>, <analysis>, <reflection>, and
<inner_monologue> blocks. Expand the regex to strip all internal
reasoning tags when the setting is enabled.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: Natfii

app/src/main/java/com/zeroclaw/android/ui/screen/terminal/TerminalViewModel.kt

@@ -774,10 +774,20 @@ class TerminalViewModel(
             "No chat provider configured \u2014 use /help to see admin commands, " +
                 "or add a provider in Settings > API Keys."
 
-        /** Pattern matching common chain-of-thought tag variants across models. */
+        /**
+         * Pattern matching chain-of-thought and internal reasoning tags
+         * across models.
+         *
+         * Covers `<think>`, `<thinking>`, `<commentary>`, `<tool_output>`,
+         * `<analysis>`, `<reflection>`, and `<inner_monologue>` tag pairs.
+         */
         private val THINKING_TAG_REGEX =
             Regex(
-                "<(?:think|thinking)>[\\s\\S]*?</(?:think|thinking)>",
+                "<(?:think|thinking|commentary|tool_output|analysis" +
+                    "|reflection|inner_monologue)>" +
+                    "[\\s\\S]*?" +
+                    "</(?:think|thinking|commentary|tool_output|analysis" +
+                    "|reflection|inner_monologue)>",
                 RegexOption.IGNORE_CASE,
             )
 
@@ -803,13 +813,14 @@ class TerminalViewModel(
             Regex("""Bound (.+) to (\w+) \((\w+)\)\. Restart daemon to apply\.""")
 
         /**
-         * Removes chain-of-thought thinking tags from a model response.
+         * Removes chain-of-thought and internal reasoning tags from a model response.
          *
-         * Strips `<think>...</think>` and `<thinking>...</thinking>` blocks
-         * emitted by reasoning models (Gemma, DeepSeek-R1, QwQ, etc.).
+         * Strips `<think>`, `<thinking>`, `<commentary>`, `<tool_output>`,
+         * `<analysis>`, `<reflection>`, and `<inner_monologue>` blocks
+         * emitted by reasoning models.
          *
          * @param text Raw model response.
-         * @return Response with thinking blocks removed and whitespace trimmed.
+         * @return Response with reasoning blocks removed and whitespace trimmed.
          */
         fun stripThinkingTags(text: String): String = text.replace(THINKING_TAG_REGEX, "").trim()
 

app/src/test/java/com/zeroclaw/android/ui/screen/terminal/TerminalViewModelTest.kt

@@ -172,6 +172,30 @@ class TerminalViewModelTest {
             assertEquals("Final answer.", result)
         }
 
+        @Test
+        @DisplayName("removes commentary tags from response")
+        fun `removes commentary tags from response`() {
+            val input = "<commentary>Internal notes.</commentary>The answer."
+            val result = TerminalViewModel.stripThinkingTags(input)
+            assertEquals("The answer.", result)
+        }
+
+        @Test
+        @DisplayName("removes tool_output tags from response")
+        fun `removes tool_output tags from response`() {
+            val input = "<tool_output>curl result here</tool_output>Summary."
+            val result = TerminalViewModel.stripThinkingTags(input)
+            assertEquals("Summary.", result)
+        }
+
+        @Test
+        @DisplayName("removes analysis tags from response")
+        fun `removes analysis tags from response`() {
+            val input = "<analysis>We have curl and can reach...</analysis>Yes, I can."
+            val result = TerminalViewModel.stripThinkingTags(input)
+            assertEquals("Yes, I can.", result)
+        }
+
         @Test
         @DisplayName("passes through text without thinking tags")
         fun `passes through text without thinking tags`() {