From 5b5f79ff2cd097fe36c9dc76b57da43c6f559626 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Thu, 26 Jun 2025 23:38:11 +0300 Subject: [PATCH] =?UTF-8?q?Revert=20"fix(agent/agentcontainers):=20refresh?= =?UTF-8?q?=20containers=20before=20status=20change=20(=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 73879056f9213bc91b689afb5bc20adb713544cd. --- agent/agentcontainers/api.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/agent/agentcontainers/api.go b/agent/agentcontainers/api.go index b853c865c8813..26ebafd660fb1 100644 --- a/agent/agentcontainers/api.go +++ b/agent/agentcontainers/api.go @@ -1002,15 +1002,6 @@ func (api *API) CreateDevcontainer(workspaceFolder, configPath string, opts ...D logger.Info(ctx, "devcontainer created successfully") - // Ensure the container list is updated immediately after creation. - // This makes sure that dc.Container is populated before we acquire - // the lock avoiding a temporary inconsistency in the API state - // where status is running, but the container is nil. - if err := api.RefreshContainers(ctx); err != nil { - logger.Error(ctx, "failed to trigger immediate refresh after devcontainer creation", slog.Error(err)) - return xerrors.Errorf("refresh containers: %w", err) - } - api.mu.Lock() dc = api.knownDevcontainers[dc.WorkspaceFolder] // Update the devcontainer status to Running or Stopped based on the @@ -1029,6 +1020,13 @@ func (api *API) CreateDevcontainer(workspaceFolder, configPath string, opts ...D api.knownDevcontainers[dc.WorkspaceFolder] = dc api.mu.Unlock() + // Ensure an immediate refresh to accurately reflect the + // devcontainer state after recreation. + if err := api.RefreshContainers(ctx); err != nil { + logger.Error(ctx, "failed to trigger immediate refresh after devcontainer creation", slog.Error(err)) + return xerrors.Errorf("refresh containers: %w", err) + } + return nil }