@zq-silk/yui 0.7.0 → 0.7.1

package/dist/coordination/workMailbox.js

@@ -121,22 +121,26 @@ function appendUnique(existing, incoming, keyOf) {
     }
     return result;
 }
-function mergeBatches(earlier, later) {
+function mergeBatches(left, right) {
     const merged = {
-        fromSequence: earlier.fromSequence,
-        toSequence: later.toSequence,
-        reasons: appendUnique(earlier.reasons, later.reasons, (reason) => reason),
-        refs: appendUnique(earlier.refs, later.refs, mailboxEntityRefKey),
-        requestCount: earlier.requestCount + later.requestCount,
-        firstQueuedAt: earlier.firstQueuedAt,
-        lastQueuedAt: later.lastQueuedAt,
-        sources: appendUnique(earlier.sources, later.sources, (source) => source),
-        dedupeKeys: appendUnique(earlier.dedupeKeys, later.dedupeKeys, (key) => key),
-        deliveryModes: appendUnique(earlier.deliveryModes, later.deliveryModes, (mode) => mode),
-        ...((earlier.highestFactRevision ?? later.highestFactRevision) === undefined
+        fromSequence: Math.min(left.fromSequence, right.fromSequence),
+        toSequence: Math.max(left.toSequence, right.toSequence),
+        reasons: appendUnique(left.reasons, right.reasons, (reason) => reason),
+        refs: appendUnique(left.refs, right.refs, mailboxEntityRefKey),
+        requestCount: left.requestCount + right.requestCount,
+        firstQueuedAt: Date.parse(left.firstQueuedAt) <= Date.parse(right.firstQueuedAt)
+            ? left.firstQueuedAt
+            : right.firstQueuedAt,
+        lastQueuedAt: Date.parse(left.lastQueuedAt) >= Date.parse(right.lastQueuedAt)
+            ? left.lastQueuedAt
+            : right.lastQueuedAt,
+        sources: appendUnique(left.sources, right.sources, (source) => source),
+        dedupeKeys: appendUnique(left.dedupeKeys, right.dedupeKeys, (key) => key),
+        deliveryModes: appendUnique(left.deliveryModes, right.deliveryModes, (mode) => mode),
+        ...((left.highestFactRevision ?? right.highestFactRevision) === undefined
             ? {}
             : {
-                highestFactRevision: Math.max(earlier.highestFactRevision ?? 0, later.highestFactRevision ?? 0)
+                highestFactRevision: Math.max(left.highestFactRevision ?? 0, right.highestFactRevision ?? 0)
             })
     };
     return merged;
@@ -196,17 +200,16 @@ export function validateWorkMailbox(value) {
         pending.userCorrection,
         inputDelivery?.batch
     ].filter((batch) => batch !== null && batch !== undefined);
+    const activeDedupeKeys = new Set();
     for (const batch of batches) {
         if (batch.toSequence >= nextSequence) {
             throw new Error("WorkMailbox batch sequence must be lower than nextSequence");
         }
-    }
-    const ranges = batches
-        .map((batch) => [batch.fromSequence, batch.toSequence])
-        .sort((left, right) => left[0] - right[0]);
-    for (let index = 1; index < ranges.length; index += 1) {
-        if (ranges[index - 1][1] >= ranges[index][0]) {
-            throw new Error("WorkMailbox batch sequences overlap");
+        for (const dedupeKey of batch.dedupeKeys) {
+            if (activeDedupeKeys.has(dedupeKey)) {
+                throw new Error("WorkMailbox active batches share a dedupe key");
+            }
+            activeDedupeKeys.add(dedupeKey);
         }
     }
     if (inputDelivery !== null && target.kind !== "role" && target.kind !== "operator") {
@@ -304,8 +307,8 @@ function parseBatch(value, label) {
     const fromSequence = requireInteger(batch.fromSequence, 1, `${label} fromSequence`);
     const toSequence = requireInteger(batch.toSequence, fromSequence, `${label} toSequence`);
     const requestCount = requireInteger(batch.requestCount, 1, `${label} requestCount`);
-    if (requestCount !== toSequence - fromSequence + 1) {
-        throw new Error(`${label} requestCount does not match its sequence range`);
+    if (requestCount > toSequence - fromSequence + 1) {
+        throw new Error(`${label} requestCount exceeds its sequence envelope`);
     }
     const reasons = requireStringArray(batch.reasons, `${label} reasons`);
     if (reasons.length === 0)

package/dist/storage/sqliteStore.js

@@ -1923,13 +1923,20 @@ export class SqliteTaskStore {
         return rows.map((row) => this.#rowToMailbox(row));
     }
     saveWorkMailbox(mailbox) {
-        const cols = this.#mailboxCols(mailbox.target);
+        let validated;
+        try {
+            validated = validateWorkMailbox(mailbox);
+        }
+        catch (error) {
+            throw new StorageRecordError(error instanceof Error ? error.message : String(error));
+        }
+        const cols = this.#mailboxCols(validated.target);
         this.#mutate(() => {
             this.#db.prepare(`INSERT INTO mailboxes (target_kind, task_id, role_name, target_key, next_sequence, processing, pending, input_delivery)
          VALUES (?, ?, ?, ?, ?, ?, ?, ?)
          ON CONFLICT(target_key) DO UPDATE SET next_sequence = excluded.next_sequence,
            processing = excluded.processing, pending = excluded.pending,
-           input_delivery = excluded.input_delivery`).run(cols.targetKind, cols.taskId, cols.roleName, cols.targetKey, mailbox.nextSequence, mailbox.processing === null ? null : this.#json(mailbox.processing), this.#json(mailbox.pending), mailbox.inputDelivery === null ? null : this.#json(mailbox.inputDelivery));
+           input_delivery = excluded.input_delivery`).run(cols.targetKind, cols.taskId, cols.roleName, cols.targetKey, validated.nextSequence, validated.processing === null ? null : this.#json(validated.processing), this.#json(validated.pending), validated.inputDelivery === null ? null : this.#json(validated.inputDelivery));
         });
     }
     removeWorkMailbox(target) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zq-silk/yui",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Local control plane for long-running native agent CLI sessions backed by tmux.",
   "license": "MIT",
   "private": false,