luv-cli 0.0.18__tar.gz → 0.0.20__tar.gz

{luv_cli-0.0.18 → luv_cli-0.0.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: luv-cli
-Version: 0.0.18
+Version: 0.0.20
 Summary: Launch Claude Code agents on GitHub repos with isolated workspaces and optional Docker dev environments
 Project-URL: Homepage, https://github.com/exospherehost/luv
 Project-URL: Repository, https://github.com/exospherehost/luv

{luv_cli-0.0.18 → luv_cli-0.0.20}/luv/__init__.py

@@ -3,6 +3,7 @@ import os
 import random
 import re
 import shutil
+import stat
 import subprocess
 import sys
 import tempfile
@@ -399,6 +400,49 @@ def launch(clone_dir: Path, prompt: str | None, plan_mode: bool = False,
 SAFE_AGE_SECONDS = 24 * 3600
 
 
+def _on_rm_error(func, path, _exc):
+    """rmtree handler: make `path` (and its parent dir) writable, then retry."""
+    parent = os.path.dirname(path)
+    try:
+        os.chmod(parent, os.stat(parent).st_mode | stat.S_IWUSR | stat.S_IXUSR)
+    except OSError:
+        pass
+    os.chmod(path, stat.S_IWUSR | stat.S_IRUSR | stat.S_IXUSR)
+    func(path)
+
+
+def _docker_wipe(path: Path) -> bool:
+    """rm -rf `path` from inside a busybox container so the container's root can
+    delete files that a previous container bind-mounted in as root (e.g. Rust
+    target dirs built inside the workspace's dev-environment). Returns True on
+    success. No-op if docker isn't available."""
+    if shutil.which("docker") is None:
+        return False
+    parent = path.resolve().parent
+    name = path.name
+    r = subprocess.run(
+        ["docker", "run", "--rm",
+         "-v", f"{parent}:/p",
+         "busybox", "rm", "-rf", f"/p/{name}"],
+        capture_output=True, text=True,
+    )
+    if r.returncode != 0:
+        sys.stderr.write(f"luv: docker rm fallback failed for {path}: {r.stderr.strip()}\n")
+        return False
+    return not path.exists()
+
+
+def _force_rmtree(path: Path) -> None:
+    """rmtree that survives read-only files (chmod-and-retry) and root-owned
+    files left behind by Docker bind-mounts (containerized rm -rf fallback)."""
+    kwargs = {"onexc": _on_rm_error} if sys.version_info >= (3, 12) else {"onerror": _on_rm_error}
+    try:
+        shutil.rmtree(path, **kwargs)
+    except PermissionError:
+        if not _docker_wipe(path):
+            raise
+
+
 def cmd_clean(force: bool = False, safe: bool = False) -> None:
     """Scan ~/prs/ and delete fully-pushed, clean work folders."""
     if not PRS_DIR.exists():
@@ -421,7 +465,7 @@ def cmd_clean(force: bool = False, safe: bool = False) -> None:
             if safe and (now - entry.stat().st_mtime) < SAFE_AGE_SECONDS:
                 skipped.append((entry.name, "younger than 24h (--safe)"))
                 continue
-            shutil.rmtree(entry)
+            _force_rmtree(entry)
             cleaned.append(entry.name)
             continue
 
@@ -464,7 +508,7 @@ def cmd_clean(force: bool = False, safe: bool = False) -> None:
             if local_sha != pr_head_sha:
                 skipped.append((entry.name, "local HEAD differs from merged PR head"))
                 continue
-            shutil.rmtree(entry)
+            _force_rmtree(entry)
             cleaned.append(entry.name)
             continue
 
@@ -474,7 +518,7 @@ def cmd_clean(force: bool = False, safe: bool = False) -> None:
             skipped.append((entry.name, "unpushed commits"))
             continue
 
-        shutil.rmtree(entry)
+        _force_rmtree(entry)
         cleaned.append(entry.name)
 
     if skipped:

{luv_cli-0.0.18 → luv_cli-0.0.20}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "luv-cli"
-version = "0.0.18"
+version = "0.0.20"
 description = "Launch Claude Code agents on GitHub repos with isolated workspaces and optional Docker dev environments"
 requires-python = ">=3.10"
 license = "MIT"