zola-mcp 1.4.2 → 1.4.4

package/.claude-plugin/marketplace.json

@@ -7,7 +7,7 @@
   },
   "metadata": {
     "description": "Zola wedding planning tools for Claude Code",
-    "version": "1.4.2"
+    "version": "1.4.4"
   },
   "plugins": [
     {
@@ -15,7 +15,7 @@
       "displayName": "Zola",
       "source": "./",
       "description": "Zola wedding planning tools for Claude — vendors, budget, guests, seating, events, registry, inquiries, and more via MCP",
-      "version": "1.4.2",
+      "version": "1.4.4",
       "author": {
         "name": "Chris Chall"
       },

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "zola",
   "displayName": "Zola",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "Zola wedding planning tools for Claude — vendors, budget, guests, seating, events, registry, inquiries, and more via MCP",
   "author": {
     "name": "Chris Chall",

package/dist/bundle.js

@@ -12,7 +12,11 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 var __commonJS = (cb, mod) => function __require2() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  try {
+    return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  } catch (e) {
+    throw mod = 0, e;
+  }
 };
 var __export = (target, all) => {
   for (var name in all)
@@ -34724,8 +34728,12 @@ var API_KEY_RE = new RegExp([
   // webhook signing secret (Stripe-style)
 ].map((p) => `\\b${p}`).join("|"), "g");
 var QUERY_SECRET_RE = /([?&](?:access_token|refresh_token|client_secret|api_?key|signature|token|key|sig)=)[^&#\s"'<>`]+/gi;
+var AWS_SIGV4_RE = /([?&]X-Amz-(?:Signature|Security-Token|Credential)=)[^&#\s"'<>`]+/gi;
+var JSON_SECRET_KEYS = "access_token|refresh_token|client_secret|api_?key|password|passwd|secret|token";
+var JSON_SECRET_DQ_RE = new RegExp(`("(?:${JSON_SECRET_KEYS})"\\s*:\\s*")[^"]*(")`, "gi");
+var JSON_SECRET_SQ_RE = new RegExp(`('(?:${JSON_SECRET_KEYS})'\\s*:\\s*')[^']*(')`, "gi");
 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(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(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]");
 }
 function truncateErrorMessage(text, max = DEFAULT_ERROR_MESSAGE_MAX) {
   const str = text === null || text === void 0 ? "" : String(text);
@@ -34848,6 +34856,8 @@ var NonNegInt = external_exports.number().int().nonnegative();
 var NonEmptyString = external_exports.string().min(1);
 var IsoDate = external_exports.iso.date();
 var IsoTime = external_exports.string().regex(/^([01]?\d|2[0-3]):[0-5]\d$/, "must be HH:MM (24h), e.g. 19:30");
+var NumericIdString = external_exports.string().regex(/^\d+$/, "must be a numeric id (digits only)").describe("A numeric id string (digits only), safe to interpolate into a URL path.");
+var SafePathSegment = external_exports.string().min(1).regex(/^[^/?#\s]+$/, 'must not contain "/", "?", "#", or whitespace').refine((v) => !v.includes(".."), 'must not contain ".."').describe('A single URL path segment, safe to interpolate: no "/", "..", "?", "#", or whitespace.');
 var schemaOrigin = external_exports.string().optional().describe("Portal origin (e.g. https://<vendor>.example.co) selecting which active session to use. Optional when only one session is active.");
 var schemaConfirm = external_exports.boolean().optional().describe("Must be true to proceed. Without this, the tool returns a preview.");
 var paginationSchema = {
@@ -34859,6 +34869,41 @@ var pageSchema = {
   page_size: external_exports.number().int().min(1).max(200).default(50).describe("Number of items per page (1-200).")
 };
 
+// node_modules/@chrischall/mcp-utils/dist/auth/cached-token.js
+function createCachedTokenSource(opts) {
+  const now = opts.now ?? Date.now;
+  const bufferMs = opts.bufferMs ?? 6e4;
+  const defaultTtlMs = opts.defaultTtlMs ?? 36e5;
+  let cached2 = null;
+  let inFlight = null;
+  const expiryOf = (minted) => {
+    if (minted.expiresAt !== void 0) {
+      return minted.expiresAt instanceof Date ? minted.expiresAt.getTime() : minted.expiresAt;
+    }
+    return now() + (minted.ttlMs ?? defaultTtlMs);
+  };
+  return {
+    getToken() {
+      if (cached2 && cached2.expiresAt - bufferMs > now())
+        return Promise.resolve(cached2.token);
+      if (inFlight)
+        return inFlight;
+      const p = opts.mint().then((minted) => {
+        cached2 = { token: minted.token, expiresAt: expiryOf(minted) };
+        return minted.token;
+      }).finally(() => {
+        if (inFlight === p)
+          inFlight = null;
+      });
+      inFlight = p;
+      return p;
+    },
+    invalidate() {
+      cached2 = null;
+    }
+  };
+}
+
 // node_modules/@chrischall/mcp-utils/dist/auth/index.js
 function bridgeDownHintOf(err) {
   if (err instanceof Error && err.name === "FetchproxyBridgeDownError") {
@@ -35860,10 +35905,20 @@ async function openEncryptedFrame(sessionKey, frame) {
 
 // node_modules/@fetchproxy/server/dist/election.js
 import { createServer, Server as HttpServer } from "node:http";
+var DEFAULT_BIND_TIMEOUT_MS = 5e3;
 async function electRole(opts) {
   const server = createServer();
+  const bindTimeoutMs = opts.bindTimeoutMs ?? DEFAULT_BIND_TIMEOUT_MS;
   return new Promise((resolve, reject) => {
+    let timer;
+    const clearBindTimer = () => {
+      if (timer) {
+        clearTimeout(timer);
+        timer = void 0;
+      }
+    };
     const onError = (e) => {
+      clearBindTimer();
       server.removeListener("listening", onListening);
       if (e.code === "EADDRINUSE") {
         try {
@@ -35876,11 +35931,25 @@ async function electRole(opts) {
       }
     };
     const onListening = () => {
+      clearBindTimer();
       server.removeListener("error", onError);
       resolve({ role: "host", server });
     };
     server.once("error", onError);
     server.once("listening", onListening);
+    if (bindTimeoutMs > 0) {
+      timer = setTimeout(() => {
+        server.removeListener("error", onError);
+        server.removeListener("listening", onListening);
+        try {
+          server.close();
+        } catch {
+        }
+        reject(new Error(`fetchproxy: bind to ${opts.host}:${opts.port} timed out after ${bindTimeoutMs}ms (port may be in a bad state)`));
+      }, bindTimeoutMs);
+      if (typeof timer.unref === "function")
+        timer.unref();
+    }
     server.listen(opts.port, opts.host);
   });
 }
@@ -35973,6 +36042,44 @@ var SessionState = class {
   }
 };
 
+// node_modules/@fetchproxy/server/dist/session-ready.js
+var SESSION_READY_TIMEOUT_MS = 3e4;
+var FetchproxySessionNotReadyError = class extends Error {
+  reason;
+  pairCode;
+  mcpId;
+  hint;
+  constructor(info) {
+    const pairing = info.pairCode !== null && info.pairCode !== "";
+    const hint = pairing ? `Open the Transporter extension popup and approve pair code ${info.pairCode} for "${info.mcpId}", then retry.` : `The extension is connected but hasn't confirmed a session for "${info.mcpId}" \u2014 sign in to the target site in that browser (and approve the requested scope if it changed), then retry.`;
+    super(`fetchproxy: ${pairing ? "pairing not yet approved" : "no confirmed browser session"} for "${info.mcpId}". ${hint}`);
+    this.name = "FetchproxySessionNotReadyError";
+    this.reason = pairing ? "pair-required" : "not-ready";
+    this.pairCode = pairing ? info.pairCode : null;
+    this.mcpId = info.mcpId;
+    this.hint = hint;
+    Object.setPrototypeOf(this, new.target.prototype);
+  }
+};
+async function awaitSessionReady(ready, opts) {
+  const ms = opts.timeoutMs ?? SESSION_READY_TIMEOUT_MS;
+  if (ms <= 0)
+    return ready;
+  let timer;
+  const timeout = new Promise((_, reject) => {
+    timer = setTimeout(() => {
+      reject(new FetchproxySessionNotReadyError({ mcpId: opts.mcpId, pairCode: opts.pendingPairCode() }));
+    }, ms);
+    timer.unref?.();
+  });
+  try {
+    return await Promise.race([ready, timeout]);
+  } finally {
+    if (timer)
+      clearTimeout(timer);
+  }
+}
+
 // node_modules/@fetchproxy/server/dist/host.js
 var PUBLIC_ORIGIN_RE = /^https?:\/\/(?!(127\.0\.0\.1|localhost)(:|$))/i;
 var enc2 = new TextEncoder();
@@ -36060,6 +36167,29 @@ async function startHost(opts) {
           return;
         }
         if (frame.type === "hello" && frame.role === "server") {
+          const peerEdPub = fromB64(frame.identityEd25519Pub);
+          const peerSigMsg = concatBytes(enc2.encode(frame.mcpId), fromB64(frame.sessionNonce));
+          const peerSig = fromB64(frame.sessionSig);
+          let peerSigOk = false;
+          try {
+            peerSigOk = await ed25519Verify(peerEdPub, peerSigMsg, peerSig);
+          } catch {
+            peerSigOk = false;
+          }
+          if (!peerSigOk) {
+            console.warn("[fetchproxy] peer hello signature invalid \u2014 refusing registration (possible squatter)");
+            ws.close(1008, "peer hello signature invalid");
+            return;
+          }
+          const existing = peers.get(frame.mcpId);
+          if (existing && existing.ws !== ws) {
+            const existingEdPub = existing.helloFrame.identityEd25519Pub;
+            if (existingEdPub !== frame.identityEd25519Pub) {
+              console.warn("[fetchproxy] peer mcpId already mapped to a different identity \u2014 refusing (mcpId squatting)");
+              ws.close(1008, "mcpId already registered to another identity");
+              return;
+            }
+          }
           identified = "peer";
           peerMcpId = frame.mcpId;
           peers.set(frame.mcpId, { ws, helloFrame: frame });
@@ -36152,8 +36282,10 @@ async function startHost(opts) {
         resetSessionPromise();
         disconnectListeners.forEach((cb) => cb());
       }
-      if (identified === "peer" && peerMcpId)
-        peers.delete(peerMcpId);
+      if (identified === "peer" && peerMcpId) {
+        if (peers.get(peerMcpId)?.ws === ws)
+          peers.delete(peerMcpId);
+      }
     });
   });
   return {
@@ -36169,7 +36301,10 @@ async function startHost(opts) {
       });
     }),
     sendOwnInner: async (inner) => {
-      const session = await ownSessionReady;
+      const session = await awaitSessionReady(ownSessionReady, {
+        mcpId: opts.ownMcpId,
+        pendingPairCode: () => ownPendingPairCode
+      });
       if (!extensionWs)
         throw new Error("host: no extension connected");
       const sealed = await sealInnerFrame(session.sessionKey, opts.ownMcpId, session.nextOutboundSeq(), inner);
@@ -36274,7 +36409,10 @@ async function startPeer(opts) {
     ws,
     session: sessionPromise,
     sendInner: async (inner) => {
-      await sessionPromise;
+      await awaitSessionReady(sessionPromise, {
+        mcpId: opts.mcpId,
+        pendingPairCode: () => pendingPairCode
+      });
       const s = session;
       const sealed = await sealInnerFrame(s.sessionKey, opts.mcpId, s.nextOutboundSeq(), inner);
       ws.send(JSON.stringify(sealed));
@@ -36940,6 +37078,35 @@ var FetchproxyServer = class {
       this.keepAliveTimer = null;
     }
   }
+  /**
+   * Send an inner request frame via whichever bridge handle is active. If the
+   * send throws (e.g. `FetchproxySessionNotReadyError` — the session never
+   * confirmed), the frame never reached the bridge, so no reply will arrive:
+   * drop the just-registered pending resolver for this id (it lives in exactly
+   * one of the op maps — request ids are unique) so it doesn't leak until the
+   * server closes, then rethrow.
+   */
+  async sendInnerFrame(inner) {
+    try {
+      if (this.hostHandle) {
+        await this.hostHandle.sendOwnInner(inner);
+      } else if (this.peerHandle) {
+        await this.peerHandle.sendInner(inner);
+      }
+    } catch (err) {
+      if ("id" in inner && typeof inner.id === "number") {
+        const { id } = inner;
+        this.pending.delete(id);
+        this.pendingReadCookies.delete(id);
+        this.pendingStorage.delete(id);
+        this.pendingCapture.delete(id);
+        this.pendingRedirect.delete(id);
+        this.pendingDownload.delete(id);
+        this.pendingIdb.delete(id);
+      }
+      throw err;
+    }
+  }
   /**
    * Single bridge round-trip, wrapped by `fetchTimeoutMs` when set.
    * On timeout returns the `{ok:false, kind:'timeout'}` envelope —
@@ -36951,11 +37118,7 @@ var FetchproxyServer = class {
     const pending = new Promise((resolve) => {
       this.pending.set(id, resolve);
     });
-    if (this.hostHandle) {
-      await this.hostHandle.sendOwnInner(inner);
-    } else if (this.peerHandle) {
-      await this.peerHandle.sendInner(inner);
-    }
+    await this.sendInnerFrame(inner);
     const timeoutMs = this.opts.fetchTimeoutMs;
     if (timeoutMs === void 0 || timeoutMs <= 0)
       return pending;
@@ -36984,6 +37147,51 @@ var FetchproxyServer = class {
         clearTimeout(timer);
     }
   }
+  /**
+   * FP-B2: bound a non-`fetch` verb's reply wait by `fetchTimeoutMs`.
+   *
+   * Before this, only `fetch()` raced its `pending` reply against a timer
+   * (`_fetchOnceWithTimeout`); `readCookies`, the storage reads,
+   * `capture_request_header`, `capture_redirect`, `download`, and
+   * `read_indexed_db` awaited their `pending` promise with no race, so a
+   * wedged extension hung the tool call indefinitely.
+   *
+   * `pending` is the already-registered reply promise. `pendingMap`/`id`
+   * point at the op-specific map entry so we can drop it on expiry exactly
+   * as `_fetchOnceWithTimeout` does — otherwise a late bridge reply would
+   * resolve into a stale resolver / leak. On timeout we reject with a
+   * `FetchproxyTimeoutError` (the same throwable the convenience methods
+   * already surface for fetch timeouts). `0`/unset opts out (unbounded),
+   * matching the fetch path.
+   */
+  async _withVerbTimeout(pending, pendingMap, id, url2) {
+    const timeoutMs = this.opts.fetchTimeoutMs;
+    if (timeoutMs === void 0 || timeoutMs <= 0)
+      return pending;
+    let timer;
+    const start = Date.now();
+    try {
+      return await Promise.race([
+        pending,
+        new Promise((_resolve, reject) => {
+          timer = setTimeout(() => {
+            pendingMap.delete(id);
+            reject(new FetchproxyTimeoutError({
+              url: url2,
+              timeoutMs,
+              role: this.role,
+              port: this.opts.port,
+              elapsedMs: Date.now() - start,
+              retryAttempted: false
+            }));
+          }, timeoutMs);
+        })
+      ]);
+    } finally {
+      if (timer)
+        clearTimeout(timer);
+    }
+  }
   /**
    * Map an `ok:false` fetch result to its typed throwable. Centralizes
    * the kind-to-error-class switch so `request()` and (via the same
@@ -37274,12 +37482,8 @@ var FetchproxyServer = class {
     const pending = new Promise((resolve) => {
       this.pendingReadCookies.set(id, resolve);
     });
-    if (this.hostHandle) {
-      await this.hostHandle.sendOwnInner(inner);
-    } else if (this.peerHandle) {
-      await this.peerHandle.sendInner(inner);
-    }
-    const result = await pending;
+    await this.sendInnerFrame(inner);
+    const result = await this._withVerbTimeout(pending, this.pendingReadCookies, id, `https://${host}`);
     if (!result.ok) {
       throw new FetchproxyProtocolError(result.error);
     }
@@ -37345,12 +37549,8 @@ var FetchproxyServer = class {
     const pending = new Promise((resolve, reject) => {
       this.pendingStorage.set(id, { resolve, reject });
     });
-    if (this.hostHandle) {
-      await this.hostHandle.sendOwnInner(inner);
-    } else if (this.peerHandle) {
-      await this.peerHandle.sendInner(inner);
-    }
-    return pending;
+    await this.sendInnerFrame(inner);
+    return this._withVerbTimeout(pending, this.pendingStorage, id, `https://${host}`);
   }
   /**
    * 0.3.0+: snapshot the next outgoing request's named header. Single-
@@ -37454,12 +37654,8 @@ var FetchproxyServer = class {
     const pending = new Promise((resolve, reject) => {
       this.pendingCapture.set(id, { resolve, reject });
     });
-    if (this.hostHandle) {
-      await this.hostHandle.sendOwnInner(inner);
-    } else if (this.peerHandle) {
-      await this.peerHandle.sendInner(inner);
-    }
-    return pending;
+    await this.sendInnerFrame(inner);
+    return this._withVerbTimeout(pending, this.pendingCapture, id, `https://${opts.host}${opts.path ?? "/*"}`);
   }
   /**
    * Snapshot the redirect target URL of the next request the browser
@@ -37543,12 +37739,8 @@ var FetchproxyServer = class {
     const pending = new Promise((resolve, reject) => {
       this.pendingRedirect.set(id, { resolve, reject });
     });
-    if (this.hostHandle) {
-      await this.hostHandle.sendOwnInner(inner);
-    } else if (this.peerHandle) {
-      await this.peerHandle.sendInner(inner);
-    }
-    return pending;
+    await this.sendInnerFrame(inner);
+    return this._withVerbTimeout(pending, this.pendingRedirect, id, `https://${opts.host}${opts.path ?? "/*"}`);
   }
   /**
    * Download `url` through the BROWSER's own network stack via
@@ -37629,12 +37821,8 @@ var FetchproxyServer = class {
     const pending = new Promise((resolve, reject) => {
       this.pendingDownload.set(id, { resolve, reject });
     });
-    if (this.hostHandle) {
-      await this.hostHandle.sendOwnInner(inner);
-    } else if (this.peerHandle) {
-      await this.peerHandle.sendInner(inner);
-    }
-    return pending;
+    await this.sendInnerFrame(inner);
+    return this._withVerbTimeout(pending, this.pendingDownload, id, opts.url);
   }
   /**
    * 0.4.0+: read declared IndexedDB keys from the user's signed-in
@@ -37681,12 +37869,8 @@ var FetchproxyServer = class {
     const pending = new Promise((resolve, reject) => {
       this.pendingIdb.set(id, { resolve, reject });
     });
-    if (this.hostHandle) {
-      await this.hostHandle.sendOwnInner(inner);
-    } else if (this.peerHandle) {
-      await this.peerHandle.sendInner(inner);
-    }
-    return pending;
+    await this.sendInnerFrame(inner);
+    return this._withVerbTimeout(pending, this.pendingIdb, id, origin);
   }
   assertScopeSubset(requested, declared, label) {
     const undeclared = undeclaredKeys(requested, declared);
@@ -38084,7 +38268,7 @@ var BootstrapDisabledError = class extends Error {
 // package.json
 var package_default = {
   name: "zola-mcp",
-  version: "1.4.2",
+  version: "1.4.4",
   mcpName: "io.github.chrischall/zola-mcp",
   description: "Zola wedding MCP server for Claude",
   author: "Claude Code (AI) <https://www.anthropic.com/claude>",
@@ -38130,7 +38314,7 @@ var package_default = {
     "test:watch": "vitest"
   },
   dependencies: {
-    "@chrischall/mcp-utils": "^0.7.0",
+    "@chrischall/mcp-utils": "^0.12.0",
     "@fetchproxy/bootstrap": "^1.3.0",
     "@fetchproxy/server": "^1.3.0",
     "@modelcontextprotocol/sdk": "^1.29.0",
@@ -38138,7 +38322,7 @@ var package_default = {
     zod: "^4.4.3"
   },
   devDependencies: {
-    "@types/node": "^25.9.2",
+    "@types/node": "^26.0.0",
     "@vitest/coverage-v8": "^4.1.8",
     esbuild: "^0.28.0",
     typescript: "^6.0.3",
@@ -38183,18 +38367,26 @@ async function resolveRefreshToken() {
 var __dirname = dirname(fileURLToPath(import.meta.url));
 await loadDotenvSafely({ path: join2(__dirname, "..", ".env"), override: false });
 var MOBILE_BASE_URL = "https://mobile-api.zola.com";
+var SESSION_REFRESH_BUFFER_MS = 5 * 60 * 1e3;
 var ZolaClient = class {
-  sessionToken = null;
-  sessionExpiry = null;
   cachedContext = null;
   // WAF requires x-zola-session-id on all mobile-api.zola.com requests
   deviceSessionId = crypto.randomUUID().toUpperCase();
+  // The `ZOLA_SESSION_TOKEN` seed is a cold-start-only shortcut, exactly as the
+  // old `ensureSession` gated it on `sessionToken === null`; a 401 re-mint goes
+  // straight to `refresh()`, never back to the env token.
+  triedEnvSeed = false;
+  // Single-flight cached mint: caches the 30-min session JWT until 5 min before
+  // its `exp`, coalesces concurrent mints, and re-mints on demand after a 401.
+  session = createCachedTokenSource({
+    mint: () => this.mintSession(),
+    bufferMs: SESSION_REFRESH_BUFFER_MS
+  });
   /**
    * Make a request to the Zola mobile API (mobile-api.zola.com).
    * Uses Bearer JWT auth with x-zola-session-id header.
    */
   async requestMobile(method, path, body) {
-    await this.ensureSession();
     return this.doRequest(method, path, body);
   }
   /**
@@ -38204,7 +38396,6 @@ var ZolaClient = class {
    * raw bytes and the server's content-type so callers can pass it through.
    */
   async requestMobileBinary(method, path, body) {
-    await this.ensureSession();
     const response = await this.sendWithRetry(method, path, body, false, false, "*/*");
     const contentType = response.headers.get("content-type") ?? "application/octet-stream";
     const bytes = new Uint8Array(await response.arrayBuffer());
@@ -38248,10 +38439,11 @@ var ZolaClient = class {
     return text ? JSON.parse(text) : null;
   }
   async sendWithRetry(method, path, body, isAuthRetry = false, isRateRetry = false, accept = "application/json") {
-    const sessionId = decodeJwtSessionId(this.sessionToken);
+    const token = await this.session.getToken();
+    const sessionId = decodeJwtSessionId(token);
     const headers = {
       accept,
-      authorization: `Bearer ${this.sessionToken}`,
+      authorization: `Bearer ${token}`,
       "x-zola-platform-type": "iphone_app",
       "x-zola-session-id": this.deviceSessionId,
       "user-agent": "Zola/42.5.0 (iPad; iOS 26.4; Scale/2.0)",
@@ -38264,9 +38456,7 @@ var ZolaClient = class {
       ...body !== void 0 ? { body: JSON.stringify(body) } : {}
     });
     if (response.status === 401 && !isAuthRetry) {
-      this.sessionToken = null;
-      this.sessionExpiry = null;
-      await this.refresh();
+      this.session.invalidate();
       return this.sendWithRetry(method, path, body, true, isRateRetry, accept);
     }
     if (response.status === 429) {
@@ -38284,30 +38474,33 @@ var ZolaClient = class {
     }
     return response;
   }
-  async ensureSession() {
-    if (this.sessionToken && this.sessionExpiry) {
-      if (this.sessionExpiry.getTime() - Date.now() > 5 * 60 * 1e3) return;
-    }
-    if (this.sessionToken === null) {
+  /**
+   * Mint a session token for the cache. On the very first mint, use a valid
+   * `ZOLA_SESSION_TOKEN` if present (a cold-start shortcut that skips the
+   * initial refresh); otherwise, and on every later mint, refresh via the
+   * mobile API. Returns `{ token, expiresAt }` so the cache serves it until
+   * `SESSION_REFRESH_BUFFER_MS` before the JWT's `exp`.
+   */
+  async mintSession() {
+    if (!this.triedEnvSeed) {
+      this.triedEnvSeed = true;
       const envSession = readEnvVar("ZOLA_SESSION_TOKEN");
       if (envSession) {
         try {
           const exp = decodeJwtExp(envSession);
-          if (exp * 1e3 - Date.now() > 5 * 60 * 1e3) {
-            this.sessionToken = envSession;
-            this.sessionExpiry = new Date(exp * 1e3);
-            return;
+          if (exp * 1e3 - Date.now() > SESSION_REFRESH_BUFFER_MS) {
+            return { token: envSession, expiresAt: exp * 1e3 };
           }
         } catch {
         }
       }
     }
-    await this.refresh();
+    return this.refresh();
   }
   /**
    * Refresh the session using the mobile API endpoint.
    * POST /v3/sessions/refresh with the refresh token JWT.
-   * Returns a new session_token (30-min) and optionally a new refresh_token.
+   * Returns a new session_token (30-min) as a {@link MintedToken}.
    *
    * The refresh token comes from `resolveRefreshToken()`, which tries
    * (1) ZOLA_REFRESH_TOKEN env var, then (2) the fetchproxy 0.3.0 extension's
@@ -38336,8 +38529,7 @@ To fix: set ZOLA_REFRESH_TOKEN, or install the fetchproxy extension and sign int
     const result = await response.json();
     const { session_token } = result.data;
     const exp = decodeJwtExp(session_token);
-    this.sessionToken = session_token;
-    this.sessionExpiry = new Date(exp * 1e3);
+    return { token: session_token, expiresAt: exp * 1e3 };
   }
 };
 var client = new ZolaClient();
@@ -40303,7 +40495,7 @@ function registerEventInvitationTools(server) {
 }
 
 // src/index.ts
-var VERSION = "1.4.2";
+var VERSION = "1.4.4";
 await runMcp({
   name: "zola-mcp",
   version: VERSION,

package/dist/client.js

@@ -1,6 +1,6 @@
 import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
-import { readEnvVar, loadDotenvSafely, decodeJwtExp, decodeJwtSessionId, formatApiError, truncateErrorMessage, } from '@chrischall/mcp-utils';
+import { readEnvVar, loadDotenvSafely, decodeJwtExp, decodeJwtSessionId, formatApiError, truncateErrorMessage, createCachedTokenSource, } from '@chrischall/mcp-utils';
 import { resolveRefreshToken } from './auth.js';
 // Load `.env` next to the compiled entry point. `loadDotenvSafely` is a
 // no-throw loader: in bundled mode (no resolvable `dotenv`) it returns false
@@ -8,18 +8,29 @@ import { resolveRefreshToken } from './auth.js';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 await loadDotenvSafely({ path: join(__dirname, '..', '.env'), override: false });
 const MOBILE_BASE_URL = 'https://mobile-api.zola.com';
+// Refresh the session token this long before its JWT `exp` — the same 5-minute
+// comfort margin the hand-rolled cache used for both the "still valid" check and
+// the `ZOLA_SESSION_TOKEN` seed's freshness gate.
+const SESSION_REFRESH_BUFFER_MS = 5 * 60 * 1000;
 export class ZolaClient {
-    sessionToken = null;
-    sessionExpiry = null;
     cachedContext = null;
     // WAF requires x-zola-session-id on all mobile-api.zola.com requests
     deviceSessionId = crypto.randomUUID().toUpperCase();
+    // The `ZOLA_SESSION_TOKEN` seed is a cold-start-only shortcut, exactly as the
+    // old `ensureSession` gated it on `sessionToken === null`; a 401 re-mint goes
+    // straight to `refresh()`, never back to the env token.
+    triedEnvSeed = false;
+    // Single-flight cached mint: caches the 30-min session JWT until 5 min before
+    // its `exp`, coalesces concurrent mints, and re-mints on demand after a 401.
+    session = createCachedTokenSource({
+        mint: () => this.mintSession(),
+        bufferMs: SESSION_REFRESH_BUFFER_MS,
+    });
     /**
      * Make a request to the Zola mobile API (mobile-api.zola.com).
      * Uses Bearer JWT auth with x-zola-session-id header.
      */
     async requestMobile(method, path, body) {
-        await this.ensureSession();
         return this.doRequest(method, path, body);
     }
     /**
@@ -29,7 +40,6 @@ export class ZolaClient {
      * raw bytes and the server's content-type so callers can pass it through.
      */
     async requestMobileBinary(method, path, body) {
-        await this.ensureSession();
         const response = await this.sendWithRetry(method, path, body, false, false, '*/*');
         const contentType = response.headers.get('content-type') ?? 'application/octet-stream';
         const bytes = new Uint8Array(await response.arrayBuffer());
@@ -75,10 +85,14 @@ export class ZolaClient {
         return (text ? JSON.parse(text) : null);
     }
     async sendWithRetry(method, path, body, isAuthRetry = false, isRateRetry = false, accept = 'application/json') {
-        const sessionId = decodeJwtSessionId(this.sessionToken);
+        // Current session token from the cache (mints/refreshes as needed). The
+        // per-request `x-zola-user-session-id` is derived from it every call, so a
+        // re-minted token below carries its own session id on the replay.
+        const token = await this.session.getToken();
+        const sessionId = decodeJwtSessionId(token);
         const headers = {
             accept,
-            authorization: `Bearer ${this.sessionToken}`,
+            authorization: `Bearer ${token}`,
             'x-zola-platform-type': 'iphone_app',
             'x-zola-session-id': this.deviceSessionId,
             'user-agent': 'Zola/42.5.0 (iPad; iOS 26.4; Scale/2.0)',
@@ -92,9 +106,8 @@ export class ZolaClient {
             ...(body !== undefined ? { body: JSON.stringify(body) } : {}),
         });
         if (response.status === 401 && !isAuthRetry) {
-            this.sessionToken = null;
-            this.sessionExpiry = null;
-            await this.refresh();
+            // Drop the cached token so the replay's getToken re-mints via refresh().
+            this.session.invalidate();
             return this.sendWithRetry(method, path, body, true, isRateRetry, accept);
         }
         if (response.status === 429) {
@@ -110,22 +123,24 @@ export class ZolaClient {
         }
         return response;
     }
-    async ensureSession() {
-        // Session still valid with comfortable margin
-        if (this.sessionToken && this.sessionExpiry) {
-            if (this.sessionExpiry.getTime() - Date.now() > 5 * 60 * 1000)
-                return;
-        }
-        // Check for session token in env (first load only)
-        if (this.sessionToken === null) {
+    /**
+     * Mint a session token for the cache. On the very first mint, use a valid
+     * `ZOLA_SESSION_TOKEN` if present (a cold-start shortcut that skips the
+     * initial refresh); otherwise, and on every later mint, refresh via the
+     * mobile API. Returns `{ token, expiresAt }` so the cache serves it until
+     * `SESSION_REFRESH_BUFFER_MS` before the JWT's `exp`.
+     */
+    async mintSession() {
+        // Cold-start seed: use ZOLA_SESSION_TOKEN if present and comfortably
+        // unexpired. Only attempted once — a 401 re-mint always goes to refresh().
+        if (!this.triedEnvSeed) {
+            this.triedEnvSeed = true;
             const envSession = readEnvVar('ZOLA_SESSION_TOKEN');
             if (envSession) {
                 try {
                     const exp = decodeJwtExp(envSession);
-                    if (exp * 1000 - Date.now() > 5 * 60 * 1000) {
-                        this.sessionToken = envSession;
-                        this.sessionExpiry = new Date(exp * 1000);
-                        return;
+                    if (exp * 1000 - Date.now() > SESSION_REFRESH_BUFFER_MS) {
+                        return { token: envSession, expiresAt: exp * 1000 };
                     }
                 }
                 catch {
@@ -133,12 +148,12 @@ export class ZolaClient {
                 }
             }
         }
-        await this.refresh();
+        return this.refresh();
     }
     /**
      * Refresh the session using the mobile API endpoint.
      * POST /v3/sessions/refresh with the refresh token JWT.
-     * Returns a new session_token (30-min) and optionally a new refresh_token.
+     * Returns a new session_token (30-min) as a {@link MintedToken}.
      *
      * The refresh token comes from `resolveRefreshToken()`, which tries
      * (1) ZOLA_REFRESH_TOKEN env var, then (2) the fetchproxy 0.3.0 extension's
@@ -168,8 +183,7 @@ export class ZolaClient {
         const result = (await response.json());
         const { session_token } = result.data;
         const exp = decodeJwtExp(session_token);
-        this.sessionToken = session_token;
-        this.sessionExpiry = new Date(exp * 1000);
+        return { token: session_token, expiresAt: exp * 1000 };
     }
 }
 export const client = new ZolaClient();

package/dist/index.js

@@ -12,7 +12,7 @@ import { registerWebsiteThemeTools } from './tools/website-theme.js';
 import { registerRegistryItemTools } from './tools/registry-items.js';
 import { registerInvitationTools } from './tools/invitations.js';
 import { registerEventInvitationTools } from './tools/event-invitations.js';
-const VERSION = '1.4.2'; // x-release-please-version
+const VERSION = '1.4.4'; // x-release-please-version
 await runMcp({
     name: 'zola-mcp',
     version: VERSION,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zola-mcp",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "mcpName": "io.github.chrischall/zola-mcp",
   "description": "Zola wedding MCP server for Claude",
   "author": "Claude Code (AI) <https://www.anthropic.com/claude>",
@@ -46,7 +46,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@chrischall/mcp-utils": "^0.7.0",
+    "@chrischall/mcp-utils": "^0.12.0",
     "@fetchproxy/bootstrap": "^1.3.0",
     "@fetchproxy/server": "^1.3.0",
     "@modelcontextprotocol/sdk": "^1.29.0",
@@ -54,7 +54,7 @@
     "zod": "^4.4.3"
   },
   "devDependencies": {
-    "@types/node": "^25.9.2",
+    "@types/node": "^26.0.0",
     "@vitest/coverage-v8": "^4.1.8",
     "esbuild": "^0.28.0",
     "typescript": "^6.0.3",

package/server.json

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