drydock-cli 3.0.50__tar.gz → 3.0.51__tar.gz

{drydock_cli-3.0.50/drydock_cli.egg-info → drydock_cli-3.0.51}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.50
+Version: 3.0.51
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0

drydock_cli-3.0.51/drydock/gittools.py

@@ -0,0 +1,96 @@
+"""Dedicated Version Control helpers — first-class git for the agent.
+
+Git works through the generic Bash tool, but purpose-built git_* tools give the
+model concise, structured, TRUNCATED output (a raw `git diff` can blow the
+context window) and a safe commit path, without it having to remember exact git
+invocations. Read ops (status/diff/log) are side-effect-free; commit is local
+and reversible (push stays gated through Bash's approval modal).
+
+All logic original to Drydock.
+"""
+from __future__ import annotations
+
+import subprocess
+
+
+class GitError(RuntimeError):
+    """A git operation failed (not a repo, git missing, or a command error)."""
+
+
+def _run_git(args: list[str], cwd: str, timeout: float = 30.0) -> str:
+    """Run `git <args>` in cwd, returning stdout. Raises GitError on failure."""
+    try:
+        p = subprocess.run(
+            ["git", *args], cwd=cwd, capture_output=True, text=True,
+            timeout=timeout,
+        )
+    except FileNotFoundError as e:
+        raise GitError("git is not installed or not on PATH") from e
+    except subprocess.TimeoutExpired as e:
+        raise GitError(f"git {args[0]} timed out after {timeout:.0f}s") from e
+    if p.returncode != 0:
+        err = (p.stderr or p.stdout or "").strip()
+        if "not a git repository" in err.lower():
+            raise GitError(f"not a git repository: {cwd}")
+        raise GitError(err or f"git {args[0]} failed (exit {p.returncode})")
+    return p.stdout
+
+
+def _truncate(text: str, max_chars: int, *, tail: bool = False) -> str:
+    if len(text) <= max_chars:
+        return text
+    note = f"\n[... {len(text) - max_chars} chars truncated ...]\n"
+    return (note + text[-max_chars:]) if tail else (text[:max_chars] + note)
+
+
+def status(cwd: str) -> str:
+    """Branch + concise porcelain status of the working tree."""
+    branch = _run_git(["rev-parse", "--abbrev-ref", "HEAD"], cwd).strip()
+    porcelain = _run_git(["status", "--porcelain=v1", "--branch"], cwd).strip()
+    if len(porcelain.splitlines()) <= 1:  # only the "## branch" header line
+        return f"On branch {branch}. Working tree clean."
+    return f"On branch {branch}:\n{_truncate(porcelain, 4000)}"
+
+
+def diff(cwd: str, path: str | None = None, *, staged: bool = False,
+         max_chars: int = 8000) -> str:
+    """Working-tree (or --staged) diff, optionally scoped to a path. Truncated."""
+    args = ["diff"]
+    if staged:
+        args.append("--cached")
+    if path:
+        args += ["--", path]
+    out = _run_git(args, cwd)
+    if not out.strip():
+        scope = " (staged)" if staged else ""
+        return f"No{scope} changes" + (f" in {path}" if path else "") + "."
+    # Lead with a --stat summary so the model sees the shape even when truncated.
+    stat_args = ["diff", "--stat"] + (["--cached"] if staged else [])
+    if path:
+        stat_args += ["--", path]
+    stat = _run_git(stat_args, cwd).strip()
+    return f"{stat}\n\n{_truncate(out, max_chars)}"
+
+
+def log(cwd: str, n: int = 10) -> str:
+    """The last n commits, one line each."""
+    n = max(1, min(n, 50))
+    out = _run_git(["log", f"-{n}", "--oneline", "--decorate"], cwd).strip()
+    return out or "No commits yet."
+
+
+def commit(cwd: str, message: str, *, add_all: bool = True) -> str:
+    """Stage (all, by default) and commit. Local + reversible (git reset undoes
+    it). Refuses an empty message. Does NOT push."""
+    message = (message or "").strip()
+    if not message:
+        raise GitError("a commit needs a non-empty message")
+    if add_all:
+        _run_git(["add", "-A"], cwd)
+    # Nothing staged → say so instead of erroring opaquely.
+    staged = _run_git(["diff", "--cached", "--name-only"], cwd).strip()
+    if not staged:
+        return "Nothing to commit — the working tree has no staged changes."
+    out = _run_git(["commit", "-m", message], cwd)
+    head = _run_git(["rev-parse", "--short", "HEAD"], cwd).strip()
+    return f"Committed {head}:\n{out.strip()}"

{drydock_cli-3.0.50 → drydock_cli-3.0.51}/drydock/tools/__init__.py

@@ -161,6 +161,56 @@ SCHEMAS = [
             "required": ["prompt"],
         },
     },
+    {
+        "name": "GitStatus",
+        "description": (
+            "Show the current branch and a concise list of changed/staged/"
+            "untracked files (git status). Use it to understand the working tree "
+            "before editing or committing."
+        ),
+        "input_schema": {"type": "object", "properties": {}},
+    },
+    {
+        "name": "GitDiff",
+        "description": (
+            "Show the diff of changes (git diff), with a --stat summary first and "
+            "the body truncated to fit context. Set staged=true for staged "
+            "changes; pass a path to scope it to one file/dir."
+        ),
+        "input_schema": {
+            "type": "object",
+            "properties": {
+                "path": {"type": "string", "description": "Optional file/dir to scope the diff."},
+                "staged": {"type": "boolean", "description": "Diff staged changes instead of the working tree."},
+            },
+        },
+    },
+    {
+        "name": "GitLog",
+        "description": "Show the last n commits, one line each (git log --oneline).",
+        "input_schema": {
+            "type": "object",
+            "properties": {
+                "n": {"type": "integer", "description": "How many commits (default 10)."},
+            },
+        },
+    },
+    {
+        "name": "GitCommit",
+        "description": (
+            "Stage all changes and commit with a message (git add -A && git "
+            "commit). Local and reversible; does NOT push. Use it to package a "
+            "completed, verified change. Write a clear, specific message."
+        ),
+        "input_schema": {
+            "type": "object",
+            "properties": {
+                "message": {"type": "string", "description": "The commit message."},
+                "add_all": {"type": "boolean", "description": "Stage all changes first (default true)."},
+            },
+            "required": ["message"],
+        },
+    },
     {
         "name": "WebSearch",
         "description": (
@@ -769,6 +819,54 @@ def tool_task(params: dict, config: dict) -> str:
     return f"[sub-agent finished {steps} step(s) with no summary]"
 
 
+def _git_cwd(config: dict) -> str:
+    return config.get("cwd") or os.getcwd()
+
+
+def tool_gitstatus(params: dict, config: dict) -> str:
+    from drydock import gittools
+    try:
+        return gittools.status(_git_cwd(config))
+    except gittools.GitError as e:
+        return f"git status failed: {e}"
+
+
+def tool_gitdiff(params: dict, config: dict) -> str:
+    from drydock import gittools
+    try:
+        return gittools.diff(
+            _git_cwd(config),
+            path=(params.get("path") or None),
+            staged=bool(params.get("staged")),
+        )
+    except gittools.GitError as e:
+        return f"git diff failed: {e}"
+
+
+def tool_gitlog(params: dict, config: dict) -> str:
+    from drydock import gittools
+    try:
+        n = int(params.get("n") or 10)
+    except (TypeError, ValueError):
+        n = 10
+    try:
+        return gittools.log(_git_cwd(config), n=n)
+    except gittools.GitError as e:
+        return f"git log failed: {e}"
+
+
+def tool_gitcommit(params: dict, config: dict) -> str:
+    from drydock import gittools
+    try:
+        return gittools.commit(
+            _git_cwd(config),
+            params.get("message") or "",
+            add_all=params.get("add_all", True) is not False,
+        )
+    except gittools.GitError as e:
+        return f"git commit failed: {e}"
+
+
 def tool_websearch(params: dict, config: dict) -> str:
     """Search the internet (DuckDuckGo). Read-only; clean message when offline."""
     from drydock import web
@@ -845,6 +943,10 @@ _TOOLS = [
     ("Knowledge", tool_knowledge, True),
     ("WebSearch", tool_websearch, True),
     ("WebFetch", tool_webfetch, True),
+    ("GitStatus", tool_gitstatus, True),
+    ("GitDiff", tool_gitdiff, True),
+    ("GitLog", tool_gitlog, True),
+    ("GitCommit", tool_gitcommit, False),
 ]
 
 def register_all():
@@ -855,10 +957,14 @@ def register_all():
             "Bash": tool_bash, "Glob": tool_glob, "Grep": tool_grep,
             "todo": tool_todo, "task": tool_task, "Knowledge": tool_knowledge,
             "WebSearch": tool_websearch, "WebFetch": tool_webfetch,
+            "GitStatus": tool_gitstatus, "GitDiff": tool_gitdiff,
+            "GitLog": tool_gitlog, "GitCommit": tool_gitcommit,
         }[name]
-        # These are read-only w.r.t. the parent's files.
+        # Read-only w.r.t. the parent's files (GitStatus/Diff/Log inspect only;
+        # GitCommit writes a local, reversible commit).
         read_only = name in (
             "Read", "Glob", "Grep", "task", "Knowledge", "WebSearch", "WebFetch",
+            "GitStatus", "GitDiff", "GitLog",
         )
         register(ToolDef(name=name, schema=schema, func=func, read_only=read_only))
 

{drydock_cli-3.0.50 → drydock_cli-3.0.51/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.50
+Version: 3.0.51
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0

{drydock_cli-3.0.50 → drydock_cli-3.0.51}/drydock_cli.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ drydock/cli.py
 drydock/compaction.py
 drydock/config.py
 drydock/detect.py
+drydock/gittools.py
 drydock/graphrag.py
 drydock/guards.py
 drydock/loop_detect.py
@@ -44,6 +45,7 @@ tests/test_detect.py
 tests/test_empty_response.py
 tests/test_failure_loop.py
 tests/test_first_run_setup.py
+tests/test_gittools.py
 tests/test_graphrag.py
 tests/test_guards_and_tools.py
 tests/test_hallucinated_tools.py

{drydock_cli-3.0.50 → drydock_cli-3.0.51}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 # PyPI distribution name is drydock-cli (the established install name, continued
 # from the retired v2 fork); the import package + CLI command stay `drydock`.
 name = "drydock-cli"
-version = "3.0.50"
+version = "3.0.51"
 description = "Drydock — a local, provider-agnostic terminal coding agent for local LLMs"
 readme = "README.md"
 requires-python = ">=3.11"

drydock_cli-3.0.51/tests/test_gittools.py

@@ -0,0 +1,78 @@
+"""Dedicated Version Control tools (drydock/gittools.py): structured, truncated
+git for the agent. Tests run in isolated temp repos."""
+from __future__ import annotations
+
+import subprocess
+
+import pytest
+
+from drydock import gittools
+from drydock.tools import (
+    tool_gitstatus, tool_gitdiff, tool_gitlog, tool_gitcommit,
+)
+
+
+def _git(args, cwd):
+    subprocess.run(["git", *args], cwd=cwd, check=True, capture_output=True, text=True)
+
+
+@pytest.fixture
+def repo(tmp_path):
+    _git(["init", "-q"], tmp_path)
+    _git(["config", "user.email", "t@t.com"], tmp_path)
+    _git(["config", "user.name", "T"], tmp_path)
+    (tmp_path / "a.txt").write_text("hello\n")
+    _git(["add", "-A"], tmp_path)
+    _git(["commit", "-qm", "initial"], tmp_path)
+    return tmp_path
+
+
+def test_status_clean_then_dirty(repo):
+    cfg = {"cwd": str(repo)}
+    assert "clean" in tool_gitstatus({}, cfg).lower()
+    (repo / "a.txt").write_text("hello\nworld\n")
+    out = tool_gitstatus({}, cfg)
+    assert "a.txt" in out and "clean" not in out.lower()
+
+
+def test_diff_shows_stat_and_body(repo):
+    (repo / "a.txt").write_text("hello\nchanged\n")
+    out = tool_gitdiff({}, {"cwd": str(repo)})
+    assert "a.txt" in out and "changed" in out and "insertion" in out
+
+
+def test_diff_no_changes(repo):
+    assert "No changes" in tool_gitdiff({}, {"cwd": str(repo)})
+
+
+def test_log_lists_commits(repo):
+    out = tool_gitlog({"n": 5}, {"cwd": str(repo)})
+    assert "initial" in out
+
+
+def test_commit_stages_and_commits(repo):
+    (repo / "b.txt").write_text("new file\n")
+    out = tool_gitcommit({"message": "add b"}, {"cwd": str(repo)})
+    assert "Committed" in out
+    assert "add b" in tool_gitlog({}, {"cwd": str(repo)})
+
+
+def test_commit_empty_message_refused(repo):
+    (repo / "b.txt").write_text("x")
+    assert "non-empty message" in tool_gitcommit({"message": "  "}, {"cwd": str(repo)})
+
+
+def test_commit_nothing_to_commit(repo):
+    assert "Nothing to commit" in tool_gitcommit({"message": "noop"}, {"cwd": str(repo)})
+
+
+def test_not_a_repo_is_graceful(tmp_path):
+    out = tool_gitstatus({}, {"cwd": str(tmp_path)})
+    assert "not a git repository" in out.lower()
+
+
+def test_diff_truncates_large_body(repo):
+    # modify a TRACKED file so it appears in the working-tree diff
+    (repo / "a.txt").write_text("\n".join(f"line {i}" for i in range(5000)))
+    out = gittools.diff(str(repo), max_chars=1000)
+    assert "truncated" in out and len(out) < 4000