@reftrixmcp/mcp-server 0.1.7 → 0.2.0

package/src/tools/responsive/search.tool.ts

@@ -15,7 +15,9 @@
  */
 
 import { ZodError } from "zod";
+import { createDIFactory } from "../../utils/di-factory";
 import { logger, isDevelopment } from "../../utils/logger";
+import { sanitizeErrorMessage } from "../../utils/sanitize-error";
 import {
   responsiveSearchInputSchema,
   RESPONSIVE_MCP_ERROR_CODES,
@@ -28,6 +30,11 @@ import type {
 } from "../../services/responsive-search.service";
 import { applyPreferenceReranking } from "../../services/preference-rerank.helper";
 import type { IPrismaClient } from "../../services/preference-profile.service";
+import {
+  generateCacheKey,
+  getCachedResult,
+  setCachedResult,
+} from "../../services/search-cache.service";
 
 // =====================================================
 // 型定義
@@ -73,39 +80,16 @@ export type ResponsiveSearchOutput =
 // サービスファクトリー（DI）
 // =====================================================
 
-let responsiveSearchServiceFactory: (() => IResponsiveSearchService) | null = null;
-
-export function setResponsiveSearchServiceFactory(factory: () => IResponsiveSearchService): void {
-  responsiveSearchServiceFactory = factory;
-}
-
-export function resetResponsiveSearchServiceFactory(): void {
-  responsiveSearchServiceFactory = null;
-}
+const responsiveSearchServiceDI =
+  createDIFactory<IResponsiveSearchService>("ResponsiveSearchService");
+export const setResponsiveSearchServiceFactory = responsiveSearchServiceDI.set;
+export const resetResponsiveSearchServiceFactory = responsiveSearchServiceDI.reset;
 
 export { IResponsiveSearchService };
 
-/**
- * PrismaClientファクトリー（嗜好リランキング用DI）
- * PrismaClient factory (DI for preference reranking)
- */
-let prismaClientFactory: (() => IPrismaClient) | null = null;
-
-/**
- * PrismaClientファクトリーを設定（嗜好リランキング用）
- * Set PrismaClient factory (for preference reranking)
- */
-export function setResponsiveSearchPrismaClientFactory(factory: () => IPrismaClient): void {
-  prismaClientFactory = factory;
-}
-
-/**
- * PrismaClientファクトリーをリセット（テスト用）
- * Reset PrismaClient factory (for testing)
- */
-export function resetResponsiveSearchPrismaClientFactory(): void {
-  prismaClientFactory = null;
-}
+const prismaClientDI = createDIFactory<IPrismaClient>("ResponsiveSearchPrismaClient");
+export const setResponsiveSearchPrismaClientFactory = prismaClientDI.set;
+export const resetResponsiveSearchPrismaClientFactory = prismaClientDI.reset;
 
 // =====================================================
 // エラーコード判定
@@ -154,11 +138,9 @@ export async function responsiveSearchHandler(input: unknown): Promise<Responsiv
     if (error instanceof ZodError) {
       const errorMessage = error.errors.map((e) => `${e.path.join(".")}: ${e.message}`).join(", ");
 
-      if (isDevelopment()) {
-        logger.error("[MCP Tool] responsive.search validation error", {
-          errors: error.errors,
-        });
-      }
+      logger.warn("[MCP Tool] responsive.search validation error", {
+        error: (error as Error).message,
+      });
 
       return {
         success: false,
@@ -172,7 +154,7 @@ export async function responsiveSearchHandler(input: unknown): Promise<Responsiv
   }
 
   // サービスファクトリーチェック
-  if (!responsiveSearchServiceFactory) {
+  if (!responsiveSearchServiceDI.get()) {
     if (isDevelopment()) {
       logger.error("[MCP Tool] responsive.search service factory not set");
     }
@@ -186,7 +168,17 @@ export async function responsiveSearchHandler(input: unknown): Promise<Responsiv
     };
   }
 
-  const service = responsiveSearchServiceFactory();
+  const service = responsiveSearchServiceDI.get()!();
+
+  // キャッシュチェック / Cache check
+  const cacheKey = generateCacheKey(
+    "responsive.search",
+    validated as unknown as Record<string, unknown>
+  );
+  const cached = getCachedResult<ResponsiveSearchOutput>(cacheKey);
+  if (cached) {
+    return cached;
+  }
 
   try {
     // E5 モデル用 query: プレフィックスを付与
@@ -243,6 +235,18 @@ export async function responsiveSearchHandler(input: unknown): Promise<Responsiv
       if (validated.filters.webPageId) {
         filters.webPageId = validated.filters.webPageId;
       }
+      if (validated.filters.webPageUrl) {
+        filters.webPageUrl = validated.filters.webPageUrl;
+      }
+      if (validated.filters.industry) {
+        filters.industry = validated.filters.industry;
+      }
+      if (validated.filters.audience) {
+        filters.audience = validated.filters.audience;
+      }
+      if (validated.filters.tags && validated.filters.tags.length > 0) {
+        filters.tags = validated.filters.tags;
+      }
       if (Object.keys(filters).length > 0) {
         searchOptions.filters = filters;
       }
@@ -285,12 +289,12 @@ export async function responsiveSearchHandler(input: unknown): Promise<Responsiv
     mappedResults = await applyPreferenceReranking(
       mappedResults,
       validated.profile_id,
-      prismaClientFactory,
+      prismaClientDI.get(),
       "responsive",
       "responsive.search"
     );
 
-    return {
+    const result: ResponsiveSearchOutput = {
       success: true,
       data: {
         results: mappedResults,
@@ -299,22 +303,23 @@ export async function responsiveSearchHandler(input: unknown): Promise<Responsiv
         searchTimeMs,
       },
     };
+
+    setCachedResult(cacheKey, result);
+    return result;
   } catch (error) {
     const errorInstance = error instanceof Error ? error : new Error(String(error));
     const errorCode = mapErrorToCode(errorInstance);
 
-    if (isDevelopment()) {
-      logger.error("[MCP Tool] responsive.search error", {
-        code: errorCode,
-        error: errorInstance.message,
-      });
-    }
+    logger.error("[MCP Tool] responsive.search error", {
+      code: errorCode,
+      error: errorInstance.message,
+    });
 
     return {
       success: false,
       error: {
         code: errorCode,
-        message: errorInstance.message,
+        message: sanitizeErrorMessage(error),
       },
     };
   }
@@ -402,6 +407,28 @@ export const responsiveSearchToolDefinition = {
             format: "uuid",
             description: "WebページIDでフィルター",
           },
+          webPageUrl: {
+            type: "string",
+            format: "uri",
+            description: "WebページURLでフィルター / Filter by web page URL",
+          },
+          industry: {
+            type: "string",
+            description: "業種フィルター（例: tech, finance, healthcare） / Industry filter",
+            maxLength: 100,
+          },
+          audience: {
+            type: "string",
+            description:
+              "ターゲットオーディエンス（例: b2b, b2c, enterprise） / Target audience filter",
+            maxLength: 100,
+          },
+          tags: {
+            type: "array",
+            items: { type: "string", maxLength: 50 },
+            maxItems: 10,
+            description: "タグフィルター / Tag filter",
+          },
         },
       },
       // Preference reranking