fix: address workspace skills review findings

ibetitsmike · ibetitsmike · commit 34fa8b2fde71 · 2026-05-22T23:53:15.000Z
diff --git a/coderd/workspaceskills_test.go b/coderd/workspaceskills_test.go
@@ -2,6 +2,7 @@ package coderd_test
 
 import (
 	"context"
+	"database/sql"
 	"encoding/json"
 	"net/http"
 	"os"
@@ -10,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/google/uuid"
+	"github.com/sqlc-dev/pqtype"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 	"golang.org/x/xerrors"
@@ -20,6 +22,8 @@ import (
 	"github.com/coder/coder/v2/coderd/coderdtest"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbauthz"
+	"github.com/coder/coder/v2/coderd/database/dbgen"
+	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/coderd/rbac"
 	"github.com/coder/coder/v2/coderd/workspaceapps"
 	"github.com/coder/coder/v2/codersdk"
@@ -147,15 +151,60 @@ func TestGetWorkspaceSkills(t *testing.T) {
 	require.Empty(t, skills)
 	require.NotNil(t, skills)
 
-	workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, codersdk.WorkspaceTransitionStop, codersdk.WorkspaceTransitionDelete)
-	require.NoError(t, db.UpdateWorkspaceDeletedByID(dbauthz.AsSystemRestricted(ctx), database.UpdateWorkspaceDeletedByIDParams{
-		ID:      workspace.ID,
-		Deleted: false,
-	}))
+	deleteJobID := uuid.New()
+	now := dbtime.Now()
+	_, err = db.InsertProvisionerJob(dbauthz.AsSystemRestricted(ctx), database.InsertProvisionerJobParams{
+		ID:             deleteJobID,
+		CreatedAt:      now,
+		UpdatedAt:      now,
+		OrganizationID: user.OrganizationID,
+		InitiatorID:    user.UserID,
+		Provisioner:    database.ProvisionerTypeEcho,
+		StorageMethod:  database.ProvisionerStorageMethodFile,
+		FileID:         uuid.New(),
+		Type:           database.ProvisionerJobTypeWorkspaceBuild,
+		Input:          json.RawMessage("{}"),
+		Tags:           database.StringMap{},
+		TraceMetadata:  pqtype.NullRawMessage{},
+	})
+	require.NoError(t, err)
+	deleteBuild := dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{
+		WorkspaceID:       workspace.ID,
+		TemplateVersionID: workspace.LatestBuild.TemplateVersionID,
+		BuildNumber:       workspace.LatestBuild.BuildNumber + 1,
+		Transition:        database.WorkspaceTransitionDelete,
+		InitiatorID:       user.UserID,
+		JobID:             deleteJobID,
+	})
+	deleteResource := dbgen.WorkspaceResource(t, db, database.WorkspaceResource{
+		JobID:      deleteBuild.JobID,
+		Transition: database.WorkspaceTransitionDelete,
+	})
+	connectedAt := dbtime.Now()
+	dbgen.WorkspaceAgent(t, db, database.WorkspaceAgent{
+		ResourceID: deleteResource.ID,
+		FirstConnectedAt: sql.NullTime{
+			Time:  connectedAt,
+			Valid: true,
+		},
+		LastConnectedAt: sql.NullTime{
+			Time:  connectedAt,
+			Valid: true,
+		},
+	})
+	agentProviderCalled := false
+	restore = coderd.SetAgentProviderForTest(api, workspaceSkillsAgentProvider{
+		agentConn: func(context.Context, uuid.UUID) (workspacesdk.AgentConn, func(), error) {
+			agentProviderCalled = true
+			return nil, nil, xerrors.New("unexpected agent dial")
+		},
+	})
 	skills, err = expClient.WorkspaceSkills(ctx, workspace.ID)
+	restore()
 	require.NoError(t, err)
 	require.Empty(t, skills)
 	require.NotNil(t, skills)
+	require.False(t, agentProviderCalled)
 
 	require.NoError(t, db.UpdateWorkspaceDeletedByID(dbauthz.AsSystemRestricted(ctx), database.UpdateWorkspaceDeletedByIDParams{
 		ID:      workspace.ID,
diff --git a/site/src/pages/AgentsPage/AgentChatPage.tsx b/site/src/pages/AgentsPage/AgentChatPage.tsx
@@ -1585,6 +1585,7 @@ const AgentChatPage: FC = () => {
 			canShareChat={canShareChat}
 			workspace={workspace}
 			workspaceAgent={workspaceAgent}
+			workspaceAgentId={workspaceAgentId}
 			chatBuildId={chatQuery.data?.build_id}
 			store={store}
 			editing={editing}
diff --git a/site/src/pages/AgentsPage/AgentChatPageView.tsx b/site/src/pages/AgentsPage/AgentChatPageView.tsx
@@ -98,6 +98,7 @@ interface AgentChatPageViewProps {
 	canUpdateOtherUserChatLoading: boolean;
 	canShareChat: boolean;
 	workspaceAgent?: TypesGen.WorkspaceAgent;
+	workspaceAgentId?: string;
 	workspace?: TypesGen.Workspace;
 	chatBuildId?: string;
 
@@ -205,6 +206,7 @@ export const AgentChatPageView: FC<AgentChatPageViewProps> = ({
 	canUpdateOtherUserChatLoading,
 	canShareChat,
 	workspaceAgent,
+	workspaceAgentId,
 	workspace,
 	chatBuildId,
 	store,
@@ -591,6 +593,7 @@ export const AgentChatPageView: FC<AgentChatPageViewProps> = ({
 								lastInjectedContext={lastInjectedContext}
 								workspace={workspace}
 								workspaceAgent={workspaceAgent}
+								workspaceAgentId={workspaceAgentId}
 								chatId={agentId}
 								sshCommand={sshCommand}
 								attachedWorkspace={attachedWorkspace}
diff --git a/site/src/pages/AgentsPage/components/ChatPageContent.tsx b/site/src/pages/AgentsPage/components/ChatPageContent.tsx
@@ -247,6 +247,7 @@ interface ChatPageInputProps {
 	isWorkspaceLoading: boolean;
 	workspace?: TypesGen.Workspace;
 	workspaceAgent?: TypesGen.WorkspaceAgent;
+	workspaceAgentId?: string;
 	chatId?: string;
 	sshCommand?: string;
 	attachedWorkspace?: AttachedWorkspaceInfo;
@@ -299,6 +300,7 @@ export const ChatPageInput: FC<ChatPageInputProps> = ({
 	isWorkspaceLoading,
 	workspace,
 	workspaceAgent,
+	workspaceAgentId,
 	chatId,
 	sshCommand,
 	attachedWorkspace,
@@ -335,7 +337,10 @@ export const ChatPageInput: FC<ChatPageInputProps> = ({
 	const shouldUsePersistedWorkspaceSkills =
 		chatId !== undefined &&
 		lastInjectedContext !== undefined &&
-		contextBelongsToAgent(lastInjectedContext, workspaceAgent?.id);
+		contextBelongsToAgent(
+			lastInjectedContext,
+			workspaceAgentId ?? workspaceAgent?.id,
+		);
 	const workspaceSkillsOverride = shouldUsePersistedWorkspaceSkills
 		? workspaceSkillsFromContext(lastInjectedContext ?? [])
 		: undefined;
