openmausbot 0.1.68 → 0.1.69

package/dist-server/server/routine-requests.js

@@ -28,6 +28,10 @@ const ACTION_COPY = {
 };
 const ROUTINE_REQUEST_FINGERPRINT_VERSION = 1;
 const jsonObjectSchema = z.record(z.string(), z.custom());
+const toolIntervalWindowSchema = z.object({
+    start: z.string().max(5),
+    end: z.string().max(5),
+}).strict();
 const routineToolScheduleSchema = z.discriminatedUnion("type", [
     z.object({ type: z.literal("once"), at: z.string().max(64) }).strict(),
     z.object({
@@ -39,6 +43,9 @@ const routineToolScheduleSchema = z.discriminatedUnion("type", [
         type: z.literal("interval"),
         everyMinutes: z.number(),
         anchorAt: z.string().max(64).optional(),
+        weekdays: z.array(z.string().max(9)).min(1).max(7).nullable().optional(),
+        window: toolIntervalWindowSchema.nullable().optional(),
+        endsAt: z.string().max(64).nullable().optional(),
     }).strict(),
 ]);
 const routineToolDefinitionSchema = z.object({
@@ -71,6 +78,10 @@ const routineProposalSchema = z.discriminatedUnion("action", [
     z.object({ action: z.literal("delete"), routineId: z.string().max(128) }).strict(),
 ]);
 const storedWeekdaysSchema = z.array(z.number().int().min(0).max(6)).min(1).max(7).refine((weekdays) => new Set(weekdays).size === weekdays.length, "Stored routine weekdays must be unique");
+const storedIntervalWindowSchema = z.object({
+    start: z.string().regex(TIME),
+    end: z.string().regex(TIME),
+}).strict().refine(({ start, end }) => start < end, "Stored interval window must end later on the same day");
 const storedScheduleSchema = z.discriminatedUnion("type", [
     z.object({ type: z.literal("once"), at: z.number().int().nonnegative() }).strict(),
     z.object({
@@ -82,8 +93,64 @@ const storedScheduleSchema = z.discriminatedUnion("type", [
         type: z.literal("interval"),
         everyMinutes: z.number().int().min(5).max(1_440),
         anchorAt: z.number().int().nonnegative().max(MAX_DATE_MS).optional(),
+        weekdays: storedWeekdaysSchema.optional(),
+        window: storedIntervalWindowSchema.optional(),
+        endsAt: z.number().int().nonnegative().max(MAX_DATE_MS).optional(),
     }).strict(),
-]);
+]).superRefine((schedule, context) => {
+    if (schedule.type !== "interval")
+        return;
+    if (schedule.window && intervalWindowMinutes(schedule.window) < schedule.everyMinutes) {
+        context.addIssue({
+            code: "custom",
+            message: "Stored interval window must be at least as long as the cadence",
+            path: ["window"],
+        });
+    }
+    if (schedule.endsAt !== undefined && schedule.anchorAt !== undefined && schedule.endsAt < schedule.anchorAt) {
+        context.addIssue({
+            code: "custom",
+            message: "Stored interval end must not be before its anchor",
+            path: ["endsAt"],
+        });
+    }
+});
+const storedScheduleChangesSchema = z.discriminatedUnion("type", [
+    z.object({ type: z.literal("once"), at: z.number().int().nonnegative() }).strict(),
+    z.object({
+        type: z.literal("daily"),
+        time: z.string().regex(TIME),
+        weekdays: storedWeekdaysSchema,
+    }).strict(),
+    z.object({
+        type: z.literal("interval"),
+        everyMinutes: z.number().int().min(5).max(1_440),
+        anchorAt: z.number().int().nonnegative().max(MAX_DATE_MS).optional(),
+        weekdays: storedWeekdaysSchema.nullable().optional(),
+        window: storedIntervalWindowSchema.nullable().optional(),
+        endsAt: z.number().int().nonnegative().max(MAX_DATE_MS).nullable().optional(),
+    }).strict(),
+]).superRefine((schedule, context) => {
+    if (schedule.type !== "interval")
+        return;
+    if (schedule.window && intervalWindowMinutes(schedule.window) < schedule.everyMinutes) {
+        context.addIssue({
+            code: "custom",
+            message: "Stored interval window must be at least as long as the cadence",
+            path: ["window"],
+        });
+    }
+    if (schedule.endsAt !== undefined &&
+        schedule.endsAt !== null &&
+        schedule.anchorAt !== undefined &&
+        schedule.endsAt < schedule.anchorAt) {
+        context.addIssue({
+            code: "custom",
+            message: "Stored interval end must not be before its anchor",
+            path: ["endsAt"],
+        });
+    }
+});
 const storedDefinitionSchema = z.object({
     name: z.string().trim().min(1).max(80),
     instructions: z.string().trim().min(1).max(20_000),
@@ -94,9 +161,12 @@ const storedDefinitionSchema = z.object({
     continuity: z.boolean().optional(),
 }).strict();
 const storedChangesSchema = storedDefinitionSchema
-    .omit({ timeoutMinutes: true })
+    .omit({ schedule: true, timeoutMinutes: true })
     .partial()
-    .extend({ timeoutMinutes: z.number().int().min(5).max(240).nullable().optional() })
+    .extend({
+    schedule: storedScheduleChangesSchema.optional(),
+    timeoutMinutes: z.number().int().min(5).max(240).nullable().optional(),
+})
     .strict()
     .refine((changes) => Object.values(changes).some((value) => value !== undefined), "Stored routine update must change at least one field");
 const storedManageBase = {
@@ -161,6 +231,32 @@ function timeout(value) {
     }
     return value;
 }
+function intervalWindowMinutes(window) {
+    const [startHour, startMinute] = window.start.split(":").map(Number);
+    const [endHour, endMinute] = window.end.split(":").map(Number);
+    return endHour * 60 + endMinute - (startHour * 60 + startMinute);
+}
+function intervalWeekdays(values) {
+    const weekdays = values.map((day) => {
+        const number = WEEKDAY_NUMBER[day.toLowerCase()];
+        if (number === undefined)
+            throw new RoutineRequestError(`Unsupported weekday: ${day}`);
+        return number;
+    });
+    return [...new Set(weekdays)].sort();
+}
+function intervalWindow(value, everyMinutes) {
+    if (!TIME.test(value.start) || !TIME.test(value.end)) {
+        throw new RoutineRequestError("Interval windows must use 24-hour HH:MM");
+    }
+    if (value.start >= value.end) {
+        throw new RoutineRequestError("Interval windows must end later on the same day");
+    }
+    if (intervalWindowMinutes(value) < everyMinutes) {
+        throw new RoutineRequestError("The interval window must be at least as long as everyMinutes");
+    }
+    return { start: value.start, end: value.end };
+}
 function rfc3339Instant(value, offsetMessage) {
     const parts = RFC3339_WITH_OFFSET.exec(value);
     if (!parts)
@@ -201,14 +297,31 @@ function normalizeSchedule(schedule, now) {
         if (!Number.isInteger(schedule.everyMinutes) || schedule.everyMinutes < 5 || schedule.everyMinutes > 1_440) {
             throw new RoutineRequestError("everyMinutes must be a whole number from 5 to 1440");
         }
-        if (schedule.anchorAt === undefined) {
-            return { type: "interval", everyMinutes: schedule.everyMinutes };
+        let anchorAt;
+        if (schedule.anchorAt !== undefined) {
+            anchorAt = rfc3339Instant(schedule.anchorAt, "Interval starts need an RFC3339 date-time with an explicit timezone offset");
+            if (!Number.isSafeInteger(anchorAt) || anchorAt < 0 || anchorAt > MAX_DATE_MS) {
+                throw new RoutineRequestError("Choose a valid interval start time");
+            }
         }
-        const anchorAt = rfc3339Instant(schedule.anchorAt, "Interval starts need an RFC3339 date-time with an explicit timezone offset");
-        if (!Number.isSafeInteger(anchorAt) || anchorAt < 0 || anchorAt > MAX_DATE_MS) {
-            throw new RoutineRequestError("Choose a valid interval start time");
+        let endsAt;
+        if (schedule.endsAt !== undefined && schedule.endsAt !== null) {
+            endsAt = rfc3339Instant(schedule.endsAt, "Interval ends need an RFC3339 date-time with an explicit timezone offset");
+            if (!Number.isSafeInteger(endsAt) || endsAt < 0 || endsAt > MAX_DATE_MS) {
+                throw new RoutineRequestError("Choose a valid interval end time");
+            }
+            if (endsAt < (anchorAt ?? now)) {
+                throw new RoutineRequestError("The interval end must not be before its start");
+            }
         }
-        return { type: "interval", everyMinutes: schedule.everyMinutes, anchorAt };
+        return {
+            type: "interval",
+            everyMinutes: schedule.everyMinutes,
+            ...(anchorAt === undefined ? {} : { anchorAt }),
+            ...(schedule.weekdays == null ? {} : { weekdays: intervalWeekdays(schedule.weekdays) }),
+            ...(schedule.window == null ? {} : { window: intervalWindow(schedule.window, schedule.everyMinutes) }),
+            ...(endsAt === undefined ? {} : { endsAt }),
+        };
     }
     if (!TIME.test(schedule.time)) {
         throw new RoutineRequestError("Weekly schedule time must use 24-hour HH:MM");
@@ -225,6 +338,17 @@ function normalizeSchedule(schedule, now) {
     });
     return { type: "daily", time: schedule.time, weekdays: [...new Set(weekdays)].sort() };
 }
+function normalizeScheduleChanges(schedule, now) {
+    const normalized = normalizeSchedule(schedule, now);
+    if (schedule.type !== "interval" || normalized.type !== "interval")
+        return normalized;
+    return {
+        ...normalized,
+        ...(schedule.weekdays === null ? { weekdays: null } : {}),
+        ...(schedule.window === null ? { window: null } : {}),
+        ...(schedule.endsAt === null ? { endsAt: null } : {}),
+    };
+}
 function normalizeDefinition(input, now) {
     const timeoutMinutes = timeout(input.timeoutMinutes);
     return {
@@ -244,7 +368,7 @@ function normalizeChanges(input, now) {
     if (input.instructions !== undefined)
         changes.instructions = text(input.instructions, "instructions", 20_000);
     if (input.schedule !== undefined)
-        changes.schedule = normalizeSchedule(input.schedule, now);
+        changes.schedule = normalizeScheduleChanges(input.schedule, now);
     if (input.runOn !== undefined)
         changes.runOn = runOn(input.runOn);
     if (input.durationMinutes !== undefined)
@@ -263,6 +387,15 @@ function routineId(value) {
 function ownedRoutine(manager, id, botId) {
     return manager.listRoutines().find((routine) => routine.id === id && routine.botId === botId) ?? null;
 }
+function noFutureResumeMessage(schedule) {
+    if (schedule.type === "interval") {
+        return "That interval routine has no future runs. Choose a later end time or remove the end restriction before resuming.";
+    }
+    if (schedule.type === "once") {
+        return "That one-time routine's scheduled time has passed. Update it to a new future time before resuming.";
+    }
+    return "That routine has no future runs. Update its schedule before resuming.";
+}
 function normalizedOperation(manager, botId, validated, now) {
     if (validated.action === "create") {
         const operation = {
@@ -286,7 +419,7 @@ function normalizedOperation(manager, botId, validated, now) {
         };
     }
     if (validated.action === "resume" && nextOccurrence(current.schedule, now) === null) {
-        throw new RoutineRequestError("That one-time routine's scheduled time has passed. Update it to a new future time before resuming.", 409);
+        throw new RoutineRequestError(noFutureResumeMessage(current.schedule), 409);
     }
     return { action: validated.action, routineId: id, expectedUpdatedAt: current.updatedAt };
 }
@@ -294,10 +427,60 @@ function asSchedule(schedule, now) {
     if (schedule.type === "once")
         return { type: "once", at: schedule.at };
     if (schedule.type === "interval") {
-        return { type: "interval", everyMinutes: schedule.everyMinutes, anchorAt: schedule.anchorAt ?? now };
+        return {
+            type: "interval",
+            everyMinutes: schedule.everyMinutes,
+            anchorAt: schedule.anchorAt ?? now,
+            ...(schedule.weekdays === undefined ? {} : { weekdays: [...schedule.weekdays] }),
+            ...(schedule.window === undefined ? {} : { window: { ...schedule.window } }),
+            ...(schedule.endsAt === undefined ? {} : { endsAt: schedule.endsAt }),
+        };
     }
     return { type: "daily", time: schedule.time, weekdays: [...schedule.weekdays] };
 }
+function schedulePatch(schedule, now, current) {
+    if (schedule.type !== "interval")
+        return asSchedule(schedule, now);
+    return {
+        type: "interval",
+        everyMinutes: schedule.everyMinutes,
+        anchorAt: schedule.anchorAt ?? (current.type === "interval" ? current.anchorAt : now),
+        ...(Object.hasOwn(schedule, "weekdays")
+            ? { weekdays: schedule.weekdays === null ? null : [...schedule.weekdays] }
+            : {}),
+        ...(Object.hasOwn(schedule, "window")
+            ? { window: schedule.window === null ? null : { ...schedule.window } }
+            : {}),
+        ...(Object.hasOwn(schedule, "endsAt") ? { endsAt: schedule.endsAt } : {}),
+    };
+}
+function effectiveSchedule(current, incoming) {
+    if (incoming.type !== "interval") {
+        return incoming.type === "once"
+            ? { type: "once", at: incoming.at }
+            : { type: "daily", time: incoming.time, weekdays: [...incoming.weekdays] };
+    }
+    const previous = current.type === "interval" ? current : undefined;
+    const merged = {
+        type: "interval",
+        everyMinutes: incoming.everyMinutes,
+        ...(incoming.anchorAt !== undefined
+            ? { anchorAt: incoming.anchorAt }
+            : previous?.anchorAt !== undefined
+                ? { anchorAt: previous.anchorAt }
+                : {}),
+    };
+    const weekdays = incoming.weekdays === undefined ? previous?.weekdays : incoming.weekdays;
+    if (weekdays !== undefined && weekdays !== null)
+        merged.weekdays = [...weekdays];
+    const window = incoming.window === undefined ? previous?.window : incoming.window;
+    if (window !== undefined && window !== null)
+        merged.window = { ...window };
+    const endsAt = incoming.endsAt === undefined ? previous?.endsAt : incoming.endsAt;
+    if (endsAt !== undefined && endsAt !== null)
+        merged.endsAt = endsAt;
+    return merged;
+}
 function nextForOperation(operation, manager, now) {
     if (operation.action === "create") {
         if (operation.routine.schedule.type === "interval" && operation.routine.schedule.anchorAt === undefined)
@@ -317,9 +500,12 @@ function nextForOperation(operation, manager, now) {
         return null;
     if (!current.enabled)
         return null;
-    if (operation.changes.schedule?.type === "interval" && operation.changes.schedule.anchorAt === undefined)
+    const definition = effectiveDefinition(operation, manager);
+    if (!definition)
+        return null;
+    if (definition.schedule.type === "interval" && definition.schedule.anchorAt === undefined)
         return null;
-    const schedule = operation.changes.schedule ? asSchedule(operation.changes.schedule, now) : current.schedule;
+    const schedule = asSchedule(definition.schedule, now);
     return nextOccurrence(schedule, now);
 }
 function formatInstant(at, timeZone) {
@@ -334,13 +520,27 @@ function formatInstant(at, timeZone) {
         return new Date(at).toISOString();
     }
 }
+function intervalHasRestrictions(schedule) {
+    return schedule.weekdays !== undefined || schedule.window !== undefined || schedule.endsAt !== undefined;
+}
 export function scheduleText(schedule, timeZone) {
     if (schedule.type === "once")
         return `${formatInstant(schedule.at, timeZone)} (${timeZone})`;
     if (schedule.type === "interval") {
-        return schedule.anchorAt === undefined
-            ? `Every ${schedule.everyMinutes} minutes, starting one interval after confirmation`
+        const restricted = intervalHasRestrictions(schedule);
+        const cadence = schedule.anchorAt === undefined
+            ? restricted
+                ? `Every ${schedule.everyMinutes} minutes, cadence starting at confirmation; first run is the next allowed time`
+                : `Every ${schedule.everyMinutes} minutes, starting one interval after confirmation`
             : `Every ${schedule.everyMinutes} minutes, anchored at ${formatInstant(schedule.anchorAt, timeZone)} (${timeZone})`;
+        const restrictions = [
+            schedule.weekdays?.length
+                ? `on ${schedule.weekdays.map((day) => WEEKDAY_LABEL[day]).join(", ")} (${timeZone})`
+                : null,
+            schedule.window ? `during ${schedule.window.start}–${schedule.window.end} (${timeZone})` : null,
+            schedule.endsAt !== undefined ? `until ${formatInstant(schedule.endsAt, timeZone)} (${timeZone})` : null,
+        ].filter((part) => part !== null);
+        return restrictions.length ? `${cadence} · ${restrictions.join(" · ")}` : cadence;
     }
     const days = schedule.weekdays.map((day) => WEEKDAY_LABEL[day]).join(", ");
     return `${days} at ${schedule.time} (${timeZone})`;
@@ -355,6 +555,9 @@ export function consequenceLine(schedule, continuity = false) {
     if (schedule.type === "once")
         return "Will run once; that run starts a fresh session.";
     if (schedule.type === "interval") {
+        if (intervalHasRestrictions(schedule)) {
+            return `Will run every ${schedule.everyMinutes} minutes when its day, time, and end restrictions allow; ${session}.`;
+        }
         const runsPerDay = Math.round(1440 / schedule.everyMinutes);
         const cadence = runsPerDay <= 1 ? "about once a day" : `about ${runsPerDay} times a day`;
         return `Will run ${cadence}; ${session}.`;
@@ -372,7 +575,15 @@ function effectiveDefinition(operation, manager) {
     const base = {
         name: existing.name,
         instructions: existing.prompt,
-        schedule: { ...existing.schedule },
+        schedule: existing.schedule.type === "interval"
+            ? {
+                ...existing.schedule,
+                ...(existing.schedule.weekdays ? { weekdays: [...existing.schedule.weekdays] } : {}),
+                ...(existing.schedule.window ? { window: { ...existing.schedule.window } } : {}),
+            }
+            : existing.schedule.type === "daily"
+                ? { ...existing.schedule, weekdays: [...existing.schedule.weekdays] }
+                : { ...existing.schedule },
         runOn: existing.runOn,
         durationMinutes: existing.durationMinutes,
         ...(existing.timeoutMinutes === undefined ? {} : { timeoutMinutes: existing.timeoutMinutes }),
@@ -380,8 +591,12 @@ function effectiveDefinition(operation, manager) {
     };
     if (operation.action !== "update")
         return base;
-    const { timeoutMinutes, ...changes } = operation.changes;
-    const merged = { ...base, ...changes };
+    const { schedule, timeoutMinutes, ...changes } = operation.changes;
+    const merged = {
+        ...base,
+        ...changes,
+        ...(schedule === undefined ? {} : { schedule: effectiveSchedule(base.schedule, schedule) }),
+    };
     if (timeoutMinutes === null)
         delete merged.timeoutMinutes;
     else if (timeoutMinutes !== undefined)
@@ -413,10 +628,15 @@ function cardCopy(operation, manager, timeZone, now) {
         : manager.listRoutines().find((routine) => routine.id === operation.routineId) ?? null;
     const remainsPaused = operation.action === "update" && current?.enabled === false;
     const deferredInterval = definition.schedule.type === "interval" && definition.schedule.anchorAt === undefined;
+    const deferredRestrictedInterval = deferredInterval &&
+        definition.schedule.type === "interval" &&
+        intervalHasRestrictions(definition.schedule);
     const nextDescription = remainsPaused
         ? "None — this routine remains paused"
         : deferredInterval
-            ? "One interval after confirmation"
+            ? deferredRestrictedInterval
+                ? `Next allowed time after confirmation (${timeZone})`
+                : "One interval after confirmation"
             : nextRunAt !== null
                 ? formatInstant(nextRunAt, timeZone)
                 : operation.action === "pause"
@@ -470,14 +690,14 @@ function inputFromDefinition(definition, botId, now) {
         ...(definition.continuity ? { continuity: true } : {}),
     };
 }
-function updateFromChanges(changes, now) {
+function updateFromChanges(changes, now, currentSchedule) {
     const patch = {};
     if (changes.name !== undefined)
         patch.name = changes.name;
     if (changes.instructions !== undefined)
         patch.prompt = changes.instructions;
     if (changes.schedule !== undefined)
-        patch.schedule = asSchedule(changes.schedule, now);
+        patch.schedule = schedulePatch(changes.schedule, now, currentSchedule);
     if (changes.runOn !== undefined)
         patch.runOn = changes.runOn;
     if (changes.durationMinutes !== undefined)
@@ -549,11 +769,36 @@ function revalidateOperation(operation, manager, botId, now) {
     if (schedule?.type === "once" && schedule.at <= now) {
         throw new RoutineRequestError("That one-time schedule is now in the past. Ask the bot to propose a new time.", 409);
     }
+    if (schedule?.type === "interval") {
+        const base = operation.action === "create"
+            ? operation.routine.schedule
+            : current
+                ? effectiveSchedule(current.schedule.type === "interval"
+                    ? {
+                        ...current.schedule,
+                        ...(current.schedule.weekdays ? { weekdays: [...current.schedule.weekdays] } : {}),
+                        ...(current.schedule.window ? { window: { ...current.schedule.window } } : {}),
+                    }
+                    : current.schedule.type === "daily"
+                        ? { ...current.schedule, weekdays: [...current.schedule.weekdays] }
+                        : { ...current.schedule }, schedule)
+                : null;
+        const concrete = base ? asSchedule(base, now) : null;
+        if (concrete) {
+            const valid = storedScheduleSchema.safeParse(concrete);
+            if (!valid.success) {
+                throw new RoutineRequestError(schemaIssue(valid.error, "Invalid interval schedule"));
+            }
+        }
+        if (concrete && nextOccurrence(concrete, now) === null) {
+            throw new RoutineRequestError("That interval no longer has a future run. Choose a later end time or remove the end restriction.", 409);
+        }
+    }
     if (operation.action === "resume") {
         if (!current)
             throw new RoutineRequestError("That routine no longer exists", 404);
         if (nextOccurrence(current.schedule, now) === null) {
-            throw new RoutineRequestError("That one-time routine's scheduled time has passed. Update it to a new future time before resuming.", 409);
+            throw new RoutineRequestError(noFutureResumeMessage(current.schedule), 409);
         }
     }
 }
@@ -838,8 +1083,8 @@ export class RoutineRequestService {
                     fingerprint,
                 }).id;
             case "update": {
-                verifyManageSnapshot(operation, this.routines, payload.botId);
-                const updated = this.routines.update(operation.routineId, updateFromChanges(operation.changes, confirmationAt), {
+                const current = verifyManageSnapshot(operation, this.routines, payload.botId);
+                const updated = this.routines.update(operation.routineId, updateFromChanges(operation.changes, confirmationAt, current.schedule), {
                     requestId: payload.requestId,
                     messageId,
                     botId: payload.botId,