gogcli-mcp-drive 4.4.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.4.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.4.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.4.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

@@ -34554,10 +34554,8 @@ function errorResult(message) {
 
 // ../../node_modules/@chrischall/mcp-utils/dist/server/confirmation.js
 import { createHash, createHmac, timingSafeEqual } from "node:crypto";
-var DEFAULT_REQUEST_KEY = "confirmation";
-var DEFAULT_CONFIRMATION_LABEL = "Confirm this action should proceed.";
-var UNSUPPORTED_NOTE = "Nothing was done because this client cannot show a confirmation prompt (it declares no MCP elicitation capability), and this action is never taken without one";
-var STATE_PREFIX = "mcpu.confirm.v1.";
+
+// ../../node_modules/@chrischall/mcp-utils/dist/server/canonical.js
 function canonicalJson(value) {
   if (value === null || typeof value === "string" || typeof value === "boolean")
     return JSON.stringify(value);
@@ -34568,7 +34566,7 @@ function canonicalJson(value) {
   if (typeof value === "bigint")
     return `{"$bigint":"${value.toString()}"}`;
   if (typeof value === "function" || typeof value === "symbol") {
-    throw new TypeError(`requireConfirmation: cannot bind a ${typeof value} argument value.`);
+    throw new TypeError(`confirmation: cannot bind a ${typeof value} argument value.`);
   }
   if (Array.isArray(value))
     return `[${value.map(canonicalJson).join(",")}]`;
@@ -34590,7 +34588,7 @@ function canonicalJson(value) {
   }
   const proto = Object.getPrototypeOf(value);
   if (proto !== Object.prototype && proto !== null) {
-    throw new TypeError("requireConfirmation: cannot bind a non-plain object argument value (class instance).");
+    throw new TypeError("confirmation: cannot bind a non-plain object argument value (class instance).");
   }
   const entries = Object.entries(value).filter(([, v]) => v !== void 0).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0);
   return `{${entries.map(([k, v]) => `${JSON.stringify(escapeKey(k))}:${canonicalJson(v)}`).join(",")}}`;
@@ -34598,6 +34596,12 @@ function canonicalJson(value) {
 function escapeKey(key) {
   return key.startsWith("$") ? `$${key}` : key;
 }
+
+// ../../node_modules/@chrischall/mcp-utils/dist/server/confirmation.js
+var DEFAULT_REQUEST_KEY = "confirmation";
+var DEFAULT_CONFIRMATION_LABEL = "Confirm this action should proceed.";
+var UNSUPPORTED_NOTE = "Nothing was done because this client cannot show a confirmation prompt (it declares no MCP elicitation capability), and this action is never taken without one";
+var STATE_PREFIX = "mcpu.confirm.v1.";
 function bindingKey(binding) {
   if (binding.ttlSeconds !== void 0 && !(Number.isFinite(binding.ttlSeconds) && binding.ttlSeconds > 0)) {
     throw new RangeError("requireConfirmation: binding.ttlSeconds must be a finite number greater than 0.");
@@ -34700,6 +34704,264 @@ ${JSON.stringify(preview, null, 2)}`,
   });
 }
 
+// ../../node_modules/@chrischall/mcp-utils/dist/server/confirm-token.js
+import { createHash as createHash2, createHmac as createHmac2, randomBytes, timingSafeEqual as timingSafeEqual2 } from "node:crypto";
+function createSpentTokenStore() {
+  const spent2 = /* @__PURE__ */ new Map();
+  return {
+    has: (nonce) => spent2.has(nonce),
+    add: (nonce, exp) => {
+      spent2.set(nonce, exp);
+    },
+    prune: (now) => {
+      for (const [nonce, exp] of spent2)
+        if (exp < now)
+          spent2.delete(nonce);
+    },
+    clear: () => spent2.clear(),
+    get size() {
+      return spent2.size;
+    }
+  };
+}
+var PROCESS_SPENT = createSpentTokenStore();
+var PREFIX = "mcpu.token.v1.";
+var DEFAULT_TTL_SECONDS = 600;
+function tokenKey(key) {
+  const bytes = typeof key === "string" ? Buffer.from(key, "utf8") : Buffer.from(key);
+  if (bytes.length < 32)
+    throw new RangeError("confirm token: key must be at least 32 bytes.");
+  return bytes;
+}
+function ttlOf(ttlSeconds) {
+  if (ttlSeconds === void 0)
+    return DEFAULT_TTL_SECONDS;
+  if (!(Number.isFinite(ttlSeconds) && ttlSeconds > 0)) {
+    throw new RangeError("confirm token: ttlSeconds must be a finite number greater than 0.");
+  }
+  return ttlSeconds;
+}
+function sign(key, body) {
+  return createHmac2("sha256", key).update(`${PREFIX}${body}`).digest();
+}
+function hashConfirmPayload(payload) {
+  return createHash2("sha256").update(canonicalJson(payload)).digest("base64url");
+}
+function issueConfirmToken(key, binding, options = {}) {
+  const k = tokenKey(key);
+  const now = options.now ?? Date.now();
+  const exp = now + ttlOf(options.ttlSeconds) * 1e3;
+  const claims = {
+    t: binding.tool,
+    ...binding.account === void 0 ? {} : { a: binding.account },
+    g: binding.target,
+    ...binding.revision === void 0 ? {} : { r: binding.revision },
+    h: binding.payloadHash,
+    exp,
+    n: randomBytes(16).toString("base64url")
+  };
+  const body = Buffer.from(JSON.stringify(claims), "utf8").toString("base64url");
+  return { token: `${PREFIX}${body}.${sign(k, body).toString("base64url")}`, expiresAt: new Date(exp).toISOString() };
+}
+function parseClaims(body) {
+  try {
+    const claims = JSON.parse(Buffer.from(body, "base64url").toString("utf8"));
+    return claims && typeof claims === "object" ? claims : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function verifyConfirmToken(key, token, binding, options = {}) {
+  const k = tokenKey(key);
+  const now = options.now ?? Date.now();
+  const spent2 = options.spent ?? PROCESS_SPENT;
+  spent2.prune(now);
+  if (!token.startsWith(PREFIX))
+    return { ok: false, error: "TOKEN_INVALID" };
+  const rest = token.slice(PREFIX.length);
+  const dot = rest.indexOf(".");
+  const body = dot < 0 ? "" : rest.slice(0, dot);
+  const mac3 = Buffer.from(dot < 0 ? "" : rest.slice(dot + 1), "base64url");
+  const expected = sign(k, body);
+  if (!body || mac3.length !== expected.length || !timingSafeEqual2(mac3, expected))
+    return { ok: false, error: "TOKEN_INVALID" };
+  const claims = parseClaims(body);
+  if (!claims)
+    return { ok: false, error: "TOKEN_INVALID" };
+  if (claims.t !== binding.tool || claims.a !== binding.account || claims.g !== binding.target) {
+    return { ok: false, error: "TOKEN_INVALID" };
+  }
+  if (spent2.has(claims.n))
+    return { ok: false, error: "TOKEN_REUSED" };
+  if (now > claims.exp)
+    return { ok: false, error: "TOKEN_EXPIRED" };
+  if (claims.r !== binding.revision)
+    return { ok: false, error: "DRAFT_CHANGED", reason: "revision-changed" };
+  if (claims.h !== binding.payloadHash)
+    return { ok: false, error: "DRAFT_CHANGED", reason: "payload-changed" };
+  spent2.add(claims.n, claims.exp);
+  return { ok: true };
+}
+var CONFIRM_TOKEN_INSTRUCTION = "Show this preview to the user verbatim and proceed only after they explicitly approve in chat. Then call again with confirmToken.";
+var confirmTokenParam = external_exports.string().optional().describe(`ONLY for the two-step confirmation fallback (a client without MCP elicitation). The confirmToken from this same tool's phase-1 "confirmation-required" response, passed back ONLY after the user has seen that preview and explicitly approved it in chat \u2014 never on the first call, never invented, never reused. Call again with the same arguments. Ignored when the client supports elicitation.`);
+var TOKEN_ERROR_NOTE = {
+  TOKEN_EXPIRED: "Nothing was sent or changed: the confirmToken expired. Call again WITHOUT confirmToken for a fresh preview, and ask the user to approve it again.",
+  TOKEN_REUSED: "Nothing was sent or changed by this call: this confirmToken was already used, and one approval acts once. If doing it again is really intended, call again WITHOUT confirmToken and get a new approval.",
+  TOKEN_INVALID: "Nothing was sent or changed: this confirmToken was not issued by this server for this tool, account and target (or the server has restarted since). Call again WITHOUT confirmToken for a fresh preview and approval."
+};
+var CHANGED_NOTE = {
+  "revision-changed": "Nothing was sent or changed: the target was edited since the user approved it (its version rotated), so what would happen is not what they saw.",
+  "payload-changed": "Nothing was sent or changed: what would happen no longer matches what the user approved."
+};
+function isToolResult(value) {
+  return Array.isArray(value.content);
+}
+function rejection2(data) {
+  return { ...textResult({ status: "confirmation-rejected", confirmed: false, dispatched: false, ...data }), isError: true };
+}
+async function tokenConfirmation(action, fb) {
+  const subject = await fb.subject();
+  if (isToolResult(subject))
+    return subject;
+  const binding = {
+    tool: fb.tool,
+    ...fb.account === void 0 ? {} : { account: fb.account },
+    target: subject.target,
+    ...subject.revision === void 0 ? {} : { revision: subject.revision },
+    payloadHash: hashConfirmPayload(subject.payload)
+  };
+  const phaseOne = () => {
+    const { token, expiresAt } = issueConfirmToken(fb.key, binding, { ttlSeconds: fb.ttlSeconds });
+    return {
+      action,
+      preview: subject.preview,
+      confirmToken: token,
+      expiresAt,
+      ttlSeconds: ttlOf(fb.ttlSeconds),
+      instruction: fb.instruction ?? CONFIRM_TOKEN_INSTRUCTION
+    };
+  };
+  if (!fb.confirmToken) {
+    return textResult({ status: "confirmation-required", confirmed: false, dispatched: false, ...phaseOne() });
+  }
+  const verdict = verifyConfirmToken(fb.key, fb.confirmToken, binding, { spent: fb.spent });
+  if (verdict.ok)
+    return void 0;
+  if (verdict.error === "DRAFT_CHANGED") {
+    return rejection2({
+      error: "DRAFT_CHANGED",
+      reason: verdict.reason,
+      note: `${CHANGED_NOTE[verdict.reason]} The current preview and a fresh confirmToken are below.`,
+      ...phaseOne()
+    });
+  }
+  return rejection2({ error: verdict.error, action, note: TOKEN_ERROR_NOTE[verdict.error] });
+}
+async function requireConfirmationWithFallback(ctx, options) {
+  const { tokenFallback, ...confirmation } = options;
+  if (tokenFallback && callerAcceptsFormElicitation(ctx) === false) {
+    return tokenConfirmation(options.action, tokenFallback);
+  }
+  return requireConfirmation(ctx, confirmation);
+}
+
+// ../../node_modules/@chrischall/mcp-utils/dist/server/confirm-env.js
+import { createHash as createHash3, randomBytes as randomBytes2 } from "node:crypto";
+
+// ../../node_modules/@chrischall/mcp-utils/dist/config/index.js
+import { homedir } from "node:os";
+import { isAbsolute, join, resolve } from "node:path";
+var PLACEHOLDER_RE = /^\$\{[^}]*\}$/;
+function readEnvVar(key, opts = {}) {
+  const env = opts.env ?? process.env;
+  const raw = env[key];
+  if (typeof raw === "string") {
+    const trimmed = raw.trim();
+    if (trimmed.length > 0 && trimmed !== "undefined" && trimmed !== "null" && !PLACEHOLDER_RE.test(trimmed)) {
+      return trimmed;
+    }
+  }
+  return opts.default;
+}
+var TRUE_TOKENS = /* @__PURE__ */ new Set(["1", "true", "yes", "on"]);
+var FALSE_TOKENS = /* @__PURE__ */ new Set(["0", "false", "no", "off"]);
+function parseBoolEnv(key, opts = {}) {
+  const fallback = opts.default ?? false;
+  const raw = readEnvVar(key, { env: opts.env });
+  if (raw === void 0)
+    return fallback;
+  const token = raw.toLowerCase();
+  if (TRUE_TOKENS.has(token))
+    return true;
+  if (FALSE_TOKENS.has(token))
+    return false;
+  return fallback;
+}
+function expandPath(p) {
+  let expanded = p;
+  if (p === "~") {
+    expanded = homedir();
+  } else if (p.startsWith("~/")) {
+    expanded = join(homedir(), p.slice(2));
+  }
+  return isAbsolute(expanded) ? expanded : resolve(expanded);
+}
+
+// ../../node_modules/@chrischall/mcp-utils/dist/server/confirm-env.js
+var MODES = /* @__PURE__ */ new Set(["ask-user", "auto", "refuse"]);
+var DEFAULT_TTL_SECONDS2 = 600;
+var warned = /* @__PURE__ */ new Set();
+function readConfirmMode(env = process.env) {
+  const raw = readEnvVar("MCP_CONFIRM_MODE", { env })?.trim().toLowerCase();
+  if (!raw)
+    return "ask-user";
+  if (MODES.has(raw))
+    return raw;
+  if (!warned.has(raw)) {
+    warned.add(raw);
+    process.stderr.write(`MCP_CONFIRM_MODE="${raw}" is not one of ask-user, auto, refuse; treating it as refuse.
+`);
+  }
+  return "refuse";
+}
+function confirmTtlFromEnv(env = process.env) {
+  const raw = readEnvVar("MCP_CONFIRM_TTL_SECONDS", { env })?.trim();
+  return raw && /^[1-9]\d*$/.test(raw) ? Number(raw) : DEFAULT_TTL_SECONDS2;
+}
+var processKey;
+function confirmKeyFromEnv(env = process.env) {
+  const secret = readEnvVar("MCP_CONFIRM_SECRET", { env });
+  if (secret)
+    return createHash3("sha256").update(secret, "utf8").digest();
+  processKey ??= randomBytes2(32);
+  return processKey;
+}
+var CONFIRM_TOKEN_AUTO_INSTRUCTION = "Nothing has been done yet. Review this preview; if it is what was intended, call again with the same arguments plus confirmToken. (This server runs with MCP_CONFIRM_MODE=auto, so the user's approval in chat is not required.)";
+var REFUSE_HINT = "Set MCP_CONFIRM_MODE=ask-user on the server to allow two-step confirmation instead.";
+function confirmationFromEnv(options) {
+  const { tool, account, confirmToken, subject, instruction, spent: spent2, env = process.env, ...confirmation } = options;
+  const mode = readConfirmMode(env);
+  if (mode === "refuse") {
+    return {
+      ...confirmation,
+      unsupportedNote: confirmation.unsupportedNote ? `${confirmation.unsupportedNote} ${REFUSE_HINT}` : REFUSE_HINT
+    };
+  }
+  return {
+    ...confirmation,
+    tokenFallback: {
+      key: confirmKeyFromEnv(env),
+      tool,
+      ...account === void 0 ? {} : { account },
+      ...confirmToken === void 0 ? {} : { confirmToken },
+      subject,
+      ttlSeconds: confirmTtlFromEnv(env),
+      instruction: mode === "auto" ? CONFIRM_TOKEN_AUTO_INSTRUCTION : instruction ?? CONFIRM_TOKEN_INSTRUCTION,
+      ...spent2 === void 0 ? {} : { spent: spent2 }
+    }
+  };
+}
+
 // ../../node_modules/@chrischall/mcp-utils/dist/server/index.js
 var SERVER_PROTOCOL_VERSIONS = Object.freeze([
   "2026-07-28",
@@ -34875,45 +35137,6 @@ function runMcp(opts) {
   return handle;
 }
 
-// ../../node_modules/@chrischall/mcp-utils/dist/config/index.js
-import { homedir } from "node:os";
-import { isAbsolute, join, resolve } from "node:path";
-var PLACEHOLDER_RE = /^\$\{[^}]*\}$/;
-function readEnvVar(key, opts = {}) {
-  const env = opts.env ?? process.env;
-  const raw = env[key];
-  if (typeof raw === "string") {
-    const trimmed = raw.trim();
-    if (trimmed.length > 0 && trimmed !== "undefined" && trimmed !== "null" && !PLACEHOLDER_RE.test(trimmed)) {
-      return trimmed;
-    }
-  }
-  return opts.default;
-}
-var TRUE_TOKENS = /* @__PURE__ */ new Set(["1", "true", "yes", "on"]);
-var FALSE_TOKENS = /* @__PURE__ */ new Set(["0", "false", "no", "off"]);
-function parseBoolEnv(key, opts = {}) {
-  const fallback = opts.default ?? false;
-  const raw = readEnvVar(key, { env: opts.env });
-  if (raw === void 0)
-    return fallback;
-  const token = raw.toLowerCase();
-  if (TRUE_TOKENS.has(token))
-    return true;
-  if (FALSE_TOKENS.has(token))
-    return false;
-  return fallback;
-}
-function expandPath(p) {
-  let expanded = p;
-  if (p === "~") {
-    expanded = homedir();
-  } else if (p.startsWith("~/")) {
-    expanded = join(homedir(), p.slice(2));
-  }
-  return isAbsolute(expanded) ? expanded : resolve(expanded);
-}
-
 // ../../node_modules/@chrischall/mcp-utils/dist/fs/confine.js
 import { existsSync, realpathSync } from "node:fs";
 import { dirname, isAbsolute as isAbsolute2, relative, resolve as resolve2, sep } from "node:path";
@@ -35705,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}
@@ -35794,167 +36018,77 @@ function formatAuthHealth(raw, now) {
 }
 
 // ../gogcli-mcp/src/send-confirm-token.ts
-import { createHash as createHash2, createHmac as createHmac2, randomBytes, timingSafeEqual as timingSafeEqual2 } from "node:crypto";
-var CONFIRM_TOKEN_TTL_DEFAULT_SECONDS = 600;
-var PREFIX = "gct1";
-var secret;
-var spent = /* @__PURE__ */ new Map();
-function sendConfirmFallbackEnabled() {
-  return readEnvVar("GOG_SEND_CONFIRM_FALLBACK")?.trim().toLowerCase() === "token";
-}
-function confirmTokenTtlSeconds() {
-  const raw = readEnvVar("GOG_CONFIRM_TTL_SECONDS")?.trim();
-  if (raw && /^\d+$/.test(raw)) {
-    const n = Number(raw);
-    if (n > 0) return n;
-  }
-  return CONFIRM_TOKEN_TTL_DEFAULT_SECONDS;
-}
-function hmacKey() {
-  if (!secret) {
-    const configured = readEnvVar("GOG_CONFIRM_SECRET");
-    secret = configured ? Buffer.from(configured, "utf8") : randomBytes(32);
-  }
-  return secret;
-}
-function canonicalize(value) {
-  if (Array.isArray(value)) return value.map(canonicalize);
-  if (value && typeof value === "object") {
-    const out = {};
-    for (const key of Object.keys(value).sort()) {
-      const v = value[key];
-      if (v !== void 0) out[key] = canonicalize(v);
-    }
-    return out;
-  }
-  return value;
-}
-function hashSendPayload(payload) {
-  return createHash2("sha256").update(JSON.stringify(canonicalize(payload))).digest("hex");
-}
-function sign(body) {
-  return createHmac2("sha256", hmacKey()).update(`${PREFIX}.${body}`).digest("base64url");
-}
-function issueConfirmToken(binding, now = Date.now()) {
-  const exp = now + confirmTokenTtlSeconds() * 1e3;
-  const claims = {
-    t: binding.tool,
-    a: binding.account,
-    g: binding.target,
-    ...binding.revision === void 0 ? {} : { r: binding.revision },
-    h: binding.payloadHash,
-    iat: now,
-    exp,
-    n: randomBytes(16).toString("base64url")
-  };
-  const body = Buffer.from(JSON.stringify(claims), "utf8").toString("base64url");
-  return { token: `${PREFIX}.${body}.${sign(body)}`, expiresAt: new Date(exp).toISOString() };
-}
-function signatureMatches(body, sig) {
-  const expected = Buffer.from(sign(body), "utf8");
-  const actual = Buffer.from(sig, "utf8");
-  return expected.length === actual.length && timingSafeEqual2(expected, actual);
-}
-function parseClaims(body) {
-  try {
-    return JSON.parse(Buffer.from(body, "base64url").toString("utf8"));
-  } catch {
-    return void 0;
-  }
-}
-function verifyConfirmToken(token, binding, now = Date.now()) {
-  for (const [nonce, exp] of spent) if (exp < now) spent.delete(nonce);
-  const parts = token.split(".");
-  if (parts.length !== 3 || parts[0] !== PREFIX || !parts[1] || !parts[2]) return { ok: false, error: "TOKEN_INVALID" };
-  const [, body, sig] = parts;
-  if (!signatureMatches(body, sig)) return { ok: false, error: "TOKEN_INVALID" };
-  const claims = parseClaims(body);
-  if (!claims) return { ok: false, error: "TOKEN_INVALID" };
-  if (claims.t !== binding.tool || claims.a !== binding.account || claims.g !== binding.target) {
-    return { ok: false, error: "TOKEN_INVALID" };
-  }
-  if (spent.has(claims.n)) return { ok: false, error: "TOKEN_REUSED" };
-  if (now > claims.exp) return { ok: false, error: "TOKEN_EXPIRED" };
-  if (claims.r !== binding.revision) return { ok: false, error: "DRAFT_CHANGED", reason: "message-id-rotated" };
-  if (claims.h !== binding.payloadHash) return { ok: false, error: "DRAFT_CHANGED", reason: "payload-changed" };
-  spent.set(claims.n, claims.exp);
-  return { ok: true };
+var spent = createSpentTokenStore();
+function confirmSpentStore() {
+  return spent;
 }
 
 // ../gogcli-mcp/src/dispatch-confirmation.ts
-var CONFIRM_ACTION_INSTRUCTION = "Show this preview to the user verbatim and proceed only after they explicitly approve in chat. Then call again with confirmToken.";
-var FALLBACK_HINT = "Or set GOG_SEND_CONFIRM_FALLBACK=token to enable two-step confirmation.";
-var CONFIRM_FALLBACK_DESCRIPTION = ' If the client cannot show that prompt (no MCP elicitation, e.g. claude.ai) and the server sets GOG_SEND_CONFIRM_FALLBACK=token, 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. Show that preview to the user verbatim; 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.';
-var confirmTokenParam = external_exports.string().optional().describe(
-  `ONLY for the two-step fallback (client without MCP elicitation, server with GOG_SEND_CONFIRM_FALLBACK=token). The confirmToken from this same tool's phase-1 "confirmation-required" response, passed back ONLY after the user has seen that preview and explicitly approved it in chat \u2014 never on the first call, never invented, never reused. Call again with the same arguments. Ignored when the client supports elicitation.`
-);
-var TOKEN_ERROR_NOTE = {
-  TOKEN_EXPIRED: "Nothing was sent or changed: the confirmToken expired. Call again WITHOUT confirmToken for a fresh preview, and ask the user to approve it again.",
-  TOKEN_REUSED: "Nothing was sent or changed by this call: this confirmToken was already used, and one approval acts once. If doing it again is really intended, call again WITHOUT confirmToken and get a new approval.",
-  TOKEN_INVALID: "Nothing was sent or changed: this confirmToken was not issued by this server for this tool, account and target (or the server has restarted since). Call again WITHOUT confirmToken for a fresh preview and approval."
-};
-var DRAFT_CHANGED_NOTE = {
-  "message-id-rotated": "Nothing was sent or changed: the target was edited since the user approved it (a draft's messageId or an event's version rotated), so what would happen is not what they saw.",
-  "payload-changed": "Nothing was sent or changed: what would happen no longer matches what the user approved."
-};
-function isToolResult(value) {
-  return Array.isArray(value.content);
+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]`;
 }
-function rejection2(data) {
-  return { ...textResult({ status: "confirmation-rejected", confirmed: false, dispatched: false, ...data }), isError: true };
-}
-async function tokenConfirmation(op, fallback) {
-  const subject = await fallback.subject();
-  if (isToolResult(subject)) return subject;
-  const binding = {
-    tool: fallback.tool,
-    account: fallback.account ?? readEnvVar("GOG_ACCOUNT") ?? "",
-    target: subject.target,
-    ...subject.revision === void 0 ? {} : { revision: subject.revision },
-    payloadHash: hashSendPayload(subject.payload)
-  };
-  const phaseOne = () => {
-    const { token, expiresAt } = issueConfirmToken(binding);
-    return {
-      action: op,
-      preview: subject.preview,
-      confirmToken: token,
-      expiresAt,
-      ttlSeconds: confirmTokenTtlSeconds(),
-      instruction: fallback.instruction ?? CONFIRM_ACTION_INSTRUCTION
-    };
-  };
-  if (!fallback.confirmToken) {
-    return textResult({ status: "confirmation-required", confirmed: false, dispatched: false, ...phaseOne() });
-  }
-  const verdict = verifyConfirmToken(fallback.confirmToken, binding);
-  if (verdict.ok) return void 0;
-  if (verdict.error === "DRAFT_CHANGED") {
-    return rejection2({
-      error: "DRAFT_CHANGED",
-      reason: verdict.reason,
-      note: `${DRAFT_CHANGED_NOTE[verdict.reason]} The current preview and a fresh confirmToken are below.`,
-      ...phaseOne()
-    });
-  }
-  return rejection2({ error: verdict.error, action: op, note: TOKEN_ERROR_NOTE[verdict.error] });
+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;
-  if (fallback && callerAcceptsFormElicitation(ctx) === false && sendConfirmFallbackEnabled()) {
-    return tokenConfirmation(action, fallback);
-  }
-  const note = fallback ? [options.unsupportedNote, FALLBACK_HINT].filter(Boolean).join(" ") : options.unsupportedNote;
-  return requireConfirmation(ctx, {
+  const confirmation = {
     action,
     message: options.message,
     details: options.details,
     confirmationLabel: options.confirmationLabel,
-    ...note ? { unsupportedNote: note } : {}
-  });
+    ...options.unsupportedNote ? { unsupportedNote: options.unsupportedNote } : {}
+  };
+  if (!fallback) return requireConfirmationWithFallback(ctx, confirmation);
+  return requireConfirmationWithFallback(ctx, confirmationFromEnv({
+    ...confirmation,
+    tool: fallback.tool,
+    account: fallback.account ?? readEnvVar("GOG_ACCOUNT") ?? "",
+    confirmToken: fallback.confirmToken,
+    subject: fallback.subject,
+    instruction: fallback.instruction ?? CONFIRM_ACTION_INSTRUCTION,
+    spent: confirmSpentStore()
+  }));
 }
 function resultText(result) {
   const first = result.content[0];
@@ -36096,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.`
@@ -36161,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) {
@@ -36173,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;
@@ -36281,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 });
   });
@@ -36480,7 +36692,7 @@ var failIfNotEmptyParam = external_exports.boolean().optional().describe(
 );
 
 // ../gogcli-mcp/src/server.ts
-var VERSION = true ? "4.4.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";
@@ -36517,12 +36729,12 @@ async function bootstrapGogAuth(env = process.env, options = {}) {
   const [clientId, clientSecret, refreshToken, account] = values;
   const { spawner } = options;
   try {
-    const { createHash: createHash3 } = await import("node:crypto");
+    const { createHash: createHash4 } = await import("node:crypto");
     const { mkdir, readFile, writeFile, chmod } = await import("node:fs/promises");
     const home = options.home ?? (await import("node:os")).homedir();
     const dir = join5(home, ".gogcli-mcp");
     const marker = join5(dir, AUTH_BOOTSTRAP_MARKER);
-    const fingerprint = createHash3("sha256").update(values.join("\0")).digest("hex");
+    const fingerprint = createHash4("sha256").update(values.join("\0")).digest("hex");
     const previous = await readFile(marker, "utf8").catch(() => void 0);
     if (previous === fingerprint && await accountListed(account, spawner)) return "present";
     await run(
@@ -36744,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", {
@@ -36778,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.4.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.4.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>",
@@ -24,7 +24,7 @@
     "test:coverage": "vitest run --coverage"
   },
   "dependencies": {
-    "@chrischall/mcp-utils": "^2.4.0",
+    "@chrischall/mcp-utils": "^2.6.0",
     "@modelcontextprotocol/server": "^2.0.0",
     "zod": "^4.6.1"
   },

package/server.json

@@ -7,12 +7,12 @@
     "source": "github",
     "subfolder": "packages/gogcli-mcp-drive"
   },
-  "version": "4.4.0",
+  "version": "4.5.1",
   "packages": [
     {
       "registryType": "npm",
       "identifier": "gogcli-mcp-drive",
-      "version": "4.4.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', () => {