@cyanheads/congressgov-mcp-server 0.3.7 → 0.3.9

package/dist/services/congress-api/congress-api-service.d.ts

@@ -2,7 +2,10 @@
  * @fileoverview Congress.gov API v3 client — auth, pagination, rate limiting, response normalization.
  * @module services/congress-api/congress-api-service
  */
+import type { Context } from '@cyanheads/mcp-ts-core';
 import type { BillSubResourceParams, CommitteeSubResourceParams, CongressDetail, GetBillParams, GetCommitteeReportParams, GetCrsReportParams, GetDailyArticlesParams, GetDailyIssuesParams, GetLawParams, GetMemberLegislationParams, GetVoteParams, ListBillsParams, ListCommitteeReportsParams, ListCommitteesParams, ListDailyRecordParams, ListLawsParams, ListMembersParams, ListNominationsParams, ListSummariesParams, ListVotesParams, NominationSubResourceParams, Pagination, PaginationParams } from './types.js';
+type ApiRecord = Record<string, unknown>;
+type EntityResult<TKey extends string> = Record<TKey, ApiRecord>;
 interface FetchListResult {
     data: unknown[];
     pagination: Pagination;
@@ -14,60 +17,51 @@ export declare class CongressApiService {
     private requestCount;
     private windowStart;
     constructor();
-    listBills(params: ListBillsParams): Promise<FetchListResult>;
-    getBill(params: GetBillParams): Promise<{
-        bill: unknown;
-    }>;
-    getBillSubResource(params: BillSubResourceParams): Promise<FetchListResult>;
-    listLaws(params: ListLawsParams): Promise<FetchListResult>;
-    getLaw(params: GetLawParams): Promise<{
-        law: unknown;
-    }>;
-    listMembers(params: ListMembersParams): Promise<FetchListResult>;
-    getMember(bioguideId: string): Promise<{
-        member: unknown;
-    }>;
-    getMemberLegislation(params: GetMemberLegislationParams): Promise<FetchListResult>;
-    listCommittees(params: ListCommitteesParams): Promise<FetchListResult>;
-    getCommittee(chamber: string, committeeCode: string): Promise<{
-        committee: unknown;
-    }>;
-    getCommitteeSubResource(params: CommitteeSubResourceParams): Promise<FetchListResult>;
-    listVotes(params: ListVotesParams): Promise<FetchListResult>;
-    getVote(params: GetVoteParams): Promise<{
-        vote: unknown;
-    }>;
-    getVoteMembers(params: GetVoteParams): Promise<{
-        vote: unknown;
-    }>;
-    listNominations(params: ListNominationsParams): Promise<FetchListResult>;
-    getNomination(congress: number, nominationNumber: string): Promise<{
-        nomination: unknown;
-    }>;
-    getNominee(congress: number, nominationNumber: string, ordinal: number, params?: PaginationParams): Promise<FetchListResult>;
-    getNominationSubResource(params: NominationSubResourceParams): Promise<FetchListResult>;
-    listSummaries(params: ListSummariesParams): Promise<FetchListResult>;
-    listCrsReports(params?: PaginationParams): Promise<FetchListResult>;
-    getCrsReport(params: GetCrsReportParams): Promise<{
-        report: unknown;
-    }>;
-    listCommitteeReports(params: ListCommitteeReportsParams): Promise<FetchListResult>;
-    getCommitteeReport(params: GetCommitteeReportParams): Promise<{
-        report: unknown;
-    }>;
-    getCommitteeReportText(params: GetCommitteeReportParams): Promise<{
+    listBills(params: ListBillsParams, ctx?: Context): Promise<FetchListResult>;
+    getBill(params: GetBillParams, ctx?: Context): Promise<EntityResult<'bill'>>;
+    getBillSubResource(params: BillSubResourceParams, ctx?: Context): Promise<FetchListResult>;
+    listLaws(params: ListLawsParams, ctx?: Context): Promise<FetchListResult>;
+    getLaw(params: GetLawParams, ctx?: Context): Promise<EntityResult<'law'>>;
+    listMembers(params: ListMembersParams, ctx?: Context): Promise<FetchListResult>;
+    getMember(bioguideId: string, ctx?: Context): Promise<EntityResult<'member'>>;
+    getMemberLegislation(params: GetMemberLegislationParams, ctx?: Context): Promise<FetchListResult>;
+    listCommittees(params: ListCommitteesParams, ctx?: Context): Promise<FetchListResult>;
+    getCommittee(chamber: string, committeeCode: string, ctx?: Context): Promise<EntityResult<'committee'>>;
+    getCommitteeSubResource(params: CommitteeSubResourceParams, ctx?: Context): Promise<FetchListResult>;
+    listVotes(params: ListVotesParams, ctx?: Context): Promise<FetchListResult>;
+    getVote(params: GetVoteParams, ctx?: Context): Promise<EntityResult<'vote'>>;
+    getVoteMembers(params: GetVoteParams, ctx?: Context): Promise<EntityResult<'vote'>>;
+    listNominations(params: ListNominationsParams, ctx?: Context): Promise<FetchListResult>;
+    getNomination(congress: number, nominationNumber: string, ctx?: Context): Promise<EntityResult<'nomination'>>;
+    getNominee(congress: number, nominationNumber: string, ordinal: number, params?: PaginationParams, ctx?: Context): Promise<FetchListResult>;
+    getNominationSubResource(params: NominationSubResourceParams, ctx?: Context): Promise<FetchListResult>;
+    listSummaries(params: ListSummariesParams, ctx?: Context): Promise<FetchListResult>;
+    listCrsReports(params?: PaginationParams, ctx?: Context): Promise<FetchListResult>;
+    getCrsReport(params: GetCrsReportParams, ctx?: Context): Promise<EntityResult<'report'>>;
+    listCommitteeReports(params: ListCommitteeReportsParams, ctx?: Context): Promise<FetchListResult>;
+    getCommitteeReport(params: GetCommitteeReportParams, ctx?: Context): Promise<EntityResult<'report'>>;
+    getCommitteeReportText(params: GetCommitteeReportParams, ctx?: Context): Promise<{
         text: unknown;
     }>;
-    listDailyRecord(params?: ListDailyRecordParams): Promise<FetchListResult>;
-    getDailyIssues(params: GetDailyIssuesParams): Promise<FetchListResult>;
-    getDailyArticles(params: GetDailyArticlesParams): Promise<FetchListResult>;
-    getCurrentCongress(): Promise<CongressDetail>;
-    getCongress(congress: number): Promise<CongressDetail>;
+    listDailyRecord(params?: ListDailyRecordParams, ctx?: Context): Promise<FetchListResult>;
+    getDailyIssues(params: GetDailyIssuesParams, ctx?: Context): Promise<FetchListResult>;
+    getDailyArticles(params: GetDailyArticlesParams, ctx?: Context): Promise<FetchListResult>;
+    getCurrentCongress(ctx?: Context): Promise<CongressDetail>;
+    getCongress(congress: number, ctx?: Context): Promise<CongressDetail>;
     private fetchList;
     private extractPagination;
     private get;
     private checkRateLimit;
     private inferListKey;
+    private buildUrl;
+    private buildQuery;
+    private extractListItems;
+    private getRequestContext;
+    private getAbortSignal;
+    private fetchResponse;
+    private isRetryableError;
+    private parseJsonResponse;
+    private isMissingEntityErrorBody;
 }
 export declare function initCongressApi(): void;
 export declare function getCongressApi(): CongressApiService;

package/dist/services/congress-api/congress-api-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"congress-api-service.d.ts","sourceRoot":"","sources":["../../../src/services/congress-api/congress-api-service.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EACV,qBAAqB,EACrB,0BAA0B,EAC1B,cAAc,EAEd,aAAa,EACb,wBAAwB,EACxB,kBAAkB,EAClB,sBAAsB,EACtB,oBAAoB,EACpB,YAAY,EACZ,0BAA0B,EAC1B,aAAa,EACb,eAAe,EACf,0BAA0B,EAC1B,oBAAoB,EACpB,qBAAqB,EACrB,cAAc,EACd,iBAAiB,EACjB,qBAAqB,EACrB,mBAAmB,EACnB,eAAe,EACf,2BAA2B,EAC3B,UAAU,EACV,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAEpB,UAAU,eAAe;IACvB,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,UAAU,EAAE,UAAU,CAAC;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAOD,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,YAAY,CAAK;IACzB,OAAO,CAAC,WAAW,CAAc;;IAUjC,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAOtD,OAAO,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,OAAO,CAAA;KAAE,CAAC;IAKhE,kBAAkB,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,eAAe,CAAC;IAQ3E,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;IAOpD,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE,CAAC;IAO7D,WAAW,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IAa1D,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,OAAO,CAAA;KAAE,CAAC;IAKjE,oBAAoB,CAAC,MAAM,EAAE,0BAA0B,GAAG,OAAO,CAAC,eAAe,CAAC;IAQlF,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,eAAe,CAAC;IAQhE,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,SAAS,EAAE,OAAO,CAAA;KAAE,CAAC;IAK3F,uBAAuB,CAAC,MAAM,EAAE,0BAA0B,GAAG,OAAO,CAAC,eAAe,CAAC;IAQrF,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAQtD,OAAO,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,OAAO,CAAA;KAAE,CAAC;IAO1D,cAAc,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,OAAO,CAAA;KAAE,CAAC;IASvE,eAAe,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,eAAe,CAAC;IAIlE,aAAa,CACjB,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC;QAAE,UAAU,EAAE,OAAO,CAAA;KAAE,CAAC;IAKnC,UAAU,CACR,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,gBAAgB,GACxB,OAAO,CAAC,eAAe,CAAC;IAQ3B,wBAAwB,CAAC,MAAM,EAAE,2BAA2B,GAAG,OAAO,CAAC,eAAe,CAAC;IAQvF,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,eAAe,CAAC;IAUpE,cAAc,CAAC,MAAM,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC;IAI7D,YAAY,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,OAAO,CAAA;KAAE,CAAC;IAgB5E,oBAAoB,CAAC,MAAM,EAAE,0BAA0B,GAAG,OAAO,CAAC,eAAe,CAAC;IAO5E,kBAAkB,CAAC,MAAM,EAAE,wBAAwB,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,OAAO,CAAA;KAAE,CAAC;IAgBlF,sBAAsB,CAAC,MAAM,EAAE,wBAAwB,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,OAAO,CAAA;KAAE,CAAC;IAS1F,eAAe,CAAC,MAAM,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,eAAe,CAAC;IAIzE,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,eAAe,CAAC;IAQtE,gBAAgB,CAAC,MAAM,EAAE,sBAAsB,GAAG,OAAO,CAAC,eAAe,CAAC;IAOpE,kBAAkB,IAAI,OAAO,CAAC,cAAc,CAAC;IAK7C,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;YAO9C,SAAS;IAwBvB,OAAO,CAAC,iBAAiB;YAaX,GAAG;IAkDjB,OAAO,CAAC,cAAc;IAatB,OAAO,CAAC,YAAY;CAmBrB;AAQD,wBAAgB,eAAe,IAAI,IAAI,CAEtC;AAED,wBAAgB,cAAc,IAAI,kBAAkB,CAInD"}
+{"version":3,"file":"congress-api-service.d.ts","sourceRoot":"","sources":["../../../src/services/congress-api/congress-api-service.ts"],"names":[],"mappings":"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"}

package/dist/services/congress-api/congress-api-service.js

@@ -2,12 +2,32 @@
  * @fileoverview Congress.gov API v3 client — auth, pagination, rate limiting, response normalization.
  * @module services/congress-api/congress-api-service
  */
-import { notFound, rateLimited, serviceUnavailable } from '@cyanheads/mcp-ts-core/errors';
+import { JsonRpcErrorCode, McpError, notFound, rateLimited, serviceUnavailable, validationError, } from '@cyanheads/mcp-ts-core/errors';
+import { fetchWithTimeout, withRetry } from '@cyanheads/mcp-ts-core/utils';
 import { getServerConfig } from '../../config/server-config.js';
-const MAX_RETRIES = 3;
+function isApiRecord(value) {
+    return typeof value === 'object' && value !== null;
+}
+function isNativeAbortSignal(value) {
+    if (typeof AbortSignal !== 'function' ||
+        typeof AbortSignal.prototype.throwIfAborted !== 'function' ||
+        !value) {
+        return false;
+    }
+    try {
+        AbortSignal.prototype.throwIfAborted.call(value);
+        return true;
+    }
+    catch (error) {
+        return !(error instanceof TypeError);
+    }
+}
+const MAX_ATTEMPTS = 3;
 const BASE_BACKOFF_MS = 1000;
 const RATE_LIMIT_WINDOW_MS = 60 * 60 * 1000;
 const RATE_LIMIT_MAX = 5000;
+const REQUEST_TIMEOUT_MS = 10_000;
+const HTML_RESPONSE_RE = /^\s*<(!DOCTYPE\s+html|html[\s>])/i;
 export class CongressApiService {
     apiKey;
     baseUrl;
@@ -19,58 +39,67 @@ export class CongressApiService {
         this.baseUrl = config.baseUrl.replace(/\/$/, '');
     }
     // --- Bills ---
-    listBills(params) {
+    listBills(params, ctx) {
         const path = params.billType
             ? `/bill/${params.congress}/${params.billType}`
             : `/bill/${params.congress}`;
-        return this.fetchList(path, 'bills', params);
+        return this.fetchList(path, 'bills', params, ctx);
     }
-    async getBill(params) {
-        const data = await this.get(`/bill/${params.congress}/${params.billType}/${params.billNumber}`);
+    async getBill(params, ctx) {
+        const data = await this.get(`/bill/${params.congress}/${params.billType}/${params.billNumber}`, ctx);
         return { bill: data.bill };
     }
-    getBillSubResource(params) {
+    getBillSubResource(params, ctx) {
         const path = `/bill/${params.congress}/${params.billType}/${params.billNumber}/${params.subResource}`;
         const key = this.inferListKey(params.subResource);
-        return this.fetchList(path, key, params);
+        return this.fetchList(path, key, params, ctx);
     }
     // --- Laws ---
-    listLaws(params) {
+    listLaws(params, ctx) {
         const path = params.lawType
             ? `/law/${params.congress}/${params.lawType}`
             : `/law/${params.congress}`;
-        return this.fetchList(path, 'bills', params);
+        return this.fetchList(path, 'bills', params, ctx);
     }
-    async getLaw(params) {
-        const data = await this.get(`/law/${params.congress}/${params.lawType}/${params.lawNumber}`);
-        return { law: data.law };
+    async getLaw(params, ctx) {
+        /** Congress.gov returns the law endpoint payload under `bill` — a law is a bill that became law. */
+        const data = await this.get(`/law/${params.congress}/${params.lawType}/${params.lawNumber}`, ctx);
+        return { law: data.bill };
     }
     // --- Members ---
-    listMembers(params) {
+    listMembers(params, ctx) {
+        if (params.congress !== undefined && (params.stateCode || params.district !== undefined)) {
+            throw validationError('Congress.gov does not support combining congress with stateCode or district for member lookups. Use congress-only or stateCode/district-only filters.', {
+                congress: params.congress,
+                stateCode: params.stateCode,
+                district: params.district,
+            });
+        }
         let path = '/member';
-        if (params.congress)
-            path = `/member/congress/${params.congress}`;
         if (params.stateCode) {
             path = `/member/${params.stateCode}`;
             if (params.district !== undefined)
                 path += `/${params.district}`;
         }
-        const query = {};
-        if (params.currentMember !== undefined)
-            query.currentMember = params.currentMember ? 'true' : 'false';
-        return this.fetchList(path, 'members', params, query);
+        else if (params.congress) {
+            path = `/member/congress/${params.congress}`;
+        }
+        const extraQuery = params.currentMember === undefined
+            ? undefined
+            : { currentMember: params.currentMember ? 'true' : 'false' };
+        return this.fetchList(path, 'members', params, ctx, extraQuery);
     }
-    async getMember(bioguideId) {
-        const data = await this.get(`/member/${bioguideId}`);
+    async getMember(bioguideId, ctx) {
+        const data = await this.get(`/member/${bioguideId}`, ctx);
         return { member: data.member };
     }
-    getMemberLegislation(params) {
+    getMemberLegislation(params, ctx) {
         const path = `/member/${params.bioguideId}/${params.type}`;
         const key = params.type.replace('-legislation', 'Legislation');
-        return this.fetchList(path, key, params);
+        return this.fetchList(path, key, params, ctx);
     }
     // --- Committees ---
-    listCommittees(params) {
+    listCommittees(params, ctx) {
         let path = '/committee';
         if (params.congress && params.chamber)
             path = `/committee/${params.congress}/${params.chamber}`;
@@ -78,81 +107,85 @@ export class CongressApiService {
             path = `/committee/${params.congress}`;
         else if (params.chamber)
             path = `/committee/${params.chamber}`;
-        return this.fetchList(path, 'committees', params);
+        return this.fetchList(path, 'committees', params, ctx);
     }
-    async getCommittee(chamber, committeeCode) {
-        const data = await this.get(`/committee/${chamber}/${committeeCode}`);
+    async getCommittee(chamber, committeeCode, ctx) {
+        const data = await this.get(`/committee/${chamber}/${committeeCode}`, ctx);
         return { committee: data.committee };
     }
-    getCommitteeSubResource(params) {
+    getCommitteeSubResource(params, ctx) {
         const path = `/committee/${params.chamber}/${params.committeeCode}/${params.subResource}`;
         const key = this.inferListKey(params.subResource);
-        return this.fetchList(path, key, params);
+        return this.fetchList(path, key, params, ctx);
     }
     // --- Votes ---
-    listVotes(params) {
-        return this.fetchList(`/house-vote/${params.congress}/${params.session}`, 'houseRollCallVotes', params);
+    listVotes(params, ctx) {
+        return this.fetchList(`/house-vote/${params.congress}/${params.session}`, 'houseRollCallVotes', params, ctx);
     }
-    async getVote(params) {
-        const data = await this.get(`/house-vote/${params.congress}/${params.session}/${params.voteNumber}`);
-        return { vote: data.houseRollCallVote ?? data };
+    async getVote(params, ctx) {
+        const data = await this.get(`/house-vote/${params.congress}/${params.session}/${params.voteNumber}`, ctx);
+        return { vote: (data.houseRollCallVote ?? data) };
     }
-    async getVoteMembers(params) {
-        const data = await this.get(`/house-vote/${params.congress}/${params.session}/${params.voteNumber}/members`);
-        return { vote: data.houseRollCallVoteMemberVotes ?? data };
+    async getVoteMembers(params, ctx) {
+        const data = await this.get(`/house-vote/${params.congress}/${params.session}/${params.voteNumber}/members`, ctx);
+        return { vote: (data.houseRollCallVoteMemberVotes ?? data) };
     }
     // --- Nominations ---
-    listNominations(params) {
-        return this.fetchList(`/nomination/${params.congress}`, 'nominations', params);
+    listNominations(params, ctx) {
+        return this.fetchList(`/nomination/${params.congress}`, 'nominations', params, ctx);
     }
-    async getNomination(congress, nominationNumber) {
-        const data = await this.get(`/nomination/${congress}/${nominationNumber}`);
+    async getNomination(congress, nominationNumber, ctx) {
+        const data = await this.get(`/nomination/${congress}/${nominationNumber}`, ctx);
         return { nomination: data.nomination };
     }
-    getNominee(congress, nominationNumber, ordinal, params) {
-        return this.fetchList(`/nomination/${congress}/${nominationNumber}/${ordinal}`, 'nominees', params);
+    getNominee(congress, nominationNumber, ordinal, params, ctx) {
+        return this.fetchList(`/nomination/${congress}/${nominationNumber}/${ordinal}`, 'nominees', params, ctx);
     }
-    getNominationSubResource(params) {
+    getNominationSubResource(params, ctx) {
         const path = `/nomination/${params.congress}/${params.nominationNumber}/${params.subResource}`;
         const key = this.inferListKey(params.subResource);
-        return this.fetchList(path, key, params);
+        return this.fetchList(path, key, params, ctx);
     }
     // --- Summaries ---
-    listSummaries(params) {
+    listSummaries(params, ctx) {
         let path = '/summaries';
         if (params.congress && params.billType)
             path = `/summaries/${params.congress}/${params.billType}`;
         else if (params.congress)
             path = `/summaries/${params.congress}`;
-        return this.fetchList(path, 'summaries', params);
+        return this.fetchList(path, 'summaries', params, ctx);
     }
     // --- CRS Reports ---
-    listCrsReports(params) {
-        return this.fetchList('/crsreport', 'CRSReports', params);
+    listCrsReports(params, ctx) {
+        return this.fetchList('/crsreport', 'CRSReports', params, ctx);
     }
-    async getCrsReport(params) {
-        let data;
+    async getCrsReport(params, ctx) {
         try {
-            data = await this.get(`/crsreport/${params.reportNumber}`);
+            const data = await this.get(`/crsreport/${params.reportNumber}`, ctx);
+            return { report: (data.CRSReport ?? data) };
         }
-        catch (err) {
-            // Upstream API returns 500 instead of 404 for nonexistent report IDs
-            if (err instanceof Error && err.message.includes('HTTP 500')) {
-                throw notFound('CRS report not found', { reportNumber: params.reportNumber });
+        catch (error) {
+            const statusCode = error instanceof McpError && typeof error.data?.statusCode === 'number'
+                ? error.data.statusCode
+                : undefined;
+            const responseBody = error instanceof McpError && typeof error.data?.responseBody === 'string'
+                ? error.data.responseBody
+                : '';
+            if (statusCode === 500 && this.isMissingEntityErrorBody(responseBody)) {
+                throw notFound('CRS report not found', { reportNumber: params.reportNumber }, { cause: error });
             }
-            throw err;
+            throw error;
         }
-        return { report: data.CRSReport ?? data };
     }
     // --- Committee Reports ---
-    listCommitteeReports(params) {
+    listCommitteeReports(params, ctx) {
         const path = params.reportType
             ? `/committee-report/${params.congress}/${params.reportType}`
             : `/committee-report/${params.congress}`;
-        return this.fetchList(path, 'reports', params);
+        return this.fetchList(path, 'reports', params, ctx);
     }
-    async getCommitteeReport(params) {
-        const data = await this.get(`/committee-report/${params.congress}/${params.reportType}/${params.reportNumber}`);
+    async getCommitteeReport(params, ctx) {
+        const data = await this.get(`/committee-report/${params.congress}/${params.reportType}/${params.reportNumber}`, ctx);
         const reports = data.committeeReports;
         const report = Array.isArray(reports) ? reports[0] : (reports ?? data);
         if (!report || (typeof report === 'object' && Object.keys(report).length === 0)) {
@@ -162,51 +195,36 @@ export class CongressApiService {
                 reportNumber: params.reportNumber,
             });
         }
-        return { report };
+        return { report: report };
     }
-    async getCommitteeReportText(params) {
-        const data = await this.get(`/committee-report/${params.congress}/${params.reportType}/${params.reportNumber}/text`);
+    async getCommitteeReportText(params, ctx) {
+        const data = await this.get(`/committee-report/${params.congress}/${params.reportType}/${params.reportNumber}/text`, ctx);
         return { text: data.text ?? data['text-versions'] ?? data };
     }
     // --- Daily Congressional Record ---
-    listDailyRecord(params) {
-        return this.fetchList('/daily-congressional-record', 'dailyCongressionalRecord', params);
+    listDailyRecord(params, ctx) {
+        return this.fetchList('/daily-congressional-record', 'dailyCongressionalRecord', params, ctx);
     }
-    getDailyIssues(params) {
-        return this.fetchList(`/daily-congressional-record/${params.volumeNumber}`, 'dailyCongressionalRecord', params);
+    getDailyIssues(params, ctx) {
+        return this.fetchList(`/daily-congressional-record/${params.volumeNumber}`, 'dailyCongressionalRecord', params, ctx);
     }
-    getDailyArticles(params) {
+    getDailyArticles(params, ctx) {
         const path = `/daily-congressional-record/${params.volumeNumber}/${params.issueNumber}/articles`;
-        return this.fetchList(path, 'articles', params);
+        return this.fetchList(path, 'articles', params, ctx);
     }
     // --- Congress metadata ---
-    async getCurrentCongress() {
-        const data = await this.get('/congress/current');
+    async getCurrentCongress(ctx) {
+        const data = await this.get('/congress/current', ctx);
         return data.congress;
     }
-    async getCongress(congress) {
-        const data = await this.get(`/congress/${congress}`);
+    async getCongress(congress, ctx) {
+        const data = await this.get(`/congress/${congress}`, ctx);
         return data.congress;
     }
     // --- Internal ---
-    async fetchList(path, listKey, params, extraQuery) {
-        const query = { ...extraQuery };
-        if (params?.limit)
-            query.limit = String(params.limit);
-        if (params?.offset)
-            query.offset = String(params.offset);
-        if (params?.fromDateTime)
-            query.fromDateTime = params.fromDateTime;
-        if (params?.toDateTime)
-            query.toDateTime = params.toDateTime;
-        const data = await this.get(path, query);
-        const raw = data[listKey];
-        // Some endpoints (e.g. committee-bills) nest the array inside an object — unwrap it.
-        const items = Array.isArray(raw)
-            ? raw
-            : raw && typeof raw === 'object'
-                ? (Object.values(raw).find(Array.isArray) ?? [])
-                : [];
+    async fetchList(path, listKey, params, ctx, extraQuery) {
+        const data = await this.get(path, ctx, this.buildQuery(params, extraQuery));
+        const items = this.extractListItems(data[listKey]);
         const pagination = this.extractPagination(data.pagination, items.length, params);
         return { data: items, pagination };
     }
@@ -218,44 +236,26 @@ export class CongressApiService {
         return { count, nextOffset };
     }
     // biome-ignore lint/suspicious/noExplicitAny: API responses are dynamic JSON
-    async get(path, query) {
+    get(path, ctx, query) {
         this.checkRateLimit();
-        const url = new URL(`${this.baseUrl}${path}`);
-        url.searchParams.set('format', 'json');
-        url.searchParams.set('api_key', this.apiKey);
-        if (query) {
-            for (const [k, v] of Object.entries(query)) {
-                if (v !== undefined && v !== '')
-                    url.searchParams.set(k, v);
-            }
-        }
-        for (let attempt = 0; attempt < MAX_RETRIES; attempt++) {
-            const res = await fetch(url.toString(), {
-                headers: { Accept: 'application/json' },
-            });
-            if (res.status === 429) {
-                throw rateLimited('Congress.gov API rate limit reached (5,000 requests/hour). Wait before retrying — the limit resets hourly.');
-            }
-            if (res.status >= 500) {
-                const body = await res.text().catch(() => '');
-                // The API returns 500 instead of 404 for some nonexistent entities —
-                // these have structured JSON error bodies vs. empty/HTML for real outages
-                if (body.includes('"error"')) {
-                    throw new Error(`Congress.gov API returned HTTP ${res.status}: ${body}`);
-                }
-                if (attempt < MAX_RETRIES - 1) {
-                    await sleep(BASE_BACKOFF_MS * 2 ** attempt);
-                    continue;
-                }
-                throw serviceUnavailable(`Congress.gov API returned HTTP ${res.status} after ${MAX_RETRIES} attempts.`, { status: res.status });
-            }
-            if (!res.ok) {
-                const body = await res.text().catch(() => '');
-                throw new Error(`Congress.gov API returned HTTP ${res.status}: ${body || res.statusText}`);
-            }
+        const url = this.buildUrl(path, query);
+        const operation = `CongressApiService GET ${path}`;
+        const requestContext = this.getRequestContext(ctx, operation);
+        const signal = this.getAbortSignal(ctx);
+        const retryOptions = {
+            operation,
+            context: requestContext,
+            baseDelayMs: BASE_BACKOFF_MS,
+            maxRetries: MAX_ATTEMPTS - 1,
+            isTransient: (error) => this.isRetryableError(error),
+            ...(signal ? { signal } : {}),
+        };
+        return withRetry(async () => {
+            const response = await this.fetchResponse(url, path, requestContext, signal);
+            const data = this.parseJsonResponse(await response.text(), path);
             this.requestCount++;
-            return res.json();
-        }
+            return data;
+        }, retryOptions);
     }
     checkRateLimit() {
         const now = Date.now();
@@ -286,9 +286,109 @@ export class CongressApiService {
         };
         return mapping[subResource] ?? subResource;
     }
-}
-function sleep(ms) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
+    buildUrl(path, query) {
+        const url = new URL(`${this.baseUrl}${path}`);
+        url.searchParams.set('format', 'json');
+        url.searchParams.set('api_key', this.apiKey);
+        if (query) {
+            for (const [k, v] of Object.entries(query)) {
+                if (v !== undefined && v !== '')
+                    url.searchParams.set(k, v);
+            }
+        }
+        return url;
+    }
+    buildQuery(params, extraQuery) {
+        const query = { ...extraQuery };
+        if (params?.limit != null)
+            query.limit = String(params.limit);
+        if (params?.offset != null)
+            query.offset = String(params.offset);
+        if (params?.fromDateTime)
+            query.fromDateTime = params.fromDateTime;
+        if (params?.toDateTime)
+            query.toDateTime = params.toDateTime;
+        return query;
+    }
+    extractListItems(raw) {
+        if (Array.isArray(raw))
+            return raw;
+        if (!isApiRecord(raw))
+            return [];
+        const nestedItems = Object.values(raw).find(Array.isArray);
+        return Array.isArray(nestedItems) ? nestedItems : [];
+    }
+    getRequestContext(ctx, operation) {
+        const ctxRecord = ctx;
+        const requestId = typeof ctxRecord?.requestId === 'string' ? ctxRecord.requestId : 'congress-api-service';
+        const timestamp = typeof ctxRecord?.timestamp === 'string' ? ctxRecord.timestamp : new Date().toISOString();
+        return { operation, requestId, timestamp };
+    }
+    getAbortSignal(ctx) {
+        const signal = ctx?.signal;
+        return isNativeAbortSignal(signal) ? signal : undefined;
+    }
+    async fetchResponse(url, path, requestContext, signal) {
+        try {
+            return await fetchWithTimeout(url, REQUEST_TIMEOUT_MS, requestContext, {
+                headers: { Accept: 'application/json' },
+                ...(signal ? { signal } : {}),
+            });
+        }
+        catch (error) {
+            if (error instanceof McpError && error.code === JsonRpcErrorCode.ServiceUnavailable) {
+                const statusCode = typeof error.data?.statusCode === 'number' ? error.data.statusCode : undefined;
+                if (statusCode === 404) {
+                    throw notFound('Congress.gov resource not found', { path }, { cause: error });
+                }
+                if (statusCode === 429) {
+                    throw rateLimited('Congress.gov API rate limit reached (5,000 requests/hour). Wait before retrying — the limit resets hourly.', { path }, { cause: error });
+                }
+            }
+            throw error;
+        }
+    }
+    isRetryableError(error) {
+        if (error instanceof McpError) {
+            return (error.code === JsonRpcErrorCode.ServiceUnavailable ||
+                error.code === JsonRpcErrorCode.Timeout);
+        }
+        return true;
+    }
+    parseJsonResponse(text, path) {
+        const trimmed = text.trim();
+        if (!trimmed) {
+            throw serviceUnavailable('Congress.gov API returned an empty response body.', { path });
+        }
+        if (HTML_RESPONSE_RE.test(trimmed)) {
+            throw serviceUnavailable('Congress.gov API returned HTML instead of JSON.', {
+                path,
+            });
+        }
+        try {
+            return JSON.parse(trimmed);
+        }
+        catch (error) {
+            throw serviceUnavailable('Congress.gov API returned invalid JSON.', { path }, { cause: error });
+        }
+    }
+    isMissingEntityErrorBody(body) {
+        const trimmed = body.trim();
+        if (!trimmed || HTML_RESPONSE_RE.test(trimmed))
+            return false;
+        try {
+            const parsed = JSON.parse(trimmed);
+            const message = typeof parsed.error === 'string'
+                ? parsed.error
+                : typeof parsed.message === 'string'
+                    ? parsed.message
+                    : '';
+            return /not found|no data/i.test(message);
+        }
+        catch {
+            return false;
+        }
+    }
 }
 let _service;
 export function initCongressApi() {