drydock-cli 3.0.25__tar.gz → 3.0.27__tar.gz

{drydock_cli-3.0.25/drydock_cli.egg-info → drydock_cli-3.0.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.25
+Version: 3.0.27
 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.25 → drydock_cli-3.0.27}/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.25"
+    __version__ = "3.0.27"

{drydock_cli-3.0.25 → drydock_cli-3.0.27}/drydock/cli.py

@@ -168,6 +168,35 @@ def _summarize(inputs: dict) -> str:
 
 # ── Entry point ───────────────────────────────────────────────────────────
 
+def _first_run_setup(cfg: dict, cfg_path, cfgmod) -> tuple[dict, str]:
+    """Interactive first-launch: ask for the model server URL + model name and
+    persist them to config.toml. Autodetect (if anything is listening) supplies
+    the suggested defaults. Returns (updated cfg, onboarding line)."""
+    from drydock import detect
+
+    found = detect.detect_local_llms()
+    default_url = found[0]["base_url"] if found else "http://127.0.0.1:8000/v1"
+    default_model = (
+        found[0]["models"][0]
+        if found and found[0].get("models")
+        else (cfg.get("model") or "gemma4")
+    )
+    print("\n  ⚓ Drydock — first-time setup")
+    print("  Point Drydock at your local model server (any OpenAI-compatible URL).\n")
+    try:
+        url = input(f"  Model server URL [{default_url}]: ").strip() or default_url
+        model = input(f"  Model name [{default_model}]: ").strip() or default_model
+    except (EOFError, KeyboardInterrupt):
+        url, model = default_url, default_model
+        print()
+    cfg["base_url"] = url
+    cfg["model"] = model
+    cfg.setdefault("provider", found[0]["provider"] if found else "vllm")
+    cfgmod.save_file(cfg, cfg_path)
+    print(f"\n  Saved to {cfg_path} — change it anytime with /model or by editing that file.\n")
+    return cfg, f"⚓ Using {model} at {url}"
+
+
 def main():
     parser = argparse.ArgumentParser(description="DryDock — local coding agent")
     parser.add_argument(
@@ -198,19 +227,22 @@ def main():
         "temperature": args.temperature,
     }, cfg_path)
 
-    # First-launch autodetect: if no config existed and the user didn't pin an
-    # endpoint, probe localhost for a running local LLM and wire up the first
-    # one found (persisted, so subsequent runs skip detection).
+    # First launch: ask the user for their model server URL + model name and
+    # persist them to config.toml. Interactive only — when stdin isn't a TTY
+    # (piped / -p / cron) we fall back to silent autodetect so nothing blocks.
     onboarding = ""
     if first_run and not args.provider and not args.base_url:
-        from drydock import detect
-
-        found = detect.detect_local_llms()
-        onboarding = detect.onboarding_message(found)
-        if found:
-            cfg["provider"] = found[0]["provider"]
-            cfg["base_url"] = found[0]["base_url"]
-            cfgmod.save_file(cfg, cfg_path)
+        if sys.stdin.isatty() and not args.prompt:
+            cfg, onboarding = _first_run_setup(cfg, cfg_path, cfgmod)
+        else:
+            from drydock import detect
+
+            found = detect.detect_local_llms()
+            onboarding = detect.onboarding_message(found)
+            if found:
+                cfg["provider"] = found[0]["provider"]
+                cfg["base_url"] = found[0]["base_url"]
+                cfgmod.save_file(cfg, cfg_path)
 
     config = {
         **cfg,

{drydock_cli-3.0.25 → drydock_cli-3.0.27}/drydock/providers.py

@@ -253,7 +253,12 @@ def stream(
         if delta.content:
             # Strip any leaked thinking-token markers (best-effort per chunk).
             chunk_text = strip_thinking_tokens(delta.content)
-            if chunk_text.strip():
+            # Keep ANY non-empty chunk — including whitespace-only ones. A
+            # `.strip()` guard here used to DROP newline-only chunks (the blank
+            # line a model streams between markdown blocks arrives as its own
+            # chunk), mashing "para### Header" together. `if chunk_text:` still
+            # skips chunks that stripping emptied (e.g. a lone thinking marker).
+            if chunk_text:
                 text += chunk_text
                 yield TextChunk(chunk_text)
 

{drydock_cli-3.0.25 → drydock_cli-3.0.27/drydock_cli.egg-info}/PKG-INFO

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

@@ -35,6 +35,7 @@ tests/test_compaction.py
 tests/test_config.py
 tests/test_detect.py
 tests/test_empty_response.py
+tests/test_first_run_setup.py
 tests/test_guards_and_tools.py
 tests/test_hallucinated_tools.py
 tests/test_leaked_tool_call.py
@@ -42,6 +43,7 @@ tests/test_loop_detect.py
 tests/test_plan_autocontinue.py
 tests/test_providers_unreachable.py
 tests/test_stop.py
+tests/test_streaming_newlines.py
 tests/test_subagent.py
 tests/test_todo.py
 tests/test_tool_arg_parsing.py

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

drydock_cli-3.0.27/tests/test_first_run_setup.py

@@ -0,0 +1,34 @@
+"""First-launch setup: prompt for model server URL + name, persist to config."""
+from __future__ import annotations
+
+from drydock import cli
+from drydock import config as cfgmod
+
+
+def test_first_run_setup_persists_url_and_model(tmp_path, monkeypatch):
+    # No server running → defaults; user types a custom URL + model.
+    monkeypatch.setattr(cli, "_first_run_setup", cli._first_run_setup)  # ensure present
+    import drydock.detect as detect
+    monkeypatch.setattr(detect, "detect_local_llms", lambda: [])
+    answers = iter(["http://127.0.0.1:8000/v1", "gemma4"])
+    monkeypatch.setattr("builtins.input", lambda *_: next(answers))
+
+    cfg_path = tmp_path / "config.toml"
+    cfg, onboarding = cli._first_run_setup(dict(cfgmod.DEFAULTS), cfg_path, cfgmod)
+
+    assert cfg["base_url"] == "http://127.0.0.1:8000/v1"
+    assert cfg["model"] == "gemma4"
+    # Persisted to disk.
+    on_disk = cfgmod.load_file(cfg_path)
+    assert on_disk["base_url"] == "http://127.0.0.1:8000/v1"
+    assert on_disk["model"] == "gemma4"
+    assert "gemma4" in onboarding and "127.0.0.1:8000" in onboarding
+
+
+def test_first_run_setup_uses_defaults_on_empty_input(tmp_path, monkeypatch):
+    import drydock.detect as detect
+    monkeypatch.setattr(detect, "detect_local_llms", lambda: [])
+    monkeypatch.setattr("builtins.input", lambda *_: "")  # user just hits Enter
+    cfg, _ = cli._first_run_setup(dict(cfgmod.DEFAULTS), tmp_path / "c.toml", cfgmod)
+    assert cfg["base_url"] == "http://127.0.0.1:8000/v1"  # the documented default
+    assert cfg["model"] == "gemma4"

drydock_cli-3.0.27/tests/test_streaming_newlines.py

@@ -0,0 +1,70 @@
+"""Streaming must preserve whitespace-only (newline) chunks.
+
+A `.strip()` guard in the streaming loop used to DROP a chunk that was only
+"\n\n" — the blank line a model streams between markdown blocks — so a long
+response rendered as "paragraph### Header" mashed together (operator-reported).
+"""
+from __future__ import annotations
+
+import drydock.providers as P
+from drydock.providers import AssistantTurn, TextChunk, stream
+
+
+class _Delta:
+    def __init__(self, c):
+        self.content = c
+        self.tool_calls = None
+
+
+class _Choice:
+    def __init__(self, c):
+        self.delta = _Delta(c)
+        self.finish_reason = None
+
+
+class _Chunk:
+    def __init__(self, c):
+        self.choices = [_Choice(c)]
+        self.usage = None
+
+
+def test_streaming_preserves_newline_only_chunks(monkeypatch):
+    chunks = [
+        _Chunk("Intro paragraph."),
+        _Chunk("\n\n"),          # ← blank line between blocks (was dropped)
+        _Chunk("### Header"),
+        _Chunk("\n\n"),
+        _Chunk("body text"),
+    ]
+    monkeypatch.setattr(P, "_safe_create", lambda *a, **k: iter(chunks))
+
+    full = ""
+    streamed = []
+    for ev in stream(
+        model="gemma4", system="s",
+        messages=[{"role": "user", "content": "review"}],
+        tool_schemas=[],  # no tools → text-only → streaming path even for gemma
+        config={"model": "gemma4", "provider": "vllm"},
+    ):
+        if isinstance(ev, TextChunk):
+            streamed.append(ev.text)
+        elif isinstance(ev, AssistantTurn):
+            full = ev.text
+
+    assert "\n\n" in "".join(streamed)            # newline chunks survived streaming
+    assert "Intro paragraph.\n\n### Header" in full  # blocks not mashed
+    assert "### Header\n\nbody text" in full
+
+
+def test_streaming_still_drops_chunk_emptied_by_stripping(monkeypatch):
+    # A chunk that is ONLY a thinking marker strips to "" and is skipped (so we
+    # don't emit empty text), but real whitespace is kept.
+    chunks = [_Chunk("hello"), _Chunk("<|channel>x<channel|>"), _Chunk("\n"), _Chunk("world")]
+    monkeypatch.setattr(P, "_safe_create", lambda *a, **k: iter(chunks))
+    full = ""
+    for ev in stream(model="gemma4", system="s",
+                     messages=[{"role": "user", "content": "hi"}],
+                     tool_schemas=[], config={"model": "gemma4", "provider": "vllm"}):
+        if isinstance(ev, AssistantTurn):
+            full = ev.text
+    assert full == "hello\nworld"  # marker-only chunk gone, newline kept