drydock-cli 3.0.21__tar.gz → 3.0.23__tar.gz

{drydock_cli-3.0.21/drydock_cli.egg-info → drydock_cli-3.0.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.21
+Version: 3.0.23
 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.21 → drydock_cli-3.0.23}/drydock/__init__.py

@@ -7,4 +7,4 @@ try:
     __version__ = _version("drydock-cli")
 except PackageNotFoundError:
     # Running from source before install (e.g. PYTHONPATH dev runs).
-    __version__ = "3.0.21"
+    __version__ = "3.0.23"

{drydock_cli-3.0.21 → drydock_cli-3.0.23}/drydock/detect.py

@@ -61,9 +61,11 @@ def onboarding_message(found: list[dict]) -> str:
     if not found:
         ports = ", ".join(b.split("//")[1] for _, b in CANDIDATES)
         return (
-            "No local LLM detected (" + ports + "). Start a server "
-            "(llama.cpp / vLLM / Ollama / LM Studio), or set base_url in "
-            "~/.drydock/config.toml, then restart."
+            "No local LLM detected (" + ports + "). Point Drydock at your model "
+            "right here:\n"
+            "  /model url <http://host:port/v1>     then     /model <model-name>\n"
+            "(saved to ~/.drydock/config.toml). Or start a local server "
+            "(llama.cpp / vLLM / Ollama / LM Studio) and restart."
         )
     best = found[0]
     model = best["models"][0] if best["models"] else "?"

{drydock_cli-3.0.21 → drydock_cli-3.0.23}/drydock/tools/__init__.py

@@ -460,7 +460,12 @@ def tool_bash(params: dict, config: dict) -> str:
             output += f"\n[exit code: {result.returncode}]"
         return output.strip() or "(no output)"
     except subprocess.TimeoutExpired:
-        return f"Error: command timed out after {timeout}s"
+        bigger = min(timeout * 4, 600)
+        return (
+            f"Error: command timed out after {timeout}s. If it is legitimately "
+            f"slow (a big query, build, download, or test run), retry with a "
+            f"larger timeout — pass timeout: {bigger}. Otherwise it may be hung."
+        )
     except Exception as e:
         return f"Error: {e}"
 

{drydock_cli-3.0.21 → drydock_cli-3.0.23}/drydock/tui/app.py

@@ -405,7 +405,8 @@ class DrydockApp(App):
             self._info(
                 "Commands:\n"
                 "  /help            this help\n"
-                "  /model [name]    show or switch the model\n"
+                "  /model           show/set model, provider, endpoint URL\n"
+                "                   /model <name> · /model url <url> · /model provider <p>\n"
                 "  /cwd [path]      show or change the working directory\n"
                 "  /undo            revert the last file write/edit\n"
                 "  /back            rewind the last turn from the model's context\n"
@@ -418,14 +419,61 @@ class DrydockApp(App):
         else:
             self._mount(ErrorMessage(f"unknown command: {cmd} (try /help)"))
 
-    def _cmd_model(self, name: str) -> None:
-        if not name:
-            self._info(f"model: {self.config.get('model')}")
+    def _persist_config(self) -> None:
+        """Save the persistable settings (model/provider/base_url/… — save_file
+        filters to those) to ~/.drydock/config.toml so setup survives restart."""
+        from drydock import config as cfgmod
+
+        ok = cfgmod.save_file(self.config, cfgmod.default_config_path())
+        if not ok:
+            self._mount(ErrorMessage("could not write ~/.drydock/config.toml"))
+
+    def _cmd_model(self, arg: str) -> None:
+        """Model + endpoint setup. Subcommands persist so they survive restart:
+          /model                      show model, provider, endpoint
+          /model <name>               set the model name
+          /model url <base_url>       set the server URL (e.g. http://host:8000/v1)
+          /model provider <name>      vllm | ollama | lmstudio | openai
+        """
+        arg = (arg or "").strip()
+        if not arg:
+            prov = self.config.get("provider") or "(default)"
+            url = self.config.get("base_url") or "(provider default)"
+            self._info(
+                f"model:    {self.config.get('model')}\n"
+                f"provider: {prov}\n"
+                f"endpoint: {url}\n"
+                "Set up:  /model <name>  ·  /model url <http://host:port/v1>  ·  "
+                "/model provider <vllm|ollama|lmstudio|openai>"
+            )
+            return
+        parts = arg.split(maxsplit=1)
+        sub = parts[0].lower()
+        val = parts[1].strip() if len(parts) > 1 else ""
+        if sub == "url":
+            if not val:
+                self._info("usage: /model url <http://host:port/v1>")
+                return
+            self.config["base_url"] = val
+            self._persist_config()
+            self._info(f"endpoint → {val}  (saved). Send a prompt to test it.")
+            return
+        if sub == "provider":
+            from drydock.providers import PROVIDERS
+
+            if val not in PROVIDERS:
+                self._info(f"unknown provider {val!r}. Choose: {', '.join(PROVIDERS)}")
+                return
+            self.config["provider"] = val
+            self._persist_config()
+            self._info(f"provider → {val}  (saved)")
             return
-        self.config["model"] = name
-        self.system = self._build_system(name)  # prompt may be model-specific
+        # Otherwise: set the model name (the whole arg, so names with spaces work).
+        self.config["model"] = arg
+        self.system = self._build_system(arg)  # prompt may be model-specific
+        self._persist_config()
         self._refresh_status()
-        self._info(f"switched model → {name}")
+        self._info(f"model → {arg}  (saved)")
 
     def _cmd_cwd(self, path: str) -> None:
         if not path:

{drydock_cli-3.0.21 → drydock_cli-3.0.23/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.21
+Version: 3.0.23
 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.21 → drydock_cli-3.0.23}/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.21"
+version = "3.0.23"
 description = "Drydock — a local, provider-agnostic terminal coding agent for local LLMs"
 readme = "README.md"
 requires-python = ">=3.12"

{drydock_cli-3.0.21 → drydock_cli-3.0.23}/tests/test_detect.py

@@ -71,3 +71,5 @@ def test_onboarding_message_when_nothing_found():
     msg = detect.onboarding_message([])
     assert "No local LLM detected" in msg
     assert "config.toml" in msg
+    # New users must learn how to point Drydock at their model from the TUI.
+    assert "/model url" in msg and "/model" in msg

{drydock_cli-3.0.21 → drydock_cli-3.0.23}/tests/test_guards_and_tools.py

@@ -313,6 +313,15 @@ def test_file_tools_honor_config_cwd(tmp_path):
     assert "x.py" in tool_bash({"command": "ls sub"}, cfg)
 
 
+def test_tool_bash_timeout_suggests_larger_timeout():
+    from drydock.tools import tool_bash
+    out = tool_bash({"command": "sleep 2", "timeout": 1}, {})
+    assert "timed out after 1s" in out
+    # Must tell the model it can retry with a bigger timeout (so a legitimately
+    # slow query/build doesn't dead-end — what derailed query-optimize).
+    assert "timeout: 4" in out
+
+
 def test_absolute_paths_pass_through(tmp_path):
     fp = str(tmp_path / "abs.py")
     tool_write({"file_path": fp, "content": "a=1\n"}, {"cwd": "/nonexistent"})