Run shell commands in the middle of a thread, with the ! prefix (#75)

* Run shell commands in the middle of a thread, with the ! prefix

Signed-off-by: David Gageot <david.gageot@docker.com>

* Remove duplication

Signed-off-by: David Gageot <david.gageot@docker.com>

* Remove agent context

Signed-off-by: David Gageot <david.gageot@docker.com>

---------

Signed-off-by: David Gageot <david.gageot@docker.com>

Author: dgageot

internal/app/app.go

@@ -2,6 +2,8 @@ package app
 
 import (
 	"context"
+	"os/exec"
+	"strings"
 
 	tea "github.com/charmbracelet/bubbletea/v2"
 
@@ -41,6 +43,14 @@ func (a *App) Team() *team.Team {
 // Run one agent loop
 func (a *App) Run(ctx context.Context, message string) {
 	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) {
 			a.events <- event

internal/tui/components/message/message.go

@@ -100,6 +100,11 @@ func (mv *messageModel) Render(int) string {
 		}
 
 		return strings.TrimRight(rendered, "\n\r\t ")
+	case types.MessageTypeShellOutput:
+		if rendered, err := mv.renderer.Render(fmt.Sprintf("```console\n%s\n```", msg.Content)); err == nil {
+			return strings.TrimRight(rendered, "\n\r\t ")
+		}
+		return msg.Content
 	case types.MessageTypeSeparator:
 		return styles.MutedStyle.Render("•" + strings.Repeat("─", mv.width-3) + "•")
 	case types.MessageTypeError:

internal/tui/components/messages/messages.go

@@ -37,6 +37,7 @@ type Model interface {
 	ClearMessages()
 	ScrollToBottom() tea.Cmd
 	FocusToolInConfirmation() tea.Cmd
+	AddShellOutputMessage(content string) tea.Cmd
 }
 
 // renderedItem represents a cached rendered message with position information
@@ -460,60 +461,38 @@ func (m *model) isAtBottom() bool {
 
 // AddUserMessage adds a user message to the chat
 func (m *model) AddUserMessage(content string) tea.Cmd {
-	msg := types.Message{
+	return m.addMessage(&types.Message{
 		Type:    types.MessageTypeUser,
 		Content: content,
-	}
-
-	wasAtBottom := m.isAtBottom()
-	m.messages = append(m.messages, msg)
-
-	view := m.createMessageView(&msg)
-	m.views = append(m.views, view)
-
-	if wasAtBottom {
-		return tea.Batch(view.Init(), func() tea.Msg {
-			m.scrollToBottom()
-			return nil
-		})
-	}
-
-	return view.Init()
+	})
 }
 
 func (m *model) AddErrorMessage(content string) tea.Cmd {
-	msg := types.Message{
+	return m.addMessage(&types.Message{
 		Type:    types.MessageTypeError,
 		Content: content,
-	}
-
-	wasAtBottom := m.isAtBottom()
-	m.messages = append(m.messages, msg)
-
-	view := m.createMessageView(&msg)
-	m.views = append(m.views, view)
+	})
+}
 
-	if wasAtBottom {
-		return tea.Batch(view.Init(), func() tea.Msg {
-			m.scrollToBottom()
-			return nil
-		})
-	}
-	return view.Init()
+func (m *model) AddShellOutputMessage(content string) tea.Cmd {
+	return m.addMessage(&types.Message{
+		Type:    types.MessageTypeShellOutput,
+		Content: content,
+	})
 }
 
 // AddAssistantMessage adds an assistant message to the chat
-//
-//goland:noinspection ALL
 func (m *model) AddAssistantMessage() tea.Cmd {
-	msg := types.Message{
+	return m.addMessage(&types.Message{
 		Type: types.MessageTypeAssistant,
-	}
+	})
+}
 
+func (m *model) addMessage(msg *types.Message) tea.Cmd {
 	wasAtBottom := m.isAtBottom()
-	m.messages = append(m.messages, msg)
+	m.messages = append(m.messages, *msg)
 
-	view := m.createMessageView(&msg)
+	view := m.createMessageView(msg)
 	m.views = append(m.views, view)
 
 	var cmds []tea.Cmd

internal/tui/page/chat/chat.go

@@ -192,6 +192,9 @@ func (p *chatPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case *runtime.ErrorEvent:
 		cmd := p.messages.AddErrorMessage(msg.Error)
 		return p, tea.Batch(cmd, p.messages.ScrollToBottom())
+	case *runtime.ShellOutputEvent:
+		cmd := p.messages.AddShellOutputMessage(msg.Output)
+		return p, tea.Batch(cmd, p.messages.ScrollToBottom())
 	case *runtime.UserMessageEvent:
 		cmd := p.messages.AddUserMessage(msg.Message)
 		return p, tea.Batch(cmd, p.messages.ScrollToBottom())

internal/tui/types/types.go

@@ -9,6 +9,7 @@ const (
 	MessageTypeUser MessageType = iota
 	MessageTypeAssistant
 	MessageTypeError
+	MessageTypeShellOutput
 	MessageTypeSeparator
 	MessageTypeToolCall
 	MessageTypeToolResult

pkg/runtime/event.go

@@ -148,6 +148,20 @@ func Error(msg string) Event {
 }
 func (e *ErrorEvent) isEvent() {}
 
+type ShellOutputEvent struct {
+	Type   string `json:"type"`
+	Output string `json:"error"`
+}
+
+func ShellOutput(output string) Event {
+	return &ShellOutputEvent{
+		Type:   "shell",
+		Output: output,
+	}
+}
+func (e *ShellOutputEvent) isEvent()             {}
+func (e *ShellOutputEvent) GetAgentName() string { return "" }
+
 type TokenUsageEvent struct {
 	Type  string `json:"type"`
 	Usage *Usage `json:"usage"`