drydock-cli 2.0.2__tar.gz → 2.1.1__tar.gz

{drydock_cli-2.0.2 → drydock_cli-2.1.1}/PKG-INFO

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

{drydock_cli-2.0.2 → drydock_cli-2.1.1}/drydock/core/agent_loop.py

@@ -474,104 +474,10 @@ class AgentLoop:
 
         yield UserMessageEvent(content=user_msg, message_id=user_message.message_id)
 
-        # === BUILD ORCHESTRATION ===
-        # For complex build tasks (PRD + multiple files), run the multi-phase
-        # pipeline instead of letting the model do everything in one context.
-        if self._is_build_task(user_msg):
-            try:
-                from drydock.core.build_orchestrator import run_build_pipeline
-                # Include PRD content if it exists — the user prompt is usually
-                # just "review the PRD and get started", not the PRD itself
-                build_prompt = user_msg
-                for prd_name in ("PRD.md", "prd.md", "PRD.txt"):
-                    prd_path = Path.cwd() / prd_name
-                    if prd_path.exists():
-                        prd_content = prd_path.read_text()[:8000]
-                        build_prompt = f"{user_msg}\n\nPRD CONTENT:\n{prd_content}"
-                        break
-                from drydock.core.build_orchestrator import (
-                    make_plan_from_prd, scaffold_package, implement_file,
-                    _fix_cross_file_imports, _fix_circular_imports,
-                    _extract_public_api,
-                )
-
-                # Phase 1: Plan
-                yield AssistantEvent(content="Planning project structure...")
-                plan = make_plan_from_prd(build_prompt)
-                file_list = ", ".join(f.path.split("/")[-1] for f in plan.files)
-                yield AssistantEvent(
-                    content=f"Package: `{plan.package_name}` with {len(plan.files)} files: {file_list}"
-                )
-
-                # Phase 2: Scaffold
-                yield AssistantEvent(content="Creating package structure...")
-                scaffold_package(plan, Path.cwd())
-
-                # Phase 3: Implement each file
-                for i, file_spec in enumerate(plan.files):
-                    yield AssistantEvent(
-                        content=f"Writing {file_spec.path} ({i+1}/{len(plan.files)})..."
-                    )
-                    for attempt in range(3):
-                        success = await implement_file(
-                            file_spec, plan, self.config, Path.cwd(), self.backend
-                        )
-                        if success:
-                            from drydock.core.build_orchestrator import _fix_imports
-                            _fix_imports(Path.cwd() / file_spec.path, plan.package_name)
-                            break
-
-                # Phase 3.5: Fix imports
-                yield AssistantEvent(content="Fixing cross-file imports...")
-                _fix_cross_file_imports(plan, Path.cwd())
-                _fix_circular_imports(plan, Path.cwd())
-
-                # Build summary
-                succeeded = sum(
-                    1 for f in plan.files
-                    if (Path.cwd() / f.path).exists()
-                    and (Path.cwd() / f.path).stat().st_size > 100
-                )
-                summary = (
-                    f"Project `{plan.package_name}` built: {succeeded}/{len(plan.files)} files.\n"
-                    f"Test with: `python3 -m {plan.package_name} --help`"
-                )
-                yield AssistantEvent(content=summary)
-
-                # Auto-test: run python3 -m package and report result
-                import subprocess as _sp
-                pkg_name = summary.split("'")[1] if "'" in summary else "project"
-                test_result = _sp.run(
-                    f"python3 -m {pkg_name} --help",
-                    shell=True, cwd=str(Path.cwd()),
-                    capture_output=True, text=True, timeout=15,
-                )
-                if test_result.returncode == 0:
-                    yield AssistantEvent(
-                        content=f"\nTest passed: `python3 -m {pkg_name} --help` works.\n\n"
-                        f"```\n{test_result.stdout[:300]}\n```\n\n"
-                        f"Create sample data and test further, or ask me to fix any issues."
-                    )
-                else:
-                    err = (test_result.stderr or test_result.stdout)[:300]
-                    # Let the model fix this error
-                    self._inject_system_note(
-                        f"The project was built but has an error. Fix it:\n\n"
-                        f"```\n{err}\n```\n\n"
-                        f"Use read_file and search_replace to fix. Do NOT rewrite entire files."
-                    )
-
-                logger.info("Build orchestrator completed successfully")
-            except Exception as e:
-                import traceback
-                logger.warning("Build orchestrator failed (%s), falling back to normal flow", e)
-                logger.warning("Traceback: %s", traceback.format_exc())
-                auto_context = self._build_auto_context(user_msg)
-                if auto_context:
-                    self._inject_system_note(auto_context)
-        else:
-            # Smart task routing: auto-explore + skill injection
-            await self._auto_route_task(user_msg)
+        # === AUTO-CONTEXT ===
+        # Auto-explore project files + inject relevant skill for the task type.
+        # The model handles everything with subagents (v2.0.0 fixed delegation).
+        await self._auto_route_task(user_msg)
 
         try:
             should_break_loop = False
@@ -1863,20 +1769,28 @@ class AgentLoop:
             self._inject_system_note("\n\n".join(parts))
 
     def _is_build_task(self, user_msg: str) -> bool:
-        """Detect if a user message is a complex build task that needs orchestration."""
+        """Detect if a user message is an explicit build task that needs orchestration.
+
+        Only triggers on clear build intent — NOT on "review" or "look at".
+        """
         msg_lower = user_msg.lower()
+
+        # Explicit build verbs — user clearly wants to create something
         has_build_verb = any(kw in msg_lower for kw in (
-            "build", "create a", "implement", "get started",
-            "set up", "scaffold", "review the prd", "review prd",
+            "build", "create a", "implement", "scaffold",
+            "build the project", "build this project",
+            "build from prd", "build it",
+            "get started building", "start building",
         ))
-        has_complexity = (
-            len(user_msg) > 200
-            or any(kw in msg_lower for kw in (
-                "prd", "multiple", "package", "modules", "cli",
-                "features", "commands", "architecture", "structure",
-            ))
-        )
-        # Check if a PRD.md exists in the working directory
+
+        # "review", "look at", "read" are NOT build verbs
+        is_review = any(kw in msg_lower for kw in (
+            "review", "look at", "read", "check", "analyze", "audit",
+            "what does", "explain", "summarize",
+        ))
+        if is_review and not has_build_verb:
+            return False
+
         has_prd = Path.cwd().joinpath("PRD.md").exists() or Path.cwd().joinpath("prd.md").exists()
         return has_build_verb and (has_complexity or has_prd)
 

{drydock_cli-2.0.2 → drydock_cli-2.1.1}/drydock/core/prompts/cli.md

@@ -222,18 +222,21 @@ Error Handling:
 - After ANY error, your next action must be DIFFERENT from what just failed.
 - Never run the same failing command twice — the result won't change.
 
+Building Projects (multi-file):
+When asked to build a project from a PRD or requirements:
+1. Use `task(agent="planner")` to create an implementation plan FIRST
+2. Use `task(agent="explore")` to understand existing code (if any)
+3. Create files one at a time using `write_file`
+4. Test with `bash` after creating all files
+5. Fix errors with `search_replace`, then test again
+
 Python Package Rules (MANDATORY):
 When creating Python packages (directories with __init__.py):
-- ALWAYS create __main__.py so `python3 -m mypackage` works. Contents:
-  ```
-  from mypackage.cli import main
-  if __name__ == "__main__":
-      main()
-  ```
+- ALWAYS create `__init__.py` AND `__main__.py`
+- `__main__.py` contents: `from package.cli import main; main()` (if __name__ == "__main__")
 - Use ABSOLUTE imports: `from mypackage.module import X`, NOT `from .module import X`
-- NEVER run `python3 mypackage/file.py` — ALWAYS use `python3 -m mypackage`
-- Create sample/test data BEFORE running tests (e.g., create test.log before analyzing it)
-- After 1-2 successful test runs, STOP testing and summarize what you built
+- Run with `python3 -m mypackage`, NOT `python3 mypackage/file.py`
+- Create sample/test data BEFORE running tests
 
 Debugging Best Practices:
 When fixing bugs, follow this cycle: RUN → READ → FIX → VERIFY.

{drydock_cli-2.0.2 → drydock_cli-2.1.1}/pyproject.toml

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