mcp-google-ads 1.0.5 → 1.0.7

package/README.md

@@ -1,6 +1,6 @@
 # MCP Google Ads Server
 
-An MCP (Model Context Protocol) server for the Google Ads API with built-in safeguards for review before changes go live. Production-proven with MCC (Manager Account) support, 35 tools for campaign management, reporting, and optimization.
+An MCP (Model Context Protocol) server for the Google Ads API with built-in safeguards for review before changes go live. Production-proven with MCC (Manager Account) support, 34 tools for campaign management, reporting, and optimization.
 
 ## Features
 
@@ -133,7 +133,7 @@ Restart Claude Code.
 5. Claude enables (requires your approval prompt)
 ```
 
-### Available Tools (35)
+### Available Tools (34)
 
 #### Context & Discovery
 | Tool | Description |

package/dist/build-info.json

@@ -1 +1 @@
-{"sha":"82b0bbb","builtAt":"2026-04-09T19:59:25.007Z"}
+{"sha":"3490598","builtAt":"2026-04-09T21:18:29.192Z"}

package/dist/index.js

@@ -233,7 +233,7 @@ class GoogleAdsManager {
             query += ` AND campaign.id = ${sanitizeNumericId(options.campaignId)}`;
         }
         if (options.adGroupId) {
-            query += ` AND ad_group.id = ${options.adGroupId}`;
+            query += ` AND ad_group.id = ${sanitizeNumericId(options.adGroupId)}`;
         }
         query += ` ORDER BY campaign.name, ad_group.name`;
         const result = await withResilience(() => customer.query(query), "listAds");
@@ -1151,8 +1151,8 @@ class GoogleAdsManager {
 const config = loadConfig();
 const adsManager = new GoogleAdsManager(config);
 const server = new Server({
-    name: "mcp-google-ads",
-    version: "1.0.0",
+    name: __cliPkg.name,
+    version: __cliPkg.version,
 }, {
     capabilities: {
         tools: {},
@@ -1806,4 +1806,12 @@ async function main() {
     await server.connect(transport);
     logger.info("MCP Google Ads server running");
 }
+process.on("SIGTERM", () => {
+    console.error("[shutdown] SIGTERM received, exiting");
+    process.exit(0);
+});
+process.on("SIGINT", () => {
+    console.error("[shutdown] SIGINT received, exiting");
+    process.exit(0);
+});
 main().catch((err) => logger.error({ error: err.message, stack: err.stack }, "Fatal startup error"));

package/dist/resilience.js

@@ -1,4 +1,4 @@
-import { retry, circuitBreaker, wrap, handleAll, timeout, TimeoutStrategy, ExponentialBackoff, ConsecutiveBreaker, } from "cockatiel";
+import { retry, circuitBreaker, wrap, handleWhen, timeout, TimeoutStrategy, ExponentialBackoff, ConsecutiveBreaker, } from "cockatiel";
 import pino from "pino";
 // ============================================
 // LOGGER
@@ -21,27 +21,39 @@ export const logger = pino({
 // ============================================
 const MAX_RESPONSE_SIZE = 200_000; // 200KB
 export function safeResponse(data, context) {
-    const jsonStr = JSON.stringify(data);
-    const sizeBytes = Buffer.byteLength(jsonStr, "utf-8");
-    if (sizeBytes > MAX_RESPONSE_SIZE) {
-        logger.warn({ sizeBytes, maxSize: MAX_RESPONSE_SIZE, context }, `Response exceeds size limit, truncating`);
-        // If it's an array, truncate
-        if (Array.isArray(data)) {
-            const truncated = data.slice(0, Math.max(1, Math.floor(data.length * 0.5)));
-            return truncated;
+    let current = data;
+    for (let pass = 0; pass < 10; pass++) {
+        const jsonStr = JSON.stringify(current);
+        const sizeBytes = Buffer.byteLength(jsonStr, "utf-8");
+        if (sizeBytes <= MAX_RESPONSE_SIZE)
+            return current;
+        logger.warn({ sizeBytes, maxSize: MAX_RESPONSE_SIZE, context, pass }, "Response exceeds size limit, truncating");
+        if (Array.isArray(current)) {
+            current = current.slice(0, Math.max(1, Math.floor(current.length * 0.5)));
+            continue;
         }
-        // If it's an object with items/results, truncate those
-        if (typeof data === "object" && data !== null) {
-            const obj = data;
-            for (const key of ["items", "results", "data", "rows"]) {
-                if (Array.isArray(obj[key])) {
+        if (typeof current === "object" && current !== null) {
+            const obj = current;
+            let truncated = false;
+            for (const key of ["items", "results", "data", "rows", "tags", "triggers", "variables"]) {
+                if (Array.isArray(obj[key]) && obj[key].length > 1) {
                     obj[key] = obj[key].slice(0, Math.max(1, Math.floor(obj[key].length * 0.5)));
-                    return obj;
+                    if ("count" in obj)
+                        obj.count = obj[key].length;
+                    if ("row_count" in obj)
+                        obj.row_count = obj[key].length;
+                    obj.truncated = true;
+                    truncated = true;
+                    break;
                 }
             }
+            if (truncated)
+                continue;
         }
+        // Can't truncate further (not an array/object with known keys)
+        break;
     }
-    return data;
+    return current;
 }
 // ============================================
 // RETRY + CIRCUIT BREAKER + TIMEOUT
@@ -50,12 +62,28 @@ const backoff = new ExponentialBackoff({
     initialDelay: 100,
     maxDelay: 5_000,
 });
+const isTransient = handleWhen((err) => {
+    const msg = (err?.message || "").toLowerCase();
+    const code = err?.code || err?.status;
+    // Don't retry auth errors
+    if (code === 401 || code === 403 || code === 7 || code === 16)
+        return false;
+    if (msg.includes("unauthenticated") || msg.includes("permission_denied") || msg.includes("invalid_grant"))
+        return false;
+    // Don't retry client errors (except rate limits)
+    if (code === 429 || msg.includes("rate"))
+        return true;
+    if (code >= 400 && code < 500)
+        return false;
+    // Retry everything else (5xx, timeouts, network errors)
+    return true;
+});
 // Individual policies
-const retryPolicy = retry(handleAll, {
+const retryPolicy = retry(isTransient, {
     maxAttempts: 3,
     backoff,
 });
-const circuitBreakerPolicy = circuitBreaker(handleAll, {
+const circuitBreakerPolicy = circuitBreaker(isTransient, {
     halfOpenAfter: 60_000, // 60s to attempt recovery
     breaker: new ConsecutiveBreaker(5), // Open after 5 consecutive failures
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mcp-google-ads",
   "mcpName": "io.github.mharnett/google-ads",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "MCP server for Google Ads API with MCC support, 35 tools for campaign management, reporting, and optimization. Safe by default — all changes created PAUSED.",
   "main": "dist/index.js",
   "bin": {