chore: simplify things a little

DanielleMaywood · DanielleMaywood · commit 3714fec62efa · 2025-06-24T22:30:42.000Z
diff --git a/agent/agent.go b/agent/agent.go
@@ -1108,9 +1108,6 @@ func (a *agent) handleManifest(manifestOK *checkpoint) func(ctx context.Context,
 			if a.devcontainers {
 				a.logger.Info(ctx, "devcontainers are not supported on sub agents, disabling feature")
 				a.devcontainers = false
-				if err := a.containerAPI.Close(); err != nil {
-					a.logger.Error(ctx, "disable container API", slog.Error(err))
-				}
 			}
 		}
 		a.client.RewriteDERPMap(manifest.DERPMap)
diff --git a/agent/agentcontainers/api.go b/agent/agentcontainers/api.go
@@ -51,7 +51,6 @@ const (
 type API struct {
 	ctx                         context.Context
 	cancel                      context.CancelFunc
-	initialized                 chan struct{}
 	watcherDone                 chan struct{}
 	updaterDone                 chan struct{}
 	initialUpdateDone           chan struct{}   // Closed after first update in updaterLoop.
@@ -266,7 +265,6 @@ func NewAPI(logger slog.Logger, options ...Option) *API {
 	api := &API{
 		ctx:                         ctx,
 		cancel:                      cancel,
-		initialized:                 make(chan struct{}),
 		watcherDone:                 make(chan struct{}),
 		updaterDone:                 make(chan struct{}),
 		initialUpdateDone:           make(chan struct{}),
@@ -317,24 +315,19 @@ func NewAPI(logger slog.Logger, options ...Option) *API {
 		api.subAgentClient.Store(&c)
 	}
 
-	go func() {
-		select {
-		case <-api.ctx.Done():
-			break
-		case <-api.initialized:
-			go api.watcherLoop()
-			go api.updaterLoop()
-		}
-	}()
-
 	return api
 }
 
+// Init applies a final set of options to the API and then
+// begins the watcherLoop and updaterLoop. This function
+// must only be called once.
 func (api *API) Init(opts ...Option) {
 	for _, opt := range opts {
 		opt(api)
 	}
-	close(api.initialized)
+
+	go api.watcherLoop()
+	go api.updaterLoop()
 }
 
 func (api *API) watcherLoop() {
@@ -1605,8 +1598,6 @@ func (api *API) Close() error {
 	api.logger.Debug(api.ctx, "closing API")
 	api.closed = true
 
-	close(api.initialized)
-
 	// Stop all running subagent processes and clean up.
 	subAgentIDs := make([]uuid.UUID, 0, len(api.injectedSubAgentProcs))
 	for workspaceFolder, proc := range api.injectedSubAgentProcs {

Original file line number	Diff line number	Diff line change
`@@ -1108,9 +1108,6 @@ func (a agent) handleManifest(manifestOK checkpoint) func(ctx context.Context,`
`1108`	`1108`	`if a.devcontainers {`
`1109`	`1109`	`a.logger.Info(ctx, "devcontainers are not supported on sub agents, disabling feature")`
`1110`	`1110`	`a.devcontainers = false`
`1111`		`- if err := a.containerAPI.Close(); err != nil {`
`1112`		`- a.logger.Error(ctx, "disable container API", slog.Error(err))`
`1113`		`- }`
`1114`	`1111`	`}`
`1115`	`1112`	`}`
`1116`	`1113`	`a.client.RewriteDERPMap(manifest.DERPMap)`