drydock-cli 3.1.10__tar.gz → 3.1.12__tar.gz

{drydock_cli-3.1.10/drydock_cli.egg-info → drydock_cli-3.1.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.1.10
+Version: 3.1.12
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0
@@ -450,16 +450,24 @@ conventions.
 ### Custom system prompt
 
 For standing instructions applied on **every** turn (stronger than the
-per-project `AGENTS.md`, which is framed as optional background), edit
-**`~/.drydock/system_prompt.md`**. Drydock creates this file for you (a
-commented template) on first run, so you never have to know where it lives —
-just open it and write your instructions. It has no effect until you add text
-(the template is all comments, which are ignored).
-
-Prefer keeping it in the config file instead? Set `system_prompt = "..."` in
-`~/.drydock/config.toml`. The `system_prompt.md` file wins if both are set;
-contents are capped at 8000 chars, injected after drydock's base prompt and
-before any project `AGENTS.md`, and apply in both the TUI and CLI.
+per-project `AGENTS.md`, which is framed as optional background), edit a
+`system_prompt.md` file. Drydock creates a commented template for you, so you
+never have to know where it lives — just open it and write your instructions.
+It has no effect until you add text (the template is all comments, ignored).
+
+Two scopes, most-specific wins:
+
+- **Per-project** — `system_prompt.md` in the folder you launch drydock from.
+  Auto-created inside any **git repo** (so different projects get different
+  standing orders, and drydock never drops the file into non-project dirs).
+- **Global** — `~/.drydock/system_prompt.md`. Auto-created on first run; applies
+  to every project. A per-project file **overrides** it.
+- **Or the config key** — `system_prompt = "..."` in `~/.drydock/config.toml`
+  (lowest precedence).
+
+Contents are capped at 8000 chars, injected after drydock's base prompt and
+before any project `AGENTS.md`, and apply in both the TUI and CLI. Restart
+drydock after editing.
 
 ## Safety
 

{drydock_cli-3.1.10 → drydock_cli-3.1.12}/README.md

@@ -426,16 +426,24 @@ conventions.
 ### Custom system prompt
 
 For standing instructions applied on **every** turn (stronger than the
-per-project `AGENTS.md`, which is framed as optional background), edit
-**`~/.drydock/system_prompt.md`**. Drydock creates this file for you (a
-commented template) on first run, so you never have to know where it lives —
-just open it and write your instructions. It has no effect until you add text
-(the template is all comments, which are ignored).
-
-Prefer keeping it in the config file instead? Set `system_prompt = "..."` in
-`~/.drydock/config.toml`. The `system_prompt.md` file wins if both are set;
-contents are capped at 8000 chars, injected after drydock's base prompt and
-before any project `AGENTS.md`, and apply in both the TUI and CLI.
+per-project `AGENTS.md`, which is framed as optional background), edit a
+`system_prompt.md` file. Drydock creates a commented template for you, so you
+never have to know where it lives — just open it and write your instructions.
+It has no effect until you add text (the template is all comments, ignored).
+
+Two scopes, most-specific wins:
+
+- **Per-project** — `system_prompt.md` in the folder you launch drydock from.
+  Auto-created inside any **git repo** (so different projects get different
+  standing orders, and drydock never drops the file into non-project dirs).
+- **Global** — `~/.drydock/system_prompt.md`. Auto-created on first run; applies
+  to every project. A per-project file **overrides** it.
+- **Or the config key** — `system_prompt = "..."` in `~/.drydock/config.toml`
+  (lowest precedence).
+
+Contents are capped at 8000 chars, injected after drydock's base prompt and
+before any project `AGENTS.md`, and apply in both the TUI and CLI. Restart
+drydock after editing.
 
 ## Safety
 

{drydock_cli-3.1.10 → drydock_cli-3.1.12}/drydock/cli.py

@@ -13,7 +13,7 @@ import sys
 from pathlib import Path
 
 from drydock import __version__
-from drydock.config import load_user_system_prompt
+from drydock.config import load_user_system_prompt, ensure_project_system_prompt
 from drydock.agent import AgentState, run, TextChunk, ToolStart, ToolEnd, TurnDone
 
 
@@ -436,8 +436,11 @@ def main():
     # greeting into a runaway build. The TUI reads this from config; CLI modes
     # call load_project_instructions directly (see run_interactive/run_oneshot).
     config["project_instructions"] = load_project_instructions()
-    # The user's custom system prompt (~/.drydock/system_prompt.md or the
-    # `system_prompt` config key) — standing instructions the TUI injects every turn.
+    # In a git project, drop a discoverable per-project prompt template at
+    # <project>/.drydock/system_prompt.md (inert until edited). Then load the
+    # effective custom prompt — project file OVERRIDES the global ~/.drydock one —
+    # as standing instructions the TUI/CLI inject every turn.
+    ensure_project_system_prompt()
     config["user_system_prompt"] = load_user_system_prompt(config)
 
     # Connect any configured MCP servers and register their tools so the model

{drydock_cli-3.1.10 → drydock_cli-3.1.12}/drydock/config.py

@@ -120,14 +120,21 @@ def default_config_path() -> Path:
 
 
 def system_prompt_path() -> Path:
-    """User's global custom system-prompt file."""
+    """User's GLOBAL custom system-prompt file (applies to every project)."""
     return Path.home() / ".drydock" / "system_prompt.md"
 
 
-# The template drydock drops at ~/.drydock/system_prompt.md so the file is always
-# THERE and discoverable — the user never has to know the path or filename. It's
-# ALL comments, so it has ZERO effect until the user writes real text below them
-# (load_user_system_prompt strips <!-- --> blocks before use).
+def project_system_prompt_path(cwd: Path | None = None) -> Path:
+    """A PER-PROJECT custom system-prompt file: system_prompt.md in the folder
+    drydock was started from. Overrides the global one when present — different
+    projects, different orders."""
+    return (cwd or Path.cwd()) / "system_prompt.md"
+
+
+# The template drydock drops so the file is always THERE and discoverable — the
+# user never has to know the path or filename. It's ALL comments, so it has ZERO
+# effect until the user writes real text below them (load_user_system_prompt
+# strips <!-- --> blocks before use).
 _SYSTEM_PROMPT_TEMPLATE = """\
 <!--
   Drydock custom system prompt.
@@ -139,6 +146,10 @@ _SYSTEM_PROMPT_TEMPLATE = """\
     - Prefer the standard library; avoid adding new dependencies.
     - State your plan in one sentence before making changes.
 
+  SCOPE: a system_prompt.md in a project's root folder is THAT PROJECT'S prompt;
+  the copy at ~/.drydock/system_prompt.md applies to every project. A project
+  file OVERRIDES the global one.
+
   This template has NO effect until you add your own text below this comment.
   Comment blocks like this one are ignored. Capped at 8000 characters.
   Restart drydock after editing for changes to take effect.
@@ -151,13 +162,19 @@ def _strip_comments(text: str) -> str:
     return re.sub(r"<!--.*?-->", "", text, flags=re.DOTALL)
 
 
-def ensure_system_prompt_file(config_dir: Path | None = None) -> None:
-    """Create <config_dir>/system_prompt.md (the commented template) if it's absent,
-    so users discover the feature without knowing the path/name. `config_dir`
-    defaults to ~/.drydock. NEVER overwrites an existing file (can't clobber a real
-    prompt) and never raises."""
+def _read_prompt_file(p: Path) -> str:
+    """Comment-stripped, whitespace-trimmed contents of a prompt file, or ''."""
+    try:
+        if p.exists():
+            return _strip_comments(p.read_text()).strip()
+    except OSError:
+        pass
+    return ""
+
+
+def _write_template(p: Path) -> None:
+    """Write the commented template to p if absent. Never overwrites; never raises."""
     try:
-        p = (config_dir / "system_prompt.md") if config_dir is not None else system_prompt_path()
         if not p.exists():
             p.parent.mkdir(parents=True, exist_ok=True)
             p.write_text(_SYSTEM_PROMPT_TEMPLATE, encoding="utf-8")
@@ -165,21 +182,36 @@ def ensure_system_prompt_file(config_dir: Path | None = None) -> None:
         pass
 
 
-def load_user_system_prompt(config: dict | None = None) -> str:
+def ensure_system_prompt_file(config_dir: Path | None = None) -> None:
+    """Create the GLOBAL <config_dir>/system_prompt.md template if absent (config_dir
+    defaults to ~/.drydock), so the feature is discoverable. Never overwrites."""
+    _write_template((config_dir / "system_prompt.md") if config_dir is not None else system_prompt_path())
+
+
+def ensure_project_system_prompt(cwd: Path | None = None) -> None:
+    """Create system_prompt.md in the folder drydock was started from if absent —
+    but ONLY inside a git repo, so drydock never drops a system_prompt.md into
+    arbitrary directories (e.g. $HOME, /tmp). A real project you `git init`'d gets
+    a discoverable per-project prompt at its root; a throwaway cwd gets nothing.
+    Never raises."""
+    cwd = cwd or Path.cwd()
+    try:
+        if (cwd / ".git").exists():   # file OR dir — covers worktrees too
+            _write_template(project_system_prompt_path(cwd))
+    except OSError:
+        pass
+
+
+def load_user_system_prompt(config: dict | None = None, cwd: Path | None = None) -> str:
     """The user's custom system prompt, injected every turn as standing orders.
 
-    Source (first non-empty wins): the file ~/.drydock/system_prompt.md (comment
-    blocks stripped, so the shipped template is inert), then the inline
-    `system_prompt` config key. Wrapped with a clear header and capped at 8000
-    chars. Returns '' when neither has real content. Never raises.
+    Precedence (first with real content wins): the PER-PROJECT file
+    <project>/.drydock/system_prompt.md, then the GLOBAL ~/.drydock/system_prompt.md,
+    then the inline `system_prompt` config key. Comment blocks are stripped (so the
+    shipped template is inert). Capped at 8000 chars. Returns '' when none has real
+    content. Never raises.
     """
-    text = ""
-    try:
-        p = system_prompt_path()
-        if p.exists():
-            text = _strip_comments(p.read_text()).strip()
-    except OSError:
-        text = ""
+    text = _read_prompt_file(project_system_prompt_path(cwd)) or _read_prompt_file(system_prompt_path())
     if not text and config:
         text = str(config.get("system_prompt", "") or "").strip()
     if not text:

{drydock_cli-3.1.10 → drydock_cli-3.1.12/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.1.10
+Version: 3.1.12
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0
@@ -450,16 +450,24 @@ conventions.
 ### Custom system prompt
 
 For standing instructions applied on **every** turn (stronger than the
-per-project `AGENTS.md`, which is framed as optional background), edit
-**`~/.drydock/system_prompt.md`**. Drydock creates this file for you (a
-commented template) on first run, so you never have to know where it lives —
-just open it and write your instructions. It has no effect until you add text
-(the template is all comments, which are ignored).
-
-Prefer keeping it in the config file instead? Set `system_prompt = "..."` in
-`~/.drydock/config.toml`. The `system_prompt.md` file wins if both are set;
-contents are capped at 8000 chars, injected after drydock's base prompt and
-before any project `AGENTS.md`, and apply in both the TUI and CLI.
+per-project `AGENTS.md`, which is framed as optional background), edit a
+`system_prompt.md` file. Drydock creates a commented template for you, so you
+never have to know where it lives — just open it and write your instructions.
+It has no effect until you add text (the template is all comments, ignored).
+
+Two scopes, most-specific wins:
+
+- **Per-project** — `system_prompt.md` in the folder you launch drydock from.
+  Auto-created inside any **git repo** (so different projects get different
+  standing orders, and drydock never drops the file into non-project dirs).
+- **Global** — `~/.drydock/system_prompt.md`. Auto-created on first run; applies
+  to every project. A per-project file **overrides** it.
+- **Or the config key** — `system_prompt = "..."` in `~/.drydock/config.toml`
+  (lowest precedence).
+
+Contents are capped at 8000 chars, injected after drydock's base prompt and
+before any project `AGENTS.md`, and apply in both the TUI and CLI. Restart
+drydock after editing.
 
 ## Safety
 

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

{drydock_cli-3.1.10 → drydock_cli-3.1.12}/tests/test_config.py

@@ -159,3 +159,43 @@ def test_load_ignores_comment_only_file(monkeypatch, tmp_path):
     (d / "system_prompt.md").write_text(cfg._SYSTEM_PROMPT_TEMPLATE)
     monkeypatch.setattr(cfg.Path, "home", staticmethod(lambda: tmp_path))
     assert cfg.load_user_system_prompt({}) == ""
+
+
+# ── per-project system prompt (<project>/.drydock/system_prompt.md) ──
+
+def test_project_prompt_overrides_global(monkeypatch, tmp_path):
+    home = tmp_path / "home"; (home / ".drydock").mkdir(parents=True)
+    (home / ".drydock" / "system_prompt.md").write_text("GLOBAL RULES")
+    monkeypatch.setattr(cfg.Path, "home", staticmethod(lambda: home))
+    proj = tmp_path / "proj"; proj.mkdir()
+    (proj / "system_prompt.md").write_text("PROJECT RULES")
+    out = cfg.load_user_system_prompt({}, cwd=proj)
+    assert "PROJECT RULES" in out
+    assert "GLOBAL RULES" not in out
+
+
+def test_global_used_when_no_project_file(monkeypatch, tmp_path):
+    home = tmp_path / "home"; (home / ".drydock").mkdir(parents=True)
+    (home / ".drydock" / "system_prompt.md").write_text("GLOBAL RULES")
+    monkeypatch.setattr(cfg.Path, "home", staticmethod(lambda: home))
+    proj = tmp_path / "proj"; proj.mkdir()  # no project system_prompt.md
+    out = cfg.load_user_system_prompt({}, cwd=proj)
+    assert "GLOBAL RULES" in out
+
+
+def test_ensure_project_prompt_only_in_git_repo(tmp_path):
+    # git repo → template created at the project root
+    repo = tmp_path / "repo"; (repo / ".git").mkdir(parents=True)
+    cfg.ensure_project_system_prompt(repo)
+    assert (repo / "system_prompt.md").exists()
+    # non-git dir → nothing created (no litter)
+    plain = tmp_path / "plain"; plain.mkdir()
+    cfg.ensure_project_system_prompt(plain)
+    assert not (plain / "system_prompt.md").exists()
+
+
+def test_ensure_project_prompt_never_overwrites(tmp_path):
+    repo = tmp_path / "repo"; (repo / ".git").mkdir(parents=True)
+    (repo / "system_prompt.md").write_text("MINE")
+    cfg.ensure_project_system_prompt(repo)
+    assert (repo / "system_prompt.md").read_text() == "MINE"