Klomgor · pull · Aug 29, 2025 · Aug 29, 2025 · Aug 29, 2025 · Aug 29, 2025
diff --git a/cli/exp_taskcreate.go b/cli/exp_taskcreate.go
@@ -104,7 +104,7 @@ func (r *RootCmd) taskCreate() *serpent.Command {
 				templateVersionPresetID = preset.ID
 			}
 
-			workspace, err := expClient.CreateTask(ctx, codersdk.Me, codersdk.CreateTaskRequest{
+			task, err := expClient.CreateTask(ctx, codersdk.Me, codersdk.CreateTaskRequest{
 				TemplateVersionID:       templateVersionID,
 				TemplateVersionPresetID: templateVersionPresetID,
 				Prompt:                  taskInput,
@@ -116,8 +116,8 @@ func (r *RootCmd) taskCreate() *serpent.Command {
 			_, _ = fmt.Fprintf(
 				inv.Stdout,
 				"The task %s has been created at %s!\n",
-				cliui.Keyword(workspace.Name),
-				cliui.Timestamp(workspace.CreatedAt),
+				cliui.Keyword(task.Name),
+				cliui.Timestamp(task.CreatedAt),
 			)
 
 			return nil

diff --git a/coderd/aitasks.go b/coderd/aitasks.go
@@ -188,15 +188,72 @@ func (api *API) tasksCreate(rw http.ResponseWriter, r *http.Request) {
 			WorkspaceOwner: owner.Username,
 		},
 	})
-
 	defer commitAudit()
 	w, err := createWorkspace(ctx, aReq, apiKey.UserID, api, owner, createReq, r)
 	if err != nil {
 		httperror.WriteResponseError(ctx, rw, err)
 		return
 	}
 
-	httpapi.Write(ctx, rw, http.StatusCreated, w)
+	task := taskFromWorkspace(w, req.Prompt)
+	httpapi.Write(ctx, rw, http.StatusCreated, task)
+}
+
+func taskFromWorkspace(ws codersdk.Workspace, initialPrompt string) codersdk.Task {
+	// TODO(DanielleMaywood):
+	// This just picks up the first agent it discovers.
+	// This approach _might_ break when a task has multiple agents,
+	// depending on which agent was found first.
+	//
+	// We explicitly do not have support for running tasks
+	// inside of a sub agent at the moment, so we can be sure
+	// that any sub agents are not the agent we're looking for.
+	var taskAgentID uuid.NullUUID
+	var taskAgentLifecycle *codersdk.WorkspaceAgentLifecycle
+	var taskAgentHealth *codersdk.WorkspaceAgentHealth
+	for _, resource := range ws.LatestBuild.Resources {
+		for _, agent := range resource.Agents {
+			if agent.ParentID.Valid {
+				continue
+			}
+
+			taskAgentID = uuid.NullUUID{Valid: true, UUID: agent.ID}
+			taskAgentLifecycle = &agent.LifecycleState
+			taskAgentHealth = &agent.Health
+			break
+		}
+	}
+
+	var currentState *codersdk.TaskStateEntry
+	if ws.LatestAppStatus != nil {
+		currentState = &codersdk.TaskStateEntry{
+			Timestamp: ws.LatestAppStatus.CreatedAt,
+			State:     codersdk.TaskState(ws.LatestAppStatus.State),
+			Message:   ws.LatestAppStatus.Message,
+			URI:       ws.LatestAppStatus.URI,
+		}
+	}
+
+	return codersdk.Task{
+		ID:                      ws.ID,
+		OrganizationID:          ws.OrganizationID,
+		OwnerID:                 ws.OwnerID,
+		OwnerName:               ws.OwnerName,
+		Name:                    ws.Name,
+		TemplateID:              ws.TemplateID,
+		TemplateName:            ws.TemplateName,
+		TemplateDisplayName:     ws.TemplateDisplayName,
+		TemplateIcon:            ws.TemplateIcon,
+		WorkspaceID:             uuid.NullUUID{Valid: true, UUID: ws.ID},
+		WorkspaceAgentID:        taskAgentID,
+		WorkspaceAgentLifecycle: taskAgentLifecycle,
+		WorkspaceAgentHealth:    taskAgentHealth,
+		CreatedAt:               ws.CreatedAt,
+		UpdatedAt:               ws.UpdatedAt,
+		InitialPrompt:           initialPrompt,
+		Status:                  ws.LatestBuild.Status,
+		CurrentState:            currentState,
+	}
 }
 
 // tasksFromWorkspaces converts a slice of API workspaces into tasks, fetching
@@ -221,60 +278,7 @@ func (api *API) tasksFromWorkspaces(ctx context.Context, apiWorkspaces []codersd
 
 	tasks := make([]codersdk.Task, 0, len(apiWorkspaces))
 	for _, ws := range apiWorkspaces {
-		// TODO(DanielleMaywood):
-		// This just picks up the first agent it discovers.
-		// This approach _might_ break when a task has multiple agents,
-		// depending on which agent was found first.
-		//
-		// We explicitly do not have support for running tasks
-		// inside of a sub agent at the moment, so we can be sure
-		// that any sub agents are not the agent we're looking for.
-		var taskAgentID uuid.NullUUID
-		var taskAgentLifecycle *codersdk.WorkspaceAgentLifecycle
-		var taskAgentHealth *codersdk.WorkspaceAgentHealth
-		for _, resource := range ws.LatestBuild.Resources {
-			for _, agent := range resource.Agents {
-				if agent.ParentID.Valid {
-					continue
-				}
-
-				taskAgentID = uuid.NullUUID{Valid: true, UUID: agent.ID}
-				taskAgentLifecycle = &agent.LifecycleState
-				taskAgentHealth = &agent.Health
-				break
-			}
-		}
-
-		var currentState *codersdk.TaskStateEntry
-		if ws.LatestAppStatus != nil {
-			currentState = &codersdk.TaskStateEntry{
-				Timestamp: ws.LatestAppStatus.CreatedAt,
-				State:     codersdk.TaskState(ws.LatestAppStatus.State),
-				Message:   ws.LatestAppStatus.Message,
-				URI:       ws.LatestAppStatus.URI,
-			}
-		}
-
-		tasks = append(tasks, codersdk.Task{
-			ID:                      ws.ID,
-			OrganizationID:          ws.OrganizationID,
-			OwnerID:                 ws.OwnerID,
-			OwnerName:               ws.OwnerName,
-			Name:                    ws.Name,
-			TemplateID:              ws.TemplateID,
-			TemplateName:            ws.TemplateName,
-			TemplateDisplayName:     ws.TemplateDisplayName,
-			TemplateIcon:            ws.TemplateIcon,
-			WorkspaceID:             uuid.NullUUID{Valid: true, UUID: ws.ID},
-			WorkspaceAgentID:        taskAgentID,
-			WorkspaceAgentLifecycle: taskAgentLifecycle,
-			WorkspaceAgentHealth:    taskAgentHealth,
-			CreatedAt:               ws.CreatedAt,
-			UpdatedAt:               ws.UpdatedAt,
-			InitialPrompt:           promptsByBuildID[ws.LatestBuild.ID],
-			Status:                  ws.LatestBuild.Status,
-			CurrentState:            currentState,
-		})
+		tasks = append(tasks, taskFromWorkspace(ws, promptsByBuildID[ws.LatestBuild.ID]))
 	}
 
 	return tasks, nil

diff --git a/coderd/aitasks_test.go b/coderd/aitasks_test.go
@@ -419,19 +419,23 @@ func TestTasksCreate(t *testing.T) {
 		expClient := codersdk.NewExperimentalClient(client)
 
 		// When: We attempt to create a Task.
-		workspace, err := expClient.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
+		task, err := expClient.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
 			TemplateVersionID: template.ActiveVersionID,
 			Prompt:            taskPrompt,
 		})
 		require.NoError(t, err)
-		coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID)
+		require.True(t, task.WorkspaceID.Valid)
+
+		ws, err := client.Workspace(ctx, task.WorkspaceID.UUID)
+		require.NoError(t, err)
+		coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID)
 
 		// Then: We expect a workspace to have been created.
-		assert.NotEmpty(t, workspace.Name)
-		assert.Equal(t, template.ID, workspace.TemplateID)
+		assert.NotEmpty(t, task.Name)
+		assert.Equal(t, template.ID, task.TemplateID)
 
 		// And: We expect it to have the "AI Prompt" parameter correctly set.
-		parameters, err := client.WorkspaceBuildParameters(ctx, workspace.LatestBuild.ID)
+		parameters, err := client.WorkspaceBuildParameters(ctx, ws.LatestBuild.ID)
 		require.NoError(t, err)
 		require.Len(t, parameters, 1)
 		assert.Equal(t, codersdk.AITaskPromptParameterName, parameters[0].Name)

diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -2252,14 +2252,6 @@ func (q *querier) GetLogoURL(ctx context.Context) (string, error) {
 	return q.db.GetLogoURL(ctx)
 }
 
-func (q *querier) GetManagedAgentCount(ctx context.Context, arg database.GetManagedAgentCountParams) (int64, error) {
-	// Must be able to read all workspaces to check usage.
-	if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceWorkspace); err != nil {
-		return 0, xerrors.Errorf("authorize read all workspaces: %w", err)
-	}
-	return q.db.GetManagedAgentCount(ctx, arg)
-}
-
 func (q *querier) GetNotificationMessagesByStatus(ctx context.Context, arg database.GetNotificationMessagesByStatusParams) ([]database.NotificationMessage, error) {
 	if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceNotificationMessage); err != nil {
 		return nil, err
@@ -3058,6 +3050,13 @@ func (q *querier) GetTemplatesWithFilter(ctx context.Context, arg database.GetTe
 	return q.db.GetAuthorizedTemplates(ctx, arg, prep)
 }
 
+func (q *querier) GetTotalUsageDCManagedAgentsV1(ctx context.Context, arg database.GetTotalUsageDCManagedAgentsV1Params) (int64, error) {
+	if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceUsageEvent); err != nil {
+		return 0, err
+	}
+	return q.db.GetTotalUsageDCManagedAgentsV1(ctx, arg)
+}
+
 func (q *querier) GetUnexpiredLicenses(ctx context.Context) ([]database.License, error) {
 	if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceLicense); err != nil {
 		return nil, err

diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -723,12 +723,6 @@ func (s *MethodTestSuite) TestLicense() {
 		dbm.EXPECT().GetAnnouncementBanners(gomock.Any()).Return("value", nil).AnyTimes()
 		check.Args().Asserts().Returns("value")
 	}))
-	s.Run("GetManagedAgentCount", s.Mocked(func(dbm *dbmock.MockStore, _ *gofakeit.Faker, check *expects) {
-		start := dbtime.Now()
-		end := start.Add(time.Hour)
-		dbm.EXPECT().GetManagedAgentCount(gomock.Any(), database.GetManagedAgentCountParams{StartTime: start, EndTime: end}).Return(int64(0), nil).AnyTimes()
-		check.Args(database.GetManagedAgentCountParams{StartTime: start, EndTime: end}).Asserts(rbac.ResourceWorkspace, policy.ActionRead).Returns(int64(0))
-	}))
 }
 
 func (s *MethodTestSuite) TestOrganization() {
@@ -4284,4 +4278,12 @@ func (s *MethodTestSuite) TestUsageEvents() {
 		db.EXPECT().UpdateUsageEventsPostPublish(gomock.Any(), params).Return(nil)
 		check.Args(params).Asserts(rbac.ResourceUsageEvent, policy.ActionUpdate)
 	}))
+
+	s.Run("GetTotalUsageDCManagedAgentsV1", s.Mocked(func(db *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
+		db.EXPECT().GetTotalUsageDCManagedAgentsV1(gomock.Any(), gomock.Any()).Return(int64(1), nil)
+		check.Args(database.GetTotalUsageDCManagedAgentsV1Params{
+			StartDate: time.Time{},
+			EndDate:   time.Time{},
+		}).Asserts(rbac.ResourceUsageEvent, policy.ActionRead)
+	}))
 }
diff --git a/coderd/database/dbmetrics/querymetrics.go b/coderd/database/dbmetrics/querymetrics.go
diff --git a/coderd/database/dbmock/dbmock.go b/coderd/database/dbmock/dbmock.go
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000362_aggregate_usage_events.down.sql b/coderd/database/migrations/000362_aggregate_usage_events.down.sql
@@ -0,0 +1,3 @@
+DROP TRIGGER IF EXISTS trigger_aggregate_usage_event ON usage_events;
+DROP FUNCTION IF EXISTS aggregate_usage_event();
+DROP TABLE IF EXISTS usage_events_daily;