@reftrixmcp/mcp-server 0.1.7 → 0.2.0

package/src/tools/project-list.ts

@@ -28,6 +28,7 @@ import {
 import { serviceClient } from "../services/service-client";
 import { logger, isDevelopment } from "../utils/logger";
 import { ErrorCode } from "../utils/errors";
+import { sanitizeErrorMessage } from "../utils/sanitize-error";
 import {
   type McpResponse,
   generateRequestId,
@@ -66,12 +67,10 @@ export async function projectListHandler(input: unknown): Promise<ProjectListRes
     if (error instanceof ZodError) {
       const errorMessage = error.errors.map((e) => `${e.path.join(".")}: ${e.message}`).join(", ");
 
-      if (isDevelopment()) {
-        logger.error("[MCP Tool] project.list validation error", {
-          errors: error.errors,
-          requestId,
-        });
-      }
+      logger.warn("[MCP Tool] project.list validation error", {
+        error: (error as Error).message,
+        requestId,
+      });
 
       return createErrorResponseWithRequestId(
         ErrorCode.VALIDATION_ERROR,
@@ -152,21 +151,10 @@ export async function projectListHandler(input: unknown): Promise<ProjectListRes
 
     return createSuccessResponseWithRequestId(fullData, requestId);
   } catch (error) {
-    // SEC: 開発環境のみでエラー詳細をログ（スタックトレース含む）
-    // 本番環境ではメッセージとrequestIdのみ
-    if (isDevelopment()) {
-      logger.error("[MCP Tool] project.list API error", {
-        error,
-        message: error instanceof Error ? error.message : String(error),
-        stack: error instanceof Error ? error.stack : undefined,
-        requestId,
-      });
-    } else {
-      logger.error("[MCP Tool] project.list API error", {
-        message: error instanceof Error ? error.message : String(error),
-        requestId,
-      });
-    }
+    logger.warn("[MCP Tool] project.list API error", {
+      error: error instanceof Error ? error.message : String(error),
+      requestId,
+    });
 
     // 認証エラーのチェック
     if (error instanceof Error && error.message.includes("UNAUTHORIZED")) {
@@ -174,7 +162,7 @@ export async function projectListHandler(input: unknown): Promise<ProjectListRes
     }
 
     // 詳細なエラーメッセージを含めて返す（開発時のデバッグ用）
-    const errorMessage = error instanceof Error ? error.message : String(error);
+    const errorMessage = sanitizeErrorMessage(error);
     return createErrorResponseWithRequestId(
       ErrorCode.INTERNAL_ERROR,
       `プロジェクト一覧取得中にエラーが発生しました`,

package/src/tools/quality/batch-evaluate.tool.ts

@@ -15,6 +15,7 @@
  * @module tools/quality/batch-evaluate.tool
  */
 
+import { createDIFactory } from "../../utils/di-factory";
 import { logger, isDevelopment } from "../../utils/logger";
 import { LRUCache } from "../../services/cache";
 import { isRedisAvailable } from "../../config/redis";
@@ -29,6 +30,7 @@ import {
   createLowUsageToolDeprecationWarning,
   logDeprecationWarning,
 } from "../../utils/deprecation-warning";
+import { sanitizeErrorMessage } from "../../utils/sanitize-error";
 
 import {
   batchQualityEvaluateInputSchema,
@@ -54,17 +56,11 @@ export interface IBatchQualityEvaluateService {
   getPageById?: (pageId: string) => Promise<string | null>;
 }
 
-let serviceFactory: (() => IBatchQualityEvaluateService) | null = null;
-
-export function setBatchQualityEvaluateServiceFactory(
-  factory: () => IBatchQualityEvaluateService
-): void {
-  serviceFactory = factory;
-}
-
-export function resetBatchQualityEvaluateServiceFactory(): void {
-  serviceFactory = null;
-}
+const serviceFactoryDI = createDIFactory<IBatchQualityEvaluateService>(
+  "BatchQualityEvaluateService"
+);
+export const setBatchQualityEvaluateServiceFactory = serviceFactoryDI.set;
+export const resetBatchQualityEvaluateServiceFactory = serviceFactoryDI.reset;
 
 // =====================================================
 // LRUキャッシュジョブストア（フォールバック用）
@@ -132,7 +128,7 @@ async function processJobSync(
     strict: boolean;
   }
 ): Promise<void> {
-  const service = serviceFactory ? serviceFactory() : null;
+  const service = serviceFactoryDI.get() ? serviceFactoryDI.get()!() : null;
 
   // ジョブを処理中に更新
   updateBatchJob(jobId, {
@@ -173,7 +169,7 @@ async function processJobSync(
           index: item.index,
           error: {
             code: "EVALUATION_ERROR",
-            message: error instanceof Error ? error.message : "Unknown error",
+            message: sanitizeErrorMessage(error),
           },
         });
 
@@ -210,7 +206,7 @@ async function processJobSync(
           index: -1,
           error: {
             code: "BATCH_PROCESSING_ERROR",
-            message: error instanceof Error ? error.message : "Unknown error",
+            message: sanitizeErrorMessage(error),
           },
         },
       ],
@@ -243,14 +239,14 @@ export async function batchQualityEvaluateHandler(
   try {
     validated = batchQualityEvaluateInputSchema.parse(input);
   } catch (error) {
-    if (isDevelopment()) {
-      logger.error("[MCP Tool] quality.batch_evaluate validation error", { error });
-    }
+    logger.warn("[MCP Tool] quality.batch_evaluate validation error", {
+      error: (error as Error).message,
+    });
     return {
       success: false,
       error: {
         code: QUALITY_MCP_ERROR_CODES.VALIDATION_ERROR,
-        message: error instanceof Error ? error.message : "Invalid input",
+        message: sanitizeErrorMessage(error),
       },
     };
   }
@@ -258,7 +254,7 @@ export async function batchQualityEvaluateHandler(
   // サービスファクトリーチェック（オプション）
   // サービスが設定されていなくても、HTMLで直接指定されたアイテムは評価可能
   const hasPageIdItems = validated.items.some((item) => item.pageId !== undefined);
-  if (hasPageIdItems && !serviceFactory) {
+  if (hasPageIdItems && !serviceFactoryDI.get()) {
     if (isDevelopment()) {
       logger.warn(
         "[MCP Tool] quality.batch_evaluate service factory not set, pageId items will be skipped"
@@ -385,14 +381,12 @@ export async function batchQualityEvaluateHandler(
       deprecation_warning: deprecationWarning,
     };
   } catch (error) {
-    if (isDevelopment()) {
-      logger.error("[MCP Tool] quality.batch_evaluate error", { error });
-    }
+    logger.warn("[MCP Tool] quality.batch_evaluate error", { error: (error as Error).message });
     return {
       success: false,
       error: {
         code: QUALITY_MCP_ERROR_CODES.INTERNAL_ERROR,
-        message: error instanceof Error ? error.message : "Batch evaluation failed",
+        message: sanitizeErrorMessage(error),
       },
     };
   }

package/src/tools/quality/evaluate.tool.ts

@@ -11,12 +11,14 @@
  */
 
 import { ZodError } from "zod";
+import { createDIFactory } from "../../utils/di-factory";
 import { logger, isDevelopment } from "../../utils/logger";
 import {
   formatZodError,
   createValidationErrorWithHints,
   formatMultipleDetailedErrors,
 } from "../../utils/error-messages";
+import { sanitizeErrorMessage } from "../../utils/sanitize-error";
 
 import { generateImprovements, calculateSummary } from "./improvement-utils";
 
@@ -90,100 +92,28 @@ export type {
 // DI Factories
 // =====================================================
 
-let serviceFactory: (() => IQualityEvaluateService) | null = null;
-let benchmarkServiceFactory: (() => IBenchmarkService) | null = null;
-let patternMatcherServiceFactory: (() => IPatternMatcherService) | null = null;
+const serviceFactoryDI = createDIFactory<IQualityEvaluateService>("QualityEvaluateService");
+export const setQualityEvaluateServiceFactory = serviceFactoryDI.set;
+export const resetQualityEvaluateServiceFactory = serviceFactoryDI.reset;
 
-/**
- * IQualityEvaluateService ファクトリを設定
- *
- * @param factory - サービスファクトリ関数
- */
-export function setQualityEvaluateServiceFactory(factory: () => IQualityEvaluateService): void {
-  serviceFactory = factory;
-}
-
-/**
- * IQualityEvaluateService ファクトリをリセット（テスト用）
- */
-export function resetQualityEvaluateServiceFactory(): void {
-  serviceFactory = null;
-}
-
-/**
- * IBenchmarkService ファクトリを設定
- *
- * @param factory - ベンチマークサービスファクトリ関数
- */
-export function setBenchmarkServiceFactory(factory: () => IBenchmarkService): void {
-  benchmarkServiceFactory = factory;
-}
-
-/**
- * IBenchmarkService ファクトリをリセット（テスト用）
- */
-export function resetBenchmarkServiceFactory(): void {
-  benchmarkServiceFactory = null;
-}
+const benchmarkServiceDI = createDIFactory<IBenchmarkService>("BenchmarkService");
+export const setBenchmarkServiceFactory = benchmarkServiceDI.set;
+export const resetBenchmarkServiceFactory = benchmarkServiceDI.reset;
+export const getBenchmarkServiceFactory = benchmarkServiceDI.get;
 
-/**
- * 現在のBenchmarkServiceファクトリを取得（内部用）
- */
-export function getBenchmarkServiceFactory(): (() => IBenchmarkService) | null {
-  return benchmarkServiceFactory;
-}
-
-/**
- * IPatternMatcherService ファクトリを設定
- *
- * @param factory - パターンマッチャーサービスファクトリ関数
- */
-export function setPatternMatcherServiceFactory(factory: () => IPatternMatcherService): void {
-  patternMatcherServiceFactory = factory;
-}
-
-/**
- * IPatternMatcherService ファクトリをリセット（テスト用）
- */
-export function resetPatternMatcherServiceFactory(): void {
-  patternMatcherServiceFactory = null;
-}
-
-/**
- * 現在のPatternMatcherServiceファクトリを取得（内部用）
- */
-export function getPatternMatcherServiceFactory(): (() => IPatternMatcherService) | null {
-  return patternMatcherServiceFactory;
-}
+const patternMatcherServiceDI = createDIFactory<IPatternMatcherService>("PatternMatcherService");
+export const setPatternMatcherServiceFactory = patternMatcherServiceDI.set;
+export const resetPatternMatcherServiceFactory = patternMatcherServiceDI.reset;
+export const getPatternMatcherServiceFactory = patternMatcherServiceDI.get;
 
 // =====================================================
 // aXe Accessibility Service DI (JSDOM版)
 // =====================================================
 
-let axeServiceFactory: (() => AxeAccessibilityService) | null = null;
-
-/**
- * AxeAccessibilityService ファクトリを設定
- *
- * @param factory - サービスファクトリ関数
- */
-export function setAxeAccessibilityServiceFactory(factory: () => AxeAccessibilityService): void {
-  axeServiceFactory = factory;
-}
-
-/**
- * AxeAccessibilityService ファクトリをリセット（テスト用）
- */
-export function resetAxeAccessibilityServiceFactory(): void {
-  axeServiceFactory = null;
-}
-
-/**
- * 現在のAxeAccessibilityServiceファクトリを取得（内部用）
- */
-export function getAxeAccessibilityServiceFactory(): (() => AxeAccessibilityService) | null {
-  return axeServiceFactory;
-}
+const axeServiceDI = createDIFactory<AxeAccessibilityService>("AxeAccessibilityService");
+export const setAxeAccessibilityServiceFactory = axeServiceDI.set;
+export const resetAxeAccessibilityServiceFactory = axeServiceDI.reset;
+export const getAxeAccessibilityServiceFactory = axeServiceDI.get;
 
 // デフォルトaXeサービスインスタンス（ファクトリが未設定の場合）
 let defaultAxeService: AxeAccessibilityService | null = null;
@@ -192,8 +122,8 @@ let defaultAxeService: AxeAccessibilityService | null = null;
  * aXeサービスインスタンスを取得
  */
 function getAxeService(): AxeAccessibilityService {
-  if (axeServiceFactory) {
-    return axeServiceFactory();
+  if (axeServiceDI.get()) {
+    return axeServiceDI.get()!();
   }
   // デフォルトインスタンスを作成（シングルトン）
   if (!defaultAxeService) {
@@ -206,34 +136,17 @@ function getAxeService(): AxeAccessibilityService {
 // Playwright aXe Service DI (v0.1.0新規)
 // =====================================================
 
-let playwrightAxeServiceFactory: (() => PlaywrightAxeService) | null = null;
+const playwrightAxeServiceDI = createDIFactory<PlaywrightAxeService>("PlaywrightAxeService");
 let defaultPlaywrightAxeService: PlaywrightAxeService | null = null;
 let playwrightAvailabilityChecked = false;
 let playwrightIsAvailable = false;
 
-/**
- * PlaywrightAxeService ファクトリを設定
- *
- * @param factory - サービスファクトリ関数
- */
-export function setPlaywrightAxeServiceFactory(factory: () => PlaywrightAxeService): void {
-  playwrightAxeServiceFactory = factory;
-}
-
-/**
- * PlaywrightAxeService ファクトリをリセット（テスト用）
- */
+export const setPlaywrightAxeServiceFactory = playwrightAxeServiceDI.set;
 export function resetPlaywrightAxeServiceFactory(): void {
-  playwrightAxeServiceFactory = null;
+  playwrightAxeServiceDI.reset();
   defaultPlaywrightAxeService = null;
 }
-
-/**
- * 現在のPlaywrightAxeServiceファクトリを取得（内部用）
- */
-export function getPlaywrightAxeServiceFactory(): (() => PlaywrightAxeService) | null {
-  return playwrightAxeServiceFactory;
-}
+export const getPlaywrightAxeServiceFactory = playwrightAxeServiceDI.get;
 
 /**
  * Playwright aXeサービスインスタンスを取得
@@ -258,8 +171,8 @@ async function getPlaywrightAxeService(): Promise<PlaywrightAxeService | null> {
   }
 
   // ファクトリが設定されている場合はそれを使用
-  if (playwrightAxeServiceFactory) {
-    return playwrightAxeServiceFactory();
+  if (playwrightAxeServiceDI.get()) {
+    return playwrightAxeServiceDI.get()!();
   }
 
   // デフォルトインスタンスを作成（シングルトン）
@@ -300,11 +213,9 @@ export async function qualityEvaluateHandler(
       const detailedMessage = formatMultipleDetailedErrors(errorWithHints.errors);
       const formattedErrors = formatZodError(error);
 
-      if (isDevelopment()) {
-        logger.error("[MCP Tool] quality.evaluate validation error", {
-          errors: errorWithHints.errors,
-        });
-      }
+      logger.warn("[MCP Tool] quality.evaluate validation error", {
+        error: (error as Error).message,
+      });
 
       return {
         success: false,
@@ -334,7 +245,7 @@ export async function qualityEvaluateHandler(
   // pageIdが指定されている場合はDBから取得
   if (validated.pageId && !html) {
     try {
-      const service = serviceFactory?.();
+      const service = serviceFactoryDI.get()?.();
       if (!service?.getPageById) {
         return {
           success: false,
@@ -359,14 +270,12 @@ export async function qualityEvaluateHandler(
       html = page.htmlContent;
       pageId = page.id;
     } catch (error) {
-      if (isDevelopment()) {
-        logger.error("[MCP Tool] quality.evaluate DB error", { error });
-      }
+      logger.warn("[MCP Tool] quality.evaluate DB error", { error: (error as Error).message });
       return {
         success: false,
         error: {
           code: QUALITY_MCP_ERROR_CODES.DB_ERROR,
-          message: error instanceof Error ? error.message : "Database error",
+          message: sanitizeErrorMessage(error),
         },
       };
     }
@@ -513,15 +422,19 @@ export async function qualityEvaluateHandler(
     };
 
     // パターン駆動評価が有効かつDIサービスが利用可能な場合
-    if (patternComparisonOptions.enabled && patternMatcherServiceFactory && serviceFactory) {
+    if (
+      patternComparisonOptions.enabled &&
+      patternMatcherServiceDI.get() &&
+      serviceFactoryDI.get()
+    ) {
       const patternResult = await executePatternDrivenEvaluation(
         html,
         baseScores,
         baseRecommendations,
         patternComparisonOptions,
         {
-          patternMatcher: patternMatcherServiceFactory(),
-          qualityService: serviceFactory(),
+          patternMatcher: patternMatcherServiceDI.get()!(),
+          qualityService: serviceFactoryDI.get()!(),
         }
       );
 
@@ -746,9 +659,9 @@ export async function qualityEvaluateHandler(
 
     // DB永続化処理（v0.1.0 MCP-QUALITY-02）
     // save_to_db: true かつ pageId が指定されている場合のみ保存
-    if (validated.save_to_db && validated.pageId && serviceFactory) {
+    if (validated.save_to_db && validated.pageId && serviceFactoryDI.get()) {
       try {
-        const service = serviceFactory();
+        const service = serviceFactoryDI.get()!();
         // PatternReferences を構築
         const patternRefs = {
           similarSections: patternAnalysis?.similarSections?.map((s) => s.id) ?? [],
@@ -776,14 +689,12 @@ export async function qualityEvaluateHandler(
       data,
     };
   } catch (error) {
-    if (isDevelopment()) {
-      logger.error("[MCP Tool] quality.evaluate error", { error });
-    }
+    logger.warn("[MCP Tool] quality.evaluate error", { error: (error as Error).message });
     return {
       success: false,
       error: {
         code: QUALITY_MCP_ERROR_CODES.INTERNAL_ERROR,
-        message: error instanceof Error ? error.message : "Evaluation failed",
+        message: sanitizeErrorMessage(error),
       },
     };
   }

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

@@ -39,6 +39,7 @@ export type { QualityGetJobStatusInput, QualityGetJobStatusOutput } from "./sche
 import { getBatchJob } from "./batch-evaluate.tool";
 import { logger, isDevelopment } from "../../utils/logger";
 import { generateRequestId, createErrorResponseWithRequestId } from "../../utils/mcp-response";
+import { sanitizeErrorMessage } from "../../utils/sanitize-error";
 
 // ============================================================================
 // Constants
@@ -168,7 +169,7 @@ export async function qualityGetJobStatusHandler(
     });
     return createErrorResponseWithRequestId(
       GET_QUALITY_JOB_STATUS_ERROR_CODES.VALIDATION_ERROR,
-      error instanceof Error ? error.message : "Invalid input",
+      sanitizeErrorMessage(error),
       requestId
     );
   }

package/src/tools/responsive/schemas.ts

@@ -9,6 +9,7 @@
  */
 
 import { z } from "zod";
+import { commonSearchFiltersSchema } from "../../schemas/common-search-filters";
 
 // ============================================================================
 // Enum Schemas
@@ -74,9 +75,8 @@ export const responsiveSearchFiltersSchema = z
       .optional(),
     /** 最小スクリーンショット差分パーセンテージ */
     minDiffPercentage: z.number().min(0).max(100).optional(),
-    /** WebページIDフィルタ */
-    webPageId: z.string().uuid().optional(),
   })
+  .merge(commonSearchFiltersSchema)
   .optional();
 
 export type ResponsiveSearchFilters = z.infer<typeof responsiveSearchFiltersSchema>;