chore: pass env variables + remove accidental commit

DanielleMaywood · DanielleMaywood · commit 91fd4e71b21c · 2025-06-18T10:14:44.000Z
diff --git a/agent/agentcontainers/api.go b/agent/agentcontainers/api.go
@@ -1146,12 +1146,14 @@ func (api *API) maybeInjectSubAgentIntoContainerLocked(ctx context.Context, dc c
 
 		var apps []SubAgentApp
 
-		if config, err := api.dccli.ReadConfig(ctx, dc.WorkspaceFolder, dc.ConfigPath, []string{
-			fmt.Sprintf("CODER_AGENT_NAME=%s", dc.Name),
-			fmt.Sprintf("CODER_USER_NAME=%s", api.userName),
-			fmt.Sprintf("CODER_WORKSPACE_NAME=%s", api.workspaceName),
-			fmt.Sprintf("CODER_DEPLOYMENT_URL=%s", api.subAgentURL),
-		}); err != nil {
+		if config, err := api.dccli.ReadConfig(ctx, dc.WorkspaceFolder, dc.ConfigPath,
+			[]string{
+				fmt.Sprintf("CODER_WORKSPACE_AGENT_NAME=%s", dc.Name),
+				fmt.Sprintf("CODER_WORKSPACE_OWNER_NAME=%s", api.userName),
+				fmt.Sprintf("CODER_WORKSPACE_NAME=%s", api.workspaceName),
+				fmt.Sprintf("CODER_DEPLOYMENT_URL=%s", api.subAgentURL),
+			},
+		); err != nil {
 			api.logger.Error(ctx, "unable to read devcontainer config", slog.Error(err))
 		} else {
 			coderCustomization := config.MergedConfiguration.Customizations.Coder
diff --git a/agent/agentcontainers/devcontainercli.go b/agent/agentcontainers/devcontainercli.go
@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"errors"
 	"io"
+	"os"
 
 	"golang.org/x/xerrors"
 
@@ -264,7 +265,7 @@ func (d *devcontainerCLI) ReadConfig(ctx context.Context, workspaceFolder, confi
 	}
 
 	c := d.execer.CommandContext(ctx, "devcontainer", args...)
-	// c.Env = append(c.Env, env...)
+	c.Env = append(os.Environ(), env...)
 
 	var stdoutBuf bytes.Buffer
 	stdoutWriters := []io.Writer{&stdoutBuf, &devcontainerCLILogWriter{ctx: ctx, logger: logger.With(slog.F("stdout", true))}}
diff --git a/site/src/pages/WorkspacePage/Workspace.tsx b/site/src/pages/WorkspacePage/Workspace.tsx
@@ -99,8 +99,6 @@ export const Workspace: FC<WorkspaceProps> = ({
 	const shouldShowProvisionerAlert =
 		workspacePending && !haveBuildLogs && !provisionersHealthy && !isRestarting;
 
-	console.log(selectedResource?.agents);
-
 	return (
 		<div
 			css={{
