coder
diff --git a/‎coderd/database/dbauthz/dbauthz.go
Lines changed: 1 addition & 1 deletion b/‎coderd/database/dbauthz/dbauthz.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎coderd/database/querier.go
Lines changed: 1 addition & 0 deletions b/‎coderd/database/querier.go
Lines changed: 1 addition & 0 deletions
diff --git a/‎coderd/database/queries.sql.go
Lines changed: 38 additions & 29 deletions b/‎coderd/database/queries.sql.go
Lines changed: 38 additions & 29 deletions
diff --git a/‎coderd/database/queries/licenses.sql
Lines changed: 10 additions & 3 deletions b/‎coderd/database/queries/licenses.sql
Lines changed: 10 additions & 3 deletions
diff --git a/‎coderd/wsbuilder/wsbuilder.go
Lines changed: 2 additions & 2 deletions b/‎coderd/wsbuilder/wsbuilder.go
Lines changed: 2 additions & 2 deletions
@@ -2196,7 +2196,7 @@ func (q *querier) GetLogoURL(ctx context.Context) (string, error) {
 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, err
+		return 0, xerrors.Errorf("authorize read all workspaces: %w", err)
 	}
 	return q.db.GetManagedAgentCount(ctx, arg)
 }
 
@@ -49,7 +49,14 @@ ON
 WHERE
 	wb.transition = 'start'::workspace_transition
 	AND wb.has_ai_task = true
-	-- Exclude failed builds since they can't use AI managed agents anyway.
-	AND pj.job_status NOT IN ('canceled'::provisioner_job_status, 'failed'::provisioner_job_status)
-	-- Jobs are counted when they are created.
+	-- Only count jobs that are pending, running or succeeded. Other statuses
+	-- like cancel(ed|ing), failed or unknown are not considered as managed
+	-- agent usage. These workspace builds are typically unusable anyway.
+	AND pj.job_status IN (
+		'pending'::provisioner_job_status,
+		'running'::provisioner_job_status,
+		'succeeded'::provisioner_job_status
+	)
+	-- Jobs are counted at the time they are created, not when they are
+	-- completed, as pending jobs haven't completed yet.
 	AND wb.created_at BETWEEN @start_time::timestamptz AND @end_time::timestamptz;
@@ -1272,12 +1272,12 @@ func (b *Builder) checkTemplateJobStatus() error {
 func (b *Builder) checkUsage() error {
 	templateVersion, err := b.getTemplateVersion()
 	if err != nil {
-		return BuildError{http.StatusInternalServerError, "failed to fetch template version", err}
+		return BuildError{http.StatusInternalServerError, "Failed to fetch template version", err}
 	}
 
 	resp, err := b.usageChecker.CheckBuildUsage(b.ctx, b.store, templateVersion)
 	if err != nil {
-		return BuildError{http.StatusInternalServerError, "failed to check build usage", err}
+		return BuildError{http.StatusInternalServerError, "Failed to check build usage", err}
 	}
 	if !resp.Permitted {
 		return BuildError{http.StatusForbidden, "Build is not permitted: " + resp.Message, nil}
Original file line number	Diff line number	Diff line change
`@@ -2196,7 +2196,7 @@ func (q *querier) GetLogoURL(ctx context.Context) (string, error) {`
`2196`	`2196`	`func (q *querier) GetManagedAgentCount(ctx context.Context, arg database.GetManagedAgentCountParams) (int64, error) {`
`2197`	`2197`	`// Must be able to read all workspaces to check usage.`
`2198`	`2198`	`if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceWorkspace); err != nil {`
`2199`		`- return 0, err`
	`2199`	`+ return 0, xerrors.Errorf("authorize read all workspaces: %w", err)`
`2200`	`2200`	`}`
`2201`	`2201`	`return q.db.GetManagedAgentCount(ctx, arg)`
`2202`	`2202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1272,12 +1272,12 @@ func (b *Builder) checkTemplateJobStatus() error {`
`1272`	`1272`	`func (b *Builder) checkUsage() error {`
`1273`	`1273`	`templateVersion, err := b.getTemplateVersion()`
`1274`	`1274`	`if err != nil {`
`1275`		`- return BuildError{http.StatusInternalServerError, "failed to fetch template version", err}`
	`1275`	`+ return BuildError{http.StatusInternalServerError, "Failed to fetch template version", err}`
`1276`	`1276`	`}`
`1277`	`1277`
`1278`	`1278`	`resp, err := b.usageChecker.CheckBuildUsage(b.ctx, b.store, templateVersion)`
`1279`	`1279`	`if err != nil {`
`1280`		`- return BuildError{http.StatusInternalServerError, "failed to check build usage", err}`
	`1280`	`+ return BuildError{http.StatusInternalServerError, "Failed to check build usage", err}`
`1281`	`1281`	`}`
`1282`	`1282`	`if !resp.Permitted {`
`1283`	`1283`	`return BuildError{http.StatusForbidden, "Build is not permitted: " + resp.Message, nil}`