feat: Add conflict source branch tracking and fix auto-mode subscription cascade

apps/ui/src/hooks/queries/use-worktrees.ts

@@ -28,6 +28,8 @@ interface WorktreeInfo {
   conflictType?: 'merge' | 'rebase' | 'cherry-pick';
   /** List of files with conflicts */
   conflictFiles?: string[];
+  /** The branch that is the source of the conflict (e.g. the branch being merged in) */
+  conflictSourceBranch?: string;
 }
 
 interface RemovedWorktree {

apps/ui/src/hooks/use-auto-mode.ts

@@ -959,10 +959,10 @@ export function useAutoMode(worktree?: WorktreeInfo) {
 
   // Stop a specific feature
   const stopFeature = useCallback(
-    async (featureId: string) => {
+    async (featureId: string): Promise<boolean> => {
       if (!currentProject) {
         logger.error('No project selected');
-        return;
+        return false;
       }
 
       try {
@@ -983,6 +983,7 @@ export function useAutoMode(worktree?: WorktreeInfo) {
             message: 'Feature stopped by user',
             passes: false,
           });
+          return true;
         } else {
           logger.error('Failed to stop feature:', result.error);
           throw new Error(result.error || 'Failed to stop feature');