Merge pull request #529 from dgageot/fix-527

Fix #527

Author: dgageot

pkg/app/app.go

@@ -3,7 +3,6 @@ package app
 import (
 	"context"
 	"os/exec"
-	"strings"
 	"time"
 
 	tea "github.com/charmbracelet/bubbletea/v2"
@@ -54,14 +53,6 @@ func (a *App) Title() string {
 func (a *App) Run(ctx context.Context, cancel context.CancelFunc, message string) {
 	a.cancel = cancel
 	go func() {
-		// Special shell command
-		if strings.HasPrefix(message, "!") {
-			out, _ := exec.CommandContext(ctx, "/bin/sh", "-c", message[1:]).CombinedOutput()
-			a.events <- runtime.ShellOutput("$ " + message[1:] + "\n" + string(out))
-			return
-		}
-
-		// User message
 		a.session.AddMessage(session.UserMessage(a.agentFilename, message))
 		for event := range a.runtime.RunStream(ctx, a.session) {
 			if ctx.Err() != nil {
@@ -72,6 +63,11 @@ func (a *App) Run(ctx context.Context, cancel context.CancelFunc, message string
 	}()
 }
 
+func (a *App) RunBangCommand(ctx context.Context, command string) {
+	out, _ := exec.CommandContext(ctx, "/bin/sh", "-c", command).CombinedOutput()
+	a.events <- runtime.ShellOutput("$ " + command + "\n" + string(out))
+}
+
 func (a *App) Subscribe(ctx context.Context, program *tea.Program) {
 	throttledChan := a.throttleEvents(ctx, a.events)
 	for {

pkg/tui/page/chat/chat.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/atotto/clipboard"
 	"github.com/charmbracelet/bubbles/v2/help"
@@ -439,7 +440,11 @@ func (p *chatPage) processMessage(content string) tea.Cmd {
 	var ctx context.Context
 	ctx, p.msgCancel = context.WithCancel(context.Background())
 
-	p.app.Run(ctx, p.msgCancel, content)
+	if strings.HasPrefix(content, "!") {
+		p.app.RunBangCommand(ctx, content[1:])
+	} else {
+		p.app.Run(ctx, p.msgCancel, content)
+	}
 
 	return p.messages.ScrollToBottom()
 }