rollout-cli 0.4.2__tar.gz → 0.5.0__tar.gz

{rollout_cli-0.4.2 → rollout_cli-0.5.0}/.claude/skills/mass-update/SKILL.md

@@ -43,12 +43,18 @@ gone. The new mechanism:
 
 ```bash
 bash .claude/skills/mass-update/scripts/mass-update.sh \
-  --repos <owner/repo[,owner/repo...]> <ops> [--pr] [--keep-clone]
+  --repos <owner/repo[,owner/repo...]> <ops> [--slug SLUG] [--pr] [--keep-clone]
 ```
 
 Run it from the rollout-cli repo root. `--repos` takes comma-separated GitHub
 slugs (e.g. `agentculture/widget-cli`).
 
+The work branch defaults to `mass-update/<owner>-<repo>`. Pass `--slug SLUG` to
+suffix it as `mass-update/<owner>-<repo>-<slug>`, so several independent updates
+to the same repo can coexist as distinct branches (and distinct PRs) instead of
+colliding on the one default branch name. `SLUG` must be ref-safe — letters,
+digits, `.`, `_`, `-`; start with a letter or digit; no trailing `.` or `-`.
+
 ## Op shapes (combinable in one call)
 
 | Op | What it does |
@@ -65,6 +71,7 @@ All ops given in one call are applied to each clone. At least one op is required
 |------|--------|
 | *(none)* | **PREVIEW.** Clone, apply ops, print diff, cleanup. **Zero outward effect.** Always start here. |
 | `--pr` | Clone, apply, commit, push, open PR, file a companion tracking issue via `communicate/scripts/post-issue.sh`, cleanup. Both the PR URL and issue URL are printed. |
+| `--slug SLUG` | Suffix the work branch: `mass-update/<owner>-<repo>-<slug>` (default has no suffix). Use when a repo may receive more than one independent mass-update so the branches don't collide. |
 | `--keep-clone` | Retain the scratch clone on exit (debug). |
 
 ## Worked example — propagate a LICENSE to a sibling repo

{rollout_cli-0.4.2 → rollout_cli-0.5.0}/.claude/skills/mass-update/scripts/mass-update.sh

@@ -28,6 +28,9 @@ Targets:
   --repos a/b,c/d    Comma-separated GitHub slugs (owner/repo). Required.
 
 Other:
+  --slug SLUG        Suffix the work branch: mass-update/<owner>-<repo>-SLUG
+                     (default: mass-update/<owner>-<repo>). Lets several
+                     independent updates to the same repo coexist.
   -h, --help         Show this help.
 EOF
 }
@@ -47,6 +50,7 @@ EDITS=()
 DO_PR=0
 KEEP_CLONE=0
 PENDING_FILE=""
+SLUG=""
 
 _push_file() {
     [[ -n "$PENDING_FILE" ]] || { echo "error: $([[ "$1" == "from" ]] && echo --from || echo --content) given before any --file DEST" >&2; exit 2; }
@@ -93,6 +97,11 @@ while [[ $# -gt 0 ]]; do
             EDITS+=("$2")
             shift 2
             ;;
+        --slug)
+            need_value "$#" "$1"
+            SLUG="$2"
+            shift 2
+            ;;
         --pr)
             DO_PR=1
             shift
@@ -133,6 +142,22 @@ if [[ ${#FILE_DESTS[@]} -eq 0 && ${#EDITS[@]} -eq 0 ]]; then
     exit 2
 fi
 
+# Validate the optional branch slug — it becomes a git ref suffix, so it must be
+# a valid ref *component*, not merely a "nice-looking" string. Beyond the safe
+# charset and leading/trailing dash/dot rules, git also rejects a '..' sequence
+# and a '.lock' suffix in a ref name; allowing them here would pass validation
+# but blow up later at `checkout -b` / `push` / `pr create --head` (where the
+# failure is swallowed by `|| true`), so reject them up front with a clear error.
+if [[ -n "$SLUG" ]]; then
+    if [[ ! "$SLUG" =~ ^[A-Za-z0-9][A-Za-z0-9._-]*$ \
+          || "$SLUG" == *. || "$SLUG" == *- \
+          || "$SLUG" == *..* || "$SLUG" == *.lock ]]; then
+        echo "error: '$SLUG' is not a valid --slug (must be a valid git ref component)" >&2
+        echo "hint: letters, digits, '.', '_', '-'; start with a letter/digit; no trailing '.'/'-', no '..' sequence, no '.lock' suffix" >&2
+        exit 2
+    fi
+fi
+
 # ── validate slug format ────────────────────────────────────────────────────
 validate_slug() {
     local slug="$1"
@@ -314,6 +339,9 @@ for raw in "${TARGETS[@]}"; do
     repo="${target#*/}"
     clone_name="${owner}-${repo}"
     clone_dir="$CLONES_DIR/$clone_name"
+    # Work branch: mass-update/<owner>-<repo>, with an optional -<slug> suffix so
+    # several independent updates to the same repo get distinct branches.
+    branch="mass-update/${clone_name}${SLUG:+-$SLUG}"
 
     # Check auth before cloning
     if ! gh auth status >/dev/null 2>&1; then
@@ -337,8 +365,8 @@ for raw in "${TARGETS[@]}"; do
     fi
 
     # Create work branch
-    git -C "$clone_dir" checkout -b "mass-update/$clone_name" 2>/dev/null || \
-        git -C "$clone_dir" switch -c "mass-update/$clone_name" 2>/dev/null || true
+    git -C "$clone_dir" checkout -b "$branch" 2>/dev/null || \
+        git -C "$clone_dir" switch -c "$branch" 2>/dev/null || true
 
     # Apply file ops
     apply_file_ops "$clone_dir" || { overall_rc=1; continue; }
@@ -366,7 +394,7 @@ for raw in "${TARGETS[@]}"; do
         fi
 
         # Push work branch — a failed push must not be swallowed.
-        if ! git -C "$clone_dir" push origin "mass-update/$clone_name"; then
+        if ! git -C "$clone_dir" push origin "$branch"; then
             echo "error: push failed for $target" >&2
             overall_rc=1
             continue
@@ -377,7 +405,7 @@ for raw in "${TARGETS[@]}"; do
             --repo "$target" \
             --title "mass-update: deterministic update" \
             --body "Automated update via mass-update skill." \
-            --head "mass-update/$clone_name")" || [[ -z "$pr_url" ]]; then
+            --head "$branch")" || [[ -z "$pr_url" ]]; then
             echo "error: gh pr create failed for $target" >&2
             overall_rc=1
             continue

{rollout_cli-0.4.2 → rollout_cli-0.5.0}/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 Format follows [Keep a Changelog](https://keepachangelog.com/). This project
 adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.5.0] - 2026-06-13
+
+### Added
+
+- mass-update: --slug SLUG flag suffixes the work branch as `mass-update/<owner>-<repo>-<slug>`, so several independent updates to the same repo get distinct branches/PRs instead of colliding on the default branch name. Slug is validated as a valid git ref component — rejecting not just bad charset / leading-trailing dash-or-dot, but also the `..` sequences and `.lock` suffix git refuses (which would otherwise pass validation and only fail later at checkout/push/PR). (Qodo PR #10 bug 1.)
+
 ## [0.4.2] - 2026-06-13
 
 ### Changed

{rollout_cli-0.4.2 → rollout_cli-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rollout-cli
-Version: 0.4.2
+Version: 0.5.0
 Summary: Cross-repo propagation workflow built on refactor-cli — apply a transformation across many repos at once.
 Project-URL: Homepage, https://github.com/agentculture/rollout-cli
 Project-URL: Issues, https://github.com/agentculture/rollout-cli/issues

{rollout_cli-0.4.2 → rollout_cli-0.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "rollout-cli"
-version = "0.4.2"
+version = "0.5.0"
 description = "Cross-repo propagation workflow built on refactor-cli — apply a transformation across many repos at once."
 readme = "README.md"
 license = "Apache-2.0"

{rollout_cli-0.4.2 → rollout_cli-0.5.0}/tests/test_mass_update.py

@@ -478,6 +478,66 @@ def test_pr_writes_no_tempfiles_outside_repo(repo, fake_bin, tmp_path):
     assert not (repo / ".mass-update").exists()
 
 
+# --------------------------------------------------------------------------- #
+# --slug: suffix the work branch so several independent updates to the same repo
+# get distinct branches (mass-update/<owner>-<repo>-<slug>).
+# --------------------------------------------------------------------------- #
+
+
+def _current_branch(clone: Path) -> str:
+    return subprocess.run(
+        ["git", "rev-parse", "--abbrev-ref", "HEAD"],
+        cwd=clone,
+        capture_output=True,
+        text=True,
+    ).stdout.strip()
+
+
+def test_default_branch_has_no_slug_suffix(repo, fake_bin):
+    r = run(repo, fake_bin, "--repos", SLUG, "--file", "NOTICE", "--content", "x\n", "--keep-clone")
+    assert r.returncode == 0, r.stderr
+    assert _current_branch(_clone_dir(repo)) == "mass-update/agentculture-widget-cli"
+
+
+def test_slug_suffixes_the_work_branch(repo, fake_bin):
+    r = run(
+        repo,
+        fake_bin,
+        "--repos",
+        SLUG,
+        "--file",
+        "NOTICE",
+        "--content",
+        "x\n",
+        "--slug",
+        "notice-v2",
+        "--keep-clone",
+    )
+    assert r.returncode == 0, r.stderr
+    assert _current_branch(_clone_dir(repo)) == "mass-update/agentculture-widget-cli-notice-v2"
+
+
+@pytest.mark.parametrize(
+    "bad",
+    [
+        "-leading",
+        "trailing-",
+        "has space",
+        "has/slash",
+        "trailing.",
+        "@bad",
+        # git rejects these as ref names even though they look benign:
+        "dot..dot",  # '..' sequence
+        "foo.lock",  # '.lock' suffix
+    ],
+)
+def test_invalid_slug_is_rejected(repo, fake_bin, bad):
+    r = run(repo, fake_bin, "--repos", SLUG, "--file", "NOTICE", "--content", "x\n", "--slug", bad)
+    assert r.returncode == 2, r.stderr
+    assert "slug" in (r.stdout + r.stderr).lower()
+    assert not (repo / ".mass-update").exists()
+
+
 # finding 2: when communicate's post-issue.sh is absent, --pr must error (route
 # issues only through /communicate), not silently fall back to `agtag` directly.
 def test_missing_post_issue_script_errors_no_agtag_fallback(repo, fake_bin):

{rollout_cli-0.4.2 → rollout_cli-0.5.0}/uv.lock

@@ -430,7 +430,7 @@ wheels = [
 
 [[package]]
 name = "rollout-cli"
-version = "0.4.2"
+version = "0.5.0"
 source = { editable = "." }
 
 [package.dev-dependencies]