@chrischall/gemini-mcp 2.1.1 → 2.1.3

package/.claude-plugin/marketplace.json

@@ -7,7 +7,7 @@
   },
   "metadata": {
     "description": "MCP server for Google Gemini image generation and editing — generate and edit images via the Gemini API",
-    "version": "2.1.1"
+    "version": "2.1.3"
   },
   "plugins": [
     {
@@ -15,7 +15,7 @@
       "displayName": "Gemini Images",
       "source": "./",
       "description": "Generate and edit images with Google Gemini image models (Nano Banana / Nano Banana Pro) via natural language prompts",
-      "version": "2.1.1",
+      "version": "2.1.3",
       "author": {
         "name": "Chris Hall"
       },

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "gemini-mcp",
   "displayName": "Gemini Images",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "MCP server for Google Gemini image generation and editing — generate and edit images via the Gemini API",
   "author": {
     "name": "Chris Hall",

package/dist/bundle.js

@@ -41,6 +41,41 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
+// node_modules/@chrischall/mcp-utils/dist/cancel/index.js
+import { AsyncLocalStorage } from "node:async_hooks";
+function withCallSignal(signal, fn, request) {
+  return signal ? storage.run({ signal, ...request ? { request } : {} }, fn) : fn();
+}
+function currentCallSignal() {
+  return storage.getStore()?.signal;
+}
+function withAmbientCancellation(own2) {
+  const ambient = currentCallSignal();
+  if (!ambient)
+    return own2;
+  if (!own2)
+    return ambient;
+  return AbortSignal.any([own2, ambient]);
+}
+var storage;
+var init_cancel = __esm({
+  "node_modules/@chrischall/mcp-utils/dist/cancel/index.js"() {
+    storage = new AsyncLocalStorage();
+  }
+});
+
+// node_modules/@chrischall/mcp-utils/dist/caller/index.js
+import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
+function withCallerCapabilities(capabilities, fn) {
+  return capabilities ? storage2.run(capabilities, fn) : fn();
+}
+var storage2;
+var init_caller = __esm({
+  "node_modules/@chrischall/mcp-utils/dist/caller/index.js"() {
+    storage2 = new AsyncLocalStorage2();
+  }
+});
+
 // node_modules/@modelcontextprotocol/server/dist/chunk-Br0eD_fh.mjs
 var __create2, __defProp2, __getOwnPropDesc2, __getOwnPropNames2, __getProtoOf2, __hasOwnProp2, __commonJSMin, __exportAll, __copyProps2, __toESM2;
 var init_chunk_Br0eD_fh = __esm({
@@ -4926,7 +4961,7 @@ var require_memoizer = __commonJS({
     var NONE2 = 0;
     var ASSUMED2 = 1;
     var PROVEN2 = 2;
-    function isRecursive2(inst, stack, resolve2) {
+    function isRecursive2(inst, stack, resolve4) {
       const cached2 = recursive2.get(inst);
       if (cached2 !== void 0)
         return cached2 ? PROVEN2 : NONE2;
@@ -4936,7 +4971,7 @@ var require_memoizer = __commonJS({
       let result = NONE2;
       const check2 = (child) => {
         if (result !== PROVEN2 && child?._zod) {
-          const answer = isRecursive2(child, stack, resolve2);
+          const answer = isRecursive2(child, stack, resolve4);
           if (answer > result)
             result = answer;
         }
@@ -4947,7 +4982,7 @@ var require_memoizer = __commonJS({
           const desc = Object.getOwnPropertyDescriptor(sh, key);
           if (spread && !desc.enumerable)
             continue;
-          const child = desc.get ? ASSUMED2 : desc.value?._zod ? isRecursive2(desc.value, stack, resolve2) : NONE2;
+          const child = desc.get ? ASSUMED2 : desc.value?._zod ? isRecursive2(desc.value, stack, resolve4) : NONE2;
           if (child > answer)
             answer = child;
         }
@@ -5011,7 +5046,7 @@ var require_memoizer = __commonJS({
           break;
         // `$ZodLazy` caches its inner on the def, so a resolved edge is followed exactly
         case "lazy": {
-          const inner = def._cachedInner ?? (resolve2 ? inst._zod.innerType : void 0);
+          const inner = def._cachedInner ?? (resolve4 ? inst._zod.innerType : void 0);
           merge2(inner ? isRecursive2(inner, stack, false) : ASSUMED2);
           break;
         }
@@ -26845,14 +26880,14 @@ function inputRequiredRoundsExceededMessage(method, maxRounds) {
   return `Multi-round-trip request '${method}' still required input after ${maxRounds} rounds (inputRequired.maxRounds)`;
 }
 function sleep(ms, signal) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve4, reject) => {
     if (signal?.aborted) {
       reject(signal.reason instanceof SdkError ? signal.reason : new SdkError(SdkErrorCode.RequestTimeout, String(signal.reason)));
       return;
     }
     const timer = setTimeout(() => {
       signal?.removeEventListener("abort", onAbort);
-      resolve2();
+      resolve4();
     }, ms);
     const onAbort = () => {
       clearTimeout(timer);
@@ -28648,7 +28683,7 @@ var init_src_CX2iR2pK = __esm({
         const flowStartedAt = Date.now();
         let onAbort;
         let cleanupMessageId;
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve4, reject) => {
           const earlyReject = (error62) => {
             reject(error62);
           };
@@ -28716,7 +28751,7 @@ var init_src_CX2iR2pK = __esm({
             }
             if (decoded.kind === "invalid") return reject(decoded.error);
             if (decoded.kind === "input_required") {
-              if (options?.allowInputRequired === true) return resolve2(manualInputRequiredValue(decoded));
+              if (options?.allowInputRequired === true) return resolve4(manualInputRequiredValue(decoded));
               const flow = {
                 codec: codec2,
                 request,
@@ -28728,11 +28763,11 @@ var init_src_CX2iR2pK = __esm({
                   params
                 }, resultSchema, legOptions)
               };
-              return resolve2(this._resolveNonCompleteResult(decoded, flow));
+              return resolve4(this._resolveNonCompleteResult(decoded, flow));
             }
             const result = decoded.result;
             validateStandardSchema(resultSchema, result).then((parseResult) => {
-              if (parseResult.success) resolve2(parseResult.data);
+              if (parseResult.success) resolve4(parseResult.data);
               else reject(new SdkError(SdkErrorCode.InvalidResult, `Invalid result for ${request.method}: ${parseResult.error}`));
             }, reject);
           });
@@ -31548,7 +31583,7 @@ var init_ajvProvider_CEoC_sr = __esm({
         ref = (0, resolve_1.resolveUrl)(this.opts.uriResolver, baseId, ref);
         const schOrFunc = root.refs[ref];
         if (schOrFunc) return schOrFunc;
-        let _sch = resolve2.call(this, root, ref);
+        let _sch = resolve4.call(this, root, ref);
         if (_sch === void 0) {
           const schema = (_a3 = root.localRefs) === null || _a3 === void 0 ? void 0 : _a3[ref];
           const { schemaId } = this.opts;
@@ -31574,7 +31609,7 @@ var init_ajvProvider_CEoC_sr = __esm({
       function sameSchemaEnv(s1, s2) {
         return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
       }
-      function resolve2(root, ref) {
+      function resolve4(root, ref) {
         let sch;
         while (typeof (sch = this.refs[ref]) == "string") ref = sch;
         return sch || this.schemas[ref] || resolveSchema.call(this, root, ref);
@@ -32024,47 +32059,47 @@ var init_ajvProvider_CEoC_sr = __esm({
         else if (typeof uri === "object") uri = parse3(serialize(uri, options), options);
         return uri;
       }
-      function resolve2(baseURI, relativeURI, options) {
+      function resolve4(baseURI, relativeURI, options) {
         const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
         const resolved = resolveComponent(parse3(baseURI, schemelessOptions), parse3(relativeURI, schemelessOptions), schemelessOptions, true);
         schemelessOptions.skipEscape = true;
         return serialize(resolved, schemelessOptions);
       }
-      function resolveComponent(base, relative, options, skipNormalization) {
+      function resolveComponent(base, relative2, options, skipNormalization) {
         const target = {};
         if (!skipNormalization) {
           base = parse3(serialize(base, options), options);
-          relative = parse3(serialize(relative, options), options);
+          relative2 = parse3(serialize(relative2, options), options);
         }
         options = options || {};
-        if (!options.tolerant && relative.scheme) {
-          target.scheme = relative.scheme;
-          target.userinfo = relative.userinfo;
-          target.host = relative.host;
-          target.port = relative.port;
-          target.path = removeDotSegments(relative.path || "");
-          target.query = relative.query;
+        if (!options.tolerant && relative2.scheme) {
+          target.scheme = relative2.scheme;
+          target.userinfo = relative2.userinfo;
+          target.host = relative2.host;
+          target.port = relative2.port;
+          target.path = removeDotSegments(relative2.path || "");
+          target.query = relative2.query;
         } else {
-          if (relative.userinfo !== void 0 || relative.host !== void 0 || relative.port !== void 0) {
-            target.userinfo = relative.userinfo;
-            target.host = relative.host;
-            target.port = relative.port;
-            target.path = removeDotSegments(relative.path || "");
-            target.query = relative.query;
+          if (relative2.userinfo !== void 0 || relative2.host !== void 0 || relative2.port !== void 0) {
+            target.userinfo = relative2.userinfo;
+            target.host = relative2.host;
+            target.port = relative2.port;
+            target.path = removeDotSegments(relative2.path || "");
+            target.query = relative2.query;
           } else {
-            if (!relative.path) {
+            if (!relative2.path) {
               target.path = base.path;
-              if (relative.query !== void 0) target.query = relative.query;
+              if (relative2.query !== void 0) target.query = relative2.query;
               else target.query = base.query;
             } else {
-              if (relative.path[0] === "/") target.path = removeDotSegments(relative.path);
+              if (relative2.path[0] === "/") target.path = removeDotSegments(relative2.path);
               else {
-                if ((base.userinfo !== void 0 || base.host !== void 0 || base.port !== void 0) && !base.path) target.path = "/" + relative.path;
-                else if (!base.path) target.path = relative.path;
-                else target.path = base.path.slice(0, base.path.lastIndexOf("/") + 1) + relative.path;
+                if ((base.userinfo !== void 0 || base.host !== void 0 || base.port !== void 0) && !base.path) target.path = "/" + relative2.path;
+                else if (!base.path) target.path = relative2.path;
+                else target.path = base.path.slice(0, base.path.lastIndexOf("/") + 1) + relative2.path;
                 target.path = removeDotSegments(target.path);
               }
-              target.query = relative.query;
+              target.query = relative2.query;
             }
             target.userinfo = base.userinfo;
             target.host = base.host;
@@ -32072,7 +32107,7 @@ var init_ajvProvider_CEoC_sr = __esm({
           }
           target.scheme = base.scheme;
         }
-        target.fragment = relative.fragment;
+        target.fragment = relative2.fragment;
         return target;
       }
       function equal(uriA, uriB, options) {
@@ -32198,7 +32233,7 @@ var init_ajvProvider_CEoC_sr = __esm({
       const fastUri = {
         SCHEMES,
         normalize,
-        resolve: resolve2,
+        resolve: resolve4,
         resolveComponent,
         equal,
         serialize,
@@ -37890,7 +37925,7 @@ var init_stdio = __esm({
       }
       send(message) {
         if (this._closed) return Promise.reject(/* @__PURE__ */ new Error("StdioServerTransport is closed"));
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve4, reject) => {
           const json2 = serializeMessage(message);
           let settled = false;
           const onError = (error62) => {
@@ -37905,14 +37940,14 @@ var init_stdio = __esm({
             settled = true;
             this._stdout.off("error", onError);
             this._stdout.off("drain", onDrain);
-            resolve2();
+            resolve4();
           };
           this._stdout.once("error", onError);
           if (this._stdout.write(json2)) {
             if (settled) return;
             settled = true;
             this._stdout.off("error", onError);
-            resolve2();
+            resolve4();
           } else if (!settled) this._stdout.once("drain", onDrain);
         });
       }
@@ -37966,14 +38001,14 @@ var init_stdio = __esm({
       */
       async whenRequestsAnswered(timeoutMs) {
         if (this._closed || this._pendingRequests.size === 0) return true;
-        return await new Promise((resolve2) => {
+        return await new Promise((resolve4) => {
           const waiter = () => {
             clearTimeout(timer);
-            resolve2(true);
+            resolve4(true);
           };
           const timer = setTimeout(() => {
             this._drainWaiters = this._drainWaiters.filter((pending) => pending !== waiter);
-            resolve2(false);
+            resolve4(false);
           }, timeoutMs);
           this._drainWaiters.push(waiter);
         });
@@ -38013,7 +38048,7 @@ var init_dist = __esm({
 
 // node_modules/@chrischall/mcp-utils/dist/errors/index.js
 function redactSecrets(text) {
-  return text.replace(BEARER_RE, "$1[REDACTED]").replace(BASIC_AUTH_RE, "$1[REDACTED]").replace(SET_COOKIE_RE, "$1$2=[REDACTED]").replace(COOKIE_HEADER_RE, (_m, prefix, pairs) => `${prefix}${pairs.replace(/=[^;,\s]*/g, "=[REDACTED]")}`).replace(API_KEY_RE, "[REDACTED]").replace(QUERY_SECRET_RE, "$1[REDACTED]").replace(AWS_SIGV4_RE, "$1[REDACTED]").replace(JSON_SECRET_DQ_RE, "$1[REDACTED]$2").replace(JSON_SECRET_SQ_RE, "$1[REDACTED]$2").replace(JWT_RE, "[REDACTED]");
+  return text.replace(BEARER_RE, "$1[REDACTED]").replace(BASIC_AUTH_RE, "$1[REDACTED]").replace(SET_COOKIE_RE, "$1$2=[REDACTED]").replace(COOKIE_HEADER_RE, (_m, prefix, pairs) => `${prefix}${pairs.replace(/=[^;,\s]*/g, "=[REDACTED]")}`).replace(API_KEY_RE, "[REDACTED]").replace(HEADER_SECRET_RE, "$1[REDACTED]").replace(QUERY_SECRET_RE, "$1[REDACTED]").replace(OAUTH_CODE_RE, "$1[REDACTED]").replace(FORM_PASSWORD_RE, "$1[REDACTED]").replace(AWS_SIGV4_RE, "$1[REDACTED]").replace(JSON_SECRET_DQ_RE, "$1[REDACTED]$2").replace(JSON_SECRET_SQ_RE, "$1[REDACTED]$2").replace(JWT_RE, "[REDACTED]");
 }
 function truncateErrorMessage(text, max = DEFAULT_ERROR_MESSAGE_MAX) {
   const str = text === null || text === void 0 ? "" : String(text);
@@ -38027,7 +38062,7 @@ function messageOf(err) {
     return err.message;
   return String(err);
 }
-var DEFAULT_ERROR_MESSAGE_MAX, McpToolError, BEARER_RE, JWT_RE, BASIC_AUTH_RE, SET_COOKIE_RE, COOKIE_HEADER_RE, API_KEY_RE, QUERY_SECRET_RE, AWS_SIGV4_RE, JSON_SECRET_KEYS, JSON_SECRET_DQ_RE, JSON_SECRET_SQ_RE;
+var DEFAULT_ERROR_MESSAGE_MAX, McpToolError, BEARER_RE, JWT_RE, BASIC_AUTH_RE, SET_COOKIE_RE, COOKIE_HEADER_RE, API_KEY_RE, QUERY_SECRET_RE, OAUTH_CODE_RE, FORM_PASSWORD_RE, HEADER_SECRET_RE, AWS_SIGV4_RE, JSON_SECRET_KEYS, JSON_SECRET_DQ_RE, JSON_SECRET_SQ_RE;
 var init_errors = __esm({
   "node_modules/@chrischall/mcp-utils/dist/errors/index.js"() {
     DEFAULT_ERROR_MESSAGE_MAX = 500;
@@ -38061,11 +38096,26 @@ var init_errors = __esm({
       "whsec_[A-Za-z0-9]{16,}\\b"
       // webhook signing secret (Stripe-style)
     ].map((p) => `\\b${p}`).join("|"), "g");
-    QUERY_SECRET_RE = /([?&](?:access_token|refresh_token|client_secret|api_?key|signature|token|key|sig)=)[^&#\s"'<>`]+/gi;
+    QUERY_SECRET_RE = /([?&](?:(?:access|refresh|id|auth|session|csrf|xsrf)[_-]?token|client[_-]?secret|api[_-]?secret|api[_-]?key|password|passwd|signature|token|key|sig)=)[^&#\s"'<>`]+/gi;
+    OAUTH_CODE_RE = /([?&]code=)(?=[^&#\s"'<>`]{16,})[^&#\s"'<>`]+/gi;
+    FORM_PASSWORD_RE = /((?:^|[\s,;:"'(\[{])(?:password|passwd)=)[^&#\s"'<>`]+/gim;
+    HEADER_SECRET_RE = /(\b(?:x[-_][a-z0-9_-]*?(?:api[-_]?key|token|secret|auth)[a-z0-9_-]*|api[-_]?key)\s*:\s*)[^\s,;"'<>`]+/gi;
     AWS_SIGV4_RE = /([?&]X-Amz-(?:Signature|Security-Token|Credential)=)[^&#\s"'<>`]+/gi;
-    JSON_SECRET_KEYS = "access_token|refresh_token|client_secret|api_?key|password|passwd|secret|token";
-    JSON_SECRET_DQ_RE = new RegExp(`("(?:${JSON_SECRET_KEYS})"\\s*:\\s*")[^"]*(")`, "gi");
-    JSON_SECRET_SQ_RE = new RegExp(`('(?:${JSON_SECRET_KEYS})'\\s*:\\s*')[^']*(')`, "gi");
+    JSON_SECRET_KEYS = [
+      "(?:access|refresh|id|auth|session|bearer|csrf|xsrf)[_-]?token",
+      "client[_-]?secret",
+      "api[_-]?secret",
+      "(?:x[_-])?api[_-]?key",
+      "private[_-]?key",
+      "x[_-][a-z0-9_-]*?(?:api[_-]?key|token|secret|auth)[a-z0-9_-]*",
+      "(?:proxy-)?authorization",
+      "password",
+      "passwd",
+      "secret",
+      "token"
+    ].join("|");
+    JSON_SECRET_DQ_RE = new RegExp(`("(?:${JSON_SECRET_KEYS})"\\s*:\\s*")(?:[^"\\\\]|\\\\.)*(")`, "gi");
+    JSON_SECRET_SQ_RE = new RegExp(`('(?:${JSON_SECRET_KEYS})'\\s*:\\s*')(?:[^'\\\\]|\\\\.)*(')`, "gi");
   }
 });
 
@@ -42565,7 +42615,7 @@ function isRef(value) {
 function cloneIssues(issues) {
   return issues.map((iss) => iss.path ? { ...iss, path: iss.path.slice() } : { ...iss });
 }
-function isRecursive(inst, stack, resolve2) {
+function isRecursive(inst, stack, resolve4) {
   const cached2 = recursive.get(inst);
   if (cached2 !== void 0)
     return cached2 ? PROVEN : NONE;
@@ -42575,7 +42625,7 @@ function isRecursive(inst, stack, resolve2) {
   let result = NONE;
   const check2 = (child) => {
     if (result !== PROVEN && child?._zod) {
-      const answer = isRecursive(child, stack, resolve2);
+      const answer = isRecursive(child, stack, resolve4);
       if (answer > result)
         result = answer;
     }
@@ -42586,7 +42636,7 @@ function isRecursive(inst, stack, resolve2) {
       const desc = Object.getOwnPropertyDescriptor(sh, key);
       if (spread && !desc.enumerable)
         continue;
-      const child = desc.get ? ASSUMED : desc.value?._zod ? isRecursive(desc.value, stack, resolve2) : NONE;
+      const child = desc.get ? ASSUMED : desc.value?._zod ? isRecursive(desc.value, stack, resolve4) : NONE;
       if (child > answer)
         answer = child;
     }
@@ -42650,7 +42700,7 @@ function isRecursive(inst, stack, resolve2) {
       break;
     // `$ZodLazy` caches its inner on the def, so a resolved edge is followed exactly
     case "lazy": {
-      const inner = def._cachedInner ?? (resolve2 ? inst._zod.innerType : void 0);
+      const inner = def._cachedInner ?? (resolve4 ? inst._zod.innerType : void 0);
       merge2(inner ? isRecursive(inner, stack, false) : ASSUMED);
       break;
     }
@@ -58466,6 +58516,7 @@ var init_response = __esm({
 var init_confirmation = __esm({
   "node_modules/@chrischall/mcp-utils/dist/server/confirmation.js"() {
     init_dist();
+    init_caller();
     init_response();
   }
 });
@@ -58479,17 +58530,73 @@ Hint: ${err.hint}`);
   }
   throw err;
 }
+function mcpRequestFrom(args) {
+  const ctx = args.at(-1);
+  if (typeof ctx !== "object" || ctx === null)
+    return void 0;
+  const req = ctx.mcpReq;
+  if (typeof req !== "object" || req === null)
+    return void 0;
+  return typeof req.notify === "function" ? req : void 0;
+}
+function callSignalFrom(args) {
+  const ctx = args.at(-1);
+  if (typeof ctx !== "object" || ctx === null)
+    return void 0;
+  const req = ctx.mcpReq;
+  if (typeof req !== "object" || req === null)
+    return void 0;
+  const signal = req.signal;
+  return signal instanceof AbortSignal ? signal : void 0;
+}
+function declaredCapabilitiesFrom(server) {
+  const inner = server.server;
+  if (typeof inner !== "object" || inner === null)
+    return void 0;
+  const read = inner.getClientCapabilities;
+  if (typeof read !== "function")
+    return void 0;
+  try {
+    const declared = read.call(inner);
+    return typeof declared === "object" && declared !== null ? declared : void 0;
+  } catch {
+    return void 0;
+  }
+}
 function surfaceToolHints(server) {
   const register2 = server.registerTool.bind(server);
-  server.registerTool = (name, config2, cb) => register2(name, config2, (...args) => {
-    let result;
-    try {
-      result = cb(...args);
-    } catch (err) {
-      return hintResultOrRethrow(err);
-    }
-    return result instanceof Promise ? result.catch(hintResultOrRethrow) : result;
-  });
+  server.registerTool = (name, config2, cb) => register2(name, config2, (...args) => (
+    // THE CALLER'S CANCELLATION, made ambient for the whole handler
+    // (`cancel/index.ts`). The SDK delivers it and the fleet ignored it:
+    // measured against @modelcontextprotocol/server 2.0.0, a cancelled
+    // call aborts `ctx.mcpReq.signal` with the caller's reason and the
+    // handler runs to completion regardless — so the HTTP request stays
+    // in flight, the child keeps burning metered CPU, and the upstream
+    // keeps being hit for somebody who has gone. claude.ai sent 101
+    // cancellations in the week to 2026-09-20.
+    //
+    // Here because this is the one wrapper every tool already passes
+    // through: threading the signal by hand would mean editing several
+    // hundred handlers and missing exactly the ones nobody edits.
+    withCallSignal(callSignalFrom(args), () => (
+      // WHAT THE CALLER CAN DO, made ambient for the same reason and in
+      // the same place (`caller/index.ts`). Only the 2025-era half needs
+      // the wrapper — a 2026-07-28 request answers for itself off its own
+      // envelope — but a guarded tool that cannot tell whether the caller
+      // can be shown a prompt returns one the SDK then refuses to deliver,
+      // and that refusal reaches the caller as an unexplained protocol
+      // error it had no chance to catch.
+      withCallerCapabilities(declaredCapabilitiesFrom(server), () => {
+        let result;
+        try {
+          result = cb(...args);
+        } catch (err) {
+          return hintResultOrRethrow(err);
+        }
+        return result instanceof Promise ? result.catch(hintResultOrRethrow) : result;
+      })
+    ), mcpRequestFrom(args))
+  ));
 }
 async function createMcpServer(opts) {
   const server = new McpServer({ name: opts.name, version: opts.version }, { supportedProtocolVersions: [...SERVER_PROTOCOL_VERSIONS] });
@@ -58506,11 +58613,43 @@ async function createMcpServer(opts) {
 }
 function withGracefulShutdown(target, opts = {}) {
   const shouldExit = opts.exit ?? true;
+  if (opts.timeoutMs !== void 0 && !(Number.isFinite(opts.timeoutMs) && opts.timeoutMs > 0)) {
+    throw new RangeError("withGracefulShutdown: timeoutMs must be a finite number greater than 0.");
+  }
+  const timeoutMs = opts.timeoutMs ?? DEFAULT_SHUTDOWN_TIMEOUT_MS;
+  if (opts.repeatSignalGraceMs !== void 0 && !(Number.isFinite(opts.repeatSignalGraceMs) && opts.repeatSignalGraceMs >= 0)) {
+    throw new RangeError("withGracefulShutdown: repeatSignalGraceMs must be a finite number >= 0.");
+  }
+  const repeatGraceMs = opts.repeatSignalGraceMs ?? DEFAULT_REPEAT_SIGNAL_GRACE_MS;
   let shuttingDown = false;
+  let firstSignalAt = 0;
+  let exited = false;
+  const exitOnce = () => {
+    if (exited)
+      return;
+    exited = true;
+    process.exit(0);
+  };
   const handler = (signal) => {
-    if (shuttingDown)
+    if (shuttingDown) {
+      if (Date.now() - firstSignalAt < repeatGraceMs)
+        return;
+      if (shouldExit) {
+        console.error(`[mcp-utils] second ${signal} during shutdown \u2014 exiting now`);
+        exitOnce();
+      }
       return;
+    }
     shuttingDown = true;
+    firstSignalAt = Date.now();
+    let timer;
+    if (shouldExit) {
+      timer = setTimeout(() => {
+        console.error(`[mcp-utils] graceful shutdown on ${signal} did not finish in ${timeoutMs}ms \u2014 exiting`);
+        exitOnce();
+      }, timeoutMs);
+      timer.unref?.();
+    }
     void (async () => {
       try {
         if (opts.onSignal)
@@ -58519,8 +58658,10 @@ function withGracefulShutdown(target, opts = {}) {
       } catch (err) {
         console.error(`[mcp-utils] error during graceful shutdown on ${signal}: ${err instanceof Error ? err.message : String(err)}`);
       } finally {
+        if (timer !== void 0)
+          clearTimeout(timer);
         if (shouldExit)
-          process.exit(0);
+          exitOnce();
       }
     })();
   };
@@ -58548,7 +58689,7 @@ function runMcp(opts) {
   }
   return handle;
 }
-var SERVER_PROTOCOL_VERSIONS;
+var SERVER_PROTOCOL_VERSIONS, DEFAULT_SHUTDOWN_TIMEOUT_MS, DEFAULT_REPEAT_SIGNAL_GRACE_MS;
 var init_server = __esm({
   "node_modules/@chrischall/mcp-utils/dist/server/index.js"() {
     init_stdio();
@@ -58556,14 +58697,20 @@ var init_server = __esm({
     init_errors();
     init_response();
     init_confirmation();
+    init_cancel();
+    init_caller();
     SERVER_PROTOCOL_VERSIONS = Object.freeze([
       "2026-07-28",
       ...SUPPORTED_PROTOCOL_VERSIONS
     ]);
+    DEFAULT_SHUTDOWN_TIMEOUT_MS = 5e3;
+    DEFAULT_REPEAT_SIGNAL_GRACE_MS = 500;
   }
 });
 
 // node_modules/@chrischall/mcp-utils/dist/config/index.js
+import { homedir } from "node:os";
+import { isAbsolute, join, resolve } from "node:path";
 function readEnvVar(key, opts = {}) {
   const env = opts.env ?? process.env;
   const raw = env[key];
@@ -58575,6 +58722,15 @@ function readEnvVar(key, opts = {}) {
   }
   return opts.default;
 }
+function expandPath(p) {
+  let expanded = p;
+  if (p === "~") {
+    expanded = homedir();
+  } else if (p.startsWith("~/")) {
+    expanded = join(homedir(), p.slice(2));
+  }
+  return isAbsolute(expanded) ? expanded : resolve(expanded);
+}
 async function loadDotenvSafely(opts = {}) {
   try {
     const mod = await import(
@@ -58598,19 +58754,61 @@ var init_config = __esm({
   }
 });
 
+// node_modules/@chrischall/mcp-utils/dist/fs/confine.js
+import { existsSync, realpathSync } from "node:fs";
+import { dirname, isAbsolute as isAbsolute2, relative, resolve as resolve2, sep } from "node:path";
+function isInside(root, target) {
+  const rel = relative(root, target);
+  return rel === "" || !rel.startsWith(`..${sep}`) && rel !== ".." && !isAbsolute2(rel);
+}
+function realPathAllowingMissing(p) {
+  const abs = resolve2(p);
+  let existing = abs;
+  const tail = [];
+  while (!existsSync(existing)) {
+    const parent = dirname(existing);
+    if (parent === existing)
+      break;
+    tail.unshift(existing.slice(parent.length).replace(/^[/\\]+/, ""));
+    existing = parent;
+  }
+  let real;
+  try {
+    real = realpathSync(existing);
+  } catch {
+    real = existing;
+  }
+  return tail.length > 0 ? resolve2(real, ...tail) : real;
+}
+function assertPathWithinRoots(path, roots) {
+  const target = realPathAllowingMissing(expandPath(path));
+  for (const root of roots) {
+    if (isInside(realPathAllowingMissing(expandPath(root)), target))
+      return target;
+  }
+  throw new Error(`Path is outside the allowed directories: ${path}`);
+}
+var init_confine = __esm({
+  "node_modules/@chrischall/mcp-utils/dist/fs/confine.js"() {
+    init_config();
+  }
+});
+
 // node_modules/@chrischall/mcp-utils/dist/fs/output.js
 var init_output = __esm({
   "node_modules/@chrischall/mcp-utils/dist/fs/output.js"() {
     init_config();
+    init_confine();
   }
 });
 
 // node_modules/@chrischall/mcp-utils/dist/fs/index.js
 import { openAsBlob } from "node:fs";
 async function fileBlob(path, opts = {}) {
+  const target = opts.allowedRoots ? assertPathWithinRoots(path, opts.allowedRoots) : path;
   let blob;
   try {
-    blob = await openAsBlob(path, opts.type !== void 0 ? { type: opts.type } : void 0);
+    blob = await openAsBlob(target, opts.type !== void 0 ? { type: opts.type } : void 0);
   } catch {
     throw new Error(`Cannot read file for upload: ${path}`);
   }
@@ -58621,7 +58819,9 @@ async function fileBlob(path, opts = {}) {
 }
 var init_fs = __esm({
   "node_modules/@chrischall/mcp-utils/dist/fs/index.js"() {
+    init_confine();
     init_output();
+    init_confine();
   }
 });
 
@@ -58672,23 +58872,78 @@ function createApiClient(opts) {
   const retryStatuses = retry.statuses ?? [429];
   const timeoutMs = opts.timeout;
   const authHeader = (token) => !token ? {} : opts.tokenHeader ? { [opts.tokenHeader]: token } : { Authorization: `Bearer ${token}` };
-  function withTimeout(run) {
-    if (timeoutMs == null || timeoutMs <= 0)
-      return run(void 0);
+  async function withTimeout(run) {
+    if (timeoutMs == null || timeoutMs <= 0) {
+      const res2 = await run(withAmbientCancellation(void 0));
+      return { res: res2, done: () => {
+      }, expired: void 0 };
+    }
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), timeoutMs);
-    return run(controller.signal).catch((err) => {
-      if (err instanceof Error && err.name === "AbortError")
+    let res;
+    try {
+      res = await run(withAmbientCancellation(controller.signal));
+    } catch (err) {
+      clearTimeout(timer);
+      if (err instanceof Error && err.name === "AbortError" && controller.signal.aborted) {
         throw new RequestTimeoutError(service, timeoutMs);
+      }
       throw err;
-    }).finally(() => clearTimeout(timer));
+    }
+    const expired = new Promise((_resolve, reject) => {
+      controller.signal.addEventListener("abort", () => reject(new RequestTimeoutError(service, timeoutMs)), {
+        once: true
+      });
+    });
+    expired.catch(() => {
+    });
+    return { res, done: () => clearTimeout(timer), expired };
+  }
+  async function readBody(attempt, read) {
+    try {
+      if (!attempt.expired)
+        return await read(attempt.res);
+      return await Promise.race([read(attempt.res), attempt.expired]);
+    } catch (err) {
+      if (err instanceof RequestTimeoutError) {
+        attempt.res.body?.cancel().catch(() => {
+        });
+      }
+      throw err;
+    } finally {
+      attempt.done();
+    }
+  }
+  const baseParts = (() => {
+    try {
+      const u = new URL(base);
+      return { origin: u.origin, username: u.username, password: u.password };
+    } catch {
+      return void 0;
+    }
+  })();
+  const baseOrigin = baseParts?.origin;
+  function resolveUrl2(path, query) {
+    const url4 = `${base}${path}${query}`;
+    if (baseOrigin === void 0)
+      return url4;
+    let parsed;
+    try {
+      parsed = new URL(url4);
+    } catch {
+      throw new Error(`Refusing request to ${service}: path ${JSON.stringify(path)} does not form a valid URL.`);
+    }
+    if (parsed.origin !== baseOrigin || parsed.username !== baseParts?.username || parsed.password !== baseParts?.password) {
+      throw new Error(`Refusing request to ${service}: path ${JSON.stringify(path)} resolves outside the base origin ${baseOrigin}. Paths must be relative to baseUrl (start them with "/").`);
+    }
+    return url4;
   }
   async function send(method, path, opt) {
     const isMultipart = opt.formData !== void 0;
     const hasJsonBody = !isMultipart && opt.body !== void 0;
     const reqBody = isMultipart ? opt.formData : hasJsonBody ? JSON.stringify(opt.body) : void 0;
     const query = opt.query ? buildQueryString(opt.query) : "";
-    const url4 = `${base}${path}${query}`;
+    const url4 = resolveUrl2(path, query);
     const bodyInit = reqBody !== void 0 ? { body: reqBody } : {};
     const fetchWith = (token, signal) => doFetch(url4, {
       method,
@@ -58705,8 +58960,10 @@ function createApiClient(opts) {
     const once = () => withTimeout((signal) => opts.tokenManager ? opts.tokenManager.withAuth((token) => fetchWith(token, signal)) : (async () => fetchWith(await opts.getToken?.() || void 0, signal))());
     let attempt = 0;
     for (; ; ) {
-      const res = await once();
+      const current = await once();
+      const res = current.res;
       if (retryStatuses.includes(res.status) && attempt < retry.count) {
+        current.done();
         attempt += 1;
         const delay = retry.honorRetryAfter ? parseRetryAfterMs(res.headers.get("retry-after"), {
           defaultMs: retry.delayMs,
@@ -58715,18 +58972,21 @@ function createApiClient(opts) {
         await sleep2(delay);
         continue;
       }
-      return res;
+      return current;
     }
   }
   async function fetchJson(method, path, opt = {}) {
-    const res = await send(method, path, opt);
+    const attempt = await send(method, path, opt);
+    const res = attempt.res;
+    if (res.status === 401 || res.status === 429 || res.status === 204)
+      attempt.done();
     if (res.status === 401)
       throw unauthorized();
     if (res.status === 429)
       throw rateLimited();
     if (res.status === 204)
       return void 0;
-    const text = await res.text();
+    const text = await readBody(attempt, (r) => r.text());
     if (!res.ok) {
       throw new ApiError(res.status, formatApiError(res.status, method, path, text, { service }));
     }
@@ -58736,12 +58996,15 @@ function createApiClient(opts) {
   }
   async function fetchHtml(method, path, opt = {}) {
     const headers = { Accept: "text/html,*/*", ...opt.headers };
-    const res = await send(method, path, { ...opt, headers });
+    const attempt = await send(method, path, { ...opt, headers });
+    const res = attempt.res;
+    if (res.status === 401 || res.status === 429)
+      attempt.done();
     if (res.status === 401)
       throw unauthorized();
     if (res.status === 429)
       throw rateLimited();
-    const text = await res.text();
+    const text = await readBody(attempt, (r) => r.text());
     if (!res.ok) {
       throw new ApiError(res.status, formatApiError(res.status, method, path, text, { service }));
     }
@@ -58749,16 +59012,23 @@ function createApiClient(opts) {
   }
   async function fetchRaw(method, path, opt = {}) {
     const headers = { Accept: "*/*", ...opt.headers };
-    const res = await send(method, path, { ...opt, headers });
+    const attempt = await send(method, path, { ...opt, headers });
+    const res = attempt.res;
+    if (res.status === 401 || res.status === 429)
+      attempt.done();
     if (res.status === 401)
       throw unauthorized();
     if (res.status === 429)
       throw rateLimited();
     if (!res.ok) {
-      const text = await res.text().catch(() => "");
+      const text = await readBody(attempt, (r) => r.text()).catch((err) => {
+        if (err instanceof RequestTimeoutError)
+          throw err;
+        return "";
+      });
       throw new ApiError(res.status, formatApiError(res.status, method, path, text, { service }));
     }
-    const bytes = new Uint8Array(await res.arrayBuffer());
+    const bytes = new Uint8Array(await readBody(attempt, (r) => r.arrayBuffer()));
     return {
       status: res.status,
       contentType: res.headers.get("content-type"),
@@ -58794,6 +59064,7 @@ function formatApiError(status, method, path, errorText, opts = {}) {
 var DEFAULT_RETRY, defaultSleep, UnauthorizedError, RateLimitedError, RequestTimeoutError, ApiError;
 var init_http = __esm({
   "node_modules/@chrischall/mcp-utils/dist/http/index.js"() {
+    init_cancel();
     init_errors();
     init_throttle();
     init_response_cache();
@@ -58866,10 +59137,14 @@ var init_parse_lenient = __esm({
 
 // node_modules/@chrischall/mcp-utils/dist/zod/index.js
 function toolAnnotations(opts = {}) {
+  if (opts.readOnly === true && opts.destructive === true) {
+    throw new Error("toolAnnotations: readOnly: true contradicts destructive: true \u2014 a destructive tool is not read-only.");
+  }
   return {
     ...opts.title !== void 0 ? { title: opts.title } : {},
-    readOnlyHint: opts.readOnly ?? true,
+    readOnlyHint: opts.readOnly ?? opts.destructive === void 0,
     ...opts.idempotent !== void 0 ? { idempotentHint: opts.idempotent } : {},
+    ...opts.destructive !== void 0 ? { destructiveHint: opts.destructive } : {},
     ...opts.openWorld !== void 0 ? { openWorldHint: opts.openWorld } : {}
   };
 }
@@ -58921,15 +59196,24 @@ var init_auth = __esm({
   }
 });
 
+// node_modules/@chrischall/mcp-utils/dist/internal/ascii.js
+var init_ascii = __esm({
+  "node_modules/@chrischall/mcp-utils/dist/internal/ascii.js"() {
+  }
+});
+
 // node_modules/@chrischall/mcp-utils/dist/scrape/index.js
 var init_scrape = __esm({
   "node_modules/@chrischall/mcp-utils/dist/scrape/index.js"() {
+    init_ascii();
   }
 });
 
 // node_modules/@chrischall/mcp-utils/dist/index.js
 var init_dist2 = __esm({
   "node_modules/@chrischall/mcp-utils/dist/index.js"() {
+    init_cancel();
+    init_caller();
     init_server();
     init_response();
     init_errors();
@@ -58964,8 +59248,8 @@ __export(images_exports, {
   writeSidecar: () => writeSidecar
 });
 import { mkdir, readFile, writeFile, access, stat, open as open2 } from "node:fs/promises";
-import { existsSync } from "node:fs";
-import { join as join2, resolve, isAbsolute } from "node:path";
+import { existsSync as existsSync2 } from "node:fs";
+import { join as join3, resolve as resolve3, isAbsolute as isAbsolute3 } from "node:path";
 function slugify2(text, max = 40) {
   const s = text.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, max).replace(/-+$/g, "");
   return s || "image";
@@ -58979,10 +59263,10 @@ async function exists(p) {
   }
 }
 async function uniquePath(dir, base, ext) {
-  let candidate = join2(dir, `${base}.${ext}`);
+  let candidate = join3(dir, `${base}.${ext}`);
   let n = 2;
   while (await exists(candidate)) {
-    candidate = join2(dir, `${base}-${n}.${ext}`);
+    candidate = join3(dir, `${base}-${n}.${ext}`);
     n++;
   }
   return candidate;
@@ -59016,7 +59300,7 @@ async function writeMedia(dir, base, base643, mimeType) {
   await mkdir(dir, { recursive: true });
   const path = await uniquePath(dir, base, mediaExt(mimeType));
   await writeFile(path, Buffer.from(base643, "base64"));
-  return resolve(path);
+  return resolve3(path);
 }
 async function writeImage(dir, base, base643, mimeType) {
   return writeMedia(dir, base, base643, mimeType);
@@ -59025,14 +59309,14 @@ async function writeSidecar(imagePath, data) {
   await writeFile(`${imagePath}.json`, JSON.stringify(data, null, 2));
 }
 function resolveInputPath(p, kind) {
-  if (isAbsolute(p) && existsSync(p)) return p;
+  if (isAbsolute3(p) && existsSync2(p)) return p;
   const inputDir = readEnvVar("GEMINI_INPUT_DIR");
   if (inputDir) {
-    const candidate = join2(inputDir, p);
-    if (existsSync(candidate)) return resolve(candidate);
+    const candidate = join3(inputDir, p);
+    if (existsSync2(candidate)) return resolve3(candidate);
   }
-  const cwd = resolve(p);
-  if (existsSync(cwd)) return cwd;
+  const cwd = resolve3(p);
+  if (existsSync2(cwd)) return cwd;
   const hint = `Set GEMINI_INPUT_DIR to a directory containing your ${kind.toLowerCase()}s, or pass an absolute path.`;
   throw new McpToolError(
     `${kind} not found: ${p}` + (inputDir ? ` (also searched GEMINI_INPUT_DIR=${inputDir})` : ""),
@@ -59128,7 +59412,7 @@ import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 import { readFile as readFile2, unlink } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join as join3 } from "node:path";
+import { join as join4 } from "node:path";
 async function readClipboardImage(run = defaultRun) {
   if (process.platform !== "darwin") {
     throw new McpToolError("from_clipboard is only supported on macOS", {
@@ -59136,8 +59420,8 @@ async function readClipboardImage(run = defaultRun) {
     });
   }
   const id = `${Date.now()}-${Math.random().toString(36).slice(2)}`;
-  const png = join3(tmpdir(), `gemini-clip-${id}.png`);
-  const jpg = join3(tmpdir(), `gemini-clip-${id}.jpg`);
+  const png = join4(tmpdir(), `gemini-clip-${id}.png`);
+  const jpg = join4(tmpdir(), `gemini-clip-${id}.jpg`);
   try {
     try {
       await run("osascript", [
@@ -59184,15 +59468,15 @@ init_dist2();
 
 // src/dotenv.ts
 init_dist2();
-import { dirname, join } from "node:path";
+import { dirname as dirname2, join as join2 } from "node:path";
 import { fileURLToPath } from "node:url";
 async function loadStdioDotenv() {
-  const here = dirname(fileURLToPath(import.meta.url));
-  await loadDotenvSafely({ path: join(here, "..", ".env"), override: false });
+  const here = dirname2(fileURLToPath(import.meta.url));
+  await loadDotenvSafely({ path: join2(here, "..", ".env"), override: false });
 }
 
 // src/version.ts
-var VERSION = "2.1.1";
+var VERSION = "2.1.3";
 
 // src/errors.ts
 init_dist2();
@@ -60510,8 +60794,8 @@ async function emitMedia(named, kind, opts, meta3, onWritten) {
       ...p.key ? { curl_hint: `curl -sS -o ${downloadFilename(p.key)} "${p.ref}"` } : {}
     }))
   } : {};
-  const storage = sink.persistsFiles ? {} : { storage: sink.kind, storage_note: storageNote };
-  return minifiedResult({ [`${kind}s`]: refs, ...media, ...unavailable, ...note, ...storage, ...meta3 });
+  const storage3 = sink.persistsFiles ? {} : { storage: sink.kind, storage_note: storageNote };
+  return minifiedResult({ [`${kind}s`]: refs, ...media, ...unavailable, ...note, ...storage3, ...meta3 });
 }
 async function emit(named, opts, meta3, onWritten) {
   return emitMedia(named.map((n) => ({ media: n.image, base: n.base })), "image", opts, meta3, onWritten);
@@ -60827,13 +61111,13 @@ function persistableResult(result) {
   return { result };
 }
 function awaitWithBudget(promise2, waitMs) {
-  return new Promise((resolve2, reject) => {
-    const timer = setTimeout(() => resolve2(void 0), waitMs);
+  return new Promise((resolve4, reject) => {
+    const timer = setTimeout(() => resolve4(void 0), waitMs);
     timer.unref?.();
     promise2.then(
       (result) => {
         clearTimeout(timer);
-        resolve2(result);
+        resolve4(result);
       },
       (err) => {
         clearTimeout(timer);
@@ -60901,7 +61185,7 @@ var JobRegistry = class {
   /** Await outstanding durable writes. Tests only — handlers never need it. */
   async drain() {
     for (let round = 0; round < 50; round++) {
-      await new Promise((resolve2) => setTimeout(resolve2, 0));
+      await new Promise((resolve4) => setTimeout(resolve4, 0));
       if (!this.pending.size) return;
       await Promise.allSettled([...this.pending]);
     }
@@ -62967,8 +63251,8 @@ init_images();
 
 // src/sidecar.ts
 import { readdir, readFile as readFile3, stat as stat2 } from "node:fs/promises";
-import { existsSync as existsSync2 } from "node:fs";
-import { join as join4 } from "node:path";
+import { existsSync as existsSync3 } from "node:fs";
+import { join as join5 } from "node:path";
 var SIDECAR_SUFFIX2 = ".json";
 async function readSidecars(dir) {
   let entries;
@@ -62980,7 +63264,7 @@ async function readSidecars(dir) {
   const records = [];
   for (const entry of entries) {
     if (!entry.endsWith(SIDECAR_SUFFIX2)) continue;
-    const sidecarPath = join4(dir, entry);
+    const sidecarPath = join5(dir, entry);
     try {
       const parsed = JSON.parse(await readFile3(sidecarPath, "utf8"));
       if (typeof parsed !== "object" || parsed === null) continue;
@@ -62990,7 +63274,7 @@ async function readSidecars(dir) {
       records.push({
         sidecarPath,
         interactionId,
-        images: paths.filter((p) => existsSync2(p)),
+        images: paths.filter((p) => existsSync3(p)),
         mtimeMs: (await stat2(sidecarPath)).mtimeMs
       });
     } catch {

package/dist/version.js

@@ -1,2 +1,2 @@
 /** Single source of the server version. release-please bumps the literal below. */
-export const VERSION = '2.1.1'; // x-release-please-version
+export const VERSION = '2.1.3'; // x-release-please-version

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrischall/gemini-mcp",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "mcpName": "io.github.chrischall/gemini-mcp",
   "description": "Gemini image-generation MCP server for Claude — developed and maintained by AI (Claude Code)",
   "author": "Claude Code (AI) <https://www.anthropic.com/claude>",
@@ -46,10 +46,10 @@
     "typecheck": "tsc -p tsconfig.test.json"
   },
   "dependencies": {
-    "@chrischall/mcp-utils": "^1.0.0",
+    "@chrischall/mcp-utils": "^2.4.0",
     "@modelcontextprotocol/server": "^2.0.0",
     "dotenv": "^17.4.0",
-    "zod": "^4.6.2"
+    "zod": "^4.6.5"
   },
   "devDependencies": {
     "@modelcontextprotocol/client": "^2.0.0",

package/server.json

@@ -6,12 +6,12 @@
     "url": "https://github.com/chrischall/gemini-mcp",
     "source": "github"
   },
-  "version": "2.1.1",
+  "version": "2.1.3",
   "packages": [
     {
       "registryType": "npm",
       "identifier": "@chrischall/gemini-mcp",
-      "version": "2.1.1",
+      "version": "2.1.3",
       "transport": {
         "type": "stdio"
       },