upgrade global work

Author: icecrasher321

apps/sim/app/api/v1/admin/dashboard/global-work/route.ts

@@ -22,7 +22,13 @@ export const GET = withRouteHandler(
     if (!parsed.success) return parsed.response
 
     try {
-      const data = await getGlobalWorkSummary(parsed.data.query.month)
+      const { month, userId, organizationId } = parsed.data.query
+      const filter = userId
+        ? ({ type: 'user', id: userId } as const)
+        : organizationId
+          ? ({ type: 'organization', id: organizationId } as const)
+          : undefined
+      const data = await getGlobalWorkSummary(month, new Date(), filter)
       return NextResponse.json({ data })
     } catch (error) {
       logger.error('Failed to build Global Work summary', { error })

apps/sim/lib/api/contracts/v1/admin/global-work.test.ts

@@ -0,0 +1,28 @@
+/** @vitest-environment node */
+
+import { describe, expect, it } from 'vitest'
+import { adminV1GlobalWorkQuerySchema } from '@/lib/api/contracts/v1/admin/global-work'
+
+describe('Global Work admin query contract', () => {
+  it('accepts either a user or organization filter', () => {
+    expect(
+      adminV1GlobalWorkQuerySchema.safeParse({ month: '2026-06', userId: 'user-1' }).success
+    ).toBe(true)
+    expect(
+      adminV1GlobalWorkQuerySchema.safeParse({
+        month: '2026-06',
+        organizationId: 'org-1',
+      }).success
+    ).toBe(true)
+  })
+
+  it('rejects ambiguous combined filters', () => {
+    expect(
+      adminV1GlobalWorkQuerySchema.safeParse({
+        month: '2026-06',
+        userId: 'user-1',
+        organizationId: 'org-1',
+      }).success
+    ).toBe(false)
+  })
+})

apps/sim/lib/api/contracts/v1/admin/global-work.ts

@@ -2,24 +2,37 @@ import { z } from 'zod'
 import { type ContractJsonResponse, defineRouteContract } from '@/lib/api/contracts/types'
 import { lastQueryValue } from '@/lib/api/contracts/v1/admin/shared'
 
-export const adminV1GlobalWorkQuerySchema = z.object({
-  month: z
-    .preprocess(
-      lastQueryValue,
-      z
-        .string()
-        .regex(/^\d{4}-(0[1-9]|1[0-2])$/)
-        .optional()
-    )
-    .optional(),
-})
+const optionalIdQuerySchema = z.preprocess(lastQueryValue, z.string().trim().min(1).optional())
+
+export const adminV1GlobalWorkQuerySchema = z
+  .object({
+    month: z
+      .preprocess(
+        lastQueryValue,
+        z
+          .string()
+          .regex(/^\d{4}-(0[1-9]|1[0-2])$/)
+          .optional()
+      )
+      .optional(),
+    userId: optionalIdQuerySchema.optional(),
+    organizationId: optionalIdQuerySchema.optional(),
+  })
+  .refine((query) => !(query.userId && query.organizationId), {
+    error: 'Filter by either user or organization, not both',
+  })
 
 export const adminV1GlobalWorkResponseSchema = z.object({
   data: z.object({
     month: z.string(),
     label: z.string(),
     isCurrentMonth: z.boolean(),
     attribution: z.literal('estimated'),
+    scope: z.discriminatedUnion('type', [
+      z.object({ type: z.literal('global'), id: z.null() }),
+      z.object({ type: z.literal('user'), id: z.string() }),
+      z.object({ type: z.literal('organization'), id: z.string() }),
+    ]),
     formula: z.object({
       minutesPerUnit: z.number().positive(),
       globalAnnualHours: z.number().positive(),

apps/sim/lib/global-work/summary.test.ts

@@ -92,6 +92,7 @@ describe('Global Work Pacific reporting windows', () => {
     const summary = await getGlobalWorkSummary('2026-06', new Date('2026-07-09T12:00:00.000Z'))
 
     expect(summary.attribution).toBe('estimated')
+    expect(summary.scope).toEqual({ type: 'global', id: null })
     expect(summary.formula).toEqual(GLOBAL_WORK_FORMULA)
     expect(summary.units).toBe(12)
     expect(summary.humanEquivalentHours).toBe(1)
@@ -187,4 +188,44 @@ describe('Global Work Pacific reporting windows', () => {
     expect(queryText).toContain("AT TIME ZONE 'UTC'")
     expect(dialect.sqlToQuery(getCapturedQuery()).params).toContain('America/Los_Angeles')
   })
+
+  it('filters a user by recorded actor without changing payer eligibility', async () => {
+    execute.mockResolvedValueOnce([])
+
+    const summary = await getGlobalWorkSummary('2026-06', new Date('2026-07-09T12:00:00.000Z'), {
+      type: 'user',
+      id: 'user-1',
+    })
+
+    const query = dialect.sqlToQuery(getCapturedQuery())
+    expect(query.sql).toContain('su.actor_user_id = $')
+    expect(query.params.filter((parameter) => parameter === 'user-1')).toHaveLength(2)
+    expect(summary.scope).toEqual({ type: 'user', id: 'user-1' })
+  })
+
+  it('filters an organization by both billing entity type and ID', async () => {
+    execute.mockResolvedValueOnce([])
+
+    const summary = await getGlobalWorkSummary('2026-06', new Date('2026-07-09T12:00:00.000Z'), {
+      type: 'organization',
+      id: 'org-1',
+    })
+
+    const query = dialect.sqlToQuery(getCapturedQuery())
+    expect(query.sql).toContain("su.billing_entity_type = 'organization'")
+    expect(query.sql).toContain('su.billing_entity_id = $')
+    expect(query.params.filter((parameter) => parameter === 'org-1')).toHaveLength(2)
+    expect(summary.scope).toEqual({ type: 'organization', id: 'org-1' })
+  })
+
+  it('preserves billing entity type across snapshots, usage fallback, and current workspace state', async () => {
+    execute.mockResolvedValueOnce([])
+
+    await getGlobalWorkSummary('2026-06', new Date('2026-07-09T12:00:00.000Z'))
+
+    const queryText = getCapturedQueryText()
+    expect(queryText).toContain("'{billingAttribution,billingEntity,type}'")
+    expect(queryText).toContain('usage_scope.billing_entity_type::text')
+    expect(queryText).toContain('wb.billing_entity_type')
+  })
 })

apps/sim/lib/global-work/summary.ts

@@ -25,6 +25,10 @@ export interface GlobalWorkSummary {
   label: string
   isCurrentMonth: boolean
   attribution: 'estimated'
+  scope:
+    | { type: 'global'; id: null }
+    | { type: 'user'; id: string }
+    | { type: 'organization'; id: string }
   formula: {
     minutesPerUnit: number
     globalAnnualHours: number
@@ -45,6 +49,8 @@ export interface GlobalWorkSummary {
   }>
 }
 
+export type GlobalWorkFilter = { type: 'user'; id: string } | { type: 'organization'; id: string }
+
 function addMonth(month: string, delta: number): string {
   const [year, monthNumber] = month.split('-').map(Number)
   const date = new Date(Date.UTC(year, monthNumber - 1 + delta, 1))
@@ -109,14 +115,20 @@ export function buildZeroFilledGlobalWorkDailySeries(params: {
  * billing snapshot already persisted for billing; older workflows and all
  * Mothership messages fall back to the current/last-known subscription state.
  */
-async function queryEstimatedGlobalWorkUnits(periodStart: Date, periodEnd: Date) {
+async function queryEstimatedGlobalWorkUnits(
+  periodStart: Date,
+  periodEnd: Date,
+  filter?: GlobalWorkFilter
+) {
   // Raw `sql` parameters do not infer a timestamp encoder from the surrounding
   // comparison. Bind through the matching schema columns so postgres.js
   // receives UTC timestamp strings rather than JavaScript Date objects.
   const workflowPeriodStart = sql.param(periodStart, workflowExecutionLogs.endedAt)
   const workflowPeriodEnd = sql.param(periodEnd, workflowExecutionLogs.endedAt)
   const mothershipPeriodStart = sql.param(periodStart, copilotMessages.createdAt)
   const mothershipPeriodEnd = sql.param(periodEnd, copilotMessages.createdAt)
+  const actorUserId = filter?.type === 'user' ? filter.id : null
+  const billingOrganizationId = filter?.type === 'organization' ? filter.id : null
 
   const result = await dbReplica.execute<AggregatedRow>(sql`
     WITH workspace_billing AS (
@@ -127,6 +139,11 @@ async function queryEstimatedGlobalWorkUnits(periodStart: Date, periodEnd: Date)
             THEN w.organization_id
           ELSE w.billed_account_user_id
         END AS billing_entity_id,
+        CASE
+          WHEN w.workspace_mode = 'organization' AND w.organization_id IS NOT NULL
+            THEN 'organization'::text
+          ELSE 'user'::text
+        END AS billing_entity_type,
         COALESCE(org_owner.user_id, w.billed_account_user_id) AS billing_owner_user_id
       FROM workspace w
       LEFT JOIN LATERAL (
@@ -146,6 +163,11 @@ async function queryEstimatedGlobalWorkUnits(periodStart: Date, periodEnd: Date)
           usage_scope.billing_entity_id,
           wb.billing_entity_id
         ) AS billing_entity_id,
+        COALESCE(
+          wel.execution_data #>> '{billingAttribution,billingEntity,type}',
+          usage_scope.billing_entity_type::text,
+          wb.billing_entity_type
+        ) AS billing_entity_type,
         COALESCE(
           wel.execution_data #>> '{billingAttribution,billedAccountUserId}',
           wb.billing_owner_user_id
@@ -164,7 +186,7 @@ async function queryEstimatedGlobalWorkUnits(periodStart: Date, periodEnd: Date)
       FROM workflow_execution_logs wel
       JOIN workspace_billing wb ON wb.workspace_id = wel.workspace_id
       LEFT JOIN LATERAL (
-        SELECT ul.billing_entity_id, ul.user_id
+        SELECT ul.billing_entity_id, ul.billing_entity_type, ul.user_id
         FROM usage_log ul
         WHERE NOT (wel.execution_data ? 'billingAttribution')
           AND ul.execution_id = wel.execution_id
@@ -184,6 +206,7 @@ async function queryEstimatedGlobalWorkUnits(periodStart: Date, periodEnd: Date)
         cm.message_id AS source_event_id,
         cm.created_at AS occurred_at,
         wb.billing_entity_id,
+        wb.billing_entity_type,
         wb.billing_owner_user_id,
         cc.user_id AS actor_user_id,
         false AS has_billing_snapshot,
@@ -213,6 +236,7 @@ async function queryEstimatedGlobalWorkUnits(periodStart: Date, periodEnd: Date)
         source_event_id,
         occurred_at,
         billing_entity_id,
+        billing_entity_type,
         billing_owner_user_id,
         actor_user_id,
         has_billing_snapshot,
@@ -228,6 +252,14 @@ async function queryEstimatedGlobalWorkUnits(periodStart: Date, periodEnd: Date)
       LEFT JOIN "user" billing_owner ON billing_owner.id = su.billing_owner_user_id
       WHERE lower(split_part(COALESCE(actor.email, ''), '@', 2)) NOT IN ('sim.ai', 'simstudio.ai')
         AND lower(split_part(COALESCE(billing_owner.email, ''), '@', 2)) NOT IN ('sim.ai', 'simstudio.ai')
+        AND (${actorUserId}::text IS NULL OR su.actor_user_id = ${actorUserId})
+        AND (
+          ${billingOrganizationId}::text IS NULL
+          OR (
+            su.billing_entity_type = 'organization'
+            AND su.billing_entity_id = ${billingOrganizationId}
+          )
+        )
         AND (
           (
             su.has_billing_snapshot
@@ -282,13 +314,14 @@ async function queryEstimatedGlobalWorkUnits(periodStart: Date, periodEnd: Date)
 
 export async function getGlobalWorkSummary(
   requestedMonth?: string,
-  now = new Date()
+  now = new Date(),
+  filter?: GlobalWorkFilter
 ): Promise<GlobalWorkSummary> {
   const month = requestedMonth ?? getLatestCompletedGlobalWorkMonth(now)
   const currentMonth = zonedWallClock(now, REPORTING_TIME_ZONE).slice(0, 7)
   const isCurrentMonth = month === currentMonth
   const { periodStart, periodEnd } = getGlobalWorkMonthWindow(month)
-  const rows = await queryEstimatedGlobalWorkUnits(periodStart, periodEnd)
+  const rows = await queryEstimatedGlobalWorkUnits(periodStart, periodEnd, filter)
 
   const sourceUnits = { workflow: 0, mothership: 0 }
   const unitsByDate = new Map<string, { workflow: number; mothership: number }>()
@@ -329,6 +362,7 @@ export async function getGlobalWorkSummary(
     label: isCurrentMonth ? 'Month to date · projected annualized' : 'Completed month',
     isCurrentMonth,
     attribution: 'estimated',
+    scope: filter ?? { type: 'global', id: null },
     formula: GLOBAL_WORK_FORMULA,
     units,
     humanEquivalentHours: round(humanEquivalentHours, 2),

packages/db/migrations/0260_unknown_sinister_six.sql

@@ -0,0 +1,22 @@
+ALTER TABLE "paused_executions" ADD COLUMN IF NOT EXISTS "automatic_resume_retry_count" integer DEFAULT 0 NOT NULL;--> statement-breakpoint
+ALTER TABLE "workspace" ADD COLUMN IF NOT EXISTS "storage_used_bytes" bigint DEFAULT 0 NOT NULL;--> statement-breakpoint
+ALTER TABLE "workspace" ADD COLUMN IF NOT EXISTS "organization_assigned_at" timestamp;--> statement-breakpoint
+-- migration-safe: replay-only cleanup of the constraint this same migration adds on the next line; no deployed code knows it yet. A failed concurrent index build below leaves this file unjournaled, and the rerun must not fail on ADD CONSTRAINT already-exists.
+ALTER TABLE "workspace" DROP CONSTRAINT IF EXISTS "workspace_storage_used_bytes_non_negative";--> statement-breakpoint
+ALTER TABLE "workspace" ADD CONSTRAINT "workspace_storage_used_bytes_non_negative" CHECK ("workspace"."storage_used_bytes" >= 0) NOT VALID;--> statement-breakpoint
+
+-- These tables are live and potentially large. End the migration transaction
+-- before building their indexes so writes remain available during deployment.
+-- Every statement in this file is idempotent, so a failed concurrent build
+-- (which leaves this migration unjournaled and an INVALID same-name index
+-- behind) replays safely from the top: the drop clears any INVALID leftover
+-- before each rebuild.
+COMMIT;--> statement-breakpoint
+SET lock_timeout = 0;--> statement-breakpoint
+DROP INDEX CONCURRENTLY IF EXISTS "copilot_messages_user_created_at_idx";--> statement-breakpoint
+CREATE INDEX CONCURRENTLY IF NOT EXISTS "copilot_messages_user_created_at_idx" ON "copilot_messages" USING btree ("created_at","chat_id","message_id") WHERE "copilot_messages"."role" = 'user' AND "copilot_messages"."deleted_at" IS NULL;--> statement-breakpoint
+DROP INDEX CONCURRENTLY IF EXISTS "outbox_event_type_created_idx";--> statement-breakpoint
+CREATE INDEX CONCURRENTLY IF NOT EXISTS "outbox_event_type_created_idx" ON "outbox_event" USING btree ("event_type","created_at");--> statement-breakpoint
+DROP INDEX CONCURRENTLY IF EXISTS "workflow_execution_logs_completed_ended_at_idx";--> statement-breakpoint
+CREATE INDEX CONCURRENTLY IF NOT EXISTS "workflow_execution_logs_completed_ended_at_idx" ON "workflow_execution_logs" USING btree ("ended_at","workspace_id","execution_id") WHERE "workflow_execution_logs"."status" = 'completed' AND "workflow_execution_logs"."level" = 'info' AND "workflow_execution_logs"."ended_at" IS NOT NULL;--> statement-breakpoint
+SET lock_timeout = '5s';