luv-cli 0.0.22__tar.gz → 0.0.24__tar.gz

{luv_cli-0.0.22 → luv_cli-0.0.24}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: luv-cli
-Version: 0.0.22
-Summary: Launch Claude Code agents on GitHub repos with isolated workspaces and optional Docker dev environments
+Version: 0.0.24
+Summary: Launch Claude Code or Codex 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
 Project-URL: Issues, https://github.com/exospherehost/luv/issues
 License-Expression: MIT
 License-File: LICENSE
-Keywords: agent,ai,claude,cli,docker,github
+Keywords: agent,ai,claude,cli,codex,docker,github
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
@@ -23,7 +23,7 @@ Description-Content-Type: text/markdown
 
 # luv
 
-A CLI that launches [Claude Code](https://docs.anthropic.com/en/docs/claude-code) agents on GitHub repos with isolated workspaces and optional Docker dev environments.
+A CLI that launches Claude Code or Codex agents on GitHub repos with isolated workspaces and optional Docker dev environments.
 
 `luv` clones a repo, creates a branch, and drops you into a Claude session ready to work. When the repo ships a `.luv/settings.json`, it spins up Docker Compose automatically so every command runs in the right environment.
 
@@ -37,7 +37,7 @@ uv tool install luv-cli
 pip install luv-cli
 ```
 
-**Requirements:** [Claude Code](https://docs.anthropic.com/en/docs/claude-code) CLI and [GitHub CLI](https://cli.github.com/) (`gh`) must be installed and authenticated.
+**Requirements:** [GitHub CLI](https://cli.github.com/) (`gh`) plus either Claude Code or Codex must be installed and authenticated.
 
 ## Quick start
 
@@ -48,6 +48,15 @@ luv --init
 # Create a new workspace and launch Claude
 luv my-repo "add user authentication"
 
+# Launch Codex in YOLO mode instead
+luv --codex my-repo "add user authentication"
+
+# Select Claude explicitly (Claude remains the default)
+luv --claude my-repo "add user authentication"
+
+# Base a new workspace off a non-default branch
+luv my-repo -b develop "add user authentication"
+
 # Use a different org inline
 luv other-org/my-repo "fix the bug"
 
@@ -71,8 +80,8 @@ luv --clean
 
 1. Clones the repo into `~/prs/{repo}-{number}/`
 2. Creates a new branch `luv-{number}`
-3. Trusts the project in Claude Code config
-4. Launches Claude with Opus 4.8 at max effort
+3. Configures the selected agent with the workspace's PR conventions
+4. Launches Claude with Opus 4.8 at max effort, or Codex in YOLO mode
 
 All workspaces live under `~/prs/`. The number comes from the repo's GitHub issue counter to avoid collisions.
 
@@ -81,7 +90,9 @@ All workspaces live under `~/prs/`. The number comes from the repo's GitHub issu
 | Command | Description |
 |---------|-------------|
 | `luv --init` | Configure default GitHub org |
-| `luv [org/]<repo> [prompt...]` | Create a new workspace and launch Claude |
+| `luv [org/]<repo> [prompt...]` | Create a new workspace and launch Claude (default) |
+| `luv --codex [org/]<repo> [prompt...]` | Create a workspace and launch Codex in YOLO mode |
+| `luv [org/]<repo> -b <branch> [prompt...]` | Create a workspace based off `<branch>` instead of the default |
 | `luv [org/]<repo> <number> [prompt]` | Reopen an existing workspace |
 | `luv -l <PR URL> [prompt]` | Open any GitHub PR by URL |
 | `luv [org/]<repo> -pr <number> [prompt]` | Open a PR by repo + number |
@@ -93,11 +104,14 @@ All workspaces live under `~/prs/`. The number comes from the repo's GitHub issu
 
 | Flag | Description |
 |------|-------------|
+| `--claude` | Launch Claude Code (default) |
+| `--codex` | Launch Codex with approvals and sandboxing bypassed (YOLO mode) |
 | `-n` | Navigate: open a shell instead of Claude |
-| `-r` | Resume: resume the last Claude session |
+| `-r` | Resume: resume the selected agent's last 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-8`); passed through to `claude --model`, so aliases like `opus`/`sonnet`/`haiku` work |
+| `-nit` | Non-interactive: run the selected agent and exit (no REPL); Claude streams `stream-json` events to stdout |
+| `-m MODEL` | Model to use; Claude defaults to `claude-opus-4-8`, while Codex uses its configured CLI default |
+| `-b BRANCH` | Base a new workspace off `BRANCH` (clone + branch from it); recorded in `git config luv.base` so the PR can target it |
 | `-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) |
@@ -138,7 +152,7 @@ services:
       POSTGRES_PASSWORD: dev
 ```
 
-The `dev-environment` service **must** have [Claude Code](https://docs.anthropic.com/en/docs/claude-code) installed in its image.
+The `dev-environment` service **must** have the selected agent CLI (`claude` or `codex`) installed in its image.
 
 ### How Docker mode works
 
@@ -146,7 +160,7 @@ The `dev-environment` service **must** have [Claude Code](https://docs.anthropic
 2. Tears down any stale environment from a previous run
 3. Starts `docker compose up -d --build` with a unique project name (`luv-{repo}-{number}`) for network/volume isolation
 4. Verifies the `dev-environment` service is running
-5. Runs Claude inside the container via `docker compose exec`
+5. Runs the selected agent inside the container via `docker compose exec`
 6. The repo is volume-mounted, so all file changes and git commits are visible on the host
 7. On exit (including Ctrl-C), tears down the environment with `docker compose down -v`
 

{luv_cli-0.0.22 → luv_cli-0.0.24}/README.md

@@ -1,6 +1,6 @@
 # luv
 
-A CLI that launches [Claude Code](https://docs.anthropic.com/en/docs/claude-code) agents on GitHub repos with isolated workspaces and optional Docker dev environments.
+A CLI that launches Claude Code or Codex agents on GitHub repos with isolated workspaces and optional Docker dev environments.
 
 `luv` clones a repo, creates a branch, and drops you into a Claude session ready to work. When the repo ships a `.luv/settings.json`, it spins up Docker Compose automatically so every command runs in the right environment.
 
@@ -14,7 +14,7 @@ uv tool install luv-cli
 pip install luv-cli
 ```
 
-**Requirements:** [Claude Code](https://docs.anthropic.com/en/docs/claude-code) CLI and [GitHub CLI](https://cli.github.com/) (`gh`) must be installed and authenticated.
+**Requirements:** [GitHub CLI](https://cli.github.com/) (`gh`) plus either Claude Code or Codex must be installed and authenticated.
 
 ## Quick start
 
@@ -25,6 +25,15 @@ luv --init
 # Create a new workspace and launch Claude
 luv my-repo "add user authentication"
 
+# Launch Codex in YOLO mode instead
+luv --codex my-repo "add user authentication"
+
+# Select Claude explicitly (Claude remains the default)
+luv --claude my-repo "add user authentication"
+
+# Base a new workspace off a non-default branch
+luv my-repo -b develop "add user authentication"
+
 # Use a different org inline
 luv other-org/my-repo "fix the bug"
 
@@ -48,8 +57,8 @@ luv --clean
 
 1. Clones the repo into `~/prs/{repo}-{number}/`
 2. Creates a new branch `luv-{number}`
-3. Trusts the project in Claude Code config
-4. Launches Claude with Opus 4.8 at max effort
+3. Configures the selected agent with the workspace's PR conventions
+4. Launches Claude with Opus 4.8 at max effort, or Codex in YOLO mode
 
 All workspaces live under `~/prs/`. The number comes from the repo's GitHub issue counter to avoid collisions.
 
@@ -58,7 +67,9 @@ All workspaces live under `~/prs/`. The number comes from the repo's GitHub issu
 | Command | Description |
 |---------|-------------|
 | `luv --init` | Configure default GitHub org |
-| `luv [org/]<repo> [prompt...]` | Create a new workspace and launch Claude |
+| `luv [org/]<repo> [prompt...]` | Create a new workspace and launch Claude (default) |
+| `luv --codex [org/]<repo> [prompt...]` | Create a workspace and launch Codex in YOLO mode |
+| `luv [org/]<repo> -b <branch> [prompt...]` | Create a workspace based off `<branch>` instead of the default |
 | `luv [org/]<repo> <number> [prompt]` | Reopen an existing workspace |
 | `luv -l <PR URL> [prompt]` | Open any GitHub PR by URL |
 | `luv [org/]<repo> -pr <number> [prompt]` | Open a PR by repo + number |
@@ -70,11 +81,14 @@ All workspaces live under `~/prs/`. The number comes from the repo's GitHub issu
 
 | Flag | Description |
 |------|-------------|
+| `--claude` | Launch Claude Code (default) |
+| `--codex` | Launch Codex with approvals and sandboxing bypassed (YOLO mode) |
 | `-n` | Navigate: open a shell instead of Claude |
-| `-r` | Resume: resume the last Claude session |
+| `-r` | Resume: resume the selected agent's last 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-8`); passed through to `claude --model`, so aliases like `opus`/`sonnet`/`haiku` work |
+| `-nit` | Non-interactive: run the selected agent and exit (no REPL); Claude streams `stream-json` events to stdout |
+| `-m MODEL` | Model to use; Claude defaults to `claude-opus-4-8`, while Codex uses its configured CLI default |
+| `-b BRANCH` | Base a new workspace off `BRANCH` (clone + branch from it); recorded in `git config luv.base` so the PR can target it |
 | `-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) |
@@ -115,7 +129,7 @@ services:
       POSTGRES_PASSWORD: dev
 ```
 
-The `dev-environment` service **must** have [Claude Code](https://docs.anthropic.com/en/docs/claude-code) installed in its image.
+The `dev-environment` service **must** have the selected agent CLI (`claude` or `codex`) installed in its image.
 
 ### How Docker mode works
 
@@ -123,7 +137,7 @@ The `dev-environment` service **must** have [Claude Code](https://docs.anthropic
 2. Tears down any stale environment from a previous run
 3. Starts `docker compose up -d --build` with a unique project name (`luv-{repo}-{number}`) for network/volume isolation
 4. Verifies the `dev-environment` service is running
-5. Runs Claude inside the container via `docker compose exec`
+5. Runs the selected agent inside the container via `docker compose exec`
 6. The repo is volume-mounted, so all file changes and git commits are visible on the host
 7. On exit (including Ctrl-C), tears down the environment with `docker compose down -v`
 

{luv_cli-0.0.22 → luv_cli-0.0.24}/luv/__init__.py

@@ -15,6 +15,7 @@ CONFIG_FILE = LUV_DIR / "config.json"
 PRS_DIR = Path.home() / "prs"
 CLAUDE_JSON = Path.home() / ".claude.json"
 CLAUDE_SETTINGS_JSON = Path.home() / ".claude" / "settings.json"
+CODEX_AGENTS_MD = Path(os.environ.get("CODEX_HOME", Path.home() / ".codex")) / "AGENTS.md"
 
 COLORS = ["red", "blue", "green", "yellow", "purple", "orange", "pink", "cyan", "default"]
 
@@ -147,13 +148,14 @@ def docker_env_flags(env_vars: dict[str, str]) -> list[str]:
     return flags
 
 
-def ensure_pr_rules() -> None:
-    claude_dir = Path.home() / ".claude"
-    claude_md = claude_dir / "CLAUDE.md"
-    claude_dir.mkdir(parents=True, exist_ok=True)
-    existing = claude_md.read_text() if claude_md.exists() else ""
+def ensure_pr_rules(agent: str = "claude") -> None:
+    """Install the workspace/PR convention for the selected agent."""
+    instructions_file = (Path.home() / ".claude" / "CLAUDE.md"
+                         if agent == "claude" else CODEX_AGENTS_MD)
+    instructions_file.parent.mkdir(parents=True, exist_ok=True)
+    existing = instructions_file.read_text() if instructions_file.exists() else ""
     if "# Pull Request Management" not in existing:
-        with claude_md.open("a") as f:
+        with instructions_file.open("a") as f:
             f.write(PR_RULES)
 
 
@@ -318,83 +320,106 @@ def navigate(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-8") -> None:
-    """Trust, chdir, and exec claude --resume — replacing this process."""
+           model: str | None = None, agent: str = "claude") -> None:
+    """Chdir and resume the selected agent, replacing this process."""
     extra_env = extra_env or {}
-    trust_project(clone_dir)
+    if agent == "claude":
+        trust_project(clone_dir)
     os.chdir(str(clone_dir))
     settings = load_luv_settings(clone_dir)
     compose_file = (settings or {}).get("compose_file")
 
+    if agent == "claude":
+        agent_cmd = ["claude", "--dangerously-skip-permissions",
+                     "--model", model or "claude-opus-4-8",
+                     "--effort", "max", "--resume",
+                     "--remote-control",
+                     "--remote-control-session-name-prefix", clone_dir.name]
+    else:
+        agent_cmd = ["codex", "resume", "--last",
+                     "--dangerously-bypass-approvals-and-sandbox"]
+        if model:
+            agent_cmd += ["--model", model]
+
     if compose_file:
         project = docker_project_name(clone_dir)
         start_docker(clone_dir, compose_file, project)
         try:
             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", model,
-                                       "--effort", "max", "--resume",
-                                       "--remote-control",
-                                       "--remote-control-session-name-prefix", clone_dir.name])
+            r = subprocess.run(base + ["exec", "-it"] + docker_env_flags(extra_env)
+                               + ["dev-environment"] + agent_cmd)
             sys.exit(r.returncode)
         finally:
             stop_docker(clone_dir, compose_file, project)
     else:
-        claude_bin = shutil.which("claude")
-        if not claude_bin:
-            die("'claude' not found in PATH")
+        agent_bin = shutil.which(agent)
+        if not agent_bin:
+            die(f"'{agent}' not found in PATH")
         os.environ.update(extra_env)
-        os.execv(claude_bin, [claude_bin, "--dangerously-skip-permissions",
-                              "--model", model, "--effort", "max", "--resume",
-                              "--remote-control",
-                              "--remote-control-session-name-prefix", clone_dir.name])
+        os.execv(agent_bin, [agent_bin] + agent_cmd[1:])
 
 
 def launch(clone_dir: Path, prompt: str | None, plan_mode: bool = False,
            non_interactive: bool = False, extra_env: dict[str, str] | None = None,
-           model: str = "claude-opus-4-8") -> None:
-    """Trust, resolve claude, chdir, and exec — replacing this process."""
+           model: str | None = None, agent: str = "claude") -> None:
+    """Resolve and launch the selected agent, replacing this process."""
     extra_env = extra_env or {}
-    trust_project(clone_dir)
+    if agent == "claude":
+        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", model,
+    if agent == "codex":
+        if plan_mode:
+            die("-p is only supported with Claude")
+        agent_cmd = ["codex"]
+        if non_interactive:
+            if not prompt:
+                die("-nit requires a prompt")
+            agent_cmd += ["exec", "--dangerously-bypass-approvals-and-sandbox"]
+        else:
+            agent_cmd += ["--dangerously-bypass-approvals-and-sandbox"]
+        if model:
+            agent_cmd += ["--model", model]
+        if prompt:
+            agent_cmd.append(prompt)
+    else:
+        common_flags = ["--dangerously-skip-permissions",
+                    "--model", model or "claude-opus-4-8",
                     "--effort", "max",
                     "--remote-control",
                     "--remote-control-session-name-prefix", clone_dir.name]
-    if non_interactive:
-        if not prompt:
-            die("-nit requires a prompt")
-        mode_flags = ["--output-format", "stream-json",
-                      "--verbose", "--include-partial-messages"]
-        initial_args = ["-p", prompt]
-    elif plan_mode:
-        mode_flags = ["--permission-mode", "plan"]
-        initial_args = [prompt] if prompt else [f"/color {pick_color()}"]
-    else:
-        mode_flags = ["--permission-mode", "bypassPermissions"]
-        initial_args = [prompt] if prompt else [f"/color {pick_color()}"]
+        if non_interactive:
+            if not prompt:
+                die("-nit requires a prompt")
+            mode_flags = ["--output-format", "stream-json",
+                          "--verbose", "--include-partial-messages"]
+            initial_args = ["-p", prompt]
+        elif plan_mode:
+            mode_flags = ["--permission-mode", "plan"]
+            initial_args = [prompt] if prompt else [f"/color {pick_color()}"]
+        else:
+            mode_flags = ["--permission-mode", "bypassPermissions"]
+            initial_args = [prompt] if prompt else [f"/color {pick_color()}"]
+        agent_cmd = ["claude"] + common_flags + mode_flags + initial_args
 
     if compose_file:
         project = docker_project_name(clone_dir)
         start_docker(clone_dir, compose_file, project)
         try:
             base = docker_compose_base(clone_dir, compose_file, project)
-            claude_cmd = ["claude"] + common_flags + mode_flags + initial_args
-            r = subprocess.run(base + ["exec", "-it"] + docker_env_flags(extra_env) + ["dev-environment"] + claude_cmd)
+            r = subprocess.run(base + ["exec", "-it"] + docker_env_flags(extra_env)
+                               + ["dev-environment"] + agent_cmd)
             sys.exit(r.returncode)
         finally:
             stop_docker(clone_dir, compose_file, project)
     else:
-        claude_bin = shutil.which("claude")
-        if not claude_bin:
-            die("'claude' not found in PATH")
+        agent_bin = shutil.which(agent)
+        if not agent_bin:
+            die(f"'{agent}' not found in PATH")
         os.environ.update(extra_env)
-        os.execv(claude_bin, [claude_bin] + common_flags + mode_flags + initial_args)
+        os.execv(agent_bin, [agent_bin] + agent_cmd[1:])
 
 
 SAFE_AGE_SECONDS = 24 * 3600
@@ -552,7 +577,7 @@ 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 = None, model: str = "claude-opus-4-8") -> 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 | None = None, agent: str = "claude") -> None:
     """Open an existing work folder or remote branch by number."""
     extra_env = extra_env or {}
     clone_dir = PRS_DIR / f"{repo}-{number}"
@@ -560,13 +585,13 @@ def open_existing(org: str, repo: str, number: int, prompt: str | None, nav_mode
     # 1. Local folder takes priority
     if clone_dir.exists():
         print(f"luv: opening existing folder {clone_dir.name}")
-        ensure_pr_rules()
+        ensure_pr_rules(agent)
         if nav_mode:
             navigate(clone_dir, extra_env=extra_env)
         elif resume_mode:
-            resume(clone_dir, extra_env=extra_env, model=model)
+            resume(clone_dir, extra_env=extra_env, model=model, agent=agent)
         else:
-            launch(clone_dir, prompt, plan_mode=plan_mode, non_interactive=non_interactive, extra_env=extra_env, model=model)
+            launch(clone_dir, prompt, plan_mode=plan_mode, non_interactive=non_interactive, extra_env=extra_env, model=model, agent=agent)
         return  # unreachable
 
     # 2. Check remote branch luv-{number}
@@ -587,29 +612,29 @@ def open_existing(org: str, repo: str, number: int, prompt: str | None, nav_mode
         die(f"git checkout {branch} failed (exit {r.returncode})")
 
     print(f"luv: ready — {clone_dir.name}, branch {branch}")
-    ensure_pr_rules()
+    ensure_pr_rules(agent)
     if nav_mode:
         navigate(clone_dir, extra_env=extra_env)
     elif resume_mode:
-        resume(clone_dir, extra_env=extra_env, model=model)
+        resume(clone_dir, extra_env=extra_env, model=model, agent=agent)
     else:
-        launch(clone_dir, prompt, plan_mode=plan_mode, non_interactive=non_interactive, extra_env=extra_env, model=model)
+        launch(clone_dir, prompt, plan_mode=plan_mode, non_interactive=non_interactive, extra_env=extra_env, model=model, agent=agent)
 
 
-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-8") -> 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 | None = None, agent: str = "claude") -> 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():
         print(f"luv: opening existing folder {clone_dir.name}")
-        ensure_pr_rules()
+        ensure_pr_rules(agent)
         if nav_mode:
             navigate(clone_dir, extra_env=extra_env)
         elif resume_mode:
-            resume(clone_dir, extra_env=extra_env, model=model)
+            resume(clone_dir, extra_env=extra_env, model=model, agent=agent)
         else:
-            launch(clone_dir, prompt, plan_mode=plan_mode, non_interactive=non_interactive, extra_env=extra_env, model=model)
+            launch(clone_dir, prompt, plan_mode=plan_mode, non_interactive=non_interactive, extra_env=extra_env, model=model, agent=agent)
         return  # unreachable
 
     # Resolve the actual branch name via GitHub API
@@ -630,13 +655,13 @@ def open_pr(org: str, repo: str, number: int, prompt: str | None, nav_mode: bool
         die(f"git checkout {branch} failed (exit {r.returncode})")
 
     print(f"luv: ready — {clone_dir.name}, branch {branch}")
-    ensure_pr_rules()
+    ensure_pr_rules(agent)
     if nav_mode:
         navigate(clone_dir, extra_env=extra_env)
     elif resume_mode:
-        resume(clone_dir, extra_env=extra_env, model=model)
+        resume(clone_dir, extra_env=extra_env, model=model, agent=agent)
     else:
-        launch(clone_dir, prompt, plan_mode=plan_mode, non_interactive=non_interactive, extra_env=extra_env, model=model)
+        launch(clone_dir, prompt, plan_mode=plan_mode, non_interactive=non_interactive, extra_env=extra_env, model=model, agent=agent)
 
 
 def main() -> None:
@@ -650,8 +675,14 @@ def main() -> None:
     safe = "--safe" in args
     env_mode = "-e" in args
 
+    if "--claude" in args and "--codex" in args:
+        die("--claude and --codex are mutually exclusive")
+    agent = "codex" if "--codex" in args else "claude"
+    if agent == "codex" and plan_mode:
+        die("-p is only supported with Claude")
+
     # -m takes a value, so extract it before the boolean-flag strip below
-    model = "claude-opus-4-8"
+    model = None
     if args.count("-m") > 1:
         die("-m may only be provided once")
     if "-m" in args:
@@ -663,7 +694,20 @@ def main() -> None:
             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")]
+    # -b takes a value (base branch); extract before the boolean-flag strip below.
+    base = None
+    if args.count("-b") > 1:
+        die("-b may only be provided once")
+    if "-b" in args:
+        idx = args.index("-b")
+        if idx + 1 >= len(args):
+            die("-b requires a branch name")
+        base = args[idx + 1].strip()
+        if not base or base.startswith("-"):
+            die("-b requires a branch 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", "--claude", "--codex")]
     extra_env = collect_luv_env() if env_mode else {}
 
     if not args or args[0] in ("-h", "--help"):
@@ -671,11 +715,14 @@ def main() -> None:
 Usage: luv [flags] <command>
 
 Flags:
-  -n            navigate: open a shell in the work folder instead of launching Claude
-  -r            resume: resume the last Claude session in the work folder
+  --claude      launch Claude Code (default)
+  --codex       launch Codex in YOLO mode (no approvals or sandbox)
+  -n            navigate: open a shell instead of launching an agent
+  -r            resume: resume the selected agent's last session
   -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-8)
+  -nit          non-interactive: run the selected agent and exit (no REPL)
+  -m MODEL      model to use (Claude default: claude-opus-4-8; Codex: CLI default)
+  -b BRANCH     base a new workspace off BRANCH (clone + branch from it; recorded in git config luv.base)
   -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
@@ -683,11 +730,12 @@ Flags:
 Commands:
   luv --init                              configure default GitHub org
   luv [org/]<repo> [prompt...]            create a new PR workspace
+  luv [org/]<repo> -b <branch> [prompt]   create a workspace based off <branch>
   luv [org/]<repo> <number> [prompt]      reopen an existing work folder by number
   luv -l <PR URL> [prompt]                open any GitHub PR by URL
   luv [org/]<repo> -pr <number> [prompt]  open a GitHub PR by repo + number
   luv [org/]<repo> -n                     open shell in latest local clone
-  luv [org/]<repo> -r                     resume Claude in latest local clone
+  luv [org/]<repo> -r                     resume the selected agent in latest local clone
   luv --clean [-f] [--safe]               delete fully-pushed work folders
 
 Org resolution:
@@ -696,13 +744,26 @@ Org resolution:
 
 Docker:
   If the repo contains .luv/settings.json with a "compose_file" key,
-  luv starts a Docker Compose environment and runs Claude inside the
+  luv starts a Docker Compose environment and runs the selected agent inside the
   "dev-environment" service. Torn down automatically on exit.""")
         sys.exit(0)
 
     if safe and (args[0] != "--clean" or not force):
         die("--safe only works with --clean -f")
 
+    # -b only makes sense when creating a NEW workspace; reject it on every path
+    # that early-returns without cloning+branching from scratch.
+    if base is not None:
+        is_reopen_by_number = len(args) > 1 and args[1].isdigit()
+        opens_latest_local = (nav_mode or resume_mode) and len(args) == 1
+        if (args[0] in ("--clean", "--init", "-l")
+                or "-pr" in args
+                or is_reopen_by_number
+                or opens_latest_local):
+            die("-b only applies when creating a new workspace "
+                "(luv [org/]<repo> [prompt...]); it cannot be combined with "
+                "--clean, --init, -l, -pr, reopen-by-number, or bare -n/-r")
+
     if args[0] == "--clean":
         cmd_clean(force=force, safe=safe)
         return
@@ -721,7 +782,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, model=model)
+        open_pr(org, repo, number, prompt, nav_mode, resume_mode, plan_mode, non_interactive, extra_env=extra_env, model=model, agent=agent)
         return
 
     raw = args[0].rstrip("/")
@@ -741,14 +802,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, model=model)
+        open_pr(resolve_org(explicit_org), repo, number, prompt, nav_mode, resume_mode, plan_mode, non_interactive, extra_env=extra_env, model=model, agent=agent)
         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, model=model)
+        open_existing(resolve_org(explicit_org), repo, number, prompt, nav_mode, resume_mode, plan_mode, non_interactive, extra_env=extra_env, model=model, agent=agent)
         return
 
     org = resolve_org(explicit_org)
@@ -763,7 +824,8 @@ Docker:
         if nav_mode:
             navigate(clone_dir, extra_env=extra_env)
         else:
-            resume(clone_dir, extra_env=extra_env, model=model)
+            ensure_pr_rules(agent)
+            resume(clone_dir, extra_env=extra_env, model=model, agent=agent)
         return
 
     # 1. Verify repo exists
@@ -771,6 +833,14 @@ Docker:
     if r.returncode != 0:
         die(f"repo '{org}/{repo}' not found or gh auth failed.\n{r.stderr.strip()}")
 
+    clone_url = f"https://github.com/{org}/{repo}"
+
+    # 1b. If a base branch was requested, verify it exists before cloning.
+    if base is not None:
+        r = run(["git", "ls-remote", "--heads", clone_url, base])
+        if r.returncode != 0 or f"refs/heads/{base}" not in r.stdout:
+            die(f"base branch '{base}' not found on {org}/{repo}")
+
     # 2. Get latest issue/PR number (shared counter on GitHub).
     # /issues is documented to include PRs but in practice returns [] for repos
     # with no plain issues, so query both endpoints and take the max.
@@ -791,23 +861,34 @@ Docker:
         candidate += 1
     clone_dir = PRS_DIR / f"{repo}-{candidate}"
 
-    # 4. Clone
-    clone_url = f"https://github.com/{org}/{repo}"
-    print(f"luv: cloning {clone_url} -> {clone_dir}")
-    r = subprocess.run(["git", "clone", clone_url, str(clone_dir)])
+    # 4. Clone (off the base branch when -b was given)
+    print(f"luv: cloning {clone_url} -> {clone_dir}" + (f" (base {base})" if base else ""))
+    clone_cmd = ["git", "clone"]
+    if base is not None:
+        clone_cmd += ["--branch", base]
+    clone_cmd += [clone_url, str(clone_dir)]
+    r = subprocess.run(clone_cmd)
     if r.returncode != 0:
         die(f"git clone failed (exit {r.returncode})")
 
-    # 5. Create branch
+    # 5. Create branch off the cloned HEAD (= base when -b was given, else default)
     branch = f"luv-{candidate}"
     print(f"luv: creating branch {branch}")
     r = subprocess.run(["git", "checkout", "-b", branch], cwd=str(clone_dir))
     if r.returncode != 0:
         die(f"git checkout -b failed (exit {r.returncode})")
 
+    # 5b. Record the base so the eventual PR can target it (local .git/config only).
+    if base is not None:
+        r = run(["git", "config", "luv.base", base], cwd=str(clone_dir))
+        if r.returncode != 0:
+            print(f"luv: warning: could not record base branch ({r.stderr.strip()})",
+                  file=sys.stderr)
+
     # 6. Ensure PR rules in ~/.claude/CLAUDE.md and bypass-permissions default
-    ensure_pr_rules()
-    ensure_default_permission_mode()
+    ensure_pr_rules(agent)
+    if agent == "claude":
+        ensure_default_permission_mode()
 
     print(f"luv: ready — {clone_dir.name}, branch {branch}")
 
@@ -815,6 +896,6 @@ Docker:
     if nav_mode:
         navigate(clone_dir, extra_env=extra_env)
     elif resume_mode:
-        resume(clone_dir, extra_env=extra_env, model=model)
+        resume(clone_dir, extra_env=extra_env, model=model, agent=agent)
     else:
-        launch(clone_dir, prompt, plan_mode=plan_mode, non_interactive=non_interactive, extra_env=extra_env, model=model)
+        launch(clone_dir, prompt, plan_mode=plan_mode, non_interactive=non_interactive, extra_env=extra_env, model=model, agent=agent)

{luv_cli-0.0.22 → luv_cli-0.0.24}/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "hatchling.build"
 
 [project]
 name = "luv-cli"
-version = "0.0.22"
-description = "Launch Claude Code agents on GitHub repos with isolated workspaces and optional Docker dev environments"
+version = "0.0.24"
+description = "Launch Claude Code or Codex agents on GitHub repos with isolated workspaces and optional Docker dev environments"
 requires-python = ">=3.10"
 license = "MIT"
 dependencies = []
 readme = "README.md"
-keywords = ["claude", "cli", "github", "ai", "agent", "docker"]
+keywords = ["claude", "codex", "cli", "github", "ai", "agent", "docker"]
 classifiers = [
     "Development Status :: 4 - Beta",
     "Environment :: Console",

luv_cli-0.0.24/tests/test_agents.py

@@ -0,0 +1,74 @@
+import tempfile
+import unittest
+import sys
+from pathlib import Path
+from unittest.mock import patch
+
+import luv
+
+
+class AgentLaunchTests(unittest.TestCase):
+    def setUp(self):
+        self.tempdir = tempfile.TemporaryDirectory()
+        self.clone_dir = Path(self.tempdir.name)
+
+    def tearDown(self):
+        self.tempdir.cleanup()
+
+    def _exec_args(self, func, *args, **kwargs):
+        with (patch.object(luv, "trust_project"),
+              patch.object(luv, "load_luv_settings", return_value=None),
+              patch.object(luv.shutil, "which", side_effect=lambda name: f"/bin/{name}"),
+              patch.object(luv.os, "chdir"),
+              patch.object(luv.os, "execv") as execv):
+            func(*args, **kwargs)
+        return execv.call_args.args
+
+    def test_codex_launch_uses_yolo_mode(self):
+        executable, argv = self._exec_args(
+            luv.launch, self.clone_dir, "fix it", agent="codex")
+
+        self.assertEqual(executable, "/bin/codex")
+        self.assertEqual(argv, [
+            "/bin/codex",
+            "--dangerously-bypass-approvals-and-sandbox",
+            "fix it",
+        ])
+
+    def test_codex_non_interactive_uses_exec(self):
+        _, argv = self._exec_args(
+            luv.launch, self.clone_dir, "fix it", agent="codex",
+            non_interactive=True, model="gpt-5")
+
+        self.assertEqual(argv, [
+            "/bin/codex", "exec",
+            "--dangerously-bypass-approvals-and-sandbox",
+            "--model", "gpt-5", "fix it",
+        ])
+
+    def test_codex_resume_uses_last_session_in_yolo_mode(self):
+        _, argv = self._exec_args(
+            luv.resume, self.clone_dir, agent="codex")
+
+        self.assertEqual(argv, [
+            "/bin/codex", "resume", "--last",
+            "--dangerously-bypass-approvals-and-sandbox",
+        ])
+
+    def test_claude_remains_default(self):
+        _, argv = self._exec_args(luv.launch, self.clone_dir, None)
+
+        self.assertEqual(argv[0], "/bin/claude")
+        self.assertIn("claude-opus-4-8", argv)
+        self.assertIn("--dangerously-skip-permissions", argv)
+
+    def test_main_routes_codex_to_existing_workspace(self):
+        with (patch.object(sys, "argv", ["luv", "--codex", "org/repo", "7"]),
+              patch.object(luv, "open_existing") as open_existing):
+            luv.main()
+
+        self.assertEqual(open_existing.call_args.kwargs["agent"], "codex")
+
+
+if __name__ == "__main__":
+    unittest.main()