@qilin-agent/schedule 3.1.6 → 3.1.8

package/lib/types/update.js

@@ -1,164 +1,92 @@
-/** Optimistic name, instruction, and timing updates of retained Host tasks, without Session mutations. */
+/** Typed timing construction and edits shared by all Schedule management callers. */
 import { isDeepStrictEqual } from 'node:util';
-import { canonicalizeCronExpression, canonicalizeTimeZone, createAtScheduleRecord, createCronScheduleRecord, createDailyScheduleRecord, createEveryScheduleRecord, createWeeklyScheduleRecord, decodeScheduleRecord, decodeStoredTitle, parseAtInput, parseCronInput, parseDailyInput, parseWeeklyInput, ScheduleInputError, ScheduleLogError, scheduleTitle, } from "./domain.js";
-/** Name the exact selector property each timing kind must carry, or undefined for an unknown discriminant. */
-function timingSelector(kind) {
-    switch (kind) {
-        case 'at': return 'at';
-        case 'every': return 'every_seconds';
-        case 'daily': return 'daily';
-        case 'weekly': return 'weekly';
-        case 'cron': return 'cron';
-        default: return undefined;
+import { createAfterScheduleRecord, createAtScheduleRecord, createCronScheduleRecord, createDailyScheduleRecord, createEveryScheduleRecord, createWeeklyScheduleRecord, createRRuleScheduleRecord, parseAtInput, parseCronInput, parseDailyInput, parseWeeklyInput, normalizeRRule, updateRRuleScheduleRecord, ScheduleInputError, scheduleTitle, isRecord, hasExactKeys, } from "./domain.js";
+/** Read exactly one matching timing payload at the untrusted management boundary. */
+function validateTiming(value) {
+    const selectors = { after: 'after_seconds', at: 'at', every: 'every_seconds', daily: 'daily', weekly: 'weekly', cron: 'cron', rrule: 'rrule' };
+    if (!isRecord(value) || !(value.kind in selectors)
+        || !hasExactKeys(value, ['kind', selectors[value.kind]])) {
+        throw new ScheduleInputError('invalid_rule', 'timing must contain exactly kind and its matching selector.');
     }
+    return value;
 }
 /**
- * Validate the exact timing selector keys received over RPC.
- * @param value - Untrusted timing change; the wire can carry a null, array, or foreign discriminant.
- * @returns The same value narrowed to the closed timing-change union.
+ * Construct a current record with one authoritative timing kind and a future committed target.
+ * @param id - Host-generated task identity.
+ * @param title - Required user-facing task title.
+ * @param prompt - Non-empty instruction delivered at each occurrence.
+ * @param value - Exactly one typed timing selector.
+ * @param now - Explicit acceptance time in epoch milliseconds.
+ * @returns A validated record with its first future occurrence.
  */
-function validateChange(value) {
-    if (typeof value !== 'object' || value === null || Array.isArray(value)) {
-        throw new ScheduleInputError('invalid_rule', 'Timing change must be an object with exactly one supported timing selector.');
+export function createScheduleRecord(id, title, prompt, value, now) {
+    const timing = validateTiming(value);
+    switch (timing.kind) {
+        case 'after': return createAfterScheduleRecord(id, prompt, timing.after_seconds, now, title);
+        case 'at': return createAtScheduleRecord(id, prompt, timing.at, now, title);
+        case 'every': return createEveryScheduleRecord(id, prompt, timing.every_seconds, now, title);
+        case 'daily': return createDailyScheduleRecord(id, prompt, timing.daily, now, title);
+        case 'weekly': return createWeeklyScheduleRecord(id, prompt, timing.weekly, now, title);
+        case 'cron': return createCronScheduleRecord(id, prompt, timing.cron, now, title);
+        case 'rrule': return createRRuleScheduleRecord(id, title, prompt, timing.rrule, now);
     }
-    const change = value;
-    const selector = timingSelector(change.kind);
-    const keys = Object.keys(change);
-    if (selector === undefined || keys.length !== 2 || !keys.includes('kind') || !keys.includes(selector)) {
-        throw new ScheduleInputError('invalid_rule', 'Timing change must contain exactly kind and its matching timing selector.');
-    }
-    return change;
 }
-/**
- * Validate a replacement instruction received over RPC.
- * @param prompt - Untrusted instruction value; the wire can carry a non-string.
- * @returns The trimmed instruction; an invalid instruction throws ScheduleInputError.
- */
-function schedulePrompt(prompt) {
-    if (typeof prompt !== 'string' || prompt.trim().length === 0) {
-        throw new ScheduleInputError('invalid_prompt', 'prompt must be non-empty after trimming.');
+/** Express a record's rule as editable timing; a one-shot retains its committed absolute target. */
+function timingOf(record) {
+    switch (record.kind) {
+        case 'after':
+        case 'at': return { kind: 'at', at: record.scheduledAt };
+        case 'every': return { kind: 'every', every_seconds: record.everySeconds };
+        case 'daily': return { kind: 'daily', daily: { time: record.time, time_zone: record.timeZone } };
+        case 'weekly': return { kind: 'weekly', weekly: { time: record.time, time_zone: record.timeZone, weekdays: record.weekdays } };
+        case 'cron': return { kind: 'cron', cron: { expression: record.expression, time_zone: record.timeZone } };
+        case 'rrule': return { kind: 'rrule', rrule: record.rrule };
     }
-    return prompt.trim();
 }
-/**
- * Title one update must either keep or replace.
- *
- * A decoded record always carries a stored title. A record value without a
- * valid one is refused with the durable decode error instead of deriving a name.
- * @param record - Current active Host record.
- * @returns The stored title; a missing, blank, untrimmed, or over-long title throws ScheduleLogError.
- */
-export function retainedTitle(record) {
-    return decodeStoredTitle(record.title);
-}
-/**
- * Apply a replacement name and instruction to a stored record without touching its rule.
- * @param current - Current active record holding the committed target.
- * @param title - Validated replacement or retained name.
- * @param prompt - Validated replacement or retained instruction.
- * @returns The same record when both are unchanged, otherwise a frozen copy with the new content.
- */
-function withContent(current, title, prompt) {
-    return title === current.title && prompt === current.prompt
-        ? current
-        : Object.freeze({ ...current, title, prompt });
-}
-/**
- * Resolve the requested rule against the current record after the complete expected record has matched.
- *
- * The change kind may differ from the current record's kind; a change whose normalized
- * timing equals the current rule keeps the committed target and only applies the supplied
- * name and instruction, while any other change recomputes the target exactly as creation
- * computes it from the same now.
- */
-function changedRecord(current, title, prompt, value, now) {
-    if (value === undefined)
-        return withContent(current, title, prompt);
-    const change = validateChange(value);
-    switch (change.kind) {
-        case 'at':
-            if ((current.kind === 'after' || current.kind === 'at')
-                && parseAtInput(change.at) === Date.parse(current.scheduledAt))
-                return withContent(current, title, prompt);
-            return createAtScheduleRecord(current.id, prompt, change.at, now, title);
-        case 'every':
-            if (current.kind === 'every' && change.every_seconds === current.everySeconds) {
-                return withContent(current, title, prompt);
-            }
-            return createEveryScheduleRecord(current.id, prompt, change.every_seconds, now, title);
-        case 'daily': {
-            if (current.kind === 'daily') {
-                const normalized = parseDailyInput(change.daily);
-                if (normalized.time === current.time
-                    && normalized.timeZone === canonicalizeTimeZone(current.timeZone))
-                    return withContent(current, title, prompt);
-            }
-            return createDailyScheduleRecord(current.id, prompt, change.daily, now, title);
-        }
-        case 'weekly': {
-            if (current.kind === 'weekly') {
-                const normalized = parseWeeklyInput(change.weekly);
-                if (normalized.time === current.time
-                    && normalized.timeZone === canonicalizeTimeZone(current.timeZone)
-                    && isDeepStrictEqual(normalized.weekdays, current.weekdays))
-                    return withContent(current, title, prompt);
-            }
-            return createWeeklyScheduleRecord(current.id, prompt, change.weekly, now, title);
-        }
-        case 'cron': {
-            if (current.kind === 'cron') {
-                const normalized = parseCronInput(change.cron);
-                if (normalized.expression === canonicalizeCronExpression(current.expression)
-                    && normalized.timeZone === canonicalizeTimeZone(current.timeZone))
-                    return withContent(current, title, prompt);
-            }
-            return createCronScheduleRecord(current.id, prompt, change.cron, now, title);
-        }
-        /* v8 ignore next 4 -- validateChange rejects unknown discriminants before this closed union switch. */
-        default: {
-            const unreachable = change;
-            throw new Error(`Unknown validated timing change: ${String(unreachable)}`);
-        }
+/** Normalize timing for equivalence before calculating any new target. */
+function normalizedTiming(value) {
+    const timing = validateTiming(value);
+    switch (timing.kind) {
+        case 'after': return timing;
+        case 'at': return { kind: 'at', at: parseAtInput(timing.at) };
+        case 'every': return timing;
+        case 'daily': return { kind: 'daily', ...parseDailyInput(timing.daily) };
+        case 'weekly': return { kind: 'weekly', ...parseWeeklyInput(timing.weekly) };
+        case 'cron': return { kind: 'cron', ...parseCronInput(timing.cron) };
+        case 'rrule': return { kind: 'rrule', rrule: normalizeRRule(timing.rrule) };
     }
 }
 /**
- * Compare the complete observed record and resolve one name, instruction, and timing update
- * using a single queue-time sample.
- *
- * An omitted change, name, or instruction keeps the stored value. A supplied name or
- * instruction never re-anchors the schedule on its own; an equivalent normalized timing
- * change keeps the committed target too.
- * @param current - Current active Host record.
- * @param expected - Untrusted complete record observed by the caller.
- * @param change - Strict timing selector, whose kind may differ from the current record's kind, or undefined to keep timing.
- * @param now - Single wall-clock sample from the accepted FIFO slot.
- * @param content - Untrusted replacement name and instruction; each omitted field keeps its stored value.
- * @returns Current/new record or a bounded input/conflict result; unrelated failures throw.
+ * Keep unchanged timing and committed targets, or re-arm through the same constructor as creation.
+ * @param current - Stored record before the edit.
+ * @param patch - Descriptive fields and optional typed timing replacement.
+ * @param now - Explicit edit acceptance time in epoch milliseconds.
+ * @param resume - Whether to find a future occurrence for unchanged timing.
+ * @returns The retained or revised authoritative timing record.
  */
-export function resolveScheduleUpdate(current, expected, change, now, content = {}) {
-    let decoded;
-    try {
-        decoded = decodeScheduleRecord(expected);
-    }
-    catch (error) {
-        if (!(error instanceof ScheduleLogError))
-            throw error;
-        return { code: 'invalid_rule', message: 'expected must be a complete valid Schedule record.' };
-    }
-    if (!isDeepStrictEqual(current, decoded)) {
-        return { id: current.id, updated: false, code: 'schedule_conflict' };
+export function updateScheduleRecord(current, patch, now, resume) {
+    const title = scheduleTitle(patch.title === undefined ? current.title : patch.title);
+    const prompt = patch.prompt === undefined ? current.prompt : patch.prompt;
+    if (typeof prompt !== 'string' || prompt.trim().length === 0) {
+        throw new ScheduleInputError('invalid_prompt', 'prompt must be non-empty after trimming.');
     }
+    const timing = patch.timing === undefined ? timingOf(current) : patch.timing;
+    const changed = patch.timing !== undefined && !isDeepStrictEqual(normalizedTiming(timing), normalizedTiming(timingOf(current)));
     try {
-        const retained = retainedTitle(current);
-        const title = content.title === undefined ? retained : scheduleTitle(content.title);
-        const prompt = content.prompt === undefined ? current.prompt : schedulePrompt(content.prompt);
-        const record = changedRecord(current, title, prompt, change, now);
-        return { id: current.id, updated: record !== current, record };
+        if (current.kind === 'rrule' && timing.kind === 'rrule') {
+            return updateRRuleScheduleRecord(current, { title, prompt,
+                ...(changed ? { rrule: timing.rrule } : {}),
+            }, now, changed || resume);
+        }
+        if (changed || resume)
+            return createScheduleRecord(current.id, title, prompt, timing, now);
     }
     catch (error) {
-        if (!(error instanceof ScheduleInputError))
-            throw error;
-        return { code: error.code, message: error.message };
+        if (resume && !changed && error instanceof ScheduleInputError && error.code === 'not_future') {
+            throw new ScheduleInputError('not_future', 'This task has no future occurrence. Set a future schedule before resuming it.');
+        }
+        throw error;
     }
+    return title === current.title && prompt.trim() === current.prompt ? current : Object.freeze({ ...current, title, prompt: prompt.trim() });
 }
 //# sourceMappingURL=update.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qilin-agent/schedule",
-  "description": "Host-wide durable reminders with shared management and original-Session delivery",
-  "version": "3.1.6",
+  "description": "Host-wide durable reminders with shared management and delivery to existing or new Sessions",
+  "version": "3.1.8",
   "publishConfig": {
     "access": "public"
   },
@@ -49,43 +49,46 @@
   ],
   "license": "MIT",
   "peerDependencies": {
-    "@qilin-agent/agent": "3.1.6",
-    "@qilin-agent/llm": "3.1.6",
-    "@qilin-agent/session": "3.1.6",
-    "@qilin-agent/session-projection": "3.1.6",
-    "@qilin-agent/storage-domain": "3.1.6",
-    "@qilin-agent/api-session-controller": "3.1.6",
-    "@qilin-agent/subagent": "3.1.6",
-    "@qilin-agent/tools": "3.1.6",
-    "@qilin-agent/brand": "3.1.6",
-    "@qilin-agent/session-persistence": "3.1.6",
-    "@qilin-agent/typert-protocol": "3.1.6",
-    "@qilin-agent/kylin": "~4.0.5"
+    "@qilin-agent/agent": "3.1.8",
+    "@qilin-agent/api-session-controller": "3.1.8",
+    "@qilin-agent/brand": "3.1.8",
+    "@qilin-agent/llm": "3.1.8",
+    "@qilin-agent/session": "3.1.8",
+    "@qilin-agent/session-persistence": "3.1.8",
+    "@qilin-agent/session-projection": "3.1.8",
+    "@qilin-agent/session-title": "3.1.8",
+    "@qilin-agent/storage-domain": "3.1.8",
+    "@qilin-agent/subagent": "3.1.8",
+    "@qilin-agent/tools": "3.1.8",
+    "@qilin-agent/typert-protocol": "3.1.8",
+    "@qilin-agent/kylin": "~4.0.6-alpha.2"
   },
   "dependencies": {
+    "@qilin-agent/schemastery": "~3.18.6-alpha.2",
     "@js-temporal/polyfill": "0.5.1",
-    "zod": "^4.4.3",
-    "@qilin-agent/schemastery": "~3.18.5"
+    "zod": "^4.4.3"
   },
   "devDependencies": {
-    "@qilin-agent/kylin-plugin-loader": "~1.0.6",
-    "@qilin-agent/agent": "3.1.6",
-    "@qilin-agent/agent-loop-testkit": "3.1.6",
-    "@qilin-agent/api-session-controller": "3.1.6",
-    "@qilin-agent/agent-loop": "3.1.6",
-    "@qilin-agent/brand": "3.1.6",
-    "@qilin-agent/session-persistence": "3.1.6",
-    "@qilin-agent/session-persistence-jsonl": "3.1.6",
-    "@qilin-agent/session-projection": "3.1.6",
-    "@qilin-agent/llm": "3.1.6",
-    "@qilin-agent/session": "3.1.6",
-    "@qilin-agent/storage-domain": "3.1.6",
-    "@qilin-agent/subagent": "3.1.6",
-    "@qilin-agent/storage": "3.1.6",
-    "@qilin-agent/tools": "3.1.6",
-    "@qilin-agent/system-prompt": "3.1.6",
-    "@qilin-agent/storage-json": "3.1.6",
-    "@qilin-agent/typert-protocol": "3.1.6",
-    "@qilin-agent/kylin": "~4.0.5"
+    "@qilin-agent/kylin-plugin-loader": "~1.0.7-alpha.2",
+    "@qilin-agent/agent": "3.1.8",
+    "@qilin-agent/agent-loop": "3.1.8",
+    "@qilin-agent/agent-loop-testkit": "3.1.8",
+    "@qilin-agent/api-session-controller": "3.1.8",
+    "@qilin-agent/brand": "3.1.8",
+    "@qilin-agent/llm": "3.1.8",
+    "@qilin-agent/session": "3.1.8",
+    "@qilin-agent/session-persistence": "3.1.8",
+    "@qilin-agent/session-persistence-jsonl": "3.1.8",
+    "@qilin-agent/session-projection": "3.1.8",
+    "@qilin-agent/storage": "3.1.8",
+    "@qilin-agent/storage-domain": "3.1.8",
+    "@qilin-agent/storage-json": "3.1.8",
+    "@qilin-agent/subagent": "3.1.8",
+    "@qilin-agent/system-prompt": "3.1.8",
+    "@qilin-agent/tools": "3.1.8",
+    "@qilin-agent/typert-protocol": "3.1.8",
+    "@qilin-agent/kylin": "~4.0.6-alpha.2",
+    "@qilin-agent/goal": "3.1.8",
+    "@qilin-agent/goal-round-driver": "3.1.8"
   }
 }