untappd-mcp 1.1.0 → 1.2.0

package/dist/client.js

@@ -1,11 +1,15 @@
 import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 import { loadDotenvSafely, readEnvVar, buildQueryString, formatApiError, createHelpfulError, McpToolError, RateLimitError, UnreachableError, } from '@chrischall/mcp-utils';
-// Load .env for local dev; silently skip if dotenv is unavailable (e.g. the
-// mcpb bundle). `loadDotenvSafely` swallows a missing dotenv module and never
-// lets .env override a host-provided value.
-const __dirname = dirname(fileURLToPath(import.meta.url));
-await loadDotenvSafely({ path: join(__dirname, '..', '.env'), override: false });
+// Load .env for local (Node) dev; silently skip if dotenv is unavailable (e.g.
+// the mcpb bundle). `loadDotenvSafely` swallows a missing dotenv module and
+// never lets .env override a host-provided value. Guard on `import.meta.url`:
+// in a non-Node runtime (Cloudflare Workers) it is undefined and there is no
+// local .env — secrets arrive via the platform's env bindings instead.
+if (import.meta.url) {
+    const __dirname = dirname(fileURLToPath(import.meta.url));
+    await loadDotenvSafely({ path: join(__dirname, '..', '.env'), override: false });
+}
 const BASE_URL = 'https://api.untappd.com/v4';
 const SERVICE = 'Untappd';
 const REQUEST_TIMEOUT_MS = 30_000;
@@ -25,15 +29,87 @@ const 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 };
+// One HTTP attempt with a hard timeout, shared by the instance `send()` method
+// and the standalone `xauthLogin()` helper below. Network/timeout failures
+// become an UnreachableError; HTTP status handling is left to the caller.
+async function sendRequest(fetchImpl, method, url, init) {
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
+    try {
+        return await fetchImpl(url, {
+            method,
+            headers: init.headers,
+            ...(init.body !== undefined ? { body: init.body } : {}),
+            signal: controller.signal,
+        });
+    }
+    catch {
+        throw new UnreachableError(SERVICE);
+    }
+    finally {
+        clearTimeout(timer);
+    }
+}
+function xauthHeaders(userAgent) {
+    return {
+        'User-Agent': userAgent,
+        Accept: 'application/json',
+        'x-untappd-app': 'ios',
+        'x-untappd-app-version': DEFAULTS.appVersion,
+    };
+}
+/**
+ * Performs the one-shot Untappd xauth login POST (username/password →
+ * access token). Standalone so it can be reused both by `UntappdClient`'s
+ * own on-demand login and by the Cloudflare-connector login flow
+ * (`src/untappd-auth.ts`), which authenticates a user before a client even
+ * exists — without duplicating the request/parsing logic.
+ */
+export 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.');
     }
-    return null;
+    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));
@@ -44,8 +120,11 @@ function missingCredsError() {
 }
 export class UntappdClient {
     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;
@@ -59,28 +138,34 @@ export class UntappdClient {
     constructor(opts = {}) {
         this.fetchImpl = opts.fetchImpl ?? fetch;
         this.token = opts.token ?? null;
-        const creds = opts.credentials !== undefined ? 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;
+        // A pre-seeded token needs only app creds (for writes); otherwise a full login is required.
+        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 {
@@ -90,25 +175,10 @@ export class UntappdClient {
             '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, url, init) {
-        const controller = new AbortController();
-        const timer = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
-        try {
-            return await this.fetchImpl(url, {
-                method,
-                headers: init.headers,
-                ...(init.body !== undefined ? { body: init.body } : {}),
-                signal: controller.signal,
-            });
-        }
-        catch {
-            throw new UnreachableError(SERVICE);
-        }
-        finally {
-            clearTimeout(timer);
-        }
+        return sendRequest(this.fetchImpl, method, url, init);
     }
     /**
      * Obtain an access token, logging in via xauth (username/password) on demand.
@@ -126,46 +196,13 @@ export class UntappdClient {
         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 res = await this.send('POST', `${BASE_URL}/xauth${qs}`, {
-            headers: { ...this.baseHeaders(), 'Content-Type': 'application/x-www-form-urlencoded' },
-            body: form.toString(),
+        const c = this.requireLogin();
+        const token = await xauthLogin(c, {
+            fetchImpl: this.fetchImpl,
+            utv: this.utv,
+            deviceUdid: this.deviceUdid,
+            userAgent: this.userAgent,
         });
-        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;
     }
@@ -204,7 +241,7 @@ export class UntappdClient {
         // requests the app itself makes.
         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 };
         }
@@ -255,10 +292,3 @@ export class UntappdClient {
         }
     }
 }
-/**
- * Module-level singleton shared by every tool module. Constructing it here (not
- * in `index.ts`) keeps the deferred-config-error pattern: the server boots and
- * answers the host's install-time tools/list smoke test even when credentials
- * are absent — the error only surfaces on the first tool call.
- */
-export const client = new UntappdClient();

package/dist/index.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import { runMcp } from '@chrischall/mcp-utils';
 import { VERSION } from './version.js';
+import { UntappdClient } from './client.js';
 import { registerBeerTools } from './tools/beer.js';
 import { registerBreweryTools } from './tools/brewery.js';
 import { registerVenueTools } from './tools/venue.js';
@@ -8,30 +9,29 @@ import { registerUserTools } from './tools/user.js';
 import { registerFeedTools } from './tools/feed.js';
 import { registerResolveTools } from './tools/resolve.js';
 import { registerDiscoverTools } from './tools/discover.js';
-import { registerWishlistTools } from './tools/wishlist.js';
 import { registerFriendActionTools } from './tools/friends.js';
+import { registerWishlistTools } from './tools/wishlist.js';
 import { registerCheckinTools } from './tools/checkin.js';
 import { registerUtilityTools } from './tools/utilities.js';
-// The Untappd client is a module-level singleton (imported by each tool module)
-// that defers its config error to the first request. That preserves the
-// deferred-config-error pattern: the server boots and answers the host's
-// install-time tools/list smoke test even when credentials are absent — the
-// configuration error only surfaces on the first tool call.
+// Build the env-based client once and inject it into each registrar. The
+// constructor defers its config error, so the server still boots (and answers
+// the host's install-time tools/list probe) when credentials are absent.
+const 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),
     ],
 });

package/dist/tools/beer.js

@@ -1,13 +1,12 @@
 import { z } from 'zod';
 import { textResult, toolAnnotations } from '@chrischall/mcp-utils';
-import { client } from '../client.js';
 import { compactBeerSearch, compactCheckins } from '../compact.js';
 const BidSchema = z.number().int().positive().describe('Untappd beer id (bid)');
 const CompactCheckins = z
     .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)');
-export function registerBeerTools(server) {
+export function registerBeerTools(server, client) {
     server.registerTool('untappd_search_beer', {
         title: 'Search Untappd beers',
         description: 'Search Untappd for beers by name (optionally "Brewery Beer"). Returns ranked matches with their ' +

package/dist/tools/brewery.js

@@ -1,7 +1,6 @@
 import { z } from 'zod';
 import { textResult, toolAnnotations } from '@chrischall/mcp-utils';
-import { client } from '../client.js';
-export function registerBreweryTools(server) {
+export function registerBreweryTools(server, client) {
     server.registerTool('untappd_search_brewery', {
         title: 'Search Untappd breweries',
         description: 'Search Untappd for breweries by name. Returns matches with their brewery id, location, type, and beer ' +

package/dist/tools/checkin.js

@@ -2,7 +2,6 @@ import { existsSync } from 'node:fs';
 import { extname } from 'node:path';
 import { z } from 'zod';
 import { textResult, toolAnnotations, schemaConfirm, fileBlob, McpToolError, createHelpfulError, messageOf } from '@chrischall/mcp-utils';
-import { client } from '../client.js';
 const CheckinIdSchema = z.number().int().positive().describe('Untappd check-in id');
 // Keyed by the NORMALISED extension that photoExt() returns (jpeg → jpg), so
 // there is no dead `jpeg` entry.
@@ -23,7 +22,7 @@ function localTimezone() {
     const gmt_offset = -new Date().getTimezoneOffset() / 60;
     return { timezone, gmt_offset };
 }
-export function registerCheckinTools(server) {
+export function registerCheckinTools(server, client) {
     server.registerTool('untappd_toast', {
         title: 'Toast an Untappd check-in',
         description: "Toast (like) a check-in on YOUR account. This endpoint is a TOGGLE: calling it on a check-in you have " +

package/dist/tools/discover.js

@@ -1,8 +1,7 @@
 import { z } from 'zod';
 import { textResult, toolAnnotations } from '@chrischall/mcp-utils';
-import { client } from '../client.js';
 import { compactCheckins } from '../compact.js';
-export function registerDiscoverTools(server) {
+export function registerDiscoverTools(server, client) {
     server.registerTool('untappd_trending', {
         title: 'Get trending beers',
         description: 'Get the beers trending on Untappd right now, split into macro (big/widely-available) and micro ' +

package/dist/tools/feed.js

@@ -1,8 +1,7 @@
 import { z } from 'zod';
 import { textResult, toolAnnotations } from '@chrischall/mcp-utils';
-import { client } from '../client.js';
 import { compactCheckins } from '../compact.js';
-export function registerFeedTools(server) {
+export function registerFeedTools(server, client) {
     server.registerTool('untappd_activity_feed', {
         title: 'Get Untappd friend activity feed',
         description: 'Get your Untappd friend activity feed — the recent check-ins from people you follow, newest first. Page ' +

package/dist/tools/friends.js

@@ -1,6 +1,5 @@
 import { z } from 'zod';
 import { textResult, toolAnnotations, schemaConfirm } from '@chrischall/mcp-utils';
-import { client } from '../client.js';
 // The endpoint PATHS below are confirmed from the Untappd app's own JS bundle
 // (`friend/request`, `friend/accept`, `friend/reject`, `friend/remove`). The
 // HTTP method (POST) mirrors the other captured action-writes (toast/comment),
@@ -43,7 +42,7 @@ const ACTIONS = [
         detail: 'Removes an existing friend, or cancels a friend request you sent.',
     },
 ];
-export function registerFriendActionTools(server) {
+export function registerFriendActionTools(server, client) {
     for (const action of ACTIONS) {
         server.registerTool(action.tool, {
             title: action.title,

package/dist/tools/resolve.js

@@ -1,6 +1,5 @@
 import { z } from 'zod';
 import { textResult, toolAnnotations, createHelpfulError } from '@chrischall/mcp-utils';
-import { client } from '../client.js';
 /**
  * Parse an untappd.com URL into its entity type and id. Path shapes (confirmed
  * from the app + site):
@@ -44,7 +43,7 @@ export function parseUntappdUrl(input) {
     }
     return null;
 }
-export function registerResolveTools(server) {
+export function registerResolveTools(server, client) {
     server.registerTool('untappd_resolve', {
         title: 'Resolve an Untappd URL',
         description: 'Parse an untappd.com URL (a beer /b/, brewery /w/, venue /v/, user /user/, or check-in link) into its ' +

package/dist/tools/user.js

@@ -1,6 +1,5 @@
 import { z } from 'zod';
 import { textResult, toolAnnotations, createHelpfulError } from '@chrischall/mcp-utils';
-import { client } from '../client.js';
 import { compactCheckins, compactWishlist, compactUserBeers } from '../compact.js';
 const UsernameArg = z
     .string()
@@ -8,8 +7,8 @@ const UsernameArg = z
     .optional()
     .describe('Untappd username. Omit to use your own configured account (UNTAPPD_USERNAME).');
 /** Resolve the target username: explicit arg, else the configured login name. */
-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.',
@@ -17,7 +16,7 @@ function resolveUser(username) {
     }
     return encodeURIComponent(u);
 }
-export function registerUserTools(server) {
+export function registerUserTools(server, client) {
     server.registerTool('untappd_user_info', {
         title: 'Get Untappd user profile',
         description: "Get an Untappd user's profile: bio, location, total check-ins, distinct beers, badges, and stats. " +
@@ -28,7 +27,7 @@ export function registerUserTools(server) {
             compact: z.boolean().optional().describe('Return a slimmer record without embedded lists (default false)'),
         },
     }, async ({ username, compact }) => {
-        const data = await client.get(`/user/info/${resolveUser(username)}`, { compact: compact ? 'true' : undefined });
+        const data = await client.get(`/user/info/${resolveUser(username, client.loginName)}`, { compact: compact ? 'true' : undefined });
         return textResult(data);
     });
     server.registerTool('untappd_user_checkins', {
@@ -46,7 +45,7 @@ export function registerUserTools(server) {
                 .describe('Project each check-in to a slim summary to save context (default false)'),
         },
     }, async ({ username, limit, max_id, compact }) => {
-        const data = await client.get(`/user/checkins/${resolveUser(username)}`, { limit, max_id });
+        const data = await client.get(`/user/checkins/${resolveUser(username, client.loginName)}`, { limit, max_id });
         return textResult(compact ? compactCheckins(data) : data);
     });
     server.registerTool('untappd_user_wishlist', {
@@ -67,7 +66,7 @@ export function registerUserTools(server) {
                 .describe('Project each beer to a slim summary (bid, name, brewery, style, abv, added_at) to save context (default false)'),
         },
     }, async ({ username, limit, offset, sort, compact }) => {
-        const data = await client.get(`/user/wishlist/${resolveUser(username)}`, { limit, offset, sort });
+        const data = await client.get(`/user/wishlist/${resolveUser(username, client.loginName)}`, { limit, offset, sort });
         return textResult(compact ? compactWishlist(data) : data);
     });
     server.registerTool('untappd_user_beers', {
@@ -89,7 +88,7 @@ export function registerUserTools(server) {
                 .describe('Project each beer to a slim summary (bid, name, brewery, style, abv, ibu, your_count, your_rating, global_rating, last_had) to save context (default false)'),
         },
     }, async ({ username, limit, offset, sort, compact }) => {
-        const data = await client.get(`/user/beers/${resolveUser(username)}`, { limit, offset, sort });
+        const data = await client.get(`/user/beers/${resolveUser(username, client.loginName)}`, { limit, offset, sort });
         return textResult(compact ? compactUserBeers(data) : data);
     });
     server.registerTool('untappd_user_badges', {
@@ -102,7 +101,7 @@ export function registerUserTools(server) {
             offset: z.number().int().min(0).optional().describe('Result offset for paging (default 0)'),
         },
     }, async ({ username, limit, offset }) => {
-        const data = await client.get(`/user/badges/${resolveUser(username)}`, { limit, offset });
+        const data = await client.get(`/user/badges/${resolveUser(username, client.loginName)}`, { limit, offset });
         return textResult(data);
     });
     server.registerTool('untappd_user_friends', {
@@ -115,7 +114,7 @@ export function registerUserTools(server) {
             offset: z.number().int().min(0).optional().describe('Result offset for paging (default 0)'),
         },
     }, async ({ username, limit, offset }) => {
-        const data = await client.get(`/user/friends/${resolveUser(username)}`, { limit, offset });
+        const data = await client.get(`/user/friends/${resolveUser(username, client.loginName)}`, { limit, offset });
         return textResult(data);
     });
     server.registerTool('untappd_user_venues', {
@@ -133,7 +132,7 @@ export function registerUserTools(server) {
                 .describe('Sort order (default most recent)'),
         },
     }, async ({ username, limit, offset, sort }) => {
-        const data = await client.get(`/user/venues/${resolveUser(username)}`, { limit, offset, sort });
+        const data = await client.get(`/user/venues/${resolveUser(username, client.loginName)}`, { limit, offset, sort });
         return textResult(data);
     });
     server.registerTool('untappd_pending_friends', {

package/dist/tools/utilities.js

@@ -1,6 +1,5 @@
 import { textResult, toolAnnotations } from '@chrischall/mcp-utils';
-import { client } from '../client.js';
-export function registerUtilityTools(server) {
+export function registerUtilityTools(server, client) {
     server.registerTool('untappd_healthcheck', {
         title: 'Untappd healthcheck',
         description: 'Verify Untappd connectivity and that credentials are configured and can log in. Performs a lightweight ' +

package/dist/tools/venue.js

@@ -1,8 +1,7 @@
 import { z } from 'zod';
 import { textResult, toolAnnotations } from '@chrischall/mcp-utils';
-import { client } from '../client.js';
 import { compactCheckins } from '../compact.js';
-export function registerVenueTools(server) {
+export function registerVenueTools(server, client) {
     server.registerTool('untappd_search_venue', {
         title: 'Search Untappd venues',
         description: 'Search Untappd for venues (bars, breweries, restaurants) by name. Returns matches with their venue id, ' +

package/dist/tools/wishlist.js

@@ -1,8 +1,7 @@
 import { z } from 'zod';
 import { textResult, toolAnnotations, schemaConfirm } from '@chrischall/mcp-utils';
-import { client } from '../client.js';
 const BidSchema = z.number().int().positive().describe('Untappd beer id (bid) — from untappd_search_beer');
-export function registerWishlistTools(server) {
+export function registerWishlistTools(server, client) {
     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 ' +

package/dist/version.js

@@ -3,4 +3,4 @@
 // json's `extra-files`), and `versionSyncTest` guards that it stays equal to
 // package.json. Import VERSION wherever the version is needed rather than
 // re-declaring it.
-export const VERSION = '1.1.0'; // x-release-please-version
+export const VERSION = '1.2.0'; // x-release-please-version

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "untappd-mcp",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "mcpName": "io.github.chrischall/untappd-mcp",
   "description": "Untappd MCP server for Claude — developed and maintained by AI (Claude Code)",
   "author": "Claude Code (AI) <https://www.anthropic.com/claude>",
@@ -37,19 +37,27 @@
     "dev": "node dist/index.js",
     "test": "vitest run",
     "test:watch": "vitest",
-    "test:coverage": "vitest run --coverage"
+    "test:coverage": "vitest run --coverage",
+    "worker:dev": "wrangler dev",
+    "worker:deploy": "wrangler deploy",
+    "worker:test": "vitest run --config vitest.workers.config.ts"
   },
   "dependencies": {
     "@chrischall/mcp-utils": "^0.12.0",
     "@modelcontextprotocol/sdk": "^1.29.0",
+    "ai": "^7.0.19",
     "dotenv": "^17.4.0",
     "zod": "^4.4.2"
   },
   "devDependencies": {
+    "@chrischall/mcp-connector": "file:./packages/mcp-connector",
+    "@cloudflare/vitest-pool-workers": "^0.18.4",
+    "@cloudflare/workers-types": "^5.20260708.1",
     "@types/node": "^26.1.1",
     "@vitest/coverage-v8": "^4.1.2",
     "esbuild": "^0.28.0",
     "typescript": "^7.0.2",
-    "vitest": "^4.1.2"
+    "vitest": "^4.1.2",
+    "wrangler": "^4.110.0"
   }
 }

package/server.json

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