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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: luv-cli
-Version: 0.0.22
+Version: 0.0.23
 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
@@ -48,6 +48,9 @@ luv --init
 # Create a new workspace and launch Claude
 luv 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"
 
@@ -82,6 +85,7 @@ All workspaces live under `~/prs/`. The number comes from the repo's GitHub issu
 |---------|-------------|
 | `luv --init` | Configure default GitHub org |
 | `luv [org/]<repo> [prompt...]` | Create a new workspace and launch Claude |
+| `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 |
@@ -98,6 +102,7 @@ All workspaces live under `~/prs/`. The number comes from the repo's GitHub issu
 | `-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 |
+| `-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) |

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

@@ -25,6 +25,9 @@ luv --init
 # Create a new workspace and launch Claude
 luv 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"
 
@@ -59,6 +62,7 @@ All workspaces live under `~/prs/`. The number comes from the repo's GitHub issu
 |---------|-------------|
 | `luv --init` | Configure default GitHub org |
 | `luv [org/]<repo> [prompt...]` | Create a new workspace and launch Claude |
+| `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 |
@@ -75,6 +79,7 @@ All workspaces live under `~/prs/`. The number comes from the repo's GitHub issu
 | `-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 |
+| `-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) |

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

@@ -663,6 +663,19 @@ def main() -> None:
             die("-m requires a model name")
         args = args[:idx] + args[idx + 2:]
 
+    # -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")]
     extra_env = collect_luv_env() if env_mode else {}
 
@@ -676,6 +689,7 @@ Flags:
   -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)
+  -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,6 +697,7 @@ 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
@@ -703,6 +718,19 @@ Docker:
     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
@@ -771,6 +799,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,20 +827,30 @@ 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()

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

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