drydock-cli 1.6.5__tar.gz → 1.6.7__tar.gz

{drydock_cli-1.6.5 → drydock_cli-1.6.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 1.6.5
+Version: 1.6.7
 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.6.5 → drydock_cli-1.6.7}/drydock/core/agent_loop.py

@@ -494,7 +494,33 @@ class AgentLoop:
                     config=self.config,
                     base_dir=Path.cwd(),
                 )
-                self._inject_system_note(summary)
+                # Yield the summary directly to the user — don't let the model
+                # respond, because it will ignore the instructions and rebuild files.
+                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

{drydock_cli-1.6.5 → drydock_cli-1.6.7}/drydock/core/build_orchestrator.py

@@ -398,6 +398,10 @@ async def run_build_pipeline(
                 logger.warning("  Attempt %d error for %s: %s", attempt + 1, file_spec.path, e)
         results.append((file_spec.path, success))
 
+    # Phase 3.5: Auto-fix cross-file import mismatches
+    logger.info("BUILD PHASE 3.5: Fixing cross-file imports...")
+    _fix_cross_file_imports(plan, base_dir)
+
     # Build summary
     succeeded = sum(1 for _, ok in results if ok)
     failed_files = [path for path, ok in results if not ok]
@@ -437,6 +441,99 @@ async def run_build_pipeline(
     return "\n".join(summary_lines)
 
 
+def _fix_cross_file_imports(plan: BuildPlan, base_dir: Path) -> None:
+    """Fix import name mismatches between files.
+
+    Each file was built by a separate LLM call, so they may reference
+    function/class names that don't exist in the target module.
+    This function scans all imports and renames them to match actual definitions.
+    """
+    import ast
+
+    # Step 1: Build a map of what each module actually exports
+    exports: dict[str, set[str]] = {}  # module_path -> {name1, name2, ...}
+    for f in plan.files:
+        fp = base_dir / f.path
+        if not fp.exists():
+            continue
+        try:
+            content = fp.read_text()
+            tree = ast.parse(content)
+            names = set()
+            for node in ast.walk(tree):
+                if isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef)):
+                    names.add(node.name)
+                elif isinstance(node, ast.ClassDef):
+                    names.add(node.name)
+            module_name = f"{plan.package_name}.{fp.stem}"
+            exports[module_name] = names
+        except Exception:
+            continue
+
+    # Step 2: For each file, check if its imports reference names that don't exist
+    for f in plan.files:
+        fp = base_dir / f.path
+        if not fp.exists():
+            continue
+        try:
+            content = fp.read_text()
+            tree = ast.parse(content)
+            replacements: list[tuple[str, str]] = []
+
+            for node in ast.walk(tree):
+                if isinstance(node, ast.ImportFrom) and node.module:
+                    module = node.module
+                    if module not in exports:
+                        continue
+                    available = exports[module]
+                    for alias in node.names:
+                        if alias.name not in available and alias.name != "*":
+                            # Find the closest match
+                            best = _find_closest(alias.name, available)
+                            if best:
+                                replacements.append((alias.name, best))
+
+            if replacements:
+                for old_name, new_name in replacements:
+                    content = content.replace(old_name, new_name)
+                fp.write_text(content)
+                logger.info("Fixed imports in %s: %s",
+                            fp.name, ", ".join(f"{o}->{n}" for o, n in replacements))
+        except Exception as e:
+            logger.debug("Failed to fix imports in %s: %s", f.path, e)
+
+
+def _find_closest(name: str, available: set[str]) -> str | None:
+    """Find the closest matching name from available names."""
+    name_lower = name.lower()
+
+    # Exact match (case-insensitive)
+    for a in available:
+        if a.lower() == name_lower:
+            return a
+
+    # Substring match (the wanted name is part of an available name or vice versa)
+    for a in available:
+        if name_lower in a.lower() or a.lower() in name_lower:
+            return a
+
+    # Word overlap (split by _ and CamelCase)
+    import re
+    name_words = set(re.findall(r'[a-z]+', name_lower))
+    best_match = None
+    best_overlap = 0
+    for a in available:
+        a_words = set(re.findall(r'[a-z]+', a.lower()))
+        overlap = len(name_words & a_words)
+        if overlap > best_overlap:
+            best_overlap = overlap
+            best_match = a
+    if best_overlap >= 1:
+        return best_match
+
+    return None
+
+
 def _fix_imports(file_path: Path, package_name: str) -> None:
     """Fix relative imports in a file to absolute imports."""
     try:

{drydock_cli-1.6.5 → drydock_cli-1.6.7}/pyproject.toml

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