feat(FN-2944): merge fusion/fn-2944

- test(FN-2944): cover already checked out worktree conflict recovery
- fix(FN-2944): recognize git already checked out worktree conflict
- fix(engine): auto-recover from squash-merge orphan rebase failures

Fusion-Task-Id: FN-2944

packages/dashboard/app/components/GitManagerModal.tsx

@@ -5,6 +5,7 @@ import { getErrorMessage } from "@fusion/core";
 import type { ToastType } from "../hooks/useToast";
 import { useConfirm } from "../hooks/useConfirm";
 import { truncateMiddle } from "../utils/truncatePath";
+import { getPathBasename } from "../utils/pathDisplay";
 import { useModalResizePersist } from "../hooks/useModalResizePersist";
 import { useOverlayDismiss } from "../hooks/useOverlayDismiss";
 import type {
@@ -1624,7 +1625,7 @@ function WorktreesPanel({ worktrees }: { worktrees: GitWorktree[] }) {
                 {worktree.isMain && <span className="gm-badge main">main</span>}
                 {worktree.isBare && <span className="gm-badge bare">bare</span>}
                 <span className="gm-worktree-path" title={worktree.path}>
-                  {worktree.path.split("/").pop() || worktree.path}
+                  {getPathBasename(worktree.path) || worktree.path}
                 </span>
               </div>
               <div className="gm-worktree-detail">