@reftrixmcp/mcp-server 0.1.8 → 0.2.0

package/src/tools/index.ts

@@ -5,7 +5,7 @@
  * MCP Tools Export
  * WebDesign専用ツールハンドラーとツール定義のエクスポート
  *
- * Total: 26 tools
+ * Total: 28 tools
  * - Style: style.get_palette
  * - System: system.health
  * - Layout: layout.inspect, layout.ingest, layout.search, layout.generate_code, layout.batch_ingest
@@ -19,6 +19,8 @@
  * - Responsive: responsive.search
  * - Preference: preference.hear, preference.get, preference.reset
  * - Part: part.search, part.inspect, part.compare
+ * - Search: search.unified
+ * - Design: design.search_by_image
  */
 
 // style系スキーマのエクスポート（style.get_palette用）
@@ -446,6 +448,33 @@ export {
   type PartCompareOutput,
 } from "./part/compare.tool";
 
+// search.unified ツール（コンポーネント横断検索）
+export {
+  searchUnifiedHandler,
+  searchUnifiedToolDefinition,
+  UNIFIED_SEARCH_ERROR_CODES,
+  type SearchUnifiedInput,
+  type SearchUnifiedOutput,
+  type UnifiedSearchResultItem,
+} from "./search-unified.tool";
+
+// design.search_by_image ツール（画像からの類似デザイン検索）
+export {
+  designSearchByImageHandler,
+  designSearchByImageToolDefinition,
+  designSearchByImageInputSchema,
+  setDesignSearchDINOv2ServiceFactory,
+  resetDesignSearchDINOv2ServiceFactory,
+  setDesignSearchEmbeddingServiceFactory,
+  resetDesignSearchEmbeddingServiceFactory,
+  setDesignSearchPrismaClientFactory,
+  resetDesignSearchPrismaClientFactory,
+  DESIGN_SEARCH_ERROR_CODES,
+  type DesignSearchByImageInput,
+  type DesignSearchByImageOutput,
+  type DesignSearchResultItem,
+} from "./design/search-by-image.tool";
+
 // project.* スキーマのエクスポート
 export {
   // project.get スキーマ
@@ -507,6 +536,8 @@ import {
 import { partSearchToolDefinition } from "./part/search.tool";
 import { partInspectToolDefinition } from "./part/inspect.tool";
 import { partCompareToolDefinition } from "./part/compare.tool";
+import { searchUnifiedToolDefinition } from "./search-unified.tool";
+import { designSearchByImageToolDefinition } from "./design/search-by-image.tool";
 
 export const allToolDefinitions = [
   // style.get_palette（ブランドパレット取得）
@@ -562,6 +593,10 @@ export const allToolDefinitions = [
   partInspectToolDefinition,
   // part.compare（パーツ並列比較）
   partCompareToolDefinition,
+  // search.unified（コンポーネント横断検索）
+  searchUnifiedToolDefinition,
+  // design.search_by_image（画像からの類似デザイン検索）
+  designSearchByImageToolDefinition,
 ];
 
 /**
@@ -590,6 +625,8 @@ import { preferenceHearHandler, preferenceGetHandler, preferenceResetHandler } f
 import { partSearchHandler } from "./part/search.tool";
 import { partInspectHandler } from "./part/inspect.tool";
 import { partCompareHandler } from "./part/compare.tool";
+import { searchUnifiedHandler } from "./search-unified.tool";
+import { designSearchByImageHandler } from "./design/search-by-image.tool";
 
 export const toolHandlers: Record<string, (input: unknown) => Promise<unknown>> = {
   // style.get_palette（ブランドパレット取得）
@@ -645,6 +682,10 @@ export const toolHandlers: Record<string, (input: unknown) => Promise<unknown>>
   "part.inspect": partInspectHandler,
   // part.compare（パーツ並列比較）
   "part.compare": partCompareHandler,
+  // search.unified（コンポーネント横断検索）
+  "search.unified": searchUnifiedHandler,
+  // design.search_by_image（画像からの類似デザイン検索）
+  "design.search_by_image": designSearchByImageHandler,
 };
 
 /**

package/src/tools/layout/batch-ingest.tool.ts

@@ -17,6 +17,7 @@ import { ZodError } from "zod";
 import { v7 as uuidv7 } from "uuid";
 import { prisma } from "@reftrixmcp/database";
 import { logger, isDevelopment } from "../../utils/logger";
+import { sanitizeErrorMessage } from "../../utils/sanitize-error";
 import { validateExternalUrl } from "../../utils/url-validator";
 import { normalizeUrlForStorage } from "../../utils/url-normalizer";
 import { sanitizeHtml } from "../../utils/html-sanitizer";
@@ -171,17 +172,14 @@ async function ingestSingleUrl(
           });
         }
       } catch (dbError) {
-        const errorMessage = dbError instanceof Error ? dbError.message : String(dbError);
-        if (isDevelopment()) {
-          logger.error("[MCP Tool] layout.batch_ingest DB save failed", {
-            url,
-            error: errorMessage,
-          });
-        }
+        logger.error("[MCP Tool] layout.batch_ingest DB save failed", {
+          url,
+          error: dbError instanceof Error ? dbError.message : String(dbError),
+        });
         return {
           url,
           status: "failed",
-          error: `Failed to save to database: ${errorMessage}`,
+          error: sanitizeErrorMessage(dbError),
         };
       }
     }
@@ -193,17 +191,14 @@ async function ingestSingleUrl(
       patterns_extracted: patternsExtracted,
     };
   } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    if (isDevelopment()) {
-      logger.error("[MCP Tool] layout.batch_ingest error", {
-        url,
-        error: errorMessage,
-      });
-    }
+    logger.error("[MCP Tool] layout.batch_ingest error", {
+      url,
+      error: error instanceof Error ? error.message : String(error),
+    });
     return {
       url,
       status: "failed",
-      error: errorMessage,
+      error: sanitizeErrorMessage(error),
     };
   }
 }
@@ -253,11 +248,9 @@ export async function layoutBatchIngestHandler(input: unknown): Promise<LayoutBa
       const detailedMessage = formatMultipleDetailedErrors(errorWithHints.errors);
       const formattedErrors = formatZodError(error);
 
-      if (isDevelopment()) {
-        logger.error("[MCP Tool] layout.batch_ingest validation error", {
-          errors: errorWithHints.errors,
-        });
-      }
+      logger.warn("[MCP Tool] layout.batch_ingest validation error", {
+        error: (error as Error).message,
+      });
 
       return {
         success: false,

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

@@ -15,7 +15,9 @@
 import { ZodError } from "zod";
 import { v7 as uuidv7 } from "uuid";
 import { prisma } from "@reftrixmcp/database";
+import { createDIFactory } from "../../utils/di-factory";
 import { logger, isDevelopment } from "../../utils/logger";
+import { sanitizeErrorMessage } from "../../utils/sanitize-error";
 import { validateExternalUrl } from "../../utils/url-validator";
 import { normalizeUrlForStorage } from "../../utils/url-normalizer";
 import { sanitizeHtml } from "../../utils/html-sanitizer";
@@ -150,22 +152,9 @@ export interface ILayoutIngestService {
   generateEmbedding: (text: string) => Promise<number[]>;
 }
 
-/** サービスファクトリ関数 */
-let ingestServiceFactory: (() => ILayoutIngestService) | null = null;
-
-/**
- * サービスファクトリを設定（テスト用）
- */
-export function setLayoutIngestServiceFactory(factory: () => ILayoutIngestService): void {
-  ingestServiceFactory = factory;
-}
-
-/**
- * サービスファクトリをリセット（テスト用）
- */
-export function resetLayoutIngestServiceFactory(): void {
-  ingestServiceFactory = null;
-}
+const ingestServiceDI = createDIFactory<ILayoutIngestService>("LayoutIngestService");
+export const setLayoutIngestServiceFactory = ingestServiceDI.set;
+export const resetLayoutIngestServiceFactory = ingestServiceDI.reset;
 
 // =============================================
 // HTML最適化関数
@@ -335,23 +324,8 @@ function determineErrorCode(error: Error | string): string {
   return LAYOUT_MCP_ERROR_CODES.INTERNAL_ERROR;
 }
 
-/**
- * エラーメッセージをユーザーフレンドリーに変換
- */
-function formatErrorMessage(code: string, originalMessage: string): string {
-  switch (code) {
-    case LAYOUT_MCP_ERROR_CODES.TIMEOUT_ERROR:
-      return `Page load timeout: ${originalMessage}`;
-    case LAYOUT_MCP_ERROR_CODES.NETWORK_ERROR:
-      return `Network error: Unable to reach the specified URL`;
-    case LAYOUT_MCP_ERROR_CODES.BROWSER_ERROR:
-      return `Browser error: ${originalMessage}`;
-    case LAYOUT_MCP_ERROR_CODES.HTTP_ERROR:
-      return `HTTP error: ${originalMessage}`;
-    default:
-      return `Internal error: ${originalMessage}`;
-  }
-}
+// formatErrorMessage は sanitizeErrorMessage に統一（CWE-209対策）
+// Replaced by sanitizeErrorMessage from utils/sanitize-error (CWE-209)
 
 // =============================================
 // メインハンドラー
@@ -408,11 +382,7 @@ export async function layoutIngestHandler(input: unknown): Promise<LayoutIngestO
         }
       } catch {
         // JSON解析に失敗した場合は元の入力をそのまま使用
-        if (isDevelopment()) {
-          logger.warn("[MCP Tool] layout.ingest options string parse failed", {
-            options: inputObj.options,
-          });
-        }
+        logger.warn("[MCP Tool] layout.ingest options string parse failed");
       }
     }
 
@@ -464,11 +434,7 @@ export async function layoutIngestHandler(input: unknown): Promise<LayoutIngestO
       // 後方互換性のため旧形式も保持
       const formattedErrors = formatZodError(error);
 
-      if (isDevelopment()) {
-        logger.error("[MCP Tool] layout.ingest validation error", {
-          errors: errorWithHints.errors,
-        });
-      }
+      logger.warn("[MCP Tool] layout.ingest validation error", { error: (error as Error).message });
 
       return {
         success: false,
@@ -802,19 +768,16 @@ export async function layoutIngestHandler(input: unknown): Promise<LayoutIngestO
         // DB保存失敗時はエラーを返す
         const errorMessage = dbError instanceof Error ? dbError.message : String(dbError);
 
-        if (isDevelopment()) {
-          logger.error("[MCP Tool] layout.ingest DB save failed", {
-            url: validated.url,
-            error: errorMessage,
-          });
-        }
+        logger.error("[MCP Tool] layout.ingest DB save failed", {
+          url: validated.url,
+          error: errorMessage,
+        });
 
         return {
           success: false,
           error: {
             code: LAYOUT_MCP_ERROR_CODES.DB_SAVE_FAILED,
-            message: `Failed to save to database: ${errorMessage}`,
-            details: isDevelopment() ? { originalError: errorMessage } : undefined,
+            message: `Failed to save to database: ${sanitizeErrorMessage(dbError)}`,
           },
         };
       }
@@ -892,13 +855,11 @@ export async function layoutIngestHandler(input: unknown): Promise<LayoutIngestO
       } catch (responsiveError) {
         // レスポンシブ解析の失敗はエラーとして返すのではなく、警告ログを出力して続行
         // インジェスト自体は成功しているため
-        if (isDevelopment()) {
-          logger.warn("[MCP Tool] layout.ingest responsive analysis failed", {
-            url: validated.url,
-            error:
-              responsiveError instanceof Error ? responsiveError.message : String(responsiveError),
-          });
-        }
+        logger.warn("[MCP Tool] layout.ingest responsive analysis failed", {
+          url: validated.url,
+          error:
+            responsiveError instanceof Error ? responsiveError.message : String(responsiveError),
+        });
       }
     }
 
@@ -925,12 +886,10 @@ export async function layoutIngestHandler(input: unknown): Promise<LayoutIngestO
         }
       } catch (dbError) {
         // DB保存失敗はエラーとして返さず、警告ログを出力して続行
-        if (isDevelopment()) {
-          logger.warn("[MCP Tool] layout.ingest responsive DB save failed", {
-            webPageId: persistedId,
-            error: dbError instanceof Error ? dbError.message : String(dbError),
-          });
-        }
+        logger.warn("[MCP Tool] layout.ingest responsive DB save failed", {
+          webPageId: persistedId,
+          error: dbError instanceof Error ? dbError.message : String(dbError),
+        });
       }
     }
 
@@ -940,7 +899,7 @@ export async function layoutIngestHandler(input: unknown): Promise<LayoutIngestO
     let externalCssFetchResult: ExternalCssFetchResult | undefined;
 
     if (autoAnalyze && saveToDb && persistedId && sanitizedHtml) {
-      const service = ingestServiceFactory?.();
+      const service = ingestServiceDI.get()?.();
       if (service) {
         try {
           if (isDevelopment()) {
@@ -1059,13 +1018,10 @@ export async function layoutIngestHandler(input: unknown): Promise<LayoutIngestO
               }
             } catch (sectionError) {
               // 個別セクションの保存失敗は警告ログのみで継続
-              if (isDevelopment()) {
-                logger.warn("[MCP Tool] layout.ingest section save failed", {
-                  sectionType: section.type,
-                  error:
-                    sectionError instanceof Error ? sectionError.message : String(sectionError),
-                });
-              }
+              logger.warn("[MCP Tool] layout.ingest section save failed", {
+                sectionType: section.type,
+                error: sectionError instanceof Error ? sectionError.message : String(sectionError),
+              });
             }
           }
 
@@ -1081,12 +1037,10 @@ export async function layoutIngestHandler(input: unknown): Promise<LayoutIngestO
           }
         } catch (analyzeError) {
           // 解析失敗は警告ログのみで、インジェスト自体は成功とする
-          if (isDevelopment()) {
-            logger.warn("[MCP Tool] layout.ingest auto_analyze failed", {
-              webPageId: persistedId,
-              error: analyzeError instanceof Error ? analyzeError.message : String(analyzeError),
-            });
-          }
+          logger.warn("[MCP Tool] layout.ingest auto_analyze failed", {
+            webPageId: persistedId,
+            error: analyzeError instanceof Error ? analyzeError.message : String(analyzeError),
+          });
         }
       } else {
         if (isDevelopment()) {
@@ -1238,22 +1192,18 @@ export async function layoutIngestHandler(input: unknown): Promise<LayoutIngestO
     // エラーハンドリング
     const errorMessage = error instanceof Error ? error.message : String(error);
     const errorCode = determineErrorCode(error instanceof Error ? error : errorMessage);
-    const formattedMessage = formatErrorMessage(errorCode, errorMessage);
 
-    if (isDevelopment()) {
-      logger.error("[MCP Tool] layout.ingest error", {
-        url: validated.url,
-        code: errorCode,
-        error: errorMessage,
-      });
-    }
+    logger.error("[MCP Tool] layout.ingest error", {
+      url: validated.url,
+      code: errorCode,
+      error: errorMessage,
+    });
 
     return {
       success: false,
       error: {
         code: errorCode,
-        message: formattedMessage,
-        details: isDevelopment() ? { originalError: errorMessage } : undefined,
+        message: sanitizeErrorMessage(error),
       },
     };
   }

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

@@ -16,6 +16,7 @@
  * @module tools/layout/inspect/inspect.tool
  */
 
+import { createDIFactory } from "../../../utils/di-factory";
 import {
   layoutInspectInputSchema,
   type LayoutInspectInput,
@@ -39,6 +40,7 @@ import {
 } from "./inspect.utils";
 import { createLogger, isDevelopment } from "../../../utils/logger";
 import { getToolErrorMessage } from "../../../utils/error-messages";
+import { sanitizeErrorMessage } from "../../../utils/sanitize-error";
 import { sanitizeHtml } from "../../../utils/html-sanitizer";
 import type {
   VisionAnalysisResult,
@@ -91,24 +93,9 @@ export interface ILayoutInspectService {
   getVisionAnalyzer?: () => IVisionAnalyzer | null;
 }
 
-/** サービスファクトリ関数 */
-let serviceFactory: (() => ILayoutInspectService) | null = null;
-
-/**
- * サービスファクトリを設定
- *
- * @param factory - サービスインスタンスを生成するファクトリ関数
- */
-export function setLayoutInspectServiceFactory(factory: () => ILayoutInspectService): void {
-  serviceFactory = factory;
-}
-
-/**
- * サービスファクトリをリセット（テスト用）
- */
-export function resetLayoutInspectServiceFactory(): void {
-  serviceFactory = null;
-}
+const serviceFactoryDI = createDIFactory<ILayoutInspectService>("LayoutInspectService");
+export const setLayoutInspectServiceFactory = serviceFactoryDI.set;
+export const resetLayoutInspectServiceFactory = serviceFactoryDI.reset;
 
 // =====================================================
 // ハンドラー
@@ -139,14 +126,12 @@ export async function layoutInspectHandler(input: unknown): Promise<LayoutInspec
   try {
     validated = layoutInspectInputSchema.parse(input);
   } catch (error) {
-    if (isDevelopment()) {
-      logger.error("Validation error", { error });
-    }
+    logger.warn("Validation error", { error: (error as Error).message });
     return {
       success: false,
       error: {
         code: "VALIDATION_ERROR",
-        message: error instanceof Error ? error.message : "Invalid input",
+        message: sanitizeErrorMessage(error),
       },
     };
   }
@@ -176,7 +161,7 @@ export async function layoutInspectHandler(input: unknown): Promise<LayoutInspec
   // IDが指定されている場合はDBから取得
   if (validated.id && !html) {
     try {
-      const service = serviceFactory?.();
+      const service = serviceFactoryDI.get()?.();
       if (service?.getWebPageById) {
         const webPage = await service.getWebPageById(validated.id);
         if (!webPage) {
@@ -209,14 +194,12 @@ export async function layoutInspectHandler(input: unknown): Promise<LayoutInspec
         };
       }
     } catch (error) {
-      if (isDevelopment()) {
-        logger.error("DB error", { error });
-      }
+      logger.warn("DB error", { error: (error as Error).message });
       return {
         success: false,
         error: {
           code: "DB_ERROR",
-          message: error instanceof Error ? error.message : "Database error",
+          message: sanitizeErrorMessage(error),
         },
       };
     }
@@ -236,7 +219,7 @@ export async function layoutInspectHandler(input: unknown): Promise<LayoutInspec
     }
 
     try {
-      const service = serviceFactory?.();
+      const service = serviceFactoryDI.get()?.();
       if (!service?.analyzeScreenshot) {
         const message =
           getToolErrorMessage("layout.inspect", "SERVICE_UNAVAILABLE") ??
@@ -272,9 +255,9 @@ export async function layoutInspectHandler(input: unknown): Promise<LayoutInspec
           }
         } catch (hwError) {
           // ハードウェア検出失敗時はCPUフォールバック
-          if (isDevelopment()) {
-            logger.warn("Hardware detection failed, falling back to CPU", { error: hwError });
-          }
+          logger.warn("Hardware detection failed, falling back to CPU", {
+            error: (hwError as Error).message,
+          });
         }
       } else {
         if (isDevelopment()) {
@@ -312,9 +295,9 @@ export async function layoutInspectHandler(input: unknown): Promise<LayoutInspec
           }
         } catch (optError) {
           // 画像最適化失敗時は元の画像を使用
-          if (isDevelopment()) {
-            logger.warn("Image optimization failed, using original", { error: optError });
-          }
+          logger.warn("Image optimization failed, using original", {
+            error: (optError as Error).message,
+          });
         }
       }
 
@@ -364,12 +347,10 @@ export async function layoutInspectHandler(input: unknown): Promise<LayoutInspec
       } catch (timeoutError) {
         // タイムアウト時のフォールバック処理
         if (visionOptions.visionFallbackToHtmlOnly !== false) {
-          if (isDevelopment()) {
-            logger.warn("Vision API timeout, using fallback", {
-              timeout: effectiveTimeout,
-              error: timeoutError instanceof Error ? timeoutError.message : String(timeoutError),
-            });
-          }
+          logger.warn("Vision API timeout, using fallback", {
+            timeout: effectiveTimeout,
+            error: timeoutError instanceof Error ? timeoutError.message : String(timeoutError),
+          });
           // フォールバック: 空のVision結果を返す
           visionResult = {
             success: false,
@@ -444,14 +425,12 @@ export async function layoutInspectHandler(input: unknown): Promise<LayoutInspec
         data,
       };
     } catch (error) {
-      if (isDevelopment()) {
-        logger.error("Screenshot analysis error", { error });
-      }
+      logger.warn("Screenshot analysis error", { error: (error as Error).message });
       return {
         success: false,
         error: {
           code: "VISION_API_ERROR",
-          message: error instanceof Error ? error.message : "Screenshot analysis failed",
+          message: sanitizeErrorMessage(error),
         },
       };
     }
@@ -601,9 +580,9 @@ export async function layoutInspectHandler(input: unknown): Promise<LayoutInspec
       }
     } catch (cacheError) {
       // キャッシュエラーは無視して解析を続行
-      if (isDevelopment()) {
-        logger.warn("layout.inspect cache error, proceeding with analysis", { error: cacheError });
-      }
+      logger.warn("layout.inspect cache error, proceeding with analysis", {
+        error: (cacheError as Error).message,
+      });
     }
   }
 
@@ -620,18 +599,16 @@ export async function layoutInspectHandler(input: unknown): Promise<LayoutInspec
     let visionFeatures: VisionAnalysisResult | undefined;
     if (options.useVision) {
       try {
-        const service = serviceFactory?.();
+        const service = serviceFactoryDI.get()?.();
         if (service?.analyzeWithVision) {
           visionFeatures = await service.analyzeWithVision(html);
         }
       } catch (error) {
-        if (isDevelopment()) {
-          logger.error("Vision API error", { error });
-        }
+        logger.warn("Vision API error", { error: (error as Error).message });
         visionFeatures = {
           success: false,
           features: [],
-          error: error instanceof Error ? error.message : "Vision API error",
+          error: sanitizeErrorMessage(error),
           processingTimeMs: 0,
           modelName: "unknown",
         };
@@ -707,9 +684,7 @@ export async function layoutInspectHandler(input: unknown): Promise<LayoutInspec
         }
       } catch (cacheError) {
         // キャッシュ保存エラーは無視
-        if (isDevelopment()) {
-          logger.warn("layout.inspect cache save error", { error: cacheError });
-        }
+        logger.warn("layout.inspect cache save error", { error: (cacheError as Error).message });
       }
     }
 
@@ -729,14 +704,12 @@ export async function layoutInspectHandler(input: unknown): Promise<LayoutInspec
       data,
     };
   } catch (error) {
-    if (isDevelopment()) {
-      logger.error("Analysis error", { error });
-    }
+    logger.warn("Analysis error", { error: (error as Error).message });
     return {
       success: false,
       error: {
         code: "INTERNAL_ERROR",
-        message: error instanceof Error ? error.message : "Analysis failed",
+        message: sanitizeErrorMessage(error),
       },
     };
   }

package/src/tools/layout/inspect/visual-extractors.utils.ts

@@ -154,9 +154,7 @@ export async function extractVisualFeatures(
             });
           }
         } catch (error) {
-          if (isDevelopment()) {
-            logger.error("CSS Variable extraction failed", { error });
-          }
+          logger.warn("CSS Variable extraction failed", { error: (error as Error).message });
         }
       })()
     );
@@ -180,9 +178,7 @@ export async function extractVisualFeatures(
             });
           }
         } catch (error) {
-          if (isDevelopment()) {
-            logger.error("Typography extraction failed", { error });
-          }
+          logger.warn("Typography extraction failed", { error: (error as Error).message });
         }
       })()
     );
@@ -205,9 +201,7 @@ export async function extractVisualFeatures(
             });
           }
         } catch (error) {
-          if (isDevelopment()) {
-            logger.error("Gradient detection failed", { error });
-          }
+          logger.warn("Gradient detection failed", { error: (error as Error).message });
         }
       })()
     );

package/src/tools/layout/schemas.ts

@@ -16,6 +16,7 @@
  */
 import { z } from "zod";
 import { moodFilterSchema, brandToneFilterSchema } from "../../schemas/mood-brandtone-filters";
+import { commonSearchFiltersSchema } from "../../schemas/common-search-filters";
 
 // ============================================================================
 // Enum Schemas
@@ -857,14 +858,16 @@ export type VisualFeaturesFilter = z.infer<typeof visualFeaturesFilterSchema>;
  * @property usageScope - 利用範囲フィルター（オプション）
  * @property visualFeatures - ビジュアル特徴フィルター（Phase 4-1、オプション）
  */
-export const layoutSearchFiltersSchema = z.object({
-  sectionType: sectionTypeForSearchSchema.optional(),
-  sourceType: sourceTypeSchema.optional(),
-  usageScope: usageScopeSchema.optional(),
-  visualFeatures: visualFeaturesFilterSchema.optional(),
-  mood: moodFilterSchema.optional(),
-  brandTone: brandToneFilterSchema.optional(),
-});
+export const layoutSearchFiltersSchema = z
+  .object({
+    sectionType: sectionTypeForSearchSchema.optional(),
+    sourceType: sourceTypeSchema.optional(),
+    usageScope: usageScopeSchema.optional(),
+    visualFeatures: visualFeaturesFilterSchema.optional(),
+    mood: moodFilterSchema.optional(),
+    brandTone: brandToneFilterSchema.optional(),
+  })
+  .merge(commonSearchFiltersSchema);
 export type LayoutSearchFilters = z.infer<typeof layoutSearchFiltersSchema>;
 
 /**