Jun 18, 2025 · Jun 12, 2025 · Jun 12, 2025 · Jun 13, 2025 · Jun 13, 2025 · Jun 13, 2025
diff --git a/agent/agentcontainers/devcontainercli.go b/agent/agentcontainers/devcontainercli.go
 }

 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
 }
 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
 const shouldShowProvisionerAlert =
 workspacePending && !haveBuildLogs && !provisionersHealthy && !isRestarting;

 console.log(selectedResource?.agents);

 return (
 <div
 css={{
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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))}}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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),
Copy link Member mafredriJun 18, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. It'd be nice to consolidate similar things rather than having too many knobs, perhaps a`agentcontainers.WithManifestInfo(url, owner, workspace)`? (I'm aware my naming suggestion could've been better 😅.)
		)

		if len(manifest.Devcontainers) > 0 {
		containerAPIOpts = append(
		containerAPIOpts,
		agentcontainers.WithDevcontainers(manifest.Devcontainers, manifest.Scripts),
		)
		}
DanielleMaywood marked this conversation as resolved. Show resolvedHide resolved
		}

		// Append after to allow the agent options to override the default options.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -99,6 +99,8 @@ export const Workspace: FC<WorkspaceProps> = ({
		const shouldShowProvisionerAlert =
		workspacePending && !haveBuildLogs && !provisionersHealthy && !isRestarting;

		console.log(selectedResource?.agents);

		return (
		<div
		css={{
Expand Down