@reftrixmcp/mcp-server 0.1.7 → 0.2.0

package/src/tools/page/handlers/timeout-utils.ts

@@ -13,6 +13,7 @@
  */
 
 import { logger, isDevelopment } from "../../../utils/logger";
+import { sanitizeErrorMessage } from "../../../utils/sanitize-error";
 import {
   PAGE_ANALYZE_TIMEOUTS,
   PAGE_ANALYZE_ERROR_CODES,
@@ -120,12 +121,10 @@ export async function withTimeoutGraceful<T>(
     const durationMs = Date.now() - startTime;
 
     if (error instanceof PhaseTimeoutError) {
-      if (isDevelopment()) {
-        logger.warn(`[page.analyze] ${phaseName} timed out (graceful degradation)`, {
-          timeoutMs,
-          durationMs,
-        });
-      }
+      logger.warn(`[page.analyze] ${phaseName} timed out (graceful degradation)`, {
+        timeoutMs,
+        durationMs,
+      });
 
       warnings.push({
         feature,
@@ -140,12 +139,10 @@ export async function withTimeoutGraceful<T>(
     // 各フェーズの失敗は全体の処理を中断せず、warningsに記録して継続
     const errorMessage = error instanceof Error ? error.message : String(error);
 
-    if (isDevelopment()) {
-      logger.warn(`[page.analyze] ${phaseName} failed (graceful degradation)`, {
-        errorMessage,
-        durationMs,
-      });
-    }
+    logger.warn(`[page.analyze] ${phaseName} failed (graceful degradation)`, {
+      errorMessage,
+      durationMs,
+    });
 
     // feature に応じたエラーコードを選択
     const errorCode =
@@ -158,7 +155,7 @@ export async function withTimeoutGraceful<T>(
     warnings.push({
       feature,
       code: errorCode,
-      message: `${phaseName} failed: ${errorMessage} (graceful degradation)`,
+      message: `${phaseName} failed: ${sanitizeErrorMessage(error)} (graceful degradation)`,
     });
 
     return null;
@@ -767,14 +764,12 @@ export async function withTimeoutAndTracking<T>(
     tracker.markFailed(phase, isTimeout);
 
     if (isTimeout) {
-      if (isDevelopment()) {
-        logger.warn(`[page.analyze] ${phaseName} timed out`, {
-          timeoutMs,
-          durationMs,
-          phase,
-          strategy: tracker.getStrategy(),
-        });
-      }
+      logger.warn(`[page.analyze] ${phaseName} timed out`, {
+        timeoutMs,
+        durationMs,
+        phase,
+        strategy: tracker.getStrategy(),
+      });
 
       // Strict戦略の場合は例外を再スロー
       if (tracker.getStrategy() === "strict") {
@@ -798,14 +793,12 @@ export async function withTimeoutAndTracking<T>(
     // タイムアウト以外のエラー
     const errorMessage = error instanceof Error ? error.message : String(error);
 
-    if (isDevelopment()) {
-      logger.warn(`[page.analyze] ${phaseName} failed`, {
-        errorMessage,
-        durationMs,
-        phase,
-        strategy: tracker.getStrategy(),
-      });
-    }
+    logger.warn(`[page.analyze] ${phaseName} failed`, {
+      errorMessage,
+      durationMs,
+      phase,
+      strategy: tracker.getStrategy(),
+    });
 
     // Strict戦略の場合は例外を再スロー
     if (tracker.getStrategy() === "strict") {
@@ -827,7 +820,7 @@ export async function withTimeoutAndTracking<T>(
     warnings.push({
       feature,
       code: errorCode,
-      message: `${phaseName} failed: ${errorMessage} (graceful degradation)`,
+      message: `${phaseName} failed: ${sanitizeErrorMessage(error)} (graceful degradation)`,
     });
 
     return null;

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

@@ -14,6 +14,7 @@
  */
 
 import { logger, isDevelopment } from "../../../utils/logger";
+import { sanitizeErrorMessage } from "../../../utils/sanitize-error";
 import { executeFrameCapture, getFrameImageAnalysisService } from "../../motion/detect.tool";
 import type {
   FrameCaptureOptions,
@@ -126,12 +127,12 @@ export async function executeVideoMode(
       }
     }
   } catch (frameCaptureErr) {
-    if (isDevelopment()) {
-      logger.error("[video-handler] Frame capture failed", { error: frameCaptureErr });
-    }
+    logger.warn("[video-handler] Frame capture failed", {
+      error: (frameCaptureErr as Error).message,
+    });
     result.frame_capture_error = {
       code: "FRAME_CAPTURE_ERROR",
-      message: frameCaptureErr instanceof Error ? frameCaptureErr.message : "Frame capture failed",
+      message: sanitizeErrorMessage(frameCaptureErr),
     };
   }
 
@@ -285,14 +286,13 @@ async function executeFrameAnalysis(
 
     return { frame_analysis: frameAnalysis };
   } catch (frameAnalysisErr) {
-    if (isDevelopment()) {
-      logger.error("[video-handler] Frame image analysis failed", { error: frameAnalysisErr });
-    }
+    logger.warn("[video-handler] Frame image analysis failed", {
+      error: (frameAnalysisErr as Error).message,
+    });
     return {
       frame_analysis_error: {
         code: "FRAME_ANALYSIS_ERROR",
-        message:
-          frameAnalysisErr instanceof Error ? frameAnalysisErr.message : "Frame analysis failed",
+        message: sanitizeErrorMessage(frameAnalysisErr),
       },
     };
   }

package/src/tools/page/handlers/webgl-animation-handler.ts

@@ -10,6 +10,7 @@
 
 import { chromium, type Browser, type Page } from "playwright";
 import { logger, isDevelopment } from "../../../utils/logger";
+import { sanitizeErrorMessage } from "../../../utils/sanitize-error";
 import { WEBGL_BROWSER_ARGS } from "../../../utils/gpu-browser-args";
 import {
   WebGLAnimationDetectorService,
@@ -249,11 +250,9 @@ export async function executeWebGLAnimationDetection(
         }
       } catch (dbError) {
         // DB保存エラーは警告のみ、検出結果は返す
-        if (isDevelopment()) {
-          logger.warn("[webgl-animation-handler] Failed to save WebGL animation embeddings", {
-            error: dbError instanceof Error ? dbError.message : "Unknown error",
-          });
-        }
+        logger.warn("[webgl-animation-handler] Failed to save WebGL animation embeddings", {
+          error: dbError instanceof Error ? dbError.message : "Unknown error",
+        });
       }
     }
 
@@ -274,18 +273,16 @@ export async function executeWebGLAnimationDetection(
   } catch (error) {
     const processingTimeMs = Date.now() - startTime;
 
-    if (isDevelopment()) {
-      logger.error("[webgl-animation-handler] WebGL animation detection failed", {
-        error: error instanceof Error ? error.message : "Unknown error",
-        url,
-        processingTimeMs,
-      });
-    }
+    logger.warn("[webgl-animation-handler] WebGL animation detection failed", {
+      error: error instanceof Error ? error.message : "Unknown error",
+      url,
+      processingTimeMs,
+    });
 
     return {
       webgl_animation_error: {
         code: "WEBGL_DETECTION_FAILED",
-        message: error instanceof Error ? error.message : "WebGL animation detection failed",
+        message: sanitizeErrorMessage(error),
       },
     };
   } finally {

package/src/tools/part/compare.tool.ts

@@ -106,26 +106,8 @@ export const PART_COMPARE_ERROR_CODES = {
 // エラーハンドリング / Error Handling
 // =====================================================
 
-/**
- * エラーメッセージをサニタイズ（内部構造の漏洩防止）
- * Sanitize error message (prevent internal structure leakage)
- */
-function sanitizeErrorMessage(error: unknown): string {
-  if (error instanceof Error) {
-    const prismaError = error as { code?: string };
-    if (prismaError.code) {
-      switch (prismaError.code) {
-        case "P2002":
-          return "A record with this value already exists";
-        case "P2025":
-          return "Record not found";
-        default:
-          return "Database operation failed";
-      }
-    }
-  }
-  return "An internal error occurred";
-}
+// sanitizeErrorMessage: unified utility from utils/sanitize-error.ts
+import { sanitizeErrorMessage } from "../../utils/sanitize-error";
 
 // =====================================================
 // 比較ロジック / Comparison Logic

package/src/tools/part/inspect.tool.ts

@@ -19,7 +19,9 @@
  */
 
 import { ZodError } from "zod";
+import { createDIFactory } from "../../utils/di-factory";
 import { logger, isDevelopment } from "../../utils/logger";
+import { sanitizeErrorMessage } from "../../utils/sanitize-error";
 import { sanitizeHtml } from "../../utils/html-sanitizer";
 import {
   partInspectInputSchema,
@@ -99,48 +101,16 @@ export const PART_INSPECT_ERROR_CODES = {
 // DI ファクトリー / DI Factory
 // =====================================================
 
-let prismaClientFactory: (() => PartInspectPrismaClient) | null = null;
-
-/**
- * PrismaClientファクトリーを設定
- * Set PrismaClient factory
- */
-export function setPartInspectPrismaClientFactory(factory: () => PartInspectPrismaClient): void {
-  prismaClientFactory = factory;
-}
-
-/**
- * PrismaClientファクトリーをリセット（テスト用）
- * Reset PrismaClient factory (for testing)
- */
-export function resetPartInspectPrismaClientFactory(): void {
-  prismaClientFactory = null;
-}
+const prismaClientDI = createDIFactory<PartInspectPrismaClient>("PartInspectPrismaClient");
+export const setPartInspectPrismaClientFactory = prismaClientDI.set;
+export const resetPartInspectPrismaClientFactory = prismaClientDI.reset;
 
 // =====================================================
 // エラーハンドリング / Error handling
 // =====================================================
 
-/**
- * エラーメッセージをサニタイズ（内部構造の漏洩防止）
- * Sanitize error message (prevent internal structure leakage)
- */
-function sanitizePartInspectError(error: unknown): string {
-  if (error instanceof Error) {
-    const prismaError = error as { code?: string };
-    if (prismaError.code) {
-      switch (prismaError.code) {
-        case "P2002":
-          return "A record with this value already exists";
-        case "P2025":
-          return "Record not found";
-        default:
-          return "Database operation failed";
-      }
-    }
-  }
-  return "An internal error occurred";
-}
+// sanitizeErrorMessage は ../../utils/sanitize-error から統一インポート
+// Unified import from ../../utils/sanitize-error (CWE-209)
 
 // =====================================================
 // DB行の型定義 / DB row types
@@ -218,7 +188,7 @@ export async function partInspectHandler(input: unknown): Promise<PartInspectOut
   }
 
   // PrismaClient取得 / Get PrismaClient
-  if (!prismaClientFactory) {
+  if (!prismaClientDI.get()) {
     return {
       success: false,
       error: {
@@ -228,7 +198,7 @@ export async function partInspectHandler(input: unknown): Promise<PartInspectOut
     };
   }
 
-  const prisma = prismaClientFactory();
+  const prisma = prismaClientDI.get()!();
 
   try {
     // パーツ詳細を取得 / Get part details
@@ -333,7 +303,7 @@ export async function partInspectHandler(input: unknown): Promise<PartInspectOut
     };
   } catch (error) {
     logger.warn("[MCP Tool] part.inspect error", {
-      error: sanitizePartInspectError(error),
+      error: sanitizeErrorMessage(error),
       partId: truncateId(validated.part_id),
     });
 
@@ -341,7 +311,7 @@ export async function partInspectHandler(input: unknown): Promise<PartInspectOut
       success: false,
       error: {
         code: PART_INSPECT_ERROR_CODES.INTERNAL_ERROR,
-        message: sanitizePartInspectError(error),
+        message: sanitizeErrorMessage(error),
       },
     };
   }

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

@@ -24,7 +24,13 @@
 
 import { ZodError } from "zod";
 import { logger, isDevelopment } from "../../utils/logger";
+import { sanitizeErrorMessage } from "../../utils/sanitize-error";
 import { sanitizeHtml } from "../../utils/html-sanitizer";
+import {
+  generateCacheKey,
+  getCachedResult,
+  setCachedResult,
+} from "../../services/search-cache.service";
 import { partSearchInputSchema, type PartSearchInput } from "../../services/part/schemas";
 import {
   getPartSearchService,
@@ -119,26 +125,8 @@ function mapErrorToCode(error: Error): string {
   return PART_SEARCH_ERROR_CODES.INTERNAL_ERROR;
 }
 
-/**
- * エラーメッセージをサニタイズ（内部構造の漏洩防止）
- * Sanitize error message (prevent internal structure leakage)
- */
-function sanitizePartSearchError(error: unknown): string {
-  if (error instanceof Error) {
-    const prismaError = error as { code?: string };
-    if (prismaError.code) {
-      switch (prismaError.code) {
-        case "P2002":
-          return "A record with this value already exists";
-        case "P2025":
-          return "Record not found";
-        default:
-          return "Database operation failed";
-      }
-    }
-  }
-  return "An internal error occurred";
-}
+// sanitizeErrorMessage は ../../utils/sanitize-error から統一インポート
+// Unified import from ../../utils/sanitize-error (CWE-209)
 
 // =====================================================
 // 結果フォーマット / Result formatting
@@ -225,6 +213,13 @@ export async function partSearchHandler(input: unknown): Promise<PartSearchOutpu
     throw error;
   }
 
+  // Search result cache check / 検索キャッシュチェック
+  const cacheKey = generateCacheKey("part.search", validated as unknown as Record<string, unknown>);
+  const cached = getCachedResult<PartSearchOutput>(cacheKey);
+  if (cached) {
+    return cached;
+  }
+
   // サービス取得 / Get service
   let searchService: ReturnType<typeof getPartSearchService>;
   try {
@@ -251,11 +246,18 @@ export async function partSearchHandler(input: unknown): Promise<PartSearchOutpu
     if (validated.part_type) {
       options.partType = validated.part_type;
     }
-
-    // WebページIDフィルタはPartSearchOptionsにないため、
-    // 将来的な拡張ポイントとして保持
-    // webPageId filter is not in PartSearchOptions yet,
-    // kept as future extension point
+    if (validated.web_page_id) {
+      options.webPageId = validated.web_page_id;
+    }
+    if (validated.tags && validated.tags.length > 0) {
+      options.tags = validated.tags;
+    }
+    if (validated.industry) {
+      options.industry = validated.industry;
+    }
+    if (validated.audience) {
+      options.audience = validated.audience;
+    }
 
     let result: PartSearchResult;
 
@@ -334,7 +336,7 @@ export async function partSearchHandler(input: unknown): Promise<PartSearchOutpu
       });
     }
 
-    return {
+    const searchOutput: PartSearchOutput = {
       success: true,
       data: {
         results: mappedResults,
@@ -346,20 +348,23 @@ export async function partSearchHandler(input: unknown): Promise<PartSearchOutpu
         searchTimeMs,
       },
     };
+    // Cache successful results / 成功結果をキャッシュ
+    setCachedResult(cacheKey, searchOutput);
+    return searchOutput;
   } catch (error) {
     const errorInstance = error instanceof Error ? error : new Error(String(error));
     const errorCode = mapErrorToCode(errorInstance);
 
     logger.warn("[MCP Tool] part.search error", {
       code: errorCode,
-      error: sanitizePartSearchError(error),
+      error: sanitizeErrorMessage(error),
     });
 
     return {
       success: false,
       error: {
         code: errorCode,
-        message: sanitizePartSearchError(error),
+        message: sanitizeErrorMessage(error),
       },
     };
   }
@@ -457,6 +462,23 @@ export const partSearchToolDefinition = {
         maximum: 1,
         default: 0.3,
       },
+      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",
+      },
     },
   },
 };

package/src/tools/preference/get.tool.ts

@@ -12,6 +12,7 @@
  */
 
 import { ZodError } from "zod";
+import { createDIFactory } from "../../utils/di-factory";
 import { logger, isDevelopment } from "../../utils/logger";
 import {
   preferenceGetInputSchema,
@@ -63,23 +64,9 @@ export type PreferenceGetOutput =
 // サービスファクトリー（DI） / Service Factory (DI)
 // =====================================================
 
-let preferenceServiceFactory: (() => IPreferenceService) | null = null;
-
-/**
- * サービスファクトリーを設定
- * Set service factory
- */
-export function setPreferenceServiceFactory(factory: () => IPreferenceService): void {
-  preferenceServiceFactory = factory;
-}
-
-/**
- * サービスファクトリーをリセット
- * Reset service factory
- */
-export function resetPreferenceServiceFactory(): void {
-  preferenceServiceFactory = null;
-}
+const preferenceServiceDI = createDIFactory<IPreferenceService>("PreferenceService");
+export const setPreferenceServiceFactory = preferenceServiceDI.set;
+export const resetPreferenceServiceFactory = preferenceServiceDI.reset;
 
 // =====================================================
 // メインハンドラー / Main Handler
@@ -123,7 +110,7 @@ export async function preferenceGetHandler(input: unknown): Promise<PreferenceGe
   }
 
   // サービスファクトリーチェック / Service factory check
-  if (!preferenceServiceFactory) {
+  if (!preferenceServiceDI.get()) {
     logger.warn("[MCP Tool] preference.get service factory not set");
 
     return {
@@ -135,7 +122,7 @@ export async function preferenceGetHandler(input: unknown): Promise<PreferenceGe
     };
   }
 
-  const service = preferenceServiceFactory();
+  const service = preferenceServiceDI.get()!();
 
   try {
     const profile = await service.getProfile(validated.profile_id);

package/src/tools/preference/hear.tool.ts

@@ -18,6 +18,7 @@
  */
 
 import { ZodError } from "zod";
+import { createDIFactory } from "../../utils/di-factory";
 import { logger, isDevelopment } from "../../utils/logger";
 import {
   preferenceHearInputSchema,
@@ -229,23 +230,9 @@ export type PreferenceHearOutput =
 // サービスファクトリー（DI） / Service Factory (DI)
 // =====================================================
 
-let preferenceServiceFactory: (() => IPreferenceService) | null = null;
-
-/**
- * サービスファクトリーを設定
- * Set service factory
- */
-export function setPreferenceServiceFactory(factory: () => IPreferenceService): void {
-  preferenceServiceFactory = factory;
-}
-
-/**
- * サービスファクトリーをリセット
- * Reset service factory
- */
-export function resetPreferenceServiceFactory(): void {
-  preferenceServiceFactory = null;
-}
+const preferenceServiceDI = createDIFactory<IPreferenceService>("PreferenceService");
+export const setPreferenceServiceFactory = preferenceServiceDI.set;
+export const resetPreferenceServiceFactory = preferenceServiceDI.reset;
 
 // =====================================================
 // エラーコード判定 / Error Code Mapping
@@ -311,7 +298,7 @@ export async function preferenceHearHandler(input: unknown): Promise<PreferenceH
   }
 
   // サービスファクトリーチェック / Service factory check
-  if (!preferenceServiceFactory) {
+  if (!preferenceServiceDI.get()) {
     logger.warn("[MCP Tool] preference.hear service factory not set");
 
     return {
@@ -323,7 +310,7 @@ export async function preferenceHearHandler(input: unknown): Promise<PreferenceH
     };
   }
 
-  const service = preferenceServiceFactory();
+  const service = preferenceServiceDI.get()!();
 
   try {
     // モード判定: feedbackの有無で分岐

package/src/tools/preference/reset.tool.ts

@@ -12,6 +12,7 @@
  */
 
 import { ZodError } from "zod";
+import { createDIFactory } from "../../utils/di-factory";
 import { logger, isDevelopment } from "../../utils/logger";
 import {
   preferenceResetInputSchema,
@@ -52,23 +53,9 @@ export type PreferenceResetOutput =
 // サービスファクトリー（DI） / Service Factory (DI)
 // =====================================================
 
-let preferenceServiceFactory: (() => IPreferenceService) | null = null;
-
-/**
- * サービスファクトリーを設定
- * Set service factory
- */
-export function setPreferenceServiceFactory(factory: () => IPreferenceService): void {
-  preferenceServiceFactory = factory;
-}
-
-/**
- * サービスファクトリーをリセット
- * Reset service factory
- */
-export function resetPreferenceServiceFactory(): void {
-  preferenceServiceFactory = null;
-}
+const preferenceServiceDI = createDIFactory<IPreferenceService>("PreferenceService");
+export const setPreferenceServiceFactory = preferenceServiceDI.set;
+export const resetPreferenceServiceFactory = preferenceServiceDI.reset;
 
 // =====================================================
 // エラーコード判定 / Error Code Mapping
@@ -145,7 +132,7 @@ export async function preferenceResetHandler(input: unknown): Promise<Preference
   }
 
   // サービスファクトリーチェック / Service factory check
-  if (!preferenceServiceFactory) {
+  if (!preferenceServiceDI.get()) {
     logger.warn("[MCP Tool] preference.reset service factory not set");
 
     return {
@@ -157,7 +144,7 @@ export async function preferenceResetHandler(input: unknown): Promise<Preference
     };
   }
 
-  const service = preferenceServiceFactory();
+  const service = preferenceServiceDI.get()!();
 
   try {
     // hard_delete: true → プロファイル完全削除（GDPR忘れられる権利）

package/src/tools/project-get.ts

@@ -24,6 +24,7 @@ import {
 } from "./schemas/project-schemas";
 import { serviceClient } from "../services/service-client";
 import { logger, isDevelopment } from "../utils/logger";
+import { sanitizeErrorMessage } from "../utils/sanitize-error";
 import { ErrorCode } from "../utils/errors";
 import {
   type McpResponse,
@@ -60,18 +61,15 @@ export async function projectGetHandler(input: unknown): Promise<ProjectGetRespo
     if (error instanceof ZodError) {
       const errorMessage = error.errors.map((e) => `${e.path.join(".")}: ${e.message}`).join(", ");
 
-      if (isDevelopment()) {
-        logger.error("[MCP Tool] project.get validation error", {
-          errors: error.errors,
-          requestId,
-        });
-      }
+      logger.warn("[MCP Tool] project.get validation error", {
+        errors: error.errors,
+        requestId,
+      });
 
       return createErrorResponseWithRequestId(
         ErrorCode.VALIDATION_ERROR,
         `入力バリデーションエラー: ${errorMessage}`,
-        requestId,
-        error.errors // details（開発環境のみ含まれる）
+        requestId
       );
     }
     // 予期せぬエラー
@@ -144,9 +142,10 @@ export async function projectGetHandler(input: unknown): Promise<ProjectGetRespo
 
     return createSuccessResponseWithRequestId(fullData, requestId);
   } catch (error) {
-    if (isDevelopment()) {
-      logger.error("[MCP Tool] project.get API error", { error, requestId });
-    }
+    logger.error("[MCP Tool] project.get API error", {
+      error: error instanceof Error ? error.message : String(error),
+      requestId,
+    });
 
     // 認証エラーのチェック
     if (error instanceof Error && error.message.includes("UNAUTHORIZED")) {
@@ -155,9 +154,8 @@ export async function projectGetHandler(input: unknown): Promise<ProjectGetRespo
 
     return createErrorResponseWithRequestId(
       ErrorCode.INTERNAL_ERROR,
-      "プロジェクト取得中にエラーが発生しました",
-      requestId,
-      error instanceof Error ? error.message : undefined
+      sanitizeErrorMessage(error),
+      requestId
     );
   }
 }