@reftrixmcp/mcp-server 0.1.7 → 0.2.0

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

@@ -16,17 +16,19 @@
  */
 
 import { ZodError } from "zod";
+import { createDIFactory } from "../../utils/di-factory";
 import { logger, isDevelopment } from "../../utils/logger";
-import { sanitizeHtml } from "../../utils/html-sanitizer";
+import { sanitizeErrorMessage } from "../../utils/sanitize-error";
+import {
+  generateCacheKey,
+  getCachedResult,
+  setCachedResult,
+} from "../../services/search-cache.service";
 import {
   layoutSearchInputSchema,
   LAYOUT_MCP_ERROR_CODES,
   type LayoutSearchInput,
   type LayoutSearchOutput,
-  type LayoutSearchFilters,
-  type LayoutSearchResultItem,
-  type ProjectContextOptions,
-  type IntegrationHints,
   type InferredContextOutput,
 } from "./schemas";
 import {
@@ -39,1345 +41,93 @@ import type { IPrismaClient } from "../../services/preference-profile.service";
 import {
   ProjectContextAnalyzer,
   type ProjectPatterns,
-} from "../../services/project-context-analyzer";
-import type {
-  VisionSearchQuery as VisionSearchQueryService,
-  VisionSearchOptions as VisionSearchOptionsService,
-  HybridSearchOptions,
-  VisionSearchResult,
-  VisionSearchServiceResult,
-} from "../../services/vision-embedding-search.service";
-import type { MoodBrandToneSearchService } from "../../services/search/mood-brandtone-search.service";
-import type { Mood, BrandTone } from "../../schemas/mood-brandtone-filters";
-
-// =====================================================
-// 型定義
-// =====================================================
-
-export type { LayoutSearchInput, LayoutSearchOutput };
-
-/**
- * 検索オプション
- * MCP-RESP-03: include_html (snake_case) を正式形式とし、
- * includeHtml (camelCase) はレガシー互換として維持
- */
-export interface SearchOptions {
-  filters?: LayoutSearchFilters | undefined;
-  limit: number;
-  offset: number;
-  /** HTMLを含めるか（snake_case正式形式） */
-  include_html: boolean;
-  /** @deprecated include_html を使用してください */
-  includeHtml?: boolean;
-  project_context?: ProjectContextOptions | undefined;
-}
-
-/**
- * 検索結果（サービスから返される形式）
- */
-/**
- * VisionAnalysis 結果（layout.inspect Vision分析の結果）
- */
-export interface VisionAnalysisResult {
-  success: boolean;
-  features: Array<{
-    type: string;
-    confidence: number;
-    description?: string;
-    data?: unknown;
-  }>;
-  textRepresentation?: string;
-  processingTimeMs?: number;
-  modelName?: string;
-  rawResponse?: string;
-  error?: string;
-}
-
-/**
- * VisualFeatures テーマ情報
- */
-export interface VisualFeaturesTheme {
-  type: "light" | "dark" | "mixed";
-  backgroundColor?: string;
-  textColor?: string;
-  contrastRatio?: number;
-  luminance?: {
-    background: number;
-    text: number;
-  };
-  source?: string;
-  confidence?: number;
-}
-
-/**
- * VisualFeatures カラー情報
- */
-export interface VisualFeaturesColors {
-  dominant?: string;
-  accent?: string[];
-  palette?: string[];
-}
-
-/**
- * VisualFeatures 密度情報
- */
-export interface VisualFeaturesDensity {
-  contentDensity?: number;
-  whitespaceRatio?: number;
-  visualBalance?: number;
-}
-
-/**
- * VisualFeatures 統合情報
- */
-export interface VisualFeatures {
-  theme?: VisualFeaturesTheme;
-  colors?: VisualFeaturesColors;
-  density?: VisualFeaturesDensity;
-}
-
-export interface SearchResult {
-  id: string;
-  webPageId: string;
-  sectionType: string;
-  sectionName?: string;
-  similarity: number;
-  layoutInfo?: {
-    type?: string;
-    heading?: string;
-    description?: string;
-    grid?: unknown;
-    visionAnalysis?: VisionAnalysisResult;
-    visualFeatures?: VisualFeatures;
-  };
-  visualFeatures?: VisualFeatures;
-  htmlSnippet?: string;
-  webPage: {
-    id: string;
-    url: string;
-    title?: string;
-    sourceType: string;
-    usageScope: string;
-    screenshotDesktopUrl?: string | null;
-  };
-  // RRF統合検索時の情報（combined モード時のみ）
-  rrfDetails?: {
-    textRank: number; // テキスト検索でのランク（0=含まれない）
-    visionRank: number; // Vision検索でのランク（0=含まれない）
-    textScore?: number;
-    visionScore?: number;
-    rrfScore?: number;
-  };
-}
-
-/**
- * 検索サービスの結果
- */
-export interface SearchServiceResult {
-  results: SearchResult[];
-  total: number;
-}
-
-/**
- * layout.search サービスインターフェース（DI用）
- */
-export interface ILayoutSearchService {
-  /**
-   * クエリテキストからEmbeddingを生成
-   * EmbeddingServiceが利用できない場合はnullを返す
-   */
-  generateQueryEmbedding: (query: string) => Promise<number[] | null>;
-
-  /**
-   * セクションパターンを検索（ベクトル検索のみ）
-   */
-  searchSectionPatterns: (
-    embedding: number[],
-    options: SearchOptions
-  ) => Promise<SearchServiceResult | null>;
-
-  /**
-   * ハイブリッド検索: ベクトル検索 + 全文検索をRRFで統合
-   * 実装されていない場合はsearchSectionPatternsにフォールバック
-   */
-  searchSectionPatternsHybrid?: (
-    queryText: string,
-    embedding: number[],
-    options: SearchOptions
-  ) => Promise<SearchServiceResult | null>;
-}
-
-/**
- * Vision検索サービスインターフェース（DI用）
- * Phase 4-2: visionEmbeddingベースのセマンティック検索
- */
-export interface IVisionSearchService {
-  /**
-   * vision_embeddingでセマンティック検索
-   */
-  searchByVisionEmbedding: (
-    query: VisionSearchQueryService,
-    options: VisionSearchOptionsService
-  ) => Promise<VisionSearchServiceResult | null>;
-
-  /**
-   * ハイブリッド検索（text_embedding + vision_embedding）
-   * RRF (Reciprocal Rank Fusion) で結果を統合
-   */
-  hybridSearch: (
-    textQuery: string,
-    visionQuery: VisionSearchQueryService,
-    options: HybridSearchOptions
-  ) => Promise<VisionSearchServiceResult | null>;
-}
-
-// =====================================================
-// サービスファクトリー（DI）
-// =====================================================
-
-let serviceFactory: (() => ILayoutSearchService) | null = null;
-
-/**
- * VisionSearchサービスファクトリー（DI）
- * Phase 4-2: visionEmbeddingベースの検索
- */
-let visionSearchServiceFactory: (() => IVisionSearchService) | null = null;
-
-/**
- * ProjectContextAnalyzer シングルトンインスタンス
- */
-let projectContextAnalyzer: ProjectContextAnalyzer | null = null;
-
-/**
- * ProjectContextAnalyzer インスタンスを取得
- */
-function getProjectContextAnalyzer(): ProjectContextAnalyzer {
-  if (!projectContextAnalyzer) {
-    projectContextAnalyzer = new ProjectContextAnalyzer();
-  }
-  return projectContextAnalyzer;
-}
-
-/**
- * サービスファクトリーを設定
- */
-export function setLayoutSearchServiceFactory(factory: () => ILayoutSearchService): void {
-  serviceFactory = factory;
-}
-
-/**
- * サービスファクトリーをリセット
- */
-export function resetLayoutSearchServiceFactory(): void {
-  serviceFactory = null;
-}
-
-/**
- * VisionSearchサービスファクトリーを設定
- * Phase 4-2: visionEmbeddingベースの検索
- */
-export function setVisionSearchServiceFactory(factory: () => IVisionSearchService): void {
-  visionSearchServiceFactory = factory;
-}
-
-/**
- * VisionSearchサービスファクトリーをリセット
- */
-export function resetVisionSearchServiceFactory(): void {
-  visionSearchServiceFactory = null;
-}
-
-/**
- * ProjectContextAnalyzer をリセット（テスト用）
- */
-export function resetProjectContextAnalyzer(): void {
-  if (projectContextAnalyzer) {
-    projectContextAnalyzer.clearCache();
-  }
-  projectContextAnalyzer = null;
-}
-
-/**
- * MoodBrandToneSearchサービスファクトリー（DI）
- * GREEN Phase: mood/brandTone semantic search
- */
-let moodBrandToneSearchServiceFactory: (() => MoodBrandToneSearchService) | null = null;
-
-/**
- * MoodBrandToneSearchサービスファクトリーを設定
- */
-export function setMoodBrandToneSearchServiceFactory(
-  factory: () => MoodBrandToneSearchService
-): void {
-  moodBrandToneSearchServiceFactory = factory;
-}
-
-/**
- * MoodBrandToneSearchサービスファクトリーをリセット
- */
-export function resetMoodBrandToneSearchServiceFactory(): void {
-  moodBrandToneSearchServiceFactory = null;
-}
-
-/**
- * PrismaClientファクトリー（嗜好リランキング用DI）
- * PrismaClient factory (DI for preference reranking)
- */
-let prismaClientFactory: (() => IPrismaClient) | null = null;
-
-/**
- * PrismaClientファクトリーを設定（嗜好リランキング用）
- * Set PrismaClient factory (for preference reranking)
- */
-export function setLayoutSearchPrismaClientFactory(factory: () => IPrismaClient): void {
-  prismaClientFactory = factory;
-}
-
-/**
- * PrismaClientファクトリーをリセット（テスト用）
- * Reset PrismaClient factory (for testing)
- */
-export function resetLayoutSearchPrismaClientFactory(): void {
-  prismaClientFactory = null;
-}
-
-// =====================================================
-// クエリ前処理
-// =====================================================
-
-/**
- * 検索クエリを前処理する
- * - E5モデル用のquery:プレフィックスを追加
- * - 空白の正規化
- * - 全角スペースの半角変換
- *
- * @param query - 元のクエリ文字列
- * @returns 前処理されたクエリ文字列
- */
-export function preprocessQuery(query: string): string {
-  // 1. 全角スペースを半角に変換
-  let normalized = query.replace(/\u3000/g, " ");
-
-  // 2. 改行・タブを空白に変換
-  normalized = normalized.replace(/[\n\t\r]/g, " ");
-
-  // 3. 連続する空白を1つに正規化
-  normalized = normalized.replace(/\s+/g, " ");
-
-  // 4. 前後の空白を除去
-  normalized = normalized.trim();
-
-  // 5. E5モデル用のquery:プレフィックスを追加
-  return `query: ${normalized}`;
-}
-
-// =====================================================
-// エラーコード判定
-// =====================================================
-
-/**
- * エラーからエラーコードを判定
- */
-function determineErrorCode(error: Error | string): string {
-  const message = typeof error === "string" ? error : error.message;
-  const lowerMessage = message.toLowerCase();
-
-  // Embeddingエラー
-  if (
-    lowerMessage.includes("embedding") ||
-    lowerMessage.includes("model") ||
-    lowerMessage.includes("tensor")
-  ) {
-    return "EMBEDDING_ERROR";
-  }
-
-  // データベースエラー
-  if (
-    lowerMessage.includes("database") ||
-    lowerMessage.includes("prisma") ||
-    lowerMessage.includes("connection")
-  ) {
-    return LAYOUT_MCP_ERROR_CODES.SEARCH_FAILED;
-  }
-
-  // タイムアウトエラー
-  if (lowerMessage.includes("timeout")) {
-    return LAYOUT_MCP_ERROR_CODES.TIMEOUT;
-  }
-
-  // その他は内部エラー
-  return LAYOUT_MCP_ERROR_CODES.INTERNAL_ERROR;
-}
-
-// =====================================================
-// 結果マッピング
-// =====================================================
-
-/**
- * Adaptability情報（オプション）
- */
-interface AdaptabilityInfo {
-  score: number;
-  hints: IntegrationHints;
-}
-
-/**
- * HTMLプレビュー生成オプション
- */
-interface PreviewOptions {
-  /** プレビューを含めるか（デフォルト: true） */
-  includePreview: boolean;
-  /** プレビューの最大文字数（デフォルト: 500） */
-  maxLength: number;
-}
-
-/**
- * HTMLスニペットからサニタイズ済みプレビューを生成
- *
- * @param htmlSnippet - 元のHTMLスニペット
- * @param maxLength - 最大文字数
- * @returns サニタイズ・切り詰め済みHTMLプレビューと元の長さ
- */
-function generateHtmlPreview(
-  htmlSnippet: string,
-  maxLength: number
-): { htmlPreview: string; previewLength: number } {
-  // 1. HTMLをサニタイズ（XSS対策）
-  const sanitized = sanitizeHtml(htmlSnippet);
-
-  // 元の長さを記録
-  const previewLength = sanitized.length;
-
-  // 2. 最大長に切り詰め
-  let htmlPreview = sanitized;
-  if (sanitized.length > maxLength) {
-    // タグの途中で切らないように、最後の完全なタグまで切り詰める
-    htmlPreview = sanitized.substring(0, maxLength);
-
-    // 開いているタグを検出して閉じる試み
-    // 簡易的に最後の不完全なタグを除去
-    const lastOpenTagIndex = htmlPreview.lastIndexOf("<");
-    const lastCloseTagIndex = htmlPreview.lastIndexOf(">");
-
-    if (lastOpenTagIndex > lastCloseTagIndex) {
-      // 不完全なタグがある場合、その前まで切り詰め
-      htmlPreview = htmlPreview.substring(0, lastOpenTagIndex);
-    }
-
-    // 省略記号を追加
-    htmlPreview = htmlPreview.trimEnd() + "...";
-  }
-
-  return { htmlPreview, previewLength };
-}
-
-/**
- * バリデーション済み入力からinclude_htmlを取得
- * MCP-RESP-03: snake_case (include_html) を優先し、camelCase (includeHtml) はフォールバック
- */
-function getIncludeHtml(validated: LayoutSearchInput): boolean {
-  // snake_case優先
-  if (validated.include_html !== undefined) {
-    return validated.include_html;
-  }
-  // camelCaseフォールバック（後方互換）
-  return validated.includeHtml ?? false;
-}
-
-/**
- * 検索結果をMCPレスポンス形式にマップ
- * @param result - 検索結果
- * @param include_html - HTMLを含めるか（snake_case正式形式）
- */
-function mapSearchResult(
-  result: SearchResult,
-  include_html: boolean,
-  adaptability?: AdaptabilityInfo,
-  semanticInfo?: {
-    moodInfo?: { primary: Mood; secondary?: Mood | undefined };
-    brandToneInfo?: { primary: BrandTone; secondary?: BrandTone | undefined };
-  },
-  previewOptions?: PreviewOptions,
-  contextBoost?: number
-): LayoutSearchResultItem {
-  const preview: LayoutSearchResultItem["preview"] = {};
-
-  // プレビュー情報を抽出
-  if (result.layoutInfo) {
-    if (result.layoutInfo.heading) {
-      preview.heading = result.layoutInfo.heading;
-    }
-    if (result.layoutInfo.description) {
-      preview.description = result.layoutInfo.description;
-    }
-  }
-
-  // サムネイル（スクリーンショットURL）
-  if (result.webPage.screenshotDesktopUrl) {
-    preview.thumbnail = result.webPage.screenshotDesktopUrl;
-  }
-
-  const item: LayoutSearchResultItem = {
-    id: result.id,
-    webPageId: result.webPageId,
-    type: result.sectionType,
-    similarity: result.similarity,
-    preview,
-    source: {
-      url: result.webPage.url,
-      type: result.webPage.sourceType as "award_gallery" | "user_provided",
-      usageScope: result.webPage.usageScope as "inspiration_only" | "owned_asset",
-    },
-  };
-
-  // HTMLを含める場合
-  if (include_html && result.htmlSnippet) {
-    item.html = sanitizeHtml(result.htmlSnippet);
-  }
-
-  // HTMLプレビューを含める場合（デフォルト有効）
-  const shouldIncludePreview = previewOptions?.includePreview ?? true;
-  const maxLength = previewOptions?.maxLength ?? 500;
-
-  if (shouldIncludePreview && result.htmlSnippet) {
-    const { htmlPreview, previewLength } = generateHtmlPreview(result.htmlSnippet, maxLength);
-    item.htmlPreview = htmlPreview;
-    item.previewLength = previewLength;
-  }
-
-  // Vision分析結果を含める（存在する場合）
-  if (result.layoutInfo?.visionAnalysis) {
-    item.visionAnalysis = result.layoutInfo.visionAnalysis;
-  }
-
-  // Adaptability情報を含める（project_context.enabled=true時）
-  if (adaptability) {
-    item.adaptability_score = adaptability.score;
-    item.integration_hints = adaptability.hints;
-  }
-
-  // TASK-06-3 Step 2: セマンティックメタデータを含める（mood/brandTone検索結果がある場合）
-  if (semanticInfo?.moodInfo) {
-    item.moodInfo = semanticInfo.moodInfo;
-  }
-  if (semanticInfo?.brandToneInfo) {
-    item.brandToneInfo = semanticInfo.brandToneInfo;
-  }
-
-  // REFTRIX-LAYOUT-02: Context boost
-  if (contextBoost !== undefined && contextBoost > 0) {
-    item.context_boost = contextBoost;
-  }
-
-  // RRF統合検索時の詳細情報（combined モード時のみ）
-  if (result.rrfDetails) {
-    item.rrfDetails = result.rrfDetails;
-  }
-
-  return item;
-}
-
-// =====================================================
-// Vision検索実行（Phase 4-2）
-// =====================================================
-
-/**
- * VisionSearchResult を SearchResult に変換
- */
-function mapVisionResultToSearchResult(visionResult: VisionSearchResult): SearchResult {
-  const result: SearchResult = {
-    id: visionResult.id,
-    webPageId: visionResult.webPageId,
-    sectionType: visionResult.sectionType,
-    similarity: visionResult.similarity,
-    webPage: {
-      id: visionResult.webPage.id,
-      url: visionResult.webPage.url,
-      sourceType: visionResult.webPage.sourceType,
-      usageScope: visionResult.webPage.usageScope,
-      screenshotDesktopUrl: visionResult.webPage.screenshotDesktopUrl,
-    },
-  };
-
-  // Optional fields - only set if defined
-  if (visionResult.sectionName) {
-    result.sectionName = visionResult.sectionName;
-  }
-  if (visionResult.webPage.title) {
-    result.webPage.title = visionResult.webPage.title;
-  }
-  // layoutInfo: 存在する場合にオブジェクトを構築
-  if (visionResult.layoutInfo !== undefined) {
-    const layoutInfoSrc = visionResult.layoutInfo;
-    const layoutInfo: NonNullable<SearchResult["layoutInfo"]> = {};
-    if (typeof layoutInfoSrc["type"] === "string") {
-      layoutInfo.type = layoutInfoSrc["type"];
-    }
-    if (typeof layoutInfoSrc["heading"] === "string") {
-      layoutInfo.heading = layoutInfoSrc["heading"];
-    }
-    if (typeof layoutInfoSrc["description"] === "string") {
-      layoutInfo.description = layoutInfoSrc["description"];
-    }
-    if (layoutInfoSrc["grid"] !== undefined) {
-      layoutInfo.grid = layoutInfoSrc["grid"];
-    }
-    if (layoutInfoSrc["visionAnalysis"] !== undefined) {
-      layoutInfo.visionAnalysis = layoutInfoSrc["visionAnalysis"] as VisionAnalysisResult;
-    }
-    if (layoutInfoSrc["visualFeatures"] !== undefined) {
-      layoutInfo.visualFeatures = layoutInfoSrc["visualFeatures"] as VisualFeatures;
-    }
-    result.layoutInfo = layoutInfo;
-  }
-  // visualFeatures: 存在する場合にオブジェクトを構築
-  // VisualFeaturesはtheme?, colors?, density?の複合型
-  if (visionResult.visualFeatures !== undefined) {
-    const vfSrc = visionResult.visualFeatures;
-    const visualFeatures: VisualFeatures = {};
-    // theme: VisualFeaturesTheme型（type, backgroundColor, textColor, contrastRatio, luminance, source, confidence）
-    if (vfSrc["theme"] !== undefined && typeof vfSrc["theme"] === "object") {
-      visualFeatures.theme = vfSrc["theme"] as VisualFeaturesTheme;
-    }
-    // colors: VisualFeaturesColors型（dominant?, accent?, palette?）
-    if (vfSrc["colors"] !== undefined && typeof vfSrc["colors"] === "object") {
-      visualFeatures.colors = vfSrc["colors"] as VisualFeaturesColors;
-    }
-    // density: VisualFeaturesDensity型（contentDensity?, whitespaceRatio?, visualBalance?）
-    if (vfSrc["density"] !== undefined && typeof vfSrc["density"] === "object") {
-      visualFeatures.density = vfSrc["density"] as VisualFeaturesDensity;
-    }
-    result.visualFeatures = visualFeatures;
-  }
-  if (visionResult.htmlSnippet) {
-    result.htmlSnippet = visionResult.htmlSnippet;
-  }
-
-  // RRF詳細情報（combined モード時のみ）
-  if (visionResult.textRank !== undefined || visionResult.visionRank !== undefined) {
-    result.rrfDetails = {
-      textRank: visionResult.textRank ?? 0,
-      visionRank: visionResult.visionRank ?? 0,
-    };
-    if (visionResult.rrfDetails) {
-      if (visionResult.rrfDetails.textScore !== undefined) {
-        result.rrfDetails.textScore = visionResult.rrfDetails.textScore;
-      }
-      if (visionResult.rrfDetails.visionScore !== undefined) {
-        result.rrfDetails.visionScore = visionResult.rrfDetails.visionScore;
-      }
-      if (visionResult.rrfDetails.combinedScore !== undefined) {
-        result.rrfDetails.rrfScore = visionResult.rrfDetails.combinedScore;
-      }
-    }
-  }
-
-  return result;
-}
-
-/**
- * Vision検索を実行（Phase 4-2）
- * useVisionSearch=true の場合に呼び出される
- *
- * @param validated - バリデーション済み入力
- * @param startTime - 開始時刻
- */
-async function executeVisionSearch(
-  validated: LayoutSearchInput,
-  startTime: number
-): Promise<LayoutSearchOutput> {
-  // VisionSearchサービスチェック
-  if (!visionSearchServiceFactory) {
-    if (isDevelopment()) {
-      logger.warn(
-        "[MCP Tool] layout.search vision search service not available, falling back to text search"
-      );
-    }
-
-    // フォールバック: 通常の検索を実行（サービスがない場合）
-    return {
-      success: false,
-      error: {
-        code: "VISION_SEARCH_UNAVAILABLE",
-        message:
-          "Vision search service is not available. Set use_vision_search=false to use text-only search.",
-      },
-    };
-  }
-
-  const visionService = visionSearchServiceFactory();
-
-  // VisionSearchQueryの構築
-  const visionQuery: VisionSearchQueryService = {
-    textQuery: validated.vision_search_query?.textQuery ?? validated.query,
-  };
-
-  // visualFeaturesが定義されている場合のみ追加
-  if (validated.vision_search_query?.visualFeatures) {
-    const vf = validated.vision_search_query.visualFeatures;
-    const visualFeatures: NonNullable<VisionSearchQueryService["visualFeatures"]> = {};
-
-    if (vf.theme) visualFeatures.theme = vf.theme;
-    if (vf.colors) visualFeatures.colors = vf.colors;
-    if (vf.density) visualFeatures.density = vf.density;
-    if (vf.gradient) visualFeatures.gradient = vf.gradient;
-    if (vf.mood) visualFeatures.mood = vf.mood;
-    if (vf.brandTone) visualFeatures.brandTone = vf.brandTone;
-
-    visionQuery.visualFeatures = visualFeatures;
-  }
-
-  // sectionPatternIdが定義されている場合のみ追加
-  if (validated.vision_search_query?.sectionPatternId) {
-    visionQuery.sectionPatternId = validated.vision_search_query.sectionPatternId;
-  }
-
-  // VisionSearchOptionsの構築
-  const visionOptions: HybridSearchOptions = {
-    limit: validated.limit,
-    offset: validated.offset,
-    minSimilarity: validated.vision_search_options?.minSimilarity ?? 0.5,
-    visionWeight: validated.vision_search_options?.visionWeight ?? 0.6,
-    textWeight: validated.vision_search_options?.textWeight ?? 0.4,
-  };
-
-  // フィルターが定義されている場合のみ追加
-  if (validated.filters?.sectionType) {
-    visionOptions.sectionType = validated.filters.sectionType;
-  }
-  if (validated.filters?.sourceType) {
-    visionOptions.sourceType = validated.filters.sourceType;
-  }
-  if (validated.filters?.usageScope) {
-    visionOptions.usageScope = validated.filters.usageScope;
-  }
-
-  if (isDevelopment()) {
-    logger.debug("[MCP Tool] layout.search executing vision search", {
-      visionQuery,
-      visionOptions,
-    });
-  }
-
-  try {
-    // ハイブリッド検索を実行（text_embedding + vision_embedding のRRF統合）
-    const visionResult = await visionService.hybridSearch(
-      validated.query,
-      visionQuery,
-      visionOptions
-    );
-
-    if (!visionResult) {
-      return {
-        success: true,
-        data: {
-          results: [],
-          total: 0,
-          query: validated.query,
-          filters: validated.filters ?? {},
-          searchTimeMs: Date.now() - startTime,
-        },
-      };
-    }
-
-    // Vision結果を標準形式にマップ
-    const previewOptions: PreviewOptions = {
-      includePreview: validated.include_preview,
-      maxLength: validated.preview_max_length,
-    };
-
-    const includeHtmlValue = getIncludeHtml(validated);
-    const mappedResults = visionResult.results.map((vr) => {
-      const searchResult = mapVisionResultToSearchResult(vr);
-      return mapSearchResult(
-        searchResult,
-        includeHtmlValue,
-        undefined, // adaptability
-        undefined, // semanticInfo
-        previewOptions
-      );
-    });
-
-    const searchTimeMs = Date.now() - startTime;
-
-    if (isDevelopment()) {
-      logger.info("[MCP Tool] layout.search vision search completed", {
-        query: validated.query,
-        use_vision_search: true,
-        resultCount: mappedResults.length,
-        total: visionResult.total,
-        searchTimeMs,
-      });
-    }
-
-    return {
-      success: true,
-      data: {
-        results: mappedResults,
-        total: visionResult.total,
-        query: validated.query,
-        filters: validated.filters ?? {},
-        searchTimeMs,
-      },
-    };
-  } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    const errorCode = determineErrorCode(error instanceof Error ? error : errorMessage);
+} from "../../services/project-context-analyzer";
+import type { MoodBrandToneSearchService } from "../../services/search/mood-brandtone-search.service";
+import type { Mood, BrandTone } from "../../schemas/mood-brandtone-filters";
 
-    if (isDevelopment()) {
-      logger.error("[MCP Tool] layout.search vision search error", {
-        code: errorCode,
-        error: errorMessage,
-      });
-    }
+// ヘルパー・型定義（search-helpers.ts から）
+import {
+  type ILayoutSearchService,
+  type IVisionSearchService,
+  type SearchOptions,
+  type AdaptabilityInfo,
+  type PreviewOptions,
+  preprocessQuery,
+  determineErrorCode,
+  getIncludeHtml,
+  mapSearchResult,
+} from "./search-helpers";
+
+// 検索実行関数（search-executor.ts から）
+import { executeVisionSearch, executeMultimodalSearch } from "./search-executor";
 
-    return {
-      success: false,
-      error: {
-        code: errorCode,
-        message: errorMessage,
-      },
-    };
-  }
-}
+// =====================================================
+// Re-exports（後方互換性維持）
+// =====================================================
+
+export type { LayoutSearchInput, LayoutSearchOutput };
+
+// search-helpers.ts の型・関数を re-export
+export type {
+  SearchOptions,
+  VisionAnalysisResult,
+  VisualFeaturesTheme,
+  VisualFeaturesColors,
+  VisualFeaturesDensity,
+  VisualFeatures,
+  SearchResult,
+  SearchServiceResult,
+  ILayoutSearchService,
+  IVisionSearchService,
+} from "./search-helpers";
+export { preprocessQuery, calculateRrfScore, determineSearchMode } from "./search-helpers";
 
 // =====================================================
-// Multimodal Search / RRF Functions
+// サービスファクトリー（DI）
 // =====================================================
 
+const serviceFactoryDI = createDIFactory<ILayoutSearchService>("LayoutSearchService");
+const visionSearchServiceDI = createDIFactory<IVisionSearchService>("VisionSearchService");
+
 /**
- * RRF (Reciprocal Rank Fusion) スコアを計算
- *
- * 公式: score = 1 / (k + rank)
- *
- * @param textRank - テキスト検索でのランク（1から開始、0は未検索）
- * @param visionRank - Vision検索でのランク（1から開始、0は未検索）
- * @param textWeight - テキスト検索の重み（デフォルト0.6）
- * @param visionWeight - Vision検索の重み（デフォルト0.4）
- * @param k - RRFのkパラメータ（デフォルト60）
+ * ProjectContextAnalyzer シングルトンインスタンス
  */
-export function calculateRrfScore(
-  textRank: number,
-  visionRank: number,
-  textWeight: number = 0.6,
-  visionWeight: number = 0.4,
-  k: number = 60
-): number {
-  const textScore = textRank > 0 ? 1 / (k + textRank) : 0;
-  const visionScore = visionRank > 0 ? 1 / (k + visionRank) : 0;
-  return textWeight * textScore + visionWeight * visionScore;
-}
+let projectContextAnalyzer: ProjectContextAnalyzer | null = null;
 
 /**
- * 検索モードを決定し、必要に応じてフォールバック（Graceful Degradation）
- *
- * @param requestedMode - 要求された検索モード
- * @param hasVisionService - VisionSearchServiceが利用可能か
- * @param hasVisionEmbeddings - vision_embeddingが存在するか（DBチェック）
- * @returns 実際の検索モードと警告メッセージ
+ * ProjectContextAnalyzer インスタンスを取得
  */
-export function determineSearchMode(
-  requestedMode: "text_only" | "vision_only" | "combined",
-  hasVisionService: boolean,
-  hasVisionEmbeddings: boolean = true
-): { actualMode: "text_only" | "vision_only" | "combined"; warnings: string[] } {
-  const warnings: string[] = [];
-
-  // text_only は常にそのまま
-  if (requestedMode === "text_only") {
-    return { actualMode: "text_only", warnings };
-  }
-
-  // VisionSearchServiceが利用不可
-  if (!hasVisionService) {
-    if (requestedMode === "vision_only") {
-      warnings.push("VisionSearchService unavailable, falling back to text_only");
-    } else if (requestedMode === "combined") {
-      warnings.push("VisionSearchService unavailable, falling back to text_only");
-    }
-    return { actualMode: "text_only", warnings };
-  }
-
-  // vision_embeddingが存在しない
-  if (!hasVisionEmbeddings) {
-    if (requestedMode === "vision_only") {
-      warnings.push("vision_embedding not available, falling back to text_only");
-    } else if (requestedMode === "combined") {
-      warnings.push("No vision embeddings available, falling back to text_only");
-    }
-    return { actualMode: "text_only", warnings };
+function getProjectContextAnalyzer(): ProjectContextAnalyzer {
+  if (!projectContextAnalyzer) {
+    projectContextAnalyzer = new ProjectContextAnalyzer();
   }
-
-  // 要求されたモードをそのまま使用
-  return { actualMode: requestedMode, warnings };
+  return projectContextAnalyzer;
 }
 
+export const setLayoutSearchServiceFactory = serviceFactoryDI.set;
+export const resetLayoutSearchServiceFactory = serviceFactoryDI.reset;
+export const setVisionSearchServiceFactory = visionSearchServiceDI.set;
+export const resetVisionSearchServiceFactory = visionSearchServiceDI.reset;
+
 /**
- * search_modeに基づくマルチモーダル検索実行
+ * ProjectContextAnalyzer をリセット（テスト用）
  */
-async function executeMultimodalSearch(
-  validated: LayoutSearchInput,
-  service: ILayoutSearchService,
-  startTime: number
-): Promise<LayoutSearchOutput> {
-  const searchMode = validated.search_mode ?? "text_only";
-  const multimodalOptions = validated.multimodal_options;
-  const textWeight = multimodalOptions?.textWeight ?? 0.6;
-  const visionWeight = multimodalOptions?.visionWeight ?? 0.4;
-  const rrfK = multimodalOptions?.rrfK ?? 60;
-
-  // VisionSearchServiceの可用性チェック
-  const hasVisionService = !!visionSearchServiceFactory;
-
-  // 検索モードを決定（Graceful Degradation）
-  const { actualMode, warnings } = determineSearchMode(searchMode, hasVisionService);
-
-  if (isDevelopment()) {
-    logger.debug("[MCP Tool] layout.search multimodal mode", {
-      requestedMode: searchMode,
-      actualMode,
-      warnings,
-    });
-  }
-
-  // text_only モード
-  if (actualMode === "text_only") {
-    const processedQuery = preprocessQuery(validated.query);
-    const queryEmbedding = await service.generateQueryEmbedding(processedQuery);
-
-    if (queryEmbedding === null) {
-      return {
-        success: true,
-        data: {
-          results: [],
-          total: 0,
-          query: validated.query,
-          filters: validated.filters ?? {},
-          searchTimeMs: Date.now() - startTime,
-          searchMode: searchMode,
-          actualSearchMode: actualMode,
-          warnings: warnings.length > 0 ? warnings : undefined,
-        },
-      };
-    }
-
-    const searchOptions: SearchOptions = {
-      filters: validated.filters,
-      limit: validated.limit,
-      offset: validated.offset,
-      include_html: getIncludeHtml(validated),
-      project_context: validated.project_context,
-    };
-
-    // ハイブリッド検索（vector + fulltext RRF）が利用可能な場合はそちらを使用
-    const searchResult = service.searchSectionPatternsHybrid
-      ? await service.searchSectionPatternsHybrid(validated.query, queryEmbedding, searchOptions)
-      : await service.searchSectionPatterns(queryEmbedding, searchOptions);
-
-    if (!searchResult) {
-      return {
-        success: true,
-        data: {
-          results: [],
-          total: 0,
-          query: validated.query,
-          filters: validated.filters ?? {},
-          searchTimeMs: Date.now() - startTime,
-          searchMode: searchMode,
-          actualSearchMode: actualMode,
-          warnings: warnings.length > 0 ? warnings : undefined,
-        },
-      };
-    }
-
-    // 結果マッピング
-    const previewOptions: PreviewOptions = {
-      includePreview: validated.include_preview,
-      maxLength: validated.preview_max_length,
-    };
-    const includeHtmlValue = getIncludeHtml(validated);
-    const mappedResults = searchResult.results.map((sr) =>
-      mapSearchResult(
-        sr,
-        includeHtmlValue,
-        undefined, // adaptability
-        undefined, // semanticInfo
-        previewOptions
-      )
-    );
-
-    return {
-      success: true,
-      data: {
-        results: mappedResults,
-        total: searchResult.total,
-        query: validated.query,
-        filters: validated.filters ?? {},
-        searchTimeMs: Date.now() - startTime,
-        searchMode: searchMode,
-        actualSearchMode: actualMode,
-        warnings: warnings.length > 0 ? warnings : undefined,
-      },
-    };
-  }
-
-  // vision_only または combined モードではVisionSearchServiceを使用
-  if (!visionSearchServiceFactory) {
-    // これはdetermineSearchModeで処理されるはずだが、安全のため
-    return {
-      success: false,
-      error: {
-        code: "VISION_SEARCH_UNAVAILABLE",
-        message: "Vision search service is not available.",
-      },
-    };
-  }
-
-  const visionService = visionSearchServiceFactory();
-
-  // vision_only モード
-  if (actualMode === "vision_only") {
-    try {
-      const visionQuery: VisionSearchQueryService = {
-        textQuery: validated.vision_search_query?.textQuery ?? validated.query,
-      };
-
-      const visionOptions: HybridSearchOptions = {
-        limit: validated.limit,
-        offset: validated.offset,
-        minSimilarity: 0.5,
-        visionWeight: 1.0, // vision_onlyなので100%
-        textWeight: 0.0,
-      };
-
-      if (validated.filters?.sectionType) {
-        visionOptions.sectionType = validated.filters.sectionType;
-      }
-
-      // searchByVisionEmbeddingを呼び出し（vision_onlyモード）
-      const visionResult = await visionService.searchByVisionEmbedding(visionQuery, visionOptions);
-
-      if (!visionResult) {
-        return {
-          success: true,
-          data: {
-            results: [],
-            total: 0,
-            query: validated.query,
-            filters: validated.filters ?? {},
-            searchTimeMs: Date.now() - startTime,
-            searchMode: searchMode,
-            actualSearchMode: actualMode,
-            warnings: warnings.length > 0 ? warnings : undefined,
-          },
-        };
-      }
-
-      // Graceful Degradation - fallbackToTextOnly処理
-      if (visionResult.fallbackToTextOnly) {
-        warnings.push("vision_embedding not available, falling back to text_only");
-        // text_onlyで再検索（警告を保持したまま）
-        const processedQuery = preprocessQuery(validated.query);
-        const queryEmbedding = await service.generateQueryEmbedding(processedQuery);
-
-        if (queryEmbedding === null) {
-          return {
-            success: true,
-            data: {
-              results: [],
-              total: 0,
-              query: validated.query,
-              filters: validated.filters ?? {},
-              searchTimeMs: Date.now() - startTime,
-              searchMode: searchMode,
-              actualSearchMode: "text_only", // フォールバック後
-              warnings: warnings,
-            },
-          };
-        }
-
-        const searchOptions: SearchOptions = {
-          filters: validated.filters,
-          limit: validated.limit,
-          offset: validated.offset,
-          include_html: getIncludeHtml(validated),
-          project_context: validated.project_context,
-        };
-
-        const searchResult = await service.searchSectionPatterns(queryEmbedding, searchOptions);
-
-        const previewOptionsForFallback: PreviewOptions = {
-          includePreview: validated.include_preview,
-          maxLength: validated.preview_max_length,
-        };
-        const includeHtmlValueForFallback = getIncludeHtml(validated);
-        const mappedResultsForFallback = (searchResult?.results ?? []).map((sr) =>
-          mapSearchResult(
-            sr,
-            includeHtmlValueForFallback,
-            undefined,
-            undefined,
-            previewOptionsForFallback
-          )
-        );
-
-        return {
-          success: true,
-          data: {
-            results: mappedResultsForFallback,
-            total: searchResult?.total ?? 0,
-            query: validated.query,
-            filters: validated.filters ?? {},
-            searchTimeMs: Date.now() - startTime,
-            searchMode: searchMode,
-            actualSearchMode: "text_only", // フォールバック後
-            warnings: warnings,
-          },
-        };
-      }
-
-      const previewOptions: PreviewOptions = {
-        includePreview: validated.include_preview,
-        maxLength: validated.preview_max_length,
-      };
-      const includeHtmlValue = getIncludeHtml(validated);
-      const mappedResults = visionResult.results.map((vr) => {
-        const searchResult = mapVisionResultToSearchResult(vr);
-        return mapSearchResult(
-          searchResult,
-          includeHtmlValue,
-          undefined,
-          undefined,
-          previewOptions
-        );
-      });
-
-      return {
-        success: true,
-        data: {
-          results: mappedResults,
-          total: visionResult.total,
-          query: validated.query,
-          filters: validated.filters ?? {},
-          searchTimeMs: Date.now() - startTime,
-          searchMode: searchMode,
-          actualSearchMode: actualMode,
-          warnings: warnings.length > 0 ? warnings : undefined,
-        },
-      };
-    } catch (error) {
-      // エラー時はtext_onlyにフォールバック（警告を保持）
-      warnings.push(
-        `Vision search error: ${error instanceof Error ? error.message : String(error)}, falling back to text_only`
-      );
-
-      const processedQuery = preprocessQuery(validated.query);
-      const queryEmbedding = await service.generateQueryEmbedding(processedQuery);
-
-      if (queryEmbedding === null) {
-        return {
-          success: true,
-          data: {
-            results: [],
-            total: 0,
-            query: validated.query,
-            filters: validated.filters ?? {},
-            searchTimeMs: Date.now() - startTime,
-            searchMode: searchMode,
-            actualSearchMode: "text_only",
-            warnings: warnings,
-          },
-        };
-      }
-
-      const searchOptions: SearchOptions = {
-        filters: validated.filters,
-        limit: validated.limit,
-        offset: validated.offset,
-        include_html: getIncludeHtml(validated),
-        project_context: validated.project_context,
-      };
-
-      const searchResult = await service.searchSectionPatterns(queryEmbedding, searchOptions);
-
-      const previewOptionsForError: PreviewOptions = {
-        includePreview: validated.include_preview,
-        maxLength: validated.preview_max_length,
-      };
-      const includeHtmlValueForError = getIncludeHtml(validated);
-      const mappedResultsForError = (searchResult?.results ?? []).map((sr) =>
-        mapSearchResult(sr, includeHtmlValueForError, undefined, undefined, previewOptionsForError)
-      );
-
-      return {
-        success: true,
-        data: {
-          results: mappedResultsForError,
-          total: searchResult?.total ?? 0,
-          query: validated.query,
-          filters: validated.filters ?? {},
-          searchTimeMs: Date.now() - startTime,
-          searchMode: searchMode,
-          actualSearchMode: "text_only",
-          warnings: warnings,
-        },
-      };
-    }
+export function resetProjectContextAnalyzer(): void {
+  if (projectContextAnalyzer) {
+    projectContextAnalyzer.clearCache();
   }
+  projectContextAnalyzer = null;
+}
 
-  // combined モード（RRF統合検索）
-  if (actualMode === "combined") {
-    const rrfStartTime = Date.now();
-
-    try {
-      const visionQuery: VisionSearchQueryService = {
-        textQuery: validated.vision_search_query?.textQuery ?? validated.query,
-      };
-
-      const hybridOptions: HybridSearchOptions = {
-        limit: validated.limit,
-        offset: validated.offset,
-        minSimilarity: 0.5,
-        visionWeight: visionWeight,
-        textWeight: textWeight,
-        rrfK: rrfK, // RRFのkパラメータ
-      };
-
-      if (validated.filters?.sectionType) {
-        hybridOptions.sectionType = validated.filters.sectionType;
-      }
-
-      // hybridSearchを呼び出し
-      const hybridResult = await visionService.hybridSearch(
-        validated.query,
-        visionQuery,
-        hybridOptions
-      );
-
-      const rrfCalculationTime = Date.now() - rrfStartTime;
-
-      if (!hybridResult) {
-        return {
-          success: true,
-          data: {
-            results: [],
-            total: 0,
-            query: validated.query,
-            filters: validated.filters ?? {},
-            searchTimeMs: Date.now() - startTime,
-            searchMode: searchMode,
-            actualSearchMode: actualMode,
-            warnings: warnings.length > 0 ? warnings : undefined,
-            rrfDetails: {
-              k: rrfK,
-              textWeight,
-              visionWeight,
-              textResultCount: 0,
-              visionResultCount: 0,
-              fusedResultCount: 0,
-              calculationTimeMs: rrfCalculationTime,
-            },
-          },
-        };
-      }
-
-      // Graceful Degradation - fallbackToTextOnly処理
-      if (hybridResult.fallbackToTextOnly) {
-        // フォールバック発生時は actualSearchMode を text_only に変更
-        const fallbackReason = hybridResult.fallbackReason ?? "No vision embeddings available";
-        warnings.push(fallbackReason);
-
-        const previewOptions: PreviewOptions = {
-          includePreview: validated.include_preview,
-          maxLength: validated.preview_max_length,
-        };
-        const includeHtmlValue = getIncludeHtml(validated);
-        const mappedResults = hybridResult.results.map((vr) => {
-          const searchResult = mapVisionResultToSearchResult(vr);
-          return mapSearchResult(
-            searchResult,
-            includeHtmlValue,
-            undefined,
-            undefined,
-            previewOptions
-          );
-        });
-
-        return {
-          success: true,
-          data: {
-            results: mappedResults,
-            total: hybridResult.total,
-            query: validated.query,
-            filters: validated.filters ?? {},
-            searchTimeMs: Date.now() - startTime,
-            searchMode: searchMode,
-            actualSearchMode: "text_only", // フォールバック後のモード
-            warnings: warnings.length > 0 ? warnings : undefined,
-            fallbackReason: fallbackReason,
-          },
-        };
-      }
-
-      const previewOptions: PreviewOptions = {
-        includePreview: validated.include_preview,
-        maxLength: validated.preview_max_length,
-      };
-      const includeHtmlValue = getIncludeHtml(validated);
-      const mappedResults = hybridResult.results.map((vr) => {
-        const searchResult = mapVisionResultToSearchResult(vr);
-        return mapSearchResult(
-          searchResult,
-          includeHtmlValue,
-          undefined,
-          undefined,
-          previewOptions
-        );
-      });
-
-      return {
-        success: true,
-        data: {
-          results: mappedResults,
-          total: hybridResult.total,
-          query: validated.query,
-          filters: validated.filters ?? {},
-          searchTimeMs: Date.now() - startTime,
-          searchMode: searchMode,
-          actualSearchMode: actualMode,
-          warnings: warnings.length > 0 ? warnings : undefined,
-          rrfDetails: {
-            k: rrfK,
-            textWeight,
-            visionWeight,
-            textResultCount: hybridResult.results.length,
-            visionResultCount: hybridResult.results.length,
-            fusedResultCount: hybridResult.results.length,
-            calculationTimeMs: rrfCalculationTime,
-          },
-        },
-      };
-    } catch (error) {
-      warnings.push(
-        `Combined search error: ${error instanceof Error ? error.message : String(error)}, falling back to text_only`
-      );
-      return executeMultimodalSearch(
-        { ...validated, search_mode: "text_only" },
-        service,
-        startTime
-      );
-    }
-  }
+const moodBrandToneSearchServiceDI = createDIFactory<MoodBrandToneSearchService>(
+  "MoodBrandToneSearchService"
+);
+export const setMoodBrandToneSearchServiceFactory = moodBrandToneSearchServiceDI.set;
+export const resetMoodBrandToneSearchServiceFactory = moodBrandToneSearchServiceDI.reset;
 
-  // フォールバック（通常到達しない）
-  return {
-    success: false,
-    error: {
-      code: "INTERNAL_ERROR",
-      message: `Unexpected search mode: ${actualMode}`,
-    },
-  };
-}
+const prismaClientDI = createDIFactory<IPrismaClient>("LayoutSearchPrismaClient");
+export const setLayoutSearchPrismaClientFactory = prismaClientDI.set;
+export const resetLayoutSearchPrismaClientFactory = prismaClientDI.reset;
 
 // =====================================================
 // メインハンドラー
@@ -1420,11 +170,7 @@ export async function layoutSearchHandler(input: unknown): Promise<LayoutSearchO
     if (error instanceof ZodError) {
       const errorMessage = error.errors.map((e) => `${e.path.join(".")}: ${e.message}`).join(", ");
 
-      if (isDevelopment()) {
-        logger.error("[MCP Tool] layout.search validation error", {
-          errors: error.errors,
-        });
-      }
+      logger.warn("[MCP Tool] layout.search validation error", { error: (error as Error).message });
 
       return {
         success: false,
@@ -1438,7 +184,7 @@ export async function layoutSearchHandler(input: unknown): Promise<LayoutSearchO
   }
 
   // サービスファクトリーチェック
-  if (!serviceFactory) {
+  if (!serviceFactoryDI.get()) {
     if (isDevelopment()) {
       logger.error("[MCP Tool] layout.search service factory not set");
     }
@@ -1452,19 +198,33 @@ export async function layoutSearchHandler(input: unknown): Promise<LayoutSearchO
     };
   }
 
-  const service = serviceFactory();
+  const service = serviceFactoryDI.get()!();
+
+  // Search result cache check / 検索キャッシュチェック
+  const cacheKey = generateCacheKey(
+    "layout.search",
+    validated as unknown as Record<string, unknown>
+  );
+  const cached = getCachedResult<LayoutSearchOutput>(cacheKey);
+  if (cached) {
+    return cached;
+  }
+
+  // VisionServiceファクトリの解決（executor関数に渡すため）
+  const visionFactory = visionSearchServiceDI.get();
+  const resolvedVisionFactory = visionFactory ? visionFactory : undefined;
 
   try {
     // search_mode ベースのルーティング（text_only以外の場合）
     // search_mode が明示的に指定され、text_only以外の場合はマルチモーダル検索を実行
     if (validated.search_mode && validated.search_mode !== "text_only") {
-      return executeMultimodalSearch(validated, service, startTime);
+      return executeMultimodalSearch(validated, service, startTime, resolvedVisionFactory);
     }
 
     // Phase 4-2: Vision検索が有効な場合（レガシー互換性）
     // use_vision_search=true かつ search_mode未指定の場合
     if (validated.use_vision_search && !validated.search_mode) {
-      return executeVisionSearch(validated, startTime);
+      return executeVisionSearch(validated, startTime, resolvedVisionFactory);
     }
 
     // 通常の検索（text_embedding）
@@ -1541,8 +301,8 @@ export async function layoutSearchHandler(input: unknown): Promise<LayoutSearchO
 
     // moodBrandToneSearchService インスタンスを取得
     let moodBrandToneService: MoodBrandToneSearchService | null = null;
-    if (moodBrandToneSearchServiceFactory) {
-      moodBrandToneService = moodBrandToneSearchServiceFactory();
+    if (moodBrandToneSearchServiceDI.get()) {
+      moodBrandToneService = moodBrandToneSearchServiceDI.get()!();
     }
 
     // mood フィルターが提供されている場合、セマンティック検索を実行
@@ -1567,11 +327,9 @@ export async function layoutSearchHandler(input: unknown): Promise<LayoutSearchO
           semanticMetadata.set(patternId, existing);
         }
       } catch (error) {
-        if (isDevelopment()) {
-          logger.warn("[MCP Tool] layout.search mood search failed", {
-            error: error instanceof Error ? error.message : String(error),
-          });
-        }
+        logger.warn("[MCP Tool] layout.search mood search failed", {
+          error: (error as Error).message,
+        });
         // Graceful degradation: mood 検索失敗時は続行
       }
     }
@@ -1600,11 +358,9 @@ export async function layoutSearchHandler(input: unknown): Promise<LayoutSearchO
           semanticMetadata.set(patternId, existing);
         }
       } catch (error) {
-        if (isDevelopment()) {
-          logger.warn("[MCP Tool] layout.search brandTone search failed", {
-            error: error instanceof Error ? error.message : String(error),
-          });
-        }
+        logger.warn("[MCP Tool] layout.search brandTone search failed", {
+          error: (error as Error).message,
+        });
         // Graceful degradation: brandTone 検索失敗時は続行
       }
     }
@@ -1628,11 +384,9 @@ export async function layoutSearchHandler(input: unknown): Promise<LayoutSearchO
           });
         }
       } catch (error) {
-        if (isDevelopment()) {
-          logger.warn("[MCP Tool] layout.search project context analysis failed", {
-            error: error instanceof Error ? error.message : String(error),
-          });
-        }
+        logger.warn("[MCP Tool] layout.search project context analysis failed", {
+          error: (error as Error).message,
+        });
         // ProjectContext解析失敗時は続行（Graceful degradation）
       }
     }
@@ -1667,11 +421,9 @@ export async function layoutSearchHandler(input: unknown): Promise<LayoutSearchO
           contextBoostApplied = true;
         }
       } catch (error) {
-        if (isDevelopment()) {
-          logger.warn("[MCP Tool] layout.search context inference failed", {
-            error: error instanceof Error ? error.message : String(error),
-          });
-        }
+        logger.warn("[MCP Tool] layout.search context inference failed", {
+          error: (error as Error).message,
+        });
         // コンテキスト推論失敗時は続行（Graceful degradation）
       }
     }
@@ -1692,12 +444,9 @@ export async function layoutSearchHandler(input: unknown): Promise<LayoutSearchO
             hints: adaptabilityResult.integration_hints,
           };
         } catch (error) {
-          if (isDevelopment()) {
-            logger.warn("[MCP Tool] layout.search adaptability calculation failed", {
-              resultId: r.id,
-              error: error instanceof Error ? error.message : String(error),
-            });
-          }
+          logger.warn("[MCP Tool] layout.search adaptability calculation failed", {
+            error: (error as Error).message,
+          });
           // 個別の計算失敗は無視して続行
         }
       }
@@ -1785,7 +534,7 @@ export async function layoutSearchHandler(input: unknown): Promise<LayoutSearchO
     mappedResults = await applyPreferenceReranking(
       mappedResults,
       validated.profile_id,
-      prismaClientFactory,
+      prismaClientDI.get(),
       "layout",
       "layout.search"
     );
@@ -1801,7 +550,7 @@ export async function layoutSearchHandler(input: unknown): Promise<LayoutSearchO
       };
     }
 
-    return {
+    const result: LayoutSearchOutput = {
       success: true,
       data: {
         results: mappedResults,
@@ -1814,22 +563,23 @@ export async function layoutSearchHandler(input: unknown): Promise<LayoutSearchO
         context_boost_applied: contextBoostApplied,
       },
     };
+    // Cache successful results / 成功結果をキャッシュ
+    setCachedResult(cacheKey, result);
+    return result;
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
     const errorCode = determineErrorCode(error instanceof Error ? error : errorMessage);
 
-    if (isDevelopment()) {
-      logger.error("[MCP Tool] layout.search error", {
-        code: errorCode,
-        error: errorMessage,
-      });
-    }
+    logger.error("[MCP Tool] layout.search error", {
+      code: errorCode,
+      error: errorMessage,
+    });
 
     return {
       success: false,
       error: {
         code: errorCode,
-        message: errorMessage,
+        message: sanitizeErrorMessage(error),
       },
     };
   }
@@ -1897,6 +647,33 @@ export const layoutSearchToolDefinition = {
             description:
               "利用範囲でフィルター（inspiration_only: インスピレーションのみ、owned_asset: 所有アセット）",
           },
+          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",
+          },
         },
       },
       limit: {