@desplega.ai/agent-swarm 1.68.0 → 1.69.1

package/README.md

@@ -31,8 +31,8 @@
   <a href="https://discord.gg/KZgfyyDVZa">
     <img src="https://img.shields.io/badge/Discord-Join%20Community-5865F2?style=for-the-badge&logo=discord&logoColor=white" alt="Join Discord">
   </a>
-  <a href="https://x.com/swarm_lead">
-    <img src="https://img.shields.io/badge/𝕏-@swarm__lead-000?style=for-the-badge&logo=x&logoColor=white" alt="Follow on X">
+  <a href="https://x.com/desplegalabs">
+    <img src="https://img.shields.io/badge/𝕏-@desplegalabs-000?style=for-the-badge&logo=x&logoColor=white" alt="Follow on X">
   </a>
 </p>
 
@@ -89,7 +89,7 @@ flowchart LR
 - **Multi-channel inputs** — Slack, GitHub, GitLab, email, Linear, and the HTTP API all create tasks. [Integrations](#integrations)
 - **Workflow engine with Human-in-the-Loop** — DAG-based automation with approval gates, retries, and structured I/O. [Workflows →](https://docs.agent-swarm.dev/docs/concepts/workflows)
 - **Scheduled & recurring tasks** — cron-based automation for standing work. [Scheduling →](https://docs.agent-swarm.dev/docs/concepts/scheduling)
-- **Multi-provider** — run with Claude Code, OpenAI Codex, or pi-mono. [Harness config →](https://docs.agent-swarm.dev/docs/guides/harness-configuration)
+- **Multi-provider** — run with Claude Code, OpenAI Codex, or pi-mono. [Harness config →](https://docs.agent-swarm.dev/docs/guides/harness-configuration) · [Add a new provider →](https://docs.agent-swarm.dev/docs/guides/harness-providers)
 - **Skills & MCP servers** — reusable procedural knowledge and per-agent MCP servers with scope cascade. [MCP tools →](https://docs.agent-swarm.dev/docs/reference/mcp-tools)
 - **Real-time dashboard** — monitor agents, tasks, and inter-agent chat. [app.agent-swarm.dev →](https://app.agent-swarm.dev)
 

package/openapi.json

@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "Agent Swarm API",
-    "version": "1.68.0",
+    "version": "1.69.1",
     "description": "Multi-agent orchestration API for Claude Code, Codex, and Gemini CLI. Enables task distribution, agent communication, and service discovery.\n\nMCP tools are documented separately in [MCP.md](./MCP.md)."
   },
   "servers": [
@@ -4724,6 +4724,351 @@
         }
       }
     },
+    "/api/mcp-oauth/{mcpServerId}/metadata": {
+      "get": {
+        "summary": "Probe OAuth metadata (PRMD + AS) for an MCP server",
+        "tags": [
+          "MCP OAuth"
+        ],
+        "security": [
+          {
+            "bearerAuth": []
+          }
+        ],
+        "parameters": [
+          {
+            "schema": {
+              "type": "string"
+            },
+            "required": true,
+            "name": "mcpServerId",
+            "in": "path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OAuth metadata or { requiresOAuth: false }"
+          },
+          "400": {
+            "description": "MCP has no URL / invalid transport"
+          },
+          "404": {
+            "description": "MCP server not found"
+          }
+        }
+      }
+    },
+    "/api/mcp-oauth/{mcpServerId}/status": {
+      "get": {
+        "summary": "Get the current OAuth connection status for an MCP server",
+        "tags": [
+          "MCP OAuth"
+        ],
+        "security": [
+          {
+            "bearerAuth": []
+          }
+        ],
+        "parameters": [
+          {
+            "schema": {
+              "type": "string"
+            },
+            "required": true,
+            "name": "mcpServerId",
+            "in": "path"
+          },
+          {
+            "schema": {
+              "type": "string"
+            },
+            "required": false,
+            "name": "userId",
+            "in": "query"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Token status (never includes the token value itself)"
+          },
+          "404": {
+            "description": "MCP server not found"
+          }
+        }
+      }
+    },
+    "/api/mcp-oauth/{mcpServerId}/authorize": {
+      "get": {
+        "summary": "Start an OAuth flow. Redirects to the provider.",
+        "tags": [
+          "MCP OAuth"
+        ],
+        "security": [
+          {
+            "bearerAuth": []
+          }
+        ],
+        "parameters": [
+          {
+            "schema": {
+              "type": "string"
+            },
+            "required": true,
+            "name": "mcpServerId",
+            "in": "path"
+          },
+          {
+            "schema": {
+              "type": "string"
+            },
+            "required": false,
+            "name": "redirect",
+            "in": "query"
+          },
+          {
+            "schema": {
+              "type": "string"
+            },
+            "required": false,
+            "name": "userId",
+            "in": "query"
+          },
+          {
+            "schema": {
+              "type": "string"
+            },
+            "required": false,
+            "name": "scopes",
+            "in": "query"
+          }
+        ],
+        "responses": {
+          "302": {
+            "description": "Redirect to authorization server"
+          },
+          "400": {
+            "description": "MCP has no URL / does not require OAuth"
+          },
+          "404": {
+            "description": "MCP server not found"
+          }
+        }
+      }
+    },
+    "/api/mcp-oauth/callback": {
+      "get": {
+        "summary": "OAuth redirect target. Exchanges code -> tokens and redirects back to dashboard.",
+        "tags": [
+          "MCP OAuth"
+        ],
+        "parameters": [
+          {
+            "schema": {
+              "type": "string"
+            },
+            "required": false,
+            "name": "code",
+            "in": "query"
+          },
+          {
+            "schema": {
+              "type": "string"
+            },
+            "required": false,
+            "name": "state",
+            "in": "query"
+          },
+          {
+            "schema": {
+              "type": "string"
+            },
+            "required": false,
+            "name": "error",
+            "in": "query"
+          },
+          {
+            "schema": {
+              "type": "string"
+            },
+            "required": false,
+            "name": "error_description",
+            "in": "query"
+          }
+        ],
+        "responses": {
+          "302": {
+            "description": "Redirect back to dashboard with oauth=success or oauth=error"
+          },
+          "400": {
+            "description": "Bad state / missing code"
+          }
+        }
+      }
+    },
+    "/api/mcp-oauth/{mcpServerId}/refresh": {
+      "post": {
+        "summary": "Force-refresh the access token for an MCP server",
+        "tags": [
+          "MCP OAuth"
+        ],
+        "security": [
+          {
+            "bearerAuth": []
+          }
+        ],
+        "parameters": [
+          {
+            "schema": {
+              "type": "string"
+            },
+            "required": true,
+            "name": "mcpServerId",
+            "in": "path"
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "userId": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Refreshed token"
+          },
+          "404": {
+            "description": "No token for this MCP server"
+          },
+          "500": {
+            "description": "Refresh failed"
+          }
+        }
+      }
+    },
+    "/api/mcp-oauth/{mcpServerId}": {
+      "delete": {
+        "summary": "Revoke and delete the OAuth token for an MCP server",
+        "tags": [
+          "MCP OAuth"
+        ],
+        "security": [
+          {
+            "bearerAuth": []
+          }
+        ],
+        "parameters": [
+          {
+            "schema": {
+              "type": "string"
+            },
+            "required": true,
+            "name": "mcpServerId",
+            "in": "path"
+          },
+          {
+            "schema": {
+              "type": "string"
+            },
+            "required": false,
+            "name": "userId",
+            "in": "query"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Token revoked/deleted"
+          },
+          "404": {
+            "description": "No token for this MCP server"
+          }
+        }
+      }
+    },
+    "/api/mcp-oauth/{mcpServerId}/manual-client": {
+      "post": {
+        "summary": "Register a pre-existing OAuth client (DCR fallback)",
+        "tags": [
+          "MCP OAuth"
+        ],
+        "security": [
+          {
+            "bearerAuth": []
+          }
+        ],
+        "parameters": [
+          {
+            "schema": {
+              "type": "string"
+            },
+            "required": true,
+            "name": "mcpServerId",
+            "in": "path"
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "clientId": {
+                    "type": "string",
+                    "minLength": 1
+                  },
+                  "clientSecret": {
+                    "type": "string"
+                  },
+                  "authorizationServerIssuer": {
+                    "type": "string",
+                    "format": "uri"
+                  },
+                  "authorizeUrl": {
+                    "type": "string",
+                    "format": "uri"
+                  },
+                  "tokenUrl": {
+                    "type": "string",
+                    "format": "uri"
+                  },
+                  "revocationUrl": {
+                    "type": "string",
+                    "format": "uri"
+                  },
+                  "scopes": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  }
+                },
+                "required": [
+                  "clientId"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Pending client stored. Call /authorize to start the flow."
+          },
+          "400": {
+            "description": "Bad input"
+          },
+          "404": {
+            "description": "MCP server not found"
+          }
+        }
+      }
+    },
     "/api/mcp-servers": {
       "get": {
         "summary": "List MCP servers with optional filters",
@@ -5399,6 +5744,9 @@
                   "outputSchema": {
                     "type": "object",
                     "additionalProperties": {}
+                  },
+                  "contextKey": {
+                    "type": "string"
                   }
                 },
                 "required": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@desplega.ai/agent-swarm",
-  "version": "1.68.0",
+  "version": "1.69.1",
   "description": "Multi-agent orchestration for Claude Code, Codex, Gemini CLI, and other AI coding assistants",
   "license": "MIT",
   "author": "desplega.sh <contact@desplega.sh>",

package/src/agentmail/handlers.ts

@@ -1,5 +1,4 @@
 import {
-  createTaskExtended,
   findTaskByAgentMailThread,
   getAgentById,
   getAgentMailInboxMapping,
@@ -7,11 +6,63 @@ import {
   resolveUser,
 } from "../be/db";
 import { resolveTemplate } from "../prompts/resolver";
+import { createIngressBuffer } from "../tasks/additive-ingress";
+import { agentmailContextKey } from "../tasks/context-key";
+import { createTaskWithSiblingAwareness } from "../tasks/sibling-awareness";
 import { workflowEventBus } from "../workflows/event-bus";
 // Side-effect import: registers all AgentMail event templates in the in-memory registry
 import "./templates";
 import type { AgentMailMessage, AgentMailWebhookPayload } from "./types";
 
+const ACTIVE_TASK_STATUSES = new Set(["pending", "in_progress", "offered", "paused"]);
+
+interface BufferedAgentMailMessage {
+  from: string;
+  subject: string;
+  inboxId: string;
+  threadId: string;
+  messageId: string;
+  preview: string;
+  agentId: string | null;
+  parentTaskId: string;
+  requestedByUserId: string | undefined;
+}
+
+const AGENTMAIL_BUFFER_TIMEOUT_MS = Number(process.env.ADDITIVE_AGENTMAIL_BUFFER_MS) || 10_000;
+
+const agentmailBuffer = createIngressBuffer<BufferedAgentMailMessage>({
+  source: "agentmail",
+  envFlag: "ADDITIVE_AGENTMAIL",
+  timeoutMs: AGENTMAIL_BUFFER_TIMEOUT_MS,
+  onFlush: (items, contextKey) => {
+    if (items.length === 0) return;
+    const first = items[0]!;
+    const combinedPreview = items.map((m) => m.preview).join("\n---\n");
+    const followupResult = resolveTemplate("agentmail.email.followup", {
+      from: first.from,
+      subject: first.subject,
+      inbox_id: first.inboxId,
+      thread_id: first.threadId,
+      preview: `[${items.length} buffered message(s)]\n\n${combinedPreview}`,
+    });
+    if (followupResult.skipped) return;
+    const task = createTaskWithSiblingAwareness(followupResult.text, {
+      agentId: first.agentId,
+      source: "agentmail",
+      taskType: "agentmail-reply",
+      agentmailInboxId: first.inboxId,
+      agentmailMessageId: first.messageId,
+      agentmailThreadId: first.threadId,
+      parentTaskId: first.parentTaskId,
+      requestedByUserId: first.requestedByUserId,
+      contextKey,
+    });
+    console.log(
+      `[AgentMail] Buffered flush → task ${task.id} (${items.length} messages, thread ${first.threadId})`,
+    );
+  },
+});
+
 /**
  * Extract bare email address from a from_ field like "Taras Yarema <t@desplega.ai>" or "t@desplega.ai".
  */
@@ -126,6 +177,31 @@ export async function handleMessageReceived(
   // Check for thread continuity - find existing task for this thread
   const existingTask = findTaskByAgentMailThread(thread_id);
   if (existingTask) {
+    const contextKey = agentmailContextKey({ threadId: thread_id });
+    const siblingInFlight = ACTIVE_TASK_STATUSES.has(existingTask.status);
+
+    // Opt-in: when ADDITIVE_AGENTMAIL is true, buffer rapid follow-ups while
+    // the prior task is still running — coalesce into ONE follow-up task.
+    if (
+      agentmailBuffer.enabled &&
+      agentmailBuffer.maybeBuffer(contextKey, siblingInFlight, {
+        from,
+        subject,
+        inboxId: inbox_id,
+        threadId: thread_id,
+        messageId: message_id,
+        preview,
+        agentId: existingTask.agentId,
+        parentTaskId: existingTask.id,
+        requestedByUserId,
+      })
+    ) {
+      console.log(
+        `[AgentMail] Buffered follow-up for thread ${thread_id} (parent ${existingTask.id}, status ${existingTask.status})`,
+      );
+      return { created: false };
+    }
+
     // Create a follow-up task with parentTaskId to continue the session
     const followupResult = resolveTemplate("agentmail.email.followup", {
       from,
@@ -139,7 +215,7 @@ export async function handleMessageReceived(
       return { created: false };
     }
 
-    const task = createTaskExtended(followupResult.text, {
+    const task = createTaskWithSiblingAwareness(followupResult.text, {
       agentId: existingTask.agentId,
       source: "agentmail",
       taskType: "agentmail-reply",
@@ -148,6 +224,7 @@ export async function handleMessageReceived(
       agentmailThreadId: thread_id,
       parentTaskId: existingTask.id,
       requestedByUserId,
+      contextKey,
     });
 
     console.log(
@@ -177,7 +254,7 @@ export async function handleMessageReceived(
           return { created: false };
         }
 
-        const task = createTaskExtended(leadResult.text, {
+        const task = createTaskWithSiblingAwareness(leadResult.text, {
           agentId: agent.id,
           source: "agentmail",
           taskType: "agentmail-message",
@@ -185,6 +262,7 @@ export async function handleMessageReceived(
           agentmailMessageId: message_id,
           agentmailThreadId: thread_id,
           requestedByUserId,
+          contextKey: agentmailContextKey({ threadId: thread_id }),
         });
 
         console.log(
@@ -206,7 +284,7 @@ export async function handleMessageReceived(
         return { created: false };
       }
 
-      const task = createTaskExtended(workerResult.text, {
+      const task = createTaskWithSiblingAwareness(workerResult.text, {
         agentId: agent.id,
         source: "agentmail",
         taskType: "agentmail-message",
@@ -214,6 +292,7 @@ export async function handleMessageReceived(
         agentmailMessageId: message_id,
         agentmailThreadId: thread_id,
         requestedByUserId,
+        contextKey: agentmailContextKey({ threadId: thread_id }),
       });
 
       console.log(
@@ -239,7 +318,7 @@ export async function handleMessageReceived(
       return { created: false };
     }
 
-    const task = createTaskExtended(unmappedResult.text, {
+    const task = createTaskWithSiblingAwareness(unmappedResult.text, {
       agentId: lead.id,
       source: "agentmail",
       taskType: "agentmail-message",
@@ -247,6 +326,7 @@ export async function handleMessageReceived(
       agentmailMessageId: message_id,
       agentmailThreadId: thread_id,
       requestedByUserId,
+      contextKey: agentmailContextKey({ threadId: thread_id }),
     });
 
     console.log(
@@ -268,13 +348,14 @@ export async function handleMessageReceived(
     return { created: false };
   }
 
-  const task = createTaskExtended(noAgentResult.text, {
+  const task = createTaskWithSiblingAwareness(noAgentResult.text, {
     source: "agentmail",
     taskType: "agentmail-message",
     agentmailInboxId: inbox_id,
     agentmailMessageId: message_id,
     agentmailThreadId: thread_id,
     requestedByUserId,
+    contextKey: agentmailContextKey({ threadId: thread_id }),
   });
 
   console.log(`[AgentMail] Created unassigned task ${task.id} (no lead or mapping available)`);