3 files changed, 9 insertions, 6 deletions
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 {