luv-cli 0.0.17__tar.gz → 0.0.19__tar.gz

{luv_cli-0.0.17 → luv_cli-0.0.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: luv-cli
-Version: 0.0.17
+Version: 0.0.19
 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
@@ -97,6 +97,7 @@ All workspaces live under `~/prs/`. The number comes from the repo's GitHub issu
 | `-r` | Resume: resume the last Claude session |
 | `-p` | Launch Claude in plan permission mode (default: `bypassPermissions`) |
 | `-nit` | Non-interactive: run `claude -p <prompt>` and exit (no REPL); streams `stream-json` events to stdout |
+| `-m MODEL` | Claude model to use (default: `claude-opus-4-7`); passed through to `claude --model`, so aliases like `opus`/`sonnet`/`haiku` work |
 | `-e` | Env: pass `LUV_*` environment variables (with prefix stripped) into the session |
 | `-f`, `--force` | Skip safety checks (with `--clean`) |
 | `--safe` | With `--clean -f`, only delete workspaces older than 24h (mtime) |

{luv_cli-0.0.17 → luv_cli-0.0.19}/README.md

@@ -74,6 +74,7 @@ All workspaces live under `~/prs/`. The number comes from the repo's GitHub issu
 | `-r` | Resume: resume the last Claude session |
 | `-p` | Launch Claude in plan permission mode (default: `bypassPermissions`) |
 | `-nit` | Non-interactive: run `claude -p <prompt>` and exit (no REPL); streams `stream-json` events to stdout |
+| `-m MODEL` | Claude model to use (default: `claude-opus-4-7`); passed through to `claude --model`, so aliases like `opus`/`sonnet`/`haiku` work |
 | `-e` | Env: pass `LUV_*` environment variables (with prefix stripped) into the session |
 | `-f`, `--force` | Skip safety checks (with `--clean`) |
 | `--safe` | With `--clean -f`, only delete workspaces older than 24h (mtime) |

{luv_cli-0.0.17 → luv_cli-0.0.19}/luv/__init__.py

@@ -3,6 +3,7 @@ import os
 import random
 import re
 import shutil
+import stat
 import subprocess
 import sys
 import tempfile
@@ -316,8 +317,10 @@ def navigate(clone_dir: Path, extra_env: dict[str, str] = {}) -> None:
         os.execv(shell, [shell])
 
 
-def resume(clone_dir: Path, extra_env: dict[str, str] = {}) -> None:
+def resume(clone_dir: Path, extra_env: dict[str, str] | None = None,
+           model: str = "claude-opus-4-7") -> None:
     """Trust, chdir, and exec claude --resume — replacing this process."""
+    extra_env = extra_env or {}
     trust_project(clone_dir)
     os.chdir(str(clone_dir))
     settings = load_luv_settings(clone_dir)
@@ -330,7 +333,7 @@ def resume(clone_dir: Path, extra_env: dict[str, str] = {}) -> None:
             base = docker_compose_base(clone_dir, compose_file, project)
             r = subprocess.run(base + ["exec", "-it"] + docker_env_flags(extra_env) + ["dev-environment",
                                        "claude", "--dangerously-skip-permissions",
-                                       "--model", "claude-opus-4-7",
+                                       "--model", model,
                                        "--effort", "max", "--resume",
                                        "--remote-control",
                                        "--remote-control-session-name-prefix", clone_dir.name])
@@ -343,21 +346,23 @@ def resume(clone_dir: Path, extra_env: dict[str, str] = {}) -> None:
             die("'claude' not found in PATH")
         os.environ.update(extra_env)
         os.execv(claude_bin, [claude_bin, "--dangerously-skip-permissions",
-                              "--model", "claude-opus-4-7", "--effort", "max", "--resume",
+                              "--model", model, "--effort", "max", "--resume",
                               "--remote-control",
                               "--remote-control-session-name-prefix", clone_dir.name])
 
 
 def launch(clone_dir: Path, prompt: str | None, plan_mode: bool = False,
-           non_interactive: bool = False, extra_env: dict[str, str] = {}) -> None:
+           non_interactive: bool = False, extra_env: dict[str, str] | None = None,
+           model: str = "claude-opus-4-7") -> None:
     """Trust, resolve claude, chdir, and exec — replacing this process."""
+    extra_env = extra_env or {}
     trust_project(clone_dir)
     os.chdir(str(clone_dir))
     settings = load_luv_settings(clone_dir)
     compose_file = (settings or {}).get("compose_file")
 
     common_flags = ["--dangerously-skip-permissions",
-                    "--model", "claude-opus-4-7",
+                    "--model", model,
                     "--effort", "max",
                     "--remote-control",
                     "--remote-control-session-name-prefix", clone_dir.name]
@@ -395,6 +400,23 @@ 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 _force_rmtree(path: Path) -> None:
+    """rmtree that chmods read-only files (e.g. uv's CACHEDIR.TAG) instead of crashing."""
+    kwargs = {"onexc": _on_rm_error} if sys.version_info >= (3, 12) else {"onerror": _on_rm_error}
+    shutil.rmtree(path, **kwargs)
+
+
 def cmd_clean(force: bool = False, safe: bool = False) -> None:
     """Scan ~/prs/ and delete fully-pushed, clean work folders."""
     if not PRS_DIR.exists():
@@ -417,7 +439,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
 
@@ -460,7 +482,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
 
@@ -470,7 +492,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:
@@ -504,8 +526,9 @@ def find_latest_clone(repo: str) -> Path | None:
     return best
 
 
-def open_existing(org: str, repo: str, number: int, prompt: str | None, nav_mode: bool = False, resume_mode: bool = False, plan_mode: bool = False, non_interactive: bool = False, extra_env: dict[str, str] = {}) -> None:
+def open_existing(org: str, repo: str, number: int, prompt: str | None, nav_mode: bool = False, resume_mode: bool = False, plan_mode: bool = False, non_interactive: bool = False, extra_env: dict[str, str] | None = None, model: str = "claude-opus-4-7") -> None:
     """Open an existing work folder or remote branch by number."""
+    extra_env = extra_env or {}
     clone_dir = PRS_DIR / f"{repo}-{number}"
 
     # 1. Local folder takes priority
@@ -515,9 +538,9 @@ def open_existing(org: str, repo: str, number: int, prompt: str | None, nav_mode
         if nav_mode:
             navigate(clone_dir, extra_env=extra_env)
         elif resume_mode:
-            resume(clone_dir, extra_env=extra_env)
+            resume(clone_dir, extra_env=extra_env, model=model)
         else:
-            launch(clone_dir, prompt, plan_mode=plan_mode, non_interactive=non_interactive, extra_env=extra_env)
+            launch(clone_dir, prompt, plan_mode=plan_mode, non_interactive=non_interactive, extra_env=extra_env, model=model)
         return  # unreachable
 
     # 2. Check remote branch luv-{number}
@@ -542,13 +565,14 @@ def open_existing(org: str, repo: str, number: int, prompt: str | None, nav_mode
     if nav_mode:
         navigate(clone_dir, extra_env=extra_env)
     elif resume_mode:
-        resume(clone_dir, extra_env=extra_env)
+        resume(clone_dir, extra_env=extra_env, model=model)
     else:
-        launch(clone_dir, prompt, plan_mode=plan_mode, non_interactive=non_interactive, extra_env=extra_env)
+        launch(clone_dir, prompt, plan_mode=plan_mode, non_interactive=non_interactive, extra_env=extra_env, model=model)
 
 
-def open_pr(org: str, repo: str, number: int, prompt: str | None, nav_mode: bool = False, resume_mode: bool = False, plan_mode: bool = False, non_interactive: bool = False, extra_env: dict[str, str] = {}) -> None:
+def open_pr(org: str, repo: str, number: int, prompt: str | None, nav_mode: bool = False, resume_mode: bool = False, plan_mode: bool = False, non_interactive: bool = False, extra_env: dict[str, str] | None = None, model: str = "claude-opus-4-7") -> None:
     """Open any GitHub PR by org/repo/number, cloning if needed."""
+    extra_env = extra_env or {}
     clone_dir = PRS_DIR / f"{repo}-{number}"
 
     if clone_dir.exists():
@@ -557,9 +581,9 @@ def open_pr(org: str, repo: str, number: int, prompt: str | None, nav_mode: bool
         if nav_mode:
             navigate(clone_dir, extra_env=extra_env)
         elif resume_mode:
-            resume(clone_dir, extra_env=extra_env)
+            resume(clone_dir, extra_env=extra_env, model=model)
         else:
-            launch(clone_dir, prompt, plan_mode=plan_mode, non_interactive=non_interactive, extra_env=extra_env)
+            launch(clone_dir, prompt, plan_mode=plan_mode, non_interactive=non_interactive, extra_env=extra_env, model=model)
         return  # unreachable
 
     # Resolve the actual branch name via GitHub API
@@ -584,9 +608,9 @@ def open_pr(org: str, repo: str, number: int, prompt: str | None, nav_mode: bool
     if nav_mode:
         navigate(clone_dir, extra_env=extra_env)
     elif resume_mode:
-        resume(clone_dir, extra_env=extra_env)
+        resume(clone_dir, extra_env=extra_env, model=model)
     else:
-        launch(clone_dir, prompt, plan_mode=plan_mode, non_interactive=non_interactive, extra_env=extra_env)
+        launch(clone_dir, prompt, plan_mode=plan_mode, non_interactive=non_interactive, extra_env=extra_env, model=model)
 
 
 def main() -> None:
@@ -599,6 +623,20 @@ def main() -> None:
     force = "-f" in args or "--force" in args
     safe = "--safe" in args
     env_mode = "-e" in args
+
+    # -m takes a value, so extract it before the boolean-flag strip below
+    model = "claude-opus-4-7"
+    if args.count("-m") > 1:
+        die("-m may only be provided once")
+    if "-m" in args:
+        idx = args.index("-m")
+        if idx + 1 >= len(args):
+            die("-m requires a model name")
+        model = args[idx + 1].strip()
+        if not model or model.startswith("-"):
+            die("-m requires a model name")
+        args = args[:idx] + args[idx + 2:]
+
     args = [a for a in args if a not in ("-n", "-r", "-e", "-f", "--force", "-p", "-nit", "--safe")]
     extra_env = collect_luv_env() if env_mode else {}
 
@@ -611,6 +649,7 @@ Flags:
   -r            resume: resume the last Claude session in the work folder
   -p            launch Claude in plan permission mode (default: bypassPermissions)
   -nit          non-interactive: run claude -p <prompt> and exit (no REPL)
+  -m MODEL      claude model to use (default: claude-opus-4-7)
   -e            env: pass LUV_* environment variables (with prefix stripped) into the session
   -f, --force   (with --clean) skip safety checks and delete all work folders
   --safe        (with --clean -f) only delete folders older than 24h
@@ -656,7 +695,7 @@ Docker:
             die(f"cannot parse PR URL: {url}")
         org, repo, number = m.group(1), m.group(2), int(m.group(3))
         prompt = " ".join(args[2:]) or None
-        open_pr(org, repo, number, prompt, nav_mode, resume_mode, plan_mode, non_interactive, extra_env=extra_env)
+        open_pr(org, repo, number, prompt, nav_mode, resume_mode, plan_mode, non_interactive, extra_env=extra_env, model=model)
         return
 
     raw = args[0].rstrip("/")
@@ -676,14 +715,14 @@ Docker:
             die(f"expected a PR number after -pr, got '{args[idx + 1]}'")
         prompt_parts = [a for i, a in enumerate(args) if i not in (0, idx, idx + 1)]
         prompt = " ".join(prompt_parts) or None
-        open_pr(resolve_org(explicit_org), repo, number, prompt, nav_mode, resume_mode, plan_mode, non_interactive, extra_env=extra_env)
+        open_pr(resolve_org(explicit_org), repo, number, prompt, nav_mode, resume_mode, plan_mode, non_interactive, extra_env=extra_env, model=model)
         return
 
     # Detect optional numeric second argument
     if len(args) > 1 and args[1].isdigit():
         number = int(args[1])
         prompt = " ".join(args[2:]) or None
-        open_existing(resolve_org(explicit_org), repo, number, prompt, nav_mode, resume_mode, plan_mode, non_interactive, extra_env=extra_env)
+        open_existing(resolve_org(explicit_org), repo, number, prompt, nav_mode, resume_mode, plan_mode, non_interactive, extra_env=extra_env, model=model)
         return
 
     org = resolve_org(explicit_org)
@@ -698,7 +737,7 @@ Docker:
         if nav_mode:
             navigate(clone_dir, extra_env=extra_env)
         else:
-            resume(clone_dir, extra_env=extra_env)
+            resume(clone_dir, extra_env=extra_env, model=model)
         return
 
     # 1. Verify repo exists
@@ -750,6 +789,6 @@ Docker:
     if nav_mode:
         navigate(clone_dir, extra_env=extra_env)
     elif resume_mode:
-        resume(clone_dir, extra_env=extra_env)
+        resume(clone_dir, extra_env=extra_env, model=model)
     else:
-        launch(clone_dir, prompt, plan_mode=plan_mode, non_interactive=non_interactive, extra_env=extra_env)
+        launch(clone_dir, prompt, plan_mode=plan_mode, non_interactive=non_interactive, extra_env=extra_env, model=model)

{luv_cli-0.0.17 → luv_cli-0.0.19}/pyproject.toml

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