pkg/lmcli/provider/anthropic/anthropic.go

@@ -94,11 +94,7 @@ func buildRequest(params model.RequestParameters, messages []model.Message) Requ
 			if err != nil {
 				panic("Could not serialize []ToolCall to XMLFunctionCall")
 			}
-			if len(message.Content) > 0 {
+			message.Content += xmlString
-				message.Content += fmt.Sprintf("\n\n%s", xmlString)
-			} else {
-				message.Content = xmlString
-			}
 		case model.MessageRoleToolResult:
 			xmlFuncResults := convertToolResultsToXMLFunctionResult(msg.ToolResults)
 			xmlString, err := xmlFuncResults.XMLString()
@@ -201,8 +197,6 @@ func (c *AnthropicClient) CreateChatCompletionStream(
 	scanner := bufio.NewScanner(resp.Body)
 	sb := strings.Builder{}
 
-	isToolCall := false
-
 	for scanner.Scan() {
 		line := scanner.Text()
 		line = strings.TrimSpace(line)
@@ -277,8 +271,6 @@ func (c *AnthropicClient) CreateChatCompletionStream(
 							return content, fmt.Errorf("reached </function_calls> stop sequence but no opening tag found")
 						}
 
-						isToolCall = true
-
 						funcCallXml := content[start:]
 						funcCallXml += FUNCTION_STOP_SEQUENCE
 
@@ -324,13 +316,11 @@ func (c *AnthropicClient) CreateChatCompletionStream(
 			case "message_stop":
 				// return the completed message
 				if callback != nil {
-					if !isToolCall {
 					callback(model.Message{
 						Role:    model.MessageRoleAssistant,
 						Content: sb.String(),
 					})
 				}
-				}
 				return sb.String(), nil
 			case "error":
 				return sb.String(), fmt.Errorf("an error occurred: %s", event["error"])

pkg/lmcli/provider/openai/openai.go

@@ -204,7 +204,7 @@ func (c *OpenAIClient) CreateChatCompletionStream(
 	ctx context.Context,
 	params model.RequestParameters,
 	messages []model.Message,
-	callback provider.ReplyCallback,
+	callbback provider.ReplyCallback,
 	output chan<- string,
 ) (string, error) {
 	client := openai.NewClient(c.APIKey)
@@ -256,23 +256,23 @@ func (c *OpenAIClient) CreateChatCompletionStream(
 			return content.String(), err
 		}
 
-		if callback != nil {
+		if callbback != nil {
 			for _, result := range results {
-				callback(result)
+				callbback(result)
 			}
 		}
 
 		// Recurse into CreateChatCompletionStream with the tool call replies
 		messages = append(messages, results...)
-		return c.CreateChatCompletionStream(ctx, params, messages, callback, output)
+		return c.CreateChatCompletionStream(ctx, params, messages, callbback, output)
-	} else {
+	}
-		if callback != nil {
+
-			callback(model.Message{
+	if callbback != nil {
+		callbback(model.Message{
 			Role:    model.MessageRoleAssistant,
 			Content: content.String(),
 		})
 	}
-	}
 
 	return content.String(), err
 }

pkg/tui/tui.go

@@ -2,6 +2,8 @@ package tui
 
 // The terminal UI for lmcli, launched from the `lmcli chat` command
 // TODO:
+// - binding to open selected message/input in $EDITOR
+// - ability to continue or retry previous response
 // - conversation list view
 // - change model
 // - rename conversation
@@ -22,7 +24,6 @@ import (
 	"github.com/charmbracelet/bubbles/viewport"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
-	"github.com/muesli/reflow/wordwrap"
 )
 
 type focusState int
@@ -32,13 +33,6 @@ const (
 	focusMessages
 )
 
-type editorTarget int
-
-const (
-	input editorTarget = iota
-	selectedMessage
-)
-
 type model struct {
 	width  int
 	height int
@@ -50,20 +44,16 @@ type model struct {
 	conversation    *models.Conversation
 	messages        []models.Message
 	waitingForReply bool
-	editorTarget    editorTarget
 	stopSignal      chan interface{}
 	replyChan       chan models.Message
 	replyChunkChan  chan string
-	persistence     bool // whether we will save new messages in the conversation
 	err             error
+	persistence     bool // whether we will save new messages in the conversation
 
 	// ui state
 	focus          focusState
-	wrap            bool     // whether message content is wrapped to viewport width
 	status         string   // a general status message
 	highlightCache []string // a cache of syntax highlighted message content
-	messageOffsets  []int
-	selectedMessage int
 
 	// ui elements
 	content viewport.Model
@@ -100,12 +90,11 @@ type (
 var (
 	userStyle      = lipgloss.NewStyle().Faint(true).Bold(true).Foreground(lipgloss.Color("10"))
 	assistantStyle = lipgloss.NewStyle().Faint(true).Bold(true).Foreground(lipgloss.Color("12"))
-	messageStyle   = lipgloss.NewStyle().PaddingLeft(2).PaddingRight(2)
+	messageStyle   = lipgloss.NewStyle().PaddingLeft(1)
 	headerStyle    = lipgloss.NewStyle().
 			Background(lipgloss.Color("0"))
-	conversationStyle = lipgloss.NewStyle().
+	contentStyle = lipgloss.NewStyle().
-				MarginTop(1).
+			Padding(1)
-				MarginBottom(1)
 	footerStyle = lipgloss.NewStyle().
 			BorderTop(true).
 			BorderStyle(lipgloss.NormalBorder())
@@ -131,35 +120,16 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	var cmds []tea.Cmd
 
 	switch msg := msg.(type) {
-	case msgTempfileEditorClosed:
-		contents := string(msg)
-		switch m.editorTarget {
-		case input:
-			m.input.SetValue(contents)
-		case selectedMessage:
-			m.setMessageContents(m.selectedMessage, contents)
-			if m.persistence && m.messages[m.selectedMessage].ID > 0 {
-				// update persisted message
-				err := m.ctx.Store.UpdateMessage(&m.messages[m.selectedMessage])
-				if err != nil {
-					cmds = append(cmds, wrapError(fmt.Errorf("Could not save edited message: %v", err)))
-				}
-			}
-			m.updateContent()
-		}
 	case tea.KeyMsg:
 		switch msg.String() {
 		case "ctrl+c":
 			if m.waitingForReply {
-				m.stopSignal <- ""
+				m.stopSignal <- "stahp!"
 			} else {
 				return m, tea.Quit
 			}
 		case "ctrl+p":
 			m.persistence = !m.persistence
-		case "ctrl+w":
-			m.wrap = !m.wrap
-			m.updateContent()
 		case "q":
 			if m.focus != focusInput {
 				return m, tea.Quit
@@ -207,16 +177,11 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		reply := models.Message(msg)
 		last := len(m.messages) - 1
 		if last < 0 {
-			panic("Unexpected empty messages handling msgReply")
+			panic("Unexpected messages length handling msgReply")
 		}
-		m.setMessageContents(last, strings.TrimSpace(m.messages[last].Content))
+		if reply.Role == models.MessageRoleToolCall && m.messages[last].Role == models.MessageRoleAssistant {
-		if m.messages[last].Role == models.MessageRoleAssistant {
+			m.setMessage(last, reply)
-			// the last message was an assistant message, so this is a continuation
+		} else if reply.Role != models.MessageRoleAssistant {
-			if reply.Role == models.MessageRoleToolCall {
-				// update last message rrole to tool call
-				m.messages[last].Role = models.MessageRoleToolCall
-			}
-		} else {
 			m.addMessage(reply)
 		}
 
@@ -228,7 +193,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			if err != nil {
 				cmds = append(cmds, wrapError(err))
 			} else {
-				cmds = append(cmds, m.persistConversation())
+				cmds = append(cmds, m.persistRecentMessages())
 			}
 		}
 
@@ -240,12 +205,6 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		cmds = append(cmds, m.waitForReply())
 	case msgResponseEnd:
 		m.waitingForReply = false
-		last := len(m.messages) - 1
-		if last < 0 {
-			panic("Unexpected empty messages handling msgResponseEnd")
-		}
-		m.setMessageContents(last, strings.TrimSpace(m.messages[last].Content))
-		m.updateContent()
 		m.status = "Press ctrl+s to send"
 	case msgResponseError:
 		m.waitingForReply = false
@@ -417,15 +376,11 @@ func initialModel(ctx *lmcli.Context, convShortname string) model {
 		stopSignal:     make(chan interface{}),
 		replyChan:      make(chan models.Message),
 		replyChunkChan: make(chan string),
-
-		wrap:            true,
-		selectedMessage: -1,
 	}
 
 	m.content = viewport.New(0, 0)
 
 	m.input = textarea.New()
-	m.input.CharLimit = 0
 	m.input.Placeholder = "Enter a message"
 
 	m.input.FocusedStyle.CursorLine = lipgloss.NewStyle()
@@ -452,60 +407,11 @@ func initialModel(ctx *lmcli.Context, convShortname string) model {
 	return m
 }
 
-// fraction is the fraction of the total screen height into view the offset
-// should be scrolled into view. 0.5 = items will be snapped to middle of
-// view
-func scrollIntoView(vp *viewport.Model, offset int, fraction float32) {
-	currentOffset := vp.YOffset
-	if offset >= currentOffset && offset < currentOffset+vp.Height {
-		return
-	}
-	distance := currentOffset - offset
-	if distance < 0 {
-		// we should scroll down until it just comes into view
-		vp.SetYOffset(currentOffset - (distance + (vp.Height - int(float32(vp.Height)*fraction))) + 1)
-	} else {
-		// we should scroll up
-		vp.SetYOffset(currentOffset - distance - int(float32(vp.Height)*fraction))
-	}
-}
-
 func (m *model) handleMessagesKey(msg tea.KeyMsg) tea.Cmd {
 	switch msg.String() {
 	case "tab":
 		m.focus = focusInput
-		m.updateContent()
 		m.input.Focus()
-	case "e":
-		message := m.messages[m.selectedMessage]
-		cmd := openTempfileEditor("message.*.md", message.Content, "# Edit the message below\n")
-		m.editorTarget = selectedMessage
-		return cmd
-	case "ctrl+k":
-		if m.selectedMessage > 0 && len(m.messages) == len(m.messageOffsets) {
-			m.selectedMessage--
-			m.updateContent()
-			offset := m.messageOffsets[m.selectedMessage]
-			scrollIntoView(&m.content, offset, 0.1)
-		}
-	case "ctrl+j":
-		if m.selectedMessage < len(m.messages)-1 && len(m.messages) == len(m.messageOffsets) {
-			m.selectedMessage++
-			m.updateContent()
-			offset := m.messageOffsets[m.selectedMessage]
-			scrollIntoView(&m.content, offset, 0.1)
-		}
-	case "ctrl+r":
-		// resubmit the conversation with all messages up until and including
-		// the selected message
-		if len(m.messages) == 0 {
-			return nil
-		}
-		m.messages = m.messages[:m.selectedMessage+1]
-		m.highlightCache = m.highlightCache[:m.selectedMessage+1]
-		m.updateContent()
-		m.content.GotoBottom()
-		return m.promptLLM()
 	}
 	return nil
 }
@@ -514,10 +420,6 @@ func (m *model) handleInputKey(msg tea.KeyMsg) tea.Cmd {
 	switch msg.String() {
 	case "esc":
 		m.focus = focusMessages
-		if m.selectedMessage < 0 || m.selectedMessage >= len(m.messages) {
-			m.selectedMessage = len(m.messages) - 1
-		}
-		m.updateContent()
 		m.input.Blur()
 	case "ctrl+s":
 		userInput := strings.TrimSpace(m.input.Value())
@@ -545,7 +447,7 @@ func (m *model) handleInputKey(msg tea.KeyMsg) tea.Cmd {
 
 			// ensure all messages up to the one we're about to add are
 			// persistent
-			cmd := m.persistConversation()
+			cmd := m.persistRecentMessages()
 			if cmd != nil {
 				return cmd
 			}
@@ -562,11 +464,19 @@ func (m *model) handleInputKey(msg tea.KeyMsg) tea.Cmd {
 
 		m.updateContent()
 		m.content.GotoBottom()
+
+		return m.promptLLM()
+	case "ctrl+r":
+		if len(m.messages) == 0 {
+			return nil
+		}
+		// TODO: retry from selected message
+		if m.messages[len(m.messages)-1].Role != models.MessageRoleUser {
+			m.messages = m.messages[:len(m.messages)-1]
+			m.updateContent()
+		}
+		m.content.GotoBottom()
 		return m.promptLLM()
-	case "ctrl+e":
-		cmd := openTempfileEditor("message.*.md", m.input.Value(), "# Edit your input below\n")
-		m.editorTarget = input
-		return cmd
 	}
 	return nil
 }
@@ -663,56 +573,17 @@ func (m *model) promptLLM() tea.Cmd {
 	}
 }
 
-func (m *model) persistConversation() tea.Cmd {
+func (m *model) persistRecentMessages() tea.Cmd {
-	existingMessages, err := m.ctx.Store.Messages(m.conversation)
-	if err != nil {
-		return wrapError(fmt.Errorf("Could not retrieve existing conversation messages while trying to save: %v", err))
-	}
-
-	existingById := make(map[uint]*models.Message, len(existingMessages))
-	for _, msg := range existingMessages {
-		existingById[msg.ID] = &msg
-	}
-
-	currentById := make(map[uint]*models.Message, len(m.messages))
-	for _, msg := range m.messages {
-		currentById[msg.ID] = &msg
-	}
-
-	for _, msg := range existingMessages {
-		_, ok := currentById[msg.ID]
-		if !ok {
-			err := m.ctx.Store.DeleteMessage(&msg)
-			if err != nil {
-				return wrapError(fmt.Errorf("Failed to remove messages: %v", err))
-			}
-		}
-	}
-
 	for i, msg := range m.messages {
 		if msg.ID > 0 {
-			exist, ok := existingById[msg.ID]
-			if ok {
-				if msg.Content == exist.Content {
 			continue
 		}
-				// update message when contents don't match that of store
-				err := m.ctx.Store.UpdateMessage(&msg)
-				if err != nil {
-					return wrapError(err)
-				}
-			} else {
-				// this would be quite odd... and I'm not sure how to handle
-				// it at the time of writing this
-			}
-		} else {
 		newMessage, err := m.ctx.Store.AddReply(m.conversation, msg)
 		if err != nil {
 			return wrapError(err)
 		}
 		m.setMessage(i, *newMessage)
 	}
-	}
 	return nil
 }
 
@@ -749,25 +620,11 @@ func (m *model) setMessageContents(i int, content string) {
 	m.highlightCache[i] = highlighted
 }
 
+// render the conversation into the main viewport
 func (m *model) updateContent() {
-	atBottom := m.content.AtBottom()
-	m.content.SetContent(m.conversationView())
-	if atBottom {
-		// if we were at bottom before the update, scroll with the output
-		m.content.GotoBottom()
-	}
-}
-
-// render the conversation into a string
-func (m *model) conversationView() string {
 	sb := strings.Builder{}
 	msgCnt := len(m.messages)
-
-	m.messageOffsets = make([]int, len(m.messages))
-	lineCnt := conversationStyle.GetMarginTop()
 	for i, message := range m.messages {
-		m.messageOffsets[i] = lineCnt
-
 		icon := "⚙️"
 		friendly := message.Role.FriendlyRole()
 		style := lipgloss.NewStyle().Bold(true).Faint(true)
@@ -783,27 +640,16 @@ func (m *model) conversationView() string {
 			icon = "🔧"
 		}
 
-		// write message heading with space for content
-		user := style.Render(icon + friendly)
-
 		var saved string
 		if message.ID == 0 {
 			saved = lipgloss.NewStyle().Faint(true).Render(" (not saved)")
 		}
 
-		var selectedPrefix string
+		// write message heading with space for content
-		if m.focus == focusMessages && i == m.selectedMessage {
+		header := fmt.Sprintf("%s\n\n", style.Render(icon+friendly)+saved)
-			selectedPrefix = "> "
-		}
-
-		header := lipgloss.NewStyle().PaddingLeft(1).Render(selectedPrefix + user + saved)
 		sb.WriteString(header)
-		lineCnt += lipgloss.Height(header)
 
 		// TODO: special rendering for tool calls/results?
-		if message.Content != "" {
-			sb.WriteString("\n\n")
-			lineCnt += 1
 
 		// write message contents
 		var highlighted string
@@ -812,24 +658,19 @@ func (m *model) conversationView() string {
 		} else {
 			highlighted = m.highlightCache[i]
 		}
-			var contents string
+		contents := messageStyle.Width(m.content.Width - 5).Render(highlighted)
-			if m.wrap {
+		sb.WriteString(contents)
-				wrapWidth := m.content.Width - messageStyle.GetHorizontalPadding() - 2
-				wrapped := wordwrap.String(highlighted, wrapWidth)
-				contents = wrapped
-			} else {
-				contents = highlighted
-			}
-			sb.WriteString(messageStyle.Width(0).Render(contents))
-			lineCnt += lipgloss.Height(contents)
-		}
 
 		if i < msgCnt-1 {
 			sb.WriteString("\n\n")
-			lineCnt += 1
 		}
 	}
-	return conversationStyle.Render(sb.String())
+	atBottom := m.content.AtBottom()
+	m.content.SetContent(contentStyle.Render(sb.String()))
+	if atBottom {
+		// if we were at bottom before the update, scroll with the output
+		m.content.GotoBottom()
+	}
 }
 
 func Launch(ctx *lmcli.Context, convShortname string) error {

pkg/tui/util.go

@@ -1,42 +0,0 @@
-package tui
-
-import (
-	"os"
-	"os/exec"
-	"strings"
-
-	tea "github.com/charmbracelet/bubbletea"
-)
-
-type msgTempfileEditorClosed string
-
-// openTempfileEditor opens an $EDITOR on a new temporary file with the given
-// content. Upon closing, the contents of the file are read back returned
-// wrapped in a msgTempfileEditorClosed returned by the tea.Cmd
-func openTempfileEditor(pattern string, content string, placeholder string) tea.Cmd {
-	msgFile, _ := os.CreateTemp("/tmp", pattern)
-
-	err := os.WriteFile(msgFile.Name(), []byte(placeholder+content), os.ModeAppend)
-	if err != nil {
-		return wrapError(err)
-	}
-
-	editor := os.Getenv("EDITOR")
-	if editor == "" {
-		editor = "vim"
-	}
-
-	c := exec.Command(editor, msgFile.Name())
-	return tea.ExecProcess(c, func(err error) tea.Msg {
-		bytes, err := os.ReadFile(msgFile.Name())
-		if err != nil {
-			return msgError(err)
-		}
-		fileContents := string(bytes)
-		if strings.HasPrefix(fileContents, placeholder) {
-			fileContents = fileContents[len(placeholder):]
-		}
-		stripped := strings.Trim(fileContents, "\n \t")
-		return msgTempfileEditorClosed(stripped)
-	})
-}