@desplega.ai/agent-swarm 2.5.3 → 2.6.0

package/dist/{cli-jjznk3f7.js → cli-3fwqy71j.js}

@@ -8,7 +8,13 @@ import {
   updateAgentStatus2,
   updateAgentMaxTasks2,
   getActiveTaskCount2,
+  approvalCancellationNotificationKey,
+  init_approvals,
   getTaskById2,
+  WorkflowReplayStateError,
+  init_workflow_replay,
+  getRunLineageBlock,
+  getWorkflowRunStatus,
   getChildWorkflowRunId,
   isParentStepAttemptCurrent,
   createForeachChildSteps,
@@ -23,8 +29,6 @@ import {
   getOAuthApp,
   getOAuthTokens,
   init_oauth,
-  WorkflowReplayStateError,
-  init_workflow_replay,
   createTaskExtended2,
   getSwarmConfigs2,
   upsertSwarmConfig2,
@@ -51,30 +55,30 @@ import {
   releaseApprovalCancellationNotificationClaim2,
   updateApprovalRequestNotifications2,
   init_db3
-} from "./cli-kxawjrxg.js";
+} from "./cli-g8ka5j4j.js";
 import {
   isMultiRuntimeEnabled
 } from "./cli-e8xyjvfc.js";
 import {
   getSlackApp2
-} from "./cli-ce0ak9ms.js";
+} from "./cli-g20jjwt4.js";
 import {
   externalChannelToolError2,
   isBlockExternalEnabled2,
   getChannelBlockReason2
-} from "./cli-s53vp709.js";
+} from "./cli-gnsb1zxa.js";
 import {
   DEFAULT_MODEL,
   resolveCredential
-} from "./cli-qqzmjxkf.js";
+} from "./cli-v49fkghp.js";
 import {
   revokeRuntimeTokensForRuntime,
   init_users
-} from "./cli-e8jyq7d8.js";
+} from "./cli-esakngh8.js";
 import {
   TERMINAL_TASK_STATUSES,
   init_types
-} from "./cli-mz9afxxf.js";
+} from "./cli-4rf0f5vg.js";
 import {
   getSlackConfiguration,
   isSlackConfigured,
@@ -83,19 +87,19 @@ import {
 import {
   selectCredential,
   init_credentials
-} from "./cli-zw88zjba.js";
-import {
-  deepInterpolate,
-  init_template,
-  resolveTemplate,
-  init_resolver
-} from "./cli-tx00c0h6.js";
+} from "./cli-1tem6ns9.js";
 import {
   DEFAULT_OPENROUTER_BASE_URL,
   getOpenRouterBaseUrl,
   getOpenRouterAttributionHeaders,
   init_openrouter_base_url
 } from "./cli-dfyv0jdy.js";
+import {
+  deepInterpolate,
+  init_template,
+  resolveTemplate,
+  init_resolver
+} from "./cli-dqygeeh5.js";
 import {
   init_zod
 } from "./cli-4chz1hye.js";
@@ -127,13 +131,13 @@ import {
   isSensitiveKey,
   scrubSecrets,
   init_secret_scrubber
-} from "./cli-n4c8e3s5.js";
+} from "./cli-708wdy32.js";
 import {
   providerKeyVars,
   providerBaseUrl,
   providerForModel,
   init_src2
-} from "./cli-nwyw3zhg.js";
+} from "./cli-gxee0bqa.js";
 
 // src/automation-preflight-alert.ts
 init_constants2();
@@ -145,7 +149,7 @@ async function notifyAutomationPreflightFailure(preflight) {
     return;
   }
   try {
-    const { getSlackApp } = await import("./app-ag29n14f.js");
+    const { getSlackApp } = await import("./app-k8a5cgpp.js");
     const app = getSlackApp();
     if (!app) {
       console.warn("[Automation Preflight] Slack not available, cannot send notification");
@@ -958,6 +962,7 @@ init_secret_scrubber();
 
 // src/workflows/approval-notifications.ts
 init_db3();
+init_approvals();
 init_resolver();
 
 // src/slack/dm.ts
@@ -1124,7 +1129,7 @@ async function postApprovalCancellationUpdates(approvals, reason, client = getSl
     for (const notification of slackThreads) {
       if (notification.channel !== "slack" || !notification.messageTs)
         continue;
-      const notificationKey = `${notification.target}:${notification.messageTs}`;
+      const notificationKey = approvalCancellationNotificationKey(notification.target, notification.messageTs);
       const claim = await claimApprovalCancellationNotification2(approval.id, notificationKey);
       if (!claim)
         continue;
@@ -3441,16 +3446,18 @@ class SystemOneDecisionExecutor extends BaseExecutor {
 
 // src/workflows/foreach-join.ts
 init_db3();
+init_workflow_runs();
 
 // src/workflows/checkpoint.ts
 init_db3();
+init_workflow_runs();
 async function holdsFence(runId, stepId, fence) {
   const row = await getDbClient2().get(`SELECT 1 AS found
        FROM workflow_run_steps s
        JOIN workflow_runs r ON r.id = s.runId
       WHERE s.id = ? AND s.runId = ? AND s.status = 'running' AND s.retryCount = ?
         AND r.status IN ('running', 'waiting')`, [stepId, runId, fence.retryCount]);
-  return row != null;
+  return row != null && await getRunLineageBlock(runId) == null;
 }
 async function checkpointStep(runId, stepId, nodeId, result, ctx, options = {}) {
   return getDbClient2().transaction(async () => {
@@ -3511,6 +3518,8 @@ async function checkpointStepFailure(runId, stepId, error, retryCount, retryPoli
 }
 async function checkpointStepWaiting(runId, stepId, ctx, options = {}) {
   return getDbClient2().transaction(async () => {
+    if (await getRunLineageBlock(runId))
+      return false;
     const step = await getDbClient2().get(`UPDATE workflow_run_steps
          SET status = 'waiting'
        WHERE id = ? AND runId = ? AND status = 'running'
@@ -3547,6 +3556,7 @@ function calculateBackoff(policy, attempt) {
 
 // src/workflows/foreach-driver.ts
 init_db3();
+init_workflow_runs();
 
 // src/workflows/constants.ts
 var FAILED_TASK_OUTPUT_PREFIX = "[FAILED:";
@@ -3943,12 +3953,16 @@ async function resolveRenderedWorkflowInputs(input) {
 async function startWorkflowExecution2(workflow, triggerData, registry, options = {}) {
   const preflight = preflightAutomation(workflowPreflightInput(workflow), await getAutomationSetupStates());
   if (preflight.state === "needs_setup" && !options.parentStepId) {
-    const { runId, recorded } = await recordWorkflowPreflightFailure({
-      workflowId: workflow.id,
-      triggerType: options.triggerType ?? "manual",
-      triggerData,
-      failureReason: preflight.failureReason,
-      createdBy: options.requestedByUserId
+    const { runId, recorded } = await getDbClient2().transaction(async () => {
+      const failure = await recordWorkflowPreflightFailure({
+        workflowId: workflow.id,
+        triggerType: options.triggerType ?? "manual",
+        triggerData,
+        failureReason: preflight.failureReason,
+        createdBy: options.requestedByUserId
+      });
+      await options.accept?.({ runId: failure.runId, skipped: false });
+      return failure;
     });
     if (recorded)
       await notifyAutomationPreflightFailure(preflight);
@@ -4067,6 +4081,7 @@ async function createRunWithInitialState(workflow, triggerData, options, initial
     });
     await updateWorkflowRun2(runId, initial.status ? { status: initial.status, error: initial.error, finishedAt: initial.finishedAt } : { context: initial.context });
     const preflightAlert = initial.status === "failed" && initial.preflight ? await isFirstWorkflowPreflightFailureToday(workflow.id, runId) : undefined;
+    await options.accept?.({ runId, skipped: initial.status === "skipped" });
     return { runId, created: true, preflightAlert };
   });
 }
@@ -4228,6 +4243,8 @@ async function walkGraphOwned(def, runId, ctx, startNodes, registry, workflowId,
     const run = await getWorkflowRun2(runId);
     if (!run || run.status !== "running")
       return;
+    if (await getRunLineageBlock(runId))
+      return;
     const finalSteps = await getWorkflowRunStepsByRunId2(runId);
     if (hasRunningStep(finalSteps))
       return;
@@ -4336,6 +4353,8 @@ async function executeStep(def, runId, ctx, node, registry, workflowId, secretKe
     if (!run || run.status !== "running" && run.status !== "waiting") {
       return { halted: true };
     }
+    if (await getRunLineageBlock(runId))
+      return { halted: true };
     if (node.type !== "foreach") {
       const current = await getCurrentStepForNode2(runId, node.id, getAllPredecessors(def, node.id));
       if (current && (current.status !== "running" || executingSteps.has(current.id))) {
@@ -4517,7 +4536,7 @@ async function runClaimedStep(def, runId, ctx, node, registry, existingStep, ste
     }
     const waiting = await checkpointStepWaiting(runId, stepId, ctx);
     if (waiting && result.waitFor === "workflow.child.finished") {
-      const { resumeFromChildRun } = await import("./resume-2dvq348g.js");
+      const { resumeFromChildRun } = await import("./resume-8ayf37g5.js");
       await resumeFromChildRun(stepId, registry);
     }
     return { outcome: waiting ? "waiting" : "completed", successors: [] };
@@ -4809,7 +4828,7 @@ class ForeachExecutor extends BaseExecutor {
       };
     }));
     const childSteps = (await this.deps.db.getWorkflowRunStepsByRunId(meta.runId)).filter((step) => parseSyntheticNodeId(step.nodeId)?.parentNodeId === meta.nodeId);
-    if (childSteps.every((step) => FOREACH_TERMINAL_STEP_STATUSES.has(step.status))) {
+    if (childSteps.every(isForeachChildSettled)) {
       return { status: "success", output: buildForeachAggregate(childSteps) };
     }
     return {
@@ -4979,7 +4998,7 @@ async function runForeachDrive(runId, parentNodeId, registry) {
     if (drive.successors.length > 0) {
       await walkGraph(workflow.definition, runId, ctx, drive.successors, registry, workflow.id, getSecretInputKeys(workflow.input));
     } else {
-      const { finalizeOrWait } = await import("./resume-2dvq348g.js");
+      const { finalizeOrWait } = await import("./resume-8ayf37g5.js");
       await finalizeOrWait(runId);
     }
     return drive;
@@ -5018,6 +5037,11 @@ async function claimChildren(def, runId, parentNode) {
   const claimed = [];
   try {
     await getDbClient2().transaction(async () => {
+      const status = await getWorkflowRunStatus(runId);
+      if (status !== "running" && status !== "waiting")
+        return;
+      if (await getRunLineageBlock(runId))
+        return;
       const children = latestForeachChildren(def, parentNode.id, await getWorkflowRunStepsByRunId2(runId));
       for (const child of children) {
         if (child.status === "running" && !ownedChildren.has(child.id)) {
@@ -5025,7 +5049,7 @@ async function claimChildren(def, runId, parentNode) {
           claimed.push(child);
         }
       }
-      const inFlight = children.filter((child) => child.status === "running" || child.status === "waiting").length;
+      const inFlight = children.filter((child) => child.status === "running" || child.status === "waiting" || isRetryPending(child)).length;
       let free = foreachConcurrencyCap(parentNode) - inFlight;
       for (const child of children) {
         if (free <= 0)
@@ -5121,7 +5145,7 @@ async function startChild(input) {
     const parked = await getDbClient2().get("UPDATE workflow_run_steps SET status = 'waiting' WHERE id = ? AND status = 'running' RETURNING id", [child.id]);
     if (parked && result.waitFor === "workflow.child.finished") {
       ownedChildren.delete(child.id);
-      const { resumeFromChildRun } = await import("./resume-2dvq348g.js");
+      const { resumeFromChildRun } = await import("./resume-8ayf37g5.js");
       await resumeFromChildRun(child.id, registry);
     }
     return null;
@@ -5162,6 +5186,12 @@ var FOREACH_TERMINAL_STEP_STATUSES = new Set([
   "cancelled",
   "skipped"
 ]);
+function isRetryPending(step) {
+  return step.status === "failed" && step.nextRetryAt != null;
+}
+function isForeachChildSettled(step) {
+  return FOREACH_TERMINAL_STEP_STATUSES.has(step.status) && !isRetryPending(step);
+}
 function parseSyntheticNodeId(nodeId) {
   const separatorIndex = nodeId.indexOf("#");
   if (separatorIndex <= 0 || separatorIndex === nodeId.length - 1)
@@ -5184,7 +5214,7 @@ async function joinForeach(def, runId, childStep, ctx) {
     throw new Error(`Step "${childStep.nodeId}" is not a foreach child`);
   }
   const children = latestForeachChildren(def, parent.id, await getWorkflowRunStepsByRunId2(runId));
-  if (children.some((step) => !FOREACH_TERMINAL_STEP_STATUSES.has(step.status))) {
+  if (children.some((step) => !isForeachChildSettled(step))) {
     return { joined: false, parentNodeId: parent.id, successors: [] };
   }
   const parentStep = await getLatestStepForNode2(runId, parent.id);
@@ -5274,6 +5304,8 @@ async function settleForeachChild(def, runId, childStepId, outcome, ctx, options
     });
     if (run.status !== "running" && run.status !== "waiting")
       return unclaimed;
+    if (await getRunLineageBlock(runId))
+      return unclaimed;
     if (outcome.status !== "completed" && effectiveFailurePolicy(parent, def) === "fail-fast") {
       const reason = options.runError ?? outcome.error ?? `foreach item ${current.nodeId} failed`;
       await cancelQueuedForeachChildren(def, runId, parent.id, current.nodeId);
@@ -5303,9 +5335,11 @@ async function cancelQueuedForeachChildren(def, runId, parentNodeId, failedChild
   await getDbClient2().transaction(async () => {
     const children = latestForeachChildren(def, parentNodeId, await getWorkflowRunStepsByRunId2(runId));
     for (const child of children) {
-      if (child.status !== "pending")
+      if (child.status !== "pending" && !isRetryPending(child))
         continue;
-      const row = await getDbClient2().get("UPDATE workflow_run_steps SET status = 'cancelled', error = ?, finishedAt = ? WHERE id = ? AND status = 'pending' RETURNING id", [error, finishedAt, child.id]);
+      const row = await getDbClient2().get(`UPDATE workflow_run_steps SET status = 'cancelled', error = ?, finishedAt = ?, nextRetryAt = NULL
+          WHERE id = ? AND (status = 'pending' OR (status = 'failed' AND nextRetryAt IS NOT NULL))
+          RETURNING id`, [error, finishedAt, child.id]);
       if (row)
         cancelled++;
     }
@@ -5732,4 +5766,4 @@ function applyDefinitionPatch(def, patch) {
   return { definition: patchedDef, errors };
 }
 
-export { notifyAutomationPreflightFailure, automationIntegrationFixUrl, isNeedsSetupFailure, preflightAutomation, renderAutomationTokens, getAutomationSetupStates, schedulePreflightInput, listEnabledAutomationPreflightInputs, recordSchedulePreflightFailure, BaseExecutor, AGENT_MAX_TASKS_CONFIG_KEY, reconcileAgentMaxTasksPolicy, resetAgentMaxTasksMirror, upsertSwarmConfigWithPolicyMirror, runtimeStaleThresholdMinutes, upsertRuntimeInstance, getRuntimeInstanceById, insertProvisioningRuntime, markRuntimeTerminated, touchRuntimeInstance, markRuntimeInstanceOffline, countActiveRuntimeInstancesForAgent, listRuntimeInstancesForAgent, setRuntimeCredentialReady, reconcileAgentStatusFromRuntimes, agentsWithLiveRuntime, expireStaleRuntimeInstances, listRuntimeInstancesForPool, ConfigQuestionSettingsSchema, ConfigStateSchema, readConfigState, normalizeApprovalQuestions, isConfigQuestion, parseConfigAnswer, skippedConfigResult, keptConfigResult, applyConfigAnswer, resolveSlackConversationId, dispatchApprovalNotifications, postApprovalCancellationUpdates, createApprovalFollowUpTask, HumanInTheLoopExecutor, resolveWorkflowLlmConfig, SYSTEM_ONE_PROVIDER_IDS, SystemOneExtractionExecutor, SYSTEM_ONE_DECISION_NODE_TYPE, SystemOneDecisionConfigSchema, SystemOneDecisionExecutor, checkpointStep, checkpointStepFailure, checkpointStepWaiting, FAILED_TASK_OUTPUT_PREFIX, FOREACH_ITEMS_WAIT_FOR, loadCompletedStepRouting, resolveInputValue, getSecretInputKeys, validateJsonSchema, findJsonSchemaShapeErrors, getMaxWorkflowStepsPerRun, findWorkflowReadinessProblems, formatReadinessProblems, workflowSaveWarnings, withSaveWarnings, runStepValidation, TriggerSchemaError, startWorkflowExecution2, ParentStepNotCurrentError, failRunOnUnreadableReplay, isWorkflowRunActive, isStepExecuting, holdWorkflowRun, walkGraph, hasRunningStep, findReadyNodes, scriptBodyInterpolationError, ForeachExecutor, rebuildNodeExecutionInput, isForeachChildOwned, parkAndDriveForeach, startForeachDrive, runForeachDrive, FOREACH_TERMINAL_STEP_STATUSES, parseSyntheticNodeId, resolveForeachParent, settleForeachChild, resolveStepNode, stepFailureMode, getNextTargets, generateEdges, resolveValidationPort, getSuccessors, definitionNodeIds, validateDefinition, applyDefinitionPatch };
+export { notifyAutomationPreflightFailure, automationIntegrationFixUrl, isNeedsSetupFailure, preflightAutomation, renderAutomationTokens, getAutomationSetupStates, schedulePreflightInput, listEnabledAutomationPreflightInputs, recordSchedulePreflightFailure, BaseExecutor, AGENT_MAX_TASKS_CONFIG_KEY, reconcileAgentMaxTasksPolicy, resetAgentMaxTasksMirror, upsertSwarmConfigWithPolicyMirror, runtimeStaleThresholdMinutes, upsertRuntimeInstance, getRuntimeInstanceById, insertProvisioningRuntime, markRuntimeTerminated, touchRuntimeInstance, markRuntimeInstanceOffline, countActiveRuntimeInstancesForAgent, listRuntimeInstancesForAgent, setRuntimeCredentialReady, reconcileAgentStatusFromRuntimes, agentsWithLiveRuntime, expireStaleRuntimeInstances, listRuntimeInstancesForPool, ConfigQuestionSettingsSchema, ConfigStateSchema, readConfigState, normalizeApprovalQuestions, isConfigQuestion, parseConfigAnswer, skippedConfigResult, keptConfigResult, applyConfigAnswer, resolveSlackConversationId, dispatchApprovalNotifications, postApprovalCancellationUpdates, createApprovalFollowUpTask, HumanInTheLoopExecutor, resolveWorkflowLlmConfig, SYSTEM_ONE_PROVIDER_IDS, SystemOneExtractionExecutor, SYSTEM_ONE_DECISION_NODE_TYPE, SystemOneDecisionConfigSchema, SystemOneDecisionExecutor, checkpointStep, checkpointStepFailure, checkpointStepWaiting, FAILED_TASK_OUTPUT_PREFIX, FOREACH_ITEMS_WAIT_FOR, loadCompletedStepRouting, resolveInputValue, getSecretInputKeys, validateJsonSchema, findJsonSchemaShapeErrors, getMaxWorkflowStepsPerRun, findWorkflowReadinessProblems, formatReadinessProblems, workflowSaveWarnings, withSaveWarnings, runStepValidation, TriggerSchemaError, startWorkflowExecution2, ParentStepNotCurrentError, failRunOnUnreadableReplay, isWorkflowRunActive, isStepExecuting, holdWorkflowRun, walkGraph, hasRunningStep, findReadyNodes, scriptBodyInterpolationError, ForeachExecutor, rebuildNodeExecutionInput, isForeachChildOwned, parkAndDriveForeach, startForeachDrive, runForeachDrive, FOREACH_TERMINAL_STEP_STATUSES, isRetryPending, parseSyntheticNodeId, resolveForeachParent, settleForeachChild, resolveStepNode, stepFailureMode, getNextTargets, generateEdges, resolveValidationPort, getSuccessors, definitionNodeIds, validateDefinition, applyDefinitionPatch };

package/dist/{cli-p9rafdrb.js → cli-3gfvmzht.js}

@@ -40,14 +40,14 @@ import {
   getResolvedConfig2,
   getMcpServerById2,
   init_db3
-} from "./cli-kxawjrxg.js";
+} from "./cli-g8ka5j4j.js";
 import {
   generateRandomCodeVerifier,
   generateRandomState,
   calculatePKCECodeChallenge,
   oauthAppRowToProviderConfig,
   ensureAuthorizationTokenOrThrow
-} from "./cli-egjggehm.js";
+} from "./cli-kf4jree9.js";
 import {
   detachedProcessGroup,
   registerProcessGroup,
@@ -60,11 +60,11 @@ import {
   mintScriptRunToken,
   revokeSessionToken,
   init_users
-} from "./cli-e8jyq7d8.js";
+} from "./cli-esakngh8.js";
 import {
   defaultAssetKey,
   init_key
-} from "./cli-mz9afxxf.js";
+} from "./cli-4rf0f5vg.js";
 import {
   init_zod
 } from "./cli-4chz1hye.js";
@@ -105,7 +105,7 @@ import {
   refreshSecretScrubberCache,
   registerVolatileSecret,
   init_secret_scrubber
-} from "./cli-n4c8e3s5.js";
+} from "./cli-708wdy32.js";
 import {
   __toESM,
   __commonJS,
@@ -176111,7 +176111,7 @@ async function resolveSqlDsn(connection, agentId) {
   assertPostgresDsn(dsn);
   return dsn;
 }
-var asTemplate = (text) => Object.assign([text], { raw: [text] });
+var asTemplate = (text) => Object.freeze(Object.defineProperty([text], "raw", { value: Object.freeze([text]) }));
 var defaultExecutor = async (dsn, query, params, take) => {
   const sql = new Bun.SQL({
     adapter: "postgres",
@@ -184236,7 +184236,7 @@ export interface SwarmSdk {
   workflow_list(args?: { enabled?: boolean; includeFull?: boolean; consecutiveErrorsMin?: number; lastRunStatus?: "running" | "waiting" | "completed" | "failed" | "skipped" | "cancelled" }): Promise<unknown>;
   workflow_get(args: { id: string }): Promise<unknown>;
   workflow_listRuns(args: { workflowId: string; status?: "running" | "waiting" | "completed" | "failed" | "skipped" | "cancelled"; limit?: number; offset?: number }): Promise<unknown>;
-  workflow_getRun(args: { id: string }): Promise<unknown>;
+  workflow_getRun(args: { id: string; fields?: "full" | "slim" }): Promise<unknown>;
   // --- prompt templates ---
   prompt_list(args?: { eventType?: string; scope?: "global" | "agent" | "repo"; scopeId?: string; isDefault?: boolean }): Promise<unknown>;
   prompt_get(args: { id: string }): Promise<unknown>;

package/dist/{cli-03vpq45j.js → cli-3ndmpxxv.js}

@@ -9,7 +9,7 @@ import {
   loadMcpConfig,
   addMcpServerConfig,
   removeMcpServerConfig
-} from "./cli-x77gen2p.js";
+} from "./cli-w2656ka1.js";
 import {
   McpOAuthCredentialStore2,
   McpSignInCancelledError2,
@@ -17,7 +17,7 @@ import {
   McpServerLog2,
   createDefaultTransport2,
   McpServerConnection2
-} from "./cli-cz5nmdxt.js";
+} from "./cli-683y0b3a.js";
 
 // node_modules/@earendil-works/pi-coding-agent/dist/extensions/mcp/cli.js
 import { existsSync } from "node:fs";