@zq-silk/yui 0.6.8 → 0.6.10

package/dist/controller/controller.js

@@ -13,6 +13,7 @@ import { isProjectMaintenanceFenced } from "../repository/projectMaintenanceLock
 import { KeyedWorkQueue } from "../coordination/keyedWorkQueue.js";
 import { MailboxScheduler } from "../coordination/mailboxScheduler.js";
 import { nearestDeadlineBatch } from "../coordination/deadlineScheduler.js";
+import { mailboxHasWork, nextPendingBatch } from "../coordination/workMailbox.js";
 import { hasRuntimeCleanupObligation, isRuntimeLaunchReservation, runtimeLifecycleTarget } from "../runtime/lifecycleReservation.js";
 import { formatTaskRecordReference } from "../task/taskRecordReference.js";
 import { parseDurableJobAcknowledgeParams, parseDurableJobCancelParams, parseDurableJobRefParams, parseDurableJobStartParams } from "./jobControl.js";
@@ -43,7 +44,7 @@ const ZERO_DRAIN_METRICS = Object.freeze({
  * Runs one lean scheduler pass. Due native Turn completions are folded before
  * liveness, so a valid Hook boundary fences destructive process reconciliation.
  */
-export async function runControllerSchedulerPass(store, delivery, now, workspacePreparer, scope = { kind: "full" }, includeOperator = true, runtimeCleanupOutcomes = [], lifecycleHost, stallWindowMs = DEFAULT_STALL_WINDOW_MS, maintenanceFence, onMaintenanceFenceDefer, blockedTaskIds = new Set()) {
+export async function runControllerSchedulerPass(store, delivery, now, workspacePreparer, scope = { kind: "full" }, includeOperator = true, runtimeCleanupOutcomes = [], lifecycleHost, stallWindowMs = DEFAULT_STALL_WINDOW_MS, maintenanceFence, onMaintenanceFenceDefer, blockedTaskIds = new Set(), inputDeliveryRecoveryCutoff) {
     const compiledSelection = compileReconcileSelection(scope);
     const selection = includeOperator
         ? { ...compiledSelection, blockedTaskIds }
@@ -75,12 +76,11 @@ export async function runControllerSchedulerPass(store, delivery, now, workspace
         // Sessions before delivery, so the existing delivery path re-pushes the
         // exact same input in this same pass.
         resolveDueProviderRetries(store, roleSelection, now);
-        const activeRunDeliveries = await processActiveRoleRunDeliveries(store, delivery, now, roleSelection);
+        const activeRunDeliveries = await processActiveRoleRunDeliveries(store, delivery, now, roleSelection, inputDeliveryRecoveryCutoff);
         await controlEventLoopTurn();
         const unsettledRunRefs = new Set(activeRunDeliveries.flatMap((result) => (result.reason === "delivery-uncertain" || result.terminalFailure !== undefined
             ? [formatTaskRecordReference(result.taskId, result.runId, "agentRun")]
             : [])));
-        resolveDueRuntimeTurnCompletions(store, delivery, selection, now);
         // Every successful Task has completed the targeted phases owned by its
         // mailbox at this boundary. Settle that exact claim before advisory
         // cross-Task reconciliation so an unrelated failure cannot retain and
@@ -412,29 +412,6 @@ function runtimeOwnerIdentity(owner) {
         ? `task\0${owner.taskId}\0${owner.roleName}`
         : `global\0${owner.roleName}`;
 }
-function resolveDueRuntimeTurnCompletions(store, delivery, selection, now) {
-    if (typeof store.resolveDueRuntimeTurnCompletions !== "function")
-        return;
-    const selectedTaskIds = selectedTaskIdsForBoundedPass(store, selection);
-    if (selectedTaskIds?.size === 0)
-        return;
-    const candidateTaskIds = selectedTaskIds === undefined
-        ? undefined
-        : [...selectedTaskIds].sort((left, right) => (left.localeCompare(right, undefined, { numeric: true })));
-    const candidates = store.listPendingRuntimeTurnCompletions(candidateTaskIds);
-    const finalized = new Set(store.resolveDueRuntimeTurnCompletions(now, selectedTaskIds));
-    if (finalized.size === 0)
-        return;
-    for (const completion of candidates) {
-        if (!finalized.has(formatTaskRecordReference(completion.taskId, completion.runId, "agentRun")))
-            continue;
-        delivery.forgetPrepared?.({
-            taskId: completion.taskId,
-            roleName: completion.roleName,
-            runId: completion.runId
-        });
-    }
-}
 /**
  * Issue 04: reopens due in-place Provider retries on their original Native
  * Sessions before the active-run delivery pass, so the existing delivery
@@ -540,7 +517,7 @@ function runtimeCleanupMailboxKey(target) {
 function runtimeLifecycleBatchIdentity(target, mailbox) {
     if (mailbox.processing !== null)
         return mailbox.processing.batchId;
-    const pending = mailbox.pending;
+    const pending = nextPendingBatch(mailbox);
     return pending === null
         ? runtimeTargetIdentity(target)
         : `${runtimeTargetIdentity(target)}:${pending.fromSequence}-${pending.toSequence}`;
@@ -607,10 +584,11 @@ function claimSelectedTaskMailboxes(store, selection, now) {
     const claims = [];
     for (const target of targets) {
         const mailbox = store.getWorkMailbox(target);
-        if (mailbox === null || (mailbox.processing === null && mailbox.pending === null))
+        if (mailbox === null || !mailboxHasWork(mailbox))
             continue;
+        const pending = nextPendingBatch(mailbox);
         const batchId = mailbox.processing?.batchId
-            ?? `task:${encodeURIComponent(target.taskId)}:${mailbox.pending.fromSequence}-${mailbox.pending.toSequence}`;
+            ?? `task:${encodeURIComponent(target.taskId)}:${pending.fromSequence}-${pending.toSequence}`;
         const claim = store.claimWorkMailbox({
             target,
             batchId,
@@ -809,6 +787,7 @@ function mergeControllerSchedulerResults(results) {
 export class FileTaskController {
     store;
     delivery;
+    #startedAt;
     #intervalMs;
     #now;
     #onError;
@@ -841,6 +820,7 @@ export class FileTaskController {
     #maintenanceFence;
     #onMaintenanceFenceDefer;
     #jobSupervisor;
+    #continuationReconciler;
     #current;
     #operatorCurrent;
     #runtimeObserverCurrent;
@@ -860,6 +840,7 @@ export class FileTaskController {
         this.delivery = delivery;
         this.#intervalMs = positiveInteger(options.intervalMs, DEFAULT_RECONCILIATION_INTERVAL_MS, "Controller reconciliation interval");
         this.#now = options.now ?? (() => new Date());
+        this.#startedAt = this.#now();
         this.#onError = options.onError ?? (() => { });
         this.#workspacePreparer = options.workspacePreparer;
         this.#deliveryRetryMs = positiveInteger(options.deliveryRetryMs, DEFAULT_DELIVERY_RETRY_MS, "Controller delivery retry delay");
@@ -878,6 +859,7 @@ export class FileTaskController {
         this.#maintenanceFence = options.maintenanceFence;
         this.#onMaintenanceFenceDefer = options.onMaintenanceFenceDefer;
         this.#jobSupervisor = options.jobSupervisor;
+        this.#continuationReconciler = options.continuationReconciler;
         this.#signalScheduler = new MailboxScheduler(async (keys) => { await this.#requestPass({ kind: "dirty", keys }); }, {
             windowMs: options.signalWindowMs ?? DEFAULT_SIGNAL_WINDOW_MS,
             onError: this.#onError,
@@ -1045,7 +1027,7 @@ export class FileTaskController {
             return;
         const mailbox = this.store.getWorkMailbox({ kind: "operator" });
         const shouldArm = mailbox !== null
-            && (mailbox.pending !== null || mailbox.processing !== null);
+            && mailboxHasWork(mailbox);
         if (shouldArm)
             this.#clearDeliveryRetry("operator");
         this.#operatorStartupRetryArmed = shouldArm;
@@ -1116,12 +1098,18 @@ export class FileTaskController {
                     for (const taskId of runtimeTaskFailureIds(firstRuntimeDrain)) {
                         runtimeFailedTaskIds.add(taskId);
                     }
+                    // Detached reconciliation is deliberately confined to the low-rate
+                    // full pass. It queries only identities already present in Task
+                    // facts and cannot start a model Turn or scan unknown children.
+                    if (scope.kind === "full" && this.#continuationReconciler !== undefined) {
+                        await this.#continuationReconciler.reconcile(this.#now());
+                    }
                     // DurableJob reconciliation runs before the scheduler pass so a
                     // terminal job's Leader wakeup is enqueued in the same pass that
                     // processes Leader wakeups.
                     this.#jobSupervisor?.reconcile(this.#now());
                     if (scope.kind === "full") {
-                        result = await runControllerSchedulerPass(this.store, this.delivery, this.#now(), this.#workspacePreparer, scope, false, runtimeCleanupOutcomes, this.#lifecycleHost, this.#stallWindowMs, this.#maintenanceFence, this.#onMaintenanceFenceDefer, runtimeFailedTaskIds);
+                        result = await runControllerSchedulerPass(this.store, this.delivery, this.#now(), this.#workspacePreparer, scope, false, runtimeCleanupOutcomes, this.#lifecycleHost, this.#stallWindowMs, this.#maintenanceFence, this.#onMaintenanceFenceDefer, runtimeFailedTaskIds, this.#startedAt);
                     }
                     else {
                         const dirtyPass = await this.#runDirtySchedulerPass(scope, runtimeCleanupOutcomes, runtimeFailedTaskIds);
@@ -1219,7 +1207,7 @@ export class FileTaskController {
         const taskScopes = partition.taskScopes.filter((taskScope) => (!blockedTaskIds.has(taskScope.taskId)));
         const orderedResults = [];
         if (partition.globalKeys.length > 0) {
-            orderedResults.push(await runControllerSchedulerPass(this.store, this.delivery, this.#now(), this.#workspacePreparer, { kind: "dirty", keys: partition.globalKeys }, false, runtimeCleanupOutcomes, this.#lifecycleHost, this.#stallWindowMs, this.#maintenanceFence, this.#onMaintenanceFenceDefer, blockedTaskIds));
+            orderedResults.push(await runControllerSchedulerPass(this.store, this.delivery, this.#now(), this.#workspacePreparer, { kind: "dirty", keys: partition.globalKeys }, false, runtimeCleanupOutcomes, this.#lifecycleHost, this.#stallWindowMs, this.#maintenanceFence, this.#onMaintenanceFenceDefer, blockedTaskIds, this.#startedAt));
         }
         if (taskScopes.length === 0
             || this.#stopped
@@ -1252,7 +1240,7 @@ export class FileTaskController {
                     if (this.#stopped || this.#pendingFull)
                         continue;
                     try {
-                        taskResults[selected.index] = await runControllerSchedulerPass(this.store, this.delivery, this.#now(), this.#workspacePreparer, { kind: "dirty", keys: selected.taskScope.keys }, false, taskCleanupOutcomes[selected.index], this.#lifecycleHost, this.#stallWindowMs, this.#maintenanceFence, this.#onMaintenanceFenceDefer, blockedTaskIds);
+                        taskResults[selected.index] = await runControllerSchedulerPass(this.store, this.delivery, this.#now(), this.#workspacePreparer, { kind: "dirty", keys: selected.taskScope.keys }, false, taskCleanupOutcomes[selected.index], this.#lifecycleHost, this.#stallWindowMs, this.#maintenanceFence, this.#onMaintenanceFenceDefer, blockedTaskIds, this.#startedAt);
                         this.#clearTaskPassRetry(selected.taskScope.taskId);
                     }
                     catch (error) {
@@ -1300,7 +1288,7 @@ export class FileTaskController {
         if (this.#operatorStartupRetryArmed && result.inputNotifications.length === 0) {
             const mailbox = this.store.getWorkMailbox({ kind: "operator" });
             if (mailbox === null
-                || (mailbox.pending === null && mailbox.processing === null)) {
+                || !mailboxHasWork(mailbox)) {
                 this.#operatorStartupRetryArmed = false;
             }
         }
@@ -1443,12 +1431,6 @@ export class FileTaskController {
                         at: Date.parse(request.policy.timeoutAt)
                     }]
                 : []),
-            ...(typeof this.store.listPendingRuntimeTurnCompletions === "function"
-                ? this.store.listPendingRuntimeTurnCompletions()
-                : []).map((completion) => ({
-                key: `role:${encodeURIComponent(completion.taskId)}/${encodeURIComponent(completion.roleName)}`,
-                at: Date.parse(completion.dueAt)
-            })),
             // Issue 04 durable in-place retry timer: arm the Controller wake at the
             // earliest `nextAttemptAt` so a due retry re-pushes on its original
             // Session. The projection is durable, so a restart resumes the lineage.
@@ -1491,8 +1473,7 @@ export class FileTaskController {
             else if (delivery.reason === "writer-attached")
                 writerBlocked.add(key);
             else if (delivery.reason === "not-ready"
-                || delivery.reason === "runtime-unavailable"
-                || delivery.reason === "delivery-uncertain") {
+                || delivery.reason === "runtime-unavailable") {
                 retry.set(key, {
                     identity: delivery.runId,
                     ...(delivery.terminalFailure === undefined
@@ -1508,8 +1489,7 @@ export class FileTaskController {
             if (wakeup.reason === "writer-attached") {
                 writerBlocked.add(key);
             }
-            else if (wakeup.reason === "not-ready"
-                || wakeup.reason === "delivery-uncertain") {
+            else if (wakeup.reason === "not-ready") {
                 retry.set(key, { identity: wakeup.runId ?? key });
             }
             else if (wakeup.status === "dispatched")
@@ -1569,7 +1549,8 @@ export class FileTaskController {
             const mailbox = this.store.getWorkMailbox(target);
             // A newly queued pending batch must not reset the retry identity/bound
             // while this Controller still owns an older processing batch.
-            const batch = mailbox?.processing?.batch ?? mailbox?.pending;
+            const batch = mailbox?.processing?.batch
+                ?? (mailbox === null || mailbox === undefined ? null : nextPendingBatch(mailbox));
             if (batch === undefined || batch === null) {
                 this.#clearDeliveryRetry(key);
                 continue;
@@ -1657,7 +1638,7 @@ export class FileTaskController {
             return;
         const mailbox = this.store.getWorkMailbox({ kind: "operator" });
         if (mailbox === null
-            || (mailbox.pending === null && mailbox.processing === null)) {
+            || !mailboxHasWork(mailbox)) {
             this.#operatorStartupRetryArmed = false;
             this.#clearDeliveryRetry("operator");
         }
@@ -1886,7 +1867,8 @@ function boundedPositiveInteger(value, fallback, maximum, label) {
     return resolved;
 }
 function operatorMailboxBatchIdentity(mailbox) {
-    const batch = mailbox?.pending ?? mailbox?.processing?.batch;
+    const batch = mailbox?.processing?.batch
+        ?? (mailbox === null || mailbox === undefined ? null : nextPendingBatch(mailbox));
     if (batch === null || batch === undefined)
         return null;
     return [