@dakkitor/api-contracts 1.1.154 → 1.5.0

package/dist/actives/actives.contract.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.activesContractRouter = exports.FilterTimesheetSchema = exports.TimesheetResponseSchema = exports.TimesheetCollaborationGroupSchema = exports.TimesheetCollaborationHeaderSchema = exports.TimesheetWorkerRowSchema = exports.TimesheetDayEntrySchema = exports.PaginatedActiveResponseSchema = exports.FilterActiveSchema = exports.FilterActiveByJobSchema = exports.ActivesByJobResponseSchema = exports.CollaborationActiveGroupSchema = exports.JobActiveGroupSchema = exports.JobGroupHeaderSchema = exports.ActiveInJobGroupSchema = exports.BatchDeleteActiveResponseSchema = exports.BatchDeleteActiveSchema = exports.BulkUpdateActiveResponseSchema = exports.BulkUpdateActiveSchema = exports.UpdateActiveSchema = exports.CreateActiveSchema = exports.ActiveSchema = exports.ActiveSortableFieldsSchema = exports.ActiveStatusFilterTypeSchema = exports.ActiveStatusSchema = void 0;
+exports.activesContractRouter = exports.FilterTimesheetSchema = exports.TimesheetResponseSchema = exports.TimesheetCollaborationGroupSchema = exports.TimesheetCollaborationHeaderSchema = exports.TimesheetWorkerRowSchema = exports.TimesheetDayEntrySchema = exports.PaginatedActiveListResponseSchema = exports.ActiveListItemSchema = exports.PaginatedActiveResponseSchema = exports.FilterActiveSchema = exports.FilterActiveByJobSchema = exports.ActiveRegionCountsResponseSchema = exports.ActiveMapMarkersResponseSchema = exports.ActiveMapMarkerSchema = exports.FlatActivesByDayResponseSchema = exports.FlatActiveByDaySchema = exports.ActiveInJobGroupSchema = exports.BatchDeleteActiveResponseSchema = exports.BatchDeleteActiveSchema = exports.BulkUpdateActiveResponseSchema = exports.BulkUpdateActiveSchema = exports.UpdateActiveSchema = exports.CreateActiveSchema = exports.ActiveSchema = exports.ActiveSortFieldMapping = exports.ActiveSortableFieldsSchema = exports.BookingScheduleEntrySchema = exports.ActiveStatusChangeSchema = exports.ActiveStatusSchema = void 0;
 const zod_openapi_1 = require("@anatine/zod-openapi");
 const core_1 = require("@ts-rest/core");
 const zod_1 = require("zod");
@@ -9,6 +9,7 @@ const common_schemas_1 = require("../common/common-schemas");
 const error_schemas_1 = require("../common/error-schemas");
 const pagination_query_schema_1 = require("../common/pagination-query.schema");
 const pagination_schema_1 = require("../common/pagination.schema");
+const summary_schemas_1 = require("../shared/summary-schemas");
 (0, zod_openapi_1.extendZodWithOpenApi)(zod_1.z);
 // Enums
 exports.ActiveStatusSchema = zod_1.z.enum([
@@ -19,19 +20,40 @@ exports.ActiveStatusSchema = zod_1.z.enum([
     'MEDICAL_LEAVE',
     'DAY_OFF',
     'INJURY',
-]);
-exports.ActiveStatusFilterTypeSchema = zod_1.z.enum([
-    'SECOND_AGENT',
-    'FIRST_AGENT',
-    'BOTH',
-    'EITHER',
-]);
+    'OFF_SCHEDULE',
+], { message: 'Required' });
+exports.ActiveStatusChangeSchema = zod_1.z.object({
+    id: zod_1.z.string().uuid(),
+    fromStatus: exports.ActiveStatusSchema.nullable(),
+    toStatus: exports.ActiveStatusSchema,
+    changedById: zod_1.z.string().uuid(),
+    changedByName: zod_1.z.string().nullable(),
+    createdAt: zod_1.z.string().datetime(),
+    reconstructed: zod_1.z.boolean(),
+});
+exports.BookingScheduleEntrySchema = zod_1.z
+    .object({
+    activeId: zod_1.z.string().uuid().describe('The active record for this day.'),
+    date: zod_1.z.string().date().describe('YYYY-MM-DD.'),
+    status: exports.ActiveStatusSchema.describe('Settled status for this day.'),
+    fromStatus: exports.ActiveStatusSchema.nullable().describe('The status before the attributing change, or null when no change record exists for this day.'),
+    attributingActorName: zod_1.z.string().nullable(),
+    attributingCreatedAt: zod_1.z
+        .union([zod_1.z.string().datetime(), zod_1.z.date(), zod_1.z.null()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val))
+        .nullable(),
+    attributingReconstructed: zod_1.z
+        .boolean()
+        .describe('True when the attributing change is a reconstructed (historical-estimate) row.'),
+    isPlacementStart: zod_1.z.boolean().describe('True when this day is booking.startDate.'),
+    isPlacementEnd: zod_1.z.boolean().describe('True when this day is booking.endDate.'),
+})
+    .openapi({ title: 'BookingScheduleEntry' });
 exports.ActiveSortableFieldsSchema = zod_1.z.enum([
     'date',
     'startDate',
     'workerName',
-    'statusSa',
-    'statusFa',
+    'status',
     'hoursWorked',
     'payRate',
     'receivedRate',
@@ -39,9 +61,28 @@ exports.ActiveSortableFieldsSchema = zod_1.z.enum([
     'collaborationCompany',
     'collaborationClient',
     'collaborationAgent',
+    'postcode',
+    'firstAgent',
     'createdAt',
     'updatedAt',
 ]);
+/** Maps sort field values to ability field paths on SortActiveSchema. */
+exports.ActiveSortFieldMapping = {
+    date: 'date',
+    startDate: 'startDate',
+    workerName: 'workerName',
+    status: 'status.status',
+    hoursWorked: 'hoursWorked',
+    payRate: 'pay.rate',
+    receivedRate: 'pay.receivedRate',
+    secondAgent: 'agentId',
+    collaborationCompany: 'job.companyId',
+    collaborationClient: 'job.clientId',
+    collaborationAgent: 'job.userId',
+    firstAgent: 'job.userId',
+    createdAt: 'createdAt',
+    updatedAt: 'updatedAt',
+};
 // Active Pay schema - includes receivedRate
 const ActivePaySchema = zod_1.z
     .object({
@@ -51,6 +92,14 @@ const ActivePaySchema = zod_1.z
         .number()
         .nullable()
         .describe('The received pay rate'),
+    hourlyRate: zod_1.z.coerce
+        .number()
+        .nullable()
+        .describe('Pre-computed hourly rate (rate / workHours for DAILY, rate for HOURLY)'),
+    hourlyReceivedRate: zod_1.z.coerce
+        .number()
+        .nullable()
+        .describe('Pre-computed hourly received rate'),
 })
     .openapi({ title: 'ActivePay' });
 // Worker Pay schema for create/update (without receivedRate for SA)
@@ -73,12 +122,7 @@ const ActivePayUpdateSchema = zod_1.z
     .openapi({ title: 'ActivePayUpdate' });
 // Active Status Filter
 const ActiveStatusFilterSchema = zod_1.z
-    .object({
-    status: exports.ActiveStatusSchema.optional().describe('Filter by status value'),
-    filterType: exports.ActiveStatusFilterTypeSchema.optional()
-        .default('EITHER')
-        .describe('Status filter type: SECOND_AGENT (check only SA status), FIRST_AGENT (check only FA status), BOTH (both statuses must be the same), EITHER (either SA or FA status can match)'),
-})
+    .object({ status: exports.ActiveStatusSchema.optional().describe('Filter by status value') })
     .openapi({ title: 'ActiveStatusFilter' });
 // ============================================================================
 // Main Active schema
@@ -90,20 +134,44 @@ exports.ActiveSchema = zod_1.z
         .uuid()
         .describe('The unique identifier of the active record.'),
     date: zod_1.z.string().date().describe('The date when the worker was active.'),
+    saUserId: zod_1.z
+        .string()
+        .uuid()
+        .nullable()
+        .optional()
+        .describe('Denormalised SA user ID — needed for frontend CASL condition evaluation'),
+    faUserId: zod_1.z
+        .string()
+        .uuid()
+        .nullable()
+        .optional()
+        .describe('Denormalised FA user ID — needed for frontend CASL condition evaluation'),
     pay: ActivePaySchema.describe('Pay Information'),
     comment: zod_1.z.string().nullable().describe('Optional comment for the day.'),
-    statusSa: exports.ActiveStatusSchema.describe('Filter by status value.'),
+    status: exports.ActiveStatusSchema.describe('Status value.'),
+    statusUpdatedAt: zod_1.z
+        .union([zod_1.z.string().datetime(), zod_1.z.date(), zod_1.z.null()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val))
+        .nullable()
+        .describe('The timestamp when status was last updated.'),
+    // DEPRECATED (read-only): historical dual statuses; not written/edited after the single-status cutover
+    statusSa: exports.ActiveStatusSchema.nullable().describe('DEPRECATED: historical SA status.'),
     statusSaUpdatedAt: zod_1.z
         .union([zod_1.z.string().datetime(), zod_1.z.date(), zod_1.z.null()])
         .transform((val) => (val instanceof Date ? val.toISOString() : val))
         .nullable()
-        .describe('The timestamp when statusSa was last updated.'),
-    statusFa: exports.ActiveStatusSchema.describe('Filter by status value.'),
+        .describe('DEPRECATED: timestamp when SA status was last updated.'),
+    statusFa: exports.ActiveStatusSchema.nullable().describe('DEPRECATED: historical FA status.'),
     statusFaUpdatedAt: zod_1.z
         .union([zod_1.z.string().datetime(), zod_1.z.date(), zod_1.z.null()])
         .transform((val) => (val instanceof Date ? val.toISOString() : val))
         .nullable()
-        .describe('The timestamp when statusFa was last updated.'),
+        .describe('DEPRECATED: timestamp when FA status was last updated.'),
+    statusChangedById: zod_1.z
+        .string()
+        .uuid()
+        .nullable()
+        .describe('ID of the user who last changed the status.'),
     hoursWorked: zod_1.z.coerce
         .number()
         .nullable()
@@ -128,8 +196,7 @@ exports.CreateActiveSchema = zod_1.z
     date: zod_1.z.string().date().describe('Select date'),
     pay: WorkerPaySchema.describe('Pay rate and unit'),
     comment: zod_1.z.string().optional().describe('Enter comment'),
-    statusSa: exports.ActiveStatusSchema.optional().describe('Select SA status'),
-    statusFa: exports.ActiveStatusSchema.optional().describe('Select FA status'),
+    status: exports.ActiveStatusSchema.optional().describe('Status'),
 })
     .openapi({ title: 'CreateActive' });
 exports.UpdateActiveSchema = zod_1.z
@@ -137,8 +204,18 @@ exports.UpdateActiveSchema = zod_1.z
     pay: ActivePayUpdateSchema.optional().describe('Updated pay rate and unit'),
     hoursWorked: zod_1.z.number().min(0).optional().describe('Updated hours worked'),
     comment: zod_1.z.string().nullable().optional().describe('Updated comment'),
-    statusSa: exports.ActiveStatusSchema.optional().describe('Updated SA status'),
-    statusFa: exports.ActiveStatusSchema.optional().describe('Updated FA status'),
+    status: exports.ActiveStatusSchema.optional().describe('Status'),
+    collaboration: zod_1.z
+        .object({
+        clientId: zod_1.z.string().uuid().optional().describe('Client ID'),
+        companyId: zod_1.z.string().uuid().describe('Company ID'),
+        userId: zod_1.z.string().uuid().optional().describe('User/agent ID'),
+        startDate: zod_1.z.string().date().describe('Start date for change range'),
+        endDate: zod_1.z.string().date().describe('End date for change range'),
+        updateBookingAndJob: zod_1.z.boolean().optional().describe('Whether to also update booking and job'),
+    })
+        .optional()
+        .describe('Collaboration change — updates company/client on actives in date range'),
 })
     .openapi({ title: 'UpdateActive' });
 exports.BulkUpdateActiveSchema = zod_1.z
@@ -154,6 +231,18 @@ exports.BulkUpdateActiveSchema = zod_1.z
 exports.BulkUpdateActiveResponseSchema = zod_1.z
     .object({
     updated: zod_1.z.number().describe('Number of records updated'),
+    collaborationChanged: zod_1.z
+        .number()
+        .optional()
+        .describe('Number of active records updated with new collaboration'),
+    bookingsUpdated: zod_1.z
+        .number()
+        .optional()
+        .describe('Number of bookings updated with new collaboration dates'),
+    jobsUpdated: zod_1.z
+        .number()
+        .optional()
+        .describe('Number of jobs updated with new collaboration'),
 })
     .openapi({ title: 'BulkUpdateActiveResponse' });
 exports.BatchDeleteActiveSchema = zod_1.z
@@ -171,16 +260,53 @@ exports.BatchDeleteActiveResponseSchema = zod_1.z
 })
     .openapi({ title: 'BatchDeleteActiveResponse' });
 // ============================================================================
-// Grouped-by-Job schemas
+// Grouped-by-Job schemas (kept for frontend type compatibility)
+// NOTE: ActiveInJobGroupSchema is kept because the ActiveInJobGroup type is
+// still consumed by frontend components (active-row.tsx, placements-today.tsx,
+// group-actives-by-collaboration.ts). The other grouped schemas
+// (JobGroupHeaderSchema, JobActiveGroupSchema, CollaborationActiveGroupSchema,
+// ActivesByJobResponseSchema) have been removed as they are no longer used.
 // ============================================================================
 /** Active record within a job group — booking.job is omitted (available from parent) */
 exports.ActiveInJobGroupSchema = zod_1.z
     .object({
     id: zod_1.z.string().uuid(),
     date: zod_1.z.string().date(),
+    saUserId: zod_1.z
+        .string()
+        .uuid()
+        .nullable()
+        .optional()
+        .describe('Denormalised SA user ID — needed for frontend CASL condition evaluation'),
+    faUserId: zod_1.z
+        .string()
+        .uuid()
+        .nullable()
+        .optional()
+        .describe('Denormalised FA user ID — needed for frontend CASL condition evaluation'),
     pay: ActivePaySchema,
-    statusSa: exports.ActiveStatusSchema,
-    statusFa: exports.ActiveStatusSchema,
+    status: exports.ActiveStatusSchema,
+    // DEPRECATED (read-only): historical dual statuses; not written/edited after the single-status cutover
+    statusSa: exports.ActiveStatusSchema.nullable().optional().describe('DEPRECATED: historical SA status.'),
+    statusSaUpdatedAt: zod_1.z
+        .union([zod_1.z.string().datetime(), zod_1.z.date(), zod_1.z.null()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val))
+        .nullable()
+        .optional()
+        .describe('DEPRECATED: timestamp when SA status was last updated.'),
+    statusFa: exports.ActiveStatusSchema.nullable().optional().describe('DEPRECATED: historical FA status.'),
+    statusFaUpdatedAt: zod_1.z
+        .union([zod_1.z.string().datetime(), zod_1.z.date(), zod_1.z.null()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val))
+        .nullable()
+        .optional()
+        .describe('DEPRECATED: timestamp when FA status was last updated.'),
+    statusChangedById: zod_1.z
+        .string()
+        .uuid()
+        .nullable()
+        .optional()
+        .describe('ID of the user who last changed the status.'),
     hoursWorked: zod_1.z.coerce.number().nullable(),
     hoursWorkedUpdatedAt: zod_1.z
         .union([zod_1.z.string().datetime(), zod_1.z.date(), zod_1.z.null()])
@@ -201,11 +327,15 @@ exports.ActiveInJobGroupSchema = zod_1.z
             .union([zod_1.z.string(), zod_1.z.date(), zod_1.z.null()])
             .transform((val) => (val instanceof Date ? val.toISOString() : val))
             .nullable(),
+        expectedEndDate: zod_1.z
+            .union([zod_1.z.string(), zod_1.z.date(), zod_1.z.null()])
+            .transform((val) => (val instanceof Date ? val.toISOString() : val))
+            .nullable()
+            .optional(),
         worker: zod_1.z.object({
             id: zod_1.z.string().uuid(),
             firstName: zod_1.z.string(),
             lastName: zod_1.z.string().nullable(),
-            phoneNumbers: zod_1.z.array(common_schemas_1.PhoneNumberResponseSchema).default([]),
         }),
         user: zod_1.z.object({
             id: zod_1.z.string().uuid(),
@@ -214,7 +344,13 @@ exports.ActiveInJobGroupSchema = zod_1.z
         }),
         job: zod_1.z
             .object({
-            currentCollaboration: zod_1.z
+            createdById: zod_1.z
+                .string()
+                .uuid()
+                .nullable()
+                .optional()
+                .describe('Job creator — needed for frontend CASL condition evaluation when collaboration is null'),
+            collaboration: zod_1.z
                 .object({
                 userId: zod_1.z
                     .string()
@@ -231,109 +367,223 @@ exports.ActiveInJobGroupSchema = zod_1.z
     }),
 })
     .openapi({ title: 'ActiveInJobGroup' });
-/** Minimal job shape for the group header */
-exports.JobGroupHeaderSchema = zod_1.z
+// ============================================================================
+// Flat-by-day schemas (replaces grouped response for findAllByJob endpoint)
+// ============================================================================
+/** Flat active record with embedded job context — frontend groups by collaboration/job */
+exports.FlatActiveByDaySchema = zod_1.z
     .object({
     id: zod_1.z.string().uuid(),
-    tradeId: zod_1.z.string().uuid(),
-    createdById: zod_1.z
+    date: zod_1.z.string().date(),
+    saUserId: zod_1.z
         .string()
         .uuid()
         .nullable()
         .optional()
-        .describe('Creator User ID (used for CASL condition evaluation)'),
-    location: zod_1.z
-        .object({
-        postcode: zod_1.z.string().nullable(),
-    })
+        .describe('Denormalised SA user ID — needed for frontend CASL condition evaluation'),
+    faUserId: zod_1.z
+        .string()
+        .uuid()
+        .nullable()
+        .optional()
+        .describe('Denormalised FA user ID — needed for frontend CASL condition evaluation'),
+    pay: ActivePaySchema,
+    status: exports.ActiveStatusSchema,
+    // DEPRECATED (read-only): historical dual statuses; not written/edited after the single-status cutover
+    statusSa: exports.ActiveStatusSchema.nullable().describe('DEPRECATED: historical SA status.'),
+    statusSaUpdatedAt: zod_1.z
+        .union([zod_1.z.string().datetime(), zod_1.z.date(), zod_1.z.null()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val))
+        .nullable()
+        .describe('DEPRECATED: timestamp when SA status was last updated.'),
+    statusFa: exports.ActiveStatusSchema.nullable().describe('DEPRECATED: historical FA status.'),
+    statusFaUpdatedAt: zod_1.z
+        .union([zod_1.z.string().datetime(), zod_1.z.date(), zod_1.z.null()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val))
+        .nullable()
+        .describe('DEPRECATED: timestamp when FA status was last updated.'),
+    statusChangedById: zod_1.z
+        .string()
+        .uuid()
+        .nullable()
+        .describe('ID of the user who last changed the status.'),
+    hoursWorked: zod_1.z.coerce.number().nullable(),
+    hoursWorkedUpdatedAt: zod_1.z
+        .union([zod_1.z.string().datetime(), zod_1.z.date(), zod_1.z.null()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val))
         .nullable(),
-    currentCollaboration: zod_1.z
-        .object({
+    booking: zod_1.z.object({
+        id: zod_1.z.string().uuid(),
         userId: zod_1.z
             .string()
             .uuid()
             .nullable()
             .optional()
-            .describe('Agent User ID (used for CASL condition evaluation)'),
-        client: zod_1.z
-            .object({
-            id: zod_1.z.string().uuid(),
-            name: zod_1.z.string(),
-        })
+            .describe('Booking owner (SA) — for CASL condition evaluation'),
+        startDate: zod_1.z
+            .union([zod_1.z.string(), zod_1.z.date()])
+            .transform((val) => (val instanceof Date ? val.toISOString() : val)),
+        endDate: zod_1.z
+            .union([zod_1.z.string(), zod_1.z.date(), zod_1.z.null()])
+            .transform((val) => (val instanceof Date ? val.toISOString() : val))
             .nullable(),
-        company: zod_1.z
-            .object({
+        expectedEndDate: zod_1.z
+            .union([zod_1.z.string(), zod_1.z.date(), zod_1.z.null()])
+            .transform((val) => (val instanceof Date ? val.toISOString() : val))
+            .nullable()
+            .optional(),
+        worker: zod_1.z.object({
             id: zod_1.z.string().uuid(),
-            name: zod_1.z.string(),
-        })
-            .nullable(),
-        user: zod_1.z
-            .object({
+            firstName: zod_1.z.string(),
+            lastName: zod_1.z.string().nullable(),
+        }),
+        user: zod_1.z.object({
             id: zod_1.z.string().uuid(),
             firstName: zod_1.z.string(),
             lastName: zod_1.z.string().nullable(),
-        })
-            .nullable(),
-    })
-        .nullable(),
-    createdAt: zod_1.z
-        .union([zod_1.z.string(), zod_1.z.date()])
-        .transform((val) => (val instanceof Date ? val.toISOString() : val)),
+        }),
+        job: zod_1.z.object({
+            id: zod_1.z.string().uuid(),
+            tradeId: zod_1.z.string().uuid(),
+            createdById: zod_1.z
+                .string()
+                .uuid()
+                .nullable()
+                .optional()
+                .describe('Creator User ID (for CASL condition evaluation)'),
+            createdBy: zod_1.z
+                .object({
+                id: zod_1.z.string().uuid(),
+                firstName: zod_1.z.string(),
+                lastName: zod_1.z.string().nullable(),
+            })
+                .nullable()
+                .optional()
+                .describe('Creator user — fallback agent when collaboration is null'),
+            createdAt: zod_1.z
+                .union([zod_1.z.string(), zod_1.z.date()])
+                .transform((val) => (val instanceof Date ? val.toISOString() : val)),
+            location: zod_1.z.object({ postcode: zod_1.z.string().nullable() }).nullable(),
+            collaboration: zod_1.z
+                .object({
+                id: zod_1.z.string().uuid().nullable(),
+                userId: zod_1.z
+                    .string()
+                    .uuid()
+                    .nullable()
+                    .optional()
+                    .describe('FA agent User ID (for CASL condition evaluation)'),
+                client: zod_1.z
+                    .object({ id: zod_1.z.string().uuid(), name: zod_1.z.string() })
+                    .nullable()
+                    .optional(),
+                company: zod_1.z
+                    .object({ id: zod_1.z.string().uuid(), name: zod_1.z.string() })
+                    .nullable()
+                    .optional(),
+                user: zod_1.z
+                    .object({
+                    id: zod_1.z.string().uuid(),
+                    firstName: zod_1.z.string(),
+                    lastName: zod_1.z.string().nullable(),
+                })
+                    .nullable()
+                    .optional(),
+            })
+                .nullable()
+                .optional(),
+        }),
+    }),
 })
-    .openapi({ title: 'JobGroupHeader' });
-/** A single job group with its actives and status breakdown */
-exports.JobActiveGroupSchema = zod_1.z
+    .openapi({ title: 'FlatActiveByDay' });
+/** Response for the by-day endpoint — uses `data` key for interceptor compatibility */
+exports.FlatActivesByDayResponseSchema = zod_1.z
     .object({
-    job: exports.JobGroupHeaderSchema,
-    actives: zod_1.z.array(exports.ActiveInJobGroupSchema),
-    statusBreakdown: zod_1.z
-        .record(exports.ActiveStatusSchema, zod_1.z.number())
-        .describe('Count per status'),
+    data: zod_1.z.array(exports.FlatActiveByDaySchema),
+    total: zod_1.z.number(),
 })
-    .openapi({ title: 'JobActiveGroup' });
-exports.CollaborationActiveGroupSchema = zod_1.z
+    .openapi({ title: 'FlatActivesByDayResponse' });
+exports.ActiveMapMarkerSchema = zod_1.z
     .object({
-    collaboration: bookings_contract_1.CollaborationGroupHeaderSchema.describe('Collaboration header'),
-    jobs: zod_1.z
-        .array(exports.JobActiveGroupSchema)
-        .describe('Jobs within this collaboration'),
-    totalActives: zod_1.z
+    jobId: zod_1.z.string().uuid().describe('Job ID'),
+    tradeId: zod_1.z.string().uuid().describe('Trade ID'),
+    postcode: zod_1.z.string().nullable().describe('Job postcode'),
+    latitude: zod_1.z.number().describe('Latitude coordinate'),
+    longitude: zod_1.z.number().describe('Longitude coordinate'),
+    activeCount: zod_1.z.number().int().describe('Number of active workers on this job'),
+    collaboration: zod_1.z
+        .object({
+        id: zod_1.z.string().uuid(),
+        userId: zod_1.z.string().uuid().nullable(),
+        userName: zod_1.z.string().nullable(),
+        clientName: zod_1.z.string().nullable(),
+        companyName: zod_1.z.string().nullable(),
+    })
+        .nullable()
+        .describe('Collaboration info (CASL-filtered)'),
+})
+    .openapi({ title: 'ActiveMapMarker' });
+exports.ActiveMapMarkersResponseSchema = zod_1.z
+    .object({
+    items: zod_1.z.array(exports.ActiveMapMarkerSchema),
+    totalCount: zod_1.z
+        .number()
+        .int()
+        .describe('Total active workers matching filters'),
+    excludedCount: zod_1.z
         .number()
-        .describe('Total actives in this collaboration group'),
+        .int()
+        .describe('Active workers excluded due to missing job coordinates'),
 })
-    .openapi({ title: 'CollaborationActiveGroup' });
-/** Top-level response for the grouped-by-job endpoint */
-exports.ActivesByJobResponseSchema = zod_1.z
+    .openapi({ title: 'ActiveMapMarkersResponse' });
+exports.ActiveRegionCountsResponseSchema = zod_1.z
     .object({
-    collaborations: zod_1.z.array(exports.CollaborationActiveGroupSchema),
-    totalActives: zod_1.z.number(),
-    totalJobs: zod_1.z.number(),
-    totalCollaborations: zod_1.z.number(),
+    areaCounts: zod_1.z
+        .record(zod_1.z.string(), zod_1.z.number().int())
+        .describe('Active count per postcode area (e.g., "AB": 12, "N": 45)'),
+    districtCounts: zod_1.z
+        .record(zod_1.z.string(), zod_1.z.number().int())
+        .describe('Active count per postcode district (e.g., "AB10": 3, "N1": 15)'),
+    totalCount: zod_1.z
+        .number()
+        .int()
+        .describe('Total active workers matching filters'),
 })
-    .openapi({ title: 'ActivesByJobResponse' });
+    .openapi({ title: 'ActiveRegionCounts' });
 /** Filter schema for the by-job endpoint — no pagination, date is required */
 exports.FilterActiveByJobSchema = zod_1.z
     .object({
-    workerName: zod_1.z.string().optional().nullable(),
+    date: zod_1.z
+        .string()
+        .date()
+        .describe('Single date (YYYY-MM-DD) to query actives for'),
+    workerName: common_schemas_1.NameFilterSchema.optional()
+        .nullable()
+        .describe('Search worker by name (value) with optional exact match'),
+    status: ActiveStatusFilterSchema.optional().nullable(),
+    pay: common_schemas_1.PayRangeSchema.optional().nullable(),
     agentId: zod_1.z.string().uuid().optional().nullable(),
     job: bookings_contract_1.FilterJobInBookingSchema.optional().nullable(),
-    date: common_schemas_1.DateRangeSchema.refine((d) => d.from != null, {
-        message: 'date.from is required',
-        path: ['from'],
-    }).describe('Date range — typically a single day'),
-    pay: common_schemas_1.PayRangeSchema.optional().nullable(),
-    status: ActiveStatusFilterSchema.optional().nullable(),
-    sortBy: exports.ActiveSortableFieldsSchema.optional().nullable(),
-    sortOrder: common_schemas_1.SortOrderSchema.optional().nullable(),
+    jobIds: zod_1.z
+        .array(zod_1.z.string().uuid())
+        .optional()
+        .nullable()
+        .describe('Filter actives to specific job IDs'),
+    sort: (0, common_schemas_1.createSortArraySchema)(exports.ActiveSortableFieldsSchema),
 })
     .openapi({ title: 'FilterActiveByJob' });
 // Filter Active schema
 exports.FilterActiveSchema = pagination_query_schema_1.PaginationQuerySchema.extend({
-    workerName: zod_1.z
-        .string()
-        .optional()
+    date: common_schemas_1.DateRangeSchema.optional().nullable().describe('Filter by date range'),
+    workerName: common_schemas_1.NameFilterSchema.optional()
+        .nullable()
+        .describe('Search worker by name (value) with optional exact match'),
+    status: ActiveStatusFilterSchema.optional()
+        .nullable()
+        .describe('Filter by status'),
+    pay: common_schemas_1.PayRangeSchema.optional()
         .nullable()
-        .describe('Search worker by name'),
+        .describe('Filter by pay rate range'),
     agentId: zod_1.z
         .string()
         .uuid()
@@ -343,30 +593,119 @@ exports.FilterActiveSchema = pagination_query_schema_1.PaginationQuerySchema.ext
     job: bookings_contract_1.FilterJobInBookingSchema.optional()
         .nullable()
         .describe('Filter by job details'),
-    date: common_schemas_1.DateRangeSchema.optional().nullable().describe('Filter by date range'),
-    pay: common_schemas_1.PayRangeSchema.optional()
-        .nullable()
-        .describe('Filter by pay rate range'),
-    status: ActiveStatusFilterSchema.optional()
-        .nullable()
-        .describe('Filter by status'),
-    sortBy: exports.ActiveSortableFieldsSchema.optional()
-        .nullable()
-        .describe('The field to sort the results by'),
-    sortOrder: common_schemas_1.SortOrderSchema.optional()
-        .nullable()
-        .describe('The order to sort the results by'),
+    sort: (0, common_schemas_1.createSortArraySchema)(exports.ActiveSortableFieldsSchema),
 });
 exports.PaginatedActiveResponseSchema = (0, pagination_schema_1.createPaginatedResponseSchema)(exports.ActiveSchema)
     .describe('Active records retrieved successfully')
     .openapi({ title: 'ActivesPaginatedResponse' });
 // ============================================================================
+// ActiveListItemSchema — optimised schema for the findAll paginated list
+// ============================================================================
+// Worker summary with phone numbers for Actives
+const ActiveWorkerSummarySchema = summary_schemas_1.WorkerSummarySchema.extend({
+    phoneNumbers: zod_1.z.array(common_schemas_1.PhoneNumberResponseSchema).default([]),
+}).openapi({ title: 'ActiveWorkerSummary' });
+// Job summary for active context
+const ActiveJobSummarySchema = zod_1.z
+    .object({
+    id: zod_1.z.string().uuid(),
+    tradeId: zod_1.z.string().uuid(),
+    createdById: zod_1.z.string().uuid().nullable().optional(),
+    createdBy: summary_schemas_1.UserSummarySchema.nullable().optional(),
+    location: summary_schemas_1.LocationSummarySchema.nullable().optional(),
+    collaboration: summary_schemas_1.CollaborationSummarySchema.nullable().optional(),
+})
+    .openapi({ title: 'ActiveJobSummary' });
+// Booking summary for active context
+const ActiveBookingSummarySchema = zod_1.z
+    .object({
+    id: zod_1.z.string().uuid(),
+    userId: zod_1.z.string().uuid().nullable().optional(),
+    startDate: zod_1.z
+        .union([zod_1.z.string(), zod_1.z.date()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val)),
+    endDate: zod_1.z
+        .union([zod_1.z.string(), zod_1.z.date(), zod_1.z.null()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val))
+        .nullable()
+        .optional(),
+    expectedEndDate: zod_1.z
+        .union([zod_1.z.string(), zod_1.z.date(), zod_1.z.null()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val))
+        .nullable()
+        .optional(),
+    worker: ActiveWorkerSummarySchema,
+    user: summary_schemas_1.UserSummarySchema,
+    job: ActiveJobSummarySchema,
+})
+    .openapi({ title: 'ActiveBookingSummary' });
+exports.ActiveListItemSchema = zod_1.z
+    .object({
+    id: zod_1.z.string().uuid(),
+    date: zod_1.z.string().date(),
+    saUserId: zod_1.z
+        .string()
+        .uuid()
+        .nullable()
+        .optional()
+        .describe('Denormalised SA user ID — needed for frontend CASL condition evaluation'),
+    faUserId: zod_1.z
+        .string()
+        .uuid()
+        .nullable()
+        .optional()
+        .describe('Denormalised FA user ID — needed for frontend CASL condition evaluation'),
+    pay: ActivePaySchema,
+    comment: zod_1.z.string().nullable(),
+    status: exports.ActiveStatusSchema.describe('Status value.'),
+    statusUpdatedAt: zod_1.z
+        .union([zod_1.z.string().datetime(), zod_1.z.date(), zod_1.z.null()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val))
+        .nullable()
+        .describe('The timestamp when status was last updated.'),
+    // DEPRECATED (read-only): historical dual statuses; not written/edited after the single-status cutover
+    statusSa: exports.ActiveStatusSchema.nullable().describe('DEPRECATED: historical SA status.'),
+    statusSaUpdatedAt: zod_1.z
+        .union([zod_1.z.string().datetime(), zod_1.z.date(), zod_1.z.null()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val))
+        .nullable()
+        .describe('DEPRECATED: timestamp when SA status was last updated.'),
+    statusFa: exports.ActiveStatusSchema.nullable().describe('DEPRECATED: historical FA status.'),
+    statusFaUpdatedAt: zod_1.z
+        .union([zod_1.z.string().datetime(), zod_1.z.date(), zod_1.z.null()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val))
+        .nullable()
+        .describe('DEPRECATED: timestamp when FA status was last updated.'),
+    statusChangedById: zod_1.z
+        .string()
+        .uuid()
+        .nullable()
+        .describe('ID of the user who last changed the status.'),
+    hoursWorked: zod_1.z.coerce.number().nullable(),
+    hoursWorkedUpdatedAt: zod_1.z
+        .union([zod_1.z.string().datetime(), zod_1.z.date(), zod_1.z.null()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val))
+        .nullable(),
+    booking: ActiveBookingSummarySchema,
+    createdAt: zod_1.z
+        .union([zod_1.z.string().datetime(), zod_1.z.date()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val)),
+    updatedAt: zod_1.z
+        .union([zod_1.z.string().datetime(), zod_1.z.date()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val)),
+})
+    .openapi({ title: 'ActiveListItem' });
+exports.PaginatedActiveListResponseSchema = (0, pagination_schema_1.createPaginatedResponseSchema)(exports.ActiveListItemSchema);
+// ============================================================================
 // Timesheet schemas
 // ============================================================================
 /** A single day entry in the timesheet */
 exports.TimesheetDayEntrySchema = zod_1.z
     .object({
     activeId: zod_1.z.string().uuid(),
+    saUserId: zod_1.z.string().uuid().nullable(),
+    faUserId: zod_1.z.string().uuid().nullable(),
+    status: exports.ActiveStatusSchema,
     hoursWorked: zod_1.z.coerce.number().nullable(),
     payRate: zod_1.z.coerce.number().min(0),
     payUnit: common_schemas_1.RateUnitSchema,
@@ -378,13 +717,13 @@ exports.TimesheetWorkerRowSchema = zod_1.z
     .object({
     workerId: zod_1.z.string().uuid(),
     workerName: zod_1.z.string(),
-    bookingId: zod_1.z.string().uuid(),
     jobId: zod_1.z.string().uuid(),
     tradeId: zod_1.z.string().uuid(),
     postcode: zod_1.z.string().nullable(),
     secondAgentName: zod_1.z.string().nullable(),
     days: zod_1.z.record(zod_1.z.string(), exports.TimesheetDayEntrySchema.nullable()),
     totalHours: zod_1.z.coerce.number().nullable(),
+    daysWorked: zod_1.z.coerce.number(),
 })
     .openapi({ title: 'TimesheetWorkerRow' });
 /** Collaboration header for timesheet grouping */
@@ -424,7 +763,9 @@ exports.FilterTimesheetSchema = zod_1.z
         .date()
         .optional()
         .describe('Monday of the week (YYYY-MM-DD)'),
-    workerName: zod_1.z.string().optional().nullable(),
+    workerName: common_schemas_1.NameFilterSchema.optional()
+        .nullable()
+        .describe('Search worker by name (value) with optional exact match'),
     agentId: zod_1.z.string().uuid().optional().nullable(),
     job: bookings_contract_1.FilterJobInBookingSchema.optional().nullable(),
 })
@@ -454,7 +795,7 @@ exports.activesContractRouter = c.router({
         method: 'GET',
         path: '/v2/actives',
         responses: {
-            200: exports.PaginatedActiveResponseSchema,
+            200: exports.PaginatedActiveListResponseSchema,
         },
         query: exports.FilterActiveSchema,
         summary: 'Get all active records',
@@ -467,7 +808,7 @@ exports.activesContractRouter = c.router({
         method: 'GET',
         path: '/v2/actives/by-job',
         responses: {
-            200: exports.ActivesByJobResponseSchema,
+            200: exports.FlatActivesByDayResponseSchema,
         },
         query: exports.FilterActiveByJobSchema,
         summary: 'Get all actives for a date range, grouped by job',
@@ -476,6 +817,32 @@ exports.activesContractRouter = c.router({
             openApi: { operationId: 'findAllActivesByJob' },
         },
     },
+    findMapMarkers: {
+        method: 'GET',
+        path: '/v2/actives/map-markers',
+        responses: {
+            200: exports.ActiveMapMarkersResponseSchema,
+        },
+        query: exports.FilterActiveByJobSchema,
+        summary: 'Get lightweight active data for map markers, grouped by job',
+        metadata: {
+            tags: ['Actives'],
+            openApi: { operationId: 'findActiveMapMarkers' },
+        },
+    },
+    findRegionCounts: {
+        method: 'GET',
+        path: '/v2/actives/map-region-counts',
+        responses: {
+            200: exports.ActiveRegionCountsResponseSchema,
+        },
+        query: exports.FilterActiveByJobSchema,
+        summary: 'Get active worker counts grouped by postcode area and district',
+        metadata: {
+            tags: ['Actives'],
+            openApi: { operationId: 'findActiveRegionCounts' },
+        },
+    },
     findTimesheet: {
         method: 'GET',
         path: '/v2/actives/timesheet',
@@ -570,6 +937,42 @@ exports.activesContractRouter = c.router({
             openApi: { operationId: 'batchDeleteActives' },
         },
     },
+    statusHistory: {
+        method: 'GET',
+        path: '/v2/actives/:id/status-history',
+        responses: {
+            200: zod_1.z.array(exports.ActiveStatusChangeSchema),
+            404: error_schemas_1.ErrorResponseSchema,
+        },
+        pathParams: zod_1.z.object({
+            id: zod_1.z.string().uuid().describe('Active Record ID'),
+        }),
+        summary: 'Get the status change history for an active record',
+        metadata: {
+            tags: ['Actives'],
+            openApi: { operationId: 'getActiveStatusHistory' },
+        },
+    },
+    bookingSchedule: {
+        method: 'GET',
+        path: '/v2/actives/:id/booking-schedule',
+        responses: {
+            200: zod_1.z.array(exports.BookingScheduleEntrySchema),
+            404: error_schemas_1.ErrorResponseSchema,
+        },
+        pathParams: zod_1.z.object({
+            id: zod_1.z.string().uuid().describe('Active Record ID (anchor of the window).'),
+        }),
+        query: zod_1.z.object({
+            windowBefore: zod_1.z.coerce.number().int().min(1).max(90).optional().describe('Days before the anchor date to include (default 14, capped to booking.startDate).'),
+            windowAfter: zod_1.z.coerce.number().int().min(1).max(90).optional().describe('Days after the anchor date to include (default 14, capped to booking.endDate).'),
+        }),
+        summary: "Get the booking's per-day schedule context around an active (default 14 days before + 14 days after, clipped to booking range).",
+        metadata: {
+            tags: ['Actives'],
+            openApi: { operationId: 'getActiveBookingSchedule' },
+        },
+    },
 }, {
     commonResponses: {
         400: error_schemas_1.ErrorResponseSchema,