@reftrixmcp/mcp-server 0.1.8 → 0.2.0

package/src/services/worker-supervisor.service.ts

@@ -348,9 +348,7 @@ export class WorkerSupervisor {
         }
       } catch {
         // IPC送信失敗は致命的でない（SIGTERMにフォールバック）
-        if (isDevelopment()) {
-          logger.debug("[WorkerSupervisor] IPC shutdown message failed (non-fatal)");
-        }
+        logger.warn("[WorkerSupervisor] IPC shutdown message failed (non-fatal)");
       }
 
       // Phase 2: 2秒後にSIGTERMを送信（BullMQ close()に時間を与える）
@@ -578,9 +576,7 @@ export class WorkerSupervisor {
       }
     } catch {
       // IPC送信失敗は致命的でない（SIGTERMにフォールバック）
-      if (isDevelopment()) {
-        logger.debug("[WorkerSupervisor] IPC shutdown message failed during restart (non-fatal)");
-      }
+      logger.warn("[WorkerSupervisor] IPC shutdown message failed during restart (non-fatal)");
     }
 
     // Phase 2: 猶予後にSIGTERMを送信（BullMQ close()に時間を与える）

package/src/tools/background/schemas.ts

@@ -9,6 +9,7 @@
  */
 
 import { z } from "zod";
+import { commonSearchFiltersSchema } from "../../schemas/common-search-filters";
 
 // ============================================================================
 // Enum Schemas
@@ -65,8 +66,8 @@ export type BackgroundMcpErrorCode =
 export const backgroundSearchFiltersSchema = z
   .object({
     designType: backgroundDesignTypeSchema.optional(),
-    webPageId: z.string().optional(),
   })
+  .merge(commonSearchFiltersSchema)
   .optional();
 
 export type BackgroundSearchFilters = z.infer<typeof backgroundSearchFiltersSchema>;

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

@@ -15,7 +15,14 @@
  */
 
 import { ZodError } from "zod";
+import { createDIFactory } from "../../utils/di-factory";
 import { logger, isDevelopment } from "../../utils/logger";
+import { sanitizeErrorMessage } from "../../utils/sanitize-error";
+import {
+  generateCacheKey,
+  getCachedResult,
+  setCachedResult,
+} from "../../services/search-cache.service";
 import {
   backgroundSearchInputSchema,
   BACKGROUND_MCP_ERROR_CODES,
@@ -107,6 +114,10 @@ export interface IBackgroundSearchService {
       filters?: {
         designType?: string;
         webPageId?: string;
+        webPageUrl?: string;
+        tags?: string[];
+        industry?: string;
+        audience?: string;
       };
     }
   ) => Promise<{
@@ -127,6 +138,10 @@ export interface IBackgroundSearchService {
       filters?: {
         designType?: string;
         webPageId?: string;
+        webPageUrl?: string;
+        tags?: string[];
+        industry?: string;
+        audience?: string;
       };
     }
   ) => Promise<{
@@ -139,43 +154,14 @@ export interface IBackgroundSearchService {
 // サービスファクトリー（DI）
 // =====================================================
 
-let backgroundSearchServiceFactory: (() => IBackgroundSearchService) | null = null;
-
-/**
- * サービスファクトリーを設定
- */
-export function setBackgroundSearchServiceFactory(factory: () => IBackgroundSearchService): void {
-  backgroundSearchServiceFactory = factory;
-}
-
-/**
- * サービスファクトリーをリセット
- */
-export function resetBackgroundSearchServiceFactory(): void {
-  backgroundSearchServiceFactory = null;
-}
-
-/**
- * PrismaClientファクトリー（嗜好リランキング用DI）
- * PrismaClient factory (DI for preference reranking)
- */
-let prismaClientFactory: (() => IPrismaClient) | null = null;
-
-/**
- * PrismaClientファクトリーを設定（嗜好リランキング用）
- * Set PrismaClient factory (for preference reranking)
- */
-export function setBackgroundSearchPrismaClientFactory(factory: () => IPrismaClient): void {
-  prismaClientFactory = factory;
-}
+const backgroundSearchServiceDI =
+  createDIFactory<IBackgroundSearchService>("BackgroundSearchService");
+export const setBackgroundSearchServiceFactory = backgroundSearchServiceDI.set;
+export const resetBackgroundSearchServiceFactory = backgroundSearchServiceDI.reset;
 
-/**
- * PrismaClientファクトリーをリセット（テスト用）
- * Reset PrismaClient factory (for testing)
- */
-export function resetBackgroundSearchPrismaClientFactory(): void {
-  prismaClientFactory = null;
-}
+const prismaClientDI = createDIFactory<IPrismaClient>("BackgroundSearchPrismaClient");
+export const setBackgroundSearchPrismaClientFactory = prismaClientDI.set;
+export const resetBackgroundSearchPrismaClientFactory = prismaClientDI.reset;
 
 // =====================================================
 // エラーコード判定
@@ -233,11 +219,9 @@ export async function backgroundSearchHandler(input: unknown): Promise<Backgroun
     if (error instanceof ZodError) {
       const errorMessage = error.errors.map((e) => `${e.path.join(".")}: ${e.message}`).join(", ");
 
-      if (isDevelopment()) {
-        logger.error("[MCP Tool] background.search validation error", {
-          errors: error.errors,
-        });
-      }
+      logger.warn("[MCP Tool] background.search validation error", {
+        errors: error.errors,
+      });
 
       return {
         success: false,
@@ -251,7 +235,7 @@ export async function backgroundSearchHandler(input: unknown): Promise<Backgroun
   }
 
   // サービスファクトリーチェック
-  if (!backgroundSearchServiceFactory) {
+  if (!backgroundSearchServiceDI.get()) {
     if (isDevelopment()) {
       logger.error("[MCP Tool] background.search service factory not set");
     }
@@ -265,7 +249,17 @@ export async function backgroundSearchHandler(input: unknown): Promise<Backgroun
     };
   }
 
-  const service = backgroundSearchServiceFactory();
+  const service = backgroundSearchServiceDI.get()!();
+
+  // Search result cache check / 検索キャッシュチェック
+  const cacheKey = generateCacheKey(
+    "background.search",
+    validated as unknown as Record<string, unknown>
+  );
+  const cached = getCachedResult<BackgroundSearchOutput>(cacheKey);
+  if (cached) {
+    return cached;
+  }
 
   try {
     // E5 モデル用 query: プレフィックスを付与
@@ -300,6 +294,10 @@ export async function backgroundSearchHandler(input: unknown): Promise<Backgroun
       filters?: {
         designType?: string;
         webPageId?: string;
+        webPageUrl?: string;
+        tags?: string[];
+        industry?: string;
+        audience?: string;
       };
     } = {
       limit: validated.limit,
@@ -308,13 +306,32 @@ export async function backgroundSearchHandler(input: unknown): Promise<Backgroun
 
     // フィルターが存在する場合のみ追加
     if (validated.filters) {
-      const filters: { designType?: string; webPageId?: string } = {};
+      const filters: {
+        designType?: string;
+        webPageId?: string;
+        webPageUrl?: string;
+        tags?: string[];
+        industry?: string;
+        audience?: string;
+      } = {};
       if (validated.filters.designType) {
         filters.designType = validated.filters.designType;
       }
       if (validated.filters.webPageId) {
         filters.webPageId = validated.filters.webPageId;
       }
+      if (validated.filters.webPageUrl) {
+        filters.webPageUrl = validated.filters.webPageUrl;
+      }
+      if (validated.filters.tags && validated.filters.tags.length > 0) {
+        filters.tags = validated.filters.tags;
+      }
+      if (validated.filters.industry) {
+        filters.industry = validated.filters.industry;
+      }
+      if (validated.filters.audience) {
+        filters.audience = validated.filters.audience;
+      }
       if (Object.keys(filters).length > 0) {
         searchOptions.filters = filters;
       }
@@ -355,12 +372,12 @@ export async function backgroundSearchHandler(input: unknown): Promise<Backgroun
     mappedResults = await applyPreferenceReranking(
       mappedResults,
       validated.profile_id,
-      prismaClientFactory,
+      prismaClientDI.get(),
       "background",
       "background.search"
     );
 
-    return {
+    const result: BackgroundSearchOutput = {
       success: true,
       data: {
         results: mappedResults,
@@ -369,22 +386,23 @@ export async function backgroundSearchHandler(input: unknown): Promise<Backgroun
         searchTimeMs,
       },
     };
+    // Cache successful results / 成功結果をキャッシュ
+    setCachedResult(cacheKey, result);
+    return result;
   } catch (error) {
     const errorInstance = error instanceof Error ? error : new Error(String(error));
     const errorCode = mapErrorToCode(errorInstance);
 
-    if (isDevelopment()) {
-      logger.error("[MCP Tool] background.search error", {
-        code: errorCode,
-        error: errorInstance.message,
-      });
-    }
+    logger.error("[MCP Tool] background.search error", {
+      code: errorCode,
+      error: errorInstance.message,
+    });
 
     return {
       success: false,
       error: {
         code: errorCode,
-        message: errorInstance.message,
+        message: sanitizeErrorMessage(error),
       },
     };
   }
@@ -461,6 +479,28 @@ export const backgroundSearchToolDefinition = {
             format: "uuid",
             description: "Webページ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",
+          },
         },
       },
       // Preference reranking

package/src/tools/brief/validate.handler.ts

@@ -16,7 +16,9 @@
  * @module tools/brief/validate.handler
  */
 
+import { createDIFactory } from "../../utils/di-factory";
 import { logger, isDevelopment } from "../../utils/logger";
+import { sanitizeErrorMessage } from "../../utils/sanitize-error";
 
 import {
   briefValidateInputSchema,
@@ -44,30 +46,17 @@ export type IBriefValidateServiceFactory = () => IBriefValidateService;
 // サービスファクトリ（DI用）
 // =====================================================
 
-let serviceFactory: IBriefValidateServiceFactory | null = null;
-
-/**
- * カスタムサービスファクトリを設定
- * @param factory - サービスファクトリ関数
- */
-export function setBriefValidateServiceFactory(factory: IBriefValidateServiceFactory): void {
-  serviceFactory = factory;
-}
-
-/**
- * サービスファクトリをリセット（デフォルトに戻す）
- */
-export function resetBriefValidateServiceFactory(): void {
-  serviceFactory = null;
-}
+const serviceFactoryDI = createDIFactory<IBriefValidateService>("BriefValidateService");
+export const setBriefValidateServiceFactory = serviceFactoryDI.set;
+export const resetBriefValidateServiceFactory = serviceFactoryDI.reset;
 
 /**
  * サービスインスタンスを取得
  * @returns IBriefValidateService
  */
 function getService(): IBriefValidateService {
-  if (serviceFactory) {
-    return serviceFactory();
+  if (serviceFactoryDI.get()) {
+    return serviceFactoryDI.get()!();
   }
   return new BriefValidateService();
 }
@@ -95,14 +84,12 @@ export async function briefValidateHandler(input: unknown): Promise<BriefValidat
   try {
     validated = briefValidateInputSchema.parse(input);
   } catch (error) {
-    if (isDevelopment()) {
-      logger.error("[MCP Tool] brief.validate validation error", { error });
-    }
+    logger.warn("[MCP Tool] brief.validate validation error", { error: (error as Error).message });
     return {
       success: false,
       error: {
         code: BRIEF_MCP_ERROR_CODES.VALIDATION_ERROR,
-        message: error instanceof Error ? error.message : "Invalid input",
+        message: sanitizeErrorMessage(error),
       },
     };
   }
@@ -129,14 +116,12 @@ export async function briefValidateHandler(input: unknown): Promise<BriefValidat
       data: result,
     };
   } catch (error) {
-    if (isDevelopment()) {
-      logger.error("[MCP Tool] brief.validate error", { error });
-    }
+    logger.warn("[MCP Tool] brief.validate error", { error: (error as Error).message });
     return {
       success: false,
       error: {
         code: BRIEF_MCP_ERROR_CODES.INTERNAL_ERROR,
-        message: error instanceof Error ? error.message : "Validation failed",
+        message: sanitizeErrorMessage(error),
       },
     };
   }