@desplega.ai/agent-swarm 1.57.5 → 1.58.0

package/openapi.json

@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "Agent Swarm API",
-    "version": "1.57.5",
+    "version": "1.58.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": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@desplega.ai/agent-swarm",
-  "version": "1.57.5",
+  "version": "1.58.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

@@ -4,6 +4,7 @@ import {
   getAgentById,
   getAgentMailInboxMapping,
   getAllAgents,
+  resolveUser,
 } from "../be/db";
 import { resolveTemplate } from "../prompts/resolver";
 import { workflowEventBus } from "../workflows/event-bus";
@@ -11,6 +12,16 @@ import { workflowEventBus } from "../workflows/event-bus";
 import "./templates";
 import type { AgentMailMessage, AgentMailWebhookPayload } from "./types";
 
+/**
+ * Extract bare email address from a from_ field like "Taras Yarema <t@desplega.ai>" or "t@desplega.ai".
+ */
+function extractEmailFromField(from: string): string | undefined {
+  const angleMatch = from.match(/<([^>]+@[^>]+)>/);
+  if (angleMatch?.[1]) return angleMatch[1].toLowerCase();
+  const bareMatch = from.match(/[\w.+-]+@[\w.-]+\.\w+/);
+  return bareMatch?.[0]?.toLowerCase();
+}
+
 /**
  * Check if an inbox domain is allowed by the filter.
  * Returns true if no filter is set or the inbox domain matches.
@@ -96,6 +107,10 @@ export async function handleMessageReceived(
     (Array.isArray(message.from_) ? message.from_.join(", ") : message.from_) || "unknown";
   const subject = message.subject || "(no subject)";
   const body = message.text || message.html || "";
+
+  // Resolve canonical user from sender email
+  const senderEmail = extractEmailFromField(from);
+  const requestedByUserId = senderEmail ? resolveUser({ email: senderEmail })?.id : undefined;
   const preview = body.length > 500 ? `${body.substring(0, 500)}...` : body;
 
   // Emit workflow trigger event
@@ -132,6 +147,7 @@ export async function handleMessageReceived(
       agentmailMessageId: message_id,
       agentmailThreadId: thread_id,
       parentTaskId: existingTask.id,
+      requestedByUserId,
     });
 
     console.log(
@@ -168,6 +184,7 @@ export async function handleMessageReceived(
           agentmailInboxId: inbox_id,
           agentmailMessageId: message_id,
           agentmailThreadId: thread_id,
+          requestedByUserId,
         });
 
         console.log(
@@ -196,6 +213,7 @@ export async function handleMessageReceived(
         agentmailInboxId: inbox_id,
         agentmailMessageId: message_id,
         agentmailThreadId: thread_id,
+        requestedByUserId,
       });
 
       console.log(
@@ -228,6 +246,7 @@ export async function handleMessageReceived(
       agentmailInboxId: inbox_id,
       agentmailMessageId: message_id,
       agentmailThreadId: thread_id,
+      requestedByUserId,
     });
 
     console.log(
@@ -255,6 +274,7 @@ export async function handleMessageReceived(
     agentmailInboxId: inbox_id,
     agentmailMessageId: message_id,
     agentmailThreadId: thread_id,
+    requestedByUserId,
   });
 
   console.log(`[AgentMail] Created unassigned task ${task.id} (no lead or mapping available)`);

package/src/be/db.ts

@@ -44,6 +44,7 @@ import type {
   SwarmConfig,
   SwarmRepo,
   TriggerConfig,
+  User,
   VersionableField,
   VersionMeta,
   Workflow,
@@ -66,6 +67,17 @@ export function initDb(dbPath = "./agent-swarm-db.sqlite"): Database {
     return db;
   }
 
+  // Fast path for tests: restore from pre-built template that already has
+  // migrations, seeds, and all post-init work baked in. Only the per-connection
+  // PRAGMA and the in-memory resolver function need to be set.
+  const templateBytes = (globalThis as any).__testMigrationTemplate as Uint8Array | undefined;
+  if (templateBytes) {
+    db = Database.deserialize(templateBytes);
+    db.run("PRAGMA foreign_keys = ON;");
+    configureDbResolver(resolvePromptTemplate);
+    return db;
+  }
+
   db = new Database(dbPath, { create: true });
   console.log(`Database initialized at ${dbPath}`);
 
@@ -730,6 +742,7 @@ type AgentTaskRow = {
   was_paused: number;
   credentialKeySuffix: string | null;
   credentialKeyType: string | null;
+  requestedByUserId: string | null;
 };
 
 function rowToAgentTask(row: AgentTaskRow): AgentTask {
@@ -785,6 +798,7 @@ function rowToAgentTask(row: AgentTaskRow): AgentTask {
     wasPaused: !!row.was_paused,
     credentialKeySuffix: row.credentialKeySuffix ?? undefined,
     credentialKeyType: row.credentialKeyType ?? undefined,
+    requestedByUserId: row.requestedByUserId ?? undefined,
   };
 }
 
@@ -1798,6 +1812,7 @@ export interface CreateTaskOptions {
   workflowRunStepId?: string;
   sourceTaskId?: string;
   outputSchema?: Record<string, unknown>;
+  requestedByUserId?: string;
 }
 
 /**
@@ -1865,6 +1880,9 @@ export function createTaskExtended(task: string, options?: CreateTaskOptions): A
       if (parent.agentmailThreadId && !options.agentmailThreadId) {
         options.agentmailThreadId = parent.agentmailThreadId;
       }
+      if (parent.requestedByUserId && !options.requestedByUserId) {
+        options.requestedByUserId = parent.requestedByUserId;
+      }
     }
   }
 
@@ -1889,8 +1907,8 @@ export function createTaskExtended(task: string, options?: CreateTaskOptions): A
         vcsProvider, vcsRepo, vcsEventType, vcsNumber, vcsCommentId, vcsAuthor, vcsUrl,
         agentmailInboxId, agentmailMessageId, agentmailThreadId,
         mentionMessageId, mentionChannelId, dir, parentTaskId, model, scheduleId,
-        workflowRunId, workflowRunStepId, outputSchema, createdAt, lastUpdatedAt
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING *`,
+        workflowRunId, workflowRunStepId, outputSchema, requestedByUserId, createdAt, lastUpdatedAt
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING *`,
     )
     .get(
       id,
@@ -1927,6 +1945,7 @@ export function createTaskExtended(task: string, options?: CreateTaskOptions): A
       options?.workflowRunId ?? null,
       options?.workflowRunStepId ?? null,
       options?.outputSchema ? JSON.stringify(options.outputSchema) : null,
+      options?.requestedByUserId ?? null,
       now,
       now,
     );
@@ -7685,3 +7704,247 @@ export function getKeyCostSummary(keyType?: string): KeyCostSummary[] {
     )
     .all(...params);
 }
+
+// ============================================================================
+// User Identity Operations
+// ============================================================================
+
+type UserRow = {
+  id: string;
+  name: string;
+  email: string | null;
+  role: string | null;
+  notes: string | null;
+  slackUserId: string | null;
+  linearUserId: string | null;
+  githubUsername: string | null;
+  gitlabUsername: string | null;
+  emailAliases: string | null;
+  preferredChannel: string | null;
+  timezone: string | null;
+  createdAt: string;
+  lastUpdatedAt: string;
+};
+
+function rowToUser(row: UserRow): User {
+  return {
+    id: row.id,
+    name: row.name,
+    email: row.email ?? undefined,
+    role: row.role ?? undefined,
+    notes: row.notes ?? undefined,
+    slackUserId: row.slackUserId ?? undefined,
+    linearUserId: row.linearUserId ?? undefined,
+    githubUsername: row.githubUsername ?? undefined,
+    gitlabUsername: row.gitlabUsername ?? undefined,
+    emailAliases: row.emailAliases ? JSON.parse(row.emailAliases) : [],
+    preferredChannel: row.preferredChannel ?? "slack",
+    timezone: row.timezone ?? undefined,
+    createdAt: row.createdAt,
+    lastUpdatedAt: row.lastUpdatedAt,
+  };
+}
+
+/**
+ * Resolve a user by any platform-specific identifier.
+ * Priority: exact match on platform ID, then email (including aliases), then name substring.
+ */
+export function resolveUser(opts: {
+  slackUserId?: string;
+  linearUserId?: string;
+  githubUsername?: string;
+  gitlabUsername?: string;
+  email?: string;
+  name?: string;
+}): User | null {
+  const db = getDb();
+
+  // Try exact platform ID matches first
+  if (opts.slackUserId) {
+    const row = db
+      .prepare<UserRow, string>("SELECT * FROM users WHERE slackUserId = ?")
+      .get(opts.slackUserId);
+    if (row) return rowToUser(row);
+  }
+  if (opts.linearUserId) {
+    const row = db
+      .prepare<UserRow, string>("SELECT * FROM users WHERE linearUserId = ?")
+      .get(opts.linearUserId);
+    if (row) return rowToUser(row);
+  }
+  if (opts.githubUsername) {
+    const row = db
+      .prepare<UserRow, string>("SELECT * FROM users WHERE githubUsername = ?")
+      .get(opts.githubUsername);
+    if (row) return rowToUser(row);
+  }
+  if (opts.gitlabUsername) {
+    const row = db
+      .prepare<UserRow, string>("SELECT * FROM users WHERE gitlabUsername = ?")
+      .get(opts.gitlabUsername);
+    if (row) return rowToUser(row);
+  }
+
+  // Try email match (primary email)
+  if (opts.email) {
+    const row = db.prepare<UserRow, string>("SELECT * FROM users WHERE email = ?").get(opts.email);
+    if (row) return rowToUser(row);
+
+    // Check emailAliases (JSON array search)
+    const aliasRows = db
+      .prepare<UserRow, []>("SELECT * FROM users WHERE emailAliases != '[]'")
+      .all();
+    for (const r of aliasRows) {
+      const aliases: string[] = r.emailAliases ? JSON.parse(r.emailAliases) : [];
+      if (aliases.some((a) => a.toLowerCase() === opts.email!.toLowerCase())) {
+        return rowToUser(r);
+      }
+    }
+  }
+
+  // Try name substring match (case-insensitive)
+  if (opts.name) {
+    const row = db
+      .prepare<UserRow, string>("SELECT * FROM users WHERE LOWER(name) LIKE '%' || LOWER(?) || '%'")
+      .get(opts.name);
+    if (row) return rowToUser(row);
+  }
+
+  return null;
+}
+
+export function getUserById(id: string): User | null {
+  const row = getDb().prepare<UserRow, string>("SELECT * FROM users WHERE id = ?").get(id);
+  return row ? rowToUser(row) : null;
+}
+
+export function getAllUsers(): User[] {
+  return getDb().prepare<UserRow, []>("SELECT * FROM users ORDER BY name").all().map(rowToUser);
+}
+
+export function createUser(data: {
+  name: string;
+  email?: string;
+  role?: string;
+  notes?: string;
+  slackUserId?: string;
+  linearUserId?: string;
+  githubUsername?: string;
+  gitlabUsername?: string;
+  emailAliases?: string[];
+  preferredChannel?: string;
+  timezone?: string;
+}): User {
+  const id = crypto.randomUUID().replace(/-/g, "");
+  const now = new Date().toISOString();
+  const row = getDb()
+    .prepare<UserRow, (string | null)[]>(
+      `INSERT INTO users (id, name, email, role, notes, slackUserId, linearUserId, githubUsername, gitlabUsername, emailAliases, preferredChannel, timezone, createdAt, lastUpdatedAt)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING *`,
+    )
+    .get(
+      id,
+      data.name,
+      data.email ?? null,
+      data.role ?? null,
+      data.notes ?? null,
+      data.slackUserId ?? null,
+      data.linearUserId ?? null,
+      data.githubUsername ?? null,
+      data.gitlabUsername ?? null,
+      JSON.stringify(data.emailAliases ?? []),
+      data.preferredChannel ?? "slack",
+      data.timezone ?? null,
+      now,
+      now,
+    );
+  if (!row) throw new Error("Failed to create user");
+  return rowToUser(row);
+}
+
+export function updateUser(
+  id: string,
+  data: Partial<{
+    name: string;
+    email: string;
+    role: string;
+    notes: string;
+    slackUserId: string;
+    linearUserId: string;
+    githubUsername: string;
+    gitlabUsername: string;
+    emailAliases: string[];
+    preferredChannel: string;
+    timezone: string;
+  }>,
+): User | null {
+  const sets: string[] = [];
+  const params: (string | null)[] = [];
+
+  if (data.name !== undefined) {
+    sets.push("name = ?");
+    params.push(data.name);
+  }
+  if (data.email !== undefined) {
+    sets.push("email = ?");
+    params.push(data.email);
+  }
+  if (data.role !== undefined) {
+    sets.push("role = ?");
+    params.push(data.role);
+  }
+  if (data.notes !== undefined) {
+    sets.push("notes = ?");
+    params.push(data.notes);
+  }
+  if (data.slackUserId !== undefined) {
+    sets.push("slackUserId = ?");
+    params.push(data.slackUserId);
+  }
+  if (data.linearUserId !== undefined) {
+    sets.push("linearUserId = ?");
+    params.push(data.linearUserId);
+  }
+  if (data.githubUsername !== undefined) {
+    sets.push("githubUsername = ?");
+    params.push(data.githubUsername);
+  }
+  if (data.gitlabUsername !== undefined) {
+    sets.push("gitlabUsername = ?");
+    params.push(data.gitlabUsername);
+  }
+  if (data.emailAliases !== undefined) {
+    sets.push("emailAliases = ?");
+    params.push(JSON.stringify(data.emailAliases));
+  }
+  if (data.preferredChannel !== undefined) {
+    sets.push("preferredChannel = ?");
+    params.push(data.preferredChannel);
+  }
+  if (data.timezone !== undefined) {
+    sets.push("timezone = ?");
+    params.push(data.timezone);
+  }
+
+  if (sets.length === 0) return getUserById(id);
+
+  sets.push("lastUpdatedAt = ?");
+  params.push(new Date().toISOString());
+  params.push(id);
+
+  const row = getDb()
+    .prepare<UserRow, (string | null)[]>(
+      `UPDATE users SET ${sets.join(", ")} WHERE id = ? RETURNING *`,
+    )
+    .get(...params);
+  return row ? rowToUser(row) : null;
+}
+
+export function deleteUser(id: string): boolean {
+  // Clear any task references before deleting
+  getDb()
+    .prepare("UPDATE agent_tasks SET requestedByUserId = NULL WHERE requestedByUserId = ?")
+    .run(id);
+  const result = getDb().prepare("DELETE FROM users WHERE id = ?").run(id);
+  return result.changes > 0;
+}

package/src/be/migrations/031_user_registry.sql

@@ -0,0 +1,35 @@
+-- User registry: canonical user profiles for cross-channel identity resolution
+CREATE TABLE IF NOT EXISTS users (
+  id TEXT PRIMARY KEY DEFAULT (lower(hex(randomblob(16)))),
+  name TEXT NOT NULL,
+  email TEXT,
+  role TEXT,
+  notes TEXT,
+  slackUserId TEXT UNIQUE,
+  linearUserId TEXT UNIQUE,
+  githubUsername TEXT UNIQUE,
+  gitlabUsername TEXT UNIQUE,
+  emailAliases TEXT DEFAULT '[]',
+  preferredChannel TEXT DEFAULT 'slack',
+  timezone TEXT,
+  createdAt TEXT NOT NULL DEFAULT (datetime('now')),
+  lastUpdatedAt TEXT NOT NULL DEFAULT (datetime('now'))
+);
+
+-- Reverse lookup indexes (partial — only index non-null values)
+CREATE UNIQUE INDEX IF NOT EXISTS idx_users_slack ON users(slackUserId) WHERE slackUserId IS NOT NULL;
+CREATE UNIQUE INDEX IF NOT EXISTS idx_users_linear ON users(linearUserId) WHERE linearUserId IS NOT NULL;
+CREATE UNIQUE INDEX IF NOT EXISTS idx_users_github ON users(githubUsername) WHERE githubUsername IS NOT NULL;
+CREATE UNIQUE INDEX IF NOT EXISTS idx_users_gitlab ON users(gitlabUsername) WHERE gitlabUsername IS NOT NULL;
+CREATE UNIQUE INDEX IF NOT EXISTS idx_users_email ON users(email) WHERE email IS NOT NULL;
+
+-- Link tasks to canonical users
+ALTER TABLE agent_tasks ADD COLUMN requestedByUserId TEXT REFERENCES users(id);
+CREATE INDEX IF NOT EXISTS idx_tasks_requested_by ON agent_tasks(requestedByUserId) WHERE requestedByUserId IS NOT NULL;
+
+-- Seed initial users
+INSERT OR IGNORE INTO users (id, name, email, role, slackUserId, githubUsername)
+VALUES (lower(hex(randomblob(16))), 'Taras', 't@desplega.ai', 'founder', 'U08NR6QD6CS', 'tarasyarema');
+
+INSERT OR IGNORE INTO users (id, name, email, role, slackUserId)
+VALUES (lower(hex(randomblob(16))), 'Eze', 'e@desplega.ai', 'founder', 'U08NY4B5R2M');

package/src/commands/runner.ts

@@ -1222,6 +1222,7 @@ interface Trigger {
     text?: string;
   }>;
   cursorUpdates?: Array<{ channelId: string; ts: string }>; // Deferred cursor commits for channel_activity
+  requestedBy?: { name: string; email?: string };
 }
 
 /** Options for polling */
@@ -1339,10 +1340,16 @@ async function buildPromptForTrigger(
           '\n\nWhen done, use `store-progress` with status: "completed" and include your output.';
       }
 
+      // Include requesting user info if available from the poll trigger
+      const requestedBy = trigger.requestedBy;
+      const requestedBySection = requestedBy
+        ? `\n\nRequested by: ${requestedBy.name}${requestedBy.email ? ` (${requestedBy.email})` : ""}`
+        : "";
+
       const result = await resolveTemplateAsync("task.trigger.assigned", {
         work_on_task_cmd: fmt("work-on-task"),
         task_id: trigger.taskId,
-        task_desc_section: taskDescSection,
+        task_desc_section: taskDescSection + requestedBySection,
         output_instructions: outputInstructions,
       });
       return result.text;

package/src/github/handlers.ts

@@ -1,4 +1,4 @@
-import { createTaskExtended, failTask, findTaskByVcs, getAllAgents } from "../be/db";
+import { createTaskExtended, failTask, findTaskByVcs, getAllAgents, resolveUser } from "../be/db";
 import { resolveTemplate } from "../prompts/resolver";
 import {
   detectMention,
@@ -134,6 +134,9 @@ export async function handlePullRequest(
     requested_reviewer,
   } = event;
 
+  // Resolve canonical user from GitHub sender
+  const requestedByUserId = resolveUser({ githubUsername: sender.login })?.id;
+
   // Handle assigned action - bot was assigned to PR
   if (action === "assigned") {
     // Check if bot was assigned
@@ -178,6 +181,7 @@ export async function handlePullRequest(
       vcsEventType: "pull_request",
       vcsNumber: pr.number,
       vcsAuthor: sender.login,
+      requestedByUserId,
       vcsUrl: pr.html_url,
     });
 
@@ -275,6 +279,7 @@ export async function handlePullRequest(
       vcsEventType: "pull_request",
       vcsNumber: pr.number,
       vcsAuthor: sender.login,
+      requestedByUserId,
       vcsUrl: pr.html_url,
     });
 
@@ -364,6 +369,7 @@ export async function handlePullRequest(
       vcsEventType: "pull_request",
       vcsNumber: pr.number,
       vcsAuthor: sender.login,
+      requestedByUserId,
       vcsUrl: pr.html_url,
     });
 
@@ -478,6 +484,9 @@ export async function handleIssue(
 ): Promise<{ created: boolean; taskId?: string }> {
   const { action, issue, repository, sender, installation, assignee } = event;
 
+  // Resolve canonical user from GitHub sender
+  const requestedByUserId = resolveUser({ githubUsername: sender.login })?.id;
+
   // Handle assigned action - bot was assigned to issue
   if (action === "assigned") {
     // Check if bot was assigned
@@ -520,6 +529,7 @@ export async function handleIssue(
       vcsEventType: "issues",
       vcsNumber: issue.number,
       vcsAuthor: sender.login,
+      requestedByUserId,
       vcsUrl: issue.html_url,
     });
 
@@ -605,6 +615,7 @@ export async function handleIssue(
       vcsEventType: "issues",
       vcsNumber: issue.number,
       vcsAuthor: sender.login,
+      requestedByUserId,
       vcsUrl: issue.html_url,
     });
 
@@ -702,6 +713,9 @@ export async function handleComment(
 ): Promise<{ created: boolean; taskId?: string }> {
   const { action, comment, repository, sender, issue, pull_request, installation } = event;
 
+  // Resolve canonical user from GitHub sender
+  const requestedByUserId = resolveUser({ githubUsername: sender.login })?.id;
+
   // Only handle created action
   if (action !== "created") {
     return { created: false };
@@ -802,6 +816,9 @@ export async function handlePullRequestReview(
 ): Promise<{ created: boolean; taskId?: string }> {
   const { action, review, pull_request: pr, repository, sender, installation } = event;
 
+  // Resolve canonical user from GitHub sender
+  const requestedByUserId = resolveUser({ githubUsername: sender.login })?.id;
+
   // Only handle submitted reviews (the most important action)
   // Edited reviews are less common and dismissed is handled by the state
   if (action !== "submitted") {

package/src/gitlab/handlers.ts

@@ -8,7 +8,7 @@
  * - Detects bot mentions
  */
 
-import { createTaskExtended, failTask, findTaskByVcs, getAllAgents } from "../be/db";
+import { createTaskExtended, failTask, findTaskByVcs, getAllAgents, resolveUser } from "../be/db";
 import { resolveTemplate } from "../prompts/resolver";
 import { GITLAB_BOT_NAME } from "./auth";
 import { addGitLabNoteReaction, addGitLabReaction } from "./reactions";
@@ -60,6 +60,9 @@ export async function handleMergeRequest(
   const action = mr.action;
   const repo = project.path_with_namespace;
 
+  // Resolve canonical user from GitLab sender
+  const requestedByUserId = resolveUser({ gitlabUsername: user.username })?.id;
+
   console.log(`[GitLab] MR #${mr.iid} ${action} by ${user.username} in ${repo}`);
 
   const dedupKey = `gitlab-mr-${repo}-${mr.iid}-${action}-${user.username}`;
@@ -105,6 +108,7 @@ export async function handleMergeRequest(
         vcsEventType: "merge_request",
         vcsNumber: mr.iid,
         vcsAuthor: user.username,
+        requestedByUserId,
         vcsUrl: mr.url,
       });
 
@@ -151,6 +155,9 @@ export async function handleIssue(
   const action = issue.action;
   const repo = project.path_with_namespace;
 
+  // Resolve canonical user from GitLab sender
+  const requestedByUserId = resolveUser({ gitlabUsername: user.username })?.id;
+
   console.log(`[GitLab] Issue #${issue.iid} ${action} by ${user.username} in ${repo}`);
 
   const dedupKey = `gitlab-issue-${repo}-${issue.iid}-${action}-${user.username}`;
@@ -198,6 +205,7 @@ export async function handleIssue(
         vcsEventType: "issue",
         vcsNumber: issue.iid,
         vcsAuthor: user.username,
+        requestedByUserId,
         vcsUrl: issue.url,
       });
 
@@ -226,6 +234,9 @@ export async function handleNote(event: NoteEvent): Promise<{ created: boolean;
   const { user, project, object_attributes: note } = event;
   const repo = project.path_with_namespace;
 
+  // Resolve canonical user from GitLab sender
+  const requestedByUserId = resolveUser({ gitlabUsername: user.username })?.id;
+
   // Only handle comments with bot mentions
   if (!detectMention(note.note)) {
     return { created: false };

package/src/http/poll.ts

@@ -12,6 +12,7 @@ import {
   getOfferedTasksForAgent,
   getPendingTaskForAgent,
   getUnassignedTaskIds,
+  getUserById,
   hasCapacity,
   startTask,
   upsertChannelActivityCursor,
@@ -144,11 +145,19 @@ export async function handlePoll(
               conditions: [{ timeout_ms: 300_000 }], // 5 min: polling interval + queue wait
             });
 
+            // Resolve requesting user if available
+            const requestedByUser = pendingTask.requestedByUserId
+              ? getUserById(pendingTask.requestedByUserId)
+              : undefined;
+
             return {
               trigger: {
                 type: "task_assigned",
                 taskId: pendingTask.id,
                 task: { ...pendingTask, status: "in_progress" },
+                ...(requestedByUser && {
+                  requestedBy: { name: requestedByUser.name, email: requestedByUser.email },
+                }),
               },
             };
           }