Skip to content

feat: add managed agent runtimes #323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xxx7xxxx merged 1 commit into from
Jul 11, 2026
Merged

feat: add managed agent runtimes #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cli/completion/completion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ func FullSpec() CommandSpec {
{Name: "daemon", Short: "d"},
{Name: "no-auth-detect"},
{Name: "no-browser"},
{Name: "no-codex-auto-install"},
{Name: "log-level", TakesValue: true, Values: logLevelValues()},
{Name: "log", TakesValue: true},
{Name: "pid", TakesValue: true},
Expand Down
2 changes: 1 addition & 1 deletion cli/completion/completion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func TestCompleteSubcommandsAndFlags(t *testing.T) {
assertContainsAll(t, got, "list", "create", "start", "stop", "delete", "logs", "--help")

got = Complete(FullSpec(), "csgclaw", []string{"csgclaw", "serve", "--"})
assertContainsAll(t, got, "--daemon", "--no-auth-detect", "--no-browser", "--log-level", "--log", "--pid")
assertContainsAll(t, got, "--daemon", "--no-auth-detect", "--no-browser", "--no-codex-auto-install", "--log-level", "--log", "--pid")

got = Complete(FullSpec(), "csgclaw", []string{"csgclaw", "upgrade", "--"})
assertContainsAll(t, got, "--check", "--no-restart")
Expand Down
69 changes: 46 additions & 23 deletions cli/serve/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import (
internalonboard "csgclaw/internal/onboard"
"csgclaw/internal/participant"
runtimecodex "csgclaw/internal/runtime/codex"
"csgclaw/internal/runtimecatalog"
"csgclaw/internal/sandboxproviders"
"csgclaw/internal/scheduledtask"
"csgclaw/internal/server"
Expand All @@ -64,6 +65,7 @@ var (
NewTeamService = newTeamService
NewAgentTaskService = newAgentTaskService
NewScheduledTaskService = newScheduledTaskService
NewAgentRuntimeService = func() *runtimecatalog.Service { return runtimecatalog.NewService() }
CheckModelProvider = checkModelProvider
CheckCatalogModelProvider = agent.CheckModelProvider
EnsureCLIProxy = func(ctx context.Context) error {
Expand Down Expand Up @@ -123,6 +125,7 @@ func (c serveCmd) Run(ctx context.Context, run *command.Context, args []string,
fs.BoolVar(daemon, "d", false, "run server in background")
noBrowser := fs.Bool("no-browser", false, "do not open the browser after startup")
noAuthDetect := fs.Bool("no-auth-detect", false, "disable automatic auth detection during startup")
noCodexAutoInstall := fs.Bool("no-codex-auto-install", false, "do not automatically install Codex CLI during startup")
logLevel := fs.String("log-level", "info", "log level: debug, info, warn, error")

defaultLogPath, err := defaultServerLogPath()
Expand Down Expand Up @@ -172,15 +175,17 @@ func (c serveCmd) Run(ctx context.Context, run *command.Context, args []string,
cfg.Server.AdvertiseBaseURL = strings.TrimRight(globals.Endpoint, "/")
}

serveOpts := serveOptions{
NoBrowser: *noBrowser,
NoAuthDetect: *noAuthDetect,
NoCodexAutoInstall: *noCodexAutoInstall,
}
if *daemon {
serveGlobals := globals
serveGlobals.Config = configPath
return serveBackground(run, cfg, serveGlobals, *logPath, *pidPath, *logLevel, *noBrowser, *noAuthDetect)
return serveBackground(run, cfg, serveGlobals, *logPath, *pidPath, *logLevel, serveOpts)
}
return serveForegroundWithConfigPath(ctx, run, cfg, configPath, globals.Output, serveOptions{
NoBrowser: *noBrowser,
NoAuthDetect: *noAuthDetect,
})
return serveForegroundWithConfigPath(ctx, run, cfg, configPath, globals.Output, serveOpts)
}

func (stopCmd) Name() string {
Expand Down Expand Up @@ -253,6 +258,7 @@ func (c internalServeCmd) Run(ctx context.Context, run *command.Context, args []
logLevel := fs.String("log-level", "info", "log level: debug, info, warn, error")
noBrowser := fs.Bool("no-browser", false, "do not open the browser after startup")
noAuthDetect := fs.Bool("no-auth-detect", false, "disable automatic auth detection during startup")
noCodexAutoInstall := fs.Bool("no-codex-auto-install", false, "do not automatically install Codex CLI during startup")
if err := fs.Parse(args); err != nil {
return err
}
Expand Down Expand Up @@ -312,8 +318,9 @@ func (c internalServeCmd) Run(ctx context.Context, run *command.Context, args []
return err
}
return startServerWithConfigPath(ctx, run, cfg, svc, imSvc, imBus, feishuSvc, configPath, globals.Output, serveOptions{
NoBrowser: *noBrowser,
NoAuthDetect: *noAuthDetect,
NoBrowser: *noBrowser,
NoAuthDetect: *noAuthDetect,
NoCodexAutoInstall: *noCodexAutoInstall,
})
}

Expand All @@ -339,8 +346,9 @@ func officialInstallGuidance(goos string) (string, string) {
}

type serveOptions struct {
NoBrowser bool
NoAuthDetect bool
NoBrowser bool
NoAuthDetect bool
NoCodexAutoInstall bool
}

func serveForegroundWithConfigPath(ctx context.Context, run *command.Context, cfg config.Config, configPath string, output string, opts ...serveOptions) error {
Expand Down Expand Up @@ -386,7 +394,7 @@ func serveForegroundWithConfigPath(ctx context.Context, run *command.Context, cf
return startServerWithConfigPath(ctx, run, cfg, svc, imSvc, imBus, feishuSvc, configPath, output, opts...)
}

func serveBackground(run *command.Context, cfg config.Config, globals command.GlobalOptions, logPath, pidPath, logLevel string, noBrowser, noAuthDetect bool) error {
func serveBackground(run *command.Context, cfg config.Config, globals command.GlobalOptions, logPath, pidPath, logLevel string, opts serveOptions) error {
exe, err := os.Executable()
if err != nil {
return fmt.Errorf("resolve executable: %w", err)
Expand All @@ -400,19 +408,7 @@ func serveBackground(run *command.Context, cfg config.Config, globals command.Gl
}
defer logFile.Close()

childArgs := []string{"_serve", "--pid", pidPath}
if globals.Config != "" {
childArgs = append(childArgs, "--config", globals.Config)
}
if strings.TrimSpace(logLevel) != "" {
childArgs = append(childArgs, "--log-level", logLevel)
}
if noBrowser {
childArgs = append(childArgs, "--no-browser")
}
if noAuthDetect {
childArgs = append(childArgs, "--no-auth-detect")
}
childArgs := backgroundServeArgs(globals.Config, pidPath, logLevel, opts)
cmd := exec.Command(exe, childArgs...)
cmd.Stdout = logFile
cmd.Stderr = logFile
Expand Down Expand Up @@ -450,6 +446,26 @@ func serveBackground(run *command.Context, cfg config.Config, globals command.Gl
return nil
}

func backgroundServeArgs(configPath, pidPath, logLevel string, opts serveOptions) []string {
args := []string{"_serve", "--pid", pidPath}
if configPath != "" {
args = append(args, "--config", configPath)
}
if strings.TrimSpace(logLevel) != "" {
args = append(args, "--log-level", logLevel)
}
if opts.NoBrowser {
args = append(args, "--no-browser")
}
if opts.NoAuthDetect {
args = append(args, "--no-auth-detect")
}
if opts.NoCodexAutoInstall {
args = append(args, "--no-codex-auto-install")
}
return args
}

func applyNoAuthDetectEnv(disabled bool) func() {
if !disabled {
return func() {}
Expand Down Expand Up @@ -616,6 +632,7 @@ func startServerWithConfigPath(ctx context.Context, run *command.Context, cfg co
if agentManagerSvc != nil {
defer agentManagerSvc.Close()
}
agentRuntimeSvc := NewAgentRuntimeService()
return RunServer(server.Options{
ListenAddr: cfg.Server.ListenAddr,
Service: svc,
Expand All @@ -629,6 +646,7 @@ func startServerWithConfigPath(ctx context.Context, run *command.Context, cfg co
Team: teamSvc,
AgentTask: agentTaskSvc,
ScheduledTask: scheduledTaskSvc,
AgentRuntimes: agentRuntimeSvc,
TeamAdapters: teamAdapters,
Upgrade: upgradeManager,
ActivityDecider: channelActivityDecider(codexBridgeMgr),
Expand All @@ -653,6 +671,11 @@ func startServerWithConfigPath(ctx context.Context, run *command.Context, cfg co
}()
}
go func() {
if !serveOpts.NoCodexAutoInstall && agentRuntimeSvc != nil {
if _, err := agentRuntimeSvc.EnsureCodex(ctx); err != nil {
slog.Warn("Codex CLI auto-install failed", "error", err)
}
}
if agentManagerSvc != nil {
if err := agentManagerSvc.Start(ctx); err != nil {
slog.Warn("bootstrap manager failed to start", "error", err)
Expand Down
Loading
Loading