agentic-devtools 0.2.49__tar.gz → 0.2.51__tar.gz

agentic_devtools-0.2.51/.github/agents/agdt.pr-merge-manager.agent.md

@@ -0,0 +1,31 @@
+---
+description: "PR Merge Manager: Poll PR state, address Copilot review comments, approve and merge when green"
+---
+
+## User Input
+
+```text
+$ARGUMENTS
+```
+
+You **MUST** consider the user input before proceeding (if not empty).
+Expected input flags: `--pr <number>` (required), `--repo <owner/repo>` (optional,
+defaults to the current repository), plus optional tuning flags `--max-iterations <number>`
+and `--poll-interval <seconds>`. See `.github/prompts/agdt.pr-merge-manager.prompt.md`
+for the full flag set.
+
+## Purpose
+
+Automate the repetitive PR completion loop: poll the PR and its latest Copilot review
+for the current head commit, delegate to `/agdt.address-copilot-review` when feedback
+exists, and approve then merge when all checks are green — repeating until the PR
+reaches a terminal state (merged, closed, or locked).
+
+## Instructions
+
+Follow the detailed instructions in the corresponding prompt file
+(`.github/prompts/agdt.pr-merge-manager.prompt.md`).
+
+## Next Step
+
+Task is complete when the PR is merged, closed, or blocked.

{agentic_devtools-0.2.49 → agentic_devtools-0.2.51}/.github/copilot-instructions.md

@@ -329,6 +329,36 @@ NEW STEP: implementation-review
 ...
 ```
 
+### Issue Key (Provider-Agnostic)
+
+The top-level `issue_key` is the canonical, provider-agnostic issue identifier. It supports
+both Jira keys (`PROJECT-1234`) and GitHub issue numbers (`#42`, `42`):
+
+```bash
+# Primary way to set the current issue identifier (provider-agnostic)
+agdt-set issue_key 42
+
+# Jira-specific legacy key (backward compatible — continues to work)
+agdt-set jira.issue_key PROJECT-1234
+```
+
+Numeric issue IDs (e.g., `42`) are JSON-parsed as integers by `agdt-set`.
+Read paths that resolve the current issue key normalize that value to its
+string representation, so `agdt-set issue_key 42` and `agdt-set issue_key "42"`
+produce equivalent behavior.
+
+All core functions that resolve an issue key check `issue_key` first, then fall back to
+`jira.issue_key`. Both keys can coexist with different values — setting one does **not**
+clear the other. Both are context-switching keys — setting either one clears
+`pull_request_id`, and setting `pull_request_id` clears both `issue_key` and `jira.issue_key`.
+
+**Resolution priority** (used by `_get_issue_key_from_state`, `resolve_worktree_key`, etc.):
+
+1. `issue_key` (top-level, provider-agnostic)
+2. `jira.issue_key` (legacy Jira-specific key)
+3. Workflow context `jira_issue_key` (for active workflows)
+4. `pull_request_id` (fallback used by `resolve_worktree_key` when no issue key is set)
+
 ### Jira Namespace
 
 Jira commands use keys prefixed with `jira.`:
@@ -449,10 +479,27 @@ Use `--completed` to mark checklist items during commit:
 agdt-git-save-work --completed 1 2 3  # Marks items 1, 2, 3 complete before committing
 ```
 
+**Optional CLI flags:**
+
+- `--dry-run` - Preview operations without executing
+- `--skip-stage` - Skip the staging step
+- `--skip-push` - Skip the push step
+- `--skip-rebase` - Skip the fetch/rebase onto main step
+
+```bash
+agdt-git-save-work --dry-run
+agdt-git-save-work --skip-stage --skip-push
+agdt-set commit_message "feat([#42](https://github.com/ayaiayorg/agentic-devtools/issues/42)): my change
+
+[#42](https://github.com/ayaiayorg/agentic-devtools/issues/42)"
+agdt-git-save-work --skip-push
+```
+
 **Optional Git state keys:**
 
 - `dry_run` - Preview operations without executing
 - `skip_stage` - Skip the staging step
+- `skip_push` - Skip the push step
 - `skip_publish` - Skip branch publish after initial commit
 
 ### Jira Actions (Background Tasks)
@@ -1839,6 +1886,22 @@ agdt-add-jira-comment  # Previews without posting
 | `.agdt/workflows/…/reviews/review-state.json` | `agdt-review-pull-request` | Hierarchical review state (thread IDs, statuses, suggestions) |
 | `.agdt/workflows/…/temp-<workflow>-<step>-prompt.md` | Workflow initiation commands | Rendered workflow prompts |
 
+### Commit Hash Source of Truth
+
+The PR commit hash is stored in multiple locations, each serving a distinct purpose.
+
+| Location | Field | Format | Purpose |
+|----------|-------|--------|---------|
+| `review-state.json` | `commitHash` | Full 40-char SHA | **Canonical** source of truth for the reviewed commit, set from `lastMergeSourceCommit.commitId` during scaffolding |
+| `state.json` | `review.commit_hash_short` | First 12 chars | Derived from the canonical hash; used as the artifact directory name under `pull-request-review/` |
+| `review-state.json` | `sessions[].commitHash` | Full 40-char SHA | Records which commit each individual review session targeted (may differ across sessions after new pushes) |
+| Artifact directory | `pull-request-review/<hash>/` | First 12 chars | On-disk directory scoping review prompts and queue files, derived from the canonical hash |
+
+`review-state.json` → `commitHash` is the **canonical** full commit hash for the PR under review.
+`state.json` → `review.commit_hash_short` is **derived** from it (first 12 characters) and used for artifact directory resolution.
+Legacy 8-character directory names may still be recognized as a backward-compatibility fallback.
+Per-session `commitHash` records which specific commit each review session targeted, which may differ from the top-level `commitHash` when the PR is re-reviewed after new pushes.
+
 ### Background Task Storage Structure
 
 Background tasks use a separate storage structure in `.agdt/workflows/…/background-tasks/`:

{agentic_devtools-0.2.49 → agentic_devtools-0.2.51}/.github/prompts/agdt.address-copilot-review.prompt.md

@@ -206,6 +206,24 @@ COMMIT_FULL=$(git log -1 --format="%H")
 COMMIT_SHORT=$(git log -1 --format="%h")
 ```
 
+### Verify Push Was Successful
+
+After `agdt-git-save-work` completes, confirm the local commit was pushed to the
+remote and that the PR head now matches:
+
+```bash
+REMOTE_SHA=$(gh pr view {pr_number} --repo {owner}/{repo} --json headRefOid --jq '.headRefOid')
+REMOTE_SHA_SHORT=$(echo "$REMOTE_SHA" | cut -c1-7)
+```
+
+Compare `REMOTE_SHA` with `COMMIT_FULL`. If they do not match:
+
+1. Print `⚠️ Push verification failed — remote head ({REMOTE_SHA_SHORT}) ≠ local ({COMMIT_SHORT}). Retrying push.`
+2. Run `agdt-git-force-push` and `agdt-task-wait`.
+3. Re-verify with the same `gh pr view` command.
+4. If the SHAs still do not match after the retry, **stop** and report the failure
+   to the user.
+
 ### Edge Case: No Addressable Comments
 
 If every comment was triaged as **not addressable**, skip the commit step and proceed
@@ -244,6 +262,25 @@ gh api "repos/{owner}/{repo}/pulls/{pr_number}/comments/{comment_id}/replies" \
   -f body="<reply text>"
 ```
 
+### Verify Replies Were Posted
+
+After posting all replies, verify each one was actually created:
+
+```bash
+gh api --paginate \
+  "repos/{owner}/{repo}/pulls/{pr_number}/reviews/{review_id}/comments" \
+  --jq '.[] | {id, in_reply_to_id, body}' | jq -s '.'
+```
+
+For each comment you replied to, confirm that a child reply exists (a comment whose
+`in_reply_to_id` matches the original comment's `id`). If any reply is missing:
+
+1. Print `⚠️ Reply to comment {comment_id} was not found — retrying.`
+2. Retry the POST for that specific comment (up to 2 retries).
+3. Re-verify after each retry.
+4. If the reply still cannot be confirmed after retries, log the failure and
+   continue — report it in the Phase 8 summary.
+
 ---
 
 ## Phase 6: Resolve Review Threads
@@ -292,6 +329,39 @@ gh api graphql -f query='mutation {
 }'
 ```
 
+### Step 3 — Verify All Threads Are Resolved
+
+After resolving all threads, re-fetch the review threads to confirm resolution:
+
+```bash
+gh api graphql -f query='query {
+  repository(owner: "{owner}", name: "{repo}") {
+    pullRequest(number: {pr_number}) {
+      reviewThreads(first: 100) {
+        pageInfo { hasNextPage endCursor }
+        nodes {
+          id
+          isResolved
+          comments(first: 1) {
+            nodes { databaseId }
+          }
+        }
+      }
+    }
+  }
+}'
+```
+
+Paginate as in Step 1. Filter to threads whose first comment `databaseId` is in the
+set of comment IDs from Phase 2. For each thread that **should** be resolved but is
+not (`isResolved == false`):
+
+1. Print `⚠️ Thread {thread_id} is still unresolved — retrying.`
+2. Re-run the `resolveReviewThread` mutation (up to 2 retries).
+3. Re-verify after each retry.
+4. If the thread still cannot be resolved after retries, log the failure and
+   report it in the Phase 8 summary.
+
 ---
 
 ## Phase 7: Re-request Copilot Review
@@ -305,6 +375,25 @@ gh api "repos/{owner}/{repo}/pulls/{pr_number}/requested_reviewers" \
 
 The Copilot reviewer's login is always `copilot-pull-request-reviewer[bot]`.
 
+### Verify Review Was Requested
+
+After requesting the review, confirm the request was registered:
+
+```bash
+gh api "repos/{owner}/{repo}/pulls/{pr_number}/requested_reviewers" \
+  --jq '[.users[].login]'
+```
+
+Check that `copilot-pull-request-reviewer[bot]` appears in the returned array.
+If it does not:
+
+1. Print `⚠️ Copilot review request not confirmed — retrying.`
+2. Re-send the POST request (up to 2 retries).
+3. Re-verify after each retry.
+4. If the reviewer still does not appear after retries, log the failure and
+   report it in the Phase 8 summary. The merge-manager parent loop will detect
+   the missing review in its next iteration and can recover.
+
 ---
 
 ## Phase 8: Summary
@@ -325,12 +414,21 @@ After completing all phases, present a summary to the user:
 | 12345 | src/foo.py | 42 | Addressed | Fixed in {COMMIT_SHORT} |
 | 12346 | README.md | 10 | Not addressed | Already correct (explained) |
 
+### Verification
+
+| Step | Status | Details |
+|------|--------|---------|
+| Push to remote | ✅ Verified | Head SHA matches {COMMIT_SHORT} |
+| Replies posted | ✅ Verified | All X replies confirmed |
+| Threads resolved | ✅ Verified | All Y threads resolved |
+| Copilot re-review requested | ✅ Verified | Reviewer appears in requested list |
+
 ### Status
 
-- [x] All comments replied to
-- [x] All threads resolved
-- [x] Copilot re-review requested
-- [x] Commit: {COMMIT_SHORT} (if changes were made)
+- [x] All comments replied to (verified)
+- [x] All threads resolved (verified)
+- [x] Copilot re-review requested (verified)
+- [x] Commit: {COMMIT_SHORT} (push verified)
 ```
 
 ---