gogcli-mcp-drive 4.5.0 → 4.5.1

package/.claude-plugin/marketplace.json

@@ -7,7 +7,7 @@
   },
   "metadata": {
     "description": "Extended Google Drive for Claude via gogcli — auth + full Drive support (upload, download, permissions, comments, shared drives)",
-    "version": "4.5.0"
+    "version": "4.5.1"
   },
   "plugins": [
     {
@@ -15,7 +15,7 @@
       "displayName": "gogcli (Drive)",
       "source": "./",
       "description": "Extended Google Drive for Claude via gogcli — auth + full Drive support (upload, download, permissions, comments, shared drives)",
-      "version": "4.5.0",
+      "version": "4.5.1",
       "author": {
         "name": "Chris Hall"
       },

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "gogcli-mcp-drive",
   "displayName": "gogcli (Drive)",
-  "version": "4.5.0",
+  "version": "4.5.1",
   "description": "Extended Google Drive for Claude via gogcli — auth + full Drive support (upload, download, permissions, comments, shared drives)",
   "author": {
     "name": "Chris Hall",

package/dist/index.js

@@ -35928,6 +35928,7 @@ async function diagnose(err) {
   const isAuthError = !isTransientError && AUTH_ERROR_PATTERN.test(errText);
   const isGridLimitError = GRID_LIMIT_ERROR_PATTERN.test(errText);
   const hint = isInvalidGrant ? INVALID_GRANT_HINT : isAuthError ? AUTH_HINT : isTransientError ? TRANSIENT_HINT : isGridLimitError ? GRID_LIMIT_HINT : "";
+  if (!isAuthError && !isInvalidGrant) return errorResult(`${errText}${hint}`);
   try {
     const accounts = formatAccountList(await run(["auth", "list"]));
     return errorResult(`${errText}
@@ -36023,10 +36024,51 @@ function confirmSpentStore() {
 }
 
 // ../gogcli-mcp/src/dispatch-confirmation.ts
+var BODY_PREVIEW_MAX = 2048;
+function bodyPreview(text) {
+  if (!text) return void 0;
+  if (text.length <= BODY_PREVIEW_MAX) return text;
+  return `${text.slice(0, BODY_PREVIEW_MAX)}\u2026 [${text.length - BODY_PREVIEW_MAX} more characters not shown]`;
+}
 var CONFIRM_ACTION_INSTRUCTION = CONFIRM_TOKEN_INSTRUCTION;
 var CONFIRM_FALLBACK_DESCRIPTION = ' If the client cannot show that prompt (no MCP elicitation, e.g. claude.ai), a two-step flow applies instead: call WITHOUT confirmToken and nothing is sent or changed \u2014 the result has status "confirmation-required", the full preview and a confirmToken. Follow its instruction (by default: show the preview to the user verbatim and only after they explicitly approve it in chat, call again with the SAME arguments plus confirmToken). The tool re-reads what it would act on and refuses (DRAFT_CHANGED, with a fresh preview and token) if it changed; TOKEN_EXPIRED / TOKEN_REUSED / TOKEN_INVALID also do nothing. A server set to MCP_CONFIRM_MODE=refuse refuses instead.';
+function refusedInRun(what, via, does, instead) {
+  return `${what} ${does} and is not available through ${via}. ${instead}`;
+}
 function gatedElsewhere(what, via, does, tool) {
-  return `${what} ${does} and is not available through ${via}. Use ${tool}, which asks the user to confirm.`;
+  return refusedInRun(what, via, does, `Use ${tool}, which asks the user to confirm.`);
+}
+function hasCommandWord(args, words) {
+  return args.find((a) => words.has(a.toLowerCase()));
+}
+var COMMENT_ADD_WORDS = /* @__PURE__ */ new Set(["create", "add", "new"]);
+var COMMENT_REPLY_WORDS = /* @__PURE__ */ new Set(["reply", "respond"]);
+function hasTrueFlag(args, flag) {
+  const name = `--${flag}`;
+  return args.some((a) => {
+    const lower = a.toLowerCase();
+    if (lower === name) return true;
+    return lower.startsWith(`${name}=`) && lower.slice(name.length + 1) !== "false";
+  });
+}
+function vetCommentsRun(service, subcommand, args) {
+  if (subcommand.toLowerCase() !== "comments") return void 0;
+  const reply = hasCommandWord(args, COMMENT_REPLY_WORDS);
+  if (reply) {
+    return gatedElsewhere(
+      `gog ${service} comments ${reply.toLowerCase()}`,
+      `gog_${service}_run`,
+      "notifies the comment thread",
+      `gog_${service}_comments_reply`
+    );
+  }
+  const add = hasCommandWord(args, COMMENT_ADD_WORDS);
+  return add ? gatedElsewhere(
+    `gog ${service} comments ${add.toLowerCase()}`,
+    `gog_${service}_run`,
+    "notifies the file's owner and anyone it mentions",
+    `gog_${service}_comments_add`
+  ) : void 0;
 }
 async function requireDispatchConfirmation(ctx, options) {
   const { action, fallback } = options;
@@ -36188,6 +36230,27 @@ function authToolsFor(defaultServices) {
 }
 
 // ../gogcli-mcp/src/tools/calendar.ts
+var ASKS = (tool) => `Use ${tool}, which asks the user to confirm.`;
+var CALENDAR_REFUSED = {
+  create: { does: "can change what guests see", instead: ASKS("gog_calendar_create") },
+  add: { does: "can change what guests see", instead: ASKS("gog_calendar_create") },
+  new: { does: "can change what guests see", instead: ASKS("gog_calendar_create") },
+  update: { does: "can change what guests see", instead: ASKS("gog_calendar_update") },
+  edit: { does: "can change what guests see", instead: ASKS("gog_calendar_update") },
+  set: { does: "can change what guests see", instead: ASKS("gog_calendar_update") },
+  respond: { does: "can change what guests see", instead: ASKS("gog_calendar_respond") },
+  rsvp: { does: "can change what guests see", instead: ASKS("gog_calendar_respond") },
+  reply: { does: "can change what guests see", instead: ASKS("gog_calendar_respond") },
+  move: { does: "moves an event off guests' calendars (and can email them)", instead: ASKS("gog_calendar_move") },
+  transfer: { does: "moves an event off guests' calendars (and can email them)", instead: ASKS("gog_calendar_move") },
+  delete: { does: "removes an event from every guest's calendar (the whole series by default)", instead: ASKS("gog_calendar_delete") },
+  del: { does: "removes an event from every guest's calendar (the whole series by default)", instead: ASKS("gog_calendar_delete") },
+  rm: { does: "removes an event from every guest's calendar (the whole series by default)", instead: ASKS("gog_calendar_delete") },
+  remove: { does: "removes an event from every guest's calendar (the whole series by default)", instead: ASKS("gog_calendar_delete") },
+  "delete-calendar": { does: "deletes a calendar and every event on it", instead: ASKS("gog_calendar_delete_calendar") },
+  "out-of-office": { does: "auto-declines invitations and notifies their organizers", instead: ASKS("gog_calendar_out_of_office") },
+  ooo: { does: "auto-declines invitations and notifies their organizers", instead: ASKS("gog_calendar_out_of_office") }
+};
 var reminderParams = {
   reminders: external_exports.array(external_exports.string()).max(5).optional().describe(
     `Reminders as method:duration, e.g. ["popup:30m", "email:1d"]. Method is popup or email; duration accepts m/h/d (max 40320 minutes = 4 weeks). Google allows at most 5. These REPLACE the event's reminders \u2014 on update, pass an EMPTY array to drop custom reminders and go back to the calendar's defaults. Cannot be combined with noReminders.`
@@ -36253,8 +36316,25 @@ function inlineFileArg(flag, attachment, opts = {}) {
 }
 
 // ../gogcli-mcp/src/tools/drive.ts
-function vetDriveRun(subcommand, _args) {
-  return subcommand.toLowerCase() === "share" ? gatedElsewhere("gog drive share", "gog_drive_run", "grants access to a file", "gog_drive_share") : void 0;
+var DRIVE_DELETE_WORDS = /* @__PURE__ */ new Set(["delete", "rm", "del"]);
+function vetDriveRun(subcommand, args) {
+  const sub = subcommand.toLowerCase();
+  if (sub === "share") return gatedElsewhere("gog drive share", "gog_drive_run", "grants access to a file", "gog_drive_share");
+  if (DRIVE_DELETE_WORDS.has(sub) && hasTrueFlag(args, "permanent")) {
+    return gatedElsewhere(`gog drive ${sub} --permanent`, "gog_drive_run", "deletes a file for good, bypassing the trash", "gog_drive_delete");
+  }
+  if (sub === "bulk") {
+    return gatedElsewhere(
+      "gog drive bulk",
+      "gog_drive_run",
+      "rewrites sharing permissions across every matching file in a tree",
+      "gog_drive_share (one file at a time)"
+    );
+  }
+  if (sub === "unshare") {
+    return refusedInRun("gog drive unshare", "gog_drive_run", "removes someone's access to a file", "Use gog_drive_unshare.");
+  }
+  return vetCommentsRun("drive", sub, args);
 }
 var GOOGLE_DOC_MIME = "application/vnd.google-apps.document";
 function shareTargetMeta(raw) {
@@ -36265,6 +36345,26 @@ function shareTargetMeta(raw) {
     return {};
   }
 }
+function commentSnapshot(raw) {
+  let comment;
+  try {
+    const parsed = JSON.parse(raw);
+    comment = parsed?.comment ?? parsed ?? void 0;
+  } catch {
+    comment = void 0;
+  }
+  const name = typeof comment?.author?.displayName === "string" ? comment.author.displayName : void 0;
+  const email3 = typeof comment?.author?.emailAddress === "string" ? comment.author.emailAddress : void 0;
+  const author = name && email3 ? `${name} <${email3}>` : name ?? email3;
+  return {
+    ...author ? { author } : {},
+    ...typeof comment?.content === "string" ? { content: comment.content } : {},
+    ...typeof comment?.resolved === "boolean" ? { resolved: comment.resolved } : {}
+  };
+}
+function commentMentions(text) {
+  return [...new Set(text.match(/(?<=[+@])[\w.+-]+@[\w-]+(?:\.[\w-]+)+/g) ?? [])];
+}
 function fileMeta(raw) {
   const parsed = JSON.parse(raw);
   const f = parsed.file ?? parsed;
@@ -36373,16 +36473,36 @@ function registerDriveTools(server) {
     return runOrDiagnose(["drive", "move", pos(fileId), `--parent=${parentId}`], { account });
   });
   server.registerTool("gog_drive_delete", {
-    description: "Move a Google Drive file to trash, or permanently delete it with permanent=true (irreversible).",
+    description: "Move a Google Drive file to trash, or permanently delete it with permanent=true (irreversible). A permanent delete reads the file and asks the MCP host to show the user a confirmation prompt naming it first; nothing is deleted unless they accept. Moving to trash is recoverable and does not ask." + CONFIRM_FALLBACK_DESCRIPTION,
     annotations: { destructiveHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File ID to delete"),
-      permanent: external_exports.boolean().optional().describe("Permanently delete instead of moving to trash (irreversible)"),
-      account: accountParam
+      permanent: external_exports.boolean().optional().describe("Permanently delete instead of moving to trash (irreversible; asks the user first)"),
+      account: accountParam,
+      confirmToken: confirmTokenParam
     })
-  }, async ({ fileId, permanent, account }) => {
+  }, async ({ fileId, permanent, account, confirmToken }, ctx) => {
     const args = ["drive", "delete", pos(fileId)];
-    if (permanent) args.push("--permanent");
+    if (permanent) {
+      const got = await runOrDiagnose(["drive", "get", pos(fileId)], { account });
+      if (got.isError) return got;
+      const target = { file: { id: fileId, ...shareTargetMeta(resultText(got)) }, permanent: true };
+      const confirmation = await requireDispatchConfirmation(ctx, {
+        action: "drive.delete-permanent",
+        message: "Review and confirm PERMANENTLY deleting this file \u2014 it skips the trash and cannot be recovered:",
+        confirmationLabel: "Confirm that this file should be permanently deleted now.",
+        details: target,
+        unsupportedNote: "Move it to the trash instead (permanent=false); the user can empty the trash from Google Drive.",
+        fallback: {
+          tool: "gog_drive_delete",
+          account,
+          confirmToken,
+          subject: () => ({ target: fileId, payload: target, preview: target })
+        }
+      });
+      if (confirmation) return confirmation;
+      args.push("--permanent");
+    }
     args.push("--force");
     return runOrDiagnose(args, { account });
   });
@@ -36572,7 +36692,7 @@ var failIfNotEmptyParam = external_exports.boolean().optional().describe(
 );
 
 // ../gogcli-mcp/src/server.ts
-var VERSION = true ? "4.5.0" : "0.0.0";
+var VERSION = true ? "4.5.1" : "0.0.0";
 
 // ../gogcli-mcp/src/bootstrap-auth.ts
 import { join as join5 } from "node:path";
@@ -36836,14 +36956,37 @@ function registerExtraDriveTools(server) {
     return runOrDiagnose(["drive", "comments", "get", pos(fileId), pos(commentId)], { account });
   });
   server.registerTool("gog_drive_comments_add", {
-    description: "Add a new comment to a Drive file.",
+    description: "Add a new comment to a Drive file. Drive notifies the file's owner and everyone the text +mentions, so this reads the file and asks the MCP host to show the user a confirmation prompt with the file, the text and who is mentioned first; nothing is posted unless they accept." + CONFIRM_FALLBACK_DESCRIPTION,
     annotations: { destructiveHint: false },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File ID"),
       content: external_exports.string().describe("Comment text"),
-      account: accountParam
+      account: accountParam,
+      confirmToken: confirmTokenParam
     })
-  }, async ({ fileId, content, account }) => {
+  }, async ({ fileId, content, account, confirmToken }, ctx) => {
+    const got = await runOrDiagnose(["drive", "get", pos(fileId)], { account });
+    if (got.isError) return got;
+    const { name } = shareTargetMeta(resultText(got));
+    const file2 = { id: fileId, ...name !== void 0 ? { name } : {} };
+    const mentions = commentMentions(content);
+    const confirmation = await requireDispatchConfirmation(ctx, {
+      action: "drive.comment-add",
+      message: "Review and confirm this comment \u2014 the file's owner and anyone mentioned are notified:",
+      confirmationLabel: "Confirm that this comment should be posted now.",
+      details: { file: file2, textPreview: bodyPreview(content), mentions },
+      unsupportedNote: "Ask the user to comment from Google Drive.",
+      fallback: {
+        tool: "gog_drive_comments_add",
+        account,
+        confirmToken,
+        subject: () => {
+          const view = { file: file2, text: content, mentions };
+          return { target: fileId, payload: view, preview: view };
+        }
+      }
+    });
+    if (confirmation) return confirmation;
     return runOrDiagnose(["drive", "comments", "create", pos(fileId), pos(content)], { account });
   });
   server.registerTool("gog_drive_comments_update", {
@@ -36870,18 +37013,44 @@ function registerExtraDriveTools(server) {
     return runOrDiagnose(["drive", "comments", "delete", pos(fileId), pos(commentId), "--force"], { account });
   });
   server.registerTool("gog_drive_comments_reply", {
-    description: 'Reply to an existing comment on a Drive file. Pass `action: "resolve"` or `"reopen"` to atomically flip the parent comment\'s resolved state via the Drive API\'s Reply.action field \u2014 avoids the older workaround of deleting the comment (which destroys review-thread context).',
+    description: 'Reply to an existing comment on a Drive file. Pass `action: "resolve"` or `"reopen"` to atomically flip the parent comment\'s resolved state via the Drive API\'s Reply.action field \u2014 avoids the older workaround of deleting the comment (which destroys review-thread context). Everyone on the thread and anyone the reply +mentions is notified, so this reads the file and the comment and asks the MCP host to show the user a confirmation prompt with both and the reply first; nothing is posted unless they accept.' + CONFIRM_FALLBACK_DESCRIPTION,
     annotations: { destructiveHint: false },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File ID"),
       commentId: external_exports.string().describe("Comment ID to reply to"),
       content: external_exports.string().describe("Reply text"),
       action: external_exports.enum(["resolve", "reopen"]).optional().describe("Optional action on the parent comment alongside the reply"),
-      account: accountParam
+      account: accountParam,
+      confirmToken: confirmTokenParam
     })
-  }, async ({ fileId, commentId, content, action, account }) => {
+  }, async ({ fileId, commentId, content, action, account, confirmToken }, ctx) => {
     const args = ["drive", "comments", "reply", pos(fileId), pos(commentId), pos(content)];
     if (action) args.push(`--action=${action}`);
+    const got = await runOrDiagnose(["drive", "get", pos(fileId)], { account });
+    if (got.isError) return got;
+    const thread = await runOrDiagnose(["drive", "comments", "get", pos(fileId), pos(commentId)], { account });
+    if (thread.isError) return thread;
+    const { name } = shareTargetMeta(resultText(got));
+    const file2 = { id: fileId, ...name !== void 0 ? { name } : {} };
+    const replyingTo = commentSnapshot(resultText(thread));
+    const mentions = commentMentions(content);
+    const confirmation = await requireDispatchConfirmation(ctx, {
+      action: "drive.comment-reply",
+      message: "Review and confirm this reply \u2014 everyone on the thread and anyone mentioned is notified:",
+      confirmationLabel: "Confirm that this reply should be posted now.",
+      details: { file: file2, replyingTo, textPreview: bodyPreview(content), mentions, ...action ? { action } : {} },
+      unsupportedNote: "Ask the user to reply from Google Drive.",
+      fallback: {
+        tool: "gog_drive_comments_reply",
+        account,
+        confirmToken,
+        subject: () => {
+          const view = { file: file2, replyingTo, text: content, mentions, ...action ? { action } : {} };
+          return { target: `${fileId}/${commentId}`, payload: view, preview: view };
+        }
+      }
+    });
+    if (confirmation) return confirmation;
     return runOrDiagnose(args, { account });
   });
   server.registerTool("gog_drive_comments_resolve", {

package/manifest.json

@@ -3,7 +3,7 @@
   "manifest_version": "0.3",
   "name": "gogcli-mcp-drive",
   "display_name": "gogcli (Drive)",
-  "version": "4.5.0",
+  "version": "4.5.1",
   "description": "Extended Google Drive for Claude via gogcli — auth + full Drive support (upload, download, permissions, comments, shared drives)",
   "author": {
     "name": "Chris Hall",
@@ -130,7 +130,7 @@
     },
     {
       "name": "gog_drive_delete",
-      "description": "Delete a file (trash by default, or permanent=true for irreversible delete)"
+      "description": "Delete a file (trash by default, or permanent=true for irreversible delete) (a permanent delete asks the user to confirm)"
     },
     {
       "name": "gog_drive_share",
@@ -182,7 +182,7 @@
     },
     {
       "name": "gog_drive_comments_add",
-      "description": "Add a new comment"
+      "description": "Add a new comment (asks the user to confirm)"
     },
     {
       "name": "gog_drive_comments_update",
@@ -194,7 +194,7 @@
     },
     {
       "name": "gog_drive_comments_reply",
-      "description": "Reply to an existing comment (optionally resolve/reopen the parent atomically via action)"
+      "description": "Reply to an existing comment (optionally resolve/reopen the parent atomically via action) (asks the user to confirm)"
     },
     {
       "name": "gog_drive_comments_resolve",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gogcli-mcp-drive",
-  "version": "4.5.0",
+  "version": "4.5.1",
   "mcpName": "io.github.chrischall/gogcli-mcp-drive",
   "description": "Extended Google Drive MCP server via gogcli — auth + full Drive support (upload/download/permissions/comments/shared drives)",
   "author": "Claude Code (AI) <https://www.anthropic.com/claude>",

package/server.json

@@ -7,12 +7,12 @@
     "source": "github",
     "subfolder": "packages/gogcli-mcp-drive"
   },
-  "version": "4.5.0",
+  "version": "4.5.1",
   "packages": [
     {
       "registryType": "npm",
       "identifier": "gogcli-mcp-drive",
-      "version": "4.5.0",
+      "version": "4.5.1",
       "transport": {
         "type": "stdio"
       },

package/src/tools/drive-extra.ts

@@ -1,6 +1,25 @@
 import { McpServer } from '@modelcontextprotocol/server';
 import { z } from 'zod';
-import { accountParam, runOrDiagnose, paginationParams, pushPaginationFlags, pageTokenParam, pageAliasParam, resolvePageToken, inlineFileArg, pos, confinePath } from '../../../gogcli-mcp/src/lib.js';
+import {
+  accountParam,
+  runOrDiagnose,
+  paginationParams,
+  pushPaginationFlags,
+  pageTokenParam,
+  pageAliasParam,
+  resolvePageToken,
+  inlineFileArg,
+  pos,
+  confinePath,
+  bodyPreview,
+  commentMentions,
+  commentSnapshot,
+  CONFIRM_FALLBACK_DESCRIPTION,
+  confirmTokenParam,
+  requireDispatchConfirmation,
+  resultText,
+  shareTargetMeta,
+} from '../../../gogcli-mcp/src/lib.js';
 import type { GogArg } from '../../../gogcli-mcp/src/lib.js';
 
 export function registerExtraDriveTools(server: McpServer): void {
@@ -222,14 +241,39 @@ export function registerExtraDriveTools(server: McpServer): void {
   });
 
   server.registerTool('gog_drive_comments_add', {
-    description: 'Add a new comment to a Drive file.',
+    description: 'Add a new comment to a Drive file. Drive notifies the file\'s owner and everyone the text +mentions, so '
+      + 'this reads the file and asks the MCP host to show the user a confirmation prompt with the file, the text and who '
+      + 'is mentioned first; nothing is posted unless they accept.' + CONFIRM_FALLBACK_DESCRIPTION,
     annotations: { destructiveHint: false },
     inputSchema: z.object({
       fileId: z.string().describe('File ID'),
       content: z.string().describe('Comment text'),
       account: accountParam,
+      confirmToken: confirmTokenParam,
     }),
-  }, async ({ fileId, content, account }) => {
+  }, async ({ fileId, content, account, confirmToken }, ctx) => {
+    const got = await runOrDiagnose(['drive', 'get', pos(fileId)], { account });
+    if (got.isError) return got;
+    const { name } = shareTargetMeta(resultText(got));
+    const file = { id: fileId, ...(name !== undefined ? { name } : {}) };
+    const mentions = commentMentions(content);
+    const confirmation = await requireDispatchConfirmation(ctx, {
+      action: 'drive.comment-add',
+      message: 'Review and confirm this comment — the file\'s owner and anyone mentioned are notified:',
+      confirmationLabel: 'Confirm that this comment should be posted now.',
+      details: { file, textPreview: bodyPreview(content), mentions },
+      unsupportedNote: 'Ask the user to comment from Google Drive.',
+      fallback: {
+        tool: 'gog_drive_comments_add',
+        account,
+        confirmToken,
+        subject: () => {
+          const view = { file, text: content, mentions };
+          return { target: fileId, payload: view, preview: view };
+        },
+      },
+    });
+    if (confirmation) return confirmation;
     return runOrDiagnose(['drive', 'comments', 'create', pos(fileId), pos(content)], { account });
   });
 
@@ -259,7 +303,10 @@ export function registerExtraDriveTools(server: McpServer): void {
   });
 
   server.registerTool('gog_drive_comments_reply', {
-    description: 'Reply to an existing comment on a Drive file. Pass `action: "resolve"` or `"reopen"` to atomically flip the parent comment\'s resolved state via the Drive API\'s Reply.action field — avoids the older workaround of deleting the comment (which destroys review-thread context).',
+    description: 'Reply to an existing comment on a Drive file. Pass `action: "resolve"` or `"reopen"` to atomically flip the parent comment\'s resolved state via the Drive API\'s Reply.action field — avoids the older workaround of deleting the comment (which destroys review-thread context). '
+      + 'Everyone on the thread and anyone the reply +mentions is notified, so this reads the file and the comment and '
+      + 'asks the MCP host to show the user a confirmation prompt with both and the reply first; nothing is posted unless '
+      + 'they accept.' + CONFIRM_FALLBACK_DESCRIPTION,
     annotations: { destructiveHint: false },
     inputSchema: z.object({
       fileId: z.string().describe('File ID'),
@@ -267,10 +314,36 @@ export function registerExtraDriveTools(server: McpServer): void {
       content: z.string().describe('Reply text'),
       action: z.enum(['resolve', 'reopen']).optional().describe('Optional action on the parent comment alongside the reply'),
       account: accountParam,
+      confirmToken: confirmTokenParam,
     }),
-  }, async ({ fileId, commentId, content, action, account }) => {
+  }, async ({ fileId, commentId, content, action, account, confirmToken }, ctx) => {
     const args: GogArg[] = ['drive', 'comments', 'reply', pos(fileId), pos(commentId), pos(content)];
     if (action) args.push(`--action=${action}`);
+    const got = await runOrDiagnose(['drive', 'get', pos(fileId)], { account });
+    if (got.isError) return got;
+    const thread = await runOrDiagnose(['drive', 'comments', 'get', pos(fileId), pos(commentId)], { account });
+    if (thread.isError) return thread;
+    const { name } = shareTargetMeta(resultText(got));
+    const file = { id: fileId, ...(name !== undefined ? { name } : {}) };
+    const replyingTo = commentSnapshot(resultText(thread));
+    const mentions = commentMentions(content);
+    const confirmation = await requireDispatchConfirmation(ctx, {
+      action: 'drive.comment-reply',
+      message: 'Review and confirm this reply — everyone on the thread and anyone mentioned is notified:',
+      confirmationLabel: 'Confirm that this reply should be posted now.',
+      details: { file, replyingTo, textPreview: bodyPreview(content), mentions, ...(action ? { action } : {}) },
+      unsupportedNote: 'Ask the user to reply from Google Drive.',
+      fallback: {
+        tool: 'gog_drive_comments_reply',
+        account,
+        confirmToken,
+        subject: () => {
+          const view = { file, replyingTo, text: content, mentions, ...(action ? { action } : {}) };
+          return { target: `${fileId}/${commentId}`, payload: view, preview: view };
+        },
+      },
+    });
+    if (confirmation) return confirmation;
     return runOrDiagnose(args, { account });
   });
 

package/tests/tools/drive-extra-gates.test.ts

@@ -0,0 +1,154 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { registerExtraDriveTools } from '../../src/tools/drive-extra.js';
+import * as lib from '../../../gogcli-mcp/src/lib.js';
+import { createTestHarness } from '@chrischall/mcp-utils/test';
+import { rawTextResult } from '@chrischall/mcp-utils';
+import type { ElicitRequest, ElicitResult } from '@modelcontextprotocol/server';
+import { pos } from '../../../gogcli-mcp/src/argv.js';
+import { resetConfirmTokenState } from '../../../gogcli-mcp/src/send-confirm-token.js';
+
+vi.mock('../../../gogcli-mcp/src/lib.js', async (importOriginal) => {
+  const actual = await importOriginal<typeof lib>();
+  return { ...actual, runOrDiagnose: vi.fn() };
+});
+
+// Fleet audit 2026-09-24 SEC-6: a Drive comment or reply notifies the owner, the
+// thread and everyone it +mentions, so both ask first — naming the file.
+
+const ORIGINAL_ENV = { ...process.env };
+beforeEach(() => {
+  vi.clearAllMocks();
+  process.env = { ...ORIGINAL_ENV };
+  delete process.env.MCP_CONFIRM_MODE;
+  resetConfirmTokenState();
+});
+afterEach(() => { process.env = ORIGINAL_ENV; });
+
+const json = (r: { content: Array<{ text?: string }> }) => JSON.parse(r.content[0]!.text as string);
+async function prompted(answer: ElicitResult = { action: 'accept', content: { confirmed: true } }) {
+  const seen: ElicitRequest[] = [];
+  const harness = await createTestHarness(registerExtraDriveTools, { elicitation: async (r) => { seen.push(r); return answer; } });
+  const details = () => JSON.parse(seen[0]!.params.message.split('\n').slice(1).join('\n')).details;
+  return { harness, seen, details };
+}
+const unprompted = () => createTestHarness(registerExtraDriveTools);
+
+const FILE = JSON.stringify({ file: { id: 'f1', name: 'Q3 plan', mimeType: 'application/vnd.google-apps.document' } });
+const COMMENT = JSON.stringify({ comment: { id: 'k1', content: 'Is this final?', author: { displayName: 'Alice', emailAddress: 'alice@example.com' }, resolved: false } });
+function stub(failing?: string, file = FILE) {
+  vi.mocked(lib.runOrDiagnose).mockImplementation(async (args) => {
+    const key = args.filter((a): a is string => typeof a === 'string' && !a.startsWith('--')).join(' ');
+    if (failing && key.startsWith(failing)) return { content: [{ type: 'text', text: 'Error: not found' }], isError: true };
+    if (key === 'drive get') return rawTextResult(file);
+    if (key === 'drive comments get') return rawTextResult(COMMENT);
+    return rawTextResult('{"ok":true}');
+  });
+}
+const callsTo = (...words: string[]) => vi.mocked(lib.runOrDiagnose).mock.calls.filter(([args]) =>
+  words.every((w, i) => args[i] === w));
+
+describe('gog_drive_comments_add', () => {
+  const ARGS = { fileId: 'f1', content: 'Looks good +bob@example.com' };
+
+  it('reads the file and asks with its name, the text and who is mentioned', async () => {
+    stub();
+    const { harness, details } = await prompted();
+    await harness.callTool('gog_drive_comments_add', ARGS);
+    expect(details()).toEqual({ file: { id: 'f1', name: 'Q3 plan' }, textPreview: 'Looks good +bob@example.com', mentions: ['bob@example.com'] });
+    expect(callsTo('drive', 'comments', 'create')[0]![0]).toEqual(['drive', 'comments', 'create', pos('f1'), pos(ARGS.content)]);
+  });
+
+  it('names only the id when the file read carries no name', async () => {
+    stub(undefined, '{}');
+    const { harness, details } = await prompted({ action: 'decline' });
+    await harness.callTool('gog_drive_comments_add', ARGS);
+    expect(details().file).toEqual({ id: 'f1' });
+  });
+
+  it('posts nothing when the user declines or the read fails', async () => {
+    stub();
+    expect(json(await (await prompted({ action: 'decline' })).harness.callTool('gog_drive_comments_add', ARGS)))
+      .toMatchObject({ cancelled: true, action: 'drive.comment-add' });
+    stub('drive get');
+    expect((await (await prompted()).harness.callTool('gog_drive_comments_add', ARGS)).isError).toBe(true);
+    expect(callsTo('drive', 'comments', 'create')).toHaveLength(0);
+  });
+
+  it('refuses a client that cannot be prompted', async () => {
+    process.env.MCP_CONFIRM_MODE = 'refuse';
+    stub();
+    const r = json(await (await unprompted()).callTool('gog_drive_comments_add', ARGS));
+    expect(r).toMatchObject({ reason: 'confirmation-unsupported', action: 'drive.comment-add' });
+    expect(r.note).toMatch(/Google Drive/);
+  });
+
+  it('token fallback: changed text is DRAFT_CHANGED; the same call posts', async () => {
+    process.env.MCP_CONFIRM_MODE = 'ask-user';
+    stub();
+    const harness = await unprompted();
+    const p1 = json(await harness.callTool('gog_drive_comments_add', ARGS));
+    expect(p1.preview).toEqual({ file: { id: 'f1', name: 'Q3 plan' }, text: ARGS.content, mentions: ['bob@example.com'] });
+    expect(json(await harness.callTool('gog_drive_comments_add', { ...ARGS, content: 'Nope', confirmToken: p1.confirmToken })))
+      .toMatchObject({ error: 'DRAFT_CHANGED' });
+    await harness.callTool('gog_drive_comments_add', { ...ARGS, confirmToken: p1.confirmToken });
+    expect(callsTo('drive', 'comments', 'create')).toHaveLength(1);
+  });
+});
+
+describe('gog_drive_comments_reply', () => {
+  const ARGS = { fileId: 'f1', commentId: 'k1', content: 'Yes, final.', action: 'resolve' as const };
+
+  it('reads the file and the comment and asks with both and the reply', async () => {
+    stub();
+    const { harness, details } = await prompted();
+    await harness.callTool('gog_drive_comments_reply', ARGS);
+    expect(details()).toEqual({
+      file: { id: 'f1', name: 'Q3 plan' },
+      replyingTo: { author: 'Alice <alice@example.com>', content: 'Is this final?', resolved: false },
+      textPreview: 'Yes, final.', mentions: [], action: 'resolve',
+    });
+    expect(callsTo('drive', 'comments', 'reply')[0]![0]).toEqual(
+      ['drive', 'comments', 'reply', pos('f1'), pos('k1'), pos('Yes, final.'), '--action=resolve']);
+  });
+
+  it.each(['drive get', 'drive comments get'])('returns a failed read (%s) without asking or replying', async (failing) => {
+    stub(failing);
+    const { harness, seen } = await prompted();
+    expect((await harness.callTool('gog_drive_comments_reply', ARGS)).isError).toBe(true);
+    expect(seen).toHaveLength(0);
+    expect(callsTo('drive', 'comments', 'reply')).toHaveLength(0);
+  });
+
+  it('refuses a client that cannot be prompted', async () => {
+    process.env.MCP_CONFIRM_MODE = 'refuse';
+    stub();
+    const r = json(await (await unprompted()).callTool('gog_drive_comments_reply', ARGS));
+    expect(r).toMatchObject({ reason: 'confirmation-unsupported', action: 'drive.comment-reply' });
+  });
+
+  it('token fallback: the thread action is part of what was approved', async () => {
+    process.env.MCP_CONFIRM_MODE = 'ask-user';
+    stub();
+    const harness = await unprompted();
+    const p1 = json(await harness.callTool('gog_drive_comments_reply', ARGS));
+    expect(p1.preview.action).toBe('resolve');
+    expect(json(await harness.callTool('gog_drive_comments_reply', { ...ARGS, action: 'reopen', confirmToken: p1.confirmToken })))
+      .toMatchObject({ error: 'DRAFT_CHANGED' });
+    expect(callsTo('drive', 'comments', 'reply')).toHaveLength(0);
+  });
+
+  it('token fallback: previews the thread; a reply with no action posts on phase 2', async () => {
+    process.env.MCP_CONFIRM_MODE = 'ask-user';
+    stub();
+    const harness = await unprompted();
+    const args = { fileId: 'f1', commentId: 'k1', content: 'Yes.' };
+    const p1 = json(await harness.callTool('gog_drive_comments_reply', args));
+    expect(p1.preview).toEqual({
+      file: { id: 'f1', name: 'Q3 plan' },
+      replyingTo: { author: 'Alice <alice@example.com>', content: 'Is this final?', resolved: false },
+      text: 'Yes.', mentions: [],
+    });
+    await harness.callTool('gog_drive_comments_reply', { ...args, confirmToken: p1.confirmToken });
+    expect(callsTo('drive', 'comments', 'reply')).toHaveLength(1);
+  });
+});

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

@@ -18,7 +18,10 @@ let harness: TestHarness;
 beforeEach(async () => {
   vi.clearAllMocks();
   vi.mocked(lib.runOrDiagnose).mockResolvedValue(rawTextResult('{}'));
-  harness = await createTestHarness(registerExtraDriveTools);
+  // The comment tools ask first (drive-extra-gates.test.ts covers the prompts); here the user accepts.
+  harness = await createTestHarness(registerExtraDriveTools, {
+    elicitation: async () => ({ action: 'accept', content: { confirmed: true } }),
+  });
 });
 
 describe('gog_drive_download', () => {