@reftrixmcp/mcp-server 0.1.8 → 0.2.0

package/src/tools/narrative/analyze.tool.ts

@@ -18,7 +18,9 @@
  */
 
 import { ZodError } from "zod";
+import { createDIFactory } from "../../utils/di-factory";
 import { logger, isDevelopment } from "../../utils/logger";
+import { sanitizeErrorMessage } from "../../utils/sanitize-error";
 import {
   narrativeAnalyzeInputSchema,
   NARRATIVE_MCP_ERROR_CODES,
@@ -48,30 +50,17 @@ export type INarrativeAnalyzeServiceFactory = () => INarrativeAnalysisService;
 // Service Factory (DI)
 // ============================================================================
 
-/** デフォルトのサービスファクトリー */
-let narrativeAnalyzeServiceFactory: INarrativeAnalyzeServiceFactory | null = null;
-
-/**
- * サービスファクトリーを設定
- * @param factory - サービスファクトリー
- */
-export function setNarrativeAnalyzeServiceFactory(factory: INarrativeAnalyzeServiceFactory): void {
-  narrativeAnalyzeServiceFactory = factory;
-}
-
-/**
- * サービスファクトリーをリセット（テスト用）
- */
-export function resetNarrativeAnalyzeServiceFactory(): void {
-  narrativeAnalyzeServiceFactory = null;
-}
+const narrativeAnalyzeServiceDI =
+  createDIFactory<INarrativeAnalysisService>("NarrativeAnalyzeService");
+export const setNarrativeAnalyzeServiceFactory = narrativeAnalyzeServiceDI.set;
+export const resetNarrativeAnalyzeServiceFactory = narrativeAnalyzeServiceDI.reset;
 
 /**
  * NarrativeAnalysisServiceを取得
  */
 async function getNarrativeAnalysisService(): Promise<INarrativeAnalysisService> {
-  if (narrativeAnalyzeServiceFactory !== null) {
-    return narrativeAnalyzeServiceFactory();
+  if (narrativeAnalyzeServiceDI.get() !== null) {
+    return narrativeAnalyzeServiceDI.get()!();
   }
 
   // デフォルト: 実サービスをインポート
@@ -318,9 +307,7 @@ export async function narrativeAnalyzeHandler(input: unknown): Promise<Narrative
         message: e.message,
       }));
 
-      if (isDevelopment()) {
-        logger.warn("[narrative.analyze] Validation error", { details });
-      }
+      logger.warn("[narrative.analyze] Validation error", { details });
 
       return {
         success: false,
@@ -336,19 +323,16 @@ export async function narrativeAnalyzeHandler(input: unknown): Promise<Narrative
     if (error instanceof Error) {
       const errorCode = mapErrorToCode(error);
 
-      if (isDevelopment()) {
-        logger.error("[narrative.analyze] Error", {
-          code: errorCode,
-          message: error.message,
-          stack: error.stack,
-        });
-      }
+      logger.warn("[narrative.analyze] Error", {
+        code: errorCode,
+        message: sanitizeErrorMessage(error),
+      });
 
       return {
         success: false,
         error: {
           code: errorCode,
-          message: error.message,
+          message: sanitizeErrorMessage(error),
         },
       };
     }

package/src/tools/narrative/schemas.ts

@@ -16,6 +16,7 @@
  * - LayoutStructure: レイアウト構成（gridSystem, visualHierarchy, spacingRhythm等）
  */
 import { z } from "zod";
+import { commonSearchFiltersSchema } from "../../schemas/common-search-filters";
 
 // ============================================================================
 // Enum Schemas
@@ -581,17 +582,19 @@ export type NarrativeAnalyzeOutput = z.infer<typeof narrativeAnalyzeOutputSchema
 /**
  * narrative.search フィルタースキーマ
  */
-export const narrativeSearchFiltersSchema = z.object({
-  /** ムードカテゴリでフィルター */
-  moodCategory: moodCategorySchema.optional(),
-  /** 最小信頼度 */
-  minConfidence: z
-    .number()
-    .min(0, { message: "minConfidenceは0以上1以下である必要があります" })
-    .max(1, { message: "minConfidenceは0以上1以下である必要があります" })
-    .optional()
-    .describe("最小信頼度フィルター（0-1）"),
-});
+export const narrativeSearchFiltersSchema = z
+  .object({
+    /** ムードカテゴリでフィルター */
+    moodCategory: moodCategorySchema.optional(),
+    /** 最小信頼度 */
+    minConfidence: z
+      .number()
+      .min(0, { message: "minConfidenceは0以上1以下である必要があります" })
+      .max(1, { message: "minConfidenceは0以上1以下である必要があります" })
+      .optional()
+      .describe("最小信頼度フィルター（0-1）"),
+  })
+  .merge(commonSearchFiltersSchema);
 export type NarrativeSearchFilters = z.infer<typeof narrativeSearchFiltersSchema>;
 
 /**

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

@@ -12,13 +12,20 @@
  * 2. pgvector HNSW近傍探索（Vector検索）
  * 3. Full-text検索（hybridモード時）
  * 4. RRF（Reciprocal Rank Fusion）統合
- * 5. フィルター適用（moodCategory, minConfidence）
+ * 5. フィルター適用（moodCategory, minConfidence, industry, audience, tags, webPageId, webPageUrl）
  *
  * @module tools/narrative/search.tool
  */
 
 import { ZodError } from "zod";
+import { createDIFactory } from "../../utils/di-factory";
 import { logger, isDevelopment } from "../../utils/logger";
+import { sanitizeErrorMessage } from "../../utils/sanitize-error";
+import {
+  generateCacheKey,
+  getCachedResult,
+  setCachedResult,
+} from "../../services/search-cache.service";
 import {
   narrativeSearchInputSchema,
   NARRATIVE_MCP_ERROR_CODES,
@@ -51,30 +58,17 @@ export type INarrativeSearchServiceFactory = () => INarrativeAnalysisService;
 // Service Factory (DI)
 // ============================================================================
 
-/** デフォルトのサービスファクトリー */
-let narrativeSearchServiceFactory: INarrativeSearchServiceFactory | null = null;
-
-/**
- * サービスファクトリーを設定
- * @param factory - サービスファクトリー
- */
-export function setNarrativeSearchServiceFactory(factory: INarrativeSearchServiceFactory): void {
-  narrativeSearchServiceFactory = factory;
-}
-
-/**
- * サービスファクトリーをリセット（テスト用）
- */
-export function resetNarrativeSearchServiceFactory(): void {
-  narrativeSearchServiceFactory = null;
-}
+const narrativeSearchServiceDI =
+  createDIFactory<INarrativeAnalysisService>("NarrativeSearchService");
+export const setNarrativeSearchServiceFactory = narrativeSearchServiceDI.set;
+export const resetNarrativeSearchServiceFactory = narrativeSearchServiceDI.reset;
 
 /**
  * NarrativeAnalysisServiceを取得
  */
 async function getNarrativeAnalysisService(): Promise<INarrativeAnalysisService> {
-  if (narrativeSearchServiceFactory !== null) {
-    return narrativeSearchServiceFactory();
+  if (narrativeSearchServiceDI.get() !== null) {
+    return narrativeSearchServiceDI.get()!();
   }
 
   // デフォルト: 実サービスをインポート
@@ -99,44 +93,13 @@ interface IEmbeddingService {
   generateEmbedding(text: string): Promise<number[]>;
 }
 
-/** デフォルトのEmbeddingサービスファクトリー */
-let embeddingServiceFactory: (() => IEmbeddingService) | null = null;
+const embeddingServiceDI = createDIFactory<IEmbeddingService>("EmbeddingService");
+export const setEmbeddingServiceFactory = embeddingServiceDI.set;
+export const resetEmbeddingServiceFactory = embeddingServiceDI.reset;
 
-/**
- * Embeddingサービスファクトリーを設定（テスト用）
- */
-export function setEmbeddingServiceFactory(factory: () => IEmbeddingService): void {
-  embeddingServiceFactory = factory;
-}
-
-/**
- * Embeddingサービスファクトリーをリセット（テスト用）
- */
-export function resetEmbeddingServiceFactory(): void {
-  embeddingServiceFactory = null;
-}
-
-/**
- * PrismaClientファクトリー（嗜好リランキング用DI）
- * PrismaClient factory (DI for preference reranking)
- */
-let prismaClientFactory: (() => IPrismaClient) | null = null;
-
-/**
- * PrismaClientファクトリーを設定（嗜好リランキング用）
- * Set PrismaClient factory (for preference reranking)
- */
-export function setNarrativeSearchPrismaClientFactory(factory: () => IPrismaClient): void {
-  prismaClientFactory = factory;
-}
-
-/**
- * PrismaClientファクトリーをリセット（テスト用）
- * Reset PrismaClient factory (for testing)
- */
-export function resetNarrativeSearchPrismaClientFactory(): void {
-  prismaClientFactory = null;
-}
+const prismaClientDI = createDIFactory<IPrismaClient>("NarrativeSearchPrismaClient");
+export const setNarrativeSearchPrismaClientFactory = prismaClientDI.set;
+export const resetNarrativeSearchPrismaClientFactory = prismaClientDI.reset;
 
 /**
  * Embeddingサービスを取得
@@ -144,8 +107,8 @@ export function resetNarrativeSearchPrismaClientFactory(): void {
  * @internal
  */
 export async function getEmbeddingService(): Promise<IEmbeddingService> {
-  if (embeddingServiceFactory !== null) {
-    return embeddingServiceFactory();
+  if (embeddingServiceDI.get() !== null) {
+    return embeddingServiceDI.get()!();
   }
 
   // デフォルト: 実サービスをインポート
@@ -173,18 +136,18 @@ function convertSearchResultsToMcpResponse(
   const resultItems: NarrativeSearchResultItem[] = results.map((r) => ({
     id: r.id,
     webPageId: r.webPageId,
-    sourceUrl: "", // TODO: WebPageテーブルから取得
+    sourceUrl: r.sourceUrl || "https://unknown",
     similarity: r.score,
 
     worldView: {
-      moodCategory: r.moodCategory,
+      moodCategory: r.moodCategory as NarrativeSearchResultItem["worldView"]["moodCategory"],
       moodDescription: r.moodDescription,
-      overallTone: "", // TODO: サービスから詳細取得
+      overallTone: r.overallTone,
     },
 
     layoutStructure: {
-      gridType: "mixed", // TODO: サービスから詳細取得
-      columns: 12, // TODO: サービスから詳細取得
+      gridType: r.gridType as NarrativeSearchResultItem["layoutStructure"]["gridType"],
+      columns: r.columns,
     },
 
     confidence: r.confidence,
@@ -243,6 +206,16 @@ export async function narrativeSearchHandler(input: unknown): Promise<NarrativeS
     // 1. 入力バリデーション
     const validatedInput = narrativeSearchInputSchema.parse(input);
 
+    // Search result cache check / 検索キャッシュチェック
+    const cacheKey = generateCacheKey(
+      "narrative.search",
+      validatedInput as unknown as Record<string, unknown>
+    );
+    const cached = getCachedResult<NarrativeSearchOutput>(cacheKey);
+    if (cached) {
+      return cached;
+    }
+
     if (isDevelopment()) {
       logger.info("[narrative.search] Input validated", {
         hasQuery: !!validatedInput.query,
@@ -293,6 +266,22 @@ export async function narrativeSearchHandler(input: unknown): Promise<NarrativeS
       if (minConfidence !== undefined) {
         filtersObj.minConfidence = minConfidence;
       }
+      // 共通フィルター転送 / Common filters passthrough
+      if (validatedInput.filters.webPageId) {
+        filtersObj.webPageId = validatedInput.filters.webPageId;
+      }
+      if (validatedInput.filters.webPageUrl) {
+        filtersObj.webPageUrl = validatedInput.filters.webPageUrl;
+      }
+      if (validatedInput.filters.tags && validatedInput.filters.tags.length > 0) {
+        filtersObj.tags = validatedInput.filters.tags;
+      }
+      if (validatedInput.filters.industry) {
+        filtersObj.industry = validatedInput.filters.industry;
+      }
+      if (validatedInput.filters.audience) {
+        filtersObj.audience = validatedInput.filters.audience;
+      }
 
       // フィールドが存在する場合のみ設定
       if (Object.keys(filtersObj).length > 0) {
@@ -323,7 +312,7 @@ export async function narrativeSearchHandler(input: unknown): Promise<NarrativeS
       await applyPreferenceReranking(
         narrativeItems,
         validatedInput.profile_id,
-        prismaClientFactory,
+        prismaClientDI.get(),
         "narrative",
         "narrative.search"
       )
@@ -348,10 +337,13 @@ export async function narrativeSearchHandler(input: unknown): Promise<NarrativeS
       });
     }
 
-    return {
+    const result: NarrativeSearchOutput = {
       success: true,
       data,
     };
+    // Cache successful results / 成功結果をキャッシュ
+    setCachedResult(cacheKey, result);
+    return result;
   } catch (error) {
     // エラーハンドリング
     if (error instanceof ZodError) {
@@ -360,9 +352,7 @@ export async function narrativeSearchHandler(input: unknown): Promise<NarrativeS
         message: e.message,
       }));
 
-      if (isDevelopment()) {
-        logger.warn("[narrative.search] Validation error", { details });
-      }
+      logger.warn("[narrative.search] Validation error", { details });
 
       return {
         success: false,
@@ -377,19 +367,16 @@ export async function narrativeSearchHandler(input: unknown): Promise<NarrativeS
     if (error instanceof Error) {
       const errorCode = mapErrorToCode(error);
 
-      if (isDevelopment()) {
-        logger.error("[narrative.search] Error", {
-          code: errorCode,
-          message: error.message,
-          stack: error.stack,
-        });
-      }
+      logger.warn("[narrative.search] Error", {
+        code: errorCode,
+        message: sanitizeErrorMessage(error),
+      });
 
       return {
         success: false,
         error: {
           code: errorCode,
-          message: error.message,
+          message: sanitizeErrorMessage(error),
         },
       };
     }
@@ -483,6 +470,33 @@ export const narrativeSearchToolDefinition = {
             maximum: 1,
             description: "最小信頼度フィルター（0-1）",
           },
+          webPageId: {
+            type: "string",
+            format: "uuid",
+            description: "WebページIDでフィルター / Filter by web page 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",
+          },
         },
       },
       options: {

package/src/tools/page/analyze.tool.ts

@@ -9,7 +9,9 @@
  */
 
 import { v7 as uuidv7 } from "uuid";
+import { createDIFactory } from "../../utils/di-factory";
 import { logger, isDevelopment } from "../../utils/logger";
+import { sanitizeErrorMessage } from "../../utils/sanitize-error";
 import { validateExternalUrl, normalizeUrlForValidation } from "../../utils/url-validator";
 import { isUrlAllowedByRobotsTxt } from "@reftrixmcp/core";
 import { assertNonProductionFactory } from "../../services/production-guard";
@@ -125,21 +127,15 @@ export type { IPageAnalyzeService, IPageAnalyzePrismaClient } from "./handlers/t
 // サービスファクトリ（DI用）
 // =====================================================
 
-let serviceFactory: (() => IPageAnalyzeService) | null = null;
-
-export function setPageAnalyzeServiceFactory(factory: () => IPageAnalyzeService): void {
-  serviceFactory = factory;
-}
-
-export function resetPageAnalyzeServiceFactory(): void {
-  serviceFactory = null;
-}
+const serviceFactoryDI = createDIFactory<IPageAnalyzeService>("PageAnalyzeService");
+export const setPageAnalyzeServiceFactory = serviceFactoryDI.set;
+export const resetPageAnalyzeServiceFactory = serviceFactoryDI.reset;
 
 // =====================================================
 // Prismaクライアントファクトリ（DI用）
 // =====================================================
 
-let prismaClientFactory: (() => IPageAnalyzePrismaClient) | null = null;
+const prismaClientDI = createDIFactory<IPageAnalyzePrismaClient>("PageAnalyzePrismaClient");
 
 /**
  * PrismaClientファクトリを設定
@@ -148,25 +144,21 @@ let prismaClientFactory: (() => IPageAnalyzePrismaClient) | null = null;
  */
 export function setPageAnalyzePrismaClientFactory(factory: () => IPageAnalyzePrismaClient): void {
   // 本番環境で既に設定済みの場合のみ禁止（上書き防止）
-  if (prismaClientFactory !== null) {
+  if (prismaClientDI.get() !== null) {
     assertNonProductionFactory("pageAnalyzePrismaClient");
   }
-  prismaClientFactory = factory;
+  prismaClientDI.set(factory);
 }
 
-/**
- * PrismaClientファクトリをリセット
- */
-export function resetPageAnalyzePrismaClientFactory(): void {
-  prismaClientFactory = null;
-}
+export const resetPageAnalyzePrismaClientFactory = prismaClientDI.reset;
 
 /**
  * PrismaClientを取得
  */
 function getPrismaClient(): IPageAnalyzePrismaClient | null {
-  if (prismaClientFactory) {
-    return prismaClientFactory();
+  const factory = prismaClientDI.get();
+  if (factory) {
+    return factory();
   }
   return null;
 }
@@ -210,14 +202,12 @@ export async function pageAnalyzeHandler(
 
     validated = pageAnalyzeInputSchema.parse(input);
   } catch (error) {
-    if (isDevelopment()) {
-      logger.error("[MCP Tool] page.analyze validation error", { error });
-    }
+    logger.warn("[MCP Tool] page.analyze validation error", { error: (error as Error).message });
     return {
       success: false,
       error: {
         code: PAGE_ANALYZE_ERROR_CODES.VALIDATION_ERROR,
-        message: error instanceof Error ? error.message : "Invalid input",
+        message: sanitizeErrorMessage(error),
       },
     };
   }
@@ -489,7 +479,7 @@ export async function pageAnalyzeHandler(
       normalizedUrl,
       overallStartTime,
       {
-        getService: () => serviceFactory?.() ?? {},
+        getService: () => serviceFactoryDI.get()?.() ?? {},
         getPrismaClient,
       },
       progressContext
@@ -504,14 +494,12 @@ export async function pageAnalyzeHandler(
       const isTimeout = error instanceof PhaseTimeoutError;
       const elapsedMs = Date.now() - overallStartTime;
 
-      if (isDevelopment()) {
-        logger.error("[page.analyze] Overall hard timeout triggered", {
-          timeoutMs: OVERALL_HARD_TIMEOUT_MS,
-          elapsedMs,
-          isTimeout,
-          error: error instanceof Error ? error.message : String(error),
-        });
-      }
+      logger.error("[page.analyze] Overall hard timeout triggered", {
+        timeoutMs: OVERALL_HARD_TIMEOUT_MS,
+        elapsedMs,
+        isTimeout,
+        error: error instanceof Error ? error.message : String(error),
+      });
 
       return {
         success: false,

package/src/tools/page/get-job-status.tool.ts

@@ -29,6 +29,7 @@ import {
   type PageGetJobStatusData,
 } from "./schemas";
 import { logger, isDevelopment } from "../../utils/logger";
+import { sanitizeErrorMessage } from "../../utils/sanitize-error";
 import {
   generateRequestId,
   createSuccessResponseWithRequestId,
@@ -118,12 +119,13 @@ export async function pageGetJobStatusHandler(input: unknown): Promise<PageGetJo
   try {
     validated = pageGetJobStatusInputSchema.parse(input);
   } catch (error) {
-    if (isDevelopment()) {
-      logger.error("[MCP Tool] page.getJobStatus validation error", { error, requestId });
-    }
+    logger.warn("[MCP Tool] page.getJobStatus validation error", {
+      error: error instanceof Error ? error.message : String(error),
+      requestId,
+    });
     return createErrorResponseWithRequestId(
       GET_JOB_STATUS_ERROR_CODES.VALIDATION_ERROR,
-      error instanceof Error ? error.message : "Invalid input",
+      "Invalid input parameters",
       requestId
     );
   }
@@ -194,20 +196,14 @@ export async function pageGetJobStatusHandler(input: unknown): Promise<PageGetJo
 
     return createSuccessResponseWithRequestId(data, requestId);
   } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
     logger.error("[MCP Tool] page.getJobStatus error", {
       jobId,
-      error: errorMessage,
+      error: error instanceof Error ? error.message : String(error),
       requestId,
     });
-    // SEC監査指摘: 本番環境では詳細エラーメッセージを隠蔽
-    // 開発環境のみ詳細を表示、本番では一般的なメッセージ
-    const userMessage = isDevelopment()
-      ? `Failed to get job status: ${errorMessage}`
-      : "Failed to get job status";
     return createErrorResponseWithRequestId(
       GET_JOB_STATUS_ERROR_CODES.INTERNAL_ERROR,
-      userMessage,
+      sanitizeErrorMessage(error),
       requestId
     );
   } finally {

package/src/tools/page/handlers/db-handler.ts

@@ -16,6 +16,7 @@
 
 import { v7 as uuidv7 } from "uuid";
 import { logger, isDevelopment } from "../../../utils/logger";
+import { sanitizeErrorMessage } from "../../../utils/sanitize-error";
 import { normalizeUrlForStorage } from "../../../utils/url-normalizer";
 import type { QualityServiceResult, IPageAnalyzePrismaClient, VisionFeatureBase } from "./types";
 import type { VisualFeatures } from "../schemas";
@@ -624,15 +625,11 @@ export async function saveToDatabase(
       }
     );
   } catch (error) {
-    if (isDevelopment()) {
-      logger.error("[page.analyze] DB save failed", {
-        error: error instanceof Error ? error.message : "Unknown error",
-      });
-    }
+    logger.warn("[page.analyze] DB save failed", { error: (error as Error).message });
 
     return {
       success: false,
-      error: error instanceof Error ? error.message : "DB save failed",
+      error: sanitizeErrorMessage(error),
     };
   }
 }