cleanup app, config and root

6 files changed, 21 insertions, 13 deletions

diff --git a/internal/tui/components/chat/messages.go b/internal/tui/components/chat/messages.go
index b5a361392..dc21fca29 100644
--- a/internal/tui/components/chat/messages.go
+++ b/internal/tui/components/chat/messages.go
@@ -1,6 +1,7 @@
 package chat
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"math"
@@ -324,7 +325,7 @@ func (m *messagesCmp) renderToolCall(toolCall message.ToolCall, isNested bool) s
 
 	innerToolCalls := make([]string, 0)
 	if toolCall.Name == agent.AgentToolName {
-		messages, _ := m.app.Messages.List(toolCall.ID)
+		messages, _ := m.app.Messages.List(context.Background(), toolCall.ID)
 		toolCalls := make([]message.ToolCall, 0)
 		for _, v := range messages {
 			toolCalls = append(toolCalls, v.ToolCalls()...)
@@ -554,7 +555,7 @@ func (m *messagesCmp) GetSize() (int, int) {
 
 func (m *messagesCmp) SetSession(session session.Session) tea.Cmd {
 	m.session = session
-	messages, err := m.app.Messages.List(session.ID)
+	messages, err := m.app.Messages.List(context.Background(), session.ID)
 	if err != nil {
 		return util.ReportError(err)
 	}
diff --git a/internal/tui/components/repl/editor.go b/internal/tui/components/repl/editor.go
index e9493129d..b1e39e655 100644
--- a/internal/tui/components/repl/editor.go
+++ b/internal/tui/components/repl/editor.go
@@ -160,7 +160,7 @@ func (m *editorCmp) Send() tea.Cmd {
 		return util.ReportWarn("Assistant is still working on the previous message")
 	}
 
-	messages, err := m.app.Messages.List(m.sessionID)
+	messages, err := m.app.Messages.List(context.Background(), m.sessionID)
 	if err != nil {
 		return util.ReportError(err)
 	}
@@ -177,7 +177,7 @@ func (m *editorCmp) Send() tea.Cmd {
 	if len(content) == 0 {
 		return util.ReportWarn("Message is empty")
 	}
-	ctx, cancel := context.WithCancel(m.app.Context)
+	ctx, cancel := context.WithCancel(context.Background())
 	m.cancelMessage = cancel
 	go func() {
 		defer cancel()
diff --git a/internal/tui/components/repl/messages.go b/internal/tui/components/repl/messages.go
index 57a55c579..260be220e 100644
--- a/internal/tui/components/repl/messages.go
+++ b/internal/tui/components/repl/messages.go
@@ -1,6 +1,7 @@
 package repl
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"sort"
@@ -77,8 +78,8 @@ func (m *messagesCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.session = msg.Payload
 		}
 	case SelectedSessionMsg:
-		m.session, _ = m.app.Sessions.Get(msg.SessionID)
-		m.messages, _ = m.app.Messages.List(m.session.ID)
+		m.session, _ = m.app.Sessions.Get(context.Background(), msg.SessionID)
+		m.messages, _ = m.app.Messages.List(context.Background(), m.session.ID)
 		m.renderView()
 		m.viewport.GotoBottom()
 	}
@@ -259,7 +260,7 @@ func (m *messagesCmp) renderMessageWithToolCall(content string, tools []message.
 
 			runningIndicator := runningStyle.Render(fmt.Sprintf("%s Running...", styles.SpinnerIcon))
 			allParts = append(allParts, leftPadding.Render(runningIndicator))
-			taskSessionMessages, _ := m.app.Messages.List(toolCall.ID)
+			taskSessionMessages, _ := m.app.Messages.List(context.Background(), toolCall.ID)
 			for _, msg := range taskSessionMessages {
 				if msg.Role == message.Assistant {
 					for _, toolCall := range msg.ToolCalls() {
diff --git a/internal/tui/components/repl/sessions.go b/internal/tui/components/repl/sessions.go
index 093337b18..c83c40367 100644
--- a/internal/tui/components/repl/sessions.go
+++ b/internal/tui/components/repl/sessions.go
@@ -1,6 +1,7 @@
 package repl
 
 import (
+	"context"
 	"fmt"
 	"strings"
 
@@ -57,12 +58,13 @@ var sessionKeyMapValue = sessionsKeyMap{
 }
 
 func (i *sessionsCmp) Init() tea.Cmd {
-	existing, err := i.app.Sessions.List()
+	existing, err := i.app.Sessions.List(context.Background())
 	if err != nil {
 		return util.ReportError(err)
 	}
 	if len(existing) == 0 || existing[0].MessageCount > 0 {
 		newSession, err := i.app.Sessions.Create(
+			context.Background(),
 			"New Session",
 		)
 		if err != nil {
diff --git a/internal/tui/page/chat.go b/internal/tui/page/chat.go
index a7a51bb84..9b9924909 100644
--- a/internal/tui/page/chat.go
+++ b/internal/tui/page/chat.go
@@ -1,6 +1,8 @@
 package page
 
 import (
+	"context"
+
 	"github.com/charmbracelet/bubbles/key"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/kujtimiihoxha/termai/internal/app"
@@ -36,7 +38,7 @@ func (p *chatPage) Init() tea.Cmd {
 		p.layout.Init(),
 	}
 
-	sessions, _ := p.app.Sessions.List()
+	sessions, _ := p.app.Sessions.List(context.Background())
 	if len(sessions) > 0 {
 		p.session = sessions[0]
 		cmd := p.setSidebar()
@@ -92,7 +94,7 @@ func (p *chatPage) clearSidebar() {
 func (p *chatPage) sendMessage(text string) tea.Cmd {
 	var cmds []tea.Cmd
 	if p.session.ID == "" {
-		session, err := p.app.Sessions.Create("New Session")
+		session, err := p.app.Sessions.Create(context.Background(), "New Session")
 		if err != nil {
 			return util.ReportError(err)
 		}
@@ -110,7 +112,7 @@ func (p *chatPage) sendMessage(text string) tea.Cmd {
 		return util.ReportError(err)
 	}
 	go func() {
-		a.Generate(p.app.Context, p.session.ID, text)
+		a.Generate(context.Background(), p.session.ID, text)
 	}()
 
 	return tea.Batch(cmds...)
diff --git a/internal/tui/tui.go b/internal/tui/tui.go
index db9ac9ff6..1b1a1ed50 100644
--- a/internal/tui/tui.go
+++ b/internal/tui/tui.go
@@ -1,6 +1,8 @@
 package tui
 
 import (
+	"context"
+
 	"github.com/charmbracelet/bubbles/key"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
@@ -184,7 +186,7 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				}
 			case key.Matches(msg, replKeyMap):
 				if a.currentPage == page.ReplPage {
-					sessions, err := a.app.Sessions.List()
+					sessions, err := a.app.Sessions.List(context.Background())
 					if err != nil {
 						return a, util.CmdHandler(util.ReportError(err))
 					}
@@ -192,7 +194,7 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 					if lastSession.MessageCount == 0 {
 						return a, util.CmdHandler(repl.SelectedSessionMsg{SessionID: lastSession.ID})
 					}
-					s, err := a.app.Sessions.Create("New Session")
+					s, err := a.app.Sessions.Create(context.Background(), "New Session")
 					if err != nil {
 						return a, util.CmdHandler(util.ReportError(err))
 					}