Jun 25, 2025 · Jun 20, 2025 · Jun 20, 2025 · Jun 20, 2025 · Jun 24, 2025 · Jun 24, 2025
diff --git a/agent/agent.go b/agent/agent.go

 experimentalDevcontainersEnabled bool
 containerAPIOptions              []agentcontainers.Option
 containerAPI                     atomic.Pointer[agentcontainers.API] // Set by apiHandler.
 containerAPI                     atomic.Pointer[agentcontainers.API]
 }

 func (a *agent) TailnetConn() *tailnet.Conn {
 sentResult = true

 // The startup script should only execute on the first run!
 if oldManifest == nil {
 a.setLifecycle(codersdk.WorkspaceAgentLifecycleStarting)

 // Perform overrides early so that Git auth can work even if users
 devcontainerScripts map[uuid.UUID]codersdk.WorkspaceAgentScript
 )
 if a.experimentalDevcontainersEnabled {
 containerAPIOpts := []agentcontainers.Option{
 agentcontainers.WithExecer(a.execer),
 agentcontainers.WithCommandEnv(a.sshServer.CommandEnv),
 agentcontainers.WithScriptLogger(func(logSourceID uuid.UUID) agentcontainers.ScriptLogger {
 return a.logSender.GetScriptLogger(logSourceID)
 }),
 agentcontainers.WithManifestInfo(manifest.OwnerName, manifest.WorkspaceName),
 agentcontainers.WithDevcontainers(manifest.Devcontainers, scripts),
 agentcontainers.WithSubAgentClient(agentcontainers.NewSubAgentClientFromAPI(a.logger, aAPI)),
 }
 containerAPIOpts = append(containerAPIOpts, a.containerAPIOptions...)

 a.containerAPI.Store(agentcontainers.NewAPI(a.logger.Named("containers"), containerAPIOpts...))

 scripts, devcontainerScripts = agentcontainers.ExtractDevcontainerScripts(manifest.Devcontainers, scripts)
 }
 err = a.scriptRunner.Init(scripts, aAPI.ScriptCompleted, scriptRunnerOpts...)
diff --git a/agent/api.go b/agent/api.go

 "github.com/go-chi/chi/v5"

 "github.com/google/uuid"

 "github.com/coder/coder/v2/agent/agentcontainers"
 "github.com/coder/coder/v2/agent/proto"
 "github.com/coder/coder/v2/coderd/httpapi"
 "github.com/coder/coder/v2/codersdk"
 )

 func (a *agent) apiHandler(aAPI proto.DRPCAgentClient26) (http.Handler, func() error) {
 r := chi.NewRouter()
 r.Get("/", func(rw http.ResponseWriter, r *http.Request) {
 httpapi.Write(r.Context(), rw, http.StatusOK, codersdk.Response{
 }

 if a.experimentalDevcontainersEnabled {
 containerAPIOpts := []agentcontainers.Option{
 agentcontainers.WithExecer(a.execer),
 agentcontainers.WithCommandEnv(a.sshServer.CommandEnv),
 agentcontainers.WithScriptLogger(func(logSourceID uuid.UUID) agentcontainers.ScriptLogger {
 return a.logSender.GetScriptLogger(logSourceID)
 }),
 agentcontainers.WithSubAgentClient(agentcontainers.NewSubAgentClientFromAPI(a.logger, aAPI)),
 }
 manifest := a.manifest.Load()
 if manifest != nil {
 containerAPIOpts = append(containerAPIOpts,
 agentcontainers.WithManifestInfo(manifest.OwnerName, manifest.WorkspaceName),
 )

 if len(manifest.Devcontainers) > 0 {
 containerAPIOpts = append(
 containerAPIOpts,
 agentcontainers.WithDevcontainers(manifest.Devcontainers, manifest.Scripts),
 )
 }
 if cAPI := a.containerAPI.Load(); cAPI != nil {
 r.Mount("/api/v0/containers", cAPI.Routes())
 }

 // Append after to allow the agent options to override the default options.
 containerAPIOpts = append(containerAPIOpts, a.containerAPIOptions...)

 containerAPI := agentcontainers.NewAPI(a.logger.Named("containers"), containerAPIOpts...)
 r.Mount("/api/v0/containers", containerAPI.Routes())
 a.containerAPI.Store(containerAPI)
 } else {
 r.HandleFunc("/api/v0/containers", func(w http.ResponseWriter, r *http.Request) {
 httpapi.Write(r.Context(), w, http.StatusForbidden, codersdk.Response{
Original file line number	Diff line number	Diff line change
Expand Up		@@ -280,7 +280,7 @@

		experimentalDevcontainersEnabled bool
		containerAPIOptions []agentcontainers.Option
		containerAPI atomic.Pointer[agentcontainers.API] // Set by apiHandler.
		containerAPI atomic.Pointer[agentcontainers.API]
		}

		func (a agent) TailnetConn() tailnet.Conn {
Expand DownExpand Up		@@ -1130,7 +1130,7 @@
		sentResult = true

		// The startup script should only execute on the first run!
		if oldManifest == nil {
Check failure on line 1133 in agent/agent.go View workflow job for this annotation GitHub Actions/ lint `if oldManifest == nil` has complex nested blocks (complexity: 20) (nestif)
		a.setLifecycle(codersdk.WorkspaceAgentLifecycleStarting)

		// Perform overrides early so that Git auth can work even if users
Expand All		@@ -1153,6 +1153,20 @@
		devcontainerScripts map[uuid.UUID]codersdk.WorkspaceAgentScript
		)
		if a.experimentalDevcontainersEnabled {
		containerAPIOpts := []agentcontainers.Option{
		agentcontainers.WithExecer(a.execer),
		agentcontainers.WithCommandEnv(a.sshServer.CommandEnv),
		agentcontainers.WithScriptLogger(func(logSourceID uuid.UUID) agentcontainers.ScriptLogger {
		return a.logSender.GetScriptLogger(logSourceID)
		}),
		agentcontainers.WithManifestInfo(manifest.OwnerName, manifest.WorkspaceName),
		agentcontainers.WithDevcontainers(manifest.Devcontainers, scripts),
		agentcontainers.WithSubAgentClient(agentcontainers.NewSubAgentClientFromAPI(a.logger, aAPI)),
		}
		containerAPIOpts = append(containerAPIOpts, a.containerAPIOptions...)

		a.containerAPI.Store(agentcontainers.NewAPI(a.logger.Named("containers"), containerAPIOpts...))

		scripts, devcontainerScripts = agentcontainers.ExtractDevcontainerScripts(manifest.Devcontainers, scripts)
		}
		err = a.scriptRunner.Init(scripts, aAPI.ScriptCompleted, scriptRunnerOpts...)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,15 +7,12 @@

		"github.com/go-chi/chi/v5"

		"github.com/google/uuid"

		"github.com/coder/coder/v2/agent/agentcontainers"
		"github.com/coder/coder/v2/agent/proto"
		"github.com/coder/coder/v2/coderd/httpapi"
		"github.com/coder/coder/v2/codersdk"
		)

		func (a *agent) apiHandler(aAPI proto.DRPCAgentClient26) (http.Handler, func() error) {
Check failure on line 15 in agent/api.go View workflow job for this annotation GitHub Actions/ lint `unused-parameter: parameter 'aAPI' seems to be unused, consider removing or renaming it as _ (revive)`
		r := chi.NewRouter()
		r.Get("/", func(rw http.ResponseWriter, r *http.Request) {
		httpapi.Write(r.Context(), rw, http.StatusOK, codersdk.Response{
Expand All		@@ -41,34 +38,9 @@
		}

		if a.experimentalDevcontainersEnabled {
		containerAPIOpts := []agentcontainers.Option{
		agentcontainers.WithExecer(a.execer),
		agentcontainers.WithCommandEnv(a.sshServer.CommandEnv),
		agentcontainers.WithScriptLogger(func(logSourceID uuid.UUID) agentcontainers.ScriptLogger {
		return a.logSender.GetScriptLogger(logSourceID)
		}),
		agentcontainers.WithSubAgentClient(agentcontainers.NewSubAgentClientFromAPI(a.logger, aAPI)),
		}
		manifest := a.manifest.Load()
		if manifest != nil {
		containerAPIOpts = append(containerAPIOpts,
		agentcontainers.WithManifestInfo(manifest.OwnerName, manifest.WorkspaceName),
		)

		if len(manifest.Devcontainers) > 0 {
		containerAPIOpts = append(
		containerAPIOpts,
		agentcontainers.WithDevcontainers(manifest.Devcontainers, manifest.Scripts),
		)
		}
		if cAPI := a.containerAPI.Load(); cAPI != nil {
DanielleMaywood marked this conversation as resolved. Show resolvedHide resolved
		r.Mount("/api/v0/containers", cAPI.Routes())
		}

		// Append after to allow the agent options to override the default options.
		containerAPIOpts = append(containerAPIOpts, a.containerAPIOptions...)

		containerAPI := agentcontainers.NewAPI(a.logger.Named("containers"), containerAPIOpts...)
		r.Mount("/api/v0/containers", containerAPI.Routes())
		a.containerAPI.Store(containerAPI)
		} else {
		r.HandleFunc("/api/v0/containers", func(w http.ResponseWriter, r *http.Request) {
		httpapi.Write(r.Context(), w, http.StatusForbidden, codersdk.Response{
Expand Down