From 3468c2834de7fe012f22cc63dc675bf9f19691b0 Mon Sep 17 00:00:00 2001
From: Concedo <39025047+LostRuins@users.noreply.github.com>
Date: Fri, 8 Aug 2025 22:26:36 +0800
Subject: [PATCH] fixed adv mode

---
 kcpp_adapters/OpenAI-Harmony.json | 2 +-
 klite.embd                        | 8 ++++----
 model_adapter.cpp                 | 4 ++++
 model_adapter.h                   | 1 +
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/kcpp_adapters/OpenAI-Harmony.json b/kcpp_adapters/OpenAI-Harmony.json
index 5176b2a53..eaa1bee8d 100644
--- a/kcpp_adapters/OpenAI-Harmony.json
+++ b/kcpp_adapters/OpenAI-Harmony.json
@@ -4,5 +4,5 @@
   "user_start": "<|start|>user<|message|>",
   "user_end": "<|end|>",
   "assistant_start": "<|start|>assistant<|channel|>final<|message|>",
-  "assistant_end": "<|return|>"
+  "assistant_end": "<|end|>"
 }
diff --git a/klite.embd b/klite.embd
index 14752ec75..8f37a06da 100644
--- a/klite.embd
+++ b/klite.embd
@@ -12,7 +12,7 @@ Current version indicated by LITEVER below.
 -->
 
 <script id="init-config">
-	const LITEVER = 268;
+	const LITEVER = 269;
 	const urlParams = new URLSearchParams(window.location.search);
 	var localflag = urlParams.get('local'); //this will be replaced automatically in embedded kcpp
 	const STORAGE_PREFIX = (localflag?"e_":"")+"kaihordewebui_";
@@ -3633,7 +3633,7 @@ Current version indicated by LITEVER below.
 		"user":"<|start|>user<|message|>",
 		"user_end":"<|end|>",
 		"assistant":"<|start|>assistant<|channel|>final<|message|>",
-		"assistant_end":"<|return|>",
+		"assistant_end":"<|end|>",
 		"system":"<|start|>developer<|message|>",
 		"system_end":"<|end|>",
 	}
@@ -15975,12 +15975,12 @@ Current version indicated by LITEVER below.
 				newgen = "\n\n\> " + newgen + diceaddon + "\n\n";
 			}
 			//if very first submission is a story in adventure mode, swap to action
-			if(localsettings.opmode == 2 && newgen != "" && gametext_arr.length==0)
+			if(localsettings.opmode == 2 && (gametext_arr.length==0 || (gametext_arr.length==1 && gametext_arr[0]=="")))
 			{
 				if(localsettings.adventure_switch_mode==0)
 				{
 					localsettings.adventure_switch_mode = 1;
-					if (current_memory.trim() == "")
+					if (current_memory.trim() == "" && newgen!="")
 					{
 						doNotGenerate = true;
 					}
diff --git a/model_adapter.cpp b/model_adapter.cpp
index 77db8f02c..3918a184b 100644
--- a/model_adapter.cpp
+++ b/model_adapter.cpp
@@ -356,6 +356,10 @@ void print_tok_vec(std::vector<float> &embd)
             {
                 fileformatmeta->model_architecture = GGUFArch::ARCH_GLM4;
             }
+            else if(modelarch=="gpt-oss")
+            {
+                fileformatmeta->model_architecture = GGUFArch::ARCH_GPTOSS;
+            }
             printf("Arch Category: %d\n",fileformatmeta->model_architecture);
 
         }
diff --git a/model_adapter.h b/model_adapter.h
index ff3cb342c..a542a4ad1 100644
--- a/model_adapter.h
+++ b/model_adapter.h
@@ -64,6 +64,7 @@ enum GGUFArch
     ARCH_GLM4 = 9,
     ARCH_GEMMA3N = 10,
     ARCH_JAMBA = 11,
+    ARCH_GPTOSS = 12,
 };
 
 struct FileFormatExtraMeta