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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.51
+Version: 3.0.53
 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.53/drydock/skills.py

@@ -0,0 +1,90 @@
+"""Skills — user-defined reusable slash commands.
+
+A skill is a markdown file with simple frontmatter; its body is a prompt the
+user invokes as ``/<name>`` in the TUI (or --cli). It saves retyping common
+instructions ("/review", "/explain", "/testgen") and ships project conventions
+alongside the code.
+
+Discovery (project overrides user on a name clash):
+  • ~/.drydock/skills/*.md          (personal, all projects)
+  • <cwd>/.drydock/skills/*.md      (this project)
+
+File format (frontmatter optional; name defaults to the filename):
+    ---
+    name: review
+    description: Review the current diff for bugs
+    ---
+    Run GitDiff, then review the changes for bugs and suggest fixes.
+
+Invocation:
+  • ``/review``                 → the body becomes the user turn.
+  • ``/review focus on perf``   → trailing text replaces ``$ARGS`` in the body,
+    or is appended if the body has no ``$ARGS`` placeholder.
+
+All logic original to Drydock.
+"""
+from __future__ import annotations
+
+import re
+from dataclasses import dataclass
+from pathlib import Path
+
+_FRONTMATTER = re.compile(r"^---\n(.*?)\n---\n?(.*)$", re.S)
+_NAME_RE = re.compile(r"^[a-z0-9][a-z0-9_-]*$", re.I)
+
+
+@dataclass
+class Skill:
+    name: str
+    description: str
+    body: str
+    source: str  # file path, for /skills listing
+
+    def render(self, args: str = "") -> str:
+        """Expand the skill into a prompt, substituting/append args."""
+        args = (args or "").strip()
+        if "$ARGS" in self.body:
+            return self.body.replace("$ARGS", args)
+        return f"{self.body}\n\n{args}".rstrip() if args else self.body
+
+
+def _parse(path: Path) -> Skill | None:
+    try:
+        text = path.read_text("utf-8", "ignore")
+    except OSError:
+        return None
+    name = path.stem.lower()
+    description = ""
+    body = text
+    m = _FRONTMATTER.match(text)
+    if m:
+        meta, body = m.group(1), m.group(2)
+        for line in meta.splitlines():
+            if ":" in line:
+                key, _, val = line.partition(":")
+                key, val = key.strip().lower(), val.strip()
+                if key == "name" and val:
+                    name = val.lower()
+                elif key == "description":
+                    description = val
+    body = body.strip()
+    if not body or not _NAME_RE.match(name):
+        return None
+    return Skill(name=name, description=description, body=body, source=str(path))
+
+
+def skills_dirs(cwd: str) -> list[Path]:
+    return [Path.home() / ".drydock" / "skills", Path(cwd) / ".drydock" / "skills"]
+
+
+def load_skills(cwd: str) -> dict[str, Skill]:
+    """Load all skills; later dirs (project) override earlier (user) by name."""
+    skills: dict[str, Skill] = {}
+    for d in skills_dirs(cwd):
+        if not d.is_dir():
+            continue
+        for f in sorted(d.glob("*.md")):
+            sk = _parse(f)
+            if sk:
+                skills[sk.name] = sk
+    return skills

{drydock_cli-3.0.51 → drydock_cli-3.0.53}/drydock/tui/app.py

@@ -153,7 +153,10 @@ class DrydockApp(App):
         self._abort_inflight()
         dropped = len(self._queue)
         self._queue.clear()
+        looping = self._repeat is not None
+        self._repeat = None  # Esc/stop also ends an active /loop
         note = "⏹ stopped." + (f" (discarded {dropped} queued)" if dropped else "")
+        note += " loop ended." if looping else ""
         self._info(note)
         self._refresh_status()
 
@@ -236,6 +239,8 @@ class DrydockApp(App):
         self.config = config
         self.state = AgentState()
         self.system = self._build_system(config.get("model"))
+        from drydock.skills import load_skills
+        self._skills = load_skills(config.get("cwd") or ".")
         self._current_assistant: AssistantMessage | None = None
         self._last_card: ToolCard | None = None
         self._busy = False
@@ -249,6 +254,7 @@ class DrydockApp(App):
         # A plain dict survives run()'s dict(config) shallow copy by reference.
         self.config["_abort"] = {}
         self._queue: list[str] = []  # prompts submitted while a turn is running
+        self._repeat: dict | None = None  # active /loop: {prompt, remaining, total}
         self._ctx_tokens = 0  # current context size (last turn's prompt tokens)
         self._ctrl_c_armed = False  # first Ctrl+C arms; second within ~2s exits
         # Live "working" line state.
@@ -375,7 +381,8 @@ class DrydockApp(App):
             return
         hint = ""
         if text.startswith("/") and " " not in text and "\n" not in text:
-            matches = [c for c in SLASH_COMMANDS if c.startswith(text.lower())]
+            commands = SLASH_COMMANDS + ["/skills"] + [f"/{n}" for n in sorted(self._skills)]
+            matches = [c for c in commands if c.startswith(text.lower())]
             if matches:
                 hint = "  " + "   ".join(matches) + "   ·  Tab to complete"
         self.query_one("#working", Static).update(hint)
@@ -485,13 +492,69 @@ class DrydockApp(App):
                 "  /compact         shrink old context to free up the window\n"
                 "  /graphrag        build/query a knowledge base from your docs\n"
                 "                   /graphrag build <path> · /graphrag status · /graphrag clear\n"
+                "  /skills          list your reusable /<name> skills\n"
+                "  /loop            /loop <count> <prompt> — repeat a prompt (Esc stops)\n"
                 "  /clear           reset the conversation\n"
                 "  /quit            exit\n"
                 "Type a task and press Enter. ↑/↓ recall history · Esc stops · Ctrl+O expands tools."
             )
+        elif cmd == "/loop":
+            self._cmd_loop(arg)
+        elif cmd == "/skills":
+            self._cmd_skills()
+        elif cmd[1:] in self._skills:
+            self._run_skill(self._skills[cmd[1:]], arg)
         else:
             self._mount(ErrorMessage(f"unknown command: {cmd} (try /help)"))
 
+    def _cmd_loop(self, arg: str) -> None:
+        """/loop <count> <prompt> — run <prompt> up to <count> times (1–50),
+        re-submitting after each turn finishes. Esc (or /stop) ends the loop."""
+        parts = arg.split(maxsplit=1)
+        if len(parts) < 2 or not parts[0].isdigit():
+            self._info(
+                "usage: /loop <count> <prompt>   e.g.  /loop 5 fix the next "
+                "failing test and run pytest\n(count 1–50; Esc stops the loop)"
+            )
+            return
+        count = max(1, min(int(parts[0]), 50))
+        prompt = parts[1].strip()
+        if not prompt:
+            self._info("usage: /loop <count> <prompt>")
+            return
+        if self._busy:
+            self._info("A turn is already running — stop it (Esc) before starting a loop.")
+            return
+        self._repeat = {"prompt": prompt, "remaining": count, "total": count}
+        self._info(f"↻ looping {count}× (Esc to stop):  {prompt}")
+        self._mount(UserMessage(prompt))
+        self._begin(prompt)
+
+    def _cmd_skills(self) -> None:
+        if not self._skills:
+            self._info(
+                "No skills yet. Create one as a markdown file in "
+                "~/.drydock/skills/<name>.md (or <project>/.drydock/skills/), "
+                "then invoke it as /<name>. The body is the prompt; use $ARGS for "
+                "trailing input."
+            )
+            return
+        lines = ["Skills (invoke as /<name>):"]
+        for name in sorted(self._skills):
+            sk = self._skills[name]
+            lines.append(f"  /{name}" + (f"  — {sk.description}" if sk.description else ""))
+        self._info("\n".join(lines))
+
+    def _run_skill(self, skill, arg: str) -> None:
+        """Expand a skill into a prompt and run it as a normal user turn."""
+        prompt = skill.render(arg)
+        self._mount(UserMessage(f"/{skill.name}" + (f" {arg}" if arg else "")))
+        if self._busy:
+            self._queue.append(prompt)
+            self._refresh_status()
+        else:
+            self._begin(prompt)
+
     def _cmd_compact(self) -> None:
         """Manually compact the conversation to reclaim context NOW, without
         waiting for the automatic 60%-of-window threshold (agent.maybe_compact).
@@ -747,6 +810,15 @@ class DrydockApp(App):
         if self._queue:
             self._begin(self._queue.pop(0))
             return
+        # /loop: re-run the prompt until the iteration count is exhausted (Esc/
+        # stop clears self._repeat). Queued user prompts take priority (above).
+        if self._repeat and self._repeat["remaining"] > 1 and not self._cancel.is_set():
+            self._repeat["remaining"] -= 1
+            done = self._repeat["total"] - self._repeat["remaining"] + 1
+            self._info(f"↻ loop iteration {done}/{self._repeat['total']}")
+            self._begin(self._repeat["prompt"])
+            return
+        self._repeat = None
         self._refresh_status()
         self.query_one("#prompt", PromptArea).focus()
 

{drydock_cli-3.0.51 → drydock_cli-3.0.53}/drydock/tui/widgets.py

@@ -153,7 +153,7 @@ class PromptHistory:
 # completes the prefix.
 SLASH_COMMANDS = [
     "/help", "/model", "/cwd", "/undo", "/back", "/stop", "/status",
-    "/compact", "/graphrag", "/clear", "/quit",
+    "/compact", "/graphrag", "/skills", "/loop", "/clear", "/quit",
 ]
 
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.51
+Version: 3.0.53
 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_cli-3.0.53}/drydock_cli.egg-info/SOURCES.txt

@@ -15,6 +15,7 @@ drydock/graphrag.py
 drydock/guards.py
 drydock/loop_detect.py
 drydock/providers.py
+drydock/skills.py
 drydock/tool_registry.py
 drydock/tuning.py
 drydock/web.py
@@ -55,6 +56,7 @@ tests/test_oneshot_unreachable.py
 tests/test_plan_autocontinue.py
 tests/test_providers_unreachable.py
 tests/test_runaway_repetition.py
+tests/test_skills.py
 tests/test_stop.py
 tests/test_streaming_newlines.py
 tests/test_subagent.py

{drydock_cli-3.0.51 → drydock_cli-3.0.53}/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.51"
+version = "3.0.53"
 description = "Drydock — a local, provider-agnostic terminal coding agent for local LLMs"
 readme = "README.md"
 requires-python = ">=3.11"

drydock_cli-3.0.53/tests/test_skills.py

@@ -0,0 +1,56 @@
+"""Skills: user-defined reusable /<name> slash commands loaded from markdown."""
+from __future__ import annotations
+
+from drydock import skills
+
+
+def _write(d, name, content):
+    d.mkdir(parents=True, exist_ok=True)
+    (d / name).write_text(content)
+
+
+def test_load_parses_frontmatter_and_body(tmp_path):
+    _write(tmp_path / ".drydock" / "skills", "review.md",
+           "---\nname: review\ndescription: Review the diff\n---\nRun GitDiff and review it.")
+    sk = skills.load_skills(str(tmp_path))
+    assert "review" in sk
+    assert sk["review"].description == "Review the diff"
+    assert sk["review"].body == "Run GitDiff and review it."
+
+
+def test_name_defaults_to_filename(tmp_path):
+    _write(tmp_path / ".drydock" / "skills", "explain.md", "Explain the selected code.")
+    sk = skills.load_skills(str(tmp_path))
+    assert "explain" in sk and sk["explain"].body == "Explain the selected code."
+
+
+def test_render_appends_args_without_placeholder(tmp_path):
+    _write(tmp_path / ".drydock" / "skills", "t.md", "Do the thing.")
+    sk = skills.load_skills(str(tmp_path))["t"]
+    assert sk.render("on auth.py") == "Do the thing.\n\non auth.py"
+    assert sk.render("") == "Do the thing."
+
+
+def test_render_substitutes_args_placeholder(tmp_path):
+    _write(tmp_path / ".drydock" / "skills", "t.md", "Focus on $ARGS and nothing else.")
+    sk = skills.load_skills(str(tmp_path))["t"]
+    assert sk.render("performance") == "Focus on performance and nothing else."
+
+
+def test_project_overrides_user(tmp_path, monkeypatch):
+    home = tmp_path / "home"
+    proj = tmp_path / "proj"
+    monkeypatch.setattr(skills.Path, "home", lambda: home)
+    _write(home / ".drydock" / "skills", "x.md", "USER version")
+    _write(proj / ".drydock" / "skills", "x.md", "PROJECT version")
+    sk = skills.load_skills(str(proj))
+    assert sk["x"].body == "PROJECT version"
+
+
+def test_empty_body_skipped(tmp_path):
+    _write(tmp_path / ".drydock" / "skills", "empty.md", "---\nname: empty\n---\n")
+    assert "empty" not in skills.load_skills(str(tmp_path))
+
+
+def test_no_skills_dir_is_empty(tmp_path):
+    assert skills.load_skills(str(tmp_path)) == {}

{drydock_cli-3.0.51 → drydock_cli-3.0.53}/tests/test_tui.py

@@ -348,3 +348,40 @@ def test_new_user_turn_clears_stale_plan():
             assert str(panel.render()) == ""            # panel cleared
 
     asyncio.run(main())
+
+
+def test_loop_command_iterates_and_stops():
+    """/loop <n> <prompt> re-runs the prompt n times, then clears; Esc ends it."""
+    async def main():
+        app = DrydockApp({"model": "gemma4", "provider": "vllm", "cwd": "/tmp"})
+        async with app.run_test() as pilot:
+            await pilot.pause()
+            begins = []
+            app._begin = lambda text: begins.append(text)  # stub out the real agent
+
+            # bad usage → no loop
+            app._handle_slash("/loop notanumber")
+            assert app._repeat is None and not begins
+
+            # /loop 3 <prompt> → starts, first iteration begun
+            app._handle_slash("/loop 3 do the thing")
+            assert app._repeat and app._repeat["total"] == 3
+            assert begins == ["do the thing"]
+
+            # each finished turn re-begins until the count is exhausted
+            from drydock.tui.messages import AgentFinished
+            app.on_agent_finished(AgentFinished())  # iter 2
+            app.on_agent_finished(AgentFinished())  # iter 3
+            assert len(begins) == 3
+            app.on_agent_finished(AgentFinished())  # done → loop cleared
+            assert app._repeat is None
+            assert len(begins) == 3  # no 4th run
+
+            # Esc/stop ends an active loop
+            app._begin = lambda text: begins.append(text)
+            app._handle_slash("/loop 5 again")
+            app._busy = True
+            app.action_stop()
+            assert app._repeat is None
+
+    asyncio.run(main())