dabke 0.83.0 → 0.84.0

package/dist/cpsat/rules/min-hours-week.d.ts

@@ -1,29 +1,26 @@
 import * as z from "zod";
-import type { CompilationRule } from "../model-builder.js";
-declare const MinHoursWeekSchema: z.ZodIntersection<z.ZodObject<{
+export declare const MinHoursWeekSchema: z.ZodIntersection<z.ZodObject<{
     hours: z.ZodNumber;
-    priority: z.ZodDefault<z.ZodUnion<readonly [z.ZodLiteral<"LOW">, z.ZodLiteral<"MEDIUM">, z.ZodLiteral<"HIGH">, z.ZodLiteral<"MANDATORY">]>>;
+    priority: z.ZodDefault<z.ZodEnum<{
+        LOW: "LOW";
+        MEDIUM: "MEDIUM";
+        HIGH: "HIGH";
+        MANDATORY: "MANDATORY";
+    }>>;
     weekStartsOn: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"monday">, z.ZodLiteral<"tuesday">, z.ZodLiteral<"wednesday">, z.ZodLiteral<"thursday">, z.ZodLiteral<"friday">, z.ZodLiteral<"saturday">, z.ZodLiteral<"sunday">]>>;
 }, z.core.$strip>, z.ZodType<import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">, unknown, z.core.$ZodTypeInternals<import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">, unknown>>>;
 /**
- * Configuration for {@link createMinHoursWeekRule}.
- *
- * - `hours` (required): minimum hours required per scheduling week
- * - `priority` (required): how strictly the solver enforces this rule
- * - `weekStartsOn` (optional): which day starts the week; defaults to {@link ModelBuilder.weekStartsOn}
- *
- * Entity scoping (at most one): `memberIds`, `roleIds`, `skillIds`
+ * Configuration for {@link minHoursWeekRuleDescriptor}.
  */
 export type MinHoursWeekConfig = z.infer<typeof MinHoursWeekSchema>;
 /**
- * Enforces a minimum total number of hours per scheduling week.
+ * Low-level descriptor for the `min-hours-week` rule.
  *
- * @param config - See {@link MinHoursWeekConfig}
- * @example
- * ```ts
- * createMinHoursWeekRule({ hours: 30, priority: "HIGH" });
- * ```
+ * @category Rules
  */
-export declare function createMinHoursWeekRule(config: MinHoursWeekConfig): CompilationRule;
-export {};
+export declare const minHoursWeekRuleDescriptor: import("../rule-descriptor.js").RuleDescriptor<"min-hours-week", {
+    hours: number;
+    priority: "LOW" | "MEDIUM" | "HIGH" | "MANDATORY";
+    weekStartsOn?: "monday" | "tuesday" | "wednesday" | "thursday" | "friday" | "saturday" | "sunday" | undefined;
+} & import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">>;
 //# sourceMappingURL=min-hours-week.d.ts.map

package/dist/cpsat/rules/min-hours-week.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"min-hours-week.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/min-hours-week.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAEzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAiB3D,QAAA,MAAM,kBAAkB;;;;iOAAoE,CAAC;AAE7F;;;;;;;;GAQG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEpE;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,kBAAkB,GAAG,eAAe,CAqDlF"}
+{"version":3,"file":"min-hours-week.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/min-hours-week.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAsBzB,eAAO,MAAM,kBAAkB;;;;;;;;;iOAAoE,CAAC;AAEpG;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEpE;;;;GAIG;AACH,eAAO,MAAM,0BAA0B;;;;+EAqFrC,CAAC"}

package/dist/cpsat/rules/min-hours-week.js

@@ -1,73 +1,91 @@
 import * as z from "zod";
 import { DayOfWeekSchema } from "../../types.js";
+import { defineRuleDescriptor } from "../rule-descriptor.js";
 import { priorityToPenalty, splitIntoWeeks } from "../utils.js";
 import { PrioritySchema, entityScope, parseEntityScope, resolveMembersFromScope, ruleGroup, } from "./scope.types.js";
+import { assignmentTermsForDays } from "./assignment-terms.js";
+import { maxAssignableMinutesForDay, patternDurationMinutes } from "./pattern-time.js";
+import { hardConstraint, reportValidation, softConstraint } from "./artifacts.js";
 const MinHoursWeekBase = z.object({
     hours: z.number().min(0),
     priority: PrioritySchema,
     weekStartsOn: DayOfWeekSchema.optional(),
 });
-const MinHoursWeekSchema = MinHoursWeekBase.and(entityScope(["members", "roles", "skills"]));
+export const MinHoursWeekSchema = MinHoursWeekBase.and(entityScope(["members", "roles", "skills"]));
 /**
- * Enforces a minimum total number of hours per scheduling week.
+ * Low-level descriptor for the `min-hours-week` rule.
  *
- * @param config - See {@link MinHoursWeekConfig}
- * @example
- * ```ts
- * createMinHoursWeekRule({ hours: 30, priority: "HIGH" });
- * ```
+ * @category Rules
  */
-export function createMinHoursWeekRule(config) {
-    const parsed = MinHoursWeekSchema.parse(config);
-    const scope = parseEntityScope(parsed);
-    const { hours, priority, weekStartsOn } = parsed;
-    const minMinutes = hours * 60;
-    const group = ruleGroup(`min-hours-week:${hours}`, `Min ${hours}h per week`, scope);
-    return {
-        compile(b) {
-            if (hours <= 0)
-                return;
-            const members = resolveMembersFromScope(scope, b.members);
-            const weeks = splitIntoWeeks(b.days, weekStartsOn ?? b.weekStartsOn);
-            for (const emp of members) {
-                for (const weekDays of weeks) {
-                    const terms = [];
-                    for (const day of weekDays) {
-                        for (const pattern of b.shiftPatterns) {
-                            if (!b.canAssign(emp, pattern))
-                                continue;
-                            if (!b.patternAvailableOnDay(pattern, day))
-                                continue;
-                            terms.push({
-                                var: b.assignment(emp.id, pattern.id, day),
-                                coeff: b.patternDuration(pattern.id),
+export const minHoursWeekRuleDescriptor = defineRuleDescriptor({
+    name: "min-hours-week",
+    schema: MinHoursWeekSchema,
+    compile(config, ctx) {
+        const scope = parseEntityScope(config);
+        const { hours, priority, weekStartsOn } = config;
+        const minMinutes = hours * 60;
+        const group = ruleGroup(`min-hours-week:${hours}`, `Min ${hours}h per week`, scope);
+        const members = resolveMembersFromScope(scope, [...ctx.members]);
+        const weeks = splitIntoWeeks([...ctx.days], weekStartsOn ?? ctx.weekStartsOn);
+        const artifacts = [];
+        for (const member of members) {
+            for (const weekDays of weeks) {
+                const weekStart = weekDays[0];
+                if (!weekStart)
+                    continue;
+                const terms = assignmentTermsForDays(member, weekDays, ctx.shiftPatterns, patternDurationMinutes);
+                if (terms.length === 0)
+                    continue;
+                const description = `${member.id} min ${hours}h in week starting ${weekStart.iso}`;
+                const context = { memberIds: [member.id], days: weekDays.map((day) => day.iso) };
+                const constraintId = `min-hours-week:${member.id}:${weekStart.iso}`;
+                if (priority === "MANDATORY") {
+                    artifacts.push(hardConstraint({
+                        group,
+                        description,
+                        context,
+                        validation: reportValidation(constraintId),
+                        terms,
+                        comparator: ">=",
+                        targetValue: minMinutes,
+                    }), {
+                        kind: "pre-solve-feedback",
+                        run(preSolveContext, reporter) {
+                            const maxMinutes = weekDays.reduce((total, day) => total + maxAssignableMinutesForDay(member, day, preSolveContext.shiftPatterns), 0);
+                            if (maxMinutes >= minMinutes)
+                                return;
+                            reporter.reportRuleError({
+                                rule: "min-hours-week",
+                                message: `${member.id} cannot reach ${hours}h in week starting ${weekStart.iso}; maximum possible is ${Math.round((maxMinutes / 60) * 10) / 10}h.`,
+                                context,
+                                suggestions: [
+                                    `Reduce the weekly minimum for ${member.id}`,
+                                    `Add longer or additional shifts in the week starting ${weekStart.iso}`,
+                                ],
+                                group,
                             });
-                        }
-                    }
-                    if (terms.length === 0)
-                        continue;
-                    const weekLabel = weekDays[0];
-                    const constraintId = `min-hours-week:${emp.id}:${weekLabel}`;
-                    if (priority === "MANDATORY") {
-                        b.addLinear(terms, ">=", minMinutes);
-                    }
-                    else {
-                        b.addSoftLinear(terms, ">=", minMinutes, priorityToPenalty(priority), constraintId);
-                        b.reporter.trackConstraint({
-                            id: constraintId,
-                            type: "rule",
-                            rule: "min-hours-week",
-                            description: `${emp.id} min ${hours}h in week starting ${weekLabel}`,
-                            targetValue: minMinutes,
-                            comparator: ">=",
-                            day: weekLabel,
-                            context: { memberIds: [emp.id], days: weekDays },
-                            group,
-                        });
-                    }
+                        },
+                    });
+                }
+                else {
+                    artifacts.push(softConstraint({
+                        group,
+                        description,
+                        context,
+                        validation: reportValidation(),
+                        terms,
+                        comparator: ">=",
+                        targetValue: minMinutes,
+                        penalty: priorityToPenalty(priority),
+                        constraintId,
+                    }));
                 }
             }
-        },
-    };
-}
+        }
+        return {
+            rule: "min-hours-week",
+            artifacts,
+        };
+    },
+});
 //# sourceMappingURL=min-hours-week.js.map

package/dist/cpsat/rules/min-hours-week.js.map

@@ -1 +1 @@
-{"version":3,"file":"min-hours-week.js","sourceRoot":"","sources":["../../../src/cpsat/rules/min-hours-week.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"min-hours-week.js","sourceRoot":"","sources":["../../../src/cpsat/rules/min-hours-week.ts"],"names":[],"mappings":"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"}

package/dist/cpsat/rules/min-rest-between-shifts.d.ts

@@ -1,27 +1,24 @@
 import * as z from "zod";
-import type { CompilationRule } from "../model-builder.js";
-declare const MinRestBetweenShiftsSchema: z.ZodIntersection<z.ZodObject<{
+export declare const MinRestBetweenShiftsSchema: z.ZodIntersection<z.ZodObject<{
     hours: z.ZodNumber;
-    priority: z.ZodDefault<z.ZodUnion<readonly [z.ZodLiteral<"LOW">, z.ZodLiteral<"MEDIUM">, z.ZodLiteral<"HIGH">, z.ZodLiteral<"MANDATORY">]>>;
+    priority: z.ZodDefault<z.ZodEnum<{
+        LOW: "LOW";
+        MEDIUM: "MEDIUM";
+        HIGH: "HIGH";
+        MANDATORY: "MANDATORY";
+    }>>;
 }, z.core.$strip>, z.ZodType<import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">, unknown, z.core.$ZodTypeInternals<import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">, unknown>>>;
 /**
- * Configuration for {@link createMinRestBetweenShiftsRule}.
- *
- * - `hours` (required): minimum rest hours required between consecutive shifts
- * - `priority` (required): how strictly the solver enforces this rule
- *
- * Entity scoping (at most one): `memberIds`, `roleIds`, `skillIds`
+ * Configuration for {@link minRestBetweenShiftsRuleDescriptor}.
  */
 export type MinRestBetweenShiftsConfig = z.infer<typeof MinRestBetweenShiftsSchema>;
 /**
- * Enforces a minimum rest period between any two shifts a person works.
+ * Low-level descriptor for the `min-rest-between-shifts` rule.
  *
- * @param config - See {@link MinRestBetweenShiftsConfig}
- * @example
- * ```ts
- * createMinRestBetweenShiftsRule({ hours: 10, priority: "MANDATORY" });
- * ```
+ * @category Rules
  */
-export declare function createMinRestBetweenShiftsRule(config: MinRestBetweenShiftsConfig): CompilationRule;
-export {};
+export declare const minRestBetweenShiftsRuleDescriptor: import("../rule-descriptor.js").RuleDescriptor<"min-rest-between-shifts", {
+    hours: number;
+    priority: "LOW" | "MEDIUM" | "HIGH" | "MANDATORY";
+} & import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">>;
 //# sourceMappingURL=min-rest-between-shifts.d.ts.map

package/dist/cpsat/rules/min-rest-between-shifts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"min-rest-between-shifts.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/min-rest-between-shifts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,KAAK,EAAE,eAAe,EAAyB,MAAM,qBAAqB,CAAC;AAYlF,QAAA,MAAM,0BAA0B;;;iOAKmB,CAAC;AAEpD;;;;;;;GAOG;AACH,MAAM,MAAM,0BAA0B,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAEpF;;;;;;;;GAQG;AACH,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,0BAA0B,GACjC,eAAe,CAsKjB"}
+{"version":3,"file":"min-rest-between-shifts.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/min-rest-between-shifts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAkBzB,eAAO,MAAM,0BAA0B;;;;;;;;iOAKY,CAAC;AAEpD;;GAEG;AACH,MAAM,MAAM,0BAA0B,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAEpF;;;;GAIG;AACH,eAAO,MAAM,kCAAkC;;;+EAuK7C,CAAC"}

package/dist/cpsat/rules/min-rest-between-shifts.js

@@ -1,159 +1,169 @@
 import * as z from "zod";
+import { schedulingDay } from "../../types.js";
+import { defineRuleDescriptor } from "../rule-descriptor.js";
 import { normalizeEndMinutes, priorityToPenalty, timeOfDayToMinutes } from "../utils.js";
 import { PrioritySchema, entityScope, parseEntityScope, resolveMembersFromScope, ruleGroup, } from "./scope.types.js";
-const MinRestBetweenShiftsSchema = z
+import { assignmentVar } from "./variables.js";
+import { hardConstraint, reportValidation, softConstraint } from "./artifacts.js";
+import { canAssignMemberToPattern, isPatternAvailableOnDay } from "./pattern-eligibility.js";
+export const MinRestBetweenShiftsSchema = z
     .object({
     hours: z.number().min(0),
     priority: PrioritySchema,
 })
     .and(entityScope(["members", "roles", "skills"]));
 /**
- * Enforces a minimum rest period between any two shifts a person works.
+ * Low-level descriptor for the `min-rest-between-shifts` rule.
  *
- * @param config - See {@link MinRestBetweenShiftsConfig}
- * @example
- * ```ts
- * createMinRestBetweenShiftsRule({ hours: 10, priority: "MANDATORY" });
- * ```
+ * @category Rules
  */
-export function createMinRestBetweenShiftsRule(config) {
-    const parsed = MinRestBetweenShiftsSchema.parse(config);
-    const scope = parseEntityScope(parsed);
-    const { hours, priority } = parsed;
-    const minMinutes = hours * 60;
-    const group = ruleGroup(`min-rest-between-shifts:${hours}`, `Min ${hours}h rest between shifts`, scope);
-    return {
-        compile(b) {
-            const members = resolveMembersFromScope(scope, b.members);
-            for (const emp of members) {
-                for (let i = 0; i < b.days.length; i++) {
-                    const day1 = b.days[i];
-                    if (!day1)
+export const minRestBetweenShiftsRuleDescriptor = defineRuleDescriptor({
+    name: "min-rest-between-shifts",
+    schema: MinRestBetweenShiftsSchema,
+    compile(config, ctx) {
+        const scope = parseEntityScope(config);
+        const { hours, priority } = config;
+        const minMinutes = hours * 60;
+        const group = ruleGroup(`min-rest-between-shifts:${hours}`, `Min ${hours}h rest between shifts`, scope);
+        const members = resolveMembersFromScope(scope, [...ctx.members]);
+        const artifacts = members.flatMap((member) => {
+            const memberArtifacts = [];
+            for (let dayIndex = 0; dayIndex < ctx.days.length; dayIndex++) {
+                const day1 = ctx.days[dayIndex];
+                if (!day1)
+                    continue;
+                const checkDays = [day1];
+                const nextDay = ctx.days[dayIndex + 1];
+                if (nextDay)
+                    checkDays.push(nextDay);
+                for (const pattern1 of ctx.shiftPatterns) {
+                    if (!canAssignMemberToPattern(member, pattern1) ||
+                        !isPatternAvailableOnDay(pattern1, day1)) {
                         continue;
-                    const checkDays = [day1];
-                    const nextDay = b.days[i + 1];
-                    if (nextDay)
-                        checkDays.push(nextDay);
-                    for (const pattern1 of b.shiftPatterns) {
-                        if (!b.canAssign(emp, pattern1))
-                            continue;
-                        if (!b.patternAvailableOnDay(pattern1, day1))
-                            continue;
-                        const end1 = b.endMinutes(pattern1, day1);
-                        for (const day2 of checkDays) {
-                            if (!day2)
+                    }
+                    const end1 = patternEndMinutes(pattern1);
+                    for (const day2 of checkDays) {
+                        for (const pattern2 of ctx.shiftPatterns) {
+                            if (!canAssignMemberToPattern(member, pattern2) ||
+                                !isPatternAvailableOnDay(pattern2, day2) ||
+                                (day1.iso === day2.iso && pattern1.id === pattern2.id)) {
                                 continue;
-                            for (const pattern2 of b.shiftPatterns) {
-                                if (!b.canAssign(emp, pattern2))
-                                    continue;
-                                if (!b.patternAvailableOnDay(pattern2, day2))
-                                    continue;
-                                if (day1 === day2 && pattern1.id === pattern2.id)
-                                    continue;
-                                const start2 = b.startMinutes(pattern2, day2);
-                                const gap = start2 - end1;
-                                if (gap >= 0 && gap < minMinutes) {
-                                    const var1 = b.assignment(emp.id, pattern1.id, day1);
-                                    const var2 = b.assignment(emp.id, pattern2.id, day2);
-                                    if (priority === "MANDATORY") {
-                                        b.addLinear([
-                                            { var: var1, coeff: 1 },
-                                            { var: var2, coeff: 1 },
-                                        ], "<=", 1);
-                                    }
-                                    else {
-                                        const conflictVar = b.boolVar(`rest_conflict_${emp.id}_${pattern1.id}_${day1}_${pattern2.id}_${day2}`);
-                                        b.addLinear([
-                                            { var: var1, coeff: 1 },
-                                            { var: var2, coeff: 1 },
-                                            { var: conflictVar, coeff: -1 },
-                                        ], "<=", 1);
-                                        b.addLinear([
-                                            { var: conflictVar, coeff: 1 },
-                                            { var: var1, coeff: -1 },
-                                        ], "<=", 0);
-                                        b.addLinear([
-                                            { var: conflictVar, coeff: 1 },
-                                            { var: var2, coeff: -1 },
-                                        ], "<=", 0);
-                                        b.addPenalty(conflictVar, priorityToPenalty(priority));
-                                    }
-                                }
+                            }
+                            const start2 = dayGapMinutes(day1, day2) + timeOfDayToMinutes(pattern2.startTime);
+                            const gap = start2 - end1;
+                            if (gap < 0 || gap >= minMinutes)
+                                continue;
+                            const description = `${member.id} needs ${hours}h rest between ${pattern1.id} on ${day1.iso} and ${pattern2.id} on ${day2.iso}`;
+                            const context = { memberIds: [member.id], days: [day1.iso, day2.iso] };
+                            const constraintId = `min-rest-between-shifts:${member.id}:${pattern1.id}:${day1.iso}:${pattern2.id}:${day2.iso}`;
+                            const terms = [
+                                { var: assignmentVar(member.id, pattern1.id, day1.iso), coeff: 1 },
+                                { var: assignmentVar(member.id, pattern2.id, day2.iso), coeff: 1 },
+                            ];
+                            if (priority === "MANDATORY") {
+                                memberArtifacts.push(hardConstraint({
+                                    group,
+                                    description,
+                                    context,
+                                    validation: reportValidation(constraintId),
+                                    terms,
+                                    comparator: "<=",
+                                    targetValue: 1,
+                                }));
+                            }
+                            else {
+                                memberArtifacts.push(softConstraint({
+                                    group,
+                                    description,
+                                    context,
+                                    validation: reportValidation(),
+                                    terms,
+                                    comparator: "<=",
+                                    targetValue: 1,
+                                    penalty: priorityToPenalty(priority),
+                                    constraintId,
+                                }));
                             }
                         }
                     }
                 }
             }
-        },
-        validate(assignments, reporter, context) {
-            if (priority === "MANDATORY")
-                return;
-            const members = resolveMembersFromScope(scope, context.members);
-            if (members.length === 0)
-                return;
-            const memberIds = new Set(members.map((m) => m.id));
-            // Group assignments by member, sort by day then start time
-            const byMember = new Map();
-            for (const a of assignments) {
-                if (!memberIds.has(a.memberId))
-                    continue;
-                const list = byMember.get(a.memberId) ?? [];
-                list.push(a);
-                byMember.set(a.memberId, list);
-            }
-            for (const [memberId, memberAssignments] of byMember) {
-                const sorted = memberAssignments.toSorted((a, b) => {
-                    if (a.day !== b.day)
-                        return a.day < b.day ? -1 : 1;
-                    return timeOfDayToMinutes(a.startTime) - timeOfDayToMinutes(b.startTime);
-                });
-                let violated = false;
-                for (let i = 0; i < sorted.length - 1; i++) {
-                    const current = sorted[i];
-                    const next = sorted[i + 1];
-                    const currentEndMin = timeOfDayToMinutes(current.endTime);
-                    const normalizedEnd = normalizeEndMinutes(timeOfDayToMinutes(current.startTime), currentEndMin);
-                    const nextStartMin = timeOfDayToMinutes(next.startTime);
-                    // Calculate gap considering day boundaries
-                    let gap;
-                    if (current.day === next.day) {
-                        gap = nextStartMin - normalizedEnd;
-                    }
-                    else {
-                        // Different days: account for the day boundary
-                        const dayDiff = daysBetween(current.day, next.day);
-                        gap = dayDiff * 24 * 60 - normalizedEnd + nextStartMin;
-                    }
-                    if (gap >= 0 && gap < minMinutes) {
-                        reporter.reportRuleViolation({
-                            rule: "min-rest-between-shifts",
-                            message: `${memberId} has ${Math.round((gap / 60) * 10) / 10}h rest between shifts on ${current.day} and ${next.day}, need ${hours}h`,
-                            context: { memberIds: [memberId], days: [current.day, next.day] },
-                            shortfall: minMinutes - gap,
-                            group,
-                        });
-                        violated = true;
-                    }
-                }
-                if (!violated && sorted.length > 1) {
-                    reporter.reportRulePassed({
-                        rule: "min-rest-between-shifts",
-                        message: `${memberId} has ${hours}h+ rest between all shifts`,
-                        context: {
-                            memberIds: [memberId],
-                            days: [...new Set(sorted.map((a) => a.day))],
-                        },
-                        group,
-                    });
-                }
-            }
-        },
-    };
+            return memberArtifacts;
+        });
+        const validatorArtifacts = priority === "MANDATORY"
+            ? []
+            : [
+                {
+                    kind: "post-solve-feedback",
+                    run(assignments, reporter, validationContext) {
+                        const validatorMembers = resolveMembersFromScope(scope, [
+                            ...validationContext.members,
+                        ]);
+                        if (validatorMembers.length === 0)
+                            return;
+                        const dayLookup = new Map(validationContext.days.map((day) => [day.iso, day]));
+                        const memberIds = new Set(validatorMembers.map((member) => member.id));
+                        const byMember = new Map();
+                        for (const assignment of assignments) {
+                            if (!memberIds.has(assignment.memberId))
+                                continue;
+                            const list = byMember.get(assignment.memberId) ?? [];
+                            list.push(assignment);
+                            byMember.set(assignment.memberId, list);
+                        }
+                        for (const [memberId, memberAssignments] of byMember) {
+                            const sorted = [...memberAssignments].toSorted((left, right) => {
+                                if (left.day !== right.day)
+                                    return left.day < right.day ? -1 : 1;
+                                return timeOfDayToMinutes(left.startTime) - timeOfDayToMinutes(right.startTime);
+                            });
+                            let violated = false;
+                            for (let index = 0; index < sorted.length - 1; index++) {
+                                const current = sorted[index];
+                                const next = sorted[index + 1];
+                                const currentEnd = normalizeEndMinutes(timeOfDayToMinutes(current.startTime), timeOfDayToMinutes(current.endTime));
+                                const nextStart = timeOfDayToMinutes(next.startTime);
+                                const gap = current.day === next.day
+                                    ? nextStart - currentEnd
+                                    : daysBetween(current.day, next.day, dayLookup) * 24 * 60 -
+                                        currentEnd +
+                                        nextStart;
+                                if (gap < 0 || gap >= minMinutes)
+                                    continue;
+                                violated = true;
+                            }
+                            if (!violated && sorted.length > 1) {
+                                reporter.reportRulePassed({
+                                    rule: "min-rest-between-shifts",
+                                    message: `${memberId} has ${hours}h+ rest between all shifts`,
+                                    context: {
+                                        memberIds: [memberId],
+                                        days: [...new Set(sorted.map((assignment) => assignment.day))],
+                                    },
+                                    group,
+                                });
+                            }
+                        }
+                    },
+                },
+            ];
+        return {
+            rule: "min-rest-between-shifts",
+            artifacts: [...artifacts, ...validatorArtifacts],
+        };
+    },
+});
+function patternEndMinutes(pattern) {
+    return normalizeEndMinutes(timeOfDayToMinutes(pattern.startTime), timeOfDayToMinutes(pattern.endTime));
+}
+function dayGapMinutes(day1, day2) {
+    return (day2.epochDay - day1.epochDay) * 24 * 60;
 }
-/** Compute day difference from YYYY-MM-DD strings. */
-function daysBetween(day1, day2) {
-    const d1 = new Date(`${day1}T00:00:00Z`);
-    const d2 = new Date(`${day2}T00:00:00Z`);
-    return Math.round((d2.getTime() - d1.getTime()) / (24 * 60 * 60 * 1000));
+function daysBetween(day1, day2, lookup) {
+    const left = lookup.get(day1);
+    const right = lookup.get(day2);
+    if (left && right)
+        return right.epochDay - left.epochDay;
+    return schedulingDay(day2).epochDay - schedulingDay(day1).epochDay;
 }
 //# sourceMappingURL=min-rest-between-shifts.js.map