@reftrixmcp/mcp-server 0.1.8 → 0.2.0

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

@@ -15,7 +15,9 @@
  * @module tools/page/handlers/embedding-handler
  */
 
+import { createDIFactory } from "../../../utils/di-factory";
 import { isDevelopment, logger } from "../../../utils/logger";
+import { sanitizeErrorMessage } from "../../../utils/sanitize-error";
 import {
   LayoutEmbeddingService,
   saveSectionEmbedding,
@@ -165,24 +167,20 @@ export interface ILayoutEmbeddingServiceForMotion {
   generateFromText(text: string): Promise<{ embedding: number[]; modelName: string }>;
 }
 
-let motionLayoutEmbeddingServiceFactory: (() => ILayoutEmbeddingServiceForMotion) | null = null;
+const motionLayoutEmbeddingServiceDI = createDIFactory<ILayoutEmbeddingServiceForMotion>(
+  "MotionLayoutEmbeddingService"
+);
 let motionLayoutEmbeddingServiceSingleton: ILayoutEmbeddingServiceForMotion | null = null;
 
-/**
- * MotionEmbedding用LayoutEmbeddingServiceファクトリを設定（テスト用）
- */
 export function setMotionLayoutEmbeddingServiceFactory(
   factory: () => ILayoutEmbeddingServiceForMotion
 ): void {
-  motionLayoutEmbeddingServiceFactory = factory;
+  motionLayoutEmbeddingServiceDI.set(factory);
   motionLayoutEmbeddingServiceSingleton = null;
 }
 
-/**
- * MotionEmbedding用LayoutEmbeddingServiceファクトリをリセット（テスト用）
- */
 export function resetMotionLayoutEmbeddingServiceFactory(): void {
-  motionLayoutEmbeddingServiceFactory = null;
+  motionLayoutEmbeddingServiceDI.reset();
   motionLayoutEmbeddingServiceSingleton = null;
 }
 
@@ -190,8 +188,8 @@ export function resetMotionLayoutEmbeddingServiceFactory(): void {
  * MotionEmbedding用LayoutEmbeddingServiceを取得（DI対応、singleton）
  */
 function getMotionLayoutEmbeddingService(): ILayoutEmbeddingServiceForMotion {
-  if (motionLayoutEmbeddingServiceFactory) {
-    return motionLayoutEmbeddingServiceFactory();
+  if (motionLayoutEmbeddingServiceDI.get()) {
+    return motionLayoutEmbeddingServiceDI.get()!();
   }
   // シングルトンで再利用（毎回new LayoutEmbeddingService()するとメモリリスク）
   if (!motionLayoutEmbeddingServiceSingleton) {
@@ -297,15 +295,13 @@ export async function generateSectionEmbeddings(
     for (const section of sections) {
       const dbSectionId = sectionIdMapping.get(section.id);
       if (!dbSectionId) {
-        if (isDevelopment()) {
-          logger.warn("[EmbeddingHandler] Section ID mapping not found, skipping embedding", {
-            originalId: section.id,
-          });
-        }
+        logger.warn("[EmbeddingHandler] Section ID mapping not found, skipping embedding", {
+          originalId: section.id,
+        });
         result.failedCount++;
         result.errors.push({
           sectionId: section.id,
-          error: "Section ID mapping not found",
+          error: "Embedding generation failed",
         });
         try {
           options.onProgress?.(result.generatedCount + result.failedCount, sections.length);
@@ -352,11 +348,9 @@ export async function generateSectionEmbeddings(
         batchEmbeddings = await embeddingService.generateBatchFromTexts(allTexts);
       } catch (batchError) {
         // バッチ推論失敗時は個別フォールバック（後続ループで1件ずつ生成）
-        if (isDevelopment()) {
-          logger.warn("[EmbeddingHandler] Batch embedding failed, falling back to individual", {
-            error: batchError instanceof Error ? batchError.message : "Unknown error",
-          });
-        }
+        logger.warn("[EmbeddingHandler] Batch embedding failed, falling back to individual", {
+          error: batchError instanceof Error ? batchError.message : "Unknown error",
+        });
         batchEmbeddings = [];
       }
     }
@@ -452,42 +446,31 @@ export async function generateSectionEmbeddings(
               };
             }
             result.visionEmbedding.failedCount++;
-            const visionErrorMessage =
-              visionError instanceof Error ? visionError.message : "Unknown error";
             result.visionEmbedding.errors.push({
               sectionId: section.id,
-              error: visionErrorMessage,
+              error: sanitizeErrorMessage(visionError),
             });
 
-            if (isDevelopment()) {
-              logger.warn(
-                "[EmbeddingHandler] VisionEmbedding generation failed (partial success)",
-                {
-                  originalSectionId: section.id,
-                  dbSectionId: dbSectionId,
-                  error: visionErrorMessage,
-                }
-              );
-            }
+            logger.warn("[EmbeddingHandler] VisionEmbedding generation failed (partial success)", {
+              originalSectionId: section.id,
+              dbSectionId: dbSectionId,
+              error: visionError instanceof Error ? visionError.message : "Unknown error",
+            });
           }
         }
       } catch (embeddingError) {
         // Embedding生成失敗時もSectionPatternは保存済み（部分成功）
         result.failedCount++;
-        const errorMessage =
-          embeddingError instanceof Error ? embeddingError.message : "Unknown error";
         result.errors.push({
           sectionId: section.id,
-          error: errorMessage,
+          error: sanitizeErrorMessage(embeddingError),
         });
 
-        if (isDevelopment()) {
-          logger.warn("[EmbeddingHandler] SectionEmbedding generation failed (partial success)", {
-            originalSectionId: section.id,
-            dbSectionId: dbSectionId,
-            error: errorMessage,
-          });
-        }
+        logger.warn("[EmbeddingHandler] SectionEmbedding generation failed (partial success)", {
+          originalSectionId: section.id,
+          dbSectionId: dbSectionId,
+          error: embeddingError instanceof Error ? embeddingError.message : "Unknown error",
+        });
       }
 
       // Granular progress: report after each section (fire-and-forget)
@@ -500,13 +483,10 @@ export async function generateSectionEmbeddings(
   } catch (serviceError) {
     // EmbeddingService初期化失敗時
     result.success = false;
-    const errorMessage = serviceError instanceof Error ? serviceError.message : "Unknown error";
 
-    if (isDevelopment()) {
-      logger.warn("[EmbeddingHandler] EmbeddingService not available", {
-        error: errorMessage,
-      });
-    }
+    logger.warn("[EmbeddingHandler] EmbeddingService not available", {
+      error: serviceError instanceof Error ? serviceError.message : "Unknown error",
+    });
   }
 
   return result;
@@ -597,11 +577,9 @@ export async function generateMotionEmbeddings(
   // IDマッピングがない場合はEmbedding生成をスキップ
   // db-handler.tsでパターンが保存されていない可能性がある
   if (!motionPatternIdMapping || motionPatternIdMapping.size === 0) {
-    if (isDevelopment()) {
-      logger.warn(
-        "[EmbeddingHandler] No motionPatternIdMapping provided, skipping embedding generation"
-      );
-    }
+    logger.warn(
+      "[EmbeddingHandler] No motionPatternIdMapping provided, skipping embedding generation"
+    );
     return result;
   }
 
@@ -610,9 +588,7 @@ export async function generateMotionEmbeddings(
 
     if (!motionPersistenceService.isAvailable()) {
       result.success = false;
-      if (isDevelopment()) {
-        logger.warn("[EmbeddingHandler] MotionPersistenceService not available");
-      }
+      logger.warn("[EmbeddingHandler] MotionPersistenceService not available");
       return result;
     }
 
@@ -628,14 +604,12 @@ export async function generateMotionEmbeddings(
       // 保存済みのパターンIDを取得
       const dbPatternId = motionPatternIdMapping.get(pattern.id);
       if (!dbPatternId) {
-        if (isDevelopment()) {
-          logger.warn("[EmbeddingHandler] Pattern ID mapping not found, skipping embedding", {
-            originalId: pattern.id,
-          });
-        }
+        logger.warn("[EmbeddingHandler] Pattern ID mapping not found, skipping embedding", {
+          originalId: pattern.id,
+        });
         result.errors.push({
           patternId: pattern.id,
-          error: "Pattern ID mapping not found",
+          error: "Embedding generation failed",
         });
         continue;
       }
@@ -669,20 +643,16 @@ export async function generateMotionEmbeddings(
         }
       } catch (embeddingError) {
         // Embedding生成失敗時もパターンは保存済み（部分成功）
-        const errorMessage =
-          embeddingError instanceof Error ? embeddingError.message : "Unknown error";
         result.errors.push({
           patternId: pattern.id,
-          error: errorMessage,
+          error: sanitizeErrorMessage(embeddingError),
         });
 
-        if (isDevelopment()) {
-          logger.warn("[EmbeddingHandler] MotionEmbedding generation failed (partial success)", {
-            originalPatternId: pattern.id,
-            dbPatternId: dbPatternId,
-            error: errorMessage,
-          });
-        }
+        logger.warn("[EmbeddingHandler] MotionEmbedding generation failed (partial success)", {
+          originalPatternId: pattern.id,
+          dbPatternId: dbPatternId,
+          error: embeddingError instanceof Error ? embeddingError.message : "Unknown error",
+        });
       }
 
       // Granular progress: report after each motion pattern (fire-and-forget)
@@ -704,13 +674,10 @@ export async function generateMotionEmbeddings(
   } catch (serviceError) {
     // サービス初期化失敗時
     result.success = false;
-    const errorMessage = serviceError instanceof Error ? serviceError.message : "Unknown error";
 
-    if (isDevelopment()) {
-      logger.warn("[EmbeddingHandler] MotionEmbedding service error", {
-        error: errorMessage,
-      });
-    }
+    logger.warn("[EmbeddingHandler] MotionEmbedding service error", {
+      error: serviceError instanceof Error ? serviceError.message : "Unknown error",
+    });
   }
 
   return result;

package/src/tools/page/handlers/execution-status-tracker.ts

@@ -451,11 +451,9 @@ export class ExecutionStatusTrackerV2 {
       this.options.onStatusChange(this.getStatus());
     } catch (error) {
       // コールバックのエラーは無視して処理を継続
-      if (isDevelopment()) {
-        logger.warn("[ExecutionStatusTrackerV2] onStatusChange callback error", {
-          error: error instanceof Error ? error.message : String(error),
-        });
-      }
+      logger.warn("[ExecutionStatusTrackerV2] onStatusChange callback error", {
+        error: error instanceof Error ? error.message : String(error),
+      });
     }
   }
 }

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

@@ -14,6 +14,7 @@
 
 import type { Browser } from "playwright";
 import { logger, isDevelopment } from "../../../utils/logger";
+import { sanitizeErrorMessage } from "../../../utils/sanitize-error";
 import { getJSAnimationDetectorService } from "../../motion/di-factories";
 import {
   createJSAnimationEmbeddingService,
@@ -589,9 +590,9 @@ export async function saveJSAnimationPatterns(
 
     return totalCount;
   } catch (error) {
-    if (isDevelopment()) {
-      logger.error("[js-animation-handler] Failed to save JS animation patterns", { error });
-    }
+    logger.warn("[js-animation-handler] Failed to save JS animation patterns", {
+      error: (error as Error).message,
+    });
     throw error;
   }
 }
@@ -690,12 +691,9 @@ export async function saveJSAnimationEmbeddings(
         );
         savedCount++;
       } catch (upsertError) {
-        if (isDevelopment()) {
-          logger.warn("[js-animation-handler] Failed to save embedding for pattern", {
-            patternId,
-            error: upsertError instanceof Error ? upsertError.message : "Unknown error",
-          });
-        }
+        logger.warn("[js-animation-handler] Failed to save embedding for pattern", {
+          error: (upsertError as Error).message,
+        });
         // 個別のエラーは無視して続行
       }
     }
@@ -710,9 +708,9 @@ export async function saveJSAnimationEmbeddings(
 
     return savedCount;
   } catch (error) {
-    if (isDevelopment()) {
-      logger.error("[js-animation-handler] Failed to generate/save embeddings", { error });
-    }
+    logger.warn("[js-animation-handler] Failed to generate/save embeddings", {
+      error: (error as Error).message,
+    });
     throw error;
   }
 }
@@ -797,11 +795,9 @@ export async function saveJSAnimationPatternsWithEmbeddings(
 
     return { savedPatternCount, embeddingCount };
   } catch (error) {
-    if (isDevelopment()) {
-      logger.error("[js-animation-handler] Embedding generation error", {
-        error: error instanceof Error ? error.message : "Unknown error",
-      });
-    }
+    logger.warn("[js-animation-handler] Embedding generation error", {
+      error: (error as Error).message,
+    });
     // パターン保存は成功しているのでエラーは投げない
     return { savedPatternCount, embeddingCount: 0 };
   }
@@ -841,12 +837,9 @@ export async function checkPlaywrightAvailability(): Promise<boolean> {
     playwrightAvailabilityCache = true;
     return true;
   } catch (error) {
-    if (isDevelopment()) {
-      logger.warn("[js-animation-handler] Playwright not available", {
-        error: error instanceof Error ? error.message : "Unknown error",
-        hint: 'Run "pnpm exec playwright install chromium" to install Playwright',
-      });
-    }
+    logger.warn("[js-animation-handler] Playwright not available", {
+      error: (error as Error).message,
+    });
     playwrightAvailabilityCache = false;
     return false;
   }
@@ -1129,11 +1122,9 @@ export async function executeJSAnimationMode(
         }
       } catch (dbError) {
         // DB保存エラーは検出結果には影響させない（警告のみ）
-        if (isDevelopment()) {
-          logger.warn("[js-animation-handler] Failed to save patterns to DB, continuing", {
-            error: dbError instanceof Error ? dbError.message : "Unknown error",
-          });
-        }
+        logger.warn("[js-animation-handler] Failed to save patterns to DB, continuing", {
+          error: dbError instanceof Error ? dbError.message : "Unknown error",
+        });
         result.embedding_error = {
           code: "DB_SAVE_ERROR",
           message: dbError instanceof Error ? dbError.message : "Failed to save to DB",
@@ -1189,35 +1180,20 @@ export async function executeJSAnimationMode(
         "For WebGL/3D sites, consider using layoutOptions.disableWebGL: true or motionOptions.detect_js_animations: false";
     }
 
-    // 開発環境では詳細なエラーログを出力
-    if (isDevelopment()) {
-      logger.error("[js-animation-handler] JS animation detection failed", {
-        error,
-        errorCode,
-        url,
-        processingTimeMs,
-        options: {
-          enableCDP: options?.enableCDP ?? JS_ANIMATION_DEFAULTS.ENABLE_CDP,
-          enableWebAnimations:
-            options?.enableWebAnimations ?? JS_ANIMATION_DEFAULTS.ENABLE_WEB_ANIMATIONS,
-          enableLibraryDetection:
-            options?.enableLibraryDetection ?? JS_ANIMATION_DEFAULTS.ENABLE_LIBRARY_DETECTION,
-          waitTime: options?.waitTime ?? JS_ANIMATION_DEFAULTS.WAIT_TIME,
-        },
-        hint,
-      });
-    }
-
-    // 本番環境でも重要なエラー情報を記録（console.errorを使用）
-    // これにより運用時のトラブルシューティングが容易になる
-    console.error(
-      `[js-animation-handler] ${errorCode}: ${errorMessage}${hint ? ` (Hint: ${hint})` : ""}`
-    );
+    // 全環境でエラーログを出力（isDevelopmentガードなし）
+    logger.warn("[js-animation-handler] JS animation detection failed", {
+      errorCode,
+      error: errorMessage,
+      url,
+      processingTimeMs,
+      hint,
+    });
 
+    const sanitized = sanitizeErrorMessage(error);
     return {
       js_animation_error: {
         code: errorCode,
-        message: hint ? `${errorMessage}. ${hint}` : errorMessage,
+        message: hint ? `${sanitized}. ${hint}` : sanitized,
       },
     };
   } finally {

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

@@ -14,6 +14,7 @@
 
 import { v7 as uuidv7 } from "uuid";
 import { logger, isDevelopment } from "../../../utils/logger";
+import { sanitizeErrorMessage } from "../../../utils/sanitize-error";
 import {
   getLayoutAnalyzerService,
   type LayoutAnalysisResult,
@@ -279,37 +280,29 @@ async function extractDeterministicVisualFeatures(
     // Note: Theme detection uses computed styles if available for more accurate results
     const [colorResult, themeResult, densityResult, gradientResult] = await Promise.all([
       colorExtractor.extractColors(imageBuffer).catch((error) => {
-        if (isDevelopment()) {
-          logger.warn("[layout-handler] ColorExtractor failed", {
-            error: error instanceof Error ? error.message : "Unknown error",
-          });
-        }
+        logger.warn("[layout-handler] ColorExtractor failed", {
+          error: error instanceof Error ? error.message : "Unknown error",
+        });
         return undefined;
       }),
       // Use detectThemeWithComputedStyles for more accurate theme detection
       // This prioritizes computed backgroundColor values from Playwright over screenshot analysis
       themeDetector.detectThemeWithComputedStyles(imageBuffer, computedStyles).catch((error) => {
-        if (isDevelopment()) {
-          logger.warn("[layout-handler] ThemeDetector failed", {
-            error: error instanceof Error ? error.message : "Unknown error",
-          });
-        }
+        logger.warn("[layout-handler] ThemeDetector failed", {
+          error: error instanceof Error ? error.message : "Unknown error",
+        });
         return undefined;
       }),
       densityCalculator.calculateDensity(imageBuffer).catch((error) => {
-        if (isDevelopment()) {
-          logger.warn("[layout-handler] DensityCalculator failed", {
-            error: error instanceof Error ? error.message : "Unknown error",
-          });
-        }
+        logger.warn("[layout-handler] DensityCalculator failed", {
+          error: error instanceof Error ? error.message : "Unknown error",
+        });
         return undefined;
       }),
       gradientDetector.detectGradient(imageBuffer).catch((error) => {
-        if (isDevelopment()) {
-          logger.warn("[layout-handler] GradientDetector failed", {
-            error: error instanceof Error ? error.message : "Unknown error",
-          });
-        }
+        logger.warn("[layout-handler] GradientDetector failed", {
+          error: error instanceof Error ? error.message : "Unknown error",
+        });
         return undefined;
       }),
     ]);
@@ -403,12 +396,9 @@ async function extractDeterministicVisualFeatures(
 
     return visualFeatures;
   } catch (error) {
-    if (isDevelopment()) {
-      logger.error("[layout-handler] extractDeterministicVisualFeatures failed", {
-        error: error instanceof Error ? error.message : "Unknown error",
-        processingTimeMs: Date.now() - startTime,
-      });
-    }
+    logger.warn("[layout-handler] extractDeterministicVisualFeatures failed", {
+      error: (error as Error).message,
+    });
     // Graceful degradation - return undefined, don't throw
     return undefined;
   }
@@ -505,11 +495,9 @@ async function executePageVisionAnalysis(
         }
       } catch (hwError) {
         // ハードウェア検出失敗時はCPUと仮定（安全側）
-        if (isDevelopment()) {
-          logger.warn("[layout-handler] Hardware detection failed, assuming CPU", {
-            error: hwError instanceof Error ? hwError.message : "Unknown error",
-          });
-        }
+        logger.warn("[layout-handler] Hardware detection failed, assuming CPU", {
+          error: hwError instanceof Error ? hwError.message : "Unknown error",
+        });
       }
 
       // Phase 4: 進捗報告 - ハードウェア検出完了 (5%)
@@ -570,11 +558,9 @@ async function executePageVisionAnalysis(
           }
         } catch (optError) {
           // 最適化失敗時は元の画像を使用
-          if (isDevelopment()) {
-            logger.warn("[layout-handler] Image optimization failed, using original", {
-              error: optError instanceof Error ? optError.message : "Unknown error",
-            });
-          }
+          logger.warn("[layout-handler] Image optimization failed, using original", {
+            error: optError instanceof Error ? optError.message : "Unknown error",
+          });
         }
       }
 
@@ -686,11 +672,9 @@ async function executePageVisionAnalysis(
             }
           }
         } catch (boundaryError) {
-          if (isDevelopment()) {
-            logger.warn("[layout-handler] Section boundary detection error (non-critical)", {
-              error: boundaryError instanceof Error ? boundaryError.message : "Unknown error",
-            });
-          }
+          logger.warn("[layout-handler] Section boundary detection error (non-critical)", {
+            error: (boundaryError as Error).message,
+          });
           // セクション境界検出エラーは非クリティカル - 続行
         }
 
@@ -710,13 +694,11 @@ async function executePageVisionAnalysis(
         // ================================================================
         const isTimeout = visionError instanceof Error && visionError.message.includes("timeout");
 
-        if (isDevelopment()) {
-          logger.warn("[layout-handler] Vision analysis failed", {
-            error: visionError instanceof Error ? visionError.message : "Unknown error",
-            isTimeout,
-            fallbackEnabled: visionFallbackToHtmlOnly,
-          });
-        }
+        logger.warn("[layout-handler] Vision analysis failed", {
+          error: visionError instanceof Error ? visionError.message : "Unknown error",
+          isTimeout,
+          fallbackEnabled: visionFallbackToHtmlOnly,
+        });
 
         if (visionFallbackToHtmlOnly) {
           // Graceful Degradation: HTML解析のみで続行
@@ -739,11 +721,7 @@ async function executePageVisionAnalysis(
             progressReporter.complete();
           }
 
-          if (isDevelopment()) {
-            logger.info(
-              "[layout-handler] Graceful Degradation: continuing with HTML analysis only"
-            );
-          }
+          logger.warn("[layout-handler] Graceful Degradation: continuing with HTML analysis only");
         } else {
           // フォールバック無効: エラーを再スロー
           throw visionError;
@@ -770,9 +748,9 @@ async function executePageVisionAnalysis(
       }
     }
   } catch (visionError) {
-    if (isDevelopment()) {
-      logger.error("[layout-handler] Vision analysis failed", { error: visionError });
-    }
+    logger.warn("[layout-handler] Vision analysis failed", {
+      error: (visionError as Error).message,
+    });
 
     result.visionFeatures = {
       success: false,
@@ -999,11 +977,9 @@ async function executePerSectionVisionAnalysis(
       });
     }
   } catch (perSectionError) {
-    if (isDevelopment()) {
-      logger.error("[layout-handler] Per-section Vision analysis failed", {
-        error: perSectionError instanceof Error ? perSectionError.message : "Unknown error",
-      });
-    }
+    logger.warn("[layout-handler] Per-section Vision analysis failed", {
+      error: (perSectionError as Error).message,
+    });
 
     for (const section of sections) {
       if (section.position && !section.visionFeatures) {
@@ -1167,9 +1143,9 @@ export async function defaultAnalyzeLayout(
           }
         }
       } catch (error) {
-        if (isDevelopment()) {
-          logger.warn("[layout-handler] CSS variable extraction failed", { error });
-        }
+        logger.warn("[layout-handler] CSS variable extraction failed", {
+          error: (error as Error).message,
+        });
         // エラー時はcssVariablesを省略（Graceful Degradation）
       }
     }
@@ -1227,11 +1203,9 @@ export async function defaultAnalyzeLayout(
         });
       }
     } catch (bgError) {
-      if (isDevelopment()) {
-        logger.warn("[layout-handler] Background design detection failed", {
-          error: bgError instanceof Error ? bgError.message : String(bgError),
-        });
-      }
+      logger.warn("[layout-handler] Background design detection failed", {
+        error: (bgError as Error).message,
+      });
       // Graceful Degradation: 背景デザイン検出失敗はpage.analyzeを中断しない
     }
 
@@ -1405,9 +1379,7 @@ export async function defaultAnalyzeLayout(
 
     return result;
   } catch (error) {
-    if (isDevelopment()) {
-      logger.error("[layout-handler] defaultAnalyzeLayout error", { error });
-    }
+    logger.warn("[layout-handler] defaultAnalyzeLayout error", { error: (error as Error).message });
 
     return {
       success: false,
@@ -1416,7 +1388,7 @@ export async function defaultAnalyzeLayout(
       processingTimeMs: Date.now() - startTime,
       error: {
         code: PAGE_ANALYZE_ERROR_CODES.LAYOUT_ANALYSIS_FAILED,
-        message: error instanceof Error ? error.message : "Layout analysis failed",
+        message: sanitizeErrorMessage(error),
       },
     };
   }