uni-diff-patch 0.0.1__tar.gz

uni_diff_patch-0.0.1/PKG-INFO

@@ -0,0 +1,194 @@
+Metadata-Version: 2.3
+Name: uni-diff-patch
+Version: 0.0.1
+Summary: MCP server and CLI tool for generating valid unified diff patches deterministically
+Author: LimLLL
+Author-email: LimLLL <github@awebapp.useforall.com>
+Requires-Dist: mpatch
+Requires-Dist: mcp[cli]
+Requires-Dist: click
+Requires-Dist: pydantic>=2.13.4
+Requires-Python: >=3.12
+Description-Content-Type: text/markdown
+
+# uni-diff-patch
+
+MCP server + CLI tool for generating valid unified diff patches deterministically.
+
+LLM provides content or search/replace pairs, the tool computes correct diffs via [mpatch](https://github.com/Romelium/mpatch) (Rust) — no more broken hunks, no more `git apply` failures.
+
+---
+
+MCP 服务器 + CLI 工具，确定性生成合法的 unified diff patch。
+
+LLM 只需提供文件内容或搜索替换对，工具通过 [mpatch](https://github.com/Romelium/mpatch) (Rust) 计算正确的 diff — 不再有坏掉的 hunk，`git apply` 不再失败。
+
+## Install / 安装
+
+```bash
+uv add uni-diff-patch     # as dependency / 作为依赖
+uvx uni-diff-patch --help  # run directly / 直接运行
+```
+
+## CLI / 命令行
+
+```bash
+# Generate patch from JSON spec / 从 JSON spec 生成 patch
+uni-diff-patch generate --spec changes.json -o output.diff
+
+# Generate with work_dir (for absolute paths) / 指定工作目录（用于绝对路径）
+uni-diff-patch generate --spec changes.json --work-dir /path/to/project
+
+# Validate a patch / 验证 patch
+uni-diff-patch validate output.diff
+uni-diff-patch validate output.diff --git-check --work-dir /path/to/repo
+
+# Start MCP server / 启动 MCP 服务器
+uni-diff-patch serve
+```
+
+## MCP Configuration / MCP 配置
+
+```json
+{
+  "mcpServers": {
+    "uni-diff-patch": {
+      "command": "uvx",
+      "args": ["uni-diff-patch", "serve"]
+    }
+  }
+}
+```
+
+## JSON Spec Format / JSON Spec 格式
+
+All modes are specified in a `changes` array. Each change requires `file_path` and `mode`.
+
+所有模式通过 `changes` 数组指定，每个变更需要 `file_path` 和 `mode`。
+
+### file_content — Full new content / 完整新内容
+
+Tool reads original from disk and diffs. / 工具从磁盘读取原文件并生成 diff。
+
+```json
+{
+  "changes": [{
+    "file_path": "src/main.py",
+    "mode": "file_content",
+    "new_content": "def main():\n    print('hello')\n"
+  }]
+}
+```
+
+### search_replace — Targeted replacements / 精准替换（最省 token）
+
+```json
+{
+  "changes": [{
+    "file_path": "src/main.py",
+    "mode": "search_replace",
+    "replacements": [
+      {"search": "print('hello')", "replace": "print('world')"},
+      {"search": "old_func()", "replace": "new_func()", "line_hint": 42}
+    ]
+  }]
+}
+```
+
+`line_hint`: approximate line number for disambiguation when `search` matches multiple locations.
+
+`line_hint`：当 `search` 匹配多处时，用大致行号消歧（选最近的匹配）。
+
+### create_file — New file / 新建文件
+
+```json
+{
+  "changes": [{
+    "file_path": "src/new_module.py",
+    "mode": "create_file",
+    "new_content": "# New module\ndef init():\n    pass\n"
+  }]
+}
+```
+
+### delete_file — Remove file / 删除文件
+
+```json
+{
+  "changes": [{
+    "file_path": "src/deprecated.py",
+    "mode": "delete_file"
+  }]
+}
+```
+
+### text_pair — Both old and new text / 直接传入新旧文本（不读磁盘）
+
+```json
+{
+  "changes": [{
+    "file_path": "virtual/path.py",
+    "mode": "text_pair",
+    "old_text": "x = 1\n",
+    "new_text": "x = 2\n"
+  }]
+}
+```
+
+### rename_file — Rename/move / 重命名/移动文件
+
+Optionally with content change. / 可同时修改内容。
+
+```json
+{
+  "changes": [{
+    "file_path": "src/old_name.py",
+    "mode": "rename_file",
+    "new_path": "src/new_name.py",
+    "new_content": "# Optional modified content\n"
+  }]
+}
+```
+
+### chmod — Permission change / 权限变更
+
+Optionally with content change. / 可同时修改内容。
+
+```json
+{
+  "changes": [{
+    "file_path": "scripts/deploy.sh",
+    "mode": "chmod",
+    "old_mode": "100644",
+    "new_mode": "100755"
+  }]
+}
+```
+
+### Multi-file patch / 多文件合并 patch
+
+```json
+{
+  "changes": [
+    {"file_path": "src/a.py", "mode": "file_content", "new_content": "..."},
+    {"file_path": "src/b.py", "mode": "search_replace", "replacements": [{"search": "old", "replace": "new"}]},
+    {"file_path": "src/c.py", "mode": "create_file", "new_content": "..."}
+  ],
+  "output_path": "changes.diff"
+}
+```
+
+## Optional Fields / 可选字段
+
+| Field / 字段 | Default / 默认值 | Description / 说明 |
+|-------|---------|------------|
+| `encoding` | `"utf-8"` | File encoding for disk-read modes / 磁盘读取模式的文件编码 |
+| `context_lines` | `3` | Context lines in diff / diff 中的上下文行数 |
+| `output_path` | — | Top-level, writes patch to file / 顶层字段，将 patch 写入文件 |
+
+## Development / 开发
+
+```bash
+uv sync
+uv run pytest tests/ -v
+```

uni_diff_patch-0.0.1/README.md

@@ -0,0 +1,181 @@
+# uni-diff-patch
+
+MCP server + CLI tool for generating valid unified diff patches deterministically.
+
+LLM provides content or search/replace pairs, the tool computes correct diffs via [mpatch](https://github.com/Romelium/mpatch) (Rust) — no more broken hunks, no more `git apply` failures.
+
+---
+
+MCP 服务器 + CLI 工具，确定性生成合法的 unified diff patch。
+
+LLM 只需提供文件内容或搜索替换对，工具通过 [mpatch](https://github.com/Romelium/mpatch) (Rust) 计算正确的 diff — 不再有坏掉的 hunk，`git apply` 不再失败。
+
+## Install / 安装
+
+```bash
+uv add uni-diff-patch     # as dependency / 作为依赖
+uvx uni-diff-patch --help  # run directly / 直接运行
+```
+
+## CLI / 命令行
+
+```bash
+# Generate patch from JSON spec / 从 JSON spec 生成 patch
+uni-diff-patch generate --spec changes.json -o output.diff
+
+# Generate with work_dir (for absolute paths) / 指定工作目录（用于绝对路径）
+uni-diff-patch generate --spec changes.json --work-dir /path/to/project
+
+# Validate a patch / 验证 patch
+uni-diff-patch validate output.diff
+uni-diff-patch validate output.diff --git-check --work-dir /path/to/repo
+
+# Start MCP server / 启动 MCP 服务器
+uni-diff-patch serve
+```
+
+## MCP Configuration / MCP 配置
+
+```json
+{
+  "mcpServers": {
+    "uni-diff-patch": {
+      "command": "uvx",
+      "args": ["uni-diff-patch", "serve"]
+    }
+  }
+}
+```
+
+## JSON Spec Format / JSON Spec 格式
+
+All modes are specified in a `changes` array. Each change requires `file_path` and `mode`.
+
+所有模式通过 `changes` 数组指定，每个变更需要 `file_path` 和 `mode`。
+
+### file_content — Full new content / 完整新内容
+
+Tool reads original from disk and diffs. / 工具从磁盘读取原文件并生成 diff。
+
+```json
+{
+  "changes": [{
+    "file_path": "src/main.py",
+    "mode": "file_content",
+    "new_content": "def main():\n    print('hello')\n"
+  }]
+}
+```
+
+### search_replace — Targeted replacements / 精准替换（最省 token）
+
+```json
+{
+  "changes": [{
+    "file_path": "src/main.py",
+    "mode": "search_replace",
+    "replacements": [
+      {"search": "print('hello')", "replace": "print('world')"},
+      {"search": "old_func()", "replace": "new_func()", "line_hint": 42}
+    ]
+  }]
+}
+```
+
+`line_hint`: approximate line number for disambiguation when `search` matches multiple locations.
+
+`line_hint`：当 `search` 匹配多处时，用大致行号消歧（选最近的匹配）。
+
+### create_file — New file / 新建文件
+
+```json
+{
+  "changes": [{
+    "file_path": "src/new_module.py",
+    "mode": "create_file",
+    "new_content": "# New module\ndef init():\n    pass\n"
+  }]
+}
+```
+
+### delete_file — Remove file / 删除文件
+
+```json
+{
+  "changes": [{
+    "file_path": "src/deprecated.py",
+    "mode": "delete_file"
+  }]
+}
+```
+
+### text_pair — Both old and new text / 直接传入新旧文本（不读磁盘）
+
+```json
+{
+  "changes": [{
+    "file_path": "virtual/path.py",
+    "mode": "text_pair",
+    "old_text": "x = 1\n",
+    "new_text": "x = 2\n"
+  }]
+}
+```
+
+### rename_file — Rename/move / 重命名/移动文件
+
+Optionally with content change. / 可同时修改内容。
+
+```json
+{
+  "changes": [{
+    "file_path": "src/old_name.py",
+    "mode": "rename_file",
+    "new_path": "src/new_name.py",
+    "new_content": "# Optional modified content\n"
+  }]
+}
+```
+
+### chmod — Permission change / 权限变更
+
+Optionally with content change. / 可同时修改内容。
+
+```json
+{
+  "changes": [{
+    "file_path": "scripts/deploy.sh",
+    "mode": "chmod",
+    "old_mode": "100644",
+    "new_mode": "100755"
+  }]
+}
+```
+
+### Multi-file patch / 多文件合并 patch
+
+```json
+{
+  "changes": [
+    {"file_path": "src/a.py", "mode": "file_content", "new_content": "..."},
+    {"file_path": "src/b.py", "mode": "search_replace", "replacements": [{"search": "old", "replace": "new"}]},
+    {"file_path": "src/c.py", "mode": "create_file", "new_content": "..."}
+  ],
+  "output_path": "changes.diff"
+}
+```
+
+## Optional Fields / 可选字段
+
+| Field / 字段 | Default / 默认值 | Description / 说明 |
+|-------|---------|------------|
+| `encoding` | `"utf-8"` | File encoding for disk-read modes / 磁盘读取模式的文件编码 |
+| `context_lines` | `3` | Context lines in diff / diff 中的上下文行数 |
+| `output_path` | — | Top-level, writes patch to file / 顶层字段，将 patch 写入文件 |
+
+## Development / 开发
+
+```bash
+uv sync
+uv run pytest tests/ -v
+```

uni_diff_patch-0.0.1/pyproject.toml

@@ -0,0 +1,27 @@
+[project]
+name = "uni-diff-patch"
+version = "0.0.1"
+description = "MCP server and CLI tool for generating valid unified diff patches deterministically"
+readme = "README.md"
+authors = [
+    { name = "LimLLL", email = "github@awebapp.useforall.com" }
+]
+requires-python = ">=3.12"
+dependencies = [
+    "mpatch",
+    "mcp[cli]",
+    "click",
+    "pydantic>=2.13.4",
+]
+
+[project.scripts]
+uni-diff-patch = "uni_diff_patch.cli:main"
+
+[build-system]
+requires = ["uv_build>=0.9.27,<0.10.0"]
+build-backend = "uv_build"
+
+[dependency-groups]
+dev = [
+    "pytest>=9.1.1",
+]

uni_diff_patch-0.0.1/src/uni_diff_patch/__init__.py

@@ -0,0 +1,46 @@
+"""uni-diff-patch: MCP server and CLI for generating valid unified diff patches."""
+
+from uni_diff_patch.core.diff_engine import (
+    DiffGenerationError,
+    GenerateResult,
+    generate_patch,
+)
+from uni_diff_patch.core.search_replace import (
+    AmbiguousMatchError,
+    NoMatchError,
+    Replacement,
+    SearchReplaceError,
+)
+from uni_diff_patch.core.validator import ValidationResult, validate_patch
+from uni_diff_patch.models import (
+    ChmodChange,
+    CreateFileChange,
+    DeleteFileChange,
+    FileChange,
+    FileContentChange,
+    RenameFileChange,
+    ReplacementModel,
+    SearchReplaceChange,
+    TextPairChange,
+)
+
+__all__ = [
+    "ChmodChange",
+    "CreateFileChange",
+    "DeleteFileChange",
+    "DiffGenerationError",
+    "FileChange",
+    "FileContentChange",
+    "GenerateResult",
+    "RenameFileChange",
+    "ReplacementModel",
+    "SearchReplaceChange",
+    "TextPairChange",
+    "generate_patch",
+    "validate_patch",
+    "ValidationResult",
+    "Replacement",
+    "SearchReplaceError",
+    "NoMatchError",
+    "AmbiguousMatchError",
+]

uni_diff_patch-0.0.1/src/uni_diff_patch/cli.py

@@ -0,0 +1,178 @@
+"""CLI entry point for uni-diff-patch."""
+
+from __future__ import annotations
+
+import json
+import sys
+
+import click
+
+from uni_diff_patch.core.diff_engine import (
+    DiffGenerationError,
+    generate_patch,
+)
+from uni_diff_patch.core.search_replace import SearchReplaceError
+from uni_diff_patch.core.validator import validate_patch
+from uni_diff_patch.server import _parse_changes
+
+
+@click.group()
+@click.version_option(package_name="uni-diff-patch")
+def main() -> None:
+    """uni-diff-patch: Generate valid unified diff patches deterministically."""
+
+
+@main.command()
+@click.option(
+    "--spec",
+    "spec_source",
+    required=True,
+    help="JSON spec file path, or '-' for stdin.",
+)
+@click.option(
+    "-o",
+    "--output",
+    "output_override",
+    default=None,
+    help="Override output file path (takes precedence over spec's output_path).",
+)
+@click.option(
+    "--work-dir",
+    default=None,
+    help="Base directory for relativizing absolute paths in diff headers.",
+)
+@click.option(
+    "--overwrite",
+    is_flag=True,
+    help="Overwrite existing output file.",
+)
+def generate(
+    spec_source: str,
+    output_override: str | None,
+    work_dir: str | None,
+    overwrite: bool,
+) -> None:
+    """Generate a unified diff patch from a JSON spec.
+
+    The spec JSON must contain a "changes" array. Each change has:
+    file_path, mode, and mode-specific fields.
+
+    Modes: file_content, search_replace, create_file, delete_file,
+    text_pair, rename_file, chmod.
+    """
+    # 读取 spec
+    try:
+        if spec_source == "-":
+            spec_data = json.load(sys.stdin)
+        else:
+            with open(spec_source, encoding="utf-8") as f:
+                spec_data = json.load(f)
+    except (json.JSONDecodeError, FileNotFoundError, OSError) as e:
+        raise click.ClickException(f"Failed to read spec: {e}")
+
+    if not isinstance(spec_data, dict):
+        raise click.ClickException("Spec must be a JSON object")
+
+    raw_changes = spec_data.get("changes")
+    if not isinstance(raw_changes, list) or not raw_changes:
+        raise click.ClickException("Spec must contain a non-empty 'changes' array")
+
+    try:
+        file_changes = _parse_changes(raw_changes)
+    except ValueError as e:
+        raise click.ClickException(str(e))
+
+    # output 优先级：CLI flag > spec 中的 output_path
+    final_output = output_override or spec_data.get("output_path")
+
+    try:
+        result = generate_patch(
+            file_changes,
+            output_path=final_output,
+            work_dir=work_dir,
+            overwrite=overwrite,
+        )
+    except (DiffGenerationError, SearchReplaceError) as e:
+        raise click.ClickException(str(e))
+
+    if not result.patch:
+        click.echo("No changes detected.", err=True)
+        sys.exit(0)
+
+    if result.skipped_files:
+        click.echo(
+            f"Skipped (no changes): {', '.join(result.skipped_files)}",
+            err=True,
+        )
+
+    if not result.self_valid:
+        click.echo("WARNING: generated patch failed self-validation", err=True)
+
+    if final_output:
+        click.echo(
+            f"Patch written to {final_output} "
+            f"({result.files_changed} file(s) changed)",
+            err=True,
+        )
+    else:
+        click.echo(result.patch, nl=False)
+
+
+@main.command()
+@click.argument("patch_source", default="-")
+@click.option(
+    "--git-check", is_flag=True, help="Also run git apply --check."
+)
+@click.option(
+    "--work-dir",
+    default=None,
+    help="Working directory for git apply --check.",
+)
+def validate(patch_source: str, git_check: bool, work_dir: str | None) -> None:
+    """Validate a unified diff patch file.
+
+    Pass a file path or '-' (default) to read from stdin.
+    """
+    patch_content: str | None = None
+    patch_path: str | None = None
+
+    if patch_source == "-":
+        raw = sys.stdin.read()
+        if not raw.strip():
+            raise click.ClickException("No patch content provided on stdin")
+        patch_content = raw
+    else:
+        patch_path = patch_source
+
+    result = validate_patch(
+        patch_content=patch_content,
+        patch_path=patch_path,
+        git_check=git_check,
+        work_dir=work_dir,
+    )
+
+    if result.valid:
+        click.echo(f"VALID — {len(result.files)} file(s), {result.total_hunks} hunk(s)")
+        for f in result.files:
+            status = " [new]" if f.is_creation else ""
+            click.echo(f"  {f.file_path}: {f.hunk_count} hunk(s){status}")
+    else:
+        click.echo("INVALID", err=True)
+        if result.parse_error:
+            click.echo(f"  Parse error: {result.parse_error}", err=True)
+        if result.git_apply_error:
+            click.echo(f"  git apply: {result.git_apply_error}", err=True)
+        sys.exit(1)
+
+    if result.git_apply_ok is True:
+        click.echo("git apply --check: OK")
+    elif result.git_apply_ok is False:
+        click.echo(f"git apply --check: FAILED — {result.git_apply_error}", err=True)
+
+
+@main.command()
+def serve() -> None:
+    """Start the MCP server (stdio transport)."""
+    from uni_diff_patch.server import run_server
+
+    run_server()