bmsdna-devtools 0.28.1__tar.gz → 0.30.0__tar.gz

{bmsdna_devtools-0.28.1 → bmsdna_devtools-0.30.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: bmsdna-devtools
-Version: 0.28.1
+Version: 0.30.0
 Summary: Shared Azure DevOps / GitHub / git / Azure Monitor developer tooling for BMS projects
 Requires-Python: >=3.14
 Requires-Dist: pgdevkit[db]>=0.7.1
@@ -13,8 +13,8 @@ Description-Content-Type: text/markdown
 
 # bmsdna-devtools
 
-Shared developer tooling for BMS projects: PR build/check status, PR
-creation, issue/work item creation and comments, git worktrees (creation and
+Shared developer tooling for BMS projects: PR build/check status and a
+one-shot PR summary (`bdt pr info`), PR creation, claiming an issue (`bdt issue take`), issue/work item creation and comments, git worktrees (creation and
 merged-worktree/orphaned-test-DB cleanup), a commit-and-push helper with
 pre-flight checks, Azure log queries, and static checks (`bdt lint`) for
 postgres/psycopg SQL rules, pydantic-model placement, hand-wired HTTP access in
@@ -48,9 +48,12 @@ Find the PR opened from the current branch and report build/check status
 GitHub — whichever `origin` points at.
 
 ```bash
-bdt pr status [--target-branch main] [--wait]
+bdt pr status [--target-branch dev] [--wait]
 ```
 
+Every `--target` / `--target-branch` option in bdt (`pr create/status/info/retry/publish/update/comment/watch-deploy`,
+`issue take`, `commit`) defaults to `dev`; pass `--target main` (or whatever your PRs go into) to override.
+
 If the PR can't be merged, that's reported immediately instead of polling
 for builds/checks that will never run — e.g. on Azure DevOps:
 `PR #42 ('feat: widgets') has merge conflicts with the target branch (mergeStatus=conflicts)`;
@@ -85,6 +88,25 @@ locally at all. `bdt pr retry`, `pr publish`, `pr update`, and `pr comment`
 all accept the same option, for the same reason. (`pr watch-deploy` doesn't:
 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 dev]
+```
+
+One-shot summary of the current branch's PR: link, state (open/merged/closed, draft), aggregate
+build state (`passing`, `failing`, `pending`, `waiting` for a manual approval, `none`) and the
+issue(s)/work item(s) it closes, with links. Exits 1 when the branch has no PR. `--json` is what
+a status integration reads (e.g. the Claude Code mod planned in bmsuisse/skills#61). Build state is judged the way `bdt pr status` does: on GitHub from
+the check rollup (only a failed check fails it; skipped/cancelled ones don't count), on Azure DevOps
+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.
+
+Azure DevOps limits: the PR is found by the current branch into `--target-branch` (default `dev`),
+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
+`bdt pr create --issue`.
+
 ## `bdt pr retry`
 
 Retry only the **failed** job(s)/stage(s) of the most recent build/run for the
@@ -92,7 +114,7 @@ PR opened from the current branch — not a whole new build/run. Whenever `bdt
 pr status` reports a failure, it prints a hint to run this.
 
 ```bash
-bdt pr retry [--target-branch main]
+bdt pr retry [--target-branch dev]
 ```
 
 No build/run ID needed — like `bdt pr status`, it resolves the PR (and its
@@ -125,7 +147,7 @@ workflow run triggered *directly* on `--target-branch` and reports its
 status the same way `pr status` does (failed steps print their logs inline).
 
 ```bash
-bdt pr watch-deploy [--target-branch main] [--wait]
+bdt pr watch-deploy [--target-branch dev] [--wait]
 ```
 
 After `bdt pr status` reports the PR's build/checks succeeded, if a build/
@@ -146,7 +168,7 @@ branch. Failed steps are printed via `gh run view <id> --log-failed`.
 ## `bdt pr create`
 
 ```bash
-bdt pr create --target main   # or --target test
+bdt pr create --target dev   # or --target main / test
 ```
 
 Creates a PR from the current branch into `--target`. On Azure DevOps,
@@ -154,7 +176,7 @@ a thin wrapper around `az repos pr create` (org/project/repo inferred by
 `az` itself from the git remote). On GitHub, `gh pr create --fill` (autofills
 title/body from commit info so it never blocks on an interactive prompt).
 Extra arguments pass through either way, e.g.
-`bdt pr create --target main -- --title "..."`.
+`bdt pr create --target dev -- --title "..."`.
 
 PRs are created as **drafts by default**; a successful create always prints
 the PR's link plus `bdt pr publish` (which abstracts over the host) to mark
@@ -298,6 +320,26 @@ description and runs `claude -p "<prompt>" --name "60: <title>"`, so the session
 with `claude --resume`. `--agent` picks another executable (it then gets just the prompt as its
 last argument); extra args are passed through; `--dry-run` prints the command.
 
+It takes the issue first (like `bdt issue take`): before the agent starts it comments `Taken by <you>`
+on the issue, naming the session it is about to start -- for `claude` a `--session-id` is generated and
+passed, so the comment says `claude --resume <id>`; the prompt tells the agent not to take it again. For
+another `--agent` the comment just says `(via <agent>)`. `--dry-run` posts nothing. Like `issue take`, it doesn't comment again when the newest comment already is a claim.
+
+## `bdt issue take`
+
+```bash
+bdt issue take [NUMBER] [--target-branch dev]
+```
+
+Claims an issue (GitHub) or work item (Azure DevOps): comments `Taken by <you>` on it, followed by the
+running coding agent's session (the same `<Agent> Session: <id>` note every bdt comment gets: a
+claude.ai link under a bridged Claude session, otherwise the bare session id; nothing outside an
+agent), so others can see who is on it. `<you>` is the GitHub login
+`gh` is authenticated as, else the git `user.name`. Without `NUMBER` it takes the issue the current
+branch's PR closes (`Fixes #N`, or an issue/work-item URL in the PR body); it refuses to guess if
+that is none or several. If the issue's newest comment already is a "Taken by ..." claim (by anyone) it
+says so and posts nothing, so it's safe to run repeatedly -- including before `bdt issue do`.
+
 ## `bdt worktree`
 
 ```bash
@@ -548,6 +590,10 @@ it can't see through):
 
 - **`sql-inline-too-complex`** — more than a trivial (≤4 line) query, or a
   JOIN/CTE/subquery/aggregation, inline instead of `load_sql()`/a `.sql` file.
+  Simple `INSERT`/`UPDATE`/`DELETE` are exempt from the line limit; `INSERT ... SELECT`,
+  `UPDATE ... FROM` and `DELETE ... USING` still count as complex.
+  Also applied to any `*_sql`/`*_SQL` variable assigned a literal, even if it never reaches an
+  `.execute()` call in the same file (e.g. it's handed to a helper).
 - **`sql-fstring-injection`** / **`sql-concat-injection`** /
   **`sql-percent-format-injection`** / **`sql-format-injection`** — SQL built
   with an f-string, `+` concatenation, the `%` operator, or `str.format()`

{bmsdna_devtools-0.28.1 → bmsdna_devtools-0.30.0}/README.md

@@ -1,7 +1,7 @@
 # bmsdna-devtools
 
-Shared developer tooling for BMS projects: PR build/check status, PR
-creation, issue/work item creation and comments, git worktrees (creation and
+Shared developer tooling for BMS projects: PR build/check status and a
+one-shot PR summary (`bdt pr info`), PR creation, claiming an issue (`bdt issue take`), issue/work item creation and comments, git worktrees (creation and
 merged-worktree/orphaned-test-DB cleanup), a commit-and-push helper with
 pre-flight checks, Azure log queries, and static checks (`bdt lint`) for
 postgres/psycopg SQL rules, pydantic-model placement, hand-wired HTTP access in
@@ -35,9 +35,12 @@ Find the PR opened from the current branch and report build/check status
 GitHub — whichever `origin` points at.
 
 ```bash
-bdt pr status [--target-branch main] [--wait]
+bdt pr status [--target-branch dev] [--wait]
 ```
 
+Every `--target` / `--target-branch` option in bdt (`pr create/status/info/retry/publish/update/comment/watch-deploy`,
+`issue take`, `commit`) defaults to `dev`; pass `--target main` (or whatever your PRs go into) to override.
+
 If the PR can't be merged, that's reported immediately instead of polling
 for builds/checks that will never run — e.g. on Azure DevOps:
 `PR #42 ('feat: widgets') has merge conflicts with the target branch (mergeStatus=conflicts)`;
@@ -72,6 +75,25 @@ locally at all. `bdt pr retry`, `pr publish`, `pr update`, and `pr comment`
 all accept the same option, for the same reason. (`pr watch-deploy` doesn't:
 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 dev]
+```
+
+One-shot summary of the current branch's PR: link, state (open/merged/closed, draft), aggregate
+build state (`passing`, `failing`, `pending`, `waiting` for a manual approval, `none`) and the
+issue(s)/work item(s) it closes, with links. Exits 1 when the branch has no PR. `--json` is what
+a status integration reads (e.g. the Claude Code mod planned in bmsuisse/skills#61). Build state is judged the way `bdt pr status` does: on GitHub from
+the check rollup (only a failed check fails it; skipped/cancelled ones don't count), on Azure DevOps
+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.
+
+Azure DevOps limits: the PR is found by the current branch into `--target-branch` (default `dev`),
+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
+`bdt pr create --issue`.
+
 ## `bdt pr retry`
 
 Retry only the **failed** job(s)/stage(s) of the most recent build/run for the
@@ -79,7 +101,7 @@ PR opened from the current branch — not a whole new build/run. Whenever `bdt
 pr status` reports a failure, it prints a hint to run this.
 
 ```bash
-bdt pr retry [--target-branch main]
+bdt pr retry [--target-branch dev]
 ```
 
 No build/run ID needed — like `bdt pr status`, it resolves the PR (and its
@@ -112,7 +134,7 @@ workflow run triggered *directly* on `--target-branch` and reports its
 status the same way `pr status` does (failed steps print their logs inline).
 
 ```bash
-bdt pr watch-deploy [--target-branch main] [--wait]
+bdt pr watch-deploy [--target-branch dev] [--wait]
 ```
 
 After `bdt pr status` reports the PR's build/checks succeeded, if a build/
@@ -133,7 +155,7 @@ branch. Failed steps are printed via `gh run view <id> --log-failed`.
 ## `bdt pr create`
 
 ```bash
-bdt pr create --target main   # or --target test
+bdt pr create --target dev   # or --target main / test
 ```
 
 Creates a PR from the current branch into `--target`. On Azure DevOps,
@@ -141,7 +163,7 @@ a thin wrapper around `az repos pr create` (org/project/repo inferred by
 `az` itself from the git remote). On GitHub, `gh pr create --fill` (autofills
 title/body from commit info so it never blocks on an interactive prompt).
 Extra arguments pass through either way, e.g.
-`bdt pr create --target main -- --title "..."`.
+`bdt pr create --target dev -- --title "..."`.
 
 PRs are created as **drafts by default**; a successful create always prints
 the PR's link plus `bdt pr publish` (which abstracts over the host) to mark
@@ -285,6 +307,26 @@ description and runs `claude -p "<prompt>" --name "60: <title>"`, so the session
 with `claude --resume`. `--agent` picks another executable (it then gets just the prompt as its
 last argument); extra args are passed through; `--dry-run` prints the command.
 
+It takes the issue first (like `bdt issue take`): before the agent starts it comments `Taken by <you>`
+on the issue, naming the session it is about to start -- for `claude` a `--session-id` is generated and
+passed, so the comment says `claude --resume <id>`; the prompt tells the agent not to take it again. For
+another `--agent` the comment just says `(via <agent>)`. `--dry-run` posts nothing. Like `issue take`, it doesn't comment again when the newest comment already is a claim.
+
+## `bdt issue take`
+
+```bash
+bdt issue take [NUMBER] [--target-branch dev]
+```
+
+Claims an issue (GitHub) or work item (Azure DevOps): comments `Taken by <you>` on it, followed by the
+running coding agent's session (the same `<Agent> Session: <id>` note every bdt comment gets: a
+claude.ai link under a bridged Claude session, otherwise the bare session id; nothing outside an
+agent), so others can see who is on it. `<you>` is the GitHub login
+`gh` is authenticated as, else the git `user.name`. Without `NUMBER` it takes the issue the current
+branch's PR closes (`Fixes #N`, or an issue/work-item URL in the PR body); it refuses to guess if
+that is none or several. If the issue's newest comment already is a "Taken by ..." claim (by anyone) it
+says so and posts nothing, so it's safe to run repeatedly -- including before `bdt issue do`.
+
 ## `bdt worktree`
 
 ```bash
@@ -535,6 +577,10 @@ it can't see through):
 
 - **`sql-inline-too-complex`** — more than a trivial (≤4 line) query, or a
   JOIN/CTE/subquery/aggregation, inline instead of `load_sql()`/a `.sql` file.
+  Simple `INSERT`/`UPDATE`/`DELETE` are exempt from the line limit; `INSERT ... SELECT`,
+  `UPDATE ... FROM` and `DELETE ... USING` still count as complex.
+  Also applied to any `*_sql`/`*_SQL` variable assigned a literal, even if it never reaches an
+  `.execute()` call in the same file (e.g. it's handed to a helper).
 - **`sql-fstring-injection`** / **`sql-concat-injection`** /
   **`sql-percent-format-injection`** / **`sql-format-injection`** — SQL built
   with an f-string, `+` concatenation, the `%` operator, or `str.format()`

{bmsdna_devtools-0.28.1 → bmsdna_devtools-0.30.0}/bmsdna/devtools/ado_issue.py

@@ -314,6 +314,17 @@ def add_comment(session: requests.Session, remote: AdoRemote, work_item_id: int,
     return r.json()
 
 
+def last_comment(session: requests.Session, remote: AdoRemote, work_item_id: int) -> str | None:
+    """Text (HTML, as stored) of the work item's newest comment, or None if it has none."""
+    r = session.get(
+        f"{_base_url(remote)}/_apis/wit/workItems/{work_item_id}/comments",
+        params={"api-version": COMMENTS_API_VERSION, "$top": 1, "order": "desc"},
+    )
+    r.raise_for_status()
+    comments = r.json().get("comments") or []
+    return comments[0].get("text") if comments else None
+
+
 def update_comment(session: requests.Session, remote: AdoRemote, work_item_id: int, comment_id: int, text: str) -> dict:
     r = session.patch(
         f"{_base_url(remote)}/_apis/wit/workItems/{work_item_id}/comments/{comment_id}",
@@ -379,14 +390,20 @@ def comment_with_screenshots(
     message: str | None,
     screenshot_paths: list[str],
     file_paths: list[str] | None = None,
+    agent_note: bool = True,
 ) -> dict:
-    """Post a comment, with a message and/or screenshots/files, on the work item."""
+    """Post a comment, with a message and/or screenshots/files, on the work item.
+
+    `agent_note=False` leaves out the detected agent-session note (see `gh_issue.comment`).
+    """
     file_paths = file_paths or []
     images = _upload_attachments(session, remote, screenshot_paths) if screenshot_paths else []
     files = _upload_attachments(session, remote, file_paths) if file_paths else []
     if images or files:
         link_attachments(session, remote, work_item_id, images + files)
-    content = ensure_agent_session_note(build_comment_content_html(message, images, files)) or ""
+    content = build_comment_content_html(message, images, files) or ""
+    if agent_note:
+        content = ensure_agent_session_note(content) or ""
     comment = add_comment(session, remote, work_item_id, content)
     print(
         f"Added comment #{comment['id']} ({len(screenshot_paths)} screenshot(s), {len(file_paths)} file(s)) "

{bmsdna_devtools-0.28.1 → bmsdna_devtools-0.30.0}/bmsdna/devtools/cli.py

@@ -1,8 +1,10 @@
 from __future__ import annotations
 
 import json
+import re
 import subprocess
 import sys
+import uuid
 from collections.abc import Callable
 from datetime import datetime, timedelta, timezone
 from importlib.metadata import version as _pkg_version
@@ -20,9 +22,9 @@ from . import gh_issue, gh_pr
 from . import find_injection as find_injection_mod
 from . import lint as lint_mod
 from . import logs as logs_mod
-from . import pr_build, 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_labels, pull as pull_mod, worktree as worktree_mod
 from .ado_auth import auth_header
-from .cli_tools import detect_agent_session, require_az, require_gh
+from .cli_tools import CLI_TIMEOUT_SECS, detect_agent_session, require_az, require_gh
 from .gitrepo import AdoRemote, GitHubRemote, UnknownRemoteError, current_branch, current_remote, head_commit_subject
 
 # Non-ASCII output (checkmarks, en-dashes in ADO project names, etc.) needs a
@@ -34,6 +36,9 @@ if sys.platform == "win32":
 
 __version__ = _pkg_version("bmsdna-devtools")
 
+# What `--target` / `--target-branch` mean when not given: the branch PRs normally go into.
+DEFAULT_TARGET_BRANCH = "dev"
+
 app = typer.Typer(
     name="bdt",
     help=f"Shared BMS developer tooling: PRs/builds (Azure DevOps or GitHub), worktrees, commits, logs (v{__version__})",
@@ -115,6 +120,14 @@ def _resolve_ado_pr(pat: str | None, remote: AdoRemote, target: str, pr_id: int
     return session, pr
 
 
+def _current_pr_info(pr_id: int | None, target_branch: str, pat: str | None) -> pr_info_mod.PrInfo:
+    remote = current_remote()
+    if isinstance(remote, GitHubRemote):
+        return pr_info_mod.github_info(gh_pr.get_pr(require_gh(), pr_id, fields=gh_pr.PR_INFO_FIELDS), remote)
+    session, pr = _resolve_ado_pr(pat, remote, target_branch, pr_id=pr_id)
+    return pr_info_mod.ado_info(session, pr, remote)
+
+
 def _gh_branch_for(gh: str, 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
@@ -219,7 +232,7 @@ def _link_and_label_ado(session: requests.Session, remote: AdoRemote, pr_id: int
 
 @pr_app.command("create")
 def pr_create(
-    target: str = typer.Option("main", "--target", help="Target branch (e.g. main, test)"),
+    target: str = typer.Option(DEFAULT_TARGET_BRANCH, "--target", help="Target branch (e.g. dev, main, test)"),
     draft: bool = typer.Option(
         True,
         "--draft/--no-draft",
@@ -371,7 +384,7 @@ def pr_create(
 
 @pr_app.command("publish")
 def pr_publish(
-    target: str = typer.Option("main", "--target", help="Target branch of the PR (Azure DevOps only)"),
+    target: str = typer.Option(DEFAULT_TARGET_BRANCH, "--target", help="Target branch of the PR (Azure DevOps only)"),
     pr_id: int | None = typer.Option(None, "--pr-id", help=_PR_ID_HELP),
     pat: str | None = typer.Option(
         None,
@@ -393,7 +406,7 @@ def pr_publish(
 
 @pr_app.command("status")
 def pr_status(
-    target_branch: str = typer.Option("main", "--target-branch", help="Target branch of the PR (Azure DevOps only — gh has no equivalent filter, it always resolves the PR for the current branch)"),
+    target_branch: str = typer.Option(DEFAULT_TARGET_BRANCH, "--target-branch", help="Target branch of the PR (Azure DevOps only — gh has no equivalent filter, it always resolves the PR for the current branch)"),
     wait: bool = typer.Option(False, "--wait", help="Poll until all pipelines/checks are completed; stops early and reports status if one needs manual approval"),
     pr_id: int | None = typer.Option(None, "--pr-id", help=_PR_ID_HELP),
     pat: str | None = typer.Option(None, "--pat", envvar=["AZURE_DEVOPS_EXT_PAT", "AZURE_DEVOPS_PAT"], help="Azure DevOps PAT (else falls back to `az` login)"),
@@ -408,9 +421,30 @@ def pr_status(
     pr_build.run(remote, pat, target_branch, wait, pr_id=pr_id)
 
 
+@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 = typer.Option(DEFAULT_TARGET_BRANCH, "--target-branch", help="Target branch of the PR (Azure DevOps only)"),
+    pr_id: int | None = typer.Option(None, "--pr-id", help=_PR_ID_HELP),
+    pat: str | None = typer.Option(None, "--pat", envvar=["AZURE_DEVOPS_EXT_PAT", "AZURE_DEVOPS_PAT"], help="Azure DevOps PAT (else falls back to `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).
+    """
+    info = _current_pr_info(pr_id, 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}")
+
+
 @pr_app.command("retry")
 def pr_retry(
-    target_branch: str = typer.Option("main", "--target-branch", help="Target branch of the PR (Azure DevOps only)"),
+    target_branch: str = typer.Option(DEFAULT_TARGET_BRANCH, "--target-branch", help="Target branch of the PR (Azure DevOps only)"),
     pr_id: int | None = typer.Option(None, "--pr-id", help=_PR_ID_HELP),
     pat: str | None = typer.Option(
         None,
@@ -432,7 +466,7 @@ def pr_retry(
 
 @pr_app.command("watch-deploy")
 def pr_watch_deploy(
-    target_branch: str = typer.Option("main", "--target-branch", help="Branch to watch for a directly-triggered build/workflow run (e.g. a post-merge deployment pipeline)"),
+    target_branch: str = typer.Option(DEFAULT_TARGET_BRANCH, "--target-branch", help="Branch to watch for a directly-triggered build/workflow run (e.g. a post-merge deployment pipeline)"),
     wait: bool = typer.Option(False, "--wait", help="Poll until the build/workflow run(s) are completed; stops early and reports status if one needs manual approval"),
     pat: str | None = typer.Option(
         None,
@@ -467,7 +501,7 @@ def pr_update(
     file: list[str] = typer.Option(
         [], "--file", help="Path to an arbitrary file to append to the PR description as a linked attachment (repeatable)"
     ),
-    target: str = typer.Option("main", "--target", help="Target branch of the PR (Azure DevOps only)"),
+    target: str = typer.Option(DEFAULT_TARGET_BRANCH, "--target", help="Target branch of the PR (Azure DevOps only)"),
     pr_id: int | None = typer.Option(None, "--pr-id", help=_PR_ID_HELP),
     pat: str | None = typer.Option(
         None,
@@ -510,7 +544,7 @@ def pr_comment(
     file: list[str] = typer.Option(
         [], "--file", help="Path to an arbitrary file to link in the comment as an attachment (repeatable)"
     ),
-    target: str = typer.Option("main", "--target", help="Target branch of the PR (Azure DevOps only)"),
+    target: str = typer.Option(DEFAULT_TARGET_BRANCH, "--target", help="Target branch of the PR (Azure DevOps only)"),
     pr_id: int | None = typer.Option(None, "--pr-id", help=_PR_ID_HELP),
     pat: str | None = typer.Option(
         None,
@@ -717,7 +751,86 @@ def issue_do(
         session = requests.Session()
         session.headers.update(auth_header(pat))
         title, body = issue_do_mod.fetch_ado(session, remote, number)
-    issue_do_mod.run(number, title, body, agent=agent, extra=list(ctx.args), dry_run=dry_run)
+    extra = list(ctx.args)
+    # claude can be given the session id up front, so the "Taken by" comment can link the session that will exist
+    session_id = str(uuid.uuid4()) if agent == "claude" and "--session-id" not in extra else None
+    if dry_run:
+        typer.echo(f"(dry run: would comment 'Taken by ...' on #{number} first)", err=True)
+    else:
+        _take(remote, number, issue_do_mod.take_message(_current_user(remote), agent, session_id), pat, agent_note=False)
+    issue_do_mod.run(number, title, body, agent=agent, extra=extra, dry_run=dry_run, session_id=session_id)
+
+
+@issue_app.command("take")
+def issue_take(
+    number: int | None = typer.Argument(None, help="Issue number (GitHub) or work item ID (Azure DevOps). Default: the issue the current branch's PR closes"),
+    target_branch: str = typer.Option(DEFAULT_TARGET_BRANCH, "--target-branch", help="Target branch of the PR (Azure DevOps only; only used to find the issue when no number is given)"),
+    pat: str | None = typer.Option(None, "--pat", envvar=["AZURE_DEVOPS_EXT_PAT", "AZURE_DEVOPS_PAT"], help="Azure DevOps PAT (else falls back to `az` login)"),
+) -> None:
+    """Claim an issue / work item: comment "Taken by <you>" on it, with this coding agent's
+    session link (detected automatically) so others can see who is working on it and find the session.
+    """
+    remote = current_remote()
+    if number is None:
+        issues = _current_pr_info(None, target_branch, pat).issues
+        if len(issues) != 1:
+            raise typer.BadParameter(
+                f"The current branch's PR closes {len(issues)} issues, so can't tell which to take -- pass the number"
+                if issues
+                else "No issue number given, and the current branch's PR doesn't reference one (e.g. 'Fixes #N')"
+            )
+        number = issues[0].number
+    _take(remote, number, f"{issue_do_mod.TAKEN_PREFIX} {_current_user(remote)}", pat)
+
+
+def _take(remote: AdoRemote | GitHubRemote, number: int, message: str, pat: str | None, *, agent_note: bool = True) -> None:
+    """Comment `message` ("Taken by ...") on the issue -- unless its newest comment already is such a
+    claim, so running this twice (or `issue do` after `issue take`) doesn't post it again."""
+    kind = "issue" if isinstance(remote, GitHubRemote) else "work item"
+    if issue_do_mod.is_take_comment(_last_comment(remote, number, pat)):
+        typer.echo(f"{kind.capitalize()} #{number} is already taken (its last comment says so) -- not commenting again")
+        return
+    typer.echo(f"Taking {kind} #{number}")
+    _comment_on_issue(remote, number, message, pat, agent_note=agent_note)
+
+
+def _last_comment(remote: AdoRemote | GitHubRemote, number: int, pat: str | None) -> str | None:
+    if isinstance(remote, GitHubRemote):
+        return gh_issue.last_comment(require_gh(), remote.owner, remote.repo, number)
+    session = requests.Session()
+    session.headers.update(auth_header(pat))
+    return ado_issue.last_comment(session, remote, number)
+
+
+def _comment_on_issue(remote: AdoRemote | GitHubRemote, number: int, message: str, pat: str | None, *, agent_note: bool = True) -> None:
+    if isinstance(remote, GitHubRemote):
+        gh_issue.comment(require_gh(), remote.owner, remote.repo, number, message, [], agent_note=agent_note)
+    else:
+        session = requests.Session()
+        session.headers.update(auth_header(pat))
+        ado_issue.comment_with_screenshots(session, remote, number, message, [], [], agent_note=agent_note)
+
+
+def _current_user(remote: AdoRemote | GitHubRemote) -> str:
+    """Who to say took an issue: the GitHub login `gh` is authenticated as, else the git `user.name`."""
+    if isinstance(remote, GitHubRemote):
+        r = _capture([require_gh(), "api", "user", "--jq", ".login"])
+        if r and r.returncode == 0 and r.stdout.strip():
+            return r.stdout.strip()
+    r = _capture(["git", "config", "user.name"])
+    # `git config user.name` comes from the (possibly cloned-from-elsewhere) repo's own config and ends up in a
+    # markdown/HTML comment, so keep it to plain name characters: no links, tags or @mentions
+    name = re.sub(r"[^\w .'-]", "", r.stdout if r else "").strip()[:64]
+    return name or "unknown"
+
+
+def _capture(cmd: list[str]) -> subprocess.CompletedProcess | None:
+    """Run `cmd` for its UTF-8 output, bounded so a stalled `gh` (expired login prompting) can't hang the
+    caller; None on timeout."""
+    try:
+        return subprocess.run(cmd, capture_output=True, encoding="utf-8", timeout=CLI_TIMEOUT_SECS, check=False)
+    except subprocess.TimeoutExpired:
+        return None
 
 
 @issue_app.command("update")
@@ -1116,7 +1229,7 @@ def commit(
     subrepo: list[str] = typer.Option([], "--subrepo", help="Submodule directory name to split matching files into (repeatable)"),
     skip_message_check: bool = typer.Option(False, "--skip-message-check", help="Don't require a conventional-commit-style message"),
     allow_main: bool = typer.Option(False, "--allow-main", help="Allow committing directly on main/master"),
-    target: str = typer.Option("main", "--target", help="Target branch of the PR to draft on a 'feat' commit (Azure DevOps only)"),
+    target: str = typer.Option(DEFAULT_TARGET_BRANCH, "--target", help="Target branch of the PR to draft on a 'feat' commit (Azure DevOps only)"),
     pat: str | None = typer.Option(
         None,
         "--pat",

{bmsdna_devtools-0.28.1 → bmsdna_devtools-0.30.0}/bmsdna/devtools/gh_issue.py

@@ -366,12 +366,19 @@ def comment(
     message: str | None,
     screenshot_paths: list[str],
     file_paths: list[str] | None = None,
+    agent_note: bool = True,
 ) -> None:
-    """Post a comment, with a message and/or screenshots/files, on a GitHub issue."""
+    """Post a comment, with a message and/or screenshots/files, on a GitHub issue.
+
+    `agent_note=False` leaves out the detected agent-session note, for a caller (`bdt issue do`) that
+    is not itself the agent and writes the right session into `message` instead.
+    """
     file_paths = file_paths or []
     images = _screenshot_images(owner, repo, f"issue-{number}", screenshot_paths) if screenshot_paths else []
     files = _file_links(owner, repo, f"issue-{number}", file_paths) if file_paths else []
-    content = ensure_agent_session_note(build_comment_content(message, images, files)) or ""
+    content = build_comment_content(message, images, files) or ""
+    if agent_note:
+        content = ensure_agent_session_note(content) or ""
     url = _run_gh(gh, ["issue", "comment", str(number), "--body", content])
     comment_id = parse_comment_id(url)
     suffix = f" (comment #{comment_id})" if comment_id else ""
@@ -379,6 +386,19 @@ def comment(
     print(url)
 
 
+_LAST_COMMENT_QUERY = (
+    "query($owner: String!, $repo: String!, $number: Int!) { repository(owner: $owner, name: $repo) "
+    "{ issue(number: $number) { comments(last: 1) { nodes { body } } } } }"
+)
+
+
+def last_comment(gh: str, owner: str, repo: str, number: int) -> str | None:
+    """Text of the issue's newest comment, or None if it has none."""
+    out = _run_gh(gh, ["api", "graphql", "-f", f"query={_LAST_COMMENT_QUERY}", "-f", f"owner={owner}", "-f", f"repo={repo}", "-F", f"number={number}"])
+    nodes = json.loads(out)["data"]["repository"]["issue"]["comments"]["nodes"]
+    return nodes[-1]["body"] if nodes else None
+
+
 def update_comment(gh: str, owner: str, repo: str, comment_id: str, text: str) -> None:
     _run_gh(gh, ["api", "--method", "PATCH", f"repos/{owner}/{repo}/issues/comments/{comment_id}", "-f", f"body={text}"])
     print(f"Updated comment #{comment_id}")

{bmsdna_devtools-0.28.1 → bmsdna_devtools-0.30.0}/bmsdna/devtools/gh_pr.py

@@ -23,6 +23,8 @@ from .cli_tools import CLI_TIMEOUT_SECS, EXIT_NEEDS_APPROVAL, PollHeartbeat, det
 from .pr_markdown import build_attachments_section, build_comment_content, build_screenshots_section
 
 PR_VIEW_FIELDS = "number,title,baseRefName,headRefName,mergeable,statusCheckRollup,isDraft"
+# What `bdt pr info` needs on top of the check rollup: where to link to, and the issues GitHub says it closes.
+PR_INFO_FIELDS = "number,title,url,state,isDraft,closingIssuesReferences,statusCheckRollup"
 
 # GitHub has no API for uploading images to a PR description (only the web
 # UI's drag-and-drop, which needs a browser session). The standard
@@ -99,14 +101,16 @@ def _pr_id_args(pr_id: int | None) -> list[str]:
     return [str(pr_id)] if pr_id is not None else []
 
 
-def get_pr(gh: str, pr_id: int | None = None) -> dict:
+def get_pr(gh: str, pr_id: int | None = None, fields: str = PR_VIEW_FIELDS) -> dict:
     """The PR for the current branch, however `gh` resolves it — there's no
     target-branch filter on `gh pr view` the way ADO's search API has one.
 
     If `pr_id` is given, resolves that PR directly instead -- lets a caller act on a
     specific PR without needing its branch checked out locally at all.
+
+    `fields` is the `--json` field list; defaults to what `bdt pr status` needs.
     """
-    args = ["pr", "view", *_pr_id_args(pr_id), "--json", PR_VIEW_FIELDS]
+    args = ["pr", "view", *_pr_id_args(pr_id), "--json", fields]
     return _run_gh_json(gh, args)
 
 

{bmsdna_devtools-0.28.1 → bmsdna_devtools-0.30.0}/bmsdna/devtools/issue_do.py

@@ -19,6 +19,7 @@ from .ado_issue import _base_url
 from .gitrepo import AdoRemote
 
 _HTML_TAG_RE = re.compile(r"<[^>]+>")
+TAKEN_PREFIX = "Taken by"
 
 
 def fetch_github(gh: str, number: int) -> tuple[str, str]:
@@ -49,20 +50,37 @@ def build_prompt(number: int, title: str, body: str) -> str:
     return (
         f"Work on issue {number}: {title}\n\n{body.strip() or '(no description)'}\n\n"
         "Follow the dev-workflow skill: worktree, draft PR early, implement, test, publish the PR "
-        f"and reference issue {number} in it. Do not merge."
+        f"and reference issue {number} in it. Do not merge. `bdt issue do` has already marked "
+        f"issue {number} as taken (with this session), so don't run `bdt issue take`."
     )
 
 
-def build_command(agent: str, number: int, title: str, body: str, extra: list[str]) -> list[str]:
+def is_take_comment(text: str | None) -> bool:
+    """Is `text` (a comment, markdown or ADO HTML) a "Taken by ..." claim -- what `take_message` and
+    `bdt issue take` post?"""
+    return _HTML_TAG_RE.sub("", text or "").strip().startswith(TAKEN_PREFIX)
+
+
+def take_message(user: str, agent: str, session_id: str | None) -> str:
+    """The "Taken by" comment `bdt issue do` posts before the agent starts. It names the session itself,
+    because the agent's own session doesn't exist yet and `bdt`'s auto-detected one (if `bdt issue do` is
+    run from inside an agent) would be the wrong one."""
+    if session_id is None:
+        return f"{TAKEN_PREFIX} {user} (via {agent})"
+    return f"{TAKEN_PREFIX} {user}\n\nClaude Session: {session_id} (resume with `claude --resume {session_id}`)"
+
+
+def build_command(agent: str, number: int, title: str, body: str, extra: list[str], session_id: str | None = None) -> list[str]:
     prompt = build_prompt(number, title, body)
     if agent == "claude":
-        return [agent, "-p", prompt, "--name", session_name(number, title), *extra]
+        session = ["--session-id", session_id] if session_id else []
+        return [agent, "-p", prompt, "--name", session_name(number, title), *session, *extra]
     # Other agents: no known naming flag, so just hand over the prompt.
     return [agent, *extra, prompt]
 
 
-def run(number: int, title: str, body: str, *, agent: str, extra: list[str], dry_run: bool) -> None:
-    cmd = build_command(agent, number, title, body, extra)
+def run(number: int, title: str, body: str, *, agent: str, extra: list[str], dry_run: bool, session_id: str | None = None) -> None:
+    cmd = build_command(agent, number, title, body, extra, session_id)
     if dry_run:
         print(" ".join(json.dumps(c) if " " in c or "\n" in c else c for c in cmd))
         return