gogcli-mcp-gmail 2.4.0 → 2.5.0

package/dist/index.js

@@ -31274,14 +31274,16 @@ function registerGmailTools(server2) {
       bcc: external_exports.string().optional().describe("BCC recipients, comma-separated"),
       replyToMessageId: external_exports.string().optional().describe("Message ID to reply to"),
       threadId: external_exports.string().optional().describe("Thread ID to reply within"),
+      attach: external_exports.array(external_exports.string()).optional().describe("Local file paths to attach (repeatable). Each file is read on the gog server (not this client), base64-encoded with a MIME type inferred from its extension, and added as a multipart attachment. Keep the total under Gmail's ~35 MB inline-upload limit."),
       account: accountParam
     }
-  }, async ({ to, subject, body, cc, bcc, replyToMessageId, threadId, account }) => {
+  }, async ({ to, subject, body, cc, bcc, replyToMessageId, threadId, attach, account }) => {
     const args = ["gmail", "send", `--to=${to}`, `--subject=${subject}`, `--body=${body}`];
     if (cc) args.push(`--cc=${cc}`);
     if (bcc) args.push(`--bcc=${bcc}`);
     if (replyToMessageId) args.push(`--reply-to-message-id=${replyToMessageId}`);
     if (threadId) args.push(`--thread-id=${threadId}`);
+    if (attach) for (const path of attach) args.push(`--attach=${path}`);
     return runOrDiagnose(args, { account });
   });
   registerRunTool(server2, { service: "gmail", examples: '"archive", "mark-read", "labels"' });
@@ -31297,7 +31299,7 @@ var failIfNotEmptyParam = external_exports.boolean().optional().describe(
 );
 
 // ../gogcli-mcp/src/server.ts
-var VERSION = true ? "2.4.0" : "0.0.0";
+var VERSION = true ? "2.5.0" : "0.0.0";
 function createServer(options) {
   return new McpServer({
     name: options?.name ?? "gogcli",
@@ -31478,7 +31480,7 @@ function registerExtraGmailTools(server2) {
     return runOrDiagnose(args, { account });
   });
   server2.registerTool("gog_gmail_thread_get", {
-    description: "Get a Gmail thread with all messages. For long threads that overflow context, use latestN to fetch only the most recent messages and/or snippetsOnly for a lightweight per-message headers+snippet view; sanitizeContent strips raw payloads/HTML and is the biggest size reducer when you do need bodies.",
+    description: "Get a Gmail thread with all messages. For long threads that overflow context, use latestN to fetch only the most recent messages and/or snippetsOnly for a lightweight per-message headers+snippet view; sanitizeContent strips raw payloads/HTML and is the biggest size reducer when you do need bodies. Note each message carries two distinct id concepts: the top-level `id` (the Gmail short hex message id \u2014 pass THIS as replyToMessageId to reply) and the `Message-Id` header (the RFC822 `<\u2026@host>` value used in In-Reply-To/References) \u2014 don't confuse either with the `threadId`. To reply to the thread itself, pass the thread's id as replyToThreadId on gog_gmail_drafts_create.",
     annotations: { readOnlyHint: true },
     inputSchema: {
       threadId: external_exports.string().describe("Gmail thread ID"),
@@ -31630,10 +31632,11 @@ function registerExtraGmailTools(server2) {
     subject: external_exports.string().describe("Subject"),
     body: external_exports.string().describe("Body (plain text)"),
     bodyHtml: external_exports.string().optional().describe("Body (HTML; optional)"),
-    replyToMessageId: external_exports.string().optional().describe("Reply to Gmail message ID (sets In-Reply-To/References and thread)"),
+    replyToMessageId: external_exports.string().optional().describe("Reply to a specific Gmail MESSAGE id \u2014 the short hex `id` field from gog_gmail_get / _search / _thread_get (e.g. 19e7593d77fd9636), NOT a thread id and NOT the RFC822 `<\u2026@host>` Message-Id header. Anchors In-Reply-To/References to that exact message. To reply to a thread when you don't know the latest message, use replyToThreadId instead. If both are given, replyToMessageId wins."),
+    replyToThreadId: external_exports.string().optional().describe(`Reply to a Gmail THREAD id \u2014 passed to gog as --thread-id, which threads the draft using the thread's latest-message headers (In-Reply-To/References). This is what "reply to this thread" almost always means. Mutually exclusive with replyToMessageId (which wins if both are set). Thread ids and message ids are both 16-hex strings and easy to confuse \u2014 use this param, not replyToMessageId, when the id came from a thread.`),
     replyTo: external_exports.string().optional().describe("Reply-To header address"),
-    quote: external_exports.boolean().optional().describe("Include quoted original message in reply (requires replyToMessageId)"),
-    attach: external_exports.array(external_exports.string()).optional().describe("Attachment file paths (repeatable)"),
+    quote: external_exports.boolean().optional().describe("Include quoted original message in reply (requires replyToMessageId or replyToThreadId)"),
+    attach: external_exports.array(external_exports.string()).optional().describe("Local file paths to attach (repeatable). Read on the gog server, base64-encoded with a MIME type inferred from the extension. On gog_gmail_drafts_update, supplying attach REPLACES the draft's existing attachments; omitting it preserves them (use clearAttachments to remove all)."),
     from: external_exports.string().optional().describe("Send from this email address (must be a verified send-as alias)"),
     omitRecipients: external_exports.boolean().optional().describe("Create the draft with no recipients even if to/cc/bcc are supplied \u2014 an accidental-send guard. Populate recipients in a later update before sending."),
     returnFull: external_exports.boolean().optional().describe("After writing, re-fetch and return the full stored draft (subject, body, recipients) instead of just the write acknowledgement. Costs one extra read."),
@@ -31649,6 +31652,7 @@ function registerExtraGmailTools(server2) {
     args.push(`--body=${f.body}`);
     if (f.bodyHtml) args.push(`--body-html=${f.bodyHtml}`);
     if (f.replyToMessageId) args.push(`--reply-to-message-id=${f.replyToMessageId}`);
+    else if (f.replyToThreadId) args.push(`--thread-id=${f.replyToThreadId}`);
     if (f.replyTo) args.push(`--reply-to=${f.replyTo}`);
     if (f.quote) args.push("--quote");
     if (f.attach) for (const path of f.attach) args.push(`--attach=${path}`);
@@ -31668,7 +31672,7 @@ function registerExtraGmailTools(server2) {
     return runOrDiagnose(["gmail", "drafts", "get", draftId], { account });
   }
   server2.registerTool("gog_gmail_drafts_create", {
-    description: "Create a new Gmail draft. Recipients (to/cc/bcc) are optional; omit them (or set omitRecipients) to create a recipient-less draft as an accidental-send guard.",
+    description: "Create a new Gmail draft. Recipients (to/cc/bcc) are optional; omit them (or set omitRecipients) to create a recipient-less draft as an accidental-send guard. For replies, prefer replyToThreadId (anchors to the thread's latest message) or replyToMessageId (a specific message) \u2014 don't pass a thread id into replyToMessageId, which mis-threads silently.",
     inputSchema: draftWriteSchema
   }, async ({ account, returnFull, ...flags }) => {
     const args = ["gmail", "drafts", "create"];
@@ -31676,15 +31680,17 @@ function registerExtraGmailTools(server2) {
     return writeDraft(args, account, returnFull);
   });
   server2.registerTool("gog_gmail_drafts_update", {
-    description: "Update an existing Gmail draft.",
+    description: "Update an existing Gmail draft. For replies, prefer replyToThreadId (threads off the thread's latest message) or replyToMessageId (a specific message) over passing a thread id into replyToMessageId. Attachment semantics: supplying attach REPLACES the draft's existing attachments; omitting it preserves them; set clearAttachments to remove all.",
     annotations: { destructiveHint: true },
     inputSchema: {
       draftId: external_exports.string().describe("Draft ID"),
-      ...draftWriteSchema
+      ...draftWriteSchema,
+      clearAttachments: external_exports.boolean().optional().describe("Remove all attachments from the draft. By default, omitting attach preserves the draft's existing attachments; this intentionally clears them. Ignored if attach is also supplied (attach replaces).")
     }
-  }, async ({ draftId, account, returnFull, ...flags }) => {
+  }, async ({ draftId, account, returnFull, clearAttachments, ...flags }) => {
     const args = ["gmail", "drafts", "update", draftId];
     appendDraftFlags(args, flags);
+    if (clearAttachments) args.push("--clear-attachments");
     return writeDraft(args, account, returnFull, draftId);
   });
   server2.registerTool("gog_gmail_drafts_delete", {

package/manifest.json

@@ -3,7 +3,7 @@
   "manifest_version": "0.3",
   "name": "gogcli-mcp-gmail",
   "display_name": "gogcli (Gmail)",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "Extended Gmail for Claude via gogcli — auth + full Gmail support (threads, labels, drafts, attachments, forward, autoreply, bulk operations)",
   "author": {
     "name": "Chris Hall",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gogcli-mcp-gmail",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "mcpName": "io.github.chrischall/gogcli-mcp-gmail",
   "description": "Extended Gmail MCP server via gogcli — auth + full Gmail support (threads, labels, drafts, attachments, forward, autoreply, bulk operations)",
   "author": "Claude Code (AI) <https://www.anthropic.com/claude>",

package/src/tools/gmail-extra.ts

@@ -208,7 +208,7 @@ export function registerExtraGmailTools(server: McpServer): void {
   });
 
   server.registerTool('gog_gmail_thread_get', {
-    description: 'Get a Gmail thread with all messages. For long threads that overflow context, use latestN to fetch only the most recent messages and/or snippetsOnly for a lightweight per-message headers+snippet view; sanitizeContent strips raw payloads/HTML and is the biggest size reducer when you do need bodies.',
+    description: 'Get a Gmail thread with all messages. For long threads that overflow context, use latestN to fetch only the most recent messages and/or snippetsOnly for a lightweight per-message headers+snippet view; sanitizeContent strips raw payloads/HTML and is the biggest size reducer when you do need bodies. Note each message carries two distinct id concepts: the top-level `id` (the Gmail short hex message id — pass THIS as replyToMessageId to reply) and the `Message-Id` header (the RFC822 `<…@host>` value used in In-Reply-To/References) — don\'t confuse either with the `threadId`. To reply to the thread itself, pass the thread\'s id as replyToThreadId on gog_gmail_drafts_create.',
     annotations: { readOnlyHint: true },
     inputSchema: {
       threadId: z.string().describe('Gmail thread ID'),
@@ -371,10 +371,11 @@ export function registerExtraGmailTools(server: McpServer): void {
     subject: z.string().describe('Subject'),
     body: z.string().describe('Body (plain text)'),
     bodyHtml: z.string().optional().describe('Body (HTML; optional)'),
-    replyToMessageId: z.string().optional().describe('Reply to Gmail message ID (sets In-Reply-To/References and thread)'),
+    replyToMessageId: z.string().optional().describe('Reply to a specific Gmail MESSAGE id — the short hex `id` field from gog_gmail_get / _search / _thread_get (e.g. 19e7593d77fd9636), NOT a thread id and NOT the RFC822 `<…@host>` Message-Id header. Anchors In-Reply-To/References to that exact message. To reply to a thread when you don\'t know the latest message, use replyToThreadId instead. If both are given, replyToMessageId wins.'),
+    replyToThreadId: z.string().optional().describe('Reply to a Gmail THREAD id — passed to gog as --thread-id, which threads the draft using the thread\'s latest-message headers (In-Reply-To/References). This is what "reply to this thread" almost always means. Mutually exclusive with replyToMessageId (which wins if both are set). Thread ids and message ids are both 16-hex strings and easy to confuse — use this param, not replyToMessageId, when the id came from a thread.'),
     replyTo: z.string().optional().describe('Reply-To header address'),
-    quote: z.boolean().optional().describe('Include quoted original message in reply (requires replyToMessageId)'),
-    attach: z.array(z.string()).optional().describe('Attachment file paths (repeatable)'),
+    quote: z.boolean().optional().describe('Include quoted original message in reply (requires replyToMessageId or replyToThreadId)'),
+    attach: z.array(z.string()).optional().describe('Local file paths to attach (repeatable). Read on the gog server, base64-encoded with a MIME type inferred from the extension. On gog_gmail_drafts_update, supplying attach REPLACES the draft\'s existing attachments; omitting it preserves them (use clearAttachments to remove all).'),
     from: z.string().optional().describe('Send from this email address (must be a verified send-as alias)'),
     omitRecipients: z.boolean().optional().describe('Create the draft with no recipients even if to/cc/bcc are supplied — an accidental-send guard. Populate recipients in a later update before sending.'),
     returnFull: z.boolean().optional().describe('After writing, re-fetch and return the full stored draft (subject, body, recipients) instead of just the write acknowledgement. Costs one extra read.'),
@@ -389,6 +390,7 @@ export function registerExtraGmailTools(server: McpServer): void {
     body: string;
     bodyHtml?: string;
     replyToMessageId?: string;
+    replyToThreadId?: string;
     replyTo?: string;
     quote?: boolean;
     attach?: string[];
@@ -405,7 +407,11 @@ export function registerExtraGmailTools(server: McpServer): void {
     args.push(`--subject=${f.subject}`);
     args.push(`--body=${f.body}`);
     if (f.bodyHtml) args.push(`--body-html=${f.bodyHtml}`);
+    // A draft can reply to a specific message (--reply-to-message-id) or thread
+    // off the latest message in a thread (--thread-id, which gog resolves
+    // server-side). replyToMessageId wins when both are supplied.
     if (f.replyToMessageId) args.push(`--reply-to-message-id=${f.replyToMessageId}`);
+    else if (f.replyToThreadId) args.push(`--thread-id=${f.replyToThreadId}`);
     if (f.replyTo) args.push(`--reply-to=${f.replyTo}`);
     if (f.quote) args.push('--quote');
     if (f.attach) for (const path of f.attach) args.push(`--attach=${path}`);
@@ -441,7 +447,7 @@ export function registerExtraGmailTools(server: McpServer): void {
   }
 
   server.registerTool('gog_gmail_drafts_create', {
-    description: 'Create a new Gmail draft. Recipients (to/cc/bcc) are optional; omit them (or set omitRecipients) to create a recipient-less draft as an accidental-send guard.',
+    description: 'Create a new Gmail draft. Recipients (to/cc/bcc) are optional; omit them (or set omitRecipients) to create a recipient-less draft as an accidental-send guard. For replies, prefer replyToThreadId (anchors to the thread\'s latest message) or replyToMessageId (a specific message) — don\'t pass a thread id into replyToMessageId, which mis-threads silently.',
     inputSchema: draftWriteSchema,
   }, async ({ account, returnFull, ...flags }) => {
     const args = ['gmail', 'drafts', 'create'];
@@ -450,15 +456,17 @@ export function registerExtraGmailTools(server: McpServer): void {
   });
 
   server.registerTool('gog_gmail_drafts_update', {
-    description: 'Update an existing Gmail draft.',
+    description: 'Update an existing Gmail draft. For replies, prefer replyToThreadId (threads off the thread\'s latest message) or replyToMessageId (a specific message) over passing a thread id into replyToMessageId. Attachment semantics: supplying attach REPLACES the draft\'s existing attachments; omitting it preserves them; set clearAttachments to remove all.',
     annotations: { destructiveHint: true },
     inputSchema: {
       draftId: z.string().describe('Draft ID'),
       ...draftWriteSchema,
+      clearAttachments: z.boolean().optional().describe('Remove all attachments from the draft. By default, omitting attach preserves the draft\'s existing attachments; this intentionally clears them. Ignored if attach is also supplied (attach replaces).'),
     },
-  }, async ({ draftId, account, returnFull, ...flags }) => {
+  }, async ({ draftId, account, returnFull, clearAttachments, ...flags }) => {
     const args = ['gmail', 'drafts', 'update', draftId];
     appendDraftFlags(args, flags);
+    if (clearAttachments) args.push('--clear-attachments');
     return writeDraft(args, account, returnFull, draftId);
   });
 

package/tests/tools/gmail-extra.test.ts

@@ -545,6 +545,41 @@ describe('gog_gmail_drafts_create', () => {
   });
 });
 
+describe('gmail draft reply threading (native --thread-id)', () => {
+  it('passes replyToThreadId straight through as --thread-id on create (no thread fetch)', async () => {
+    await handlers.get('gog_gmail_drafts_create')!({
+      subject: 'Re: roof', body: 'Sounds good', replyToThreadId: '19dffe06f9668b28', account: 'me@x.com',
+    });
+    // gog resolves the thread's latest-message headers itself — no extra fetch.
+    expect(lib.runOrDiagnose).toHaveBeenCalledTimes(1);
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['gmail', 'drafts', 'create', '--subject=Re: roof', '--body=Sounds good', '--thread-id=19dffe06f9668b28'],
+      { account: 'me@x.com' },
+    );
+  });
+
+  it('passes replyToThreadId as --thread-id on update', async () => {
+    await handlers.get('gog_gmail_drafts_update')!({
+      draftId: 'd1', subject: 'S', body: 'B', replyToThreadId: 't1',
+    });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['gmail', 'drafts', 'update', 'd1', '--subject=S', '--body=B', '--thread-id=t1'],
+      { account: undefined },
+    );
+  });
+
+  it('replyToMessageId wins when both ids are supplied (no --thread-id)', async () => {
+    await handlers.get('gog_gmail_drafts_create')!({
+      subject: 'S', body: 'B', replyToMessageId: 'mExplicit', replyToThreadId: 't1',
+    });
+    expect(lib.runOrDiagnose).toHaveBeenCalledTimes(1);
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['gmail', 'drafts', 'create', '--subject=S', '--body=B', '--reply-to-message-id=mExplicit'],
+      { account: undefined },
+    );
+  });
+});
+
 describe('gog_gmail_drafts_update', () => {
   it('calls runOrDiagnose with draftId and updated fields', async () => {
     await handlers.get('gog_gmail_drafts_update')!({
@@ -581,6 +616,16 @@ describe('gog_gmail_drafts_update', () => {
     );
   });
 
+  it('passes --clear-attachments when clearAttachments is true', async () => {
+    await handlers.get('gog_gmail_drafts_update')!({
+      draftId: 'd1', subject: 'S', body: 'B', clearAttachments: true,
+    });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['gmail', 'drafts', 'update', 'd1', '--subject=S', '--body=B', '--clear-attachments'],
+      { account: undefined },
+    );
+  });
+
   it('returnFull re-fetches the draft by its known id', async () => {
     vi.mocked(lib.runOrDiagnose)
       .mockResolvedValueOnce(toText('{"draftId":"d1"}'))