@desplega.ai/agent-swarm 1.147.0 → 1.149.0

package/dist/{cli-atcve9y8.js → cli-yb9qhqam.js}

@@ -2,7 +2,7 @@ import {
   COMPOSIO_HTTP_METHODS,
   composioArgsFromParts,
   executeComposioRequest
-} from "./cli-8fc8de14.js";
+} from "./cli-0z2v4nhw.js";
 import {
   LlmRater,
   REFERENCES_SOURCE_MAX_LENGTH,
@@ -10,18 +10,19 @@ import {
 } from "./cli-xvkmedgn.js";
 import {
   calculateNextRun,
+  reconcileDeferredTaskWaits,
   runScheduleNow
-} from "./cli-smby5m17.js";
+} from "./cli-ygweqcn4.js";
 import {
   startPricingRefreshLoop
-} from "./cli-m8yrsg97.js";
+} from "./cli-sd5pv3b1.js";
 import {
   seedPricingFromModelsDev
-} from "./cli-rw51bq3j.js";
+} from "./cli-9fy6nk6g.js";
 import {
   ensureRbacSeedsSynced,
   getUserGrant
-} from "./cli-8v0g1yc8.js";
+} from "./cli-k0cr4kat.js";
 import {
   can,
   decideAdmission,
@@ -48,7 +49,7 @@ import {
   runSavedScriptAsAgent,
   updateApp,
   upgradeAppDefinition
-} from "./cli-de14znh8.js";
+} from "./cli-19f354qr.js";
 import {
   require_dist as require_dist2
 } from "./cli-qgm2pfpq.js";
@@ -72,7 +73,7 @@ import {
   updateTrackerSync,
   updateTrackerSyncSwarmId,
   upsertSwarmConfigWithPolicyMirror
-} from "./cli-f7dsy61y.js";
+} from "./cli-mnmsfd1w.js";
 import {
   isMultiRuntimeEnabled
 } from "./cli-07jd68a1.js";
@@ -86,7 +87,7 @@ import {
   snapshotWorkflow,
   startWorkflowExecution,
   validateJsonSchema
-} from "./cli-yz3djrm0.js";
+} from "./cli-6pqcb4q0.js";
 import {
   ConnectionAuthInputSchema,
   SCRIPT_LONG_TIMEOUT_HINT_MS,
@@ -109,7 +110,7 @@ import {
   upsertCredentialBinding,
   upsertScriptConnection,
   validateDefinition
-} from "./cli-3tgwnf43.js";
+} from "./cli-aae6hz6a.js";
 import {
   CANDIDATE_SET_MULTIPLIER,
   computeScore,
@@ -121,7 +122,7 @@ import {
   isGraphExpansionEnabled,
   rerank,
   rowToCandidate
-} from "./cli-1th1728g.js";
+} from "./cli-3q5ejx9p.js";
 import {
   getApiKey
 } from "./cli-f14fvzag.js";
@@ -139,7 +140,7 @@ import {
   listAuthorizationsForApp,
   onAuthorizationRefreshed,
   upsertOAuthApp
-} from "./cli-zhjmqxzh.js";
+} from "./cli-9hspd3dp.js";
 import {
   ZodFirstPartyTypeKind,
   objectType
@@ -158,7 +159,7 @@ import {
   getFileInfo,
   parseSlackTs,
   uploadFile
-} from "./cli-mmemxxdc.js";
+} from "./cli-kgz4np97.js";
 import {
   AgentFsProvider
 } from "./cli-jsp14b6c.js";
@@ -178,10 +179,10 @@ import {
   resolveIdentityByEmail,
   resolveUserByToken,
   unlinkIdentity
-} from "./cli-p1d5b073.js";
+} from "./cli-gv88e1vf.js";
 import {
   createTaskWithSiblingAwareness
-} from "./cli-53s590z8.js";
+} from "./cli-q50ef8g0.js";
 import {
   ensure,
   getAgentDisplayName,
@@ -192,7 +193,7 @@ import {
   startSlackApp,
   stopSlackApp,
   withSpan
-} from "./cli-b5bq9crk.js";
+} from "./cli-d8ftsp62.js";
 import {
   $OpenAPIRegistry,
   $OpenApiGeneratorV31,
@@ -225,6 +226,7 @@ import {
   ReasoningEffortSchema,
   RepoGuidelinesInputSchema,
   RepoHooksSchema,
+  RoutingReasonSchema,
   ScheduledTaskTargetTypeSchema,
   ScriptRunStatusSchema,
   ServiceStatusSchema,
@@ -254,6 +256,7 @@ import {
   createAppVersion,
   createApprovalRequest,
   createChannel,
+  createLogEntry,
   createMcpServer,
   createMetric,
   createMetricVersion,
@@ -439,13 +442,13 @@ import {
   upsertPromptTemplate,
   upsertService,
   validateConfigValue
-} from "./cli-ftht3zzj.js";
+} from "./cli-yab68w40.js";
 import {
   generateDefaultClaudeMd,
   generateDefaultIdentityMd,
   generateDefaultSoulMd,
   init_defaults
-} from "./cli-y6b6fb76.js";
+} from "./cli-08b07b4r.js";
 import {
   getTemplateDefinition,
   init_registry,
@@ -454,7 +457,7 @@ import {
   interpolate,
   registerTemplate,
   resolveTemplate
-} from "./cli-kpv03zhj.js";
+} from "./cli-3apbzgyk.js";
 import {
   MAX_PROFILE_FILE_LENGTH,
   getAppUrl,
@@ -515,14 +518,14 @@ import {
 import {
   init_package,
   package_default
-} from "./cli-w9kb3bk1.js";
+} from "./cli-kjwt6hdf.js";
 import {
   init_secret_scrubber,
   refreshSecretScrubberCache,
   registerVolatileSecret,
   scrubObject,
   scrubSecrets
-} from "./cli-xqcq9y5e.js";
+} from "./cli-r2ap2czm.js";
 import {
   init_event_bus,
   workflowEventBus
@@ -19306,6 +19309,7 @@ ${combinedPreview}`
       return;
     const task = await createTaskWithSiblingAwareness(followupResult.text, {
       agentId: first.agentId,
+      routingReason: "continuity",
       source: "agentmail",
       taskType: "agentmail-reply",
       agentmailInboxId: first.inboxId,
@@ -19432,6 +19436,7 @@ async function handleMessageReceived(payload) {
     }
     const task2 = await createTaskWithSiblingAwareness(followupResult.text, {
       agentId: existingTask.agentId,
+      routingReason: existingTask.agentId ? "continuity" : undefined,
       source: "agentmail",
       taskType: "agentmail-reply",
       agentmailInboxId: inbox_id,
@@ -19462,6 +19467,7 @@ async function handleMessageReceived(payload) {
         }
         const task3 = await createTaskWithSiblingAwareness(leadResult.text, {
           agentId: agent.id,
+          routingReason: "human_pinned",
           source: "agentmail",
           taskType: "agentmail-message",
           agentmailInboxId: inbox_id,
@@ -19485,6 +19491,7 @@ async function handleMessageReceived(payload) {
       }
       const task2 = await createTaskWithSiblingAwareness(workerResult.text, {
         agentId: agent.id,
+        routingReason: "human_pinned",
         source: "agentmail",
         taskType: "agentmail-message",
         agentmailInboxId: inbox_id,
@@ -19512,6 +19519,7 @@ async function handleMessageReceived(payload) {
     }
     const task2 = await createTaskWithSiblingAwareness(unmappedResult.text, {
       agentId: lead.id,
+      routingReason: "skill",
       source: "agentmail",
       taskType: "agentmail-message",
       agentmailInboxId: inbox_id,
@@ -20319,6 +20327,7 @@ async function handlePullRequest(event) {
     }
     const task2 = await createTaskWithSiblingAwareness(result2.text, {
       agentId: lead2?.id ?? "",
+      routingReason: lead2 ? "skill" : undefined,
       source: "github",
       vcsProvider: "github",
       taskType: "github-pr",
@@ -20391,6 +20400,7 @@ async function handlePullRequest(event) {
     }
     const task2 = await createTaskWithSiblingAwareness(result2.text, {
       agentId: lead2?.id ?? "",
+      routingReason: lead2 ? "skill" : undefined,
       source: "github",
       vcsProvider: "github",
       taskType: "github-pr",
@@ -20459,6 +20469,7 @@ async function handlePullRequest(event) {
     }
     const task2 = await createTaskWithSiblingAwareness(result2.text, {
       agentId: lead2?.id ?? "",
+      routingReason: lead2 ? "skill" : undefined,
       source: "github",
       vcsProvider: "github",
       taskType: "github-pr",
@@ -20517,6 +20528,7 @@ async function handlePullRequest(event) {
   }
   const task = await createTaskWithSiblingAwareness(result.text, {
     agentId: lead?.id ?? "",
+    routingReason: lead ? "skill" : undefined,
     source: "github",
     vcsProvider: "github",
     taskType: "github-pr",
@@ -20565,6 +20577,7 @@ async function handleIssue(event) {
     }
     const task2 = await createTaskWithSiblingAwareness(result2.text, {
       agentId: lead2?.id ?? "",
+      routingReason: lead2 ? "skill" : undefined,
       source: "github",
       vcsProvider: "github",
       taskType: "github-issue",
@@ -20631,6 +20644,7 @@ async function handleIssue(event) {
     }
     const task2 = await createTaskWithSiblingAwareness(result2.text, {
       agentId: lead2?.id ?? "",
+      routingReason: lead2 ? "skill" : undefined,
       source: "github",
       vcsProvider: "github",
       taskType: "github-issue",
@@ -20679,6 +20693,7 @@ async function handleIssue(event) {
   }
   const task = await createTaskWithSiblingAwareness(result.text, {
     agentId: lead?.id ?? "",
+    routingReason: lead ? "skill" : undefined,
     source: "github",
     vcsProvider: "github",
     taskType: "github-issue",
@@ -20742,6 +20757,7 @@ async function handleComment(event, eventType) {
   }
   const task = await createTaskWithSiblingAwareness(result.text, {
     agentId: lead?.id ?? "",
+    routingReason: lead ? "skill" : undefined,
     source: "github",
     vcsProvider: "github",
     taskType: "github-comment",
@@ -20941,6 +20957,7 @@ ${review.body}` : "";
   }
   const task = await createTaskWithSiblingAwareness(result.text, {
     agentId: lead?.id ?? "",
+    routingReason: lead ? "skill" : undefined,
     source: "github",
     vcsProvider: "github",
     taskType: "github-review",
@@ -21287,6 +21304,7 @@ async function handleMergeRequest(event) {
       }
       const task = await createTaskWithSiblingAwareness(result.text, {
         agentId: lead?.id ?? null,
+        routingReason: lead ? "skill" : undefined,
         source: "gitlab",
         vcsProvider: "gitlab",
         taskType: "gitlab-mr",
@@ -21369,6 +21387,7 @@ async function handleIssue2(event) {
       }
       const task = await createTaskWithSiblingAwareness(result.text, {
         agentId: lead?.id ?? null,
+        routingReason: lead ? "skill" : undefined,
         source: "gitlab",
         vcsProvider: "gitlab",
         taskType: "gitlab-issue",
@@ -21451,6 +21470,7 @@ _Note: There's an active task (${existingTask.id}) for this ${entityLabel}._` :
   }
   const task = await createTaskWithSiblingAwareness(noteResult.text, {
     agentId: lead?.id ?? null,
+    routingReason: lead ? "skill" : undefined,
     source: "gitlab",
     vcsProvider: "gitlab",
     taskType: "gitlab-comment",
@@ -21507,6 +21527,7 @@ async function handlePipeline(event) {
   }
   const task = await createTaskWithSiblingAwareness(pipelineResult.text, {
     agentId: lead?.id ?? null,
+    routingReason: lead ? "skill" : undefined,
     source: "gitlab",
     vcsProvider: "gitlab",
     taskType: "gitlab-ci",
@@ -22235,6 +22256,7 @@ ${input.descriptionText}
   }
   const task = await createTaskWithSiblingAwareness(result.text, {
     agentId: lead?.id ?? "",
+    routingReason: lead ? "skill" : undefined,
     source: "jira",
     taskType: "jira-issue",
     requestedByUserId: input.requestedByUserId,
@@ -22264,6 +22286,7 @@ ${input.descriptionText}
   }
   const task = await createTaskWithSiblingAwareness(result.text, {
     agentId: lead?.id ?? "",
+    routingReason: lead ? "skill" : undefined,
     source: "jira",
     taskType: "jira-issue",
     requestedByUserId: input.requestedByUserId,
@@ -22303,7 +22326,7 @@ async function notifySlack(text) {
     return;
   }
   try {
-    const { getSlackApp: getSlackApp2 } = await import("./app-w066xfy0.js");
+    const { getSlackApp: getSlackApp2 } = await import("./app-1hh67x8w.js");
     const app = getSlackApp2();
     if (!app) {
       console.warn("[Jira webhook keepalive] Slack not available, cannot send notification");
@@ -22374,7 +22397,7 @@ async function deleteJiraWebhook(webhookId) {
   console.log(`[Jira webhook keepalive] Deleted webhook id=${webhookId}`);
 }
 async function overwriteWebhookIds(next) {
-  const { getDbClient: getDbClient2 } = await import("./db-sfbsc8wt.js");
+  const { getDbClient: getDbClient2 } = await import("./db-ggz97zbm.js");
   await getDbClient2().transaction(async (tx) => {
     const row = await tx.get("SELECT metadata FROM oauth_apps WHERE provider = 'jira'");
     if (!row) {
@@ -94557,6 +94580,7 @@ ${issueDescription}
   }
   const task = await createTaskWithSiblingAwareness(templateResult.text, {
     agentId: lead?.id ?? "",
+    routingReason: lead ? "skill" : undefined,
     source: "linear",
     taskType: "linear-issue",
     requestedByUserId,
@@ -94750,6 +94774,7 @@ async function handleAgentSessionPrompted(event) {
   }
   const task = await createTaskWithSiblingAwareness(followupResult.text, {
     agentId: lead?.id ?? "",
+    routingReason: lead ? "skill" : undefined,
     source: "linear",
     taskType: "linear-issue",
     requestedByUserId: promptedRequestedByUserId,
@@ -96199,6 +96224,9 @@ async function handleCore(req, res, myAgentId, apiKey) {
   return false;
 }
 
+// src/server.ts
+init_resolver();
+
 // src/tools/accept-steer.ts
 init_zod();
 init_db();
@@ -96344,6 +96372,22 @@ var slackReadNudge = (r) => {
   const messages = r.data?.messages;
   return messages?.some((m) => m.files?.some((f) => Boolean(f.localPath))) ? SLACK_API_DISK_NUDGE : undefined;
 };
+function formatIdleDuration(ms) {
+  const minutes = Math.round(ms / 60000);
+  if (minutes < 60)
+    return `${minutes}m`;
+  const hours = Math.floor(minutes / 60);
+  const remMinutes = minutes % 60;
+  return remMinutes > 0 ? `${hours}h${remMinutes}m` : `${hours}h`;
+}
+var storeProgressBlockedWaitingNudge = (r) => {
+  if (!r.ok)
+    return;
+  const ms = r.data?.blockedWaitingElapsedMs;
+  if (typeof ms !== "number")
+    return;
+  return `That reads as blocked-waiting, ${formatIdleDuration(ms)} since your last update — call defer-task so a wake-up task resumes you instead of polling manually.`;
+};
 var workflowLongScriptTimeoutNudge = (r) => {
   if (!r.ok)
     return;
@@ -96352,6 +96396,7 @@ var workflowLongScriptTimeoutNudge = (r) => {
 };
 var NUDGES = {
   "defer-task": (r) => r.ok ? "Stop working on this task now; the wake-up task will carry your note." : undefined,
+  "store-progress": storeProgressBlockedWaitingNudge,
   "script-run": scriptRunNudge,
   "script-upsert": scriptAuthoringNudge,
   "launch-script-run": scriptAuthoringNudge,
@@ -96660,10 +96705,15 @@ async function finalizeSwarmToolResult(toolName, result, requestInfo = {
   }
   return composeWireResult(r);
 }
+var preloadedToolsByServer = new WeakMap;
+function setPreloadedTools(server, names) {
+  preloadedToolsByServer.set(server, new Set(names));
+}
 var createToolRegistrar = (server) => {
   return (name, config, cb) => {
+    const toolConfig = preloadedToolsByServer.get(server)?.has(name) ? { ...config, _meta: { ...config._meta, "anthropic/alwaysLoad": true } } : config;
     if (config.inputSchema === undefined) {
-      return server.registerTool(name, config, async (meta2) => {
+      return server.registerTool(name, toolConfig, async (meta2) => {
         const requestInfo = getRequestInfo(meta2);
         return withSpan("mcp.tool", async (span) => {
           const outcome = await cb(requestInfo, meta2);
@@ -96673,7 +96723,7 @@ var createToolRegistrar = (server) => {
         }, toolRequestAttributes(name, requestInfo));
       });
     }
-    return server.registerTool(name, config, async (args, meta2) => {
+    return server.registerTool(name, toolConfig, async (args, meta2) => {
       const requestInfo = getRequestInfo(meta2);
       return withSpan(`mcp.tool ${name}`, async (span) => {
         const outcome = await cb(args, requestInfo, meta2);
@@ -96722,7 +96772,7 @@ function assertOwnsTask(ctx, task, verb = "task.read.own") {
 init_secret_scrubber();
 var acceptSteerInputSchema = object({
   steeringMessageId: uuid().describe("The steering message ID to acknowledge."),
-  note: string().max(500).optional().describe("Optional short note describing how the steering was incorporated.")
+  note: string().optional().describe("Optional short note describing how the steering was incorporated.")
 });
 var looseSteeringMessageSchema = looseObject({
   id: string().optional(),
@@ -99940,6 +99990,7 @@ async function handleApps(req, res, pathSegments, queryParams, myAgentId) {
     const task = await createTaskWithSiblingAwareness(taskPrompt.text, {
       source: "api",
       agentId: action.agentId ?? lead?.id,
+      routingReason: action.agentId ? "human_pinned" : lead ? "skill" : undefined,
       key: normalizeAssetKey(`shared/app:${app.id}/action:${parsed.params.name}/`),
       ...actor.startsWith("user:") ? { requestedByUserId: actor.slice("user:".length) } : {}
     });
@@ -103156,12 +103207,17 @@ var registerDeferTaskTool = (server) => {
   createToolRegistrar(server)("defer-task", {
     title: "Defer Task",
     annotations: { destructiveHint: false, idempotentHint: false },
-    description: "Completes this task now with status `completed` and books a wake-up for you. Use when the result needs time: a build, a deploy, a reply. The task reaches its final state on this call; the lead sees your summary as its output. A one-off schedule wakes you up later with a child task that carries this task as its parent. Provide delayMs or runAt, a summary of what you did, and a note that says what is pending and what to check.",
+    description: "Completes this task now with status `completed` and books a wake-up for you. Use when the result needs time: a build, a deploy, a reply. The task reaches its final state on this call; the lead sees your summary as its output unless the task has an outputSchema. For a task with an outputSchema, provide output as a JSON string matching that schema; it is stored verbatim as terminal output, while deferral details remain visible in the task log. A one-off schedule wakes you up later with a child task that carries this task as its parent. Optionally provide wakeOn to wake early when another task completes or fails; delayMs or runAt remains required as the ceiling. Provide delayMs or runAt, a summary of what you did, and a note that says what is pending and what to check.",
     inputSchema: object({
       taskId: string().describe("The ID of the task you are working on."),
       delayMs: number().int().positive().optional().describe("Wake up after this many milliseconds (e.g. 1800000 for 30 min)."),
       runAt: string().datetime().optional().describe("Wake up at this ISO datetime (e.g. '2026-03-06T15:00:00Z'). Must be future."),
-      summary: string().min(1).max(4000).describe("What you did so far and where things stand. This becomes the task's output; the lead and your wake-up run both read it."),
+      wakeOn: object({
+        event: _enum(["task.completed", "task.failed", "settled"]),
+        taskId: string().min(1)
+      }).strict().optional().describe("Wake early on this task event. settled covers completed or failed. Already-terminal tasks are rejected; a delayMs/runAt ceiling is still required."),
+      summary: string().min(1).max(4000).describe("What you did so far and where things stand. Stored in the task log for tasks with an outputSchema; otherwise becomes the task's output."),
+      output: string().optional().describe("Required when the task has an outputSchema: a JSON string matching that schema, stored verbatim as terminal output. Ignored for tasks without an outputSchema."),
       note: string().min(1).max(2000).describe("What is pending, and what to check on wake-up."),
       checks: array(string().min(1)).max(20).optional().describe("Concrete things to verify on wake-up, one per entry.")
     }),
@@ -103171,7 +103227,7 @@ var registerDeferTaskTool = (server) => {
       scheduleId: string().optional(),
       nextRunAt: string().optional()
     })
-  }, async ({ taskId, delayMs, runAt, summary, note, checks: checks2 }, requestInfo, _meta) => {
+  }, async ({ taskId, delayMs, runAt, wakeOn, summary, output, note, checks: checks2 }, requestInfo, _meta) => {
     if (!requestInfo.agentId) {
       return toolErr('Agent ID not found. Set the "X-Agent-ID" header.');
     }
@@ -103205,18 +103261,29 @@ var registerDeferTaskTool = (server) => {
       return toolErr("runAt must be in the future.");
     }
     const nextRunAt = delayMs ? new Date(Date.now() + delayMs).toISOString() : runAt;
+    const wakeDescription = wakeOn ? `on ${wakeOn.event} for task ${wakeOn.taskId}, or by ${nextRunAt}` : `at ${nextRunAt}`;
     const checksBlock = renderChecks(checks2);
     const taskTemplate = `Resume task ${taskId}: ${note}${checksBlock}`;
     const createdBy = await resolveTaskAuditUserId(requestInfo.sourceTaskId, requestInfo.agentId) ?? undefined;
-    const previewOutput = `${summary}
-
-Deferred until ${nextRunAt} (schedule pending). Pending: ${note}${checksBlock}`;
-    const outputValidationError = getTaskOutputValidationError(task.outputSchema, previewOutput);
-    if (outputValidationError) {
-      return toolErr(`Task ${taskId} has an outputSchema; its terminal output must satisfy it, but a deferral note cannot. ${outputValidationError}`);
+    if (task.outputSchema) {
+      if (!output) {
+        return toolErr(`Task ${taskId} has an outputSchema. Call defer-task with output: a JSON string matching that schema. Summary and note are stored separately in the task log.`);
+      }
+      const outputValidationError = getTaskOutputValidationError(task.outputSchema, output);
+      if (outputValidationError)
+        return toolErr(outputValidationError);
     }
     try {
       const committed = await getDbClient().transaction(async () => {
+        if (wakeOn) {
+          if (wakeOn.taskId === taskId)
+            throw new DeferAbortedError("Cannot wake on the task being deferred.");
+          const watched = await getTaskById(wakeOn.taskId);
+          if (!watched)
+            throw new DeferAbortedError(`Watched task ${wakeOn.taskId} not found.`);
+          if (isTerminalTaskStatus(watched.status))
+            throw new DeferAbortedError(`Watched task ${wakeOn.taskId} is already ${watched.status}; read its result instead of deferring.`);
+        }
         const schedule = await createScheduledTask({
           name: `deferred-${taskId.slice(0, 8)}-${Date.now()}-${crypto.randomUUID()}`,
           description: note,
@@ -103233,13 +103300,30 @@ Deferred until ${nextRunAt} (schedule pending). Pending: ${note}${checksBlock}`;
           parentTaskId: taskId,
           createdBy
         });
-        const output = `${summary}
+        if (wakeOn) {
+          await getDbClient().run("INSERT INTO deferred_task_waits (scheduleId, taskId, eventName, created_by, updated_by) VALUES (?, ?, ?, ?, ?)", [schedule.id, wakeOn.taskId, wakeOn.event, createdBy ?? null, createdBy ?? null]);
+          getDbClient().afterCommit(() => {
+            reconcileDeferredTaskWaits(wakeOn.taskId).catch((err) => {
+              console.error("[defer-task] Event wake reconciliation failed:", err);
+            });
+          });
+        }
+        const deferralDetails = `${summary}
 
 Deferred until ${nextRunAt} (schedule ${schedule.id}). Pending: ${note}${checksBlock}`;
-        const completed = await completeTask(taskId, output);
+        const terminalOutput = task.outputSchema ? output : deferralDetails;
+        const completed = await completeTask(taskId, terminalOutput);
         if (!completed) {
           throw new DeferAbortedError(`Task ${taskId} reached a terminal state before this deferral committed.`);
         }
+        if (task.outputSchema) {
+          await createLogEntry({
+            eventType: "task_progress",
+            taskId,
+            agentId: requestInfo.agentId,
+            newValue: deferralDetails
+          });
+        }
         getDbClient().afterCommit(() => {
           ensure({
             id: "completed",
@@ -103260,7 +103344,7 @@ Deferred until ${nextRunAt} (schedule ${schedule.id}). Pending: ${note}${checksB
         if (task.agentId) {
           await updateAgentStatusFromCapacity(task.agentId);
         }
-        return { scheduleId: schedule.id, output, completed };
+        return { scheduleId: schedule.id, output: terminalOutput, completed };
       });
       await runTaskTerminalEffects({
         task: committed.completed,
@@ -103268,7 +103352,7 @@ Deferred until ${nextRunAt} (schedule ${schedule.id}). Pending: ${note}${checksB
         output: committed.output,
         agentId: requestInfo.agentId
       });
-      return toolOk(`Task ${taskId} completed and deferred. Wake-up at ${nextRunAt} (schedule ${committed.scheduleId}). This task is final; the wake-up task continues the work.`, {
+      return toolOk(`Task ${taskId} completed and deferred. Wake-up ${wakeDescription} (schedule ${committed.scheduleId}). This task is final; the wake-up task continues the work.`, {
         data: {
           yourAgentId: requestInfo.agentId,
           taskId,
@@ -105505,8 +105589,9 @@ var registerMemoryGetTool = (server) => {
     description: "Retrieve the full content of a specific memory by its ID. Use memory-search to find memory IDs first.",
     annotations: { readOnlyHint: true },
     inputSchema: object({
-      memoryId: uuid().describe("The ID of the memory to retrieve."),
-      intent: string().min(1).describe("Why you are retrieving this memory. Required. E.g. 'need full details of the auth fix pattern'.")
+      memoryId: uuid().optional().describe("The ID of the memory to retrieve (or use id)."),
+      id: uuid().optional().describe("Alias for memoryId, matching memory-search results."),
+      intent: string().min(1).optional().describe("Optional reason for retrieving this memory. E.g. 'need full details of the auth fix pattern'.")
     }),
     outputSchema: swarmToolOutputSchema({
       yourAgentId: string().optional(),
@@ -105515,7 +105600,13 @@ var registerMemoryGetTool = (server) => {
       backlinks: array(MemoryBacklinkSchema).optional().describe("Other memories whose content links to this one (ACL-filtered)."),
       rateHint: string().optional()
     })
-  }, async ({ memoryId, intent }, requestInfo, _meta) => {
+  }, async ({ memoryId: requestedMemoryId, id, intent }, requestInfo, _meta) => {
+    if (requestedMemoryId && id && requestedMemoryId !== id) {
+      return toolErr("memoryId and id must identify the same memory; supply only one.");
+    }
+    const memoryId = requestedMemoryId ?? id;
+    if (!memoryId)
+      return toolErr("Supply memoryId (or its alias id) from memory-search.");
     const store = getMemoryStore();
     const memoryForAuth = await store.peek(memoryId);
     if (!memoryForAuth) {
@@ -105573,13 +105664,20 @@ var registerMemoryRateTool = (server) => {
     description: "Rate a memory you used in the current task. Call this when a " + "retrieved memory was clearly useful (or actively misleading) so " + "the swarm learns to surface better memories next time.",
     annotations: { destructiveHint: false },
     inputSchema: object({
-      id: string().describe("Memory ID returned by memory_search."),
+      id: string().min(1).optional().describe("Memory ID returned by memory-search (or use memoryId)."),
+      memoryId: string().min(1).optional().describe("Alias for id, matching memory-get."),
       useful: boolean().describe("true = this memory helped solve the task; false = misled or wasted time."),
-      note: string().max(280).optional().describe("Short reason. Captured for telemetry; not surfaced to other agents."),
+      note: string().optional().describe("Reason, stored up to 500 characters for telemetry; not surfaced to other agents."),
       referencesSource: string().min(1).max(REFERENCES_SOURCE_MAX_LENGTH).optional().describe(REFERENCES_SOURCE_DESCRIPTION)
     }),
     outputSchema: swarmToolOutputSchema()
-  }, async ({ id, useful, note, referencesSource }, requestInfo, _meta) => {
+  }, async ({ id, memoryId, useful, note, referencesSource }, requestInfo, _meta) => {
+    if (id && memoryId && id !== memoryId) {
+      return toolErr("id and memoryId must identify the same memory; supply only one.");
+    }
+    const resolvedMemoryId = id ?? memoryId;
+    if (!resolvedMemoryId)
+      return toolErr("Supply id (or its alias memoryId) from memory-search.");
     if (!requestInfo.agentId) {
       return toolErr("Agent ID required. Are you registered in the swarm?");
     }
@@ -105597,11 +105695,11 @@ var registerMemoryRateTool = (server) => {
     const apiUrl = getMcpBaseUrl();
     const apiKey = getApiKey();
     const event = {
-      memoryId: id,
+      memoryId: resolvedMemoryId,
       signal: useful ? 1 : -1,
       weight: 1,
       source: "explicit-self",
-      reasoning: note ?? "",
+      reasoning: (note ?? "").slice(0, 500),
       taskId: requestInfo.sourceTaskId,
       ...cleanedReferencesSource !== undefined ? { referencesSource: cleanedReferencesSource } : {}
     };
@@ -105630,7 +105728,7 @@ var registerMemoryRateTool = (server) => {
       if (!response.ok) {
         return toolErr(`Memory rating failed (HTTP ${response.status}).`);
       }
-      return toolOk(`Memory ${id} rated as ${useful ? "useful" : "not useful"}.`);
+      return toolOk(`Memory ${resolvedMemoryId} rated as ${useful ? "useful" : "not useful"}.`);
     } catch (err) {
       return toolErr(`Memory rating failed: ${err.message}`);
     }
@@ -105777,7 +105875,7 @@ var registerMemorySearchTool = (server) => {
     annotations: { readOnlyHint: false },
     inputSchema: object({
       query: string().min(1).describe("Natural language search query."),
-      intent: string().min(1).describe("Why you are searching for this memory. Required. E.g. 'looking for auth pattern to fix login bug'."),
+      intent: string().min(1).optional().describe("Optional reason for searching for this memory. E.g. 'looking for auth pattern to fix login bug'."),
       scope: _enum(["all", "agent", "swarm"]).default("all").describe("Search scope: 'all' (own + swarm), 'agent' (own only), 'swarm' (shared only)."),
       limit: number().int().min(1).max(50).default(10).describe("Max results to return."),
       source: AgentMemorySourceSchema.optional().describe("Filter by memory source type.")
@@ -106116,9 +106214,9 @@ var registerMemoryStoreTool = (server) => {
     annotations: { destructiveHint: false },
     inputSchema: object({
       content: string().min(1).describe("The memory body. Markdown is fine. State the fact, the context it applies to, and the evidence."),
-      name: string().min(1).max(200).describe("Short title, one line, used in search results and the UI."),
+      name: string().min(1).max(200).optional().describe("Short title used in search results and the UI. Defaults to the first non-empty content line (up to 200 characters)."),
       scope: AgentMemoryScopeSchema.default("agent").describe("'agent' (default): only you can recall it. 'swarm': every agent can recall it."),
-      tags: array(string()).optional().describe("Free-form tags, for example a repo name or a topic."),
+      tags: union([array(string()), string()]).optional().describe("Free-form tags as an array or a comma-separated string, for example a repo name or a topic."),
       taskId: uuid().optional().describe("The task this learning came from, when there is one."),
       intent: string().min(1).optional().describe("Why this is worth remembering. Kept in the audit trail.")
     }),
@@ -106128,7 +106226,9 @@ var registerMemoryStoreTool = (server) => {
       chunks: number().int().optional(),
       queued: boolean().optional()
     })
-  }, async ({ content, name, scope, tags, taskId, intent }, requestInfo, _meta) => {
+  }, async ({ content, name: requestedName, scope, tags, taskId, intent }, requestInfo, _meta) => {
+    const name = requestedName ?? content.split(/\r?\n/).find((line) => line.trim())?.trim().slice(0, 200) ?? "Untitled memory";
+    const normalizedTags = typeof tags === "string" ? tags.split(",").map((tag) => tag.trim()).filter(Boolean) : tags;
     if (!requestInfo.agentId) {
       return toolErr("Agent ID required. Are you registered in the swarm?");
     }
@@ -106140,7 +106240,7 @@ var registerMemoryStoreTool = (server) => {
         scope,
         source: "manual",
         sourceTaskId: taskId ?? null,
-        tags,
+        tags: normalizedTags,
         intent
       });
       return toolOk(`Memory "${name}" stored as ${result.chunks} chunk(s) in ${scope} scope. Embedding runs in the background.`, {
@@ -116170,6 +116270,8 @@ function checkOutputSchemaShape(outputSchema, ctx) {
 }
 var sendTaskInputSchema = object({
   agentId: string().optional().describe("The agent to assign/offer task to. Omit to create unassigned task for pool."),
+  routingReason: RoutingReasonSchema.optional().describe("Why this agent was selected. Required when agentId is supplied; omit for pool routing."),
+  routingNote: string().max(200).optional().describe("Optional routing context (maximum 200 characters)."),
   task: string().min(1).describe("The task description to send."),
   key: AssetKeySchema.optional().describe("Logical namespace key. Child tasks inherit their parent namespace when provided."),
   offerMode: boolean().default(false).describe("If true, offer the task instead of direct assign (agent must accept/reject)."),
@@ -116190,7 +116292,7 @@ var sendTaskInputSchema = object({
   slackThreadTs: string().optional().describe("Slack thread timestamp. Required with slackChannelId for thread-level updates."),
   slackUserId: string().optional().describe("Slack user ID of the original requester."),
   overrideSlackContext: boolean().default(false).describe("Explicitly route this task's Slack updates to a different channel/thread than its parent/contextKey. Requires slackChannelId AND slackThreadTs. Use only for deliberate cross-channel dispatch (e.g. escalation to another human's DM); logged for audit. Without this flag, a slackChannelId/slackThreadTs that disagrees with the parent task or inherited contextKey is rejected — omit the three Slack fields to inherit them from the parent as a unit instead."),
-  requestedByUserId: string().uuid().optional().describe("ID of the human user who originally requested this task chain. When omitted, inherited from the caller's current task so the attribution flows through multi-hop delegation automatically."),
+  requestedByUserId: string().regex(/^[a-f0-9]{32}$/, "Expected a registry user ID (32 lowercase hexadecimal characters).").optional().describe("Registered requester ID (32 lowercase hexadecimal characters). When omitted, inherited from the caller's current task so the attribution flows through multi-hop delegation automatically."),
   followUpConfig: FollowUpConfigSchema.optional().describe("Control the lead follow-up created when this task finishes. When to use `followUpConfig`: set `disabled: true` when you'll wait for this task to complete inline and no follow-up is needed; set `onCompleted` / `onFailed` with specific instructions when you need to follow up effectively on a particular outcome of a long-running flow; for normal one-shot tasks, leave it unset because defaults are fine. It is most valuable for long-running / complex flows."),
   outputSchema: record(string(), unknown()).optional().describe("Optional JSON Schema the assignee's final output must satisfy. store-progress rejects a completion that does not match. Supported keywords: type, required, properties, enum, const, items.")
 }).superRefine((data, ctx) => {
@@ -116203,6 +116305,13 @@ var sendTaskInputSchema = object({
       path: [hasChannel ? "slackThreadTs" : "slackChannelId"]
     });
   }
+  if (data.agentId !== undefined && data.routingReason === undefined) {
+    ctx.addIssue({
+      code: ZodIssueCode.custom,
+      message: "routingReason is required when agentId is supplied.",
+      path: ["routingReason"]
+    });
+  }
   checkOutputSchemaShape(data.outputSchema, ctx);
 });
 var sendTaskOutputSchema = swarmToolOutputSchema({
@@ -116228,6 +116337,8 @@ async function transferTrackerSyncToResumeChild(args2) {
 }
 async function sendTaskHandler(ctx, {
   agentId,
+  routingReason,
+  routingNote,
   task,
   key,
   offerMode,
@@ -116252,6 +116363,9 @@ async function sendTaskHandler(ctx, {
   followUpConfig,
   outputSchema
 }) {
+  if (agentId !== undefined && routingReason === undefined) {
+    return toolErr("routingReason is required when agentId is supplied.");
+  }
   if (ctx.kind === "owner" && !ctx.agentId) {
     return toolErr('Agent ID not found. The MCP client should define the "X-Agent-ID" header.', {
       data: { yourAgentId: ctx.agentId }
@@ -116260,6 +116374,11 @@ async function sendTaskHandler(ctx, {
   const creatorAgentId = ctx.kind === "owner" ? ctx.agentId : undefined;
   const sourceTaskId = ctx.kind === "owner" ? ctx.sourceTaskId : undefined;
   const requestedByUserId = ctx.kind === "user" ? ctx.userId : inputRequestedByUserId ?? undefined;
+  if (ctx.kind === "owner" && requestedByUserId && !await getUserById(requestedByUserId)) {
+    return toolErr("requestedByUserId must identify an existing registered user.", {
+      data: { yourAgentId: creatorAgentId }
+    });
+  }
   if (ctx.kind === "owner" && agentId === ctx.agentId) {
     return toolErr("Cannot send a task to yourself, are you drunk?", {
       data: { yourAgentId: ctx.agentId }
@@ -116304,6 +116423,8 @@ async function sendTaskHandler(ctx, {
       effectiveAgentId = effectiveParentTask.agentId;
     }
   }
+  const effectiveRoutingReason = agentId !== undefined ? routingReason : effectiveAgentId ? "continuity" : undefined;
+  const effectiveRoutingNote = effectiveRoutingReason ? routingNote : undefined;
   const evaluateDedupGuards = async () => {
     const existingTrackerWork = await findExistingLinearTrackerContextWork(effectiveParentTask?.contextKey);
     if (existingTrackerWork) {
@@ -116377,6 +116498,8 @@ async function sendTaskHandler(ctx, {
         overrideSlackContext,
         followUpConfig,
         outputSchema,
+        routingReason: effectiveRoutingReason,
+        routingNote: effectiveRoutingNote,
         routingAffinity: effectiveLeadOnly || requiredCapabilities?.length ? { leadOnly: effectiveLeadOnly, capabilities: requiredCapabilities ?? [] } : undefined
       });
       await transferTrackerSyncToResumeChild({
@@ -116433,6 +116556,8 @@ async function sendTaskHandler(ctx, {
         overrideSlackContext,
         followUpConfig,
         outputSchema,
+        routingReason: effectiveRoutingReason,
+        routingNote: effectiveRoutingNote,
         routingAffinity: effectiveLeadOnly || requiredCapabilities?.length ? { leadOnly: effectiveLeadOnly, capabilities: requiredCapabilities ?? [] } : undefined
       });
       await transferTrackerSyncToResumeChild({
@@ -116468,6 +116593,8 @@ async function sendTaskHandler(ctx, {
       overrideSlackContext,
       followUpConfig,
       outputSchema,
+      routingReason: effectiveRoutingReason,
+      routingNote: effectiveRoutingNote,
       routingAffinity: effectiveLeadOnly || requiredCapabilities?.length ? { leadOnly: effectiveLeadOnly, capabilities: requiredCapabilities ?? [] } : undefined
     });
     await transferTrackerSyncToResumeChild({
@@ -117007,6 +117134,7 @@ To approve: update the skill's scope to "swarm" using skill-update.
 To reject: close this task with a rejection reason.`;
     const task = await createTaskExtended(taskDescription, {
       agentId: leadAgent.id,
+      routingReason: "skill",
       creatorAgentId: requestInfo.agentId,
       source: "mcp",
       taskType: "skill-approval",
@@ -118761,6 +118889,8 @@ init_zod();
 init_db();
 init_types();
 init_secret_scrubber();
+var BLOCKED_WAITING_PATTERN = /\b(waiting (for|on)|blocked (on|until|by)|still waiting|awaiting)\b/i;
+var BLOCKED_WAITING_MIN_ELAPSED_MS = 3 * 60 * 1000;
 var storeProgressOutputSchema = swarmToolOutputSchema({
   task: looseObject({
     id: string(),
@@ -118769,7 +118899,8 @@ var storeProgressOutputSchema = swarmToolOutputSchema({
   }).optional(),
   yourAgentId: string().optional(),
   wasNoOp: boolean().optional().describe("True when the call was a no-op because the task was already in a terminal state (completed/failed/cancelled). First-call-wins."),
-  wasForcedOverwrite: boolean().optional().describe("True when force: true replaced output and/or failureReason on an already-terminal task without replaying completion side effects.")
+  wasForcedOverwrite: boolean().optional().describe("True when force: true replaced output and/or failureReason on an already-terminal task without replaying completion side effects."),
+  blockedWaitingElapsedMs: number().optional().describe("Present only when this progress text reads as blocked-waiting: milliseconds since the task's prior update. Drives the store-progress nudge toward defer-task.")
 });
 var registerStoreProgressTool = (server) => {
   createToolRegistrar(server)("store-progress", {
@@ -118777,9 +118908,9 @@ var registerStoreProgressTool = (server) => {
     description: "Stores the progress of a specific task. Can also mark task as completed or failed, which will set the agent back to idle.",
     annotations: { idempotentHint: true },
     inputSchema: object({
-      taskId: uuid().describe("The ID of the task to update progress for."),
+      taskId: uuid().optional().describe("Full task UUID. Defaults to the caller-owned task in X-Source-Task-Id; required outside task context."),
       progress: string().optional().describe("The progress update to store."),
-      status: _enum(["completed", "failed"]).optional().describe("Set to 'completed' or 'failed' to finish the task."),
+      status: _enum(["completed", "failed", "in_progress", "pending"]).optional().describe("Set to 'completed' or 'failed' to finish the task. 'in_progress' and 'pending' store progress only and do not change task status."),
       output: string().optional().describe("The task result (used when completing). For Slack-originated tasks, this is published verbatim in the thread's outcome card: provide a concrete summary scaled to what was asked, including only the outcome and any links or IDs the human needs—not process narration, a transcript, or a restatement of the brief."),
       failureReason: string().optional().describe("The reason for failure (used when failing)."),
       attachments: array(AttachmentInputSchema).max(20).optional().describe("Pointer-based artifacts produced by this step — agent-fs path, URL, shared-fs path, or swarm Page. No inline file data; upload to agent-fs first and attach by path. Agent-fs pointers are verified before task state changes, using the explicit org/drive pair or the registering agent's configured defaults. May be sent on any call (progress or completion) and accumulates across calls; duplicates are de-duped by sha256 (when present) or by (kind, pointer, name)."),
@@ -118787,10 +118918,30 @@ var registerStoreProgressTool = (server) => {
       force: boolean().optional().describe("On an already-terminal task, overwrite explicitly provided output and/or failureReason text while preserving status and finishedAt and without replaying events, memory writes, follow-up creation, business-use ensure, or capacity updates. Differing terminal text is otherwise discarded and reported as a failure.")
     }),
     outputSchema: storeProgressOutputSchema
-  }, async ({ taskId, progress, status, output, failureReason, attachments, persistMemory, force }, requestInfo, _meta) => {
+  }, async ({
+    taskId: requestedTaskId,
+    progress,
+    status: requestedStatus,
+    output,
+    failureReason,
+    attachments,
+    persistMemory,
+    force
+  }, requestInfo, _meta) => {
     if (!requestInfo.agentId) {
       return toolErr('Agent ID not found. The MCP client should define the "X-Agent-ID" header.');
     }
+    const taskId = requestedTaskId ?? requestInfo.sourceTaskId;
+    if (!taskId || !uuid().safeParse(taskId).success) {
+      return toolErr("Supply taskId as the full task UUID; no valid task context is available.");
+    }
+    if (!requestedTaskId) {
+      const contextTask = await getTaskById(taskId);
+      if (!contextTask || contextTask.agentId !== requestInfo.agentId) {
+        return toolErr("Omitted taskId requires a source task assigned to the calling agent.");
+      }
+    }
+    const status = requestedStatus === "completed" || requestedStatus === "failed" ? requestedStatus : undefined;
     const agentFsScopes = new Map;
     const agentFsAttachments = attachments?.filter((a) => a.kind === "agent-fs") ?? [];
     if (agentFsAttachments.length > 0) {
@@ -118862,6 +119013,17 @@ var registerStoreProgressTool = (server) => {
       }
       let updatedTask = existingTask;
       const isTerminal2 = isTerminalTaskStatus(existingTask.status);
+      const goingTerminal = status !== undefined && isTerminalTaskStatus(status);
+      let blockedWaitingElapsedMs;
+      if (progress && !isTerminal2 && !goingTerminal && BLOCKED_WAITING_PATTERN.test(progress)) {
+        const referenceIso = existingTask.lastUpdatedAt ?? existingTask.createdAt;
+        if (referenceIso) {
+          const elapsed = Date.now() - new Date(referenceIso).getTime();
+          if (elapsed >= BLOCKED_WAITING_MIN_ELAPSED_MS) {
+            blockedWaitingElapsedMs = elapsed;
+          }
+        }
+      }
       if (attachments && attachments.length > 0) {
         for (const a of attachments) {
           let orgId = a.kind === "agent-fs" ? a.orgId : undefined;
@@ -118974,7 +119136,8 @@ var registerStoreProgressTool = (server) => {
       return {
         success: true,
         message: status ? `Task "${taskId}" marked as ${status}.` : `Progress stored for task "${taskId}".`,
-        task: updatedTask
+        task: updatedTask,
+        blockedWaitingElapsedMs
       };
     });
     const shouldRunTerminalSideEffects = (status === "completed" || status === "failed") && result.success && result.task && !(("wasNoOp" in result) && result.wasNoOp) && !(("wasForcedOverwrite" in result) && result.wasForcedOverwrite);
@@ -118998,7 +119161,8 @@ var registerStoreProgressTool = (server) => {
       yourAgentId: requestInfo.agentId,
       ...task ? { task } : {},
       ..."wasNoOp" in result && result.wasNoOp ? { wasNoOp: true } : {},
-      ..."wasForcedOverwrite" in result && result.wasForcedOverwrite ? { wasForcedOverwrite: true } : {}
+      ..."wasForcedOverwrite" in result && result.wasForcedOverwrite ? { wasForcedOverwrite: true } : {},
+      ..."blockedWaitingElapsedMs" in result && typeof result.blockedWaitingElapsedMs === "number" ? { blockedWaitingElapsedMs: result.blockedWaitingElapsedMs } : {}
     };
     return success ? toolOk(message, { data }) : toolErr(message, { data });
   });
@@ -119517,6 +119681,7 @@ async function emitBudgetRefusalSideEffects(ctx, inserted) {
         }, { agentId: ctx.agentId });
         const followUp = await createTaskExtended(resolved.text, {
           agentId: leadAgent.id,
+          routingReason: "skill",
           source: "system",
           taskType: "follow-up",
           parentTaskId: ctx.task.id,
@@ -121364,10 +121529,13 @@ async function createServer(opts = {}) {
     version: package_default.version,
     description: package_default.description
   }, {
+    ...opts.preloadedTools?.length ? { instructions: resolveTemplate("system.agent.tool_preload", {}).text } : {},
     capabilities: {
       logging: {}
     }
   });
+  if (opts.preloadedTools?.length)
+    setPreloadedTools(server, opts.preloadedTools);
   if (opts.scriptsOnly ?? isScriptsOnlyMcp()) {
     registerScriptSearchTool(server);
     registerScriptRunTool(server);