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

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

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

@@ -293,8 +293,11 @@ async def implement_file(
             {"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. Import EXACT names from the EXISTING APIs listed."
+                "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},
         ]
@@ -341,6 +344,11 @@ async def implement_file(
             logger.warning("Syntax error in generated %s: %s", file_spec.path, e)
             return False
 
+        # Ensure from __future__ import annotations is first line
+        if "from __future__ import annotations" not in content:
+            content = "from __future__ import annotations\n\n" + content
+            file_path.write_text(content)
+
         return True
 
     except Exception as e:
@@ -398,9 +406,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...")
+    # Phase 3.5: Auto-fix cross-file import mismatches and circular imports
+    logger.info("BUILD PHASE 3.5: Fixing imports...")
     _fix_cross_file_imports(plan, base_dir)
+    _fix_circular_imports(plan, base_dir)
 
     # Build summary
     succeeded = sum(1 for _, ok in results if ok)
@@ -534,6 +543,55 @@ def _find_closest(name: str, available: set[str]) -> str | None:
     return None
 
 
+def _fix_circular_imports(plan: BuildPlan, base_dir: Path) -> None:
+    """Detect and break circular imports by removing unnecessary ones."""
+    import ast
+
+    # Build import graph: module -> set of modules it imports from
+    graph: dict[str, set[str]] = {}
+    for f in plan.files:
+        fp = base_dir / f.path
+        if not fp.exists():
+            continue
+        module = f"{plan.package_name}.{fp.stem}"
+        graph[module] = set()
+        try:
+            tree = ast.parse(fp.read_text())
+            for node in ast.walk(tree):
+                if isinstance(node, ast.ImportFrom) and node.module:
+                    if node.module.startswith(plan.package_name + "."):
+                        graph[module].add(node.module)
+        except Exception:
+            continue
+
+    # Find cycles
+    for mod_a in graph:
+        for mod_b in graph.get(mod_a, set()):
+            if mod_a in graph.get(mod_b, set()):
+                # Circular: A imports B and B imports A
+                # Break by removing the import from the "utility" module
+                # (the one with fewer definitions is likely the utility)
+                file_a = base_dir / plan.package_name / f"{mod_a.split('.')[-1]}.py"
+                file_b = base_dir / plan.package_name / f"{mod_b.split('.')[-1]}.py"
+                try:
+                    content_b = file_b.read_text()
+                    # Remove the import line from B that imports A
+                    lines = content_b.split("\n")
+                    new_lines = []
+                    removed = False
+                    for line in lines:
+                        if f"from {mod_a} import" in line and not removed:
+                            logger.info("Breaking circular import: removed '%s' from %s",
+                                        line.strip(), file_b.name)
+                            removed = True
+                            continue
+                        new_lines.append(line)
+                    if removed:
+                        file_b.write_text("\n".join(new_lines))
+                except Exception:
+                    pass
+
+
 def _fix_imports(file_path: Path, package_name: str) -> None:
     """Fix relative imports in a file to absolute imports."""
     try:

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

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