From 18bfab21b3aaafbcd1b47948f62610948e34f630 Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Fri, 27 Jun 2025 13:27:19 +0000
Subject: [PATCH] fix(agent): fix script filtering for devcontainers

This was broken in #18630.
---
 agent/agent.go               | 15 +++++++--------
 agent/agentcontainers/api.go | 28 +++++++++++++---------------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/agent/agent.go b/agent/agent.go
index a2f2ea0dafaba..b05a4d4a90ed8 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -1158,15 +1158,13 @@ func (a *agent) handleManifest(manifestOK *checkpoint) func(ctx context.Context,
 				}
 			}
 
-			var (
-				scripts             = manifest.Scripts
-				scriptRunnerOpts    []agentscripts.InitOption
-				devcontainerScripts map[uuid.UUID]codersdk.WorkspaceAgentScript
-			)
+			scripts := manifest.Scripts
 			if a.containerAPI != nil {
-				scripts, devcontainerScripts = agentcontainers.ExtractDevcontainerScripts(manifest.Devcontainers, scripts)
+				// Since devcontainer are enabled, remove devcontainer scripts
+				// from the main scripts list to avoid showing an error.
+				scripts, _ = agentcontainers.ExtractDevcontainerScripts(manifest.Devcontainers, manifest.Scripts)
 			}
-			err = a.scriptRunner.Init(scripts, aAPI.ScriptCompleted, scriptRunnerOpts...)
+			err = a.scriptRunner.Init(scripts, aAPI.ScriptCompleted)
 			if err != nil {
 				return xerrors.Errorf("init script runner: %w", err)
 			}
@@ -1187,10 +1185,11 @@ func (a *agent) handleManifest(manifestOK *checkpoint) func(ctx context.Context,
 				if a.containerAPI != nil {
 					a.containerAPI.Init(
 						agentcontainers.WithManifestInfo(manifest.OwnerName, manifest.WorkspaceName, manifest.AgentName),
-						agentcontainers.WithDevcontainers(manifest.Devcontainers, scripts),
+						agentcontainers.WithDevcontainers(manifest.Devcontainers, manifest.Scripts),
 						agentcontainers.WithSubAgentClient(agentcontainers.NewSubAgentClientFromAPI(a.logger, aAPI)),
 					)
 
+					_, devcontainerScripts := agentcontainers.ExtractDevcontainerScripts(manifest.Devcontainers, manifest.Scripts)
 					for _, dc := range manifest.Devcontainers {
 						cErr := a.createDevcontainer(ctx, aAPI, dc, devcontainerScripts[dc.ID])
 						err = errors.Join(err, cErr)
diff --git a/agent/agentcontainers/api.go b/agent/agentcontainers/api.go
index 6e56d4235e473..f2f465657a594 100644
--- a/agent/agentcontainers/api.go
+++ b/agent/agentcontainers/api.go
@@ -79,6 +79,7 @@ type API struct {
 	containersErr            error                                          // Error from the last list operation.
 	devcontainerNames        map[string]bool                                // By devcontainer name.
 	knownDevcontainers       map[string]codersdk.WorkspaceAgentDevcontainer // By workspace folder.
+	devcontainerLogSourceIDs map[string]uuid.UUID                           // By workspace folder.
 	configFileModifiedTimes  map[string]time.Time                           // By config file path.
 	recreateSuccessTimes     map[string]time.Time                           // By workspace folder.
 	recreateErrorTimes       map[string]time.Time                           // By workspace folder.
@@ -86,8 +87,6 @@ type API struct {
 	usingWorkspaceFolderName map[string]bool                                // By workspace folder.
 	ignoredDevcontainers     map[string]bool                                // By workspace folder. Tracks three states (true, false and not checked).
 	asyncWg                  sync.WaitGroup
-
-	devcontainerLogSourceIDs map[string]uuid.UUID // By workspace folder.
 }
 
 type subAgentProcess struct {
@@ -935,12 +934,7 @@ func (api *API) CreateDevcontainer(workspaceFolder, configPath string, opts ...D
 		return xerrors.Errorf("devcontainer not found")
 	}
 
-	api.asyncWg.Add(1)
-	defer api.asyncWg.Done()
-	api.mu.Unlock()
-
 	var (
-		err    error
 		ctx    = api.ctx
 		logger = api.logger.With(
 			slog.F("devcontainer_id", dc.ID),
@@ -950,19 +944,23 @@ func (api *API) CreateDevcontainer(workspaceFolder, configPath string, opts ...D
 		)
 	)
 
-	if dc.ConfigPath != configPath {
-		logger.Warn(ctx, "devcontainer config path mismatch",
-			slog.F("config_path_param", configPath),
-		)
-	}
-
 	// Send logs via agent logging facilities.
 	logSourceID := api.devcontainerLogSourceIDs[dc.WorkspaceFolder]
 	if logSourceID == uuid.Nil {
-		// Fallback to the external log source ID if not found.
+		api.logger.Debug(api.ctx, "devcontainer log source ID not found, falling back to external log source ID")
 		logSourceID = agentsdk.ExternalLogSourceID
 	}
 
+	api.asyncWg.Add(1)
+	defer api.asyncWg.Done()
+	api.mu.Unlock()
+
+	if dc.ConfigPath != configPath {
+		logger.Warn(ctx, "devcontainer config path mismatch",
+			slog.F("config_path_param", configPath),
+		)
+	}
+
 	scriptLogger := api.scriptLogger(logSourceID)
 	defer func() {
 		flushCtx, cancel := context.WithTimeout(api.ctx, 5*time.Second)
@@ -981,7 +979,7 @@ func (api *API) CreateDevcontainer(workspaceFolder, configPath string, opts ...D
 	upOptions := []DevcontainerCLIUpOptions{WithUpOutput(infoW, errW)}
 	upOptions = append(upOptions, opts...)
 
-	_, err = api.dccli.Up(ctx, dc.WorkspaceFolder, configPath, upOptions...)
+	_, err := api.dccli.Up(ctx, dc.WorkspaceFolder, configPath, upOptions...)
 	if err != nil {
 		// No need to log if the API is closing (context canceled), as this
 		// is expected behavior when the API is shutting down.