@vellumai/assistant 0.4.45 → 0.4.48

package/src/config/bundled-skills/gmail/tools/gmail-forward.ts

@@ -5,8 +5,7 @@ import {
 } from "../../../../messaging/providers/gmail/client.js";
 import { buildMultipartMime } from "../../../../messaging/providers/gmail/mime-builder.js";
 import type { GmailMessagePart } from "../../../../messaging/providers/gmail/types.js";
-import { getMessagingProvider } from "../../../../messaging/registry.js";
-import { withValidToken } from "../../../../security/token-manager.js";
+import { resolveOAuthConnection } from "../../../../oauth/connection-resolver.js";
 import type {
   ToolContext,
   ToolExecutionResult,
@@ -76,66 +75,68 @@ export async function run(
   if (!forwardTo) return err("to is required.");
 
   try {
-    const provider = getMessagingProvider("gmail");
-    return await withValidToken(provider.credentialService, async (token) => {
-      const message = await getMessage(token, messageId, "full");
-      const headers = message.payload?.headers ?? [];
-      const originalFrom = extractHeader(headers, "From");
-      const originalDate = extractHeader(headers, "Date");
-      const originalSubject = extractHeader(headers, "Subject");
-      const originalBody = extractPlainTextBody(message.payload);
+    const connection = resolveOAuthConnection("integration:gmail");
+    const message = await getMessage(connection, messageId, "full");
+    const headers = message.payload?.headers ?? [];
+    const originalFrom = extractHeader(headers, "From");
+    const originalDate = extractHeader(headers, "Date");
+    const originalSubject = extractHeader(headers, "Subject");
+    const originalBody = extractPlainTextBody(message.payload);
 
-      const forwardHeader = [
-        additionalText ? `${additionalText}\n\n` : "",
-        "---------- Forwarded message ----------",
-        `From: ${originalFrom}`,
-        `Date: ${originalDate}`,
-        `Subject: ${originalSubject}`,
-        "",
-        originalBody,
-      ].join("\n");
+    const forwardHeader = [
+      additionalText ? `${additionalText}\n\n` : "",
+      "---------- Forwarded message ----------",
+      `From: ${originalFrom}`,
+      `Date: ${originalDate}`,
+      `Subject: ${originalSubject}`,
+      "",
+      originalBody,
+    ].join("\n");
 
-      const subject = originalSubject.startsWith("Fwd:")
-        ? originalSubject
-        : `Fwd: ${originalSubject}`;
+    const subject = originalSubject.startsWith("Fwd:")
+      ? originalSubject
+      : `Fwd: ${originalSubject}`;
 
-      // Collect and download attachments from the original message
-      const attachmentRefs = collectAttachmentRefs(message.payload?.parts);
-      const attachments = await Promise.all(
-        attachmentRefs.map(async (ref) => {
-          const att = await getAttachment(token, messageId, ref.attachmentId);
-          const data = Buffer.from(
-            att.data.replace(/-/g, "+").replace(/_/g, "/"),
-            "base64",
-          );
-          return { filename: ref.filename, mimeType: ref.mimeType, data };
-        }),
-      );
-
-      if (attachments.length > 0) {
-        const raw = buildMultipartMime({
-          to: forwardTo,
-          subject,
-          body: forwardHeader,
-          attachments,
-        });
-        const draft = await createDraftRaw(token, raw);
-        return ok(
-          `Forward draft created to ${forwardTo} with ${attachments.length} attachment(s) (Draft ID: ${draft.id}). Review in Gmail Drafts, then tell me to send it or send it yourself.`,
+    // Collect and download attachments from the original message
+    const attachmentRefs = collectAttachmentRefs(message.payload?.parts);
+    const attachments = await Promise.all(
+      attachmentRefs.map(async (ref) => {
+        const att = await getAttachment(
+          connection,
+          messageId,
+          ref.attachmentId,
+        );
+        const data = Buffer.from(
+          att.data.replace(/-/g, "+").replace(/_/g, "/"),
+          "base64",
         );
-      }
+        return { filename: ref.filename, mimeType: ref.mimeType, data };
+      }),
+    );
 
+    if (attachments.length > 0) {
       const raw = buildMultipartMime({
         to: forwardTo,
         subject,
         body: forwardHeader,
-        attachments: [],
+        attachments,
       });
-      const draft = await createDraftRaw(token, raw);
+      const draft = await createDraftRaw(connection, raw);
       return ok(
-        `Forward draft created to ${forwardTo} (Draft ID: ${draft.id}). Review in Gmail Drafts, then tell me to send it or send it yourself.`,
+        `Forward draft created to ${forwardTo} with ${attachments.length} attachment(s) (Draft ID: ${draft.id}). Review in Gmail Drafts, then tell me to send it or send it yourself.`,
       );
+    }
+
+    const raw = buildMultipartMime({
+      to: forwardTo,
+      subject,
+      body: forwardHeader,
+      attachments: [],
     });
+    const draft = await createDraftRaw(connection, raw);
+    return ok(
+      `Forward draft created to ${forwardTo} (Draft ID: ${draft.id}). Review in Gmail Drafts, then tell me to send it or send it yourself.`,
+    );
   } catch (e) {
     return err(e instanceof Error ? e.message : String(e));
   }

package/src/config/bundled-skills/gmail/tools/gmail-label.ts

@@ -2,8 +2,7 @@ import {
   batchModifyMessages,
   modifyMessage,
 } from "../../../../messaging/providers/gmail/client.js";
-import { getMessagingProvider } from "../../../../messaging/registry.js";
-import { withValidToken } from "../../../../security/token-manager.js";
+import { resolveOAuthConnection } from "../../../../oauth/connection-resolver.js";
 import type {
   ToolContext,
   ToolExecutionResult,
@@ -21,14 +20,12 @@ export async function run(
 
   if (messageIds && messageIds.length > 0) {
     try {
-      const provider = getMessagingProvider("gmail");
-      return await withValidToken(provider.credentialService, async (token) => {
-        await batchModifyMessages(token, messageIds, {
-          addLabelIds,
-          removeLabelIds,
-        });
-        return ok(`Labels updated on ${messageIds.length} message(s).`);
+      const connection = resolveOAuthConnection("integration:gmail");
+      await batchModifyMessages(connection, messageIds, {
+        addLabelIds,
+        removeLabelIds,
       });
+      return ok(`Labels updated on ${messageIds.length} message(s).`);
     } catch (e) {
       return err(e instanceof Error ? e.message : String(e));
     }
@@ -36,11 +33,12 @@ export async function run(
 
   if (messageId) {
     try {
-      const provider = getMessagingProvider("gmail");
-      return await withValidToken(provider.credentialService, async (token) => {
-        await modifyMessage(token, messageId, { addLabelIds, removeLabelIds });
-        return ok("Labels updated.");
+      const connection = resolveOAuthConnection("integration:gmail");
+      await modifyMessage(connection, messageId, {
+        addLabelIds,
+        removeLabelIds,
       });
+      return ok("Labels updated.");
     } catch (e) {
       return err(e instanceof Error ? e.message : String(e));
     }

package/src/config/bundled-skills/gmail/tools/gmail-outreach-scan.ts

@@ -3,8 +3,7 @@ import {
   listMessages,
 } from "../../../../messaging/providers/gmail/client.js";
 import type { GmailMessage } from "../../../../messaging/providers/gmail/types.js";
-import { getMessagingProvider } from "../../../../messaging/registry.js";
-import { withValidToken } from "../../../../security/token-manager.js";
+import { resolveOAuthConnection } from "../../../../oauth/connection-resolver.js";
 import type {
   ToolContext,
   ToolExecutionResult,
@@ -56,159 +55,162 @@ export async function run(
   const query = `in:inbox -has:unsubscribe newer_than:${timeRange}`;
 
   try {
-    const provider = getMessagingProvider("gmail");
-    return await withValidToken(provider.credentialService, async (token) => {
-      // Pipeline: fire metadata fetches for each page of IDs as they arrive
-      const allMessageIds: string[] = [];
-      const fetchPromises: Promise<GmailMessage[]>[] = [];
-      let pageToken: string | undefined = inputPageToken;
-      let truncated = false;
-      let timeBudgetExceeded = false;
-      const metadataHeaders = ["From", "Subject", "Date"];
-      const startTime = Date.now();
-      const TIME_BUDGET_MS = 90_000;
-
-      while (allMessageIds.length < maxMessages) {
-        if (Date.now() - startTime > TIME_BUDGET_MS) {
-          timeBudgetExceeded = true;
-          truncated = true;
-          break;
-        }
-        const pageSize = Math.min(100, maxMessages - allMessageIds.length);
-        const listResp = await listMessages(token, query, pageSize, pageToken);
-        const ids = (listResp.messages ?? []).map((m) => m.id);
-        if (ids.length === 0) break;
-        allMessageIds.push(...ids);
-        fetchPromises.push(
-          batchGetMessages(
-            token,
-            ids,
-            "metadata",
-            metadataHeaders,
-            "id,internalDate,payload/headers",
-          ),
-        );
-        pageToken = listResp.nextPageToken ?? undefined;
-        if (!pageToken) break;
-      }
-
-      if (allMessageIds.length >= maxMessages && pageToken) {
+    const connection = resolveOAuthConnection("integration:gmail");
+    // Pipeline: fire metadata fetches for each page of IDs as they arrive
+    const allMessageIds: string[] = [];
+    const fetchPromises: Promise<GmailMessage[]>[] = [];
+    let pageToken: string | undefined = inputPageToken;
+    let truncated = false;
+    let timeBudgetExceeded = false;
+    const metadataHeaders = ["From", "Subject", "Date"];
+    const startTime = Date.now();
+    const TIME_BUDGET_MS = 90_000;
+
+    while (allMessageIds.length < maxMessages) {
+      if (Date.now() - startTime > TIME_BUDGET_MS) {
+        timeBudgetExceeded = true;
         truncated = true;
+        break;
       }
+      const pageSize = Math.min(100, maxMessages - allMessageIds.length);
+      const listResp = await listMessages(
+        connection,
+        query,
+        pageSize,
+        pageToken,
+      );
+      const ids = (listResp.messages ?? []).map((m) => m.id);
+      if (ids.length === 0) break;
+      allMessageIds.push(...ids);
+      fetchPromises.push(
+        batchGetMessages(
+          connection,
+          ids,
+          "metadata",
+          metadataHeaders,
+          "id,internalDate,payload/headers",
+        ),
+      );
+      pageToken = listResp.nextPageToken ?? undefined;
+      if (!pageToken) break;
+    }
+
+    if (allMessageIds.length >= maxMessages && pageToken) {
+      truncated = true;
+    }
 
-      if (allMessageIds.length === 0) {
-        return ok(
-          JSON.stringify({
-            senders: [],
-            total_scanned: 0,
-            note: "No emails found matching the query.",
-          }),
-        );
+    if (allMessageIds.length === 0) {
+      return ok(
+        JSON.stringify({
+          senders: [],
+          total_scanned: 0,
+          note: "No emails found matching the query.",
+        }),
+      );
+    }
+
+    const messages = (await Promise.all(fetchPromises)).flat();
+
+    // Aggregate all fetched messages by sender
+    const senderMap = new Map<string, OutreachSenderAggregation>();
+
+    for (const msg of messages) {
+      const headers = msg.payload?.headers ?? [];
+      const fromHeader =
+        headers.find((h) => h.name.toLowerCase() === "from")?.value ?? "";
+      const subject =
+        headers.find((h) => h.name.toLowerCase() === "subject")?.value ?? "";
+      const dateStr =
+        headers.find((h) => h.name.toLowerCase() === "date")?.value ?? "";
+
+      const { displayName, email } = parseFrom(fromHeader);
+      if (!email) continue;
+
+      let agg = senderMap.get(email);
+      if (!agg) {
+        agg = {
+          displayName,
+          email,
+          messageCount: 0,
+          newestMessageId: msg.id,
+          oldestDate: dateStr,
+          newestDate: dateStr,
+          messageIds: [],
+          hasMore: false,
+          sampleSubjects: [],
+        };
+        senderMap.set(email, agg);
       }
 
-      const messages = (await Promise.all(fetchPromises)).flat();
-
-      // Aggregate all fetched messages by sender
-      const senderMap = new Map<string, OutreachSenderAggregation>();
-
-      for (const msg of messages) {
-        const headers = msg.payload?.headers ?? [];
-        const fromHeader =
-          headers.find((h) => h.name.toLowerCase() === "from")?.value ?? "";
-        const subject =
-          headers.find((h) => h.name.toLowerCase() === "subject")?.value ?? "";
-        const dateStr =
-          headers.find((h) => h.name.toLowerCase() === "date")?.value ?? "";
-
-        const { displayName, email } = parseFrom(fromHeader);
-        if (!email) continue;
-
-        let agg = senderMap.get(email);
-        if (!agg) {
-          agg = {
-            displayName,
-            email,
-            messageCount: 0,
-            newestMessageId: msg.id,
-            oldestDate: dateStr,
-            newestDate: dateStr,
-            messageIds: [],
-            hasMore: false,
-            sampleSubjects: [],
-          };
-          senderMap.set(email, agg);
-        }
-
-        agg.messageCount++;
-
-        if (!agg.displayName && displayName) agg.displayName = displayName;
-
-        if (agg.messageIds.length < MAX_IDS_PER_SENDER) {
-          agg.messageIds.push(msg.id);
-        } else {
-          agg.hasMore = true;
-        }
-
-        // Track date range
-        const msgEpoch = msg.internalDate ? Number(msg.internalDate) : 0;
-        const oldestEpoch = agg.oldestDate
-          ? new Date(agg.oldestDate).getTime()
-          : Infinity;
-        const newestEpoch = agg.newestDate
-          ? new Date(agg.newestDate).getTime()
-          : 0;
-
-        if (msgEpoch > 0 && msgEpoch < oldestEpoch) {
-          agg.oldestDate = dateStr || agg.oldestDate;
-        }
-        if (msgEpoch > newestEpoch) {
-          agg.newestDate = dateStr || agg.newestDate;
-          agg.newestMessageId = msg.id;
-        }
-
-        if (subject && agg.sampleSubjects.length < MAX_SAMPLE_SUBJECTS) {
-          agg.sampleSubjects.push(subject);
-        }
+      agg.messageCount++;
+
+      if (!agg.displayName && displayName) agg.displayName = displayName;
+
+      if (agg.messageIds.length < MAX_IDS_PER_SENDER) {
+        agg.messageIds.push(msg.id);
+      } else {
+        agg.hasMore = true;
       }
 
-      // Sort by message count desc, take top N
-      const sorted = [...senderMap.values()]
-        .sort((a, b) => b.messageCount - a.messageCount)
-        .slice(0, maxSenders);
+      // Track date range
+      const msgEpoch = msg.internalDate ? Number(msg.internalDate) : 0;
+      const oldestEpoch = agg.oldestDate
+        ? new Date(agg.oldestDate).getTime()
+        : Infinity;
+      const newestEpoch = agg.newestDate
+        ? new Date(agg.newestDate).getTime()
+        : 0;
+
+      if (msgEpoch > 0 && msgEpoch < oldestEpoch) {
+        agg.oldestDate = dateStr || agg.oldestDate;
+      }
+      if (msgEpoch > newestEpoch) {
+        agg.newestDate = dateStr || agg.newestDate;
+        agg.newestMessageId = msg.id;
+      }
 
-      const senders = sorted.map((s) => ({
+      if (subject && agg.sampleSubjects.length < MAX_SAMPLE_SUBJECTS) {
+        agg.sampleSubjects.push(subject);
+      }
+    }
+
+    // Sort by message count desc, take top N
+    const sorted = [...senderMap.values()]
+      .sort((a, b) => b.messageCount - a.messageCount)
+      .slice(0, maxSenders);
+
+    const senders = sorted.map((s) => ({
+      id: Buffer.from(s.email).toString("base64url"),
+      display_name: s.displayName || s.email.split("@")[0],
+      email: s.email,
+      message_count: s.messageCount,
+      newest_message_id: s.newestMessageId,
+      oldest_date: s.oldestDate,
+      newest_date: s.newestDate,
+      search_query: `from:${s.email}`,
+      sample_subjects: s.sampleSubjects,
+    }));
+
+    // Store message IDs server-side to keep them out of LLM context
+    const scanId = storeScanResult(
+      sorted.map((s) => ({
         id: Buffer.from(s.email).toString("base64url"),
-        display_name: s.displayName || s.email.split("@")[0],
-        email: s.email,
-        message_count: s.messageCount,
-        newest_message_id: s.newestMessageId,
-        oldest_date: s.oldestDate,
-        newest_date: s.newestDate,
-        search_query: `from:${s.email}`,
-        sample_subjects: s.sampleSubjects,
-      }));
-
-      // Store message IDs server-side to keep them out of LLM context
-      const scanId = storeScanResult(
-        sorted.map((s) => ({
-          id: Buffer.from(s.email).toString("base64url"),
-          messageIds: s.messageIds,
-          newestMessageId: s.newestMessageId,
-          newestUnsubscribableMessageId: null,
-        })),
-      );
-
-      return ok(
-        JSON.stringify({
-          scan_id: scanId,
-          senders,
-          total_scanned: allMessageIds.length,
-          ...(truncated ? { truncated: true } : {}),
-          ...(timeBudgetExceeded ? { time_budget_exceeded: true } : {}),
-          note: "Scanned inbox for senders without List-Unsubscribe headers (potential cold outreach). Use gmail_archive and gmail_filters for cleanup.",
-        }),
-      );
-    });
+        messageIds: s.messageIds,
+        newestMessageId: s.newestMessageId,
+        newestUnsubscribableMessageId: null,
+      })),
+    );
+
+    return ok(
+      JSON.stringify({
+        scan_id: scanId,
+        senders,
+        total_scanned: allMessageIds.length,
+        ...(truncated ? { truncated: true } : {}),
+        ...(timeBudgetExceeded ? { time_budget_exceeded: true } : {}),
+        note: "Scanned inbox for senders without List-Unsubscribe headers (potential cold outreach). Use gmail_archive and gmail_filters for cleanup.",
+      }),
+    );
   } catch (e) {
     return err(e instanceof Error ? e.message : String(e));
   }

package/src/config/bundled-skills/gmail/tools/gmail-send-draft.ts

@@ -1,6 +1,5 @@
 import { sendDraft } from "../../../../messaging/providers/gmail/client.js";
-import { getMessagingProvider } from "../../../../messaging/registry.js";
-import { withValidToken } from "../../../../security/token-manager.js";
+import { resolveOAuthConnection } from "../../../../oauth/connection-resolver.js";
 import type {
   ToolContext,
   ToolExecutionResult,
@@ -15,11 +14,9 @@ export async function run(
   if (!draftId) return err("draft_id is required.");
 
   try {
-    const provider = getMessagingProvider("gmail");
-    return await withValidToken(provider.credentialService, async (token) => {
-      const msg = await sendDraft(token, draftId);
-      return ok(`Draft sent (Message ID: ${msg.id}).`);
-    });
+    const connection = resolveOAuthConnection("integration:gmail");
+    const msg = await sendDraft(connection, draftId);
+    return ok(`Draft sent (Message ID: ${msg.id}).`);
   } catch (e) {
     return err(e instanceof Error ? e.message : String(e));
   }