editbuffer 0.2.1__py3-none-any.whl → 0.2.2__py3-none-any.whl

editbuffer/mcp_server.py

@@ -5,6 +5,14 @@ from typing import Any
 from uuid import uuid4
 
 from .buffer import EditBuffer
+from .errors import (
+    AmbiguousTargetError,
+    EditBufferError,
+    FuzzyMatchError,
+    InvalidOperationError,
+    StaleVersionError,
+    TargetNotFoundError,
+)
 from .history import EditRecord
 
 
@@ -61,6 +69,12 @@ class BufferRegistry:
     def command_history(self) -> list[dict[str, Any]]:
         return list(self._commands)
 
+    def current_version(self, buffer_id: str | None) -> int | None:
+        if buffer_id is None:
+            return None
+        buffer = self._buffers.get(buffer_id)
+        return None if buffer is None else buffer.version
+
     def select_command(
         self,
         command_id: str,
@@ -140,7 +154,11 @@ def create_server() -> Any:
         buffer_id: str | None = None,
     ) -> dict[str, Any]:
         """Create an in-memory pending output buffer."""
-        return registry.create(content, buffer_id=buffer_id)
+        return _tool_result(
+            lambda: registry.create(content, buffer_id=buffer_id),
+            registry,
+            buffer_id=buffer_id,
+        )
 
     @server.tool()
     def buffer_list() -> list[dict[str, Any]]:
@@ -150,7 +168,7 @@ def create_server() -> Any:
     @server.tool()
     def buffer_view(buffer_id: str) -> dict[str, Any]:
         """View current content, version, snapshots, and commit state."""
-        return registry.view(buffer_id)
+        return _tool_result(lambda: registry.view(buffer_id), registry, buffer_id=buffer_id)
 
     @server.tool()
     def buffer_edit(
@@ -164,22 +182,79 @@ def create_server() -> Any:
         Operations: append, replace, insert_before, insert_after, delete, rollback.
         Targets: exact/context/range/fuzzy/block. Ambiguous edits fail without mutation.
         """
-        return registry.edit(buffer_id, operation)
+        return _tool_result(
+            lambda: registry.edit(buffer_id, operation),
+            registry,
+            buffer_id=buffer_id,
+        )
+
+    @server.tool()
+    def buffer_append(buffer_id: str, text: str) -> dict[str, Any]:
+        """Append text to a pending buffer."""
+        return _tool_result(
+            lambda: registry.edit(buffer_id, {"op": "append", "text": text}),
+            registry,
+            buffer_id=buffer_id,
+        )
+
+    @server.tool()
+    def buffer_replace(
+        buffer_id: str,
+        target: dict[str, Any],
+        text: str,
+    ) -> dict[str, Any]:
+        """Replace a selection with text. Target can be exact/context/range/fuzzy/block."""
+        return _selection_tool(registry, buffer_id, "replace", target, text)
+
+    @server.tool()
+    def buffer_insert_before(
+        buffer_id: str,
+        target: dict[str, Any],
+        text: str,
+    ) -> dict[str, Any]:
+        """Insert text before a selection. Target can be exact/context/range/fuzzy/block."""
+        return _selection_tool(registry, buffer_id, "insert_before", target, text)
+
+    @server.tool()
+    def buffer_insert_after(
+        buffer_id: str,
+        target: dict[str, Any],
+        text: str,
+    ) -> dict[str, Any]:
+        """Insert text after a selection. Target can be exact/context/range/fuzzy/block."""
+        return _selection_tool(registry, buffer_id, "insert_after", target, text)
+
+    @server.tool()
+    def buffer_delete(buffer_id: str, target: dict[str, Any]) -> dict[str, Any]:
+        """Delete a selection. Target can be exact/context/range/fuzzy/block."""
+        return _tool_result(
+            lambda: registry.edit(buffer_id, {"op": "delete", "target": target}),
+            registry,
+            buffer_id=buffer_id,
+        )
 
     @server.tool()
     def buffer_history(buffer_id: str) -> list[dict[str, Any]]:
         """Return the audit trail for successful edits."""
-        return registry.history(buffer_id)
+        return _tool_result(
+            lambda: registry.history(buffer_id),
+            registry,
+            buffer_id=buffer_id,
+        )
 
     @server.tool()
     def buffer_rollback(buffer_id: str, version: int) -> dict[str, Any]:
         """Restore a prior snapshot as a new audited version."""
-        return registry.rollback(buffer_id, version)
+        return _tool_result(
+            lambda: registry.rollback(buffer_id, version),
+            registry,
+            buffer_id=buffer_id,
+        )
 
     @server.tool()
     def buffer_commit(buffer_id: str) -> dict[str, Any]:
         """Commit final output, close the buffer, and remember it as a reusable command."""
-        return registry.commit(buffer_id)
+        return _tool_result(lambda: registry.commit(buffer_id), registry, buffer_id=buffer_id)
 
     @server.tool()
     def command_history() -> list[dict[str, Any]]:
@@ -192,11 +267,98 @@ def create_server() -> Any:
         buffer_id: str | None = None,
     ) -> dict[str, Any]:
         """Create a new pending buffer from a previous command instead of regenerating it."""
-        return registry.select_command(command_id, buffer_id=buffer_id)
+        return _tool_result(
+            lambda: registry.select_command(command_id, buffer_id=buffer_id),
+            registry,
+            buffer_id=buffer_id,
+        )
 
     return server
 
 
+def _selection_tool(
+    registry: BufferRegistry,
+    buffer_id: str,
+    op: str,
+    target: dict[str, Any],
+    text: str,
+) -> dict[str, Any]:
+    return _tool_result(
+        lambda: registry.edit(buffer_id, {"op": op, "target": target, "text": text}),
+        registry,
+        buffer_id=buffer_id,
+    )
+
+
+def _tool_result(
+    call: Any,
+    registry: BufferRegistry,
+    *,
+    buffer_id: str | None = None,
+) -> Any:
+    try:
+        return call()
+    except (EditBufferError, KeyError, ValueError) as error:
+        return {
+            "ok": False,
+            "error": _structured_error(
+                error,
+                current_version=registry.current_version(buffer_id),
+            ),
+        }
+
+
+def _structured_error(
+    error: Exception,
+    *,
+    current_version: int | None,
+) -> dict[str, Any]:
+    payload: dict[str, Any] = {
+        "type": _error_type(error),
+        "message": _message(error),
+    }
+    if current_version is not None:
+        payload["current_version"] = current_version
+    if isinstance(error, AmbiguousTargetError):
+        payload["candidates"] = [list(candidate) for candidate in error.candidates]
+    if isinstance(error, FuzzyMatchError):
+        payload["reason"] = error.reason
+        payload["candidates"] = [list(candidate) for candidate in error.candidates]
+    return payload
+
+
+def _error_type(error: Exception) -> str:
+    if isinstance(error, TargetNotFoundError):
+        return "target_not_found"
+    if isinstance(error, AmbiguousTargetError):
+        return "ambiguous_target"
+    if isinstance(error, FuzzyMatchError):
+        return "fuzzy_match"
+    if isinstance(error, StaleVersionError):
+        return "stale_version"
+    if isinstance(error, InvalidOperationError):
+        return "invalid_operation"
+    if isinstance(error, KeyError):
+        message = _message(error)
+        if message.startswith("unknown buffer:"):
+            return "unknown_buffer"
+        if message.startswith("unknown command:"):
+            return "unknown_command"
+        return "not_found"
+    if isinstance(error, ValueError):
+        message = _message(error)
+        if message.startswith("buffer already exists:"):
+            return "duplicate_buffer"
+        return "invalid_value"
+    return "editbuffer_error"
+
+
+def _message(error: Exception) -> str:
+    if isinstance(error, KeyError) and error.args:
+        return str(error.args[0])
+    return str(error)
+
+
 def main() -> None:
     create_server().run(transport="stdio")
 

{editbuffer-0.2.1.dist-info → editbuffer-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: editbuffer
-Version: 0.2.1
+Version: 0.2.2
 Summary: Selection-based mutable output buffer for LLM tools
 Author: averagedigital
 License-Expression: MIT
@@ -199,10 +199,10 @@ Install the optional server:
 pipx install 'editbuffer[mcp]'
 ```
 
-Until a PyPI release exists, install directly from GitHub:
+Or install with `uvx` without a persistent environment:
 
 ```bash
-pipx install 'editbuffer[mcp] @ git+https://github.com/averagedigital/editbuffer.git'
+uvx --from 'editbuffer[mcp]' editbuffer-mcp
 ```
 
 Connect it to Codex:
@@ -220,9 +220,14 @@ Claude Desktop and generic MCP client examples are in
 The server exposes:
 
 - `buffer_create`
+- `buffer_append`
 - `buffer_list`
 - `buffer_view`
 - `buffer_edit`
+- `buffer_replace`
+- `buffer_insert_before`
+- `buffer_insert_after`
+- `buffer_delete`
 - `buffer_history`
 - `buffer_rollback`
 - `buffer_commit`
@@ -232,6 +237,18 @@ The server exposes:
 Buffers are in-memory and live for the MCP server process. The MCP layer calls
 the same core API and does not implement separate edit semantics.
 
+Use the first-class selection tools for normal agent use:
+
+```json
+{
+  "buffer_id": "answer",
+  "target": {"type": "exact", "text": "old"},
+  "text": "new"
+}
+```
+
+`buffer_edit` remains available for raw JSON operations.
+
 `buffer_commit` remembers non-empty committed output as a reusable command.
 `command_history` returns the last 10 commands, newest first. `command_select`
 creates a new pending buffer from a previous command so the model can reuse it

{editbuffer-0.2.1.dist-info → editbuffer-0.2.2.dist-info}/RECORD

@@ -4,15 +4,15 @@ editbuffer/buffer.py,sha256=Wc1Ode1A37PIILPW4I0aQQk-8ebBImmXgAPwiCaPMrM,5623
 editbuffer/cli.py,sha256=pv7Lhrcxmztx6tlQSYdUswCcoTg7MSFbPkka1uoCKYs,4533
 editbuffer/errors.py,sha256=gQ33Uwqo_PKfv0gGzz9fAWfgMez_44TkjbfoqTRM8gQ,831
 editbuffer/history.py,sha256=ADi-ssGTB4OpIX3pDs-YtWGXLDUshg55COoKmxpgWdI,754
-editbuffer/mcp_server.py,sha256=-x3-8sXpW1vcMb5jFZ-bMsJus5YxeG8ydkLTh4OtF6w,6712
+editbuffer/mcp_server.py,sha256=tFCp3iXeQ3L5DdQmknjVTAKydsmv3CA3zDQuO8_Q78c,11772
 editbuffer/operations.py,sha256=l2bPEnKmwXZKXBSc1jZU4r0kkEY9mdky9fDDotoRUFA,2051
 editbuffer/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 editbuffer/resolver.py,sha256=94wOuBylreBN1ddro6NoHZ_dW2xTUh6Tctp_T1xKMfU,5402
 editbuffer/selection.py,sha256=1favs_qZyTXx51NFT9FG1xxwwyb7YCKr3KzVbVlRq2g,5597
 editbuffer/validators.py,sha256=Nj6nOgP6199yuLtYYl45ASbgQ2jQXvRPm1tsLQKaj9w,534
-editbuffer-0.2.1.dist-info/licenses/LICENSE,sha256=ctvjyyJh_lx1XsyH6NKaxtB-DqJJ4tWYsXEJ15uNaTc,1071
-editbuffer-0.2.1.dist-info/METADATA,sha256=L6Diepd98YZsjl2fly6dgPTFjpDtUFxTU1qF9tSCfuQ,6329
-editbuffer-0.2.1.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-editbuffer-0.2.1.dist-info/entry_points.txt,sha256=cL9-TdYS4juRT-WIvNlcuo9hdxojHMVDyo0MlafDVfA,95
-editbuffer-0.2.1.dist-info/top_level.txt,sha256=898lOqlpIlnmCPUHF0K7C4E5-PWrmWLWy4YHzYAsMsU,11
-editbuffer-0.2.1.dist-info/RECORD,,
+editbuffer-0.2.2.dist-info/licenses/LICENSE,sha256=ctvjyyJh_lx1XsyH6NKaxtB-DqJJ4tWYsXEJ15uNaTc,1071
+editbuffer-0.2.2.dist-info/METADATA,sha256=wt3zOgCbgITVO1Jgf_jlK8TSLGZ2azA5wz6Y0ytVfmw,6609
+editbuffer-0.2.2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+editbuffer-0.2.2.dist-info/entry_points.txt,sha256=cL9-TdYS4juRT-WIvNlcuo9hdxojHMVDyo0MlafDVfA,95
+editbuffer-0.2.2.dist-info/top_level.txt,sha256=898lOqlpIlnmCPUHF0K7C4E5-PWrmWLWy4YHzYAsMsU,11
+editbuffer-0.2.2.dist-info/RECORD,,