chore: more changes

DanielleMaywood · DanielleMaywood · commit 6896dcb8c28b · 2025-06-17T16:02:07.000Z
diff --git a/agent/agentcontainers/devcontainercli.go b/agent/agentcontainers/devcontainercli.go
@@ -264,7 +264,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(c.Env, env...)
 
 	var stdoutBuf bytes.Buffer
 	stdoutWriters := []io.Writer{&stdoutBuf, &devcontainerCLILogWriter{ctx: ctx, logger: logger.With(slog.F("stdout", true))}}
diff --git a/agent/api.go b/agent/api.go
@@ -50,10 +50,17 @@ func (a *agent) apiHandler(aAPI proto.DRPCAgentClient26) (http.Handler, func() e
 		}
 		manifest := a.manifest.Load()
 		if manifest != nil && len(manifest.Devcontainers) > 0 {
-			containerAPIOpts = append(
-				containerAPIOpts,
-				agentcontainers.WithDevcontainers(manifest.Devcontainers, manifest.Scripts),
+			containerAPIOpts = append(containerAPIOpts,
+				agentcontainers.WithUserName(manifest.OwnerName),
+				agentcontainers.WithWorkspaceName(manifest.WorkspaceName),
 			)
+
+			if len(manifest.Devcontainers) > 0 {
+				containerAPIOpts = append(
+					containerAPIOpts,
+					agentcontainers.WithDevcontainers(manifest.Devcontainers, manifest.Scripts),
+				)
+			}
 		}
 
 		// Append after to allow the agent options to override the default options.
diff --git a/site/src/pages/WorkspacePage/Workspace.tsx b/site/src/pages/WorkspacePage/Workspace.tsx
@@ -99,6 +99,8 @@ export const Workspace: FC<WorkspaceProps> = ({
 	const shouldShowProvisionerAlert =
 		workspacePending && !haveBuildLogs && !provisionersHealthy && !isRestarting;
 
+	console.log(selectedResource?.agents);
+
 	return (
 		<div
 			css={{

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ func (d *devcontainerCLI) ReadConfig(ctx context.Context, workspaceFolder, confi`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`c := d.execer.CommandContext(ctx, "devcontainer", args...)`
`267`		`- c.Env = append(c.Env, env...)`
	`267`	`+ // c.Env = append(c.Env, env...)`
`268`	`268`
`269`	`269`	`var stdoutBuf bytes.Buffer`
`270`	`270`	`stdoutWriters := []io.Writer{&stdoutBuf, &devcontainerCLILogWriter{ctx: ctx, logger: logger.With(slog.F("stdout", true))}}`