speclock 3.5.4 → 4.1.0

package/src/mcp/server.js

@@ -220,10 +220,15 @@ server.tool(
       .describe("Who created this lock"),
   },
   async ({ text, tags, source }) => {
-    const { lockId } = addLock(PROJECT_ROOT, text, tags, source);
+    const { lockId, rewritten, rewriteReason } = addLock(PROJECT_ROOT, text, tags, source);
+
+    // Read the stored lock to get the normalized text
+    const brain = readBrain(PROJECT_ROOT);
+    const storedLock = brain?.specLock?.items?.find(l => l.id === lockId);
+    const storedText = storedLock?.text || text;
 
     // Auto-guard related files
-    const guardResult = autoGuardRelatedFiles(PROJECT_ROOT, text);
+    const guardResult = autoGuardRelatedFiles(PROJECT_ROOT, storedText);
     const guardMsg = guardResult.guarded.length > 0
       ? `\nAuto-guarded ${guardResult.guarded.length} file(s): ${guardResult.guarded.join(", ")}`
       : "";
@@ -231,9 +236,14 @@ server.tool(
     // Sync active locks to package.json
     syncLocksToPackageJson(PROJECT_ROOT);
 
+    // Report rewrite if it happened
+    const rewriteMsg = rewritten
+      ? `\n\nSmart Lock Authoring: Rewritten for accuracy.\n  Original: "${text}"\n  Stored as: "${storedText}"\n  Reason: ${rewriteReason}`
+      : "";
+
     return {
       content: [
-        { type: "text", text: `Lock added (${lockId}): "${text}"${guardMsg}` },
+        { type: "text", text: `Lock added (${lockId}): "${storedText}"${guardMsg}${rewriteMsg}` },
       ],
     };
   }
@@ -460,10 +470,10 @@ server.tool(
 // CONTINUITY PROTECTION TOOLS
 // ========================================
 
-// Tool 12: speclock_check_conflict (v2.5: uses enforcer — hard mode returns isError)
+// Tool 12: speclock_check_conflict (v4.1: hybrid heuristic + Gemini LLM)
 server.tool(
   "speclock_check_conflict",
-  "Check if a proposed action conflicts with any active SpecLock. Use before making significant changes. In hard enforcement mode, conflicts above the threshold will BLOCK the action (isError: true).",
+  "Check if a proposed action conflicts with any active SpecLock. Uses fast heuristic + Gemini LLM for universal domain coverage. In hard enforcement mode, conflicts above the threshold will BLOCK the action (isError: true).",
   {
     proposedAction: z
       .string()
@@ -471,18 +481,18 @@ server.tool(
       .describe("Description of the action you plan to take"),
   },
   async ({ proposedAction }) => {
-    // Try LLM-enhanced check first, fall back to heuristic enforcer
-    let result;
-    try {
-      const { llmCheckConflict } = await import("../core/llm-checker.js");
-      const llmResult = await llmCheckConflict(PROJECT_ROOT, proposedAction);
-      if (llmResult) {
-        result = llmResult;
+    // Hybrid check: heuristic first, LLM for grey-zone (1-70%)
+    let result = await checkConflictAsync(PROJECT_ROOT, proposedAction);
+
+    // If async hybrid returned no conflict, also check enforcer for hard mode
+    if (!result.hasConflict) {
+      const enforced = enforceConflictCheck(PROJECT_ROOT, proposedAction);
+      if (enforced.blocked) {
+        return {
+          content: [{ type: "text", text: enforced.analysis }],
+          isError: true,
+        };
       }
-    } catch (_) {}
-
-    if (!result) {
-      result = enforceConflictCheck(PROJECT_ROOT, proposedAction);
     }
 
     // In hard mode with blocking conflict, return isError: true