drydock-cli 0.6.1__tar.gz → 0.6.3__tar.gz

{drydock_cli-0.6.1 → drydock_cli-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 0.6.1
+Version: 0.6.3
 Summary: Drydock — nautical CLI coding agent
 Project-URL: Homepage, https://github.com/fbobe321/drydock
 Project-URL: Repository, https://github.com/fbobe321/drydock

{drydock_cli-0.6.1 → drydock_cli-0.6.3}/drydock/cli/commands.py

@@ -72,6 +72,11 @@ class CommandRegistry:
                 description="Configure proxy and SSL certificate settings",
                 handler="_show_proxy_setup",
             ),
+            "consult": Command(
+                aliases=frozenset(["/consult"]),
+                description="Ask a smarter model for advice (response visible to local model)",
+                handler="_consult_command",
+            ),
             "resume": Command(
                 aliases=frozenset(["/resume", "/continue"]),
                 description="Browse and resume past sessions",
@@ -92,7 +97,20 @@ class CommandRegistry:
         return self.commands.get(cmd_name) if cmd_name else None
 
     def get_command_name(self, user_input: str) -> str | None:
-        return self._alias_map.get(user_input.lower().strip())
+        stripped = user_input.lower().strip()
+        # Exact match first
+        if stripped in self._alias_map:
+            return self._alias_map[stripped]
+        # Prefix match for commands that take arguments (e.g., /consult <question>)
+        first_word = stripped.split()[0] if stripped else ""
+        if first_word in self._alias_map:
+            return self._alias_map[first_word]
+        return None
+
+    def get_command_args(self, user_input: str) -> str:
+        """Extract arguments after the command name."""
+        parts = user_input.strip().split(None, 1)
+        return parts[1] if len(parts) > 1 else ""
 
     def get_help_text(self) -> str:
         lines: list[str] = [

{drydock_cli-0.6.1 → drydock_cli-0.6.3}/drydock/cli/textual_ui/app.py

@@ -520,10 +520,18 @@ class VibeApp(App):  # noqa: PLR0904
                 )
             await self._mount_and_scroll(UserMessage(user_input))
             handler = getattr(self, command.handler)
+            # Pass command args to handlers that accept them
+            cmd_args = self.commands.get_command_args(user_input)
             if asyncio.iscoroutinefunction(handler):
-                await handler()
+                try:
+                    await handler(cmd_args)
+                except TypeError:
+                    await handler()  # Handler doesn't accept args
             else:
-                handler()
+                try:
+                    handler(cmd_args)
+                except TypeError:
+                    handler()
             return True
         return False
 
@@ -927,6 +935,84 @@ class VibeApp(App):  # noqa: PLR0904
 """
         await self._mount_and_scroll(UserCommandMessage(status_text))
 
+    async def _consult_command(self, question: str = "") -> None:
+        """Ask a consultant model for advice. Response goes into context."""
+        if not question:
+            await self._mount_and_scroll(
+                UserCommandMessage(
+                    "Usage: `/consult <your question>`\n\n"
+                    "Asks a smarter model for advice. The response appears in the "
+                    "conversation so the local model can see and act on it.\n\n"
+                    "Configure: set `consultant_model` in config.toml or use `--consultant MODEL`"
+                )
+            )
+            return
+
+        # Get consultant model from config, CLI flag, or env
+        import os
+        consultant_model = (
+            getattr(self.agent_loop.config, "consultant_model", "")
+            or os.environ.get("DRYDOCK_CONSULTANT_MODEL", "")
+        )
+
+        if not consultant_model:
+            # List available models to help the user
+            model_names = [m.name for m in self.agent_loop.config.models]
+            await self._mount_and_scroll(
+                ErrorMessage(
+                    "No consultant model configured.\n\n"
+                    f"Available models: {', '.join(model_names)}\n\n"
+                    "Set in config.toml:\n"
+                    "  `consultant_model = \"gemini-2.5-pro\"`\n\n"
+                    "Or via CLI:\n"
+                    "  `drydock --consultant gemini-2.5-pro`",
+                    collapsed=self._tools_collapsed,
+                )
+            )
+            return
+
+        await self._mount_and_scroll(
+            UserCommandMessage(f"Consulting {consultant_model}...")
+        )
+
+        try:
+            from drydock.core.consultant import ask_consultant
+            advice = await ask_consultant(
+                question,
+                config=self.agent_loop.config,
+                model=consultant_model,
+            )
+
+            if not advice or advice.startswith("(Consultant unavailable"):
+                await self._mount_and_scroll(
+                    ErrorMessage(
+                        f"Consultant ({consultant_model}) unavailable: {advice}",
+                        collapsed=self._tools_collapsed,
+                    )
+                )
+                return
+
+            # Show the advice in the UI
+            response_text = f"**Consultant ({consultant_model}):**\n\n{advice}"
+            await self._mount_and_scroll(UserCommandMessage(response_text))
+
+            # Inject into the message history so the LOCAL model can see it
+            from drydock.core.types import LLMMessage, Role
+            self.agent_loop.messages.append(
+                LLMMessage(
+                    role=Role.user,
+                    content=f"[CONSULTANT ADVICE from {consultant_model}]: {advice}"
+                )
+            )
+
+        except Exception as e:
+            await self._mount_and_scroll(
+                ErrorMessage(
+                    f"Consultant error: {e}",
+                    collapsed=self._tools_collapsed,
+                )
+            )
+
     async def _show_config(self) -> None:
         """Switch to the configuration app in the bottom panel."""
         if self._current_bottom_app == BottomApp.Config:

{drydock_cli-0.6.1 → drydock_cli-0.6.3}/drydock/core/agent_loop.py

@@ -847,9 +847,8 @@ class AgentLoop:
             return "ALREADY ATTEMPTED (do NOT repeat):\n" + "\n".join(attempts[:10])
         return ""
 
-    async def _circuit_breaker_check(self, tool_call: ResolvedToolCall) -> str | None:
-        """Block exact-duplicate tool calls. Returns cached result or None.
-        On 3rd attempt, auto-consults the smarter model if available."""
+    def _circuit_breaker_check(self, tool_call: ResolvedToolCall) -> str | None:
+        """Block exact-duplicate tool calls. Returns cached result or None."""
         sig = hashlib.md5(
             f"{tool_call.tool_name}:{tool_call.raw_arguments}".encode()
         ).hexdigest()
@@ -868,22 +867,16 @@ class AgentLoop:
                 f"- Ask the user for clarification"
             )
 
-            # Auto-consult smarter model if available
-            if count == 2:
-                try:
-                    from drydock.core.consultant import is_consultant_available, ask_consultant
-                    if is_consultant_available():
-                        question = (
-                            f"I'm stuck in a loop. I keep running `{tool_call.tool_name}` "
-                            f"with args: {tool_call.raw_arguments[:100]} "
-                            f"and getting: {last_result[:200]}. "
-                            f"What should I do differently?"
-                        )
-                        advice = await ask_consultant(question)
-                        if advice:
-                            msg += f"\n\nCONSULTANT ADVICE: {advice}"
-                except Exception as e:
-                    logger.debug("Consultant call failed: %s", e)
+            # Suggest using /consult if a consultant model is configured
+            try:
+                from drydock.core.consultant import is_consultant_available
+                if is_consultant_available():
+                    msg += (
+                        "\n\nTIP: A consultant model is available. "
+                        "The user can type `/consult <question>` to ask it for advice."
+                    )
+            except Exception:
+                pass
 
             return msg
         return None
@@ -900,7 +893,7 @@ class AgentLoop:
         self, tool_call: ResolvedToolCall
     ) -> AsyncGenerator[ToolResultEvent | ToolStreamEvent]:
         # Circuit breaker: block exact duplicate calls after 2 attempts
-        if blocked := await self._circuit_breaker_check(tool_call):
+        if blocked := self._circuit_breaker_check(tool_call):
             yield ToolResultEvent(
                 tool_name=tool_call.tool_name,
                 tool_class=tool_call.tool_class,

{drydock_cli-0.6.1 → drydock_cli-0.6.3}/drydock/core/config/_settings.py

@@ -310,6 +310,14 @@ class VibeConfig(BaseSettings):
     enable_notifications: bool = True
     api_timeout: float = 720.0
     auto_compact_threshold: int = 200_000
+    consultant_model: str = Field(
+        default="",
+        description=(
+            "Model name for the /consult command. Must match a model defined in "
+            "your config. The consultant provides read-only advice — it never "
+            "calls tools. Leave empty to disable. Example: 'gemini-2.5-pro'"
+        ),
+    )
 
     # TODO(vibe-nuage): remove exclude=True once the feature is publicly available
     nuage_enabled: bool = Field(default=False, exclude=True)

drydock_cli-0.6.3/drydock/core/consultant.py

@@ -0,0 +1,183 @@
+"""Consultant agent — asks a configured model for single-turn advice.
+
+The consultant is a READ-ONLY advisor:
+- Uses a model from DryDock's own config (providers + models)
+- NEVER calls tools, writes files, or runs commands
+- Only receives a question and returns reasoning/advice
+- Response is injected into context so the local model can see it
+
+Configure in config.toml:
+    consultant_model = "gemini-2.5-pro"
+
+Or via CLI:
+    drydock --consultant gemini-2.5-pro
+
+Or via /consult slash command:
+    /consult How should I fix this auth bug?
+"""
+
+from __future__ import annotations
+
+import logging
+import os
+
+logger = logging.getLogger(__name__)
+
+
+async def ask_consultant(
+    question: str,
+    config: object | None = None,
+    model: str | None = None,
+) -> str:
+    """Ask the consultant model a question using DryDock's backend.
+
+    Parameters
+    ----------
+    question : str
+        The specific question to ask.
+    config : VibeConfig, optional
+        DryDock config with providers/models. If None, uses env vars.
+    model : str, optional
+        Model name override. If None, uses config.consultant_model or env var.
+
+    Returns
+    -------
+    str
+        The consultant's advice text, or an error message.
+    """
+    # Resolve model name
+    model_name = model or os.environ.get("DRYDOCK_CONSULTANT_MODEL", "")
+    if not model_name and config:
+        model_name = getattr(config, "consultant_model", "")
+    if not model_name:
+        return ""
+
+    prompt = (
+        "You are a senior software engineering consultant. An AI coding agent is "
+        "asking for your advice. Give concise, actionable guidance. Do NOT provide "
+        "code unless specifically asked — just say WHAT to do and WHERE to look.\n\n"
+        f"QUESTION:\n{question}"
+    )
+
+    # Try to use DryDock's backend system
+    if config:
+        try:
+            return await _ask_via_backend(prompt, model_name, config)
+        except Exception as e:
+            logger.warning("Consultant via backend failed: %s — falling back to httpx", e)
+
+    # Fallback: direct API call
+    try:
+        return await _ask_via_httpx(prompt, model_name)
+    except Exception as e:
+        return f"(Consultant unavailable: {e})"
+
+
+async def _ask_via_backend(prompt: str, model_name: str, config: object) -> str:
+    """Use DryDock's configured backend to call the consultant model."""
+    from drydock.core.config import ModelConfig, ProviderConfig
+    from drydock.core.llm.backend.factory import BACKEND_FACTORY
+    from drydock.core.types import LLMMessage, Role
+
+    # Find the model and its provider in the config
+    target_model: ModelConfig | None = None
+    for m in config.models:
+        if m.name == model_name or m.alias == model_name:
+            target_model = m
+            break
+
+    if not target_model:
+        raise ValueError(f"Model '{model_name}' not found in config. Available: {[m.name for m in config.models]}")
+
+    # Find the provider
+    target_provider: ProviderConfig | None = None
+    for p in config.providers:
+        if p.name == target_model.provider:
+            target_provider = p
+            break
+
+    if not target_provider:
+        raise ValueError(f"Provider '{target_model.provider}' not found for model '{model_name}'")
+
+    # Create a one-shot backend
+    backend = BACKEND_FACTORY[target_provider.backend](
+        provider=target_provider,
+        timeout=30,
+    )
+
+    messages = [LLMMessage(role=Role.user, content=prompt)]
+
+    result = await backend.complete(
+        model=target_model,
+        messages=messages,
+        temperature=0.3,
+        tools=None,  # NO tools — read-only
+        tool_choice=None,
+        max_tokens=500,
+    )
+
+    return result.message.content or ""
+
+
+async def _ask_via_httpx(prompt: str, model_name: str) -> str:
+    """Fallback: direct API call via httpx for models not in config."""
+    import httpx
+
+    api_key = _detect_api_key(model_name)
+    api_base = _detect_api_base(model_name)
+
+    if not api_key:
+        return f"(No API key found for '{model_name}')"
+
+    verify_ssl = os.environ.get("DRYDOCK_INSECURE") != "1"
+    async with httpx.AsyncClient(verify=verify_ssl, timeout=30.0) as client:
+        response = await client.post(
+            f"{api_base}/chat/completions",
+            headers={
+                "Authorization": f"Bearer {api_key}",
+                "Content-Type": "application/json",
+            },
+            json={
+                "model": model_name,
+                "messages": [{"role": "user", "content": prompt}],
+                "max_tokens": 500,
+                "temperature": 0.3,
+            },
+        )
+        response.raise_for_status()
+        return response.json()["choices"][0]["message"]["content"]
+
+
+def _detect_api_key(model: str) -> str:
+    model_lower = model.lower()
+    if "gemini" in model_lower:
+        return os.environ.get("GEMINI_API_KEY", os.environ.get("GOOGLE_API_KEY", ""))
+    if "gpt" in model_lower or "o1" in model_lower or "o3" in model_lower:
+        return os.environ.get("OPENAI_API_KEY", "")
+    if "claude" in model_lower:
+        return os.environ.get("ANTHROPIC_API_KEY", "")
+    if "mistral" in model_lower or "devstral" in model_lower:
+        return os.environ.get("MISTRAL_API_KEY", "")
+    return os.environ.get("DRYDOCK_CONSULTANT_API_KEY", "")
+
+
+def _detect_api_base(model: str) -> str:
+    model_lower = model.lower()
+    if "gemini" in model_lower:
+        return "https://generativelanguage.googleapis.com/v1beta/openai"
+    if "gpt" in model_lower or "o1" in model_lower or "o3" in model_lower:
+        return "https://api.openai.com/v1"
+    if "claude" in model_lower:
+        return "https://api.anthropic.com/v1"
+    if "mistral" in model_lower or "devstral" in model_lower:
+        return os.environ.get("MISTRAL_API_BASE", "https://api.mistral.ai/v1")
+    return os.environ.get("DRYDOCK_CONSULTANT_API_BASE", "http://localhost:8000/v1")
+
+
+def is_consultant_available(config: object | None = None) -> bool:
+    """Check if a consultant model is configured."""
+    if os.environ.get("DRYDOCK_CONSULTANT_MODEL"):
+        return True
+    if config and getattr(config, "consultant_model", ""):
+        return True
+    return False

{drydock_cli-0.6.1 → drydock_cli-0.6.3}/drydock/core/paths/_vibe_home.py

@@ -17,9 +17,36 @@ class GlobalPath:
 
 
 _DEFAULT_DRYDOCK_HOME = Path.home() / ".drydock"
-# Fall back to ~/.vibe if it exists and ~/.drydock doesn't (migration support)
 _DEFAULT_VIBE_HOME = Path.home() / ".vibe"
 
+_migration_done = False
+
+
+def _migrate_vibe_to_drydock() -> None:
+    """Auto-migrate ~/.vibe → ~/.drydock if the user hasn't migrated yet."""
+    global _migration_done
+    if _migration_done:
+        return
+    _migration_done = True
+
+    if not _DEFAULT_VIBE_HOME.exists() or _DEFAULT_DRYDOCK_HOME.exists():
+        return  # Nothing to migrate, or already migrated
+
+    import shutil
+    import logging
+    logger = logging.getLogger(__name__)
+
+    try:
+        shutil.copytree(_DEFAULT_VIBE_HOME, _DEFAULT_DRYDOCK_HOME)
+        logger.info("Migrated ~/.vibe → ~/.drydock")
+        # Leave a note in the old directory
+        (_DEFAULT_VIBE_HOME / "MIGRATED.txt").write_text(
+            "This config has been migrated to ~/.drydock/\n"
+            "You can safely delete this .vibe directory.\n"
+        )
+    except (OSError, PermissionError) as e:
+        logger.warning("Could not migrate ~/.vibe → ~/.drydock: %s", e)
+
 
 def _get_vibe_home() -> Path:
     # Check env vars: DRYDOCK_HOME takes priority, then VIBE_HOME for compat
@@ -27,11 +54,12 @@ def _get_vibe_home() -> Path:
         return Path(drydock_home).expanduser().resolve()
     if vibe_home := os.getenv("VIBE_HOME"):
         return Path(vibe_home).expanduser().resolve()
-    # Default: use ~/.drydock, fall back to ~/.vibe if it exists
+
+    # Auto-migrate ~/.vibe → ~/.drydock on first run
+    _migrate_vibe_to_drydock()
+
     if _DEFAULT_DRYDOCK_HOME.exists():
         return _DEFAULT_DRYDOCK_HOME
-    if _DEFAULT_VIBE_HOME.exists():
-        return _DEFAULT_VIBE_HOME
     return _DEFAULT_DRYDOCK_HOME
 
 

{drydock_cli-0.6.1 → drydock_cli-0.6.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "drydock-cli"
-version = "0.6.1"
+version = "0.6.3"
 description = "Drydock — nautical CLI coding agent"
 readme = "README.md"
 requires-python = ">=3.12"

{drydock_cli-0.6.1 → drydock_cli-0.6.3}/tests/test_drydock_tasks.py

@@ -402,12 +402,12 @@ class TestCircuitBreaker:
 
         tc = SimpleNamespace(tool_name="bash", raw_arguments='{"command": "ls -ltr"}')
 
-        assert asyncio.run(al._circuit_breaker_check(tc)) is None
+        assert al._circuit_breaker_check(tc) is None
         al._circuit_breaker_record(tc, "file1.py\nfile2.py")
-        assert asyncio.run(al._circuit_breaker_check(tc)) is None
+        assert al._circuit_breaker_check(tc) is None
         al._circuit_breaker_record(tc, "file1.py\nfile2.py")
 
-        result = asyncio.run(al._circuit_breaker_check(tc))
+        result = al._circuit_breaker_check(tc)
         assert result is not None
         assert "CIRCUIT BREAKER" in result
 
@@ -426,8 +426,8 @@ class TestCircuitBreaker:
 
         al._circuit_breaker_record(tc1, "result1")
         al._circuit_breaker_record(tc1, "result1")
-        assert asyncio.run(al._circuit_breaker_check(tc1)) is not None
-        assert asyncio.run(al._circuit_breaker_check(tc2)) is None
+        assert al._circuit_breaker_check(tc1) is not None
+        assert al._circuit_breaker_check(tc2) is None
 
 
 # ============================================================================

drydock_cli-0.6.1/drydock/core/consultant.py

@@ -1,141 +0,0 @@
-"""Consultant agent — asks a smarter model for single-turn advice.
-
-The consultant is a READ-ONLY advisor:
-- The local model stays in control of ALL tool calls
-- The consultant NEVER calls tools, writes files, or runs commands
-- It only receives a question and returns reasoning/advice
-- Used when the local model is stuck, uncertain, or looping
-
-Usage from agent_loop:
-    advice = await ask_consultant("I found 3 files that match. Which one likely contains the bug?")
-
-The consultant model is configured via:
-- CLI: drydock --consultant gemini-2.5-pro
-- Env: DRYDOCK_CONSULTANT_MODEL=gemini-2.5-pro
-"""
-
-from __future__ import annotations
-
-import logging
-import os
-from typing import Any
-
-import httpx
-
-logger = logging.getLogger(__name__)
-
-
-async def ask_consultant(
-    question: str,
-    context: str = "",
-    model: str | None = None,
-    api_key: str | None = None,
-    api_base: str | None = None,
-) -> str:
-    """Ask the consultant model a question and get text advice back.
-
-    Parameters
-    ----------
-    question : str
-        The specific question to ask.
-    context : str
-        Optional context (e.g., file contents, error messages).
-    model : str
-        Model name. Defaults to DRYDOCK_CONSULTANT_MODEL env var.
-    api_key : str
-        API key. Auto-detected from common env vars if not provided.
-    api_base : str
-        API base URL. Auto-detected based on model name if not provided.
-
-    Returns
-    -------
-    str
-        The consultant's advice text, or an error message.
-    """
-    model = model or os.environ.get("DRYDOCK_CONSULTANT_MODEL", "")
-    if not model:
-        return ""
-
-    # Auto-detect API key and base URL from model name
-    api_key = api_key or _detect_api_key(model)
-    api_base = api_base or _detect_api_base(model)
-
-    if not api_key:
-        logger.warning("No API key found for consultant model '%s'", model)
-        return ""
-
-    prompt = f"""You are a senior software engineering consultant. A junior AI coding agent is asking for your advice.
-Give concise, actionable guidance. Do NOT provide code — just tell them WHAT to do and WHERE to look.
-
-QUESTION:
-{question}
-"""
-    if context:
-        prompt += f"\nCONTEXT:\n{context[:2000]}\n"
-
-    try:
-        # Use OpenAI-compatible API (works with Gemini, OpenAI, Mistral, local models)
-        verify_ssl = os.environ.get("DRYDOCK_INSECURE") != "1"
-        async with httpx.AsyncClient(verify=verify_ssl, timeout=30.0) as client:
-            response = await client.post(
-                f"{api_base}/chat/completions",
-                headers={
-                    "Authorization": f"Bearer {api_key}",
-                    "Content-Type": "application/json",
-                },
-                json={
-                    "model": model,
-                    "messages": [{"role": "user", "content": prompt}],
-                    "max_tokens": 500,
-                    "temperature": 0.3,
-                    # NO tools — consultant is read-only
-                },
-            )
-            response.raise_for_status()
-            data = response.json()
-            advice = data["choices"][0]["message"]["content"]
-            logger.info("Consultant (%s) responded: %s", model, advice[:100])
-            return advice
-
-    except Exception as e:
-        logger.warning("Consultant call failed: %s", e)
-        return f"(Consultant unavailable: {e})"
-
-
-def _detect_api_key(model: str) -> str:
-    """Auto-detect API key from environment based on model name."""
-    model_lower = model.lower()
-
-    if "gemini" in model_lower:
-        return os.environ.get("GEMINI_API_KEY", os.environ.get("GOOGLE_API_KEY", ""))
-    if "gpt" in model_lower or "o1" in model_lower or "o3" in model_lower:
-        return os.environ.get("OPENAI_API_KEY", "")
-    if "claude" in model_lower:
-        return os.environ.get("ANTHROPIC_API_KEY", "")
-    if "mistral" in model_lower or "devstral" in model_lower:
-        return os.environ.get("MISTRAL_API_KEY", "")
-
-    # Generic fallback
-    return os.environ.get("DRYDOCK_CONSULTANT_API_KEY", "")
-
-
-def _detect_api_base(model: str) -> str:
-    """Auto-detect API base URL from model name."""
-    model_lower = model.lower()
-
-    if "gemini" in model_lower:
-        return "https://generativelanguage.googleapis.com/v1beta/openai"
-    if "gpt" in model_lower or "o1" in model_lower or "o3" in model_lower:
-        return "https://api.openai.com/v1"
-    if "claude" in model_lower:
-        return "https://api.anthropic.com/v1"
-    if "mistral" in model_lower or "devstral" in model_lower:
-        return os.environ.get("MISTRAL_API_BASE", "https://api.mistral.ai/v1")
-
-    # Try local vLLM
-    return os.environ.get("DRYDOCK_CONSULTANT_API_BASE", "http://localhost:8000/v1")
-
-
-def is_consultant_available() -> bool:
-    """Check if a consultant model is configured."""
-    return bool(os.environ.get("DRYDOCK_CONSULTANT_MODEL"))