@cat-factory/node-server 0.88.0 → 0.89.1

package/dist/repositories/drizzle.js

@@ -2,7 +2,7 @@ import { LLM_WARNING_FINISH_REASONS } from '@cat-factory/kernel';
 import { agentRunKindSchema, decodeInitiativeRow, isWebSearchProvider, } from '@cat-factory/contracts';
 import { decodeEnum, tryDecodeRows, blockInsertValues, blockPatchToColumns, parseIssueIntakeColumn, serializeIssueIntakeColumn, rowToBlock, rowToExecution, executionToDetail, rowToPipeline, rowToSandboxExperiment, rowToSandboxFixture, rowToSandboxGrade, rowToSandboxPromptVersion, rowToSandboxRun, rowToWorkspace, } from '@cat-factory/server';
 import { and, asc, count, desc, eq, gte, inArray, isNull, lt, ne, notInArray, or, sql, } from 'drizzle-orm';
-import { accountInvitations, passwordResetTokens, accountSettings, localSettings, accounts, agentContextSnapshots, agentSearchQueries, agentRuns, blocks, consensusSessions, incidentEnrichmentConnections, observabilityConnections, packageRegistryConnections, emailConnections, llmCallMetrics, provisioningLog, sharedStacks, memberships, mergeThresholdPresets, releaseHealthConfigs, testSecrets, pipelineScheduleRuns, pipelineSchedules, pipelines, requirementReviews, docInterviewSessions, kaizenGradings, kaizenVerifiedCombos, clarityReviews, binaryArtifacts, brainstormSessions, initiatives, sandboxPromptVersions, sandboxFixtures, sandboxExperiments, sandboxRuns, sandboxGrades, services, tokenUsage, trackerSettings, modelPresets, userIdentities, users, userSettings, workspaceFragmentDefaults, workspaceServices, workspaceSettings, workspaces, } from '../db/schema.js';
+import { accountInvitations, passwordResetTokens, accountSettings, localSettings, accounts, agentContextSnapshots, agentSearchQueries, agentRuns, blocks, consensusSessions, incidentEnrichmentConnections, observabilityConnections, packageRegistryConnections, emailConnections, llmCallMetrics, provisioningLog, sharedStacks, memberships, riskPolicies, releaseHealthConfigs, testSecrets, pipelineScheduleRuns, pipelineSchedules, pipelines, requirementReviews, docInterviewSessions, kaizenGradings, kaizenVerifiedCombos, clarityReviews, binaryArtifacts, brainstormSessions, initiatives, sandboxPromptVersions, sandboxFixtures, sandboxExperiments, sandboxRuns, sandboxGrades, services, tokenUsage, trackerSettings, modelPresets, userIdentities, users, userSettings, workspaceFragmentDefaults, workspaceServices, workspaceSettings, workspaces, } from '../db/schema.js';
 // Drizzle/Postgres implementations of the core kernel repository ports. The
 // row<->domain mapping is the SAME shared mapping the Cloudflare D1 repos use
 // (@cat-factory/server), so behaviour matches across stores; this layer only owns
@@ -222,6 +222,7 @@ class DrizzlePipelineRepository {
             gating: pipeline.gating ? JSON.stringify(pipeline.gating) : null,
             follow_ups: pipeline.followUps ? JSON.stringify(pipeline.followUps) : null,
             tester_quality: pipeline.testerQuality ? JSON.stringify(pipeline.testerQuality) : null,
+            step_options: pipeline.stepOptions ? JSON.stringify(pipeline.stepOptions) : null,
             labels: pipeline.labels ? JSON.stringify(pipeline.labels) : null,
             archived: pipeline.archived ? 1 : null,
             builtin: pipeline.builtin ? 1 : null,
@@ -246,6 +247,7 @@ class DrizzlePipelineRepository {
             gating: pipeline.gating ? JSON.stringify(pipeline.gating) : null,
             follow_ups: pipeline.followUps ? JSON.stringify(pipeline.followUps) : null,
             tester_quality: pipeline.testerQuality ? JSON.stringify(pipeline.testerQuality) : null,
+            step_options: pipeline.stepOptions ? JSON.stringify(pipeline.stepOptions) : null,
             labels: pipeline.labels ? JSON.stringify(pipeline.labels) : null,
             archived: pipeline.archived ? 1 : null,
             version: pipeline.version ?? null,
@@ -442,6 +444,21 @@ class DrizzleExecutionRepository {
         return rows;
     }
     async markFailed(workspaceId, id, failure) {
+        // Guard against clobbering a row that already reached a terminal state: a `stopRun`
+        // racing a run that just merged (`done`) or already failed must not overwrite it. This
+        // is the authoritative first-write-wins / no-re-fail-a-merged-run check — `failRun`'s
+        // in-memory guard reads a snapshot that can be stale by the time this write lands
+        // (race-audit 2.3). Mirrors the D1 `AND status NOT IN ('done','failed')`.
+        //
+        // BUMP `rev` on the terminal write so it participates in the driver's optimistic
+        // concurrency: a `casPersist` from an in-flight driver iteration that loaded the run
+        // BEFORE this `stopRun`/`failRun` still holds the pre-fail `rev`, so bumping it here makes
+        // that stale write miss its `rev = ?` guard → `RunContendedError` → re-drive → the reload
+        // sees `failed` and no-ops. Without the bump `markFailed` left `rev` untouched, so a stale
+        // `casPersist` writing a non-terminal status (`pollGate` pending, dispatch, …) would MATCH
+        // the unchanged `rev` and RESURRECT the stopped run as `running` (race-audit 2.3, the
+        // driver-clobbers-terminal direction — the dual of the SQL status guard above). Mirrors the
+        // D1 `rev = rev + 1`.
         await this.db
             .update(agentRuns)
             .set({
@@ -449,8 +466,9 @@ class DrizzleExecutionRepository {
             error: failure.message,
             failure: JSON.stringify(failure),
             updated_at: this.clock.now(),
+            rev: sql `${agentRuns.rev} + 1`,
         })
-            .where(and(eq(agentRuns.workspace_id, workspaceId), eq(agentRuns.id, id), this.isExecution));
+            .where(and(eq(agentRuns.workspace_id, workspaceId), eq(agentRuns.id, id), this.isExecution, notInArray(agentRuns.status, ['done', 'failed'])));
     }
 }
 class DrizzleAgentRunRepository {
@@ -969,9 +987,41 @@ class DrizzleTokenUsageRepository {
             input_tokens: usage.inputTokens,
             output_tokens: usage.outputTokens,
             cost_estimate: usage.costEstimate,
+            billing: usage.billing,
+            vendor: usage.vendor,
             created_at: usage.createdAt,
         });
     }
+    async usageBreakdownForWorkspace(workspaceId, epochMs) {
+        // One GROUP BY over the workspace's current period — both billing kinds (the report
+        // shows total usage). Never a per-model loop. sum() of int columns is bigint; cast +
+        // coerce like the totals rollups. Ordered heaviest-first in SQL, mirroring the D1 repo.
+        const rows = await this.db
+            .select({
+            billing: tokenUsage.billing,
+            vendor: tokenUsage.vendor,
+            provider: tokenUsage.provider,
+            model: tokenUsage.model,
+            input: sql `coalesce(sum(${tokenUsage.input_tokens}), 0)::bigint`,
+            output: sql `coalesce(sum(${tokenUsage.output_tokens}), 0)::bigint`,
+            cost: sql `coalesce(sum(${tokenUsage.cost_estimate}), 0)::float8`,
+            calls: sql `count(*)::bigint`,
+        })
+            .from(tokenUsage)
+            .where(and(eq(tokenUsage.workspace_id, workspaceId), gte(tokenUsage.created_at, epochMs)))
+            .groupBy(tokenUsage.billing, tokenUsage.vendor, tokenUsage.provider, tokenUsage.model)
+            .orderBy(sql `(coalesce(sum(${tokenUsage.input_tokens}), 0) + coalesce(sum(${tokenUsage.output_tokens}), 0)) desc`);
+        return rows.map((r) => ({
+            billing: (r.billing === 'subscription' ? 'subscription' : 'metered'),
+            vendor: r.vendor,
+            provider: r.provider,
+            model: r.model,
+            inputTokens: Number(r.input ?? 0),
+            outputTokens: Number(r.output ?? 0),
+            costEstimate: r.cost ?? 0,
+            calls: Number(r.calls ?? 0),
+        }));
+    }
     async totalsSince(epochMs) {
         // sum() of int columns is bigint in Postgres — cast to bigint (NOT int4, which
         // overflows past ~2.1B tokens) and coerce: node-postgres returns bigint as a
@@ -984,7 +1034,7 @@ class DrizzleTokenUsageRepository {
             cost: sql `coalesce(sum(${tokenUsage.cost_estimate}), 0)::float8`,
         })
             .from(tokenUsage)
-            .where(gte(tokenUsage.created_at, epochMs));
+            .where(and(gte(tokenUsage.created_at, epochMs), eq(tokenUsage.billing, 'metered')));
         return {
             inputTokens: Number(row?.input ?? 0),
             outputTokens: Number(row?.output ?? 0),
@@ -999,7 +1049,7 @@ class DrizzleTokenUsageRepository {
             cost: sql `coalesce(sum(${tokenUsage.cost_estimate}), 0)::float8`,
         })
             .from(tokenUsage)
-            .where(and(eq(tokenUsage.workspace_id, workspaceId), gte(tokenUsage.created_at, epochMs)));
+            .where(and(eq(tokenUsage.workspace_id, workspaceId), gte(tokenUsage.created_at, epochMs), eq(tokenUsage.billing, 'metered')));
         return {
             inputTokens: Number(row?.input ?? 0),
             outputTokens: Number(row?.output ?? 0),
@@ -1014,7 +1064,7 @@ class DrizzleTokenUsageRepository {
             cost: sql `coalesce(sum(${tokenUsage.cost_estimate}), 0)::float8`,
         })
             .from(tokenUsage)
-            .where(and(eq(tokenUsage.account_id, accountId), gte(tokenUsage.created_at, epochMs)));
+            .where(and(eq(tokenUsage.account_id, accountId), gte(tokenUsage.created_at, epochMs), eq(tokenUsage.billing, 'metered')));
         return {
             inputTokens: Number(row?.input ?? 0),
             outputTokens: Number(row?.output ?? 0),
@@ -1029,7 +1079,7 @@ class DrizzleTokenUsageRepository {
             cost: sql `coalesce(sum(${tokenUsage.cost_estimate}), 0)::float8`,
         })
             .from(tokenUsage)
-            .where(and(eq(tokenUsage.user_id, userId), gte(tokenUsage.created_at, epochMs)));
+            .where(and(eq(tokenUsage.user_id, userId), gte(tokenUsage.created_at, epochMs), eq(tokenUsage.billing, 'metered')));
         return {
             inputTokens: Number(row?.input ?? 0),
             outputTokens: Number(row?.output ?? 0),
@@ -2801,7 +2851,7 @@ class DrizzleInitiativeRepository {
             .where(and(eq(initiatives.workspace_id, workspaceId), eq(initiatives.id, id)));
     }
 }
-function rowToMergePreset(row) {
+function rowToRiskPolicy(row) {
     return {
         id: row.id,
         name: row.name,
@@ -2823,13 +2873,13 @@ function rowToMergePreset(row) {
 }
 /**
  * Per-workspace merge threshold presets over Postgres (the Drizzle mirror of the
- * Worker's `D1MergePresetRepository`, migration 0024). Enforces the single-default
+ * Worker's `D1RiskPolicyRepository`, migration 0024). Enforces the single-default
  * invariant: promoting a preset to default demotes every other in the workspace
  * before the upsert. The default preset cannot be removed (the service keeps that
  * rule too; the DELETE also guards `is_default = 0`). Behaviourally identical to the
  * D1 repo so the cross-runtime conformance suite asserts the same preset resolution.
  */
-class DrizzleMergePresetRepository {
+class DrizzleRiskPolicyRepository {
     db;
     constructor(db) {
         this.db = db;
@@ -2837,27 +2887,27 @@ class DrizzleMergePresetRepository {
     async get(workspaceId, id) {
         const rows = await this.db
             .select()
-            .from(mergeThresholdPresets)
-            .where(and(eq(mergeThresholdPresets.workspace_id, workspaceId), eq(mergeThresholdPresets.id, id)))
+            .from(riskPolicies)
+            .where(and(eq(riskPolicies.workspace_id, workspaceId), eq(riskPolicies.id, id)))
             .limit(1);
-        return rows[0] ? rowToMergePreset(rows[0]) : null;
+        return rows[0] ? rowToRiskPolicy(rows[0]) : null;
     }
     async list(workspaceId) {
         const rows = await this.db
             .select()
-            .from(mergeThresholdPresets)
-            .where(eq(mergeThresholdPresets.workspace_id, workspaceId))
-            .orderBy(mergeThresholdPresets.created_at);
-        return rows.map(rowToMergePreset);
+            .from(riskPolicies)
+            .where(eq(riskPolicies.workspace_id, workspaceId))
+            .orderBy(riskPolicies.created_at);
+        return rows.map(rowToRiskPolicy);
     }
     async getDefault(workspaceId) {
         const rows = await this.db
             .select()
-            .from(mergeThresholdPresets)
-            .where(and(eq(mergeThresholdPresets.workspace_id, workspaceId), eq(mergeThresholdPresets.is_default, 1)))
-            .orderBy(mergeThresholdPresets.created_at)
+            .from(riskPolicies)
+            .where(and(eq(riskPolicies.workspace_id, workspaceId), eq(riskPolicies.is_default, 1)))
+            .orderBy(riskPolicies.created_at)
             .limit(1);
-        return rows[0] ? rowToMergePreset(rows[0]) : null;
+        return rows[0] ? rowToRiskPolicy(rows[0]) : null;
     }
     async upsert(workspaceId, preset) {
         const values = {
@@ -2885,15 +2935,15 @@ class DrizzleMergePresetRepository {
             // Promoting this preset to default demotes any other default first.
             if (preset.isDefault) {
                 await tx
-                    .update(mergeThresholdPresets)
+                    .update(riskPolicies)
                     .set({ is_default: 0 })
-                    .where(and(eq(mergeThresholdPresets.workspace_id, workspaceId), sql `${mergeThresholdPresets.id} <> ${preset.id}`));
+                    .where(and(eq(riskPolicies.workspace_id, workspaceId), sql `${riskPolicies.id} <> ${preset.id}`));
             }
             await tx
-                .insert(mergeThresholdPresets)
+                .insert(riskPolicies)
                 .values(values)
                 .onConflictDoUpdate({
-                target: [mergeThresholdPresets.workspace_id, mergeThresholdPresets.id],
+                target: [riskPolicies.workspace_id, riskPolicies.id],
                 set: {
                     name: values.name,
                     max_complexity: values.max_complexity,
@@ -2915,8 +2965,8 @@ class DrizzleMergePresetRepository {
     }
     async remove(workspaceId, id) {
         await this.db
-            .delete(mergeThresholdPresets)
-            .where(and(eq(mergeThresholdPresets.workspace_id, workspaceId), eq(mergeThresholdPresets.id, id), eq(mergeThresholdPresets.is_default, 0)));
+            .delete(riskPolicies)
+            .where(and(eq(riskPolicies.workspace_id, workspaceId), eq(riskPolicies.id, id), eq(riskPolicies.is_default, 0)));
     }
 }
 // Shape-guarded parsers matching the D1 mirror (`D1SharedStackRepository`) EXACTLY, so a
@@ -3929,7 +3979,7 @@ export function createDrizzleRepositories(db, clock) {
         clarityReviewRepository: new DrizzleClarityReviewRepository(db),
         brainstormSessionRepository: new DrizzleBrainstormSessionRepository(db),
         initiativeRepository: new DrizzleInitiativeRepository(db),
-        mergePresetRepository: new DrizzleMergePresetRepository(db),
+        riskPolicyRepository: new DrizzleRiskPolicyRepository(db),
         sharedStackRepository: new DrizzleSharedStackRepository(db),
         workspaceSettingsRepository: new DrizzleWorkspaceSettingsRepository(db),
         userSettingsRepository: new DrizzleUserSettingsRepository(db),