fix(worktree): 删除时按当前真实分支清理已改名的 worktree 分支

产品层面：
- 修复用户在创建子 worktree 后手动重命名分支时，删除 worktree 仍沿用旧分支名，导致专用分支残留的问题。
- 保持 detached HEAD 等原有兜底行为不变，避免删除流程在无有效当前分支时误删错误引用。

技术层面：
- 在 `removeWorktreeAsync` 中将删除分支前的 `wtBranch` 解析调整为“优先读取当前 worktree 真实分支，再回退到元数据记录”。
- 继续复用既有 `resolveWorktreeBranchNameAsync`，确保分支信息在 worktree 目录被移除前完成解析。
- 补充回归测试，覆盖 worktree 分支被手动改名后仍能正确删除 worktree 与对应分支的场景。

验证：
- `npx vitest run electron/git/worktreeMetaFallback.test.ts electron/git/worktreeBaseBranchOwner.test.ts`

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

Author: lulu-sk

electron/git/worktreeMetaFallback.test.ts

@@ -268,5 +268,47 @@ describe("worktree meta 缺失回退（recycle/reset/remove）", () => {
     },
     { timeout: 120_000 }
   );
+
+  it(
+    "remove：当 worktree 分支已被手动改名时，应按当前真实分支完成删除",
+    async () => {
+      const repo = await fsp.mkdtemp(path.join(os.tmpdir(), "codexflow-wt-remove-renamed-main-"));
+      const wtParent = await fsp.mkdtemp(path.join(os.tmpdir(), "codexflow-wt-remove-renamed-child-parent-"));
+      const wtDir = path.join(wtParent, "wt");
+      const userData = await fsp.mkdtemp(path.join(os.tmpdir(), "codexflow-userdata-"));
+      userDataDir = userData;
+
+      try {
+        await git(repo, ["init"]);
+        await git(repo, ["config", "user.name", "CodexFlow"]);
+        await git(repo, ["config", "user.email", "codexflow@example.com"]);
+        await git(repo, ["config", "core.autocrlf", "false"]);
+        await git(repo, ["config", "core.eol", "lf"]);
+
+        await git(repo, ["checkout", "-b", "main"]);
+        await fsp.writeFile(path.join(repo, "a.txt"), "A\n", "utf8");
+        await git(repo, ["add", "a.txt"]);
+        await git(repo, ["commit", "-m", "main: init"]);
+
+        await git(repo, ["worktree", "add", "-b", "wt", wtDir, "main"]);
+        await git(wtDir, ["branch", "-m", "wt-renamed"]);
+
+        const res = await removeWorktreeAsync({ worktreePath: wtDir, deleteBranch: true });
+        expect(res.ok).toBe(true);
+        if (res.ok) {
+          expect(res.removedWorktree).toBe(true);
+          expect(res.removedBranch).toBe(true);
+        }
+
+        const renamedRef = await gitTry(repo, ["show-ref", "--verify", "refs/heads/wt-renamed"]);
+        expect(renamedRef.ok).toBe(false);
+      } finally {
+        try { await fsp.rm(wtParent, { recursive: true, force: true }); } catch {}
+        try { await fsp.rm(repo, { recursive: true, force: true }); } catch {}
+        try { await fsp.rm(userData, { recursive: true, force: true }); } catch {}
+      }
+    },
+    { timeout: 120_000 }
+  );
 });
 

electron/git/worktreeOps.ts

@@ -1797,11 +1797,16 @@ export async function removeWorktreeAsync(req: RemoveWorktreeRequest): Promise<R
       repoMainPath = inferred.repoMainPath;
     }
 
-    // 中文说明：deleteBranch=true 时需要的关键信息尽量在 remove 之前解析（避免目录被移除后无法读取）
+    // 中文说明：deleteBranch=true 时需要的关键信息尽量在 remove 之前解析（避免目录被移除后无法读取）。
+    // - 优先读取 worktree 当前真实分支，兼容用户在创建后手动改名导致元数据过期的场景；
+    // - 若当前为 detached HEAD 或解析失败，再回退到创建记录中的 wtBranch。
     let resolvedWtBranch = String(meta?.wtBranch || "").trim();
-    if (req.deleteBranch && !resolvedWtBranch) {
+    if (req.deleteBranch) {
       const inferred = await resolveWorktreeBranchNameAsync({ repoDir: repoMainPath, worktreePath: wt, gitPath, timeoutMs: 12_000 });
-      if (inferred.ok && !inferred.detached) resolvedWtBranch = String(inferred.branch || "").trim();
+      if (inferred.ok && !inferred.detached) {
+        const inferredBranch = String(inferred.branch || "").trim();
+        if (inferredBranch) resolvedWtBranch = inferredBranch;
+      }
     }
 
     let baseRefForMergedCheck = String(meta?.baseBranch || "").trim();