feat: refine PR workflow instructions for non-interactive operations and improve clarity

Author: daniel-lxs

.roo/rules-pr-fixer/1_workflow.xml

@@ -39,13 +39,13 @@
     </phase>
 
     <phase name="implementation">
-      <description>Execute the user's chosen course of action using non-interactive commands only.</description>
+      <description>Execute the user's chosen course of action.</description>
       <steps>
-        <step>Check out the PR branch locally using 'gh pr checkout --force' to avoid interactive prompts.</step>
+        <step>Check out the PR branch locally using 'gh pr checkout --force'.</step>
         <step>Determine if the PR is from a fork by checking 'gh pr view --json isCrossRepository'.</step>
         <step>Apply code changes based on review feedback using file editing tools.</step>
         <step>Fix failing tests by modifying test files or source code as needed.</step>
-        <step>For conflict resolution: Use automated detection first, then manual resolution via file editing, avoiding interactive rebase.</step>
+        <step>For conflict resolution: Use GIT_EDITOR=true for non-interactive rebases, then resolve conflicts via file editing.</step>
         <step>If changes affect user-facing content (i18n files, UI components, announcements), delegate translation updates using the new_task tool with translate mode.</step>
         <step>Commit changes using git commands.</step>
         <step>Push changes to the correct remote (origin for same-repo PRs, fork remote for cross-repo PRs) using 'git push --force-with-lease'.</step>

.roo/rules-pr-fixer/3_common_patterns.xml

@@ -38,12 +38,12 @@
   </pattern>
 
   <pattern name="non_interactive_rebase">
-    <usage>Non-interactive rebase operations for when no conflicts are detected.</usage>
+    <usage>Rebase operations using GIT_EDITOR to prevent interactive prompts.</usage>
     <template>
       <command tool="git">git checkout <pr_branch></command>
-      <command tool="git">git rebase main</command>
-      <comment>Only proceed if rebase succeeds without conflicts</comment>
-      <command tool="git">git push --force-with-lease origin <pr_branch></command>
+      <command tool="git">GIT_EDITOR=true git rebase main</command>
+      <comment>If conflicts occur, resolve them manually then use 'git rebase --continue'</comment>
+      <command tool="git">git push --force-with-lease <remote> <pr_branch></command>
     </template>
   </pattern>
 
@@ -57,12 +57,11 @@
     </template>
   </pattern>
   <pattern name="checking_out_pr">
-    <usage>Command to check out a pull request branch locally without interactive prompts.</usage>
+    <usage>Check out a pull request branch locally.</usage>
     <template>
       <command tool="gh">gh pr checkout <pr_number_or_url> --force</command>
-      <comment>Alternative: Use git commands if gh checkout fails</comment>
-      <command tool="git">git fetch origin pull/<pr_number>/head:<branch_name></command>
-      <command tool="git">git checkout <branch_name></command>
+      <comment>Alternative if gh checkout fails:</comment>
+      <command tool="git">git fetch origin pull/<pr_number>/head:<branch_name> && git checkout <branch_name></command>
     </template>
   </pattern>
 

.roo/rules-pr-fixer/4_tool_usage.xml

@@ -46,36 +46,26 @@
 
     <tool name="gh pr checkout">
       <best_practices>
-        <practice>Always use --force flag to avoid interactive branch selection.</practice>
-        <practice>Format: 'gh pr checkout <pr_number> --force'</practice>
-        <practice>If gh checkout fails, fallback to git fetch + checkout pattern.</practice>
+        <practice>Use --force flag: 'gh pr checkout <pr_number> --force'</practice>
+        <practice>If gh checkout fails, use: git fetch origin pull/<pr_number>/head:<branch_name></practice>
       </best_practices>
-      <non_interactive_alternatives>
-        <alternative>git fetch origin pull/<pr_number>/head:<branch_name></alternative>
-        <alternative>git checkout <branch_name></alternative>
-      </non_interactive_alternatives>
     </tool>
 
     <tool name="git operations">
       <best_practices>
         <practice>Use --force-with-lease for safer force pushing.</practice>
-        <practice>Check git status programmatically with --porcelain flag.</practice>
-        <practice>Use git rebase --dry-run to detect conflicts before attempting rebase.</practice>
+        <practice>Use GIT_EDITOR=true to prevent interactive prompts during rebases.</practice>
         <practice>Always determine the correct remote before pushing (origin vs fork).</practice>
       </best_practices>
       <remote_handling>
         <step>Check if PR is from a fork: 'gh pr view <pr_number> --json isCrossRepository'</step>
-        <step>If isCrossRepository is true, the PR is from a fork</step>
-        <step>For fork PRs, check if fork remote exists: 'git remote -v'</step>
-        <step>If fork remote doesn't exist, add it: 'git remote add fork https://github.com/<fork_owner>/<repo>.git'</step>
+        <step>If isCrossRepository is true, add fork remote if needed</step>
         <step>Push to appropriate remote: 'git push --force-with-lease <remote> <branch>'</step>
       </remote_handling>
       <conflict_resolution>
-        <step>Use 'git rebase --dry-run main' to detect conflicts</step>
-        <step>If conflicts detected, resolve manually via file editing</step>
-        <step>Use 'git status --porcelain' to identify conflicted files</step>
-        <step>Edit files to resolve conflicts, removing conflict markers</step>
-        <step>Use 'git add .' and commit the resolved changes</step>
+        <step>Use 'GIT_EDITOR=true git rebase main' to start rebase</step>
+        <step>If conflicts occur, edit files to resolve them</step>
+        <step>Use 'git add .' and 'git rebase --continue' to proceed</step>
       </conflict_resolution>
     </tool>
 

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

@@ -59,13 +59,13 @@
       </step>
 
       <step number="4">
-        <description>Check out the pull request branch using non-interactive command.</description>
+        <description>Check out the pull request branch.</description>
         <tool_use>
           <execute_command>
             <command>gh pr checkout 4365 --force</command>
           </execute_command>
         </tool_use>
-        <analysis>The PR branch is now ready for local edits. Using --force avoids interactive prompts.</analysis>
+        <analysis>The PR branch is now ready for local edits.</analysis>
       </step>
 
       <step number="5">
@@ -133,7 +133,7 @@
 <command>gh pr checkout 1234 --force</command>
 </execute_command>
         </tool_use>
-        <analysis>Make the requested button text changes in the UI components. Using --force to avoid interactive prompts.</analysis>
+        <analysis>Make the requested button text changes in the UI components.</analysis>
       </step>
 
       <step number="3">