@@ -1958,7 +1958,7 @@ func (s *server) completeWorkspaceBuildJob(ctx context.Context, job database.Pro
19581958agentTimeouts := make (map [time.Duration ]bool )// A set of agent timeouts.
19591959// This could be a bulk insert to improve performance.
19601960for _ ,protoResource := range jobType .WorkspaceBuild .Resources {
1961- for ai ,protoAgent := range protoResource .Agents {
1961+ for _ ,protoAgent := range protoResource .GetAgents () {
19621962if protoAgent == nil {
19631963continue
19641964}
@@ -1967,8 +1967,7 @@ func (s *server) completeWorkspaceBuildJob(ctx context.Context, job database.Pro
19671967// the agent to a task. For now we overwrite the
19681968// protoAgent.Id because that matches old behavior.
19691969agentID := uuid .New ()
1970- protoAgent .Id = agentID .String ()
1971- protoResource .Agents [ai ]= protoAgent
1970+ protoAgent .Id = makePredeterminedAgentID (agentID )
19721971
19731972dur := time .Duration (protoAgent .GetConnectionTimeoutSeconds ())* time .Second
19741973agentTimeouts [dur ]= true
@@ -2697,13 +2696,13 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
26972696}
26982697
26992698var agentID uuid.UUID
2700- if prAgent .GetId ()== "" {
2701- agentID = uuid .New ()
2702- }else {
2703- agentID ,err = uuid .Parse (prAgent .GetId ())
2699+ if id ,ok := predeterminedAgentID (prAgent .GetId ());ok {
2700+ agentID ,err = uuid .Parse (id )
27042701if err != nil {
27052702return xerrors .Errorf ("invalid agent ID format; must be uuid: %w" ,err )
27062703}
2704+ }else {
2705+ agentID = uuid .New ()
27072706}
27082707dbAgent ,err := db .InsertWorkspaceAgent (ctx , database.InsertWorkspaceAgentParams {
27092708ID :agentID ,
@@ -3280,3 +3279,14 @@ func convertDisplayApps(apps *sdkproto.DisplayApps) []database.DisplayApp {
32803279}
32813280return dapps
32823281}
3282+
3283+ func makePredeterminedAgentID (id uuid.UUID )string {
3284+ return "keep:" + id .String ()
3285+ }
3286+
3287+ func predeterminedAgentID (agentID string ) (string ,bool ) {
3288+ if ! strings .HasPrefix (agentID ,"keep:" ) {
3289+ return "" ,false
3290+ }
3291+ return strings .TrimPrefix (agentID ,"keep:" ),true
3292+ }