drydock-cli 2.6.129__tar.gz → 2.6.130__tar.gz

{drydock_cli-2.6.129 → drydock_cli-2.6.130}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 2.6.129
+Version: 2.6.130
 Summary: Local-first CLI coding agent — tested with Gemma 4 26B via vLLM
 Project-URL: Homepage, https://github.com/fbobe321/drydock
 Project-URL: Repository, https://github.com/fbobe321/drydock

{drydock_cli-2.6.129 → drydock_cli-2.6.130}/drydock/core/llm/format.py

@@ -228,6 +228,12 @@ class APIToolFormatHandler:
             # Strip leading "thought"/"(thought)" filler and match the
             # `call:name{...}` shape so the agent loop sees empty content
             # and can fire its recovery nudge.
+            #
+            # IMPORTANT: `stripped` is for PATTERN MATCHING ONLY. We must
+            # NOT replace `content` with `stripped` in the no-match case —
+            # that ate leading/trailing spaces from every streaming chunk
+            # (issue #1: a Gemma chunk like " received" became "received"
+            # so the rendered text had no spaces between words).
             stripped = content.strip()
             # Peel "thought" or "(thought)" prefix (case-insensitive, optional
             # whitespace)
@@ -250,7 +256,12 @@ class APIToolFormatHandler:
                 # this..." — only the bare-word leak with `/` or `\n`.
                 content = None
             else:
-                content = stripped or None
+                # Preserve original whitespace. Only collapse to None when
+                # the chunk is genuinely empty after stripping (so we don't
+                # ship pure-whitespace chunks to downstream consumers).
+                if not stripped:
+                    content = None
+                # else: leave `content` as-is (with leading/trailing spaces)
 
         clean_message = {
             "role": message.role,

{drydock_cli-2.6.129 → drydock_cli-2.6.130}/drydock/setup/onboarding/__init__.py

@@ -6,7 +6,12 @@ from rich import print as rprint
 from textual.app import App
 
 from drydock.core.paths import GLOBAL_ENV_FILE
-from drydock.setup.onboarding.screens import ApiKeyScreen, WelcomeScreen
+from drydock.setup.onboarding.screens import (
+    ApiKeyScreen,
+    ChoiceScreen,
+    LocalModelScreen,
+    WelcomeScreen,
+)
 
 
 class OnboardingApp(App[str | None]):
@@ -16,6 +21,8 @@ class OnboardingApp(App[str | None]):
         self.theme = "textual-ansi"
 
         self.install_screen(WelcomeScreen(), "welcome")
+        self.install_screen(ChoiceScreen(), "choice")
+        self.install_screen(LocalModelScreen(), "local_model")
         self.install_screen(ApiKeyScreen(), "api_key")
         self.push_screen("welcome")
 

drydock_cli-2.6.130/drydock/setup/onboarding/screens/__init__.py

@@ -0,0 +1,13 @@
+from __future__ import annotations
+
+from drydock.setup.onboarding.screens.api_key import ApiKeyScreen
+from drydock.setup.onboarding.screens.choice import ChoiceScreen
+from drydock.setup.onboarding.screens.local_model import LocalModelScreen
+from drydock.setup.onboarding.screens.welcome import WelcomeScreen
+
+__all__ = [
+    "ApiKeyScreen",
+    "ChoiceScreen",
+    "LocalModelScreen",
+    "WelcomeScreen",
+]

{drydock_cli-2.6.129 → drydock_cli-2.6.130}/drydock/setup/onboarding/screens/api_key.py

@@ -19,10 +19,10 @@ from drydock.core.telemetry.send import TelemetryClient
 from drydock.setup.onboarding.base import OnboardingScreen
 
 PROVIDER_HELP = {
-    "mistral": ("https://console.mistral.ai/codestral/cli", "Mistral AI Studio")
+    "mistral": ("https://console.mistral.ai/codestral/cli", "Mistral AI Studio"),
 }
 CONFIG_DOCS_URL = (
-    "https://github.com/mistralai/mistral-vibe?tab=readme-ov-file#configuration"
+    "https://github.com/fbobe321/drydock?tab=readme-ov-file#configuration"
 )
 
 

drydock_cli-2.6.130/drydock/setup/onboarding/screens/choice.py

@@ -0,0 +1,65 @@
+"""Cloud-vs-local choice screen — step 2 of onboarding.
+
+Asks the user which kind of LLM they're connecting to. Answers github
+issue #3: a fresh install used to drop straight into a Mistral API key
+prompt with no obvious way to use a local vLLM instead. Now the user
+sees the choice up front.
+"""
+from __future__ import annotations
+
+from typing import ClassVar
+
+from textual.app import ComposeResult
+from textual.binding import Binding, BindingType
+from textual.containers import Center, Vertical
+from textual.widgets import OptionList
+from textual.widgets.option_list import Option
+
+from drydock.cli.textual_ui.widgets.no_markup_static import NoMarkupStatic
+from drydock.setup.onboarding.base import OnboardingScreen
+
+
+class ChoiceScreen(OnboardingScreen):
+    BINDINGS: ClassVar[list[BindingType]] = [
+        Binding("ctrl+c", "cancel", "Cancel", show=False),
+        Binding("escape", "cancel", "Cancel", show=False),
+    ]
+
+    NEXT_SCREEN = None  # set dynamically based on selection
+
+    def compose(self) -> ComposeResult:
+        with Vertical(id="choice-outer"):
+            yield NoMarkupStatic("", classes="spacer")
+            yield Center(NoMarkupStatic(
+                "How will you connect to an LLM?",
+                id="choice-title",
+            ))
+            with Center():
+                with Vertical(id="choice-content"):
+                    yield OptionList(
+                        Option(
+                            "Local server (vLLM, Ollama, LM Studio, llama.cpp)",
+                            id="local",
+                        ),
+                        Option(
+                            "Cloud API (Mistral)",
+                            id="cloud",
+                        ),
+                        id="choice-options",
+                    )
+                    yield NoMarkupStatic(
+                        "[dim]↑↓ Navigate · Enter Select · Esc Cancel[/]",
+                        id="choice-help",
+                    )
+            yield NoMarkupStatic("", classes="spacer")
+
+    def on_mount(self) -> None:
+        self.query_one(OptionList).focus()
+
+    def on_option_list_option_selected(
+        self, event: OptionList.OptionSelected
+    ) -> None:
+        if event.option.id == "local":
+            self.app.switch_screen("local_model")
+        elif event.option.id == "cloud":
+            self.app.switch_screen("api_key")

drydock_cli-2.6.130/drydock/setup/onboarding/screens/local_model.py

@@ -0,0 +1,138 @@
+"""Local-LLM setup screen — alternative to the Mistral API key path.
+
+Asks the user for an api_base URL and a model name, writes a minimal
+config.toml pointing at it, and exits onboarding marking it complete.
+The user can refine later via `/setup-model` or by editing config.toml
+directly. This is the "I'll run my own vLLM/Ollama/LM Studio" path
+described in github issue #3.
+"""
+from __future__ import annotations
+
+from pathlib import Path
+from typing import ClassVar
+
+import tomli_w
+from textual.app import ComposeResult
+from textual.binding import Binding, BindingType
+from textual.containers import Center, Horizontal, Vertical
+from textual.validation import Length, Regex
+from textual.widgets import Input
+
+from drydock.cli.textual_ui.widgets.no_markup_static import NoMarkupStatic
+from drydock.setup.onboarding.base import OnboardingScreen
+
+
+_DEFAULT_API_BASE = "http://localhost:8000/v1"
+_DEFAULT_MODEL = "local"
+
+
+def _write_local_config(api_base: str, model_name: str) -> Path:
+    """Write a minimal local-model config to ~/.drydock/config.toml.
+
+    Adds a 'local' provider pointing at api_base, a 'local' model alias
+    pointing at the user's model name, and sets it as the active model.
+    Doesn't touch the existing Mistral defaults — the user can still
+    add a Mistral key later if they want.
+    """
+    config_dir = Path.home() / ".drydock"
+    config_dir.mkdir(parents=True, exist_ok=True)
+    cfg_path = config_dir / "config.toml"
+    payload = {
+        "active_model": model_name or _DEFAULT_MODEL,
+        "providers": [
+            {
+                "name": "local",
+                "api_base": api_base,
+                "api_key_env_var": "",
+                "backend": "generic",
+            },
+        ],
+        "models": [
+            {
+                "name": model_name or _DEFAULT_MODEL,
+                "provider": "local",
+                "alias": model_name or _DEFAULT_MODEL,
+                "input_price": 0.0,
+                "output_price": 0.0,
+            },
+        ],
+    }
+    with cfg_path.open("wb") as f:
+        tomli_w.dump(payload, f)
+    return cfg_path
+
+
+class LocalModelScreen(OnboardingScreen):
+    """Step-2 alternative: configure a local OpenAI-compatible endpoint."""
+
+    BINDINGS: ClassVar[list[BindingType]] = [
+        Binding("ctrl+c", "cancel", "Cancel", show=False),
+        Binding("escape", "cancel", "Cancel", show=False),
+    ]
+
+    NEXT_SCREEN = None
+
+    def compose(self) -> ComposeResult:
+        self.api_base_input = Input(
+            value=_DEFAULT_API_BASE,
+            id="api-base",
+            placeholder=_DEFAULT_API_BASE,
+            validators=[
+                Length(minimum=1, failure_description="API base URL required."),
+                Regex(
+                    r"^https?://.+",
+                    failure_description="Must start with http:// or https://",
+                ),
+            ],
+        )
+        self.model_input = Input(
+            value="",
+            id="model-name",
+            placeholder="model name (e.g. gemma4, llama-3-8b)",
+            validators=[Length(minimum=1, failure_description="Model name required.")],
+        )
+        with Vertical(id="local-model-outer"):
+            yield NoMarkupStatic("", classes="spacer")
+            yield Center(NoMarkupStatic(
+                "Local LLM setup",
+                id="local-model-title",
+            ))
+            with Center():
+                with Vertical(id="local-model-content"):
+                    yield NoMarkupStatic(
+                        "Point Drydock at any OpenAI-compatible endpoint "
+                        "(vLLM, Ollama, LM Studio, llama.cpp, etc.):",
+                        id="local-model-hint",
+                    )
+                    yield NoMarkupStatic("API base URL:")
+                    yield Center(Horizontal(self.api_base_input, id="api-base-row"))
+                    yield NoMarkupStatic("Model name (as your server reports it):")
+                    yield Center(Horizontal(self.model_input, id="model-row"))
+                    yield NoMarkupStatic("", id="feedback")
+                    yield NoMarkupStatic(
+                        "[dim]Tab to switch fields · Enter on the model "
+                        "field to save · Esc to skip[/]",
+                        id="local-model-help",
+                    )
+            yield NoMarkupStatic("", classes="spacer")
+
+    def on_mount(self) -> None:
+        self.api_base_input.focus()
+
+    def on_input_submitted(self, event: Input.Submitted) -> None:
+        # Enter on api-base → jump to model field; Enter on model → save.
+        if event.input.id == "api-base":
+            self.model_input.focus()
+            return
+        if event.input.id == "model-name":
+            self._save_and_finish()
+
+    def _save_and_finish(self) -> None:
+        api_base = self.api_base_input.value.strip() or _DEFAULT_API_BASE
+        model_name = self.model_input.value.strip() or _DEFAULT_MODEL
+        try:
+            _write_local_config(api_base, model_name)
+        except OSError as err:
+            self.app.exit(f"save_error:{err}")
+            return
+        self.app.exit("completed")

{drydock_cli-2.6.129 → drydock_cli-2.6.130}/drydock/setup/onboarding/screens/welcome.py

@@ -50,7 +50,7 @@ class WelcomeScreen(OnboardingScreen):
         Binding("escape", "cancel", "Cancel", show=False),
     ]
 
-    NEXT_SCREEN = "api_key"
+    NEXT_SCREEN = "choice"
 
     def __init__(self) -> None:
         super().__init__()

{drydock_cli-2.6.129 → drydock_cli-2.6.130}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "drydock-cli"
-version = "2.6.129"
+version = "2.6.130"
 description = "Local-first CLI coding agent — tested with Gemma 4 26B via vLLM"
 readme = "README.md"
 requires-python = ">=3.12"

{drydock_cli-2.6.129 → drydock_cli-2.6.130}/tests/test_reasoning_content.py

@@ -287,6 +287,48 @@ class TestAPIToolFormatHandlerReasoningContent:
         assert result.content == "Hello"
         assert result.reasoning_content is None
 
+    def test_process_api_response_message_preserves_leading_space(self):
+        """Streaming chunks like ' received' must keep their leading space —
+        otherwise the rendered text reads 'Whatwouldyoulikemetotest' (issue
+        #1: spaces stripped from streaming output with Gemma vLLM)."""
+        handler = APIToolFormatHandler()
+        mock_message = MagicMock(spec=["role", "content", "tool_calls"])
+        mock_message.role = "assistant"
+        mock_message.content = " received"
+        mock_message.tool_calls = None
+        result = handler.process_api_response_message(mock_message)
+        assert result.content == " received"
+
+    def test_process_api_response_message_preserves_trailing_space(self):
+        handler = APIToolFormatHandler()
+        mock_message = MagicMock(spec=["role", "content", "tool_calls"])
+        mock_message.role = "assistant"
+        mock_message.content = "What "
+        mock_message.tool_calls = None
+        result = handler.process_api_response_message(mock_message)
+        assert result.content == "What "
+
+    def test_process_api_response_message_preserves_internal_whitespace(self):
+        """Multi-word chunks must preserve all internal whitespace too."""
+        handler = APIToolFormatHandler()
+        mock_message = MagicMock(spec=["role", "content", "tool_calls"])
+        mock_message.role = "assistant"
+        mock_message.content = " I am working\n  correctly."
+        mock_message.tool_calls = None
+        result = handler.process_api_response_message(mock_message)
+        assert result.content == " I am working\n  correctly."
+
+    def test_process_api_response_message_pure_whitespace_becomes_none(self):
+        """A chunk that's entirely whitespace should still collapse to None
+        — we don't want to ship '   ' as a content chunk."""
+        handler = APIToolFormatHandler()
+        mock_message = MagicMock(spec=["role", "content", "tool_calls"])
+        mock_message.role = "assistant"
+        mock_message.content = "    "
+        mock_message.tool_calls = None
+        result = handler.process_api_response_message(mock_message)
+        assert result.content is None
+
 
 class TestAgentLoopStreamingReasoningEvents:
     @pytest.mark.asyncio

{drydock_cli-2.6.129 → drydock_cli-2.6.130}/uv.lock

@@ -326,7 +326,7 @@ wheels = [
 
 [[package]]
 name = "drydock-cli"
-version = "2.6.127"
+version = "2.6.129"
 source = { editable = "." }
 dependencies = [
     { name = "agent-client-protocol" },

drydock_cli-2.6.129/.auto_release.lock

@@ -1 +0,0 @@
-1768422

drydock_cli-2.6.129/drydock/setup/onboarding/screens/__init__.py

@@ -1,6 +0,0 @@
-from __future__ import annotations
-
-from drydock.setup.onboarding.screens.api_key import ApiKeyScreen
-from drydock.setup.onboarding.screens.welcome import WelcomeScreen
-
-__all__ = ["ApiKeyScreen", "WelcomeScreen"]