@adeu/mcp-server 1.18.1 → 1.18.4

package/src/parity_live.test.ts

@@ -4,9 +4,17 @@ import { spawn, ChildProcess } from "node:child_process";
 import { resolve, join } from "node:path";
 import { existsSync, readFileSync } from "node:fs";
 
+// Each Python CLI invocation spawns a fresh interpreter costing ~3-5s on
+// Windows even when warm, so tests that shell out to Python need more than
+// vitest's 5s default timeout.
+const PYTHON_PARITY_TIMEOUT_MS = 60_000;
+
 describe("Parity Live Server Integration Verification", () => {
   let serverProc: ChildProcess;
-  const fixturePath = resolve(__dirname, "../tests/fixtures/gap2_minimal_repro.docx");
+  const fixturePath = resolve(
+    __dirname,
+    "../tests/fixtures/gap2_minimal_repro.docx",
+  );
 
   beforeAll(async () => {
     const serverPath = resolve(__dirname, "../dist/index.js");
@@ -76,86 +84,117 @@ describe("Parity Live Server Integration Verification", () => {
   });
 
   it("exposes the build stamp via serverInfo.version in initialize", async () => {
-    const initRes = await sendRpc("initialize", {
-      protocolVersion: "2024-11-05",
-      capabilities: {},
-      clientInfo: { name: "test-client", version: "1.0.0" }
-    }, 202);
+    const initRes = await sendRpc(
+      "initialize",
+      {
+        protocolVersion: "2024-11-05",
+        capabilities: {},
+        clientInfo: { name: "test-client", version: "1.0.0" },
+      },
+      202,
+    );
     expect(initRes.result).toBeDefined();
     expect(initRes.result.serverInfo).toBeDefined();
     expect(initRes.result.serverInfo.version).not.toBe("1.0.0");
     expect(initRes.result.serverInfo.version).not.toContain("unknown");
   });
 
-
   it("read_docx appends [Debug] build stamp footer to mode=outline and mode=full", async () => {
-    const res = await sendRpc("tools/call", {
-      name: "read_docx",
-      arguments: {
-        file_path: fixturePath,
-        mode: "outline",
+    const res = await sendRpc(
+      "tools/call",
+      {
+        name: "read_docx",
+        arguments: {
+          reasoning: "test",
+          file_path: fixturePath,
+          mode: "outline",
+        },
       },
-    }, 202);
+      202,
+    );
 
     expect(res.result).toBeDefined();
     expect(res.result.content[0].text).not.toContain("[Debug] build=");
   });
 
-  it("GAP 2 (Live): process_document_batch modify straddling deleted text returns actionable deletion error", async () => {
-    const outPath = join(resolve(__dirname, "../../../../tmp"), `live_gap2_out_${Date.now()}.docx`);
-    const res = await sendRpc("tools/call", {
-      name: "process_document_batch",
-      arguments: {
-        original_docx_path: fixturePath,
-        author_name: "Ed",
-        changes: [
-          {
-            type: "modify",
-            target_text: "Foo bar old phrase here.",
-            new_text: "X",
-            comment: "c",
-          }
-        ],
-        output_path: outPath,
-        dry_run: true,
+  it("GAP 2 (Live): process_document_batch modify straddling deleted text returns actionable deletion error", { timeout: PYTHON_PARITY_TIMEOUT_MS }, async () => {
+    const outPath = join(
+      resolve(__dirname, "../../../../tmp"),
+      `live_gap2_out_${Date.now()}.docx`,
+    );
+    const res = await sendRpc(
+      "tools/call",
+      {
+        name: "process_document_batch",
+        arguments: {
+          reasoning: "test",
+          original_docx_path: fixturePath,
+          author_name: "Ed",
+          changes: [
+            {
+              type: "modify",
+              target_text: "Foo bar old phrase here.",
+              new_text: "X",
+              comment: "c",
+            },
+          ],
+          output_path: outPath,
+          dry_run: true,
+        },
       },
-    }, 203);
+      203,
+    );
 
     expect(res.result).toBeDefined();
     const text = res.result.content[0].text;
-    expect(text).toContain("Edit 1 Failed: Target text matches text inside a tracked deletion by Test Negotiator.");
-    expect(text).toContain("Reject/accept that change first or target the active replacement text instead.");
+    expect(text).toContain(
+      "Edit 1 Failed: Target text matches text inside a tracked deletion by Test Negotiator.",
+    );
+    expect(text).toContain(
+      "Reject/accept that change first or target the active replacement text instead.",
+    );
     expect(text).not.toContain("Target text not found in document.");
 
     // Run Python engine to assert cross-engine exact error parity
     const { execSync } = await import("node:child_process");
     const projectRoot = resolve(__dirname, "../../../..");
-    const pythonCli = process.platform === "win32"
-      ? join(projectRoot, "python/.venv/Scripts/adeu.exe")
-      : join(projectRoot, "python/.venv/bin/adeu");
-    
+    const pythonCli =
+      process.platform === "win32"
+        ? join(projectRoot, "python/.venv/Scripts/adeu.exe")
+        : join(projectRoot, "python/.venv/bin/adeu");
+
     // Create temporary changes JSON for Python CLI
     const fs = await import("node:fs");
     const tempJsonPath = join(projectRoot, "tmp", `changes_${Date.now()}.json`);
     fs.mkdirSync(join(projectRoot, "tmp"), { recursive: true });
-    fs.writeFileSync(tempJsonPath, JSON.stringify([
-      {
-        type: "modify",
-        target_text: "Foo bar old phrase here.",
-        new_text: "X",
-        comment: "c",
-      }
-    ]));
+    fs.writeFileSync(
+      tempJsonPath,
+      JSON.stringify([
+        {
+          type: "modify",
+          target_text: "Foo bar old phrase here.",
+          new_text: "X",
+          comment: "c",
+        },
+      ]),
+    );
 
     try {
-      const pythonOut = execSync(`"${pythonCli}" apply "${fixturePath}" "${tempJsonPath}" --dry-run --author Ed`, {
-        encoding: "utf-8",
-      });
+      const pythonOut = execSync(
+        `"${pythonCli}" apply "${fixturePath}" "${tempJsonPath}" --dry-run --author Ed`,
+        {
+          encoding: "utf-8",
+        },
+      );
       // Should not succeed normally since dry run exits with code 1 on errors, so we catch in the try block
     } catch (err: any) {
       const pyErrorOutput = err.stdout || err.stderr || "";
-      expect(pyErrorOutput).toContain("Edit 1 Failed: Target text matches text inside a tracked deletion by Test Negotiator.");
-      expect(pyErrorOutput).toContain("Reject/accept that change first or target the active replacement text instead.");
+      expect(pyErrorOutput).toContain(
+        "Edit 1 Failed: Target text matches text inside a tracked deletion by Test Negotiator.",
+      );
+      expect(pyErrorOutput).toContain(
+        "Reject/accept that change first or target the active replacement text instead.",
+      );
     } finally {
       if (fs.existsSync(tempJsonPath)) {
         fs.unlinkSync(tempJsonPath);
@@ -163,35 +202,51 @@ describe("Parity Live Server Integration Verification", () => {
     }
   });
 
-  it("GAP 1 (Live): read_docx mode=outline heading count and content parity with Python", async () => {
-    const gap1FixturePath = resolve(__dirname, "../tests/fixtures/gap1_deleted_row_repro.docx");
+  it("GAP 1 (Live): read_docx mode=outline heading count and content parity with Python", { timeout: PYTHON_PARITY_TIMEOUT_MS }, async () => {
+    const gap1FixturePath = resolve(
+      __dirname,
+      "../tests/fixtures/gap1_deleted_row_repro.docx",
+    );
     const { execSync } = await import("node:child_process");
     const projectRoot = resolve(__dirname, "../../../..");
-    const pythonCli = process.platform === "win32"
-      ? join(projectRoot, "python/.venv/Scripts/adeu.exe")
-      : join(projectRoot, "python/.venv/bin/adeu");
+    const pythonCli =
+      process.platform === "win32"
+        ? join(projectRoot, "python/.venv/Scripts/adeu.exe")
+        : join(projectRoot, "python/.venv/bin/adeu");
 
     // 1. clean_view = true
-    const nodeResClean = await sendRpc("tools/call", {
-      name: "read_docx",
-      arguments: {
-        file_path: gap1FixturePath,
-        mode: "outline",
-        clean_view: true,
+    const nodeResClean = await sendRpc(
+      "tools/call",
+      {
+        name: "read_docx",
+        arguments: {
+          reasoning: "test",
+          file_path: gap1FixturePath,
+          mode: "outline",
+          clean_view: true,
+        },
       },
-    }, 204);
+      204,
+    );
 
     expect(nodeResClean.result).toBeDefined();
     const nodeTextClean = nodeResClean.result.content[0].text;
-    
+
     // Get Python output for clean_view = true
-    const pythonOutClean = execSync(`"${pythonCli}" extract "${gap1FixturePath}" --mode outline --clean-view`, {
-      encoding: "utf-8",
-    });
+    const pythonOutClean = execSync(
+      `"${pythonCli}" extract "${gap1FixturePath}" --mode outline --clean-view`,
+      {
+        encoding: "utf-8",
+      },
+    );
 
     // Extract raw markdown headings (lines starting with #) to assert perfect parity
-    const getHeadings = (text: string) => text.split("\n").filter(line => line.startsWith("#")).map(l => l.trim());
-    
+    const getHeadings = (text: string) =>
+      text
+        .split("\n")
+        .filter((line) => line.startsWith("#"))
+        .map((l) => l.trim());
+
     const nodeHeadingsClean = getHeadings(nodeTextClean);
     const pythonHeadingsClean = getHeadings(pythonOutClean);
 
@@ -200,56 +255,86 @@ describe("Parity Live Server Integration Verification", () => {
     expect(nodeHeadingsClean).toEqual(pythonHeadingsClean);
 
     // 2. clean_view = false
-    const nodeResDirty = await sendRpc("tools/call", {
-      name: "read_docx",
-      arguments: {
-        file_path: gap1FixturePath,
-        mode: "outline",
-        clean_view: false,
+    const nodeResDirty = await sendRpc(
+      "tools/call",
+      {
+        name: "read_docx",
+        arguments: {
+          reasoning: "test",
+          file_path: gap1FixturePath,
+          mode: "outline",
+          clean_view: false,
+        },
       },
-    }, 205);
+      205,
+    );
 
     expect(nodeResDirty.result).toBeDefined();
     const nodeTextDirty = nodeResDirty.result.content[0].text;
 
-    const pythonOutDirty = execSync(`"${pythonCli}" extract "${gap1FixturePath}" --mode outline`, {
-      encoding: "utf-8",
-    });
+    const pythonOutDirty = execSync(
+      `"${pythonCli}" extract "${gap1FixturePath}" --mode outline`,
+      {
+        encoding: "utf-8",
+      },
+    );
 
     const nodeHeadingsDirty = getHeadings(nodeTextDirty);
     const pythonHeadingsDirty = getHeadings(pythonOutDirty);
 
-    expect(nodeHeadingsDirty).toEqual(["# Active Heading (p1)", "# Deleted Heading (p1)"]);
-    expect(pythonHeadingsDirty).toEqual(["# Active Heading (p1)", "# Deleted Heading (p1)"]);
+    expect(nodeHeadingsDirty).toEqual([
+      "# Active Heading (p1)",
+      "# Deleted Heading (p1)",
+    ]);
+    expect(pythonHeadingsDirty).toEqual([
+      "# Active Heading (p1)",
+      "# Deleted Heading (p1)",
+    ]);
     expect(nodeHeadingsDirty).toEqual(pythonHeadingsDirty);
   });
 
-  it("GAP 1 - Style Def (Live): style-definition outlineLvl on non-heading style classification parity", async () => {
-    const gap1FixturePath = resolve(__dirname, "../tests/fixtures/gap1_minimal_repro.docx");
+  it("GAP 1 - Style Def (Live): style-definition outlineLvl on non-heading style classification parity", { timeout: PYTHON_PARITY_TIMEOUT_MS }, async () => {
+    const gap1FixturePath = resolve(
+      __dirname,
+      "../tests/fixtures/gap1_minimal_repro.docx",
+    );
     const { execSync } = await import("node:child_process");
     const projectRoot = resolve(__dirname, "../../../..");
-    const pythonCli = process.platform === "win32"
-      ? join(projectRoot, "python/.venv/Scripts/adeu.exe")
-      : join(projectRoot, "python/.venv/bin/adeu");
+    const pythonCli =
+      process.platform === "win32"
+        ? join(projectRoot, "python/.venv/Scripts/adeu.exe")
+        : join(projectRoot, "python/.venv/bin/adeu");
 
     // 1. clean_view = true (both engines must return exactly 2 headings, excluding Subtitle)
-    const nodeResClean = await sendRpc("tools/call", {
-      name: "read_docx",
-      arguments: {
-        file_path: gap1FixturePath,
-        mode: "outline",
-        clean_view: true,
+    const nodeResClean = await sendRpc(
+      "tools/call",
+      {
+        name: "read_docx",
+        arguments: {
+          reasoning: "test",
+          file_path: gap1FixturePath,
+          mode: "outline",
+          clean_view: true,
+        },
       },
-    }, 206);
+      206,
+    );
 
     expect(nodeResClean.result).toBeDefined();
     const nodeTextClean = nodeResClean.result.content[0].text;
 
-    const pythonOutClean = execSync(`"${pythonCli}" extract "${gap1FixturePath}" --mode outline --clean-view`, {
-      encoding: "utf-8",
-    });
+    const pythonOutClean = execSync(
+      `"${pythonCli}" extract "${gap1FixturePath}" --mode outline --clean-view`,
+      {
+        encoding: "utf-8",
+      },
+    );
 
-    const getHeadings = (text: string) => text.split("\n").filter(line => line.startsWith("#")).map(l => l.trim());
+    const getHeadings = (text: string) =>
+      text
+        .split("\n")
+        .filter((line) => line.startsWith("#"))
+        .map((l) => l.trim());
 
     const nodeHeadingsClean = getHeadings(nodeTextClean);
     const pythonHeadingsClean = getHeadings(pythonOutClean);
@@ -258,8 +343,14 @@ describe("Parity Live Server Integration Verification", () => {
     expect(nodeHeadingsClean.length).toBe(2);
     expect(pythonHeadingsClean.length).toBe(2);
 
-    expect(nodeHeadingsClean).toEqual(["# Real Heading One (p1)", "# Real Heading Two (p1)"]);
-    expect(pythonHeadingsClean).toEqual(["# Real Heading One (p1)", "# Real Heading Two (p1)"]);
+    expect(nodeHeadingsClean).toEqual([
+      "# Real Heading One (p1)",
+      "# Real Heading Two (p1)",
+    ]);
+    expect(pythonHeadingsClean).toEqual([
+      "# Real Heading One (p1)",
+      "# Real Heading Two (p1)",
+    ]);
     expect(nodeHeadingsClean).toEqual(pythonHeadingsClean);
   });
 });

package/src/repro.feedback.test.ts

@@ -57,14 +57,17 @@ describe("Field feedback repro — Issue 3 file-path ambiguity (real MCP server)
 
     const serverPath = resolve(__dirname, "../dist/index.js");
     if (!existsSync(serverPath)) {
-      throw new Error("MCP server not built. Run 'npm run build' before tests.");
+      throw new Error(
+        "MCP server not built. Run 'npm run build' before tests.",
+      );
     }
     serverProc = spawn("node", [serverPath]);
   });
 
   afterAll(() => {
     if (serverProc && !serverProc.killed) serverProc.kill();
-    if (workDir && existsSync(workDir)) rmSync(workDir, { recursive: true, force: true });
+    if (workDir && existsSync(workDir))
+      rmSync(workDir, { recursive: true, force: true });
   });
 
   function sendRpc(method: string, params: any, id: number): Promise<any> {
@@ -105,9 +108,12 @@ describe("Field feedback repro — Issue 3 file-path ambiguity (real MCP server)
     const r1 = await callTool(
       "process_document_batch",
       {
+        reasoning: "test",
         original_docx_path: contractPath,
         author_name: "Agent",
-        changes: [{ type: "modify", target_text: "Provider", new_text: "Supplier" }],
+        changes: [
+          { type: "modify", target_text: "Provider", new_text: "Supplier" },
+        ],
       },
       201,
     );
@@ -120,7 +126,10 @@ describe("Field feedback repro — Issue 3 file-path ambiguity (real MCP server)
     //    NOT back onto contract.docx / contract_processed.docx.
     const r2 = await callTool(
       "accept_all_changes",
-      { docx_path: join(workDir, "contract_processed.docx") },
+      {
+        reasoning: "test",
+        docx_path: join(workDir, "contract_processed.docx"),
+      },
       202,
     );
     const msg2 = r2.result.content[0].text as string;
@@ -145,15 +154,20 @@ describe("Field feedback repro — Issue 3 file-path ambiguity (real MCP server)
     const r = await callTool(
       "process_document_batch",
       {
+        reasoning: "test",
         original_docx_path: join(workDir, "contract_processed.docx"),
         author_name: "Agent",
-        changes: [{ type: "modify", target_text: "goods", new_text: "products" }],
+        changes: [
+          { type: "modify", target_text: "goods", new_text: "products" },
+        ],
       },
       203,
     );
     const msg = r.result.content[0].text as string;
     expect(savedFile(msg)).toBe("contract_processed.docx");
-    expect(existsSync(join(workDir, "contract_processed_processed.docx"))).toBe(false);
+    expect(existsSync(join(workDir, "contract_processed_processed.docx"))).toBe(
+      false,
+    );
   });
 
   it("Issue 1 (end-to-end via shipped server): accept + modify the same foreign insertion in one batch succeeds", async () => {
@@ -162,7 +176,9 @@ describe("Field feedback repro — Issue 3 file-path ambiguity (real MCP server)
     const foreign = join(workDir, "lease.docx");
     {
       const doc = await DocumentObject.load(
-        readFileSync(resolve(__dirname, "../../../../shared/fixtures/initial.docx")),
+        readFileSync(
+          resolve(__dirname, "../../../../shared/fixtures/initial.docx"),
+        ),
       );
       const body = doc.element;
       while (body.firstChild) body.removeChild(body.firstChild);
@@ -191,6 +207,7 @@ describe("Field feedback repro — Issue 3 file-path ambiguity (real MCP server)
     const res = await callTool(
       "process_document_batch",
       {
+        reasoning: "test",
         original_docx_path: foreign,
         author_name: "Acme's Counsel",
         output_path: join(workDir, "lease_out.docx"),

package/src/response-builders.ts

@@ -220,13 +220,27 @@ export function build_search_response(
   const [body] = split_structural_appendix(text);
   const escapeRegExp = (s: string) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   const flags = search_case_sensitive ? "g" : "gi";
-  const patternStr = search_regex ? search_query : escapeRegExp(search_query);
 
+  // When the caller asked for a regex but supplied something the engine can't
+  // compile (e.g. an unterminated character class `\[`, or an inline-flag group
+  // `(?i)...` that JS RegExp rejects), do NOT hard-error and burn the turn.
+  // Downgrade to a literal search of the raw string and tell the model, so it
+  // can either accept the literal hits or fix its pattern — instead of retrying
+  // the same broken regex.
+  let regexDowngradedNote = "";
   let regex: RegExp;
-  try {
-    regex = new RegExp(patternStr, flags);
-  } catch (e: any) {
-    throw new Error(`Invalid regex pattern: ${e.message}`);
+  if (search_regex) {
+    try {
+      regex = new RegExp(search_query, flags);
+    } catch (e: any) {
+      regexDowngradedNote =
+        `> **Note:** \`${search_query}\` is not a valid regular expression ` +
+        `(${e.message}), so it was searched as literal text instead. ` +
+        `If you meant a regex, fix the pattern; if you meant literal text, set \`search_regex\` to false.`;
+      regex = new RegExp(escapeRegExp(search_query), flags);
+    }
+  } else {
+    regex = new RegExp(escapeRegExp(search_query), flags);
   }
 
   const allMatches = Array.from(body.matchAll(regex));
@@ -295,6 +309,7 @@ export function build_search_response(
     } else {
       body_msg = `> **Search Results** — No matches found for query \`${search_query}\` in \`${basename(file_path)}\`.\n\nVerify your search spelling, or try setting \`search_case_sensitive\` to false or enabling \`search_regex\` if you used pattern wildcards.`;
     }
+    if (regexDowngradedNote) body_msg = `${regexDowngradedNote}\n\n${body_msg}`;
     const llm_content = `> **File Path:** \`${resolve(file_path)}\`\n\n${body_msg}`;
     return {
       content: [{ type: "text", text: llm_content }],
@@ -415,6 +430,7 @@ export function build_search_response(
     i++;
   }
 
+  if (regexDowngradedNote) ui_parts.unshift(regexDowngradedNote);
   const ui_markdown = ui_parts.join("\n\n");
   const llm_content = `> **File Path:** \`${resolve(file_path)}\`\n\n${ui_markdown}`;