gogcli-mcp-contacts 2.23.1 → 2.23.2

package/dist/index.js

@@ -31542,6 +31542,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."
@@ -31570,9 +31590,19 @@ 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 registerRunTool(server, options) {
@@ -31647,7 +31677,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);
   }
@@ -31883,7 +31913,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([
@@ -32396,14 +32426,16 @@ function registerExtraContactsTools(server) {
     inputSchema: {
       query: external_exports.string().describe("Search query (name, email, etc.)"),
       max: external_exports.number().optional().describe("Max results (default: 50)"),
-      page: external_exports.string().optional().describe("Page token"),
+      pageToken: pageTokenParam,
+      page: pageAliasParam,
       all: external_exports.boolean().optional().describe("Fetch all pages"),
       account: accountParam
     }
-  }, async ({ query, max, page, all, account }) => {
+  }, async ({ query, max, pageToken, page, all, account }) => {
     const args = ["people", "search", query];
     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");
     return runOrDiagnose(args, { account });
   });
@@ -32472,17 +32504,19 @@ function registerExtraContactsTools(server) {
       all: external_exports.boolean().optional().describe("Export all personal contacts"),
       out: external_exports.string().optional().describe("Output path (.vcf), or - for stdout (default: stdout)"),
       max: external_exports.number().optional().describe("Max results for query (1-30)"),
-      page: external_exports.string().optional().describe("Start page token for all"),
+      pageToken: pageTokenParam,
+      page: pageAliasParam,
       account: accountParam
     }
-  }, async ({ selector, query, all, out, max, page, account }) => {
+  }, async ({ selector, query, all, out, max, pageToken, page, account }) => {
     const args = ["contacts", "export"];
     if (selector) args.push(selector);
     if (query) args.push(`--query=${query}`);
     if (all) args.push("--all");
     if (out) args.push(`--out=${out}`);
     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_contacts_dedupe", {
@@ -32511,14 +32545,16 @@ function registerExtraContactsTools(server) {
     annotations: { readOnlyHint: true },
     inputSchema: {
       max: external_exports.number().optional().describe("Max results (default: 50)"),
-      page: external_exports.string().optional().describe("Page token"),
+      pageToken: pageTokenParam,
+      page: pageAliasParam,
       all: external_exports.boolean().optional().describe("Fetch all pages"),
       account: accountParam
     }
-  }, async ({ max, page, all, account }) => {
+  }, async ({ max, pageToken, page, all, account }) => {
     const args = ["contacts", "directory", "list"];
     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");
     return runOrDiagnose(args, { account });
   });
@@ -32527,14 +32563,16 @@ function registerExtraContactsTools(server) {
     annotations: { readOnlyHint: true },
     inputSchema: {
       max: external_exports.number().optional().describe("Max results (default: 100)"),
-      page: external_exports.string().optional().describe("Page token"),
+      pageToken: pageTokenParam,
+      page: pageAliasParam,
       all: external_exports.boolean().optional().describe("Fetch all pages"),
       account: accountParam
     }
-  }, async ({ max, page, all, account }) => {
+  }, async ({ max, pageToken, page, all, account }) => {
     const args = ["contacts", "other", "list"];
     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");
     return runOrDiagnose(args, { account });
   });

package/manifest.json

@@ -3,7 +3,7 @@
   "manifest_version": "0.3",
   "name": "gogcli-mcp-contacts",
   "display_name": "gogcli (Contacts)",
-  "version": "2.23.1",
+  "version": "2.23.2",
   "description": "Extended Google Contacts for Claude via gogcli — auth + Contacts + Workspace directory (People API)",
   "author": {
     "name": "Chris Hall",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gogcli-mcp-contacts",
-  "version": "2.23.1",
+  "version": "2.23.2",
   "mcpName": "io.github.chrischall/gogcli-mcp-contacts",
   "description": "Extended Google Contacts + People MCP server via gogcli — auth + Contacts + Workspace directory (People API)",
   "author": "Claude Code (AI) <https://www.anthropic.com/claude>",

package/src/tools/contacts-extra.ts

@@ -1,6 +1,6 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { z } from 'zod';
-import { accountParam, runOrDiagnose } from '../../../gogcli-mcp/src/lib.js';
+import { accountParam, runOrDiagnose, pageTokenParam, pageAliasParam, resolvePageToken} from '../../../gogcli-mcp/src/lib.js';
 
 // People is the richer API behind Google Contacts: Workspace directory
 // search, profile fields, and relations.
@@ -32,14 +32,16 @@ export function registerExtraContactsTools(server: McpServer): void {
     inputSchema: {
       query: z.string().describe('Search query (name, email, etc.)'),
       max: z.number().optional().describe('Max results (default: 50)'),
-      page: z.string().optional().describe('Page token'),
+      pageToken: pageTokenParam,
+      page: pageAliasParam,
       all: z.boolean().optional().describe('Fetch all pages'),
       account: accountParam,
     },
-  }, async ({ query, max, page, all, account }) => {
+  }, async ({ query, max, pageToken, page, all, account }) => {
     const args = ['people', 'search', query];
     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');
     return runOrDiagnose(args, { account });
   });
@@ -112,17 +114,19 @@ export function registerExtraContactsTools(server: McpServer): void {
       all: z.boolean().optional().describe('Export all personal contacts'),
       out: z.string().optional().describe('Output path (.vcf), or - for stdout (default: stdout)'),
       max: z.number().optional().describe('Max results for query (1-30)'),
-      page: z.string().optional().describe('Start page token for all'),
+      pageToken: pageTokenParam,
+      page: pageAliasParam,
       account: accountParam,
     },
-  }, async ({ selector, query, all, out, max, page, account }) => {
+  }, async ({ selector, query, all, out, max, pageToken, page, account }) => {
     const args = ['contacts', 'export'];
     if (selector) args.push(selector);
     if (query) args.push(`--query=${query}`);
     if (all) args.push('--all');
     if (out) args.push(`--out=${out}`);
     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 });
   });
 
@@ -153,14 +157,16 @@ export function registerExtraContactsTools(server: McpServer): void {
     annotations: { readOnlyHint: true },
     inputSchema: {
       max: z.number().optional().describe('Max results (default: 50)'),
-      page: z.string().optional().describe('Page token'),
+      pageToken: pageTokenParam,
+      page: pageAliasParam,
       all: z.boolean().optional().describe('Fetch all pages'),
       account: accountParam,
     },
-  }, async ({ max, page, all, account }) => {
+  }, async ({ max, pageToken, page, all, account }) => {
     const args = ['contacts', 'directory', 'list'];
     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');
     return runOrDiagnose(args, { account });
   });
@@ -170,14 +176,16 @@ export function registerExtraContactsTools(server: McpServer): void {
     annotations: { readOnlyHint: true },
     inputSchema: {
       max: z.number().optional().describe('Max results (default: 100)'),
-      page: z.string().optional().describe('Page token'),
+      pageToken: pageTokenParam,
+      page: pageAliasParam,
       all: z.boolean().optional().describe('Fetch all pages'),
       account: accountParam,
     },
-  }, async ({ max, page, all, account }) => {
+  }, async ({ max, pageToken, page, all, account }) => {
     const args = ['contacts', 'other', 'list'];
     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');
     return runOrDiagnose(args, { account });
   });