From: Roj234 <redacted>
Date: Fri, 6 Mar 2026 05:41:11 +0000 (+0800)
Subject: cli : Don't clear system prompt when using '/clear' (#20067)
X-Git-Tag: upstream/0.0.8611~397
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=f7db3f37895ad3a98405afdb84b42ed462542b12;p=pkg%2Fggml%2Fsources%2Fllama.cpp

cli : Don't clear system prompt when using '/clear' (#20067)

* Enhance /clear command to include system prompt

Add system prompt to messages when clearing chat history.

* Use lambda
---

diff --git a/tools/cli/cli.cpp b/tools/cli/cli.cpp
index 65ff4ac6c..13bedf31e 100644
--- a/tools/cli/cli.cpp
+++ b/tools/cli/cli.cpp
@@ -382,12 +382,15 @@ int main(int argc, char ** argv) {
         modalities += ", audio";
     }
 
-    if (!params.system_prompt.empty()) {
-        ctx_cli.messages.push_back({
-            {"role",    "system"},
-            {"content", params.system_prompt}
-        });
-    }
+    auto add_system_prompt = [&]() {
+        if (!params.system_prompt.empty()) {
+            ctx_cli.messages.push_back({
+                {"role",    "system"},
+                {"content", params.system_prompt}
+            });
+        }
+    };
+    add_system_prompt();
 
     console::log("\n");
     console::log("%s\n", LLAMA_ASCII_LOGO);
@@ -477,6 +480,8 @@ int main(int argc, char ** argv) {
             }
         } else if (string_starts_with(buffer, "/clear")) {
             ctx_cli.messages.clear();
+            add_system_prompt();
+
             ctx_cli.input_files.clear();
             console::log("Chat history cleared.\n");
             continue;