fix(worktree): 按基分支合并状态删除专用分支

产品层面：
- 当主 worktree 当前未签出基分支时，删除子 worktree 仍按基分支的真实合并状态判断是否允许删除专用分支。
- 已经合并到目标基线的专用分支，不再因为当前 HEAD 偏离基分支而误报为未合并，减少用户额外强制删除的心智负担。

技术层面：
- 在 `removeWorktreeAsync` 中复用基分支作为合并校验基线，并将分支删除逻辑收敛到统一 helper。
- 对已通过显式祖先校验的分支，优先执行 `git branch -d`；若仅因当前 HEAD 或上游判断不同被 Git 拒绝，则安全回退到 `git branch -D`。
- 补充回归测试，覆盖主 worktree 未签出基分支时，已合并专用分支仍可正常删除的场景。

Signed-off-by: Lulu <58587930+lulu-sk@users.noreply.github.com>

Author: lulu-sk

electron/git/worktreeBaseBranchOwner.test.ts

@@ -11,7 +11,7 @@ vi.mock("electron", () => ({
   },
 }));
 
-import { createWorktreesAsync, recycleWorktreeAsync } from "./worktreeOps";
+import { createWorktreesAsync, recycleWorktreeAsync, removeWorktreeAsync } from "./worktreeOps";
 import { getWorktreeMeta, setWorktreeMeta } from "../stores/worktreeMetaStore";
 
 /**
@@ -23,6 +23,13 @@ async function git(repo: string, argv: string[], timeoutMs: number = 12_000): Pr
   return String(res.stdout || "");
 }
 
+/**
+ * 中文说明：执行 git 命令但不强制断言成功，用于验证分支已删除等预期失败场景。
+ */
+async function gitTry(repo: string, argv: string[], timeoutMs: number = 12_000) {
+  return await execGitAsync({ argv: ["-C", repo, ...argv], timeoutMs });
+}
+
 /**
  * 中文说明：创建一个带 `main` 初始提交的临时仓库，并返回后续测试会复用的目录路径。
  */
@@ -136,4 +143,55 @@ describe("worktree 基分支落点解析", () => {
     },
     { timeout: 120_000 }
   );
+
+  it(
+    "remove：当前主 worktree 未签出基分支时，仍应按基分支合并状态删除专用分支",
+    async () => {
+      const { sandbox, repo } = await setupRepoFixtureAsync("codexflow-wt-remove-base-owner-");
+
+      try {
+        await git(repo, ["checkout", "-b", "feature"]);
+        await git(repo, ["checkout", "main"]);
+
+        await fsp.writeFile(path.join(repo, "main-only.txt"), "main\n", "utf8");
+        await git(repo, ["add", "main-only.txt"]);
+        await git(repo, ["commit", "-m", "main: advance"]);
+
+        await git(repo, ["checkout", "feature"]);
+
+        const createRes = await createWorktreesAsync({
+          repoDir: repo,
+          baseBranch: "main",
+          instances: [{ providerId: "codex", count: 1 }],
+          copyRules: false,
+        });
+
+        expect(createRes.ok).toBe(true);
+        expect(createRes.items?.length).toBe(1);
+
+        const item = createRes.items?.[0];
+        expect(item).toBeTruthy();
+
+        const removeRes = await removeWorktreeAsync({
+          worktreePath: String(item?.worktreePath || ""),
+          deleteBranch: true,
+        });
+
+        expect(removeRes.ok).toBe(true);
+        if (removeRes.ok) {
+          expect(removeRes.removedWorktree).toBe(true);
+          expect(removeRes.removedBranch).toBe(true);
+        }
+
+        const wtBranch = String(item?.wtBranch || "").trim();
+        expect(wtBranch).not.toBe("");
+
+        const ref = await gitTry(repo, ["show-ref", "--verify", `refs/heads/${wtBranch}`]);
+        expect(ref.ok).toBe(false);
+      } finally {
+        try { await fsp.rm(sandbox, { recursive: true, force: true }); } catch {}
+      }
+    },
+    { timeout: 120_000 }
+  );
 });

electron/git/worktreeOps.ts

@@ -207,6 +207,61 @@ async function removeWorktreeDirBestEffortAsync(worktreePath: string): Promise<v
   } catch {}
 }
 
+/**
+ * 中文说明：在已完成合并安全检查后删除 worktree 对应分支。
+ * - 未合并且未强制时，返回 `needsForceDeleteBranch` 让上层二次确认；
+ * - 已合并时优先尝试 `git branch -d`，保持与 Git 常规删除语义一致；
+ * - 若 `-d` 因当前 `HEAD/上游` 与创建基分支不同而拒绝删除，则回退到 `-D`；
+ *   因为调用方已经通过显式祖先检查确认该分支已合并到目标基线，回退为安全兜底。
+ */
+async function deleteCheckedWorktreeBranchAsync(args: {
+  repoMainPath: string;
+  wtBranch: string;
+  isMerged: boolean;
+  forceDeleteBranch?: boolean;
+  gitPath?: string;
+}): Promise<
+  | { ok: true; removedBranch: boolean }
+  | { ok: false; removedBranch: false; needsForceDeleteBranch?: boolean; error: string }
+> {
+  const repoMainPath = toFsPathAbs(args.repoMainPath);
+  const wtBranch = String(args.wtBranch || "").trim();
+  if (!wtBranch) return { ok: true, removedBranch: false };
+  if (!repoMainPath) return { ok: false, removedBranch: false, error: "missing repoMainPath" };
+
+  if (!args.isMerged && args.forceDeleteBranch !== true) {
+    return { ok: false, removedBranch: false, needsForceDeleteBranch: true, error: "branch not merged" };
+  }
+
+  /**
+   * 中文说明：执行一次分支删除，并统一抽取可读错误文本。
+   */
+  const runDeleteAsync = async (mode: "-d" | "-D"): Promise<{ ok: true } | { ok: false; error: string }> => {
+    const del = await execGitAsync({
+      gitPath: args.gitPath,
+      argv: ["-C", repoMainPath, "branch", mode, wtBranch],
+      timeoutMs: 10_000,
+    });
+    if (del.ok) return { ok: true };
+    return {
+      ok: false,
+      error: String(del.error || del.stderr || del.stdout || "git branch delete failed").trim() || "git branch delete failed",
+    };
+  };
+
+  const primaryMode: "-d" | "-D" = args.isMerged ? "-d" : "-D";
+  const primary = await runDeleteAsync(primaryMode);
+  if (primary.ok) return { ok: true, removedBranch: true };
+
+  if (!args.isMerged) {
+    return { ok: false, removedBranch: false, error: primary.error };
+  }
+
+  const fallback = await runDeleteAsync("-D");
+  if (fallback.ok) return { ok: true, removedBranch: true };
+  return { ok: false, removedBranch: false, error: fallback.error || primary.error };
+}
+
 /**
  * 读取当前仓库的分支信息（用于 baseBranch 下拉）。
  */
@@ -1791,15 +1846,23 @@ export async function removeWorktreeAsync(req: RemoveWorktreeRequest): Promise<R
           return { ok: false, removedWorktree, removedBranch: false, error: merged.error || merged.stderr.trim() || "git merge-base failed" };
         }
         const isMerged = merged.exitCode === 0;
-        if (!isMerged && !req.forceDeleteBranch) {
-          return { ok: false, removedWorktree, removedBranch: false, needsForceDeleteBranch: true, error: "branch not merged" };
-        }
-        const delArgv = ["-C", repoMainPath, "branch", isMerged ? "-d" : "-D", wtBranch];
-        const del = await execGitAsync({ gitPath, argv: delArgv, timeoutMs: 10_000 });
-        if (!del.ok) {
-          return { ok: false, removedWorktree, removedBranch: false, error: del.error || del.stderr.trim() || "git branch delete failed" };
+        const deleteRes = await deleteCheckedWorktreeBranchAsync({
+          repoMainPath,
+          wtBranch,
+          isMerged,
+          forceDeleteBranch: req.forceDeleteBranch,
+          gitPath,
+        });
+        if (!deleteRes.ok) {
+          return {
+            ok: false,
+            removedWorktree,
+            removedBranch: false,
+            needsForceDeleteBranch: deleteRes.needsForceDeleteBranch,
+            error: deleteRes.error,
+          };
         }
-        removedBranch = true;
+        removedBranch = deleteRes.removedBranch;
       }
     }