From e6a49c404f3b43e14400c5eaf303c1f99aed80bc Mon Sep 17 00:00:00 2001
From: Concedo <39025047+LostRuins@users.noreply.github.com>
Date: Fri, 3 Apr 2026 12:20:01 +0800
Subject: [PATCH] fixed gemma4 templates, basic non thinking is working fine on
 all models now

---
 embd_res/klite.embd                                 | 11 ++++++++++-
 kcpp_adapters/AutoGuess-NoThink.json                | 13 ++++++++++++-
 kcpp_adapters/AutoGuess.json                        | 13 ++++++++++++-
 kcpp_adapters/Gemma-4-26B-31B.json                  |  8 ++++++++
 .../{Gemma-4.json => Gemma-4-E2B-E4B.json}          |  0
 5 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 kcpp_adapters/Gemma-4-26B-31B.json
 rename kcpp_adapters/{Gemma-4.json => Gemma-4-E2B-E4B.json} (100%)

diff --git a/embd_res/klite.embd b/embd_res/klite.embd
index 438bb9047..704fa6814 100644
--- a/embd_res/klite.embd
+++ b/embd_res/klite.embd
@@ -4655,7 +4655,7 @@ Current version indicated by LITEVER below.
 		"system_end":"<end_of_turn>\\n",
 	},
 	{
-		"name":"Gemma 4",
+		"name":"Gemma 4 E2B & E4B",
 		"user":"<|turn>user\\n",
 		"user_end":"<turn|>\\n",
 		"assistant":"<|turn>model\\n",
@@ -4663,6 +4663,15 @@ Current version indicated by LITEVER below.
 		"system":"<|turn>system\\n",
 		"system_end":"<turn|>\\n",
 	},
+	{
+		"name":"Gemma 4 26B & 31B",
+		"user":"<|turn>user\\n",
+		"user_end":"<turn|>\\n",
+		"assistant":"<|turn>model\\n<|channel>thought\\n<channel|>",
+		"assistant_end":"<turn|>\\n",
+		"system":"<|turn>system\\n",
+		"system_end":"<turn|>\\n",
+	},
 	{
 		"name":"GLM-4 & 4.5",
 		"user":"<|user|>\\n",
diff --git a/kcpp_adapters/AutoGuess-NoThink.json b/kcpp_adapters/AutoGuess-NoThink.json
index a8baec3ce..d77d9d835 100644
--- a/kcpp_adapters/AutoGuess-NoThink.json
+++ b/kcpp_adapters/AutoGuess-NoThink.json
@@ -76,9 +76,20 @@
         "assistant_start": "<start_of_turn>model\n",
         "assistant_end": "<end_of_turn>\n"
     }
+}, {
+    "search": ["<|turn>model","<|think|>","<|channel>thought"],
+    "name": "Google Gemma 4 (26B and 31B)",
+    "adapter": {
+        "system_start": "<|turn>system\n",
+        "system_end": "<turn|>\n",
+        "user_start": "<|turn>user\n",
+        "user_end": "<turn|>\n",
+        "assistant_start": "<|turn>model\n<|channel>thought\n<channel|>",
+        "assistant_end": "<turn|>\n"
+    }
 }, {
     "search": ["<|turn>model","<|think|>"],
-    "name": "Google Gemma 4",
+    "name": "Google Gemma 4 (E2B and E4B)",
     "adapter": {
         "system_start": "<|turn>system\n",
         "system_end": "<turn|>\n",
diff --git a/kcpp_adapters/AutoGuess.json b/kcpp_adapters/AutoGuess.json
index 3a45b6265..e8acbdb41 100644
--- a/kcpp_adapters/AutoGuess.json
+++ b/kcpp_adapters/AutoGuess.json
@@ -76,9 +76,20 @@
         "assistant_start": "<start_of_turn>model\n",
         "assistant_end": "<end_of_turn>\n"
     }
+}, {
+    "search": ["<|turn>model","<|think|>","<|channel>thought"],
+    "name": "Google Gemma 4 (26B and 31B)",
+    "adapter": {
+        "system_start": "<|turn>system\n",
+        "system_end": "<turn|>\n",
+        "user_start": "<|turn>user\n",
+        "user_end": "<turn|>\n",
+        "assistant_start": "<|turn>model\n<|channel>thought\n<channel|>",
+        "assistant_end": "<turn|>\n"
+    }
 }, {
     "search": ["<|turn>model","<|think|>"],
-    "name": "Google Gemma 4",
+    "name": "Google Gemma 4 (E2B and E4B)",
     "adapter": {
         "system_start": "<|turn>system\n",
         "system_end": "<turn|>\n",
diff --git a/kcpp_adapters/Gemma-4-26B-31B.json b/kcpp_adapters/Gemma-4-26B-31B.json
new file mode 100644
index 000000000..6fbb6e4f5
--- /dev/null
+++ b/kcpp_adapters/Gemma-4-26B-31B.json
@@ -0,0 +1,8 @@
+{
+  "system_start": "<|turn>system\n",
+  "system_end": "<turn|>\n",
+  "user_start": "<|turn>user\n",
+  "user_end": "<turn|>\n",
+  "assistant_start": "<|turn>model\n<|channel>thought\n<channel|>",
+  "assistant_end": "<turn|>\n"
+}
\ No newline at end of file
diff --git a/kcpp_adapters/Gemma-4.json b/kcpp_adapters/Gemma-4-E2B-E4B.json
similarity index 100%
rename from kcpp_adapters/Gemma-4.json
rename to kcpp_adapters/Gemma-4-E2B-E4B.json