@pipeworx/mcp-openstates 0.1.3 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipeworx/mcp-openstates",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "OpenStates MCP — bills, legislators, votes in all 50 US states",
   "type": "module",
   "main": "src/index.ts",
@@ -26,7 +26,7 @@
     "@cloudflare/workers-types": "^4.20260405.1"
   },
   "pipeworx": {
-    "sourceHash": "v1-cb3703013cf69fc6e2fc70bca57a6857b7ead99de0e71beaa6a32b1312e11733",
-    "sourceCommit": "c7cc6672266b20d1b5feb0c4c2d631e50ad8ba17"
+    "sourceHash": "v1-732159c87c7a46974cc5b92992d343278cc7c9e5f77023cc3f442dfd8969be69",
+    "sourceCommit": "ca77f046c3ddc52178f0c89d5682d4625c655201"
   }
 }

package/server.json

@@ -3,7 +3,7 @@
   "name": "io.github.pipeworx-io/openstates",
   "title": "Openstates",
   "description": "OpenStates MCP — bills, legislators, votes in all 50 US states",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "websiteUrl": "https://pipeworx.io/packs/openstates",
   "repository": {
     "url": "https://github.com/pipeworx-io/mcp-openstates",

package/src/index.ts

@@ -909,13 +909,19 @@ async function searchBills(apiKey: string, args: Record<string, unknown>) {
     bills: (data.results ?? []).map((b) => normalizeBill(b, false)),
   });
 
+  // Session ids are per-state (fleet #2465), so a zero under a session filter
+  // is as likely a wrong-shaped id as a genuine no-match. A year-shaped value
+  // is the common wrong shape: fetch the state's session list ALONGSIDE the
+  // search rather than after it, so the retry costs one extra round trip, not
+  // two — ask_pipeworx gives a leg ~13s and this upstream is slow.
+  const resolutionP: Promise<Settled> | null =
+    session && yearRangeOf(session) ? resolveSession(apiKey, jurisdiction, session).then(ok, fail) : null;
   const data = await osFetch<BillsPage>(apiKey, '/bills', params);
   if (!session || (data.results?.length ?? 0) > 0) return shape(data);
 
-  // Zero rows WITH a session filter: session ids are per-state (fleet #2465),
-  // so a zero here is as likely a wrong-shaped id as a genuine no-match. Check
-  // it against the state's own session list before reporting an empty result.
-  const resolution = await resolveSession(apiKey, jurisdiction, session);
+  const settled = resolutionP ? await resolutionP : await resolveSession(apiKey, jurisdiction, session).then(ok, fail);
+  if ('error' in settled) throw settled.error;
+  const resolution = settled.value;
   if (resolution.exact) return shape(data, { session_checked: resolution.exact });
 
   let last = data;
@@ -934,6 +940,11 @@ async function searchBills(apiKey: string, args: Record<string, unknown>) {
   });
 }
 
+type Resolution = { exact?: string; candidates: OsSession[] };
+type Settled = { value: Resolution } | { error: unknown };
+const ok = (value: Resolution): Settled => ({ value });
+const fail = (error: unknown): Settled => ({ error });
+
 function sessionNote(requested: string, used: string, name: string | undefined, candidates: OsSession[]) {
   return {
     requested,
@@ -997,8 +1008,8 @@ export function resolveSessionCandidates(requested: string, sessions: OsSession[
   return hits
     .map((s, i) => ({ s, i }))
     .sort((a, b) => {
-      const pa = a.s.classification === 'primary' ? 0 : 1;
-      const pb = b.s.classification === 'primary' ? 0 : 1;
+      const pa = isSpecialSession(a.s) ? 1 : 0;
+      const pb = isSpecialSession(b.s) ? 1 : 0;
       if (pa !== pb) return pa - pb;
       const da = a.s.start_date ?? '';
       const db = b.s.start_date ?? '';
@@ -1009,6 +1020,15 @@ export function resolveSessionCandidates(requested: string, sessions: OsSession[
     .slice(0, 4);
 }
 
+// Otherwise the newest special session outranks the regular one for the same
+// year ("2025" in Texas picked "892" over "89R").
+// Live Texas marks its called sessions `primary` too, so the name is the
+// signal that actually separates them; `classification` only adds to it.
+function isSpecialSession(s: OsSession): boolean {
+  if (s.classification === 'special') return true;
+  return /\b(special|called|extraordinary|extra)\b/i.test(s.name ?? '');
+}
+
 const TERRITORIES = new Set(['pr', 'gu', 'vi', 'as', 'mp']);
 
 function jurisdictionPathId(jurisdiction: string): string {
@@ -1021,6 +1041,25 @@ function jurisdictionPathId(jurisdiction: string): string {
   return j.startsWith('ocd-jurisdiction/') ? j : encodeURIComponent(j);
 }
 
+// Session lists change a few times a year; the upstream free tier is small and
+// per-minute throttled, so keep them per isolate for an hour rather than
+// spending a request on every zero-row search.
+const SESSION_TTL_MS = 60 * 60 * 1000;
+const sessionCache = new Map<string, { at: number; data: { name?: string; legislative_sessions?: OsSession[] } }>();
+
+async function jurisdictionSessions(apiKey: string, jurisdiction: string) {
+  const key = jurisdictionPathId(jurisdiction);
+  const hit = sessionCache.get(key);
+  if (hit && Date.now() - hit.at < SESSION_TTL_MS) return hit.data;
+  const data = await osFetch<{ name?: string; legislative_sessions?: OsSession[] }>(
+    apiKey,
+    `/jurisdictions/${key}`,
+    new URLSearchParams({ include: 'legislative_sessions' }),
+  );
+  sessionCache.set(key, { at: Date.now(), data });
+  return data;
+}
+
 /**
  * Check a session value against the jurisdiction's real session list.
  * exact → it IS a valid identifier (an empty result is genuine).
@@ -1033,11 +1072,7 @@ async function resolveSession(
   jurisdiction: string,
   session: string,
 ): Promise<{ exact?: string; candidates: OsSession[] }> {
-  const data = await osFetch<{ name?: string; legislative_sessions?: OsSession[] }>(
-    apiKey,
-    `/jurisdictions/${jurisdictionPathId(jurisdiction)}`,
-    new URLSearchParams({ include: 'legislative_sessions' }),
-  );
+  const data = await jurisdictionSessions(apiKey, jurisdiction);
   const sessions = (data.legislative_sessions ?? []).filter((s) => s && s.identifier);
   const norm = session.trim().toLowerCase();
   const exact = sessions.find(
@@ -1062,7 +1097,9 @@ async function resolveSession(
 
 async function getBill(apiKey: string, args: Record<string, unknown>) {
   const id = (args.openstates_id as string | undefined)?.trim();
-  const params = new URLSearchParams({ include: 'sponsorships,actions,votes,versions,sources,abstracts' });
+  // v3 takes `include` REPEATED; a comma-joined value is a 422 on every call.
+  const params = new URLSearchParams();
+  for (const inc of ['sponsorships', 'actions', 'votes', 'versions', 'sources', 'abstracts']) params.append('include', inc);
 
   if (id) {
     const data = await osFetch<OsBill>(apiKey, `/bills/${encodeURIComponent(id)}`, params);

package/src/server.ts

@@ -9,7 +9,7 @@ import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprot
 import pack from './index.js';
 
 const server = new Server(
-  { name: '@pipeworx/mcp-openstates', version: '0.1.3' },
+  { name: '@pipeworx/mcp-openstates', version: '0.1.5' },
   { capabilities: { tools: {} } },
 );