Jun 19, 2025
diff --git a/coderd/agentapi/api.go b/coderd/agentapi/api.go
 }

 api.SubAgentAPI = &SubAgentAPI{
 OwnerID:        opts.OwnerID,
 OrganizationID: opts.OrganizationID,
 AgentID:        opts.AgentID,
 AgentFn:        api.agent,
 Log:            opts.Log,
 Clock:          opts.Clock,
 Database:       opts.Database,
 OwnerID:                  opts.OwnerID,
 OrganizationID:           opts.OrganizationID,
 AgentID:                  opts.AgentID,
 AgentFn:                  api.agent,
 PublishWorkspaceUpdateFn: api.publishWorkspaceUpdate,
 Log:                      opts.Log,
 Clock:                    opts.Clock,
 Database:                 opts.Database,
 }

 return api
diff --git a/coderd/agentapi/subagent.go b/coderd/agentapi/subagent.go
 agentproto "github.com/coder/coder/v2/agent/proto"
 "github.com/coder/coder/v2/coderd/database"
 "github.com/coder/coder/v2/coderd/database/dbauthz"
 "github.com/coder/coder/v2/coderd/wspubsub"
 "github.com/coder/coder/v2/codersdk"
 "github.com/coder/coder/v2/provisioner"
 "github.com/coder/quartz"
 )

 type SubAgentAPI struct {
 OwnerID        uuid.UUID
 OrganizationID uuid.UUID
 AgentID        uuid.UUID
 AgentFn        func(context.Context) (database.WorkspaceAgent, error)
 OwnerID                  uuid.UUID
 OrganizationID           uuid.UUID
 AgentID                  uuid.UUID
 AgentFn                  func(context.Context) (database.WorkspaceAgent, error)
 PublishWorkspaceUpdateFn func(context.Context, *database.WorkspaceAgent, wspubsub.WorkspaceEventKind) error

 Log      slog.Logger
 Clock    quartz.Clock
 }
 }

 if a.PublishWorkspaceUpdateFn != nil {
 err = a.PublishWorkspaceUpdateFn(ctx, &subAgent, wspubsub.WorkspaceEventKindStateChange)
 if err != nil {
 a.Log.Error(ctx, "failed to publish workspace update after creating sub agent",
 slog.Error(err),
 slog.F("sub_agent_id", subAgent.ID),
 slog.F("sub_agent_name", subAgent.Name),
 )
 // We don't return an error here because we created the sub agent.
 }
 }

 return &agentproto.CreateSubAgentResponse{
 Agent: &agentproto.SubAgent{
 Name:      subAgent.Name,
 return nil, err
 }

 subAgent, err := a.Database.GetWorkspaceAgentByID(ctx, subAgentID)
 if err != nil {
 if xerrors.Is(err, sql.ErrNoRows) {
 return nil, codersdk.ValidationError{
 Field:  "id",
 Detail: fmt.Sprintf("sub agent with id %q does not exist", req.Id),
 }
 }
 return nil, xerrors.Errorf("get workspace agent by id %q: %w", subAgentID, err)
 }

 if err := a.Database.DeleteWorkspaceSubAgentByID(ctx, subAgentID); err != nil {
 return nil, err
 }

 if a.PublishWorkspaceUpdateFn != nil {
 err = a.PublishWorkspaceUpdateFn(ctx, &subAgent, wspubsub.WorkspaceEventKindStateChange)
 if err != nil {
 a.Log.Error(ctx, "failed to publish workspace update after deleting sub agent",
 slog.Error(err),
 slog.F("sub_agent_id", subAgent.ID),
 slog.F("sub_agent_name", subAgent.Name),
 )
 // We don't return an error here because we deleted the sub agent.
 }
 }

 return &agentproto.DeleteSubAgentResponse{}, nil
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -196,13 +196,14 @@ func New(opts Options) *API {
		}

		api.SubAgentAPI = &SubAgentAPI{
		OwnerID: opts.OwnerID,
		OrganizationID: opts.OrganizationID,
		AgentID: opts.AgentID,
		AgentFn: api.agent,
		Log: opts.Log,
		Clock: opts.Clock,
		Database: opts.Database,
		OwnerID: opts.OwnerID,
		OrganizationID: opts.OrganizationID,
		AgentID: opts.AgentID,
		AgentFn: api.agent,
		PublishWorkspaceUpdateFn: api.publishWorkspaceUpdate,
		Log: opts.Log,
		Clock: opts.Clock,
		Database: opts.Database,
		}

		return api
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,16 +15,18 @@ import (
		agentproto "github.com/coder/coder/v2/agent/proto"
		"github.com/coder/coder/v2/coderd/database"
		"github.com/coder/coder/v2/coderd/database/dbauthz"
		"github.com/coder/coder/v2/coderd/wspubsub"
		"github.com/coder/coder/v2/codersdk"
		"github.com/coder/coder/v2/provisioner"
		"github.com/coder/quartz"
		)

		type SubAgentAPI struct {
		OwnerID uuid.UUID
		OrganizationID uuid.UUID
		AgentID uuid.UUID
		AgentFn func(context.Context) (database.WorkspaceAgent, error)
		OwnerID uuid.UUID
		OrganizationID uuid.UUID
		AgentID uuid.UUID
		AgentFn func(context.Context) (database.WorkspaceAgent, error)
		PublishWorkspaceUpdateFn func(context.Context, *database.WorkspaceAgent, wspubsub.WorkspaceEventKind) error

		Log slog.Logger
		Clock quartz.Clock
Expand DownExpand Up		@@ -216,6 +218,18 @@ func (a SubAgentAPI) CreateSubAgent(ctx context.Context, req agentproto.Create
		}
		}

		if a.PublishWorkspaceUpdateFn != nil {
		err = a.PublishWorkspaceUpdateFn(ctx, &subAgent, wspubsub.WorkspaceEventKindStateChange)
		if err != nil {
		a.Log.Error(ctx, "failed to publish workspace update after creating sub agent",
		slog.Error(err),
		slog.F("sub_agent_id", subAgent.ID),
		slog.F("sub_agent_name", subAgent.Name),
		)
		// We don't return an error here because we created the sub agent.
		}
		}

		return &agentproto.CreateSubAgentResponse{
		Agent: &agentproto.SubAgent{
		Name: subAgent.Name,
Expand All		@@ -235,10 +249,33 @@ func (a SubAgentAPI) DeleteSubAgent(ctx context.Context, req agentproto.Delete
		return nil, err
		}

		subAgent, err := a.Database.GetWorkspaceAgentByID(ctx, subAgentID)
		if err != nil {
		if xerrors.Is(err, sql.ErrNoRows) {
		return nil, codersdk.ValidationError{
		Field: "id",
		Detail: fmt.Sprintf("sub agent with id %q does not exist", req.Id),
		}
		}
		return nil, xerrors.Errorf("get workspace agent by id %q: %w", subAgentID, err)
		}

		if err := a.Database.DeleteWorkspaceSubAgentByID(ctx, subAgentID); err != nil {
		return nil, err
		}

		if a.PublishWorkspaceUpdateFn != nil {
		err = a.PublishWorkspaceUpdateFn(ctx, &subAgent, wspubsub.WorkspaceEventKindStateChange)
		if err != nil {
		a.Log.Error(ctx, "failed to publish workspace update after deleting sub agent",
		slog.Error(err),
		slog.F("sub_agent_id", subAgent.ID),
		slog.F("sub_agent_name", subAgent.Name),
		)
		// We don't return an error here because we deleted the sub agent.
		}
		}

		return &agentproto.DeleteSubAgentResponse{}, nil
		}

Expand Down