From 671ee0fb6182f707d42e9df3a09d66ad9780a690 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Fri, 16 Oct 2026 17:07:16 -0600 Subject: [PATCH 1/2] fix(agent): use generic delivery diagnostics --- pkg/agent/delivery/kubernetes.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/agent/delivery/kubernetes.go b/pkg/agent/delivery/kubernetes.go index 3b1ef0574e..162e45fae0 100644 --- a/pkg/agent/delivery/kubernetes.go +++ b/pkg/agent/delivery/kubernetes.go @@ -101,7 +101,7 @@ func (d *KubernetesDelivery) DeliverPostStart(ctx context.Context, opts PostStar err, ) } else { - log.Debugf("delivered agent binary to pod via in-container download") + log.Debugf("delivered agent binary to container via in-container download") return nil } } @@ -110,7 +110,7 @@ func (d *KubernetesDelivery) DeliverPostStart(ctx context.Context, opts PostStar return deliveryFailure(downloadErr, err) } - log.Debugf("delivered agent binary to pod via kubernetes exec-stream") + log.Debugf("delivered agent binary to container via exec-stream") return nil } From 1eed3dd5bdf130d1ffa179ab544f63a2b5dff97e Mon Sep 17 00:00:00 2001 From: Samuel K Date: Fri, 16 Oct 2026 17:43:13 -0600 Subject: [PATCH 2/2] fix(workspace): retain detached result workspace folder --- cmd/workspace/task.go | 13 ++++--- cmd/workspace/task_test.go | 69 +++++++++++++++++++++++++++++--------- 2 files changed, 62 insertions(+), 20 deletions(-) diff --git a/cmd/workspace/task.go b/cmd/workspace/task.go index 8ae1ca9d52..39105ba3d5 100644 --- a/cmd/workspace/task.go +++ b/cmd/workspace/task.go @@ -411,10 +411,15 @@ func resultEnvelopeFrom(state *task.State) config2.ResultEnvelope { if state.Result == nil { return config2.ResultEnvelope{} } + var workspaceFolder string + if state.Result.SubstitutionContext != nil { + workspaceFolder = state.Result.SubstitutionContext.ContainerWorkspaceFolder + } return config2.ResultEnvelope{ - ContainerID: config2.GetContainerID(state.Result), - RemoteUser: config2.GetRemoteUser(state.Result), - Warnings: state.Result.HostWarnings, - Recovery: state.Result.RecoveryContainer, + ContainerID: config2.GetContainerID(state.Result), + RemoteUser: config2.GetRemoteUser(state.Result), + RemoteWorkspaceFolder: workspaceFolder, + Warnings: state.Result.HostWarnings, + Recovery: state.Result.RecoveryContainer, } } diff --git a/cmd/workspace/task_test.go b/cmd/workspace/task_test.go index 1c612ffc54..c9cb0d9a20 100644 --- a/cmd/workspace/task_test.go +++ b/cmd/workspace/task_test.go @@ -16,6 +16,7 @@ import ( const ( testResultContainerID = "abc123" + testResultSuccess = "success" testBuild = "build" testPhase = "building_image" testOp = "op-1" @@ -183,26 +184,62 @@ func checkTaskTransitionJSON(t *testing.T, output string, expected config.Status require.ErrorIs(t, decoder.Decode(&extra), io.EOF) } -func TestResultEnvelopeFrom_PopulatedResult(t *testing.T) { - state := &task.State{ - Result: &config.Result{ - HostWarnings: []string{"warn"}, - RecoveryContainer: true, - ContainerDetails: &config.ContainerDetails{ - ID: testResultContainerID, +func TestReportTaskStateJSON_SucceededResult(t *testing.T) { + tests := []struct { + name string + result *config.Result + want config.ResultEnvelope + }{ + { + name: "resolved workspace folder and metadata", + result: &config.Result{ + HostWarnings: []string{"warn"}, + RecoveryContainer: true, + SubstitutionContext: &config.SubstitutionContext{ + ContainerWorkspaceFolder: "/workspaces/python/app", + }, + MergedConfig: &config.MergedDevContainerConfig{ + DevContainerConfigBase: config.DevContainerConfigBase{ + RemoteUser: "workspace-user", + }, + }, + ContainerDetails: &config.ContainerDetails{ID: testResultContainerID}, + }, + want: config.ResultEnvelope{ + Kind: config.KindResult, Outcome: testResultSuccess, + ContainerID: testResultContainerID, RemoteUser: "workspace-user", + RemoteWorkspaceFolder: "/workspaces/python/app", + Warnings: []string{"warn"}, Recovery: true, + }, + }, + { + name: "nil substitution context", + result: &config.Result{}, + want: config.ResultEnvelope{ + Kind: config.KindResult, Outcome: testResultSuccess, RemoteUser: "root", }, }, + { + name: "nil result", + want: config.ResultEnvelope{Kind: config.KindResult, Outcome: testResultSuccess}, + }, } - got := resultEnvelopeFrom(state) - if got.ContainerID != testResultContainerID { - t.Errorf("ContainerID = %q, want %q", got.ContainerID, testResultContainerID) - } - if !got.Recovery { - t.Error("expected Recovery = true") - } - if len(got.Warnings) != 1 || got.Warnings[0] != "warn" { - t.Errorf("Warnings = %v", got.Warnings) + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + state := &task.State{Status: task.StatusSucceeded, Result: tt.result} + output := captureTaskTransitionStdout(t, func() { + require.NoError(t, reportTaskStateJSON(state)) + }) + require.Equal(t, 1, strings.Count(output, "\n")) + + decoder := json.NewDecoder(strings.NewReader(output)) + var got config.ResultEnvelope + require.NoError(t, decoder.Decode(&got)) + require.Equal(t, tt.want, got) + var extra any + require.ErrorIs(t, decoder.Decode(&extra), io.EOF) + }) } }