gogcli-mcp-drive 2.23.1 → 2.23.2

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

package/.claude-plugin/plugin.json

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

@@ -31552,6 +31552,26 @@ function normalizeTimestamps(text, tz = displayTimeZone(), naiveTz = naiveSource
   return JSON.stringify(parsed, null, detectIndent(text));
 }
 
+// ../gogcli-mcp/src/pagination.ts
+function detectIndent2(text) {
+  const match = /\n(\s+)\S/.exec(text);
+  return match ? match[1].replace(/\t/g, "  ").length : 0;
+}
+function stripConsumedPageToken(text) {
+  const trimmed = text.trim();
+  if (trimmed === "" || !trimmed.startsWith("{")) return text;
+  let parsed;
+  try {
+    parsed = JSON.parse(trimmed);
+  } catch {
+    return text;
+  }
+  const obj = parsed;
+  if (obj.nextPageToken !== "") return text;
+  delete obj.nextPageToken;
+  return JSON.stringify(obj, null, detectIndent2(text));
+}
+
 // ../gogcli-mcp/src/tools/utils.ts
 var accountParam = external_exports.string().optional().describe(
   "Google account email to use, e.g. you@gmail.com \u2014 must be the full address, not a bare username. Overrides the GOG_ACCOUNT env var. Omit to use the single configured account."
@@ -31580,14 +31600,25 @@ var ids = {
   // People API uses fully-qualified resource names ("people/c123") not bare IDs.
   person: external_exports.string().describe("Person resource name (people/...) or email")
 };
+var pageTokenParam = external_exports.string().optional().describe(
+  "Cursor for the NEXT page. Pass back the nextPageToken from a previous response verbatim, keeping the query and max identical: call once, then call again with pageToken=<that value>. A response with NO nextPageToken is the last page."
+);
+var pageAliasParam = external_exports.string().optional().describe(
+  "Deprecated alias for pageToken, accepted so existing callers keep working. Use pageToken \u2014 it matches the nextPageToken field in the response."
+);
+function resolvePageToken(p) {
+  return p.pageToken ?? p.page;
+}
 var paginationParams = {
   max: external_exports.number().int().optional().describe("Max results"),
-  page: external_exports.string().optional().describe("Page token"),
+  pageToken: pageTokenParam,
+  page: pageAliasParam,
   all: external_exports.boolean().optional().describe("Fetch all pages")
 };
 function pushPaginationFlags(args, p) {
   if (p.max !== void 0) args.push(`--max=${p.max}`);
-  if (p.page) args.push(`--page=${p.page}`);
+  const token = resolvePageToken(p);
+  if (token) args.push(`--page=${token}`);
   if (p.all) args.push("--all");
 }
 function registerRunTool(server, options) {
@@ -31662,7 +31693,7 @@ ${accounts || "(none)"}${hint}`);
 async function runOrDiagnose(args, options) {
   try {
     const raw = await run(args, options);
-    return rawTextResult(options.lossless ? raw : normalizeTimestamps(raw));
+    return rawTextResult(options.lossless ? raw : stripConsumedPageToken(normalizeTimestamps(raw)));
   } catch (err) {
     return diagnose(err);
   }
@@ -31847,16 +31878,18 @@ function registerDriveTools(server) {
     inputSchema: {
       folderId: external_exports.string().optional().describe("Folder ID to list (default: root)"),
       max: external_exports.number().optional().describe("Max results (default: 20)"),
-      page: external_exports.string().optional().describe("Page token for pagination"),
+      pageToken: pageTokenParam,
+      page: pageAliasParam,
       query: external_exports.string().optional().describe(`Drive query filter (e.g. "name contains 'budget'")`),
       allDrives: external_exports.boolean().optional().describe("Include shared drives (default: true). Set false for My Drive only."),
       account: accountParam
     }
-  }, async ({ folderId, max, page, query, allDrives, account }) => {
+  }, async ({ folderId, max, pageToken, page, query, allDrives, account }) => {
     const args = ["drive", "ls"];
     if (folderId) args.push(`--parent=${folderId}`);
     if (max !== void 0) args.push(`--max=${max}`);
-    if (page) args.push(`--page=${page}`);
+    const token = resolvePageToken({ pageToken, page });
+    if (token) args.push(`--page=${token}`);
     if (query) args.push(`--query=${query}`);
     if (allDrives === false) args.push("--no-all-drives");
     return runOrDiagnose(args, { account });
@@ -32056,7 +32089,7 @@ var failIfNotEmptyParam = external_exports.boolean().optional().describe(
 );
 
 // ../gogcli-mcp/src/server.ts
-var VERSION = true ? "2.23.1" : "0.0.0";
+var VERSION = true ? "2.23.2" : "0.0.0";
 
 // ../gogcli-mcp/src/auth-log.ts
 var FAILURES = /* @__PURE__ */ new Set([
@@ -32638,13 +32671,15 @@ function registerExtraDriveTools(server) {
     inputSchema: {
       fileId: external_exports.string().describe("File ID"),
       max: external_exports.number().optional().describe("Max results (default: 100)"),
-      page: external_exports.string().optional().describe("Page token"),
+      pageToken: pageTokenParam,
+      page: pageAliasParam,
       account: accountParam
     }
-  }, async ({ fileId, max, page, account }) => {
+  }, async ({ fileId, max, pageToken, page, account }) => {
     const args = ["drive", "permissions", fileId];
     if (max !== void 0) args.push(`--max=${max}`);
-    if (page) args.push(`--page=${page}`);
+    const token = resolvePageToken({ pageToken, page });
+    if (token) args.push(`--page=${token}`);
     return runOrDiagnose(args, { account });
   });
   server.registerTool("gog_drive_unshare", {
@@ -32663,15 +32698,17 @@ function registerExtraDriveTools(server) {
     annotations: { readOnlyHint: true },
     inputSchema: {
       max: external_exports.number().optional().describe("Max results (default: 100, max allowed: 100)"),
-      page: external_exports.string().optional().describe("Page token"),
+      pageToken: pageTokenParam,
+      page: pageAliasParam,
       all: external_exports.boolean().optional().describe("Fetch all pages"),
       query: external_exports.string().optional().describe("Search query for filtering shared drives"),
       account: accountParam
     }
-  }, async ({ max, page, all, query, account }) => {
+  }, async ({ max, pageToken, page, all, query, account }) => {
     const args = ["drive", "drives"];
     if (max !== void 0) args.push(`--max=${max}`);
-    if (page) args.push(`--page=${page}`);
+    const token = resolvePageToken({ pageToken, page });
+    if (token) args.push(`--page=${token}`);
     if (all) args.push("--all");
     if (query) args.push(`--query=${query}`);
     return runOrDiagnose(args, { account });
@@ -32831,16 +32868,18 @@ function registerExtraDriveTools(server) {
     inputSchema: {
       token: external_exports.string().describe("Start page token or next page token"),
       max: external_exports.number().optional().describe("Max results (default: 100)"),
-      page: external_exports.string().optional().describe("Alias for token when continuing a page"),
+      pageToken: pageTokenParam,
+      page: pageAliasParam,
       all: external_exports.boolean().optional().describe("Fetch all pages"),
       includeRemoved: external_exports.boolean().optional().describe("Include removed changes"),
       drive: external_exports.string().optional().describe("Shared drive ID for a shared-drive change log"),
       account: accountParam
     }
-  }, async ({ token, max, page, all, includeRemoved, drive, account }) => {
+  }, async ({ token, max, pageToken, page, all, includeRemoved, drive, account }) => {
     const args = ["drive", "changes", "list", `--token=${token}`];
     if (max !== void 0) args.push(`--max=${max}`);
-    if (page) args.push(`--page=${page}`);
+    const cursor = resolvePageToken({ pageToken, page });
+    if (cursor) args.push(`--page=${cursor}`);
     if (all) args.push("--all");
     if (includeRemoved) args.push("--include-removed");
     if (drive) args.push(`--drive=${drive}`);
@@ -32892,10 +32931,16 @@ function registerExtraDriveTools(server) {
       minimumRole: external_exports.string().optional().describe("Minimum role filter (e.g. READER, APPLIER, ORGANIZER)"),
       publishedOnly: external_exports.boolean().optional().describe("Only list published labels"),
       adminAccess: external_exports.boolean().optional().describe("Use admin access for Workspace admin accounts"),
+      max: external_exports.number().int().optional().describe("Max results"),
+      pageToken: pageTokenParam,
+      page: pageAliasParam,
       account: accountParam
     }
-  }, async ({ language, view, minimumRole, publishedOnly, adminAccess, account }) => {
+  }, async ({ language, view, minimumRole, publishedOnly, adminAccess, max, pageToken, page, account }) => {
     const args = ["drive", "labels", "list"];
+    if (max !== void 0) args.push(`--max=${max}`);
+    const token = resolvePageToken({ pageToken, page });
+    if (token) args.push(`--page=${token}`);
     if (language) args.push(`--language=${language}`);
     if (view) args.push(`--view=${view}`);
     if (minimumRole) args.push(`--minimum-role=${minimumRole}`);
@@ -32926,13 +32971,15 @@ function registerExtraDriveTools(server) {
     inputSchema: {
       fileId: external_exports.string().describe("File ID"),
       max: external_exports.number().optional().describe("Max results (default: 100)"),
-      page: external_exports.string().optional().describe("Page token"),
+      pageToken: pageTokenParam,
+      page: pageAliasParam,
       account: accountParam
     }
-  }, async ({ fileId, max, page, account }) => {
+  }, async ({ fileId, max, pageToken, page, account }) => {
     const args = ["drive", "labels", "file", "list", fileId];
     if (max !== void 0) args.push(`--max=${max}`);
-    if (page) args.push(`--page=${page}`);
+    const token = resolvePageToken({ pageToken, page });
+    if (token) args.push(`--page=${token}`);
     return runOrDiagnose(args, { account });
   });
   server.registerTool("gog_drive_labels_file_apply", {
@@ -32982,12 +33029,13 @@ function registerExtraDriveTools(server) {
       to: external_exports.string().optional().describe("Upper activity time bound (RFC3339)"),
       filter: external_exports.string().optional().describe("Raw Drive Activity filter expression appended with AND"),
       max: external_exports.number().optional().describe("Page size (default: 10)"),
-      page: external_exports.string().optional().describe("Page token"),
+      pageToken: pageTokenParam,
+      page: pageAliasParam,
       all: external_exports.boolean().optional().describe("Fetch all pages"),
       consolidate: external_exports.boolean().optional().describe("Use Drive Activity legacy consolidation strategy"),
       account: accountParam
     }
-  }, async ({ file: file2, folder, actions, from, to, filter, max, page, all, consolidate, account }) => {
+  }, async ({ file: file2, folder, actions, from, to, filter, max, pageToken, page, all, consolidate, account }) => {
     const args = ["drive", "activity", "query"];
     if (file2) args.push(`--file=${file2}`);
     if (folder) args.push(`--folder=${folder}`);
@@ -32996,7 +33044,8 @@ function registerExtraDriveTools(server) {
     if (to) args.push(`--to=${to}`);
     if (filter) args.push(`--filter=${filter}`);
     if (max !== void 0) args.push(`--max=${max}`);
-    if (page) args.push(`--page=${page}`);
+    const token = resolvePageToken({ pageToken, page });
+    if (token) args.push(`--page=${token}`);
     if (all) args.push("--all");
     if (consolidate) args.push("--consolidate");
     return runOrDiagnose(args, { account });

package/manifest.json

@@ -3,7 +3,7 @@
   "manifest_version": "0.3",
   "name": "gogcli-mcp-drive",
   "display_name": "gogcli (Drive)",
-  "version": "2.23.1",
+  "version": "2.23.2",
   "description": "Extended Google Drive for Claude via gogcli — auth + full Drive support (upload, download, permissions, comments, shared drives)",
   "author": {
     "name": "Chris Hall",
@@ -227,7 +227,7 @@
     },
     {
       "name": "gog_drive_labels_list",
-      "description": "List Drive label schemas"
+      "description": "List Drive label schemas available to the account; paginated"
     },
     {
       "name": "gog_drive_labels_get",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gogcli-mcp-drive",
-  "version": "2.23.1",
+  "version": "2.23.2",
   "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.1",
+  "version": "2.23.2",
   "packages": [
     {
       "registryType": "npm",
       "identifier": "gogcli-mcp-drive",
-      "version": "2.23.1",
+      "version": "2.23.2",
       "transport": {
         "type": "stdio"
       },

package/src/tools/drive-extra.ts

@@ -1,6 +1,6 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { z } from 'zod';
-import { accountParam, runOrDiagnose, paginationParams, pushPaginationFlags } from '../../../gogcli-mcp/src/lib.js';
+import { accountParam, runOrDiagnose, paginationParams, pushPaginationFlags, pageTokenParam, pageAliasParam, resolvePageToken} from '../../../gogcli-mcp/src/lib.js';
 
 export function registerExtraDriveTools(server: McpServer): void {
   server.registerTool('gog_drive_download', {
@@ -111,13 +111,15 @@ export function registerExtraDriveTools(server: McpServer): void {
     inputSchema: {
       fileId: z.string().describe('File ID'),
       max: z.number().optional().describe('Max results (default: 100)'),
-      page: z.string().optional().describe('Page token'),
+      pageToken: pageTokenParam,
+      page: pageAliasParam,
       account: accountParam,
     },
-  }, async ({ fileId, max, page, account }) => {
+  }, async ({ fileId, max, pageToken, page, account }) => {
     const args = ['drive', 'permissions', fileId];
     if (max !== undefined) args.push(`--max=${max}`);
-    if (page) args.push(`--page=${page}`);
+    const token = resolvePageToken({ pageToken, page });
+    if (token) args.push(`--page=${token}`);
     return runOrDiagnose(args, { account });
   });
 
@@ -138,15 +140,17 @@ export function registerExtraDriveTools(server: McpServer): void {
     annotations: { readOnlyHint: true },
     inputSchema: {
       max: z.number().optional().describe('Max results (default: 100, max allowed: 100)'),
-      page: z.string().optional().describe('Page token'),
+      pageToken: pageTokenParam,
+      page: pageAliasParam,
       all: z.boolean().optional().describe('Fetch all pages'),
       query: z.string().optional().describe('Search query for filtering shared drives'),
       account: accountParam,
     },
-  }, async ({ max, page, all, query, account }) => {
+  }, async ({ max, pageToken, page, all, query, account }) => {
     const args = ['drive', 'drives'];
     if (max !== undefined) args.push(`--max=${max}`);
-    if (page) args.push(`--page=${page}`);
+    const token = resolvePageToken({ pageToken, page });
+    if (token) args.push(`--page=${token}`);
     if (all) args.push('--all');
     if (query) args.push(`--query=${query}`);
     return runOrDiagnose(args, { account });
@@ -320,16 +324,20 @@ export function registerExtraDriveTools(server: McpServer): void {
     inputSchema: {
       token: z.string().describe('Start page token or next page token'),
       max: z.number().optional().describe('Max results (default: 100)'),
-      page: z.string().optional().describe('Alias for token when continuing a page'),
+      pageToken: pageTokenParam,
+      page: pageAliasParam,
       all: z.boolean().optional().describe('Fetch all pages'),
       includeRemoved: z.boolean().optional().describe('Include removed changes'),
       drive: z.string().optional().describe('Shared drive ID for a shared-drive change log'),
       account: accountParam,
     },
-  }, async ({ token, max, page, all, includeRemoved, drive, account }) => {
+  }, async ({ token, max, pageToken, page, all, includeRemoved, drive, account }) => {
     const args = ['drive', 'changes', 'list', `--token=${token}`];
     if (max !== undefined) args.push(`--max=${max}`);
-    if (page) args.push(`--page=${page}`);
+    // NOT `token` — this tool already binds that name to the start-page token
+    // it takes as a required arg, which is a different value entirely.
+    const cursor = resolvePageToken({ pageToken, page });
+    if (cursor) args.push(`--page=${cursor}`);
     if (all) args.push('--all');
     if (includeRemoved) args.push('--include-removed');
     if (drive) args.push(`--drive=${drive}`);
@@ -385,10 +393,16 @@ export function registerExtraDriveTools(server: McpServer): void {
       minimumRole: z.string().optional().describe('Minimum role filter (e.g. READER, APPLIER, ORGANIZER)'),
       publishedOnly: z.boolean().optional().describe('Only list published labels'),
       adminAccess: z.boolean().optional().describe('Use admin access for Workspace admin accounts'),
+      max: z.number().int().optional().describe('Max results'),
+      pageToken: pageTokenParam,
+      page: pageAliasParam,
       account: accountParam,
     },
-  }, async ({ language, view, minimumRole, publishedOnly, adminAccess, account }) => {
+  }, async ({ language, view, minimumRole, publishedOnly, adminAccess, max, pageToken, page, account }) => {
     const args = ['drive', 'labels', 'list'];
+    if (max !== undefined) args.push(`--max=${max}`);
+    const token = resolvePageToken({ pageToken, page });
+    if (token) args.push(`--page=${token}`);
     if (language) args.push(`--language=${language}`);
     if (view) args.push(`--view=${view}`);
     if (minimumRole) args.push(`--minimum-role=${minimumRole}`);
@@ -421,13 +435,15 @@ export function registerExtraDriveTools(server: McpServer): void {
     inputSchema: {
       fileId: z.string().describe('File ID'),
       max: z.number().optional().describe('Max results (default: 100)'),
-      page: z.string().optional().describe('Page token'),
+      pageToken: pageTokenParam,
+      page: pageAliasParam,
       account: accountParam,
     },
-  }, async ({ fileId, max, page, account }) => {
+  }, async ({ fileId, max, pageToken, page, account }) => {
     const args = ['drive', 'labels', 'file', 'list', fileId];
     if (max !== undefined) args.push(`--max=${max}`);
-    if (page) args.push(`--page=${page}`);
+    const token = resolvePageToken({ pageToken, page });
+    if (token) args.push(`--page=${token}`);
     return runOrDiagnose(args, { account });
   });
 
@@ -480,12 +496,13 @@ export function registerExtraDriveTools(server: McpServer): void {
       to: z.string().optional().describe('Upper activity time bound (RFC3339)'),
       filter: z.string().optional().describe('Raw Drive Activity filter expression appended with AND'),
       max: z.number().optional().describe('Page size (default: 10)'),
-      page: z.string().optional().describe('Page token'),
+      pageToken: pageTokenParam,
+      page: pageAliasParam,
       all: z.boolean().optional().describe('Fetch all pages'),
       consolidate: z.boolean().optional().describe('Use Drive Activity legacy consolidation strategy'),
       account: accountParam,
     },
-  }, async ({ file, folder, actions, from, to, filter, max, page, all, consolidate, account }) => {
+  }, async ({ file, folder, actions, from, to, filter, max, pageToken, page, all, consolidate, account }) => {
     const args = ['drive', 'activity', 'query'];
     if (file) args.push(`--file=${file}`);
     if (folder) args.push(`--folder=${folder}`);
@@ -494,7 +511,8 @@ export function registerExtraDriveTools(server: McpServer): void {
     if (to) args.push(`--to=${to}`);
     if (filter) args.push(`--filter=${filter}`);
     if (max !== undefined) args.push(`--max=${max}`);
-    if (page) args.push(`--page=${page}`);
+    const token = resolvePageToken({ pageToken, page });
+    if (token) args.push(`--page=${token}`);
     if (all) args.push('--all');
     if (consolidate) args.push('--consolidate');
     return runOrDiagnose(args, { account });

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

@@ -459,6 +459,22 @@ describe('gog_drive_labels_list', () => {
     await harness.callTool('gog_drive_labels_list', { publishedOnly: false, adminAccess: false });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['drive', 'labels', 'list'], { account: undefined });
   });
+
+  // gog drive labels list is paginated upstream; the tool exposed neither max
+  // nor a cursor, so later pages were unreachable.
+  it('passes --max and --page through', async () => {
+    await harness.callTool('gog_drive_labels_list', { max: 50, pageToken: 'CURSOR' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['drive', 'labels', 'list', '--max=50', '--page=CURSOR'], { account: undefined },
+    );
+  });
+
+  it('accepts the deprecated page alias', async () => {
+    await harness.callTool('gog_drive_labels_list', { page: 'CURSOR' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['drive', 'labels', 'list', '--page=CURSOR'], { account: undefined },
+    );
+  });
 });
 
 describe('gog_drive_labels_get', () => {