From 3ae71d81c426d5526827da1df3d930b991d0d62f Mon Sep 17 00:00:00 2001
From: Grail Finder <wohilas@gmail.com>
Date: Sun, 16 Feb 2025 13:43:42 +0300
Subject: Fix: card edit

---
 llm.go    |  4 ++--
 tables.go | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/llm.go b/llm.go
index c9bebc9..85f9d51 100644
--- a/llm.go
+++ b/llm.go
@@ -44,7 +44,6 @@ func (lcp LlamaCPPeer) FormMsg(msg, role string, resume bool) (io.Reader, error)
 		}
 	}
 	if cfg.ToolUse && !resume {
-		// prompt += "\n" + cfg.ToolRole + ":\n" + toolSysMsg
 		// add to chat body
 		chatBody.Messages = append(chatBody.Messages, models.RoleMsg{Role: cfg.ToolRole, Content: toolSysMsg})
 	}
@@ -63,7 +62,8 @@ func (lcp LlamaCPPeer) FormMsg(msg, role string, resume bool) (io.Reader, error)
 	if cfg.ThinkUse && !cfg.ToolUse {
 		prompt += "<think>"
 	}
-	logger.Info("checking prompt for llamacpp", "tool_use", cfg.ToolUse, "msg", msg, "resume", resume, "prompt", prompt)
+	logger.Debug("checking prompt for /completion", "tool_use", cfg.ToolUse,
+		"msg", msg, "resume", resume, "prompt", prompt)
 	payload := models.NewLCPReq(prompt, cfg, defaultLCPProps)
 	data, err := json.Marshal(payload)
 	if err != nil {
diff --git a/tables.go b/tables.go
index 41ea61b..e281dd2 100644
--- a/tables.go
+++ b/tables.go
@@ -112,15 +112,23 @@ func makeChatTable(chatMap map[string]models.Chat) *tview.Table {
 				if err := notifyUser("error", "no such card: "+agentName); err != nil {
 					logger.Warn("failed ot notify", "error", err)
 				}
+				return
+			}
+			if chatBody.Messages[0].Role != "system" || chatBody.Messages[1].Role != agentName {
+				if err := notifyUser("error", "unexpected chat structure; card: "+agentName); err != nil {
+					logger.Warn("failed ot notify", "error", err)
+				}
+				return
 			}
+			// change sys_prompt + first msg
+			cc.SysPrompt = chatBody.Messages[0].Content
+			cc.FirstMsg = chatBody.Messages[1].Content
 			if err := pngmeta.WriteToPng(cc.ToSpec(cfg.UserRole), cc.FilePath, cc.FilePath); err != nil {
 				logger.Error("failed to write charcard",
 					"error", err)
 			}
-			// pages.RemovePage(historyPage)
 			return
 		default:
-			// pages.RemovePage(historyPage)
 			return
 		}
 	})
-- 
cgit v1.2.3