@desplega.ai/agent-swarm 1.113.0 → 1.115.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@desplega.ai/agent-swarm",
-  "version": "1.113.0",
+  "version": "1.115.0",
   "description": "Multi-agent orchestration for Claude Code, Codex, Gemini CLI, and other AI coding assistants",
   "license": "MIT",
   "author": "desplega.sh <contact@desplega.sh>",
@@ -83,9 +83,9 @@
     "lead": "bun src/cli.tsx lead",
     "lead:yolo": "bun src/cli.tsx lead --yolo",
     "dev": "bun --hot src/stdio.ts",
-    "dev:http": "portless api.swarm bun --hot src/http.ts",
+    "dev:http": "NODE_ENV=development portless api.swarm bun --hot src/http.ts",
     "start": "bun src/stdio.ts",
-    "start:http": "bun --expose-gc src/http.ts",
+    "start:http": "NODE_ENV=development bun --expose-gc src/http.ts",
     "start:portless": "portless api.swarm bun --expose-gc src/http.ts",
     "inspector": "bunx @modelcontextprotocol/inspector --transport stdio bun src/stdio.ts",
     "inspector:http": "bunx @modelcontextprotocol/inspector --transport http https://api.swarm.localhost:1355/mcp",

package/src/agentmail/handlers.ts

@@ -4,6 +4,7 @@ import {
   getAgentMailInboxMapping,
   getAllAgents,
 } from "../be/db";
+import { renderIdentity, resolveIdentityByEmail } from "../be/identity";
 import { findOrCreateUserByEmail } from "../be/users";
 import { resolveTemplate } from "../prompts/resolver";
 import { createIngressBuffer } from "../tasks/additive-ingress";
@@ -184,6 +185,15 @@ export async function handleMessageReceived(
     );
     requestedByUserId = user.id;
   }
+  // Render the resolved canonical name (or the UNKNOWN sentinel) for
+  // agent-visible text — never the raw From header. `findOrCreateUserByEmail`
+  // above auto-creates on a real email, so `senderEmail` present implies
+  // resolved; a missing/unparseable From header has no machine-carried
+  // identifier at all, so it renders the same non-name sentinel shape via
+  // the identity primitive rather than echoing the raw header string.
+  const senderDisplay = senderEmail
+    ? renderIdentity(resolveIdentityByEmail(senderEmail))
+    : renderIdentity({ status: "unknown", kind: "email", externalId: "unknown" });
   const preview = body.length > 500 ? `${body.substring(0, 500)}...` : body;
 
   // Emit workflow trigger event
@@ -207,7 +217,7 @@ export async function handleMessageReceived(
     if (
       agentmailBuffer.enabled &&
       agentmailBuffer.maybeBuffer(contextKey, siblingInFlight, {
-        from,
+        from: senderDisplay,
         subject,
         inboxId: inbox_id,
         threadId: thread_id,
@@ -226,7 +236,7 @@ export async function handleMessageReceived(
 
     // Create a follow-up task with parentTaskId to continue the session
     const followupResult = resolveTemplate("agentmail.email.followup", {
-      from,
+      from: senderDisplay,
       subject,
       inbox_id,
       thread_id,
@@ -264,7 +274,7 @@ export async function handleMessageReceived(
       if (agent.isLead) {
         // Route to lead as task
         const leadResult = resolveTemplate("agentmail.email.mapped_lead", {
-          from,
+          from: senderDisplay,
           subject,
           inbox_id,
           thread_id,
@@ -295,7 +305,7 @@ export async function handleMessageReceived(
 
       // Route to worker as task
       const workerResult = resolveTemplate("agentmail.email.mapped_worker", {
-        from,
+        from: senderDisplay,
         subject,
         inbox_id,
         thread_id,
@@ -328,7 +338,7 @@ export async function handleMessageReceived(
   const lead = findLeadAgent();
   if (lead) {
     const unmappedResult = resolveTemplate("agentmail.email.unmapped", {
-      from,
+      from: senderDisplay,
       subject,
       inbox_id,
       thread_id,
@@ -359,7 +369,7 @@ export async function handleMessageReceived(
 
   // No lead available - create unassigned task
   const noAgentResult = resolveTemplate("agentmail.email.no_agent", {
-    from,
+    from: senderDisplay,
     subject,
     inbox_id,
     thread_id,

package/src/agentmail/templates.ts

@@ -21,7 +21,11 @@ Thread: {{thread_id}}
 
 {{preview}}`,
   variables: [
-    { name: "from", description: "Sender address(es)" },
+    {
+      name: "from",
+      description:
+        "Sender identity — resolved canonical name (e.g. 'Luis (email:luis@x.com)') or the UNKNOWN sentinel",
+    },
     { name: "subject", description: "Email subject" },
     { name: "inbox_id", description: "AgentMail inbox ID" },
     { name: "thread_id", description: "AgentMail thread ID" },
@@ -41,7 +45,11 @@ Message: {{message_id}}
 
 {{preview}}`,
   variables: [
-    { name: "from", description: "Sender address(es)" },
+    {
+      name: "from",
+      description:
+        "Sender identity — resolved canonical name (e.g. 'Luis (email:luis@x.com)') or the UNKNOWN sentinel",
+    },
     { name: "subject", description: "Email subject" },
     { name: "inbox_id", description: "AgentMail inbox ID" },
     { name: "thread_id", description: "AgentMail thread ID" },
@@ -61,7 +69,11 @@ Thread: {{thread_id}}
 
 {{preview}}`,
   variables: [
-    { name: "from", description: "Sender address(es)" },
+    {
+      name: "from",
+      description:
+        "Sender identity — resolved canonical name (e.g. 'Luis (email:luis@x.com)') or the UNKNOWN sentinel",
+    },
     { name: "subject", description: "Email subject" },
     { name: "inbox_id", description: "AgentMail inbox ID" },
     { name: "thread_id", description: "AgentMail thread ID" },
@@ -81,7 +93,11 @@ Message: {{message_id}}
 
 {{preview}}`,
   variables: [
-    { name: "from", description: "Sender address(es)" },
+    {
+      name: "from",
+      description:
+        "Sender identity — resolved canonical name (e.g. 'Luis (email:luis@x.com)') or the UNKNOWN sentinel",
+    },
     { name: "subject", description: "Email subject" },
     { name: "inbox_id", description: "AgentMail inbox ID" },
     { name: "thread_id", description: "AgentMail thread ID" },
@@ -101,7 +117,11 @@ Thread: {{thread_id}}
 
 {{preview}}`,
   variables: [
-    { name: "from", description: "Sender address(es)" },
+    {
+      name: "from",
+      description:
+        "Sender identity — resolved canonical name (e.g. 'Luis (email:luis@x.com)') or the UNKNOWN sentinel",
+    },
     { name: "subject", description: "Email subject" },
     { name: "inbox_id", description: "AgentMail inbox ID" },
     { name: "thread_id", description: "AgentMail thread ID" },

package/src/be/audit-user.ts

@@ -1,6 +1,7 @@
 import type { IncomingMessage } from "node:http";
 import { getRequestAuth } from "../utils/request-auth-context";
-import { getTaskById } from "./db";
+import { getAgentCurrentTask, getTaskById } from "./db";
+import { findUserByExternalId } from "./users";
 
 /**
  * Resolve the trusted audit-actor user id for a write to an audited table
@@ -14,6 +15,13 @@ import { getTaskById } from "./db";
  * attribute a write to a task they already own, whose requester is legitimately
  * theirs.
  *
+ * Two fallbacks layer on top of the header, both still gated by ownership:
+ *   1. No header at all → the caller's own current in-progress task (never a
+ *      client-supplied id, so this can't be spoofed).
+ *   2. The resolved task has no `requestedByUserId` but carries a
+ *      machine-recorded provider external id (today: the Slack user field) →
+ *      the same generic reverse lookup used everywhere else.
+ *
  * Returns `null` when no trusted actor can be established — which leaves the
  * audit column untouched on updates and NULL on inserts.
  */
@@ -21,13 +29,29 @@ export function resolveTaskAuditUserId(
   sourceTaskId: string | undefined,
   callerAgentId: string | undefined,
 ): string | null {
-  if (!sourceTaskId || !callerAgentId) return null;
-  const task = getTaskById(sourceTaskId);
+  if (!callerAgentId) return null;
+
+  let resolvedSourceTaskId = sourceTaskId;
+  if (!resolvedSourceTaskId) {
+    const currentTask = getAgentCurrentTask(callerAgentId);
+    if (currentTask) resolvedSourceTaskId = currentTask.id;
+  }
+  if (!resolvedSourceTaskId) return null;
+
+  const task = getTaskById(resolvedSourceTaskId);
   if (!task) return null;
   // Bind the header to the caller's own task — otherwise it is just a
   // client-chosen value and its requester cannot be trusted.
   if (task.agentId !== callerAgentId) return null;
-  return task.requestedByUserId ?? null;
+
+  if (task.requestedByUserId) return task.requestedByUserId;
+
+  if (task.slackUserId) {
+    const user = findUserByExternalId("slack", task.slackUserId);
+    if (user) return user.id;
+  }
+
+  return null;
 }
 
 /**

package/src/be/db-queries/oauth.ts

@@ -113,6 +113,7 @@ export function storeOAuthTokens(
     scope?: string | null;
   },
 ): void {
+  // TODO(secrets-cipher): encrypt OAuth tokens at rest with src/be/crypto/secrets-cipher.ts.
   getDb()
     .query(
       `INSERT INTO oauth_tokens (provider, accessToken, refreshToken, expiresAt, scope)
@@ -170,6 +171,47 @@ export function updateOAuthTokensAfterRefresh(
   throw new Error(`OAuth token refresh persistence failed for ${provider}: no rows updated`);
 }
 
+/**
+ * Presence-flags-only projection of oauth_tokens for the background refresh
+ * sweep. Deliberately excludes token values so sweep code can never leak
+ * them into logs.
+ */
+export type OAuthTokenSweepRow = {
+  provider: string;
+  hasApp: boolean;
+  hasRefreshToken: boolean;
+  expiresAt: string;
+  updatedAt: string;
+};
+
+export function listOAuthTokenSweepRows(): OAuthTokenSweepRow[] {
+  const rows = getDb()
+    .query(
+      `SELECT t.provider,
+              CASE WHEN a.provider IS NOT NULL THEN 1 ELSE 0 END AS hasApp,
+              CASE WHEN t.refreshToken IS NOT NULL AND t.refreshToken != '' THEN 1 ELSE 0 END AS hasRefreshToken,
+              t.expiresAt,
+              t.updatedAt
+       FROM oauth_tokens t
+       LEFT JOIN oauth_apps a ON a.provider = t.provider
+       ORDER BY t.provider ASC`,
+    )
+    .all() as Array<{
+    provider: string;
+    hasApp: number;
+    hasRefreshToken: number;
+    expiresAt: string;
+    updatedAt: string;
+  }>;
+  return rows.map((row) => ({
+    provider: row.provider,
+    hasApp: row.hasApp === 1,
+    hasRefreshToken: row.hasRefreshToken === 1,
+    expiresAt: normalizeDateRequired(row.expiresAt),
+    updatedAt: normalizeDateRequired(row.updatedAt),
+  }));
+}
+
 export function deleteOAuthTokens(provider: string): void {
   getDb().query("DELETE FROM oauth_tokens WHERE provider = ?").run(provider);
 }