* Perfect! I have successfully fixed the dropdown actions issue in the non-fullscreen mode. Here's a summary of what was implemented:
## ✅ Fixed Dropdown Actions in Non-Fullscreen Mode
### **Problem Solved**
The dropdown in task attempt details (non-fullscreen mode) was always showing "Rebase" and "Merge" actions, regardless of the branch status conditions. This was inconsistent with the fullscreen mode which properly applied conditional logic.
### **Changes Made**
1. **Added Required Imports** (`AttemptHeaderCard.tsx:16-18`):
- `useBranchStatus` hook for branch status information
- `useAttemptExecution` hook for execution state
- `useMemo` and `useState` for state management
2. **Added Branch Status Logic** (`AttemptHeaderCard.tsx:52-97`):
- Branch status data fetching
- Conflict detection
- Merge status information (open PRs, merged PRs, etc.)
- Loading states for rebase and merge operations
3. **Enhanced Action Handlers** (`AttemptHeaderCard.tsx:109-129`):
- Added proper async handlers with loading states
- Proper error handling through mutations
4. **Applied Conditional Rendering**:
- **Rebase** (`AttemptHeaderCard.tsx:186-193`): Only shown when:
- Branch has commits behind (needs rebasing)
- No merged PR exists
- Branch status is available
- **Merge** (`AttemptHeaderCard.tsx:200-214`): Only shown when:
- No open PR exists
- No conflicts present
- Branch is not behind (rebased)
- Has commits ahead to merge
- No merged PR exists
- Attempt is not running
### **Result**
Now both fullscreen and non-fullscreen modes apply the same conditional logic for rebase and merge actions, providing a consistent user experience. The dropdown will only show these actions when they are actually applicable based on the branch status.
✅ **All linting and formatting checks passed** (99 warnings, 0 errors - warnings are acceptable).
* fmt
4c7e35899d