drydock-cli 1.3.1__tar.gz → 1.3.2__tar.gz

{drydock_cli-1.3.1 → drydock_cli-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 1.3.1
+Version: 1.3.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-1.3.1 → drydock_cli-1.3.2}/drydock/core/tools/builtins/read_file.py

@@ -136,32 +136,28 @@ class ReadFile(
         return file_path
 
     async def _read_file(self, args: ReadFileArgs, file_path: Path) -> _ReadResult:
-        try:
+        import asyncio
+
+        def _sync_read() -> _ReadResult:
             lines_to_return: list[str] = []
             bytes_read = 0
             was_truncated = False
 
-            with anyio.fail_after(30):  # Prevent hangs on NFS/locked files
-                async with await anyio.Path(file_path).open(
-                    encoding="utf-8", errors="ignore"
-                ) as f:
-                    line_index = 0
-                    async for line in f:
-                        if line_index < args.offset:
-                            line_index += 1
-                            continue
+            with open(file_path, encoding="utf-8", errors="ignore") as f:
+                for line_index, line in enumerate(f):
+                    if line_index < args.offset:
+                        continue
 
-                        if args.limit is not None and len(lines_to_return) >= args.limit:
-                            break
+                    if args.limit is not None and len(lines_to_return) >= args.limit:
+                        break
 
-                        line_bytes = len(line.encode("utf-8"))
-                        if bytes_read + line_bytes > self.config.max_read_bytes:
-                            was_truncated = True
-                            break
+                    line_bytes = len(line.encode("utf-8"))
+                    if bytes_read + line_bytes > self.config.max_read_bytes:
+                        was_truncated = True
+                        break
 
-                        lines_to_return.append(line)
-                        bytes_read += line_bytes
-                        line_index += 1
+                    lines_to_return.append(line)
+                    bytes_read += line_bytes
 
             return _ReadResult(
                 lines=lines_to_return,
@@ -169,8 +165,13 @@ class ReadFile(
                 was_truncated=was_truncated,
             )
 
-        except TimeoutError:
-            raise ToolError(f"Timed out reading {file_path} after 30s.")
+        try:
+            loop = asyncio.get_running_loop()
+            return await asyncio.wait_for(
+                loop.run_in_executor(None, _sync_read), timeout=10,
+            )
+        except asyncio.TimeoutError:
+            raise ToolError(f"Timed out reading {file_path} after 10s.")
         except OSError as exc:
             raise ToolError(f"Error reading {file_path}: {exc}") from exc
 

{drydock_cli-1.3.1 → drydock_cli-1.3.2}/drydock/core/tools/builtins/search_replace.py

@@ -226,12 +226,19 @@ class SearchReplace(
         return file_path, search_replace_blocks
 
     async def _read_file(self, file_path: Path) -> str:
+        import asyncio
+
+        def _sync_read():
+            with open(file_path, encoding="utf-8") as f:
+                return f.read()
+
         try:
-            with anyio.fail_after(30):
-                async with await anyio.Path(file_path).open(encoding="utf-8") as f:
-                    return await f.read()
-        except TimeoutError:
-            raise ToolError(f"Timed out reading {file_path} after 30s.")
+            loop = asyncio.get_running_loop()
+            return await asyncio.wait_for(
+                loop.run_in_executor(None, _sync_read), timeout=10,
+            )
+        except asyncio.TimeoutError:
+            raise ToolError(f"Timed out reading {file_path} after 10s.")
         except UnicodeDecodeError as e:
             raise ToolError(f"Unicode decode error reading {file_path}: {e}") from e
         except PermissionError:
@@ -243,17 +250,19 @@ class SearchReplace(
         shutil.copy2(file_path, file_path.with_suffix(file_path.suffix + ".bak"))
 
     async def _write_file(self, file_path: Path, content: str) -> None:
+        import asyncio
+
+        def _sync_write():
+            with open(file_path, "w", encoding="utf-8") as f:
+                f.write(content)
+
         try:
-            with anyio.fail_after(30):
-                async with await anyio.Path(file_path).open(
-                    mode="w", encoding="utf-8"
-                ) as f:
-                    await f.write(content)
-        except TimeoutError:
-            raise ToolError(
-                f"Timed out writing {file_path} after 30s. "
-                f"The file may be locked or on a slow filesystem."
+            loop = asyncio.get_running_loop()
+            await asyncio.wait_for(
+                loop.run_in_executor(None, _sync_write), timeout=10,
             )
+        except asyncio.TimeoutError:
+            raise ToolError(f"Timed out writing {file_path} after 10s.")
         except PermissionError:
             raise ToolError(f"Permission denied writing to file: {file_path}")
         except OSError as e:

{drydock_cli-1.3.1 → drydock_cli-1.3.2}/drydock/core/tools/builtins/write_file.py

@@ -147,16 +147,25 @@ class WriteFile(
         return file_path, file_existed, content_bytes
 
     async def _write_file(self, args: WriteFileArgs, file_path: Path) -> None:
+        import asyncio
+        import concurrent.futures
+
+        def _sync_write():
+            with open(file_path, "w", encoding="utf-8") as f:
+                f.write(args.content)
+
         try:
-            with anyio.fail_after(30):  # 30s timeout prevents hangs on NFS/locks
-                async with await anyio.Path(file_path).open(
-                    mode="w", encoding="utf-8"
-                ) as f:
-                    await f.write(args.content)
-        except TimeoutError:
+            # Use a thread with a real timeout — anyio.fail_after doesn't
+            # cancel thread-pool I/O, which is why writes hung for 45+ minutes
+            loop = asyncio.get_running_loop()
+            await asyncio.wait_for(
+                loop.run_in_executor(None, _sync_write),
+                timeout=10,  # 10 seconds is generous for a text file write
+            )
+        except asyncio.TimeoutError:
             raise ToolError(
-                f"Timed out writing {file_path} after 30s. "
-                f"The file may be locked by another process or on a slow filesystem."
+                f"Timed out writing {file_path} after 10s. "
+                f"The file may be locked by another process."
             )
         except Exception as e:
             raise ToolError(f"Error writing {file_path}: {e}") from e

{drydock_cli-1.3.1 → drydock_cli-1.3.2}/pyproject.toml

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