diff --git a/apps/desktop/dev-server.mjs b/apps/desktop/dev-server.mjs
index 9be99ec8..59ebef09 100644
--- a/apps/desktop/dev-server.mjs
+++ b/apps/desktop/dev-server.mjs
@@ -840,7 +840,7 @@ async function handleRequest(req, res) {
 
         return jsonResponse(req, res, { branch, remote, ahead, behind, mainCommitCount, pushRemote, aheadPush, staged, unstaged, untracked, conflicted });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -943,7 +943,7 @@ async function handleRequest(req, res) {
 
         return jsonResponse(req, res, { path, hunks });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -1019,7 +1019,7 @@ async function handleRequest(req, res) {
 
         return jsonResponse(req, res, entries.filter((e) => !e.message.startsWith("index on ") && !e.message.startsWith("untracked files on ")));
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -1075,7 +1075,7 @@ async function handleRequest(req, res) {
         });
         return jsonResponse(req, res, { ok: true });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -1092,7 +1092,7 @@ async function handleRequest(req, res) {
         });
         return jsonResponse(req, res, { ok: true });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -1112,7 +1112,7 @@ async function handleRequest(req, res) {
         }).trim();
         return jsonResponse(req, res, { hash });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -1132,7 +1132,7 @@ async function handleRequest(req, res) {
         }).trim();
         return jsonResponse(req, res, { hash });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -1523,7 +1523,7 @@ async function handleRequest(req, res) {
         }
         return jsonResponse(req, res, { state: "clean", hasConflict: false, operationHead: null, targetBranch: null, step: 0, total: 0 });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -1660,7 +1660,7 @@ async function handleRequest(req, res) {
         }
         return jsonResponse(req, res, { ok: true });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -1767,7 +1767,7 @@ async function handleRequest(req, res) {
 
         return jsonResponse(req, res, diffs);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -1851,7 +1851,7 @@ async function handleRequest(req, res) {
 
         return jsonResponse(req, res, branches);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -1882,7 +1882,7 @@ async function handleRequest(req, res) {
         execSync(`git checkout "${name}"`, { cwd: resolvedCwd, encoding: "utf-8", shell: true });
         return jsonResponse(req, res, { ok: true });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -1896,7 +1896,7 @@ async function handleRequest(req, res) {
         execSync(`git branch ${flag} "${name}"`, { cwd: resolvedCwd, encoding: "utf-8", shell: true });
         return jsonResponse(req, res, { ok: true });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -1909,7 +1909,7 @@ async function handleRequest(req, res) {
         execFileSync("git", ["push", remote, "--delete", name], { cwd: resolvedCwd, encoding: "utf-8" });
         return jsonResponse(req, res, { ok: true });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -1922,7 +1922,7 @@ async function handleRequest(req, res) {
         execSync(`git branch -m "${oldName}" "${newName}"`, { cwd: resolvedCwd, encoding: "utf-8", shell: true });
         return jsonResponse(req, res, { ok: true });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -1940,7 +1940,7 @@ async function handleRequest(req, res) {
         execFileSync("git", args, { cwd: resolvedCwd, encoding: "utf-8" });
         return jsonResponse(req, res, { ok: true });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -1953,7 +1953,7 @@ async function handleRequest(req, res) {
         execSync("git stash pop", { cwd: resolvedCwd, encoding: "utf-8", shell: true });
         return jsonResponse(req, res, { ok: true });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2005,7 +2005,7 @@ async function handleRequest(req, res) {
           });
         return jsonResponse(req, res, entries);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2023,7 +2023,7 @@ async function handleRequest(req, res) {
         });
         return jsonResponse(req, res, { ok: true });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2041,7 +2041,7 @@ async function handleRequest(req, res) {
         });
         return jsonResponse(req, res, { ok: true });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2059,7 +2059,7 @@ async function handleRequest(req, res) {
         });
         return jsonResponse(req, res, { ok: true });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2079,7 +2079,7 @@ async function handleRequest(req, res) {
         );
         return jsonResponse(req, res, { diff: out });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2119,7 +2119,7 @@ async function handleRequest(req, res) {
         }
         return jsonResponse(req, res, blameLines);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2136,7 +2136,7 @@ async function handleRequest(req, res) {
           { cwd: resolvedCwd, encoding: "utf-8", maxBuffer: 10 * 1024 * 1024 });
         return jsonResponse(req, res, parseFileLog(out.stdout || ""));
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2153,7 +2153,7 @@ async function handleRequest(req, res) {
           { cwd: resolve(cwd), encoding: "utf-8", maxBuffer: 10 * 1024 * 1024 });
         return jsonResponse(req, res, parseFileLog(out.stdout || ""));
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2171,7 +2171,7 @@ async function handleRequest(req, res) {
           { cwd: resolve(cwd), encoding: "utf-8", maxBuffer: 10 * 1024 * 1024 });
         return jsonResponse(req, res, parseFileLog(out.stdout || ""));
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2191,7 +2191,7 @@ async function handleRequest(req, res) {
         return jsonResponse(req, res, data.login ?? "");
       } catch (err) {
         console.error("[gh-current-user]", err.message);
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2243,7 +2243,7 @@ async function handleRequest(req, res) {
         return jsonResponse(req, res, prs);
       } catch (err) {
         console.error("[gh-list-prs]", err.message);
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2401,7 +2401,7 @@ async function handleRequest(req, res) {
         });
       } catch (err) {
         console.error("[gh-create-pr]", err.message);
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2438,7 +2438,7 @@ async function handleRequest(req, res) {
         return jsonResponse(req, res, all);
       } catch (err) {
         console.error("[gh-reviewer-candidates]", err.message);
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2479,7 +2479,7 @@ async function handleRequest(req, res) {
           checks_status: "",
         });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2498,7 +2498,7 @@ async function handleRequest(req, res) {
         const diff = await resp.text();
         return jsonResponse(req, res, { diff });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2529,7 +2529,7 @@ async function handleRequest(req, res) {
           details_url: c.html_url ?? "",
         })));
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2566,7 +2566,7 @@ async function handleRequest(req, res) {
           url: c.html_url ?? "",
         })));
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2613,7 +2613,7 @@ async function handleRequest(req, res) {
           in_reply_to_id: c.in_reply_to_id ?? null, diff_hunk: c.diff_hunk ?? "", url: c.html_url ?? "",
         });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2643,7 +2643,7 @@ async function handleRequest(req, res) {
         const c = await resp.json();
         return jsonResponse(req, res, { id: c.id, body: c.body, updated_at: c.updated_at });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2668,7 +2668,7 @@ async function handleRequest(req, res) {
         if (!resp.ok && resp.status !== 204) return jsonResponse(req, res, { error: `GitHub API ${resp.status}` }, 500);
         return jsonResponse(req, res, { ok: true });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2689,7 +2689,7 @@ async function handleRequest(req, res) {
         const reviews = await resp.json();
         return jsonResponse(req, res, reviews);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2746,7 +2746,7 @@ async function handleRequest(req, res) {
         const review = await resp.json();
         return jsonResponse(req, res, review);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2856,7 +2856,7 @@ async function handleRequest(req, res) {
             : `✅ Pas de conflit détecté`,
         });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2901,7 +2901,7 @@ async function handleRequest(req, res) {
         });
         return jsonResponse(req, res, hotspots);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2915,7 +2915,7 @@ async function handleRequest(req, res) {
         const count = (r.stdout || "").trim().split("\n").filter(Boolean).length;
         return jsonResponse(req, res, { count });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -2955,7 +2955,7 @@ async function handleRequest(req, res) {
         }
         return jsonResponse(req, res, result);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3041,7 +3041,7 @@ async function handleRequest(req, res) {
           detail,
         });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3066,7 +3066,7 @@ async function handleRequest(req, res) {
         }
         return res.writeHead(200, { ...corsHeaders(req), "Content-Type": "text/plain" }).end(r.stdout);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3133,7 +3133,7 @@ async function handleRequest(req, res) {
           detail,
         });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3156,7 +3156,7 @@ async function handleRequest(req, res) {
         }
         return res.writeHead(200, { ...corsHeaders(req), "Content-Type": "text/plain" }).end(r.stdout);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3193,7 +3193,7 @@ async function handleRequest(req, res) {
         }
         return jsonResponse(req, res, { ok: true });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3215,7 +3215,7 @@ async function handleRequest(req, res) {
         }
         return jsonResponse(req, res, { ok: true });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3289,7 +3289,7 @@ async function handleRequest(req, res) {
         return jsonResponse(req, res, { ok: true });
       } catch (err) {
         console.error("[rebase] Error:", err);
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3313,7 +3313,7 @@ async function handleRequest(req, res) {
           exitCode: r.status ?? -1,
         });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3350,7 +3350,7 @@ async function handleRequest(req, res) {
         // Not found — return empty string (same as Rust backend)
         return res.writeHead(200, { "Content-Type": "text/plain" }).end("");
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3380,7 +3380,7 @@ async function handleRequest(req, res) {
         writeFileSync(target, content, "utf-8");
         return jsonResponse(req, res, { ok: true });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3424,7 +3424,7 @@ async function handleRequest(req, res) {
         });
         return jsonResponse(req, res, entries);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3442,7 +3442,7 @@ async function handleRequest(req, res) {
         else if (!enabled && existsSync(enabledPath)) renameSync(enabledPath, disabledPath);
         return jsonResponse(req, res, {});
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3459,7 +3459,7 @@ async function handleRequest(req, res) {
         writeFileSync(join(hooksDir, name), script, { mode: 0o755 });
         return jsonResponse(req, res, {});
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3477,7 +3477,7 @@ async function handleRequest(req, res) {
         if (existsSync(disabledPath)) unlinkSync(disabledPath);
         return jsonResponse(req, res, {});
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3491,7 +3491,7 @@ async function handleRequest(req, res) {
         if (!existsSync(file)) return jsonResponse(req, res, { error: "No workspace file found" }, 404);
         return jsonResponse(req, res, JSON.parse(readFileSync(file, "utf-8")));
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3503,7 +3503,7 @@ async function handleRequest(req, res) {
         writeFileSync(file, JSON.stringify(workspace, null, 2));
         return jsonResponse(req, res, {});
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3527,7 +3527,7 @@ async function handleRequest(req, res) {
         });
         return jsonResponse(req, res, statuses);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3555,7 +3555,7 @@ async function handleRequest(req, res) {
         });
         return jsonResponse(req, res, statuses);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3582,7 +3582,7 @@ async function handleRequest(req, res) {
         });
         return jsonResponse(req, res, statuses);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3659,7 +3659,7 @@ async function handleRequest(req, res) {
         });
         return jsonResponse(req, res, items);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3715,7 +3715,7 @@ async function handleRequest(req, res) {
         });
         return jsonResponse(req, res, results);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3753,7 +3753,7 @@ async function handleRequest(req, res) {
         });
         return jsonResponse(req, res, results);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3776,23 +3776,27 @@ async function handleRequest(req, res) {
         }
         if (cur) worktrees.push(cur);
 
+        const CONFLICT_CODES = new Set(["UU", "AA", "DD", "AU", "UA", "DU", "UD"]);
         const statuses = worktrees.map(wt => {
           try {
             const branch = execSync("git rev-parse --abbrev-ref HEAD", { cwd: wt.path, encoding: "utf-8" }).trim();
-            let ahead = 0, behind = 0;
+            let ahead = 0, behind = 0, has_upstream = false;
             try {
               const ab = execSync("git rev-list --left-right --count HEAD...@{upstream}", { cwd: wt.path, encoding: "utf-8" }).trim().split(/\s+/);
               ahead = parseInt(ab[0]) || 0; behind = parseInt(ab[1]) || 0;
+              has_upstream = true;
             } catch {}
-            const modified = execSync("git status --porcelain --untracked-files=no", { cwd: wt.path, encoding: "utf-8" }).trim().split("\n").filter(Boolean).length;
-            return { path: wt.path, name: wt.branch || branch, branch, ahead, behind, modified, error: null };
+            const statusLines = execSync("git status --porcelain --untracked-files=no", { cwd: wt.path, encoding: "utf-8" }).trim().split("\n").filter(Boolean);
+            const conflicted = statusLines.filter(l => l.length >= 2 && CONFLICT_CODES.has(l.slice(0, 2))).length;
+            const modified = statusLines.filter(l => l.length >= 2 && !CONFLICT_CODES.has(l.slice(0, 2))).length;
+            return { path: wt.path, name: wt.branch || branch, branch, ahead, behind, has_upstream, modified, conflicted, error: null };
           } catch (e) {
-            return { path: wt.path, name: wt.branch || "", branch: "", ahead: 0, behind: 0, modified: 0, error: e.message };
+            return { path: wt.path, name: wt.branch || "", branch: "", ahead: 0, behind: 0, has_upstream: false, modified: 0, conflicted: 0, error: e.message };
           }
         });
         return jsonResponse(req, res, statuses);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3805,26 +3809,34 @@ async function handleRequest(req, res) {
         const raw = execSync("git worktree list --porcelain", { cwd, encoding: "utf-8" });
         const entries = [];
         let current = null;
-        let isFirst = true;
         for (const line of raw.split("\n")) {
           if (line.startsWith("worktree ")) {
             if (current) entries.push(current);
-            current = { path: line.slice("worktree ".length), branch: "", head: "", is_main: isFirst, is_locked: false, is_bare: false };
-            isFirst = false;
+            current = { path: line.slice("worktree ".length), branch: "", head: "", is_main: false, is_locked: false, lock_reason: null, is_bare: false, is_prunable: false, prunable_reason: null };
           } else if (current) {
-            if (line.startsWith("HEAD ")) current.head = line.slice("HEAD ".length);
+            if (line === "main") current.is_main = true;
+            else if (line.startsWith("HEAD ")) current.head = line.slice("HEAD ".length);
             else if (line.startsWith("branch ")) {
               const full = line.slice("branch ".length);
               current.branch = full.startsWith("refs/heads/") ? full.slice("refs/heads/".length) : full;
             } else if (line === "bare") current.is_bare = true;
-            else if (line.startsWith("locked")) current.is_locked = true;
-            else if (line === "detached") current.branch = "(detached HEAD)";
+            else if (line.startsWith("locked")) {
+              current.is_locked = true;
+              const reason = line.slice("locked".length).trim();
+              if (reason) current.lock_reason = reason;
+            } else if (line.startsWith("prunable")) {
+              current.is_prunable = true;
+              const reason = line.slice("prunable".length).trim();
+              if (reason) current.prunable_reason = reason;
+            } else if (line === "detached") current.branch = "(detached HEAD)";
           }
         }
         if (current) entries.push(current);
+        // Fallback git < 2.36 : marquer le premier comme main si aucun ne l'est
+        if (entries.length && entries.every(e => !e.is_main)) entries[0].is_main = true;
         return jsonResponse(req, res, entries);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3833,14 +3845,23 @@ async function handleRequest(req, res) {
       try {
         const { cwd, path: wtPath, branch, new_branch } = await readBody(req);
         const resolvedCwd = resolve(cwd);
+
+        // Ensure parent directories exist
+        const parentDir = dirname(wtPath);
+        if (!existsSync(parentDir)) {
+          mkdirSync(parentDir, { recursive: true });
+        }
+
         let cmd = `git worktree add "${wtPath}"`;
         if (new_branch) cmd += ` -b "${new_branch}" "${branch}"`;
         else cmd += ` "${branch}"`;
         execSync(cmd, { cwd: resolvedCwd, encoding: "utf-8", shell: true });
         const resolvedBranch = new_branch || branch;
-        return jsonResponse(req, res, { path: wtPath, branch: resolvedBranch, head: "", is_main: false, is_locked: false, is_bare: false });
+        let head = "";
+        try { head = execSync("git rev-parse HEAD", { cwd: wtPath, encoding: "utf-8" }).trim(); } catch {}
+        return jsonResponse(req, res, { path: wtPath, branch: resolvedBranch, head, is_main: false, is_locked: false, lock_reason: null, is_bare: false, is_prunable: false, prunable_reason: null });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3853,7 +3874,7 @@ async function handleRequest(req, res) {
         execSync(`git worktree remove ${forceFlag}"${wtPath}"`, { cwd: resolvedCwd, encoding: "utf-8", shell: true });
         return jsonResponse(req, res, {});
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3864,7 +3885,19 @@ async function handleRequest(req, res) {
         execSync("git worktree prune", { cwd: resolve(cwd), encoding: "utf-8" });
         return jsonResponse(req, res, {});
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
+      }
+    }
+
+    // POST /api/git-worktree-repair  { cwd, paths? }
+    if (url.pathname === "/api/git-worktree-repair" && req.method === "POST") {
+      try {
+        const { cwd, paths = [] } = await readBody(req);
+        const extraPaths = paths.map(p => `"${p}"`).join(" ");
+        execSync(`git worktree repair ${extraPaths}`.trim(), { cwd: resolve(cwd), encoding: "utf-8", shell: true });
+        return jsonResponse(req, res, {});
+      } catch (err) {
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3916,7 +3949,7 @@ async function handleRequest(req, res) {
         }
         return jsonResponse(req, res, sessions);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3928,7 +3961,7 @@ async function handleRequest(req, res) {
         spawn(binary, [], { cwd: resolve(cwd), detached: true, stdio: "ignore" }).unref();
         return jsonResponse(req, res, {});
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3977,7 +4010,7 @@ async function handleRequest(req, res) {
         }
         return jsonResponse(req, res, entries);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -3988,7 +4021,7 @@ async function handleRequest(req, res) {
         execSync("git submodule init", { cwd: resolve(cwd), encoding: "utf-8" });
         return jsonResponse(req, res, {});
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -4002,7 +4035,7 @@ async function handleRequest(req, res) {
         execSync(cmd, { cwd: resolve(cwd), encoding: "utf-8", shell: true });
         return jsonResponse(req, res, {});
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -4013,7 +4046,7 @@ async function handleRequest(req, res) {
         execSync(`git submodule add "${smUrl}" "${smPath}"`, { cwd: resolve(cwd), encoding: "utf-8", shell: true });
         return jsonResponse(req, res, {});
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -4145,7 +4178,7 @@ async function handleRequest(req, res) {
         }
         return jsonResponse(req, res, { name, url: remoteUrl, provider, owner, repo });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -4208,7 +4241,7 @@ async function handleRequest(req, res) {
           conflicts: hasConflicts,
         });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -4263,7 +4296,7 @@ async function handleRequest(req, res) {
         }).filter(Boolean);
         return jsonResponse(req, res, tags);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -4291,7 +4324,7 @@ async function handleRequest(req, res) {
         const unpushed = [...localTags].filter(t => !remoteTags.has(t)).sort();
         return jsonResponse(req, res, unpushed);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -4431,7 +4464,7 @@ async function handleRequest(req, res) {
         return jsonResponse(req, res, JSON.parse(raw.trim() || "[]"));
       } catch (err) {
         console.error("[pr-files]", err.message);
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -4448,7 +4481,7 @@ async function handleRequest(req, res) {
         if (result.status !== 0) return jsonResponse(req, res, { sha: "" });
         return jsonResponse(req, res, { sha: result.stdout.trim() });
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
@@ -4476,7 +4509,7 @@ async function handleRequest(req, res) {
           .filter((b) => b && b !== defaultBranch && b !== current);
         return jsonResponse(req, res, merged);
       } catch (err) {
-        return jsonResponse(req, res, { error: err.message }, 500);
+        return jsonResponse(req, res, { error: err.stderr?.toString() || err.message }, 500);
       }
     }
 
diff --git a/apps/desktop/src-tauri/src/commands/ops.rs b/apps/desktop/src-tauri/src/commands/ops.rs
index a508ab9e..44e0c3ce 100644
--- a/apps/desktop/src-tauri/src/commands/ops.rs
+++ b/apps/desktop/src-tauri/src/commands/ops.rs
@@ -1610,7 +1610,6 @@ pub(crate) fn git_worktree_list(cwd: String) -> Result<Vec<WorktreeEntry>, Strin
     let stdout = String::from_utf8_lossy(&output.stdout);
     let mut entries: Vec<WorktreeEntry> = Vec::new();
     let mut current: Option<WorktreeEntry> = None;
-    let mut is_first = true;
 
     for line in stdout.lines() {
         if line.starts_with("worktree ") {
@@ -1622,13 +1621,18 @@ pub(crate) fn git_worktree_list(cwd: String) -> Result<Vec<WorktreeEntry>, Strin
                 path,
                 branch: String::new(),
                 head: String::new(),
-                is_main: is_first,
+                is_main: false,
                 is_locked: false,
+                lock_reason: None,
                 is_bare: false,
+                is_prunable: false,
+                prunable_reason: None,
             });
-            is_first = false;
         } else if let Some(ref mut e) = current {
-            if line.starts_with("HEAD ") {
+            if line == "main" {
+                // Attribut explicite depuis git 2.36
+                e.is_main = true;
+            } else if line.starts_with("HEAD ") {
                 e.head = line["HEAD ".len()..].to_string();
             } else if line.starts_with("branch ") {
                 let full = &line["branch ".len()..];
@@ -1637,15 +1641,32 @@ pub(crate) fn git_worktree_list(cwd: String) -> Result<Vec<WorktreeEntry>, Strin
                 e.is_bare = true;
             } else if line.starts_with("locked") {
                 e.is_locked = true;
+                // Format : "locked" seul ou "locked <raison>" avec raison inline
+                let reason = line["locked".len()..].trim();
+                if !reason.is_empty() {
+                    e.lock_reason = Some(reason.to_string());
+                }
+            } else if line.starts_with("prunable") {
+                e.is_prunable = true;
+                let reason = line["prunable".len()..].trim();
+                if !reason.is_empty() {
+                    e.prunable_reason = Some(reason.to_string());
+                }
             } else if line == "detached" {
                 e.branch = "(detached HEAD)".to_string();
             }
         }
     }
-    if let Some(e) = current {
+    if let Some(e) = current.take() {
         entries.push(e);
     }
 
+    // Fallback pour git < 2.36 : l'attribut "main" n'existait pas.
+    // Si aucune entrée n'est marquée is_main, on marque la première.
+    if !entries.is_empty() && entries.iter().all(|e| !e.is_main) {
+        entries[0].is_main = true;
+    }
+
     Ok(entries)
 }
 
@@ -1656,6 +1677,15 @@ pub(crate) fn git_worktree_add(
     branch: String,
     new_branch: Option<String>,
 ) -> Result<WorktreeEntry, String> {
+    // Note, create folders if they dont exist.
+    let target_path = std::path::Path::new(&path);
+    if let Some(parent) = target_path.parent() {
+        if !parent.exists() {
+            std::fs::create_dir_all(parent)
+                .map_err(|e| format!("Failed to create worktree base directory: {}", e))?;
+        }
+    }
+
     let mut cmd = git_cmd();
     cmd.arg("worktree").arg("add").arg(&path);
 
@@ -1678,13 +1708,28 @@ pub(crate) fn git_worktree_add(
     }
 
     let resolved_branch = new_branch.as_deref().unwrap_or(&branch).to_string();
+
+    // Récupérer le SHA HEAD réel depuis le nouveau worktree
+    let head = git_cmd()
+        .args(["rev-parse", "HEAD"])
+        .current_dir(&path)
+        .output()
+        .ok()
+        .filter(|o| o.status.success())
+        .and_then(|o| String::from_utf8(o.stdout).ok())
+        .map(|s| s.trim().to_string())
+        .unwrap_or_default();
+
     Ok(WorktreeEntry {
         path,
         branch: resolved_branch,
-        head: String::new(),
+        head,
         is_main: false,
         is_locked: false,
+        lock_reason: None,
         is_bare: false,
+        is_prunable: false,
+        prunable_reason: None,
     })
 }
 
@@ -1746,12 +1791,16 @@ pub(crate) fn git_worktree_status_all(cwd: String) -> Result<Vec<WorkspaceRepoSt
             .map(|s| s.trim().to_string())
             .unwrap_or_default();
 
-        let (ahead, behind) = git_cmd()
+        // Upstream : détecter si une remote est configurée, et extraire ahead/behind
+        let upstream_out = git_cmd()
             .args(["rev-list", "--left-right", "--count", "HEAD...@{upstream}"])
             .current_dir(&path)
             .output()
             .ok()
-            .filter(|o| o.status.success())
+            .filter(|o| o.status.success());
+
+        let has_upstream = upstream_out.is_some();
+        let (ahead, behind) = upstream_out
             .and_then(|o| String::from_utf8(o.stdout).ok())
             .and_then(|s| {
                 let parts: Vec<&str> = s.trim().split_whitespace().collect();
@@ -1761,22 +1810,53 @@ pub(crate) fn git_worktree_status_all(cwd: String) -> Result<Vec<WorkspaceRepoSt
             })
             .unwrap_or((0, 0));
 
-        let modified = git_cmd()
+        // Status : séparer les fichiers en conflit (UU/AA/DD/AU/UA/DU/UD) des simples modifiés
+        let status_out = git_cmd()
             .args(["status", "--porcelain", "--untracked-files=no"])
             .current_dir(&path)
             .output()
             .ok()
             .filter(|o| o.status.success())
             .and_then(|o| String::from_utf8(o.stdout).ok())
-            .map(|s| s.lines().filter(|l| !l.is_empty()).count() as u32)
-            .unwrap_or(0);
+            .unwrap_or_default();
+
+        const CONFLICT_CODES: &[&str] = &["UU", "AA", "DD", "AU", "UA", "DU", "UD"];
+        let conflicted = status_out
+            .lines()
+            .filter(|l| l.len() >= 2 && CONFLICT_CODES.contains(&&l[..2]))
+            .count() as u32;
+        let modified = status_out
+            .lines()
+            .filter(|l| l.len() >= 2 && !CONFLICT_CODES.contains(&&l[..2]))
+            .count() as u32;
 
-        WorkspaceRepoStatus { path, name, branch, ahead, behind, modified, error: None }
+        WorkspaceRepoStatus { path, name, branch, ahead, behind, has_upstream, modified, conflicted, error: None }
     }).collect();
 
     Ok(statuses)
 }
 
+#[tauri::command]
+pub(crate) fn git_worktree_repair(cwd: String, paths: Vec<String>) -> Result<(), String> {
+    let mut cmd = git_cmd();
+    cmd.args(["worktree", "repair"]);
+    for p in &paths {
+        cmd.arg(p);
+    }
+    let output = cmd
+        .current_dir(&cwd)
+        .output()
+        .map_err(|e| format!("Failed to repair worktrees: {}", e))?;
+
+    if !output.status.success() {
+        return Err(format!(
+            "git worktree repair failed: {}",
+            String::from_utf8_lossy(&output.stderr)
+        ));
+    }
+    Ok(())
+}
+
 // ─── Git clone / fork ─────────────────────────────────────────
 
 // ─── Clone progress helpers ──────────────────────────────────
diff --git a/apps/desktop/src-tauri/src/commands/workspace.rs b/apps/desktop/src-tauri/src/commands/workspace.rs
index d930dd54..6c5a81e6 100644
--- a/apps/desktop/src-tauri/src/commands/workspace.rs
+++ b/apps/desktop/src-tauri/src/commands/workspace.rs
@@ -53,10 +53,20 @@ pub(crate) fn workspace_status_all(repos: Vec<WorkspaceRepo>) -> Vec<WorkspaceRe
         let path = repo.path.clone();
         let name = repo.name.clone();
 
-        let (branch, ahead, behind, _no_upstream) = libgit2_branch_ab(&path);
+        let (branch, ahead, behind, no_upstream) = libgit2_branch_ab(&path);
         let modified = libgit2_modified_count(&path);
 
-        WorkspaceRepoStatus { path, name, branch, ahead, behind, modified, error: None }
+        WorkspaceRepoStatus {
+            path,
+            name,
+            branch,
+            ahead,
+            behind,
+            has_upstream: !no_upstream,
+            modified,
+            conflicted: 0, // non calculé dans la vue workspace (libgit2 ne distingue pas les conflits ici)
+            error: None,
+        }
     }).collect()
 }
 
diff --git a/apps/desktop/src-tauri/src/lib.rs b/apps/desktop/src-tauri/src/lib.rs
index 7d2a71b8..8e541f8b 100644
--- a/apps/desktop/src-tauri/src/lib.rs
+++ b/apps/desktop/src-tauri/src/lib.rs
@@ -349,6 +349,7 @@ pub fn run() {
             commands::ops::git_worktree_add,
             commands::ops::git_worktree_remove,
             commands::ops::git_worktree_prune,
+            commands::ops::git_worktree_repair,
             commands::ops::agent_session_list,
             commands::ops::agent_session_launch,
             commands::ops::git_submodule_list,
diff --git a/apps/desktop/src-tauri/src/types.rs b/apps/desktop/src-tauri/src/types.rs
index e80b41ad..a2e3e964 100644
--- a/apps/desktop/src-tauri/src/types.rs
+++ b/apps/desktop/src-tauri/src/types.rs
@@ -569,7 +569,9 @@ pub struct WorkspaceRepoStatus {
     pub branch: String,
     pub ahead: u32,
     pub behind: u32,
+    pub has_upstream: bool,
     pub modified: u32,
+    pub conflicted: u32,
     pub error: Option<String>,
 }
 
@@ -673,7 +675,10 @@ pub struct WorktreeEntry {
     pub head: String,
     pub is_main: bool,
     pub is_locked: bool,
+    pub lock_reason: Option<String>,
     pub is_bare: bool,
+    pub is_prunable: bool,
+    pub prunable_reason: Option<String>,
 }
 
 // ─── Agent session types ──────────────────────────────────────────
diff --git a/apps/desktop/src/App.vue b/apps/desktop/src/App.vue
index 7fed8e4c..055cd429 100644
--- a/apps/desktop/src/App.vue
+++ b/apps/desktop/src/App.vue
@@ -219,6 +219,7 @@ const {
   applyStash: applyStashRepo,
   popStash: popStashRepo,
   dropStash,
+  worktreeBranches,
 } = useGitRepo();
 
 function switchToChangesWithFirstFile() {
@@ -2189,7 +2190,7 @@ onUnmounted(() => {
       :main-commit-count="mainCommitCount" :push-remote="pushRemote"
       :ahead-push-count="aheadPushCount" :is-pushing="isPushing" :is-pulling="isPulling"
       :force-push-preferred="forcePushPreferred" :is-fetching="isFetching"
-      :cwd="repoFolderPath ?? ''" :branches="branches" :branches-loading="branchesLoading"
+      :cwd="repoFolderPath ?? ''" :branches="branches" :worktree-branches="worktreeBranches" :branches-loading="branchesLoading"
       :is-switching-branch="isSwitchingBranch" :is-merging="isMerging" :tabs="repoTabs" :active-tab-id="activeTabId"
       @open-folder="handleOpenFolder" @open-repo="handleOpenPath" @switch-tab="switchTab" @close-tab="closeTab"
       @reorder-tabs="reorderTabs"
@@ -2355,7 +2356,7 @@ onUnmounted(() => {
         <aside v-if="showGitTree && hasRepo" class="git-tree-panel"
           :style="{ width: gitTreeWidth + 'px', minWidth: gitTreeWidth + 'px' }">
           <CommitGraph :commits="repoLog" :selected-hash="selectedCommitHash" :current-branch="repoStatus?.branch"
-            :fork-point-sha="graphForkPointSha" :repo-stats="repoStats" :branches="branches" :stashes="stashes"
+            :fork-point-sha="graphForkPointSha" :repo-stats="repoStats" :branches="branches" :worktree-branches="worktreeBranches" :stashes="stashes"
             :submodule-changes="submoduleChanges"
             :has-more="logHasMore" :loading-more="logLoadingMore"
             @select-commit="(hash) => { selectCommit(hash); viewMode = 'history'; }"
@@ -2463,6 +2464,7 @@ onUnmounted(() => {
     <WorktreeManager v-if="showWorktrees && repoFolderPath" :cwd="repoFolderPath" :branches="branches"
       :suggested-branch="pendingWorktreeBranch" :open-quick-create="pendingQuickCreate"
       @close="showWorktrees = false; pendingWorktreeBranch = undefined; pendingQuickCreate = false;"
+      @load-branches="loadBranches"
       @open-tab="(path) => { openTab(path); showWorktrees = false; pendingWorktreeBranch = undefined; pendingQuickCreate = false; }" />
 
     <!-- Submodule panel (uses BaseModal internally → own Teleport + backdrop) -->
@@ -2585,9 +2587,10 @@ onUnmounted(() => {
     <!-- Command palette (Cmd/Ctrl+K) — teleports to body, so position
          in the template tree is cosmetic. Mounted conditionally so the
          input gets fresh autofocus each time it opens. -->
-    <SearchPalette v-if="showSearchPalette" :branches="branches" :commits="repoLog" :actions="paletteActions"
-      @close="showSearchPalette = false" @switch-branch="onPaletteSwitchBranch" @select-commit="onPaletteSelectCommit"
-      @run-action="onPaletteAction" />
+    <SearchPalette v-if="showSearchPalette" :branches="branches" :worktree-branches="worktreeBranches" :commits="repoLog" :actions="paletteActions"
+      @close="showSearchPalette = false" @switch-branch="onPaletteSwitchBranch"
+      @select-commit="onPaletteSelectCommit" @run-action="onPaletteAction"
+      @load-branches="loadBranches" @load-log="loadLog" />
 
     <!-- Rename / Delete-branch modals, raised from BranchMenu.
          Both teleport to body and guard against `repoStatus?.branch` going
diff --git a/apps/desktop/src/__tests__/worktreeParser.test.ts b/apps/desktop/src/__tests__/worktreeParser.test.ts
new file mode 100644
index 00000000..1eee5972
--- /dev/null
+++ b/apps/desktop/src/__tests__/worktreeParser.test.ts
@@ -0,0 +1,378 @@
+/**
+ * Worktree parser — jeu de tests complet
+ *
+ * Couvre les fonctions pures de `utils/worktreeParser.ts` qui reflètent
+ * la logique Rust de `src-tauri/src/commands/ops.rs`.
+ *
+ * Fixtures basées sur un dépôt fictif (/home/user/projects/myrepo).
+ * Aucune dépendance réseau, aucun Tauri : tests purement unitaires (vitest).
+ *
+ * Scénarios couverts :
+ *  1. Worktree principal seul (git ≥ 2.36, attribut `main`)
+ *  2. Worktree principal + 1 worktree additionnel
+ *  3. Attribut `locked` sans raison
+ *  4. Attribut `locked` avec raison inline
+ *  5. Attribut `prunable` sans raison
+ *  6. Attribut `prunable` avec raison inline
+ *  7. HEAD détaché (detached HEAD)
+ *  8. Bare worktree
+ *  9. Fallback git < 2.36 (pas d'attribut `main` → premier = main)
+ * 10. Sortie vide → tableau vide
+ * 11. Plusieurs worktrees, ordre préservé
+ * 12. Branche refs/heads/ strippée correctement
+ * 13. Status : zéro ligne → 0/0
+ * 14. Status : uniquement modifiés
+ * 15. Status : uniquement conflits (UU, AA, DD, AU, UA, DU, UD)
+ * 16. Status : mélange conflits + modifiés
+ * 17. Status : ligne vide ignorée
+ * 18. deriveQuickWorktreePath : nom simple
+ * 19. deriveQuickWorktreePath : nom avec slash (fix/login)
+ * 20. deriveQuickWorktreePath : nom avec caractères spéciaux sanitisés
+ * 21. hasPrunableWorktrees : aucun prunable
+ * 22. hasPrunableWorktrees : un prunable
+ */
+
+import { describe, expect, it } from "vitest";
+import {
+  parseWorktreePorcelain,
+  parseWorktreeStatus,
+  deriveQuickWorktreePath,
+  hasPrunableWorktrees,
+  CONFLICT_CODES,
+} from "../utils/worktreeParser";
+
+// ─── Chemins de référence (repo fictif pour les tests) ───────────────────────
+
+const TURBULLES = "/home/user/projects/myrepo";
+const TURBULLES_FIX = "/home/user/projects/myrepo-fix-login";
+const TURBULLES_FEAT = "/home/user/projects/myrepo-feat-dashboard";
+const TURBULLES_HEAD = "a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2";
+
+// ─── Helpers ─────────────────────────────────────────────────────────────────
+
+/** Indente un porcelain brut comme git le fait (ligne vide entre stanzas). */
+function porcelain(...stanzas: string[]): string {
+  return stanzas.join("\n\n") + "\n";
+}
+
+function mainStanza(path = TURBULLES, head = TURBULLES_HEAD, branch = "master"): string {
+  return `worktree ${path}\nHEAD ${head}\nbranch refs/heads/${branch}\nmain`;
+}
+
+function wtStanza(path: string, branch: string, head = "aabbcc0011223344556677889900aabbcc001122"): string {
+  return `worktree ${path}\nHEAD ${head}\nbranch refs/heads/${branch}`;
+}
+
+// ─── 1. parseWorktreePorcelain ────────────────────────────────────────────────
+
+describe("parseWorktreePorcelain", () => {
+
+  // ── Cas 1 : Worktree principal seul (git ≥ 2.36) ────────────────────────
+
+  it("cas 1 — worktree principal seul (attribut main présent)", () => {
+    const raw = porcelain(mainStanza());
+    const result = parseWorktreePorcelain(raw);
+
+    expect(result).toHaveLength(1);
+    expect(result[0]).toMatchObject({
+      path: TURBULLES,
+      branch: "master",
+      head: TURBULLES_HEAD,
+      is_main: true,
+      is_locked: false,
+      lock_reason: null,
+      is_bare: false,
+      is_prunable: false,
+      prunable_reason: null,
+    });
+  });
+
+  // ── Cas 2 : Principal + 1 worktree additionnel ───────────────────────────
+
+  it("cas 2 — principal + un worktree additionnel", () => {
+    const raw = porcelain(
+      mainStanza(),
+      wtStanza(TURBULLES_FIX, "fix/login-bug"),
+    );
+    const result = parseWorktreePorcelain(raw);
+
+    expect(result).toHaveLength(2);
+
+    expect(result[0].is_main).toBe(true);
+    expect(result[0].path).toBe(TURBULLES);
+    expect(result[0].branch).toBe("master");
+
+    expect(result[1].is_main).toBe(false);
+    expect(result[1].path).toBe(TURBULLES_FIX);
+    expect(result[1].branch).toBe("fix/login-bug");
+  });
+
+  // ── Cas 3 : locked sans raison ───────────────────────────────────────────
+
+  it("cas 3 — attribut locked sans raison", () => {
+    const raw = porcelain(
+      mainStanza(),
+      `worktree ${TURBULLES_FIX}\nHEAD ${TURBULLES_HEAD}\nbranch refs/heads/fix/auth\nlocked`,
+    );
+    const result = parseWorktreePorcelain(raw);
+
+    expect(result[1].is_locked).toBe(true);
+    expect(result[1].lock_reason).toBeNull();
+  });
+
+  // ── Cas 4 : locked avec raison inline ───────────────────────────────────
+
+  it("cas 4 — attribut locked avec raison inline", () => {
+    const raw = porcelain(
+      mainStanza(),
+      `worktree ${TURBULLES_FIX}\nHEAD ${TURBULLES_HEAD}\nbranch refs/heads/fix/auth\nlocked added manually by CI pipeline`,
+    );
+    const result = parseWorktreePorcelain(raw);
+
+    expect(result[1].is_locked).toBe(true);
+    expect(result[1].lock_reason).toBe("added manually by CI pipeline");
+  });
+
+  // ── Cas 5 : prunable sans raison ────────────────────────────────────────
+
+  it("cas 5 — attribut prunable sans raison", () => {
+    const raw = porcelain(
+      mainStanza(),
+      `worktree ${TURBULLES_FIX}\nHEAD ${TURBULLES_HEAD}\nbranch refs/heads/fix/auth\nprunable`,
+    );
+    const result = parseWorktreePorcelain(raw);
+
+    expect(result[1].is_prunable).toBe(true);
+    expect(result[1].prunable_reason).toBeNull();
+  });
+
+  // ── Cas 6 : prunable avec raison inline ─────────────────────────────────
+
+  it("cas 6 — attribut prunable avec raison inline", () => {
+    const raw = porcelain(
+      mainStanza(),
+      `worktree ${TURBULLES_FIX}\nHEAD ${TURBULLES_HEAD}\nbranch refs/heads/fix/auth\nprunable gitdir file points to non-existent location`,
+    );
+    const result = parseWorktreePorcelain(raw);
+
+    expect(result[1].is_prunable).toBe(true);
+    expect(result[1].prunable_reason).toBe("gitdir file points to non-existent location");
+  });
+
+  // ── Cas 7 : detached HEAD ───────────────────────────────────────────────
+
+  it("cas 7 — detached HEAD", () => {
+    const raw = porcelain(
+      mainStanza(),
+      `worktree ${TURBULLES_FIX}\nHEAD ${TURBULLES_HEAD}\ndetached`,
+    );
+    const result = parseWorktreePorcelain(raw);
+
+    expect(result[1].branch).toBe("(detached HEAD)");
+  });
+
+  // ── Cas 8 : bare worktree ────────────────────────────────────────────────
+
+  it("cas 8 — bare worktree", () => {
+    const raw = `worktree /srv/git/turbulles.git\nHEAD ${TURBULLES_HEAD}\nbranch refs/heads/master\nbare\n`;
+    const result = parseWorktreePorcelain(raw);
+
+    expect(result[0].is_bare).toBe(true);
+  });
+
+  // ── Cas 9 : fallback git < 2.36 (pas d'attribut `main`) ─────────────────
+
+  it("cas 9 — fallback git < 2.36 : premier worktree marqué main", () => {
+    // Pas de ligne "main" dans la sortie (git < 2.36)
+    const raw = porcelain(
+      `worktree ${TURBULLES}\nHEAD ${TURBULLES_HEAD}\nbranch refs/heads/master`,
+      wtStanza(TURBULLES_FIX, "fix/auth"),
+    );
+    const result = parseWorktreePorcelain(raw);
+
+    expect(result[0].is_main).toBe(true);
+    expect(result[1].is_main).toBe(false);
+  });
+
+  // ── Cas 10 : sortie vide ─────────────────────────────────────────────────
+
+  it("cas 10 — sortie vide → tableau vide", () => {
+    expect(parseWorktreePorcelain("")).toEqual([]);
+    expect(parseWorktreePorcelain("\n\n")).toEqual([]);
+  });
+
+  // ── Cas 11 : plusieurs worktrees, ordre préservé ─────────────────────────
+
+  it("cas 11 — trois worktrees, ordre préservé", () => {
+    const raw = porcelain(
+      mainStanza(),
+      wtStanza(TURBULLES_FIX, "fix/login-bug"),
+      wtStanza(TURBULLES_FEAT, "feat/dashboard"),
+    );
+    const result = parseWorktreePorcelain(raw);
+
+    expect(result).toHaveLength(3);
+    expect(result.map((e) => e.path)).toEqual([TURBULLES, TURBULLES_FIX, TURBULLES_FEAT]);
+  });
+
+  // ── Cas 12 : refs/heads/ strippé ─────────────────────────────────────────
+
+  it("cas 12 — préfixe refs/heads/ strippé", () => {
+    const raw = `worktree ${TURBULLES}\nHEAD ${TURBULLES_HEAD}\nbranch refs/heads/feature/super-long-branch-name\nmain\n`;
+    const result = parseWorktreePorcelain(raw);
+
+    expect(result[0].branch).toBe("feature/super-long-branch-name");
+  });
+
+  // ── Cas bonus : locked + prunable simultanément ──────────────────────────
+
+  it("bonus — locked et prunable simultanément", () => {
+    const raw = porcelain(
+      mainStanza(),
+      `worktree ${TURBULLES_FIX}\nHEAD ${TURBULLES_HEAD}\nbranch refs/heads/fix/auth\nlocked CI lock\nprunable directory gone`,
+    );
+    const result = parseWorktreePorcelain(raw);
+
+    expect(result[1].is_locked).toBe(true);
+    expect(result[1].lock_reason).toBe("CI lock");
+    expect(result[1].is_prunable).toBe(true);
+    expect(result[1].prunable_reason).toBe("directory gone");
+  });
+});
+
+// ─── 2. parseWorktreeStatus ───────────────────────────────────────────────────
+
+describe("parseWorktreeStatus", () => {
+
+  it("cas 13 — sortie vide → 0 conflits, 0 modifiés", () => {
+    expect(parseWorktreeStatus("")).toEqual({ conflicted: 0, modified: 0 });
+  });
+
+  it("cas 14 — uniquement fichiers modifiés", () => {
+    const raw = [
+      " M src/components/WorktreeManager.vue",
+      "M  apps/desktop/src/utils/backend.ts",
+      "A  apps/desktop/src/utils/worktreeParser.ts",
+    ].join("\n");
+    expect(parseWorktreeStatus(raw)).toEqual({ conflicted: 0, modified: 3 });
+  });
+
+  it("cas 15 — uniquement conflits (tous les codes)", () => {
+    const conflictLines = [...CONFLICT_CODES].map((code) => `${code} path/to/file-${code}.ts`).join("\n");
+    const result = parseWorktreeStatus(conflictLines);
+    expect(result.conflicted).toBe(CONFLICT_CODES.size); // 7 codes
+    expect(result.modified).toBe(0);
+  });
+
+  it("cas 15b — code UU seul (le plus courant)", () => {
+    const raw = "UU src/conflict.ts\nUU src/another.ts";
+    expect(parseWorktreeStatus(raw)).toEqual({ conflicted: 2, modified: 0 });
+  });
+
+  it("cas 16 — mélange conflits + modifiés", () => {
+    const raw = [
+      "UU src/models/user.ts",      // conflit
+      " M src/views/Login.vue",      // modifié
+      "AA CHANGELOG.md",             // conflit
+      "M  package.json",             // modifié
+      "DU src/old-file.ts",          // conflit
+    ].join("\n");
+    expect(parseWorktreeStatus(raw)).toEqual({ conflicted: 3, modified: 2 });
+  });
+
+  it("cas 17 — lignes vides ignorées", () => {
+    const raw = "\n M src/file.ts\n\nUU src/conflict.ts\n\n";
+    expect(parseWorktreeStatus(raw)).toEqual({ conflicted: 1, modified: 1 });
+  });
+});
+
+// ─── 3. deriveQuickWorktreePath ──────────────────────────────────────────────
+
+describe("deriveQuickWorktreePath", () => {
+
+  it("cas 18 — nom simple", () => {
+    expect(deriveQuickWorktreePath(TURBULLES, "fix-auth")).toBe(
+      `${TURBULLES}-fix-auth`,
+    );
+  });
+
+  it("cas 19 — nom avec slash (fix/login)", () => {
+    expect(deriveQuickWorktreePath(TURBULLES, "fix/login")).toBe(
+      `${TURBULLES}-fix/login`,
+    );
+  });
+
+  it("cas 20 — caractères spéciaux sanitisés", () => {
+    const result = deriveQuickWorktreePath(TURBULLES, "Fix Auth Bug!!!");
+    // Lettres majuscules conservées, espaces et ! → tirets fusionnés
+    expect(result).toBe(`${TURBULLES}-Fix-Auth-Bug`);
+  });
+
+  it("cas 20b — tirets redondants fusionnés", () => {
+    const result = deriveQuickWorktreePath(TURBULLES, "fix--double--dash");
+    expect(result).toBe(`${TURBULLES}-fix-double-dash`);
+  });
+
+  it("tirets initiaux et finaux supprimés du slug", () => {
+    const result = deriveQuickWorktreePath(TURBULLES, "-fix-auth-");
+    expect(result).toBe(`${TURBULLES}-fix-auth`);
+  });
+
+  it("chemin principal avec trailing slash nettoyé", () => {
+    expect(deriveQuickWorktreePath(`${TURBULLES}/`, "fix")).toBe(
+      `${TURBULLES}-fix`,
+    );
+  });
+});
+
+// ─── 4. hasPrunableWorktrees ─────────────────────────────────────────────────
+
+describe("hasPrunableWorktrees", () => {
+  const makeEntry = (is_prunable: boolean) => ({
+    path: TURBULLES,
+    branch: "master",
+    head: TURBULLES_HEAD,
+    is_main: true,
+    is_locked: false,
+    lock_reason: null,
+    is_bare: false,
+    is_prunable,
+    prunable_reason: null,
+  });
+
+  it("cas 21 — tableau vide → false", () => {
+    expect(hasPrunableWorktrees([])).toBe(false);
+  });
+
+  it("cas 21b — tous propres → false", () => {
+    expect(hasPrunableWorktrees([makeEntry(false), makeEntry(false)])).toBe(false);
+  });
+
+  it("cas 22 — un prunable → true", () => {
+    expect(hasPrunableWorktrees([makeEntry(false), makeEntry(true)])).toBe(true);
+  });
+
+  it("cas 22b — le principal lui-même prunable → true", () => {
+    expect(hasPrunableWorktrees([makeEntry(true)])).toBe(true);
+  });
+});
+
+// ─── 5. CONFLICT_CODES — exhaustivité ─────────────────────────────────────────
+
+describe("CONFLICT_CODES", () => {
+  it("contient exactement les 7 codes de conflit git", () => {
+    // Source : git documentation — git-status(1) XY format
+    const expected = ["UU", "AA", "DD", "AU", "UA", "DU", "UD"];
+    for (const code of expected) {
+      expect(CONFLICT_CODES.has(code)).toBe(true);
+    }
+    expect(CONFLICT_CODES.size).toBe(expected.length);
+  });
+
+  it("ne contient pas de codes de modification simples", () => {
+    const notConflicts = ["M ", " M", "MM", "A ", " A", "D ", " D", "R ", "C ", "??"];
+    for (const code of notConflicts) {
+      expect(CONFLICT_CODES.has(code)).toBe(false);
+    }
+  });
+});
diff --git a/apps/desktop/src/components/AppHeader.vue b/apps/desktop/src/components/AppHeader.vue
index 1c0c9ee6..d183e27d 100644
--- a/apps/desktop/src/components/AppHeader.vue
+++ b/apps/desktop/src/components/AppHeader.vue
@@ -21,7 +21,7 @@
  *   - SyncSplitButton   — primary sync action (publish / push / pull /
  *                         sync / up-to-date) with a state-aware dropdown
  *   - BranchMenu        — secondary branch-op menu (merge, rebase,
- *                         rename, delete, rewind, worktrees, submodules)
+ *                         rename, delete, rewind)
  *
  * Anything still inline here is coupled specifically to the header
  * layout rather than a reusable slice: the merge-into picker (triggered
@@ -79,6 +79,7 @@ const props = defineProps<{
   isOffline?: boolean;
   // Branch popover
   branches: GitBranch[];
+  worktreeBranches?: Set<string>;
   branchesLoading: boolean;
   isSwitchingBranch: boolean;
   isMerging: boolean;
@@ -295,12 +296,6 @@ function onBranchMenuDelete() {
 function onBranchMenuRewind() {
   openUndoPopover();
 }
-function onBranchMenuWorktrees() {
-  emit("openWorktrees");
-}
-function onBranchMenuSubmodules() {
-  emit("openSubmodules");
-}
 
 // ─── Close popovers on click outside ──────────────────────────────
 // BranchSelector owns its own click-outside handling now; we only need
@@ -463,6 +458,7 @@ onUnmounted(() => document.removeEventListener("click", onDocClick, true));
             :branch-display="branchDisplay"
             :repo-stats="repoStats"
             :branches="branches"
+            :worktree-branches="worktreeBranches"
             :branches-loading="branchesLoading"
             :is-switching-branch="isSwitchingBranch"
             :cwd="cwd"
@@ -489,8 +485,6 @@ onUnmounted(() => document.removeEventListener("click", onDocClick, true));
             @open-rename-modal="onBranchMenuRename"
             @open-delete-modal="onBranchMenuDelete"
             @open-rewind="onBranchMenuRewind"
-            @open-worktrees="onBranchMenuWorktrees"
-            @open-submodules="onBranchMenuSubmodules"
             @discard-all="emit('discardAll')"
           />
 
@@ -548,6 +542,36 @@ onUnmounted(() => document.removeEventListener("click", onDocClick, true));
             <span>{{ t('tags.title') }}</span>
           </button>
 
+          <!-- Worktrees button -->
+          <button
+            class="btn btn--secondary header-action-btn"
+            :title="t('worktree.title')"
+            :aria-label="t('worktree.title')"
+            @click="emit('openWorktrees')"
+          >
+            <svg width="14" height="14" viewBox="0 0 16 16" fill="none" aria-hidden="true">
+              <rect x="2" y="2" width="5" height="5" rx="1" stroke="currentColor" stroke-width="1.3" fill="none" />
+              <rect x="9" y="2" width="5" height="5" rx="1" stroke="currentColor" stroke-width="1.3" fill="none" />
+              <rect x="5.5" y="9" width="5" height="5" rx="1" stroke="currentColor" stroke-width="1.3" fill="none" />
+              <path d="M4.5 7v1.5M11.5 7v1.5M4.5 8.5h7" stroke="currentColor" stroke-width="1.3" stroke-linecap="round" />
+            </svg>
+            <span>{{ t('worktree.title') }}</span>
+          </button>
+
+          <!-- Submodules button -->
+          <button
+            class="btn btn--secondary header-action-btn"
+            :title="t('submodule.title')"
+            :aria-label="t('submodule.title')"
+            @click="emit('openSubmodules')"
+          >
+            <svg width="14" height="14" viewBox="0 0 16 16" fill="none" aria-hidden="true">
+              <rect x="3" y="3" width="10" height="10" rx="1.5" stroke="currentColor" stroke-width="1.3" fill="none" />
+              <rect x="6" y="6" width="4" height="4" rx="0.5" stroke="currentColor" stroke-width="1.3" fill="none" />
+            </svg>
+            <span>{{ t('submodule.title') }}</span>
+          </button>
+
           <!-- Merge-into picker (triggered by BranchMenu → onBranchMenuMerge) -->
           <div v-if="showMergePopover" class="merge-popover-anchor">
             <div class="merge-popover">
@@ -578,6 +602,12 @@ onUnmounted(() => document.removeEventListener("click", onDocClick, true));
                       <circle cx="12" cy="8" r="2" stroke="currentColor" stroke-width="1.3" />
                       <path d="M5 6v4M10 8H7c-1.1 0-2-.9-2-2" stroke="currentColor" stroke-width="1.3" />
                     </svg>
+                    <svg v-if="props.worktreeBranches?.has(branch.name)" class="branch-wt-icon" width="12" height="12" viewBox="0 0 16 16" fill="currentColor" style="margin-left: 2px; color: var(--color-success); flex-shrink: 0;">
+                      <circle cx="8" cy="4.5" r="2.5" />
+                      <circle cx="4.5" cy="8.5" r="2.5" />
+                      <circle cx="11.5" cy="8.5" r="2.5" />
+                      <rect x="7.5" y="8" width="1" height="6" />
+                    </svg>
                     <span class="mp-item-name mono">{{ branch.name }}</span>
                     <span v-if="branch.isRemote" class="mp-item-tag">remote</span>
                   </li>
diff --git a/apps/desktop/src/components/BaseModal.vue b/apps/desktop/src/components/BaseModal.vue
index 944b7340..3bf16029 100644
--- a/apps/desktop/src/components/BaseModal.vue
+++ b/apps/desktop/src/components/BaseModal.vue
@@ -194,9 +194,9 @@ onUnmounted(() => {
 /* ─── Header ───────────────────────────────────────── */
 .base-modal__header {
   display: flex;
-  align-items: flex-start;
+  align-items: center;
   gap: var(--space-4);
-  padding: var(--space-6) var(--space-7) var(--space-5);
+  padding: var(--space-5) var(--space-7);
   border-bottom: 1px solid var(--color-border);
 }
 
diff --git a/apps/desktop/src/components/CommitGraph.vue b/apps/desktop/src/components/CommitGraph.vue
index 432a419c..a7a7d117 100644
--- a/apps/desktop/src/components/CommitGraph.vue
+++ b/apps/desktop/src/components/CommitGraph.vue
@@ -21,6 +21,7 @@ const props = defineProps<{
   forkPointSha?: string;
   repoStats?: { staged: number; unstaged: number; untracked: number; conflicted: number; added: number; modified: number; deleted: number; renamed: number };
   branches?: GitBranch[];
+  worktreeBranches?: Set<string>;
   stashes?: any[];
   /** Map of commit SHA → submodule pointer changes, for the Git Tree badge (v2.15.1). */
   submoduleChanges?: Record<string, Array<{ path: string; pointedSha: string }>>;
@@ -1129,7 +1130,15 @@ const visibleCommits = computed<VisibleCommit[]>(() => {
                 :title="r.name"
                 @contextmenu.stop="openCommitContextMenu($event, vc.entry, vc.index, r.name, r.type)"
                 @dblclick.stop="onBranchDblClick(r)"
-              >{{ branchList.length > 1 ? truncate(r.name) : r.name }}</span>
+              >
+                <svg v-if="r.type === 'branch' && props.worktreeBranches?.has(r.name)" class="branch-wt-icon" width="10" height="10" viewBox="0 0 16 16" fill="currentColor" style="margin-right: 3px; vertical-align: middle; margin-top: -2px;">
+                  <circle cx="8" cy="4.5" r="2.5" />
+                  <circle cx="4.5" cy="8.5" r="2.5" />
+                  <circle cx="11.5" cy="8.5" r="2.5" />
+                  <rect x="7.5" y="8" width="1" height="6" />
+                </svg>
+                {{ branchList.length > 1 ? truncate(r.name) : r.name }}
+              </span>
             </template>
             <!-- Submodule pointer badges (v2.15.1) — click navigates into the submodule's Git Tree -->
             <button
diff --git a/apps/desktop/src/components/WorktreeManager.vue b/apps/desktop/src/components/WorktreeManager.vue
index 67c885c0..382f7aa6 100644
--- a/apps/desktop/src/components/WorktreeManager.vue
+++ b/apps/desktop/src/components/WorktreeManager.vue
@@ -5,6 +5,7 @@ import {
   gitWorktreeAdd,
   gitWorktreeRemove,
   gitWorktreePrune,
+  gitWorktreeRepair,
   gitWorktreeStatusAll,
   type WorktreeEntry,
   type WorkspaceRepoStatus,
@@ -25,6 +26,7 @@ const props = defineProps<{
 const emit = defineEmits<{
   (e: "close"): void;
   (e: "open-tab", path: string): void;
+  (e: "load-branches"): void;
 }>();
 
 const { t } = useI18n();
@@ -59,26 +61,32 @@ const formBranch = ref("");
 const formNewBranch = ref("");
 const creating = ref(false);
 
+/** Base directory for worktrees (sibling of the main repo). */
+const worktreeBaseDir = computed(() => {
+  const main = worktrees.value.find((w) => w.is_main);
+  const basePath = main ? main.path : props.cwd;
+  const normalizedBase = basePath.replace(/\\/g, "/").replace(/\/+$/, "");
+  return `${normalizedBase}.worktrees`;
+});
+
+/** Derive a worktree path from a branch name. */
+function derivePath(name: string): string {
+  const slug = name.trim().replace(/[^a-zA-Z0-9/_-]/g, "-").replace(/-+/g, "-").replace(/^[-/]+|[-/]+$/g, "");
+  return `${worktreeBaseDir.value}/${slug}`;
+}
+
 // ── Quick-create form ────────────────────────────────────
 const showQuickCreate = ref(false);
 const quickName = ref("");
 const quickCreating = ref(false);
 
-/** Derive the new worktree path from the main worktree path + task name. */
-function deriveQuickPath(name: string): string {
-  const main = worktrees.value.find((w) => w.is_main);
-  const base = main ? main.path.replace(/\\/g, "/").replace(/\/+$/, "") : props.cwd.replace(/\\/g, "/");
-  const slug = name.trim().replace(/[^a-zA-Z0-9/_-]/g, "-").replace(/-+/g, "-").replace(/^[-/]+|[-/]+$/g, "");
-  return `${base}-${slug}`;
-}
-
 async function quickCreate() {
   const name = quickName.value.trim();
   if (!name) return;
   quickCreating.value = true;
   error.value = null;
   try {
-    const path = deriveQuickPath(name);
+    const path = derivePath(name);
     const branch = name.includes("/") ? name : `task/${name}`;
     await gitWorktreeAdd(props.cwd, path, "", branch);
     quickName.value = "";
@@ -92,48 +100,48 @@ async function quickCreate() {
   }
 }
 
-// ── Remove confirmation ──────────────────────────────────
-const confirmRemovePath = ref<string | null>(null);
-const forceRemove = ref(false);
-const removing = ref(false);
+// ── Prune stale worktrees ────────────────────────────────
+const pruning = ref(false);
 
-// ── Cleanup (merged worktrees) ───────────────────────────
-const showCleanup = ref(false);
-const cleanupSelected = ref<Set<string>>(new Set());
-const cleaningUp = ref(false);
-
-/** Non-main, non-locked worktrees with ahead === 0 (safe to discard). */
-const cleanupCandidates = computed(() =>
-  worktrees.value.filter((wt) => {
-    if (wt.is_main || wt.is_locked) return false;
-    const st = statusFor(wt.path);
-    return st ? st.ahead === 0 : false;
-  })
+const hasPrunableWorktrees = computed(() =>
+  worktrees.value.some((wt) => wt.is_prunable)
 );
 
-function toggleCleanup(path: string) {
-  const s = new Set(cleanupSelected.value);
-  s.has(path) ? s.delete(path) : s.add(path);
-  cleanupSelected.value = s;
+async function prune() {
+  pruning.value = true;
+  error.value = null;
+  try {
+    await gitWorktreePrune(props.cwd);
+    await loadWorktrees();
+  } catch (err: any) {
+    error.value = t("worktree.errorPrune").replace("{0}", String(err?.message ?? err));
+  } finally {
+    pruning.value = false;
+  }
 }
 
-async function doCleanup() {
-  if (cleanupSelected.value.size === 0) return;
-  cleaningUp.value = true;
-  error.value = null;
-  for (const path of cleanupSelected.value) {
-    try {
-      await gitWorktreeRemove(props.cwd, path, false);
-    } catch (err: any) {
-      error.value = t("worktree.errorRemove").replace("{0}", String(err?.message ?? err));
-    }
+// ── Branch lists for the add form ───────────────────────
+const localBranches = computed(() => props.branches.filter((b) => !b.isRemote));
+const remoteBranches = computed(() => props.branches.filter((b) => b.isRemote));
+
+/** Set of branch names that already have a worktree. */
+const usedBranches = computed(() => {
+  const set = new Set<string>();
+  for (const wt of worktrees.value) {
+    if (wt.branch) set.add(wt.branch);
   }
-  cleanupSelected.value = new Set();
-  showCleanup.value = false;
-  cleaningUp.value = false;
-  await loadWorktrees();
+  return set;
+});
+
+function isBranchUsed(name: string): boolean {
+  return usedBranches.value.has(name);
 }
 
+// ── Remove confirmation ──────────────────────────────────
+const confirmRemovePath = ref<string | null>(null);
+const forceRemove = ref(false);
+const removing = ref(false);
+
 // ── Core actions ─────────────────────────────────────────
 
 async function loadWorktrees() {
@@ -197,26 +205,28 @@ async function confirmRemove() {
   }
 }
 
-async function prune() {
-  error.value = null;
-  try {
-    await gitWorktreePrune(props.cwd);
-    await loadWorktrees();
-  } catch (err: any) {
-    error.value = t("worktree.errorPrune").replace("{0}", String(err?.message ?? err));
-  }
-}
-
 function shortPath(path: string): string {
   const parts = path.replace(/\\/g, "/").split("/").filter(Boolean);
   return parts.length <= 2 ? path : "…/" + parts.slice(-2).join("/");
 }
 
+// Watch for branch changes to pre-fill the path
+watch([formBranch, formNewBranch], ([branch, newBranch]) => {
+  const target = newBranch.trim() || branch.trim();
+  if (target) {
+    formPath.value = derivePath(target);
+  }
+});
+
 // Reload statuses whenever worktrees change
 watch(worktrees, () => { loadStatuses(); }, { immediate: false });
 
 onMounted(async () => {
+  // Répare silencieusement les liens administratifs cassés (idempotent,
+  // < 5 ms si tout va bien). Couvre le cas "repo déplacé manuellement".
+  try { await gitWorktreeRepair(props.cwd); } catch { /* best-effort */ }
   await loadWorktrees();
+  emit("load-branches");
   if (props.suggestedBranch) {
     formBranch.value = props.suggestedBranch;
     showForm.value = true;
@@ -249,38 +259,23 @@ onMounted(async () => {
 
     <!-- Header action buttons -->
     <template #header-actions>
-      <button
-        type="button"
-        class="bm-btn bm-btn--ghost"
-        :title="t('worktree.cleanupTitle')"
-        :class="{ 'bm-btn--active': showCleanup }"
-        @click="showCleanup = !showCleanup; showForm = false; showQuickCreate = false;"
-      >
-        {{ t("worktree.cleanupAction") }}
-      </button>
-      <button
-        type="button"
-        class="bm-btn bm-btn--ghost"
-        :title="t('worktree.pruneTooltip')"
-        @click="prune"
-      >
-        {{ t("worktree.prune") }}
-      </button>
       <button
         type="button"
         class="bm-btn bm-btn--ghost"
         :title="t('worktree.quickCreateTooltip')"
         :class="{ 'bm-btn--active': showQuickCreate }"
-        @click="showQuickCreate = !showQuickCreate; showForm = false; showCleanup = false;"
+        @click="showQuickCreate = !showQuickCreate; showForm = false;"
       >
         ⚡ {{ t("worktree.quickCreate") }}
       </button>
       <button
         type="button"
-        class="bm-btn bm-btn--primary"
-        @click="showForm = !showForm; showQuickCreate = false; showCleanup = false;"
+        class="bm-btn bm-btn--ghost"
+        :title="t('worktree.pruneTooltip')"
+        :disabled="!hasPrunableWorktrees || pruning"
+        @click="prune"
       >
-        + {{ t("worktree.newWorktree") }}
+        {{ pruning ? t("worktree.pruning") : t("worktree.prune") }}
       </button>
     </template>
 
@@ -313,7 +308,7 @@ onMounted(async () => {
           </button>
         </div>
         <p v-if="quickName.trim()" class="wt-quick-preview">
-          → {{ deriveQuickPath(quickName) }}
+          → {{ derivePath(quickName) }}
           <span class="wt-quick-branch">
             ({{ quickName.includes("/") ? quickName.trim() : `task/${quickName.trim()}` }})
           </span>
@@ -322,6 +317,22 @@ onMounted(async () => {
 
       <!-- ── New worktree form ───────────────────────────── -->
       <div v-if="showForm" class="wt-form">
+        <div class="wt-form-row">
+          <label class="wt-label" for="wt-form-branch">{{ t("worktree.formBranch") }}</label>
+          <select id="wt-form-branch" v-model="formBranch" class="wt-select">
+            <option value="" disabled>{{ t("worktree.formBranchPlaceholder") }}</option>
+            <optgroup :label="t('worktree.localBranches')">
+              <option v-for="b in localBranches" :key="b.name" :value="b.name" :disabled="isBranchUsed(b.name)">
+                {{ b.name }}{{ isBranchUsed(b.name) ? ` ${t("worktree.formBranchAlreadyUsed")}` : "" }}
+              </option>
+            </optgroup>
+            <optgroup v-if="remoteBranches.length" :label="t('worktree.remoteBranches')">
+              <option v-for="b in remoteBranches" :key="b.name" :value="b.name" :disabled="isBranchUsed(b.name)">
+                {{ b.name }}{{ isBranchUsed(b.name) ? ` ${t("worktree.formBranchAlreadyUsed")}` : "" }}
+              </option>
+            </optgroup>
+          </select>
+        </div>
         <div class="wt-form-row">
           <label class="wt-label" for="wt-form-path">{{ t("worktree.formPath") }}</label>
           <input
@@ -332,17 +343,6 @@ onMounted(async () => {
             @keydown.enter="createWorktree"
           />
         </div>
-        <div class="wt-form-row">
-          <label class="wt-label" for="wt-form-branch">{{ t("worktree.formBranch") }}</label>
-          <select id="wt-form-branch" v-model="formBranch" class="wt-select">
-            <option value="" disabled>{{ t("worktree.formBranchPlaceholder") }}</option>
-            <option
-              v-for="b in branches.filter(b => !b.isRemote)"
-              :key="b.name"
-              :value="b.name"
-            >{{ b.name }}</option>
-          </select>
-        </div>
         <div class="wt-form-row">
           <label class="wt-label" for="wt-form-new-branch">{{ t("worktree.formNewBranch") }}</label>
           <input
@@ -367,45 +367,12 @@ onMounted(async () => {
         </div>
       </div>
 
-      <!-- ── Cleanup panel ───────────────────────────────── -->
-      <div v-if="showCleanup" class="wt-cleanup">
-        <div class="wt-cleanup-header">
-          <span class="wt-cleanup-title">{{ t("worktree.cleanupTitle") }}</span>
-          <span class="wt-cleanup-hint">{{ t("worktree.cleanupEmpty") }}</span>
-        </div>
-        <div v-if="cleanupCandidates.length === 0" class="wt-cleanup-empty">
-          {{ t("worktree.cleanupEmpty") }}
-        </div>
-        <div v-else>
-          <label
-            v-for="wt in cleanupCandidates"
-            :key="wt.path"
-            class="wt-cleanup-row"
-          >
-            <input
-              type="checkbox"
-              :checked="cleanupSelected.has(wt.path)"
-              @change="toggleCleanup(wt.path)"
-            />
-            <span class="wt-cleanup-branch">{{ wt.branch || t("worktree.detached") }}</span>
-            <span class="wt-cleanup-path">{{ shortPath(wt.path) }}</span>
-            <span v-if="statusFor(wt.path)" class="wt-status-pill wt-pill-muted">
-              ↓{{ statusFor(wt.path)!.behind }}
-            </span>
-          </label>
-          <div class="wt-cleanup-actions">
-            <button
-              class="bm-btn bm-btn--danger"
-              :disabled="cleanupSelected.size === 0 || cleaningUp"
-              @click="doCleanup"
-            >
-              {{ t("worktree.cleanupConfirm").replace("{0}", String(cleanupSelected.size)) }}
-            </button>
-            <button class="bm-btn bm-btn--ghost" @click="showCleanup = false; cleanupSelected = new Set()">
-              {{ t("common.cancel") }}
-            </button>
-          </div>
-        </div>
+      <!-- ── Prunable alert ─────────────────────────────── -->
+      <div v-if="hasPrunableWorktrees" class="wt-alert">
+        {{ t("worktree.prunableAlert") }}
+        <button class="bm-btn bm-btn--ghost bm-btn--sm" :disabled="pruning" @click="prune">
+          {{ t("worktree.prune") }}
+        </button>
       </div>
 
       <!-- ── Error ───────────────────────────────────────── -->
@@ -445,12 +412,21 @@ onMounted(async () => {
           {{ t("worktree.statusTitle") }}…
         </div>
 
-        <div v-for="wt in worktrees" :key="wt.path" class="wt-item">
+        <div v-for="wt in worktrees" :key="wt.path" class="wt-item" :class="{ 'wt-item--main': wt.is_main }">
           <div class="wt-item-info">
             <div class="wt-item-badges">
               <span v-if="wt.is_main" class="badge badge-main">{{ t("worktree.main") }}</span>
-              <span v-if="wt.is_locked" class="badge badge-locked">{{ t("worktree.locked") }}</span>
+              <span
+                v-if="wt.is_locked"
+                class="badge badge-locked"
+                :title="wt.lock_reason ? `${t('worktree.locked')}: ${wt.lock_reason}` : t('worktree.locked')"
+              >🔒 {{ t("worktree.locked") }}</span>
               <span v-if="wt.is_bare" class="badge badge-bare">{{ t("worktree.bare") }}</span>
+              <span
+                v-if="wt.is_prunable"
+                class="badge badge-prunable"
+                :title="wt.prunable_reason ?? t('worktree.prunableTooltip')"
+              >{{ t("worktree.prunable") }}</span>
             </div>
             <div class="wt-item-branch">
               <svg class="wt-branch-icon" width="13" height="13" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">
@@ -463,10 +439,18 @@ onMounted(async () => {
 
               <!-- Status pills -->
               <template v-for="st in [statusFor(wt.path)].filter(Boolean)" :key="wt.path + '-status'">
-                <span v-if="st!.ahead > 0" class="wt-status-pill wt-pill-ahead">↑{{ st!.ahead }}</span>
-                <span v-if="st!.behind > 0" class="wt-status-pill wt-pill-behind">↓{{ st!.behind }}</span>
+                <!-- Conflits : priorité visuelle maximale -->
+                <span v-if="st!.conflicted > 0" class="wt-status-pill wt-pill-conflict" :title="t('worktree.conflicted')">⚠ {{ st!.conflicted }}</span>
+                <!-- Ahead / behind : uniquement si upstream configuré -->
+                <template v-if="st!.has_upstream">
+                  <span v-if="st!.ahead > 0" class="wt-status-pill wt-pill-ahead">↑{{ st!.ahead }}</span>
+                  <span v-if="st!.behind > 0" class="wt-status-pill wt-pill-behind">↓{{ st!.behind }}</span>
+                </template>
+                <span v-else class="wt-status-pill wt-pill-muted" :title="t('worktree.noUpstream')">{{ t("worktree.noUpstreamShort") }}</span>
+                <!-- Fichiers modifiés (hors conflits) -->
                 <span v-if="st!.modified > 0" class="wt-status-pill wt-pill-modified">~{{ st!.modified }}</span>
-                <span v-if="!st!.error && st!.ahead === 0 && st!.behind === 0 && st!.modified === 0" class="wt-status-pill wt-pill-clean">✓</span>
+                <!-- Synchro totale -->
+                <span v-if="!st!.error && st!.has_upstream && st!.ahead === 0 && st!.behind === 0 && st!.modified === 0 && st!.conflicted === 0" class="wt-status-pill wt-pill-clean">✓</span>
                 <span v-if="st!.error" class="wt-status-pill wt-pill-error" :title="st!.error!">⚠</span>
               </template>
             </div>
@@ -475,6 +459,7 @@ onMounted(async () => {
           </div>
           <div class="wt-item-actions">
             <button
+              v-if="!wt.is_main"
               class="bm-btn bm-btn--ghost"
               @click="emit('open-tab', wt.path)"
             >
@@ -489,8 +474,28 @@ onMounted(async () => {
             </button>
           </div>
         </div>
+
+        <!-- ── Only-main hint ─────────────────────────── -->
+        <div
+          v-if="worktrees.length === 1 && worktrees[0].is_main"
+          class="wt-only-main-hint"
+        >
+          {{ t("worktree.onlyMainHint") }}
+        </div>
       </div>
     </div>
+
+    <!-- Footer action -->
+    <template #footer>
+      <button
+        type="button"
+        class="wt-footer-add-btn"
+        @click="showForm = !showForm; showQuickCreate = false;"
+      >
+        <span class="wt-footer-add-btn__icon">+</span>
+        <span>{{ t("worktree.newWorktree") }}</span>
+      </button>
+    </template>
   </BaseModal>
 </template>
 
@@ -599,73 +604,6 @@ onMounted(async () => {
   gap: var(--space-3);
 }
 
-/* ── Cleanup panel ──────────────────────────────────────── */
-.wt-cleanup {
-  padding: var(--space-4) var(--space-7);
-  border-bottom: 1px solid var(--color-border);
-  background: var(--color-bg-tertiary);
-  flex-shrink: 0;
-}
-
-.wt-cleanup-header {
-  display: flex;
-  align-items: baseline;
-  gap: var(--space-3);
-  margin-bottom: var(--space-3);
-}
-
-.wt-cleanup-title {
-  font-size: var(--font-size-sm);
-  font-weight: var(--font-weight-semibold);
-  color: var(--color-text);
-}
-
-.wt-cleanup-hint {
-  font-size: var(--font-size-xs);
-  color: var(--color-text-muted);
-  display: none; /* only shown via slot when empty */
-}
-
-.wt-cleanup-empty {
-  font-size: var(--font-size-sm);
-  color: var(--color-text-muted);
-  padding: var(--space-3) 0;
-}
-
-.wt-cleanup-row {
-  display: flex;
-  align-items: center;
-  gap: var(--space-3);
-  padding: var(--space-2) 0;
-  font-size: var(--font-size-sm);
-  cursor: pointer;
-  border-bottom: 1px solid var(--color-border);
-}
-
-.wt-cleanup-row:last-of-type {
-  border-bottom: none;
-}
-
-.wt-cleanup-branch {
-  font-weight: var(--font-weight-medium);
-  color: var(--color-text);
-  font-family: var(--font-mono);
-  font-size: var(--font-size-xs);
-}
-
-.wt-cleanup-path {
-  color: var(--color-text-muted);
-  font-family: var(--font-mono);
-  font-size: var(--font-size-xs);
-  flex: 1;
-}
-
-.wt-cleanup-actions {
-  display: flex;
-  gap: var(--space-3);
-  margin-top: var(--space-4);
-}
-
 /* ── Error ──────────────────────────────────────────────── */
 .wt-error {
   margin: var(--space-4) var(--space-7) 0;
@@ -722,6 +660,18 @@ onMounted(async () => {
   font-style: italic;
 }
 
+.wt-only-main-hint {
+  margin-top: var(--space-4);
+  padding: var(--space-4) var(--space-5);
+  background: var(--color-surface-raised, var(--color-bg-subtle));
+  border: 1px dashed var(--color-border-muted, var(--color-border));
+  border-radius: var(--radius-md);
+  font-size: var(--font-size-sm);
+  color: var(--color-text-muted);
+  text-align: center;
+  line-height: 1.5;
+}
+
 /* ── List ───────────────────────────────────────────────── */
 .wt-list {
   flex: 1;
@@ -827,6 +777,7 @@ onMounted(async () => {
 .wt-pill-clean    { background: rgba(72, 187, 120, 0.15); color: #48bb78; }
 .wt-pill-muted    { background: var(--color-bg-tertiary); color: var(--color-text-muted); }
 .wt-pill-error    { background: var(--color-danger-soft); color: var(--color-danger); cursor: help; }
+.wt-pill-conflict { background: var(--color-danger-soft); color: var(--color-danger); font-weight: var(--font-weight-semibold); }
 
 /* ── Active ghost button state ──────────────────────────── */
 .bm-btn--active {
@@ -834,4 +785,61 @@ onMounted(async () => {
   color: var(--color-accent);
   border-color: var(--color-accent);
 }
+
+/* ── Prunable alert banner ──────────────────────────────── */
+.wt-alert {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: var(--space-4);
+  padding: var(--space-3) var(--space-7);
+  background: var(--color-warning-soft, rgba(245, 158, 11, 0.1));
+  color: var(--color-warning, #f59e0b);
+  font-size: var(--font-size-sm);
+  border-bottom: 1px solid var(--color-border);
+  flex-shrink: 0;
+}
+
+/* ── Prunable badge ─────────────────────────────────────── */
+.badge-prunable {
+  background: var(--color-danger-soft);
+  color: var(--color-danger);
+  font-size: var(--font-size-xs);
+  font-weight: var(--font-weight-semibold);
+  padding: 1px var(--space-2);
+  border-radius: var(--radius-pill);
+  cursor: help;
+}
+
+/* ── Footer add button ──────────────────────────────────── */
+.wt-footer-add-btn {
+  width: 100%;
+  height: var(--space-10);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: var(--space-3);
+  background: var(--color-accent);
+  color: var(--color-accent-text);
+  border: none;
+  border-radius: var(--radius-md);
+  font-size: var(--font-size-md);
+  font-weight: var(--font-weight-semibold);
+  cursor: pointer;
+  transition: background var(--transition-base), transform var(--transition-fast);
+}
+
+.wt-footer-add-btn:hover {
+  background: var(--color-accent-hover);
+}
+
+.wt-footer-add-btn:active {
+  transform: translateY(1px);
+}
+
+.wt-footer-add-btn__icon {
+  font-size: var(--font-size-md);
+  font-weight: var(--font-weight-medium);
+  margin-top: -1px;
+}
 </style>
diff --git a/apps/desktop/src/components/header/BranchMenu.vue b/apps/desktop/src/components/header/BranchMenu.vue
index 0e4c7bfe..9be45cf9 100644
--- a/apps/desktop/src/components/header/BranchMenu.vue
+++ b/apps/desktop/src/components/header/BranchMenu.vue
@@ -3,7 +3,7 @@
  * BranchMenu — secondary "Branch" dropdown in the header.
  *
  * Groups all branch-level operations that used to live as individual header
- * buttons (merge, worktrees, submodules, rebase, rewind) plus two new ones
+ * buttons (merge, rebase, rewind) plus two new ones
  * (rename, delete) behind a single dropdown. Keeps the header uncluttered
  * and gives each action a full label instead of a mystery icon.
  *
@@ -16,9 +16,6 @@
  *    BranchMenu just signals intent and closes. We used to do an inline
  *    rename panel + window.confirm for delete, but both were pulled out
  *    for a consistent modal UX with a type-the-name guard on delete.
- *  - "Advanced" expands to reveal Worktrees + Submodules. We avoid a real
- *    submenu (flyout positioning is fiddly with overflow) and just
- *    disclose inline, accordion-style.
  *
  * All labels come from the `branchMenu.*` locale group.
  */
@@ -44,8 +41,6 @@ const emit = defineEmits<{
   /** User clicked "Delete…" — parent should pop the delete modal. */
   openDeleteModal: [];
   openRewind: [];
-  openWorktrees: [];
-  openSubmodules: [];
   discardAll: [];
 }>();
 
@@ -53,21 +48,16 @@ const { t } = useI18n();
 
 // ─── Menu open/close ───────────────────────────────────────────────
 const showMenu = ref(false);
-const showAdvanced = ref(false);
 
 const wrapperRef = ref<HTMLElement | null>(null);
 
 function toggleMenu() {
   if (props.disabled) return;
   showMenu.value = !showMenu.value;
-  if (!showMenu.value) {
-    showAdvanced.value = false;
-  }
 }
 
 function closeMenu() {
   showMenu.value = false;
-  showAdvanced.value = false;
 }
 
 function onDocClick(ev: MouseEvent) {
@@ -80,12 +70,6 @@ function onDocClick(ev: MouseEvent) {
 
 function onEsc(ev: KeyboardEvent) {
   if (ev.key !== "Escape" || !showMenu.value) return;
-  // Escape unwinds one level at a time: if the Advanced accordion is
-  // open, close it first; next Escape closes the whole menu.
-  if (showAdvanced.value) {
-    showAdvanced.value = false;
-    return;
-  }
   closeMenu();
 }
 
@@ -115,16 +99,6 @@ function onRewind() {
   emit("openRewind");
 }
 
-function onWorktrees() {
-  closeMenu();
-  emit("openWorktrees");
-}
-
-function onSubmodules() {
-  closeMenu();
-  emit("openSubmodules");
-}
-
 function onRenameClick() {
   if (!props.currentBranch) return;
   closeMenu();
@@ -253,53 +227,6 @@ const hasBranch = computed(() => !!props.currentBranch);
         </svg>
         <span>{{ t('branchMenu.rewind') }}</span>
       </button>
-
-      <!-- ── Advanced (disclosure) ───────────────────────────── -->
-      <button
-        type="button"
-        role="menuitem"
-        class="branch-menu__item branch-menu__item--toggle"
-        :aria-expanded="showAdvanced ? 'true' : 'false'"
-        @click="showAdvanced = !showAdvanced"
-      >
-        <svg width="14" height="14" viewBox="0 0 16 16" fill="none" aria-hidden="true">
-          <circle cx="8" cy="8" r="2" stroke="currentColor" stroke-width="1.3" />
-          <path d="M8 1v2M8 13v2M1 8h2M13 8h2M3 3l1.5 1.5M11.5 11.5L13 13M3 13l1.5-1.5M11.5 4.5L13 3" stroke="currentColor" stroke-width="1.3" stroke-linecap="round" />
-        </svg>
-        <span>{{ t('branchMenu.advanced') }}</span>
-        <svg class="branch-menu__item-chevron" :class="{ 'branch-menu__item-chevron--open': showAdvanced }" width="10" height="10" viewBox="0 0 16 16" fill="none" aria-hidden="true">
-          <path d="M3 6l5 5 5-5" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" />
-        </svg>
-      </button>
-
-      <div v-if="showAdvanced" class="branch-menu__nested">
-        <button
-          type="button"
-          role="menuitem"
-          class="branch-menu__item branch-menu__item--nested"
-          @click="onWorktrees"
-        >
-          <svg width="14" height="14" viewBox="0 0 16 16" fill="none" aria-hidden="true">
-            <rect x="2" y="2" width="5" height="5" rx="1" stroke="currentColor" stroke-width="1.3" fill="none" />
-            <rect x="9" y="2" width="5" height="5" rx="1" stroke="currentColor" stroke-width="1.3" fill="none" />
-            <rect x="5.5" y="9" width="5" height="5" rx="1" stroke="currentColor" stroke-width="1.3" fill="none" />
-            <path d="M4.5 7v1.5M11.5 7v1.5M4.5 8.5h7" stroke="currentColor" stroke-width="1.3" stroke-linecap="round" />
-          </svg>
-          <span>{{ t('worktree.title') }}</span>
-        </button>
-        <button
-          type="button"
-          role="menuitem"
-          class="branch-menu__item branch-menu__item--nested"
-          @click="onSubmodules"
-        >
-          <svg width="14" height="14" viewBox="0 0 16 16" fill="none" aria-hidden="true">
-            <rect x="3" y="3" width="10" height="10" rx="1.5" stroke="currentColor" stroke-width="1.3" fill="none" />
-            <rect x="6" y="6" width="4" height="4" rx="0.5" stroke="currentColor" stroke-width="1.3" fill="none" />
-          </svg>
-          <span>{{ t('submodule.title') }}</span>
-        </button>
-      </div>
     </div>
   </div>
 </template>
@@ -387,30 +314,4 @@ const hasBranch = computed(() => !!props.currentBranch);
   background: var(--color-border);
   margin: var(--space-2) var(--space-3);
 }
-
-.branch-menu__item--toggle {
-  justify-content: flex-start;
-}
-
-.branch-menu__item-chevron {
-  margin-left: auto;
-  transition: transform var(--transition-base);
-  opacity: 0.7;
-}
-.branch-menu__item-chevron--open {
-  transform: rotate(180deg);
-}
-
-.branch-menu__nested {
-  display: flex;
-  flex-direction: column;
-  padding-left: var(--space-3);
-  margin-top: var(--space-1);
-  border-left: 1px solid var(--color-border);
-  margin-left: var(--space-4);
-}
-
-.branch-menu__item--nested {
-  padding: var(--space-2) var(--space-4);
-}
 </style>
diff --git a/apps/desktop/src/components/header/BranchSelector.vue b/apps/desktop/src/components/header/BranchSelector.vue
index 663fd173..ce3eca54 100644
--- a/apps/desktop/src/components/header/BranchSelector.vue
+++ b/apps/desktop/src/components/header/BranchSelector.vue
@@ -41,14 +41,23 @@ const props = defineProps<{
   branchDisplay: string;
   repoStats: { staged: number; unstaged: number; untracked: number; conflicted: number; added: number; modified: number; deleted: number; renamed: number };
   branches: GitBranch[];
+  worktreeBranches?: Set<string>;
   branchesLoading: boolean;
   isSwitchingBranch: boolean;
-  /** Path to the current repository (needed by the merge-preview composable). */
+  /** Path to the current repository (for merge preview). */
   cwd: string;
-}>();
+  }>();
+
+  const currentBranchName = computed(() => {
+  return props.branches.find((b) => b.isCurrent)?.name;
+  });
 
-const emit = defineEmits<{
-  switchBranch: [name: string];
+  const isCurrentBranchWorktree = computed(() => {
+  const name = currentBranchName.value;
+  return name && props.worktreeBranches ? props.worktreeBranches.has(name) : false;
+  });
+
+  const emit = defineEmits<{  switchBranch: [name: string];
   createBranch: [name: string];
   deleteBranch: [name: string];
   openWorktrees: [branch?: string];
@@ -300,6 +309,12 @@ onUnmounted(() => document.removeEventListener("click", onDocClick, true));
 
       <span class="branch-trigger__body">
         <div class="branch-trigger__name-row">
+          <svg v-if="isCurrentBranchWorktree" class="branch-wt-icon" width="12" height="12" viewBox="0 0 16 16" fill="currentColor" style="margin-right: 4px; color: var(--color-success);">
+            <circle cx="8" cy="4.5" r="2.5" />
+            <circle cx="4.5" cy="8.5" r="2.5" />
+            <circle cx="11.5" cy="8.5" r="2.5" />
+            <rect x="7.5" y="8" width="1" height="6" />
+          </svg>
           <span class="branch-trigger__name mono">{{ branchDisplay }}</span>
           <span
             v-if="hasRepoStats"
@@ -393,6 +408,12 @@ onUnmounted(() => document.removeEventListener("click", onDocClick, true));
                 @click="!branch.isCurrent && handleBranchSwitch(branch.name)"
               >
                 <span v-if="branch.isCurrent" class="bp-current-dot"></span>
+                <svg v-if="props.worktreeBranches?.has(branch.name)" class="branch-wt-icon" width="12" height="12" viewBox="0 0 16 16" fill="currentColor" style="margin-right: 6px; color: var(--color-success); flex-shrink: 0;">
+                  <circle cx="8" cy="4.5" r="2.5" />
+                  <circle cx="4.5" cy="8.5" r="2.5" />
+                  <circle cx="11.5" cy="8.5" r="2.5" />
+                  <rect x="7.5" y="8" width="1" height="6" />
+                </svg>
                 <span class="bp-item-name mono">{{ branch.name }}</span>
                 <span v-if="branch.ahead > 0 || branch.behind > 0" class="bp-item-meta muted">
                   <span v-if="branch.ahead > 0">&uarr;{{ branch.ahead }}</span>
diff --git a/apps/desktop/src/components/header/SearchPalette.vue b/apps/desktop/src/components/header/SearchPalette.vue
index 0762dec1..228f997c 100644
--- a/apps/desktop/src/components/header/SearchPalette.vue
+++ b/apps/desktop/src/components/header/SearchPalette.vue
@@ -37,6 +37,7 @@ export interface PaletteAction {
 
 const props = defineProps<{
   branches: GitBranch[];
+  worktreeBranches?: Set<string>;
   commits: GitLogEntry[];
   actions: PaletteAction[];
 }>();
@@ -46,6 +47,8 @@ const emit = defineEmits<{
   switchBranch: [name: string];
   selectCommit: [hash: string];
   runAction: [id: string];
+  "load-branches": [];
+  "load-log": [];
 }>();
 
 const query = ref("");
@@ -172,6 +175,8 @@ function scrollSelectedIntoView() {
 }
 
 onMounted(() => {
+  emit("load-branches");
+  emit("load-log");
   nextTick(() => inputEl.value?.focus());
   document.addEventListener("keydown", onKeydown);
 });
@@ -235,6 +240,12 @@ function formatDate(d: string): string {
             <circle cx="12" cy="8" r="2" stroke="currentColor" stroke-width="1.3" />
             <path d="M5 6v4M7 4h3c1.1 0 2 .9 2 2v0" stroke="currentColor" stroke-width="1.3" />
           </svg>
+          <svg v-if="props.worktreeBranches?.has(branch.name)" class="branch-wt-icon" width="12" height="12" viewBox="0 0 16 16" fill="currentColor" style="margin-left: 2px; color: var(--color-success); flex-shrink: 0;">
+            <circle cx="8" cy="4.5" r="2.5" />
+            <circle cx="4.5" cy="8.5" r="2.5" />
+            <circle cx="11.5" cy="8.5" r="2.5" />
+            <rect x="7.5" y="8" width="1" height="6" />
+          </svg>
           <span class="palette-item-label mono">{{ branch.name }}</span>
           <span v-if="branch.isRemote" class="palette-item-tag">remote</span>
           <span v-else-if="branch.ahead > 0 || branch.behind > 0" class="palette-item-hint">
diff --git a/apps/desktop/src/composables/useGitRepo.ts b/apps/desktop/src/composables/useGitRepo.ts
index 5dd2b742..4ceeda9c 100644
--- a/apps/desktop/src/composables/useGitRepo.ts
+++ b/apps/desktop/src/composables/useGitRepo.ts
@@ -32,6 +32,7 @@ import {
   gitStashList,
   gitStashApply,
   gitStashDrop,
+  gitWorktreeList,
   type GitStatus,
   type GitDiff,
   type GitLogEntry,
@@ -40,9 +41,11 @@ import {
   type GitPushPullResult,
   type GitBranch,
   type StashEntry,
+  type WorktreeEntry,
   gitAddToGitignore,
 } from "../utils/backend";
 import { requireOnline } from "../utils/networkGuard";
+import { t } from "./useI18n";
 
 export type ViewMode = "dashboard" | "changes" | "history" | "graph" | "prs" | "launchpad";
 
@@ -125,6 +128,16 @@ export function useGitRepo() {
   const isSwitchingBranch = ref(false);
   const isMerging = ref(false);
 
+  // Worktree state
+  const worktrees = ref<WorktreeEntry[]>([]);
+  const worktreeBranches = computed(() => {
+    const set = new Set<string>();
+    for (const wt of worktrees.value) {
+      if (wt.branch && !wt.is_main) set.add(wt.branch);
+    }
+    return set;
+  });
+
   // Commit diff state (for history view)
   const selectedCommitHash = ref<string | null>(null);
   const commitDiffs = ref<GitDiff[]>([]);
@@ -360,6 +373,7 @@ export function useGitRepo() {
 
     // Background fetch then refresh status — awaited so UI updates before user interacts
     fetchRemote();
+    loadWorktrees();
   }
 
   /**
@@ -380,6 +394,7 @@ export function useGitRepo() {
     selectedCommitHash.value = null;
     commitDiffs.value = [];
     branches.value = [];
+    worktrees.value = [];
     error.value = null;
     successMessage.value = null;
     // Don't reset commit draft / viewMode — keeping them lets the user
@@ -923,6 +938,15 @@ export function useGitRepo() {
     }
   }
 
+  async function loadWorktrees() {
+    if (!folderPath.value) return;
+    try {
+      worktrees.value = await gitWorktreeList(folderPath.value);
+    } catch {
+      // Ignore errors for worktrees
+    }
+  }
+
   async function createBranch(name: string) {
     if (!folderPath.value) return;
     try {
@@ -942,8 +966,13 @@ export function useGitRepo() {
       forcePushPreferred.value = false;
       await refresh();
       await loadBranches();
+      await loadWorktrees();
     } catch (err: any) {
-      error.value = `switch branch: ${err.message}`;
+      if (err.message?.includes("already used by worktree")) {
+        error.value = t("branches.switchWorktree");
+      } else {
+        error.value = `switch branch: ${err.message}`;
+      }
     } finally {
       isSwitchingBranch.value = false;
     }
@@ -1056,6 +1085,7 @@ export function useGitRepo() {
     branchesLoading,
     isSwitchingBranch,
     isMerging,
+    worktreeBranches,
     selectedCommitHash,
     commitDiffs,
     // Computed
@@ -1103,6 +1133,7 @@ export function useGitRepo() {
     addToGitignore,
     selectCommit,
     loadBranches,
+    loadWorktrees,
     createBranch,
     switchBranch,
     deleteBranch,
diff --git a/apps/desktop/src/locales/en.ts b/apps/desktop/src/locales/en.ts
index ac587109..09c3d31c 100644
--- a/apps/desktop/src/locales/en.ts
+++ b/apps/desktop/src/locales/en.ts
@@ -481,6 +481,7 @@ const en = {
     switchRefusedDirty: "Switch refused: uncommitted changes are present.",
     switchConfirmDirty: "Uncommitted changes will be lost. Continue anyway?",
     switchConfirmDirtyTitle: "Discard changes?",
+    switchWorktree: "This branch is already checked out in another worktree. Use the Worktree hub to open it.",
     switchStashTitle: "Stash before switching branch",
     switchStashHint: "Your changes will be stashed, then restored after switching to \u00ab {0} \u00bb. Give it a label to find it later.",
     switchStashPlaceholder: "Optional message (empty = default label)",
@@ -1474,6 +1475,7 @@ const en = {
     formPathPlaceholder: "/path/to/new-worktree",
     formBranch: "Branch",
     formBranchPlaceholder: "Select an existing branch\u2026",
+    formBranchAlreadyUsed: "(already in use)",
     formNewBranch: "New branch name (optional)",
     formNewBranchPlaceholder: "Leave empty to check out the selected branch",
     create: "Create worktree",
@@ -1496,6 +1498,16 @@ const en = {
     cleanupConfirm: "Remove {0} merged worktree(s)?",
     cleanupAction: "Clean up",
     statusTitle: "Worktree status",
+    pruning: "Pruning…",
+    prunable: "Stale",
+    prunableTooltip: "This worktree's directory no longer exists on disk",
+    prunableAlert: "Some worktrees have stale metadata. Prune them to clean up.",
+    noUpstream: "No remote configured for this branch",
+    noUpstreamShort: "no remote",
+    conflicted: "Files in conflict",
+    localBranches: "Local branches",
+    remoteBranches: "Remote tracking branches",
+    onlyMainHint: "No additional worktrees yet. Use ⚡ New task to work on another branch in parallel without switching.",
   },
 
   // ─── Automations (v2.8) ──────────────────────────────────
@@ -1787,7 +1799,7 @@ const en = {
       title: "Git workflow",
       intro: "GitWand supports a full Git workflow from a single window.",
       branchTitle: "Branches",
-      branch: "Create, switch, rename and delete branches from the branch chip in the header. The branch menu (\u2261) gives access to merge, rebase, and worktrees.",
+      branch: "Create, switch, rename and delete branches from the branch chip in the header. Use the branch menu (\u2261) for merge and rebase, and the standalone Worktrees and Submodules buttons for advanced repository management.",
       stageTitle: "Staging",
       stage: "Stage individual files, entire directories, or specific hunks. Right-click a file for contextual options including discard and add to .gitignore.",
       historyTitle: "History",
diff --git a/apps/desktop/src/locales/es.ts b/apps/desktop/src/locales/es.ts
index 19f638c9..d614da10 100644
--- a/apps/desktop/src/locales/es.ts
+++ b/apps/desktop/src/locales/es.ts
@@ -467,7 +467,8 @@ const es: Locale = {
     switchRefusedDirty: "Cambio rechazado: hay cambios sin confirmar.",
     switchConfirmDirty: "Los cambios sin confirmar se perderán. ¿Continuar de todos modos?",
     switchConfirmDirtyTitle: "¿Descartar cambios?",
-    switchStashTitle: "Hacer stash antes de cambiar de rama",
+    switchWorktree: "Esta rama ya está extraída en otro worktree. Usa el Hub de Worktree para abrirla.",
+    switchStashTitle: "Stash antes de cambiar de rama",
     switchStashHint: "Tus cambios se guardarán en stash y se restaurarán tras cambiar a « {0} ». Ponle una etiqueta para encontrarlo después.",
     switchStashPlaceholder: "Mensaje opcional (vacío = etiqueta por defecto)",
     switchStashConfirm: "Stash y cambiar",
@@ -1432,7 +1433,8 @@ const es: Locale = {
     formPathPlaceholder: "/ruta/al/nuevo-worktree",
     formBranch: "Rama",
     formBranchPlaceholder: "Seleccionar una rama existente\u2026",
-    formNewBranch: "Nombre de nueva rama (opcional)",
+    formBranchAlreadyUsed: "(ya en uso)",
+    formNewBranch: "Nombre de la nueva rama (opcional)",
     formNewBranchPlaceholder: "Dejar vacío para hacer checkout de la rama seleccionada",
     create: "Crear worktree",
     creating: "Creando\u2026",
@@ -1454,6 +1456,16 @@ const es: Locale = {
     cleanupConfirm: "¿Eliminar {0} worktree(s) fusionado(s)?",
     cleanupAction: "Limpiar",
     statusTitle: "Estado de los worktrees",
+    pruning: "Limpiando…",
+    prunable: "Obsoleto",
+    prunableTooltip: "El directorio de este worktree ya no existe en el disco",
+    prunableAlert: "Algunos worktrees tienen metadatos obsoletos. Límpialos.",
+    noUpstream: "Sin remoto configurado para esta rama",
+    noUpstreamShort: "sin remoto",
+    conflicted: "Archivos en conflicto",
+    localBranches: "Ramas locales",
+    remoteBranches: "Ramas de seguimiento remoto",
+    onlyMainHint: "Aún no hay worktrees adicionales. Usa ⚡ Nueva tarea para trabajar en otra rama en paralelo sin cambiar de contexto.",
   },
 
 
diff --git a/apps/desktop/src/locales/fr.ts b/apps/desktop/src/locales/fr.ts
index f78c3b6c..c5047921 100644
--- a/apps/desktop/src/locales/fr.ts
+++ b/apps/desktop/src/locales/fr.ts
@@ -474,6 +474,7 @@ const fr: Locale = {
     switchRefusedDirty: "Switch refus\u00e9 : des changements non commit\u00e9s sont pr\u00e9sents.",
     switchConfirmDirty: "Des changements non commités seront perdus. Continuer quand même ?",
     switchConfirmDirtyTitle: "Abandonner les changements ?",
+    switchWorktree: "Cette branche est déjà extraite dans un autre worktree. Utilise le Hub Worktree pour l'ouvrir.",
     switchStashTitle: "Stasher avant de changer de branche",
     switchStashHint: "Tes changements seront stashés, puis restaurés après bascule vers \u00ab {0} \u00bb. Donne-lui un label pour le retrouver plus tard.",
     switchStashPlaceholder: "Message optionnel (laisse vide pour le label par défaut)",
@@ -1437,13 +1438,14 @@ const fr: Locale = {
     remove: "Supprimer",
     removeConfirm: "Supprimer le worktree \u00ab\u00a0{0}\u00a0\u00bb\u00a0? Les changements non commit\u00e9s seront perdus.",
     removeForce: "Forcer la suppression (abandonner les changements)",
-    prune: "Nettoyer",
+    prune: "Élaguer",
     pruneTooltip: "Supprimer les fichiers administratifs des worktrees dont le dossier n\u2019existe plus",
     newWorktree: "Nouveau worktree",
     formPath: "Chemin du dossier",
     formPathPlaceholder: "/chemin/vers/nouveau-worktree",
     formBranch: "Branche",
     formBranchPlaceholder: "S\u00e9lectionner une branche existante\u2026",
+    formBranchAlreadyUsed: "(d\u00e9j\u00e0 utilis\u00e9e)",
     formNewBranch: "Nom de la nouvelle branche (optionnel)",
     formNewBranchPlaceholder: "Laisser vide pour checkout la branche s\u00e9lectionn\u00e9e",
     create: "Cr\u00e9er le worktree",
@@ -1466,6 +1468,16 @@ const fr: Locale = {
     cleanupConfirm: "Supprimer {0} worktree(s) mergé(s) ?",
     cleanupAction: "Nettoyer",
     statusTitle: "Statut des worktrees",
+    pruning: "Élagage…",
+    prunable: "Obsolète",
+    prunableTooltip: "Le répertoire de ce worktree n'existe plus sur le disque",
+    prunableAlert: "Des worktrees ont des métadonnées obsolètes. Élaguez-les pour nettoyer.",
+    noUpstream: "Aucun remote configuré pour cette branche",
+    noUpstreamShort: "sans remote",
+    conflicted: "Fichiers en conflit",
+    localBranches: "Branches locales",
+    remoteBranches: "Branches remote de suivi",
+    onlyMainHint: "Aucun worktree supplémentaire pour l'instant. Utilisez ⚡ Nouvelle tâche pour travailler sur une autre branche en parallèle sans changer de contexte.",
   },
 
 
@@ -1760,7 +1772,7 @@ const fr: Locale = {
       title: "Workflow Git",
       intro: "GitWand supporte un workflow Git complet depuis une seule fenêtre.",
       branchTitle: "Branches",
-      branch: "Créez, changez, renommez et supprimez des branches depuis le sélecteur de branche dans le header. Le menu branche (≡) donne accès aux opérations merge, rebase et worktrees.",
+      branch: "Créez, changez, renommez et supprimez des branches depuis le sélecteur de branche dans le header. Utilisez le menu branche (≡) pour le merge et le rebase, et les boutons Worktrees et Submodules pour la gestion avancée du dépôt.",
       stageTitle: "Indexation",
       stage: "Indexez des fichiers individuels, des répertoires entiers ou des hunks spécifiques. Faites un clic droit sur un fichier pour les options contextuelles (annuler, ajouter au .gitignore, etc.).",
       historyTitle: "Historique",
diff --git a/apps/desktop/src/locales/pt-BR.ts b/apps/desktop/src/locales/pt-BR.ts
index 832f0717..6a67177a 100644
--- a/apps/desktop/src/locales/pt-BR.ts
+++ b/apps/desktop/src/locales/pt-BR.ts
@@ -468,6 +468,7 @@ const ptBR: Locale = {
     switchRefusedDirty: "Troca recusada: há alterações não commitadas.",
     switchConfirmDirty: "Alterações não commitadas serão perdidas. Continuar mesmo assim?",
     switchConfirmDirtyTitle: "Descartar alterações?",
+    switchWorktree: "Este branch já está extraído em outro worktree. Use o Hub de Worktree para abri-lo.",
     switchStashTitle: "Fazer stash antes de trocar de branch",
     switchStashHint: "Suas alterações serão guardadas no stash e restauradas após trocar para « {0} ». Dê um rótulo para encontrá-las depois.",
     switchStashPlaceholder: "Mensagem opcional (vazio = rótulo padrão)",
@@ -1430,9 +1431,10 @@ const ptBR: Locale = {
     newWorktree: "Novo worktree",
     formPath: "Caminho da pasta",
     formPathPlaceholder: "/caminho/para/novo-worktree",
-    formBranch: "Ramo",
-    formBranchPlaceholder: "Selecionar um ramo existente\u2026",
-    formNewBranch: "Nome do novo ramo (opcional)",
+    formBranch: "Branch",
+    formBranchPlaceholder: "Selecionar um branch existente\u2026",
+    formBranchAlreadyUsed: "(j\u00e1 em uso)",
+    formNewBranch: "Nome do novo branch (opcional)",
     formNewBranchPlaceholder: "Deixar vazio para fazer checkout do ramo selecionado",
     create: "Criar worktree",
     creating: "Criando\u2026",
@@ -1454,6 +1456,16 @@ const ptBR: Locale = {
     cleanupConfirm: "Remover {0} worktree(s) mesclado(s)?",
     cleanupAction: "Limpar",
     statusTitle: "Status dos worktrees",
+    pruning: "Limpando…",
+    prunable: "Obsoleto",
+    prunableTooltip: "O diretório deste worktree não existe mais no disco",
+    prunableAlert: "Alguns worktrees possuem metadados obsoletos. Limpe-os.",
+    noUpstream: "Sem remoto configurado para este branch",
+    noUpstreamShort: "sem remoto",
+    conflicted: "Arquivos em conflito",
+    localBranches: "Branches locais",
+    remoteBranches: "Branches de rastreamento remoto",
+    onlyMainHint: "Nenhum worktree adicional ainda. Use ⚡ Nova tarefa para trabalhar em outro branch em paralelo sem trocar de contexto.",
   },
 
 
diff --git a/apps/desktop/src/locales/zh-CN.ts b/apps/desktop/src/locales/zh-CN.ts
index 28aa5a92..a513fb07 100644
--- a/apps/desktop/src/locales/zh-CN.ts
+++ b/apps/desktop/src/locales/zh-CN.ts
@@ -464,7 +464,8 @@ const zhCN: Locale = {
     switchRefusedDirty: "切换被拒绝：存在未提交的更改。",
     switchConfirmDirty: "未提交的更改将会丢失。仍要继续吗？",
     switchConfirmDirtyTitle: "放弃更改？",
-    switchStashTitle: "切换分支前先暂存",
+    switchWorktree: "此分支已在另一个工作树中检出。请使用工作树中心将其打开。",
+    switchStashTitle: "切换分支前暂存",
     switchStashHint: "你的更改将被暂存，切换到 \u201c {0} \u201d 后再恢复。给它起个标签以便稍后查找。",
     switchStashPlaceholder: "可选消息（留空 = 默认标签）",
     switchStashConfirm: "储藏并切换",
@@ -1417,6 +1418,7 @@ const zhCN: Locale = {
     formPathPlaceholder: "/路径/到/新工作树",
     formBranch: "分支",
     formBranchPlaceholder: "选择已有分支\u2026",
+    formBranchAlreadyUsed: "(已在使用)",
     formNewBranch: "新分支名称（可选）",
     formNewBranchPlaceholder: "留空则检出所选分支",
     create: "创建工作树",
@@ -1439,6 +1441,16 @@ const zhCN: Locale = {
     cleanupConfirm: "移除 {0} 个已合并的 worktree？",
     cleanupAction: "清理",
     statusTitle: "Worktree 状态",
+    pruning: "清理中…",
+    prunable: "已过期",
+    prunableTooltip: "此 worktree 的目录在磁盘上已不存在",
+    prunableAlert: "部分 worktree 存在过期元数据，请执行清理。",
+    noUpstream: "此分支未配置远程跟踪",
+    noUpstreamShort: "无远程",
+    conflicted: "存在冲突文件",
+    localBranches: "本地分支",
+    remoteBranches: "远程跟踪分支",
+    onlyMainHint: "暂无其他工作树。使用 ⚡ 新建任务在不切换上下文的情况下并行处理其他分支。",
   },
 
 
diff --git a/apps/desktop/src/utils/backend.ts b/apps/desktop/src/utils/backend.ts
index 9ca51088..fdaf617c 100644
--- a/apps/desktop/src/utils/backend.ts
+++ b/apps/desktop/src/utils/backend.ts
@@ -1172,7 +1172,10 @@ export async function gitCreateBranch(
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ cwd, name, checkout, startPoint }),
   });
-  if (!res.ok) throw new Error(`Failed to create branch: ${res.status}`);
+  if (!res.ok) {
+    const data = await res.json().catch(() => ({}));
+    throw new Error(data.error || `Failed to create branch: ${res.status}`);
+  }
 }
 
 /**
@@ -1188,7 +1191,10 @@ export async function gitSwitchBranch(cwd: string, name: string): Promise<void>
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ cwd, name }),
   });
-  if (!res.ok) throw new Error(`Failed to switch branch: ${res.status}`);
+  if (!res.ok) {
+    const data = await res.json().catch(() => ({}));
+    throw new Error(data.error || `Failed to switch branch: ${res.status}`);
+  }
 }
 
 /**
@@ -1332,7 +1338,10 @@ export async function gitDeleteBranch(cwd: string, name: string, force: boolean
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ cwd, name, force }),
   });
-  if (!res.ok) throw new Error(`Failed to delete branch: ${res.status}`);
+  if (!res.ok) {
+    const data = await res.json().catch(() => ({}));
+    throw new Error(data.error || `Failed to delete branch: ${res.status}`);
+  }
 }
 
 /**
@@ -1348,7 +1357,10 @@ export async function gitDeleteRemoteBranch(cwd: string, remote: string, name: s
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ cwd, remote, name }),
   });
-  if (!res.ok) throw new Error(`Failed to delete remote branch: ${res.status}`);
+  if (!res.ok) {
+    const data = await res.json().catch(() => ({}));
+    throw new Error(data.error || `Failed to delete remote branch: ${res.status}`);
+  }
 }
 
 /**
@@ -1365,7 +1377,10 @@ export async function gitRenameBranch(cwd: string, oldName: string, newName: str
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ cwd, oldName, newName }),
   });
-  if (!res.ok) throw new Error(`Failed to rename branch: ${res.status}`);
+  if (!res.ok) {
+    const data = await res.json().catch(() => ({}));
+    throw new Error(data.error || `Failed to rename branch: ${res.status}`);
+  }
 }
 
 // ─── Conflict Prevention (Phase 8.1) ───────────────────────
@@ -2157,7 +2172,9 @@ export interface WorkspaceRepoStatus {
   branch: string;
   ahead: number;
   behind: number;
+  has_upstream: boolean;
   modified: number;
+  conflicted: number;
   error: string | null;
 }
 
@@ -2426,7 +2443,10 @@ export interface WorktreeEntry {
   head: string;
   is_main: boolean;
   is_locked: boolean;
+  lock_reason: string | null;
   is_bare: boolean;
+  is_prunable: boolean;
+  prunable_reason: string | null;
 }
 
 /** List all git worktrees for the given repo. */
@@ -2459,7 +2479,10 @@ export async function gitWorktreeAdd(
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ cwd, path, branch, new_branch: newBranch ?? null }),
   });
-  if (!res.ok) throw new Error(`Failed to add worktree: ${res.status}`);
+  if (!res.ok) {
+    const data = await res.json().catch(() => ({}));
+    throw new Error(data.error || `Failed to add worktree: ${res.status}`);
+  }
   return res.json();
 }
 
@@ -2474,7 +2497,10 @@ export async function gitWorktreeRemove(cwd: string, path: string, force?: boole
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ cwd, path, force: force ?? false }),
   });
-  if (!res.ok) throw new Error(`Failed to remove worktree: ${res.status}`);
+  if (!res.ok) {
+    const data = await res.json().catch(() => ({}));
+    throw new Error(data.error || `Failed to remove worktree: ${res.status}`);
+  }
 }
 
 /** Prune stale worktree administrative files. */
@@ -2491,6 +2517,20 @@ export async function gitWorktreePrune(cwd: string): Promise<void> {
   if (!res.ok) throw new Error(`Failed to prune worktrees: ${res.status}`);
 }
 
+/** Repair worktree administrative files after a manual move or copy of the repo. */
+export async function gitWorktreeRepair(cwd: string, paths?: string[]): Promise<void> {
+  if (isTauri()) {
+    await tauriInvoke("git_worktree_repair", { cwd, paths: paths ?? [] });
+    return;
+  }
+  const res = await devFetch(`${DEV_SERVER}/api/git-worktree-repair`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ cwd, paths: paths ?? [] }),
+  });
+  if (!res.ok) throw new Error(`Failed to repair worktrees: ${res.status}`);
+}
+
 // ─── Agent Sessions ───────────────────────────────────────
 
 export interface AgentSession {
diff --git a/apps/desktop/src/utils/worktreeParser.ts b/apps/desktop/src/utils/worktreeParser.ts
new file mode 100644
index 00000000..396b622c
--- /dev/null
+++ b/apps/desktop/src/utils/worktreeParser.ts
@@ -0,0 +1,161 @@
+/**
+ * Pure TypeScript implementations of the worktree parsing logic.
+ *
+ * These functions mirror the Rust implementations in
+ * `src-tauri/src/commands/ops.rs` (git_worktree_list, git_worktree_status_all)
+ * and the Node.js mock in `dev-server.mjs`.
+ *
+ * Keeping the logic here as pure functions enables:
+ *   1. Unit tests that run without Tauri or a real git repo (vitest).
+ *   2. A single source of truth for the parser contract shared between
+ *      the dev-server mock and the test suite.
+ *
+ * If you modify the parsing logic in ops.rs, update this file in lockstep.
+ */
+
+import type { WorktreeEntry, WorkspaceRepoStatus } from "./backend";
+
+/** Conflict codes as defined in `git status --porcelain` (XY format). */
+export const CONFLICT_CODES = new Set(["UU", "AA", "DD", "AU", "UA", "DU", "UD"]);
+
+/**
+ * Parse the output of `git worktree list --porcelain` into a list of
+ * WorktreeEntry objects.
+ *
+ * Handles:
+ *  - `main` attribute (git ≥ 2.36)
+ *  - `locked [reason]` inline reason on the same line
+ *  - `prunable [reason]` inline reason on the same line
+ *  - `bare` worktrees
+ *  - `detached` HEAD
+ *  - git < 2.36 fallback: first entry is marked as main when no `main` attr
+ *
+ * @param raw  Raw stdout from `git worktree list --porcelain`
+ */
+export function parseWorktreePorcelain(raw: string): WorktreeEntry[] {
+  const entries: WorktreeEntry[] = [];
+  let current: WorktreeEntry | null = null;
+
+  for (const line of raw.split("\n")) {
+    if (line.startsWith("worktree ")) {
+      if (current) entries.push(current);
+      current = {
+        path: line.slice("worktree ".length),
+        branch: "",
+        head: "",
+        is_main: false,
+        is_locked: false,
+        lock_reason: null,
+        is_bare: false,
+        is_prunable: false,
+        prunable_reason: null,
+      };
+    } else if (current) {
+      if (line === "main") {
+        current.is_main = true;
+      } else if (line.startsWith("HEAD ")) {
+        current.head = line.slice("HEAD ".length);
+      } else if (line.startsWith("branch ")) {
+        const full = line.slice("branch ".length);
+        current.branch = full.startsWith("refs/heads/") ? full.slice("refs/heads/".length) : full;
+      } else if (line === "bare") {
+        current.is_bare = true;
+      } else if (line.startsWith("locked")) {
+        current.is_locked = true;
+        const reason = line.slice("locked".length).trim();
+        if (reason) current.lock_reason = reason;
+      } else if (line.startsWith("prunable")) {
+        current.is_prunable = true;
+        const reason = line.slice("prunable".length).trim();
+        if (reason) current.prunable_reason = reason;
+      } else if (line === "detached") {
+        current.branch = "(detached HEAD)";
+      }
+    }
+  }
+  if (current) entries.push(current);
+
+  // git < 2.36 fallback: if no entry has the `main` attribute, mark the first.
+  if (entries.length > 0 && entries.every((e) => !e.is_main)) {
+    entries[0].is_main = true;
+  }
+
+  return entries;
+}
+
+/**
+ * Parse `git status --porcelain --untracked-files=no` output lines into
+ * separate `conflicted` and `modified` counts.
+ *
+ * Rules:
+ *  - Lines with XY in CONFLICT_CODES → conflicted (UU, AA, DD, AU, UA, DU, UD)
+ *  - All other non-empty lines → modified
+ *  - Empty lines are ignored
+ *
+ * @param raw  Raw stdout from `git status --porcelain --untracked-files=no`
+ */
+export function parseWorktreeStatus(raw: string): { conflicted: number; modified: number } {
+  const lines = raw.split("\n").filter(Boolean);
+  let conflicted = 0;
+  let modified = 0;
+  for (const line of lines) {
+    if (line.length >= 2 && CONFLICT_CODES.has(line.slice(0, 2))) {
+      conflicted++;
+    } else {
+      modified++;
+    }
+  }
+  return { conflicted, modified };
+}
+
+/**
+ * Derive a quick-create worktree path from the main worktree path + task name.
+ * Mirrors the `deriveQuickPath` function in WorktreeManager.vue.
+ *
+ * @param mainPath  Absolute path of the main worktree
+ * @param name      Task name (e.g. "fix/login-bug")
+ */
+export function deriveQuickWorktreePath(mainPath: string, name: string): string {
+  const base = mainPath.replace(/\\/g, "/").replace(/\/+$/, "");
+  const slug = name
+    .trim()
+    .replace(/[^a-zA-Z0-9/_-]/g, "-")
+    .replace(/-+/g, "-")
+    .replace(/^[-/]+|[-/]+$/g, "");
+  return `${base}-${slug}`;
+}
+
+/**
+ * Given a list of WorktreeEntry, determine if any are prunable.
+ * Mirrors the `hasPrunableWorktrees` computed in WorktreeManager.vue.
+ */
+export function hasPrunableWorktrees(entries: WorktreeEntry[]): boolean {
+  return entries.some((e) => e.is_prunable);
+}
+
+/**
+ * Build a WorkspaceRepoStatus object from parsed status data.
+ * Used by the dev-server mock and tests to keep field shapes consistent.
+ */
+export function buildWorktreeStatus(
+  path: string,
+  branch: string,
+  ahead: number,
+  behind: number,
+  hasUpstream: boolean,
+  conflicted: number,
+  modified: number,
+  error: string | null = null,
+): WorkspaceRepoStatus {
+  return {
+    path,
+    name: branch,
+    branch,
+    ahead,
+    behind,
+    has_upstream: hasUpstream,
+    modified,
+    conflicted,
+    error,
+  };
+}