diff --git a/.agents/workflows/resolve-issues.md b/.agents/workflows/resolve-issues.md index c5a07b7b04..af9ff76513 100644 --- a/.agents/workflows/resolve-issues.md +++ b/.agents/workflows/resolve-issues.md @@ -6,7 +6,7 @@ description: Fetch all open GitHub issues, analyze bugs, resolve what's possible ## Overview -This workflow fetches all open issues from the project's GitHub repository, classifies them, analyzes bugs, resolves what can be fixed, and triages issues with insufficient information. **It does NOT commit or release automatically** — it presents a report and waits for user validation before proceeding. +This workflow fetches all open issues from the project's GitHub repository, classifies them, analyzes bugs, resolves what can be fixed, and triages issues with insufficient information. **It does NOT merge or release automatically** — it creates a PR and waits for user validation before merging. ## Steps @@ -60,11 +60,12 @@ Call the `/issue-triage` workflow (located at `~/.gemini/antigravity/global_work Proceed with resolution: -1. **Research** — Search the codebase for files related to the issue -2. **Root Cause** — Identify the root cause by reading the relevant source files -3. **Implement Fix** — Apply the fix following existing code patterns and conventions -4. **Test** — Build the project and run tests to verify the fix -5. **DO NOT commit yet** — Leave changes staged but uncommitted +1. **Create a fix branch** — `git checkout -b fix/issue--` +2. **Research** — Search the codebase for files related to the issue +3. **Root Cause** — Identify the root cause by reading the relevant source files +4. **Implement Fix** — Apply the fix following existing code patterns and conventions +5. **Test** — Build the project and run tests to verify the fix +6. **Commit** — Commit with message format: `fix: (#)` ### 5. Generate Report & Wait for Validation @@ -83,25 +84,37 @@ Present a summary report to the user via `notify_user` with `BlockedOnUser: true - If the user requests changes → Apply the requested adjustments first, then present the report again - If the user rejects → Revert the changes and stop -### 6. Commit All Fixes (only after user approval) +### 6. Commit & Push Fix Branch (only after user approval) After the user validates: - Commit each fix individually with message format: `fix: (#)` -- Each fix should be its own commit for clean git history +- Push the fix branch: `git push origin fix/issue--` +- Create a PR: `gh pr create --title "fix: (#)" --body "
" --base main` -### 7. Close Resolved Issues +### 7. 🛑 WAIT — Notify User & Await PR Verification -For each successfully fixed issue: -// turbo +**This is a mandatory stop point.** Use `notify_user` with `BlockedOnUser: true`: -- Close with a comment: `gh issue close --repo / --comment "Fixed in . The fix will be included in the next release."` +- Inform the user that the PR was created and is **awaiting their verification** +- Include the PR number, URL, and a summary of what was changed +- **DO NOT merge, close issues, generate releases, or deploy until the user confirms** -### 8. Update Docs & Release +Wait for the user to respond: -If any fixes were committed: +- **User confirms** → Proceed to step 8 +- **User requests changes** → Apply changes, push to the same branch, notify again +- **User rejects** → Close the PR and stop -1. Run the `/update-docs` workflow (at `~/.gemini/antigravity/global_workflows/update-docs.md`) to update CHANGELOG and README -2. Run the `/generate-release` workflow (at `.agents/workflows/generate-release.md`) to bump version, tag, and publish +### 8. Merge, Close Issues & Release (only after user confirms PR) + +After the user confirms the PR: + +1. **Merge** the PR: `gh pr merge --merge --repo /` or via local merge +2. **Close** resolved issues with a comment: `gh issue close --repo / --comment "Fixed in . The fix will be included in the next release."` +3. **Switch to main**: `git checkout main && git pull` +4. Run the `/update-docs` workflow (at `~/.gemini/antigravity/global_workflows/update-docs.md`) to update CHANGELOG and README +5. Run the `/generate-release` workflow (at `.agents/workflows/generate-release.md`) to bump version, tag, and publish +6. Deploy to local VPS: `ssh root@192.168.0.15 "npm install -g omniroute@ && pm2 restart omniroute"` If NO fixes were committed, skip this step and just present the report. diff --git a/.agents/workflows/review-prs.md b/.agents/workflows/review-prs.md index 0f8afc8445..6d2361fd82 100644 --- a/.agents/workflows/review-prs.md +++ b/.agents/workflows/review-prs.md @@ -6,7 +6,7 @@ description: Analyze open Pull Requests from the project's GitHub repository, ge ## Overview -This workflow fetches all open PRs from the project's GitHub repository, performs a critical analysis of each one, generates a detailed report, and waits for user approval before proceeding with implementation. +This workflow fetches all open PRs from the project's GitHub repository, performs a critical analysis of each one, generates a detailed report, and waits for user approval before proceeding with implementation. **All improvements are committed on top of the PR branch** and the user must verify before merge. ## Steps @@ -94,28 +94,52 @@ Perform a **global impact assessment** to verify whether the PR changes are comp ### 6. Implementation (if approved) -- Checkout the PR branch or apply changes locally +- Checkout the PR branch: `gh pr checkout ` - Implement any required fixes identified in the analysis -- If the Cross-Layer Analysis (3f) identified missing frontend/backend counterparts, implement them in this step +- If the Cross-Layer Analysis (3f) identified missing frontend/backend counterparts, implement them +- **Commit improvements on top of the PR branch** with descriptive commit messages - Run the project's test suite to verify nothing breaks // turbo - Run: `npm test` or equivalent test command - Build the project to verify compilation // turbo - Run: `npm run build` or equivalent build command -- If all checks pass, prepare the merge +- Push the updated branch: `git push origin ` -### 7. Thank the Contributor +### 7. 🛑 WAIT — Notify User & Await PR Verification -- After the PR is approved (and before or after merging), post a **thank-you comment** on the PR via the GitHub UI or API +**This is a mandatory stop point.** Use `notify_user` with `BlockedOnUser: true`: + +- Inform the user that the PR has been **improved and pushed**, and is **awaiting their verification** +- Include: + - PR number and URL + - Summary of improvements/fixes applied + - Build/test status + - List of files changed +- **DO NOT merge, generate releases, or deploy until the user confirms** + +Wait for the user to respond: + +- **User confirms** → Proceed to step 8 +- **User requests more changes** → Apply changes, push to the same branch, notify again +- **User rejects** → Leave a review comment and stop + +### 8. Thank the Contributor + +- Post a **thank-you comment** on the PR via the GitHub API - The message should: - Thank the author by name/username for their contribution - - Briefly mention what the PR accomplishes + - Briefly mention what the PR accomplishes and any improvements applied - Be friendly, professional, and encouraging - Example: _"Thanks @author for this great contribution! 🎉 The [feature/fix] is now merged and will be part of the next release. We appreciate your effort!"_ -### 8. Post-Merge (if applicable) +### 9. Merge & Release (only after user confirms PR) -- Update CHANGELOG.md with the new feature -- Consider version bump if warranted -- Follow the `/generate-release` workflow if a release is needed +After the user confirms the PR: + +1. **Merge** the PR into main (local merge with `--no-ff` or via `gh pr merge`) +2. **Push** to main: `git push origin main` +3. **Clean up** the feature branch: `git branch -d ` +4. **Update CHANGELOG.md** with the new feature/fix +5. Run the `/generate-release` workflow (at `.agents/workflows/generate-release.md`) to bump version, tag, and publish +6. Deploy to local VPS: `ssh root@192.168.0.15 "npm install -g omniroute@ && pm2 restart omniroute"`