mcp-ga4 2.0.3 → 2.0.5

package/README.md

@@ -19,7 +19,7 @@ npm install mcp-ga4
 Or clone the repository:
 
 ```bash
-git clone https://github.com/drak-marketing/mcp-ga4.git
+git clone https://github.com/mharnett/mcp-ga4.git
 cd mcp-ga4
 npm install
 npm run build
@@ -36,13 +36,6 @@ GA4_PROPERTY_ID=123456789
 GOOGLE_APPLICATION_CREDENTIALS=/path/to/service-account.json
 ```
 
-For OAuth credentials instead of a service account:
-
-```bash
-GA4_PROPERTY_ID=123456789
-GA4_CREDENTIALS_FILE=/path/to/oauth-credentials.json
-```
-
 ### Mode 2: Multi-Client (config.json)
 
 Create a `config.json` in the project root to map multiple GA4 properties to project directories. The server auto-detects which property to use based on the caller's working directory.

package/dist/build-info.json

@@ -1 +1 @@
-{"sha":"991317b","builtAt":"2026-04-09T19:37:26.093Z"}
+{"sha":"29cbd4f","builtAt":"2026-04-09T21:28:40.127Z"}

package/dist/index.js

@@ -11,6 +11,8 @@ import { GoogleAuth } from "google-auth-library";
 import { Ga4AuthError, Ga4RateLimitError, Ga4ServiceError, classifyError, } from "./errors.js";
 import { tools } from "./tools.js";
 import { withResilience, safeResponse, logger } from "./resilience.js";
+// CLI package info
+const __cliPkg = JSON.parse(readFileSync(join(dirname(new URL(import.meta.url).pathname), "..", "package.json"), "utf-8"));
 // Log build fingerprint at startup
 try {
     const __buildInfoDir = dirname(new URL(import.meta.url).pathname);
@@ -18,22 +20,21 @@ try {
     console.error(`[build] SHA: ${buildInfo.sha} (${buildInfo.builtAt})`);
 }
 catch {
-    // dev mode
+    console.error(`[build] ${__cliPkg.name}@${__cliPkg.version} (dev mode)`);
 }
 // CLI flags
-const __cliPkg = JSON.parse(readFileSync(join(dirname(new URL(import.meta.url).pathname), "..", "package.json"), "utf-8"));
 if (process.argv.includes("--help") || process.argv.includes("-h")) {
-    console.log(`${__cliPkg.name} v${__cliPkg.version}\n`);
-    console.log(`Usage: ${__cliPkg.name} [options]\n`);
-    console.log("MCP server communicating via stdio. Configure in your .mcp.json.\n");
-    console.log("Options:");
-    console.log("  --help, -h       Show this help message");
-    console.log("  --version, -v    Show version number");
-    console.log(`\nDocumentation: https://github.com/mharnett/mcp-ga4`);
+    console.error(`${__cliPkg.name} v${__cliPkg.version}\n`);
+    console.error(`Usage: ${__cliPkg.name} [options]\n`);
+    console.error("MCP server communicating via stdio. Configure in your .mcp.json.\n");
+    console.error("Options:");
+    console.error("  --help, -h       Show this help message");
+    console.error("  --version, -v    Show version number");
+    console.error(`\nDocumentation: https://github.com/mharnett/mcp-ga4`);
     process.exit(0);
 }
 if (process.argv.includes("--version") || process.argv.includes("-v")) {
-    console.log(__cliPkg.version);
+    console.error(__cliPkg.version);
     process.exit(0);
 }
 function loadConfig() {
@@ -314,7 +315,7 @@ Metrics: sessions, totalUsers, newUsers, activeUsers, screenPageViews,
 
 ## Date Formats
 Use YYYY-MM-DD or relative: "today", "yesterday", "7daysAgo", "30daysAgo", "90daysAgo"`;
-const server = new Server({ name: "mcp-ga4", version: "1.0.0" }, { capabilities: { tools: {} } });
+const server = new Server({ name: __cliPkg.name, version: __cliPkg.version }, { capabilities: { tools: {} } });
 server.setRequestHandler(ListToolsRequestSchema, async () => ({ tools }));
 server.setRequestHandler(CallToolRequestSchema, async (request) => {
     const { name, arguments: args } = request.params;
@@ -443,4 +444,15 @@ async function main() {
     await server.connect(transport);
     console.error("[startup] MCP GA4 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);
+});
+process.on("SIGPIPE", () => {
+    // Client disconnected -- expected during shutdown
+});
 main().catch(console.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";
 export const logger = pino({
     level: process.env.LOG_LEVEL || "info",
@@ -9,34 +9,64 @@ export const logger = pino({
                 colorize: true,
                 singleLine: true,
                 translateTime: "SYS:standard",
+                destination: 2, // stderr -- stdout is reserved for MCP JSON-RPC
             },
         },
     }),
-});
+}, 
+// When no transport (test mode), write to stderr directly
+process.env.NODE_ENV === "test" ? pino.destination(2) : undefined);
 const MAX_RESPONSE_SIZE = 200_000;
 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 (Array.isArray(data)) {
-            return data.slice(0, Math.max(1, Math.floor(data.length * 0.5)));
+    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 (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;
         }
+        break;
     }
-    return data;
+    return current;
 }
 const backoff = new ExponentialBackoff({ initialDelay: 100, maxDelay: 5_000 });
-const retryPolicy = retry(handleAll, { maxAttempts: 3, backoff });
-const circuitBreakerPolicy = circuitBreaker(handleAll, { halfOpenAfter: 60_000, breaker: new ConsecutiveBreaker(5) });
+const isTransient = handleWhen((err) => {
+    const msg = (err?.message || "").toLowerCase();
+    const code = err?.code || err?.status;
+    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;
+    if (code === 429 || msg.includes("rate"))
+        return true;
+    if (code >= 400 && code < 500)
+        return false;
+    return true;
+});
+const retryPolicy = retry(isTransient, { maxAttempts: 3, backoff });
+const circuitBreakerPolicy = circuitBreaker(isTransient, { halfOpenAfter: 60_000, breaker: new ConsecutiveBreaker(5) });
 const timeoutPolicy = timeout(30_000, TimeoutStrategy.Cooperative);
 const policy = wrap(timeoutPolicy, circuitBreakerPolicy, retryPolicy);
 export async function withResilience(fn, operationName) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mcp-ga4",
   "mcpName": "io.github.mharnett/ga4",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "MCP server for Google Analytics 4 - query GA4 data with natural language via Claude.",
   "main": "dist/index.js",
   "bin": {