@kb-labs/workflow-daemon 2.118.2 → 2.119.0-canary.cee505c72

package/dist/index.js

@@ -4,6 +4,7 @@ import { WorkflowEngine, WorkflowService } from '@kb-labs/workflow-engine';
 import { getListenOptions, HttpObservabilityCollector, createDaemonServer, createServiceReadyResponse, metricLine } from '@kb-labs/shared-http';
 import { runService } from '@kb-labs/shared-daemon';
 import { logDiagnosticEvent, createContextLogger } from '@kb-labs/core-platform';
+import { isTerminal } from '@kb-labs/workflow-constants';
 import { PluginCronJobSchema, UserCronJobSchema, evaluateExpression, interpolateObject, buildShellSafeCommand, coerceToString, interpolateString } from '@kb-labs/workflow-contracts';
 import { GateHandler } from '@kb-labs/workflow-steps';
 import { SandboxRunner } from '@kb-labs/workflow-runtime';
@@ -186,7 +187,6 @@ async function createWorkflowWorker(options) {
       try {
         const ws = await wsProvider2.materialize({
           workspaceId: wsId,
-          sourceRef: "main",
           metadata: { runId: run.id, jobId: job.id },
           onProgress: (event) => {
             jobLogger.info(`[workspace] ${event.stage}: ${event.message}`, {
@@ -257,6 +257,15 @@ async function createWorkflowWorker(options) {
             wasCancelled = true;
             break;
           }
+          const freshJob = freshRun?.jobs.find((j) => j.id === job.id);
+          if (freshJob && isTerminal(freshJob.status, "job")) {
+            jobLogger.warn("[worker] Job already in a terminal state \u2014 aborting in-process execution", {
+              runId: run.id,
+              jobId: job.id,
+              status: freshJob.status
+            });
+            return;
+          }
           const exprCtx = {
             env: freshRun?.env ?? {},
             trigger: freshRun?.trigger ?? { type: "manual" },
@@ -392,19 +401,13 @@ async function createWorkflowWorker(options) {
             if (step.status !== "waiting_approval") {
               await engine.markStepWaitingApproval(run.id, job.id, step.id);
             }
-            const approvalResult = await waitForApproval(
-              engine,
-              run.id,
-              job.id,
-              step,
-              interpolatedWith,
-              () => stopRequested,
-              stepLogger
-            );
-            if (approvalResult === "interrupted") {
-              return;
-            }
-            continue;
+            stepLogger.info("[approval] Step parked awaiting human decision \u2014 releasing worker slot", {
+              runId: run.id,
+              jobId: job.id,
+              stepId: step.id,
+              stepName: step.name
+            });
+            return;
           }
           if (step.spec.uses?.startsWith("workflow:")) {
             await invokeChildWorkflow({
@@ -833,82 +836,6 @@ function sleep(ms) {
     setTimeout(resolve, ms);
   });
 }
-async function waitForApproval(engine, runId, jobId, step, interpolatedWith, isStopRequested, stepLogger) {
-  const approvalTimeoutMs = interpolatedWith?.["timeoutMs"];
-  if (!approvalTimeoutMs) {
-    stepLogger.warn(
-      "[approval] No timeout configured \u2014 approval may wait indefinitely",
-      {
-        runId,
-        jobId,
-        stepId: step.id,
-        stepName: step.name
-      }
-    );
-  }
-  stepLogger.info("[approval] Waiting for approval", {
-    runId,
-    jobId,
-    stepId: step.id,
-    stepName: step.name,
-    context: interpolatedWith
-  });
-  const approvalStartMs = Date.now();
-  let pollCount = 0;
-  while (!isStopRequested()) {
-    await sleep(2e3);
-    pollCount++;
-    const currentRun = await engine.getRun(runId);
-    if (currentRun?.status === "cancelled") {
-      stepLogger.info(
-        "[approval] Run cancelled \u2014 treating as interrupted, NOT approved",
-        {
-          runId,
-          stepId: step.id,
-          stepName: step.name,
-          waitedMs: Date.now() - approvalStartMs
-        }
-      );
-      return "interrupted";
-    }
-    const currentJob = currentRun?.jobs.find((j) => j.id === jobId);
-    const currentStep = currentJob?.steps.find((s) => s.id === step.id);
-    if (!currentStep || currentStep.status === "success") {
-      stepLogger.info("[approval] Approval granted", {
-        runId,
-        stepId: step.id,
-        stepName: step.name,
-        waitedMs: Date.now() - approvalStartMs
-      });
-      break;
-    }
-    if (currentStep.status === "failed") {
-      stepLogger.info("[approval] Approval rejected", {
-        runId,
-        stepId: step.id,
-        stepName: step.name,
-        waitedMs: Date.now() - approvalStartMs
-      });
-      break;
-    }
-    if (pollCount % 10 === 0) {
-      stepLogger.info("[approval] Still waiting for approval", {
-        runId,
-        stepId: step.id,
-        stepName: step.name,
-        waitedMs: Date.now() - approvalStartMs,
-        pollCount
-      });
-    }
-  }
-  if (isStopRequested()) {
-    stepLogger.info("Approval wait interrupted by shutdown", {
-      stepId: step.id
-    });
-    return "interrupted";
-  }
-  return "done";
-}
 async function applyGateSkip(engine, run, job, step, decision, stepLogger) {
   const { skipTo, outputs } = decision;
   stepLogger.info("[gate] Gate triggered skip-forward", {
@@ -932,8 +859,7 @@ async function applyGateSkip(engine, run, job, step, decision, stepLogger) {
     if (s.spec.id === skipTo || s.id === skipTo) {
       break;
     }
-    await stateStore.updateStep(run.id, job.id, s.id, (draft) => {
-      draft.status = "success";
+    await stateStore.transitionStep(run.id, job.id, s.id, "success", (draft) => {
       draft.outputs = { skipped: true };
       draft.startedAt = (/* @__PURE__ */ new Date()).toISOString();
       draft.finishedAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -1005,21 +931,19 @@ async function applyGateRestart(engine, run, job, step, decision, stepLogger) {
       }
       const pending = (rj.needs ?? []).filter((n) => resetNames.has(n));
       for (const s of rj.steps) {
-        await stateStore.updateStep(run.id, rj.id, s.id, (draft) => {
-          draft.status = "queued";
+        await stateStore.transitionStep(run.id, rj.id, s.id, "queued", (draft) => {
           draft.startedAt = void 0;
           draft.finishedAt = void 0;
           draft.error = void 0;
           draft.outputs = void 0;
-        });
+        }, { allowReset: true });
       }
-      await stateStore.updateJob(run.id, rj.id, (draft) => {
-        draft.status = "queued";
+      await stateStore.transitionJob(run.id, rj.id, "queued", (draft) => {
         draft.startedAt = void 0;
         draft.finishedAt = void 0;
         draft.pendingDependencies = [...pending];
         draft.blocked = pending.length > 0;
-      });
+      }, { allowReset: true });
     }
     const refreshed = await engine.getRun(run.id);
     const targetJob = refreshed?.jobs.find((j) => j.jobName === restartFrom);
@@ -1045,17 +969,15 @@ async function applyGateRestart(engine, run, job, step, decision, stepLogger) {
       foundTarget = true;
     }
     if (foundTarget) {
-      await stateStore.updateStep(run.id, job.id, s.id, (draft) => {
-        draft.status = "queued";
+      await stateStore.transitionStep(run.id, job.id, s.id, "queued", (draft) => {
         draft.startedAt = void 0;
         draft.finishedAt = void 0;
         draft.error = void 0;
         draft.outputs = void 0;
-      });
+      }, { allowReset: true });
     }
   }
-  await stateStore.updateJob(run.id, job.id, (draft) => {
-    draft.status = "queued";
+  await stateStore.transitionJob(run.id, job.id, "queued", (draft) => {
     draft.startedAt = void 0;
     draft.finishedAt = void 0;
   });