gogcli-mcp-drive 4.7.0 → 4.7.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.7.0"
+    "version": "4.7.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.7.0",
+      "version": "4.7.1",
       "author": {
         "name": "Chris Hall"
       },

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "gogcli-mcp-drive",
   "displayName": "gogcli (Drive)",
-  "version": "4.7.0",
+  "version": "4.7.1",
   "description": "Extended Google Drive for Claude via gogcli — auth + full Drive support (upload, download, permissions, comments, shared drives)",
   "author": {
     "name": "Chris Hall",
@@ -21,6 +21,6 @@
     "comments",
     "shared-drives"
   ],
-  "skills": "./SKILL.md",
-  "mcp": "./.mcp.json"
+  "skills": ".",
+  "mcpServers": "./.mcp.json"
 }

package/dist/index.js

@@ -34537,11 +34537,19 @@ var DEFAULT_MAX_REQUEST_BODY_SIZE = 4 * 1024 * 1024;
 var McpToolError = class extends Error {
   /** Actionable remediation text, when one applies. */
   hint;
+  /** The upstream HTTP status this failure came from, when known. */
+  status;
+  /** What kind of failure this is, when the thrower knows. */
+  kind;
   constructor(message, opts) {
     super(message, opts?.cause !== void 0 ? { cause: opts.cause } : void 0);
     this.name = "McpToolError";
     if (opts?.hint !== void 0)
       this.hint = opts.hint;
+    if (opts?.status !== void 0)
+      this.status = opts.status;
+    if (opts?.kind !== void 0)
+      this.kind = opts.kind;
     Object.setPrototypeOf(this, new.target.prototype);
   }
 };
@@ -34566,7 +34574,7 @@ var API_KEY_RE = new RegExp([
   // webhook signing secret (Stripe-style)
 ].map((p) => `\\b${p}`).join("|"), "g");
 var GOOGLE_OAUTH_TOKEN_RE = /(?<![A-Za-z0-9+/])(?:ya29\.|1\/\/)[A-Za-z0-9._-]{8,}/g;
-var QUERY_SECRET_RE = new RegExp(`([?&](?:(?:access|refresh|id|auth|session|csrf|xsrf)[_-]?token|client[_-]?secret|api[_-]?secret|api[_-]?key|password|passwd|signature|token|key|sig|(?:php|j)?sess(?:ion)?[_-]?id|sid|x[-_]${HEADER_NAME_RUN}?(?:api[-_]?key|token|secret|auth)${HEADER_NAME_RUN})=)[^&#\\s"'<>\`]+`, "gi");
+var QUERY_SECRET_RE = new RegExp(`([?&](?:(?:access|refresh|id|auth|session|csrf|xsrf)[_-]?token|client[_-]?secret|api[_-]?secret|api[_-]?key|password|passwd|signature|token|key|sig|(?:code[_-]?)?verifier|(?:php|j)?sess(?:ion)?[_-]?id|sid|x[-_]${HEADER_NAME_RUN}?(?:api[-_]?key|token|secret|auth)${HEADER_NAME_RUN})=)[^&#\\s"'<>\`]+`, "gi");
 var OAUTH_CODE_RE = /([?&]code=)(?=[^&#\s"'<>`]{16,})[^&#\s"'<>`]+/gi;
 var FORM_PASSWORD_RE = /((?:^|[\s,;:"'(\[{])(?:password|passwd)=)[^&#\s"'<>`]+/gim;
 var HEADER_SECRET_RE = new RegExp(`(\\b(?:x[-_]${HEADER_NAME_RUN}?(?:api[-_]?key|token|secret|auth)${HEADER_NAME_RUN}|api[-_]?key)\\s*:\\s*)[^\\s,;"'<>\`]+`, "gi");
@@ -34577,6 +34585,8 @@ var JSON_SECRET_KEYS = [
   "api[_-]?secret",
   "(?:x[_-])?api[_-]?key",
   "private[_-]?key",
+  "code[_-]?verifier",
+  // PKCE; a bare `verifier` key is too generic for JSON
   `x[_-]${HEADER_NAME_RUN}?(?:api[_-]?key|token|secret|auth)${HEADER_NAME_RUN}`,
   // bounded like HEADER_SECRET_RE
   "(?:proxy-)?authorization",
@@ -34607,6 +34617,11 @@ function redactSecrets(text) {
   return text.replace(BEARER_RE, "$1[REDACTED]").replace(BASIC_AUTH_RE, "$1[REDACTED]").replace(SET_COOKIE_RE, "$1$2=[REDACTED]").replace(COOKIE_HEADER_RE, (_m, prefix, pairs) => `${prefix}${pairs.replace(/=[^;,\s]*/g, "=[REDACTED]")}`).replace(API_KEY_RE, "[REDACTED]").replace(GOOGLE_OAUTH_TOKEN_RE, "[REDACTED]").replace(HEADER_SECRET_RE, "$1[REDACTED]").replace(QUERY_SECRET_RE, "$1[REDACTED]").replace(OAUTH_CODE_RE, "$1[REDACTED]").replace(FORM_PASSWORD_RE, "$1[REDACTED]").replace(AWS_SIGV4_RE, "$1[REDACTED]").replace(JSON_COOKIE_DQ_RE, redactJsonCookie('"')).replace(JSON_COOKIE_SQ_RE, redactJsonCookie("'")).replace(JSON_SECRET_DQ_RE, "$1[REDACTED]$2").replace(JSON_SECRET_SQ_RE, "$1[REDACTED]$2").replace(JSON_SECRET_NUM_RE, "$1[REDACTED]").replace(JWT_RE, "[REDACTED]");
 }
 var ERROR_REDACTION_INPUT_MAX = 64 * 1024;
+function messageOf(err) {
+  if (err instanceof Error)
+    return err.message;
+  return String(err);
+}
 
 // ../../node_modules/@chrischall/mcp-utils/dist/response/view.js
 var VIEWS = ["compact", "full", "raw"];
@@ -35048,7 +35063,7 @@ function readEnvVar(key, opts = {}) {
   if (typeof raw === "string") {
     const trimmed = raw.trim();
     if (trimmed.length > 0 && trimmed !== "undefined" && trimmed !== "null" && !PLACEHOLDER_RE.test(trimmed)) {
-      return trimmed;
+      return opts.trim === false ? raw : trimmed;
     }
   }
   return opts.default;
@@ -35243,12 +35258,19 @@ function boundArgs(args) {
 }
 function confirmationFromEnv(options) {
   const { tool, account, confirmToken, subject, instruction, args, env = process.env, spent: callerSpent, ...rest } = options;
+  if (args === void 0 || args === null) {
+    throw new TypeError(`confirmationFromEnv: ${tool} passed no args; pass the tool's validated arguments ({} for a tool with none).`);
+  }
   const spent2 = callerSpent ?? spentTokenStoreFromEnv(env);
   const mode = readConfirmMode(env);
   const ttlSeconds = readConfirmTtl(env);
   const elicitationOff = readConfirmElicitation(env) === "off";
-  const bound = args === void 0 ? void 0 : boundArgs(args);
-  const bindingAdded = bound === void 0 || rest.binding ? rest : { ...rest, binding: { key: confirmKeyFromEnv(env), args: bound, ttlSeconds: ttlSeconds ?? DEFAULT_TTL_SECONDS2 } };
+  const bound = boundArgs(args);
+  const elicitationBound = account === void 0 ? { args: bound } : { account, args: bound };
+  const bindingAdded = rest.binding ? rest : {
+    ...rest,
+    binding: { key: confirmKeyFromEnv(env), args: elicitationBound, ttlSeconds: ttlSeconds ?? DEFAULT_TTL_SECONDS2 }
+  };
   const confirmation = elicitationOff ? { ...bindingAdded, elicitation: false } : bindingAdded;
   if (mode === "refuse" || ttlSeconds === void 0) {
     const reason = mode === "refuse" ? REFUSE_HINT : BAD_TTL_HINT;
@@ -35258,7 +35280,7 @@ function confirmationFromEnv(options) {
       unsupportedNote: confirmation.unsupportedNote ? `${confirmation.unsupportedNote} ${hint}` : hint
     };
   }
-  const boundSubject = bound === void 0 ? subject : async () => {
+  const boundSubject = async () => {
     const read = await subject();
     if ("content" in read)
       return read;
@@ -35285,12 +35307,14 @@ var SERVER_PROTOCOL_VERSIONS = Object.freeze([
   ...SUPPORTED_PROTOCOL_VERSIONS
 ]);
 function hintResultOrRethrow(err) {
+  if (err instanceof ProtocolError && err.code === ProtocolErrorCode.UrlElicitationRequired)
+    throw err;
   if (err instanceof McpToolError && err.hint) {
     return errorResult(`${err.message}
 
 Hint: ${err.hint}`);
   }
-  throw err;
+  return errorResult(messageOf(err));
 }
 function mcpRequestFrom(args) {
   const ctx = args.at(-1);
@@ -35524,7 +35548,7 @@ var PositiveInt = external_exports.number().int().positive();
 var NonNegInt = external_exports.number().int().nonnegative();
 var NonEmptyString = external_exports.string().min(1);
 var IsoDate = external_exports.iso.date();
-var IsoTime = external_exports.string().regex(/^([01]?\d|2[0-3]):[0-5]\d$/, "must be HH:MM (24h), e.g. 19:30");
+var IsoTime = external_exports.string().regex(/^([01]?\d|2[0-3]):[0-5]\d$/, "must be HH:MM (24h), e.g. 19:30").overwrite((v) => v.padStart(5, "0"));
 var NumericIdString = external_exports.string().regex(/^\d+$/, "must be a numeric id (digits only)").describe("A numeric id string (digits only), safe to interpolate into a URL path.");
 var SafePathSegment = external_exports.string().min(1).regex(/^[^/?#\s]+$/, 'must not contain "/", "?", "#", or whitespace').refine((v) => !v.includes(".."), 'must not contain ".."').describe('A single URL path segment, safe to interpolate: no "/", "..", "?", "#", or whitespace.');
 var schemaOrigin = external_exports.string().optional().describe("Portal origin (e.g. https://<vendor>.example.co) selecting which active session to use. Optional when only one session is active.");
@@ -36222,7 +36246,7 @@ function registerRunTool(server, options) {
   }
   server.registerTool(`gog_${service}_run`, {
     description,
-    annotations: { destructiveHint: true },
+    annotations: { destructiveHint: true, openWorldHint: true },
     inputSchema: external_exports.object(inputSchema)
   }, async (rawArgs) => {
     const { subcommand, args, account } = rawArgs;
@@ -36439,6 +36463,7 @@ async function requireDispatchConfirmation(ctx, options) {
     ...confirmation,
     tool: fallback.tool,
     account: fallback.account ?? readEnvVar("GOG_ACCOUNT") ?? "",
+    args: fallback.args,
     confirmToken: fallback.confirmToken,
     subject: fallback.subject,
     instruction: fallback.instruction ?? CONFIRM_ACTION_INSTRUCTION,
@@ -36451,13 +36476,13 @@ function resultText(result) {
 }
 
 // ../gogcli-mcp/src/tools/auth.ts
-var AUTH_RUN_SUBCOMMANDS = ["list", "status", "services", "remove", "alias"];
+var AUTH_RUN_SUBCOMMANDS = ["list", "status", "services", "alias"];
 function registerAuthToolsWith(server, defaultServices) {
   const servicesDescribe = `Services to authorize: "all" or comma-separated list (e.g. "sheets,gmail,calendar"). Default: "${defaultServices}". Prefer the narrowest set you need \u2014 requesting a service whose Google API is not enabled on the OAuth client's project makes Google reject the WHOLE request with invalid_scope.`;
   const extraScopesDescribe = "Additional raw OAuth scope URIs to request, comma-separated, on top of the ones `services` implies. Use for scopes no service covers \u2014 e.g. https://www.googleapis.com/auth/bigquery.readonly, required before gog_sheets_datasource_* can read BigQuery-backed Connected Sheets. Leave unset otherwise: an extra scope whose API is not enabled on the OAuth client project makes Google reject the WHOLE authorization with invalid_scope.";
   server.registerTool("gog_auth_list", {
     description: "List the Google accounts stored in gogcli, with their scopes. This reads local configuration only \u2014 it does not contact Google and does NOT tell you whether an account still works: a signed-out account whose refresh token expired or was revoked is listed here exactly like a healthy one, scopes and all. Use gog_auth_health to check whether an account can actually authenticate.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: false },
     inputSchema: external_exports.object({})
   }, async () => {
     try {
@@ -36468,7 +36493,7 @@ function registerAuthToolsWith(server, defaultServices) {
   });
   server.registerTool("gog_auth_status", {
     description: "Show gogcli auth CONFIGURATION: keyring backend, credential files, and auth setup. Despite the name this is not a health check \u2014 it reads local setup and does not contact Google, so it says nothing about whether an account can still authenticate. Use gog_auth_health for that.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: false },
     inputSchema: external_exports.object({})
   }, async () => {
     try {
@@ -36479,7 +36504,7 @@ function registerAuthToolsWith(server, defaultServices) {
   });
   server.registerTool("gog_auth_health", {
     description: `Check the LIVE health of each stored Google account. Unlike gog_auth_status (which only reports keyring/config setup), this performs a real token refresh against Google, so it detects expired or revoked (invalid_grant) refresh tokens \u2014 the account-wide sign-out that blocks every service. Reports per account: whether the token is currently valid, the mapped cause when it is not, how long ago it was authorized, and a warning as it approaches the 7-day refresh-token limit that applies to OAuth apps whose consent screen is still in "Testing" mode. Run it proactively to re-authorize on your own schedule instead of mid-task. On a hosted deployment this is the ONLY check that measures Google: a connector showing "connected" or "refreshed" has verified the client's connection to the MCP host, and nothing else \u2014 the Google credential lives in gog's keyring on that host and can be dead while the connection looks perfectly healthy.`,
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({})
   }, async () => {
     try {
@@ -36490,7 +36515,7 @@ function registerAuthToolsWith(server, defaultServices) {
   });
   server.registerTool("gog_auth_services", {
     description: "List all Google services supported by gogcli and the OAuth scopes each requires.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: false },
     inputSchema: external_exports.object({})
   }, async () => {
     try {
@@ -36501,7 +36526,7 @@ function registerAuthToolsWith(server, defaultServices) {
   });
   server.registerTool("gog_auth_add", {
     description: "Authorize a Google account via browser-based OAuth. Opens a browser window where the user must sign in and grant access. Blocks for up to 5 minutes waiting for the user to complete authorization. If the browser does not open automatically, a fallback URL is included in the response. Use gog_auth_list to check which accounts are already configured.",
-    annotations: { destructiveHint: true },
+    annotations: { destructiveHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       email: external_exports.string().describe("Google account email to authorize"),
       services: external_exports.string().optional().default(defaultServices).describe(servicesDescribe),
@@ -36521,7 +36546,7 @@ function registerAuthToolsWith(server, defaultServices) {
   });
   server.registerTool("gog_auth_add_url", {
     description: "Begin REMOTE/headless Google authorization (step 1 of 2). Returns a sign-in URL to open in any browser \u2014 no local server or terminal on the gogcli host is needed, so this works on a hosted deployment where the interactive gog_auth_add cannot. Hand the URL to the user; after they sign in, the browser is redirected to a localhost URL that fails to load \u2014 that is expected. They copy that full redirected URL (from the address bar) and you pass it to gog_auth_add_complete. The link is valid for 10 minutes. If you pass a custom `services` here, pass the SAME value to gog_auth_add_complete or the second step will not match this one.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: false },
     inputSchema: external_exports.object({
       email: external_exports.string().describe("Google account email to authorize"),
       services: external_exports.string().optional().default(defaultServices).describe(servicesDescribe),
@@ -36538,7 +36563,7 @@ function registerAuthToolsWith(server, defaultServices) {
   });
   server.registerTool("gog_auth_add_complete", {
     description: "Complete REMOTE/headless Google authorization (step 2 of 2). Takes the full redirected localhost URL the user copied after finishing gog_auth_add_url, exchanges it for a refresh token, and stores it. Use the SAME `services` value you passed to gog_auth_add_url. Must run within 10 minutes of step 1 and against the same gogcli host.",
-    annotations: { destructiveHint: true },
+    annotations: { destructiveHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       email: external_exports.string().describe("Google account email being authorized (same as step 1)"),
       redirectUrl: external_exports.string().describe(
@@ -36574,7 +36599,7 @@ function registerAuthToolsWith(server, defaultServices) {
   });
   registerRunTool(server, {
     service: "auth",
-    examples: '"remove", "alias", "list"',
+    examples: '"alias", "list", "status"',
     omitAccount: true,
     allowedSubcommands: AUTH_RUN_SUBCOMMANDS,
     note: "For browser-based authorization, use gog_auth_add instead."
@@ -36731,7 +36756,7 @@ var DRIVE_LS_COMPACT_FIELDS = "nextPageToken,files(id,name,mimeType,modifiedTime
 function registerDriveTools(server) {
   server.registerTool("gog_drive_ls", {
     description: "List files in a Google Drive folder (default: root).",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       folderId: external_exports.string().optional().describe("Folder ID to list (default: root)"),
       max: external_exports.number().optional().describe("Max results (default: 20)"),
@@ -36760,7 +36785,7 @@ function registerDriveTools(server) {
   });
   server.registerTool("gog_drive_search", {
     description: "Search Google Drive files by full-text query.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       query: external_exports.string().describe("Search query"),
       // gog's `drive search` accepts no --fields mask, so unlike gog_drive_ls
@@ -36777,7 +36802,7 @@ function registerDriveTools(server) {
   });
   server.registerTool("gog_drive_get", {
     description: "Get metadata for a Google Drive file.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File ID"),
       // A --fields mask saves only 7% here: the default set is already narrow,
@@ -36797,7 +36822,7 @@ function registerDriveTools(server) {
   });
   server.registerTool("gog_drive_mkdir", {
     description: "Create a new folder in Google Drive.",
-    annotations: { destructiveHint: false },
+    annotations: { destructiveHint: false, openWorldHint: true },
     inputSchema: external_exports.object({
       name: external_exports.string().describe("Folder name"),
       account: accountParam
@@ -36807,7 +36832,7 @@ function registerDriveTools(server) {
   });
   server.registerTool("gog_drive_rename", {
     description: "Rename a file or folder in Google Drive.",
-    annotations: { destructiveHint: false },
+    annotations: { destructiveHint: false, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File or folder ID"),
       newName: external_exports.string().describe("New name"),
@@ -36818,7 +36843,7 @@ function registerDriveTools(server) {
   });
   server.registerTool("gog_drive_move", {
     description: "Move a file to a different folder in Google Drive.",
-    annotations: { destructiveHint: false },
+    annotations: { destructiveHint: false, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File ID to move"),
       parentId: external_exports.string().describe("Destination folder ID"),
@@ -36829,7 +36854,7 @@ function registerDriveTools(server) {
   });
   server.registerTool("gog_drive_delete", {
     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 },
+    annotations: { destructiveHint: true, openWorldHint: 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; asks the user first)"),
@@ -36849,6 +36874,7 @@ function registerDriveTools(server) {
         details: target,
         unsupportedNote: "Move it to the trash instead (permanent=false); the user can empty the trash from Google Drive.",
         fallback: {
+          args: { fileId, permanent, account },
           tool: "gog_drive_delete",
           account,
           confirmToken,
@@ -36863,7 +36889,7 @@ function registerDriveTools(server) {
   });
   server.registerTool("gog_drive_share", {
     description: "Share a Google Drive file or folder. Granting access is the risk even though no email is sent (gog does not notify by default), so this reads the file and asks the MCP host to show the user a confirmation prompt naming it, who gets access and with what role; nothing is shared unless they accept." + CONFIRM_FALLBACK_DESCRIPTION,
-    annotations: { destructiveHint: true },
+    annotations: { destructiveHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File or folder ID"),
       to: external_exports.enum(["user", "anyone", "domain"]).describe("Share target type"),
@@ -36892,6 +36918,7 @@ function registerDriveTools(server) {
       details: grant,
       unsupportedNote: "Ask the user to share it themselves from Google Drive.",
       fallback: {
+        args: { fileId, to, email: email3, domain: domain2, role, account },
         tool: "gog_drive_share",
         account,
         confirmToken,
@@ -36909,7 +36936,7 @@ function registerDriveTools(server) {
   server.registerTool("gog_drive_extract_text", {
     description: `Extract readable TEXT from a Drive file \u2014 PDF, image, docx, or a native Google Doc \u2014 and return it to you directly (closing the webViewLink dead end). Accepts a Drive file id, including the id from gog_gmail_attachment's deliveredVia:"drive" response. For non-Docs it copies the file to a temporary Google Doc so Drive OCRs it (works for scanned PDFs too), exports plain text, then deletes the temp Doc. Operates entirely via the Drive API within the existing drive scope \u2014 no host filesystem, no scope widening. For a large file, page through with offset/maxChars.`,
     // Creates and deletes a temporary Doc for non-native files, so not read-only.
-    annotations: { destructiveHint: false },
+    annotations: { destructiveHint: false, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("Drive file ID (e.g. the id returned by gog_gmail_attachment)"),
       ocrLanguage: external_exports.string().optional().describe(
@@ -36974,7 +37001,7 @@ function registerDriveTools(server) {
   });
   server.registerTool("gog_drive_read_bytes", {
     description: "Fetch a Drive file's raw bytes and return them base64-encoded as an embedded resource \u2014 the generic fallback for callers that want the file itself (to parse locally) rather than extracted text. Files over 8 MiB are refused (checked before downloading). For readable text from a PDF, prefer gog_drive_extract_text.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("Drive file ID"),
       account: accountParam
@@ -37047,7 +37074,7 @@ var failIfNotEmptyParam = external_exports.boolean().optional().describe(
 );
 
 // ../gogcli-mcp/src/server.ts
-var VERSION = true ? "4.7.0" : "0.0.0";
+var VERSION = true ? "4.7.1" : "0.0.0";
 
 // ../gogcli-mcp/src/bootstrap-auth.ts
 import { join as join7 } from "node:path";
@@ -37126,7 +37153,7 @@ function registerExtraDriveTools(server) {
   server.registerTool("gog_drive_download", {
     description: "Download a Drive file to the local filesystem. For Google Docs formats, specify an export format (pdf, csv, xlsx, pptx, txt, png, docx, md).",
     // Writes a file on the gog host and can overwrite one: not read-only (audit SEC-4).
-    annotations: { readOnlyHint: false, destructiveHint: true },
+    annotations: { readOnlyHint: false, destructiveHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File ID to download"),
       out: external_exports.string().optional().describe("Output file path (default: gogcli config dir)"),
@@ -37144,7 +37171,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_upload", {
     description: `Upload a file to Drive. Supply it EITHER as localPath (a path on the gog server's own filesystem \u2014 local stdio deployments only) OR as content (the bytes, base64-encoded, carried with the request), which is what works when this server runs remotely from you and no path you can name exists on it. Use replace to replace the content of an existing file (preserves link/permissions), or convert to auto-convert to a Google format. Pair replace with ifVersion to make the overwrite conditional: gog sends an atomic If-Match precondition and reports a conflict \u2014 applying nothing \u2014 if the file changed since you read it, instead of silently clobbering a concurrent edit. No read tool surfaces the version number: fetch it immediately before uploading with gog_drive_run { subcommand: "raw", args: ["<fileId>", "--fields=version"] } \u2014 it comes back as a JSON string, so pass it on as a number. Conditional replacement refuses Google Workspace files (Docs/Sheets/Slides), which have no replaceable binary content.`,
-    annotations: { destructiveHint: false },
+    annotations: { destructiveHint: false, openWorldHint: true },
     inputSchema: external_exports.object({
       localPath: external_exports.string().optional().describe(`Path to the file to upload, resolved ON THE GOG SERVER's filesystem \u2014 NOT this client's. Only usable when gog runs on the same machine you do (local stdio); on a hosted deployment (e.g. mcp-host) this path does not exist and the call fails with "no such file or directory" \u2014 use content there. Exactly one of localPath / content is required. Must be inside the server's GOG_FILE_ROOTS directories (default ~/gogcli-mcp-files).`),
       content: external_exports.string().optional().describe("The file's bytes, base64-encoded (standard alphabet, with padding) \u2014 upload a file you hold without it existing anywhere on the gog server. This is the only route that works when the caller and gog share no filesystem. Requires name (there is no path to take a filename from). Max 8 MiB; for anything larger use localPath from a local deployment. Exactly one of localPath / content is required \u2014 supplying both is an error, not a precedence rule."),
@@ -37195,7 +37222,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_sync_push", {
     description: "Recursively push a local directory's contents into an existing Drive folder \u2014 uploads new files, updates changed ones (matched by name + MD5), and creates missing subfolders. One-way and additive: it never deletes anything on Drive. Use dryRun to preview the planned actions first.",
-    annotations: { destructiveHint: true },
+    annotations: { destructiveHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       localPath: external_exports.string().describe("Local directory to push (its contents are mirrored into the parent folder). Must be inside the server's GOG_FILE_ROOTS directories (default ~/gogcli-mcp-files)."),
       parent: external_exports.string().describe("Existing destination Drive folder ID"),
@@ -37212,7 +37239,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_copy", {
     description: "Copy a Drive file to a new file with the given name.",
-    annotations: { destructiveHint: false },
+    annotations: { destructiveHint: false, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File ID to copy"),
       name: external_exports.string().describe("Name for the new copy"),
@@ -37226,7 +37253,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_url", {
     description: "Print shareable web URLs for one or more Drive files.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       fileIds: external_exports.array(external_exports.string()).min(1).describe("One or more file IDs to get URLs for"),
       account: accountParam
@@ -37236,7 +37263,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_permissions", {
     description: "List permissions on a Drive file.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File ID"),
       max: external_exports.number().optional().describe("Max results (default: 100)"),
@@ -37253,7 +37280,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_unshare", {
     description: "Remove a permission from a Drive file. Get the permissionId from gog_drive_permissions.",
-    annotations: { destructiveHint: true },
+    annotations: { destructiveHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File ID"),
       permissionId: external_exports.string().describe("Permission ID to remove"),
@@ -37264,7 +37291,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_drives_list", {
     description: "List shared drives (Team Drives) accessible to the account.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       max: external_exports.number().optional().describe("Max results (default: 100, max allowed: 100)"),
       pageToken: pageTokenParam,
@@ -37284,7 +37311,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_comments_list", {
     description: "List comments on a Drive file.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File ID"),
       since: external_exports.string().optional().describe("Only return comments modified at or after this RFC3339 timestamp (e.g. 2026-06-01T00:00:00Z)"),
@@ -37301,7 +37328,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_comments_get", {
     description: "Get a single comment on a Drive file by ID.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File ID"),
       commentId: external_exports.string().describe("Comment ID"),
@@ -37312,7 +37339,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_comments_add", {
     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 },
+    annotations: { destructiveHint: false, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File ID"),
       content: external_exports.string().describe("Comment text"),
@@ -37332,6 +37359,7 @@ function registerExtraDriveTools(server) {
       details: { file: file2, textPreview: bodyPreview(content), mentions },
       unsupportedNote: "Ask the user to comment from Google Drive.",
       fallback: {
+        args: { fileId, content, account },
         tool: "gog_drive_comments_add",
         account,
         confirmToken,
@@ -37346,7 +37374,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_comments_update", {
     description: "Update the text of an existing comment.",
-    annotations: { destructiveHint: false },
+    annotations: { destructiveHint: false, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File ID"),
       commentId: external_exports.string().describe("Comment ID to update"),
@@ -37358,7 +37386,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_comments_delete", {
     description: "Delete a comment from a Drive file.",
-    annotations: { destructiveHint: true },
+    annotations: { destructiveHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File ID"),
       commentId: external_exports.string().describe("Comment ID to delete"),
@@ -37369,7 +37397,7 @@ function registerExtraDriveTools(server) {
   });
   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). 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 },
+    annotations: { destructiveHint: false, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File ID"),
       commentId: external_exports.string().describe("Comment ID to reply to"),
@@ -37396,6 +37424,7 @@ function registerExtraDriveTools(server) {
       details: { file: file2, replyingTo, textPreview: bodyPreview(content), mentions, ...action ? { action } : {} },
       unsupportedNote: "Ask the user to reply from Google Drive.",
       fallback: {
+        args: { fileId, commentId, content, action, account },
         tool: "gog_drive_comments_reply",
         account,
         confirmToken,
@@ -37410,7 +37439,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_comments_resolve", {
     description: 'Resolve a comment on a Drive file (mark as done) without posting a reply. To resolve while replying, use gog_drive_comments_reply with action: "resolve".',
-    annotations: { destructiveHint: true },
+    annotations: { destructiveHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File ID"),
       commentId: external_exports.string().describe("Comment ID to resolve"),
@@ -37421,7 +37450,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_comments_reopen", {
     description: 'Reopen a previously resolved comment on a Drive file. To reopen while replying, use gog_drive_comments_reply with action: "reopen".',
-    annotations: { destructiveHint: true },
+    annotations: { destructiveHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File ID"),
       commentId: external_exports.string().describe("Comment ID to reopen"),
@@ -37432,7 +37461,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_du", {
     description: "Summarize Drive folder sizes (disk-usage style) starting from a folder.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       parent: external_exports.string().optional().describe("Folder ID to start from (default: root)"),
       depth: external_exports.number().optional().describe("Depth for folder totals (default: 1)"),
@@ -37454,7 +37483,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_tree", {
     description: "Print a read-only folder tree starting from a folder.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       parent: external_exports.string().optional().describe("Folder ID to start from (default: root)"),
       depth: external_exports.number().optional().describe("Max depth (0 = unlimited; default: 2)"),
@@ -37472,7 +37501,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_changes_start_token", {
     description: "Get a Drive changes start page token \u2014 the cursor you pass to gog_drive_changes_list to enumerate changes since this point.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       drive: external_exports.string().optional().describe("Shared drive ID for a shared-drive change log"),
       account: accountParam
@@ -37484,7 +37513,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_changes_list", {
     description: "List Drive changes since a page token (for sync/automation). Get the initial token from gog_drive_changes_start_token; the response includes a newStartPageToken to persist for the next poll.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       token: external_exports.string().describe("Start page token or next page token"),
       max: external_exports.number().optional().describe("Max results (default: 100)"),
@@ -37507,7 +37536,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_revisions_list", {
     description: "List a file's revision history \u2014 paged revision metadata plus provider export links for each revision.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File ID"),
       ...paginationParams,
@@ -37520,7 +37549,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_revisions_get", {
     description: "Get one revision of a Drive file by revision ID (metadata + export links). Find revision IDs with gog_drive_revisions_list.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File ID"),
       revisionId: external_exports.string().describe("Revision ID"),
@@ -37531,7 +37560,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_shortcut_create", {
     description: "Create a Drive shortcut to a file or folder inside a destination folder. Shortcuts are classified distinctly in listing/tree output and are never followed by tree scans.",
-    annotations: { destructiveHint: false },
+    annotations: { destructiveHint: false, openWorldHint: true },
     inputSchema: external_exports.object({
       targetId: external_exports.string().describe("File or folder ID the shortcut points to"),
       parent: external_exports.string().describe("Destination folder ID for the shortcut"),
@@ -37545,7 +37574,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_labels_list", {
     description: "List Drive label schemas available to the account.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       language: external_exports.string().optional().describe("BCP-47 language code"),
       view: external_exports.enum(["LABEL_VIEW_BASIC", "LABEL_VIEW_FULL"]).optional().describe("Label view (default: LABEL_VIEW_BASIC)"),
@@ -37571,7 +37600,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_labels_get", {
     description: 'Get a single Drive label schema by name (e.g. "labels/abc123").',
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       name: external_exports.string().describe("Label schema name (e.g. labels/abc123)"),
       language: external_exports.string().optional().describe("BCP-47 language code"),
@@ -37588,7 +37617,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_labels_file_list", {
     description: "List labels applied to a Drive file.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File ID"),
       max: external_exports.number().optional().describe("Max results (default: 100)"),
@@ -37605,7 +37634,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_labels_file_apply", {
     description: 'Apply or update a label on a Drive file, optionally setting field values. Each field flag takes "fieldId=value" entries (repeatable). selection/integer/date/user values may be comma-separated within one entry for multi-valued fields.',
-    annotations: { destructiveHint: false },
+    annotations: { destructiveHint: false, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File ID"),
       labelId: external_exports.string().describe("Label ID to apply"),
@@ -37631,7 +37660,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_labels_file_remove", {
     description: "Remove a label from a Drive file.",
-    annotations: { destructiveHint: true },
+    annotations: { destructiveHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       fileId: external_exports.string().describe("File ID"),
       labelId: external_exports.string().describe("Label ID to remove"),
@@ -37642,7 +37671,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_activity", {
     description: "Query the Drive Activity API for audit events (edits, creates, deletes, moves, shares, etc.) scoped to a file or folder and/or time range.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       file: external_exports.string().optional().describe("Drive file ID to query"),
       folder: external_exports.string().optional().describe("Drive folder ID; includes descendants"),
@@ -37674,7 +37703,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_audit_sharing", {
     description: "Audit Drive sharing without mutation \u2014 find public (anyone-with-link) or external permissions across a folder tree or a single file.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       file: external_exports.string().optional().describe("Audit one file ID instead of a folder tree"),
       parent: external_exports.string().optional().describe("Folder ID to scan (default: root)"),
@@ -37700,7 +37729,7 @@ function registerExtraDriveTools(server) {
   });
   server.registerTool("gog_drive_audit_user", {
     description: "Audit Drive sharing without mutation \u2014 find permissions granted to a specific user across a folder tree or a single file.",
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({
       user: external_exports.string().describe("User email to audit permissions for"),
       file: external_exports.string().optional().describe("Audit one file ID instead of a folder tree"),

package/manifest.json

@@ -3,7 +3,7 @@
   "manifest_version": "0.3",
   "name": "gogcli-mcp-drive",
   "display_name": "gogcli (Drive)",
-  "version": "4.7.0",
+  "version": "4.7.1",
   "description": "Extended Google Drive for Claude via gogcli — auth + full Drive support (upload, download, permissions, comments, shared drives)",
   "author": {
     "name": "Chris Hall",
@@ -39,7 +39,10 @@
       "env": {
         "GOG_ACCOUNT": "${user_config.gog_account}",
         "GOG_PATH": "${user_config.gog_path}",
-        "GOG_FILE_ROOTS": "${user_config.gog_file_roots}"
+        "GOG_FILE_ROOTS": "${user_config.gog_file_roots}",
+        "DISPLAY_TZ": "${user_config.display_tz}",
+        "GOG_READONLY": "${user_config.gog_readonly}",
+        "GOG_TIMEZONE": "${user_config.gog_timezone}"
       }
     }
   },
@@ -61,6 +64,24 @@
       "title": "Allowed file directories",
       "description": "Directories tools may read files from (attachments, uploads) or write files to (exports, downloads), separated by ':' (';' on Windows). Optional — defaults to ~/gogcli-mcp-files",
       "required": false
+    },
+    "display_tz": {
+      "type": "string",
+      "title": "Display time zone",
+      "description": "zone for *Display fields and for interpreting naive gog values; defaults to America/New_York",
+      "required": false
+    },
+    "gog_readonly": {
+      "type": "string",
+      "title": "Read-only mode",
+      "description": "block all mutating gog API requests (injects gog's --readonly); set to 0/false/no/off (or unset) to allow writes",
+      "required": false
+    },
+    "gog_timezone": {
+      "type": "string",
+      "title": "gog time zone",
+      "description": "zone gog formats naive dates in; unset, runner.ts hands gog DISPLAY_TZ so the two cannot diverge",
+      "required": false
     }
   },
   "tools": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gogcli-mcp-drive",
-  "version": "4.7.0",
+  "version": "4.7.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.15.0",
+    "@chrischall/mcp-utils": "^3.0.0",
     "@modelcontextprotocol/server": "^2.3.0",
     "zod": "^4.6.1"
   },

package/server.json

@@ -7,12 +7,12 @@
     "source": "github",
     "subfolder": "packages/gogcli-mcp-drive"
   },
-  "version": "4.7.0",
+  "version": "4.7.1",
   "packages": [
     {
       "registryType": "npm",
       "identifier": "gogcli-mcp-drive",
-      "version": "4.7.0",
+      "version": "4.7.1",
       "transport": {
         "type": "stdio"
       },
@@ -28,6 +28,24 @@
           "description": "Override path to the gogcli binary (auto-discovered otherwise)",
           "isRequired": false,
           "format": "string"
+        },
+        {
+          "name": "DISPLAY_TZ",
+          "description": "zone for *Display fields and for interpreting naive gog values; defaults to America/New_York",
+          "isRequired": false,
+          "format": "string"
+        },
+        {
+          "name": "GOG_READONLY",
+          "description": "block all mutating gog API requests (injects gog's --readonly); set to 0/false/no/off (or unset) to allow writes",
+          "isRequired": false,
+          "format": "string"
+        },
+        {
+          "name": "GOG_TIMEZONE",
+          "description": "zone gog formats naive dates in; unset, runner.ts hands gog DISPLAY_TZ so the two cannot diverge",
+          "isRequired": false,
+          "format": "string"
         }
       ]
     }

package/src/tools/drive-extra.ts

@@ -26,7 +26,7 @@ export function registerExtraDriveTools(server: McpServer): void {
   server.registerTool('gog_drive_download', {
     description: 'Download a Drive file to the local filesystem. For Google Docs formats, specify an export format (pdf, csv, xlsx, pptx, txt, png, docx, md).',
     // Writes a file on the gog host and can overwrite one: not read-only (audit SEC-4).
-    annotations: { readOnlyHint: false, destructiveHint: true },
+    annotations: { readOnlyHint: false, destructiveHint: true, openWorldHint: true },
     inputSchema: z.object({
       fileId: z.string().describe('File ID to download'),
       out: z.string().optional().describe('Output file path (default: gogcli config dir)'),
@@ -55,7 +55,7 @@ export function registerExtraDriveTools(server: McpServer): void {
       'No read tool surfaces the version number: fetch it immediately before uploading with ' +
       'gog_drive_run { subcommand: "raw", args: ["<fileId>", "--fields=version"] } — it comes back as a JSON string, so pass it on as a number. ' +
       'Conditional replacement refuses Google Workspace files (Docs/Sheets/Slides), which have no replaceable binary content.',
-    annotations: { destructiveHint: false },
+    annotations: { destructiveHint: false, openWorldHint: true },
     inputSchema: z.object({
       localPath: z.string().optional().describe('Path to the file to upload, resolved ON THE GOG SERVER\'s filesystem — NOT this client\'s. Only usable when gog runs on the same machine you do (local stdio); on a hosted deployment (e.g. mcp-host) this path does not exist and the call fails with "no such file or directory" — use content there. Exactly one of localPath / content is required. Must be inside the server\'s GOG_FILE_ROOTS directories (default ~/gogcli-mcp-files).'),
       content: z.string().optional().describe('The file\'s bytes, base64-encoded (standard alphabet, with padding) — upload a file you hold without it existing anywhere on the gog server. This is the only route that works when the caller and gog share no filesystem. Requires name (there is no path to take a filename from). Max 8 MiB; for anything larger use localPath from a local deployment. Exactly one of localPath / content is required — supplying both is an error, not a precedence rule.'),
@@ -117,7 +117,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_sync_push', {
     description: 'Recursively push a local directory\'s contents into an existing Drive folder — uploads new files, updates changed ones (matched by name + MD5), and creates missing subfolders. One-way and additive: it never deletes anything on Drive. Use dryRun to preview the planned actions first.',
-    annotations: { destructiveHint: true },
+    annotations: { destructiveHint: true, openWorldHint: true },
     inputSchema: z.object({
       localPath: z.string().describe('Local directory to push (its contents are mirrored into the parent folder). Must be inside the server\'s GOG_FILE_ROOTS directories (default ~/gogcli-mcp-files).'),
       parent: z.string().describe('Existing destination Drive folder ID'),
@@ -135,7 +135,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_copy', {
     description: 'Copy a Drive file to a new file with the given name.',
-    annotations: { destructiveHint: false },
+    annotations: { destructiveHint: false, openWorldHint: true },
     inputSchema: z.object({
       fileId: z.string().describe('File ID to copy'),
       name: z.string().describe('Name for the new copy'),
@@ -150,7 +150,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_url', {
     description: 'Print shareable web URLs for one or more Drive files.',
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: z.object({
       fileIds: z.array(z.string()).min(1).describe('One or more file IDs to get URLs for'),
       account: accountParam,
@@ -161,7 +161,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_permissions', {
     description: 'List permissions on a Drive file.',
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: z.object({
       fileId: z.string().describe('File ID'),
       max: z.number().optional().describe('Max results (default: 100)'),
@@ -179,7 +179,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_unshare', {
     description: 'Remove a permission from a Drive file. Get the permissionId from gog_drive_permissions.',
-    annotations: { destructiveHint: true },
+    annotations: { destructiveHint: true, openWorldHint: true },
     inputSchema: z.object({
       fileId: z.string().describe('File ID'),
       permissionId: z.string().describe('Permission ID to remove'),
@@ -191,7 +191,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_drives_list', {
     description: 'List shared drives (Team Drives) accessible to the account.',
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: z.object({
       max: z.number().optional().describe('Max results (default: 100, max allowed: 100)'),
       pageToken: pageTokenParam,
@@ -212,7 +212,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_comments_list', {
     description: 'List comments on a Drive file.',
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: z.object({
       fileId: z.string().describe('File ID'),
       since: z.string().optional().describe('Only return comments modified at or after this RFC3339 timestamp (e.g. 2026-06-01T00:00:00Z)'),
@@ -230,7 +230,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_comments_get', {
     description: 'Get a single comment on a Drive file by ID.',
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: z.object({
       fileId: z.string().describe('File ID'),
       commentId: z.string().describe('Comment ID'),
@@ -244,7 +244,7 @@ export function registerExtraDriveTools(server: McpServer): void {
     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 },
+    annotations: { destructiveHint: false, openWorldHint: true },
     inputSchema: z.object({
       fileId: z.string().describe('File ID'),
       content: z.string().describe('Comment text'),
@@ -264,6 +264,7 @@ export function registerExtraDriveTools(server: McpServer): void {
       details: { file, textPreview: bodyPreview(content), mentions },
       unsupportedNote: 'Ask the user to comment from Google Drive.',
       fallback: {
+        args: { fileId, content, account },
         tool: 'gog_drive_comments_add',
         account,
         confirmToken,
@@ -279,7 +280,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_comments_update', {
     description: 'Update the text of an existing comment.',
-    annotations: { destructiveHint: false },
+    annotations: { destructiveHint: false, openWorldHint: true },
     inputSchema: z.object({
       fileId: z.string().describe('File ID'),
       commentId: z.string().describe('Comment ID to update'),
@@ -292,7 +293,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_comments_delete', {
     description: 'Delete a comment from a Drive file.',
-    annotations: { destructiveHint: true },
+    annotations: { destructiveHint: true, openWorldHint: true },
     inputSchema: z.object({
       fileId: z.string().describe('File ID'),
       commentId: z.string().describe('Comment ID to delete'),
@@ -307,7 +308,7 @@ export function registerExtraDriveTools(server: McpServer): void {
       + '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 },
+    annotations: { destructiveHint: false, openWorldHint: true },
     inputSchema: z.object({
       fileId: z.string().describe('File ID'),
       commentId: z.string().describe('Comment ID to reply to'),
@@ -334,6 +335,7 @@ export function registerExtraDriveTools(server: McpServer): void {
       details: { file, replyingTo, textPreview: bodyPreview(content), mentions, ...(action ? { action } : {}) },
       unsupportedNote: 'Ask the user to reply from Google Drive.',
       fallback: {
+        args: { fileId, commentId, content, action, account },
         tool: 'gog_drive_comments_reply',
         account,
         confirmToken,
@@ -349,7 +351,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_comments_resolve', {
     description: 'Resolve a comment on a Drive file (mark as done) without posting a reply. To resolve while replying, use gog_drive_comments_reply with action: "resolve".',
-    annotations: { destructiveHint: true },
+    annotations: { destructiveHint: true, openWorldHint: true },
     inputSchema: z.object({
       fileId: z.string().describe('File ID'),
       commentId: z.string().describe('Comment ID to resolve'),
@@ -361,7 +363,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_comments_reopen', {
     description: 'Reopen a previously resolved comment on a Drive file. To reopen while replying, use gog_drive_comments_reply with action: "reopen".',
-    annotations: { destructiveHint: true },
+    annotations: { destructiveHint: true, openWorldHint: true },
     inputSchema: z.object({
       fileId: z.string().describe('File ID'),
       commentId: z.string().describe('Comment ID to reopen'),
@@ -375,7 +377,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_du', {
     description: 'Summarize Drive folder sizes (disk-usage style) starting from a folder.',
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: z.object({
       parent: z.string().optional().describe('Folder ID to start from (default: root)'),
       depth: z.number().optional().describe('Depth for folder totals (default: 1)'),
@@ -398,7 +400,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_tree', {
     description: 'Print a read-only folder tree starting from a folder.',
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: z.object({
       parent: z.string().optional().describe('Folder ID to start from (default: root)'),
       depth: z.number().optional().describe('Max depth (0 = unlimited; default: 2)'),
@@ -417,7 +419,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_changes_start_token', {
     description: 'Get a Drive changes start page token — the cursor you pass to gog_drive_changes_list to enumerate changes since this point.',
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: z.object({
       drive: z.string().optional().describe('Shared drive ID for a shared-drive change log'),
       account: accountParam,
@@ -430,7 +432,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_changes_list', {
     description: 'List Drive changes since a page token (for sync/automation). Get the initial token from gog_drive_changes_start_token; the response includes a newStartPageToken to persist for the next poll.',
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: z.object({
       token: z.string().describe('Start page token or next page token'),
       max: z.number().optional().describe('Max results (default: 100)'),
@@ -456,7 +458,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_revisions_list', {
     description: 'List a file\'s revision history — paged revision metadata plus provider export links for each revision.',
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: z.object({
       fileId: z.string().describe('File ID'),
       ...paginationParams,
@@ -470,7 +472,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_revisions_get', {
     description: 'Get one revision of a Drive file by revision ID (metadata + export links). Find revision IDs with gog_drive_revisions_list.',
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: z.object({
       fileId: z.string().describe('File ID'),
       revisionId: z.string().describe('Revision ID'),
@@ -482,7 +484,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_shortcut_create', {
     description: 'Create a Drive shortcut to a file or folder inside a destination folder. Shortcuts are classified distinctly in listing/tree output and are never followed by tree scans.',
-    annotations: { destructiveHint: false },
+    annotations: { destructiveHint: false, openWorldHint: true },
     inputSchema: z.object({
       targetId: z.string().describe('File or folder ID the shortcut points to'),
       parent: z.string().describe('Destination folder ID for the shortcut'),
@@ -497,7 +499,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_labels_list', {
     description: 'List Drive label schemas available to the account.',
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: z.object({
       language: z.string().optional().describe('BCP-47 language code'),
       view: z.enum(['LABEL_VIEW_BASIC', 'LABEL_VIEW_FULL']).optional().describe('Label view (default: LABEL_VIEW_BASIC)'),
@@ -524,7 +526,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_labels_get', {
     description: 'Get a single Drive label schema by name (e.g. "labels/abc123").',
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: z.object({
       name: z.string().describe('Label schema name (e.g. labels/abc123)'),
       language: z.string().optional().describe('BCP-47 language code'),
@@ -542,7 +544,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_labels_file_list', {
     description: 'List labels applied to a Drive file.',
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: z.object({
       fileId: z.string().describe('File ID'),
       max: z.number().optional().describe('Max results (default: 100)'),
@@ -560,7 +562,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_labels_file_apply', {
     description: 'Apply or update a label on a Drive file, optionally setting field values. Each field flag takes "fieldId=value" entries (repeatable). selection/integer/date/user values may be comma-separated within one entry for multi-valued fields.',
-    annotations: { destructiveHint: false },
+    annotations: { destructiveHint: false, openWorldHint: true },
     inputSchema: z.object({
       fileId: z.string().describe('File ID'),
       labelId: z.string().describe('Label ID to apply'),
@@ -587,7 +589,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_labels_file_remove', {
     description: 'Remove a label from a Drive file.',
-    annotations: { destructiveHint: true },
+    annotations: { destructiveHint: true, openWorldHint: true },
     inputSchema: z.object({
       fileId: z.string().describe('File ID'),
       labelId: z.string().describe('Label ID to remove'),
@@ -599,7 +601,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_activity', {
     description: 'Query the Drive Activity API for audit events (edits, creates, deletes, moves, shares, etc.) scoped to a file or folder and/or time range.',
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: z.object({
       file: z.string().optional().describe('Drive file ID to query'),
       folder: z.string().optional().describe('Drive folder ID; includes descendants'),
@@ -632,7 +634,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_audit_sharing', {
     description: 'Audit Drive sharing without mutation — find public (anyone-with-link) or external permissions across a folder tree or a single file.',
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: z.object({
       file: z.string().optional().describe('Audit one file ID instead of a folder tree'),
       parent: z.string().optional().describe('Folder ID to scan (default: root)'),
@@ -659,7 +661,7 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_audit_user', {
     description: 'Audit Drive sharing without mutation — find permissions granted to a specific user across a folder tree or a single file.',
-    annotations: { readOnlyHint: true },
+    annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: z.object({
       user: z.string().describe('User email to audit permissions for'),
       file: z.string().optional().describe('Audit one file ID instead of a folder tree'),

package/tests/tool-annotations.test.ts

@@ -0,0 +1,10 @@
+import { authToolsFor, registerDriveTools } from '../../gogcli-mcp/src/lib.js';
+import { registerExtraDriveTools } from '../src/tools/drive-extra.js';
+import { describeToolAnnotations, LOCAL_AUTH_TOOLS } from '../../gogcli-mcp/tests/support/tool-annotations.js';
+
+// The same registrar list src/index.ts hands to runMcp.
+describeToolAnnotations([authToolsFor('drive,driveactivity,drivelabels'), registerDriveTools, registerExtraDriveTools] as never, {
+  tools: 50,
+  destructive: 13,
+  local: [...LOCAL_AUTH_TOOLS],
+});