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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 0.6.1
+Version: 0.6.2
 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.2}/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.2}/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,78 @@ 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 or env
+        import os
+        consultant_model = os.environ.get("DRYDOCK_CONSULTANT_MODEL", "")
+        if not consultant_model:
+            # Check config for consultant_model setting
+            try:
+                consultant_model = getattr(self.agent_loop.config, "consultant_model", "")
+            except Exception:
+                pass
+
+        if not consultant_model:
+            await self._mount_and_scroll(
+                ErrorMessage(
+                    "No consultant model configured.\n"
+                    "Set via: `drydock --consultant gemini-2.5-pro` or "
+                    "`export DRYDOCK_CONSULTANT_MODEL=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, 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.2}/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.2}/pyproject.toml

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

{drydock_cli-0.6.1 → drydock_cli-0.6.2}/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
 
 
 # ============================================================================