Merge pull request #1922 from dgageot/speak

Fix speech to text on macOS

Author: dgageot

pkg/tui/handlers.go

@@ -531,6 +531,69 @@ func (m *appModel) handleAttachFile(filePath string) (tea.Model, tea.Cmd) {
 	})
 }
 
+// --- Speech-to-text ---
+
+func (m *appModel) handleStartSpeak() (tea.Model, tea.Cmd) {
+	if m.transcriber.IsRunning() {
+		return m, nil
+	}
+
+	// Close any previous channel to unblock stale waitForTranscript goroutines.
+	m.closeTranscriptCh()
+
+	ch := make(chan string, 100)
+	m.transcriptCh = ch
+	err := m.transcriber.Start(context.Background(), func(delta string) {
+		select {
+		case ch <- delta:
+		default:
+		}
+	})
+	if err != nil {
+		m.closeTranscriptCh()
+		return m, notification.ErrorCmd(fmt.Sprintf("Failed to start listening: %v", err))
+	}
+
+	return m, tea.Batch(
+		notification.InfoCmd("🎤 Listening... (ENTER to send or ESC to cancel)"),
+		m.editor.SetRecording(true),
+		m.waitForTranscript(),
+	)
+}
+
+func (m *appModel) handleStopSpeak() (tea.Model, tea.Cmd) {
+	if !m.transcriber.IsRunning() {
+		return m, nil
+	}
+
+	m.transcriber.Stop()
+	m.closeTranscriptCh()
+
+	return m, tea.Batch(m.editor.SetRecording(false), notification.SuccessCmd("Stopped listening"))
+}
+
+// waitForTranscript returns a command that blocks until the next transcript
+// delta arrives and delivers it as a SpeakTranscriptMsg.
+func (m *appModel) waitForTranscript() tea.Cmd {
+	ch := m.transcriptCh
+	return func() tea.Msg {
+		delta, ok := <-ch
+		if !ok {
+			return nil
+		}
+		return messages.SpeakTranscriptMsg{Delta: delta}
+	}
+}
+
+// closeTranscriptCh closes the transcript channel and sets it to nil,
+// unblocking any goroutines waiting in waitForTranscript.
+func (m *appModel) closeTranscriptCh() {
+	if m.transcriptCh != nil {
+		close(m.transcriptCh)
+		m.transcriptCh = nil
+	}
+}
+
 func (m *appModel) handleElicitationResponse(action tools.ElicitationAction, content map[string]any) (tea.Model, tea.Cmd) {
 	if err := m.application.ResumeElicitation(context.Background(), action, content); err != nil {
 		slog.Error("Failed to resume elicitation", "action", action, "error", err)

pkg/tui/tui.go

@@ -19,6 +19,7 @@ import (
 	"charm.land/lipgloss/v2"
 
 	"github.com/docker/cagent/pkg/app"
+	"github.com/docker/cagent/pkg/audio/transcribe"
 	"github.com/docker/cagent/pkg/history"
 	"github.com/docker/cagent/pkg/runtime"
 	"github.com/docker/cagent/pkg/session"
@@ -87,6 +88,10 @@ type appModel struct {
 	statusBar    statusbar.StatusBar
 	completions  completion.Manager
 
+	// Speech-to-text
+	transcriber  *transcribe.Transcriber
+	transcriptCh chan string // bridges transcriber goroutine → Bubble Tea event loop
+
 	// Working state indicator (resize handle spinner)
 	workingSpinner spinner.Spinner
 
@@ -181,6 +186,7 @@ func New(ctx context.Context, spawner SessionSpawner, initialApp *app.App, initi
 		notification:            notification.New(),
 		dialogMgr:               dialog.New(),
 		completions:             completion.New(),
+		transcriber:             transcribe.New(os.Getenv("OPENAI_API_KEY")),
 		workingSpinner:          spinner.New(spinner.ModeSpinnerOnly, styles.SpinnerDotsHighlightStyle),
 		focusedPanel:            PanelEditor,
 		editorLines:             3,
@@ -790,10 +796,18 @@ func (m *appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	// --- Speech-to-text ---
 
 	case messages.StartSpeakMsg:
-		return m, notification.InfoCmd("Speech-to-text is not yet supported")
+		if !m.transcriber.IsSupported() {
+			return m, notification.InfoCmd("Speech-to-text is only supported on macOS")
+		}
+		return m.handleStartSpeak()
 
-	case messages.StopSpeakMsg, messages.SpeakTranscriptMsg:
-		return m, nil
+	case messages.StopSpeakMsg:
+		return m.handleStopSpeak()
+
+	case messages.SpeakTranscriptMsg:
+		m.editor.InsertText(msg.Delta)
+		cmd := m.waitForTranscript()
+		return m, cmd
 
 	// --- MCP prompts ---
 
@@ -1461,6 +1475,19 @@ func (m *appModel) Bindings() []key.Binding {
 
 // handleKeyPress handles all keyboard input with proper priority routing.
 func (m *appModel) handleKeyPress(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
+	// Check if we should stop transcription on Enter or Escape
+	if m.transcriber.IsRunning() {
+		switch msg.String() {
+		case "enter":
+			model, cmd := m.handleStopSpeak()
+			sendCmd := m.editor.SendContent()
+			return model, tea.Batch(cmd, sendCmd)
+
+		case "esc":
+			return m.handleStopSpeak()
+		}
+	}
+
 	// Dialog gets priority when open
 	if m.dialogMgr.Open() {
 		u, cmd := m.dialogMgr.Update(msg)
@@ -1978,6 +2005,8 @@ func (m *appModel) cleanupAll() {
 		m.cancelThinkingCheck()
 		m.cancelThinkingCheck = nil
 	}
+	m.transcriber.Stop()
+	m.closeTranscriptCh()
 	for _, cp := range m.chatPages {
 		cp.Cleanup()
 	}

pkg/tui/tui_exit_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/docker/cagent/pkg/audio/transcribe"
 	"github.com/docker/cagent/pkg/tui/components/completion"
 	"github.com/docker/cagent/pkg/tui/components/editor"
 	"github.com/docker/cagent/pkg/tui/components/notification"
@@ -137,6 +138,7 @@ func newTestModel() (*appModel, *mockChatPage, *mockEditor) {
 		pendingSidebarCollapsed: map[string]bool{},
 		chatPage:                page,
 		editor:                  ed,
+		transcriber:             transcribe.New(""),
 		notification:            notification.New(),
 		dialogMgr:               dialog.New(),
 		completions:             completion.New(),