Merge pull request #652 from dgageot/fix-517

Allow palette tools to run as /commands

Author: dgageot

AGENTS.md

@@ -280,10 +280,9 @@ agents:
 
 ### Session Commands During CLI Usage
 
-- `/exit` - End the session
-- `/reset` - Clear session history
-- `/usage` - Show token usage statistics
+- `/new` - Clear session history
 - `/compact` - Generate summary and compact session history
+- `/copy` - Show token usage statistics
 - `/eval` - Save evaluation data
 
 ## File Locations and Patterns

cmd/root/run.go

@@ -549,6 +549,7 @@ func runWithoutTUI(ctx context.Context, agentFilename string, rt runtime.Runtime
 	return nil
 }
 
+// TODO: This is a duplication of builtInSessionCommands() in pkg/tui/tui.go
 func runUserCommand(userInput string, sess *session.Session, rt runtime.Runtime, ctx context.Context) (bool, error) {
 	yellow := color.New(color.FgYellow).SprintfFunc()
 	switch userInput {
@@ -565,7 +566,7 @@ func runUserCommand(userInput string, sess *session.Session, rt runtime.Runtime,
 		fmt.Printf("%s\n", yellow("Input tokens: %d", sess.InputTokens))
 		fmt.Printf("%s\n", yellow("Output tokens: %d", sess.OutputTokens))
 		return true, nil
-	case "/reset":
+	case "/new":
 		// Reset session items
 		sess.Messages = []session.Item{}
 		return true, nil

pkg/tui/dialog/command_palette.go

@@ -19,11 +19,12 @@ type CommandExecuteMsg struct {
 
 // Command represents a single command in the palette
 type Command struct {
-	ID          string
-	Label       string
-	Description string
-	Category    string
-	Execute     func() tea.Cmd
+	ID           string
+	Label        string
+	Description  string
+	Category     string
+	SlashCommand string
+	Execute      func() tea.Cmd
 }
 
 // CommandCategory represents a category of commands

pkg/tui/page/chat/chat.go

@@ -67,7 +67,8 @@ type chatPage struct {
 	title string
 	app   *app.App
 
-	history *history.History
+	history         *history.History
+	sessionCommands []dialog.Command
 
 	// Cached layout dimensions
 	chatHeight  int
@@ -95,7 +96,7 @@ func defaultKeyMap() KeyMap {
 }
 
 // New creates a new chat page
-func New(a *app.App) Page {
+func New(a *app.App, sessionCommands []dialog.Command) Page {
 	ed := editor.New()
 
 	historyStore, err := history.New()
@@ -105,14 +106,15 @@ func New(a *app.App) Page {
 	ed.SetHistory(historyStore)
 
 	return &chatPage{
-		title:        a.Title(),
-		sidebar:      sidebar.New(),
-		messages:     messages.New(a),
-		editor:       ed,
-		focusedPanel: PanelEditor,
-		app:          a,
-		keyMap:       defaultKeyMap(),
-		history:      historyStore,
+		title:           a.Title(),
+		sidebar:         sidebar.New(),
+		messages:        messages.New(a),
+		editor:          ed,
+		focusedPanel:    PanelEditor,
+		app:             a,
+		keyMap:          defaultKeyMap(),
+		history:         historyStore,
+		sessionCommands: sessionCommands,
 	}
 }
 
@@ -500,6 +502,14 @@ func (p *chatPage) processMessage(content string) tea.Cmd {
 	case strings.HasPrefix(content, "!"):
 		p.app.RunBangCommand(ctx, content[1:])
 	case strings.HasPrefix(content, "/"):
+		// Try builtin session command first
+		for _, sessionCommand := range p.sessionCommands {
+			if sessionCommand.SlashCommand == content && sessionCommand.Execute != nil {
+				return sessionCommand.Execute()
+			}
+		}
+
+		// Then user-defined commands
 		p.app.Run(ctx, p.msgCancel, p.app.ResolveCommand(ctx, content))
 	default:
 		p.app.Run(ctx, p.msgCancel, content)

pkg/tui/tui.go

@@ -78,14 +78,14 @@ func DefaultKeyMap() KeyMap {
 // New creates and initializes a new TUI application model
 func New(a *app.App) tea.Model {
 	t := &appModel{
-		chatPage:     chatpage.New(a),
 		keyMap:       DefaultKeyMap(),
 		dialog:       dialog.New(),
 		notification: notification.New(),
 		application:  a,
 	}
 
 	t.statusBar = statusbar.New(t)
+	t.chatPage = chatpage.New(a, t.builtInSessionCommands())
 
 	return t
 }
@@ -316,55 +316,63 @@ func toFullscreenView(content string) tea.View {
 	return view
 }
 
+func (a *appModel) builtInSessionCommands() []dialog.Command {
+	return []dialog.Command{
+		{
+			ID:           "session.new",
+			Label:        "New",
+			SlashCommand: "/new",
+			Description:  "Start a new conversation",
+			Category:     "Session",
+			Execute: func() tea.Cmd {
+				a.application.NewSession()
+				a.chatPage = chatpage.New(a.application, a.builtInSessionCommands())
+				a.dialog = dialog.New()
+				a.statusBar = statusbar.New(a.chatPage)
+
+				return tea.Batch(a.Init(), a.handleWindowResize(a.wWidth, a.wHeight))
+			},
+		},
+		{
+			ID:           "session.compact",
+			Label:        "Compact",
+			SlashCommand: "/compact",
+			Description:  "Summarize the current conversation",
+			Category:     "Session",
+			Execute: func() tea.Cmd {
+				return a.chatPage.CompactSession()
+			},
+		},
+		{
+			ID:           "session.clipboard",
+			Label:        "Copy",
+			SlashCommand: "/copy",
+			Description:  "Copy the current conversation to the clipboard",
+			Category:     "Session",
+			Execute: func() tea.Cmd {
+				return a.chatPage.CopySessionToClipboard()
+			},
+		},
+		{
+			ID:           "session.eval",
+			Label:        "Eval",
+			SlashCommand: "/eval",
+			Description:  "Create an evaluation report for the current conversation",
+			Category:     "Session",
+			Execute: func() tea.Cmd {
+				evalFile, _ := evaluation.Save(a.application.Session())
+				return core.CmdHandler(notification.ShowMsg{Text: fmt.Sprintf("Eval saved to file %s", evalFile)})
+			},
+		},
+	}
+}
+
 // buildCommandCategories builds the list of command categories for the command palette
 func (a *appModel) buildCommandCategories(ctx context.Context) []dialog.CommandCategory {
 	categories := []dialog.CommandCategory{
 		{
-			Name: "Session",
-			Commands: []dialog.Command{
-				{
-					ID:          "session.new",
-					Label:       "New ",
-					Description: "Start a new conversation",
-					Category:    "Session",
-					Execute: func() tea.Cmd {
-						a.application.NewSession()
-						a.chatPage = chatpage.New(a.application)
-						a.dialog = dialog.New()
-						a.statusBar = statusbar.New(a.chatPage)
-
-						return tea.Batch(a.Init(), a.handleWindowResize(a.wWidth, a.wHeight))
-					},
-				},
-				{
-					ID:          "session.compact",
-					Label:       "Compact",
-					Description: "Summarize the current conversation",
-					Category:    "Session",
-					Execute: func() tea.Cmd {
-						return a.chatPage.CompactSession()
-					},
-				},
-				{
-					ID:          "session.clipboard",
-					Label:       "Copy",
-					Description: "Copy the current conversation to the clipboard",
-					Category:    "Session",
-					Execute: func() tea.Cmd {
-						return a.chatPage.CopySessionToClipboard()
-					},
-				},
-				{
-					ID:          "session.eval",
-					Label:       "Eval",
-					Description: "Create an evaluation report for the current conversation",
-					Category:    "Session",
-					Execute: func() tea.Cmd {
-						evalFile, _ := evaluation.Save(a.application.Session())
-						return core.CmdHandler(notification.ShowMsg{Text: fmt.Sprintf("Eval saved to file %s", evalFile)})
-					},
-				},
-			},
+			Name:     "Session",
+			Commands: a.builtInSessionCommands(),
 		},
 	}