drydock-cli 1.7.2__tar.gz → 1.7.4__tar.gz

{drydock_cli-1.7.2 → drydock_cli-1.7.4}/PKG-INFO

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

{drydock_cli-1.7.2 → drydock_cli-1.7.4}/drydock/core/agent_loop.py

@@ -493,6 +493,7 @@ class AgentLoop:
                     user_prompt=build_prompt,
                     config=self.config,
                     base_dir=Path.cwd(),
+                    backend=self.backend,
                 )
                 # Yield the summary directly to the user — don't let the model
                 # respond, because it will ignore the instructions and rebuild files.

{drydock_cli-1.7.2 → drydock_cli-1.7.4}/drydock/core/build_orchestrator.py

@@ -23,6 +23,8 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
 from drydock.core.config import ProviderConfig, VibeConfig
+from drydock.core.llm.types import BackendLike
+from drydock.core.types import LLMMessage, MessageList, Role
 
 
 def _get_active_provider(config: VibeConfig) -> ProviderConfig | None:
@@ -314,8 +316,9 @@ async def implement_file(
     plan: BuildPlan,
     config: VibeConfig,
     base_dir: Path,
+    backend: BackendLike | None = None,
 ) -> bool:
-    """Ask the LLM to generate code for one file via direct API call."""
+    """Ask the LLM to generate code for one file."""
     module_lines = []
     for f in plan.files:
         marker = " <-- THIS FILE" if f.path == file_spec.path else ""
@@ -348,42 +351,52 @@ async def implement_file(
         existing_apis=existing_apis,
     )
 
-    # Direct API call — no AgentLoop overhead
     try:
-        import httpx
-
-        # Find the provider config
-        provider = _get_active_provider(config)
-        if not provider:
-            return False
+        system_msg = (
+            "You are a code implementation agent. Write a CONCISE Python file. "
+            "Output ONLY Python code. No markdown fences. No explanation. "
+            "FIRST LINE MUST BE: from __future__ import annotations\n"
+            "Keep it under 150 lines. Use absolute imports (from pkg.module import X). "
+            "Do NOT use relative imports. Do NOT import classes just for type hints — "
+            "use string literals instead: def foo(x: 'ClassName'). "
+            "Import EXACT names from the EXISTING APIs listed."
+        )
 
-        messages = [
-            {"role": "system", "content": (
-                "You are a code implementation agent. Write a CONCISE Python file. "
-                "Output ONLY Python code. No markdown fences. No explanation. "
-                "FIRST LINE MUST BE: from __future__ import annotations\n"
-                "Keep it under 150 lines. Use absolute imports (from pkg.module import X). "
-                "Do NOT use relative imports. Do NOT import classes just for type hints — "
-                "use string literals instead: def foo(x: 'ClassName'). "
-                "Import EXACT names from the EXISTING APIs listed."
-            )},
-            {"role": "user", "content": prompt},
-        ]
-
-        async with httpx.AsyncClient(timeout=300) as client:
-            resp = await client.post(
-                f"{provider.api_base}/chat/completions",
-                json={
-                    "model": config.active_model,
-                    "messages": messages,
-                    "max_tokens": 2048,
-                    "temperature": 0.2,
-                },
+        msgs = MessageList()
+        msgs.append(LLMMessage(role=Role.system, content=system_msg))
+        msgs.append(LLMMessage(role=Role.user, content=prompt))
+
+        if backend:
+            # Use the same backend as the main agent loop
+            active_model = config.get_active_model()
+            result = await backend.complete(
+                model=active_model,
+                messages=msgs,
+                temperature=0.2,
+                max_tokens=2048,
             )
-            resp.raise_for_status()
-            data = resp.json()
-
-        content = data["choices"][0]["message"]["content"]
+            content = result.message.content or ""
+        else:
+            # Fallback: direct httpx call
+            import httpx
+            provider = _get_active_provider(config)
+            if not provider:
+                return False
+            async with httpx.AsyncClient(timeout=300) as client:
+                resp = await client.post(
+                    f"{provider.api_base}/chat/completions",
+                    json={
+                        "model": config.active_model,
+                        "messages": [
+                            {"role": "system", "content": system_msg},
+                            {"role": "user", "content": prompt},
+                        ],
+                        "max_tokens": 2048,
+                        "temperature": 0.2,
+                    },
+                )
+                resp.raise_for_status()
+                content = resp.json()["choices"][0]["message"]["content"]
 
         # Strip markdown fences if present
         if "```python" in content:
@@ -432,6 +445,7 @@ async def run_build_pipeline(
     user_prompt: str,
     config: VibeConfig,
     base_dir: Path | None = None,
+    backend: BackendLike | None = None,
 ) -> str:
     """Run the full multi-phase build pipeline.
 
@@ -461,7 +475,7 @@ async def run_build_pipeline(
         success = False
         for attempt in range(2):
             try:
-                success = await implement_file(file_spec, plan, config, base_dir)
+                success = await implement_file(file_spec, plan, config, base_dir, backend)
                 if success:
                     _fix_imports(base_dir / file_spec.path, plan.package_name)
                     break
@@ -499,10 +513,13 @@ async def run_build_pipeline(
     summary_lines.extend(api_summary_parts)
     summary_lines.extend([
         f"",
-        f"Now run this command to test: python3 -m {plan.package_name} --help",
-        f"If you get an ImportError, read the file that failed and fix the import with search_replace.",
-        f"If it works, create sample test data and run an actual analysis.",
-        f"Do NOT create new files or rewrite existing ones.",
+        f"YOUR NEXT STEPS (follow exactly):",
+        f"1. Run: python3 -m {plan.package_name} --help",
+        f"2. If ImportError or NameError: read the failing file, fix with search_replace",
+        f"3. Create a sample log file with write_file, then test: python3 -m {plan.package_name} --log-file sample.log",
+        f"4. When it works, tell the user",
+        f"",
+        f"DO NOT run git commands. DO NOT run ls. DO NOT create new .py files.",
     ])
 
     if failed_files:

{drydock_cli-1.7.2 → drydock_cli-1.7.4}/pyproject.toml

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