@mcinteerj/openclaw-gmail 1.4.1 → 1.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcinteerj/openclaw-gmail",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "Gmail channel plugin for OpenClaw - direct API or gog CLI",
   "type": "module",
   "main": "index.ts",

package/src/channel.ts

@@ -27,7 +27,7 @@ import { createGmailClient, type GmailClient } from "./gmail-client.js";
 import crypto from "node:crypto";
 
 const meta = {
-  id: "gmail",
+  id: "openclaw-gmail",
   label: "Gmail",
   selectionLabel: "Gmail",
   detailLabel: "Gmail",
@@ -71,8 +71,8 @@ function buildGmailMsgContext(
     ConversationLabel: threadLabel,
     SenderName: msg.sender.name,
     SenderId: msg.sender.id,
-    Provider: "gmail" as const,
-    Surface: "gmail" as const,
+    Provider: "openclaw-gmail" as const,
+    Surface: "openclaw-gmail" as const,
     MessageSid: msg.channelMessageId,
     ReplyToId: msg.channelMessageId,
     ThreadLabel: threadLabel,
@@ -83,7 +83,7 @@ function buildGmailMsgContext(
     MediaType: msg.mediaType,
     MediaUrl: msg.mediaUrl,
     CommandAuthorized: false,
-    OriginatingChannel: "gmail" as const,
+    OriginatingChannel: "openclaw-gmail" as const,
     OriginatingTo: msg.threadId,
   });
 
@@ -105,7 +105,7 @@ async function dispatchGmailMessage(
 
       // Build the dispatch context
       const ctxPayload = buildGmailMsgContext(msg, account, cfg);
-      const gmailCfg = cfg.channels?.gmail as GmailConfig | undefined;
+      const gmailCfg = cfg.channels?.["openclaw-gmail"] as GmailConfig | undefined;
 
       // Build reply dispatcher options using gateway's reply capability
       const deliver = async (payload: { text: string }) => {
@@ -255,6 +255,13 @@ export const gmailPlugin: ChannelPlugin<ResolvedGmailAccount> = {
       const client = (emailKey && activeClients.get(emailKey)) || createGmailClient(account, ctx.cfg);
       return sendGmailText({ ...ctx, client });
     },
+    sendMedia: (ctx: any) => {
+      const account = resolveGmailAccount(ctx.cfg, ctx.accountId);
+      const emailKey = account.email?.toLowerCase();
+      const client = (emailKey && activeClients.get(emailKey)) || createGmailClient(account, ctx.cfg);
+      const text = [ctx.text, ctx.mediaUrl].filter(Boolean).join("\n\n");
+      return sendGmailText({ ...ctx, text, client });
+    },
     resolveTarget: ({ to, allowFrom }) => {
       const trimmed = to?.trim() ?? "";
       const normalized = normalizeGmailTarget(trimmed);

package/src/inbound.ts

@@ -76,7 +76,7 @@ export function parseInboundGmail(payload: GogPayload, accountId?: string): Inbo
   const fullText = `[Thread Context: ID=${payload.threadId}, Subject="${subject}"]\n\n${finalText}${attachmentContext}`;
 
   return {
-    channelId: "gmail",
+    channelId: "openclaw-gmail",
     accountId,
     channelMessageId: payload.id,
     threadId: payload.threadId,
@@ -138,7 +138,7 @@ export function parseSearchGmail(msg: GogSearchMessage, accountId?: string, acco
   const fullText = `[Thread Context: ID=${msg.threadId}, Subject="${subject}"]\n\n${finalText}`;
 
   return {
-    channelId: "gmail",
+    channelId: "openclaw-gmail",
     accountId,
     channelMessageId: msg.id,
     threadId: msg.threadId,

package/src/onboarding.ts

@@ -7,7 +7,7 @@ import { readGogCredentials, runOAuthFlow, createOAuth2Client } from "./auth.js"
 import { ApiGmailClient } from "./api-client.js";
 
 const execAsync = promisify(exec);
-const channel = "gmail" as const;
+const channel = "openclaw-gmail" as const;
 
 const MIN_GOG_VERSION = "1.2.0";
 
@@ -92,7 +92,7 @@ export const gmailOnboardingAdapter: ChannelOnboardingAdapter = {
   getStatus: async ({ cfg }: { cfg: OpenClawConfig }) => {
     const ids = listGmailAccountIds(cfg);
     const configured = ids.length > 0;
-    const gmailConfig = (cfg.channels as any)?.gmail || {};
+    const gmailConfig = (cfg.channels as any)?.["openclaw-gmail"] || {};
     const accounts = gmailConfig.accounts || {};
     const backends = new Set(
       Object.values(accounts).map((a: any) => a.backend || "gog"),
@@ -128,7 +128,7 @@ export const gmailOnboardingAdapter: ChannelOnboardingAdapter = {
   }) => {
     // --- Account selection (unchanged) ---
     const existingIds = listGmailAccountIds(cfg);
-    const gmailOverride = accountOverrides.gmail?.trim();
+    const gmailOverride = (accountOverrides["openclaw-gmail"] ?? accountOverrides.gmail)?.trim();
     const defaultAccountId = resolveDefaultGmailAccountId(cfg);
     let accountId = gmailOverride || defaultAccountId;
 
@@ -154,7 +154,7 @@ export const gmailOnboardingAdapter: ChannelOnboardingAdapter = {
     if (!email) throw new Error("Email required");
 
     // --- Detect available auth sources ---
-    const gmailConfig = (cfg.channels as any)?.gmail || {};
+    const gmailConfig = (cfg.channels as any)?.["openclaw-gmail"] || {};
     const existingAccount = gmailConfig.accounts?.[email];
     const existingOAuth = existingAccount?.oauth;
     const gogInstalled = await checkGogInstalled();
@@ -330,7 +330,7 @@ export const gmailOnboardingAdapter: ChannelOnboardingAdapter = {
       ...cfg,
       channels: {
         ...cfg.channels,
-        gmail: {
+        "openclaw-gmail": {
           dmPolicy: "allowlist",
           archiveOnReply: true,
           ...gmailConfig,
@@ -349,7 +349,7 @@ export const gmailOnboardingAdapter: ChannelOnboardingAdapter = {
     ...cfg,
     channels: {
       ...cfg.channels,
-      gmail: { ...cfg.channels?.gmail, enabled: false },
+      "openclaw-gmail": { ...(cfg.channels as any)?.["openclaw-gmail"], enabled: false },
     },
   }),
 };

package/src/outbound.ts

@@ -18,7 +18,7 @@ export interface GmailOutboundContext extends OutboundContext {
 export async function sendGmailText(ctx: GmailOutboundContext) {
   const { to, text, accountId, cfg, threadId, replyToId, subject: explicitSubject, client } = ctx;
   const account = resolveGmailAccount(cfg, accountId);
-  const gmailCfg = cfg.channels?.gmail as GmailConfig | undefined;
+  const gmailCfg = cfg.channels?.["openclaw-gmail"] as GmailConfig | undefined;
 
   // Validate we have a target - prioritize threadId if it's valid
   const effectiveThreadId = isGmailThreadId(String(threadId)) ? String(threadId) : undefined;
@@ -141,5 +141,5 @@ export async function sendGmailText(ctx: GmailOutboundContext) {
     });
   }
 
-  return { id: "sent" };
+  return { channel: "openclaw-gmail", messageId: "sent" };
 }