Merge branch 'Sourcegraph-Amp-Module-Support' of github.com:Harsh9485/agentapi into Sourcegraph-Amp-Module-Support

Author: Harsh9485

chat/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chat",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "private": true,
   "scripts": {
     "dev": "next dev --turbopack",

cmd/root.go

@@ -12,8 +12,8 @@ import (
 var rootCmd = &cobra.Command{
 	Use:     "agentapi",
 	Short:   "AgentAPI CLI",
-	Long:    `AgentAPI - HTTP API for Claude Code, Goose, Aider, Gemini, Sourcegraph Amp and Codex`,
-	Version: "0.3.2",
+	Long:    `AgentAPI - HTTP API for Claude Code, Goose, Aider, Gemini and Codex`,
+	Version: "0.3.3",
 }
 
 func Execute() {
@@ -25,6 +25,6 @@ func Execute() {
 }
 
 func init() {
-	rootCmd.AddCommand(server.ServerCmd)
+	rootCmd.AddCommand(server.CreateServerCmd())
 	rootCmd.AddCommand(attach.AttachCmd)
 }

cmd/server/server.go

@@ -11,6 +11,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 	"golang.org/x/xerrors"
 
 	"github.com/coder/agentapi/lib/httpapi"
@@ -19,15 +20,6 @@ import (
 	"github.com/coder/agentapi/lib/termexec"
 )
 
-var (
-	agentTypeVar string
-	port         int
-	printOpenAPI bool
-	chatBasePath string
-	termWidth    uint16
-	termHeight   uint16
-)
-
 type AgentType = msgfmt.AgentType
 
 const (
@@ -70,11 +62,15 @@ func parseAgentType(firstArg string, agentTypeVar string) (AgentType, error) {
 
 func runServer(ctx context.Context, logger *slog.Logger, argsToPass []string) error {
 	agent := argsToPass[0]
-	agentType, err := parseAgentType(agent, agentTypeVar)
+	agentTypeValue := viper.GetString(FlagType)
+	agentType, err := parseAgentType(agent, agentTypeValue)
 	if err != nil {
 		return xerrors.Errorf("failed to parse agent type: %w", err)
 	}
 
+	termWidth := viper.GetUint16(FlagTermWidth)
+	termHeight := viper.GetUint16(FlagTermHeight)
+
 	if termWidth < 10 {
 		return xerrors.Errorf("term width must be at least 10")
 	}
@@ -85,6 +81,7 @@ func runServer(ctx context.Context, logger *slog.Logger, argsToPass []string) er
 		termHeight = 930 // codex has a bug where the TUI distorts the screen if the height is too large, see: https://github.com/openai/codex/issues/1608
 	}
 
+	printOpenAPI := viper.GetBool(FlagPrintOpenAPI)
 	var process *termexec.Process
 	if printOpenAPI {
 		process = nil
@@ -99,7 +96,13 @@ func runServer(ctx context.Context, logger *slog.Logger, argsToPass []string) er
 			return xerrors.Errorf("failed to setup process: %w", err)
 		}
 	}
-	srv := httpapi.NewServer(ctx, agentType, process, port, chatBasePath)
+	port := viper.GetInt(FlagPort)
+	srv := httpapi.NewServer(ctx, httpapi.ServerConfig{
+		AgentType:    agentType,
+		Process:      process,
+		Port:         port,
+		ChatBasePath: viper.GetString(FlagChatBasePath),
+	})
 	if printOpenAPI {
 		fmt.Println(srv.GetOpenAPI())
 		return nil
@@ -140,26 +143,69 @@ var agentNames = (func() []string {
 	return names
 })()
 
-var ServerCmd = &cobra.Command{
-	Use:   "server [agent]",
-	Short: "Run the server",
-	Long:  fmt.Sprintf("Run the server with the specified agent (one of: %s)", strings.Join(agentNames, ", ")),
-	Args:  cobra.MinimumNArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
-		logger := slog.New(slog.NewTextHandler(os.Stdout, nil))
-		ctx := logctx.WithLogger(context.Background(), logger)
-		if err := runServer(ctx, logger, cmd.Flags().Args()); err != nil {
-			fmt.Fprintf(os.Stderr, "%+v\n", err)
-			os.Exit(1)
-		}
-	},
+type flagSpec struct {
+	name         string
+	shorthand    string
+	defaultValue any
+	usage        string
+	flagType     string
 }
 
-func init() {
-	ServerCmd.Flags().StringVarP(&agentTypeVar, "type", "t", "", fmt.Sprintf("Override the agent type (one of: %s, custom)", strings.Join(agentNames, ", ")))
-	ServerCmd.Flags().IntVarP(&port, "port", "p", 3284, "Port to run the server on")
-	ServerCmd.Flags().BoolVarP(&printOpenAPI, "print-openapi", "P", false, "Print the OpenAPI schema to stdout and exit")
-	ServerCmd.Flags().StringVarP(&chatBasePath, "chat-base-path", "c", "/chat", "Base path for assets and routes used in the static files of the chat interface")
-	ServerCmd.Flags().Uint16VarP(&termWidth, "term-width", "W", 80, "Width of the emulated terminal")
-	ServerCmd.Flags().Uint16VarP(&termHeight, "term-height", "H", 1000, "Height of the emulated terminal")
+const (
+	FlagType         = "type"
+	FlagPort         = "port"
+	FlagPrintOpenAPI = "print-openapi"
+	FlagChatBasePath = "chat-base-path"
+	FlagTermWidth    = "term-width"
+	FlagTermHeight   = "term-height"
+)
+
+func CreateServerCmd() *cobra.Command {
+	serverCmd := &cobra.Command{
+		Use:   "server [agent]",
+		Short: "Run the server",
+		Long:  fmt.Sprintf("Run the server with the specified agent (one of: %s)", strings.Join(agentNames, ", ")),
+		Args:  cobra.MinimumNArgs(1),
+		Run: func(cmd *cobra.Command, args []string) {
+			logger := slog.New(slog.NewTextHandler(os.Stdout, nil))
+			ctx := logctx.WithLogger(context.Background(), logger)
+			if err := runServer(ctx, logger, cmd.Flags().Args()); err != nil {
+				fmt.Fprintf(os.Stderr, "%+v\n", err)
+				os.Exit(1)
+			}
+		},
+	}
+
+	flagSpecs := []flagSpec{
+		{FlagType, "t", "", fmt.Sprintf("Override the agent type (one of: %s, custom)", strings.Join(agentNames, ", ")), "string"},
+		{FlagPort, "p", 3284, "Port to run the server on", "int"},
+		{FlagPrintOpenAPI, "P", false, "Print the OpenAPI schema to stdout and exit", "bool"},
+		{FlagChatBasePath, "c", "/chat", "Base path for assets and routes used in the static files of the chat interface", "string"},
+		{FlagTermWidth, "W", uint16(80), "Width of the emulated terminal", "uint16"},
+		{FlagTermHeight, "H", uint16(1000), "Height of the emulated terminal", "uint16"},
+	}
+
+	for _, spec := range flagSpecs {
+		switch spec.flagType {
+		case "string":
+			serverCmd.Flags().StringP(spec.name, spec.shorthand, spec.defaultValue.(string), spec.usage)
+		case "int":
+			serverCmd.Flags().IntP(spec.name, spec.shorthand, spec.defaultValue.(int), spec.usage)
+		case "bool":
+			serverCmd.Flags().BoolP(spec.name, spec.shorthand, spec.defaultValue.(bool), spec.usage)
+		case "uint16":
+			serverCmd.Flags().Uint16P(spec.name, spec.shorthand, spec.defaultValue.(uint16), spec.usage)
+		default:
+			panic(fmt.Sprintf("unknown flag type: %s", spec.flagType))
+		}
+		if err := viper.BindPFlag(spec.name, serverCmd.Flags().Lookup(spec.name)); err != nil {
+			panic(fmt.Sprintf("failed to bind flag %s: %v", spec.name, err))
+		}
+	}
+
+	viper.SetEnvPrefix("AGENTAPI")
+	viper.AutomaticEnv()
+	viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
+
+	return serverCmd
 }