@mandujs/mcp 0.37.2 → 0.37.4

package/src/tools/guard.ts

@@ -1,10 +1,13 @@
 import type { Tool } from "@modelcontextprotocol/sdk/types.js";
 import { type ManduError } from "@mandujs/core/error";
-import {
-  loadManifest,
-  runGuardCheck,
-  runAutoCorrect,
-  type GeneratedMap,
+import {
+  checkDirectory,
+  getDefaultFsRoutesGuardPolicy,
+  validateAndReport,
+  loadManifest,
+  runGuardCheck,
+  runAutoCorrect,
+  type GeneratedMap,
   // Self-Healing Guard imports
   checkWithHealing,
   healAll,
@@ -12,16 +15,19 @@ import {
   // Follow-up E — type-aware lint bridge
   runTsgolint,
   type GuardConfig,
-  type ViolationType,
-  type GuardPreset,
-} from "@mandujs/core";
-import { getProjectPaths, readJsonFile, readConfig } from "../utils/project.js";
+  type ViolationType,
+  type GuardPreset,
+  type Violation,
+} from "@mandujs/core";
+import { getProjectPaths, readJsonFile, readConfig } from "../utils/project.js";
+import fs from "fs/promises";
+import path from "path";
 
 export const guardToolDefinitions: Tool[] = [
   {
-    name: "mandu.guard.check",
-    description:
-      "Run guard checks to validate spec integrity, generated files, and slot files. Set typeAware=true to additionally run `oxlint --type-aware` (tsgolint) and merge its results.",
+    name: "mandu.guard.check",
+    description:
+      "Run the same architecture guard used by `mandu guard`, plus legacy spec/generated/slot checks. Set typeAware=true to additionally run `oxlint --type-aware` (tsgolint) and merge its results.",
     annotations: {
       readOnlyHint: true,
     },
@@ -120,8 +126,37 @@ export const guardToolDefinitions: Tool[] = [
   },
 ];
 
-export function guardTools(projectRoot: string) {
-  const paths = getProjectPaths(projectRoot);
+export function guardTools(projectRoot: string) {
+  const paths = getProjectPaths(projectRoot);
+
+  const pathExists = async (candidate: string): Promise<boolean> => {
+    try {
+      await fs.access(candidate);
+      return true;
+    } catch {
+      return false;
+    }
+  };
+
+  const summarizeArchitectureViolation = (violation: Violation) => ({
+    ruleId: violation.ruleName,
+    type: violation.type,
+    file: path.relative(projectRoot, violation.filePath).replace(/\\/g, "/") || violation.filePath,
+    line: violation.line,
+    column: violation.column,
+    message: violation.ruleDescription,
+    suggestion: violation.suggestions[0],
+    fromLayer: violation.fromLayer,
+    toLayer: violation.toLayer,
+    importStatement: violation.importStatement,
+  });
+
+  const summarizeLegacyViolation = (v: Awaited<ReturnType<typeof runGuardCheck>>["violations"][number]) => ({
+    ruleId: v.ruleId,
+    file: v.file,
+    message: v.message,
+    suggestion: v.suggestion,
+  });
 
   const handlers: Record<string, (args: Record<string, unknown>) => Promise<unknown>> = {
     "mandu.guard.check": async (args: Record<string, unknown>) => {
@@ -137,25 +172,44 @@ export function guardTools(projectRoot: string) {
           error: "Failed to load manifest",
           details: manifestResult.errors,
         };
-      }
-
-      // Run guard check
-      const checkResult = await runGuardCheck(manifestResult.data, projectRoot);
+      }
+
+      const projectConfig = await validateAndReport(projectRoot);
+      const guardConfigFromFile = (projectConfig?.guard ?? {}) as GuardConfig;
+      const preset = guardConfigFromFile.preset ?? "mandu";
+      const enableFsRoutes = await pathExists(paths.appDir);
+
+      const architectureReport = await checkDirectory(
+        {
+          preset,
+          srcDir: guardConfigFromFile.srcDir ?? "src",
+          exclude: guardConfigFromFile.exclude,
+          fsRoutes: getDefaultFsRoutesGuardPolicy(enableFsRoutes),
+        },
+        projectRoot
+      );
+      const architecturePassed = architectureReport.bySeverity.error === 0;
+      const architectureViolations = architectureReport.violations.map(
+        summarizeArchitectureViolation
+      );
+
+      // Run guard check
+      const checkResult = await runGuardCheck(manifestResult.data, projectRoot);
 
       // Follow-up E — resolve type-aware defaulting from config, then
       // run the bridge when enabled. Result envelope is always included
       // in the tool response so MCP clients have a single stable shape.
-      let projectConfig: Awaited<ReturnType<typeof readConfig>> | undefined;
-      try {
-        projectConfig = await readConfig(projectRoot);
-      } catch {
-        projectConfig = undefined;
-      }
-      const typeAwareCfg = (
-        projectConfig?.guard as
-          | { typeAware?: Record<string, unknown> }
-          | undefined
-      )?.typeAware;
+      let rawProjectConfig: Awaited<ReturnType<typeof readConfig>> | undefined;
+      try {
+        rawProjectConfig = projectConfig ?? await readConfig(projectRoot);
+      } catch {
+        rawProjectConfig = projectConfig ?? undefined;
+      }
+      const typeAwareCfg = (
+        rawProjectConfig?.guard as
+          | { typeAware?: Record<string, unknown> }
+          | undefined
+      )?.typeAware;
       const typeAwareEnabled =
         typeAwareArg !== undefined ? typeAwareArg : typeAwareCfg !== undefined;
 
@@ -175,21 +229,40 @@ export function guardTools(projectRoot: string) {
           skipped: bridge.skipped,
           summary: bridge.summary,
           violations: bridge.violations,
-        };
-      }
-
-      if (checkResult.passed) {
-        return {
-          passed: typeAwareResponse
-            ? (typeAwareResponse.violations as Array<{ severity: string }>).filter(
-                (v) => v.severity === "error",
-              ).length === 0
-            : true,
-          violations: [],
-          message: "All guard checks passed",
-          relatedSkills: ["mandu-guard-guide", "mandu-debug"],
-          ...(typeAwareResponse ? { typeAware: typeAwareResponse } : {}),
-        };
+        };
+      }
+
+      const typeAwareViolations = typeAwareResponse
+        ? typeAwareResponse.violations as Array<{ severity: string }>
+        : [];
+      const typeAwareErrorCount = typeAwareViolations.filter(
+        (v) => v.severity === "error",
+      ).length;
+      const legacyViolations = checkResult.violations.map(summarizeLegacyViolation);
+      const combinedViolations = [
+        ...architectureViolations,
+        ...legacyViolations,
+      ];
+      const allPassed = checkResult.passed && architecturePassed && typeAwareErrorCount === 0;
+      const blockingViolationCount = combinedViolations.length + typeAwareErrorCount;
+
+      if (allPassed) {
+        return {
+          passed: true,
+          violations: [],
+          message: "All guard checks passed",
+          architecture: {
+            passed: true,
+            totalViolations: architectureReport.totalViolations,
+            bySeverity: architectureReport.bySeverity,
+          },
+          legacy: {
+            passed: true,
+            violations: 0,
+          },
+          relatedSkills: ["mandu-guard-guide", "mandu-debug"],
+          ...(typeAwareResponse ? { typeAware: typeAwareResponse } : {}),
+        };
       }
 
       // If auto-correct requested and there are violations
@@ -200,33 +273,54 @@ export function guardTools(projectRoot: string) {
           projectRoot
         );
 
-        return {
-          passed: autoCorrectResult.fixed,
-          violations: autoCorrectResult.remainingViolations,
-          autoCorrect: {
-            attempted: true,
-            fixed: autoCorrectResult.fixed,
+        return {
+          passed:
+            autoCorrectResult.fixed &&
+            architecturePassed &&
+            typeAwareErrorCount === 0,
+          violations: [
+            ...architectureViolations,
+            ...autoCorrectResult.remainingViolations.map(summarizeLegacyViolation),
+          ],
+          autoCorrect: {
+            attempted: true,
+            fixed: autoCorrectResult.fixed,
             steps: autoCorrectResult.steps,
             retriedCount: autoCorrectResult.retriedCount,
             rolledBack: autoCorrectResult.rolledBack,
-            changeId: autoCorrectResult.changeId,
-          },
-          ...(typeAwareResponse ? { typeAware: typeAwareResponse } : {}),
-        };
-      }
-
-      return {
-        passed: false,
-        violations: checkResult.violations.map((v) => ({
-          ruleId: v.ruleId,
-          file: v.file,
-          message: v.message,
-          suggestion: v.suggestion,
-        })),
-        message: `Found ${checkResult.violations.length} violation(s)`,
-        tip: "Use autoCorrect: true to attempt automatic fixes",
-        relatedSkills: ["mandu-guard-guide", "mandu-debug"],
-        ...(typeAwareResponse ? { typeAware: typeAwareResponse } : {}),
+            changeId: autoCorrectResult.changeId,
+          },
+          architecture: {
+            passed: architecturePassed,
+            totalViolations: architectureReport.totalViolations,
+            bySeverity: architectureReport.bySeverity,
+            violations: architectureViolations,
+          },
+          legacy: {
+            passed: autoCorrectResult.fixed,
+            violations: autoCorrectResult.remainingViolations.length,
+          },
+          ...(typeAwareResponse ? { typeAware: typeAwareResponse } : {}),
+        };
+      }
+
+      return {
+        passed: false,
+        violations: combinedViolations,
+        message: `Found ${blockingViolationCount} violation(s)`,
+        architecture: {
+          passed: architecturePassed,
+          totalViolations: architectureReport.totalViolations,
+          bySeverity: architectureReport.bySeverity,
+          violations: architectureViolations,
+        },
+        legacy: {
+          passed: checkResult.passed,
+          violations: legacyViolations.length,
+        },
+        tip: "Use autoCorrect: true to attempt automatic fixes",
+        relatedSkills: ["mandu-guard-guide", "mandu-debug"],
+        ...(typeAwareResponse ? { typeAware: typeAwareResponse } : {}),
       };
     },
 

package/src/tools/index.ts

@@ -11,8 +11,9 @@ import { mcpToolRegistry } from "../registry/mcp-tool-registry.js";
 import { moduleToPlugins } from "../adapters/tool-adapter.js";
 import { type McpProfile, getProfileCategories } from "../profiles.js";
 
-// 도구 모듈 export
-export { specTools, specToolDefinitions } from "./spec.js";
+// 도구 모듈 export
+export { agentTools, agentToolDefinitions } from "./agent.js";
+export { specTools, specToolDefinitions } from "./spec.js";
 export { generateTools, generateToolDefinitions } from "./generate.js";
 export { transactionTools, transactionToolDefinitions } from "./transaction.js";
 export { historyTools, historyToolDefinitions } from "./history.js";
@@ -85,8 +86,9 @@ export {
   extractContractToolDefinitions,
 } from "./extract-contract.js";
 
-// 도구 모듈 import (등록용)
-import { specTools, specToolDefinitions } from "./spec.js";
+// 도구 모듈 import (등록용)
+import { agentTools, agentToolDefinitions } from "./agent.js";
+import { specTools, specToolDefinitions } from "./spec.js";
 import { generateTools, generateToolDefinitions } from "./generate.js";
 import { transactionTools, transactionToolDefinitions } from "./transaction.js";
 import { historyTools, historyToolDefinitions } from "./history.js";
@@ -189,7 +191,8 @@ export interface ToolModule {
  * 빌트인 도구 모듈 목록
  */
 export const TOOL_MODULES: ToolModule[] = [
-  { category: "spec", definitions: specToolDefinitions, handlers: specTools },
+  { category: "agent", definitions: agentToolDefinitions, handlers: agentTools },
+  { category: "spec", definitions: specToolDefinitions, handlers: specTools },
   { category: "generate", definitions: generateToolDefinitions, handlers: generateTools },
   { category: "transaction", definitions: transactionToolDefinitions, handlers: transactionTools },
   { category: "history", definitions: historyToolDefinitions, handlers: historyTools },