@vellumai/assistant 0.4.46 → 0.4.49

package/src/config/bundled-skills/messaging/tools/messaging-analyze-style.ts

@@ -12,7 +12,7 @@ import type {
   ToolExecutionResult,
 } from "../../../../tools/types.js";
 import { truncate } from "../../../../util/truncate.js";
-import { err, ok, resolveProvider, withProviderToken } from "./shared.js";
+import { err, getProviderConnection, ok, resolveProvider } from "./shared.js";
 
 function upsertMemoryItem(opts: {
   kind: string;
@@ -91,76 +91,75 @@ export async function run(
 
   try {
     const provider = resolveProvider(platform);
-    return withProviderToken(provider, async (token) => {
-      // Search for sent messages using the platform's search
-      const query =
-        queryFilter ?? (provider.id === "gmail" ? "in:sent" : "from:me");
-      const searchResult = await provider.search(token, query, {
-        count: maxMessages,
-      });
+    const conn = getProviderConnection(provider);
+    // Search for sent messages using the platform's search
+    const query =
+      queryFilter ?? (provider.id === "gmail" ? "in:sent" : "from:me");
+    const searchResult = await provider.search(conn, query, {
+      count: maxMessages,
+    });
 
-      if (searchResult.messages.length === 0) {
-        return err(
-          "No sent messages found. Send some messages first, then try again.",
-        );
-      }
+    if (searchResult.messages.length === 0) {
+      return err(
+        "No sent messages found. Send some messages first, then try again.",
+      );
+    }
 
-      const result = await extractStylePatterns(searchResult.messages);
+    const result = await extractStylePatterns(searchResult.messages);
 
-      if (result.stylePatterns.length === 0) {
-        return err("No style patterns were extracted. Try with more messages.");
-      }
+    if (result.stylePatterns.length === 0) {
+      return err("No style patterns were extracted. Try with more messages.");
+    }
 
-      const scopeId = context.memoryScopeId ?? "default";
-      let savedCount = 0;
+    const scopeId = context.memoryScopeId ?? "default";
+    let savedCount = 0;
 
-      for (const pattern of result.stylePatterns) {
-        const subject = `${provider.id} writing style: ${pattern.aspect}`;
-        const importance = clampUnitInterval(
-          Math.min(0.85, Math.max(0.55, pattern.importance ?? 0.65)),
-        );
-        upsertMemoryItem({
-          kind: "style",
-          subject,
-          statement: pattern.summary,
-          importance,
-          scopeId,
-        });
-        savedCount++;
-      }
+    for (const pattern of result.stylePatterns) {
+      const subject = `${provider.id} writing style: ${pattern.aspect}`;
+      const importance = clampUnitInterval(
+        Math.min(0.85, Math.max(0.55, pattern.importance ?? 0.65)),
+      );
+      upsertMemoryItem({
+        kind: "style",
+        subject,
+        statement: pattern.summary,
+        importance,
+        scopeId,
+      });
+      savedCount++;
+    }
 
-      for (const contact of result.contactObservations) {
-        if (!contact.name || !contact.toneNote) continue;
-        const subject = `${provider.id} relationship: ${contact.name}`;
-        upsertMemoryItem({
-          kind: "relationship",
-          subject,
-          statement: truncate(
-            `${contact.name} (${contact.email}): ${contact.toneNote}`,
-            500,
-            "",
-          ),
-          importance: 0.6,
-          scopeId,
-        });
-        savedCount++;
-      }
+    for (const contact of result.contactObservations) {
+      if (!contact.name || !contact.toneNote) continue;
+      const subject = `${provider.id} relationship: ${contact.name}`;
+      upsertMemoryItem({
+        kind: "relationship",
+        subject,
+        statement: truncate(
+          `${contact.name} (${contact.email}): ${contact.toneNote}`,
+          500,
+          "",
+        ),
+        importance: 0.6,
+        scopeId,
+      });
+      savedCount++;
+    }
 
-      const aspects = result.stylePatterns.map((p) => p.aspect).join(", ");
-      const contactCount = result.contactObservations.length;
-      const summary = [
-        `Analyzed ${searchResult.messages.length} messages on ${provider.displayName}.`,
-        `Extracted ${result.stylePatterns.length} style patterns (${aspects}).`,
-        contactCount > 0
-          ? `Noted ${contactCount} recurring contact relationship(s).`
-          : "",
-        `Saved ${savedCount} memory items. Future drafts will automatically reflect your writing style.`,
-      ]
-        .filter(Boolean)
-        .join(" ");
+    const aspects = result.stylePatterns.map((p) => p.aspect).join(", ");
+    const contactCount = result.contactObservations.length;
+    const summary = [
+      `Analyzed ${searchResult.messages.length} messages on ${provider.displayName}.`,
+      `Extracted ${result.stylePatterns.length} style patterns (${aspects}).`,
+      contactCount > 0
+        ? `Noted ${contactCount} recurring contact relationship(s).`
+        : "",
+      `Saved ${savedCount} memory items. Future drafts will automatically reflect your writing style.`,
+    ]
+      .filter(Boolean)
+      .join(" ");
 
-      return ok(summary);
-    });
+    return ok(summary);
   } catch (e) {
     return err(e instanceof Error ? e.message : String(e));
   }

package/src/config/bundled-skills/messaging/tools/messaging-archive-by-sender.ts

@@ -2,7 +2,7 @@ import type {
   ToolContext,
   ToolExecutionResult,
 } from "../../../../tools/types.js";
-import { err, ok, resolveProvider, withProviderToken } from "./shared.js";
+import { err, getProviderConnection, ok, resolveProvider } from "./shared.js";
 
 export async function run(
   input: Record<string, unknown>,
@@ -30,21 +30,20 @@ export async function run(
       );
     }
 
-    return withProviderToken(provider, async (token) => {
-      const result = await provider.archiveByQuery!(token, query);
-
-      if (result.archived === 0) {
-        return ok("No messages matched the query. Nothing archived.");
-      }
-
-      const summary = `Archived ${result.archived} message(s) matching query: ${query}`;
-      if (result.truncated) {
-        return ok(
-          `${summary}\n\nNote: this operation was capped at 5000 messages. Additional messages matching the query may remain in the inbox. Run the command again to archive more.`,
-        );
-      }
-      return ok(summary);
-    });
+    const conn = getProviderConnection(provider);
+    const result = await provider.archiveByQuery!(conn, query);
+
+    if (result.archived === 0) {
+      return ok("No messages matched the query. Nothing archived.");
+    }
+
+    const summary = `Archived ${result.archived} message(s) matching query: ${query}`;
+    if (result.truncated) {
+      return ok(
+        `${summary}\n\nNote: this operation was capped at 5000 messages. Additional messages matching the query may remain in the inbox. Run the command again to archive more.`,
+      );
+    }
+    return ok(summary);
   } catch (e) {
     return err(e instanceof Error ? e.message : String(e));
   }

package/src/config/bundled-skills/messaging/tools/messaging-auth-test.ts

@@ -2,7 +2,7 @@ import type {
   ToolContext,
   ToolExecutionResult,
 } from "../../../../tools/types.js";
-import { err, ok, resolveProvider, withProviderToken } from "./shared.js";
+import { err, getProviderConnection, ok, resolveProvider } from "./shared.js";
 
 export async function run(
   input: Record<string, unknown>,
@@ -12,10 +12,9 @@ export async function run(
 
   try {
     const provider = resolveProvider(platform);
-    return withProviderToken(provider, async (token) => {
-      const info = await provider.testConnection(token);
-      return ok(JSON.stringify(info, null, 2));
-    });
+    const conn = getProviderConnection(provider);
+    const info = await provider.testConnection(conn);
+    return ok(JSON.stringify(info, null, 2));
   } catch (e) {
     return err(e instanceof Error ? e.message : String(e));
   }

package/src/config/bundled-skills/messaging/tools/messaging-list-conversations.ts

@@ -2,7 +2,7 @@ import type {
   ToolContext,
   ToolExecutionResult,
 } from "../../../../tools/types.js";
-import { err, ok, resolveProvider, withProviderToken } from "./shared.js";
+import { err, getProviderConnection, ok, resolveProvider } from "./shared.js";
 
 export async function run(
   input: Record<string, unknown>,
@@ -14,13 +14,12 @@ export async function run(
 
   try {
     const provider = resolveProvider(platform);
-    return withProviderToken(provider, async (token) => {
-      const conversations = await provider.listConversations(token, {
-        types: types as Array<"channel" | "dm" | "group" | "inbox"> | undefined,
-        limit,
-      });
-      return ok(JSON.stringify(conversations, null, 2));
+    const conn = getProviderConnection(provider);
+    const conversations = await provider.listConversations(conn, {
+      types: types as Array<"channel" | "dm" | "group" | "inbox"> | undefined,
+      limit,
     });
+    return ok(JSON.stringify(conversations, null, 2));
   } catch (e) {
     return err(e instanceof Error ? e.message : String(e));
   }

package/src/config/bundled-skills/messaging/tools/messaging-mark-read.ts

@@ -2,7 +2,7 @@ import type {
   ToolContext,
   ToolExecutionResult,
 } from "../../../../tools/types.js";
-import { err, ok, resolveProvider, withProviderToken } from "./shared.js";
+import { err, getProviderConnection, ok, resolveProvider } from "./shared.js";
 
 export async function run(
   input: Record<string, unknown>,
@@ -23,10 +23,9 @@ export async function run(
         `${provider.displayName} does not support marking messages as read.`,
       );
     }
-    return withProviderToken(provider, async (token) => {
-      await provider.markRead!(token, conversationId, messageId);
-      return ok("Marked as read.");
-    });
+    const conn = getProviderConnection(provider);
+    await provider.markRead(conn, conversationId, messageId);
+    return ok("Marked as read.");
   } catch (e) {
     return err(e instanceof Error ? e.message : String(e));
   }

package/src/config/bundled-skills/messaging/tools/messaging-read.ts

@@ -2,7 +2,7 @@ import type {
   ToolContext,
   ToolExecutionResult,
 } from "../../../../tools/types.js";
-import { err, ok, resolveProvider, withProviderToken } from "./shared.js";
+import { err, getProviderConnection, ok, resolveProvider } from "./shared.js";
 
 export async function run(
   input: Record<string, unknown>,
@@ -19,20 +19,19 @@ export async function run(
 
   try {
     const provider = resolveProvider(platform);
-    return withProviderToken(provider, async (token) => {
-      let messages;
-      if (threadId && provider.getThreadReplies) {
-        messages = await provider.getThreadReplies(
-          token,
-          conversationId,
-          threadId,
-          { limit },
-        );
-      } else {
-        messages = await provider.getHistory(token, conversationId, { limit });
-      }
-      return ok(JSON.stringify(messages, null, 2));
-    });
+    const conn = getProviderConnection(provider);
+    let messages;
+    if (threadId && provider.getThreadReplies) {
+      messages = await provider.getThreadReplies(
+        conn,
+        conversationId,
+        threadId,
+        { limit },
+      );
+    } else {
+      messages = await provider.getHistory(conn, conversationId, { limit });
+    }
+    return ok(JSON.stringify(messages, null, 2));
   } catch (e) {
     return err(e instanceof Error ? e.message : String(e));
   }

package/src/config/bundled-skills/messaging/tools/messaging-search.ts

@@ -2,7 +2,7 @@ import type {
   ToolContext,
   ToolExecutionResult,
 } from "../../../../tools/types.js";
-import { err, ok, resolveProvider, withProviderToken } from "./shared.js";
+import { err, getProviderConnection, ok, resolveProvider } from "./shared.js";
 
 export async function run(
   input: Record<string, unknown>,
@@ -18,10 +18,9 @@ export async function run(
 
   try {
     const provider = resolveProvider(platform);
-    return withProviderToken(provider, async (token) => {
-      const result = await provider.search(token, query, { count: maxResults });
-      return ok(JSON.stringify(result, null, 2));
-    });
+    const conn = getProviderConnection(provider);
+    const result = await provider.search(conn, query, { count: maxResults });
+    return ok(JSON.stringify(result, null, 2));
   } catch (e) {
     return err(e instanceof Error ? e.message : String(e));
   }

package/src/config/bundled-skills/messaging/tools/messaging-send.ts

@@ -9,6 +9,7 @@ import {
   listMessages,
 } from "../../../../messaging/providers/gmail/client.js";
 import { buildMultipartMime } from "../../../../messaging/providers/gmail/mime-builder.js";
+import type { OAuthConnection } from "../../../../oauth/connection.js";
 import type {
   ToolContext,
   ToolExecutionResult,
@@ -18,10 +19,10 @@ import {
   err,
   extractEmail,
   extractHeader,
+  getProviderConnection,
   ok,
   parseAddressList,
   resolveProvider,
-  withProviderToken,
 } from "./shared.js";
 
 export async function run(
@@ -51,115 +52,66 @@ export async function run(
       return err("Attachments are only supported on Gmail.");
     }
 
+    const conn = getProviderConnection(provider);
+
     // Gmail: create a draft instead of sending directly
     if (provider.id === "gmail") {
-      return withProviderToken(provider, async (token) => {
-        // Reply mode: thread_id provided — create a threaded draft with reply-all recipients
-        if (threadId) {
-          // Fetch thread messages to extract recipients and threading headers
-          const list = await listMessages(token, `thread:${threadId}`, 10);
-          if (!list.messages?.length) {
-            return err("No messages found in this thread.");
-          }
-
-          const messages = await batchGetMessages(
-            token,
-            list.messages.map((m) => m.id),
-            "metadata",
-            ["From", "To", "Cc", "Message-ID", "Subject"],
-          );
+      const gmailConn = conn as OAuthConnection;
+      // Reply mode: thread_id provided — create a threaded draft with reply-all recipients
+      if (threadId) {
+        // Fetch thread messages to extract recipients and threading headers
+        const list = await listMessages(gmailConn, `thread:${threadId}`, 10);
+        if (!list.messages?.length) {
+          return err("No messages found in this thread.");
+        }
 
-          // Use the latest message for threading and recipient extraction
-          const latest = messages[messages.length - 1];
-          const latestHeaders = latest.payload?.headers ?? [];
-
-          const messageIdHeader = extractHeader(latestHeaders, "Message-ID");
-          let replySubject = extractHeader(latestHeaders, "Subject");
-          if (replySubject && !replySubject.startsWith("Re:")) {
-            replySubject = `Re: ${replySubject}`;
-          }
-
-          // Build reply-all recipient list, excluding the user's own email
-          const profile = await getProfile(token);
-          const userEmail = profile.emailAddress.toLowerCase();
-
-          const allRecipients = new Set<string>();
-          const allCc = new Set<string>();
-
-          // From the latest message: From goes to To, original To/Cc go to Cc
-          const fromAddr = extractHeader(latestHeaders, "From");
-          const toAddrs = extractHeader(latestHeaders, "To");
-          const ccAddrs = extractHeader(latestHeaders, "Cc");
-
-          if (fromAddr) allRecipients.add(fromAddr);
-          for (const addr of parseAddressList(toAddrs)) {
-            allRecipients.add(addr);
-          }
-          for (const addr of parseAddressList(ccAddrs)) {
-            allCc.add(addr);
-          }
-
-          // Remove user's own email from recipients using exact email comparison
-          const filterSelf = (addr: string) => extractEmail(addr) !== userEmail;
-          const toList = [...allRecipients].filter(filterSelf);
-          const ccList = [...allCc].filter(filterSelf);
-
-          if (toList.length === 0) {
-            return err("Could not determine reply recipients from thread.");
-          }
-
-          // With attachments: build multipart MIME for threaded reply
-          if (attachmentPaths?.length) {
-            const attachments = await Promise.all(
-              attachmentPaths.map(async (filePath) => {
-                const data = await readFile(filePath);
-                const filename = basename(filePath);
-                const mimeType = guessMimeType(filePath);
-                return { filename, mimeType, data };
-              }),
-            );
-
-            const raw = buildMultipartMime({
-              to: toList.join(", "),
-              subject: replySubject,
-              body: text,
-              inReplyTo: messageIdHeader || undefined,
-              cc: ccList.length > 0 ? ccList.join(", ") : undefined,
-              attachments,
-            });
-            const draft = await createDraftRaw(token, raw, threadId);
-
-            const filenames = attachments.map((a) => a.filename).join(", ");
-            const recipientSummary =
-              ccList.length > 0
-                ? `To: ${toList.join(", ")}; Cc: ${ccList.join(", ")}`
-                : `To: ${toList.join(", ")}`;
-            return ok(
-              `Gmail draft created with ${attachments.length} attachment(s): ${filenames} (Draft ID: ${draft.id}). ${recipientSummary}. Review in Gmail Drafts, then tell me to send it or send it yourself.`,
-            );
-          }
-
-          const draft = await createDraft(
-            token,
-            toList.join(", "),
-            replySubject,
-            text,
-            messageIdHeader || undefined,
-            ccList.length > 0 ? ccList.join(", ") : undefined,
-            undefined,
-            threadId,
-          );
+        const messages = await batchGetMessages(
+          gmailConn,
+          list.messages.map((m) => m.id),
+          "metadata",
+          ["From", "To", "Cc", "Message-ID", "Subject"],
+        );
 
-          const recipientSummary =
-            ccList.length > 0
-              ? `To: ${toList.join(", ")}; Cc: ${ccList.join(", ")}`
-              : `To: ${toList.join(", ")}`;
-          return ok(
-            `Gmail draft created (ID: ${draft.id}). ${recipientSummary}. Review in Gmail Drafts, then tell me to send it or send it yourself.`,
-          );
+        // Use the latest message for threading and recipient extraction
+        const latest = messages[messages.length - 1];
+        const latestHeaders = latest.payload?.headers ?? [];
+
+        const messageIdHeader = extractHeader(latestHeaders, "Message-ID");
+        let replySubject = extractHeader(latestHeaders, "Subject");
+        if (replySubject && !replySubject.startsWith("Re:")) {
+          replySubject = `Re: ${replySubject}`;
+        }
+
+        // Build reply-all recipient list, excluding the user's own email
+        const profile = await getProfile(gmailConn);
+        const userEmail = profile.emailAddress.toLowerCase();
+
+        const allRecipients = new Set<string>();
+        const allCc = new Set<string>();
+
+        // From the latest message: From goes to To, original To/Cc go to Cc
+        const fromAddr = extractHeader(latestHeaders, "From");
+        const toAddrs = extractHeader(latestHeaders, "To");
+        const ccAddrs = extractHeader(latestHeaders, "Cc");
+
+        if (fromAddr) allRecipients.add(fromAddr);
+        for (const addr of parseAddressList(toAddrs)) {
+          allRecipients.add(addr);
+        }
+        for (const addr of parseAddressList(ccAddrs)) {
+          allCc.add(addr);
+        }
+
+        // Remove user's own email from recipients using exact email comparison
+        const filterSelf = (addr: string) => extractEmail(addr) !== userEmail;
+        const toList = [...allRecipients].filter(filterSelf);
+        const ccList = [...allCc].filter(filterSelf);
+
+        if (toList.length === 0) {
+          return err("Could not determine reply recipients from thread.");
         }
 
-        // With attachments: build multipart MIME and use createDraftRaw
+        // With attachments: build multipart MIME for threaded reply
         if (attachmentPaths?.length) {
           const attachments = await Promise.all(
             attachmentPaths.map(async (filePath) => {
@@ -171,51 +123,99 @@ export async function run(
           );
 
           const raw = buildMultipartMime({
-            to: conversationId,
-            subject: subject ?? "",
+            to: toList.join(", "),
+            subject: replySubject,
             body: text,
-            inReplyTo,
+            inReplyTo: messageIdHeader || undefined,
+            cc: ccList.length > 0 ? ccList.join(", ") : undefined,
             attachments,
           });
-          const draft = await createDraftRaw(token, raw, threadId);
+          const draft = await createDraftRaw(gmailConn, raw, threadId);
 
           const filenames = attachments.map((a) => a.filename).join(", ");
+          const recipientSummary =
+            ccList.length > 0
+              ? `To: ${toList.join(", ")}; Cc: ${ccList.join(", ")}`
+              : `To: ${toList.join(", ")}`;
           return ok(
-            `Gmail draft created with ${attachments.length} attachment(s): ${filenames} (Draft ID: ${draft.id}). Review in Gmail Drafts, then tell me to send it or send it yourself.`,
+            `Gmail draft created with ${attachments.length} attachment(s): ${filenames} (Draft ID: ${draft.id}). ${recipientSummary}. Review in Gmail Drafts, then tell me to send it or send it yourself.`,
           );
         }
 
-        // Without attachments: use standard createDraft
         const draft = await createDraft(
-          token,
-          conversationId,
-          subject ?? "",
+          gmailConn,
+          toList.join(", "),
+          replySubject,
           text,
-          inReplyTo,
-          undefined,
+          messageIdHeader || undefined,
+          ccList.length > 0 ? ccList.join(", ") : undefined,
           undefined,
           threadId,
         );
+
+        const recipientSummary =
+          ccList.length > 0
+            ? `To: ${toList.join(", ")}; Cc: ${ccList.join(", ")}`
+            : `To: ${toList.join(", ")}`;
         return ok(
-          `Gmail draft created (ID: ${draft.id}). Review it in your Gmail Drafts, then tell me to send it or send it yourself from Gmail.`,
+          `Gmail draft created (ID: ${draft.id}). ${recipientSummary}. Review in Gmail Drafts, then tell me to send it or send it yourself.`,
+        );
+      }
+
+      // With attachments: build multipart MIME and use createDraftRaw
+      if (attachmentPaths?.length) {
+        const attachments = await Promise.all(
+          attachmentPaths.map(async (filePath) => {
+            const data = await readFile(filePath);
+            const filename = basename(filePath);
+            const mimeType = guessMimeType(filePath);
+            return { filename, mimeType, data };
+          }),
         );
-      });
-    }
 
-    // Non-Gmail platforms
-    return withProviderToken(provider, async (token) => {
-      const result = await provider.sendMessage(token, conversationId, text, {
-        subject,
+        const raw = buildMultipartMime({
+          to: conversationId,
+          subject: subject ?? "",
+          body: text,
+          inReplyTo,
+          attachments,
+        });
+        const draft = await createDraftRaw(gmailConn, raw, threadId);
+
+        const filenames = attachments.map((a) => a.filename).join(", ");
+        return ok(
+          `Gmail draft created with ${attachments.length} attachment(s): ${filenames} (Draft ID: ${draft.id}). Review in Gmail Drafts, then tell me to send it or send it yourself.`,
+        );
+      }
+
+      // Without attachments: use standard createDraft
+      const draft = await createDraft(
+        gmailConn,
+        conversationId,
+        subject ?? "",
+        text,
         inReplyTo,
+        undefined,
+        undefined,
         threadId,
-        assistantId: context.assistantId,
-      });
+      );
+      return ok(
+        `Gmail draft created (ID: ${draft.id}). Review it in your Gmail Drafts, then tell me to send it or send it yourself from Gmail.`,
+      );
+    }
 
-      const threadSuffix = result.threadId
-        ? `, "thread_id": "${result.threadId}"`
-        : "";
-      return ok(`Message sent (ID: ${result.id}${threadSuffix}).`);
+    // Non-Gmail platforms
+    const result = await provider.sendMessage(conn, conversationId, text, {
+      subject,
+      inReplyTo,
+      threadId,
+      assistantId: context.assistantId,
     });
+
+    const threadSuffix = result.threadId
+      ? `, "thread_id": "${result.threadId}"`
+      : "";
+    return ok(`Message sent (ID: ${result.id}${threadSuffix}).`);
   } catch (e) {
     return err(e instanceof Error ? e.message : String(e));
   }