add sub agent env and revert container id change

mafredri · mafredri · commit 050177bf56b2 · 2025-06-09T15:39:50.000Z
diff --git a/agent/agentcontainers/api.go b/agent/agentcontainers/api.go
@@ -59,6 +59,7 @@ type API struct {
 	scriptLogger                func(logSourceID uuid.UUID) ScriptLogger
 	subAgentClient              SubAgentClient
 	subAgentURL                 string
+	subAgentEnv                 []string
 
 	mu                      sync.RWMutex
 	closed                  bool
@@ -141,6 +142,13 @@ func WithSubAgentURL(url string) Option {
 	}
 }
 
+// WithSubAgent sets the environment variables for the sub-agent.
+func WithSubAgentEnv(env ...string) Option {
+	return func(api *API) {
+		api.subAgentEnv = env
+	}
+}
+
 // WithDevcontainers sets the known devcontainers for the API. This
 // allows the API to be aware of devcontainers defined in the workspace
 // agent manifest.
@@ -1147,12 +1155,14 @@ func (api *API) runSubAgentInContainer(ctx context.Context, dc codersdk.Workspac
 
 	logger.Info(ctx, "starting subagent in dev container")
 
+	env := []string{
+		"CODER_AGENT_URL=" + api.subAgentURL,
+		"CODER_AGENT_TOKEN=" + agent.AuthToken.String(),
+	}
+	env = append(env, api.subAgentEnv...)
 	err := api.dccli.Exec(agentCtx, dc.WorkspaceFolder, dc.ConfigPath, agentPath, []string{"agent"},
 		WithExecContainerID(container.ID),
-		WithRemoteEnv(
-			"CODER_AGENT_URL="+api.subAgentURL,
-			"CODER_AGENT_TOKEN="+agent.AuthToken.String(),
-		),
+		WithRemoteEnv(env...),
 	)
 	if err != nil && !errors.Is(err, context.Canceled) {
 		logger.Error(ctx, "subagent process failed", slog.Error(err))
diff --git a/agent/agentcontainers/devcontainercli.go b/agent/agentcontainers/devcontainercli.go
@@ -68,11 +68,10 @@ func WithExecOutput(stdout, stderr io.Writer) DevcontainerCLIExecOptions {
 }
 
 // WithExecContainerID sets the container ID to target a specific
-// container. Note that this option will unset the workspace folder to
-// ensure properties from the container are inherited correctly.
+// container.
 func WithExecContainerID(id string) DevcontainerCLIExecOptions {
 	return func(o *devcontainerCLIExecConfig) {
-		o.containerID = id
+		o.args = append(o.args, "--container-id", id)
 	}
 }
 
@@ -168,10 +167,12 @@ func (d *devcontainerCLI) Exec(ctx context.Context, workspaceFolder, configPath
 	logger := d.logger.With(slog.F("workspace_folder", workspaceFolder), slog.F("config_path", configPath))
 
 	args := []string{"exec"}
-	switch {
-	case conf.containerID != "":
-		args = append(args, "--container-id", conf.containerID)
-	case workspaceFolder != "":
+	// For now, always set workspace folder even if --container-id is provided.
+	// Otherwise the environment of exec will be incomplete, like `pwd` will be
+	// /home/coder instead of /workspaces/coder. The downside is that the local
+	// `devcontainer.json` config will overwrite settings serialized in the
+	// container label.
+	if workspaceFolder != "" {
 		args = append(args, "--workspace-folder", workspaceFolder)
 	}
 	if configPath != "" {
