@stylusnexus/work-plan 2026.6.9 → 2026.6.10-2

package/skills/work-plan/commands/refresh_md.py

@@ -1,9 +1,12 @@
 """refresh-md subcommand."""
 from lib.config import load_config, ConfigError
-from lib.tracks import discover_tracks, find_track_by_name, filter_tracks_by_repo
+from lib.tracks import discover_tracks, find_track_by_name, filter_tracks_by_repo, parse_track_repo_arg, AmbiguousTrackError
 from lib.github_state import fetch_issues, state_to_status_label
 from lib.frontmatter import write_file
-from lib.status_table import find_all_status_tables, find_canonical_status_tables, sync_missing_rows, ISSUE_NUM_RE
+from lib.status_table import (
+    find_all_status_tables, find_canonical_status_tables, sync_missing_rows,
+    render_canonical_table, insert_canonical_block, ISSUE_NUM_RE,
+)
 from lib.prompts import prompt_yes_no, parse_flags
 
 
@@ -15,12 +18,20 @@ def run(args: list[str]) -> int:
     if repo_key is True:
         print("usage: work_plan.py refresh-md <track-name> | --all | --repo=<key>  [--yes]")
         return 2
-    track_name = positional[0] if positional else None
+    track_arg = positional[0] if positional else None
 
-    if not do_all and not track_name and not repo_key:
+    if not do_all and not track_arg and not repo_key:
         print("usage: work_plan.py refresh-md <track-name> | --all | --repo=<key>  [--yes]")
         return 2
 
+    track_name = track_arg
+    repo_qualifier = repo_key
+    if track_arg:
+        name_from_arg, repo_from_arg = parse_track_repo_arg(track_arg)
+        track_name = name_from_arg
+        if repo_from_arg:
+            repo_qualifier = repo_from_arg
+
     try:
         cfg = load_config()
     except ConfigError as e:
@@ -28,7 +39,7 @@ def run(args: list[str]) -> int:
         return 1
 
     tracks = discover_tracks(cfg)
-    if do_all or repo_key:
+    if do_all or (repo_key and not track_arg):
         targets = [t for t in tracks if t.has_frontmatter
                    and t.meta.get("status") in ("active", "in-progress", "blocked")]
         if repo_key:
@@ -41,7 +52,11 @@ def run(args: list[str]) -> int:
             return 0
         return _refresh_many(targets, yes)
 
-    track = find_track_by_name(track_name, tracks)
+    try:
+        track = find_track_by_name(track_name, tracks, repo=repo_qualifier)
+    except AmbiguousTrackError as e:
+        print(str(e))
+        return 1
     if not track:
         print(f"No track matching '{track_name}'.")
         return 1
@@ -52,7 +67,8 @@ def _refresh_many(tracks: list, yes: bool) -> int:
     """Refresh one or more tracks. Computes proposed updates, then asks one
     confirmation (or applies all if --yes)."""
     pending = []
-    for track in tracks:
+    for i, track in enumerate(tracks, 1):
+        print(f"  [{i}/{len(tracks)}] {track.path.name}...", flush=True)
         canonical = find_canonical_status_tables(track.body)
         all_tables = find_all_status_tables(track.body)
         tables = canonical if canonical else all_tables
@@ -68,7 +84,7 @@ def _refresh_many(tracks: list, yes: bool) -> int:
 
         # Frontmatter is canonical for membership: issues listed there but
         # missing from the table need a fresh row (issue #77). Fetch the union
-        # so appended rows carry live title/assignee/status too.
+        # so rows carry live title/assignee/status too.
         frontmatter_nums = track.meta.get("github", {}).get("issues") or []
         fetch_nums = sorted(all_issue_nums | set(frontmatter_nums))
         if not fetch_nums:
@@ -78,55 +94,121 @@ def _refresh_many(tracks: list, yes: bool) -> int:
         issues_by_num = {i["number"]: i for i in issues}
         state_by_num = {i["number"]: state_to_status_label(i.get("state")) for i in issues}
 
-        lines = track.body.split("\n")
-        cell_updates = 0
-        for table in tables:
-            sidx = table["status_col_index"]
-            for row in table["rows"]:
-                nums = []
-                for cell in row["cells"]:
-                    nums.extend(int(m) for m in ISSUE_NUM_RE.findall(cell))
-                for num in nums:
-                    if num not in state_by_num:
-                        continue
-                    new_status = state_by_num[num]
-                    if sidx >= len(row["cells"]):
-                        continue
-                    current = row["cells"][sidx].strip()
-                    if current == new_status.strip():
-                        continue
-                    new_label = new_status.strip().split(" ", 1)[-1].lower()
-                    if new_label and new_label in current.lower():
-                        continue
-                    new_cells = list(row["cells"])
-                    new_cells[sidx] = " " + new_status + " "
-                    lines[row["line_idx"]] = "|" + "|".join(new_cells) + "|"
-                    cell_updates += 1
-
-        new_body = "\n".join(lines)
-        # Slot in rows for frontmatter issues missing from the table, each at
-        # its frontmatter-order position. Cell updates above preserve the line
-        # count, so the table's line indices stay valid for sync_missing_rows.
-        new_body, rows_added = sync_missing_rows(new_body, frontmatter_nums, issues_by_num)
+        if canonical:
+            # Canonical table → RE-DERIVE the whole block from frontmatter
+            # membership + live data, milestone-ordered (#101). Re-deriving from
+            # the one shared renderer is what keeps the markdown table from
+            # decaying: order, columns, missing rows, and statuses are all
+            # rebuilt every run, so it can't drift from the viewer.
+            new_body, detail = _rederive_canonical(
+                track, canonical, frontmatter_nums, issues_by_num, state_by_num
+            )
+        else:
+            new_body, detail = _refresh_narrative(
+                track, tables, frontmatter_nums, issues_by_num, state_by_num
+            )
 
         if new_body == track.body:
             continue
-        pending.append((track, new_body, cell_updates, rows_added))
+        pending.append((track, new_body, detail))
 
     if not pending:
         print("All tracks in sync.")
         return 0
 
     print(f"Pending updates across {len(pending)} track(s):\n")
-    for track, _, cells, added in pending:
-        added_str = f", {added} row(s) added" if added else ""
-        print(f"  {track.path.name:50}  {cells} cell(s){added_str}")
+    for track, _, detail in pending:
+        print(f"  {track.path.name:50}  {detail}")
 
     if not yes and not prompt_yes_no("\nApply all? [y/N]"):
         print("Cancelled.")
         return 0
 
-    for track, new_body, _, _ in pending:
+    for track, new_body, _ in pending:
         write_file(track.path, track.meta, new_body)
     print(f"\n✓ Updated {len(pending)} file(s).")
     return 0
+
+
+def _rederive_canonical(track, canonical_tables, frontmatter_nums,
+                        issues_by_num, state_by_num):
+    """Rebuild the canonical block, milestone-ordered, from live data.
+
+    Returns (new_body, detail_str). detail reports rows added vs. the old table
+    and status changes, falling back to a format/order note when the only
+    change is reordering or the one-time 4→5 column migration."""
+    old_nums, old_status = set(), {}
+    for table in canonical_tables:
+        sidx = table["status_col_index"]
+        for row in table["rows"]:
+            row_nums = [int(m) for cell in row["cells"]
+                        for m in ISSUE_NUM_RE.findall(cell)]
+            for num in row_nums:
+                old_nums.add(num)
+                if sidx < len(row["cells"]):
+                    old_status[num] = row["cells"][sidx].strip()
+
+    table_md = render_canonical_table(
+        frontmatter_nums, issues_by_num,
+        milestone_alignment=track.meta.get("milestone_alignment"),
+    )
+    new_body = insert_canonical_block(track.body, table_md, replace=True)
+
+    rows_added = len(set(frontmatter_nums) - old_nums)
+    # Frontmatter is membership truth: a row in the old table but no longer in
+    # frontmatter is dropped on re-derive. Surface it so an approving user can
+    # see a deletion, not just additions.
+    rows_removed = len(old_nums - set(frontmatter_nums))
+    status_changes = sum(
+        1 for n in frontmatter_nums
+        if n in old_status and n in state_by_num
+        and old_status[n] != state_by_num[n].strip()
+    )
+    bits = []
+    if status_changes:
+        bits.append(f"{status_changes} status change(s)")
+    if rows_added:
+        bits.append(f"{rows_added} row(s) added")
+    if rows_removed:
+        bits.append(f"{rows_removed} row(s) removed")
+    detail = ", ".join(bits) if bits else "canonical table re-derived"
+    return new_body, detail
+
+
+def _refresh_narrative(track, tables, frontmatter_nums, issues_by_num, state_by_num):
+    """Original behavior for tracks WITHOUT a canonical table: update status
+    cells in narrative tables in place, then slot in missing frontmatter rows.
+    Conservative — never reorders or restructures a hand-written table."""
+    lines = track.body.split("\n")
+    cell_updates = 0
+    for table in tables:
+        sidx = table["status_col_index"]
+        for row in table["rows"]:
+            nums = []
+            for cell in row["cells"]:
+                nums.extend(int(m) for m in ISSUE_NUM_RE.findall(cell))
+            for num in nums:
+                if num not in state_by_num:
+                    continue
+                new_status = state_by_num[num]
+                if sidx >= len(row["cells"]):
+                    continue
+                current = row["cells"][sidx].strip()
+                if current == new_status.strip():
+                    continue
+                new_label = new_status.strip().split(" ", 1)[-1].lower()
+                if new_label and new_label in current.lower():
+                    continue
+                new_cells = list(row["cells"])
+                new_cells[sidx] = " " + new_status + " "
+                lines[row["line_idx"]] = "|" + "|".join(new_cells) + "|"
+                cell_updates += 1
+
+    new_body = "\n".join(lines)
+    # Slot in rows for frontmatter issues missing from the table, each at its
+    # frontmatter-order position. Cell updates preserve the line count, so the
+    # table's line indices stay valid for sync_missing_rows.
+    new_body, rows_added = sync_missing_rows(new_body, frontmatter_nums, issues_by_num)
+
+    added_str = f", {rows_added} row(s) added" if rows_added else ""
+    return new_body, f"{cell_updates} cell(s){added_str}"

package/skills/work-plan/commands/rename_track.py

@@ -0,0 +1,243 @@
+"""rename-track subcommand — rename an existing active track's slug + file.
+
+Resolves <old-slug> to a single active Track, renames its .md file on disk,
+updates the frontmatter `track` field + `last_touched`, and (for shared tracks)
+optionally commits the move with --commit. Cross-references in sibling tracks'
+`depends_on` lists are warned about, or rewritten with --fix-refs.
+
+Non-goals: no bulk rename, no body search-and-replace, no archive rename
+(archived tracks aren't discovered, so they can't be targeted).
+
+Usage:
+  rename-track <old-slug | old@repo> <new-slug>
+               [--repo=<key>] [--fix-refs] [--commit] [--confirm=<token>]
+"""
+import json
+import re
+import subprocess
+from datetime import datetime
+from pathlib import Path
+
+from lib.config import load_config, ConfigError, is_valid_git_repo
+from lib.tracks import (
+    discover_tracks,
+    find_track_by_name,
+    parse_track_repo_arg,
+    AmbiguousTrackError,
+)
+from lib.frontmatter import write_file
+from lib.write_guard import needs_confirm, make_token, valid_token
+from lib.prompts import parse_flags
+
+# Same slug rule as new-track: lowercase letters/digits/hyphens, starts with letter.
+_SLUG_RE = re.compile(r"^[a-z][a-z0-9-]*$")
+
+
+def _git_commit_rename(
+    old_path: Path, new_path: Path, old_slug: str, new_slug: str
+) -> None:
+    """Stage the old + new paths and commit a single shared-track rename.
+
+    Path-scoped (never `git add .`). git detects the move as a rename at commit
+    time from content similarity. Non-fatal: any git failure warns and returns.
+    """
+    # The clone root is .work-plan/'s parent.
+    clone_root = new_path.parent.parent
+    if not is_valid_git_repo(clone_root):
+        print("⚠ --commit ignored: track is private (not in a git repo)")
+        return
+
+    # Determine current branch name for the success message.
+    branch = "HEAD"
+    try:
+        result = subprocess.run(
+            ["git", "-C", str(clone_root), "rev-parse", "--abbrev-ref", "HEAD"],
+            capture_output=True, text=True, check=False,
+        )
+        if result.returncode == 0:
+            branch = result.stdout.strip()
+    except OSError:
+        pass
+
+    # Stage ONLY the two affected paths (old deletion + new addition).
+    try:
+        subprocess.run(
+            ["git", "-C", str(clone_root), "add", str(old_path), str(new_path)],
+            capture_output=True, text=True, check=True,
+        )
+    except (subprocess.CalledProcessError, OSError) as e:
+        msg = getattr(e, "stderr", str(e))
+        print(f"⚠ --commit: git add failed ({msg.strip()!r}) — continuing without commit")
+        return
+
+    commit_msg = f"chore: rename shared track '{old_slug}' → '{new_slug}'"
+    try:
+        subprocess.run(
+            ["git", "-C", str(clone_root), "commit", "-m", commit_msg],
+            capture_output=True, text=True, check=True,
+        )
+    except (subprocess.CalledProcessError, OSError) as e:
+        msg = getattr(e, "stderr", str(e))
+        print(f"⚠ --commit: git commit failed ({msg.strip()!r}) — continuing without commit")
+        return
+
+    print(f"✓ committed rename '{old_slug}' → '{new_slug}' to {branch}")
+
+
+def _fix_cross_references(
+    tracks: list, renamed: object, old_slug: str, new_slug: str, *, apply: bool
+) -> int:
+    """Find sibling tracks in the same repo whose `depends_on` lists old_slug.
+
+    With apply=True, rewrite each occurrence to new_slug and persist the file;
+    otherwise just report. Returns the number of referring tracks found.
+    """
+    referrers = [
+        t for t in tracks
+        if t is not renamed
+        and t.has_frontmatter
+        and t.repo == renamed.repo
+        and old_slug in (t.meta.get("depends_on") or [])
+    ]
+    if not referrers:
+        return 0
+
+    if apply:
+        for t in referrers:
+            t.meta["depends_on"] = [
+                new_slug if dep == old_slug else dep
+                for dep in t.meta.get("depends_on") or []
+            ]
+            write_file(t.path, t.meta, t.body)
+        print(
+            f"✓ updated depends_on in {len(referrers)} track(s): "
+            + ", ".join(t.name for t in referrers)
+        )
+    else:
+        print(
+            f"⚠ {len(referrers)} track(s) still depend on '{old_slug}': "
+            + ", ".join(t.name for t in referrers)
+        )
+        print("  Re-run with --fix-refs to rewrite their depends_on to the new slug.")
+    return len(referrers)
+
+
+def run(args: list[str]) -> int:
+    flags, positional = parse_flags(
+        args, {"--repo", "--confirm", "--fix-refs", "--commit"}
+    )
+
+    if len(positional) < 2:
+        print(
+            "usage: work_plan.py rename-track <old-slug | old@repo> <new-slug>"
+            " [--repo=<key>] [--fix-refs] [--commit] [--confirm=<token>]"
+        )
+        return 2
+
+    old_arg = positional[0]
+    new_slug = positional[1]
+
+    name_from_arg, repo_from_arg = parse_track_repo_arg(old_arg)
+    old_name = name_from_arg
+    repo_qualifier = repo_from_arg or (
+        flags.get("--repo") if flags.get("--repo") is not True else None
+    )
+
+    # Validate the new slug up front (cheap, no I/O).
+    if not _SLUG_RE.fullmatch(new_slug):
+        print(
+            f"ERROR: '{new_slug}' is not a valid slug."
+            " Use lowercase letters, digits, hyphens; must start with a letter."
+        )
+        return 2
+
+    try:
+        cfg = load_config()
+    except ConfigError as e:
+        print(f"ERROR: {e}")
+        return 1
+
+    tracks = discover_tracks(cfg)
+    try:
+        track = find_track_by_name(old_name, tracks, repo=repo_qualifier)
+    except AmbiguousTrackError as e:
+        print(str(e))
+        return 1
+    if not track:
+        print(f"No track matching '{old_name}'.")
+        return 1
+
+    if new_slug == track.name:
+        print(f"ERROR: '{new_slug}' is already the track's slug — nothing to rename.")
+        return 2
+
+    # Reject if a track with new_slug already exists in the same repo/tier
+    # (same target directory). new_path.exists() is the authoritative check.
+    new_path = track.path.parent / f"{new_slug}.md"
+    if new_path.exists():
+        print(f"ERROR: a track '{new_slug}' already exists at {new_path}")
+        return 2
+
+    # Public-repo confirm gate — fires BEFORE any write or move. Mirrors close.
+    confirm = flags.get("--confirm")
+    if track.repo and needs_confirm(track.repo, cfg) and not (
+        isinstance(confirm, str) and valid_token(confirm, track.repo, new_slug)
+    ):
+        print(json.dumps({
+            "needs_confirm": True,
+            "reason": (
+                f"{track.repo} is PUBLIC (or visibility unknown); "
+                f"renaming '{track.name}' → '{new_slug}' will be written there."
+            ),
+            "token": make_token(track.repo, new_slug),
+        }))
+        return 0
+
+    # ------------------------------------------------------------------
+    # Perform the rename: write the rewritten frontmatter (track slug +
+    # last_touched) to the NEW path FIRST, then remove the old file. Doing
+    # it in this order means a write_file failure (yq error, symlink refusal)
+    # leaves the original intact — no half-renamed state where the filename
+    # and the frontmatter `track` field disagree.
+    # ------------------------------------------------------------------
+    old_path = track.path
+    old_slug = track.name
+
+    track.meta["track"] = new_slug
+    track.meta["last_touched"] = datetime.now().strftime("%Y-%m-%dT%H:%M")
+
+    write_file(new_path, track.meta, track.body)
+    old_path.unlink()
+    track.path = new_path
+    track.name = new_slug
+
+    is_shared = getattr(track, "tier", None) == "shared"
+    if is_shared:
+        print(f"✓ Renamed shared track '{old_slug}' → '{new_slug}' at {new_path}")
+    else:
+        notes_root = Path(cfg["notes_root"]).expanduser()
+        try:
+            display = new_path.relative_to(notes_root)
+        except ValueError:
+            display = new_path
+        print(f"✓ Renamed track '{old_slug}' → '{new_slug}' at {display}")
+
+    # ------------------------------------------------------------------
+    # --commit: stage + commit the rename to the shared repo (non-fatal).
+    # ------------------------------------------------------------------
+    if "--commit" in flags:
+        if is_shared:
+            _git_commit_rename(old_path, new_path, old_slug, new_slug)
+        else:
+            print("⚠ --commit ignored: track is private (not in a git repo)")
+    elif is_shared:
+        print("  ↑ shared track — commit + push to share this rename with teammates.")
+
+    # ------------------------------------------------------------------
+    # Cross-reference hygiene: sibling tracks that depend_on the old slug.
+    # ------------------------------------------------------------------
+    _fix_cross_references(
+        tracks, track, old_slug, new_slug, apply="--fix-refs" in flags
+    )
+
+    return 0

package/skills/work-plan/commands/set_field.py

@@ -1,12 +1,12 @@
 """set subcommand — guarded edit of a track's frontmatter scalar/list fields."""
 import json
 from lib.config import load_config, ConfigError
-from lib.tracks import discover_tracks, find_track_by_name
+from lib.tracks import discover_tracks, find_track_by_name, parse_track_repo_arg, AmbiguousTrackError
 from lib.frontmatter import write_file
 from lib.write_guard import needs_confirm, make_token, valid_token
 from lib.prompts import parse_flags
 
-ALLOWED = {"status", "launch_priority", "milestone_alignment", "blockers", "next_up"}
+ALLOWED = {"status", "launch_priority", "milestone_alignment", "blockers", "next_up", "depends_on"}
 LIST_FIELDS = {"blockers", "next_up"}
 STATUSES = {"active", "in-progress", "blocked", "parked", "shipped", "abandoned"}
 
@@ -14,10 +14,14 @@ def run(args: list[str]) -> int:
     # Confirm token is passed as --confirm=<token> (equals form: parse_flags only
     # understands --key=value or bare --key, so a space-separated token would be
     # mis-read as a positional). The VS Code extension invokes the equals form.
-    flags, positional = parse_flags(args, {"--confirm"})
+    flags, positional = parse_flags(args, {"--confirm", "--repo"})
     if len(positional) < 2:
-        print("usage: work_plan.py set <track> field=value [field=value …] [--confirm=<token>]"); return 2
-    name, assignments = positional[0], positional[1:]
+        print("usage: work_plan.py set <track> field=value [field=value …] [--confirm=<token>] [--repo=<key>]"); return 2
+    track_arg, assignments = positional[0], positional[1:]
+    name_from_arg, repo_from_arg = parse_track_repo_arg(track_arg)
+    name = name_from_arg
+    repo_flag = flags.get("--repo") if flags.get("--repo") is not True else None
+    repo_qualifier = repo_from_arg or repo_flag
     parsed = {}
     for a in assignments:
         if "=" not in a:
@@ -25,7 +29,10 @@ def run(args: list[str]) -> int:
         k, v = a.split("=", 1)
         if k not in ALLOWED:
             print(f"ERROR: field {k!r} not settable (allowed: {sorted(ALLOWED)})"); return 2
-        if k in LIST_FIELDS:
+        if k == "depends_on":
+            # Comma-separated track slugs (strings, not issue numbers).
+            parsed[k] = [x.strip() for x in v.split(",") if x.strip()] if v.strip() else []
+        elif k in LIST_FIELDS:
             try:
                 parsed[k] = [int(x) for x in v.split(",") if x.strip()] if v.strip() else []
             except ValueError:
@@ -38,7 +45,10 @@ def run(args: list[str]) -> int:
         cfg = load_config()
     except ConfigError as e:
         print(f"ERROR: {e}"); return 1
-    track = find_track_by_name(name, discover_tracks(cfg))
+    try:
+        track = find_track_by_name(name, discover_tracks(cfg), repo=repo_qualifier)
+    except AmbiguousTrackError as e:
+        print(str(e)); return 1
     if not track:
         print(f"No track matching {name!r}."); return 1
     # Public-repo confirm gate (the extension surfaces this as a modal).

package/skills/work-plan/commands/set_notes_root.py

@@ -5,6 +5,7 @@ folder. Config writes stay in the CLI (the engine), not the extension.
 
 Usage: set-notes-root <path>
 """
+import os
 import subprocess
 from pathlib import Path
 
@@ -38,12 +39,15 @@ def run(args: list[str]) -> int:
     # Ensure the target directory exists
     new_root.mkdir(parents=True, exist_ok=True)
 
-    # Write the new notes_root into config via yq (mikefarah/yq)
-    yq_expr = f'.notes_root = "{new_root}"'
+    # Write the new notes_root into config via yq (mikefarah/yq). The path is
+    # passed as an OPAQUE env value via strenv() — never interpolated into the
+    # yq expression — so a path containing `"` or yq operators cannot break out
+    # of the string literal and rewrite arbitrary config keys (#191).
+    env = {**os.environ, "WP_NEW_ROOT": str(new_root)}
     try:
         subprocess.run(
-            ["yq", "-i", yq_expr, str(DEFAULT_CONFIG_PATH)],
-            check=True, capture_output=True, text=True,
+            ["yq", "-i", ".notes_root = strenv(WP_NEW_ROOT)", str(DEFAULT_CONFIG_PATH)],
+            check=True, capture_output=True, text=True, env=env,
         )
     except subprocess.CalledProcessError as e:
         print(f"ERROR: yq failed to update config: {e.stderr}")

package/skills/work-plan/commands/slot.py

@@ -3,7 +3,7 @@ import json
 import subprocess
 
 from lib.config import load_config, ConfigError
-from lib.tracks import discover_tracks, find_track_by_name
+from lib.tracks import discover_tracks, find_track_by_name, parse_track_repo_arg, AmbiguousTrackError
 from lib.frontmatter import write_file
 from lib.write_guard import needs_confirm, make_token, valid_token
 from lib.prompts import parse_flags, prompt_input
@@ -27,16 +27,26 @@ def _find_prior_owners(issue_num: int, repo: str, target_name: str, tracks):
 def run(args: list[str]) -> int:
     # --confirm uses equals form: --confirm=<token>
     # --move / --no-move are bare flags
-    flags, positional = parse_flags(args, {"--confirm", "--move", "--no-move"})
+    # --repo uses equals form: --repo=<key>
+    flags, positional = parse_flags(args, {"--confirm", "--move", "--no-move", "--repo"})
     if not positional:
-        print("usage: work_plan.py slot <issue-num> [track-name]")
+        print("usage: work_plan.py slot <issue-num> [track | track@repo] [--repo=<key>]")
         return 2
     try:
         issue_num = int(positional[0])
     except ValueError:
         print(f"ERROR: '{positional[0]}' is not an issue number.")
         return 2
-    target_name = positional[1] if len(positional) > 1 else None
+    target_arg = positional[1] if len(positional) > 1 else None
+    repo_flag = flags.get("--repo") if flags.get("--repo") is not True else None
+
+    target_name = target_arg
+    repo_qualifier = repo_flag
+    if target_arg:
+        name_from_arg, repo_from_arg = parse_track_repo_arg(target_arg)
+        target_name = name_from_arg
+        if repo_from_arg:
+            repo_qualifier = repo_from_arg
 
     if "--move" in flags and "--no-move" in flags:
         print("ERROR: --move and --no-move are mutually exclusive.")
@@ -53,7 +63,12 @@ def run(args: list[str]) -> int:
               and t.meta.get("status") in ("active", "in-progress", "blocked")]
 
     if target_name:
-        target = find_track_by_name(target_name, tracks, active_only=True)
+        try:
+            target = find_track_by_name(target_name, tracks, active_only=True,
+                                        repo=repo_qualifier)
+        except AmbiguousTrackError as e:
+            print(str(e))
+            return 1
         if not target:
             print(f"No active track matching '{target_name}'.")
             return 1

package/skills/work-plan/commands/suggest_priorities.py

@@ -113,8 +113,18 @@ def _apply(cfg: dict) -> int:
 
     print(f"Applying {len(answers)} priority labels to {repo}...")
     for ans in answers:
-        num = ans["number"]
-        priority = ans["priority"]
+        # The answers file is model-written; coerce the issue number to int and
+        # skip malformed entries so a non-numeric value can't reach `gh` argv
+        # (and a malformed file can't crash the apply). (#196)
+        if not isinstance(ans, dict):
+            print(f"  SKIP: answer is not an object: {ans!r}")
+            continue
+        try:
+            num = int(ans["number"])
+        except (KeyError, TypeError, ValueError):
+            print(f"  SKIP: answer missing a numeric 'number': {ans!r}")
+            continue
+        priority = ans.get("priority")
         if priority not in ("P0", "P1", "P2", "P3"):
             print(f"  SKIP #{num}: invalid priority '{priority}'")
             continue