@desplega.ai/agent-swarm 1.69.0 → 1.70.0

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.69.0",
+    "version": "1.70.0",
     "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": [
@@ -4855,6 +4855,64 @@
         }
       }
     },
+    "/api/mcp-oauth/{mcpServerId}/authorize-url": {
+      "get": {
+        "summary": "Build an OAuth authorize URL. Returns JSON so the browser can navigate without losing the Bearer auth header.",
+        "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": {
+          "200": {
+            "description": "{ providerUrl: string }"
+          },
+          "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.",
@@ -5744,6 +5802,9 @@
                   "outputSchema": {
                     "type": "object",
                     "additionalProperties": {}
+                  },
+                  "contextKey": {
+                    "type": "string"
                   }
                 },
                 "required": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@desplega.ai/agent-swarm",
-  "version": "1.69.0",
+  "version": "1.70.0",
   "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)`);

package/src/be/db.ts

@@ -802,6 +802,7 @@ type AgentTaskRow = {
   workflowRunId: string | null;
   workflowRunStepId: string | null;
   outputSchema: string | null;
+  contextKey: string | null;
   createdAt: string;
   lastUpdatedAt: string;
   finishedAt: string | null;
@@ -862,6 +863,7 @@ function rowToAgentTask(row: AgentTaskRow): AgentTask {
     workflowRunId: row.workflowRunId ?? undefined,
     workflowRunStepId: row.workflowRunStepId ?? undefined,
     outputSchema: row.outputSchema ? JSON.parse(row.outputSchema) : undefined,
+    contextKey: row.contextKey ?? undefined,
     compactionCount: row.compactionCount ?? undefined,
     peakContextPercent: row.peakContextPercent ?? undefined,
     totalContextTokensUsed: row.totalContextTokensUsed ?? undefined,
@@ -1430,6 +1432,31 @@ export function getInProgressSlackTasks(): AgentTask[] {
     .map(rowToAgentTask);
 }
 
+/**
+ * Return sibling tasks for a given cross-ingress context key, optionally
+ * filtered by status. The returned shape mirrors getInProgressSlackTasks for
+ * consistency; callers can narrow further in TypeScript.
+ *
+ * See src/tasks/context-key.ts for the key schema.
+ */
+export function getInProgressTasksByContextKey(
+  contextKey: string,
+  statuses: AgentTaskStatus[] = ["pending", "in_progress", "offered", "paused"],
+): AgentTask[] {
+  if (!contextKey || statuses.length === 0) return [];
+  const placeholders = statuses.map(() => "?").join(",");
+  return getDb()
+    .prepare<AgentTaskRow, (string | AgentTaskStatus)[]>(
+      `SELECT * FROM agent_tasks
+       WHERE contextKey = ?
+       AND status IN (${placeholders})
+       ORDER BY lastUpdatedAt DESC
+       LIMIT 200`,
+    )
+    .all(contextKey, ...statuses)
+    .map(rowToAgentTask);
+}
+
 /**
  * Find the most recent agent associated with a specific Slack thread.
  * No status filter — returns the last agent that touched this thread regardless of task state.
@@ -1934,6 +1961,7 @@ export interface CreateTaskOptions {
   sourceTaskId?: string;
   outputSchema?: Record<string, unknown>;
   requestedByUserId?: string;
+  contextKey?: string;
 }
 
 /**
@@ -2004,6 +2032,9 @@ export function createTaskExtended(task: string, options?: CreateTaskOptions): A
       if (parent.requestedByUserId && !options.requestedByUserId) {
         options.requestedByUserId = parent.requestedByUserId;
       }
+      if (parent.contextKey && !options.contextKey) {
+        options.contextKey = parent.contextKey;
+      }
     }
   }
 
@@ -2029,8 +2060,8 @@ export function createTaskExtended(task: string, options?: CreateTaskOptions): A
         vcsInstallationId, vcsNodeId,
         agentmailInboxId, agentmailMessageId, agentmailThreadId,
         mentionMessageId, mentionChannelId, dir, parentTaskId, model, scheduleId,
-        workflowRunId, workflowRunStepId, outputSchema, requestedByUserId, swarmVersion, createdAt, lastUpdatedAt
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING *`,
+        workflowRunId, workflowRunStepId, outputSchema, requestedByUserId, contextKey, swarmVersion, createdAt, lastUpdatedAt
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING *`,
     )
     .get(
       id,
@@ -2070,6 +2101,7 @@ export function createTaskExtended(task: string, options?: CreateTaskOptions): A
       options?.workflowRunStepId ?? null,
       options?.outputSchema ? JSON.stringify(options.outputSchema) : null,
       options?.requestedByUserId ?? null,
+      options?.contextKey ?? null,
       pkg.version,
       now,
       now,

package/src/be/migrations/042_task_context_key.sql

@@ -0,0 +1,13 @@
+-- Add a uniform context_key column on tasks for cross-ingress sibling awareness.
+-- See src/tasks/context-key.ts for the key schema.
+-- Nullable: historical rows stay NULL, new ingress paths populate it going forward.
+ALTER TABLE agent_tasks ADD COLUMN contextKey TEXT;
+
+-- Plain btree index for generic lookups by context key.
+CREATE INDEX IF NOT EXISTS idx_agent_tasks_context_key
+  ON agent_tasks(contextKey);
+
+-- Composite index supporting the "in-progress sibling" lookup pattern:
+-- WHERE contextKey = ? AND status IN (...).
+CREATE INDEX IF NOT EXISTS idx_agent_tasks_context_key_status
+  ON agent_tasks(contextKey, status);

package/src/commands/runner.ts

@@ -272,6 +272,7 @@ const SWARM_TOOL_LABELS: Record<string, string | null> = {
   "update-profile": "🪪 Updating profile",
   // Slack
   "slack-post": "💬 Posting to Slack",
+  "slack-start-thread": "💬 Starting Slack thread",
   "slack-reply": "💬 Replying in Slack",
   "slack-read": "💬 Reading Slack",
   "slack-list-channels": "💬 Listing Slack channels",

package/src/github/handlers.ts

@@ -1,5 +1,7 @@
-import { createTaskExtended, failTask, findTaskByVcs, getAllAgents, resolveUser } from "../be/db";
+import { failTask, findTaskByVcs, getAllAgents, resolveUser } from "../be/db";
 import { resolveTemplate } from "../prompts/resolver";
+import { githubContextKey } from "../tasks/context-key";
+import { createTaskWithSiblingAwareness } from "../tasks/sibling-awareness";
 import {
   detectMention,
   extractMentionContext,
@@ -24,6 +26,25 @@ import type {
 const processedEvents = new Map<string, number>();
 const EVENT_TTL = 60_000;
 
+/**
+ * Build a uniform cross-ingress context key for a GitHub issue or PR.
+ * `repository.full_name` is "owner/repo"; split it and fall back gracefully
+ * if the split unexpectedly fails so we never block task creation on a bad key.
+ */
+function buildGithubContextKey(
+  fullName: string,
+  kind: "issue" | "pr",
+  number: number,
+): string | undefined {
+  const [owner, repo] = fullName.split("/");
+  if (!owner || !repo) return undefined;
+  try {
+    return githubContextKey({ owner, repo, kind, number });
+  } catch {
+    return undefined;
+  }
+}
+
 /**
  * Get review state emoji and label
  */
@@ -172,7 +193,7 @@ export async function handlePullRequest(
       return { created: false };
     }
 
-    const task = createTaskExtended(result.text, {
+    const task = createTaskWithSiblingAwareness(result.text, {
       agentId: lead?.id ?? "",
       source: "github",
       vcsProvider: "github",
@@ -184,6 +205,7 @@ export async function handlePullRequest(
       requestedByUserId,
       vcsUrl: pr.html_url,
       vcsInstallationId: installation?.id,
+      contextKey: buildGithubContextKey(repository.full_name, "pr", pr.number),
     });
 
     if (lead) {
@@ -271,7 +293,7 @@ export async function handlePullRequest(
       return { created: false };
     }
 
-    const task = createTaskExtended(result.text, {
+    const task = createTaskWithSiblingAwareness(result.text, {
       agentId: lead?.id ?? "",
       source: "github",
       vcsProvider: "github",
@@ -283,6 +305,7 @@ export async function handlePullRequest(
       requestedByUserId,
       vcsUrl: pr.html_url,
       vcsInstallationId: installation?.id,
+      contextKey: buildGithubContextKey(repository.full_name, "pr", pr.number),
     });
 
     if (lead) {
@@ -362,7 +385,7 @@ export async function handlePullRequest(
       return { created: false };
     }
 
-    const task = createTaskExtended(result.text, {
+    const task = createTaskWithSiblingAwareness(result.text, {
       agentId: lead?.id ?? "",
       source: "github",
       vcsProvider: "github",
@@ -374,6 +397,7 @@ export async function handlePullRequest(
       requestedByUserId,
       vcsUrl: pr.html_url,
       vcsInstallationId: installation?.id,
+      contextKey: buildGithubContextKey(repository.full_name, "pr", pr.number),
     });
 
     if (lead) {
@@ -451,7 +475,7 @@ export async function handlePullRequest(
   }
 
   // Create task (assigned to lead if available, otherwise unassigned)
-  const task = createTaskExtended(result.text, {
+  const task = createTaskWithSiblingAwareness(result.text, {
     agentId: lead?.id ?? "",
     source: "github",
     vcsProvider: "github",
@@ -462,6 +486,7 @@ export async function handlePullRequest(
     vcsAuthor: sender.login,
     vcsUrl: pr.html_url,
     vcsInstallationId: installation?.id,
+    contextKey: buildGithubContextKey(repository.full_name, "pr", pr.number),
   });
 
   if (lead) {
@@ -524,7 +549,7 @@ export async function handleIssue(
       return { created: false };
     }
 
-    const task = createTaskExtended(result.text, {
+    const task = createTaskWithSiblingAwareness(result.text, {
       agentId: lead?.id ?? "",
       source: "github",
       vcsProvider: "github",
@@ -536,6 +561,7 @@ export async function handleIssue(
       requestedByUserId,
       vcsUrl: issue.html_url,
       vcsInstallationId: installation?.id,
+      contextKey: buildGithubContextKey(repository.full_name, "issue", issue.number),
     });
 
     if (lead) {
@@ -611,7 +637,7 @@ export async function handleIssue(
       return { created: false };
     }
 
-    const task = createTaskExtended(result.text, {
+    const task = createTaskWithSiblingAwareness(result.text, {
       agentId: lead?.id ?? "",
       source: "github",
       vcsProvider: "github",
@@ -623,6 +649,7 @@ export async function handleIssue(
       requestedByUserId,
       vcsUrl: issue.html_url,
       vcsInstallationId: installation?.id,
+      contextKey: buildGithubContextKey(repository.full_name, "issue", issue.number),
     });
 
     if (lead) {
@@ -682,7 +709,7 @@ export async function handleIssue(
   }
 
   // Create task (assigned to lead if available, otherwise unassigned)
-  const task = createTaskExtended(result.text, {
+  const task = createTaskWithSiblingAwareness(result.text, {
     agentId: lead?.id ?? "",
     source: "github",
     vcsProvider: "github",
@@ -693,6 +720,7 @@ export async function handleIssue(
     vcsAuthor: sender.login,
     vcsUrl: issue.html_url,
     vcsInstallationId: installation?.id,
+    contextKey: buildGithubContextKey(repository.full_name, "issue", issue.number),
   });
 
   if (lead) {
@@ -780,7 +808,7 @@ export async function handleComment(
   }
 
   // Create task (assigned to lead if available, otherwise unassigned)
-  const task = createTaskExtended(result.text, {
+  const task = createTaskWithSiblingAwareness(result.text, {
     agentId: lead?.id ?? "",
     source: "github",
     vcsProvider: "github",
@@ -793,6 +821,9 @@ export async function handleComment(
     vcsUrl: targetUrl,
     vcsInstallationId: installation?.id,
     vcsNodeId: comment.node_id,
+    contextKey: targetNumber
+      ? buildGithubContextKey(repository.full_name, pull_request ? "pr" : "issue", targetNumber)
+      : undefined,
   });
 
   if (lead) {
@@ -895,7 +926,7 @@ export async function handlePullRequestReview(
   }
 
   // Create task (assigned to lead if available, otherwise unassigned)
-  const task = createTaskExtended(result.text, {
+  const task = createTaskWithSiblingAwareness(result.text, {
     agentId: lead?.id ?? "",
     source: "github",
     vcsProvider: "github",
@@ -907,6 +938,7 @@ export async function handlePullRequestReview(
     vcsUrl: review.html_url,
     vcsInstallationId: installation?.id,
     vcsNodeId: review.node_id,
+    contextKey: buildGithubContextKey(repository.full_name, "pr", pr.number),
   });
 
   if (lead) {

package/src/gitlab/handlers.ts

@@ -8,8 +8,10 @@
  * - Detects bot mentions
  */
 
-import { createTaskExtended, failTask, findTaskByVcs, getAllAgents, resolveUser } from "../be/db";
+import { failTask, findTaskByVcs, getAllAgents, resolveUser } from "../be/db";
 import { resolveTemplate } from "../prompts/resolver";
+import { gitlabContextKey } from "../tasks/context-key";
+import { createTaskWithSiblingAwareness } from "../tasks/sibling-awareness";
 import { GITLAB_BOT_NAME } from "./auth";
 import { addGitLabNoteReaction, addGitLabReaction } from "./reactions";
 // Side-effect import: registers all GitLab event templates in the in-memory registry
@@ -99,7 +101,7 @@ export async function handleMergeRequest(
         return { created: false };
       }
 
-      const task = createTaskExtended(result.text, {
+      const task = createTaskWithSiblingAwareness(result.text, {
         agentId: lead?.id ?? null,
         source: "gitlab",
         vcsProvider: "gitlab",
@@ -110,6 +112,11 @@ export async function handleMergeRequest(
         vcsAuthor: user.username,
         requestedByUserId,
         vcsUrl: mr.url,
+        contextKey: gitlabContextKey({
+          projectId: String(project.id),
+          kind: "mr",
+          iid: mr.iid,
+        }),
       });
 
       try {
@@ -196,7 +203,7 @@ export async function handleIssue(
         return { created: false };
       }
 
-      const task = createTaskExtended(result.text, {
+      const task = createTaskWithSiblingAwareness(result.text, {
         agentId: lead?.id ?? null,
         source: "gitlab",
         vcsProvider: "gitlab",
@@ -207,6 +214,11 @@ export async function handleIssue(
         vcsAuthor: user.username,
         requestedByUserId,
         vcsUrl: issue.url,
+        contextKey: gitlabContextKey({
+          projectId: String(project.id),
+          kind: "issue",
+          iid: issue.iid,
+        }),
       });
 
       try {
@@ -293,7 +305,7 @@ export async function handleNote(event: NoteEvent): Promise<{ created: boolean;
     return { created: false };
   }
 
-  const task = createTaskExtended(noteResult.text, {
+  const task = createTaskWithSiblingAwareness(noteResult.text, {
     agentId: lead?.id ?? null,
     source: "gitlab",
     vcsProvider: "gitlab",
@@ -305,6 +317,13 @@ export async function handleNote(event: NoteEvent): Promise<{ created: boolean;
     vcsAuthor: user.username,
     vcsUrl: targetUrl,
     parentTaskId: existingTask?.id,
+    contextKey: targetNumber
+      ? gitlabContextKey({
+          projectId: String(project.id),
+          kind: note.noteable_type === "MergeRequest" ? "mr" : "issue",
+          iid: targetNumber,
+        })
+      : undefined,
   });
 
   try {
@@ -362,7 +381,7 @@ export async function handlePipeline(
     return { created: false };
   }
 
-  const task = createTaskExtended(pipelineResult.text, {
+  const task = createTaskWithSiblingAwareness(pipelineResult.text, {
     agentId: lead?.id ?? null,
     source: "gitlab",
     vcsProvider: "gitlab",
@@ -373,6 +392,11 @@ export async function handlePipeline(
     vcsAuthor: "",
     vcsUrl: event.merge_request.url,
     parentTaskId: existingTask.id,
+    contextKey: gitlabContextKey({
+      projectId: String(project.id),
+      kind: "mr",
+      iid: mrIid,
+    }),
   });
 
   return { created: true, taskId: task.id };