gogcli-mcp 2.18.1 → 2.18.3

package/.claude-plugin/marketplace.json

@@ -7,7 +7,7 @@
   },
   "metadata": {
     "description": "Google Sheets (and more) for Claude via gogcli — read, write, and manage spreadsheets",
-    "version": "2.18.1"
+    "version": "2.18.3"
   },
   "plugins": [
     {
@@ -15,7 +15,7 @@
       "displayName": "gogcli",
       "source": "./",
       "description": "Google Sheets (and more) for Claude via gogcli — read, write, and manage spreadsheets",
-      "version": "2.18.1",
+      "version": "2.18.3",
       "author": {
         "name": "Chris Hall"
       },

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "gogcli-mcp",
   "displayName": "gogcli",
-  "version": "2.18.1",
+  "version": "2.18.3",
   "description": "Google Sheets (and more) for Claude via gogcli — read, write, and manage spreadsheets",
   "author": {
     "name": "Chris Hall",

package/dist/index.js

@@ -31271,7 +31271,7 @@ async function run(args, options = {}) {
     }
     return redact(output);
   } catch (err) {
-    throw new Error(redact(err.message));
+    throw new Error(redact(err instanceof Error ? err.message : String(err)));
   }
 }
 async function runBinary(args, options = {}) {
@@ -32412,7 +32412,9 @@ function registerDriveTools(server) {
             `--params=${params}`,
             `--body=${body}`
           ],
-          { account }
+          // OCR on a large scanned PDF routinely outruns the default 30s.
+          // Same precedent as the interactive auth flow in tools/auth.ts.
+          { account, timeout: 3e5 }
         ));
         tempDocId = copied.id ?? copied.result?.id;
         if (!tempDocId) throw new Error("OCR conversion did not return a document id");
@@ -32455,14 +32457,16 @@ function registerDriveTools(server) {
       const { name, mimeType } = fileMeta(await run(["drive", "get", fileId], { account }));
       const params = JSON.stringify({ fileId, alt: "media" });
       const blob = await runBinary(["api", "call", "drive", "v3", "files.get", `--params=${params}`], { account });
+      const type = mimeType ?? "application/octet-stream";
+      const unrenderableHint = type.startsWith("image/") ? "" : ` If your client does not render a ${type} resource, gog_drive_extract_text returns the same file as text (PDFs included, via OCR).`;
       return {
         content: [
-          { type: "text", text: `${name ?? fileId} (${mimeType ?? "application/octet-stream"}) \u2014 ${Buffer.from(blob, "base64").length} bytes, base64 resource below.` },
+          { type: "text", text: `${name ?? fileId} (${type}) \u2014 ${Buffer.from(blob, "base64").length} bytes, base64 resource below.${unrenderableHint}` },
           {
             type: "resource",
             resource: {
               uri: `gogdrive://${fileId}/${encodeURIComponent(name ?? "file")}`,
-              mimeType: mimeType ?? "application/octet-stream",
+              mimeType: type,
               blob
             }
           }
@@ -32855,7 +32859,7 @@ function registerTasksTools(server) {
 }
 
 // src/server.ts
-var VERSION = true ? "2.18.1" : "0.0.0";
+var VERSION = true ? "2.18.3" : "0.0.0";
 var BASE_TOOL_REGISTRARS = [
   registerApiTools,
   registerAuthTools,

package/dist/lib.js

@@ -23169,7 +23169,7 @@ async function run(args, options = {}) {
     }
     return redact(output);
   } catch (err) {
-    throw new Error(redact(err.message));
+    throw new Error(redact(err instanceof Error ? err.message : String(err)));
   }
 }
 async function runBinary(args, options = {}) {
@@ -24318,7 +24318,9 @@ function registerDriveTools(server) {
             `--params=${params}`,
             `--body=${body}`
           ],
-          { account }
+          // OCR on a large scanned PDF routinely outruns the default 30s.
+          // Same precedent as the interactive auth flow in tools/auth.ts.
+          { account, timeout: 3e5 }
         ));
         tempDocId = copied.id ?? copied.result?.id;
         if (!tempDocId) throw new Error("OCR conversion did not return a document id");
@@ -24361,14 +24363,16 @@ function registerDriveTools(server) {
       const { name, mimeType } = fileMeta(await run(["drive", "get", fileId], { account }));
       const params = JSON.stringify({ fileId, alt: "media" });
       const blob = await runBinary(["api", "call", "drive", "v3", "files.get", `--params=${params}`], { account });
+      const type = mimeType ?? "application/octet-stream";
+      const unrenderableHint = type.startsWith("image/") ? "" : ` If your client does not render a ${type} resource, gog_drive_extract_text returns the same file as text (PDFs included, via OCR).`;
       return {
         content: [
-          { type: "text", text: `${name ?? fileId} (${mimeType ?? "application/octet-stream"}) \u2014 ${Buffer.from(blob, "base64").length} bytes, base64 resource below.` },
+          { type: "text", text: `${name ?? fileId} (${type}) \u2014 ${Buffer.from(blob, "base64").length} bytes, base64 resource below.${unrenderableHint}` },
           {
             type: "resource",
             resource: {
               uri: `gogdrive://${fileId}/${encodeURIComponent(name ?? "file")}`,
-              mimeType: mimeType ?? "application/octet-stream",
+              mimeType: type,
               blob
             }
           }
@@ -24761,7 +24765,7 @@ function registerTasksTools(server) {
 }
 
 // src/server.ts
-var VERSION = true ? "2.18.1" : "0.0.0";
+var VERSION = true ? "2.18.3" : "0.0.0";
 var BASE_TOOL_REGISTRARS = [
   registerApiTools,
   registerAuthTools,

package/manifest.json

@@ -3,7 +3,7 @@
   "manifest_version": "0.3",
   "name": "gogcli-mcp",
   "display_name": "gogcli",
-  "version": "2.18.1",
+  "version": "2.18.3",
   "description": "Google Sheets (and more) for Claude via gogcli — read, write, and manage spreadsheets",
   "author": {
     "name": "Chris Hall",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gogcli-mcp",
-  "version": "2.18.1",
+  "version": "2.18.3",
   "mcpName": "io.github.chrischall/gogcli-mcp",
   "description": "MCP server wrapping gogcli for Google service access",
   "author": "Claude Code (AI) <https://www.anthropic.com/claude>",

package/server.json

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

package/src/runner.ts

@@ -340,7 +340,10 @@ export async function run(args: GogArg[], options: RunOptions = {}): Promise<str
     }
     return redact(output);
   } catch (err) {
-    throw new Error(redact((err as Error).message));
+    // A thrown non-Error would make `.message` undefined and redact() blow up
+    // with a TypeError, masking the real failure. Same instanceof guard the
+    // codebase already uses in errorText() (tools/utils.ts).
+    throw new Error(redact(err instanceof Error ? err.message : String(err)));
   }
 }
 

package/src/tools/drive.ts

@@ -168,7 +168,9 @@ export function registerDriveTools(server: McpServer): void {
         const copied = JSON.parse(await run(
           ['api', 'call', 'drive', 'v3', 'files.copy', '--allow-write', '--force',
             `--params=${params}`, `--body=${body}`],
-          { account },
+          // OCR on a large scanned PDF routinely outruns the default 30s.
+          // Same precedent as the interactive auth flow in tools/auth.ts.
+          { account, timeout: 300_000 },
         )) as { id?: string; result?: { id?: string } };
         tempDocId = copied.id ?? copied.result?.id;
         if (!tempDocId) throw new Error('OCR conversion did not return a document id');
@@ -219,14 +221,24 @@ export function registerDriveTools(server: McpServer): void {
       const { name, mimeType } = fileMeta(await run(['drive', 'get', fileId], { account }));
       const params = JSON.stringify({ fileId, alt: 'media' });
       const blob = await runBinary(['api', 'call', 'drive', 'v3', 'files.get', `--params=${params}`], { account });
+      const type = mimeType ?? 'application/octet-stream';
+      // Several hosts (claude.ai among them) render embedded IMAGE resources
+      // and reject every other type outright — "Resources of type
+      // 'application/pdf' are not currently supported". The fetch succeeded and
+      // the bytes are right here, but the caller sees only the text block, so
+      // that text has to carry the way out rather than end on "resource below".
+      const unrenderableHint = type.startsWith('image/')
+        ? ''
+        : ` If your client does not render a ${type} resource, gog_drive_extract_text`
+          + ' returns the same file as text (PDFs included, via OCR).';
       return {
         content: [
-          { type: 'text', text: `${name ?? fileId} (${mimeType ?? 'application/octet-stream'}) — ${Buffer.from(blob, 'base64').length} bytes, base64 resource below.` },
+          { type: 'text', text: `${name ?? fileId} (${type}) — ${Buffer.from(blob, 'base64').length} bytes, base64 resource below.${unrenderableHint}` },
           {
             type: 'resource',
             resource: {
               uri: `gogdrive://${fileId}/${encodeURIComponent(name ?? 'file')}`,
-              mimeType: mimeType ?? 'application/octet-stream',
+              mimeType: type,
               blob,
             },
           },

package/src/worker.ts

@@ -38,7 +38,7 @@ import { gogAuth, type GogProps } from './connector-auth.js';
 // connector with all ~360 tools at once. Add whichever paths you want as separate
 // connectors in claude.ai (each authorizes with the same connector key).
 
-const VERSION = '2.18.1'; // x-release-please-version
+const VERSION = '2.18.3'; // x-release-please-version
 
 // Build an McpAgent subclass whose init() registers `registrars` onto its server,
 // each handler wrapped in the ALS scope carrying the per-session Fly executor.

package/tests/runner.test.ts

@@ -202,6 +202,14 @@ describe('run', () => {
       .rejects.toThrow('gog exited with code 2');
   });
 
+  it('surfaces a non-Error throw instead of masking it with a TypeError', async () => {
+    // A custom executor that throws a string used to reach `(err as Error).message`
+    // -> undefined -> redact(undefined) -> TypeError, hiding the real cause.
+    const spawner = vi.fn(() => { throw 'gog binary vanished'; }) as unknown as Spawner;
+    await expect(run(['sheets', 'get', 'x', 'A1'], { spawner }))
+      .rejects.toThrow('gog binary vanished');
+  });
+
   it('rejects on spawn error', async () => {
     const spawner = vi.fn(() => {
       const proc = new EventEmitter() as ReturnType<Spawner>;

package/tests/tools/drive.test.ts

@@ -244,10 +244,13 @@ describe('gog_drive_extract_text', () => {
     const j = JSON.parse(result.content[0].text as string);
     expect(j).toMatchObject({ fileId: 'pdf1', name: 'Guest_Copy.pdf', mimeType: 'application/pdf', extractedVia: 'ocr-convert' });
     expect(j.text).toBe('UTOPIA OF THE SEAS itinerary'); // BOM stripped
+    // The copy is the OCR pass itself and carries an extended timeout: a large
+    // scanned PDF routinely outruns the runner's 30s default, and the whole
+    // conversion is wasted when it does.
     expect(runner.run).toHaveBeenCalledWith(
       ['api', 'call', 'drive', 'v3', 'files.copy', '--allow-write', '--force',
         '--params={"fileId":"pdf1"}', '--body={"name":"gogcli-ocr-pdf1","mimeType":"application/vnd.google-apps.document"}'],
-      { account: undefined },
+      { account: undefined, timeout: 300_000 },
     );
     expect(runner.run).toHaveBeenCalledWith(
       ['api', 'call', 'drive', 'v3', 'files.export', '--params={"fileId":"tmpDoc1","mimeType":"text/plain"}'],
@@ -267,7 +270,7 @@ describe('gog_drive_extract_text', () => {
     expect(runner.run).toHaveBeenCalledWith(
       ['api', 'call', 'drive', 'v3', 'files.copy', '--allow-write', '--force',
         '--params={"fileId":"pdf1","ocrLanguage":"fr"}', '--body={"name":"gogcli-ocr-pdf1","mimeType":"application/vnd.google-apps.document"}'],
-      { account: undefined },
+      { account: undefined, timeout: 300_000 },
     );
     expect(runner.run).toHaveBeenCalledWith(['drive', 'delete', 'tmpDoc2', '--permanent', '--force'], { account: undefined });
   });
@@ -368,6 +371,25 @@ describe('gog_drive_read_bytes', () => {
     );
   });
 
+  it('names the text fallback when the resource type is one hosts refuse to render', async () => {
+    // The bytes arrive fine; some hosts just drop a non-image embedded resource
+    // ("Resources of type 'application/pdf' are not currently supported"), and
+    // then the text block is all the caller gets.
+    vi.mocked(runner.run).mockResolvedValueOnce(JSON.stringify({ file: { name: 'a.pdf', mimeType: 'application/pdf' } }));
+    vi.mocked(runner.runBinary).mockResolvedValueOnce(Buffer.from('%PDF-1.4').toString('base64'));
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_drive_read_bytes', { fileId: 'f1' });
+    expect(result.content[0].text).toContain('gog_drive_extract_text');
+  });
+
+  it('does not add the fallback hint for an image, which hosts do render', async () => {
+    vi.mocked(runner.run).mockResolvedValueOnce(JSON.stringify({ file: { name: 'a.png', mimeType: 'image/png' } }));
+    vi.mocked(runner.runBinary).mockResolvedValueOnce(Buffer.from('x').toString('base64'));
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_drive_read_bytes', { fileId: 'f3' });
+    expect(result.content[0].text).not.toContain('gog_drive_extract_text');
+  });
+
   it('falls back to octet-stream and "file" when metadata lacks name/mime', async () => {
     vi.mocked(runner.run).mockResolvedValueOnce('{}');
     vi.mocked(runner.runBinary).mockResolvedValueOnce(Buffer.from('x').toString('base64'));