@lostgradient/weft 0.12.0 → 0.14.0

package/dist/core/engine/review-list-entries.js

@@ -1,32 +1,8 @@
-import { z } from "zod";
 import { decode } from "../codec.js";
-const storedReviewRequestSchema = z.object({
-  reviewId: z.string(),
-  workflowId: z.string(),
-  artifact: z.unknown().nonoptional(),
-  reviewType: z.string(),
-  reviewers: z.array(z.string()),
-  allowPartial: z.boolean(),
-  timeout: z.number().optional(),
-  webhookUrl: z.string().optional(),
-  createdAt: z.number()
-}), persistedCompletedReviewEntrySchema = z.object({
-  status: z.literal("completed"),
-  reviewId: z.string(),
-  workflowId: z.string(),
-  artifact: z.unknown().nonoptional(),
-  reviewType: z.string(),
-  reviewers: z.array(z.string()),
-  allowPartial: z.boolean(),
-  timeout: z.number().optional(),
-  webhookUrl: z.string().optional(),
-  createdAt: z.number(),
-  decision: z.enum(["approved", "rejected", "needs-changes"]),
-  reviewer: z.string(),
-  feedback: z.string().optional(),
-  sectionDecisions: z.record(z.string(), z.enum(["approved", "rejected"])).optional(),
-  timestamp: z.number()
-});
+import {
+  completedReviewEntrySchema,
+  reviewRequestSchema
+} from "../review/index.js";
 function assignWhenDefined(target, key, value) {
   if (value !== void 0)
     target[key] = value;
@@ -58,7 +34,7 @@ export function parseStoredReviewRequest(value) {
   } catch {
     return null;
   }
-  const parsedReview = storedReviewRequestSchema.safeParse(decodedValue);
+  const parsedReview = reviewRequestSchema.safeParse(decodedValue);
   if (!parsedReview.success)
     return null;
   return normalizeStoredReviewRequest(parsedReview.data);
@@ -110,7 +86,7 @@ export function parseCompletedReviewEntry(value) {
   } catch {
     return null;
   }
-  const parsedReview = persistedCompletedReviewEntrySchema.safeParse(decodedValue);
+  const parsedReview = completedReviewEntrySchema.safeParse(decodedValue);
   if (!parsedReview.success)
     return null;
   return normalizeCompletedReviewEntry(parsedReview.data);

package/dist/core/engine/schedule-handle.d.ts

@@ -1,4 +1,4 @@
-import type { ScheduleSpec, ScheduleSummary } from '../types.ts';
+import type { ScheduleSpec, ScheduleSummary, ScheduleUpdateOptions } from '../types.ts';
 /**
  * Narrow engine view a {@link ScheduleHandle} delegates to. The full
  * {@link Engine} implements it; the handle only depends on these schedule
@@ -8,13 +8,13 @@ export interface ScheduleHandleEngine {
     pauseSchedule(scheduleId: string): Promise<void>;
     resumeSchedule(scheduleId: string): Promise<void>;
     cancelSchedule(scheduleId: string): Promise<void>;
-    updateSchedule(scheduleId: string, newSpec: string | ScheduleSpec): Promise<void>;
+    updateSchedule(scheduleId: string, newSpec: string | ScheduleSpec, options?: ScheduleUpdateOptions): Promise<void>;
     getSchedule(scheduleId: string): Promise<ScheduleSummary | null>;
 }
 /**
  * Handle to a recurring schedule created by {@link Engine.schedule}. Use
  * `handle.pause()`, `handle.resume()`, `handle.cancel()`, or
- * `handle.update(cronExpression)` to manage the schedule lifecycle.
+ * `handle.update(spec, options?)` to manage the schedule lifecycle.
  * `handle.describe()` returns the current {@link ScheduleSummary}.
  *
  * @example
@@ -40,6 +40,6 @@ export declare class ScheduleHandle {
     pause(): Promise<void>;
     resume(): Promise<void>;
     cancel(): Promise<void>;
-    update(newSpec: string | ScheduleSpec): Promise<void>;
+    update(newSpec: string | ScheduleSpec, options?: ScheduleUpdateOptions): Promise<void>;
     describe(): Promise<ScheduleSummary>;
 }

package/dist/core/engine/schedule-handle.js

@@ -14,8 +14,8 @@ export class ScheduleHandle {
   async cancel() {
     await this.#engine.cancelSchedule(this.id);
   }
-  async update(newSpec) {
-    await this.#engine.updateSchedule(this.id, newSpec);
+  async update(newSpec, options) {
+    await this.#engine.updateSchedule(this.id, newSpec, options);
   }
   async describe() {
     const schedule = await this.#engine.getSchedule(this.id);

package/dist/core/engine/schedule-overlap.d.ts

@@ -0,0 +1,11 @@
+import type { ScheduleState } from '../types.ts';
+import type { EngineInternals } from './internals.ts';
+import type { ScheduledRunStartOptions } from './schedule-run.ts';
+type ScheduleOverlapCallbacks = {
+    cancelWorkflow: (workflowId: string) => Promise<void>;
+    getWorkflowResult: (workflowId: string) => Promise<unknown>;
+    startScheduledRun: (state: ScheduleState, options?: ScheduledRunStartOptions) => Promise<string>;
+};
+export declare function applyBlockedScheduleOccurrence(internals: EngineInternals, state: ScheduleState, hasActiveWorkflow: boolean, callbacks: ScheduleOverlapCallbacks, occurrence?: number): Promise<ScheduleState>;
+export declare function drainQueuedScheduleRun(state: ScheduleState, callbacks: Pick<ScheduleOverlapCallbacks, 'startScheduledRun'>, completedWorkflowId?: string): Promise<ScheduleState>;
+export {};

package/dist/core/engine/schedule-overlap.js

@@ -0,0 +1,50 @@
+import { clearScheduleCurrentWorkflow } from "./state-utilities.js";
+export async function applyBlockedScheduleOccurrence(internals, state, hasActiveWorkflow, callbacks, occurrence) {
+  if (!hasActiveWorkflow)
+    return startScheduleRunInOccupiedSlot(state, callbacks, occurrence);
+  if (state.overlap === "cancel-running") {
+    if (state.currentWorkflowId) {
+      callbacks.getWorkflowResult(state.currentWorkflowId).catch(() => {});
+      await callbacks.cancelWorkflow(state.currentWorkflowId);
+    }
+    return startScheduleRunInOccupiedSlot(clearScheduleCurrentWorkflow(state), callbacks, occurrence);
+  }
+  if (state.overlap === "queue")
+    return {
+      ...state,
+      queuedRuns: [
+        ...state.queuedRuns,
+        {
+          workflowId: crypto.randomUUID(),
+          queuedAt: internals.options.getNow(),
+          ...occurrence !== void 0 && { occurrence }
+        }
+      ]
+    };
+  return state;
+}
+async function startScheduleRunInOccupiedSlot(state, callbacks, occurrence) {
+  const workflowId = crypto.randomUUID(), stateAfterStart = { ...state, currentWorkflowId: workflowId };
+  await callbacks.startScheduledRun(state, {
+    workflowId,
+    ...occurrence !== void 0 && { occurrence }
+  });
+  return stateAfterStart;
+}
+export async function drainQueuedScheduleRun(state, callbacks, completedWorkflowId) {
+  const [queuedRun, ...remainingQueuedRuns] = state.queuedRuns;
+  if (queuedRun === void 0)
+    return state;
+  const stateAfterStart = {
+    ...state,
+    currentWorkflowId: queuedRun.workflowId,
+    queuedRuns: remainingQueuedRuns
+  };
+  await callbacks.startScheduledRun(state, {
+    workflowId: queuedRun.workflowId,
+    ...queuedRun.occurrence !== void 0 && { occurrence: queuedRun.occurrence },
+    scheduleStateAfterStart: stateAfterStart,
+    ...completedWorkflowId !== void 0 && { completedWorkflowId }
+  });
+  return stateAfterStart;
+}

package/dist/core/engine/schedule-run.d.ts

@@ -1,6 +1,15 @@
 import type { ScheduleState } from '../types.ts';
 import type { EngineInternals } from './internals.ts';
 import type { ScheduleCallbacks } from './schedules.ts';
+export type ScheduledRunStartOptions = {
+    occurrence?: number;
+    /** Reserved queue identity. A fresh id is minted when omitted. */
+    workflowId?: string;
+    /** Schedule state committed atomically with the workflow start. */
+    scheduleStateAfterStart?: ScheduleState;
+    /** Prior terminal run whose transient schedule metadata is now settled. */
+    completedWorkflowId?: string;
+};
 /**
  * Launch one scheduled occurrence's workflow run and emit `schedule:fired`.
  *
@@ -11,7 +20,6 @@ import type { ScheduleCallbacks } from './schedules.ts';
  * active) never reach here, so they correctly do not fire.
  *
  * `occurrence` is the scheduled grid timestamp the run was due, threaded from the
- * timer loop. It is `undefined` for a `queue`-drained run, whose grid slot was
- * tracked only as a count and whose original timestamp is therefore gone.
+ * timer loop or retained on its durable queue entry until drain.
  */
-export declare function startScheduledRun(internals: EngineInternals, state: ScheduleState, callbacks: Pick<ScheduleCallbacks, 'startWorkflow' | 'failWorkflow' | 'handleCleanupError'>, occurrence?: number): Promise<string>;
+export declare function startScheduledRun(internals: EngineInternals, state: ScheduleState, callbacks: Pick<ScheduleCallbacks, 'startWorkflow' | 'failWorkflow' | 'handleCleanupError'>, options?: ScheduledRunStartOptions): Promise<string>;

package/dist/core/engine/schedule-run.js

@@ -1,21 +1,44 @@
 import { KEYS } from "../../storage/interface.js";
+import { encode } from "../codec.js";
 import { ScheduleFiredEvent } from "../events.js";
 import { unavailableServicesError } from "./lifecycle/recovered-services.js";
 import { EMPTY_STORAGE_VALUE } from "./lifecycle/shared.js";
 import { encodeScheduleRunMetadata } from "./schedule-run-metadata.js";
-export async function startScheduledRun(internals, state, callbacks, occurrence) {
-  const workflowId = crypto.randomUUID(), scheduleRunOperations = [
+export async function startScheduledRun(internals, state, callbacks, options = {}) {
+  const workflowId = options.workflowId ?? crypto.randomUUID(), occurrence = options.occurrence, metadata = encodeScheduleRunMetadata(state.id, occurrence), scheduleRunOperations = [
     {
       type: "put",
       key: KEYS.scheduleRun(workflowId),
-      value: encodeScheduleRunMetadata(state.id, occurrence)
+      value: metadata
+    },
+    {
+      type: "put",
+      key: KEYS.scheduleRunLink(workflowId),
+      value: metadata
+    },
+    {
+      type: "put",
+      key: KEYS.scheduleRunBySchedule(state.id, workflowId),
+      value: EMPTY_STORAGE_VALUE
     },
     {
       type: "put",
       key: KEYS.terminalCleanupNeeded(workflowId),
       value: EMPTY_STORAGE_VALUE
     }
-  ], resolution = await resolveScheduledRunServices(internals, workflowId, state, occurrence);
+  ];
+  if (options.scheduleStateAfterStart !== void 0)
+    scheduleRunOperations.push({
+      type: "put",
+      key: KEYS.schedule(options.scheduleStateAfterStart.id),
+      value: encode(options.scheduleStateAfterStart)
+    });
+  if (options.completedWorkflowId !== void 0)
+    scheduleRunOperations.push({
+      type: "delete",
+      key: KEYS.scheduleRun(options.completedWorkflowId)
+    });
+  const resolution = await resolveScheduledRunServices(internals, workflowId, state, occurrence);
   if (resolution !== null) {
     scheduleRunOperations.push({
       type: "put",

package/dist/core/engine/schedule-timer.js

@@ -1,7 +1,11 @@
 import { ScheduleMissedFireEvent } from "../events/schedule-events.js";
 import { resolveEffectiveScheduleFireAt } from "./schedule-jitter.js";
 import { collectDueScheduleOccurrences, getNextScheduleOccurrence } from "./schedule-occurrence.js";
-import { loadScheduleState, writeScheduleState } from "./storage-io.js";
+import {
+  loadScheduleState,
+  runSerializedScheduleStateOperation,
+  writeScheduleState
+} from "./storage-io.js";
 const SCHEDULE_LATE_GRACE_MILLISECONDS = 1000, MAX_SCHEDULE_BACKFILL_OCCURRENCES_PER_TICK = 256, MAX_MISSED_FIRE_COUNT_PER_TICK = MAX_SCHEDULE_BACKFILL_OCCURRENCES_PER_TICK;
 
 class ScheduleStatePersistenceError extends Error {
@@ -12,6 +16,11 @@ class ScheduleStatePersistenceError extends Error {
   }
 }
 export async function handleScheduleTimer(internals, entry, callbacks) {
+  await runSerializedScheduleStateOperation(internals, entry.workflowId, async () => {
+    await handleSerializedScheduleTimer(internals, entry, callbacks);
+  });
+}
+async function handleSerializedScheduleTimer(internals, entry, callbacks) {
   if (internals.deposed)
     return;
   const state = await loadScheduleState(internals, entry.workflowId);

package/dist/core/engine/schedules.d.ts

@@ -1,7 +1,8 @@
 import type { BatchOperation } from '../../storage/interface.ts';
-import type { PaginatedResult, ScheduleFilter, ScheduleOptions, ScheduleSpec, ScheduleState, ScheduleSummary, WorkflowState } from '../types.ts';
+import type { PaginatedResult, ScheduleFilter, ScheduleOptions, ScheduleSpec, ScheduleState, ScheduleSummary, ScheduleUpdateOptions, WorkflowState } from '../types.ts';
 import type { EngineInternals } from './internals.ts';
 import { ScheduleHandle } from './schedule-handle.ts';
+import type { ScheduledRunStartOptions } from './schedule-run.ts';
 export { startScheduledRun } from './schedule-run.ts';
 export { handleScheduleTimer } from './schedule-timer.ts';
 export type RefreshedScheduleState = {
@@ -16,7 +17,7 @@ export type ScheduleCallbacks = {
     cancelWorkflow: (workflowId: string) => Promise<void>;
     getWorkflowResult: (workflowId: string) => Promise<unknown>;
     refreshScheduledWorkflowState: (state: ScheduleState) => Promise<RefreshedScheduleState>;
-    startScheduledRun: (state: ScheduleState, occurrence?: number) => Promise<string>;
+    startScheduledRun: (state: ScheduleState, options?: ScheduledRunStartOptions) => Promise<string>;
     applyScheduleOccurrence: (state: ScheduleState, occurrence?: number) => Promise<ScheduleState>;
     settleBackfillScheduleState: (state: ScheduleState) => Promise<ScheduleState>;
     flushQueuedInlineWorkflowStartsDirectly: () => Promise<void>;
@@ -30,8 +31,8 @@ export declare function toScheduleSummary(state: ScheduleState): ScheduleSummary
 export declare function pauseSchedule(internals: EngineInternals, scheduleId: string): Promise<void>;
 export declare function resumeSchedule(internals: EngineInternals, scheduleId: string): Promise<void>;
 export declare function cancelSchedule(internals: EngineInternals, scheduleId: string): Promise<void>;
-export declare function updateSchedule(internals: EngineInternals, scheduleId: string, newSpec: string | ScheduleSpec): Promise<void>;
+export declare function updateSchedule(internals: EngineInternals, scheduleId: string, newSpec: string | ScheduleSpec, options?: ScheduleUpdateOptions): Promise<void>;
 export declare function refreshScheduledWorkflowState(internals: EngineInternals, state: ScheduleState, callbacks: Pick<ScheduleCallbacks, 'loadWorkflowState'>): Promise<RefreshedScheduleState>;
-export declare function applyScheduleOccurrence(_internals: EngineInternals, state: ScheduleState, callbacks: ScheduleCallbacks, occurrence?: number): Promise<ScheduleState>;
+export declare function applyScheduleOccurrence(internals: EngineInternals, state: ScheduleState, callbacks: ScheduleCallbacks, occurrence?: number): Promise<ScheduleState>;
 export declare function settleBackfillScheduleState(internals: EngineInternals, state: ScheduleState, callbacks: Pick<ScheduleCallbacks, 'flushQueuedInlineWorkflowStartsDirectly' | 'refreshScheduledWorkflowState'>): Promise<ScheduleState>;
 export declare function handleScheduledWorkflowTerminal(internals: EngineInternals, workflowId: string, callbacks: ScheduleCallbacks): Promise<void>;

package/dist/core/engine/schedules.js

@@ -1,9 +1,11 @@
 import { KEYS } from "../../storage/interface.js";
 import { decode } from "../codec.js";
 import { WorkflowNotRegisteredError } from "./errors.js";
+import { commitFencedEngineWrite } from "./fenced-write.js";
 import { ScheduleHandle } from "./schedule-handle.js";
 import { resolveEffectiveScheduleFireAt } from "./schedule-jitter.js";
 import { getNextScheduleOccurrence } from "./schedule-occurrence.js";
+import { applyBlockedScheduleOccurrence, drainQueuedScheduleRun } from "./schedule-overlap.js";
 import { decodeScheduleRunMetadata } from "./schedule-run-metadata.js";
 import {
   clearScheduleCurrentWorkflow,
@@ -11,14 +13,20 @@ import {
   matchesScheduleFilter,
   paginateScheduleSummaries
 } from "./state-utilities.js";
-import { loadScheduleState, requireScheduleState, writeScheduleState } from "./storage-io.js";
+import {
+  loadScheduleState,
+  requireScheduleState,
+  runSerializedScheduleStateOperation,
+  writeScheduleState
+} from "./storage-io.js";
 import {
   coerceScheduleId,
   decodeScheduleState,
   isValidScheduleIdentifier,
   normalizeScheduleFilter,
   normalizeScheduleOptions,
-  normalizeScheduleSpec
+  normalizeScheduleSpec,
+  normalizeScheduleUpdateOptions
 } from "./validation/schedule.js";
 export { startScheduledRun } from "./schedule-run.js";
 export { handleScheduleTimer } from "./schedule-timer.js";
@@ -48,7 +56,7 @@ export async function schedule(internals, type, input, spec, options) {
       updatedAt: now,
       nextFireAt: getNextScheduleOccurrence({ ...cadenceFields, createdAt: now }, now),
       missedFireCount: 0,
-      queuedRuns: 0
+      queuedRuns: []
     };
     await writeScheduleState(internals, state);
     return new ScheduleHandle(scheduleId, internals.engine);
@@ -64,8 +72,7 @@ export async function listSchedules(internals, filter) {
     const state = decodeScheduleState(value);
     if (!state || !matchesScheduleFilter(state, normalizedFilter))
       continue;
-    const { input: _input, ...summary } = state;
-    items.push(summary);
+    items.push(toScheduleSummary(state));
   }
   return paginateScheduleSummaries(items, normalizedFilter);
 }
@@ -93,7 +100,7 @@ async function hasCurrentScheduleTimer(internals, state) {
 }
 export function toScheduleSummary(state) {
   const { input: _input, ...summary } = state;
-  return summary;
+  return { ...summary, queuedRuns: summary.queuedRuns.map((queuedRun) => ({ ...queuedRun })) };
 }
 export async function pauseSchedule(internals, scheduleId) {
   const normalizedScheduleId = coerceScheduleId(scheduleId, "scheduleId"), state = await requireScheduleState(internals, normalizedScheduleId);
@@ -105,7 +112,7 @@ export async function pauseSchedule(internals, scheduleId) {
     status: "paused",
     updatedAt: now,
     nextFireAt: getNextScheduleOccurrence(state, now),
-    queuedRuns: 0
+    queuedRuns: []
   };
   await writeScheduleState(internals, updatedState, { includeTimer: !1 });
 }
@@ -132,23 +139,30 @@ export async function cancelSchedule(internals, scheduleId) {
     status: "cancelled",
     updatedAt: internals.options.getNow(),
     nextFireAt: null,
-    queuedRuns: 0
+    queuedRuns: []
   };
   await writeScheduleState(internals, updatedState, { includeTimer: !1 });
 }
-export async function updateSchedule(internals, scheduleId, newSpec) {
-  const normalizedScheduleId = coerceScheduleId(scheduleId, "scheduleId"), normalizedSpec = normalizeScheduleSpec(newSpec), state = await requireScheduleState(internals, normalizedScheduleId), now = internals.options.getNow(), {
-    cronExpression: _droppedCron,
-    intervalMs: _droppedInterval,
-    ...stateWithoutCadence
-  } = state, cadenceFields = normalizedSpec.kind === "interval" ? { intervalMs: normalizedSpec.intervalMs } : { cronExpression: normalizedSpec.cronExpression }, anchorFields = normalizedSpec.kind === "interval" ? { createdAt: now } : {}, updatedState = {
-    ...stateWithoutCadence,
-    ...cadenceFields,
-    ...anchorFields,
-    updatedAt: now,
-    nextFireAt: state.status === "cancelled" ? null : getNextScheduleOccurrence({ ...cadenceFields, createdAt: now }, now)
-  };
-  await writeScheduleState(internals, updatedState, { includeTimer: state.status === "active" });
+export async function updateSchedule(internals, scheduleId, newSpec, options) {
+  const normalizedScheduleId = coerceScheduleId(scheduleId, "scheduleId"), normalizedSpec = normalizeScheduleSpec(newSpec), normalizedOptions = normalizeScheduleUpdateOptions(options);
+  await runSerializedScheduleStateOperation(internals, normalizedScheduleId, async () => {
+    const state = await requireScheduleState(internals, normalizedScheduleId), now = internals.options.getNow(), {
+      cronExpression: _droppedCron,
+      intervalMs: _droppedInterval,
+      ...stateWithoutCadence
+    } = state, cadenceFields = normalizedSpec.kind === "interval" ? { intervalMs: normalizedSpec.intervalMs } : { cronExpression: normalizedSpec.cronExpression }, anchorFields = normalizedSpec.kind === "interval" ? { createdAt: now } : {}, updatedState = {
+      ...stateWithoutCadence,
+      ...normalizedOptions,
+      ...cadenceFields,
+      ...anchorFields,
+      updatedAt: now,
+      nextFireAt: state.status === "cancelled" ? null : getNextScheduleOccurrence({ ...cadenceFields, createdAt: now }, now)
+    };
+    await writeScheduleState(internals, updatedState, {
+      includeTimer: state.status === "active",
+      replaceTimerFrom: state
+    });
+  });
 }
 function scheduledRunOccupiesSlot(currentWorkflowState) {
   const status = currentWorkflowState?.status;
@@ -169,31 +183,20 @@ export async function refreshScheduledWorkflowState(internals, state, callbacks)
 function hasActiveScheduledWorkflow(currentWorkflowState) {
   return scheduledRunOccupiesSlot(currentWorkflowState);
 }
-async function applyBlockedScheduleOccurrence(state, hasActiveWorkflow, callbacks, occurrence) {
-  if (!hasActiveWorkflow)
-    return { ...state, currentWorkflowId: await callbacks.startScheduledRun(state, occurrence) };
-  if (state.overlap === "cancel-running") {
-    if (state.currentWorkflowId) {
-      callbacks.getWorkflowResult(state.currentWorkflowId).catch(() => {});
-      await callbacks.cancelWorkflow(state.currentWorkflowId);
-    }
-    const stateForStart = clearScheduleCurrentWorkflow(state);
-    return {
-      ...state,
-      currentWorkflowId: await callbacks.startScheduledRun(stateForStart, occurrence)
-    };
+export async function applyScheduleOccurrence(internals, state, callbacks, occurrence) {
+  const { state: refreshedState, currentWorkflowState } = await callbacks.refreshScheduledWorkflowState(state);
+  let stateForOccurrence = refreshedState, hasActiveWorkflow = hasActiveScheduledWorkflow(currentWorkflowState);
+  if (!hasActiveWorkflow && stateForOccurrence.queuedRuns.length > 0) {
+    stateForOccurrence = await drainQueuedScheduleRun(stateForOccurrence, callbacks);
+    hasActiveWorkflow = !0;
   }
-  if (state.overlap === "queue")
-    return { ...state, queuedRuns: state.queuedRuns + 1 };
-  return state;
-}
-export async function applyScheduleOccurrence(_internals, state, callbacks, occurrence) {
-  const { state: refreshedState, currentWorkflowState } = await callbacks.refreshScheduledWorkflowState(state), hasActiveWorkflow = hasActiveScheduledWorkflow(currentWorkflowState);
-  if (refreshedState.overlap === "allow") {
-    await callbacks.startScheduledRun(refreshedState, occurrence);
-    return refreshedState;
+  if (stateForOccurrence.overlap === "allow") {
+    await callbacks.startScheduledRun(stateForOccurrence, {
+      ...occurrence !== void 0 && { occurrence }
+    });
+    return stateForOccurrence;
   }
-  return applyBlockedScheduleOccurrence(refreshedState, hasActiveWorkflow, callbacks, occurrence);
+  return applyBlockedScheduleOccurrence(internals, stateForOccurrence, hasActiveWorkflow, callbacks, occurrence);
 }
 export async function settleBackfillScheduleState(internals, state, callbacks) {
   if (!state.currentWorkflowId)
@@ -208,26 +211,29 @@ export async function handleScheduledWorkflowTerminal(internals, workflowId, cal
   const scheduleRunBytes = await internals.storage.get(KEYS.scheduleRun(workflowId));
   if (!scheduleRunBytes)
     return;
-  await internals.storage.delete(KEYS.scheduleRun(workflowId));
   const metadata = decodeScheduleRunMetadata(scheduleRunBytes);
-  if (metadata === null || !isValidScheduleIdentifier(metadata.id))
+  if (metadata === null || !isValidScheduleIdentifier(metadata.id)) {
+    await deleteTransientScheduleRunMetadata(internals, workflowId);
     return;
+  }
   const scheduleId = metadata.id, state = await loadScheduleState(internals, scheduleId);
-  if (!state || state.currentWorkflowId !== workflowId)
+  if (!state || state.currentWorkflowId !== workflowId) {
+    await deleteTransientScheduleRunMetadata(internals, workflowId);
     return;
+  }
   const now = internals.options.getNow(), clearedState = {
     ...clearScheduleCurrentWorkflow(state),
     updatedAt: now
   };
-  if (clearedState.status === "active" && clearedState.overlap === "queue" && clearedState.queuedRuns > 0) {
-    const nextWorkflowId = await callbacks.startScheduledRun(clearedState);
-    await writeScheduleState(internals, {
-      ...clearedState,
-      currentWorkflowId: nextWorkflowId,
-      queuedRuns: clearedState.queuedRuns - 1,
-      updatedAt: now
-    }, { includeTimer: !1 });
+  if (clearedState.status === "active" && clearedState.queuedRuns.length > 0) {
+    await drainQueuedScheduleRun({ ...clearedState, updatedAt: now }, callbacks, workflowId);
     return;
   }
-  await writeScheduleState(internals, clearedState, { includeTimer: !1 });
+  await writeScheduleState(internals, clearedState, {
+    includeTimer: !1,
+    additionalOperations: [{ type: "delete", key: KEYS.scheduleRun(workflowId) }]
+  });
+}
+async function deleteTransientScheduleRunMetadata(internals, workflowId) {
+  await commitFencedEngineWrite(internals, [{ type: "delete", key: KEYS.scheduleRun(workflowId) }], [], () => Error(`Schedule-run cleanup for workflow "${workflowId}" lost its precondition.`));
 }

package/dist/core/engine/state-utilities.js

@@ -223,7 +223,7 @@ function matchesListFilterStatus(state, filter) {
   return (Array.isArray(filter.status) ? filter.status : [filter.status]).includes(state.status);
 }
 function matchesListFilterIdentity(state, filter) {
-  return matchesListFilterStatus(state, filter) && (filter.type === void 0 || state.type === filter.type) && (filter.idPrefix === void 0 || state.id.startsWith(filter.idPrefix));
+  return matchesListFilterStatus(state, filter) && (filter.type === void 0 || state.type === filter.type) && (filter.parentWorkflowId === void 0 || state.parentWorkflowId === filter.parentWorkflowId) && (filter.parentWorkflowExecutionToken === void 0 || state.parentWorkflowExecutionToken === filter.parentWorkflowExecutionToken) && (filter.idPrefix === void 0 || state.id.startsWith(filter.idPrefix));
 }
 function matchesListFilterTimeRanges(state, filter) {
   if (filter.createdAt !== void 0 && !timestampInRange(state.createdAt, filter.createdAt))

package/dist/core/engine/storage-io.d.ts

@@ -3,6 +3,16 @@ import type { ScheduleState, WorkflowState } from '../types.ts';
 import type { EngineInternals } from './internals.ts';
 /** Run a workflow-state write after any earlier write for that workflow has settled. */
 export declare function runSerializedWorkflowStateWrite<TResult>(internals: EngineInternals, workflowId: string, writeOperation: () => Promise<TResult>): Promise<TResult>;
+/**
+ * Serialize a schedule read-modify-write operation with its timer callback.
+ *
+ * Unlike workflow-state write serialization, a failed predecessor is propagated
+ * to callers that were already queued behind it. In particular, an update that
+ * arrives while a scanned timer callback is rearming must not delete the fired
+ * timer after that callback fails; rejecting the queued update leaves the durable
+ * timer available for the scheduler (or a lease successor) to retry.
+ */
+export declare function runSerializedScheduleStateOperation<TResult>(internals: EngineInternals, scheduleId: string, operation: () => Promise<TResult>): Promise<TResult>;
 /** Load and decode persisted workflow state by workflow ID. */
 export declare function loadWorkflowState(internals: EngineInternals, workflowId: string): Promise<WorkflowState | null>;
 /** Load a terminal workflow result or throw the persisted terminal error. */
@@ -29,6 +39,8 @@ export declare function requireScheduleState(internals: EngineInternals, schedul
 /** Persist schedule state and optionally write the next schedule timer. */
 export declare function writeScheduleState(internals: EngineInternals, state: ScheduleState, options?: {
     includeTimer?: boolean;
+    replaceTimerFrom?: ScheduleState;
+    additionalOperations?: BatchOperation[];
 }): Promise<void>;
 /** Load persisted workflow start headers by workflow ID. */
 export declare function loadWorkflowStartHeaders(internals: EngineInternals, workflowId: string): Promise<Map<string, string> | undefined>;

package/dist/core/engine/storage-io.js

@@ -30,6 +30,21 @@ export async function runSerializedWorkflowStateWrite(internals, workflowId, wri
       internals.workflowStateWriteChains.delete(workflowId);
   }
 }
+export async function runSerializedScheduleStateOperation(internals, scheduleId, operation) {
+  const execution = (internals.scheduleStateOperationChains.get(scheduleId) ?? Promise.resolve()).then(operation), trackedExecution = execution.then(() => {
+    return;
+  });
+  trackedExecution.catch(() => {
+    return;
+  });
+  internals.scheduleStateOperationChains.set(scheduleId, trackedExecution);
+  try {
+    return await execution;
+  } finally {
+    if (internals.scheduleStateOperationChains.get(scheduleId) === trackedExecution)
+      internals.scheduleStateOperationChains.delete(scheduleId);
+  }
+}
 export async function loadWorkflowState(internals, workflowId) {
   const bytes = await internals.storage.get(KEYS.workflow(workflowId));
   if (!bytes)
@@ -80,19 +95,43 @@ export async function requireScheduleState(internals, scheduleId) {
     throw Error(`Schedule "${scheduleId}" not found`);
   return state;
 }
+function buildPreviousScheduleTimerDeleteOperations(previousState) {
+  if (previousState?.status !== "active" || previousState.nextFireAt === null)
+    return [];
+  return [
+    {
+      type: "delete",
+      key: KEYS.scheduleTick(resolveEffectiveScheduleFireAt(previousState, previousState.nextFireAt), previousState.id)
+    }
+  ];
+}
+function buildNextScheduleTimerOperations(state, includeTimer) {
+  if (!includeTimer || state.status !== "active" || state.nextFireAt === null)
+    return [];
+  return buildTimerBatchOperations({
+    id: createScheduleTimerId(state.id),
+    workflowId: state.id,
+    fireAt: resolveEffectiveScheduleFireAt(state, state.nextFireAt),
+    kind: "schedule"
+  });
+}
+function buildScheduleTimerReplacementOperations(state, includeTimer, previousState) {
+  const deleteOperations = buildPreviousScheduleTimerDeleteOperations(previousState), nextTimerOperations = buildNextScheduleTimerOperations(state, includeTimer);
+  if (nextTimerOperations.length > 0)
+    return [...deleteOperations, ...nextTimerOperations];
+  if (previousState === void 0)
+    return deleteOperations;
+  return [
+    ...deleteOperations,
+    { type: "delete", key: `timer-idx:${createScheduleTimerId(state.id)}` }
+  ];
+}
 export async function writeScheduleState(internals, state, options) {
   const operations = [
     { type: "put", key: KEYS.schedule(state.id), value: encode(state) }
-  ];
-  if ((options?.includeTimer ?? state.status === "active") && state.status === "active" && state.nextFireAt !== null) {
-    const effectiveFireAt = resolveEffectiveScheduleFireAt(state, state.nextFireAt);
-    operations.push(...buildTimerBatchOperations({
-      id: createScheduleTimerId(state.id),
-      workflowId: state.id,
-      fireAt: effectiveFireAt,
-      kind: "schedule"
-    }));
-  }
+  ], includeTimer = options?.includeTimer ?? state.status === "active";
+  operations.push(...buildScheduleTimerReplacementOperations(state, includeTimer, options?.replaceTimerFrom));
+  operations.push(...options?.additionalOperations ?? []);
   await commitFencedEngineWrite(internals, operations, [], () => Error(`Schedule state commit for schedule "${state.id}" lost its precondition.`));
 }
 export async function loadWorkflowStartHeaders(internals, workflowId) {

package/dist/core/engine/termination/finalizer-claim.d.ts

@@ -37,11 +37,11 @@ export declare function runningClaimIsStale(internals: EngineInternals, claim: T
 /**
  * Durable audit record written to {@link KEYS.teardownDeadLetter} when a workflow's
  * finalizer permanently fails — the retry horizon was reached, or the recorded resource
- * state vanished so the finalizer can never run. It is the supported operator surface
- * for a leaked external resource: raw storage inspection of the `wf-teardown-deadletter:`
- * key is the contract (in-process teardown events are best-effort and not durable, and
- * the record is excluded from the workflow purge delete-set so it survives after the
- * workflow record is gone).
+ * state vanished so the finalizer can never run. It is the supported durable operator
+ * record for a leaked external resource; {@link Engine.getFinalizerStatus} and the matching
+ * transport operation expose it without relying on best-effort teardown events. The record
+ * is excluded from the workflow purge delete-set so it survives after the workflow record
+ * is gone.
  */
 export interface TeardownDeadLetterRecord {
     /** The workflow type whose finalizer leaked. */
@@ -52,6 +52,8 @@ export interface TeardownDeadLetterRecord {
     attempts: number;
     /** Engine clock when the record was written. */
     deadLetteredAt: number;
+    /** Concrete run identity, present on records written from current workflow state. */
+    workflowExecutionToken?: string;
     /** The decoded `ctx.setFinalizerState` payload, when it was still recoverable. */
     finalizerInput?: unknown;
 }
@@ -107,4 +109,4 @@ export declare function settleOnRunningClaim(internals: EngineInternals, workflo
 export declare function deadLetterTeardown(internals: EngineInternals, workflowId: string, workflowType: string, attempts: number, expectedBytes: Uint8Array, details: {
     lastError: string;
     finalizerInput: unknown;
-}): Promise<boolean>;
+}, workflowExecutionToken?: string): Promise<boolean>;