Fix patch application using 3-way merge and include unstaged changes

Author: built-by-as

main.ts

@@ -630,24 +630,24 @@ ipcMain.handle("apply-session-to-project", async (_event, sessionId: string) =>
     const patchFilename = `fleetcode-patch-${Date.now()}.patch`;
     const patchPath = path.join("/tmp", patchFilename);
 
-    // Create git instance for worktree
-    const worktreeGit = simpleGit(worktreePath);
-
-    // Generate patch file from parent branch to current HEAD (includes all commits and staged changes)
-    // Using diff to capture all changes since divergence from parent branch
-    const diffCommand = `${parentBranch}...HEAD`;
+    // Generate patch file from parent branch to current state (includes commits + unstaged changes)
+    // Using diff against parent branch to capture all changes
     const { stdout: patchContent } = await execAsync(
-      `git diff ${diffCommand}`,
+      `git diff ${parentBranch}`,
       { cwd: worktreePath }
     );
 
+    // If patch is empty, there are no changes to apply
+    if (!patchContent.trim()) {
+      return { success: false, error: "No changes to apply" };
+    }
+
     // Write patch to temp file
     fs.writeFileSync(patchPath, patchContent);
 
-    // Apply patch to original project directory
-    const projectGit = simpleGit(projectDir);
+    // Apply patch to original project directory using 3-way merge
     try {
-      await execAsync(`git apply "${patchPath}"`, { cwd: projectDir });
+      await execAsync(`git apply --3way "${patchPath}"`, { cwd: projectDir });
 
       // Clean up patch file on success
       fs.unlinkSync(patchPath);