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/cli/src/project-context.ts

@@ -6,7 +6,7 @@
  */
 
 import { TaskStore, type RegisteredProject, CentralCore, GlobalSettingsStore } from "@fusion/core";
-import { resolve, dirname } from "node:path";
+import { resolve, dirname, basename } from "node:path";
 import { existsSync } from "node:fs";
 
 /** Project context for CLI operations */
@@ -198,7 +198,7 @@ export async function detectProjectFromCwd(
       // Use empty string for id to indicate unregistered status.
       return {
         id: "",
-        name: currentDir.split("/").filter(Boolean).at(-1) ?? "current-project",
+        name: basename(currentDir) || "current-project",
         path: currentDir,
       };
     }
@@ -309,4 +309,3 @@ export async function getStore(
   const context = await resolveProject(projectName, cwd, globalDir);
   return context.store;
 }
-