avoid resetting container in recreate

mafredri · mafredri · commit ce63f79cc84b · 2025-05-16T11:52:56.000Z
diff --git a/agent/agentcontainers/api.go b/agent/agentcontainers/api.go
@@ -511,7 +511,14 @@ func (api *API) handleDevcontainerRecreate(w http.ResponseWriter, r *http.Reques
 						slog.F("name", api.knownDevcontainers[i].Name),
 					)
 					api.knownDevcontainers[i].Dirty = false
-					api.knownDevcontainers[i].Container = nil
+					// This is a bit of a hack since we don't know if we're
+					// referencing the new or the old container. But this issue
+					// will be cleared up the next time we call getContainers.
+					// TODO(mafredri): This should be handled by a service that
+					// updates the devcontainer state periodically and on-demand.
+					if api.knownDevcontainers[i].Container != nil {
+						api.knownDevcontainers[i].Container.DevcontainerDirty = false
+					}
 				}
 				return
 			}
@@ -584,6 +591,9 @@ func (api *API) markDevcontainerDirty(configPath string, modifiedAt time.Time) {
 				if api.knownDevcontainers[i].Container != nil {
 					api.knownDevcontainers[i].Container.DevcontainerDirty = true
 				}
+				// Set the modified time to the zero value to indicate that the
+				// containers list must be refreshed.
+				api.mtime = time.Time{}
 			}
 		}
 	})

Original file line number	Diff line number	Diff line change
`@@ -511,7 +511,14 @@ func (api API) handleDevcontainerRecreate(w http.ResponseWriter, r http.Reques`
`511`	`511`	`slog.F("name", api.knownDevcontainers[i].Name),`
`512`	`512`	`)`
`513`	`513`	`api.knownDevcontainers[i].Dirty = false`
`514`		`- api.knownDevcontainers[i].Container = nil`
	`514`	`+ // This is a bit of a hack since we don't know if we're`
	`515`	`+ // referencing the new or the old container. But this issue`
	`516`	`+ // will be cleared up the next time we call getContainers.`
	`517`	`+ // TODO(mafredri): This should be handled by a service that`
	`518`	`+ // updates the devcontainer state periodically and on-demand.`
	`519`	`+ if api.knownDevcontainers[i].Container != nil {`
	`520`	`+ api.knownDevcontainers[i].Container.DevcontainerDirty = false`
	`521`	`+ }`
`515`	`522`	`}`
`516`	`523`	`return`
`517`	`524`	`}`
`@@ -584,6 +591,9 @@ func (api *API) markDevcontainerDirty(configPath string, modifiedAt time.Time) {`
`584`	`591`	`if api.knownDevcontainers[i].Container != nil {`
`585`	`592`	`api.knownDevcontainers[i].Container.DevcontainerDirty = true`
`586`	`593`	`}`
	`594`	`+ // Set the modified time to the zero value to indicate that the`
	`595`	`+ // containers list must be refreshed.`
	`596`	`+ api.mtime = time.Time{}`
`587`	`597`	`}`
`588`	`598`	`}`
`589`	`599`	`})`