Jun 25, 2025 · Jun 20, 2025 · Jun 20, 2025 · Jun 20, 2025 · Jun 24, 2025 · Jun 24, 2025
diff --git a/agent/agent.go b/agent/agent.go
 // will not report anywhere.
 a.scriptRunner.RegisterMetrics(a.prometheusRegistry)

 containerAPIOpts := []agentcontainers.Option{
 agentcontainers.WithExecer(a.execer),
 agentcontainers.WithCommandEnv(a.sshServer.CommandEnv),
 agentcontainers.WithScriptLogger(func(logSourceID uuid.UUID) agentcontainers.ScriptLogger {
 return a.logSender.GetScriptLogger(logSourceID)
 }),
 }
 containerAPIOpts = append(containerAPIOpts, a.containerAPIOptions...)
 if a.devcontainers {
 containerAPIOpts := []agentcontainers.Option{
 agentcontainers.WithExecer(a.execer),
 agentcontainers.WithCommandEnv(a.sshServer.CommandEnv),
 agentcontainers.WithScriptLogger(func(logSourceID uuid.UUID) agentcontainers.ScriptLogger {
 return a.logSender.GetScriptLogger(logSourceID)
 }),
 }
 containerAPIOpts = append(containerAPIOpts, a.containerAPIOptions...)

 a.containerAPI = agentcontainers.NewAPI(a.logger.Named("containers"), containerAPIOpts...)
 a.containerAPI = agentcontainers.NewAPI(a.logger.Named("containers"), containerAPIOpts...)
 }

 a.reconnectingPTYServer = reconnectingpty.NewServer(
 a.logger.Named("reconnecting-pty"),
 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)
 network.SetBlockEndpoints(manifest.DisableDirectConnections)

 // Update the subagent client if the container API is available.
 client := agentcontainers.NewSubAgentClientFromAPI(a.logger, aAPI)
 a.containerAPI.UpdateSubAgentClient(client)
 if a.containerAPI != nil {
 client := agentcontainers.NewSubAgentClientFromAPI(a.logger, aAPI)
 a.containerAPI.UpdateSubAgentClient(client)
 }
 }
 return nil
 }
 a.logger.Error(a.hardCtx, "script runner close", slog.Error(err))
 }

 if err := a.containerAPI.Close(); err != nil {
 a.logger.Error(a.hardCtx, "container API close", slog.Error(err))
 if a.containerAPI != nil {
 if err := a.containerAPI.Close(); err != nil {
 a.logger.Error(a.hardCtx, "container API close", slog.Error(err))
 }
 }

 // Wait for the graceful shutdown to complete, but don't wait forever so
diff --git a/agent/agentcontainers/api.go b/agent/agentcontainers/api.go
 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
Expand Up		@@ -336,16 +336,18 @@ func (a *agent) init() {
		// will not report anywhere.
		a.scriptRunner.RegisterMetrics(a.prometheusRegistry)

		containerAPIOpts := []agentcontainers.Option{
		agentcontainers.WithExecer(a.execer),
		agentcontainers.WithCommandEnv(a.sshServer.CommandEnv),
		agentcontainers.WithScriptLogger(func(logSourceID uuid.UUID) agentcontainers.ScriptLogger {
		return a.logSender.GetScriptLogger(logSourceID)
		}),
		}
		containerAPIOpts = append(containerAPIOpts, a.containerAPIOptions...)
		if a.devcontainers {
		containerAPIOpts := []agentcontainers.Option{
		agentcontainers.WithExecer(a.execer),
		agentcontainers.WithCommandEnv(a.sshServer.CommandEnv),
		agentcontainers.WithScriptLogger(func(logSourceID uuid.UUID) agentcontainers.ScriptLogger {
		return a.logSender.GetScriptLogger(logSourceID)
		}),
		}
		containerAPIOpts = append(containerAPIOpts, a.containerAPIOptions...)

		a.containerAPI = agentcontainers.NewAPI(a.logger.Named("containers"), containerAPIOpts...)
		a.containerAPI = agentcontainers.NewAPI(a.logger.Named("containers"), containerAPIOpts...)
		}

		a.reconnectingPTYServer = reconnectingpty.NewServer(
		a.logger.Named("reconnecting-pty"),
Expand DownExpand Up		@@ -1106,6 +1108,9 @@ 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)
Expand DownExpand Up		@@ -1310,8 +1315,10 @@ func (a agent) createOrUpdateNetwork(manifestOK, networkOK checkpoint) func(co
		network.SetBlockEndpoints(manifest.DisableDirectConnections)

		// Update the subagent client if the container API is available.
		client := agentcontainers.NewSubAgentClientFromAPI(a.logger, aAPI)
		a.containerAPI.UpdateSubAgentClient(client)
		if a.containerAPI != nil {
		client := agentcontainers.NewSubAgentClientFromAPI(a.logger, aAPI)
		a.containerAPI.UpdateSubAgentClient(client)
		}
		}
		return nil
		}
Expand DownExpand Up		@@ -1912,8 +1919,10 @@ func (a *agent) Close() error {
		a.logger.Error(a.hardCtx, "script runner close", slog.Error(err))
		}

		if err := a.containerAPI.Close(); err != nil {
		a.logger.Error(a.hardCtx, "container API close", slog.Error(err))
		if a.containerAPI != nil {
		if err := a.containerAPI.Close(); err != nil {
		a.logger.Error(a.hardCtx, "container API close", slog.Error(err))
		}
		}

		// Wait for the graceful shutdown to complete, but don't wait forever so
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1605,6 +1605,8 @@ 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 {
Expand Down