Merge pull request #772 from dgageot/default-agent

Implement a default agent

Author: dgageot

.dockerignore

@@ -4,3 +4,5 @@
 !./**/*.template
 !./**/*.go
 !./**/*.txt
+!./**/*.txt
+!/cmd/root/default-agent.yaml

cmd/root/a2a.go

@@ -14,10 +14,9 @@ import (
 )
 
 type a2aFlags struct {
-	agentName  string
-	workingDir string
-	port       int
-	runConfig  config.RuntimeConfig
+	agentName string
+	port      int
+	runConfig config.RuntimeConfig
 }
 
 func newA2ACmd() *cobra.Command {
@@ -36,7 +35,6 @@ func newA2ACmd() *cobra.Command {
 	}
 
 	cmd.PersistentFlags().StringVarP(&flags.agentName, "agent", "a", "root", "Name of the agent to run")
-	cmd.PersistentFlags().StringVar(&flags.workingDir, "working-dir", "", "Set the working directory for the session (applies to tools and relative paths)")
 	cmd.PersistentFlags().IntVar(&flags.port, "port", 0, "Port to listen on (default: random available port)")
 	addRuntimeConfigFlags(cmd, &flags.runConfig)
 
@@ -59,14 +57,10 @@ func (f *a2aFlags) runA2ACommand(cmd *cobra.Command, args []string) error {
 		_ = ln.Close()
 	}()
 
-	if err := setupWorkingDirectory(f.workingDir); err != nil {
-		return err
-	}
-
 	agentFilename, err := agentfile.Resolve(ctx, out, args[0])
 	if err != nil {
 		return err
 	}
 
-	return a2a.Start(ctx, out, agentFilename, f.agentName, f.runConfig, ln)
+	return a2a.Start(ctx, out, agentFilename, f.agentName, &f.runConfig, ln)
 }

cmd/root/acp.go

@@ -51,7 +51,7 @@ func (f *acpFlags) runACPCommand(cmd *cobra.Command, args []string) error {
 
 	slog.Debug("Starting ACP server", "agent_file", agentFilename)
 
-	acpAgent := acp.NewAgent(agentFilename, f.runConfig)
+	acpAgent := acp.NewAgent(agentFilename, &f.runConfig)
 	conn := acpsdk.NewAgentSideConnection(acpAgent, cmd.OutOrStdout(), cmd.InOrStdin())
 	conn.SetLogger(slog.Default())
 	acpAgent.SetAgentConnection(conn)

cmd/root/alias.go

@@ -99,7 +99,12 @@ func runAliasAddCommand(cmd *cobra.Command, args []string) error {
 	out.Printf("Alias '%s' created successfully\n", name)
 	out.Printf("  Alias: %s\n", name)
 	out.Printf("  Agent: %s\n", absAgentPath)
-	out.Printf("\nYou can now run: cagent run %s\n", name)
+
+	if name == "default" {
+		out.Printf("\nYou can now run: cagent run %s (or even cagent run)\n", name)
+	} else {
+		out.Printf("\nYou can now run: cagent run %s\n", name)
+	}
 
 	return nil
 }

cmd/root/api.go

@@ -95,7 +95,7 @@ func (f *apiFlags) runAPICommand(cmd *cobra.Command, args []string) error {
 		opts = append(opts, server.WithAgentsDir(filepath.Dir(resolvedPath)))
 	}
 
-	teams, err := teamloader.LoadTeams(ctx, resolvedPath, f.runConfig)
+	teams, err := teamloader.LoadTeams(ctx, resolvedPath, &f.runConfig)
 	if err != nil {
 		return fmt.Errorf("failed to load teams: %w", err)
 	}
@@ -107,7 +107,7 @@ func (f *apiFlags) runAPICommand(cmd *cobra.Command, args []string) error {
 		}
 	}()
 
-	s, err := server.New(sessionStore, f.runConfig, teams, opts...)
+	s, err := server.New(sessionStore, &f.runConfig, teams, opts...)
 	if err != nil {
 		return fmt.Errorf("failed to create server: %w", err)
 	}

cmd/root/debug.go

@@ -56,7 +56,7 @@ func (f *debugFlags) runDebugConfigCommand(cmd *cobra.Command, args []string) er
 		return err
 	}
 
-	cfg, err := config.LoadConfig(agentFilename, filesystem.AllowAll)
+	cfg, err := config.LoadConfig(ctx, agentFilename, filesystem.AllowAll)
 	if err != nil {
 		return err
 	}
@@ -75,7 +75,7 @@ func (f *debugFlags) runDebugToolsetsCommand(cmd *cobra.Command, args []string)
 		return err
 	}
 
-	team, err := teamloader.Load(ctx, agentFilename, f.runConfig)
+	team, err := teamloader.Load(ctx, agentFilename, &f.runConfig)
 	if err != nil {
 		return err
 	}

cmd/root/default-agent.yaml

@@ -0,0 +1,13 @@
+agents:
+  root:
+    model: auto
+    description: A helpful AI assistant
+    welcome_message: |
+      Hello! I'm your AI assistant. How can I help you today?
+    instruction: |
+      You are a knowledgeable assistant that helps users with various tasks.
+      Be helpful, accurate, and concise in your responses.
+    toolsets:
+      - type: filesystem
+      - type: shell
+      - type: fetch

cmd/root/eval.go

@@ -42,7 +42,7 @@ func (f *evalFlags) runEvalCommand(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	agents, err := teamloader.Load(cmd.Context(), agentFilename, f.runConfig)
+	agents, err := teamloader.Load(cmd.Context(), agentFilename, &f.runConfig)
 	if err != nil {
 		return err
 	}

cmd/root/flags.go

@@ -21,6 +21,7 @@ func addRuntimeConfigFlags(cmd *cobra.Command, runConfig *config.RuntimeConfig)
 	addGatewayFlags(cmd, runConfig)
 	cmd.PersistentFlags().StringSliceVar(&runConfig.EnvFiles, "env-from-file", nil, "Set environment variables from file")
 	cmd.PersistentFlags().BoolVar(&runConfig.GlobalCodeMode, "code-mode-tools", false, "Provide a single tool to call other tools via Javascript")
+	cmd.PersistentFlags().StringVar(&runConfig.WorkingDir, "working-dir", "", "Set the working directory for the session (applies to tools and relative paths)")
 }
 
 func setupWorkingDirectory(workingDir string) error {
@@ -71,6 +72,11 @@ func addGatewayFlags(cmd *cobra.Command, runConfig *config.RuntimeConfig) {
 		// Ensure the gateway url is canonical.
 		runConfig.ModelsGateway = canonize(runConfig.ModelsGateway)
 
+		// Setup working directory
+		if err := setupWorkingDirectory(runConfig.WorkingDir); err != nil {
+			return err
+		}
+
 		// First call the original persistentPreRunE if it exists (from this command)
 		if persistentPreRunE != nil {
 			return persistentPreRunE(cmd, args)

cmd/root/mcp.go

@@ -13,8 +13,7 @@ import (
 )
 
 type mcpFlags struct {
-	workingDir string
-	runConfig  config.RuntimeConfig
+	runConfig config.RuntimeConfig
 }
 
 func newMCPCmd() *cobra.Command {
@@ -32,7 +31,6 @@ func newMCPCmd() *cobra.Command {
 		RunE:    flags.runMCPCommand,
 	}
 
-	cmd.PersistentFlags().StringVar(&flags.workingDir, "working-dir", "", "Set the working directory for the session (applies to tools and relative paths)")
 	addRuntimeConfigFlags(cmd, &flags.runConfig)
 
 	return cmd
@@ -44,14 +42,10 @@ func (f *mcpFlags) runMCPCommand(cmd *cobra.Command, args []string) error {
 	ctx := cmd.Context()
 	out := cli.NewPrinter(io.Discard)
 
-	if err := setupWorkingDirectory(f.workingDir); err != nil {
-		return err
-	}
-
 	agentFilename, err := agentfile.Resolve(ctx, out, args[0])
 	if err != nil {
 		return err
 	}
 
-	return mcp.StartMCPServer(ctx, out, agentFilename, f.runConfig)
+	return mcp.StartMCPServer(ctx, out, agentFilename, &f.runConfig)
 }