Add the please command

Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>

Author: jeanlaurent

cmd/root/please.go

@@ -0,0 +1,65 @@
+package root
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+
+	"github.com/docker/cagent/pkg/shortcuts"
+	"github.com/docker/cagent/pkg/telemetry"
+)
+
+// NewPleaseCmd creates a new please command for running shortcuts
+func NewPleaseCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "please <shortcut-name> [message|-]",
+		Short: "Run an agent using a registered shortcut",
+		Long: `Run an agent using a previously registered shortcut name.
+This is equivalent to running 'cagent run <agent-path>' but using a shortcut name instead.
+
+Examples:
+  # Run a shortcut without additional message (interactive mode)
+  cagent please code
+
+  # Run a shortcut with a message
+  cagent please code "Write a hello world function"
+
+  # Run a shortcut with stdin
+  echo "Write tests" | cagent please code -
+
+  # List available shortcuts
+  cagent register list`,
+		Args: cobra.MinimumNArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			telemetry.TrackCommand("please", args)
+
+			shortcutName := args[0]
+
+			// Load shortcuts
+			s, err := shortcuts.Load()
+			if err != nil {
+				return fmt.Errorf("failed to load shortcuts: %w", err)
+			}
+
+			// Resolve shortcut to agent path
+			agentPath, ok := s.Get(shortcutName)
+			if !ok {
+				return fmt.Errorf("shortcut '%s' not found\n\nList available shortcuts with: cagent register list\nRegister a new shortcut with: cagent register <name> <agent-path>", shortcutName)
+			}
+
+			// Build new args for run command: replace shortcut name with agent path
+			runArgs := make([]string, len(args))
+			runArgs[0] = agentPath
+			copy(runArgs[1:], args[1:])
+
+			// Execute run command with the resolved agent path
+			return doRunCommand(cmd.Context(), runArgs, false)
+		},
+	}
+
+	// Inherit all flags from run command
+	runCmd := NewRunCmd()
+	cmd.Flags().AddFlagSet(runCmd.PersistentFlags())
+
+	return cmd
+}

cmd/root/register.go

@@ -0,0 +1,200 @@
+package root
+
+import (
+	"fmt"
+	"path/filepath"
+	"sort"
+	"strings"
+
+	"github.com/spf13/cobra"
+
+	"github.com/docker/cagent/pkg/shortcuts"
+	"github.com/docker/cagent/pkg/telemetry"
+)
+
+// NewRegisterCmd creates a new register command for managing shortcuts
+func NewRegisterCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "register [<shortcut-name> <agent-path>]",
+		Short: "Manage shortcuts for agents",
+		Long: `Register and manage shortcuts for agent configurations or catalog references.
+
+When called without arguments, lists all registered shortcuts.`,
+		Example: `  # List all registered shortcuts (default)
+  cagent register
+
+  # Register a shortcut to a catalog agent
+  cagent register code agentcatalog/notion-expert
+
+  # Register a shortcut to a local agent file
+  cagent register myagent ~/myagent.yaml
+
+  # List all registered shortcuts
+  cagent register list
+
+  # Remove a shortcut
+  cagent register remove code`,
+		Args: cobra.RangeArgs(0, 2),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			// Default to list when no arguments provided
+			if len(args) == 0 {
+				telemetry.TrackCommand("register", []string{"list"})
+				return listRegisteredShortcuts()
+			}
+
+			// Register new shortcut with 2 arguments
+			if len(args) == 2 {
+				telemetry.TrackCommand("register", args)
+				return registerShortcut(args[0], args[1])
+			}
+
+			// Single argument is invalid in this context
+			return fmt.Errorf("invalid arguments: use 'register list' or 'register <name> <agent-path>'")
+		},
+	}
+
+	cmd.AddCommand(newRegisterListCmd())
+	cmd.AddCommand(newRegisterRemoveCmd())
+
+	return cmd
+}
+
+// newRegisterListCmd creates the list subcommand
+func newRegisterListCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "list",
+		Short: "List all registered shortcuts",
+		Args:  cobra.NoArgs,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			telemetry.TrackCommand("register", []string{"list"})
+			return listRegisteredShortcuts()
+		},
+	}
+}
+
+// newRegisterRemoveCmd creates the remove subcommand
+func newRegisterRemoveCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "remove <shortcut-name>",
+		Short: "Remove a registered shortcut",
+		Args:  cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			telemetry.TrackCommand("register", append([]string{"remove"}, args...))
+			return removeShortcut(args[0])
+		},
+	}
+}
+
+// registerShortcut registers a new shortcut
+func registerShortcut(name, agentPath string) error {
+	// Load existing shortcuts
+	s, err := shortcuts.Load()
+	if err != nil {
+		return fmt.Errorf("failed to load shortcuts: %w", err)
+	}
+
+	// Expand tilde in path if it's a local file path
+	if strings.HasPrefix(agentPath, "~/") {
+		if abs, err := expandTilde(agentPath); err == nil {
+			agentPath = abs
+		}
+	}
+
+	// Store the shortcut
+	s.Set(name, agentPath)
+
+	// Save to file
+	if err := s.Save(); err != nil {
+		return fmt.Errorf("failed to save shortcuts: %w", err)
+	}
+
+	fmt.Printf("Shortcut '%s' registered successfully\n", name)
+	fmt.Printf("  Shortcut: %s\n", name)
+	fmt.Printf("  Agent:    %s\n", agentPath)
+	fmt.Printf("\nYou can now run: cagent please %s\n", name)
+
+	return nil
+}
+
+// removeShortcut removes a shortcut
+func removeShortcut(name string) error {
+	s, err := shortcuts.Load()
+	if err != nil {
+		return fmt.Errorf("failed to load shortcuts: %w", err)
+	}
+
+	if !s.Delete(name) {
+		return fmt.Errorf("shortcut '%s' not found", name)
+	}
+
+	if err := s.Save(); err != nil {
+		return fmt.Errorf("failed to save shortcuts: %w", err)
+	}
+
+	fmt.Printf("Shortcut '%s' removed successfully\n", name)
+	return nil
+}
+
+func listRegisteredShortcuts() error {
+	s, err := shortcuts.Load()
+	if err != nil {
+		return fmt.Errorf("failed to load shortcuts: %w", err)
+	}
+
+	allShortcuts := s.List()
+	if len(allShortcuts) == 0 {
+		fmt.Println("No shortcuts registered.")
+		fmt.Println("\nRegister a shortcut with: cagent register <name> <agent-path>")
+		return nil
+	}
+
+	fmt.Printf("Registered shortcuts (%d):\n\n", len(allShortcuts))
+
+	// Sort shortcuts by name for consistent output
+	names := make([]string, 0, len(allShortcuts))
+	for name := range allShortcuts {
+		names = append(names, name)
+	}
+	sort.Strings(names)
+
+	// Find max name length for alignment
+	maxLen := 0
+	for _, name := range names {
+		if len(name) > maxLen {
+			maxLen = len(name)
+		}
+	}
+
+	for _, name := range names {
+		path := allShortcuts[name]
+		padding := strings.Repeat(" ", maxLen-len(name))
+		fmt.Printf("  %s%s → %s\n", name, padding, path)
+	}
+
+	fmt.Printf("\nRun a shortcut with: cagent please <name>\n")
+
+	return nil
+}
+
+// expandTilde expands the tilde in a path to the user's home directory
+func expandTilde(path string) (string, error) {
+	if !strings.HasPrefix(path, "~/") {
+		return path, nil
+	}
+
+	homeDir, err := filepath.Abs(filepath.Join(filepath.Dir(path), ".."))
+	if err != nil {
+		return "", err
+	}
+
+	// Get actual home directory
+	homeDir, err = filepath.EvalSymlinks(homeDir)
+	if err != nil {
+		homeDir, err = filepath.Abs("~")
+		if err != nil {
+			return "", err
+		}
+	}
+
+	return filepath.Join(homeDir, strings.TrimPrefix(path, "~/")), nil
+}

cmd/root/root.go

@@ -123,6 +123,8 @@ func NewRootCmd() *cobra.Command {
 	cmd.AddCommand(NewCatalogCmd())
 	cmd.AddCommand(NewBuildCmd())
 	cmd.AddCommand(NewPrintCmd())
+	cmd.AddCommand(NewRegisterCmd())
+	cmd.AddCommand(NewPleaseCmd())
 
 	return cmd
 }

pkg/shortcuts/shortcuts.go

@@ -0,0 +1,100 @@
+package shortcuts
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/goccy/go-yaml"
+
+	"github.com/docker/cagent/pkg/paths"
+)
+
+// Shortcuts represents the shortcuts configuration
+type Shortcuts struct {
+	Shortcuts map[string]string `yaml:"shortcuts"`
+}
+
+// GetShortcutsFilePath returns the path to the shortcuts file
+func GetShortcutsFilePath() string {
+	return filepath.Join(paths.GetConfigDir(), "shortcuts.yaml")
+}
+
+// Load loads shortcuts from the configuration file
+func Load() (*Shortcuts, error) {
+	return LoadFrom(GetShortcutsFilePath())
+}
+
+// LoadFrom loads shortcuts from a specific file path
+func LoadFrom(path string) (*Shortcuts, error) {
+	// If file doesn't exist, return empty shortcuts
+	if _, err := os.Stat(path); os.IsNotExist(err) {
+		return &Shortcuts{Shortcuts: make(map[string]string)}, nil
+	}
+
+	data, err := os.ReadFile(path)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read shortcuts file: %w", err)
+	}
+
+	var s Shortcuts
+	if err := yaml.Unmarshal(data, &s); err != nil {
+		return nil, fmt.Errorf("failed to parse shortcuts file: %w", err)
+	}
+
+	if s.Shortcuts == nil {
+		s.Shortcuts = make(map[string]string)
+	}
+
+	return &s, nil
+}
+
+// Save saves shortcuts to the configuration file
+func (s *Shortcuts) Save() error {
+	return s.SaveTo(GetShortcutsFilePath())
+}
+
+// SaveTo saves shortcuts to a specific file path
+func (s *Shortcuts) SaveTo(path string) error {
+	// Ensure directory exists
+	dir := filepath.Dir(path)
+	if err := os.MkdirAll(dir, 0o755); err != nil {
+		return fmt.Errorf("failed to create directory: %w", err)
+	}
+
+	data, err := yaml.Marshal(s)
+	if err != nil {
+		return fmt.Errorf("failed to marshal shortcuts: %w", err)
+	}
+
+	if err := os.WriteFile(path, data, 0o644); err != nil {
+		return fmt.Errorf("failed to write shortcuts file: %w", err)
+	}
+
+	return nil
+}
+
+// Get retrieves the agent path for a shortcut
+func (s *Shortcuts) Get(name string) (string, bool) {
+	path, ok := s.Shortcuts[name]
+	return path, ok
+}
+
+// Set creates or updates a shortcut
+func (s *Shortcuts) Set(name, agentPath string) {
+	s.Shortcuts[name] = agentPath
+}
+
+// Delete removes a shortcut
+func (s *Shortcuts) Delete(name string) bool {
+	if _, exists := s.Shortcuts[name]; exists {
+		delete(s.Shortcuts, name)
+		return true
+	}
+	return false
+}
+
+// List returns all shortcuts
+func (s *Shortcuts) List() map[string]string {
+	return s.Shortcuts
+}