A pull request has a failing CI check and a review comment asking for a change. Fix PR #4365 in RooCodeInc/Roo-Code. Get PR details and review comments. gh pr view 4365 --repo RooCodeInc/Roo-Code --json number,title,author,state,body,url,headRefName,baseRefName,files,additions,deletions,changedFiles,comments,reviews,mergeable,mergeStateStatus Get the branch name, list of review comments, and check for mergeability. Check CI status. gh pr checks 4365 --repo RooCodeInc/Roo-Code Identify which check is failing. Get logs for the failing check. gh run list --pr 4365 --repo RooCodeInc/Roo-Code Get the run ID of the failing workflow. View the failed logs. gh run view [run_id] --repo RooCodeInc/Roo-Code --log-failed Find the specific error message causing the test to fail. Check out the pull request branch. gh pr checkout 4365 --repo RooCodeInc/Roo-Code --force The PR branch is now ready for local edits. Summarize findings and ask the user for the next action. I've checked out the branch. I've found a failing test related to 'XYZ' and a review comment asking to rename a variable. How should we proceed? First, apply the change requested in the review comment. Let's start by fixing the failing test. Show me the code for the failing test and the file with the requested change. After pushing the changes, monitor PR checks in real-time. gh pr checks 4365 --repo RooCodeInc/Roo-Code --watch Monitor checks continuously until all complete. The --watch flag provides real-time updates as check statuses change. Always gather all information before proposing a solution. Use the GitHub CLI to get a complete picture of the PR's status. The --watch flag on gh pr checks provides real-time monitoring of CI status. A pull request has review comments requesting UI text changes that require translation updates across all supported languages. Fix PR #1234 in RooCodeInc/Roo-Code - the reviewer asked to change button text and there are some failing tests. Get PR details and analyze changes. gh pr view 1234 --repo RooCodeInc/Roo-Code --json number,title,author,state,body,url,headRefName,baseRefName,files,additions,deletions,changedFiles,comments,reviews Identify the files changed and review feedback requiring UI text modifications. Check out PR and apply the requested changes. gh pr checkout 1234 --repo RooCodeInc/Roo-Code --force Make the requested button text changes in the UI components. Identify translation requirements and delegate to translate mode. translate Translation updates needed for PR #1234 fixes. The following changes were made based on review feedback: Files modified: - webview-ui/src/components/settings/ApiSettings.tsx: Changed button text from "Save" to "Save Configuration" - webview-ui/src/i18n/locales/en/common.json: Updated key "save_button" to "save_config_button" Please update all supported languages (ca, de, es, fr, hi, id, it, ja, ko, nl, pl, pt-BR, ru, tr, vi, zh-CN, zh-TW) with appropriate translations for: - New key "save_config_button" with translation equivalent to "Save Configuration" - Any other text changes that affect user-facing content Ensure consistency across all language files and maintain the same context and tone as existing translations. Translation subtask created and all language files updated. Review and commit changes including translations. git status --porcelain Review the list of modified files to ensure only intended changes are present. Stage only the intended files for commit. git add -u && git commit -m "fix: update button text and translations as requested in review" Using 'git add -u' stages only modified tracked files, avoiding any temporary files. Check if PR is from a fork and push to correct remote. gh pr view 1234 --repo RooCodeInc/Roo-Code --json isCrossRepository,headRepositoryOwner,headRefName Determine if this is a cross-repository PR to know which remote to push to. Push changes to the appropriate remote. git push --force-with-lease origin [branch_name] Push changes safely to update the pull request. Use 'fork' remote instead if PR is from a fork. Monitor CI status in real-time. gh pr checks 1234 --repo RooCodeInc/Roo-Code --watch Watch CI checks continuously until all tests pass. The --watch flag provides automatic updates as check statuses change. Always check if PR fixes involve user-facing content that requires translation. Use new_task with translate mode to ensure consistent translation updates. Include detailed context about what changed and why in translation requests. Verify translation completeness before considering the PR fix complete. Use gh pr view --json to get structured data about PR properties. A pull request has merge conflicts that need to be resolved before other fixes can be applied. Fix PR #5678 in RooCodeInc/Roo-Code - it has merge conflicts and failing tests. Get PR details and check merge status. gh pr view 5678 --repo RooCodeInc/Roo-Code --json number,title,author,state,body,url,headRefName,baseRefName,mergeable,mergeStateStatus Identify that mergeable is false and mergeStateStatus is CONFLICTING. Delegate merge conflict resolution to merge-resolver mode. merge-resolver #5678 The merge-resolver mode will handle checkout, rebase, conflict resolution, and pushing the resolved changes. After merge-resolver completes, check PR status again. gh pr view 5678 --repo RooCodeInc/Roo-Code --json mergeable,mergeStateStatus Verify that the PR is now mergeable after conflict resolution. Check CI status for any remaining failures. gh pr checks 5678 --repo RooCodeInc/Roo-Code Identify any tests that are still failing after the merge conflict resolution. If tests are still failing, proceed with fixing them. gh pr checkout 5678 --repo RooCodeInc/Roo-Code --force Now that conflicts are resolved, we can focus on fixing the failing tests. Apply test fixes and push changes. git add -u && git commit -m "fix: resolve failing tests after merge conflict resolution" Commit the test fixes separately from the merge conflict resolution. Push changes and monitor CI status. git push --force-with-lease origin [branch_name] Push the test fixes to update the PR. Monitor CI checks in real-time. gh pr checks 5678 --repo RooCodeInc/Roo-Code --watch Watch CI checks continuously until all tests pass. Always check for merge conflicts before attempting other fixes. Delegate merge conflict resolution to the specialized merge-resolver mode. The merge-resolver mode handles the entire conflict resolution workflow including pushing. After conflict resolution, continue with other PR fixes like failing tests. Keep conflict resolution commits separate from other fix commits for clarity.