@digital-science-dsl/dimensions-analytics-mcp 1.2.0 → 1.3.1

package/src/mcp/tools/analytics.ts

@@ -4,8 +4,8 @@
  * @module mcp/tools/analytics
  */
 
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { ErrorCode, McpError } from "@modelcontextprotocol/sdk/types.js";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { ProtocolError, ProtocolErrorCode } from "@modelcontextprotocol/server";
 import { z } from "zod";
 import type { Currency, DimensionsClient, EntityType } from "../../dsl/index.js";
 import {
@@ -60,8 +60,8 @@ function entityTypeEnum(schemaStore: SchemaStore) {
 function assertFacetField(schemaStore: SchemaStore, entity: string, facetField: string): void {
   const valid = schemaStore.facetFields(entity);
   if (!valid.includes(facetField)) {
-    throw new McpError(
-      ErrorCode.InvalidParams,
+    throw new ProtocolError(
+      ProtocolErrorCode.InvalidParams,
       `Invalid facet field "${facetField}" for entity "${entity}". Valid fields: ${valid.join(", ") || "(none)"}`,
     );
   }
@@ -77,8 +77,8 @@ function assertIndicators(schemaStore: SchemaStore, entity: string, indicators:
   const valid = new Set(schemaStore.metrics(entity));
   const invalid = indicators.filter((name) => !valid.has(name));
   if (invalid.length > 0) {
-    throw new McpError(
-      ErrorCode.InvalidParams,
+    throw new ProtocolError(
+      ProtocolErrorCode.InvalidParams,
       `Invalid indicator(s) for entity "${entity}": ${invalid.join(", ")}. Valid metrics: ${[...valid].join(", ") || "(none)"}`,
     );
   }
@@ -131,7 +131,7 @@ export function registerAnalyticsTools(
       description:
         "Distribution analysis across entity dimensions. Returns facet buckets showing how records " +
         "are distributed across a categorical field. Example: 'What journals publish the most CRISPR research?'",
-      inputSchema: {
+      inputSchema: z.object({
         entityType: entityTypeSchema,
         facetField: z
           .string()
@@ -165,13 +165,13 @@ export function registerAnalyticsTools(
           .array(ExtendedWhereFilterSchema)
           .optional()
           .describe("Additional where-clause filters before faceting"),
-      },
-      outputSchema: {
+      }),
+      outputSchema: z.object({
         entityType: z.string().describe("Entity type analyzed"),
         facetField: z.string().describe("Field faceted on"),
         totalBuckets: z.number().describe("Number of facet buckets returned"),
         buckets: z.array(z.record(z.string(), z.unknown())).describe("Facet bucket distribution"),
-      },
+      }),
       annotations: READ_ONLY_API_ANNOTATIONS,
     },
     withFieldAliases(
@@ -221,7 +221,7 @@ export function registerAnalyticsTools(
       description:
         "Metric aggregation on facet buckets. Returns facet buckets enriched with aggregated indicator " +
         "values. Example: 'Which funders have the highest average citation ratio?'",
-      inputSchema: {
+      inputSchema: z.object({
         entityType: entityTypeSchema,
         facetField: z
           .string()
@@ -263,8 +263,8 @@ export function registerAnalyticsTools(
           .array(ExtendedWhereFilterSchema)
           .optional()
           .describe("Additional where-clause filters before aggregating"),
-      },
-      outputSchema: {
+      }),
+      outputSchema: z.object({
         entityType: z.string().describe("Entity type analyzed"),
         facetField: z.string().describe("Field faceted on"),
         indicators: z.array(z.string()).describe("Aggregation indicators computed"),
@@ -272,7 +272,7 @@ export function registerAnalyticsTools(
         buckets: z
           .array(z.record(z.string(), z.unknown()))
           .describe("Facet buckets with aggregated values"),
-      },
+      }),
       annotations: READ_ONLY_API_ANNOTATIONS,
     },
     withFieldAliases(
@@ -330,7 +330,7 @@ export function registerAnalyticsTools(
       description:
         "Year-by-year citation counts for a topic. Returns annual citation totals for publications " +
         "matching the query over the specified year range.",
-      inputSchema: {
+      inputSchema: z.object({
         query: z
           .string()
           .min(1)
@@ -347,22 +347,22 @@ export function registerAnalyticsTools(
           .min(1900)
           .max(2100)
           .describe("Last year of the time range (inclusive)"),
-      },
-      outputSchema: {
+      }),
+      outputSchema: z.object({
         query: z.string().describe("Search query used"),
         startYear: z.number().describe("First year of range"),
         endYear: z.number().describe("Last year of range"),
         citationsPerYear: z
           .array(z.record(z.string(), z.unknown()))
           .describe("Annual citation totals"),
-      },
+      }),
       annotations: READ_ONLY_API_ANNOTATIONS,
     },
     async (args) => {
       try {
         if (args.startYear > args.endYear) {
-          throw new McpError(
-            ErrorCode.InvalidParams,
+          throw new ProtocolError(
+            ProtocolErrorCode.InvalidParams,
             `startYear (${args.startYear}) must be ≤ endYear (${args.endYear})`,
           );
         }
@@ -393,7 +393,7 @@ export function registerAnalyticsTools(
       description:
         "Year-by-year funding totals for a topic. Returns annual grant funding amounts for grants " +
         "matching the query over the specified year range.",
-      inputSchema: {
+      inputSchema: z.object({
         query: z
           .string()
           .min(1)
@@ -416,8 +416,8 @@ export function registerAnalyticsTools(
           .describe(
             `Currency for funding amounts (default USD). Supported: ${SUPPORTED_CURRENCIES.join(", ")}.`,
           ),
-      },
-      outputSchema: {
+      }),
+      outputSchema: z.object({
         query: z.string().describe("Search query used"),
         startYear: z.number().describe("First year of range"),
         endYear: z.number().describe("Last year of range"),
@@ -425,14 +425,14 @@ export function registerAnalyticsTools(
         fundingPerYear: z
           .array(z.record(z.string(), z.unknown()))
           .describe("Annual funding totals"),
-      },
+      }),
       annotations: READ_ONLY_API_ANNOTATIONS,
     },
     async (args) => {
       try {
         if (args.startYear > args.endYear) {
-          throw new McpError(
-            ErrorCode.InvalidParams,
+          throw new ProtocolError(
+            ProtocolErrorCode.InvalidParams,
             `startYear (${args.startYear}) must be ≤ endYear (${args.endYear})`,
           );
         }

package/src/mcp/tools/fetch-search-pages.ts

@@ -3,8 +3,7 @@
  * Supports single-page, aggregate, and JSONL file export modes.
  * @module mcp/tools/fetch-search-pages
  */
-
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { McpServer } from "@modelcontextprotocol/server";
 import { z } from "zod";
 import { ValidationError } from "../../client/index.js";
 import {
@@ -95,7 +94,7 @@ export function registerFetchSearchPagesTools(
         "Default mode returns one page. Use aggregate for ID counts/sums without full rows. " +
         "Use file mode to stream JSONL or CSV locally — never for bulk mirroring of Dimensions data. " +
         `Entities: ${entityList}.`,
-      inputSchema: {
+      inputSchema: z.object({
         entityType: z
           .enum(STRUCTURED_ENTITY_TYPES)
           .describe("Dimensions source to search (same as search_* tools)"),
@@ -156,8 +155,8 @@ export function registerFetchSearchPagesTools(
           .describe(
             "Required when maxPages > 5 or planned records > 5000. Acknowledges reasonable-use policy.",
           ),
-      },
-      outputSchema: {
+      }),
+      outputSchema: z.object({
         mode: z.string(),
         entityType: z.string(),
         totalCount: z.number().optional(),
@@ -176,7 +175,7 @@ export function registerFetchSearchPagesTools(
             totalFundingUsd: z.number().optional(),
           })
           .optional(),
-      },
+      }),
       annotations: READ_ONLY_API_ANNOTATIONS,
     },
     withFieldAliases(

package/src/mcp/tools/functions.ts

@@ -3,8 +3,7 @@
  * Entity resolution helpers (affiliations, grants).
  * @module mcp/tools/functions
  */
-
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { McpServer } from "@modelcontextprotocol/server";
 import { z } from "zod";
 import type { DimensionsClient } from "../../dsl/index.js";
 import { registerTrackedTool } from "../usage-tracking.js";
@@ -24,7 +23,7 @@ export function registerFunctionTools(server: McpServer, client: DimensionsClien
         "Resolve and disambiguate organization affiliations using Dimensions entity resolution. " +
         "Takes freetext affiliation strings or structured organization data and returns matched " +
         "organizations with GRID/ROR identifiers and confidence scores.",
-      inputSchema: {
+      inputSchema: z.object({
         affiliations: z
           .array(
             z.object({
@@ -42,11 +41,11 @@ export function registerFunctionTools(server: McpServer, client: DimensionsClien
           .describe(
             "Array of affiliations to resolve. Each must have either 'affiliation' or 'name'",
           ),
-      },
-      outputSchema: {
+      }),
+      outputSchema: z.object({
         matchCount: z.number().describe("Number of resolved affiliations"),
         affiliations: z.array(z.record(z.string(), z.unknown())).describe("Resolved affiliations"),
-      },
+      }),
       annotations: READ_ONLY_API_ANNOTATIONS,
     },
     async (args) => {
@@ -71,7 +70,7 @@ export function registerFunctionTools(server: McpServer, client: DimensionsClien
         "Resolve grant numbers to Dimensions grant records. " +
         "Takes a grant number and optional funder information to find matching grants " +
         "with full metadata including funding amounts, dates, and funder details.",
-      inputSchema: {
+      inputSchema: z.object({
         grant_number: z.string().min(1).describe("Grant number to look up (e.g., 'R01HL117329')"),
         fundref: z
           .string()
@@ -81,11 +80,11 @@ export function registerFunctionTools(server: McpServer, client: DimensionsClien
           .string()
           .optional()
           .describe("Funder name as alternative to FundRef ID (e.g., 'NIH')"),
-      },
-      outputSchema: {
+      }),
+      outputSchema: z.object({
         matchCount: z.number().describe("Number of matched grants"),
         grants: z.array(z.record(z.string(), z.unknown())).describe("Matched grant records"),
-      },
+      }),
       annotations: READ_ONLY_API_ANNOTATIONS,
     },
     async (args) => {

package/src/mcp/tools/lookup.ts

@@ -3,8 +3,7 @@
  * Provides direct lookup by identifiers (DOI, PMID, Dimensions ID).
  * @module mcp/tools/lookup
  */
-
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { McpServer } from "@modelcontextprotocol/server";
 import { z } from "zod";
 import { type DimensionsClient, EntitySchema, type EntityType } from "../../dsl/index.js";
 import { withFieldAliases } from "../middleware/field-aliases.js";
@@ -29,18 +28,18 @@ export function registerLookupTools(server: McpServer, client: DimensionsClient)
     {
       description:
         "Retrieve a publication by its Digital Object Identifier (DOI). Returns full publication details including abstract, citations, and authors.",
-      inputSchema: {
+      inputSchema: z.object({
         doi: z.string().describe("The DOI to look up (e.g., '10.1038/nature12373')"),
         fields: z
           .array(z.string())
           .optional()
           .describe("Fields to return (e.g., ['id', 'title', 'abstract', 'times_cited'])"),
-      },
-      outputSchema: {
+      }),
+      outputSchema: z.object({
         found: z.boolean().describe("Whether the entity was found"),
         publication: z.record(z.string(), z.unknown()).optional().describe("The found entity"),
         message: z.string().optional().describe("Message when not found"),
-      },
+      }),
       annotations: READ_ONLY_API_ANNOTATIONS,
     },
     withFieldAliases(
@@ -83,18 +82,18 @@ export function registerLookupTools(server: McpServer, client: DimensionsClient)
     {
       description:
         "Retrieve a publication by its PubMed ID (PMID). Returns full publication details from Dimensions.",
-      inputSchema: {
+      inputSchema: z.object({
         pmid: z.string().describe("The PubMed ID to look up (e.g., '23846567')"),
         fields: z
           .array(z.string())
           .optional()
           .describe("Fields to return (e.g., ['id', 'title', 'abstract', 'times_cited'])"),
-      },
-      outputSchema: {
+      }),
+      outputSchema: z.object({
         found: z.boolean().describe("Whether the entity was found"),
         publication: z.record(z.string(), z.unknown()).optional().describe("The found entity"),
         message: z.string().optional().describe("Message when not found"),
-      },
+      }),
       annotations: READ_ONLY_API_ANNOTATIONS,
     },
     withFieldAliases(
@@ -137,17 +136,17 @@ export function registerLookupTools(server: McpServer, client: DimensionsClient)
     {
       description:
         "Retrieve any entity by its Dimensions ID. Supports publications, grants, patents, clinical trials, datasets, policy documents, researchers, organizations, reports, source titles, funder groups, and research org groups.",
-      inputSchema: {
+      inputSchema: z.object({
         entityType: EntitySchema.describe("The type of entity to look up"),
         id: z.string().describe("The Dimensions ID to look up"),
         fields: z.array(z.string()).optional().describe("Fields to return"),
-      },
-      outputSchema: {
+      }),
+      outputSchema: z.object({
         found: z.boolean().describe("Whether the entity was found"),
         entity: z.record(z.string(), z.unknown()).optional().describe("The found entity"),
         entityType: z.string().optional().describe("The type of the found entity"),
         message: z.string().optional().describe("Message when not found"),
-      },
+      }),
       annotations: READ_ONLY_API_ANNOTATIONS,
     },
     withFieldAliases(

package/src/mcp/tools/query.ts

@@ -3,8 +3,7 @@
  * Provides raw DSL query execution for power users.
  * @module mcp/tools/query
  */
-
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { McpServer } from "@modelcontextprotocol/server";
 import { z } from "zod";
 import {
   buildExecuteDslPolicyHints,
@@ -47,7 +46,7 @@ Examples:
 - return funders aggregate funding_usd
 
 Structured entity types: ${sources}`,
-      inputSchema: {
+      inputSchema: z.object({
         dsl: z.string().describe("Complete DSL query string to execute"),
         confirmLargeFetch: z
           .boolean()
@@ -56,8 +55,8 @@ Structured entity types: ${sources}`,
           .describe(
             "Required for deep pagination in DSL (skip≥5000). See dimensions://schema/policy.",
           ),
-      },
-      outputSchema: {
+      }),
+      outputSchema: z.object({
         result: z.record(z.string(), z.unknown()).describe("Raw DSL query response"),
         policyNotice: z.string().optional().describe("Reasonable-use reminder"),
         largeResultWarning: z
@@ -68,7 +67,7 @@ Structured entity types: ${sources}`,
           .string()
           .optional()
           .describe("Pagination guidance when results are truncated"),
-      },
+      }),
       annotations: {
         readOnlyHint: true,
         destructiveHint: false,

package/src/mcp/tools/schema.ts

@@ -2,8 +2,7 @@
  * Schema introspection and validation tools for the MCP server.
  * @module mcp/tools/schema
  */
-
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { McpServer } from "@modelcontextprotocol/server";
 import { z } from "zod";
 import type { DimensionsClient } from "../../dsl/index.js";
 import { buildReverseAliasMap } from "../middleware/field-aliases.js";
@@ -32,7 +31,7 @@ export function registerSchemaTools(
         "Default: compact summary with source/entity counts and resource URIs. " +
         "Use full=true or dimensions://schema for the complete describe payload. " +
         "Optionally fetch live describe for a single source or entity.",
-      inputSchema: {
+      inputSchema: z.object({
         source: z.string().optional().describe("Source name (e.g. publications)"),
         entity: z.string().optional().describe("Auxiliary entity name (e.g. journals)"),
         full: z
@@ -43,8 +42,8 @@ export function registerSchemaTools(
           .boolean()
           .optional()
           .describe("When true, fetch fresh describe for source/entity from the API"),
-      },
-      outputSchema: {
+      }),
+      outputSchema: z.object({
         summary: z
           .record(z.string(), z.unknown())
           .optional()
@@ -55,7 +54,7 @@ export function registerSchemaTools(
           .describe("Full or sliced schema when full=true or source/entity is set"),
         version: z.string().optional().describe("DSL version"),
         stats: z.record(z.string(), z.unknown()).optional().describe("Load stats and provenance"),
-      },
+      }),
       annotations: READ_ONLY_API_ANNOTATIONS,
     },
     async (args) => {
@@ -106,11 +105,11 @@ export function registerSchemaTools(
     {
       description:
         "Re-fetch describe schema from the Dimensions API, rebuild in-memory schema, and re-register MCP resources.",
-      inputSchema: {},
-      outputSchema: {
+      inputSchema: z.object({}),
+      outputSchema: z.object({
         refreshed: z.boolean(),
         stats: z.record(z.string(), z.unknown()),
-      },
+      }),
       annotations: READ_ONLY_API_ANNOTATIONS,
     },
     async () => {

package/src/mcp/tools/search.ts

@@ -3,8 +3,7 @@
  * Registers `search_{source}` tools from describe schema and shared QueryBuilder handlers.
  * @module mcp/tools/search
  */
-
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { McpServer } from "@modelcontextprotocol/server";
 import { z } from "zod";
 import type { DimensionsClient } from "../../dsl/index.js";
 import {
@@ -105,11 +104,11 @@ export function registerSearchTools(
       toolName,
       {
         description: meta.description,
-        inputSchema: {
+        inputSchema: z.object({
           ...SHARED_SEARCH_INPUT,
           ...meta.extraInputSchema,
-        },
-        outputSchema: {
+        }),
+        outputSchema: z.object({
           totalCount: z.number().describe("Total matching records"),
           returnedCount: z.number().describe("Records returned in this response"),
           truncated: z
@@ -119,7 +118,7 @@ export function registerSearchTools(
           truncationWarning: z.string().optional().describe("Warning message when truncated"),
           ...PAGINATION_OUTPUT_SCHEMA,
           [resultKey]: z.array(z.record(z.string(), z.unknown())).describe("Result records"),
-        },
+        }),
         annotations: READ_ONLY_API_ANNOTATIONS,
       },
       withFieldAliases(

package/src/mcp/tools/similar-documents.ts

@@ -3,8 +3,7 @@
  * Uses concept extraction + weighted concepts search (not vector embeddings).
  * @module mcp/tools/similar-documents
  */
-
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { McpServer } from "@modelcontextprotocol/server";
 import { z } from "zod";
 import type { DimensionsClient } from "../../dsl/index.js";
 import {
@@ -106,7 +105,7 @@ export function registerSimilarDocumentsTool(server: McpServer, client: Dimensio
         "Uses Dimensions concept extraction and weighted concepts search (not vector embeddings). " +
         "Prefer this over execute_dsl for similarity. For a known record: get_by_id / get_by_doi first, " +
         "then pass its abstract/description as text. Supported entityType: publications, grants only.",
-      inputSchema: {
+      inputSchema: z.object({
         entityType: z
           .enum(SIMILAR_DOCUMENTS_ENTITY_TYPES)
           .describe("Entity type to search (publications or grants)"),
@@ -158,8 +157,8 @@ export function registerSimilarDocumentsTool(server: McpServer, client: Dimensio
           .describe(
             "Required when skip≥5000, page≥5, or limit=1000 with skip>0. See dimensions://schema/policy.",
           ),
-      },
-      outputSchema: {
+      }),
+      outputSchema: z.object({
         entityType: z.enum(SIMILAR_DOCUMENTS_ENTITY_TYPES).describe("Entity type searched"),
         totalCount: z.number().describe("Total matching records"),
         returnedCount: z.number().describe("Records returned in this response"),
@@ -174,7 +173,7 @@ export function registerSimilarDocumentsTool(server: McpServer, client: Dimensio
           .array(z.record(z.string(), z.unknown()))
           .optional()
           .describe("Matching grants (when entityType is grants)"),
-      },
+      }),
       annotations: READ_ONLY_API_ANNOTATIONS,
     },
     withFieldAliases(

package/src/mcp/usage-tracking.ts

@@ -4,7 +4,7 @@
  */
 
 import { randomUUID } from "node:crypto";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { McpServer } from "@modelcontextprotocol/server";
 import pkg from "../../package.json" with { type: "json" };
 import {
   type McpDeploymentMode,

package/src/mcp/utils.ts

@@ -2,9 +2,7 @@
  * Utility functions for MCP tools.
  * @module mcp/utils
  */
-
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { ToolAnnotations } from "@modelcontextprotocol/sdk/types.js";
+import type { McpServer, ToolAnnotations } from "@modelcontextprotocol/server";
 import {
   buildPaginationMetadata,
   DimensionsError,

package/test/examples/dsl-examples.test.ts

@@ -20,6 +20,14 @@ describe("dsl-examples", () => {
     expect(getDslExamplesForSource("unknown")).toBeUndefined();
   });
 
+  it("includes similar_documents examples for publications and grants", () => {
+    const pubs = getDslExamplesForSource("publications") ?? [];
+    const grants = getDslExamplesForSource("grants") ?? [];
+    expect(pubs.some((q) => q.includes("similar_documents("))).toBe(true);
+    expect(grants.some((q) => q.includes("similar_documents("))).toBe(true);
+    expect(DSL_GENERAL_EXAMPLES.some((q) => q.includes("similar_documents("))).toBe(true);
+  });
+
   it("uses sort by (not bare sort) and places sort before limit", () => {
     for (const dsl of ALL_EXAMPLES) {
       expect(dsl).not.toMatch(/\blimit \d+ sort\b/);

package/test/examples/usage-scenarios.test.ts

@@ -38,9 +38,9 @@ describe("usage-scenarios", () => {
     registerSimilarDocumentsTool(server as never, client as never);
   });
 
-  it("documents twelve natural-language workflows", () => {
-    expect(USAGE_SCENARIOS).toHaveLength(12);
-    expect(new Set(USAGE_SCENARIOS.map((s) => s.id)).size).toBe(12);
+  it("documents thirteen natural-language workflows", () => {
+    expect(USAGE_SCENARIOS).toHaveLength(13);
+    expect(new Set(USAGE_SCENARIOS.map((s) => s.id)).size).toBe(13);
   });
 
   for (const scenario of USAGE_SCENARIOS) {

package/test/integration/harness.ts

@@ -5,9 +5,7 @@
  * via in-memory transport, and executes eval suites against it.
  * @module test/integration/harness
  */
-
-import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js";
+import { Client, InMemoryTransport } from "@modelcontextprotocol/client";
 import { createMcpServerAsync, type McpServerConfig } from "../../src/mcp/server.js";
 import { missingEnvVars } from "./env.js";
 import type {

package/test/integration/hosted-client.ts

@@ -2,9 +2,7 @@
  * MCP client helpers for hosted Streamable HTTP transport.
  * @module test/integration/hosted-client
  */
-
-import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import { Client, StreamableHTTPClientTransport } from "@modelcontextprotocol/client";
 import { hostedMcpEndpoint } from "./env.js";
 
 export interface HostedMcpSession {

package/test/integration/hosted.e2e.test.ts

@@ -31,7 +31,7 @@ const MOCK_HOSTED: HostedEnvConfig = {
 
 const TEST_API_KEY = "test-hosted-api-key";
 
-describe("Hosted MCP e2e (mocked backends)", () => {
+describe("Hosted MCP e2e (mocked backends)", { timeout: 30_000 }, () => {
   let restoreFetch: (() => void) | undefined;
   let server: HostedHttpServerHandle | undefined;
   let baseUrl: string;

package/test/integration/verify-usage-scenarios.ts

@@ -3,9 +3,7 @@
  * Live verification of docs/USAGE.md natural-language scenarios.
  * Run: node --import tsx apps/mcp/test/integration/verify-usage-scenarios.ts
  */
-
-import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js";
+import { Client, InMemoryTransport } from "@modelcontextprotocol/client";
 import { USAGE_SCENARIOS } from "../../src/mcp/examples/usage-scenarios.js";
 import { buildServerInstructions, createMcpServerAsync } from "../../src/mcp/server.js";