gogcli-mcp-drive 2.23.2 → 2.25.0

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": "2.23.2"
+    "version": "2.25.0"
   },
   "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": "2.23.2",
+      "version": "2.25.0",
       "author": {
         "name": "Chris Hall"
       },

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "gogcli-mcp-drive",
   "displayName": "gogcli (Drive)",
-  "version": "2.23.2",
+  "version": "2.25.0",
   "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

@@ -31177,10 +31177,11 @@ function sanitizedEnv() {
   }
   return result;
 }
+var TOKEN_LEFT_BOUNDARY = "(?<![A-Za-z0-9+/])";
 var GOOGLE_TOKEN_PATTERNS = [
-  /ya29\.[A-Za-z0-9._\-]+/g,
+  new RegExp(`${TOKEN_LEFT_BOUNDARY}ya29\\.[A-Za-z0-9._\\-]+`, "g"),
   // OAuth2 access tokens
-  /1\/\/[A-Za-z0-9._\-]+/g
+  new RegExp(`${TOKEN_LEFT_BOUNDARY}1//[A-Za-z0-9._\\-]+`, "g")
   // OAuth2 refresh tokens
 ];
 function redactGoogleTokens(text) {
@@ -31193,6 +31194,26 @@ function redactGoogleTokens(text) {
 function redactSecrets2(text) {
   return redactGoogleTokens(redactSecrets(text));
 }
+var OPAQUE_FIELD_VALUE = "[A-Za-z0-9+/_-]{16,}={0,2}";
+var opaquePlaceholder = (i) => `\0gogOpaque${i}\0`;
+function redactPreservingOpaqueFields(text, fields, redact) {
+  const lifted = [];
+  let staged = text;
+  for (const field of fields) {
+    const escaped = field.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const re = new RegExp(`("${escaped}"\\s*:\\s*")(${OPAQUE_FIELD_VALUE})(")`, "g");
+    staged = staged.replace(re, (_m, open, value, close) => {
+      lifted.push(value);
+      return `${open}${opaquePlaceholder(lifted.length - 1)}${close}`;
+    });
+  }
+  if (lifted.length === 0) return redact(text);
+  let redacted = redact(staged);
+  lifted.forEach((value, i) => {
+    redacted = redacted.split(opaquePlaceholder(i)).join(value);
+  });
+  return redacted;
+}
 function augmentedPath() {
   const home = process.env.HOME;
   const candidates = [
@@ -31223,19 +31244,24 @@ function formatTimeout(ms) {
   return `${ms}ms`;
 }
 async function spawnWithTempFiles(args, opts) {
-  const { mkdtemp, writeFile, rm } = await import("node:fs/promises");
+  const { mkdtemp, mkdir, writeFile, rm } = await import("node:fs/promises");
   const { tmpdir } = await import("node:os");
   const dir = await mkdtemp(join(tmpdir(), "gogcli-mcp-"));
   try {
     const argv = [];
+    let seq = 0;
     for (const arg of args) {
       if (!isGogFileArg(arg)) {
         argv.push(arg);
         continue;
       }
-      const path = join(dir, `${arg.flag}.${arg.ext ?? "txt"}`);
-      await writeFile(path, arg.contents, { encoding: "utf8", mode: 384 });
-      argv.push(`--${arg.flag}=${path}`);
+      const sub = join(dir, String(seq));
+      seq += 1;
+      await mkdir(sub, { recursive: true, mode: 448 });
+      const path = join(sub, arg.filename ?? `${arg.flag}.${arg.ext ?? "txt"}`);
+      const data = arg.encoding === "base64" ? Buffer.from(arg.contents, "base64") : Buffer.from(arg.contents, "utf8");
+      await writeFile(path, data, { mode: 384 });
+      argv.push(arg.positional ? path : `--${arg.flag}=${path}`);
     }
     return await spawnGog(argv, opts);
   } finally {
@@ -31320,8 +31346,9 @@ function assembleArgs(args, opts) {
   return fullArgs;
 }
 async function run(args, options = {}) {
-  const { account, spawner, interactive = false, timeout, readonly: readonly2 = false, redactMode = "full" } = options;
-  const redact = redactMode === "tokens" ? redactGoogleTokens : redactSecrets2;
+  const { account, spawner, interactive = false, timeout, readonly: readonly2 = false, redactMode = "full", opaqueFields } = options;
+  const base = redactMode === "tokens" ? redactGoogleTokens : redactSecrets2;
+  const redact = opaqueFields?.length ? (text) => redactPreservingOpaqueFields(text, opaqueFields, base) : base;
   const fullArgs = assembleArgs(args, { account, interactive, readonly: readonly2 });
   const store = activeExecutor();
   try {
@@ -31335,7 +31362,7 @@ async function run(args, options = {}) {
     }
     return redact(output);
   } catch (err) {
-    const message = redact(err instanceof Error ? err.message : String(err));
+    const message = base(err instanceof Error ? err.message : String(err));
     if (isRunnerTransportError(err)) {
       throw new RunnerTransportError(message, err.kind, err.status);
     }
@@ -31743,6 +31770,7 @@ function formatAuthHealth(raw, now) {
 // ../gogcli-mcp/src/tools/auth.ts
 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 },
@@ -31792,11 +31820,14 @@ function registerAuthToolsWith(server, defaultServices) {
     annotations: { destructiveHint: true },
     inputSchema: {
       email: external_exports.string().describe("Google account email to authorize"),
-      services: external_exports.string().optional().default(defaultServices).describe(servicesDescribe)
+      services: external_exports.string().optional().default(defaultServices).describe(servicesDescribe),
+      extraScopes: external_exports.string().optional().describe(extraScopesDescribe)
     }
-  }, async ({ email: email3, services = defaultServices }) => {
+  }, async ({ email: email3, services = defaultServices, extraScopes }) => {
     try {
-      return rawTextResult(await run(["auth", "add", email3, "--services", services], {
+      const args = ["auth", "add", email3, "--services", services];
+      if (extraScopes) args.push(`--extra-scopes=${extraScopes}`, "--force-consent");
+      return rawTextResult(await run(args, {
         interactive: true,
         timeout: 3e5
       }));
@@ -31808,14 +31839,14 @@ function registerAuthToolsWith(server, defaultServices) {
     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 over the hosted connector 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.",
     inputSchema: {
       email: external_exports.string().describe("Google account email to authorize"),
-      services: external_exports.string().optional().default(defaultServices).describe(servicesDescribe)
+      services: external_exports.string().optional().default(defaultServices).describe(servicesDescribe),
+      extraScopes: external_exports.string().optional().describe(`${extraScopesDescribe} Pass the SAME value to gog_auth_add_complete.`)
     }
-  }, async ({ email: email3, services = defaultServices }) => {
+  }, async ({ email: email3, services = defaultServices, extraScopes }) => {
     try {
-      return rawTextResult(await run(
-        ["auth", "add", email3, "--remote", "--step", "1", "--services", services, "--force-consent"],
-        { redactMode: "tokens" }
-      ));
+      const args = ["auth", "add", email3, "--remote", "--step", "1", "--services", services, "--force-consent"];
+      if (extraScopes) args.push(`--extra-scopes=${extraScopes}`);
+      return rawTextResult(await run(args, { redactMode: "tokens" }));
     } catch (err) {
       return errorResult(errorText(err));
     }
@@ -31830,25 +31861,28 @@ function registerAuthToolsWith(server, defaultServices) {
       ),
       services: external_exports.string().optional().default(defaultServices).describe(
         `Services authorized \u2014 MUST match the value passed to gog_auth_add_url. Default: "${defaultServices}".`
+      ),
+      extraScopes: external_exports.string().optional().describe(
+        "Extra OAuth scope URIs \u2014 MUST match the value passed to gog_auth_add_url, for the same reason `services` must: the two steps have to describe the same grant."
       )
     }
-  }, async ({ email: email3, redirectUrl, services = defaultServices }) => {
+  }, async ({ email: email3, redirectUrl, services = defaultServices, extraScopes }) => {
     try {
-      return rawTextResult(await run(
-        [
-          "auth",
-          "add",
-          email3,
-          "--remote",
-          "--step",
-          "2",
-          "--auth-url",
-          redirectUrl,
-          "--services",
-          services,
-          "--force-consent"
-        ]
-      ));
+      const args = [
+        "auth",
+        "add",
+        email3,
+        "--remote",
+        "--step",
+        "2",
+        "--auth-url",
+        redirectUrl,
+        "--services",
+        services,
+        "--force-consent"
+      ];
+      if (extraScopes) args.push(`--extra-scopes=${extraScopes}`);
+      return rawTextResult(await run(args));
     } catch (err) {
       return errorResult(errorText(err));
     }
@@ -32079,6 +32113,61 @@ function registerDriveTools(server) {
   registerRunTool(server, { service: "drive", examples: '"copy", "upload", "download", "permissions"' });
 }
 
+// ../gogcli-mcp/src/attachments.ts
+var MAX_INLINE_ATTACHMENT_BYTES = 8 * 1024 * 1024;
+var RUNNER_MAX_BODY_BYTES = 32 * 1024 * 1024;
+var RUNNER_BODY_JSON_RESERVE_BYTES = 256 * 1024;
+var MAX_REQUEST_PAYLOAD_WIRE_BYTES = RUNNER_MAX_BODY_BYTES - RUNNER_BODY_JSON_RESERVE_BYTES;
+var MAX_INLINE_ATTACHMENT_TOTAL_BYTES = Math.floor(MAX_REQUEST_PAYLOAD_WIRE_BYTES * 3 / 4);
+var formatMiB = (bytes) => `${Math.floor(bytes / (1024 * 1024))} MiB`;
+var INLINE_ATTACHMENT_LIMITS_TEXT = `up to ${formatMiB(MAX_INLINE_ATTACHMENT_BYTES)} per file and ${formatMiB(MAX_INLINE_ATTACHMENT_TOTAL_BYTES)} in total`;
+var inlineAttachmentSchema = external_exports.object({
+  filename: external_exports.string().min(1).describe(
+    `Filename the recipient will see, e.g. "pendant-layouts.png". gog infers the attachment's MIME type from this extension, so give it the right one \u2014 a .png sent as "layouts" arrives as an untyped blob. Must be a single filename, not a path.`
+  ),
+  contentBase64: external_exports.string().min(1).describe(
+    "The file's bytes, base64-encoded (standard alphabet, with padding). This is the whole point of this parameter: the bytes travel with the request, so nothing needs to exist on the gog server's filesystem."
+  )
+});
+var attachInlineParam = external_exports.array(inlineAttachmentSchema).optional().describe(
+  `Attachments supplied as BYTES rather than as server-side paths \u2014 use this whenever you hold a file and the gog server does not, which is always the case on the hosted connector and on any remote deployment. Each entry is {filename, contentBase64} (${INLINE_ATTACHMENT_LIMITS_TEXT}). Can be combined with \`attach\`: the two name disjoint files (paths read on the server vs. bytes sent with the call), and both end up as ordinary attachments on the message.`
+);
+function validateFilename(filename, where) {
+  if (/[/\\]/.test(filename)) {
+    throw new Error(
+      `${where}: filename ${JSON.stringify(filename)} must be a bare filename, not a path. Pass just the name the recipient should see, e.g. "report.pdf".`
+    );
+  }
+  if (/[\x00-\x1f]/.test(filename) || /^\.+$/.test(filename) || filename.length > 200) {
+    throw new Error(
+      `${where}: filename ${JSON.stringify(filename)} is not a usable filename (no control characters, not "."/"..", 200 characters max).`
+    );
+  }
+}
+function decodedLength(contentBase64) {
+  const buf = Buffer.from(contentBase64, "base64");
+  return buf.toString("base64") === contentBase64 ? buf.length : null;
+}
+function inlineFileArg(flag, attachment, opts = {}) {
+  const { filename, contentBase64 } = attachment;
+  const where = opts.where ?? `attachInline entry ${JSON.stringify(filename)}`;
+  validateFilename(filename, where);
+  const bytes = decodedLength(contentBase64);
+  if (bytes === null) {
+    throw new Error(
+      `${where}: contents are not valid base64. Send the standard alphabet with padding and no line breaks \u2014 the value must survive a decode/re-encode round trip unchanged.`
+    );
+  }
+  if (bytes > MAX_INLINE_ATTACHMENT_BYTES) {
+    throw new Error(
+      `${where}: ${bytes} bytes exceeds the ${MAX_INLINE_ATTACHMENT_BYTES}-byte (${formatMiB(MAX_INLINE_ATTACHMENT_BYTES)}) per-file limit for inline content. Upload it to Drive and link to it instead, or send it from a local (stdio) deployment using a real server-side path.`
+    );
+  }
+  const arg = { kind: "file", flag, contents: contentBase64, encoding: "base64", filename };
+  if (opts.positional) arg.positional = true;
+  return { arg, bytes };
+}
+
 // ../gogcli-mcp/src/tools/sheets.ts
 var cellValueParam = external_exports.union([external_exports.string(), external_exports.number(), external_exports.boolean(), external_exports.null()]);
 var dryRunParam = external_exports.boolean().optional().describe(
@@ -32089,7 +32178,7 @@ var failIfNotEmptyParam = external_exports.boolean().optional().describe(
 );
 
 // ../gogcli-mcp/src/server.ts
-var VERSION = true ? "2.23.2" : "0.0.0";
+var VERSION = true ? "2.25.0" : "0.0.0";
 
 // ../gogcli-mcp/src/auth-log.ts
 var FAILURES = /* @__PURE__ */ new Set([
@@ -32595,10 +32684,11 @@ function registerExtraDriveTools(server) {
     return runOrDiagnose(args, { account });
   });
   server.registerTool("gog_drive_upload", {
-    description: 'Upload a local file to Drive. 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.',
+    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: true },
     inputSchema: {
-      localPath: external_exports.string().describe("Path to the local file to upload"),
+      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 the hosted connector or any GOG_RUNNER_URL backend 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.`),
+      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."),
       name: external_exports.string().optional().describe("Override filename (create) or rename target (replace)"),
       parent: external_exports.string().optional().describe("Destination folder ID (create only)"),
       replace: external_exports.string().optional().describe("Replace content of an existing Drive file ID (preserves link/permissions). Unconditional unless ifVersion is set."),
@@ -32611,11 +32701,29 @@ function registerExtraDriveTools(server) {
       convertTo: external_exports.string().optional().describe("Convert to a specific Google format: doc | sheet | slides (create only)"),
       account: accountParam
     }
-  }, async ({ localPath, name, parent, replace, ifVersion, mimeType, keepRevisionForever, convert, convertTo, account }) => {
+  }, async ({ localPath, content, name, parent, replace, ifVersion, mimeType, keepRevisionForever, convert, convertTo, account }) => {
     if (ifVersion !== void 0 && !replace) {
       throw new Error("ifVersion requires replace: a version precondition only applies when replacing an existing Drive file.");
     }
-    const args = ["drive", "upload", localPath];
+    if (localPath === void 0 === (content === void 0)) {
+      throw new Error(
+        "Pass exactly one of localPath or content. localPath reads a file on the GOG SERVER's filesystem (local stdio deployments only); content carries the bytes with the request, base64-encoded, and is what works when this server runs remotely from you."
+      );
+    }
+    let pathArg;
+    if (localPath !== void 0) {
+      pathArg = localPath;
+    } else {
+      if (!name) {
+        throw new Error("content requires name: there is no path to derive the Drive filename from.");
+      }
+      pathArg = inlineFileArg(
+        "localPath",
+        { filename: name, contentBase64: content },
+        { positional: true, where: "content" }
+      ).arg;
+    }
+    const args = ["drive", "upload", pathArg];
     if (name) args.push(`--name=${name}`);
     if (parent) args.push(`--parent=${parent}`);
     if (replace) args.push(`--replace=${replace}`);

package/manifest.json

@@ -3,7 +3,7 @@
   "manifest_version": "0.3",
   "name": "gogcli-mcp-drive",
   "display_name": "gogcli (Drive)",
-  "version": "2.23.2",
+  "version": "2.25.0",
   "description": "Extended Google Drive for Claude via gogcli — auth + full Drive support (upload, download, permissions, comments, shared drives)",
   "author": {
     "name": "Chris Hall",
@@ -139,7 +139,7 @@
     },
     {
       "name": "gog_drive_upload",
-      "description": "Upload a local file, optionally replacing an existing file (unconditionally, or only at a given version) or converting to Google format"
+      "description": "Upload a file to Drive from a server-side path (localPath) or from base64 bytes sent with the call (content, for remote deployments with no shared filesystem), optionally replacing an existing file (unconditionally, or only at a given version) or converting to Google format"
     },
     {
       "name": "gog_drive_sync_push",

package/package.json

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

package/server.json

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

package/src/tools/drive-extra.ts

@@ -1,6 +1,7 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { z } from 'zod';
-import { accountParam, runOrDiagnose, paginationParams, pushPaginationFlags, pageTokenParam, pageAliasParam, resolvePageToken} from '../../../gogcli-mcp/src/lib.js';
+import { accountParam, runOrDiagnose, paginationParams, pushPaginationFlags, pageTokenParam, pageAliasParam, resolvePageToken, inlineFileArg} from '../../../gogcli-mcp/src/lib.js';
+import type { GogArg } from '../../../gogcli-mcp/src/lib.js';
 
 export function registerExtraDriveTools(server: McpServer): void {
   server.registerTool('gog_drive_download', {
@@ -23,7 +24,10 @@ export function registerExtraDriveTools(server: McpServer): void {
 
   server.registerTool('gog_drive_upload', {
     description:
-      'Upload a local file to Drive. Use replace to replace the content of an existing file (preserves link/permissions), ' +
+      'Upload a file to Drive. Supply it EITHER as localPath (a path on the gog server\'s own filesystem — 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 — applying nothing — if the file changed since you read it, instead of silently clobbering a concurrent edit. ' +
@@ -32,7 +36,8 @@ export function registerExtraDriveTools(server: McpServer): void {
       'Conditional replacement refuses Google Workspace files (Docs/Sheets/Slides), which have no replaceable binary content.',
     annotations: { destructiveHint: true },
     inputSchema: {
-      localPath: z.string().describe('Path to the local file to upload'),
+      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 the hosted connector or any GOG_RUNNER_URL backend 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.'),
+      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.'),
       name: z.string().optional().describe('Override filename (create) or rename target (replace)'),
       parent: z.string().optional().describe('Destination folder ID (create only)'),
       replace: z.string().optional().describe('Replace content of an existing Drive file ID (preserves link/permissions). Unconditional unless ifVersion is set.'),
@@ -47,11 +52,37 @@ export function registerExtraDriveTools(server: McpServer): void {
       convertTo: z.string().optional().describe('Convert to a specific Google format: doc | sheet | slides (create only)'),
       account: accountParam,
     },
-  }, async ({ localPath, name, parent, replace, ifVersion, mimeType, keepRevisionForever, convert, convertTo, account }) => {
+  }, async ({ localPath, content, name, parent, replace, ifVersion, mimeType, keepRevisionForever, convert, convertTo, account }) => {
     if (ifVersion !== undefined && !replace) {
       throw new Error('ifVersion requires replace: a version precondition only applies when replacing an existing Drive file.');
     }
-    const args = ['drive', 'upload', localPath];
+    // Explicit either/or, never a precedence rule: a caller who sends both has
+    // two different files in mind and silently picking one would upload the
+    // wrong bytes under the right name.
+    if ((localPath === undefined) === (content === undefined)) {
+      throw new Error(
+        'Pass exactly one of localPath or content. localPath reads a file on the GOG SERVER\'s filesystem '
+        + '(local stdio deployments only); content carries the bytes with the request, base64-encoded, and '
+        + 'is what works when this server runs remotely from you.',
+      );
+    }
+    // The positional <localPath> argument: either the caller's real server-side
+    // path, or a temp file the executor materializes next to gog from the bytes
+    // they sent. gog cannot tell the two apart, which is the point.
+    let pathArg: GogArg;
+    if (localPath !== undefined) {
+      pathArg = localPath;
+    } else {
+      if (!name) {
+        throw new Error('content requires name: there is no path to derive the Drive filename from.');
+      }
+      pathArg = inlineFileArg(
+        'localPath',
+        { filename: name, contentBase64: content as string },
+        { positional: true, where: 'content' },
+      ).arg;
+    }
+    const args: GogArg[] = ['drive', 'upload', pathArg];
     if (name) args.push(`--name=${name}`);
     if (parent) args.push(`--parent=${parent}`);
     if (replace) args.push(`--replace=${replace}`);

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

@@ -104,6 +104,85 @@ describe('gog_drive_upload', () => {
     expect(lib.runOrDiagnose).not.toHaveBeenCalled();
   });
 
+  // ==========================================================================
+  // INLINE CONTENT — uploading a file the caller holds but the gog server does
+  // not, which is every remote deployment. `content` replaces the positional
+  // localPath with a temp file the executor materializes beside gog.
+  // ==========================================================================
+  describe('content (inline bytes)', () => {
+    const PNG = Buffer.from([0x89, 0x50, 0x4e, 0x47]).toString('base64');
+
+    it('materializes content as the POSITIONAL path argument', async () => {
+      await harness.callTool('gog_drive_upload', { content: PNG, name: 'pendant-layouts.png' });
+      expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+        [
+          'drive', 'upload',
+          { kind: 'file', flag: 'localPath', contents: PNG, encoding: 'base64', filename: 'pendant-layouts.png', positional: true },
+          '--name=pendant-layouts.png',
+        ],
+        { account: undefined },
+      );
+    });
+
+    it('carries the caller mimeType through, which gog CAN honour here', async () => {
+      await harness.callTool('gog_drive_upload', { content: PNG, name: 'a.png', mimeType: 'image/png' });
+      const args = vi.mocked(lib.runOrDiagnose).mock.calls[0][0];
+      expect(args).toContain('--mime-type=image/png');
+    });
+
+    it('rejects supplying BOTH localPath and content — never a precedence rule', async () => {
+      const result = await harness.callTool('gog_drive_upload', { localPath: '/tmp/x.png', content: PNG, name: 'x.png' });
+      expect(result.isError).toBe(true);
+      expect(result.content[0].text).toMatch(/Pass exactly one of localPath or content/);
+      expect(lib.runOrDiagnose).not.toHaveBeenCalled();
+    });
+
+    it('rejects supplying NEITHER localPath nor content', async () => {
+      const result = await harness.callTool('gog_drive_upload', { name: 'x.png' });
+      expect(result.isError).toBe(true);
+      expect(result.content[0].text).toMatch(/Pass exactly one of localPath or content/);
+      expect(lib.runOrDiagnose).not.toHaveBeenCalled();
+    });
+
+    it('requires name with content, since there is no path to derive it from', async () => {
+      const result = await harness.callTool('gog_drive_upload', { content: PNG });
+      expect(result.isError).toBe(true);
+      expect(result.content[0].text).toMatch(/content requires name/);
+      expect(lib.runOrDiagnose).not.toHaveBeenCalled();
+    });
+
+    it('rejects invalid base64 rather than uploading a corrupt file', async () => {
+      const result = await harness.callTool('gog_drive_upload', { content: 'not!base64!', name: 'a.png' });
+      expect(result.isError).toBe(true);
+      expect(result.content[0].text).toMatch(/not valid base64/);
+      expect(lib.runOrDiagnose).not.toHaveBeenCalled();
+    });
+
+    it('rejects content over the 8 MiB ceiling with a message naming the limit', async () => {
+      const result = await harness.callTool('gog_drive_upload', {
+        content: Buffer.alloc(8 * 1024 * 1024 + 1).toString('base64'),
+        name: 'huge.bin',
+      });
+      expect(result.isError).toBe(true);
+      expect(result.content[0].text).toMatch(/per-file limit/);
+      expect(lib.runOrDiagnose).not.toHaveBeenCalled();
+    });
+
+    it('keeps a spaced, non-ASCII name intact as the Drive filename', async () => {
+      await harness.callTool('gog_drive_upload', { content: PNG, name: 'Reçu — étude 2026.png' });
+      const args = vi.mocked(lib.runOrDiagnose).mock.calls[0][0];
+      expect(args[2]).toMatchObject({ filename: 'Reçu — étude 2026.png' });
+      expect(args).toContain('--name=Reçu — étude 2026.png');
+    });
+
+    // The existing path-based contract must be untouched: a plain string
+    // positional, no file arg, for every local stdio caller that has one.
+    it('leaves the localPath path unchanged', async () => {
+      await harness.callTool('gog_drive_upload', { localPath: '/tmp/x.txt' });
+      expect(lib.runOrDiagnose).toHaveBeenCalledWith(['drive', 'upload', '/tmp/x.txt'], { account: undefined });
+    });
+  });
+
   // No gog read command surfaces the Drive `version` int: driveFileGetFields
   // and info_via_drive.go both omit it, and `drive upload` itself is the only
   // caller that requests it. `drive raw` (fields=*) is the sole way to read it,