@evantahler/mcpx 0.15.4 → 0.15.8

package/src/search/index.ts

@@ -1,6 +1,7 @@
 import type { SearchIndex } from "../config/schemas.ts";
 import { keywordSearch } from "./keyword.ts";
 import { semanticSearch } from "./semantic.ts";
+import { DEFAULTS } from "../constants.ts";
 
 export interface SearchResult {
   server: string;
@@ -22,7 +23,7 @@ export async function search(
   index: SearchIndex,
   options: SearchOptions = {},
 ): Promise<SearchResult[]> {
-  const topK = options.topK ?? 10;
+  const topK = options.topK ?? DEFAULTS.SEARCH_TOP_K;
   const results = new Map<string, SearchResult>();
 
   const runKeyword = !options.semanticOnly;

package/src/search/keyword.ts

@@ -1,11 +1,8 @@
 import picomatch from "picomatch";
 import type { IndexedTool } from "../config/schemas.ts";
+import type { BaseMatch } from "./types.ts";
 
-export interface KeywordMatch {
-  server: string;
-  tool: string;
-  description: string;
-  score: number;
+export interface KeywordMatch extends BaseMatch {
   matchedField: string;
 }
 

package/src/search/semantic.ts

@@ -1,11 +1,8 @@
 import type { IndexedTool } from "../config/schemas.ts";
+import { DEFAULTS } from "../constants.ts";
+import type { BaseMatch } from "./types.ts";
 
-export interface SemanticMatch {
-  server: string;
-  tool: string;
-  description: string;
-  score: number;
-}
+export type SemanticMatch = BaseMatch;
 
 // Lazy-loaded pipeline singleton
 let pipelineInstance: ((text: string) => Promise<Float32Array>) | null = null;
@@ -56,7 +53,7 @@ export function cosineSimilarity(a: number[], b: number[]): number {
 export async function semanticSearch(
   query: string,
   tools: IndexedTool[],
-  topK = 10,
+  topK = DEFAULTS.SEARCH_TOP_K,
 ): Promise<SemanticMatch[]> {
   // Only search tools that have embeddings
   const withEmbeddings = tools.filter((t) => t.embedding.length > 0);

package/src/search/types.ts

@@ -0,0 +1,7 @@
+/** Base interface for tool search matches */
+export interface BaseMatch {
+  server: string;
+  tool: string;
+  description: string;
+  score: number;
+}

package/src/validation/schema.ts

@@ -16,18 +16,12 @@ export interface ValidationResult {
   errors: ValidationError[];
 }
 
-/** Validate tool arguments against the tool's inputSchema */
-export function validateToolInput(
-  serverName: string,
-  tool: Tool,
+/** Compile (or retrieve from cache), validate, and return result */
+function validateWithSchema(
+  cacheKey: string,
+  schema: Record<string, unknown>,
   input: Record<string, unknown>,
 ): ValidationResult {
-  const schema = tool.inputSchema;
-  if (!schema || Object.keys(schema).length === 0) {
-    return { valid: true, errors: [] };
-  }
-
-  const cacheKey = `${serverName}/${tool.name}`;
   let validate = validatorCache.get(cacheKey);
 
   if (!validate) {
@@ -35,7 +29,6 @@ export function validateToolInput(
       validate = ajv.compile(schema);
       validatorCache.set(cacheKey, validate);
     } catch {
-      // If schema can't be compiled, skip validation
       return { valid: true, errors: [] };
     }
   }
@@ -49,30 +42,25 @@ export function validateToolInput(
   return { valid: false, errors };
 }
 
-/** Validate user-collected form data against an elicitation requestedSchema */
-export function validateElicitationResponse(
-  schema: Record<string, unknown>,
+/** Validate tool arguments against the tool's inputSchema */
+export function validateToolInput(
+  serverName: string,
+  tool: Tool,
   input: Record<string, unknown>,
 ): ValidationResult {
-  const cacheKey = `__elicitation__${JSON.stringify(schema)}`;
-  let validate = validatorCache.get(cacheKey);
-
-  if (!validate) {
-    try {
-      validate = ajv.compile(schema);
-      validatorCache.set(cacheKey, validate);
-    } catch {
-      return { valid: true, errors: [] };
-    }
-  }
-
-  const valid = validate(input);
-  if (valid) {
+  const schema = tool.inputSchema;
+  if (!schema || Object.keys(schema).length === 0) {
     return { valid: true, errors: [] };
   }
+  return validateWithSchema(`${serverName}/${tool.name}`, schema, input);
+}
 
-  const errors = (validate.errors ?? []).map(formatAjvError);
-  return { valid: false, errors };
+/** Validate user-collected form data against an elicitation requestedSchema */
+export function validateElicitationResponse(
+  schema: Record<string, unknown>,
+  input: Record<string, unknown>,
+): ValidationResult {
+  return validateWithSchema(`__elicitation__${JSON.stringify(schema)}`, schema, input);
 }
 
 function formatAjvError(err: ErrorObject): ValidationError {