Merge pull request #445 from dgageot/consistant-flags

Consistant flags

Author: dgageot

cmd/root/api.go

@@ -9,19 +9,12 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/docker/cagent/pkg/config"
 	"github.com/docker/cagent/pkg/server"
 	"github.com/docker/cagent/pkg/session"
 	"github.com/docker/cagent/pkg/teamloader"
 	"github.com/docker/cagent/pkg/telemetry"
 )
 
-var (
-	listenAddr string
-	sessionDb  string
-	runConfig  config.RuntimeConfig
-)
-
 // NewApiCmd creates a new api command
 func NewApiCmd() *cobra.Command {
 	cmd := &cobra.Command{
@@ -37,10 +30,8 @@ func NewApiCmd() *cobra.Command {
 
 	cmd.PersistentFlags().StringVarP(&listenAddr, "listen", "l", ":8080", "Address to listen on")
 	cmd.PersistentFlags().StringVarP(&sessionDb, "session-db", "s", "session.db", "Path to the session database")
-	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.RedirectURI, "redirect-uri", "", "Set the redirect URI for OAuth2 flows")
 	addGatewayFlags(cmd)
+	addRuntimeConfigFlags(cmd)
 
 	return cmd
 }

cmd/root/eval.go

@@ -18,9 +18,8 @@ func NewEvalCmd() *cobra.Command {
 		RunE:  runEvalCommand,
 	}
 
-	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")
 	addGatewayFlags(cmd)
+	addRuntimeConfigFlags(cmd)
 
 	return cmd
 }

cmd/root/exec.go

@@ -11,16 +11,14 @@ func NewExecCmd() *cobra.Command {
 	}
 
 	cmd.PersistentFlags().StringVarP(&agentName, "agent", "a", "root", "Name of the agent to run")
-	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(&workingDir, "working-dir", "", "Set the working directory for the session (applies to tools and relative paths)")
 	cmd.PersistentFlags().BoolVar(&autoApprove, "yolo", false, "Automatically approve all tool calls without prompting")
 	cmd.PersistentFlags().StringVar(&attachmentPath, "attach", "", "Attach an image file to the message")
-
 	cmd.PersistentFlags().BoolVar(&dryRun, "dry-run", false, "Initialize the agent without executing anything")
 	_ = cmd.PersistentFlags().MarkHidden("dry-run")
 
 	addGatewayFlags(cmd)
+	addRuntimeConfigFlags(cmd)
 
 	return cmd
 }

cmd/root/flags.go

@@ -0,0 +1,19 @@
+package root
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/docker/cagent/pkg/config"
+)
+
+var (
+	listenAddr string
+	sessionDb  string
+	runConfig  config.RuntimeConfig
+)
+
+func addRuntimeConfigFlags(cmd *cobra.Command) {
+	cmd.PersistentFlags().StringSliceVar(&runConfig.EnvFiles, "env-from-file", nil, "Set environment variables from file")
+	cmd.PersistentFlags().StringVar(&runConfig.RedirectURI, "redirect-uri", "", "Set the redirect URI for OAuth2 flows")
+	cmd.PersistentFlags().BoolVar(&runConfig.GlobalCodeMode, "code-mode-tools", false, "Provide a single tool to call other tools via Javascript")
+}

cmd/root/run.go

@@ -62,8 +62,6 @@ func NewRunCmd() *cobra.Command {
 	}
 
 	cmd.PersistentFlags().StringVarP(&agentName, "agent", "a", "root", "Name of the agent to run")
-	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(&workingDir, "working-dir", "", "Set the working directory for the session (applies to tools and relative paths)")
 	cmd.PersistentFlags().BoolVar(&autoApprove, "yolo", false, "Automatically approve all tool calls without prompting")
 	cmd.PersistentFlags().StringVar(&attachmentPath, "attach", "", "Attach an image file to the message")
@@ -75,6 +73,7 @@ func NewRunCmd() *cobra.Command {
 		f.NoOptDefVal = commandListSentinel
 	}
 	addGatewayFlags(cmd)
+	addRuntimeConfigFlags(cmd)
 
 	return cmd
 }