gogcli-mcp 2.0.7 → 2.0.9

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.0.7"
+    "version": "2.0.9"
   },
   "plugins": [
     {
@@ -15,7 +15,7 @@
       "displayName": "gogcli",
       "source": "./",
       "description": "Google Sheets (and more) for Claude via gogcli — read, write, and manage spreadsheets",
-      "version": "2.0.7",
+      "version": "2.0.9",
       "author": {
         "name": "Chris Hall"
       },

package/.claude-plugin/plugin.json

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

package/dist/index.js

@@ -3105,6 +3105,9 @@ var require_utils = __commonJS({
     "use strict";
     var isUUID = RegExp.prototype.test.bind(/^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/iu);
     var isIPv4 = RegExp.prototype.test.bind(/^(?:(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)$/u);
+    var isHexPair = RegExp.prototype.test.bind(/^[\da-f]{2}$/iu);
+    var isUnreserved = RegExp.prototype.test.bind(/^[\da-z\-._~]$/iu);
+    var isPathCharacter = RegExp.prototype.test.bind(/^[\da-z\-._~!$&'()*+,;=:@/]$/iu);
     function stringArrayToHexStripped(input) {
       let acc = "";
       let code = 0;
@@ -3297,27 +3300,77 @@ var require_utils = __commonJS({
       }
       return output.join("");
     }
-    function normalizeComponentEncoding(component, esc2) {
-      const func = esc2 !== true ? escape : unescape;
-      if (component.scheme !== void 0) {
-        component.scheme = func(component.scheme);
-      }
-      if (component.userinfo !== void 0) {
-        component.userinfo = func(component.userinfo);
-      }
-      if (component.host !== void 0) {
-        component.host = func(component.host);
+    var HOST_DELIMS = { "@": "%40", "/": "%2F", "?": "%3F", "#": "%23", ":": "%3A" };
+    var HOST_DELIM_RE = /[@/?#:]/g;
+    var HOST_DELIM_NO_COLON_RE = /[@/?#]/g;
+    function reescapeHostDelimiters(host, isIP) {
+      const re = isIP ? HOST_DELIM_NO_COLON_RE : HOST_DELIM_RE;
+      re.lastIndex = 0;
+      return host.replace(re, (ch) => HOST_DELIMS[ch]);
+    }
+    function normalizePercentEncoding(input, decodeUnreserved = false) {
+      if (input.indexOf("%") === -1) {
+        return input;
       }
-      if (component.path !== void 0) {
-        component.path = func(component.path);
+      let output = "";
+      for (let i = 0; i < input.length; i++) {
+        if (input[i] === "%" && i + 2 < input.length) {
+          const hex3 = input.slice(i + 1, i + 3);
+          if (isHexPair(hex3)) {
+            const normalizedHex = hex3.toUpperCase();
+            const decoded = String.fromCharCode(parseInt(normalizedHex, 16));
+            if (decodeUnreserved && isUnreserved(decoded)) {
+              output += decoded;
+            } else {
+              output += "%" + normalizedHex;
+            }
+            i += 2;
+            continue;
+          }
+        }
+        output += input[i];
       }
-      if (component.query !== void 0) {
-        component.query = func(component.query);
+      return output;
+    }
+    function normalizePathEncoding(input) {
+      let output = "";
+      for (let i = 0; i < input.length; i++) {
+        if (input[i] === "%" && i + 2 < input.length) {
+          const hex3 = input.slice(i + 1, i + 3);
+          if (isHexPair(hex3)) {
+            const normalizedHex = hex3.toUpperCase();
+            const decoded = String.fromCharCode(parseInt(normalizedHex, 16));
+            if (decoded !== "." && isUnreserved(decoded)) {
+              output += decoded;
+            } else {
+              output += "%" + normalizedHex;
+            }
+            i += 2;
+            continue;
+          }
+        }
+        if (isPathCharacter(input[i])) {
+          output += input[i];
+        } else {
+          output += escape(input[i]);
+        }
       }
-      if (component.fragment !== void 0) {
-        component.fragment = func(component.fragment);
+      return output;
+    }
+    function escapePreservingEscapes(input) {
+      let output = "";
+      for (let i = 0; i < input.length; i++) {
+        if (input[i] === "%" && i + 2 < input.length) {
+          const hex3 = input.slice(i + 1, i + 3);
+          if (isHexPair(hex3)) {
+            output += "%" + hex3.toUpperCase();
+            i += 2;
+            continue;
+          }
+        }
+        output += escape(input[i]);
       }
-      return component;
+      return output;
     }
     function recomposeAuthority(component) {
       const uriTokens = [];
@@ -3332,7 +3385,7 @@ var require_utils = __commonJS({
           if (ipV6res.isIPV6 === true) {
             host = `[${ipV6res.escapedHost}]`;
           } else {
-            host = component.host;
+            host = reescapeHostDelimiters(host, false);
           }
         }
         uriTokens.push(host);
@@ -3346,7 +3399,10 @@ var require_utils = __commonJS({
     module.exports = {
       nonSimpleDomain,
       recomposeAuthority,
-      normalizeComponentEncoding,
+      reescapeHostDelimiters,
+      normalizePercentEncoding,
+      normalizePathEncoding,
+      escapePreservingEscapes,
       removeDotSegments,
       isIPv4,
       isUUID,
@@ -3570,12 +3626,12 @@ var require_schemes = __commonJS({
 var require_fast_uri = __commonJS({
   "../../node_modules/fast-uri/index.js"(exports, module) {
     "use strict";
-    var { normalizeIPv6, removeDotSegments, recomposeAuthority, normalizeComponentEncoding, isIPv4, nonSimpleDomain } = require_utils();
+    var { normalizeIPv6, removeDotSegments, recomposeAuthority, normalizePercentEncoding, normalizePathEncoding, escapePreservingEscapes, reescapeHostDelimiters, isIPv4, nonSimpleDomain } = require_utils();
     var { SCHEMES, getSchemeHandler } = require_schemes();
     function normalize(uri, options) {
       if (typeof uri === "string") {
         uri = /** @type {T} */
-        serialize(parse3(uri, options), options);
+        normalizeString(uri, options);
       } else if (typeof uri === "object") {
         uri = /** @type {T} */
         parse3(serialize(uri, options), options);
@@ -3642,19 +3698,9 @@ var require_fast_uri = __commonJS({
       return target;
     }
     function equal(uriA, uriB, options) {
-      if (typeof uriA === "string") {
-        uriA = unescape(uriA);
-        uriA = serialize(normalizeComponentEncoding(parse3(uriA, options), true), { ...options, skipEscape: true });
-      } else if (typeof uriA === "object") {
-        uriA = serialize(normalizeComponentEncoding(uriA, true), { ...options, skipEscape: true });
-      }
-      if (typeof uriB === "string") {
-        uriB = unescape(uriB);
-        uriB = serialize(normalizeComponentEncoding(parse3(uriB, options), true), { ...options, skipEscape: true });
-      } else if (typeof uriB === "object") {
-        uriB = serialize(normalizeComponentEncoding(uriB, true), { ...options, skipEscape: true });
-      }
-      return uriA.toLowerCase() === uriB.toLowerCase();
+      const normalizedA = normalizeComparableURI(uriA, options);
+      const normalizedB = normalizeComparableURI(uriB, options);
+      return normalizedA !== void 0 && normalizedB !== void 0 && normalizedA.toLowerCase() === normalizedB.toLowerCase();
     }
     function serialize(cmpts, opts) {
       const component = {
@@ -3679,12 +3725,12 @@ var require_fast_uri = __commonJS({
       if (schemeHandler && schemeHandler.serialize) schemeHandler.serialize(component, options);
       if (component.path !== void 0) {
         if (!options.skipEscape) {
-          component.path = escape(component.path);
+          component.path = escapePreservingEscapes(component.path);
           if (component.scheme !== void 0) {
             component.path = component.path.split("%3A").join(":");
           }
         } else {
-          component.path = unescape(component.path);
+          component.path = normalizePercentEncoding(component.path);
         }
       }
       if (options.reference !== "suffix" && component.scheme) {
@@ -3719,7 +3765,16 @@ var require_fast_uri = __commonJS({
       return uriTokens.join("");
     }
     var URI_PARSE = /^(?:([^#/:?]+):)?(?:\/\/((?:([^#/?@]*)@)?(\[[^#/?\]]+\]|[^#/:?]*)(?::(\d*))?))?([^#?]*)(?:\?([^#]*))?(?:#((?:.|[\n\r])*))?/u;
-    function parse3(uri, opts) {
+    function getParseError(parsed, matches) {
+      if (matches[2] !== void 0 && parsed.path && parsed.path[0] !== "/") {
+        return 'URI path must start with "/" when authority is present.';
+      }
+      if (typeof parsed.port === "number" && (parsed.port < 0 || parsed.port > 65535)) {
+        return "URI port is malformed.";
+      }
+      return void 0;
+    }
+    function parseWithStatus(uri, opts) {
       const options = Object.assign({}, opts);
       const parsed = {
         scheme: void 0,
@@ -3730,6 +3785,7 @@ var require_fast_uri = __commonJS({
         query: void 0,
         fragment: void 0
       };
+      let malformedAuthorityOrPort = false;
       let isIP = false;
       if (options.reference === "suffix") {
         if (options.scheme) {
@@ -3750,6 +3806,11 @@ var require_fast_uri = __commonJS({
         if (isNaN(parsed.port)) {
           parsed.port = matches[5];
         }
+        const parseError = getParseError(parsed, matches);
+        if (parseError !== void 0) {
+          parsed.error = parsed.error || parseError;
+          malformedAuthorityOrPort = true;
+        }
         if (parsed.host) {
           const ipv4result = isIPv4(parsed.host);
           if (ipv4result === false) {
@@ -3788,14 +3849,18 @@ var require_fast_uri = __commonJS({
               parsed.scheme = unescape(parsed.scheme);
             }
             if (parsed.host !== void 0) {
-              parsed.host = unescape(parsed.host);
+              parsed.host = reescapeHostDelimiters(unescape(parsed.host), isIP);
             }
           }
           if (parsed.path) {
-            parsed.path = escape(unescape(parsed.path));
+            parsed.path = normalizePathEncoding(parsed.path);
           }
           if (parsed.fragment) {
-            parsed.fragment = encodeURI(decodeURIComponent(parsed.fragment));
+            try {
+              parsed.fragment = encodeURI(decodeURIComponent(parsed.fragment));
+            } catch {
+              parsed.error = parsed.error || "URI malformed";
+            }
           }
         }
         if (schemeHandler && schemeHandler.parse) {
@@ -3804,7 +3869,29 @@ var require_fast_uri = __commonJS({
       } else {
         parsed.error = parsed.error || "URI can not be parsed.";
       }
-      return parsed;
+      return { parsed, malformedAuthorityOrPort };
+    }
+    function parse3(uri, opts) {
+      return parseWithStatus(uri, opts).parsed;
+    }
+    function normalizeString(uri, opts) {
+      return normalizeStringWithStatus(uri, opts).normalized;
+    }
+    function normalizeStringWithStatus(uri, opts) {
+      const { parsed, malformedAuthorityOrPort } = parseWithStatus(uri, opts);
+      return {
+        normalized: malformedAuthorityOrPort ? uri : serialize(parsed, opts),
+        malformedAuthorityOrPort
+      };
+    }
+    function normalizeComparableURI(uri, opts) {
+      if (typeof uri === "string") {
+        const { normalized, malformedAuthorityOrPort } = normalizeStringWithStatus(uri, opts);
+        return malformedAuthorityOrPort ? void 0 : normalized;
+      }
+      if (typeof uri === "object") {
+        return serialize(uri, opts);
+      }
     }
     var fastUri = {
       SCHEMES,
@@ -8415,8 +8502,8 @@ function emoji() {
 }
 var ipv4 = /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])$/;
 var ipv6 = /^(([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:))$/;
-var mac = (delimiter) => {
-  const escapedDelim = escapeRegex(delimiter ?? ":");
+var mac = (delimiter2) => {
+  const escapedDelim = escapeRegex(delimiter2 ?? ":");
   return new RegExp(`^(?:[0-9A-F]{2}${escapedDelim}){5}[0-9A-F]{2}$|^(?:[0-9a-f]{2}${escapedDelim}){5}[0-9a-f]{2}$`);
 };
 var cidrv4 = /^((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\/([0-9]|[1-2][0-9]|3[0-2])$/;
@@ -9886,14 +9973,14 @@ var $ZodObjectJIT = /* @__PURE__ */ $constructor("$ZodObjectJIT", (inst, def) =>
       return `shape[${k}]._zod.run({ value: input[${k}], issues: [] }, ctx)`;
     };
     doc.write(`const input = payload.value;`);
-    const ids = /* @__PURE__ */ Object.create(null);
+    const ids2 = /* @__PURE__ */ Object.create(null);
     let counter = 0;
     for (const key of normalized.keys) {
-      ids[key] = `key_${counter++}`;
+      ids2[key] = `key_${counter++}`;
     }
     doc.write(`const newResult = {};`);
     for (const key of normalized.keys) {
-      const id = ids[key];
+      const id = ids2[key];
       const k = esc(key);
       const schema = shape[key];
       const isOptionalIn = schema?._zod?.optin === "optional";
@@ -30863,12 +30950,60 @@ var EMPTY_COMPLETION_RESULT = {
 
 // src/runner.ts
 import { spawn } from "node:child_process";
+import { delimiter } from "node:path";
 var TIMEOUT_MS = 3e4;
 function envOrUndefined(key) {
   const value = process.env[key];
   if (!value || value.startsWith("${")) return void 0;
   return value;
 }
+function sanitizedEnv() {
+  const result = {};
+  for (const [key, value] of Object.entries(process.env)) {
+    if (key === "GOG_ACCESS_TOKEN") continue;
+    if (key === "GOOGLE_APPLICATION_CREDENTIALS") continue;
+    if (/(_TOKEN|_SECRET|_API_KEY|_PRIVATE_KEY)$/.test(key)) continue;
+    result[key] = value;
+  }
+  return result;
+}
+var TOKEN_PATTERNS = [
+  /Bearer\s+[A-Za-z0-9._\-+/=]+/gi,
+  /ya29\.[A-Za-z0-9._\-]+/g,
+  // OAuth2 access tokens
+  /1\/\/[A-Za-z0-9._\-]+/g,
+  // OAuth2 refresh tokens
+  /AIza[A-Za-z0-9_\-]{35}/g
+  // Google API keys
+];
+function redactSecrets(text) {
+  let redacted = text;
+  for (const re of TOKEN_PATTERNS) {
+    redacted = redacted.replace(re, "[REDACTED]");
+  }
+  return redacted;
+}
+function augmentedPath() {
+  const home = process.env.HOME;
+  const candidates = [
+    process.env.PATH ?? "",
+    "/opt/homebrew/bin",
+    "/usr/local/bin",
+    home ? `${home}/.local/bin` : "",
+    home ? `${home}/go/bin` : ""
+  ];
+  const seen = /* @__PURE__ */ new Set();
+  const parts = [];
+  for (const c of candidates) {
+    if (!c) continue;
+    for (const dir of c.split(delimiter)) {
+      if (!dir || seen.has(dir)) continue;
+      seen.add(dir);
+      parts.push(dir);
+    }
+  }
+  return parts.join(delimiter);
+}
 function formatTimeout(ms) {
   const seconds = Math.round(ms / 1e3);
   if (seconds >= 60) {
@@ -30890,8 +31025,8 @@ async function run(args, options = {}) {
   fullArgs.push(...args);
   const effectiveTimeout = timeout ?? TIMEOUT_MS;
   return new Promise((resolve, reject) => {
-    const { GOG_ACCESS_TOKEN: _, ...cleanEnv } = process.env;
-    const child = spawner(envOrUndefined("GOG_PATH") ?? "gog", fullArgs, { env: cleanEnv });
+    const childEnv = { ...sanitizedEnv(), PATH: augmentedPath() };
+    const child = spawner(envOrUndefined("GOG_PATH") ?? "gog", fullArgs, { env: childEnv });
     const stdoutChunks = [];
     const stderrChunks = [];
     let settled = false;
@@ -30919,13 +31054,19 @@ async function run(args, options = {}) {
           resolve(stdout);
         }
       } else {
-        reject(new Error(stderr || `gog exited with code ${code}`));
+        reject(new Error(redactSecrets(stderr || `gog exited with code ${code}`)));
       }
     });
     child.on("error", (err) => {
       clearTimeout(timer);
       if (settled) return;
       settled = true;
+      if (err.code === "ENOENT") {
+        reject(new Error(
+          "gog executable not found. Install gogcli (https://github.com/steipete/gogcli) or set GOG_PATH in your MCP client config to the absolute binary path (run `which gog` in a terminal to find it)."
+        ));
+        return;
+      }
       reject(err);
     });
   });
@@ -30935,6 +31076,55 @@ async function run(args, options = {}) {
 var accountParam = external_exports.string().optional().describe(
   "Google account email to use (overrides GOG_ACCOUNT env var)"
 );
+var ids = {
+  course: external_exports.string().describe("Course ID"),
+  coursework: external_exports.string().describe("Coursework ID"),
+  submission: external_exports.string().describe("Submission ID"),
+  announcement: external_exports.string().describe("Announcement ID"),
+  topic: external_exports.string().describe("Topic ID"),
+  invitation: external_exports.string().describe("Invitation ID"),
+  spreadsheet: external_exports.string().describe("Spreadsheet ID (from the URL)"),
+  doc: external_exports.string().describe("Doc ID (from the URL)"),
+  presentation: external_exports.string().describe("Presentation ID"),
+  slide: external_exports.string().describe("Slide ID"),
+  file: external_exports.string().describe("File ID"),
+  message: external_exports.string().describe("Message ID"),
+  thread: external_exports.string().describe("Thread ID"),
+  draft: external_exports.string().describe("Draft ID"),
+  label: external_exports.string().describe("Label ID or name"),
+  attachment: external_exports.string().describe("Attachment ID"),
+  comment: external_exports.string().describe("Comment ID"),
+  meetingCode: external_exports.string().describe("Meeting code (e.g. abc-defg-hij)"),
+  permission: external_exports.string().describe("Permission ID"),
+  user: external_exports.string().describe("User ID"),
+  // People API uses fully-qualified resource names ("people/c123") not bare IDs.
+  person: external_exports.string().describe("Person resource name (people/...) or email")
+};
+var paginationParams = {
+  max: external_exports.number().int().optional().describe("Max results"),
+  page: external_exports.string().optional().describe("Page token"),
+  all: external_exports.boolean().optional().describe("Fetch all pages")
+};
+function registerRunTool(server2, options) {
+  const { service, examples, omitAccount = false, note } = options;
+  const baseDescription = `Run any gog ${service} subcommand not covered by the other tools. Run \`gog ${service} --help\` for the full list of subcommands, or \`gog ${service} <subcommand> --help\` for flags on a specific subcommand.`;
+  const description = note ? `${baseDescription} ${note}` : baseDescription;
+  const inputSchema = {
+    subcommand: external_exports.string().describe(`The gog ${service} subcommand to run, e.g. ${examples}`),
+    args: external_exports.array(external_exports.string()).describe("Additional positional args and flags")
+  };
+  if (!omitAccount) {
+    inputSchema.account = accountParam;
+  }
+  server2.registerTool(`gog_${service}_run`, {
+    description,
+    annotations: { destructiveHint: true },
+    inputSchema
+  }, async (rawArgs) => {
+    const { subcommand, args, account } = rawArgs;
+    return runOrDiagnose([service, subcommand, ...args], { account });
+  });
+}
 function toText(output) {
   return { content: [{ type: "text", text: output }] };
 }
@@ -31020,15 +31210,11 @@ function registerAuthTools(server2) {
       return toError(err);
     }
   });
-  server2.registerTool("gog_auth_run", {
-    description: "Run any gog auth subcommand. Run `gog auth --help` to see all available subcommands and flags. Note: for browser-based authorization, use gog_auth_add instead.",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      subcommand: external_exports.string().describe('The gog auth subcommand, e.g. "remove", "alias", "tokens"'),
-      args: external_exports.array(external_exports.string()).describe("Additional positional args and flags")
-    }
-  }, async ({ subcommand, args }) => {
-    return runOrDiagnose(["auth", subcommand, ...args], {});
+  registerRunTool(server2, {
+    service: "auth",
+    examples: '"remove", "alias", "tokens"',
+    omitAccount: true,
+    note: "For browser-based authorization, use gog_auth_add instead."
   });
 }
 
@@ -31139,17 +31325,7 @@ function registerCalendarTools(server2) {
     if (comment) args.push(`--comment=${comment}`);
     return runOrDiagnose(args, { account });
   });
-  server2.registerTool("gog_calendar_run", {
-    description: "Run any gog calendar subcommand not covered by the other tools. Run `gog calendar --help` for the full list of subcommands, or `gog calendar <subcommand> --help` for flags on a specific subcommand.",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      subcommand: external_exports.string().describe('The gog calendar subcommand to run, e.g. "calendars", "freebusy"'),
-      args: external_exports.array(external_exports.string()).describe("Additional positional args and flags"),
-      account: accountParam
-    }
-  }, async ({ subcommand, args, account }) => {
-    return runOrDiagnose(["calendar", subcommand, ...args], { account });
-  });
+  registerRunTool(server2, { service: "calendar", examples: '"calendars", "freebusy"' });
 }
 
 // src/tools/classroom.ts
@@ -31514,16 +31690,10 @@ function registerClassroomTools(server2) {
     if (userId) args.push(userId);
     return runOrDiagnose(args, { account });
   });
-  server2.registerTool("gog_classroom_run", {
-    description: "Run any gog classroom subcommand not covered by the other tools (guardians, guardian-invitations, materials, coursework assignees, announcement assignees, etc.). Run `gog classroom --help` for the full list, or `gog classroom <subcommand> --help` for flags.",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      subcommand: external_exports.string().describe('The gog classroom subcommand to run, e.g. "guardians", "materials", "guardian-invitations"'),
-      args: external_exports.array(external_exports.string()).describe("Additional positional args and flags"),
-      account: accountParam
-    }
-  }, async ({ subcommand, args, account }) => {
-    return runOrDiagnose(["classroom", subcommand, ...args], { account });
+  registerRunTool(server2, {
+    service: "classroom",
+    examples: '"guardians", "materials", "guardian-invitations"',
+    note: "Covers anything not wrapped by the dedicated tools (guardians, guardian-invitations, materials, coursework assignees, announcement assignees, etc.)."
   });
 }
 
@@ -31579,17 +31749,7 @@ function registerContactsTools(server2) {
     if (title) args.push(`--title=${title}`);
     return runOrDiagnose(args, { account });
   });
-  server2.registerTool("gog_contacts_run", {
-    description: "Run any gog contacts subcommand not covered by the other tools. Run `gog contacts --help` for the full list of subcommands, or `gog contacts <subcommand> --help` for flags on a specific subcommand.",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      subcommand: external_exports.string().describe('The gog contacts subcommand to run, e.g. "update", "delete", "directory"'),
-      args: external_exports.array(external_exports.string()).describe("Additional positional args and flags"),
-      account: accountParam
-    }
-  }, async ({ subcommand, args, account }) => {
-    return runOrDiagnose(["contacts", subcommand, ...args], { account });
-  });
+  registerRunTool(server2, { service: "contacts", examples: '"update", "delete", "directory"' });
 }
 
 // src/tools/docs.ts
@@ -31659,17 +31819,7 @@ function registerDocsTools(server2) {
   }, async ({ docId, account }) => {
     return runOrDiagnose(["docs", "structure", docId], { account });
   });
-  server2.registerTool("gog_docs_run", {
-    description: "Run any gog docs subcommand not covered by the other tools. Run `gog docs --help` for the full list of subcommands, or `gog docs <subcommand> --help` for flags on a specific subcommand.",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      subcommand: external_exports.string().describe('The gog docs subcommand to run, e.g. "copy", "clear", "insert", "sed", "export"'),
-      args: external_exports.array(external_exports.string()).describe("Additional positional args and flags"),
-      account: accountParam
-    }
-  }, async ({ subcommand, args, account }) => {
-    return runOrDiagnose(["docs", subcommand, ...args], { account });
-  });
+  registerRunTool(server2, { service: "docs", examples: '"copy", "clear", "insert", "sed", "export"' });
 }
 
 // src/tools/drive.ts
@@ -31777,17 +31927,7 @@ function registerDriveTools(server2) {
     if (role) args.push(`--role=${role}`);
     return runOrDiagnose(args, { account });
   });
-  server2.registerTool("gog_drive_run", {
-    description: "Run any gog drive subcommand not covered by the other tools. Run `gog drive --help` for the full list of subcommands, or `gog drive <subcommand> --help` for flags on a specific subcommand.",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      subcommand: external_exports.string().describe('The gog drive subcommand to run, e.g. "copy", "upload", "download", "permissions"'),
-      args: external_exports.array(external_exports.string()).describe("Additional positional args and flags"),
-      account: accountParam
-    }
-  }, async ({ subcommand, args, account }) => {
-    return runOrDiagnose(["drive", subcommand, ...args], { account });
-  });
+  registerRunTool(server2, { service: "drive", examples: '"copy", "upload", "download", "permissions"' });
 }
 
 // src/tools/gmail.ts
@@ -31839,17 +31979,7 @@ function registerGmailTools(server2) {
     if (threadId) args.push(`--thread-id=${threadId}`);
     return runOrDiagnose(args, { account });
   });
-  server2.registerTool("gog_gmail_run", {
-    description: "Run any gog gmail subcommand not covered by the other tools. Run `gog gmail --help` for the full list of subcommands, or `gog gmail <subcommand> --help` for flags on a specific subcommand.",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      subcommand: external_exports.string().describe('The gog gmail subcommand to run, e.g. "archive", "mark-read", "labels"'),
-      args: external_exports.array(external_exports.string()).describe("Additional positional args and flags"),
-      account: accountParam
-    }
-  }, async ({ subcommand, args, account }) => {
-    return runOrDiagnose(["gmail", subcommand, ...args], { account });
-  });
+  registerRunTool(server2, { service: "gmail", examples: '"archive", "mark-read", "labels"' });
 }
 
 // src/tools/sheets.ts
@@ -31938,17 +32068,7 @@ function registerSheetsTools(server2) {
   }, async ({ spreadsheetId, find, replace, account }) => {
     return runOrDiagnose(["sheets", "find-replace", spreadsheetId, find, replace], { account });
   });
-  server2.registerTool("gog_sheets_run", {
-    description: "Run any gog sheets subcommand not covered by the other tools. Run `gog sheets --help` for the full list of subcommands, or `gog sheets <subcommand> --help` for flags on a specific subcommand.",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      subcommand: external_exports.string().describe('The gog sheets subcommand to run, e.g. "freeze", "add-tab", "rename-tab"'),
-      args: external_exports.array(external_exports.string()).describe('Additional positional args and flags, e.g. ["<spreadsheetId>", "--rows=1"]'),
-      account: accountParam
-    }
-  }, async ({ subcommand, args, account }) => {
-    return runOrDiagnose(["sheets", subcommand, ...args], { account });
-  });
+  registerRunTool(server2, { service: "sheets", examples: '"freeze", "add-tab", "rename-tab"' });
 }
 
 // src/tools/slides.ts
@@ -32026,17 +32146,7 @@ function registerSlidesTools(server2) {
   }, async ({ presentationId, slideId, account }) => {
     return runOrDiagnose(["slides", "read-slide", presentationId, slideId], { account });
   });
-  server2.registerTool("gog_slides_run", {
-    description: "Run any gog slides subcommand not covered by the other tools. Run `gog slides --help` for the full list of subcommands, or `gog slides <subcommand> --help` for flags on a specific subcommand.",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      subcommand: external_exports.string().describe("The gog slides subcommand to run"),
-      args: external_exports.array(external_exports.string()).describe("Additional positional args and flags"),
-      account: accountParam
-    }
-  }, async ({ subcommand, args, account }) => {
-    return runOrDiagnose(["slides", subcommand, ...args], { account });
-  });
+  registerRunTool(server2, { service: "slides", examples: '"add-slide", "delete-slide", "update-notes"' });
 }
 
 // src/tools/tasks.ts
@@ -32109,21 +32219,11 @@ function registerTasksTools(server2) {
   }, async ({ tasklistId, taskId, account }) => {
     return runOrDiagnose(["tasks", "delete", tasklistId, taskId], { account });
   });
-  server2.registerTool("gog_tasks_run", {
-    description: "Run any gog tasks subcommand not covered by the other tools. Run `gog tasks --help` for the full list of subcommands, or `gog tasks <subcommand> --help` for flags on a specific subcommand.",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      subcommand: external_exports.string().describe('The gog tasks subcommand to run, e.g. "update", "undo", "clear"'),
-      args: external_exports.array(external_exports.string()).describe("Additional positional args and flags"),
-      account: accountParam
-    }
-  }, async ({ subcommand, args, account }) => {
-    return runOrDiagnose(["tasks", subcommand, ...args], { account });
-  });
+  registerRunTool(server2, { service: "tasks", examples: '"update", "undo", "clear"' });
 }
 
 // src/server.ts
-var VERSION = true ? "2.0.7" : "0.0.0";
+var VERSION = true ? "2.0.9" : "0.0.0";
 function createServer(options) {
   return new McpServer({
     name: options?.name ?? "gogcli",