adeu 3.2.2__tar.gz → 4.0.0__tar.gz

adeu-4.0.0/Dockerfile

@@ -0,0 +1,12 @@
+FROM ghcr.io/astral-sh/uv:python3.12-bookworm-slim
+
+WORKDIR /app
+
+# Copy the project files
+COPY . /app
+
+# Install dependencies including the optional `mcp` extra (frozen to lockfile, no dev dependencies)
+RUN uv sync --frozen --extra mcp --no-dev
+
+# Start the MCP server using the entrypoint defined in pyproject.toml
+ENTRYPOINT ["uv", "run", "adeu-server"]

{adeu-3.2.2 → adeu-4.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: adeu
-Version: 3.2.2
+Version: 4.0.0
 Summary: Automated DOCX Redlining Engine
 Project-URL: Homepage, https://adeu.ai
 Project-URL: Repository, https://github.com/dealfluence/adeu
@@ -37,8 +37,6 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.12
 Requires-Dist: diff-match-patch>=20230430
-Requires-Dist: fastmcp[apps]<4,>=3.4.7
-Requires-Dist: jinja2>=3.1.6
 Requires-Dist: lxml>=5.0.0
 Requires-Dist: pydantic>=2.12
 Requires-Dist: python-docx>=1.1.0
@@ -46,6 +44,12 @@ Requires-Dist: pywin32; sys_platform == 'win32'
 Requires-Dist: rapidfuzz>=3.14.5
 Requires-Dist: regex>=2024.11.6
 Requires-Dist: structlog>=24.0.0
+Provides-Extra: all
+Requires-Dist: fastmcp[apps]<4,>=3.4.7; extra == 'all'
+Requires-Dist: jinja2>=3.1.6; extra == 'all'
+Provides-Extra: mcp
+Requires-Dist: fastmcp[apps]<4,>=3.4.7; extra == 'mcp'
+Requires-Dist: jinja2>=3.1.6; extra == 'mcp'
 Description-Content-Type: text/markdown
 
 # Adeu: Python Toolchain & MCP Server
@@ -183,7 +187,7 @@ The I/O contract (see `docs/cli-agent-spec.md` for the full specification):
 
 ## The Python SDK
 
-The SDK allows you to embed Adeu's Redline Engine directly into your own Python applications.
+The SDK allows you to embed Adeu's Redline Engine directly into your own Python applications without pulling in MCP server dependencies (`pip install adeu` or `uv add adeu`).
 
 ### Applying Tracked Changes
 The engine processes a flat list of `DocumentChange` objects (`ModifyText`, `SetField`, `AcceptChange`, `RejectChange`, `ReplyComment`, `InsertTableRow`, `DeleteTableRow`).
@@ -251,13 +255,14 @@ print(result.report_text)
 
 ## The MCP Server
 
-The Python backend exposes Adeu's capabilities to AI agents via the Model Context Protocol (MCP), powered by FastMCP.
+The Python backend exposes Adeu's capabilities to AI agents via the Model Context Protocol (MCP), powered by FastMCP (shipped in the optional `adeu[mcp]` extra so SDK and CLI installs stay slim).
 
 ### Running the Server
 You can boot the server over stdio for agent consumption:
 ```bash
-uvx --from adeu adeu-server
+uvx --from "adeu[mcp]" adeu-server
 ```
+Or install into an existing environment with `pip install "adeu[mcp]"` / `uv add "adeu[mcp]"`.
 
 ### Claude Desktop Integration
 Adeu provides an initialization command to automatically inject the MCP server into your local Claude Desktop configuration.

{adeu-3.2.2 → adeu-4.0.0}/README.md

@@ -133,7 +133,7 @@ The I/O contract (see `docs/cli-agent-spec.md` for the full specification):
 
 ## The Python SDK
 
-The SDK allows you to embed Adeu's Redline Engine directly into your own Python applications.
+The SDK allows you to embed Adeu's Redline Engine directly into your own Python applications without pulling in MCP server dependencies (`pip install adeu` or `uv add adeu`).
 
 ### Applying Tracked Changes
 The engine processes a flat list of `DocumentChange` objects (`ModifyText`, `SetField`, `AcceptChange`, `RejectChange`, `ReplyComment`, `InsertTableRow`, `DeleteTableRow`).
@@ -201,13 +201,14 @@ print(result.report_text)
 
 ## The MCP Server
 
-The Python backend exposes Adeu's capabilities to AI agents via the Model Context Protocol (MCP), powered by FastMCP.
+The Python backend exposes Adeu's capabilities to AI agents via the Model Context Protocol (MCP), powered by FastMCP (shipped in the optional `adeu[mcp]` extra so SDK and CLI installs stay slim).
 
 ### Running the Server
 You can boot the server over stdio for agent consumption:
 ```bash
-uvx --from adeu adeu-server
+uvx --from "adeu[mcp]" adeu-server
 ```
+Or install into an existing environment with `pip install "adeu[mcp]"` / `uv add "adeu[mcp]"`.
 
 ### Claude Desktop Integration
 Adeu provides an initialization command to automatically inject the MCP server into your local Claude Desktop configuration.

{adeu-3.2.2 → adeu-4.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "adeu"
-version = "3.2.2"
+version = "4.0.0"
 description = "Automated DOCX Redlining Engine"
 authors = [
     { name = "Mikko Korpela" },
@@ -24,13 +24,20 @@ dependencies = [
     "pydantic>=2.12",
     "lxml>=5.0.0",
     "diff-match-patch>=20230430",
-    "fastmcp[apps]>=3.4.7,<4",
-    "jinja2>=3.1.6",
     "pywin32; sys_platform == 'win32'",
     "rapidfuzz>=3.14.5",
     "regex>=2024.11.6",
 ]
 
+[project.optional-dependencies]
+mcp = [
+    "fastmcp[apps]>=3.4.7,<4",
+    "jinja2>=3.1.6",
+]
+all = [
+    "adeu[mcp]",
+]
+
 [project.urls]
 Homepage = "https://adeu.ai"
 Repository = "https://github.com/dealfluence/adeu"
@@ -45,7 +52,11 @@ requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [dependency-groups]
+# Keep fastmcp[apps] and jinja2 mirrored with [project.optional-dependencies].mcp
+# (enforced by tests/test_optional_mcp.py) so plain `uv sync` installs the full suite.
 dev = [
+    "fastmcp[apps]>=3.4.7,<4",
+    "jinja2>=3.1.6",
     "pytest",
     "ruff",
     "mypy",

{adeu-3.2.2 → adeu-4.0.0}/server.json

@@ -6,12 +6,12 @@
     "url": "https://github.com/dealfluence/adeu",
     "source": "github"
   },
-  "version": "3.2.2",
+  "version": "4.0.0",
   "packages": [
     {
       "registryType": "npm",
       "identifier": "@adeu/mcp-server",
-      "version": "3.2.2",
+      "version": "4.0.0",
       "transport": {
         "type": "stdio"
       }

{adeu-3.2.2 → adeu-4.0.0}/src/adeu/cli.py

@@ -143,7 +143,7 @@ def handle_init(args: argparse.Namespace):
         # PyPI release, so the MCP server silently drifts away from the CLI
         # the user tested (QA 2026-07-19 F-16).
         version, _sha, _ = get_build_info()
-        package_ref = f"adeu=={version}" if version and version not in ("unknown", "0.0.0") else "adeu"
+        package_ref = f"adeu[mcp]=={version}" if version and version not in ("unknown", "0.0.0") else "adeu[mcp]"
 
         mcp_servers["adeu"] = {
             "command": uvx_path,  # absolute path, not bare "uvx"

{adeu-3.2.2 → adeu-4.0.0}/src/adeu/diff.py

@@ -1,4 +1,5 @@
 import re
+from pathlib import Path
 from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, Union
 
 import structlog
@@ -1635,3 +1636,131 @@ def create_unified_diff(
     b_lines = modified_text.splitlines(keepends=True)
     diff = difflib.unified_diff(a_lines, b_lines, fromfile=fromfile, tofile=tofile)
     return "".join(diff)
+
+
+_CM_DELIMITER_RE = re.compile(r"\{--|\{\+\+|\{>>|\{==|--\}|\+\+\}|<<\}|==\}")
+
+
+def _clamp_display_to_criticmarkup_blocks(
+    raw_target: str, raw_new: str, prefix_len: int, suffix_len: int
+) -> tuple[int, int]:
+    """
+    Backtracks trim_common_context's cut points so neither display string is
+    sliced INSIDE a CriticMarkup block: trimming the common `{--A ` prefix of
+    `{--A B--}` -> `{--A C--}` would emit the orphaned-delimiter payloads
+    `B--}` / `C--}` (QA 2026-07-23 F15). Cuts only ever move OUTWARD (prefix
+    shrinks to the block start, suffix shrinks to just past the block end), so
+    the display region stays a superset of the semantic change.
+    """
+    span_cache = {s: [(m.start(), m.end()) for m in CRITICMARKUP_BLOCK_RE.finditer(s)] for s in (raw_target, raw_new)}
+
+    changed = True
+    while changed:
+        changed = False
+        for s in (raw_target, raw_new):
+            for b_start, b_end in span_cache[s]:
+                if b_start < prefix_len < b_end:
+                    prefix_len = b_start
+                    changed = True
+                suffix_cut = len(s) - suffix_len
+                if b_start < suffix_cut < b_end:
+                    suffix_len = max(0, len(s) - b_end)
+                    changed = True
+    return prefix_len, suffix_len
+
+
+def _escape_newlines_inside_blocks(s: str) -> str:
+    """
+    Keeps each CriticMarkup block on ONE diff payload line by escaping its
+    internal newlines — a multi-line {>>…<<} bubble otherwise ends a `+` line
+    mid-block and leaks bare closers onto continuation lines (F15).
+    """
+    return CRITICMARKUP_BLOCK_RE.sub(lambda m: m.group(0).replace("\n", "\\n"), s)
+
+
+def _balance_context_line(s: str) -> str:
+    """
+    Trims a display-only context window so every CriticMarkup delimiter on the
+    line is paired: the fixed-width window legally slices mid-block, leaving
+    an opener whose closer (or a closer whose opener) lies outside the window
+    (F15). Drops the line's head through the last opener-less closer and
+    truncates at the first closer-less opener.
+    """
+    depth = 0
+    cut_start = 0
+    for m in _CM_DELIMITER_RE.finditer(s):
+        if m.group(0).startswith("{"):
+            depth += 1
+        elif depth == 0:
+            cut_start = m.end()
+        else:
+            depth -= 1
+    s = s[cut_start:]
+
+    stack: list[int] = []
+    for m in _CM_DELIMITER_RE.finditer(s):
+        if m.group(0).startswith("{"):
+            stack.append(m.start())
+        elif stack:
+            stack.pop()
+    if stack:
+        s = s[: stack[0]]
+    return s
+
+
+def format_word_patch_diff(
+    original_path: str,
+    modified_path: str,
+    text_orig: str,
+    edits: List[ModifyText],
+) -> str:
+    """Format precomputed `ModifyText` hunks into Adeu's `@@ Word Patch @@` view."""
+    output = [
+        f"--- {Path(original_path).name}",
+        f"+++ {Path(modified_path).name}",
+        "",
+    ]
+    context_size = 40
+
+    for edit in edits:
+        raw_start = getattr(edit, "_match_start_index", 0) or 0
+        raw_target = edit.target_text or ""
+        raw_new = edit.new_text or ""
+
+        prefix_len, suffix_len = trim_common_context(raw_target, raw_new)
+        prefix_len, suffix_len = _clamp_display_to_criticmarkup_blocks(raw_target, raw_new, prefix_len, suffix_len)
+
+        target_end_in_target = len(raw_target) - suffix_len
+        new_end_in_new = len(raw_new) - suffix_len
+
+        display_target = _escape_newlines_inside_blocks(raw_target[prefix_len:target_end_in_target])
+        display_new = _escape_newlines_inside_blocks(raw_new[prefix_len:new_end_in_new])
+
+        change_start = raw_start + prefix_len
+        change_end = change_start + (target_end_in_target - prefix_len)
+
+        pre_start = max(0, change_start - context_size)
+        pre_context = text_orig[pre_start:change_start]
+        pre_context = _balance_context_line(pre_context.replace("\n", " ").replace("\r", ""))
+        if pre_start > 0:
+            pre_context = "..." + pre_context
+
+        post_end = min(len(text_orig), change_end + context_size)
+        post_context = text_orig[change_end:post_end]
+        post_context = _balance_context_line(post_context.replace("\n", " ").replace("\r", ""))
+        if post_end < len(text_orig):
+            post_context = post_context + "..."
+
+        output.append("@@ Word Patch @@")
+        output.append(f" {pre_context}")
+        if display_target:
+            output.append(f"- {display_target}")
+        if display_new:
+            output.append(f"+ {display_new}")
+        output.append(f" {post_context}")
+        output.append("")
+
+    return "\n".join(output)
+
+
+_create_diff_output = format_word_patch_diff

adeu-4.0.0/src/adeu/mcp_components/build_info.json

@@ -0,0 +1 @@
+{"git_sha": "cab9c6c", "build_timestamp": "20261113103944"}

{adeu-3.2.2 → adeu-4.0.0}/src/adeu/mcp_components/tools/document.py

@@ -7,14 +7,40 @@ import sys
 import time
 from io import BytesIO
 from pathlib import Path
-from typing import Annotated, Any, List, Literal, Optional, Union
+from typing import TYPE_CHECKING, Annotated, Any, List, Literal, Optional, Union
 
-from fastmcp import Context
-from fastmcp.exceptions import ToolError
-from fastmcp.tools import ToolResult, tool
 from pydantic import BeforeValidator, Field, TypeAdapter, WithJsonSchema
 
-from adeu.diff import generate_edits_from_text
+if TYPE_CHECKING:
+    from fastmcp import Context
+    from fastmcp.exceptions import ToolError
+    from fastmcp.tools import ToolResult, tool
+else:
+    try:
+        from fastmcp import Context
+        from fastmcp.exceptions import ToolError
+        from fastmcp.tools import ToolResult, tool
+    except ModuleNotFoundError:
+
+        class Context:
+            pass
+
+        class ToolError(RuntimeError):
+            pass
+
+        class ToolResult:
+            def __init__(self, content: Any = None, structured_content: Any = None) -> None:
+                self.content = content
+                self.structured_content = structured_content
+
+        def tool(*_args: Any, **_kwargs: Any) -> Any:
+            return lambda fn: fn
+
+
+from adeu.diff import (
+    format_word_patch_diff,
+    generate_edits_from_text,
+)
 from adeu.ingest import extract_text_from_stream
 from adeu.mcp_components._response_builders import (
     BuilderError,
@@ -1037,137 +1063,7 @@ async def diff_docx_files(
     return add_timing_if_debug(start_time, res)
 
 
-def _clamp_display_to_criticmarkup_blocks(
-    raw_target: str, raw_new: str, prefix_len: int, suffix_len: int
-) -> tuple[int, int]:
-    """
-    Backtracks trim_common_context's cut points so neither display string is
-    sliced INSIDE a CriticMarkup block: trimming the common `{--A ` prefix of
-    `{--A B--}` -> `{--A C--}` would emit the orphaned-delimiter payloads
-    `B--}` / `C--}` (QA 2026-07-23 F15). Cuts only ever move OUTWARD (prefix
-    shrinks to the block start, suffix shrinks to just past the block end), so
-    the display region stays a superset of the semantic change.
-    """
-    from adeu.diff import CRITICMARKUP_BLOCK_RE
-
-    span_cache = {s: [(m.start(), m.end()) for m in CRITICMARKUP_BLOCK_RE.finditer(s)] for s in (raw_target, raw_new)}
-
-    changed = True
-    while changed:
-        changed = False
-        for s in (raw_target, raw_new):
-            for b_start, b_end in span_cache[s]:
-                if b_start < prefix_len < b_end:
-                    prefix_len = b_start
-                    changed = True
-                suffix_cut = len(s) - suffix_len
-                if b_start < suffix_cut < b_end:
-                    suffix_len = max(0, len(s) - b_end)
-                    changed = True
-    return prefix_len, suffix_len
-
-
-def _escape_newlines_inside_blocks(s: str) -> str:
-    """
-    Keeps each CriticMarkup block on ONE diff payload line by escaping its
-    internal newlines — a multi-line {>>…<<} bubble otherwise ends a `+` line
-    mid-block and leaks bare closers onto continuation lines (F15).
-    """
-    from adeu.diff import CRITICMARKUP_BLOCK_RE
-
-    return CRITICMARKUP_BLOCK_RE.sub(lambda m: m.group(0).replace("\n", "\\n"), s)
-
-
-_CM_DELIMITER_RE = re.compile(r"\{--|\{\+\+|\{>>|\{==|--\}|\+\+\}|<<\}|==\}")
-
-
-def _balance_context_line(s: str) -> str:
-    """
-    Trims a display-only context window so every CriticMarkup delimiter on the
-    line is paired: the fixed-width window legally slices mid-block, leaving
-    an opener whose closer (or a closer whose opener) lies outside the window
-    (F15). Drops the line's head through the last opener-less closer and
-    truncates at the first closer-less opener.
-    """
-    # Head: drop through the LAST closer with no opener inside the window.
-    depth = 0
-    cut_start = 0
-    for m in _CM_DELIMITER_RE.finditer(s):
-        if m.group(0).startswith("{"):
-            depth += 1
-        elif depth == 0:
-            cut_start = m.end()
-        else:
-            depth -= 1
-    s = s[cut_start:]
-
-    # Tail: truncate at the FIRST opener whose closer is beyond the window.
-    stack: list[int] = []
-    for m in _CM_DELIMITER_RE.finditer(s):
-        if m.group(0).startswith("{"):
-            stack.append(m.start())
-        elif stack:
-            stack.pop()
-    if stack:
-        s = s[: stack[0]]
-    return s
-
-
-def _create_diff_output(original_path: str, modified_path: str, text_orig: str, edits: List[ModifyText]):
-    from adeu.diff import trim_common_context
-
-    output = [
-        f"--- {Path(original_path).name}",
-        f"+++ {Path(modified_path).name}",
-        "",
-    ]
-    CONTEXT_SIZE = 40
-
-    for edit in edits:
-        raw_start = getattr(edit, "_match_start_index", 0) or 0
-        raw_target = edit.target_text or ""
-        raw_new = edit.new_text or ""
-
-        # Compute the SEMANTIC change region by stripping common context that
-        # `generate_edits_from_text` baked into target_text/new_text (anchor for
-        # synthetic insertions, common prefix/suffix from coalesced edits).
-        prefix_len, suffix_len = trim_common_context(raw_target, raw_new)
-        # Never cut a display string inside a CriticMarkup block (F15).
-        prefix_len, suffix_len = _clamp_display_to_criticmarkup_blocks(raw_target, raw_new, prefix_len, suffix_len)
-
-        target_end_in_target = len(raw_target) - suffix_len
-        new_end_in_new = len(raw_new) - suffix_len
-
-        display_target = _escape_newlines_inside_blocks(raw_target[prefix_len:target_end_in_target])
-        display_new = _escape_newlines_inside_blocks(raw_new[prefix_len:new_end_in_new])
-
-        # Shift the anchor point in the original text by the stripped prefix.
-        change_start = raw_start + prefix_len
-        change_end = change_start + (target_end_in_target - prefix_len)
-
-        # Compute context windows around the SEMANTIC change region.
-        pre_start = max(0, change_start - CONTEXT_SIZE)
-        pre_context = text_orig[pre_start:change_start]
-        pre_context = _balance_context_line(pre_context.replace("\n", " ").replace("\r", ""))
-        if pre_start > 0:
-            pre_context = "..." + pre_context
-
-        post_end = min(len(text_orig), change_end + CONTEXT_SIZE)
-        post_context = text_orig[change_end:post_end]
-        post_context = _balance_context_line(post_context.replace("\n", " ").replace("\r", ""))
-        if post_end < len(text_orig):
-            post_context = post_context + "..."
-
-        output.append("@@ Word Patch @@")
-        output.append(f" {pre_context}")
-        if display_target:
-            output.append(f"- {display_target}")
-        if display_new:
-            output.append(f"+ {display_new}")
-        output.append(f" {post_context}")
-        output.append("")
-
-    return "\n".join(output)
+_create_diff_output = format_word_patch_diff
 
 
 @tool(

{adeu-3.2.2 → adeu-4.0.0}/src/adeu/mcp_components/tools/live_word.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import io
 import os
 import re
@@ -6,9 +8,6 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Any, List, Optional, Tuple
 
 import structlog
-from fastmcp import Context
-from fastmcp.exceptions import ToolError
-from fastmcp.tools import ToolResult
 
 from adeu import RedlineEngine
 from adeu.mcp_components._response_builders import (
@@ -27,7 +26,8 @@ from adeu.utils.text import batch_details_header
 logger = structlog.get_logger(__name__)
 
 if TYPE_CHECKING:
-    pass
+    from fastmcp import Context
+    from fastmcp.tools import ToolResult
 
 
 def _build_mock_docx_stream(word_open_xml: str) -> io.BytesIO:
@@ -344,6 +344,9 @@ if sys.platform == "win32":
         match_offset: int = 0,
         full_paragraph: bool = False,
     ) -> ToolResult:
+        from fastmcp.exceptions import ToolError
+        from fastmcp.tools import ToolResult
+
         await ctx.info(
             f"Extracting live Word document via WordOpenXML "
             f"(clean_view={clean_view}, path={file_path}, mode={mode}, page={page}, "
@@ -1269,6 +1272,8 @@ if sys.platform == "win32":
         file_path: Optional[str] = None,
         gate_overrides: Optional[dict] = None,
     ) -> str:
+        from fastmcp.exceptions import ToolError
+
         if not changes:
             return "No changes provided."
 
@@ -1298,6 +1303,8 @@ if sys.platform == "win32":
             raise ToolError(str(e)) from e
 
     async def open_word_document_impl(ctx: Context, file_path: str, visible: bool = True) -> str:
+        from fastmcp.exceptions import ToolError
+
         await ctx.info(f"Opening {file_path} in Word...")
         pythoncom.CoInitialize()
         try:
@@ -1321,6 +1328,8 @@ if sys.platform == "win32":
     async def save_active_word_document_impl(
         ctx: Context, output_path: Optional[str] = None, close: bool = False
     ) -> str:
+        from fastmcp.exceptions import ToolError
+
         await ctx.info("Saving active Word document...")
         pythoncom.CoInitialize()
         try: