zola-mcp 1.4.3 → 1.4.4

package/.claude-plugin/marketplace.json

@@ -7,7 +7,7 @@
   },
   "metadata": {
     "description": "Zola wedding planning tools for Claude Code",
-    "version": "1.4.3"
+    "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.3",
+      "version": "1.4.4",
       "author": {
         "name": "Chris Chall"
       },

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "zola",
   "displayName": "Zola",
-  "version": "1.4.3",
+  "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

@@ -34728,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);
@@ -34865,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") {
@@ -38229,7 +38268,7 @@ var BootstrapDisabledError = class extends Error {
 // package.json
 var package_default = {
   name: "zola-mcp",
-  version: "1.4.3",
+  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>",
@@ -38275,7 +38314,7 @@ var package_default = {
     "test:watch": "vitest"
   },
   dependencies: {
-    "@chrischall/mcp-utils": "^0.10.3",
+    "@chrischall/mcp-utils": "^0.12.0",
     "@fetchproxy/bootstrap": "^1.3.0",
     "@fetchproxy/server": "^1.3.0",
     "@modelcontextprotocol/sdk": "^1.29.0",
@@ -38328,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);
   }
   /**
@@ -38349,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());
@@ -38393,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)",
@@ -38409,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) {
@@ -38429,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
@@ -38481,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();
@@ -40448,7 +40495,7 @@ function registerEventInvitationTools(server) {
 }
 
 // src/index.ts
-var VERSION = "1.4.3";
+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.3'; // 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.3",
+  "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.10.3",
+    "@chrischall/mcp-utils": "^0.12.0",
     "@fetchproxy/bootstrap": "^1.3.0",
     "@fetchproxy/server": "^1.3.0",
     "@modelcontextprotocol/sdk": "^1.29.0",

package/server.json

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