untappd-mcp 1.1.0 → 1.2.0

package/dist/bundle.js

@@ -31184,13 +31184,15 @@ function toolAnnotations(opts = {}) {
 }
 
 // src/version.ts
-var VERSION = "1.1.0";
+var VERSION = "1.2.0";
 
 // src/client.ts
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
-var __dirname = dirname(fileURLToPath(import.meta.url));
-await loadDotenvSafely({ path: join(__dirname, "..", ".env"), override: false });
+if (import.meta.url) {
+  const __dirname = dirname(fileURLToPath(import.meta.url));
+  await loadDotenvSafely({ path: join(__dirname, "..", ".env"), override: false });
+}
 var BASE_URL = "https://api.untappd.com/v4";
 var SERVICE = "Untappd";
 var REQUEST_TIMEOUT_MS = 3e4;
@@ -31205,15 +31207,72 @@ var DEFAULTS = {
   // works. Override with UNTAPPD_DEVICE_ID to pin your own.
   deviceUdid: "A1B2C3D4-0000-4000-8000-0000000000AA"
 };
-function readCredentials() {
-  const username = readEnvVar("UNTAPPD_USERNAME");
-  const password = readEnvVar("UNTAPPD_PASSWORD");
-  const clientId = readEnvVar("UNTAPPD_CLIENT_ID");
-  const clientSecret = readEnvVar("UNTAPPD_CLIENT_SECRET");
-  if (username && password && clientId && clientSecret) {
-    return { username, password, clientId, clientSecret };
+async function sendRequest(fetchImpl, method, url2, init) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
+  try {
+    return await fetchImpl(url2, {
+      method,
+      headers: init.headers,
+      ...init.body !== void 0 ? { body: init.body } : {},
+      signal: controller.signal
+    });
+  } catch {
+    throw new UnreachableError(SERVICE);
+  } finally {
+    clearTimeout(timer);
   }
-  return null;
+}
+function xauthHeaders(userAgent) {
+  return {
+    "User-Agent": userAgent,
+    Accept: "application/json",
+    "x-untappd-app": "ios",
+    "x-untappd-app-version": DEFAULTS.appVersion
+  };
+}
+async function xauthLogin(creds, opts = {}) {
+  const fetchImpl = opts.fetchImpl ?? fetch;
+  const utv = opts.utv ?? readEnvVar("UNTAPPD_UTV") ?? DEFAULTS.utv;
+  const deviceUdid = opts.deviceUdid ?? readEnvVar("UNTAPPD_DEVICE_ID") ?? DEFAULTS.deviceUdid;
+  const userAgent = opts.userAgent ?? readEnvVar("UNTAPPD_USER_AGENT") ?? DEFAULTS.userAgent;
+  const qs = buildQueryString({ client_id: creds.clientId, client_secret: creds.clientSecret, utv });
+  const form = new URLSearchParams({
+    user_name: creds.username,
+    user_password: creds.password,
+    device_udid: deviceUdid,
+    device_name: DEFAULTS.deviceName,
+    device_version: DEFAULTS.deviceVersion,
+    device_platform: DEFAULTS.devicePlatform,
+    app_version: DEFAULTS.appVersion,
+    multi_account: "true"
+  });
+  const res = await sendRequest(fetchImpl, "POST", `${BASE_URL}/xauth${qs}`, {
+    headers: { ...xauthHeaders(userAgent), "Content-Type": "application/x-www-form-urlencoded" },
+    body: form.toString()
+  });
+  const text = await res.text();
+  if (!res.ok) {
+    if (res.status === 401 || res.status === 400) {
+      throw createHelpfulError(`Untappd login failed (${res.status}).`, {
+        hint: "Check UNTAPPD_USERNAME / UNTAPPD_PASSWORD, and that UNTAPPD_CLIENT_ID / UNTAPPD_CLIENT_SECRET are the mobile app credentials."
+      });
+    }
+    throw new McpToolError(formatApiError(res.status, "POST", "/xauth", text, { service: SERVICE }));
+  }
+  let data;
+  try {
+    data = JSON.parse(text);
+  } catch {
+    throw new McpToolError("Untappd login returned a non-JSON response.");
+  }
+  const token = data?.response?.access_token;
+  if (!token) {
+    throw createHelpfulError("Untappd login did not return an access token.", {
+      hint: data?.response?.two_factor_enabled ? "This account has two-factor authentication enabled, which xauth login cannot satisfy." : "The credentials may be incorrect."
+    });
+  }
+  return token;
 }
 function missingCredsError() {
   const missing = ["UNTAPPD_USERNAME", "UNTAPPD_PASSWORD", "UNTAPPD_CLIENT_ID", "UNTAPPD_CLIENT_SECRET"].filter((k) => !readEnvVar(k));
@@ -31226,8 +31285,11 @@ function missingCredsError() {
 }
 var UntappdClient = class {
   fetchImpl;
-  creds;
-  configError;
+  clientId;
+  clientSecret;
+  username;
+  password;
+  _loginName;
   utv = readEnvVar("UNTAPPD_UTV") ?? DEFAULTS.utv;
   deviceUdid = readEnvVar("UNTAPPD_DEVICE_ID") ?? DEFAULTS.deviceUdid;
   userAgent = readEnvVar("UNTAPPD_USER_AGENT") ?? DEFAULTS.userAgent;
@@ -31241,26 +31303,31 @@ var UntappdClient = class {
   constructor(opts = {}) {
     this.fetchImpl = opts.fetchImpl ?? fetch;
     this.token = opts.token ?? null;
-    const creds = opts.credentials !== void 0 ? opts.credentials : readCredentials();
-    if (creds) {
-      this.creds = creds;
-      this.configError = null;
-    } else {
-      this.creds = null;
-      this.configError = missingCredsError();
-    }
+    this.clientId = opts.clientId ?? readEnvVar("UNTAPPD_CLIENT_ID") ?? null;
+    this.clientSecret = opts.clientSecret ?? readEnvVar("UNTAPPD_CLIENT_SECRET") ?? null;
+    this.username = opts.username ?? readEnvVar("UNTAPPD_USERNAME") ?? null;
+    this.password = opts.password ?? readEnvVar("UNTAPPD_PASSWORD") ?? null;
+    this._loginName = opts.loginName ?? this.username;
   }
-  /** Whether credentials are configured (used by the healthcheck tool). */
+  /** True when enough is configured to make authenticated calls. */
   get configured() {
-    return this.configError === null;
+    if (this.token) return Boolean(this.clientId && this.clientSecret);
+    return Boolean(this.clientId && this.clientSecret && this.username && this.password);
   }
   /** The configured login name — the default `username` for user-scoped tools. */
   get loginName() {
-    return this.creds?.username ?? null;
+    return this._loginName;
+  }
+  requireAppCreds() {
+    if (!this.clientId || !this.clientSecret) {
+      throw missingCredsError();
+    }
+    return { clientId: this.clientId, clientSecret: this.clientSecret };
   }
-  requireCreds() {
-    if (this.configError) throw this.configError;
-    return this.creds;
+  requireLogin() {
+    const app = this.requireAppCreds();
+    if (!this.username || !this.password) throw missingCredsError();
+    return { ...app, username: this.username, password: this.password };
   }
   baseHeaders() {
     return {
@@ -31270,23 +31337,10 @@ var UntappdClient = class {
       "x-untappd-app-version": DEFAULTS.appVersion
     };
   }
-  // One HTTP attempt with a hard timeout. Network/timeout failures become an
-  // UnreachableError; HTTP status handling is left to the caller.
+  // One HTTP attempt with a hard timeout, delegating to the module-level
+  // helper shared with `xauthLogin()`.
   async send(method, url2, init) {
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
-    try {
-      return await this.fetchImpl(url2, {
-        method,
-        headers: init.headers,
-        ...init.body !== void 0 ? { body: init.body } : {},
-        signal: controller.signal
-      });
-    } catch {
-      throw new UnreachableError(SERVICE);
-    } finally {
-      clearTimeout(timer);
-    }
+    return sendRequest(this.fetchImpl, method, url2, init);
   }
   /**
    * Obtain an access token, logging in via xauth (username/password) on demand.
@@ -31303,43 +31357,13 @@ var UntappdClient = class {
     return this.loginInFlight;
   }
   async login() {
-    const c = this.requireCreds();
-    const qs = buildQueryString({ client_id: c.clientId, client_secret: c.clientSecret, utv: this.utv });
-    const form = new URLSearchParams({
-      user_name: c.username,
-      user_password: c.password,
-      device_udid: this.deviceUdid,
-      device_name: DEFAULTS.deviceName,
-      device_version: DEFAULTS.deviceVersion,
-      device_platform: DEFAULTS.devicePlatform,
-      app_version: DEFAULTS.appVersion,
-      multi_account: "true"
+    const c = this.requireLogin();
+    const token = await xauthLogin(c, {
+      fetchImpl: this.fetchImpl,
+      utv: this.utv,
+      deviceUdid: this.deviceUdid,
+      userAgent: this.userAgent
     });
-    const res = await this.send("POST", `${BASE_URL}/xauth${qs}`, {
-      headers: { ...this.baseHeaders(), "Content-Type": "application/x-www-form-urlencoded" },
-      body: form.toString()
-    });
-    const text = await res.text();
-    if (!res.ok) {
-      if (res.status === 401 || res.status === 400) {
-        throw createHelpfulError(`Untappd login failed (${res.status}).`, {
-          hint: "Check UNTAPPD_USERNAME / UNTAPPD_PASSWORD, and that UNTAPPD_CLIENT_ID / UNTAPPD_CLIENT_SECRET are the mobile app credentials."
-        });
-      }
-      throw new McpToolError(formatApiError(res.status, "POST", "/xauth", text, { service: SERVICE }));
-    }
-    let data;
-    try {
-      data = JSON.parse(text);
-    } catch {
-      throw new McpToolError("Untappd login returned a non-JSON response.");
-    }
-    const token = data?.response?.access_token;
-    if (!token) {
-      throw createHelpfulError("Untappd login did not return an access token.", {
-        hint: data?.response?.two_factor_enabled ? "This account has two-factor authentication enabled, which xauth login cannot satisfy." : "The credentials may be incorrect."
-      });
-    }
     this.token = token;
     return token;
   }
@@ -31372,7 +31396,7 @@ var UntappdClient = class {
     const headers = this.baseHeaders();
     let query;
     if (opts.auth === "bearer") {
-      const c = this.requireCreds();
+      const c = this.requireAppCreds();
       headers["Authorization"] = `Bearer ${token}`;
       query = { ...opts.query, client_id: c.clientId, client_secret: c.clientSecret, utv: this.utv };
     } else {
@@ -31420,7 +31444,6 @@ var UntappdClient = class {
     }
   }
 };
-var client = new UntappdClient();
 
 // src/compact.ts
 function asDict(v) {
@@ -31500,7 +31523,7 @@ var compactUserBeers = (resp) => projectItems(resp, "beers", compactUserBeer);
 // src/tools/beer.ts
 var BidSchema = external_exports.number().int().positive().describe("Untappd beer id (bid)");
 var CompactCheckins = external_exports.boolean().optional().describe("Project each check-in to a slim summary (id, user, beer, rating, comment, venue, toast/comment counts) to save context (default false)");
-function registerBeerTools(server) {
+function registerBeerTools(server, client2) {
   server.registerTool(
     "untappd_search_beer",
     {
@@ -31516,7 +31539,7 @@ function registerBeerTools(server) {
       }
     },
     async ({ query, limit, offset, sort, compact }) => {
-      const data = await client.get("/search/beer", { q: query, limit, offset, sort });
+      const data = await client2.get("/search/beer", { q: query, limit, offset, sort });
       return textResult(compact ? compactBeerSearch(data) : data);
     }
   );
@@ -31532,7 +31555,7 @@ function registerBeerTools(server) {
       }
     },
     async ({ bid, compact }) => {
-      const data = await client.get(`/beer/info/${bid}`, { compact: compact ? "true" : void 0 });
+      const data = await client2.get(`/beer/info/${bid}`, { compact: compact ? "true" : void 0 });
       return textResult(data);
     }
   );
@@ -31550,14 +31573,14 @@ function registerBeerTools(server) {
       }
     },
     async ({ bid, limit, max_id, compact }) => {
-      const data = await client.get(`/beer/checkins/${bid}`, { limit, max_id });
+      const data = await client2.get(`/beer/checkins/${bid}`, { limit, max_id });
       return textResult(compact ? compactCheckins(data) : data);
     }
   );
 }
 
 // src/tools/brewery.ts
-function registerBreweryTools(server) {
+function registerBreweryTools(server, client2) {
   server.registerTool(
     "untappd_search_brewery",
     {
@@ -31571,7 +31594,7 @@ function registerBreweryTools(server) {
       }
     },
     async ({ query, limit, offset }) => {
-      const data = await client.get("/search/brewery", { q: query, limit, offset });
+      const data = await client2.get("/search/brewery", { q: query, limit, offset });
       return textResult(data);
     }
   );
@@ -31587,7 +31610,7 @@ function registerBreweryTools(server) {
       }
     },
     async ({ brewery_id, compact }) => {
-      const data = await client.get(`/brewery/info/${brewery_id}`, { compact: compact ? "true" : void 0 });
+      const data = await client2.get(`/brewery/info/${brewery_id}`, { compact: compact ? "true" : void 0 });
       return textResult(data);
     }
   );
@@ -31605,14 +31628,14 @@ function registerBreweryTools(server) {
       }
     },
     async ({ brewery_id, limit, offset, sort }) => {
-      const data = await client.get(`/brewery/beer_list/${brewery_id}`, { limit, offset, sort });
+      const data = await client2.get(`/brewery/beer_list/${brewery_id}`, { limit, offset, sort });
       return textResult(data);
     }
   );
 }
 
 // src/tools/venue.ts
-function registerVenueTools(server) {
+function registerVenueTools(server, client2) {
   server.registerTool(
     "untappd_search_venue",
     {
@@ -31625,7 +31648,7 @@ function registerVenueTools(server) {
       }
     },
     async ({ query, limit }) => {
-      const data = await client.get("/search/venue", { q: query, limit });
+      const data = await client2.get("/search/venue", { q: query, limit });
       return textResult(data);
     }
   );
@@ -31641,7 +31664,7 @@ function registerVenueTools(server) {
       }
     },
     async ({ venue_id, compact }) => {
-      const data = await client.get(`/venue/info/${venue_id}`, { compact: compact ? "true" : void 0 });
+      const data = await client2.get(`/venue/info/${venue_id}`, { compact: compact ? "true" : void 0 });
       return textResult(data);
     }
   );
@@ -31656,7 +31679,7 @@ function registerVenueTools(server) {
       }
     },
     async ({ foursquare_id }) => {
-      const data = await client.get(`/venue/foursquare_lookup/${encodeURIComponent(foursquare_id)}`);
+      const data = await client2.get(`/venue/foursquare_lookup/${encodeURIComponent(foursquare_id)}`);
       return textResult(data);
     }
   );
@@ -31674,7 +31697,7 @@ function registerVenueTools(server) {
       }
     },
     async ({ venue_id, limit, max_id, compact }) => {
-      const data = await client.get(`/venue/checkins/${venue_id}`, { limit, max_id });
+      const data = await client2.get(`/venue/checkins/${venue_id}`, { limit, max_id });
       return textResult(compact ? compactCheckins(data) : data);
     }
   );
@@ -31682,8 +31705,8 @@ function registerVenueTools(server) {
 
 // src/tools/user.ts
 var UsernameArg = external_exports.string().min(1).optional().describe("Untappd username. Omit to use your own configured account (UNTAPPD_USERNAME).");
-function resolveUser(username) {
-  const u = username ?? client.loginName;
+function resolveUser(username, loginName) {
+  const u = username ?? loginName;
   if (!u) {
     throw createHelpfulError("No username given and no configured account to fall back to.", {
       hint: "Pass `username`, or set UNTAPPD_USERNAME so user tools default to your own account."
@@ -31691,7 +31714,7 @@ function resolveUser(username) {
   }
   return encodeURIComponent(u);
 }
-function registerUserTools(server) {
+function registerUserTools(server, client2) {
   server.registerTool(
     "untappd_user_info",
     {
@@ -31704,7 +31727,7 @@ function registerUserTools(server) {
       }
     },
     async ({ username, compact }) => {
-      const data = await client.get(`/user/info/${resolveUser(username)}`, { compact: compact ? "true" : void 0 });
+      const data = await client2.get(`/user/info/${resolveUser(username, client2.loginName)}`, { compact: compact ? "true" : void 0 });
       return textResult(data);
     }
   );
@@ -31722,7 +31745,7 @@ function registerUserTools(server) {
       }
     },
     async ({ username, limit, max_id, compact }) => {
-      const data = await client.get(`/user/checkins/${resolveUser(username)}`, { limit, max_id });
+      const data = await client2.get(`/user/checkins/${resolveUser(username, client2.loginName)}`, { limit, max_id });
       return textResult(compact ? compactCheckins(data) : data);
     }
   );
@@ -31741,7 +31764,7 @@ function registerUserTools(server) {
       }
     },
     async ({ username, limit, offset, sort, compact }) => {
-      const data = await client.get(`/user/wishlist/${resolveUser(username)}`, { limit, offset, sort });
+      const data = await client2.get(`/user/wishlist/${resolveUser(username, client2.loginName)}`, { limit, offset, sort });
       return textResult(compact ? compactWishlist(data) : data);
     }
   );
@@ -31760,7 +31783,7 @@ function registerUserTools(server) {
       }
     },
     async ({ username, limit, offset, sort, compact }) => {
-      const data = await client.get(`/user/beers/${resolveUser(username)}`, { limit, offset, sort });
+      const data = await client2.get(`/user/beers/${resolveUser(username, client2.loginName)}`, { limit, offset, sort });
       return textResult(compact ? compactUserBeers(data) : data);
     }
   );
@@ -31777,7 +31800,7 @@ function registerUserTools(server) {
       }
     },
     async ({ username, limit, offset }) => {
-      const data = await client.get(`/user/badges/${resolveUser(username)}`, { limit, offset });
+      const data = await client2.get(`/user/badges/${resolveUser(username, client2.loginName)}`, { limit, offset });
       return textResult(data);
     }
   );
@@ -31794,7 +31817,7 @@ function registerUserTools(server) {
       }
     },
     async ({ username, limit, offset }) => {
-      const data = await client.get(`/user/friends/${resolveUser(username)}`, { limit, offset });
+      const data = await client2.get(`/user/friends/${resolveUser(username, client2.loginName)}`, { limit, offset });
       return textResult(data);
     }
   );
@@ -31812,7 +31835,7 @@ function registerUserTools(server) {
       }
     },
     async ({ username, limit, offset, sort }) => {
-      const data = await client.get(`/user/venues/${resolveUser(username)}`, { limit, offset, sort });
+      const data = await client2.get(`/user/venues/${resolveUser(username, client2.loginName)}`, { limit, offset, sort });
       return textResult(data);
     }
   );
@@ -31828,14 +31851,14 @@ function registerUserTools(server) {
       }
     },
     async ({ limit, offset }) => {
-      const data = await client.get("/user/pending", { limit, offset });
+      const data = await client2.get("/user/pending", { limit, offset });
       return textResult(data);
     }
   );
 }
 
 // src/tools/feed.ts
-function registerFeedTools(server) {
+function registerFeedTools(server, client2) {
   server.registerTool(
     "untappd_activity_feed",
     {
@@ -31849,7 +31872,7 @@ function registerFeedTools(server) {
       }
     },
     async ({ limit, max_id, compact }) => {
-      const data = await client.get("/checkin/recent", { limit, max_id });
+      const data = await client2.get("/checkin/recent", { limit, max_id });
       return textResult(compact ? compactCheckins(data) : data);
     }
   );
@@ -31864,7 +31887,7 @@ function registerFeedTools(server) {
       }
     },
     async ({ checkin_id }) => {
-      const data = await client.get(`/checkin/view/${checkin_id}`);
+      const data = await client2.get(`/checkin/view/${checkin_id}`);
       return textResult(data);
     }
   );
@@ -31899,7 +31922,7 @@ function parseUntappdUrl(input) {
   }
   return null;
 }
-function registerResolveTools(server) {
+function registerResolveTools(server, client2) {
   server.registerTool(
     "untappd_resolve",
     {
@@ -31938,14 +31961,14 @@ function registerResolveTools(server) {
         });
       }
       const path = resolved.type === "beer" ? `/beer/info/${resolved.id}` : resolved.type === "brewery" ? `/brewery/info/${resolved.id}` : resolved.type === "venue" ? `/venue/info/${resolved.id}` : resolved.type === "checkin" ? `/checkin/view/${resolved.id}` : `/user/info/${encodeURIComponent(resolved.username)}`;
-      const detail = await client.get(path);
+      const detail = await client2.get(path);
       return textResult({ resolved, detail });
     }
   );
 }
 
 // src/tools/discover.ts
-function registerDiscoverTools(server) {
+function registerDiscoverTools(server, client2) {
   server.registerTool(
     "untappd_trending",
     {
@@ -31955,7 +31978,7 @@ function registerDiscoverTools(server) {
       inputSchema: {}
     },
     async () => {
-      const data = await client.get("/beer/trending");
+      const data = await client2.get("/beer/trending");
       return textResult(data);
     }
   );
@@ -31971,7 +31994,7 @@ function registerDiscoverTools(server) {
       }
     },
     async ({ limit, offset }) => {
-      const data = await client.get("/notifications", { limit, offset });
+      const data = await client2.get("/notifications", { limit, offset });
       return textResult(data);
     }
   );
@@ -31990,65 +32013,12 @@ function registerDiscoverTools(server) {
       }
     },
     async ({ lat, lng, limit, radius, compact }) => {
-      const data = await client.get("/thepub/local", { lat, lng, limit, radius });
+      const data = await client2.get("/thepub/local", { lat, lng, limit, radius });
       return textResult(compact ? compactCheckins(data) : data);
     }
   );
 }
 
-// src/tools/wishlist.ts
-var BidSchema2 = external_exports.number().int().positive().describe("Untappd beer id (bid) \u2014 from untappd_search_beer");
-function registerWishlistTools(server) {
-  server.registerTool(
-    "untappd_wishlist_add",
-    {
-      title: "Add a beer to your wishlist",
-      description: "Add a beer to YOUR Untappd wishlist by its bid. Without confirm: true it returns a dry-run preview and makes NO network call; with confirm: true it adds. Writes to your account.",
-      annotations: toolAnnotations({ title: "Add a beer to your wishlist", readOnly: false, idempotent: true, openWorld: true }),
-      inputSchema: {
-        bid: BidSchema2,
-        confirm: schemaConfirm
-      }
-    },
-    async ({ bid, confirm }) => {
-      if (confirm !== true) {
-        return textResult({
-          dryRun: true,
-          action: "wishlist_add",
-          bid,
-          note: "Dry run \u2014 re-run with confirm: true to add this beer to your wishlist."
-        });
-      }
-      const data = await client.write("GET", "/user/wishlist/add", { query: { bid } });
-      return textResult({ added: true, bid, result: data?.result });
-    }
-  );
-  server.registerTool(
-    "untappd_wishlist_remove",
-    {
-      title: "Remove a beer from your wishlist",
-      description: "Remove a beer from YOUR Untappd wishlist by its bid. Without confirm: true it returns a dry-run preview and makes NO network call; with confirm: true it removes. Writes to your account.",
-      annotations: toolAnnotations({ title: "Remove a beer from your wishlist", readOnly: false, idempotent: true, openWorld: true }),
-      inputSchema: {
-        bid: BidSchema2,
-        confirm: schemaConfirm
-      }
-    },
-    async ({ bid, confirm }) => {
-      if (confirm !== true) {
-        return textResult({
-          dryRun: true,
-          action: "wishlist_remove",
-          bid,
-          note: "Dry run \u2014 re-run with confirm: true to remove this beer from your wishlist."
-        });
-      }
-      const data = await client.write("GET", "/user/wishlist/delete", { query: { bid } });
-      return textResult({ removed: true, bid, result: data?.result });
-    }
-  );
-}
-
 // src/tools/friends.ts
 var TargetUidSchema = external_exports.number().int().positive().describe("The target user id (uid) \u2014 from a user profile (response.user.uid) or a friends-list item");
 var ACTIONS = [
@@ -32081,7 +32051,7 @@ var ACTIONS = [
     detail: "Removes an existing friend, or cancels a friend request you sent."
   }
 ];
-function registerFriendActionTools(server) {
+function registerFriendActionTools(server, client2) {
   for (const action of ACTIONS) {
     server.registerTool(
       action.tool,
@@ -32103,13 +32073,66 @@ function registerFriendActionTools(server) {
             note: `Dry run \u2014 re-run with confirm: true to ${action.verb} user ${target_uid}.`
           });
         }
-        const data = await client.write("POST", `/friend/${action.path}/${target_uid}`);
+        const data = await client2.write("POST", `/friend/${action.path}/${target_uid}`);
         return textResult({ done: true, action: action.path, target_uid, result: data?.result });
       }
     );
   }
 }
 
+// src/tools/wishlist.ts
+var BidSchema2 = external_exports.number().int().positive().describe("Untappd beer id (bid) \u2014 from untappd_search_beer");
+function registerWishlistTools(server, client2) {
+  server.registerTool(
+    "untappd_wishlist_add",
+    {
+      title: "Add a beer to your wishlist",
+      description: "Add a beer to YOUR Untappd wishlist by its bid. Without confirm: true it returns a dry-run preview and makes NO network call; with confirm: true it adds. Writes to your account.",
+      annotations: toolAnnotations({ title: "Add a beer to your wishlist", readOnly: false, idempotent: true, openWorld: true }),
+      inputSchema: {
+        bid: BidSchema2,
+        confirm: schemaConfirm
+      }
+    },
+    async ({ bid, confirm }) => {
+      if (confirm !== true) {
+        return textResult({
+          dryRun: true,
+          action: "wishlist_add",
+          bid,
+          note: "Dry run \u2014 re-run with confirm: true to add this beer to your wishlist."
+        });
+      }
+      const data = await client2.write("GET", "/user/wishlist/add", { query: { bid } });
+      return textResult({ added: true, bid, result: data?.result });
+    }
+  );
+  server.registerTool(
+    "untappd_wishlist_remove",
+    {
+      title: "Remove a beer from your wishlist",
+      description: "Remove a beer from YOUR Untappd wishlist by its bid. Without confirm: true it returns a dry-run preview and makes NO network call; with confirm: true it removes. Writes to your account.",
+      annotations: toolAnnotations({ title: "Remove a beer from your wishlist", readOnly: false, idempotent: true, openWorld: true }),
+      inputSchema: {
+        bid: BidSchema2,
+        confirm: schemaConfirm
+      }
+    },
+    async ({ bid, confirm }) => {
+      if (confirm !== true) {
+        return textResult({
+          dryRun: true,
+          action: "wishlist_remove",
+          bid,
+          note: "Dry run \u2014 re-run with confirm: true to remove this beer from your wishlist."
+        });
+      }
+      const data = await client2.write("GET", "/user/wishlist/delete", { query: { bid } });
+      return textResult({ removed: true, bid, result: data?.result });
+    }
+  );
+}
+
 // src/tools/checkin.ts
 import { existsSync } from "node:fs";
 import { extname } from "node:path";
@@ -32125,7 +32148,7 @@ function localTimezone() {
   const gmt_offset = -(/* @__PURE__ */ new Date()).getTimezoneOffset() / 60;
   return { timezone, gmt_offset };
 }
-function registerCheckinTools(server) {
+function registerCheckinTools(server, client2) {
   server.registerTool(
     "untappd_toast",
     {
@@ -32146,7 +32169,7 @@ function registerCheckinTools(server) {
           note: "Dry run \u2014 re-run with confirm: true to toggle your toast on this check-in."
         });
       }
-      const data = await client.write("POST", `/checkin/toast/${checkin_id}`);
+      const data = await client2.write("POST", `/checkin/toast/${checkin_id}`);
       return textResult({ toggled: true, checkin_id, result: data?.result, like_type: data?.like_type });
     }
   );
@@ -32172,7 +32195,7 @@ function registerCheckinTools(server) {
           note: "Dry run \u2014 re-run with confirm: true to post this comment to your Untappd account."
         });
       }
-      const data = await client.write("POST", `/checkin/addcomment/${checkin_id}`, { form: { comment } });
+      const data = await client2.write("POST", `/checkin/addcomment/${checkin_id}`, { form: { comment } });
       return textResult({ posted: true, checkin_id, response: data });
     }
   );
@@ -32196,7 +32219,7 @@ function registerCheckinTools(server) {
           note: "Dry run \u2014 re-run with confirm: true to delete this comment from your Untappd account."
         });
       }
-      const data = await client.write("POST", `/checkin/deletecomment/${comment_id}`);
+      const data = await client2.write("POST", `/checkin/deletecomment/${comment_id}`);
       return textResult({ deleted: true, comment_id, result: data?.result });
     }
   );
@@ -32220,7 +32243,7 @@ function registerCheckinTools(server) {
           note: "Dry run \u2014 re-run with confirm: true to PERMANENTLY delete this check-in. This cannot be undone."
         });
       }
-      const data = await client.write("POST", `/checkin/delete/${checkin_id}`);
+      const data = await client2.write("POST", `/checkin/delete/${checkin_id}`);
       return textResult({ deleted: true, checkin_id, result: data?.result });
     }
   );
@@ -32281,14 +32304,14 @@ function registerCheckinTools(server) {
         if (!existsSync(photo_path)) throw new McpToolError(`Photo file not found: ${photo_path}`);
         blob = await fileBlob(photo_path);
       }
-      const data = await client.write("POST", "/checkin/add", { form });
+      const data = await client2.write("POST", "/checkin/add", { form });
       let photo_attached = false;
       let photo_error;
       if (photo_path !== void 0) {
         if (data?.photo_upload?.url && data.checkin_id) {
           try {
-            await client.putBinary(data.photo_upload.url, blob, PHOTO_CONTENT_TYPES[ext]);
-            await client.write("POST", "/photo/uploadComplete", {
+            await client2.putBinary(data.photo_upload.url, blob, PHOTO_CONTENT_TYPES[ext]);
+            await client2.write("POST", "/photo/uploadComplete", {
               form: { checkin_id: data.checkin_id, destination_url: data.photo_upload.destination_url }
             });
             photo_attached = true;
@@ -32311,7 +32334,7 @@ function registerCheckinTools(server) {
 }
 
 // src/tools/utilities.ts
-function registerUtilityTools(server) {
+function registerUtilityTools(server, client2) {
   server.registerTool(
     "untappd_healthcheck",
     {
@@ -32321,18 +32344,18 @@ function registerUtilityTools(server) {
       inputSchema: {}
     },
     async () => {
-      if (!client.configured) {
+      if (!client2.configured) {
         return textResult({
           ok: false,
           configured: false,
           note: "Untappd credentials are not set. Configure UNTAPPD_USERNAME, UNTAPPD_PASSWORD, UNTAPPD_CLIENT_ID, and UNTAPPD_CLIENT_SECRET."
         });
       }
-      const feed = await client.get("/checkin/recent", { limit: 1 });
+      const feed = await client2.get("/checkin/recent", { limit: 1 });
       return textResult({
         ok: true,
         configured: true,
-        account: client.loginName,
+        account: client2.loginName,
         feed_reachable: feed?.checkins !== void 0,
         note: "Logged in to Untappd and fetched the friend feed successfully."
       });
@@ -32341,21 +32364,22 @@ function registerUtilityTools(server) {
 }
 
 // src/index.ts
+var client = new UntappdClient();
 await runMcp({
   name: "untappd-mcp",
   version: VERSION,
   banner: "[untappd-mcp] This project was developed and is maintained by AI (Claude Opus 4.8). Use at your own discretion.",
   tools: [
-    registerBeerTools,
-    registerBreweryTools,
-    registerVenueTools,
-    registerUserTools,
-    registerFeedTools,
-    registerResolveTools,
-    registerDiscoverTools,
-    registerWishlistTools,
-    registerFriendActionTools,
-    registerCheckinTools,
-    registerUtilityTools
+    (s) => registerBeerTools(s, client),
+    (s) => registerBreweryTools(s, client),
+    (s) => registerVenueTools(s, client),
+    (s) => registerUserTools(s, client),
+    (s) => registerFeedTools(s, client),
+    (s) => registerResolveTools(s, client),
+    (s) => registerDiscoverTools(s, client),
+    (s) => registerFriendActionTools(s, client),
+    (s) => registerWishlistTools(s, client),
+    (s) => registerCheckinTools(s, client),
+    (s) => registerUtilityTools(s, client)
   ]
 });