untappd-mcp 1.7.0 → 1.7.2

package/.claude-plugin/marketplace.json

@@ -7,7 +7,7 @@
   },
   "metadata": {
     "description": "MCP server for Untappd — beers, breweries, venues, check-ins, wishlists, and your friend feed",
-    "version": "1.7.0"
+    "version": "1.7.2"
   },
   "plugins": [
     {
@@ -15,7 +15,7 @@
       "displayName": "Untappd",
       "source": "./",
       "description": "MCP server for Untappd — search beers/breweries/venues, read profiles/check-ins/wishlists, and post check-ins, toasts, and comments",
-      "version": "1.7.0",
+      "version": "1.7.2",
       "author": {
         "name": "Chris Hall"
       },

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "untappd-mcp",
   "displayName": "Untappd",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "description": "MCP server for Untappd — search beers/breweries/venues, read check-ins and wishlists, and post check-ins, toasts, and comments",
   "author": {
     "name": "Chris Hall",
@@ -17,6 +17,6 @@
     "checkins",
     "mcp"
   ],
-  "skills": "./SKILL.md",
+  "skills": "./skills/",
   "mcp": "./.mcp.json"
 }

package/dist/bundle.js

@@ -31184,7 +31184,7 @@ function toolAnnotations(opts = {}) {
 }
 
 // src/version.ts
-var VERSION = "1.7.0";
+var VERSION = "1.7.2";
 
 // src/client.ts
 import { dirname, join } from "path";
@@ -31658,7 +31658,8 @@ var SCHEMA_STATEMENTS = [
      checkins_truncated INTEGER NOT NULL DEFAULT 0,
      beers_offset       INTEGER,
      beers_total        INTEGER,
-     beers_complete     INTEGER NOT NULL DEFAULT 0
+     beers_complete     INTEGER NOT NULL DEFAULT 0,
+     served_backfill_last INTEGER NOT NULL DEFAULT 0
    )`
 ];
 var MIGRATIONS = [
@@ -31666,7 +31667,8 @@ var MIGRATIONS = [
   "ALTER TABLE sync_state ADD COLUMN checkins_truncated INTEGER NOT NULL DEFAULT 0",
   "ALTER TABLE sync_state ADD COLUMN beers_offset INTEGER",
   "ALTER TABLE sync_state ADD COLUMN beers_total INTEGER",
-  "ALTER TABLE sync_state ADD COLUMN beers_complete INTEGER NOT NULL DEFAULT 0"
+  "ALTER TABLE sync_state ADD COLUMN beers_complete INTEGER NOT NULL DEFAULT 0",
+  "ALTER TABLE sync_state ADD COLUMN served_backfill_last INTEGER NOT NULL DEFAULT 0"
 ];
 var CheckinStoreCore = class {
   constructor(db) {
@@ -31787,7 +31789,8 @@ var CheckinStoreCore = class {
       checkins_truncated: Number(row.checkins_truncated) === 1,
       beers_offset: num(row.beers_offset),
       beers_total: num(row.beers_total),
-      beers_complete: Number(row.beers_complete) === 1
+      beers_complete: Number(row.beers_complete) === 1,
+      served_backfill_last: Number(row.served_backfill_last) === 1
     };
   }
   /**
@@ -31810,18 +31813,20 @@ var CheckinStoreCore = class {
       checkins_truncated: pick2("checkins_truncated", false),
       beers_offset: pick2("beers_offset", null),
       beers_total: pick2("beers_total", null),
-      beers_complete: pick2("beers_complete", false)
+      beers_complete: pick2("beers_complete", false),
+      served_backfill_last: pick2("served_backfill_last", false)
     };
     this.db.run(
       `INSERT INTO sync_state
-         (username, oldest_max_id, newest_checkin_id, catchup_max_id, last_synced_at, backfill_complete, total_checkins, checkins_truncated, beers_offset, beers_total, beers_complete)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+         (username, oldest_max_id, newest_checkin_id, catchup_max_id, last_synced_at, backfill_complete, total_checkins, checkins_truncated, beers_offset, beers_total, beers_complete, served_backfill_last)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
        ON CONFLICT(username) DO UPDATE SET
          oldest_max_id=excluded.oldest_max_id, newest_checkin_id=excluded.newest_checkin_id,
          catchup_max_id=excluded.catchup_max_id, last_synced_at=excluded.last_synced_at,
          backfill_complete=excluded.backfill_complete, total_checkins=excluded.total_checkins,
          checkins_truncated=excluded.checkins_truncated, beers_offset=excluded.beers_offset,
-         beers_total=excluded.beers_total, beers_complete=excluded.beers_complete`,
+         beers_total=excluded.beers_total, beers_complete=excluded.beers_complete,
+         served_backfill_last=excluded.served_backfill_last`,
       [
         key,
         next.oldest_max_id,
@@ -31833,7 +31838,8 @@ var CheckinStoreCore = class {
         next.checkins_truncated ? 1 : 0,
         next.beers_offset,
         next.beers_total,
-        next.beers_complete ? 1 : 0
+        next.beers_complete ? 1 : 0,
+        next.served_backfill_last ? 1 : 0
       ]
     );
   }
@@ -32997,12 +33003,49 @@ async function syncCheckins(client2, cache, rawUsername, options = {}) {
       });
     }
   };
-  if (priorNewest !== null) {
+  let usedFirstFetch = false;
+  const nextFetch = async (maxId) => {
+    if (!usedFirstFetch) {
+      usedFirstFetch = true;
+      return firstFetch(maxId);
+    }
+    return fetchPage(client2, encodedUser, maxId);
+  };
+  const catchupPending = catchupMaxId !== null;
+  const wantPhase1 = priorNewest !== null;
+  const wantPhase2 = !backfillComplete && !checkinsTruncated && !catchupPending;
+  let phase1Budget;
+  let phase2Budget;
+  let servedBackfillThisRun = priorState?.served_backfill_last ?? false;
+  if (wantPhase1 && wantPhase2) {
+    phase1Budget = Math.ceil(maxPages / 2);
+    phase2Budget = maxPages - phase1Budget;
+    if (phase2Budget === 0) {
+      if (priorState?.served_backfill_last) {
+        phase1Budget = 1;
+        phase2Budget = 0;
+        servedBackfillThisRun = false;
+      } else {
+        phase1Budget = 0;
+        phase2Budget = 1;
+        servedBackfillThisRun = true;
+      }
+    }
+  } else if (wantPhase1) {
+    phase1Budget = maxPages;
+    phase2Budget = 0;
+  } else {
+    phase1Budget = 0;
+    phase2Budget = maxPages;
+  }
+  if (priorNewest !== null && phase1Budget > 0) {
     let maxId = catchupMaxId ?? void 0;
     let caughtUp = false;
-    for (; pages < maxPages; ) {
-      const page = pages === 0 ? await firstFetch(maxId) : await fetchPage(client2, encodedUser, maxId);
+    let phase1Pages = 0;
+    for (; phase1Pages < phase1Budget; ) {
+      const page = await nextFetch(maxId);
       pages++;
+      phase1Pages++;
       if (page.items.length === 0) {
         caughtUp = true;
         break;
@@ -33046,12 +33089,13 @@ async function syncCheckins(client2, cache, rawUsername, options = {}) {
       catchupInProgress = true;
     }
   }
-  if (!backfillComplete && !catchupInProgress && !checkinsTruncated) {
+  if (!backfillComplete && !catchupInProgress && !checkinsTruncated && phase2Budget > 0) {
     let maxId = oldestMaxId ?? void 0;
-    for (; pages < maxPages; ) {
-      const first = pages === 0;
-      const page = first ? await firstFetch(maxId) : await fetchPage(client2, encodedUser, maxId);
+    let phase2Pages = 0;
+    for (; phase2Pages < phase2Budget; ) {
+      const page = await nextFetch(maxId);
       pages++;
+      phase2Pages++;
       if (page.items.length === 0) {
         backfillComplete = reachedFullCoverage(await cache.cachedCount(rawUsername), total);
         checkinsTruncated = !backfillComplete;
@@ -33088,6 +33132,7 @@ async function syncCheckins(client2, cache, rawUsername, options = {}) {
     backfill_complete: backfillComplete,
     checkins_truncated: checkinsTruncated,
     total_checkins: total,
+    served_backfill_last: servedBackfillThisRun,
     last_synced_at: now()
   });
   const backfillPercent = total && total > 0 ? Math.min(100, Math.round(cached2 / total * 100)) : backfillComplete && !catchupInProgress ? 100 : null;

package/dist/cache/store.js

@@ -174,7 +174,8 @@ export const SCHEMA_STATEMENTS = [
      checkins_truncated INTEGER NOT NULL DEFAULT 0,
      beers_offset       INTEGER,
      beers_total        INTEGER,
-     beers_complete     INTEGER NOT NULL DEFAULT 0
+     beers_complete     INTEGER NOT NULL DEFAULT 0,
+     served_backfill_last INTEGER NOT NULL DEFAULT 0
    )`,
 ];
 /** Columns added after the initial release, each applied idempotently on open. */
@@ -184,6 +185,7 @@ export const MIGRATIONS = [
     'ALTER TABLE sync_state ADD COLUMN beers_offset INTEGER',
     'ALTER TABLE sync_state ADD COLUMN beers_total INTEGER',
     'ALTER TABLE sync_state ADD COLUMN beers_complete INTEGER NOT NULL DEFAULT 0',
+    'ALTER TABLE sync_state ADD COLUMN served_backfill_last INTEGER NOT NULL DEFAULT 0',
 ];
 /**
  * The cache logic over a synchronous {@link SqlDriver}. Usernames are keyed
@@ -295,6 +297,7 @@ export class CheckinStoreCore {
             beers_offset: num(row.beers_offset),
             beers_total: num(row.beers_total),
             beers_complete: Number(row.beers_complete) === 1,
+            served_backfill_last: Number(row.served_backfill_last) === 1,
         };
     }
     /**
@@ -318,19 +321,21 @@ export class CheckinStoreCore {
             beers_offset: pick('beers_offset', null),
             beers_total: pick('beers_total', null),
             beers_complete: pick('beers_complete', false),
+            served_backfill_last: pick('served_backfill_last', false),
         };
         this.db.run(`INSERT INTO sync_state
-         (username, oldest_max_id, newest_checkin_id, catchup_max_id, last_synced_at, backfill_complete, total_checkins, checkins_truncated, beers_offset, beers_total, beers_complete)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+         (username, oldest_max_id, newest_checkin_id, catchup_max_id, last_synced_at, backfill_complete, total_checkins, checkins_truncated, beers_offset, beers_total, beers_complete, served_backfill_last)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
        ON CONFLICT(username) DO UPDATE SET
          oldest_max_id=excluded.oldest_max_id, newest_checkin_id=excluded.newest_checkin_id,
          catchup_max_id=excluded.catchup_max_id, last_synced_at=excluded.last_synced_at,
          backfill_complete=excluded.backfill_complete, total_checkins=excluded.total_checkins,
          checkins_truncated=excluded.checkins_truncated, beers_offset=excluded.beers_offset,
-         beers_total=excluded.beers_total, beers_complete=excluded.beers_complete`, [
+         beers_total=excluded.beers_total, beers_complete=excluded.beers_complete,
+         served_backfill_last=excluded.served_backfill_last`, [
             key, next.oldest_max_id, next.newest_checkin_id, next.catchup_max_id, next.last_synced_at,
             next.backfill_complete ? 1 : 0, next.total_checkins, next.checkins_truncated ? 1 : 0,
-            next.beers_offset, next.beers_total, next.beers_complete ? 1 : 0,
+            next.beers_offset, next.beers_total, next.beers_complete ? 1 : 0, next.served_backfill_last ? 1 : 0,
         ]);
     }
     /**

package/dist/cache/sync.js

@@ -108,13 +108,71 @@ export async function syncCheckins(client, cache, rawUsername, options = {}) {
             });
         }
     };
+    // Only the very first network call of the whole run gets the friendlier
+    // wrapped error; every call after that uses the plain fetch.
+    let usedFirstFetch = false;
+    const nextFetch = async (maxId) => {
+        if (!usedFirstFetch) {
+            usedFirstFetch = true;
+            return firstFetch(maxId);
+        }
+        return fetchPage(client, encodedUser, maxId);
+    };
+    // ── Split the shared per-call page budget across the two phases ──
+    // `maxPages` is the TOTAL page budget for this call (the documented
+    // rate-limit contract), NOT a per-phase budget. Phase 1 (catch-up) and
+    // Phase 2 (backfill) share it. The bug being fixed: a single shared page
+    // counter always ran Phase 1 first, and Phase 1 spends at least one page just
+    // to reconfirm "nothing new above the cached top" — so a large catch-up burst
+    // (or a small maxPages) could leave Phase 2 with ZERO pages every run,
+    // forever. The gap below oldest_max_id was then never re-fetched,
+    // backfill_complete never became true, and has_had silently false-negatived
+    // every bid in that unhealed gap. Fix: give each phase a slice of the shared
+    // budget (ceil to catch-up, the remainder to backfill) so both make progress,
+    // while the TOTAL fetched stays ≤ maxPages.
+    const catchupPending = catchupMaxId !== null; // an interrupted catch-up must finish first
+    const wantPhase1 = priorNewest !== null;
+    const wantPhase2 = !backfillComplete && !checkinsTruncated && !catchupPending;
+    let phase1Budget;
+    let phase2Budget;
+    // Preserved unless a max_pages=1 tie below flips it.
+    let servedBackfillThisRun = priorState?.served_backfill_last ?? false;
+    if (wantPhase1 && wantPhase2) {
+        phase1Budget = Math.ceil(maxPages / 2);
+        phase2Budget = maxPages - phase1Budget;
+        if (phase2Budget === 0) {
+            // maxPages === 1: the split zeroes one phase. Alternate which phase gets
+            // the single page each run (persisted turn flag) so BOTH converge over
+            // repeated runs and neither is permanently starved.
+            if (priorState?.served_backfill_last) {
+                phase1Budget = 1;
+                phase2Budget = 0;
+                servedBackfillThisRun = false; // catch-up's turn this run
+            }
+            else {
+                phase1Budget = 0;
+                phase2Budget = 1;
+                servedBackfillThisRun = true; // backfill's turn this run
+            }
+        }
+    }
+    else if (wantPhase1) {
+        phase1Budget = maxPages;
+        phase2Budget = 0;
+    }
+    else {
+        phase1Budget = 0;
+        phase2Budget = maxPages;
+    }
     // ── Phase 1: incremental catch-up of the new-top region (resumable) ──
-    if (priorNewest !== null) {
+    if (priorNewest !== null && phase1Budget > 0) {
         let maxId = catchupMaxId ?? undefined;
         let caughtUp = false;
-        for (; pages < maxPages;) {
-            const page = pages === 0 ? await firstFetch(maxId) : await fetchPage(client, encodedUser, maxId);
+        let phase1Pages = 0;
+        for (; phase1Pages < phase1Budget;) {
+            const page = await nextFetch(maxId);
             pages++;
+            phase1Pages++;
             if (page.items.length === 0) {
                 caughtUp = true;
                 break;
@@ -162,13 +220,14 @@ export async function syncCheckins(client, cache, rawUsername, options = {}) {
             catchupInProgress = true; // budget spent mid-catch-up; next run resumes
         }
     }
-    // ── Phase 2: backfill older history (resumable) ──
-    if (!backfillComplete && !catchupInProgress && !checkinsTruncated) {
+    // ── Phase 2: backfill older history (resumable), its slice of the budget ──
+    if (!backfillComplete && !catchupInProgress && !checkinsTruncated && phase2Budget > 0) {
         let maxId = oldestMaxId ?? undefined;
-        for (; pages < maxPages;) {
-            const first = pages === 0;
-            const page = first ? await firstFetch(maxId) : await fetchPage(client, encodedUser, maxId);
+        let phase2Pages = 0;
+        for (; phase2Pages < phase2Budget;) {
+            const page = await nextFetch(maxId);
             pages++;
+            phase2Pages++;
             if (page.items.length === 0) {
                 // Reached the end — but only "complete" if coverage is ~full.
                 backfillComplete = reachedFullCoverage(await cache.cachedCount(rawUsername), total);
@@ -211,6 +270,7 @@ export async function syncCheckins(client, cache, rawUsername, options = {}) {
         backfill_complete: backfillComplete,
         checkins_truncated: checkinsTruncated,
         total_checkins: total,
+        served_backfill_last: servedBackfillThisRun,
         last_synced_at: now(),
     });
     const backfillPercent = total && total > 0

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.7.0'; // x-release-please-version
+export const VERSION = '1.7.2'; // x-release-please-version

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "untappd-mcp",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "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>",
@@ -27,7 +27,7 @@
   "files": [
     "dist",
     ".claude-plugin",
-    "SKILL.md",
+    "skills/",
     ".mcp.json",
     "server.json"
   ],

package/server.json

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