Feature: worktree view customization and stability fixes (#805)

* Changes from feature/worktree-view-customization

* Feature: Git sync, set-tracking, and push divergence handling (#796)

* Add quick-add feature with improved workflows (#802)

* Changes from feature/quick-add

* feat: Clarify system prompt and improve error handling across services. Address PR Feedback

* feat: Improve PR description parsing and refactor event handling

* feat: Add context options to pipeline orchestrator initialization

* fix: Deduplicate React and handle CJS interop for use-sync-external-store

Resolve "Cannot read properties of null (reading 'useState')" errors by
deduplicating React/react-dom and ensuring use-sync-external-store is
bundled together with React to prevent CJS packages from resolving to
different React instances.

* Changes from feature/worktree-view-customization

* refactor: Remove unused worktree swap and highlight props

* refactor: Consolidate feature completion logic and improve thinking level defaults

* feat: Increase max turn limit to 10000

- Update DEFAULT_MAX_TURNS from 1000 to 10000 in settings-helpers.ts and agent-executor.ts
- Update MAX_ALLOWED_TURNS from 2000 to 10000 in settings-helpers.ts
- Update UI clamping logic from 2000 to 10000 in app-store.ts
- Update fallback values from 1000 to 10000 in use-settings-sync.ts
- Update default value from 1000 to 10000 in DEFAULT_GLOBAL_SETTINGS
- Update documentation to reflect new range: 1-10000

Allows agents to perform up to 10000 turns for complex feature execution.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>

* feat: Add model resolution, improve session handling, and enhance UI stability

* refactor: Remove unused sync and tracking branch props from worktree components

* feat: Add PR number update functionality to worktrees. Address pr feedback

* feat: Optimize Gemini CLI startup and add tool result tracking

* refactor: Improve error handling and simplify worktree task cleanup

---------

Co-authored-by: Claude Haiku 4.5 <noreply@anthropic.com>

libs/git-utils/src/status.ts

@@ -171,8 +171,9 @@ export async function detectMergeCommit(
 
 /**
  * Detect the current merge state of a git repository.
- * Checks for .git/MERGE_HEAD, .git/REBASE_HEAD, .git/CHERRY_PICK_HEAD
- * to determine if a merge/rebase/cherry-pick is in progress.
+ * Checks for .git/MERGE_HEAD, .git/rebase-merge, .git/rebase-apply,
+ * and .git/CHERRY_PICK_HEAD to determine if a merge/rebase/cherry-pick
+ * is in progress.
  *
  * @param repoPath - Path to the git repository or worktree
  * @returns MergeStateInfo describing the current merge state
@@ -196,7 +197,6 @@ export async function detectMergeState(repoPath: string): Promise<MergeStateInfo
 
     const checks = [
       { file: 'MERGE_HEAD', type: 'merge' as const },
-      { file: 'REBASE_HEAD', type: 'rebase' as const },
       { file: 'rebase-merge', type: 'rebase' as const },
       { file: 'rebase-apply', type: 'rebase' as const },
       { file: 'CHERRY_PICK_HEAD', type: 'cherry-pick' as const },