From 2946898934fe458bce56720203f1074ddc3c524c Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Sat, 30 Aug 2025 15:41:06 -0500
Subject: [PATCH] fix: ensure command uses currently selected model (#2336)

---
 packages/tui/internal/app/app.go | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/tui/internal/app/app.go b/packages/tui/internal/app/app.go
index cbf12e50..8aaddfbc 100644
--- a/packages/tui/internal/app/app.go
+++ b/packages/tui/internal/app/app.go
@@ -814,15 +814,18 @@ func (a *App) SendCommand(ctx context.Context, command string, args string) (*Ap
 	}
 
 	cmds = append(cmds, func() tea.Msg {
+		params := opencode.SessionCommandParams{
+			Command:   opencode.F(command),
+			Arguments: opencode.F(args),
+			Agent:     opencode.F(a.Agents[a.AgentIndex].Name),
+		}
+		if a.Provider != nil && a.Model != nil {
+			params.Model = opencode.F(a.Provider.ID + "/" + a.Model.ID)
+		}
 		_, err := a.Client.Session.Command(
 			context.Background(),
 			a.Session.ID,
-			opencode.SessionCommandParams{
-				Command:   opencode.F(command),
-				Arguments: opencode.F(args),
-				Agent:     opencode.F(a.Agents[a.AgentIndex].Name),
-				Model:     opencode.F(a.State.Provider + "/" + a.State.Model),
-			},
+			params,
 		)
 		if err != nil {
 			slog.Error("Failed to execute command", "error", err)