@reftrixmcp/mcp-server 0.1.7 → 0.2.0

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

@@ -15,6 +15,7 @@
 
 import type { Browser } from "playwright";
 import { logger, isDevelopment } from "../../../utils/logger";
+import { sanitizeErrorMessage } from "../../../utils/sanitize-error";
 import {
   getMotionDetectorService,
   type MotionDetectionResult,
@@ -240,14 +241,12 @@ export async function defaultDetectMotion(
         }
       } catch (fetchError) {
         // 外部CSS取得失敗（タイムアウト含む）は警告のみ、インラインCSSのみで分析を継続
-        if (isDevelopment()) {
-          logger.warn(
-            "[page.analyze] Failed to fetch external CSS (graceful degradation: using inline CSS only)",
-            {
-              error: fetchError instanceof Error ? fetchError.message : String(fetchError),
-            }
-          );
-        }
+        logger.warn(
+          "[page.analyze] Failed to fetch external CSS (graceful degradation: using inline CSS only)",
+          {
+            error: fetchError instanceof Error ? fetchError.message : String(fetchError),
+          }
+        );
       }
     }
 
@@ -638,11 +637,9 @@ export async function defaultDetectMotion(
         }
       } catch (visionError) {
         // Vision検出エラーは警告のみ、処理は継続
-        if (isDevelopment()) {
-          logger.warn("[page.analyze] Vision motion candidates detection error", {
-            error: visionError instanceof Error ? visionError.message : "Unknown error",
-          });
-        }
+        logger.warn("[page.analyze] Vision motion candidates detection error", {
+          error: visionError instanceof Error ? visionError.message : "Unknown error",
+        });
         warnings.push({
           code: "VISION_MOTION_DETECTION_ERROR",
           severity: "info",
@@ -677,9 +674,7 @@ export async function defaultDetectMotion(
 
     return result;
   } catch (error) {
-    if (isDevelopment()) {
-      logger.error("[page.analyze] Motion detection failed", { error });
-    }
+    logger.warn("[page.analyze] Motion detection failed", { error: (error as Error).message });
 
     return {
       success: false,
@@ -691,7 +686,7 @@ export async function defaultDetectMotion(
       processingTimeMs: Date.now() - startTime,
       error: {
         code: PAGE_ANALYZE_ERROR_CODES.MOTION_DETECTION_FAILED,
-        message: error instanceof Error ? error.message : "Motion detection failed",
+        message: sanitizeErrorMessage(error),
       },
     };
   }
@@ -811,9 +806,7 @@ async function executeVideoModeDetection(
 
     return result;
   } catch (error) {
-    if (isDevelopment()) {
-      logger.error("[page.analyze] Video Mode detection failed", { error, url });
-    }
+    logger.warn("[page.analyze] Video Mode detection failed", { error: (error as Error).message });
 
     return {
       success: false,
@@ -825,7 +818,7 @@ async function executeVideoModeDetection(
       processingTimeMs: Date.now() - startTime,
       error: {
         code: "MOTION_VIDEO_MODE_FAILED",
-        message: error instanceof Error ? error.message : "Video mode detection failed",
+        message: sanitizeErrorMessage(error),
       },
     };
   }
@@ -944,9 +937,9 @@ async function executeRuntimeModeDetection(
 
     return result;
   } catch (error) {
-    if (isDevelopment()) {
-      logger.error("[page.analyze] Runtime Mode detection failed", { error, url });
-    }
+    logger.warn("[page.analyze] Runtime Mode detection failed", {
+      error: (error as Error).message,
+    });
 
     return {
       success: false,
@@ -958,7 +951,7 @@ async function executeRuntimeModeDetection(
       processingTimeMs: Date.now() - startTime,
       error: {
         code: "MOTION_RUNTIME_MODE_FAILED",
-        message: error instanceof Error ? error.message : "Runtime mode detection failed",
+        message: sanitizeErrorMessage(error),
       },
     };
   }
@@ -1018,12 +1011,10 @@ async function executeHybridModeDetection(
       ),
       // ランタイム検出
       executeRuntimeDetection(url, options?.runtime_options).catch((err) => {
-        if (isDevelopment()) {
-          logger.warn(
-            "[page.analyze] Runtime detection failed in hybrid mode, using CSS results only",
-            { error: err }
-          );
-        }
+        logger.warn(
+          "[page.analyze] Runtime detection failed in hybrid mode, using CSS results only",
+          { error: err instanceof Error ? err.message : "Unknown error" }
+        );
         return null;
       }),
     ]);
@@ -1135,9 +1126,7 @@ async function executeHybridModeDetection(
 
     return result;
   } catch (error) {
-    if (isDevelopment()) {
-      logger.error("[page.analyze] Hybrid Mode detection failed", { error, url });
-    }
+    logger.warn("[page.analyze] Hybrid Mode detection failed", { error: (error as Error).message });
 
     return {
       success: false,
@@ -1149,7 +1138,7 @@ async function executeHybridModeDetection(
       processingTimeMs: Date.now() - startTime,
       error: {
         code: "MOTION_HYBRID_MODE_FAILED",
-        message: error instanceof Error ? error.message : "Hybrid mode detection failed",
+        message: sanitizeErrorMessage(error),
       },
     };
   }

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

@@ -10,7 +10,9 @@
  * @module tools/page/handlers/narrative-handler
  */
 
+import { createDIFactory } from "../../../utils/di-factory";
 import { logger, isDevelopment } from "../../../utils/logger";
+import { sanitizeErrorMessage } from "../../../utils/sanitize-error";
 import {
   createNarrativeAnalysisService,
   type NarrativeAnalysisService,
@@ -36,28 +38,16 @@ export const NARRATIVE_ERROR_CODES = {
 // Service Factory（DI用）
 // =====================================================
 
-let narrativeServiceFactory: (() => NarrativeAnalysisService) | null = null;
-
-/**
- * NarrativeAnalysisServiceファクトリを設定（テスト用）
- */
-export function setNarrativeServiceFactory(factory: () => NarrativeAnalysisService): void {
-  narrativeServiceFactory = factory;
-}
-
-/**
- * NarrativeAnalysisServiceファクトリをリセット（テスト用）
- */
-export function resetNarrativeServiceFactory(): void {
-  narrativeServiceFactory = null;
-}
+const narrativeServiceDI = createDIFactory<NarrativeAnalysisService>("NarrativeService");
+export const setNarrativeServiceFactory = narrativeServiceDI.set;
+export const resetNarrativeServiceFactory = narrativeServiceDI.reset;
 
 /**
  * NarrativeAnalysisServiceを取得
  */
 function getNarrativeService(): NarrativeAnalysisService {
-  if (narrativeServiceFactory) {
-    return narrativeServiceFactory();
+  if (narrativeServiceDI.get()) {
+    return narrativeServiceDI.get()!();
   }
   return createNarrativeAnalysisService();
 }
@@ -199,12 +189,10 @@ export async function handleNarrativeAnalysis(
     const processingTimeMs = Date.now() - startTime;
     const errorMessage = error instanceof Error ? error.message : String(error);
 
-    if (isDevelopment()) {
-      logger.error("[narrative-handler] Analysis failed", {
-        error: errorMessage,
-        processingTimeMs,
-      });
-    }
+    logger.warn("[narrative-handler] Analysis failed", {
+      error: errorMessage,
+      processingTimeMs,
+    });
 
     // エラーの種類を判定
     const errorCode =
@@ -217,7 +205,7 @@ export async function handleNarrativeAnalysis(
       processingTimeMs,
       error: {
         code: errorCode,
-        message: errorMessage,
+        message: sanitizeErrorMessage(error),
       },
     };
   }

package/src/tools/page/handlers/phased-executor.ts

@@ -18,6 +18,7 @@
  */
 
 import { logger, isDevelopment } from "../../../utils/logger";
+import { sanitizeErrorMessage } from "../../../utils/sanitize-error";
 import { withTimeout, PhaseTimeoutError, type AnalysisPhase } from "./timeout-utils";
 import type { ExecutionStatusTracker } from "./timeout-utils";
 import type { LayoutServiceResult, MotionServiceResult, QualityServiceResult } from "./types";
@@ -265,24 +266,22 @@ export class PhasedExecutor {
     } catch (error) {
       const durationMs = Date.now() - startTime;
       const isTimeout = error instanceof PhaseTimeoutError;
-      const errorMessage = error instanceof Error ? error.message : String(error);
+      const sanitizedMessage = sanitizeErrorMessage(error);
 
       // Trackerに失敗を記録
       this.options.tracker.markFailed(phase as AnalysisPhase, isTimeout);
 
-      if (isDevelopment()) {
-        logger.warn(`[PhasedExecutor] ${phase} phase failed`, {
-          error: errorMessage,
-          isTimeout,
-          durationMs,
-          timeoutMs,
-        });
-      }
+      logger.warn(`[PhasedExecutor] ${phase} phase failed`, {
+        error: error instanceof Error ? error.message : String(error),
+        isTimeout,
+        durationMs,
+        timeoutMs,
+      });
 
       return {
         phase,
         success: false,
-        error: errorMessage,
+        error: sanitizedMessage,
         durationMs,
         timedOut: isTimeout,
       };
@@ -308,12 +307,10 @@ export class PhasedExecutor {
       }
     } catch (error) {
       // コールバックのエラーは無視して継続
-      if (isDevelopment()) {
-        logger.warn(`[PhasedExecutor] onPhaseComplete callback failed`, {
-          phase,
-          error: error instanceof Error ? error.message : String(error),
-        });
-      }
+      logger.warn(`[PhasedExecutor] onPhaseComplete callback failed`, {
+        phase,
+        error: error instanceof Error ? error.message : String(error),
+      });
     }
   }
 

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

@@ -9,6 +9,7 @@
  */
 
 import { logger, isDevelopment } from "../../../utils/logger";
+import { sanitizeErrorMessage } from "../../../utils/sanitize-error";
 import { getQualityEvaluatorService } from "../../../services/page/quality-evaluator.service";
 import { PAGE_ANALYZE_ERROR_CODES, type PageAnalyzeInput } from "../schemas";
 import { type QualityServiceResult } from "./types";
@@ -90,9 +91,7 @@ export async function defaultEvaluateQuality(
 
     return result;
   } catch (error) {
-    if (isDevelopment()) {
-      logger.error("[page.analyze] Quality evaluation failed", { error });
-    }
+    logger.warn("[page.analyze] Quality evaluation failed", { error: (error as Error).message });
 
     return {
       success: false,
@@ -107,7 +106,7 @@ export async function defaultEvaluateQuality(
       processingTimeMs: Date.now() - startTime,
       error: {
         code: PAGE_ANALYZE_ERROR_CODES.QUALITY_EVALUATION_FAILED,
-        message: error instanceof Error ? error.message : "Quality evaluation failed",
+        message: sanitizeErrorMessage(error),
       },
     };
   }

package/src/tools/page/handlers/result-builder.ts

@@ -267,7 +267,7 @@ export function buildQualityResult(
  */
 export function buildNarrativeResult(
   nr: NarrativeHandlerResult,
-  _isSummary: boolean // TODO: summary/full mode実装時に使用
+  isSummary: boolean
 ): NarrativeResult | undefined {
   // スキップされた場合またはnarrativeが存在しない場合はundefined
   if (nr.skipped || !nr.narrative) {
@@ -326,23 +326,26 @@ export function buildNarrativeResult(
   if (narrative.layoutStructure.columnCount !== undefined) {
     base.layoutStructure.columnCount = narrative.layoutStructure.columnCount;
   }
-  if (narrative.layoutStructure.gutterWidth !== undefined) {
-    base.layoutStructure.gutterWidth = narrative.layoutStructure.gutterWidth;
-  }
-  if (narrative.layoutStructure.containerWidth !== undefined) {
-    base.layoutStructure.containerWidth = narrative.layoutStructure.containerWidth;
-  }
-  if (narrative.layoutStructure.visualHierarchy !== undefined) {
-    base.layoutStructure.visualHierarchy = narrative.layoutStructure.visualHierarchy;
-  }
-  if (narrative.layoutStructure.spacingRhythm !== undefined) {
-    base.layoutStructure.spacingRhythm = narrative.layoutStructure.spacingRhythm;
-  }
-  if (narrative.layoutStructure.whitespaceRatio !== undefined) {
-    base.layoutStructure.whitespaceRatio = narrative.layoutStructure.whitespaceRatio;
-  }
-  if (narrative.layoutStructure.visualDensity !== undefined) {
-    base.layoutStructure.visualDensity = narrative.layoutStructure.visualDensity;
+  // Full mode: 詳細フィールドを含める / Full mode: include detailed fields
+  if (!isSummary) {
+    if (narrative.layoutStructure.gutterWidth !== undefined) {
+      base.layoutStructure.gutterWidth = narrative.layoutStructure.gutterWidth;
+    }
+    if (narrative.layoutStructure.containerWidth !== undefined) {
+      base.layoutStructure.containerWidth = narrative.layoutStructure.containerWidth;
+    }
+    if (narrative.layoutStructure.visualHierarchy !== undefined) {
+      base.layoutStructure.visualHierarchy = narrative.layoutStructure.visualHierarchy;
+    }
+    if (narrative.layoutStructure.spacingRhythm !== undefined) {
+      base.layoutStructure.spacingRhythm = narrative.layoutStructure.spacingRhythm;
+    }
+    if (narrative.layoutStructure.whitespaceRatio !== undefined) {
+      base.layoutStructure.whitespaceRatio = narrative.layoutStructure.whitespaceRatio;
+    }
+    if (narrative.layoutStructure.visualDensity !== undefined) {
+      base.layoutStructure.visualDensity = narrative.layoutStructure.visualDensity;
+    }
   }
 
   return base;