diff --git a/.cursor/rules/workflow.mdc b/.cursor/rules/workflow.mdc
index 28c2198..9faa68f 100644
--- a/.cursor/rules/workflow.mdc
+++ b/.cursor/rules/workflow.mdc
@@ -48,7 +48,8 @@ For detailed steps on initializing a git repository when cloning the template di
   3. **Commit Changes**: `git add .` and `git commit -m "descriptive message"`
   4. **Push Branch**: `git push -u origin feature/descriptive-name`
   5. **🚨 CRITICAL: Open Pull Request**: `gh pr create --title "Title" --body "Description"` or use GitHub web interface - **THIS STEP IS MANDATORY**
-  6. **Merge via PR**: Never use `git push origin main` directly
+  6. **Return to Main**: `git checkout main && git pull origin main` - **ALWAYS do this after creating PR to prepare for next task**
+  7. **Merge via PR**: Never use `git push origin main` directly
 - **Branch Naming Conventions**:
   - `feature/feature-name` for new features
   - `fix/bug-description` for bug fixes
@@ -57,6 +58,9 @@ For detailed steps on initializing a git repository when cloning the template di
   - `chore/maintenance-task` for maintenance tasks
 - **Before Starting Work**:
   ```bash
+  # CRITICAL: Prevent interactive paging first
+  export PAGER=""
+
   git checkout main
   git pull origin main
   git checkout -b feature/your-feature-name
@@ -70,7 +74,8 @@ For detailed steps on initializing a git repository when cloning the template di
 
 ### CLI Best Practices
 - **Always use SSH format for git remotes** (`git@github.com:user/repo.git`) rather than HTTPS format to leverage SSH key authentication instead of token-based authentication
-- **Prevent interactive paging**: Set pager environment variable at the start of each terminal session:
+- **🚨 CRITICAL: Prevent interactive paging** - Always set this environment variable at the start of each terminal session:
   ```bash
   export PAGER=""
   ```
+  This prevents commands like `git log`, `git show`, `git diff`, `gh pr view`, `gh pr list`, and `gh issue view` from opening interactive pagers that can block automation.