Roo-Code/.roo/rules-pr-fixer/5_examples.xml

<complete_examples>
  <example name="fix_failing_tests_and_address_comments">
    <scenario>
      A pull request has a failing CI check and a review comment asking for a change.
    </scenario>
    
    <user_request>
      Fix PR #4365 in RooCodeInc/Roo-Code.
    </user_request>

    <workflow>
      <step number="1">
        <description>Get PR details and review comments.</description>
        <tool_use>
<execute_command>
<command>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</command>
</execute_command>
        </tool_use>
        <expected_outcome>Get the branch name, list of review comments, and check for mergeability.</expected_outcome>
      </step>

      <step number="2">
        <description>Check CI status.</description>
        <tool_use>
<execute_command>
<command>gh pr checks 4365 --repo RooCodeInc/Roo-Code</command>
</execute_command>
        </tool_use>
        <analysis>Identify which check is failing.</analysis>
      </step>

      <step number="3">
        <description>Get logs for the failing check.</description>
        <tool_use>
<execute_command>
<command>gh run list --pr 4365 --repo RooCodeInc/Roo-Code</command>
</execute_command>
        </tool_use>
        <analysis>Get the run ID of the failing workflow.</analysis>
      </step>

      <step number="3a">
        <description>View the failed logs.</description>
        <tool_use>
<execute_command>
<command>gh run view [run_id] --repo RooCodeInc/Roo-Code --log-failed</command>
</execute_command>
        </tool_use>
        <analysis>Find the specific error message causing the test to fail.</analysis>
      </step>
      
      <step number="4">
        <description>Check out the pull request branch.</description>
        <tool_use>
          <execute_command>
            <command>gh pr checkout 4365 --repo RooCodeInc/Roo-Code --force</command>
          </execute_command>
        </tool_use>
        <analysis>The PR branch is now ready for local edits.</analysis>
      </step>

      <step number="5">
        <description>Summarize findings and ask the user for the next action.</description>
        <tool_use>
<ask_followup_question>
<question>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?</question>
<follow_up>
<suggest>First, apply the change requested in the review comment.</suggest>
<suggest>Let's start by fixing the failing test.</suggest>
<suggest>Show me the code for the failing test and the file with the requested change.</suggest>
</follow_up>
</ask_followup_question>
        </tool_use>
      </step>
     <step number="6">
       <description>After pushing the changes, monitor PR checks in real-time.</description>
       <tool_use>
         <execute_command>
           <command>gh pr checks 4365 --repo RooCodeInc/Roo-Code --watch</command>
         </execute_command>
       </tool_use>
       <analysis>Monitor checks continuously until all complete. The --watch flag provides real-time updates as check statuses change.</analysis>
     </step>
    </workflow>

    <key_takeaways>
      <takeaway>Always gather all information before proposing a solution.</takeaway>
      <takeaway>Use the GitHub CLI to get a complete picture of the PR's status.</takeaway>
      <takeaway>The --watch flag on gh pr checks provides real-time monitoring of CI status.</takeaway>
    </key_takeaways>
  </example>

  <example name="fix_pr_with_translation_requirements">
    <scenario>
      A pull request has review comments requesting UI text changes that require translation updates across all supported languages.
    </scenario>
    
    <user_request>
      Fix PR #1234 in RooCodeInc/Roo-Code - the reviewer asked to change button text and there are some failing tests.
    </user_request>

    <workflow>
      <step number="1">
        <description>Get PR details and analyze changes.</description>
        <tool_use>
<execute_command>
<command>gh pr view 1234 --repo RooCodeInc/Roo-Code --json number,title,author,state,body,url,headRefName,baseRefName,files,additions,deletions,changedFiles,comments,reviews</command>
</execute_command>
        </tool_use>
        <expected_outcome>Identify the files changed and review feedback requiring UI text modifications.</expected_outcome>
      </step>

      <step number="2">
        <description>Check out PR and apply the requested changes.</description>
        <tool_use>
<execute_command>
<command>gh pr checkout 1234 --repo RooCodeInc/Roo-Code --force</command>
</execute_command>
        </tool_use>
        <analysis>Make the requested button text changes in the UI components.</analysis>
      </step>

      <step number="3">
        <description>Identify translation requirements and delegate to translate mode.</description>
        <tool_use>
<new_task>
<mode>translate</mode>
<message>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.</message>
</new_task>
        </tool_use>
        <expected_outcome>Translation subtask created and all language files updated.</expected_outcome>
      </step>

      <step number="4">
        <description>Review and commit changes including translations.</description>
        <tool_use>
<execute_command>
<command>git status --porcelain</command>
</execute_command>
        </tool_use>
        <analysis>Review the list of modified files to ensure only intended changes are present.</analysis>
      </step>
      
      <step number="4a">
        <description>Stage only the intended files for commit.</description>
        <tool_use>
<execute_command>
<command>git add -u && git commit -m "fix: update button text and translations as requested in review"</command>
</execute_command>
        </tool_use>
        <analysis>Using 'git add -u' stages only modified tracked files, avoiding any temporary files.</analysis>
      </step>

      <step number="5">
        <description>Check if PR is from a fork and push to correct remote.</description>
        <tool_use>
<execute_command>
<command>gh pr view 1234 --repo RooCodeInc/Roo-Code --json isCrossRepository,headRepositoryOwner,headRefName</command>
</execute_command>
        </tool_use>
        <analysis>Determine if this is a cross-repository PR to know which remote to push to.</analysis>
      </step>
      
      <step number="6">
        <description>Push changes to the appropriate remote.</description>
        <tool_use>
<execute_command>
<command>git push --force-with-lease origin [branch_name]</command>
</execute_command>
        </tool_use>
        <analysis>Push changes safely to update the pull request. Use 'fork' remote instead if PR is from a fork.</analysis>
      </step>

      <step number="7">
        <description>Monitor CI status in real-time.</description>
        <tool_use>
<execute_command>
<command>gh pr checks 1234 --repo RooCodeInc/Roo-Code --watch</command>
</execute_command>
        </tool_use>
        <analysis>Watch CI checks continuously until all tests pass. The --watch flag provides automatic updates as check statuses change.</analysis>
      </step>
    </workflow>

    <key_takeaways>
      <takeaway>Always check if PR fixes involve user-facing content that requires translation.</takeaway>
      <takeaway>Use new_task with translate mode to ensure consistent translation updates.</takeaway>
      <takeaway>Include detailed context about what changed and why in translation requests.</takeaway>
      <takeaway>Verify translation completeness before considering the PR fix complete.</takeaway>
      <takeaway>Use gh pr view --json to get structured data about PR properties.</takeaway>
    </key_takeaways>
  </example>

  <example name="fix_pr_with_merge_conflicts">
    <scenario>
      A pull request has merge conflicts that need to be resolved before other fixes can be applied.
    </scenario>
    
    <user_request>
      Fix PR #5678 in RooCodeInc/Roo-Code - it has merge conflicts and failing tests.
    </user_request>

    <workflow>
      <step number="1">
        <description>Get PR details and check merge status.</description>
        <tool_use>
<execute_command>
<command>gh pr view 5678 --repo RooCodeInc/Roo-Code --json number,title,author,state,body,url,headRefName,baseRefName,mergeable,mergeStateStatus</command>
</execute_command>
        </tool_use>
        <expected_outcome>Identify that mergeable is false and mergeStateStatus is CONFLICTING.</expected_outcome>
      </step>

      <step number="2">
        <description>Delegate merge conflict resolution to merge-resolver mode.</description>
        <tool_use>
<new_task>
<mode>merge-resolver</mode>
<message>#5678</message>
</new_task>
        </tool_use>
        <expected_outcome>The merge-resolver mode will handle checkout, rebase, conflict resolution, and pushing the resolved changes.</expected_outcome>
      </step>

      <step number="3">
        <description>After merge-resolver completes, check PR status again.</description>
        <tool_use>
<execute_command>
<command>gh pr view 5678 --repo RooCodeInc/Roo-Code --json mergeable,mergeStateStatus</command>
</execute_command>
        </tool_use>
        <analysis>Verify that the PR is now mergeable after conflict resolution.</analysis>
      </step>

      <step number="4">
        <description>Check CI status for any remaining failures.</description>
        <tool_use>
<execute_command>
<command>gh pr checks 5678 --repo RooCodeInc/Roo-Code</command>
</execute_command>
        </tool_use>
        <analysis>Identify any tests that are still failing after the merge conflict resolution.</analysis>
      </step>

      <step number="5">
        <description>If tests are still failing, proceed with fixing them.</description>
        <tool_use>
<execute_command>
<command>gh pr checkout 5678 --repo RooCodeInc/Roo-Code --force</command>
</execute_command>
        </tool_use>
        <analysis>Now that conflicts are resolved, we can focus on fixing the failing tests.</analysis>
      </step>

      <step number="6">
        <description>Apply test fixes and push changes.</description>
        <tool_use>
<execute_command>
<command>git add -u && git commit -m "fix: resolve failing tests after merge conflict resolution"</command>
</execute_command>
        </tool_use>
        <analysis>Commit the test fixes separately from the merge conflict resolution.</analysis>
      </step>

      <step number="7">
        <description>Push changes and monitor CI status.</description>
        <tool_use>
<execute_command>
<command>git push --force-with-lease origin [branch_name]</command>
</execute_command>
        </tool_use>
        <analysis>Push the test fixes to update the PR.</analysis>
      </step>

      <step number="8">
        <description>Monitor CI checks in real-time.</description>
        <tool_use>
<execute_command>
<command>gh pr checks 5678 --repo RooCodeInc/Roo-Code --watch</command>
</execute_command>
        </tool_use>
        <analysis>Watch CI checks continuously until all tests pass.</analysis>
      </step>
    </workflow>

    <key_takeaways>
      <takeaway>Always check for merge conflicts before attempting other fixes.</takeaway>
      <takeaway>Delegate merge conflict resolution to the specialized merge-resolver mode.</takeaway>
      <takeaway>The merge-resolver mode handles the entire conflict resolution workflow including pushing.</takeaway>
      <takeaway>After conflict resolution, continue with other PR fixes like failing tests.</takeaway>
      <takeaway>Keep conflict resolution commits separate from other fix commits for clarity.</takeaway>
    </key_takeaways>
  </example>
</complete_examples>