@smithers-orchestrator/scheduler 0.21.0 → 0.23.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smithers-orchestrator/scheduler",
-  "version": "0.21.0",
+  "version": "0.23.0",
   "description": "Pure decision engine: session, scheduler, and task state management for Smithers workflows",
   "type": "module",
   "sideEffects": false,
@@ -176,8 +176,8 @@
   ],
   "dependencies": {
     "effect": "^3.21.1",
-    "@smithers-orchestrator/errors": "0.21.0",
-    "@smithers-orchestrator/graph": "0.21.0"
+    "@smithers-orchestrator/errors": "0.23.0",
+    "@smithers-orchestrator/graph": "0.23.0"
   },
   "devDependencies": {
     "@types/bun": "latest",

package/src/CachePolicy.ts

@@ -1,4 +1,4 @@
-export type CachePolicy<Ctx = any> = {
+export type CachePolicy<Ctx = unknown> = {
   by?: (ctx: Ctx) => unknown;
   version?: string;
   key?: string;

package/src/makeWorkflowSession.js

@@ -286,6 +286,8 @@ export function makeWorkflowSession(options = {}) {
                     state.states.delete(key);
                 }
                 state.retryWait.delete(key);
+                state.approvals.delete(key);
+                state.retryCounts.delete(key);
             }
         }
         for (const ralph of ralphs) {

package/src/scheduleTasks.js

@@ -38,9 +38,7 @@ function isTraversalTerminal(state, descriptor) {
  * @returns {boolean}
  */
 function dependenciesSatisfied(descriptor, states, descriptors) {
-    if (!descriptor.dependsOn || descriptor.dependsOn.length === 0)
-        return true;
-    for (const dependencyId of descriptor.dependsOn) {
+    for (const dependencyId of descriptor.dependsOn ?? []) {
         const dependency = descriptors.get(dependencyId);
         if (!dependency)
             return false;
@@ -49,8 +47,44 @@ function dependenciesSatisfied(descriptor, states, descriptors) {
             return false;
         }
     }
+    // A forked task waits until its source task has a completed (terminal)
+    // execution. The source is matched by logical id so a source inside a loop
+    // is satisfied by whichever iteration has completed; the executor then
+    // forks the latest completed snapshot for that id.
+    if (descriptor.forkSource && !forkSourceTerminal(descriptor.forkSource, states, descriptors)) {
+        return false;
+    }
     return true;
 }
+/**
+ * Strip the loop-scope suffix (`@@ralph=0,...`) from a node id to recover the
+ * logical task id authored in JSX.
+ * @param {string} nodeId
+ * @returns {string}
+ */
+function logicalNodeId(nodeId) {
+    const atIdx = nodeId.indexOf("@@");
+    return atIdx === -1 ? nodeId : nodeId.slice(0, atIdx);
+}
+/**
+ * Whether any execution of the fork source task (matched by logical id) has
+ * reached a terminal state.
+ * @param {string} forkSource
+ * @param {TaskStateMap} states
+ * @param {Map<string, TaskDescriptor>} descriptors
+ * @returns {boolean}
+ */
+function forkSourceTerminal(forkSource, states, descriptors) {
+    for (const descriptor of descriptors.values()) {
+        if (logicalNodeId(descriptor.nodeId) !== forkSource)
+            continue;
+        const state = states.get(buildStateKey(descriptor.nodeId, descriptor.iteration));
+        if (state && isTerminal(state, descriptor)) {
+            return true;
+        }
+    }
+    return false;
+}
 /**
  * @param {PlanNode | null} plan
  * @param {TaskStateMap} states