[luv-24] Add -m MODEL flag to select claude model (#24)

* [luv-24] Add -m MODEL flag to select claude model

Previously the model was hardcoded to claude-opus-4-7. Pass -m sonnet
(or any value claude --model accepts) to override per invocation;
default is unchanged.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* [luv-24] Address CodeRabbit review

- Reject repeated -m flags so a stray second -m can't fall through and
  be treated as positional input.
- Replace mutable extra_env={} defaults with None + local init in the
  four signatures touched by this PR (resume, launch, open_existing,
  open_pr) to avoid the shared-dict-instance footgun.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* Bump to 0.0.18

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* [luv-24] Reject flag-like -m values

Previously 'luv -m -r myrepo' would swallow -r as the model name and
silently drop the flag. Validate that the value is non-empty and does
not start with a hyphen.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>

Author: NiveditJain

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/__init__.py

@@ -316,8 +316,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 +332,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 +345,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]
@@ -504,8 +508,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 +520,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 +547,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 +563,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 +590,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 +605,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 +631,7 @@ def main() -> None:
   -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 +677,7 @@ def main() -> None:
             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 +697,14 @@ def main() -> None:
             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 +719,7 @@ def main() -> None:
         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 +771,6 @@ def _latest(endpoint: str) -> int:
     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)

pyproject.toml

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