small fixes

Author: kujtimiihoxha

internal/diff/patch.go

@@ -91,11 +91,9 @@ func (p *Parser) isDone(prefixes []string) bool {
 if p.index >= len(p.lines) {
 return true
 }
-if prefixes != nil {
-for _, prefix := range prefixes {
-if strings.HasPrefix(p.lines[p.index], prefix) {
-return true
-}
+for _, prefix := range prefixes {
+if strings.HasPrefix(p.lines[p.index], prefix) {
+return true
 }
 }
 return false
@@ -219,7 +217,7 @@ func (p *Parser) parseUpdateFile(text string) (PatchAction, error) {
 sectionStr = p.lines[p.index]
 p.index++
 }
-if !(defStr != "" || sectionStr != "" || index == 0) {
+if defStr == "" && sectionStr == "" && index != 0 {
 return action, NewDiffError(fmt.Sprintf("Invalid Line:\n%s", p.lines[p.index]))
 }
 if strings.TrimSpace(defStr) != "" {
@@ -433,12 +431,13 @@ func peekNextSection(lines []string, initialIndex int) ([]string, []Chunk, int,
 delLines = make([]string, 0, 8)
 insLines = make([]string, 0, 8)
 }
-if mode == "delete" {
+switch mode {
+case "delete":
 delLines = append(delLines, line)
 old = append(old, line)
-} else if mode == "add" {
+case "add":
 insLines = append(insLines, line)
-} else {
+default:
 old = append(old, line)
 }
 }
@@ -513,7 +512,7 @@ func IdentifyFilesAdded(text string) []string {
 
 func getUpdatedFile(text string, action PatchAction, path string) (string, error) {
 if action.Type != ActionUpdate {
-return "", errors.New("Expected UPDATE action")
+return "", errors.New("expected UPDATE action")
 }
 origLines := strings.Split(text, "\n")
 destLines := make([]string, 0, len(origLines)) // Preallocate with capacity
@@ -543,18 +542,19 @@ func getUpdatedFile(text string, action PatchAction, path string) (string, error
 func PatchToCommit(patch Patch, orig map[string]string) (Commit, error) {
 commit := Commit{Changes: make(map[string]FileChange, len(patch.Actions))}
 for pathKey, action := range patch.Actions {
-if action.Type == ActionDelete {
+switch action.Type {
+case ActionDelete:
 oldContent := orig[pathKey]
 commit.Changes[pathKey] = FileChange{
 Type: ActionDelete,
 OldContent: &oldContent,
 }
-} else if action.Type == ActionAdd {
+case ActionAdd:
 commit.Changes[pathKey] = FileChange{
 Type: ActionAdd,
 NewContent: action.NewFile,
 }
-} else if action.Type == ActionUpdate {
+case ActionUpdate:
 newContent, err := getUpdatedFile(orig[pathKey], action, pathKey)
 if err != nil {
 return Commit{}, err
@@ -619,18 +619,19 @@ func LoadFiles(paths []string, openFn func(string) (string, error)) (map[string]
 
 func ApplyCommit(commit Commit, writeFn func(string, string) error, removeFn func(string) error) error {
 for p, change := range commit.Changes {
-if change.Type == ActionDelete {
+switch change.Type {
+case ActionDelete:
 if err := removeFn(p); err != nil {
 return err
 }
-} else if change.Type == ActionAdd {
+case ActionAdd:
 if change.NewContent == nil {
 return NewDiffError(fmt.Sprintf("Add action for %s has nil new_content", p))
 }
 if err := writeFn(p, *change.NewContent); err != nil {
 return err
 }
-} else if change.Type == ActionUpdate {
+case ActionUpdate:
 if change.NewContent == nil {
 return NewDiffError(fmt.Sprintf("Update action for %s has nil new_content", p))
 }

internal/llm/agent/agent.go

@@ -221,6 +221,8 @@ func (a *agent) processGeneration(ctx context.Context, sessionID, content string
 agentMessage, toolResults, err := a.streamAndHandleEvents(ctx, sessionID, msgHistory)
 if err != nil {
 if errors.Is(err, context.Canceled) {
+agentMessage.AddFinish(message.FinishReasonCanceled)
+a.messages.Update(context.Background(), agentMessage)
 return a.err(ErrRequestCancelled)
 }
 return a.err(fmt.Errorf("failed to process events: %w", err))

internal/llm/tools/edit.go

@@ -141,20 +141,20 @@ func (e *editTool) Run(ctx context.Context, call ToolCall) (ToolResponse, error)
 if params.OldString == "" {
 response, err = e.createNewFile(ctx, params.FilePath, params.NewString)
 if err != nil {
-return response, nil
+return response, err
 }
 }
 
 if params.NewString == "" {
 response, err = e.deleteContent(ctx, params.FilePath, params.OldString)
 if err != nil {
-return response, nil
+return response, err
 }
 }
 
 response, err = e.replaceContent(ctx, params.FilePath, params.OldString, params.NewString)
 if err != nil {
-return response, nil
+return response, err
 }
 if response.IsError {
 // Return early if there was an error during content replacement

internal/tui/components/chat/editor.go

@@ -21,6 +21,8 @@ type editorCmp struct {
 textarea textarea.Model
 }
 
+type FocusEditorMsg bool
+
 type focusedEditorKeyMaps struct {
 Send key.Binding
 OpenEditor key.Binding
@@ -112,7 +114,6 @@ func (m *editorCmp) send() tea.Cmd {
 util.CmdHandler(SendMsg{
 Text: value,
 }),
-util.CmdHandler(EditorFocusMsg(false)),
 )
 }
 
@@ -124,9 +125,13 @@ func (m *editorCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 m.session = msg
 }
 return m, nil
+case FocusEditorMsg:
+if msg {
+m.textarea.Focus()
+return m, tea.Batch(textarea.Blink, util.CmdHandler(EditorFocusMsg(true)))
+}
 case tea.KeyMsg:
 if key.Matches(msg, focusedKeyMaps.OpenEditor) {
-m.textarea.Blur()
 return m, openEditor()
 }
 // if the key does not match any binding, return

internal/tui/components/chat/list.go

@@ -22,6 +22,10 @@ import (
 "github.com/kujtimiihoxha/opencode/internal/tui/util"
 )
 
+type cacheItem struct {
+width int
+content []uiMessage
+}
 type messagesCmp struct {
 app *app.App
 width, height int
@@ -32,8 +36,9 @@ type messagesCmp struct {
 uiMessages []uiMessage
 currentMsgID string
 mutex sync.Mutex
-cachedContent map[string][]uiMessage
+cachedContent map[string]cacheItem
 spinner spinner.Model
+lastUpdate time.Time
 rendering bool
 }
 type renderFinishedMsg struct{}
@@ -44,6 +49,8 @@ func (m *messagesCmp) Init() tea.Cmd {
 
 func (m *messagesCmp) preloadSessions() tea.Cmd {
 return func() tea.Msg {
+m.mutex.Lock()
+defer m.mutex.Unlock()
 sessions, err := m.app.Sessions.List(context.Background())
 if err != nil {
 return util.ReportError(err)()
@@ -67,13 +74,13 @@ func (m *messagesCmp) preloadSessions() tea.Cmd {
 }
 logging.Debug("preloaded sessions")
 
-return nil
+return func() tea.Msg {
+return renderFinishedMsg{}
+}
 }
 }
 
 func (m *messagesCmp) cacheSessionMessages(messages []message.Message, width int) {
-m.mutex.Lock()
-defer m.mutex.Unlock()
 pos := 0
 if m.width == 0 {
 return
@@ -87,7 +94,10 @@ func (m *messagesCmp) cacheSessionMessages(messages []message.Message, width int
 width,
 pos,
 )
-m.cachedContent[msg.ID] = []uiMessage{userMsg}
+m.cachedContent[msg.ID] = cacheItem{
+width: width,
+content: []uiMessage{userMsg},
+}
 pos += userMsg.height + 1 // + 1 for spacing
 case message.Assistant:
 assistantMessages := renderAssistantMessage(
@@ -102,7 +112,10 @@ func (m *messagesCmp) cacheSessionMessages(messages []message.Message, width int
 for _, msg := range assistantMessages {
 pos += msg.height + 1 // + 1 for spacing
 }
-m.cachedContent[msg.ID] = assistantMessages
+m.cachedContent[msg.ID] = cacheItem{
+width: width,
+content: assistantMessages,
+}
 }
 }
 }
@@ -223,8 +236,8 @@ func (m *messagesCmp) renderView() {
 for inx, msg := range m.messages {
 switch msg.Role {
 case message.User:
-if messages, ok := m.cachedContent[msg.ID]; ok {
-m.uiMessages = append(m.uiMessages, messages...)
+if cache, ok := m.cachedContent[msg.ID]; ok && cache.width == m.width {
+m.uiMessages = append(m.uiMessages, cache.content...)
 continue
 }
 userMsg := renderUserMessage(
@@ -234,11 +247,14 @@ func (m *messagesCmp) renderView() {
 pos,
 )
 m.uiMessages = append(m.uiMessages, userMsg)
-m.cachedContent[msg.ID] = []uiMessage{userMsg}
+m.cachedContent[msg.ID] = cacheItem{
+width: m.width,
+content: []uiMessage{userMsg},
+}
 pos += userMsg.height + 1 // + 1 for spacing
 case message.Assistant:
-if messages, ok := m.cachedContent[msg.ID]; ok {
-m.uiMessages = append(m.uiMessages, messages...)
+if cache, ok := m.cachedContent[msg.ID]; ok && cache.width == m.width {
+m.uiMessages = append(m.uiMessages, cache.content...)
 continue
 }
 assistantMessages := renderAssistantMessage(
@@ -254,7 +270,10 @@ func (m *messagesCmp) renderView() {
 m.uiMessages = append(m.uiMessages, msg)
 pos += msg.height + 1 // + 1 for spacing
 }
-m.cachedContent[msg.ID] = assistantMessages
+m.cachedContent[msg.ID] = cacheItem{
+width: m.width,
+content: assistantMessages,
+}
 }
 }
 
@@ -418,6 +437,10 @@ func (m *messagesCmp) SetSize(width, height int) tea.Cmd {
 m.height = height
 m.viewport.Width = width
 m.viewport.Height = height - 2
+for _, msg := range m.messages {
+delete(m.cachedContent, msg.ID)
+}
+m.uiMessages = make([]uiMessage, 0)
 m.renderView()
 return m.preloadSessions()
 }
@@ -456,7 +479,7 @@ func NewMessagesCmp(app *app.App) tea.Model {
 return &messagesCmp{
 app: app,
 writingMode: true,
-cachedContent: make(map[string][]uiMessage),
+cachedContent: make(map[string]cacheItem),
 viewport: viewport.New(0, 0),
 spinner: s,
 }

internal/tui/components/chat/message.go

@@ -389,6 +389,7 @@ func renderToolResponse(toolCall message.ToolCall, response message.ToolResult,
 errContent := fmt.Sprintf("Error: %s", strings.ReplaceAll(response.Content, "\n", " "))
 errContent = ansi.Truncate(errContent, width-1, "...")
 return styles.BaseStyle.
+Width(width).
 Foreground(styles.Error).
 Render(errContent)
 }

internal/tui/components/dialog/permission.go

@@ -40,7 +40,8 @@ type PermissionDialogCmp interface {
 }
 
 type permissionsMapping struct {
-LeftRight key.Binding
+Left key.Binding
+Right key.Binding
 EnterSpace key.Binding
 Allow key.Binding
 AllowSession key.Binding
@@ -49,9 +50,13 @@ type permissionsMapping struct {
 }
 
 var permissionsKeys = permissionsMapping{
-LeftRight: key.NewBinding(
-key.WithKeys("left", "right"),
-key.WithHelp("←/→", "switch options"),
+Left: key.NewBinding(
+key.WithKeys("left"),
+key.WithHelp("←", "switch options"),
+),
+Right: key.NewBinding(
+key.WithKeys("right"),
+key.WithHelp("→", "switch options"),
 ),
 EnterSpace: key.NewBinding(
 key.WithKeys("enter", " "),
@@ -104,21 +109,18 @@ func (p *permissionDialogCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 p.diffCache = make(map[string]string)
 case tea.KeyMsg:
 switch {
-case key.Matches(msg, permissionsKeys.LeftRight) || key.Matches(msg, permissionsKeys.Tab):
-// Change selected option
+case key.Matches(msg, permissionsKeys.Right) || key.Matches(msg, permissionsKeys.Tab):
 p.selectedOption = (p.selectedOption + 1) % 3
 return p, nil
+case key.Matches(msg, permissionsKeys.Left):
+p.selectedOption = (p.selectedOption + 2) % 3
 case key.Matches(msg, permissionsKeys.EnterSpace):
-// Select current option
 return p, p.selectCurrentOption()
 case key.Matches(msg, permissionsKeys.Allow):
-// Select Allow
 return p, util.CmdHandler(PermissionResponseMsg{Action: PermissionAllow, Permission: p.permission})
 case key.Matches(msg, permissionsKeys.AllowSession):
-// Select Allow for session
 return p, util.CmdHandler(PermissionResponseMsg{Action: PermissionAllowForSession, Permission: p.permission})
 case key.Matches(msg, permissionsKeys.Deny):
-// Select Deny
 return p, util.CmdHandler(PermissionResponseMsg{Action: PermissionDeny, Permission: p.permission})
 default:
 // Pass other keys to viewport