bmsdna-devtools 0.45.0__tar.gz → 0.46.0__tar.gz

bmsdna_devtools-0.45.0/README.md → bmsdna_devtools-0.46.0/PKG-INFO

@@ -1,3 +1,21 @@
+Metadata-Version: 2.5
+Name: bmsdna-devtools
+Version: 0.46.0
+Summary: Shared Azure DevOps / GitHub / git / Azure Monitor developer tooling for BMS projects
+Requires-Python: >=3.14
+Requires-Dist: azure-identity>=1.19.0
+Requires-Dist: pgdevkit[db]>=0.7.1
+Requires-Dist: requests>=2.32.0
+Requires-Dist: rich>=13.0.0
+Requires-Dist: tomli-w>=1.0.0
+Requires-Dist: typer>=0.26.7
+Provides-Extra: lint
+Requires-Dist: sqlglot>=27.0.0; extra == 'lint'
+Provides-Extra: usage
+Requires-Dist: duckdb>=1.3.0; extra == 'usage'
+Requires-Dist: plotly>=5.24.0; extra == 'usage'
+Description-Content-Type: text/markdown
+
 # bmsdna-devtools
 
 Shared developer tooling for BMS projects: PR build/check status and a
@@ -104,7 +122,7 @@ it watches a branch-triggered build/workflow run, not any particular PR.)
 ## `bdt pr info`
 
 ```bash
-bdt pr info [--json] [--pr-id N] [--target-branch BRANCH]
+bdt pr info [--json] [--pr-id PR]... [--target-branch BRANCH] [--all]
 ```
 
 One-shot summary of the current branch's PR: link, state (open/merged/closed, draft), aggregate
@@ -115,6 +133,24 @@ the check rollup (only a failed check fails it; skipped/cancelled ones don't cou
 from the latest build of each pipeline (any failed result fails it; unfinished builds are pending, or
 `waiting` when a stage needs approval). `unknown` if Azure DevOps can't be asked.
 
+`--all` lists every open PR from the current branch (e.g. one into `dev` and one into `main`, which plain
+`bdt pr info` refuses to pick between): with `--json` an array of the same objects, `[]` (exit 0) when there is
+none; `--target-branch` narrows it, `--pr-id` can't be combined with it. Only open PRs are listed, and a PR with
+merge conflicts is listed like any other (plain `pr info` on Azure DevOps errors on it).
+
+`--pr-id` takes several PRs, also of other repos: repeat it and/or comma-separate (`--pr-id 12,34 --pr-id owner/repo#5`).
+Each entry is a bare number (a PR of the current repo), `owner/repo#N` (GitHub), `project/repo#N` or
+`org/project/repo#N` (Azure DevOps; the host is the current repo's, and the org is its org unless given), or the PR's
+URL (GitHub, `dev.azure.com` or `*.visualstudio.com`; the only form that needs no git checkout). One plain number
+behaves as before: the single object. One `owner/repo#N` is a single object too; two or more entries print a list in the
+order given (duplicates once), as `--json` an array like `--all`'s, as text with the repo in each header. A failing entry
+(unknown number, no access) doesn't hide the others: it is reported as `error: <entry>: <reason>` on stderr, the rest is
+still printed, and the exit code is 1. An unreadable entry is a usage error before anything is looked up. `--pr-id` can't
+be combined with `--all`; `--target-branch` is ignored for it, as before. Azure DevOps entries use one PAT/`az login` for
+every org, and a PR with merge conflicts is an error entry there.
+
+Every JSON object has a `repo` (`owner/repo` on GitHub, `org/project/repo` on Azure DevOps).
+
 Azure DevOps limits: the PR is found by the current branch (into `--target-branch` if given, else any target),
 a PR with merge conflicts is reported as an error (exit 1) like `pr status` does, and the closed
 work items are only those whose URL is in the PR description -- not ones linked via
@@ -272,8 +308,7 @@ bdt pr comment --message "Looks good" [--screenshot shot.png] [--file report.pdf
 bdt pr comment --message-file plan.md          # post a file's text as the comment (`-` = stdin)
 ```
 
-`--file` links the file as an *attachment* (a download link in the comment); it does not post the file's
-content. To post a markdown document (an implementation plan, review findings) use `--message-file`.
+Use `--message-file` to post a markdown document (an implementation plan, review findings) as the comment.
 
 ## `bdt issue create` / `show` / `update` / `delete`, `bdt issue comment add` / `update` / `delete`
 

bmsdna_devtools-0.45.0/PKG-INFO → bmsdna_devtools-0.46.0/README.md

@@ -1,21 +1,3 @@
-Metadata-Version: 2.5
-Name: bmsdna-devtools
-Version: 0.45.0
-Summary: Shared Azure DevOps / GitHub / git / Azure Monitor developer tooling for BMS projects
-Requires-Python: >=3.14
-Requires-Dist: azure-identity>=1.19.0
-Requires-Dist: pgdevkit[db]>=0.7.1
-Requires-Dist: requests>=2.32.0
-Requires-Dist: rich>=13.0.0
-Requires-Dist: tomli-w>=1.0.0
-Requires-Dist: typer>=0.26.7
-Provides-Extra: lint
-Requires-Dist: sqlglot>=27.0.0; extra == 'lint'
-Provides-Extra: usage
-Requires-Dist: duckdb>=1.3.0; extra == 'usage'
-Requires-Dist: plotly>=5.24.0; extra == 'usage'
-Description-Content-Type: text/markdown
-
 # bmsdna-devtools
 
 Shared developer tooling for BMS projects: PR build/check status and a
@@ -122,7 +104,7 @@ it watches a branch-triggered build/workflow run, not any particular PR.)
 ## `bdt pr info`
 
 ```bash
-bdt pr info [--json] [--pr-id N] [--target-branch BRANCH]
+bdt pr info [--json] [--pr-id PR]... [--target-branch BRANCH] [--all]
 ```
 
 One-shot summary of the current branch's PR: link, state (open/merged/closed, draft), aggregate
@@ -133,6 +115,24 @@ the check rollup (only a failed check fails it; skipped/cancelled ones don't cou
 from the latest build of each pipeline (any failed result fails it; unfinished builds are pending, or
 `waiting` when a stage needs approval). `unknown` if Azure DevOps can't be asked.
 
+`--all` lists every open PR from the current branch (e.g. one into `dev` and one into `main`, which plain
+`bdt pr info` refuses to pick between): with `--json` an array of the same objects, `[]` (exit 0) when there is
+none; `--target-branch` narrows it, `--pr-id` can't be combined with it. Only open PRs are listed, and a PR with
+merge conflicts is listed like any other (plain `pr info` on Azure DevOps errors on it).
+
+`--pr-id` takes several PRs, also of other repos: repeat it and/or comma-separate (`--pr-id 12,34 --pr-id owner/repo#5`).
+Each entry is a bare number (a PR of the current repo), `owner/repo#N` (GitHub), `project/repo#N` or
+`org/project/repo#N` (Azure DevOps; the host is the current repo's, and the org is its org unless given), or the PR's
+URL (GitHub, `dev.azure.com` or `*.visualstudio.com`; the only form that needs no git checkout). One plain number
+behaves as before: the single object. One `owner/repo#N` is a single object too; two or more entries print a list in the
+order given (duplicates once), as `--json` an array like `--all`'s, as text with the repo in each header. A failing entry
+(unknown number, no access) doesn't hide the others: it is reported as `error: <entry>: <reason>` on stderr, the rest is
+still printed, and the exit code is 1. An unreadable entry is a usage error before anything is looked up. `--pr-id` can't
+be combined with `--all`; `--target-branch` is ignored for it, as before. Azure DevOps entries use one PAT/`az login` for
+every org, and a PR with merge conflicts is an error entry there.
+
+Every JSON object has a `repo` (`owner/repo` on GitHub, `org/project/repo` on Azure DevOps).
+
 Azure DevOps limits: the PR is found by the current branch (into `--target-branch` if given, else any target),
 a PR with merge conflicts is reported as an error (exit 1) like `pr status` does, and the closed
 work items are only those whose URL is in the PR description -- not ones linked via
@@ -290,8 +290,7 @@ bdt pr comment --message "Looks good" [--screenshot shot.png] [--file report.pdf
 bdt pr comment --message-file plan.md          # post a file's text as the comment (`-` = stdin)
 ```
 
-`--file` links the file as an *attachment* (a download link in the comment); it does not post the file's
-content. To post a markdown document (an implementation plan, review findings) use `--message-file`.
+Use `--message-file` to post a markdown document (an implementation plan, review findings) as the comment.
 
 ## `bdt issue create` / `show` / `update` / `delete`, `bdt issue comment add` / `update` / `delete`
 

{bmsdna_devtools-0.45.0 → bmsdna_devtools-0.46.0}/bmsdna/devtools/cli.py

@@ -32,7 +32,7 @@ from . import find_injection as find_injection_mod
 from . import lint as lint_mod
 from . import logs as logs_mod
 from . import translate as translate_mod
-from . import pr_build, pr_info as pr_info_mod, pr_issue_link, pr_labels, pull as pull_mod, worktree as worktree_mod
+from . import pr_build, pr_info as pr_info_mod, pr_issue_link, pr_ref, pr_labels, pull as pull_mod, worktree as worktree_mod
 from .ado_auth import auth_header
 from .bdt_config import find_pyproject, load_bdt_table
 from .cli_tools import CLI_TIMEOUT_SECS, EXIT_WAIT_TIMEOUT, detect_agent_session, require_gh
@@ -42,6 +42,7 @@ from .usage.cli import usage_app
 from .gitrepo import (
     AdoRemote,
     GitHubRemote,
+    NotAzureDevOpsRemoteError,
     NotGitHubRemoteError,
     UnknownRemoteError,
     current_branch,
@@ -170,6 +171,69 @@ def _current_pr_info(pr_id: int | None, target_branch: str | None, pat: str | No
     return pr_info_mod.ado_info(session, pr, remote)
 
 
+def _open_prs_info(target_branch: str | None, pat: str | None) -> list[pr_info_mod.PrInfo]:
+    """`_current_pr_info` for every open PR from the current branch, `[]` if there is none."""
+    remote = current_remote()
+    if isinstance(remote, GitHubRemote):
+        gh = require_gh()
+        return [
+            pr_info_mod.github_info(gh_pr.get_pr(gh, number, fields=gh_pr.PR_INFO_FIELDS), remote)
+            for number in gh_pr.open_pr_numbers(gh, target_branch)
+        ]
+    session = requests.Session()
+    session.headers.update(auth_header(pat))
+    return [pr_info_mod.ado_info(session, pr, remote) for pr in pr_build.get_active_prs(session, remote, current_branch(), target_branch)]
+
+
+_REMOTE_ERRORS = (UnknownRemoteError, NotGitHubRemoteError, NotAzureDevOpsRemoteError)
+
+
+def _current_remote_or_none() -> AdoRemote | GitHubRemote | None:
+    """The current repo's remote, or None outside a checkout -- without git's own complaint, as that is no error here."""
+    r = subprocess.run(["git", "remote", "get-url", "origin"], capture_output=True, encoding="utf-8")
+    if r.returncode != 0:
+        return None
+    try:
+        return parse_remote(r.stdout.strip())
+    except _REMOTE_ERRORS:
+        return None
+
+
+def _ref_pr_info(ref: pr_ref.PrRef, pat: str | None, clients: dict) -> pr_info_mod.PrInfo:
+    """The PR `ref` names, in its own repo (the current one for a bare number). `clients` caches the GitHub client
+    and Azure DevOps session across the entries of one call, so the token and auth are looked up once."""
+    remote = ref.remote or current_remote()
+    if isinstance(remote, GitHubRemote):
+        if "gh" not in clients:
+            clients["gh"] = require_gh()
+        base = clients["gh"]
+        gh = base if ref.remote is None else base.for_repo(remote.owner, remote.repo)
+        return pr_info_mod.github_info(gh_pr.get_pr(gh, ref.pr_id, fields=gh_pr.PR_INFO_FIELDS), remote)
+    if "session" not in clients:
+        clients["session"] = requests.Session()
+        clients["session"].headers.update(auth_header(pat))
+    session = clients["session"]
+    return pr_info_mod.ado_info(session, pr_build.get_pr_by_id(session, remote, ref.pr_id), remote)
+
+
+def _failure_text(e: BaseException) -> str:
+    return str(e.code) if isinstance(e, SystemExit) and isinstance(e.code, str) else str(e) or type(e).__name__
+
+
+def _ref_infos(refs: list[pr_ref.PrRef], pat: str | None) -> tuple[list[pr_info_mod.PrInfo], list[str]]:
+    """`_ref_pr_info` for each of `refs`, in order: the PRs found and one message per entry that failed, so one
+    unreachable repo or unknown number doesn't hide the others."""
+    clients: dict = {}
+    infos: list[pr_info_mod.PrInfo] = []
+    errors: list[str] = []
+    for ref in refs:
+        try:
+            infos.append(_ref_pr_info(ref, pat, clients))
+        except (SystemExit, requests.RequestException, KeyError, *_REMOTE_ERRORS) as e:
+            errors.append(f"{ref}: {_failure_text(e)}")
+    return infos, errors
+
+
 def _gh_branch_for(gh: GitHubClient, pr_id: int | None, *, needed: bool) -> str:
     """Branch to namespace uploaded screenshots/files under (see `gh_pr.push_assets`) --
     the checked-out branch normally, or (when acting on a PR by `--pr-id`, which may not
@@ -510,25 +574,85 @@ def pr_status(
     pr_build.run(remote, pat, target_branch, wait, pr_id=pr_id, timeout=timeout)
 
 
+def _info_text(info: pr_info_mod.PrInfo, with_repo: bool = False) -> str:
+    flags = ", ".join([info.state, *(["draft"] if info.draft else []), f"build: {info.build}"])
+    name = f"PR {info.repo}#{info.number}" if with_repo and info.repo else f"PR #{info.number}"
+    return "\n".join([f"{name}: {info.title} ({flags})", info.url, *(f"Issue #{i.number}: {i.url}" for i in info.issues)])
+
+
+def _echo_infos(infos: list[pr_info_mod.PrInfo], as_json: bool, with_repo: bool) -> None:
+    if as_json:
+        typer.echo(json.dumps([i.to_json_dict() for i in infos]))
+    elif infos:
+        typer.echo("\n\n".join(_info_text(i, with_repo) for i in infos))
+
+
 @pr_app.command("info")
 def pr_info(
     as_json: bool = typer.Option(False, "--json", help="Print machine-readable JSON (for status integrations that poll it)"),
     target_branch: str | None = typer.Option(None, "--target-branch", help=_LOOKUP_TARGET_HELP),
-    pr_id: int | None = typer.Option(None, "--pr-id", help=_PR_ID_HELP),
+    pr_ids: list[str] | None = typer.Option(
+        None,
+        "--pr-id",
+        help="Summarise this PR directly, instead of resolving it from the current git branch (lets you skip having its "
+        f"branch checked out locally). Repeat it (or comma-separate) for several, as a list; a PR of another repo is {pr_ref.FORMS}",
+    ),
+    all_prs: bool = typer.Option(
+        False,
+        "--all",
+        help="Every open PR from the current branch (e.g. one into dev and one into main) instead of exactly one: "
+        "with --json a list of the objects, [] and exit 0 when there is none",
+    ),
     pat: str | None = typer.Option(None, "--pat", envvar=["AZURE_DEVOPS_EXT_PAT", "AZURE_DEVOPS_PAT"], help="Azure DevOps PAT (else uses DefaultAzureCredential, e.g. your `az login`)"),
 ) -> None:
     """One-shot summary of the PR opened from the current branch, or --pr-id directly: link, state,
     aggregate build state, and the issue(s)/work item(s) it closes. Exits 1 if there is no such PR.
     Build state is judged the way `pr status` does (latest build per pipeline on Azure DevOps).
+
+    --all and several --pr-id values list PRs instead (with --json an array, whatever the count).
     """
-    info = _current_pr_info(pr_id, target_branch, pat)
+    refs: list[pr_ref.PrRef] = []
+    values: list[str] = []
+    if pr_ids:
+        values = pr_ref.split_values(pr_ids)
+        if not values:
+            raise typer.BadParameter("no PR given", param_hint="--pr-id")
+        try:
+            parsed = [pr_ref.parse_pr_ref(v, current_remote) for v in values]
+        except pr_ref.PrRefError as e:
+            raise typer.BadParameter(str(e), param_hint="--pr-id") from None
+        here = _current_remote_or_none() if any(r.remote for r in parsed) else None
+        # `5,5` and `5,owner/repo#5` are still a list of what they name once
+        unique: dict[str, pr_ref.PrRef] = {}
+        for ref in (pr_ref.canonical(r, here) for r in parsed):
+            unique.setdefault(str(ref).casefold(), ref)
+        refs = list(unique.values())
+    if all_prs and refs:
+        raise typer.BadParameter("--all lists the PRs of the current branch, it can't be combined with --pr-id", param_hint="--all")
+
+    if all_prs:
+        _echo_infos(_open_prs_info(target_branch, pat), as_json, with_repo=False)
+        return
+    if len(values) > 1:
+        infos, errors = _ref_infos(refs, pat)
+        _echo_infos(infos, as_json, with_repo=True)
+        for error in errors:
+            typer.echo(f"error: {error}", err=True)
+        if errors:
+            raise typer.Exit(1)
+        return
+    if refs and refs[0].remote is not None:
+        infos, errors = _ref_infos(refs, pat)
+        if errors:
+            typer.echo(f"error: {errors[0]}", err=True)
+            raise typer.Exit(1)
+        info = infos[0]
+    else:
+        info = _current_pr_info(refs[0].pr_id if refs else None, target_branch, pat)
     if as_json:
         typer.echo(json.dumps(info.to_json_dict()))
         return
-    flags = ", ".join([info.state, *(["draft"] if info.draft else []), f"build: {info.build}"])
-    typer.echo(f"PR #{info.number}: {info.title} ({flags})\n{info.url}")
-    for issue in info.issues:
-        typer.echo(f"Issue #{issue.number}: {issue.url}")
+    typer.echo(_info_text(info))
 
 
 @pr_app.command("retry")
@@ -630,13 +754,13 @@ def pr_update(
 def pr_comment(
     message: str | None = typer.Option(None, "--message", help="Comment text"),
     message_file: str | None = typer.Option(
-        None, "--message-file", help="Read the comment text from this file (`-` = stdin); unlike --file, the content is posted as the comment"
+        None, "--message-file", help="Read the comment text from this file (`-` = stdin), e.g. a markdown plan"
     ),
     screenshot: list[str] = typer.Option(
         [], "--screenshot", help="Path to an image to embed in the comment (repeatable)"
     ),
     file: list[str] = typer.Option(
-        [], "--file", help="Path to a file to link in the comment as an attachment (repeatable); to post a file's text as the comment use --message-file"
+        [], "--file", help="Path to an arbitrary file to link in the comment as an attachment (repeatable)"
     ),
     target: str | None = typer.Option(None, "--target", help=_LOOKUP_TARGET_HELP),
     pr_id: int | None = typer.Option(None, "--pr-id", help=_PR_ID_HELP),

{bmsdna_devtools-0.45.0 → bmsdna_devtools-0.46.0}/bmsdna/devtools/gh_pr.py

@@ -170,6 +170,11 @@ def resolve_pr_id(gh: GitHubClient, pr_id: int | None, target: str | None = None
     return prs[choose_pr(branch, candidates)]["number"]
 
 
+def open_pr_numbers(gh: GitHubClient, target: str | None = None) -> list[int]:
+    """Numbers of every open PR from the current branch (into `target` if given), newest first; `[]` if there is none."""
+    return [p["number"] for p in _branch_prs(gh, current_branch(), state="open", base=target)]
+
+
 _CONTEXT_FIELDS = """
 fragment ContextFields on StatusCheckRollupContext {
   __typename

{bmsdna_devtools-0.45.0 → bmsdna_devtools-0.46.0}/bmsdna/devtools/github_api.py

@@ -55,6 +55,7 @@ class GitHubClient:
 
     def __init__(self, token: str, owner: str | None = None, repo: str | None = None, base_url: str = API_URL) -> None:
         self.base_url = base_url.rstrip("/")
+        self._token = token
         self._owner = owner
         self._repo = repo
         self.session = requests.Session()
@@ -67,6 +68,10 @@ class GitHubClient:
             }
         )
 
+    def for_repo(self, owner: str, repo: str) -> GitHubClient:
+        """The same credentials, addressing another repo."""
+        return GitHubClient(self._token, owner, repo, self.base_url)
+
     @property
     def owner(self) -> str:
         self._resolve_repo()

{bmsdna_devtools-0.45.0 → bmsdna_devtools-0.46.0}/bmsdna/devtools/pr_build.py

@@ -207,6 +207,25 @@ def get_pr(session: requests.Session, remote: AdoRemote, source_branch: str, tar
     sys.exit(1)
 
 
+def get_active_prs(session: requests.Session, remote: AdoRemote, source_branch: str, target_branch: str | None) -> list[dict]:
+    """Every active PR from `source_branch` (into `target_branch` if given); `[]` if there is none.
+
+    Unlike `get_pr` nothing is asked about and merge conflicts aren't an error: the caller wants the whole list.
+    """
+    r = session.get(
+        f"{_base_url(remote)}/_apis/git/repositories/{remote.repo}/pullrequests",
+        params={
+            "searchCriteria.sourceRefName": f"refs/heads/{source_branch}",
+            **({"searchCriteria.targetRefName": f"refs/heads/{target_branch}"} if target_branch else {}),
+            "searchCriteria.status": "active",
+            "api-version": "7.1",
+        },
+        timeout=HTTP_TIMEOUT_SECS,
+    )
+    r.raise_for_status()
+    return r.json().get("value", [])
+
+
 def get_pr_by_id(session: requests.Session, remote: AdoRemote, pr_id: int) -> dict:
     """Fetch a PR directly by its ID -- for `--pr-id` overrides, where the caller wants to act
     on a specific PR without needing its source branch checked out locally (unlike `get_pr`,

{bmsdna_devtools-0.45.0 → bmsdna_devtools-0.46.0}/bmsdna/devtools/pr_info.py

@@ -40,6 +40,7 @@ class PrInfo:
     draft: bool
     build: str
     issues: list[IssueRef] = field(default_factory=list)
+    repo: str = ""  # "owner/repo" (GitHub) or "org/project/repo" (Azure DevOps): which repo the PR is in
 
     def to_json_dict(self) -> dict:
         return asdict(self)
@@ -95,6 +96,7 @@ def github_info(pr: dict, remote: GitHubRemote) -> PrInfo:
         draft=bool(pr.get("isDraft")),
         build=build_state(pr.get("statusCheckRollup") or []),
         issues=issues,
+        repo=f"{remote.owner}/{remote.repo}",
     )
 
 
@@ -143,4 +145,5 @@ def ado_info(session: requests.Session, pr: dict, remote: AdoRemote) -> PrInfo:
         draft=bool(pr.get("isDraft")),
         build=_ado_build(session, remote, pr),
         issues=issues,
+        repo=f"{remote.org}/{remote.project}/{remote.repo}",
     )

bmsdna_devtools-0.46.0/bmsdna/devtools/pr_ref.py

@@ -0,0 +1,90 @@
+"""`bdt pr info --pr-id` values: which PR, in which repo.
+
+A bare number is a PR of the current repo. For a PR of another repo (a status integration or an agent working
+across repos) an entry carries the repo too: `owner/repo#12` on GitHub, `project/repo#12` or `org/project/repo#12` on
+Azure DevOps (the host being the current repo's), or the PR's full web URL, which needs no checkout at all.
+"""
+
+from __future__ import annotations
+
+import re
+from collections.abc import Callable
+from dataclasses import dataclass
+
+from .gitrepo import AdoRemote, GitHubRemote, NotAzureDevOpsRemoteError, parse_ado_remote
+
+FORMS = "a number, owner/repo#N (GitHub), project/repo#N or org/project/repo#N (Azure DevOps), or the PR's URL"
+
+
+class PrRefError(ValueError):
+    pass
+
+
+@dataclass(frozen=True)
+class PrRef:
+    pr_id: int
+    remote: AdoRemote | GitHubRemote | None  # None: the current repo
+
+    def __str__(self) -> str:
+        if isinstance(self.remote, GitHubRemote):
+            return f"{self.remote.owner}/{self.remote.repo}#{self.pr_id}"
+        if isinstance(self.remote, AdoRemote):
+            return f"{self.remote.org}/{self.remote.project}/{self.remote.repo}#{self.pr_id}"
+        return f"#{self.pr_id}"
+
+
+_GITHUB_PR_URL = re.compile(r"^https://github\.com/([^/\s]+)/([^/\s]+)/pull/(\d+)(?:[/?#].*)?$")
+_ADO_PR_URL = re.compile(r"^https://(?:dev\.azure\.com/|[^/\s]+\.visualstudio\.com/).*?/_git/[^/\s]+/pullrequest/(\d+)(?:[/?#].*)?$")
+_SHORTHAND = re.compile(r"^(.+)#(\d+)$")
+
+
+def split_values(values: list[str]) -> list[str]:
+    """Entries of repeated and/or comma-separated `--pr-id` values, blanks dropped."""
+    return [part.strip() for value in values for part in value.split(",") if part.strip()]
+
+
+def parse_pr_ref(text: str, current_remote: Callable[[], AdoRemote | GitHubRemote]) -> PrRef:
+    """`current_remote` is only called for the `repo#N` forms, which take their host from it."""
+    text = text.strip()
+    if re.fullmatch(r"#?\d+", text):
+        return PrRef(int(text.lstrip("#")), None)
+
+    if match := _GITHUB_PR_URL.match(text):
+        return PrRef(int(match.group(3)), GitHubRemote(match.group(1), match.group(2)))
+    if match := _ADO_PR_URL.match(text):
+        # the legacy `https://org.visualstudio.com/DefaultCollection/Project/_git/...` form has a collection segment
+        url = text.replace("/DefaultCollection/", "/", 1) if "visualstudio.com" in text else text
+        try:
+            return PrRef(int(match.group(1)), parse_ado_remote(url))
+        except (NotAzureDevOpsRemoteError, IndexError):
+            raise PrRefError(f"can't read the Azure DevOps repo from '{text}'") from None
+
+    if match := _SHORTHAND.match(text):
+        parts = match.group(1).split("/")
+        pr_id = int(match.group(2))
+        if all(parts) and len(parts) in (2, 3):
+            try:
+                here = current_remote()
+            except (SystemExit, Exception) as e:
+                raise PrRefError(
+                    f"'{text}' needs to know whether this repo is GitHub or Azure DevOps ({e}); use the PR's URL instead"
+                ) from None
+            if isinstance(here, GitHubRemote) and len(parts) == 2:
+                return PrRef(pr_id, GitHubRemote(parts[0], parts[1]))
+            if isinstance(here, AdoRemote):
+                if len(parts) == 2:
+                    return PrRef(pr_id, AdoRemote(here.org, parts[0], parts[1]))
+                return PrRef(pr_id, AdoRemote(parts[0], parts[1], parts[2]))
+            raise PrRefError(f"'{text}': GitHub PRs are owner/repo#N")
+    raise PrRefError(f"can't read '{text}' as a PR: use {FORMS}")
+
+
+def canonical(ref: PrRef, here: AdoRemote | GitHubRemote | None) -> PrRef:
+    """`ref` as a bare number when it names a PR of the current repo `here` (compared case-insensitively), so that
+    `5` and `owner/repo#5` are one PR; `here` None (no checkout) leaves it as it is."""
+    if ref.remote is None or here is None or type(ref.remote) is not type(here):
+        return ref
+    same = [str(getattr(ref.remote, f)).casefold() for f in ref.remote.__dataclass_fields__] == [
+        str(getattr(here, f)).casefold() for f in here.__dataclass_fields__
+    ]
+    return PrRef(ref.pr_id, None) if same else ref

{bmsdna_devtools-0.45.0 → bmsdna_devtools-0.46.0}/pyproject.toml

@@ -10,7 +10,7 @@ packages = ["bmsdna"]
 
 [project]
 name = "bmsdna-devtools"
-version = "0.45.0"
+version = "0.46.0"
 description = "Shared Azure DevOps / GitHub / git / Azure Monitor developer tooling for BMS projects"
 readme = "README.md"
 requires-python = ">=3.14"  # pgdevkit>=0.7.1 requires 3.14; was >=3.11 before adding it as a dependency

{bmsdna_devtools-0.45.0 → bmsdna_devtools-0.46.0}/skills/bmsdna-devtools/SKILL.md

@@ -141,11 +141,16 @@ the command's own timeout (or run it in the background) longer than `--timeout`.
 ## PR summary
 
 ```bash
-bdt pr info [--json]
+bdt pr info [--json] [--all] [--pr-id PR]...
 ```
 
 PR link, state, aggregate build state and the issue(s) it closes, in one call -- cheaper than
 `bdt pr status` when you only need to know where things stand. Exits 1 if the branch has no PR.
+`--all` lists every open PR of the branch instead (a JSON array with `--json`, `[]` when there is none), for a branch
+with several PRs, e.g. into `dev` and `main`, where plain `pr info` has to ask which one.
+`--pr-id` (repeatable, comma-separated) names PRs directly, also of other repos: a number, `owner/repo#N` (GitHub),
+`project/repo#N` (Azure DevOps) or the PR's URL; two or more give a list, and a failing entry is an `error:` line on
+stderr with exit 1 while the others are still printed. Every JSON object carries its `repo`.
 (`bdt pr status --wait` is still what to use to wait for CI.)
 
 ## Creating a worktree