backend

coder · mafredri · Jun 17, 2025 · Jun 10, 2025 · Jun 10, 2025 · Jun 10, 2025
commit 765c2cfd0467fac8117fb24d191ef63c9d384299
diff --git a/agent/agentcontainers/api.go b/agent/agentcontainers/api.go
@@ -486,8 +486,6 @@ func (api *API) processUpdatedContainersLocked(ctx context.Context, updated code
 	// Check if the container is running and update the known devcontainers.
 	for i := range updated.Containers {
 		container := &updated.Containers[i] // Grab a reference to the container to allow mutating it.
-		container.DevcontainerStatus = ""   // Reset the status for the container (updated later).
-		container.DevcontainerDirty = false // Reset dirty state for the container (updated later).
 
 		workspaceFolder := container.Labels[DevcontainerLocalFolderLabel]
 		configFile := container.Labels[DevcontainerConfigFileLabel]
@@ -568,8 +566,6 @@ func (api *API) processUpdatedContainersLocked(ctx context.Context, updated code
 				// TODO(mafredri): Parse the container label (i.e. devcontainer.json) for customization.
 				dc.Name = safeFriendlyName(dc.Container.FriendlyName)
 			}
-			dc.Container.DevcontainerStatus = dc.Status
-			dc.Container.DevcontainerDirty = dc.Dirty
 		}
 
 		switch {
@@ -584,13 +580,11 @@ func (api *API) processUpdatedContainersLocked(ctx context.Context, updated code
 			if dc.Container.Running {
 				dc.Status = codersdk.WorkspaceAgentDevcontainerStatusRunning
 			}
-			dc.Container.DevcontainerStatus = dc.Status
 
 			dc.Dirty = false
 			if lastModified, hasModTime := api.configFileModifiedTimes[dc.ConfigPath]; hasModTime && dc.Container.CreatedAt.Before(lastModified) {
 				dc.Dirty = true
 			}
-			dc.Container.DevcontainerDirty = dc.Dirty
 
 			if _, injected := api.injectedSubAgentProcs[dc.Container.ID]; !injected && dc.Status == codersdk.WorkspaceAgentDevcontainerStatusRunning {
 				err := api.injectSubAgentIntoContainerLocked(ctx, dc)
@@ -661,9 +655,19 @@ func (api *API) getContainers() (codersdk.WorkspaceAgentListContainersResponse,
 	if api.containersErr != nil {
 		return codersdk.WorkspaceAgentListContainersResponse{}, api.containersErr
 	}
+
+	devcontainers := make([]codersdk.WorkspaceAgentDevcontainer, 0, len(api.knownDevcontainers))
+	for _, dc := range api.knownDevcontainers {
+		devcontainers = append(devcontainers, dc)
+	}
+	slices.SortFunc(devcontainers, func(a, b codersdk.WorkspaceAgentDevcontainer) int {
+		return strings.Compare(a.ID.String(), b.ID.String())
+	})
+
 	return codersdk.WorkspaceAgentListContainersResponse{
-		Containers: slices.Clone(api.containers.Containers),
-		Warnings:   slices.Clone(api.containers.Warnings),
+		Devcontainers: devcontainers,
+		Containers:    slices.Clone(api.containers.Containers),
+		Warnings:      slices.Clone(api.containers.Warnings),
 	}, nil
 }
 
@@ -740,9 +744,6 @@ func (api *API) handleDevcontainerRecreate(w http.ResponseWriter, r *http.Reques
 	// Update the status so that we don't try to recreate the
 	// devcontainer multiple times in parallel.
 	dc.Status = codersdk.WorkspaceAgentDevcontainerStatusStarting
-	if dc.Container != nil {
-		dc.Container.DevcontainerStatus = dc.Status
-	}
 	api.knownDevcontainers[dc.WorkspaceFolder] = dc
 	api.asyncWg.Add(1)
 	go api.recreateDevcontainer(dc, configPath)
@@ -815,9 +816,6 @@ func (api *API) recreateDevcontainer(dc codersdk.WorkspaceAgentDevcontainer, con
 		api.mu.Lock()
 		dc = api.knownDevcontainers[dc.WorkspaceFolder]
 		dc.Status = codersdk.WorkspaceAgentDevcontainerStatusError
-		if dc.Container != nil {
-			dc.Container.DevcontainerStatus = dc.Status
-		}
 		api.knownDevcontainers[dc.WorkspaceFolder] = dc
 		api.recreateErrorTimes[dc.WorkspaceFolder] = api.clock.Now("agentcontainers", "recreate", "errorTimes")
 		api.mu.Unlock()
@@ -838,7 +836,6 @@ func (api *API) recreateDevcontainer(dc codersdk.WorkspaceAgentDevcontainer, con
 		if dc.Container.Running {
 			dc.Status = codersdk.WorkspaceAgentDevcontainerStatusRunning
 		}
-		dc.Container.DevcontainerStatus = dc.Status
 	}
 	dc.Dirty = false
 	api.recreateSuccessTimes[dc.WorkspaceFolder] = api.clock.Now("agentcontainers", "recreate", "successTimes")
@@ -914,10 +911,6 @@ func (api *API) markDevcontainerDirty(configPath string, modifiedAt time.Time) {
 			logger.Info(api.ctx, "marking devcontainer as dirty")
 			dc.Dirty = true
 		}
-		if dc.Container != nil && !dc.Container.DevcontainerDirty {
-			logger.Info(api.ctx, "marking devcontainer container as dirty")
-			dc.Container.DevcontainerDirty = true
-		}
 
 		api.knownDevcontainers[dc.WorkspaceFolder] = dc
 	}

diff --git a/agent/agentcontainers/api_test.go b/agent/agentcontainers/api_test.go
@@ -609,7 +609,6 @@ func TestAPI(t *testing.T) {
 				require.Len(t, resp.Devcontainers, 1, "expected one devcontainer in response")
 				assert.Equal(t, codersdk.WorkspaceAgentDevcontainerStatusStarting, resp.Devcontainers[0].Status, "devcontainer is not starting")
 				require.NotNil(t, resp.Devcontainers[0].Container, "devcontainer should have container reference")
-				assert.Equal(t, codersdk.WorkspaceAgentDevcontain
E7F5
erStatusStarting, resp.Devcontainers[0].Container.DevcontainerStatus, "container dc status is not starting")
 
 				// Allow the devcontainer CLI to continue the up process.
 				close(tt.devcontainerCLI.upErrC)
@@ -637,7 +636,6 @@ func TestAPI(t *testing.T) {
 					require.Len(t, resp.Devcontainers, 1, "expected one devcontainer in response after error")
 					assert.Equal(t, codersdk.WorkspaceAgentDevcontainerStatusError, resp.Devcontainers[0].Status, "devcontainer is not in an error state after up failure")
 					require.NotNil(t, resp.Devcontainers[0].Container, "devcontainer should have container reference after up failure")
-					assert.Equal(t, codersdk.WorkspaceAgentDevcontainerStatusError, resp.Devcontainers[0].Container.DevcontainerStatus, "container dc status is not error after up failure")
 					return
 				}
 
@@ -662,7 +660,6 @@ func TestAPI(t *testing.T) {
 				require.Len(t, resp.Devcontainers, 1, "expected one devcontainer in response after recreation")
 				assert.Equal(t, codersdk.WorkspaceAgentDevcontainerStatusRunning, resp.Devcontainers[0].Status, "devcontainer is not running after recreation")
 				require.NotNil(t, resp.Devcontainers[0].Container, "devcontainer should have container reference after recreation")
-				assert.Equal(t, codersdk.WorkspaceAgentDevcontainerStatusRunning, resp.Devcontainers[0].Container.DevcontainerStatus, "container dc status is not running after recreation")
 			})
 		}
 	})
@@ -757,7 +754,6 @@ func TestAPI(t *testing.T) {
 					assert.Equal(t, codersdk.WorkspaceAgentDevcontainerStatusRunning, dc.Status)
 					require.NotNil(t, dc.Container)
 					assert.Equal(t, "runtime-container-1", dc.Container.ID)
-					assert.Equal(t, codersdk.WorkspaceAgentDevcontainerStatusRunning, dc.Container.DevcontainerStatus)
 				},
 			},
 			{
@@ -802,10 +798,8 @@ func TestAPI(t *testing.T) {
 
 					require.NotNil(t, known1.Container)
 					assert.Equal(t, "known-container-1", known1.Container.ID)
-					assert.Equal(t, codersdk.WorkspaceAgentDevcontainerStatusRunning, known1.Container.DevcontainerStatus)
 					require.NotNil(t, runtime1.Container)
 					assert.Equal(t, "runtime-container-1", runtime1.Container.ID)
-					assert.Equal(t, codersdk.WorkspaceAgentDevcontainerStatusRunning, runtime1.Container.DevcontainerStatus)
 				},
 			},
 			{
@@ -845,11 +839,9 @@ func TestAPI(t *testing.T) {
 
 					require.NotNil(t, running.Container, "running container should have container reference")
 					assert.Equal(t, "running-container", running.Container.ID)
-					assert.Equal(t, codersdk.WorkspaceAgentDevcontainerStatusRunning, running.Container.DevcontainerStatus)
 
 					require.NotNil(t, nonRunning.Container, "non-running container should have container reference")
 					assert.Equal(t, "non-running-container", nonRunning.Container.ID)
-					assert.Equal(t, codersdk.WorkspaceAgentDevcontainerStatusStopped, nonRunning.Container.DevcontainerStatus)
 				},
 			},
 			{
@@ -885,7 +877,6 @@ func TestAPI(t *testing.T) {
 					assert.NotEmpty(t, dc2.ConfigPath)
 					require.NotNil(t, dc2.Container)
 					assert.Equal(t, "known-container-2", dc2.Container.ID)
-					assert.Equal(t, codersdk.WorkspaceAgentDevcontainerStatusRunning, dc2.Container.DevcontainerStatus)
 				},
 			},
 			{
@@ -1185,8 +1176,6 @@ func TestAPI(t *testing.T) {
 			"devcontainer should not be marked as dirty initially")
 		assert.Equal(t, codersdk.WorkspaceAgentDevcontainerStatusRunning, response.Devcontainers[0].Status, "devcontainer should be running initially")
 		require.NotNil(t, response.Devcontainers[0].Container, "container should not be nil")
-		assert.False(t, response.Devcontainers[0].Container.DevcontainerDirty,
-			"container should not be marked as dirty initially")
 
 		// Verify the watcher is watching the config file.
 		assert.Contains(t, fWatcher.addedPaths, configPath,
@@ -1220,8 +1209,6 @@ func TestAPI(t *testing.T) {
 			"container should be marked as dirty after config file was modified")
 		assert.Equal(t, codersdk.WorkspaceAgentDevcontainerStatusRunning, response.Devcontainers[0].Status, "devcontainer should be running after config file was modified")
 		require.NotNil(t, response.Devcontainers[0].Container, "container should not be nil")
-		assert.True(t, response.Devcontainers[0].Container.DevcontainerDirty,
-			"container should be marked as dirty after config file was modified")
 
 		container.ID = "new-container-id" // Simulate a new container ID after recreation.
 		container.FriendlyName = "new-container-name"
@@ -1246,8 +1233,6 @@ func TestAPI(t *testing.T) {
 			"dirty flag should be cleared on the devcontainer after container recreation")
 		assert.Equal(t, codersdk.WorkspaceAgentDevcontainerStatusRunning, response.Devcontainers[0].Status, "devcontainer should be running after recreation")
 		require.NotNil(t, response.Devcontainers[0].Container, "container should not be nil")
-		assert.False(t, response.Devcontainers[0].Container.DevcontainerDirty,
-			"dirty flag should be cleared on the container after container recreation")
 	})
 
 	t.Run("SubAgentLifecycle", func(t *testing.T) {

diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go
@@ -1403,15 +1403,13 @@ func TestWorkspaceAgentRecreateDevcontainer(t *testing.T) {
 				agentcontainers.DevcontainerConfigFileLabel:  configFile,
 			}
 			devContainer = codersdk.WorkspaceAgentContainer{
-				ID:                 uuid.NewString(),
-				CreatedAt:          dbtime.Now(),
-				FriendlyName:       testutil.GetRandomName(t),
-				Image:              "busybox:latest",
-				Labels:             dcLabels,
-				Running:            true,
-				Status:             "running",
-				DevcontainerDirty:  true,
-				DevcontainerStatus: codersdk.WorkspaceAgentDevcontainerStatusRunning,
+				ID:           uuid.NewString(),
+				CreatedAt:    dbtime.Now(),
+				FriendlyName: testutil.GetRandomName(t),
+				Image:        "busybox:latest",
+				Labels:       dcLabels,
+				Running:      true,
+				Status:       "running",
 			}
 			plainContainer = codersdk.WorkspaceAgentContainer{
 				ID:           uuid.NewString(),

diff --git a/codersdk/workspaceagents.go b/codersdk/workspaceagents.go
@@ -450,14 +450,6 @@ type WorkspaceAgentContainer struct {
 	// Volumes is a map of "things" mounted into the container. Again, this
 	// is somewhat implementation-dependent.
 	Volumes map[string]string `json:"volumes"`
-	// DevcontainerStatus is the status of the devcontainer, if this
-	// container is a devcontainer. This is used to determine if the
-	// devcontainer is running, stopped, starting, or in an error state.
-	DevcontainerStatus WorkspaceAgentDevcontainerStatus `json:"devcontainer_status,omitempty"`
-	// DevcontainerDirty is true if the devcontainer configuration has changed
-	// since the container was created. This is used to determine if the
-	// container needs to be rebuilt.
-	DevcontainerDirty bool `json:"devcontainer_dirty"`
 }
 
 func (c *WorkspaceAgentContainer) Match(idOrName string) bool {
@@ -486,6 +478,8 @@ type WorkspaceAgentContainerPort struct {
 // WorkspaceAgentListContainersResponse is the response to the list containers
 // request.
 type WorkspaceAgentListContainersResponse struct {
+	// Devcontainers is a list of devcontainers visible to the workspace agent.
+	Devcontainers []WorkspaceAgentDevcontainer `json:"devcontainers"`
 	// Containers is a list of containers visible to the workspace agent.
 	Containers []WorkspaceAgentContainer `json:"containers"`
 	// Warnings is a list of warnings that may have occurred during the