@desplega.ai/agent-swarm 2.5.3 → 2.5.4

package/dist/{cli-502eqv93.js → cli-s682zgqz.js}

@@ -1,7 +1,7 @@
 import {
   init_package,
   package_default
-} from "./cli-y561h5a9.js";
+} from "./cli-xtrz6bzs.js";
 
 // src/commands/shared/client-config.ts
 init_package();

package/dist/{cli-fsdprwrg.js → cli-sbwsxvtd.js}

@@ -1,7 +1,7 @@
 import {
   getDb2,
   init_db3
-} from "./cli-kxawjrxg.js";
+} from "./cli-jb30dzvk.js";
 import {
   openAICompatibleProviderIds,
   withRegistryCatalogSections,

package/dist/{cli-0xk505e8.js → cli-sxgtf5fw.js}

@@ -2,7 +2,7 @@ import {
   resolveTemplateAsync,
   init_resolver,
   init_session_templates
-} from "./cli-tx00c0h6.js";
+} from "./cli-dqygeeh5.js";
 
 // src/prompts/steering-delivery.ts
 init_session_templates();

package/dist/{cli-egjggehm.js → cli-tsma7p8v.js}

@@ -9,7 +9,7 @@ import {
   acquireOAuthRefreshLock,
   releaseOAuthRefreshLock,
   init_oauth
-} from "./cli-kxawjrxg.js";
+} from "./cli-jb30dzvk.js";
 import {
   scrubSecrets,
   registerVolatileSecret,

package/dist/{cli-qgf8emrn.js → cli-wghjkr0e.js}

@@ -10,7 +10,7 @@ import {
   init_steering,
   createLogEntry2,
   init_db3
-} from "./cli-kxawjrxg.js";
+} from "./cli-jb30dzvk.js";
 import {
   ackSlackMessage,
   buildBufferFlushBlocks,
@@ -20,7 +20,7 @@ import {
   ensureSlackThreadTree2,
   registerTreeMessage,
   getSlackApp2
-} from "./cli-ce0ak9ms.js";
+} from "./cli-abs8ndtr.js";
 import {
   createAdditiveBuffer,
   TaskCreationBlockedError,
@@ -30,15 +30,15 @@ import {
   createSlackTaskWithFiles,
   notifySlackFileFailures,
   extractSlackMessageText
-} from "./cli-aecdcr77.js";
+} from "./cli-asq5ydm4.js";
 import {
   resolveSlackUserId,
   rewriteSlackMentions
-} from "./cli-25j01dpj.js";
+} from "./cli-jbnn4vxb.js";
 import {
   findUserByExternalId,
   init_users
-} from "./cli-e8jyq7d8.js";
+} from "./cli-6a1xg1p7.js";
 import {
   isSteeringEnabled2,
   init_steering_enabled

package/dist/{cli-p0rzjkya.js → cli-wx2nj19m.js}

@@ -1,12 +1,11 @@
+import {
+  contextBoundNoteThreshold,
+  createContextBoundNote
+} from "./cli-2655k16q.js";
 import {
   ampBillsCacheWrites,
   resolveAmpModel
 } from "./cli-9s05422w.js";
-import {
-  CONTEXT_FORMULA,
-  computeContextUsedUnified,
-  clampContextPercent
-} from "./cli-a5ebc95n.js";
 import {
   swarmRuntimeInstanceId
 } from "./cli-e8xyjvfc.js";
@@ -24,6 +23,12 @@ import {
 import {
   applyReasoningEffort
 } from "./cli-bn0rewsy.js";
+import {
+  CONTEXT_FORMULA,
+  computeContextUsedUnified,
+  clampContextPercent,
+  init_context_window
+} from "./cli-0shx9j93.js";
 import {
   scrubSecrets,
   registerVolatileSecret,
@@ -35,8 +40,9 @@ import { existsSync, readFileSync, renameSync, rmSync, writeFileSync } from "nod
 import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
+init_context_window();
 init_secret_scrubber();
-var AMP_PACKAGE = "@ampcode/cli@0.0.1792756861-g6187a2";
+var AMP_PACKAGE = "@ampcode/cli@0.0.1792844927-g360c96";
 var AMP_MCP_SERVER_NAME = "agent-swarm";
 var AMP_PLUGIN_MODE_KEY = "agent-swarm";
 var AMP_LIVE_TEST_TIMEOUT_MS = 5000;
@@ -322,6 +328,7 @@ class AmpSession {
   captures = [];
   steeringSeq = 0;
   steers = new Map;
+  observeContextBound;
   constructor(proc, directory, prompt, run) {
     this.proc = proc;
     this.directory = directory;
@@ -353,6 +360,12 @@ class AmpSession {
         });
       }
     };
+    this.observeContextBound = createContextBoundNote({
+      threshold: contextBoundNoteThreshold(run.env),
+      model: () => run.selection.pin,
+      canDeliver: () => !this.inputClosed && !this.aborted,
+      inject: (note) => this.queueSteering(note, true)
+    });
     this.completion = this.runSession(prompt);
   }
   onEvent(listener) {
@@ -375,13 +388,13 @@ class AmpSession {
     await this.stdin.write(userMessage(text));
     await this.stdin.flush?.();
   }
-  queueSteering(text) {
+  queueSteering(text, internal = false) {
     const name = `${String(++this.steeringSeq).padStart(6, "0")}.json`;
     const temp = join(this.run.steeringInbox, `.${name}.tmp`);
     writeFileSync(temp, JSON.stringify(text), { mode: 384 });
     renameSync(temp, join(this.run.steeringInbox, name));
     return new Promise((resolve) => {
-      this.steers.set(name, { text, via: "inbox", resolve });
+      this.steers.set(name, { text, via: "inbox", internal, resolve });
     });
   }
   inboxPath(name, suffix = "") {
@@ -446,7 +459,7 @@ class AmpSession {
         continue;
       }
       steer.via = "stdin";
-      taken.push({ name, text: steer.text });
+      taken.push({ name, text: steer.text, internal: steer.internal });
     }
     return taken;
   }
@@ -482,7 +495,11 @@ class AmpSession {
   onTurnEnd() {
     if (this.inputClosed)
       return;
-    for (const { name, text } of this.takeSteering()) {
+    for (const { name, text, internal } of this.takeSteering()) {
+      if (internal) {
+        this.settleSteer(name, { delivered: false, reason: "no tool result carried the note" });
+        continue;
+      }
       this.writeInput(text).catch((error) => {
         this.settleSteer(name, {
           delivered: false,
@@ -581,6 +598,8 @@ class AmpSession {
       });
       if (used > 0)
         this.emitContext(used, output, null);
+      if (topLevel && calledTool)
+        this.observeContextBound(input + cacheRead + cacheCreation);
     }
     if (topLevel && !calledTool && message.stop_reason !== "tool_use")
       this.onTurnEnd();

package/dist/{cli-e2ar4bp1.js → cli-x0f2v69c.js}

@@ -1,7 +1,18 @@
 import {
   getDbClient2,
+  listUndeliveredCancelledApprovalRequestIds,
+  init_approvals,
   getTaskById2,
   cancelTask2,
+  getRunLineageBlock,
+  getWorkflowRunTreeIds,
+  getWorkflowRunStatus,
+  getOpenWorkflowTreeTaskIds,
+  getTaskIdsWithDependents,
+  workflowRunTreeHasOpenWork,
+  cancelOpenWorkflowTreeSteps,
+  disarmWorkflowTreeRetries,
+  cancelLiveWorkflowTreeRuns,
   getChildWorkflowRunId,
   getWorkflowRunLineage,
   createForeachAttemptSteps,
@@ -15,14 +26,14 @@ import {
   getCompletedStepNodeIds2,
   getTaskByWorkflowRunStepId2,
   detachTaskFromWorkflowRunStep2,
+  getApprovalRequestById2,
   cancelPendingApprovalRequestsForRun2,
-  listCancelledApprovalRequestsForRun2,
   getWaitStateById2,
   getPendingEventWaitNames2,
   getPendingWaitsByEvent2,
   resolveWaitState2,
   init_db3
-} from "./cli-kxawjrxg.js";
+} from "./cli-jb30dzvk.js";
 import {
   BaseExecutor,
   postApprovalCancellationUpdates,
@@ -42,6 +53,7 @@ import {
   findReadyNodes,
   startForeachDrive,
   FOREACH_TERMINAL_STEP_STATUSES,
+  isRetryPending,
   parseSyntheticNodeId,
   resolveForeachParent,
   settleForeachChild,
@@ -49,7 +61,7 @@ import {
   stepFailureMode,
   getNextTargets,
   getSuccessors
-} from "./cli-jjznk3f7.js";
+} from "./cli-gbfxp48k.js";
 import {
   workflowEventBus2,
   init_event_bus
@@ -98,6 +110,7 @@ function shapeApprovalResolution(registry, definition, nodeId, parkedOutput, app
 
 // src/workflows/resume.ts
 init_db3();
+init_approvals();
 init_workflow_runs();
 init_types();
 init_secret_scrubber();
@@ -490,6 +503,7 @@ function computeNextPort(mode, status) {
 
 // src/workflows/task-step-routing.ts
 init_db3();
+init_workflow_runs();
 init_types();
 var UNCLAIMED = {
   claimed: false,
@@ -547,6 +561,8 @@ async function checkpointPortStepAndResolveSuccessors(def, runId, stepId, nodeId
     if (!run || run.status !== "waiting" && run.status !== "running") {
       return UNCLAIMED;
     }
+    if (await getRunLineageBlock(runId))
+      return UNCLAIMED;
     if (resolveForeachParent(def, nodeId)) {
       return toRoutingResult(await settleForeachChild(def, runId, stepId, { status: "completed", output, nextPort }, ctx, {
         registry
@@ -570,12 +586,14 @@ var SUPERSEDE_RETRY_POLICY = {
   maxDelayMs: 30000
 };
 async function scheduleTaskStepRetry(def, runId, step, taskId, reason) {
-  const node = def.nodes.find((n) => n.id === step.nodeId);
+  const foreachParent = resolveForeachParent(def, step.nodeId);
+  const node = resolveStepNode(def, step.nodeId);
   if (!node || node.type !== "agent-task")
     return "not-eligible";
+  const declaredRetry = foreachParent ? foreachParent.retry : node.retry;
   let policy;
-  if (node.retry) {
-    const parsed = RetryPolicySchema.safeParse(node.retry);
+  if (declaredRetry) {
+    const parsed = RetryPolicySchema.safeParse(declaredRetry);
     if (!parsed.success)
       return "not-eligible";
     policy = parsed.data;
@@ -590,6 +608,13 @@ async function scheduleTaskStepRetry(def, runId, step, taskId, reason) {
       return "not-claimed";
     if (!await isTaskBoundToStep(taskId, step.id))
       return "not-claimed";
+    if (foreachParent) {
+      const run = await getWorkflowRun2(runId);
+      if (run?.status !== "running" && run?.status !== "waiting")
+        return "not-eligible";
+    }
+    if (await getRunLineageBlock(runId))
+      return "not-claimed";
     if (current.retryCount >= policy.maxRetries)
       return "not-eligible";
     await detachTaskFromWorkflowRunStep2(taskId);
@@ -610,6 +635,8 @@ async function completeTaskStepAndResolveSuccessors(def, runId, step, output, ct
       return UNCLAIMED;
     if (ownerTaskId && !await isTaskBoundToStep(ownerTaskId, step.id))
       return UNCLAIMED;
+    if (await getRunLineageBlock(runId))
+      return UNCLAIMED;
     if (resolveForeachParent(def, step.nodeId)) {
       return toRoutingResult(await settleForeachChild(def, runId, step.id, {
         status: "completed",
@@ -750,10 +777,14 @@ async function resumeFromTaskCompletionUnguarded(event, registry) {
 }
 async function finalizeOrWait2(runId) {
   await getDbClient2().transaction(async () => {
+    const status = await getWorkflowRunStatus(runId);
+    if (status !== "running" && status !== "waiting")
+      return;
+    if (await getRunLineageBlock(runId))
+      return;
     const steps = await getWorkflowRunStepsByRunId2(runId);
     if (hasRunningStep(steps)) {
-      const run = await getWorkflowRun2(runId);
-      if (run?.status === "waiting")
+      if (status === "waiting")
         await updateWorkflowRun2(runId, { status: "running" });
       return;
     }
@@ -872,6 +903,9 @@ async function retryFailedRun2(runId, registry) {
     const current = await getWorkflowRun2(runId);
     if (!current || current.status !== "failed")
       return null;
+    const blocked = await getRunLineageBlock(runId);
+    if (blocked)
+      throw new Error(`Retry not started, run left failed: ${blocked}`);
     const currentSteps = await getWorkflowRunStepsByRunId2(runId);
     const attempts = foreachRetryAttempts(workflow.definition, [
       ...latestStepPerNode(currentSteps).values()
@@ -879,6 +913,11 @@ async function retryFailedRun2(runId, registry) {
     const capError = foreachRetryCapError(currentSteps.length, attempts);
     if (capError)
       throw new Error(`Retry not started, run left failed: ${capError}`);
+    for (const step of currentSteps) {
+      if (isRetryPending(step) && resolveForeachParent(workflow.definition, step.nodeId)) {
+        await updateWorkflowRunStep2(step.id, { nextRetryAt: null });
+      }
+    }
     if (!foreachParent) {
       await updateWorkflowRunStep2(failedStep.id, {
         status: shouldRetryFailedNode ? "pending" : "cancelled",
@@ -941,52 +980,80 @@ function foreachRetryCapError(existingSteps, attempts) {
     return null;
   return `foreach retry would reach ${maxSteps} total steps (WORKFLOW_MAX_STEPS_PER_RUN): ${existingSteps} existing + ${added} new attempts leaves no room for the retry walk`;
 }
+var TERMINAL_RUN_STATUSES = new Set(["completed", "failed", "cancelled", "skipped"]);
 async function cancelWorkflowRunRows2(runId, cancelReason) {
-  const terminalStatuses = ["completed", "failed", "cancelled", "skipped"];
   const now = new Date().toISOString();
+  const settledTree = await getDbClient2().transaction(async () => {
+    if (await getWorkflowRunStatus(runId) !== "cancelled")
+      return null;
+    const ids = await getWorkflowRunTreeIds(runId);
+    return await workflowRunTreeHasOpenWork(ids) ? null : ids;
+  }, { readOnly: true });
+  if (settledTree)
+    return { cancelled: false, runIds: settledTree };
   return await getDbClient2().transaction(async () => {
-    const current = await getWorkflowRun2(runId);
-    if (!current || terminalStatuses.includes(current.status))
-      return false;
-    const steps = await getWorkflowRunStepsByRunId2(runId);
-    for (const step of steps) {
-      if (terminalStatuses.includes(step.status))
-        continue;
-      const task = await getTaskByWorkflowRunStepId2(step.id);
-      if (task) {
-        await cancelTask2(task.id, cancelReason);
-      }
-      await updateWorkflowRunStep2(step.id, {
-        status: "cancelled",
-        error: cancelReason,
-        finishedAt: now
-      });
+    const rootStatus = await getWorkflowRunStatus(runId);
+    if (!rootStatus || TERMINAL_RUN_STATUSES.has(rootStatus) && rootStatus !== "cancelled") {
+      return { cancelled: false, runIds: [] };
     }
-    await cancelPendingApprovalRequestsForRun2(runId, cancelReason);
-    await updateWorkflowRun2(runId, {
-      status: "cancelled",
-      error: cancelReason,
-      finishedAt: now
-    });
-    return true;
+    const runIds = await getWorkflowRunTreeIds(runId);
+    const openTaskIds = await getOpenWorkflowTreeTaskIds(runIds);
+    const withDependents = openTaskIds.length > 0 ? await getTaskIdsWithDependents() : new Set;
+    for (const taskId of openTaskIds) {
+      await cancelTask2(taskId, cancelReason, { cascadeDependents: withDependents.has(taskId) });
+    }
+    await cancelOpenWorkflowTreeSteps(runIds, cancelReason, now);
+    await disarmWorkflowTreeRetries(runIds, now);
+    for (const id of runIds)
+      await cancelPendingApprovalRequestsForRun2(id, cancelReason);
+    await cancelLiveWorkflowTreeRuns(runIds.slice(1), cancelReason, now);
+    if (rootStatus !== "cancelled") {
+      await updateWorkflowRun2(runId, { status: "cancelled", error: cancelReason, finishedAt: now });
+    }
+    return { cancelled: rootStatus !== "cancelled", runIds };
   });
 }
-async function cancelWorkflowRun2(runId, reason) {
-  const run = await getWorkflowRun2(runId);
+var inFlightCancels = new Map;
+function cancelWorkflowRun2(runId, reason) {
+  const inFlight = inFlightCancels.get(runId);
+  if (inFlight)
+    return inFlight;
+  const cancel = cancelWorkflowRunOnce(runId, reason).finally(() => {
+    inFlightCancels.delete(runId);
+  });
+  inFlightCancels.set(runId, cancel);
+  return cancel;
+}
+async function cancelWorkflowRunOnce(runId, reason) {
+  const run = await getWorkflowRun2(runId, "display");
   if (!run)
     throw new Error("Workflow run not found");
-  const terminalStatuses = ["completed", "failed", "cancelled", "skipped"];
-  if (terminalStatuses.includes(run.status) && run.status !== "cancelled") {
+  if (TERMINAL_RUN_STATUSES.has(run.status) && run.status !== "cancelled") {
     throw new Error(`Cannot cancel run in '${run.status}' state`);
   }
   const cancelReason = reason ?? "Cancelled by user";
-  const applied = await cancelWorkflowRunRows2(runId, cancelReason);
-  const cancelledApprovals = await listCancelledApprovalRequestsForRun2(runId);
-  const latestRun = await getWorkflowRun2(runId);
-  if (!applied && latestRun?.status !== "cancelled") {
+  const { cancelled, runIds } = await cancelWorkflowRunRows2(runId, cancelReason);
+  const latestRun = await getWorkflowRun2(runId, "display");
+  if (!cancelled && latestRun?.status !== "cancelled") {
     throw new Error(`Cannot cancel run in '${latestRun?.status ?? "missing"}' state`);
   }
-  await postApprovalCancellationUpdates(cancelledApprovals, applied ? cancelReason : latestRun?.error ?? cancelReason);
+  await postTreeApprovalCancellations2(runIds, cancelled ? cancelReason : latestRun?.error ?? cancelReason);
+}
+async function postTreeApprovalCancellations2(runIds, reason, options = {}) {
+  try {
+    const approvals = [];
+    for (const id of await listUndeliveredCancelledApprovalRequestIds(runIds)) {
+      if (id === options.exceptRequestId)
+        continue;
+      const approval = await getApprovalRequestById2(id);
+      if (approval)
+        approvals.push(approval);
+    }
+    if (approvals.length > 0)
+      await postApprovalCancellationUpdates(approvals, reason);
+  } catch (err) {
+    console.error("[workflows] approval cancellation updates not posted:", scrubSecrets(err instanceof Error ? err.message : String(err)));
+  }
 }
 async function resumeFromApprovalResolution(event, registry) {
   await failClosedOnUnreadableReplay(event.workflowRunId, event.workflowRunStepId, () => resumeFromApprovalResolutionUnguarded(event, registry));
@@ -1084,6 +1151,8 @@ async function resumeFromChildRun2(parentStepId, registry) {
       const current = await getWorkflowRunStep2(step.id);
       if (!current || current.status !== "waiting")
         return null;
+      if (await getRunLineageBlock(run.id))
+        return null;
       const childId = await getChildWorkflowRunId(step.id, current.retryCount);
       const child = childId ? await getWorkflowRun2(childId) : null;
       const outcome = child ? childRunOutcome(child) : { error: `Child workflow run of step ${parentStepId} was deleted`, retryable: false };
@@ -1241,4 +1310,4 @@ function isPayloadInRun(payload, runId) {
   const rec = payload;
   return rec._runId === runId || rec.workflowRunId === runId;
 }
-export { shapeApprovalResolution, SubWorkflowExecutor, WaitExecutor, failStepAndRunIfWaiting, checkpointPortStepAndResolveSuccessors, scheduleTaskStepRetry, completeTaskStepAndResolveSuccessors, setupWorkflowResumeListener2, finalizeOrWait2, retryFailedRun2, cancelWorkflowRunRows2, cancelWorkflowRun2, resumeWaitState2, recoverResolvedWaitState2, resumeFromChildRun2, initWaitBusSubscriptions2, subscribeWaitToBus2 };
+export { shapeApprovalResolution, SubWorkflowExecutor, WaitExecutor, failStepAndRunIfWaiting, checkpointPortStepAndResolveSuccessors, scheduleTaskStepRetry, completeTaskStepAndResolveSuccessors, setupWorkflowResumeListener2, finalizeOrWait2, retryFailedRun2, cancelWorkflowRunRows2, cancelWorkflowRun2, postTreeApprovalCancellations2, resumeWaitState2, recoverResolvedWaitState2, resumeFromChildRun2, initWaitBusSubscriptions2, subscribeWaitToBus2 };

package/dist/{cli-y561h5a9.js → cli-xtrz6bzs.js}

@@ -7,7 +7,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@desplega.ai/agent-swarm",
-    version: "2.5.3",
+    version: "2.5.4",
     description: "agent-swarm.dev — an open-source operating system for AI work: a lead agent breaks goals into tasks, routes them to specialized workers such as Claude Code or Codex, runs each worker in an isolated container, and preserves shared memory, tools, schedules, and review gates so delegated work compounds across sessions.",
     keywords: [
       "agent-swarm.dev",
@@ -61,7 +61,7 @@ var init_package = __esm(() => {
     config: {
       name: "agent-swarm"
     },
-    packageManager: "bun@1.4.3",
+    packageManager: "bun@1.4.4",
     workspaces: [
       "apps/ui",
       "apps/templates-ui",
@@ -206,10 +206,10 @@ var init_package = __esm(() => {
       bun: ">=1.3.12"
     },
     dependencies: {
-      "@agentclientprotocol/sdk": "2.0.1",
+      "@agentclientprotocol/sdk": "2.0.2",
       "@ai-sdk/openai": "^3.0.41",
-      "@anthropic-ai/claude-agent-sdk": "0.3.309",
-      "@anthropic-ai/sdk": "^1.2.0",
+      "@anthropic-ai/claude-agent-sdk": "0.3.310",
+      "@anthropic-ai/sdk": "^1.3.0",
       "@asteasolutions/zod-to-openapi": "^8.0.0",
       "@aws-sdk/client-bedrock": "3.1048.0",
       "@chat-adapter/discord": "4.41.1",

package/dist/{cli-gpsz7g88.js → cli-xzfq4at3.js}

@@ -10,7 +10,7 @@ import {
   getMostRecentTaskInThread2,
   reactionName,
   init_db3
-} from "./cli-kxawjrxg.js";
+} from "./cli-jb30dzvk.js";
 import {
   TaskCreationBlockedError,
   buildEffectiveText,
@@ -23,7 +23,7 @@ import {
   extractTaskFromMessage,
   extractSlackMessageText,
   dispatchPre2
-} from "./cli-aecdcr77.js";
+} from "./cli-asq5ydm4.js";
 import {
   noteSlackInboundSideEffect,
   ignoreSlackInbound,
@@ -34,14 +34,14 @@ import {
   isSlackRenderV2Enabled2,
   ensureSlackThreadTree2,
   registerTreeMessage
-} from "./cli-ce0ak9ms.js";
+} from "./cli-abs8ndtr.js";
 import {
   isBlockExternalEnabled2,
   invalidateChannelExternality2,
   getChannelBlockReason2,
   shouldBlockChannel2,
   leaveExternalChannel2
-} from "./cli-s53vp709.js";
+} from "./cli-eftzyh9y.js";
 import {
   workflowEventBus2,
   init_event_bus
@@ -50,7 +50,7 @@ import {
   enrichSlackUserEmail,
   resolveSlackUserId,
   rewriteSlackMentions
-} from "./cli-25j01dpj.js";
+} from "./cli-jbnn4vxb.js";
 import {
   wasEventSeen,
   requestSlackThreadSteering,
@@ -58,11 +58,11 @@ import {
   bufferThreadMessage,
   getBufferMessageCount,
   instantFlush
-} from "./cli-qgf8emrn.js";
+} from "./cli-wghjkr0e.js";
 import {
   resolveTemplate,
   init_resolver
-} from "./cli-tx00c0h6.js";
+} from "./cli-dqygeeh5.js";
 import {
   init_zod
 } from "./cli-4chz1hye.js";