claude-maestro 0.1.21 → 0.1.23

package/out/renderer/assets/{index-Uh6FxvAQ.js → index-CgYg-Rwh.js}

@@ -1,4 +1,4 @@
-const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./index-Ck4WZgFA.js","./index-DroXAl3A.js","./index-C3_9l5Zo.js","./index-kJ0KF5bI.js","./index-C2wfbMG1.js","./index-CYo0nynQ.js","./index-BDxfkk76.js","./index-CdG7xnB7.js","./index-CZmL3oq-.js","./index-DD6EoqPp.js","./index-DGNONcNh.js","./index-BPiKmKfX.js","./index-D9lxbtli.js","./index-iIulTEbp.js","./index-Bm6BMufC.js","./index-BDJGybQo.js","./index-Cfvyl_8T.js","./index-BNIPHMhg.js","./index-CIAp39oC.js","./index-Bw6wDwNB.js","./dockerfile-Bvk733Ga.js","./simple-mode-DMneyfDu.js","./factor-CMxFHDqz.js","./nsis-3zG7tgur.js","./pug-CTXt1f8z.js","./javascript-C_OHM9hj.js","./index-DzjUOrFM.js","./index-Bf87-cF0.js"])))=>i.map(i=>d[i]);
+const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./index-DyMtiIII.js","./index-B-yxP0lP.js","./index-B30bhZbu.js","./index-BIwBfhPk.js","./index-DSzGVyZR.js","./index-ca-bRyvC.js","./index-c4Ddyscc.js","./index-Ce5ZMPFL.js","./index-I6gteObT.js","./index-BDHkFxx6.js","./index-BX47FB7e.js","./index-DilMbkSp.js","./index-DLZ9KBr_.js","./index-CGyGFDvb.js","./index-ByVJrO1u.js","./index-DwuBzjPV.js","./index-BKvwH0TK.js","./index-gn8sOd6r.js","./index-BlwNwTsP.js","./index-C8pOtVhi.js","./dockerfile-Bvk733Ga.js","./simple-mode-DMneyfDu.js","./factor-CMxFHDqz.js","./nsis-3zG7tgur.js","./pug-CTXt1f8z.js","./javascript-C_OHM9hj.js","./index-CdMsY_a8.js","./index-3xTQW6mE.js"])))=>i.map(i=>d[i]);
 function getDefaultExportFromCjs(x2) {
   return x2 && x2.__esModule && Object.prototype.hasOwnProperty.call(x2, "default") ? x2["default"] : x2;
 }
@@ -7596,6 +7596,22 @@ Use ✕ on the task to clean it up.`
       );
       return;
     }
+    if (state.baseBranchBusyPath) {
+      window.alert(
+        `Can't merge into "${wt.baseBranch}" right now: that branch is checked out in another worktree:
+
+${state.baseBranchBusyPath}
+
+Git can't switch the base repo (${wt.baseFolder}) to "${wt.baseBranch}" while it's busy there. Close that worktree (or merge from it), then try again.`
+      );
+      return;
+    }
+    if (state.baseDirty > 0) {
+      window.alert(
+        `Can't merge into "${wt.baseBranch}" right now: the base repo (${wt.baseFolder}) has ${state.baseDirty} uncommitted file(s). Commit, stash, or checkpoint them there first, so the merge can't clobber your work.`
+      );
+      return;
+    }
     let commitFirst = false;
     if (state.dirty > 0) {
       commitFirst = window.confirm(
@@ -7687,6 +7703,68 @@ No running claude terminal found in the parent session — resolve the conflicts
     }
     window.alert(`Merge failed:
 
+${result.output}`);
+  },
+  async checkoutBranch(sessionId, branch) {
+    const result = await window.api.gitCheckout(sessionId, branch);
+    if (result.ok) {
+      get().showNotice(`Switched to "${branch}".`, "success");
+      get().refreshGit();
+      return;
+    }
+    if (result.reason === "dirty") {
+      get().showNotice(result.output, "warn");
+      return;
+    }
+    window.alert(`Couldn't switch to "${branch}":
+
+${result.output}`);
+  },
+  async createBranch(sessionId) {
+    const name2 = window.prompt("New branch name (created off the current branch):")?.trim();
+    if (!name2) return;
+    const result = await window.api.gitCreateBranch(sessionId, name2);
+    if (result.ok) {
+      get().showNotice(`Created and switched to "${name2}".`, "success");
+      get().refreshGit();
+      return;
+    }
+    if (result.reason === "dirty") {
+      get().showNotice(result.output, "warn");
+      return;
+    }
+    window.alert(`Couldn't create "${name2}":
+
+${result.output}`);
+  },
+  async deleteBranch(sessionId, branch) {
+    if (!window.confirm(`Delete local branch "${branch}"? This can't be undone.`)) return;
+    const result = await window.api.gitDeleteBranch(sessionId, branch);
+    if (result.ok) {
+      get().showNotice(`Deleted "${branch}".`, "success");
+      get().refreshGit();
+      return;
+    }
+    window.alert(`Couldn't delete "${branch}":
+
+${result.output}`);
+  },
+  async openBranchPr(sessionId) {
+    const result = await window.api.gitCreateBranchPr(sessionId);
+    if (result.ok) {
+      const existed = result.alreadyExists ? "A pull request already exists" : "Opened a pull request";
+      get().showNotice(`${existed}.`, "success");
+      if (result.url && window.confirm(`${existed}:
+
+${result.url}
+
+Open it in your browser?`)) {
+        window.api.openExternal(result.url);
+      }
+      return;
+    }
+    window.alert(`Couldn't open the pull request:
+
 ${result.output}`);
   },
   async removeWorktreeTask(sessionId) {
@@ -7724,7 +7802,14 @@ ${err.message}`);
     try {
       state = await window.api.worktreeState(sessionId);
     } catch {
-      state = { folderExists: false, dirty: -1, ahead: -1, conflictFiles: null };
+      state = {
+        folderExists: false,
+        dirty: -1,
+        ahead: -1,
+        conflictFiles: null,
+        baseDirty: -1,
+        baseBranchBusyPath: null
+      };
     }
     set((st2) => {
       const worktreeChecking = { ...st2.worktreeChecking };
@@ -10164,6 +10249,7 @@ ${err.message}`);
       /* @__PURE__ */ jsxRuntimeExports.jsx("button", { className: "btn", disabled: busy, onClick: () => void onInit(), children: busy ? "Initializing…" : "Initialize repository" })
     ] }) : /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx(StatusChips$1, { status }),
+      /* @__PURE__ */ jsxRuntimeExports.jsx(GitHubAccountPicker, { sessionId: id, nonce: gitNonce }),
       files.length > 0 && /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "git-files", children: files.map((f) => /* @__PURE__ */ jsxRuntimeExports.jsx(ChangedFile, { file: f, onOpen: () => openDiff(id, f.path) }, f.path)) }),
       checkpoints.length > 0 && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "git-checkpoints", children: [
         /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "git-subhead", children: "Checkpoints" }),
@@ -10237,6 +10323,45 @@ ${c2.subject}`,
     ] })
   ] });
 }
+function GitHubAccountPicker({
+  sessionId,
+  nonce
+}) {
+  const [info, setInfo] = reactExports.useState(
+    null
+  );
+  reactExports.useEffect(() => {
+    let cancelled = false;
+    void window.api.githubRepoInfo(sessionId).then((i) => {
+      if (!cancelled) setInfo(i);
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [sessionId, nonce]);
+  if (!info || !info.slug || info.accounts.length === 0) return null;
+  const currentValue = info.current ? `${info.current.host}
+${info.current.login}` : "";
+  const onChange = async (value) => {
+    const account = value ? { host: value.split("\n")[0], login: value.split("\n")[1] } : null;
+    await window.api.githubSetRepoAccount(info.slug, account);
+    setInfo({ ...info, current: account });
+  };
+  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "git-gh-account", title: `Pushes & PRs for ${info.slug} use this GitHub account`, children: [
+    /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "git-gh-account-label", children: "GitHub account" }),
+    /* @__PURE__ */ jsxRuntimeExports.jsxs("select", { value: currentValue, onChange: (e) => void onChange(e.target.value), children: [
+      /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "", children: "Default (gh active account)" }),
+      info.accounts.map((a) => /* @__PURE__ */ jsxRuntimeExports.jsxs("option", { value: `${a.host}
+${a.login}`, children: [
+        a.login,
+        " @ ",
+        a.host,
+        a.active ? " (active)" : ""
+      ] }, `${a.host}
+${a.login}`))
+    ] })
+  ] });
+}
 function GitRefs({ refs }) {
   const parts = refs.split(",").map((r) => r.trim().replace(/^HEAD -> /, "")).filter(Boolean);
   return /* @__PURE__ */ jsxRuntimeExports.jsx(jsxRuntimeExports.Fragment, { children: parts.map((r) => /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: `git-ref${r.startsWith("tag: ") ? " tag" : ""}`, children: r.replace(/^tag: /, "") }, r)) });
@@ -39059,7 +39184,7 @@ function legacy(parser) {
   return new LanguageSupport(StreamLanguage.define(parser));
 }
 function sql(dialectName) {
-  return __vitePreload(() => import("./index-Ck4WZgFA.js"), true ? __vite__mapDeps([0,1]) : void 0, import.meta.url).then((m2) => m2.sql({ dialect: m2[dialectName] }));
+  return __vitePreload(() => import("./index-DyMtiIII.js"), true ? __vite__mapDeps([0,1]) : void 0, import.meta.url).then((m2) => m2.sql({ dialect: m2[dialectName] }));
 }
 const languages = [
   // New-style language modes
@@ -39067,7 +39192,7 @@ const languages = [
     name: "C",
     extensions: ["c", "h", "ino"],
     load() {
-      return __vitePreload(() => import("./index-C3_9l5Zo.js"), true ? __vite__mapDeps([2,1]) : void 0, import.meta.url).then((m2) => m2.cpp());
+      return __vitePreload(() => import("./index-B30bhZbu.js"), true ? __vite__mapDeps([2,1]) : void 0, import.meta.url).then((m2) => m2.cpp());
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
@@ -39075,7 +39200,7 @@ const languages = [
     alias: ["cpp"],
     extensions: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"],
     load() {
-      return __vitePreload(() => import("./index-C3_9l5Zo.js"), true ? __vite__mapDeps([2,1]) : void 0, import.meta.url).then((m2) => m2.cpp());
+      return __vitePreload(() => import("./index-B30bhZbu.js"), true ? __vite__mapDeps([2,1]) : void 0, import.meta.url).then((m2) => m2.cpp());
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
@@ -39090,14 +39215,14 @@ const languages = [
     name: "CSS",
     extensions: ["css"],
     load() {
-      return __vitePreload(() => import("./index-kJ0KF5bI.js"), true ? __vite__mapDeps([3,1]) : void 0, import.meta.url).then((m2) => m2.css());
+      return __vitePreload(() => import("./index-BIwBfhPk.js"), true ? __vite__mapDeps([3,1]) : void 0, import.meta.url).then((m2) => m2.css());
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
     name: "Go",
     extensions: ["go"],
     load() {
-      return __vitePreload(() => import("./index-C2wfbMG1.js"), true ? __vite__mapDeps([4,1]) : void 0, import.meta.url).then((m2) => m2.go());
+      return __vitePreload(() => import("./index-DSzGVyZR.js"), true ? __vite__mapDeps([4,1]) : void 0, import.meta.url).then((m2) => m2.go());
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
@@ -39105,14 +39230,14 @@ const languages = [
     alias: ["xhtml"],
     extensions: ["html", "htm", "handlebars", "hbs"],
     load() {
-      return __vitePreload(() => import("./index-CYo0nynQ.js"), true ? __vite__mapDeps([5,1,3,6]) : void 0, import.meta.url).then((m2) => m2.html());
+      return __vitePreload(() => import("./index-ca-bRyvC.js"), true ? __vite__mapDeps([5,1,3,6]) : void 0, import.meta.url).then((m2) => m2.html());
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
     name: "Java",
     extensions: ["java"],
     load() {
-      return __vitePreload(() => import("./index-CdG7xnB7.js"), true ? __vite__mapDeps([7,1]) : void 0, import.meta.url).then((m2) => m2.java());
+      return __vitePreload(() => import("./index-Ce5ZMPFL.js"), true ? __vite__mapDeps([7,1]) : void 0, import.meta.url).then((m2) => m2.java());
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
@@ -39120,14 +39245,14 @@ const languages = [
     alias: ["ecmascript", "js", "node"],
     extensions: ["js", "mjs", "cjs"],
     load() {
-      return __vitePreload(() => import("./index-BDxfkk76.js"), true ? __vite__mapDeps([6,1]) : void 0, import.meta.url).then((m2) => m2.javascript());
+      return __vitePreload(() => import("./index-c4Ddyscc.js"), true ? __vite__mapDeps([6,1]) : void 0, import.meta.url).then((m2) => m2.javascript());
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
     name: "Jinja",
     extensions: ["j2", "jinja", "jinja2"],
     load() {
-      return __vitePreload(() => import("./index-CZmL3oq-.js"), true ? __vite__mapDeps([8,5,1,3,6]) : void 0, import.meta.url).then((m2) => m2.jinja());
+      return __vitePreload(() => import("./index-I6gteObT.js"), true ? __vite__mapDeps([8,5,1,3,6]) : void 0, import.meta.url).then((m2) => m2.jinja());
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
@@ -39135,28 +39260,28 @@ const languages = [
     alias: ["json5"],
     extensions: ["json", "map"],
     load() {
-      return __vitePreload(() => import("./index-DD6EoqPp.js"), true ? __vite__mapDeps([9,1]) : void 0, import.meta.url).then((m2) => m2.json());
+      return __vitePreload(() => import("./index-BDHkFxx6.js"), true ? __vite__mapDeps([9,1]) : void 0, import.meta.url).then((m2) => m2.json());
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
     name: "JSX",
     extensions: ["jsx"],
     load() {
-      return __vitePreload(() => import("./index-BDxfkk76.js"), true ? __vite__mapDeps([6,1]) : void 0, import.meta.url).then((m2) => m2.javascript({ jsx: true }));
+      return __vitePreload(() => import("./index-c4Ddyscc.js"), true ? __vite__mapDeps([6,1]) : void 0, import.meta.url).then((m2) => m2.javascript({ jsx: true }));
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
     name: "LESS",
     extensions: ["less"],
     load() {
-      return __vitePreload(() => import("./index-DGNONcNh.js"), true ? __vite__mapDeps([10,3,1]) : void 0, import.meta.url).then((m2) => m2.less());
+      return __vitePreload(() => import("./index-BX47FB7e.js"), true ? __vite__mapDeps([10,3,1]) : void 0, import.meta.url).then((m2) => m2.less());
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
     name: "Liquid",
     extensions: ["liquid"],
     load() {
-      return __vitePreload(() => import("./index-BPiKmKfX.js"), true ? __vite__mapDeps([11,5,1,3,6]) : void 0, import.meta.url).then((m2) => m2.liquid());
+      return __vitePreload(() => import("./index-DilMbkSp.js"), true ? __vite__mapDeps([11,5,1,3,6]) : void 0, import.meta.url).then((m2) => m2.liquid());
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
@@ -39169,7 +39294,7 @@ const languages = [
     name: "Markdown",
     extensions: ["md", "markdown", "mkd"],
     load() {
-      return __vitePreload(() => import("./index-D9lxbtli.js"), true ? __vite__mapDeps([12,5,1,3,6]) : void 0, import.meta.url).then((m2) => m2.markdown());
+      return __vitePreload(() => import("./index-DLZ9KBr_.js"), true ? __vite__mapDeps([12,5,1,3,6]) : void 0, import.meta.url).then((m2) => m2.markdown());
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
@@ -39188,7 +39313,7 @@ const languages = [
     name: "PHP",
     extensions: ["php", "php3", "php4", "php5", "php7", "phtml"],
     load() {
-      return __vitePreload(() => import("./index-iIulTEbp.js"), true ? __vite__mapDeps([13,1,5,3,6]) : void 0, import.meta.url).then((m2) => m2.php());
+      return __vitePreload(() => import("./index-CGyGFDvb.js"), true ? __vite__mapDeps([13,1,5,3,6]) : void 0, import.meta.url).then((m2) => m2.php());
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
@@ -39209,28 +39334,28 @@ const languages = [
     extensions: ["BUILD", "bzl", "py", "pyw"],
     filename: /^(BUCK|BUILD)$/,
     load() {
-      return __vitePreload(() => import("./index-Bm6BMufC.js"), true ? __vite__mapDeps([14,1]) : void 0, import.meta.url).then((m2) => m2.python());
+      return __vitePreload(() => import("./index-ByVJrO1u.js"), true ? __vite__mapDeps([14,1]) : void 0, import.meta.url).then((m2) => m2.python());
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
     name: "Rust",
     extensions: ["rs"],
     load() {
-      return __vitePreload(() => import("./index-BDJGybQo.js"), true ? __vite__mapDeps([15,1]) : void 0, import.meta.url).then((m2) => m2.rust());
+      return __vitePreload(() => import("./index-DwuBzjPV.js"), true ? __vite__mapDeps([15,1]) : void 0, import.meta.url).then((m2) => m2.rust());
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
     name: "Sass",
     extensions: ["sass"],
     load() {
-      return __vitePreload(() => import("./index-Cfvyl_8T.js"), true ? __vite__mapDeps([16,1,3]) : void 0, import.meta.url).then((m2) => m2.sass({ indented: true }));
+      return __vitePreload(() => import("./index-BKvwH0TK.js"), true ? __vite__mapDeps([16,1,3]) : void 0, import.meta.url).then((m2) => m2.sass({ indented: true }));
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
     name: "SCSS",
     extensions: ["scss"],
     load() {
-      return __vitePreload(() => import("./index-Cfvyl_8T.js"), true ? __vite__mapDeps([16,1,3]) : void 0, import.meta.url).then((m2) => m2.sass());
+      return __vitePreload(() => import("./index-BKvwH0TK.js"), true ? __vite__mapDeps([16,1,3]) : void 0, import.meta.url).then((m2) => m2.sass());
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
@@ -39250,7 +39375,7 @@ const languages = [
     name: "TSX",
     extensions: ["tsx"],
     load() {
-      return __vitePreload(() => import("./index-BDxfkk76.js"), true ? __vite__mapDeps([6,1]) : void 0, import.meta.url).then((m2) => m2.javascript({ jsx: true, typescript: true }));
+      return __vitePreload(() => import("./index-c4Ddyscc.js"), true ? __vite__mapDeps([6,1]) : void 0, import.meta.url).then((m2) => m2.javascript({ jsx: true, typescript: true }));
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
@@ -39258,14 +39383,14 @@ const languages = [
     alias: ["ts"],
     extensions: ["ts", "mts", "cts"],
     load() {
-      return __vitePreload(() => import("./index-BDxfkk76.js"), true ? __vite__mapDeps([6,1]) : void 0, import.meta.url).then((m2) => m2.javascript({ typescript: true }));
+      return __vitePreload(() => import("./index-c4Ddyscc.js"), true ? __vite__mapDeps([6,1]) : void 0, import.meta.url).then((m2) => m2.javascript({ typescript: true }));
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
     name: "WebAssembly",
     extensions: ["wat", "wast"],
     load() {
-      return __vitePreload(() => import("./index-BNIPHMhg.js"), true ? __vite__mapDeps([17,1]) : void 0, import.meta.url).then((m2) => m2.wast());
+      return __vitePreload(() => import("./index-gn8sOd6r.js"), true ? __vite__mapDeps([17,1]) : void 0, import.meta.url).then((m2) => m2.wast());
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
@@ -39273,7 +39398,7 @@ const languages = [
     alias: ["rss", "wsdl", "xsd"],
     extensions: ["xml", "xsl", "xsd", "svg"],
     load() {
-      return __vitePreload(() => import("./index-CIAp39oC.js"), true ? __vite__mapDeps([18,1]) : void 0, import.meta.url).then((m2) => m2.xml());
+      return __vitePreload(() => import("./index-BlwNwTsP.js"), true ? __vite__mapDeps([18,1]) : void 0, import.meta.url).then((m2) => m2.xml());
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
@@ -39281,7 +39406,7 @@ const languages = [
     alias: ["yml"],
     extensions: ["yaml", "yml"],
     load() {
-      return __vitePreload(() => import("./index-Bw6wDwNB.js"), true ? __vite__mapDeps([19,1]) : void 0, import.meta.url).then((m2) => m2.yaml());
+      return __vitePreload(() => import("./index-C8pOtVhi.js"), true ? __vite__mapDeps([19,1]) : void 0, import.meta.url).then((m2) => m2.yaml());
     }
   }),
   // Legacy modes ported from CodeMirror 5
@@ -40070,13 +40195,13 @@ const languages = [
     name: "Vue",
     extensions: ["vue"],
     load() {
-      return __vitePreload(() => import("./index-DzjUOrFM.js"), true ? __vite__mapDeps([26,5,1,3,6]) : void 0, import.meta.url).then((m2) => m2.vue());
+      return __vitePreload(() => import("./index-CdMsY_a8.js"), true ? __vite__mapDeps([26,5,1,3,6]) : void 0, import.meta.url).then((m2) => m2.vue());
     }
   }),
   /* @__PURE__ */ LanguageDescription.of({
     name: "Angular Template",
     load() {
-      return __vitePreload(() => import("./index-Bf87-cF0.js"), true ? __vite__mapDeps([27,5,1,3,6]) : void 0, import.meta.url).then((m2) => m2.angular());
+      return __vitePreload(() => import("./index-3xTQW6mE.js"), true ? __vite__mapDeps([27,5,1,3,6]) : void 0, import.meta.url).then((m2) => m2.angular());
     }
   })
 ];
@@ -43039,6 +43164,57 @@ function BudgetTab() {
     /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "field-hint", children: "Leave a budget blank (or 0) to disable it — no progress bar and no alerts. When a budget is set, the Usage widget shows a progress bar and a notification fires at the threshold and again at 100%." })
   ] });
 }
+function GitHubAccountsTab() {
+  const settings = useStore((s) => s.settings);
+  const reloadSettings = useStore((s) => s.reloadSettings);
+  const [accounts, setAccounts] = reactExports.useState(null);
+  reactExports.useEffect(() => {
+    let live = true;
+    void window.api.githubListAccounts().then((a) => {
+      if (live) setAccounts(a);
+    });
+    return () => {
+      live = false;
+    };
+  }, []);
+  const mappings = Object.entries(settings?.githubRepoAccounts ?? {});
+  async function clearMapping(slug) {
+    await window.api.githubSetRepoAccount(slug, null);
+    await reloadSettings();
+  }
+  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "settings-body github-tab", children: [
+    /* @__PURE__ */ jsxRuntimeExports.jsxs("section", { className: "appearance-section", children: [
+      /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { children: "Logged-in accounts" }),
+      accounts === null ? /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "field-hint", children: "Checking the GitHub CLI…" }) : accounts.length === 0 ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "field-hint", children: [
+        "No GitHub accounts found. Run ",
+        /* @__PURE__ */ jsxRuntimeExports.jsx("code", { children: "gh auth login" }),
+        " in a terminal for each account you want to use (and ",
+        /* @__PURE__ */ jsxRuntimeExports.jsx("code", { children: "gh auth setup-git" }),
+        " once so pushes use the right credentials), then reopen this dialog."
+      ] }) : /* @__PURE__ */ jsxRuntimeExports.jsx("ul", { className: "github-account-list", children: accounts.map((a) => /* @__PURE__ */ jsxRuntimeExports.jsxs("li", { children: [
+        /* @__PURE__ */ jsxRuntimeExports.jsx("strong", { children: a.login }),
+        " ",
+        /* @__PURE__ */ jsxRuntimeExports.jsxs("span", { className: "muted", children: [
+          "@ ",
+          a.host
+        ] }),
+        a.active && /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "github-active-badge", children: " active" })
+      ] }, `${a.host}/${a.login}`)) })
+    ] }),
+    /* @__PURE__ */ jsxRuntimeExports.jsxs("section", { className: "appearance-section", children: [
+      /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { children: "Per-repo account" }),
+      mappings.length === 0 ? /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "field-hint", children: "No repositories are mapped to a specific account yet. Open the Git panel for a repo and pick its GitHub account there — every push and PR from that repo will then use it." }) : /* @__PURE__ */ jsxRuntimeExports.jsx("ul", { className: "github-mapping-list", children: mappings.map(([slug, acc]) => /* @__PURE__ */ jsxRuntimeExports.jsxs("li", { children: [
+        /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "github-mapping-slug", children: slug }),
+        /* @__PURE__ */ jsxRuntimeExports.jsxs("span", { className: "muted", children: [
+          acc.login,
+          " @ ",
+          acc.host
+        ] }),
+        /* @__PURE__ */ jsxRuntimeExports.jsx("button", { className: "link-button", onClick: () => void clearMapping(slug), children: "Clear" })
+      ] }, slug)) })
+    ] })
+  ] });
+}
 function SettingsDialog() {
   const close = useStore((s) => s.closeSettings);
   const initialTab = useStore((s) => s.settingsTab);
@@ -43077,12 +43253,21 @@ function SettingsDialog() {
           onClick: () => setTab("budget"),
           children: "Spend budget"
         }
+      ),
+      /* @__PURE__ */ jsxRuntimeExports.jsx(
+        "button",
+        {
+          className: `settings-tab${tab === "github" ? " active" : ""}`,
+          onClick: () => setTab("github"),
+          children: "GitHub accounts"
+        }
       )
     ] }),
     tab === "categories" && /* @__PURE__ */ jsxRuntimeExports.jsx(CategoriesTab, {}),
     tab === "token-efficiency" && /* @__PURE__ */ jsxRuntimeExports.jsx(TokenEfficiencyTab, {}),
     tab === "appearance" && /* @__PURE__ */ jsxRuntimeExports.jsx(AppearanceTab, {}),
-    tab === "budget" && /* @__PURE__ */ jsxRuntimeExports.jsx(BudgetTab, {})
+    tab === "budget" && /* @__PURE__ */ jsxRuntimeExports.jsx(BudgetTab, {}),
+    tab === "github" && /* @__PURE__ */ jsxRuntimeExports.jsx(GitHubAccountsTab, {})
   ] }) });
 }
 function slugify(text2) {
@@ -43715,13 +43900,25 @@ function MergeBadge({ sessionId, worktree }) {
   if (!state) kind = "checking";
   else if (!state.folderExists || state.ahead < 0) kind = "unknown";
   else if (state.ahead === 0) kind = "none";
+  else if (state.baseBranchBusyPath) kind = "base-busy";
+  else if (state.baseDirty > 0) kind = "base-dirty";
   else if (state.conflictFiles === null) kind = "unknown";
   else if (state.conflictFiles.length > 0) kind = "conflicts";
   else kind = "clean";
   const dirty = (state?.dirty ?? 0) > 0;
-  const label = kind === "checking" ? "…" : kind === "unknown" ? "unknown" : kind === "none" ? "no commits" : kind === "clean" ? "clean" : `conflicts (${state?.conflictFiles?.length ?? 0})`;
+  const label = kind === "checking" ? "…" : kind === "unknown" ? "unknown" : kind === "none" ? "no commits" : kind === "base-busy" ? "base busy" : kind === "base-dirty" ? "base dirty" : kind === "clean" ? "clean" : `conflicts (${state?.conflictFiles?.length ?? 0})`;
   const lines = [];
-  if (kind === "conflicts" && state?.conflictFiles) {
+  if (kind === "base-busy" && state) {
+    lines.push(
+      `"${worktree.baseBranch}" is checked out in another worktree, so the merge can't switch the base repo to it:`
+    );
+    lines.push(`  ${state.baseBranchBusyPath}`);
+    lines.push("Close that worktree (or merge from it) first.");
+  } else if (kind === "base-dirty" && state) {
+    lines.push(
+      `The base repo has ${state.baseDirty} uncommitted file(s) — commit, stash, or checkpoint them before merging.`
+    );
+  } else if (kind === "conflicts" && state?.conflictFiles) {
     lines.push(`Merging ${worktree.branch} into ${worktree.baseBranch} would conflict in:`);
     for (const f of state.conflictFiles.slice(0, TOOLTIP_FILE_CAP)) lines.push(`  ${f}`);
     if (state.conflictFiles.length > TOOLTIP_FILE_CAP) {
@@ -43756,6 +43953,82 @@ function MergeBadge({ sessionId, worktree }) {
     }
   );
 }
+function BranchSelector({ sessionId }) {
+  const gitNonce = useStore((s) => s.gitNonce);
+  const checkoutBranch = useStore((s) => s.checkoutBranch);
+  const createBranch = useStore((s) => s.createBranch);
+  const deleteBranch = useStore((s) => s.deleteBranch);
+  const openBranchPr = useStore((s) => s.openBranchPr);
+  const [listing, setListing] = reactExports.useState(null);
+  const [selected, setSelected] = reactExports.useState("");
+  reactExports.useEffect(() => {
+    let cancelled = false;
+    void window.api.gitBranches(sessionId).then((b2) => {
+      if (cancelled) return;
+      setListing(b2);
+      setSelected(b2.current ?? "");
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [sessionId, gitNonce]);
+  if (!listing || listing.branches.length === 0) return null;
+  const current = listing.current;
+  const isOther = !!selected && selected !== current;
+  return /* @__PURE__ */ jsxRuntimeExports.jsxs("span", { className: "session-branch", title: current ? `On branch ${current}` : "Detached HEAD", children: [
+    /* @__PURE__ */ jsxRuntimeExports.jsx(Icon, { icon: GitBranch, size: 12, className: "branch-mark" }),
+    /* @__PURE__ */ jsxRuntimeExports.jsxs(
+      "select",
+      {
+        value: selected,
+        title: "Switch to, create, or pick a branch to manage",
+        onChange: (e) => {
+          const v2 = e.target.value;
+          if (v2 === "__new__") {
+            void createBranch(sessionId);
+            setSelected(current ?? "");
+          } else {
+            setSelected(v2);
+          }
+        },
+        children: [
+          !current && /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "", children: "detached" }),
+          listing.branches.map((b2) => /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: b2, children: b2 === current ? `${b2} (current)` : b2 }, b2)),
+          /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "__new__", children: "＋ new branch…" })
+        ]
+      }
+    ),
+    isOther && /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
+      /* @__PURE__ */ jsxRuntimeExports.jsx(
+        "button",
+        {
+          className: "btn ghost branch-act",
+          title: `Check out "${selected}"`,
+          onClick: () => void checkoutBranch(sessionId, selected),
+          children: "Switch"
+        }
+      ),
+      /* @__PURE__ */ jsxRuntimeExports.jsx(
+        "button",
+        {
+          className: "btn ghost branch-act",
+          title: `Delete branch "${selected}"`,
+          onClick: () => void deleteBranch(sessionId, selected),
+          children: /* @__PURE__ */ jsxRuntimeExports.jsx(Icon, { icon: Trash2, size: 12 })
+        }
+      )
+    ] }),
+    /* @__PURE__ */ jsxRuntimeExports.jsx(
+      "button",
+      {
+        className: "btn ghost branch-act",
+        title: "Push the current branch and open a pull request",
+        onClick: () => void openBranchPr(sessionId),
+        children: "PR"
+      }
+    )
+  ] });
+}
 function QueuePopover({
   session,
   anchor,
@@ -43965,28 +44238,31 @@ ${STATUS_LABEL[session.status]} · Ctrl+${index + 1}`,
                   ]
                 }
               )
-            ] }) : /* @__PURE__ */ jsxRuntimeExports.jsxs(
-              "span",
-              {
-                className: "session-category",
-                style: category?.color ? { color: category.color } : void 0,
-                children: [
-                  /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "cat-dot", style: { background: category?.color ?? "var(--dim)" } }),
-                  /* @__PURE__ */ jsxRuntimeExports.jsxs(
-                    "select",
-                    {
-                      value: session.config.categoryId ?? "",
-                      title: "Repo category — changing it restarts the claude terminal",
-                      onChange: (e) => void setSessionCategory(id, e.target.value || null),
-                      children: [
-                        /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "", children: "no category" }),
-                        categories.map((c2) => /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: c2.id, children: c2.name }, c2.id))
-                      ]
-                    }
-                  )
-                ]
-              }
-            ),
+            ] }) : /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
+              /* @__PURE__ */ jsxRuntimeExports.jsx(BranchSelector, { sessionId: id }),
+              /* @__PURE__ */ jsxRuntimeExports.jsxs(
+                "span",
+                {
+                  className: "session-category",
+                  style: category?.color ? { color: category.color } : void 0,
+                  children: [
+                    /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "cat-dot", style: { background: category?.color ?? "var(--dim)" } }),
+                    /* @__PURE__ */ jsxRuntimeExports.jsxs(
+                      "select",
+                      {
+                        value: session.config.categoryId ?? "",
+                        title: "Repo category — changing it restarts the claude terminal",
+                        onChange: (e) => void setSessionCategory(id, e.target.value || null),
+                        children: [
+                          /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "", children: "no category" }),
+                          categories.map((c2) => /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: c2.id, children: c2.name }, c2.id))
+                        ]
+                      }
+                    )
+                  ]
+                }
+              )
+            ] }),
             session.terminals.length > 1 && /* @__PURE__ */ jsxRuntimeExports.jsxs("span", { className: "session-termcount", children: [
               session.terminals.length,
               " terminals"