Merge pull request #661 from rumpl/command-completions

Commands auto-completion

Author: rumpl

pkg/runtime/runtime.go

@@ -1060,7 +1060,6 @@ func (r *LocalRuntime) Summarize(ctx context.Context, sess *session.Session, eve
 
 	// Check if session is empty
 	if len(messages) == 0 {
-		slog.Debug("Session is empty, nothing to summarize", "session_id", sess.ID)
 		events <- &WarningEvent{Message: "Session is empty. Start a conversation before compacting."}
 		return
 	}

pkg/tui/commands/commands.go

@@ -0,0 +1,126 @@
+package commands
+
+import (
+	"context"
+
+	tea "github.com/charmbracelet/bubbletea/v2"
+
+	"github.com/docker/cagent/pkg/app"
+	"github.com/docker/cagent/pkg/tui/core"
+)
+
+// Session commands
+type (
+	NewSessionMsg             struct{}
+	EvalSessionMsg            struct{}
+	CompactSessionMsg         struct{}
+	CopySessionToClipboardMsg struct{}
+)
+
+// Agent commands
+type AgentCommandMsg struct {
+	Command string
+}
+
+// CommandCategory represents a category of commands
+type Category struct {
+	Name     string
+	Commands []Item
+}
+
+// Command represents a single command in the palette
+type Item struct {
+	ID           string
+	Label        string
+	Description  string
+	Category     string
+	SlashCommand string
+	Execute      func() tea.Cmd
+}
+
+func BuiltInSessionCommands() []Item {
+	return []Item{
+		{
+			ID:           "session.new",
+			Label:        "New",
+			SlashCommand: "/new",
+			Description:  "Start a new conversation",
+			Category:     "Session",
+			Execute: func() tea.Cmd {
+				return core.CmdHandler(NewSessionMsg{})
+			},
+		},
+		{
+			ID:           "session.compact",
+			Label:        "Compact",
+			SlashCommand: "/compact",
+			Description:  "Summarize the current conversation",
+			Category:     "Session",
+			Execute: func() tea.Cmd {
+				return core.CmdHandler(CompactSessionMsg{})
+			},
+		},
+		{
+			ID:           "session.clipboard",
+			Label:        "Copy",
+			SlashCommand: "/copy",
+			Description:  "Copy the current conversation to the clipboard",
+			Category:     "Session",
+			Execute: func() tea.Cmd {
+				return core.CmdHandler(CopySessionToClipboardMsg{})
+			},
+		},
+		{
+			ID:           "session.eval",
+			Label:        "Eval",
+			SlashCommand: "/eval",
+			Description:  "Create an evaluation report for the current conversation",
+			Category:     "Session",
+			Execute: func() tea.Cmd {
+				return core.CmdHandler(EvalSessionMsg{})
+			},
+		},
+	}
+}
+
+// BuildCommandCategories builds the list of command categories for the command palette
+func BuildCommandCategories(ctx context.Context, application *app.App) []Category {
+	categories := []Category{
+		{
+			Name:     "Session",
+			Commands: BuiltInSessionCommands(),
+		},
+	}
+
+	agentCommands := application.CurrentAgentCommands(ctx)
+	if len(agentCommands) == 0 {
+		return categories
+	}
+
+	commands := make([]Item, 0, len(agentCommands))
+	for name, prompt := range agentCommands {
+
+		// Truncate long descriptions to fit on one line
+		description := prompt
+		if len(description) > 60 {
+			description = description[:57] + "..."
+		}
+
+		commands = append(commands, Item{
+			ID:          "agent.command." + name,
+			Label:       name,
+			Description: description,
+			Category:    "Agent Commands",
+			Execute: func() tea.Cmd {
+				return core.CmdHandler(AgentCommandMsg{Command: "/" + name})
+			},
+		})
+	}
+
+	categories = append(categories, Category{
+		Name:     "Agent Commands",
+		Commands: commands,
+	})
+
+	return categories
+}

pkg/tui/components/completion/completion.go

@@ -20,6 +20,7 @@ type Item struct {
 	Label       string
 	Description string
 	Value       string
+	Execute     func() tea.Cmd
 }
 
 type OpenMsg struct {
@@ -37,7 +38,8 @@ type QueryMsg struct {
 }
 
 type SelectedMsg struct {
-	Value string
+	Value   string
+	Execute func() tea.Cmd
 }
 
 type matchResult struct {
@@ -154,7 +156,7 @@ func (c *manager) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 		case key.Matches(msg, c.keyMap.Enter):
 			c.visible = false
-			return c, core.CmdHandler(SelectedMsg{Value: c.filteredItems[c.selected].Value})
+			return c, core.CmdHandler(SelectedMsg{Value: c.filteredItems[c.selected].Value, Execute: c.filteredItems[c.selected].Execute})
 		case key.Matches(msg, c.keyMap.Escape):
 			c.visible = false
 			return c, core.CmdHandler(ClosedMsg{})
@@ -177,6 +179,14 @@ func (c *manager) View() string {
 		visibleStart := c.scrollOffset
 		visibleEnd := min(c.scrollOffset+maxItems, len(c.filteredItems))
 
+		maxLabelLen := 0
+		for i := visibleStart; i < visibleEnd; i++ {
+			labelLen := len(c.filteredItems[i].Label)
+			if labelLen > maxLabelLen {
+				maxLabelLen = labelLen
+			}
+		}
+
 		for i := visibleStart; i < visibleEnd; i++ {
 			item := c.filteredItems[i]
 			isSelected := i == c.selected
@@ -188,7 +198,9 @@ func (c *manager) View() string {
 				itemStyle = styles.CompletionNormalStyle
 			}
 
-			text := item.Label
+			// Pad label to maxLabelLen so descriptions align
+			paddedLabel := item.Label + strings.Repeat(" ", maxLabelLen+1-len(item.Label))
+			text := paddedLabel
 			if item.Description != "" {
 				text += " " + styles.CompletionDescStyle.Render(item.Description)
 			}

pkg/tui/components/editor/completions/command.go

@@ -0,0 +1,47 @@
+package completions
+
+import (
+	"context"
+
+	"github.com/docker/cagent/pkg/app"
+	"github.com/docker/cagent/pkg/tui/commands"
+	"github.com/docker/cagent/pkg/tui/components/completion"
+)
+
+type commandCompletion struct {
+	app *app.App
+}
+
+func NewCommandCompletion(a *app.App) Completion {
+	return &commandCompletion{
+		app: a,
+	}
+}
+
+func (c *commandCompletion) AutoSubmit() bool {
+	return true
+}
+
+func (c *commandCompletion) RequiresEmptyEditor() bool {
+	return true
+}
+
+func (c *commandCompletion) Trigger() string {
+	return "/"
+}
+
+func (c *commandCompletion) Items() []completion.Item {
+	cmds := commands.BuildCommandCategories(context.Background(), c.app)
+	items := make([]completion.Item, 0, len(cmds))
+	for _, cmd := range cmds {
+		for _, command := range cmd.Commands {
+			items = append(items, completion.Item{
+				Label:       command.Label,
+				Description: command.Description,
+				Value:       command.SlashCommand,
+				Execute:     command.Execute,
+			})
+		}
+	}
+	return items
+}

pkg/tui/components/editor/completions/completion.go

@@ -0,0 +1,20 @@
+package completions
+
+import (
+	"github.com/docker/cagent/pkg/app"
+	"github.com/docker/cagent/pkg/tui/components/completion"
+)
+
+type Completion interface {
+	Trigger() string
+	Items() []completion.Item
+	AutoSubmit() bool
+	RequiresEmptyEditor() bool
+}
+
+func Completions(a *app.App) []Completion {
+	return []Completion{
+		NewCommandCompletion(a),
+		NewFileCompletion(),
+	}
+}

pkg/tui/components/editor/completions/file.go

@@ -0,0 +1,40 @@
+package completions
+
+import (
+	"github.com/docker/cagent/pkg/fsx"
+	"github.com/docker/cagent/pkg/tui/components/completion"
+)
+
+type fileCompletion struct{}
+
+func NewFileCompletion() Completion {
+	return &fileCompletion{}
+}
+
+func (c *fileCompletion) AutoSubmit() bool {
+	return false
+}
+
+func (c *fileCompletion) RequiresEmptyEditor() bool {
+	return false
+}
+
+func (c *fileCompletion) Trigger() string {
+	return "@"
+}
+
+func (c *fileCompletion) Items() []completion.Item {
+	files, err := fsx.ListDirectory(".", 0)
+	if err != nil {
+		return nil
+	}
+	items := make([]completion.Item, len(files))
+	for i, f := range files {
+		items[i] = completion.Item{
+			Label: f,
+			Value: f,
+		}
+	}
+
+	return items
+}