@sideboard-ai/core 0.1.86 → 0.1.88

package/dist/mcp/run-stdio.cjs

@@ -57,6 +57,18 @@ function wrapElectronAsNodeLaunch(file, args) {
 function isStrippedElectronLaunch(command, args) {
   return command === "/bin/sh" && Boolean(args?.[1]?.includes("ELECTRON_RUN_AS_NODE") && args[1].includes("unset"));
 }
+function isElectronLikeCommand(command) {
+  const name = command.trim();
+  if (!name) return false;
+  if (process.versions.electron && name === process.execPath) return true;
+  return /(?:^|[/\\])Electron(?:\.exe)?$/i.test(name) || /Sideboard\.app[/\\]/i.test(name) || /Electron\.app[/\\]/i.test(name);
+}
+function unwrapStrippedElectronLaunch(command, args) {
+  if (!isStrippedElectronLaunch(command, args) || !args || args.length < 4) {
+    return null;
+  }
+  return { file: args[3], args: args.slice(4) };
+}
 var NESTED_ELECTRON_ENV_PREFIXES, STRIP_NESTED_ELECTRON_THEN_EXEC;
 var init_nested_electron_env = __esm({
   "src/hook/nested-electron-env.ts"() {
@@ -71,10 +83,129 @@ var init_nested_electron_env = __esm({
   }
 });
 
+// src/hook/convention-setup.ts
+function isFile(path) {
+  try {
+    return (0, import_node_fs.statSync)(path).isFile();
+  } catch {
+    return false;
+  }
+}
+function normPath(p) {
+  return p.replace(/\/+$/, "");
+}
+function findConventionSetup(worktreePath, repoPath) {
+  const roots = [
+    { root: worktreePath, where: "worktree" }
+  ];
+  if (repoPath && normPath(repoPath) !== normPath(worktreePath)) {
+    roots.push({ root: repoPath, where: "main repo" });
+  }
+  for (const { root, where } of roots) {
+    for (const relPath of CONVENTION_SETUP_RELPATHS) {
+      const absPath = (0, import_node_path.join)(root, relPath);
+      if (!(0, import_node_fs.existsSync)(absPath) || !isFile(absPath)) continue;
+      return {
+        relPath,
+        absPath,
+        command: `bash ${JSON.stringify(absPath)}`,
+        source: `${relPath} (${where})`
+      };
+    }
+  }
+  return null;
+}
+var import_node_fs, import_node_path, CONVENTION_SETUP_RELPATHS;
+var init_convention_setup = __esm({
+  "src/hook/convention-setup.ts"() {
+    "use strict";
+    import_node_fs = require("fs");
+    import_node_path = require("path");
+    CONVENTION_SETUP_RELPATHS = [
+      "script/setup",
+      "bin/setup",
+      "scripts/setup.sh",
+      "scripts/setup"
+    ];
+  }
+});
+
+// src/hook/cursor-worktrees.ts
+function loadCursorWorktreesJson(rootPath) {
+  const path = (0, import_node_path2.join)(rootPath, ".cursor", "worktrees.json");
+  if (!(0, import_node_fs2.existsSync)(path)) return null;
+  try {
+    return JSON.parse((0, import_node_fs2.readFileSync)(path, "utf8"));
+  } catch {
+    return null;
+  }
+}
+function resolveSetupSpec(config) {
+  if (process.platform === "win32") {
+    return config["setup-worktree-windows"] ?? config["setup-worktree"] ?? null;
+  }
+  return config["setup-worktree-unix"] ?? config["setup-worktree"] ?? null;
+}
+async function runCursorWorktreeSetup(repoPath, worktreePath, onLine) {
+  const fromWorktree = loadCursorWorktreesJson(worktreePath);
+  const fromRepo = worktreePath !== repoPath ? loadCursorWorktreesJson(repoPath) : null;
+  const config = fromWorktree ?? fromRepo;
+  if (!config) return { ran: false, exitCode: null, source: null };
+  const spec = resolveSetupSpec(config);
+  if (!spec) return { ran: false, exitCode: null, source: null };
+  const sourceLabel = fromWorktree ? ".cursor/worktrees.json (worktree)" : ".cursor/worktrees.json (main repo)";
+  const env = {
+    ...process.env,
+    ROOT_WORKTREE_PATH: repoPath
+  };
+  if (process.platform === "win32") {
+    env.ROOT_WORKTREE_PATH = repoPath;
+  }
+  const commands = Array.isArray(spec) ? spec : [spec.endsWith(".sh") || spec.endsWith(".ps1") ? (0, import_node_path2.join)(
+    fromWorktree ? worktreePath : repoPath,
+    ".cursor",
+    spec
+  ) : spec];
+  let lastExit = 0;
+  for (const command of commands) {
+    const isScriptPath = typeof spec === "string" && (spec.endsWith(".sh") || spec.endsWith(".ps1"));
+    const shell = process.platform === "win32" ? "powershell" : "bash";
+    const args = process.platform === "win32" ? isScriptPath ? ["-File", command] : ["-Command", command] : isScriptPath ? [command] : ["-lc", command];
+    onLine?.(`[cursor setup] ${command}`);
+    const child = (0, import_execa.execa)(shell, args, {
+      cwd: worktreePath,
+      reject: false,
+      env
+    });
+    if (child.stdout && onLine) {
+      const rl = (0, import_node_readline.createInterface)({ input: child.stdout });
+      rl.on("line", onLine);
+    }
+    if (child.stderr && onLine) {
+      const rl = (0, import_node_readline.createInterface)({ input: child.stderr });
+      rl.on("line", onLine);
+    }
+    const result = await child;
+    lastExit = result.exitCode ?? null;
+    if (lastExit !== 0 && lastExit !== null) break;
+  }
+  return { ran: true, exitCode: lastExit, source: sourceLabel };
+}
+var import_node_fs2, import_node_path2, import_execa, import_node_readline;
+var init_cursor_worktrees = __esm({
+  "src/hook/cursor-worktrees.ts"() {
+    "use strict";
+    import_node_fs2 = require("fs");
+    import_node_path2 = require("path");
+    import_execa = require("execa");
+    import_node_readline = require("readline");
+  }
+});
+
 // src/hook/settings.ts
 function expandHome(path) {
   if (path.startsWith("~/") || path === "~") {
-    return (0, import_node_path.join)((0, import_node_os.homedir)(), path.slice(2));
+    return (0, import_node_path3.join)((0, import_node_os.homedir)(), path.slice(2));
   }
   return path;
 }
@@ -87,8 +218,8 @@ function parseAvailableIn(raw) {
   return out.length ? out : void 0;
 }
 function parseSettingsFile(path, source) {
-  if (!(0, import_node_fs.existsSync)(path)) return null;
-  const raw = (0, import_node_fs.readFileSync)(path, "utf8");
+  if (!(0, import_node_fs3.existsSync)(path)) return null;
+  const raw = (0, import_node_fs3.readFileSync)(path, "utf8");
   const data = (0, import_smol_toml.parse)(raw);
   const scripts = data.scripts ?? {};
   const setup = typeof scripts.setup === "string" ? scripts.setup : void 0;
@@ -191,15 +322,15 @@ function finalizeSettings(parsed) {
   };
 }
 function familyFiles(rootPath, source) {
-  const dir = (0, import_node_path.join)(rootPath, `.${source}`);
+  const dir = (0, import_node_path3.join)(rootPath, `.${source}`);
   return {
-    toml: (0, import_node_path.join)(dir, "settings.toml"),
-    local: (0, import_node_path.join)(dir, "settings.local.toml")
+    toml: (0, import_node_path3.join)(dir, "settings.toml"),
+    local: (0, import_node_path3.join)(dir, "settings.local.toml")
   };
 }
 function familyExists(rootPath, source) {
   const files = familyFiles(rootPath, source);
-  return (0, import_node_fs.existsSync)(files.toml) || (0, import_node_fs.existsSync)(files.local);
+  return (0, import_node_fs3.existsSync)(files.toml) || (0, import_node_fs3.existsSync)(files.local);
 }
 function detectFamily(rootPath) {
   if (familyExists(rootPath, "sideboard")) return "sideboard";
@@ -218,7 +349,7 @@ function loadAnyLocal(rootPath) {
     loadLocalToml(rootPath, "sideboard")
   );
 }
-function normPath(p) {
+function normPath2(p) {
   return p.replace(/\/+$/, "");
 }
 function loadRepoSettings(repoPath) {
@@ -232,11 +363,11 @@ function loadRepoSettings(repoPath) {
 }
 function loadWorkspaceSettings(worktreePath, repoPath) {
   const wtFamily = detectFamily(worktreePath);
-  const repoFamily = repoPath && normPath(repoPath) !== normPath(worktreePath) ? detectFamily(repoPath) : null;
+  const repoFamily = repoPath && normPath2(repoPath) !== normPath2(worktreePath) ? detectFamily(repoPath) : null;
   const wtToml = wtFamily ? loadCommittedToml(worktreePath, wtFamily) : null;
   const repoToml = repoPath && repoFamily ? loadCommittedToml(repoPath, repoFamily) : null;
   let merged = wtToml ?? repoToml;
-  if (repoPath && normPath(repoPath) !== normPath(worktreePath)) {
+  if (repoPath && normPath2(repoPath) !== normPath2(worktreePath)) {
     merged = mergeSettings(merged, loadAnyLocal(repoPath));
   }
   merged = mergeSettings(merged, loadAnyLocal(worktreePath));
@@ -246,29 +377,31 @@ function settingsSourceLabel(rootPath) {
   const family = detectFamily(rootPath);
   if (!family) return null;
   const files = familyFiles(rootPath, family);
-  if ((0, import_node_fs.existsSync)(files.toml) && (0, import_node_fs.existsSync)(files.local)) {
+  if ((0, import_node_fs3.existsSync)(files.toml) && (0, import_node_fs3.existsSync)(files.local)) {
     return `.${family}/settings.toml + local`;
   }
-  if ((0, import_node_fs.existsSync)(files.local)) return `.${family}/settings.local.toml`;
+  if ((0, import_node_fs3.existsSync)(files.local)) return `.${family}/settings.local.toml`;
   return `.${family}/settings.toml`;
 }
 function workspaceSettingsSourceLabel(worktreePath, repoPath) {
   const wt = settingsSourceLabel(worktreePath);
   if (wt) return `${wt} (worktree)`;
-  if (repoPath && normPath(repoPath) !== normPath(worktreePath)) {
+  if (repoPath && normPath2(repoPath) !== normPath2(worktreePath)) {
     const repo = settingsSourceLabel(repoPath);
     if (repo) return `${repo} (main repo)`;
   }
   return null;
 }
-var import_node_fs, import_node_os, import_node_path, import_smol_toml;
+var import_node_fs3, import_node_os, import_node_path3, import_smol_toml;
 var init_settings = __esm({
   "src/hook/settings.ts"() {
     "use strict";
-    import_node_fs = require("fs");
+    import_node_fs3 = require("fs");
     import_node_os = require("os");
-    import_node_path = require("path");
+    import_node_path3 = require("path");
     import_smol_toml = require("smol-toml");
+    init_convention_setup();
+    init_cursor_worktrees();
   }
 });
 
@@ -289,89 +422,89 @@ __export(paths_exports, {
 });
 function appDataDir() {
   const override = process.env.SIDEBOARD_APP_DATA?.trim();
-  const base = override ? override : process.platform === "darwin" ? (0, import_node_path3.join)((0, import_node_os2.homedir)(), "Library", "Application Support", "sideboard") : process.platform === "win32" ? (0, import_node_path3.join)(process.env.APPDATA ?? (0, import_node_path3.join)((0, import_node_os2.homedir)(), "AppData", "Roaming"), "sideboard") : (0, import_node_path3.join)((0, import_node_os2.homedir)(), ".local", "share", "sideboard");
-  (0, import_node_fs2.mkdirSync)(base, { recursive: true });
+  const base = override ? override : process.platform === "darwin" ? (0, import_node_path5.join)((0, import_node_os2.homedir)(), "Library", "Application Support", "sideboard") : process.platform === "win32" ? (0, import_node_path5.join)(process.env.APPDATA ?? (0, import_node_path5.join)((0, import_node_os2.homedir)(), "AppData", "Roaming"), "sideboard") : (0, import_node_path5.join)((0, import_node_os2.homedir)(), ".local", "share", "sideboard");
+  (0, import_node_fs4.mkdirSync)(base, { recursive: true });
   return base;
 }
 function threadsDir() {
-  const dir = (0, import_node_path3.join)(appDataDir(), "threads");
-  (0, import_node_fs2.mkdirSync)(dir, { recursive: true });
+  const dir = (0, import_node_path5.join)(appDataDir(), "threads");
+  (0, import_node_fs4.mkdirSync)(dir, { recursive: true });
   return dir;
 }
 function locksDir() {
-  const dir = (0, import_node_path3.join)(appDataDir(), "locks");
-  (0, import_node_fs2.mkdirSync)(dir, { recursive: true });
+  const dir = (0, import_node_path5.join)(appDataDir(), "locks");
+  (0, import_node_fs4.mkdirSync)(dir, { recursive: true });
   return dir;
 }
 function sideboardHomeDir() {
-  const dir = (0, import_node_path3.join)((0, import_node_os2.homedir)(), "sideboard");
-  (0, import_node_fs2.mkdirSync)(dir, { recursive: true });
+  const dir = (0, import_node_path5.join)((0, import_node_os2.homedir)(), "sideboard");
+  (0, import_node_fs4.mkdirSync)(dir, { recursive: true });
   return dir;
 }
 function sideboardReposDir() {
-  const dir = (0, import_node_path3.join)(sideboardHomeDir(), "repos");
-  (0, import_node_fs2.mkdirSync)(dir, { recursive: true });
+  const dir = (0, import_node_path5.join)(sideboardHomeDir(), "repos");
+  (0, import_node_fs4.mkdirSync)(dir, { recursive: true });
   return dir;
 }
 function sideboardWorkspacesDir() {
-  const dir = (0, import_node_path3.join)(sideboardHomeDir(), "workspaces");
-  (0, import_node_fs2.mkdirSync)(dir, { recursive: true });
+  const dir = (0, import_node_path5.join)(sideboardHomeDir(), "workspaces");
+  (0, import_node_fs4.mkdirSync)(dir, { recursive: true });
   return dir;
 }
 function repoSlug(repoPath) {
-  return (0, import_node_path2.basename)(repoPath.replace(/\/$/, "")) || "repo";
+  return (0, import_node_path4.basename)(repoPath.replace(/\/$/, "")) || "repo";
 }
 function worktreesRoot(repoPath) {
   const settings = loadRepoSettings(repoPath);
   if (settings?.worktreesRoot) {
-    (0, import_node_fs2.mkdirSync)(settings.worktreesRoot, { recursive: true });
+    (0, import_node_fs4.mkdirSync)(settings.worktreesRoot, { recursive: true });
     return settings.worktreesRoot;
   }
-  const dir = (0, import_node_path3.join)(sideboardWorkspacesDir(), repoSlug(repoPath));
-  (0, import_node_fs2.mkdirSync)(dir, { recursive: true });
+  const dir = (0, import_node_path5.join)(sideboardWorkspacesDir(), repoSlug(repoPath));
+  (0, import_node_fs4.mkdirSync)(dir, { recursive: true });
   return dir;
 }
 function threadFilePath(id) {
-  return (0, import_node_path3.join)(threadsDir(), `${id}.json`);
+  return (0, import_node_path5.join)(threadsDir(), `${id}.json`);
 }
 function threadLockPath(id) {
-  return (0, import_node_path3.join)(locksDir(), `${id}.lock`);
+  return (0, import_node_path5.join)(locksDir(), `${id}.lock`);
 }
 function globalAgentCwd() {
-  const dir = (0, import_node_path3.join)(appDataDir(), "global");
-  (0, import_node_fs2.mkdirSync)(dir, { recursive: true });
+  const dir = (0, import_node_path5.join)(appDataDir(), "global");
+  (0, import_node_fs4.mkdirSync)(dir, { recursive: true });
   return dir;
 }
-var import_node_path2, import_node_os2, import_node_path3, import_node_fs2;
+var import_node_path4, import_node_os2, import_node_path5, import_node_fs4;
 var init_paths = __esm({
   "src/store/paths.ts"() {
     "use strict";
-    import_node_path2 = require("path");
+    import_node_path4 = require("path");
     import_node_os2 = require("os");
-    import_node_path3 = require("path");
-    import_node_fs2 = require("fs");
+    import_node_path5 = require("path");
+    import_node_fs4 = require("fs");
     init_settings();
   }
 });
 
 // src/store/private-file.ts
 function writePrivateFile(path, contents) {
-  (0, import_node_fs3.mkdirSync)((0, import_node_path4.dirname)(path), { recursive: true });
-  (0, import_node_fs3.writeFileSync)(path, contents, { encoding: "utf8", mode: PRIVATE_FILE_MODE });
+  (0, import_node_fs5.mkdirSync)((0, import_node_path6.dirname)(path), { recursive: true });
+  (0, import_node_fs5.writeFileSync)(path, contents, { encoding: "utf8", mode: PRIVATE_FILE_MODE });
   chmodOwnerOnly(path);
 }
 function chmodOwnerOnly(path) {
   try {
-    (0, import_node_fs3.chmodSync)(path, PRIVATE_FILE_MODE);
+    (0, import_node_fs5.chmodSync)(path, PRIVATE_FILE_MODE);
   } catch {
   }
 }
-var import_node_fs3, import_node_path4, PRIVATE_FILE_MODE;
+var import_node_fs5, import_node_path6, PRIVATE_FILE_MODE;
 var init_private_file = __esm({
   "src/store/private-file.ts"() {
     "use strict";
-    import_node_fs3 = require("fs");
-    import_node_path4 = require("path");
+    import_node_fs5 = require("fs");
+    import_node_path6 = require("path");
     PRIVATE_FILE_MODE = 384;
   }
 });
@@ -457,11 +590,11 @@ function decryptEnvelope(envelope, key) {
   return JSON.parse(plaintext.toString("utf8"));
 }
 function readSecureJson(path) {
-  if (!(0, import_node_fs4.existsSync)(path)) return null;
+  if (!(0, import_node_fs6.existsSync)(path)) return null;
   chmodOwnerOnly(path);
   let parsed;
   try {
-    parsed = JSON.parse((0, import_node_fs4.readFileSync)(path, "utf8"));
+    parsed = JSON.parse((0, import_node_fs6.readFileSync)(path, "utf8"));
   } catch {
     return null;
   }
@@ -481,20 +614,20 @@ function writeSecureJson(path, value) {
 `);
 }
 function isSecureFileEncrypted(path) {
-  if (!(0, import_node_fs4.existsSync)(path)) return false;
+  if (!(0, import_node_fs6.existsSync)(path)) return false;
   try {
-    return isEnvelope(JSON.parse((0, import_node_fs4.readFileSync)(path, "utf8")));
+    return isEnvelope(JSON.parse((0, import_node_fs6.readFileSync)(path, "utf8")));
   } catch {
     return false;
   }
 }
-var import_node_child_process, import_node_crypto, import_node_fs4, KEYCHAIN_SERVICE, KEYCHAIN_ACCOUNT, ALG, injectedKey;
+var import_node_child_process, import_node_crypto, import_node_fs6, KEYCHAIN_SERVICE, KEYCHAIN_ACCOUNT, ALG, injectedKey;
 var init_secure_file = __esm({
   "src/store/secure-file.ts"() {
     "use strict";
     import_node_child_process = require("child_process");
     import_node_crypto = require("crypto");
-    import_node_fs4 = require("fs");
+    import_node_fs6 = require("fs");
     init_private_file();
     KEYCHAIN_SERVICE = "ai.sideboard.app";
     KEYCHAIN_ACCOUNT = "secret-vault-v1";
@@ -598,7 +731,7 @@ function createEmptyThread(partial) {
 }
 async function withThreadLock(id, fn) {
   const lockPath = threadLockPath(id);
-  (0, import_node_fs5.writeFileSync)(lockPath, "", { flag: "a" });
+  (0, import_node_fs7.writeFileSync)(lockPath, "", { flag: "a" });
   let release;
   try {
     release = await import_proper_lockfile.default.lock(lockPath, {
@@ -612,26 +745,26 @@ async function withThreadLock(id, fn) {
 }
 function readThread(id) {
   const path = threadFilePath(id);
-  if (!(0, import_node_fs5.existsSync)(path)) return null;
-  const raw = (0, import_node_fs5.readFileSync)(path, "utf8");
+  if (!(0, import_node_fs7.existsSync)(path)) return null;
+  const raw = (0, import_node_fs7.readFileSync)(path, "utf8");
   return normalizeThread(JSON.parse(raw));
 }
 function writeThread(thread) {
   const path = threadFilePath(idPath(thread.id));
   const tmp = `${path}.${process.pid}.tmp`;
   const next = { ...thread, updatedAt: nowIso() };
-  (0, import_node_fs5.writeFileSync)(tmp, JSON.stringify(next, null, 2), "utf8");
-  (0, import_node_fs5.renameSync)(tmp, path);
+  (0, import_node_fs7.writeFileSync)(tmp, JSON.stringify(next, null, 2), "utf8");
+  (0, import_node_fs7.renameSync)(tmp, path);
 }
 function idPath(id) {
   return id;
 }
 function listThreads(opts) {
-  const files = (0, import_node_fs5.readdirSync)(threadsDir()).filter((f) => f.endsWith(".json"));
+  const files = (0, import_node_fs7.readdirSync)(threadsDir()).filter((f) => f.endsWith(".json"));
   const threads = files.map((f) => {
     try {
       return normalizeThread(
-        JSON.parse((0, import_node_fs5.readFileSync)(threadFilePath(f.replace(/\.json$/, "")), "utf8"))
+        JSON.parse((0, import_node_fs7.readFileSync)(threadFilePath(f.replace(/\.json$/, "")), "utf8"))
       );
     } catch {
       return null;
@@ -642,11 +775,11 @@ function listThreads(opts) {
 }
 function deleteThreadRecord(id) {
   const path = threadFilePath(id);
-  if ((0, import_node_fs5.existsSync)(path)) (0, import_node_fs5.unlinkSync)(path);
+  if ((0, import_node_fs7.existsSync)(path)) (0, import_node_fs7.unlinkSync)(path);
   const lock = threadLockPath(id);
-  if ((0, import_node_fs5.existsSync)(lock)) {
+  if ((0, import_node_fs7.existsSync)(lock)) {
     try {
-      (0, import_node_fs5.unlinkSync)(lock);
+      (0, import_node_fs7.unlinkSync)(lock);
     } catch {
     }
   }
@@ -670,12 +803,12 @@ function findThreadByRef(ref) {
   const all = listThreads({ includeArchived: true });
   return all.find((t) => t.id === ref || t.id.startsWith(ref) || t.branchName === ref || t.title === ref) ?? null;
 }
-var import_node_crypto2, import_node_fs5, import_proper_lockfile;
+var import_node_crypto2, import_node_fs7, import_proper_lockfile;
 var init_thread_store = __esm({
   "src/store/thread-store.ts"() {
     "use strict";
     import_node_crypto2 = require("crypto");
-    import_node_fs5 = require("fs");
+    import_node_fs7 = require("fs");
     import_proper_lockfile = __toESM(require("proper-lockfile"), 1);
     init_thinking_effort();
     init_paths();
@@ -1734,7 +1867,7 @@ var init_gh_errors = __esm({
 
 // src/store/secret-vault.ts
 function secretVaultPath() {
-  return (0, import_node_path8.join)(appDataDir(), "secrets.json");
+  return (0, import_node_path10.join)(appDataDir(), "secrets.json");
 }
 function loadSecretVault() {
   const parsed = readSecureJson(secretVaultPath());
@@ -1778,11 +1911,11 @@ function normalizeVault(raw) {
   }
   return out;
 }
-var import_node_path8;
+var import_node_path10;
 var init_secret_vault = __esm({
   "src/store/secret-vault.ts"() {
     "use strict";
-    import_node_path8 = require("path");
+    import_node_path10 = require("path");
     init_paths();
     init_secure_file();
   }
@@ -1883,10 +2016,10 @@ function toPublicAppSettings(settings) {
   };
 }
 function appSettingsPath() {
-  return (0, import_node_path9.join)(appDataDir(), "settings.json");
+  return (0, import_node_path11.join)(appDataDir(), "settings.json");
 }
 function claudeUserSettingsPath() {
-  return (0, import_node_path9.join)((0, import_node_os3.homedir)(), ".claude", "settings.json");
+  return (0, import_node_path11.join)((0, import_node_os3.homedir)(), ".claude", "settings.json");
 }
 function normalizeClaude(raw) {
   if (!raw || typeof raw !== "object") return {};
@@ -2129,10 +2262,10 @@ function normalizeSettings(raw) {
 }
 function readSettingsFile() {
   const path = appSettingsPath();
-  if (!(0, import_node_fs8.existsSync)(path)) return { ...EMPTY_SETTINGS };
+  if (!(0, import_node_fs10.existsSync)(path)) return { ...EMPTY_SETTINGS };
   try {
     chmodOwnerOnly(path);
-    const parsed = JSON.parse((0, import_node_fs8.readFileSync)(path, "utf8"));
+    const parsed = JSON.parse((0, import_node_fs10.readFileSync)(path, "utf8"));
     return normalizeSettings(parsed);
   } catch {
     return { ...EMPTY_SETTINGS };
@@ -2692,14 +2825,14 @@ function childEnvWithAppSettings(extra) {
 function harnessEnvKey(harness) {
   return HARNESS_ENV_KEYS[harness];
 }
-var import_node_crypto3, import_node_fs8, import_node_os3, import_node_path9, HARNESS_ENV_KEYS, DEFAULT_AGENTS, GITHUB_GIT_AUTH_MODES, CLOUD_CONNECT_AGENTS, ISSUE_SOURCES, GIT_AUTH_MODES, EMPTY_SETTINGS, DEFAULT_CLI_BIN;
+var import_node_crypto3, import_node_fs10, import_node_os3, import_node_path11, HARNESS_ENV_KEYS, DEFAULT_AGENTS, GITHUB_GIT_AUTH_MODES, CLOUD_CONNECT_AGENTS, ISSUE_SOURCES, GIT_AUTH_MODES, EMPTY_SETTINGS, DEFAULT_CLI_BIN;
 var init_app_settings = __esm({
   "src/store/app-settings.ts"() {
     "use strict";
     import_node_crypto3 = require("crypto");
-    import_node_fs8 = require("fs");
+    import_node_fs10 = require("fs");
     import_node_os3 = require("os");
-    import_node_path9 = require("path");
+    import_node_path11 = require("path");
     init_thinking_effort();
     init_nested_electron_env();
     init_paths();
@@ -2749,17 +2882,17 @@ var init_app_settings = __esm({
 
 // src/agents/path.ts
 function prependPathDir(env, dir) {
-  if (!dir || !(0, import_node_fs9.existsSync)(dir)) return;
+  if (!dir || !(0, import_node_fs11.existsSync)(dir)) return;
   const current = env.PATH ?? "";
-  const parts = current.split(import_node_path10.delimiter).filter(Boolean);
+  const parts = current.split(import_node_path12.delimiter).filter(Boolean);
   if (parts.includes(dir)) {
     env.PATH = current;
     return;
   }
-  env.PATH = [dir, ...parts].join(import_node_path10.delimiter);
+  env.PATH = [dir, ...parts].join(import_node_path12.delimiter);
 }
 function conductorBundledBinDir(home = process.env.HOME || process.env.USERPROFILE || (0, import_node_os4.homedir)()) {
-  return (0, import_node_path10.join)(home, "Library", "Application Support", "com.conductor.app", "bin");
+  return (0, import_node_path12.join)(home, "Library", "Application Support", "com.conductor.app", "bin");
 }
 function isConductorBundledCli(filePath) {
   const p = (filePath ?? "").replace(/\\/g, "/");
@@ -2768,21 +2901,21 @@ function isConductorBundledCli(filePath) {
 function ensureAgentPath(env = process.env) {
   const home = env.HOME || env.USERPROFILE || (0, import_node_os4.homedir)();
   const current = env.PATH ?? "";
-  const parts = current.split(import_node_path10.delimiter).filter(Boolean);
+  const parts = current.split(import_node_path12.delimiter).filter(Boolean);
   const seen = new Set(parts);
   const extras = [
-    ...EXTRA_BIN_DIRS.map((rel) => (0, import_node_path10.join)(home, rel)),
+    ...EXTRA_BIN_DIRS.map((rel) => (0, import_node_path12.join)(home, rel)),
     "/opt/homebrew/bin",
     "/usr/local/bin",
     // Keep after Homebrew/npm so a user-installed CLI still wins.
     conductorBundledBinDir(home)
   ];
   for (const dir of extras.reverse()) {
-    if (!dir || seen.has(dir) || !(0, import_node_fs9.existsSync)(dir)) continue;
+    if (!dir || seen.has(dir) || !(0, import_node_fs11.existsSync)(dir)) continue;
     parts.unshift(dir);
     seen.add(dir);
   }
-  const next = parts.join(import_node_path10.delimiter);
+  const next = parts.join(import_node_path12.delimiter);
   env.PATH = next;
   return next;
 }
@@ -2796,7 +2929,7 @@ function enrichPathWithNpmGlobalBin(env = process.env) {
       stdio: ["ignore", "pipe", "ignore"]
     }).trim().split(/\r?\n/).find(Boolean);
     if (prefix) {
-      const binDir = process.platform === "win32" ? prefix : (0, import_node_path10.join)(prefix, "bin");
+      const binDir = process.platform === "win32" ? prefix : (0, import_node_path12.join)(prefix, "bin");
       prependPathDir(env, binDir);
     }
   } catch {
@@ -2824,14 +2957,14 @@ function withExportedPath(command, pathValue) {
   if (/^(export\s+PATH=|PATH=)/.test(trimmed)) return trimmed;
   return `export PATH=${posixShellSingleQuote(pathValue)} && ${trimmed}`;
 }
-var import_node_fs9, import_node_child_process2, import_node_os4, import_node_path10, EXTRA_BIN_DIRS;
+var import_node_fs11, import_node_child_process2, import_node_os4, import_node_path12, EXTRA_BIN_DIRS;
 var init_path = __esm({
   "src/agents/path.ts"() {
     "use strict";
-    import_node_fs9 = require("fs");
+    import_node_fs11 = require("fs");
     import_node_child_process2 = require("child_process");
     import_node_os4 = require("os");
-    import_node_path10 = require("path");
+    import_node_path12 = require("path");
     EXTRA_BIN_DIRS = [
       ".local/bin",
       ".cargo/bin",
@@ -2859,7 +2992,7 @@ __export(run_exports, {
 async function run(file, args, opts) {
   ensureAgentPath();
   try {
-    const result = await (0, import_execa.execa)(file, args, {
+    const result = await (0, import_execa2.execa)(file, args, {
       cwd: opts?.cwd,
       env: { ...process.env, ...opts?.env },
       reject: opts?.reject ?? true,
@@ -2923,11 +3056,11 @@ async function resolveGhAuthToken(cwd) {
   const token = result.stdout.trim();
   return token || null;
 }
-var import_execa;
+var import_execa2;
 var init_run = __esm({
   "src/git/run.ts"() {
     "use strict";
-    import_execa = require("execa");
+    import_execa2 = require("execa");
     init_path();
   }
 });
@@ -4122,8 +4255,8 @@ function isLocalPrFetchBranch(ref) {
 }
 async function createThreadWorktree(opts) {
   let branchName = `thread/${opts.slug}`;
-  const worktreePath = (0, import_node_path11.join)(worktreesRoot(opts.repoPath), opts.slug);
-  if ((0, import_node_fs10.existsSync)(worktreePath)) {
+  const worktreePath = (0, import_node_path13.join)(worktreesRoot(opts.repoPath), opts.slug);
+  if ((0, import_node_fs12.existsSync)(worktreePath)) {
     throw new Error(`Worktree already exists at ${worktreePath}`);
   }
   await ensureGhPreferOrigin(opts.repoPath);
@@ -4192,8 +4325,8 @@ ${add.stdout}`;
 async function createExistingBranchWorktree(opts) {
   const branchName = opts.branchName.trim();
   if (!branchName) throw new Error("branch name required");
-  const worktreePath = (0, import_node_path11.join)(worktreesRoot(opts.repoPath), opts.slug);
-  if ((0, import_node_fs10.existsSync)(worktreePath)) {
+  const worktreePath = (0, import_node_path13.join)(worktreesRoot(opts.repoPath), opts.slug);
+  if ((0, import_node_fs12.existsSync)(worktreePath)) {
     throw new Error(`Worktree already exists at ${worktreePath}`);
   }
   await ensureGhPreferOrigin(opts.repoPath);
@@ -4481,10 +4614,10 @@ function sameRepoPath(a, b) {
   return normalizeWorktreePath(a) === normalizeWorktreePath(b);
 }
 function listLocalThreadBranchSlugs(repoPath) {
-  const refsDir = (0, import_node_path11.join)(repoPath, ".git", "refs", "heads", "thread");
-  if (!(0, import_node_fs10.existsSync)(refsDir)) return [];
+  const refsDir = (0, import_node_path13.join)(repoPath, ".git", "refs", "heads", "thread");
+  if (!(0, import_node_fs12.existsSync)(refsDir)) return [];
   try {
-    return (0, import_node_fs10.readdirSync)(refsDir).filter((name) => !name.startsWith(".")).map((name) => normalizeTakenSlug(name));
+    return (0, import_node_fs12.readdirSync)(refsDir).filter((name) => !name.startsWith(".")).map((name) => normalizeTakenSlug(name));
   } catch {
     return [];
   }
@@ -4492,8 +4625,8 @@ function listLocalThreadBranchSlugs(repoPath) {
 function collectTakenTeamSlugs(repoPath) {
   const taken = /* @__PURE__ */ new Set();
   const root = worktreesRoot(repoPath);
-  if ((0, import_node_fs10.existsSync)(root)) {
-    for (const entry of (0, import_node_fs10.readdirSync)(root, { withFileTypes: true })) {
+  if ((0, import_node_fs12.existsSync)(root)) {
+    for (const entry of (0, import_node_fs12.readdirSync)(root, { withFileTypes: true })) {
       if (entry.isDirectory() && entry.name !== ".DS_Store") {
         taken.add(normalizeTakenSlug(entry.name));
       }
@@ -4514,18 +4647,18 @@ function allocateTeamSlug(repoPath) {
   const taken = collectTakenTeamSlugs(repoPath);
   for (let attempt = 0; attempt < 32; attempt++) {
     const team = allocateTeamName(taken);
-    const path = (0, import_node_path11.join)(worktreesRoot(repoPath), team.slug);
-    if (!(0, import_node_fs10.existsSync)(path)) return team;
+    const path = (0, import_node_path13.join)(worktreesRoot(repoPath), team.slug);
+    if (!(0, import_node_fs12.existsSync)(path)) return team;
     taken.add(team.slug);
   }
   throw new Error("No available soccer team worktree directories left");
 }
-var import_node_fs10, import_node_path11;
+var import_node_fs12, import_node_path13;
 var init_worktree = __esm({
   "src/git/worktree.ts"() {
     "use strict";
-    import_node_fs10 = require("fs");
-    import_node_path11 = require("path");
+    import_node_fs12 = require("fs");
+    import_node_path13 = require("path");
     init_paths();
     init_thread_store();
     init_teams();
@@ -4667,7 +4800,7 @@ function coordinatorTurnReminder(opts) {
 function ensureGlobalCoordinatorCwd(opts) {
   const dir = globalAgentCwd();
   try {
-    (0, import_node_fs11.mkdirSync)(dir, { recursive: true });
+    (0, import_node_fs13.mkdirSync)(dir, { recursive: true });
   } catch {
     return dir;
   }
@@ -4675,7 +4808,7 @@ function ensureGlobalCoordinatorCwd(opts) {
   let orchId = opts?.orchestratorThreadId?.trim() || "";
   if (!orchId) {
     try {
-      const existing = (0, import_node_fs11.readFileSync)((0, import_node_path12.join)(dir, "AGENTS.md"), "utf8");
+      const existing = (0, import_node_fs13.readFileSync)((0, import_node_path14.join)(dir, "AGENTS.md"), "utf8");
       const m = existing.match(
         /YOUR orchestration thread id is `([0-9a-f-]{36})`/i
       );
@@ -4717,9 +4850,9 @@ function ensureGlobalCoordinatorCwd(opts) {
     "Always ask worktree agents to commit, push, and open draft PRs (`ask_git` / `send_to_thread`). Tell them to merge only when the user explicitly asked. The worktree agent runs git/gh; never merge from this orchestration cwd."
   ].join("\n");
   try {
-    (0, import_node_fs11.writeFileSync)((0, import_node_path12.join)(dir, "CLAUDE.md"), `${body}
+    (0, import_node_fs13.writeFileSync)((0, import_node_path14.join)(dir, "CLAUDE.md"), `${body}
 `, "utf8");
-    (0, import_node_fs11.writeFileSync)((0, import_node_path12.join)(dir, "AGENTS.md"), `${body}
+    (0, import_node_fs13.writeFileSync)((0, import_node_path14.join)(dir, "AGENTS.md"), `${body}
 `, "utf8");
   } catch {
   }
@@ -4751,12 +4884,12 @@ function coordinatorSystemPrompt(opts) {
     formatWorkspaceInventory(opts.workspaces)
   ].join("\n");
 }
-var import_node_fs11, import_node_path12, COORDINATOR_TOOL_PLAYBOOK, SLACK_REPLY_FORMATTING;
+var import_node_fs13, import_node_path14, COORDINATOR_TOOL_PLAYBOOK, SLACK_REPLY_FORMATTING;
 var init_coordinator_prompt = __esm({
   "src/orchestrator/coordinator-prompt.ts"() {
     "use strict";
-    import_node_fs11 = require("fs");
-    import_node_path12 = require("path");
+    import_node_fs13 = require("fs");
+    import_node_path14 = require("path");
     init_worktree();
     init_app_settings();
     init_paths();
@@ -4777,7 +4910,7 @@ var init_coordinator_prompt = __esm({
       "Workspaces:",
       "- add_workspace / remove_workspace \u2014 register or unregister a git repo",
       "Worktree threads (chats):",
-      "- create_thread \u2014 create a worktree + chat from branch | pr | ticket; pass repoPath + parentThreadId; omit agent and model to use Sideboard Account defaults (Settings \u2192 Default agent, model & effort). If you are Codex, do not set agent=codex (nested Codex deadlocks)",
+      "- create_thread \u2014 create a worktree + chat from branch | pr | ticket; pass repoPath + parentThreadId; omit agent and model to use Sideboard Account defaults (Settings \u2192 Default agent, model & effort). If the repo has a setup script, Sideboard runs it in the background (does not block send_to_thread). If you are Codex, do not set agent=codex (nested Codex deadlocks)",
       "- fork_worktree \u2014 fork a worktree chat into a NEW git worktree + chat (transcript attached); optional agent; leave model unset (Auto) unless you have a reason. Not for orchestration chats.",
       "- fork_chat \u2014 fork a worktree chat (same worktree tab) OR a Global orchestration chat (new orchestration tab); optional agent; leave model unset (Auto) unless you have a reason. Remote coordinators: use this to continue another orchestration chat on a different agent after session limits.",
       "- send_to_thread \u2014 queue a prompt (start/continue a chat turn); pass force_stop: true to interrupt mid-turn / clear stale queued prompts before replacing with a new request",
@@ -4785,7 +4918,7 @@ var init_coordinator_prompt = __esm({
       "- stop_thread \u2014 force-stop: kill in-flight turn AND clear queued prompts (do not leave stale queue after an interrupt)",
       "- archive_thread / restore_thread \u2014 archive (tears down worktree when last tab) or restore",
       "Setup / run:",
-      "- run_setup \u2014 re-run worktree setup",
+      "- run_setup \u2014 re-run worktree setup (already runs automatically on create when a script exists)",
       "- list_run_scripts / run_dev_script / stop_dev_script \u2014 start/stop named run scripts",
       "Inspect / review / PRs:",
       "- get_diff \u2014 compact diff summary",
@@ -5054,32 +5187,32 @@ var init_global_workspace = __esm({
 
 // src/brightsy/config.ts
 function brightsyConfigPath() {
-  return (0, import_node_path13.join)((0, import_node_os5.homedir)(), ".brightsy", "config.json");
+  return (0, import_node_path15.join)((0, import_node_os5.homedir)(), ".brightsy", "config.json");
 }
 function loadBrightsyConfig() {
   const path = brightsyConfigPath();
-  if (!(0, import_node_fs12.existsSync)(path)) {
+  if (!(0, import_node_fs14.existsSync)(path)) {
     throw new Error("Brightsy not logged in \u2014 run `brightsy login` first");
   }
-  const raw = JSON.parse((0, import_node_fs12.readFileSync)(path, "utf8"));
+  const raw = JSON.parse((0, import_node_fs14.readFileSync)(path, "utf8"));
   if (!raw.access_token || !raw.account_id) {
     throw new Error("Brightsy config incomplete \u2014 run `brightsy login`");
   }
   return raw;
 }
 function saveBrightsyConfig(cfg) {
-  (0, import_node_fs12.writeFileSync)(brightsyConfigPath(), `${JSON.stringify(cfg, null, 2)}
+  (0, import_node_fs14.writeFileSync)(brightsyConfigPath(), `${JSON.stringify(cfg, null, 2)}
 `, {
     mode: 384
   });
 }
-var import_node_fs12, import_node_os5, import_node_path13;
+var import_node_fs14, import_node_os5, import_node_path15;
 var init_config = __esm({
   "src/brightsy/config.ts"() {
     "use strict";
-    import_node_fs12 = require("fs");
+    import_node_fs14 = require("fs");
     import_node_os5 = require("os");
-    import_node_path13 = require("path");
+    import_node_path15 = require("path");
   }
 });
 
@@ -5094,22 +5227,22 @@ var init_accounts = __esm({
 
 // src/brightsy/connected-teams.ts
 function storePath4() {
-  return (0, import_node_path14.join)(appDataDir(), "brightsy-teams.json");
+  return (0, import_node_path16.join)(appDataDir(), "brightsy-teams.json");
 }
 function readStore4() {
   const path = storePath4();
-  if (!(0, import_node_fs13.existsSync)(path)) return [];
+  if (!(0, import_node_fs15.existsSync)(path)) return [];
   try {
-    const parsed = JSON.parse((0, import_node_fs13.readFileSync)(path, "utf8"));
+    const parsed = JSON.parse((0, import_node_fs15.readFileSync)(path, "utf8"));
     return Array.isArray(parsed.teams) ? parsed.teams : [];
   } catch {
     return [];
   }
 }
 function writeStore2(teams) {
-  (0, import_node_fs13.mkdirSync)(appDataDir(), { recursive: true });
+  (0, import_node_fs15.mkdirSync)(appDataDir(), { recursive: true });
   const path = storePath4();
-  (0, import_node_fs13.writeFileSync)(path, `${JSON.stringify({ teams }, null, 2)}
+  (0, import_node_fs15.writeFileSync)(path, `${JSON.stringify({ teams }, null, 2)}
 `, {
     mode: 384
   });
@@ -5221,12 +5354,12 @@ function brightsyMcpServerName(slug) {
   const cleaned = slug.replace(/[^A-Za-z0-9_-]/g, "_").replace(/^_+|_+$/g, "");
   return `brightsy_${cleaned || "team"}`;
 }
-var import_node_fs13, import_node_path14;
+var import_node_fs15, import_node_path16;
 var init_connected_teams = __esm({
   "src/brightsy/connected-teams.ts"() {
     "use strict";
-    import_node_fs13 = require("fs");
-    import_node_path14 = require("path");
+    import_node_fs15 = require("fs");
+    import_node_path16 = require("path");
     init_paths();
     init_accounts();
     init_config();
@@ -5553,11 +5686,11 @@ async function syncCliForTarget(accountId) {
   }
   applyConnectedTeamToCli(team);
 }
-var import_node_fs14, brightsyAdapter;
+var import_node_fs16, brightsyAdapter;
 var init_brightsy = __esm({
   "src/agents/brightsy.ts"() {
     "use strict";
-    import_node_fs14 = require("fs");
+    import_node_fs16 = require("fs");
     init_run();
     init_connected_teams();
     init_config();
@@ -5572,7 +5705,7 @@ var init_brightsy = __esm({
       async detect() {
         const brightsy = resolveAgentExecutable("brightsy");
         if (brightsy !== "brightsy") {
-          if (!(0, import_node_fs14.existsSync)(brightsy)) {
+          if (!(0, import_node_fs16.existsSync)(brightsy)) {
             return {
               agent: "brightsy",
               installed: false,
@@ -5822,35 +5955,35 @@ function corePackageDir() {
   try {
     const url = import_meta.url;
     if (typeof url === "string" && url.length > 0) {
-      return (0, import_node_path15.dirname)((0, import_node_url.fileURLToPath)(url));
+      return (0, import_node_path17.dirname)((0, import_node_url.fileURLToPath)(url));
     }
   } catch {
   }
   try {
-    const req = (0, import_node_module.createRequire)((0, import_node_path15.join)(process.cwd(), "package.json"));
-    return (0, import_node_path15.dirname)(req.resolve("@sideboard-ai/core"));
+    const req = (0, import_node_module.createRequire)((0, import_node_path17.join)(process.cwd(), "package.json"));
+    return (0, import_node_path17.dirname)(req.resolve("@sideboard-ai/core"));
   } catch {
     return process.cwd();
   }
 }
 function findSideboardMcpJsEntry() {
   const override = process.env.SIDEBOARD_MCP_ENTRY?.trim() || process.env.SIDEBOARD_CLI?.trim();
-  if (override && (0, import_node_fs15.existsSync)(override)) return override;
+  if (override && (0, import_node_fs17.existsSync)(override)) return override;
   let dir = corePackageDir();
   for (let i = 0; i < 10; i++) {
     const candidates = [
-      (0, import_node_path15.join)(dir, "mcp/run-stdio.js"),
-      (0, import_node_path15.join)(dir, "mcp/run-stdio.cjs"),
-      (0, import_node_path15.join)(dir, "dist/mcp/run-stdio.js"),
-      (0, import_node_path15.join)(dir, "dist/mcp/run-stdio.cjs"),
-      (0, import_node_path15.join)(dir, "packages/core/dist/mcp/run-stdio.js"),
-      (0, import_node_path15.join)(dir, "packages/cli/dist/index.js"),
-      (0, import_node_path15.join)(dir, "cli/dist/index.js")
+      (0, import_node_path17.join)(dir, "mcp/run-stdio.js"),
+      (0, import_node_path17.join)(dir, "mcp/run-stdio.cjs"),
+      (0, import_node_path17.join)(dir, "dist/mcp/run-stdio.js"),
+      (0, import_node_path17.join)(dir, "dist/mcp/run-stdio.cjs"),
+      (0, import_node_path17.join)(dir, "packages/core/dist/mcp/run-stdio.js"),
+      (0, import_node_path17.join)(dir, "packages/cli/dist/index.js"),
+      (0, import_node_path17.join)(dir, "cli/dist/index.js")
     ];
     for (const p of candidates) {
-      if ((0, import_node_fs15.existsSync)(p)) return p;
+      if ((0, import_node_fs17.existsSync)(p)) return p;
     }
-    const parent = (0, import_node_path15.dirname)(dir);
+    const parent = (0, import_node_path17.dirname)(dir);
     if (parent === dir) break;
     dir = parent;
   }
@@ -5912,22 +6045,52 @@ async function buildInjectedMcpServers(opts) {
   }
   return servers;
 }
+function shSingleQuote(value) {
+  return `'${value.replace(/'/g, `'\\''`)}'`;
+}
+function cursorSafeMcpLaunch(command, args) {
+  if (process.platform === "win32") {
+    return args && args.length > 0 ? { command, args } : { command };
+  }
+  const unwrapped = unwrapStrippedElectronLaunch(command, args);
+  const file = unwrapped?.file ?? command;
+  const fileArgs = unwrapped?.args ?? args ?? [];
+  if (!isElectronLikeCommand(file)) {
+    return fileArgs.length > 0 ? { command: file, args: fileArgs } : { command: file };
+  }
+  const dir = (0, import_node_path17.join)(appDataDir(), "mcp-launch");
+  (0, import_node_fs17.mkdirSync)(dir, { recursive: true });
+  const wrap = (0, import_node_path17.join)(dir, "cursor-electron-as-node.sh");
+  const execLine = [file, ...fileArgs].map(shSingleQuote).join(" ");
+  (0, import_node_fs17.writeFileSync)(
+    wrap,
+    [
+      "#!/bin/sh",
+      "vars=`printenv | awk -F= '/^(ELECTRON_|CHROME_)/{print $1}'`",
+      '[ -n "$vars" ] && unset $vars',
+      "export ELECTRON_RUN_AS_NODE=1",
+      `exec ${execLine} "$@"`,
+      ""
+    ].join("\n"),
+    { mode: 493 }
+  );
+  return { command: wrap };
+}
+function mcpSpawnEnv(env) {
+  if (!env) return void 0;
+  const out = { ...env };
+  delete out.ELECTRON_RUN_AS_NODE;
+  return Object.keys(out).length > 0 ? out : void 0;
+}
 function toCursorMcpServers(servers) {
   const out = {};
   for (const s of servers) {
-    const env = s.env ? { ...s.env } : void 0;
-    if (env) delete env.ELECTRON_RUN_AS_NODE;
-    let command = s.command;
-    let args = s.args;
-    if (process.platform !== "win32" && !isStrippedElectronLaunch(command, args)) {
-      const wrapped = wrapElectronAsNodeLaunch(command, args ?? []);
-      command = wrapped.file;
-      args = wrapped.args;
-    }
+    const env = mcpSpawnEnv(s.env);
+    const launch = cursorSafeMcpLaunch(s.command, s.args);
     out[s.name] = {
-      command,
-      ...args && args.length > 0 ? { args } : {},
-      ...env && Object.keys(env).length > 0 ? { env } : {}
+      command: launch.command,
+      ...launch.args && launch.args.length > 0 ? { args: launch.args } : {},
+      ...env ? { env } : {}
     };
   }
   return out;
@@ -5940,8 +6103,9 @@ function toCodexMcpConfigArgs(servers) {
     if (s.args?.length) {
       args.push("-c", `${prefix}.args=${JSON.stringify(s.args)}`);
     }
-    if (s.env) {
-      for (const [key, value] of Object.entries(s.env)) {
+    const env = mcpSpawnEnv(s.env);
+    if (env) {
+      for (const [key, value] of Object.entries(env)) {
         args.push("-c", `${prefix}.env.${key}=${JSON.stringify(value)}`);
       }
     }
@@ -5954,11 +6118,12 @@ function toCodexMcpConfigArgs(servers) {
 function toOpencodeMcpConfigContent(servers) {
   const mcp = {};
   for (const s of servers) {
+    const env = mcpSpawnEnv(s.env);
     mcp[s.name] = {
       type: "local",
       command: [s.command, ...s.args ?? []],
       enabled: true,
-      ...s.env && Object.keys(s.env).length > 0 ? { environment: s.env } : {}
+      ...env ? { environment: env } : {}
     };
   }
   return JSON.stringify({ mcp });
@@ -5967,25 +6132,26 @@ function writeMcpServersConfig(servers) {
   if (servers.length === 0) return null;
   const mcpServers = {};
   for (const s of servers) {
+    const env = mcpSpawnEnv(s.env);
     mcpServers[s.name] = {
       command: s.command,
       ...s.args ? { args: s.args } : {},
-      ...s.env ? { env: s.env } : {}
+      ...env ? { env } : {}
     };
   }
-  const dir = (0, import_node_fs15.mkdtempSync)((0, import_node_path15.join)((0, import_node_os6.tmpdir)(), "sideboard-mcp-"));
-  const cfgPath = (0, import_node_path15.join)(dir, "mcp.json");
-  (0, import_node_fs15.writeFileSync)(cfgPath, JSON.stringify({ mcpServers }, null, 2));
+  const dir = (0, import_node_fs17.mkdtempSync)((0, import_node_path17.join)((0, import_node_os6.tmpdir)(), "sideboard-mcp-"));
+  const cfgPath = (0, import_node_path17.join)(dir, "mcp.json");
+  (0, import_node_fs17.writeFileSync)(cfgPath, JSON.stringify({ mcpServers }, null, 2));
   return cfgPath;
 }
-var import_node_fs15, import_node_module, import_node_os6, import_node_path15, import_node_url, import_meta, SIDEBOARD_MCP_ALLOWED_TOOLS, SIDEBOARD_ARTIFACT_MCP_ALLOWED_TOOLS, brightsyMcpCommandCache, BRIGHTSY_WORD;
+var import_node_fs17, import_node_module, import_node_os6, import_node_path17, import_node_url, import_meta, SIDEBOARD_MCP_ALLOWED_TOOLS, SIDEBOARD_ARTIFACT_MCP_ALLOWED_TOOLS, brightsyMcpCommandCache, BRIGHTSY_WORD;
 var init_injected_mcp = __esm({
   "src/agents/injected-mcp.ts"() {
     "use strict";
-    import_node_fs15 = require("fs");
+    import_node_fs17 = require("fs");
     import_node_module = require("module");
     import_node_os6 = require("os");
-    import_node_path15 = require("path");
+    import_node_path17 = require("path");
     import_node_url = require("url");
     init_run();
     init_config();
@@ -6173,11 +6339,11 @@ function parseIssuesJson(raw) {
   }
   return [];
 }
-var import_node_fs16, BASE_ALLOWED_TOOLS, CLAUDE_CHROME_ALLOWED_TOOLS, CLAUDE_PROMPT_ARG_MAX, claudeAdapter;
+var import_node_fs18, BASE_ALLOWED_TOOLS, CLAUDE_CHROME_ALLOWED_TOOLS, CLAUDE_PROMPT_ARG_MAX, claudeAdapter;
 var init_claude = __esm({
   "src/agents/claude.ts"() {
     "use strict";
-    import_node_fs16 = require("fs");
+    import_node_fs18 = require("fs");
     init_run();
     init_app_settings();
     init_claude_mcp();
@@ -6206,7 +6372,7 @@ var init_claude = __esm({
       async detect() {
         const claude = resolveClaudeExecutable();
         if (claude !== "claude") {
-          if (!(0, import_node_fs16.existsSync)(claude)) {
+          if (!(0, import_node_fs18.existsSync)(claude)) {
             return {
               agent: "claude",
               installed: false,
@@ -6443,7 +6609,7 @@ async function listCodexModels() {
   if (codex === "codex") {
     const which = await run("which", ["codex"], { reject: false });
     if (which.exitCode !== 0) return FALLBACK_CODEX_MODELS;
-  } else if (!(0, import_node_fs17.existsSync)(codex)) {
+  } else if (!(0, import_node_fs19.existsSync)(codex)) {
     return FALLBACK_CODEX_MODELS;
   }
   const listed = await run(codex, ["debug", "models"], { reject: false });
@@ -6478,12 +6644,12 @@ function usageFromCodex(usage) {
 }
 function codexConfigHasNetworkAccess() {
   const candidates = [
-    (0, import_node_path16.join)((0, import_node_os7.homedir)(), ".codex", "config.toml"),
-    (0, import_node_path16.join)((0, import_node_os7.homedir)(), ".config", "codex", "config.toml")
+    (0, import_node_path18.join)((0, import_node_os7.homedir)(), ".codex", "config.toml"),
+    (0, import_node_path18.join)((0, import_node_os7.homedir)(), ".config", "codex", "config.toml")
   ];
   for (const path of candidates) {
-    if (!(0, import_node_fs17.existsSync)(path)) continue;
-    const text3 = (0, import_node_fs17.readFileSync)(path, "utf8");
+    if (!(0, import_node_fs19.existsSync)(path)) continue;
+    const text3 = (0, import_node_fs19.readFileSync)(path, "utf8");
     if (/network_access\s*=\s*true/.test(text3)) return true;
   }
   return false;
@@ -6515,21 +6681,21 @@ function asRecord(value) {
   return void 0;
 }
 function codexLooksAuthenticated() {
-  const authPath = (0, import_node_path16.join)((0, import_node_os7.homedir)(), ".codex", "auth.json");
-  if (!(0, import_node_fs17.existsSync)(authPath)) return false;
+  const authPath = (0, import_node_path18.join)((0, import_node_os7.homedir)(), ".codex", "auth.json");
+  if (!(0, import_node_fs19.existsSync)(authPath)) return false;
   try {
-    return (0, import_node_fs17.statSync)(authPath).size > 2;
+    return (0, import_node_fs19.statSync)(authPath).size > 2;
   } catch {
     return false;
   }
 }
-var import_node_fs17, import_node_os7, import_node_path16, CODEX_PROMPT_ARG_MAX, FALLBACK_CODEX_MODELS, cachedCodexModels, CODEX_MODEL_CACHE_MS, codexAdapter;
+var import_node_fs19, import_node_os7, import_node_path18, CODEX_PROMPT_ARG_MAX, FALLBACK_CODEX_MODELS, cachedCodexModels, CODEX_MODEL_CACHE_MS, codexAdapter;
 var init_codex = __esm({
   "src/agents/codex.ts"() {
     "use strict";
-    import_node_fs17 = require("fs");
+    import_node_fs19 = require("fs");
     import_node_os7 = require("os");
-    import_node_path16 = require("path");
+    import_node_path18 = require("path");
     init_run();
     init_app_settings();
     init_global_workspace();
@@ -6554,7 +6720,7 @@ var init_codex = __esm({
       async detect() {
         const codex = resolveAgentExecutable("codex");
         if (codex !== "codex") {
-          if (!(0, import_node_fs17.existsSync)(codex)) {
+          if (!(0, import_node_fs19.existsSync)(codex)) {
             return {
               agent: "codex",
               installed: false,
@@ -6988,11 +7154,11 @@ function entryDir() {
   const cjsDir = typeof __dirname !== "undefined" ? __dirname : "";
   if (cjsDir) return cjsDir;
   try {
-    return (0, import_node_path17.dirname)((0, import_node_url2.fileURLToPath)(import_meta2.url));
+    return (0, import_node_path19.dirname)((0, import_node_url2.fileURLToPath)(import_meta2.url));
   } catch {
     try {
       const req = (0, import_node_module2.createRequire)(process.cwd() + "/");
-      return (0, import_node_path17.dirname)(req.resolve("@sideboard-ai/core"));
+      return (0, import_node_path19.dirname)(req.resolve("@sideboard-ai/core"));
     } catch {
       return process.cwd();
     }
@@ -7001,27 +7167,27 @@ function entryDir() {
 function cursorRunnerPath() {
   const root = entryDir();
   const candidates = [
-    (0, import_node_path17.join)(root, "agents", "cursor-runner.js"),
-    (0, import_node_path17.join)(root, "agents", "cursor-runner.cjs"),
+    (0, import_node_path19.join)(root, "agents", "cursor-runner.js"),
+    (0, import_node_path19.join)(root, "agents", "cursor-runner.cjs"),
     // If somehow resolved from package root instead of dist/
-    (0, import_node_path17.join)(root, "dist", "agents", "cursor-runner.js"),
-    (0, import_node_path17.join)(root, "dist", "agents", "cursor-runner.cjs"),
+    (0, import_node_path19.join)(root, "dist", "agents", "cursor-runner.js"),
+    (0, import_node_path19.join)(root, "dist", "agents", "cursor-runner.cjs"),
     // Source tree (dev): packages/core/src/agents/cursor-runner.ts
-    (0, import_node_path17.join)(root, "cursor-runner.ts"),
-    (0, import_node_path17.join)(root, "src", "agents", "cursor-runner.ts")
+    (0, import_node_path19.join)(root, "cursor-runner.ts"),
+    (0, import_node_path19.join)(root, "src", "agents", "cursor-runner.ts")
   ];
   for (const candidate of candidates) {
-    if ((0, import_node_fs18.existsSync)(candidate)) return candidate;
+    if ((0, import_node_fs20.existsSync)(candidate)) return candidate;
   }
   return candidates[0];
 }
-var import_node_fs18, import_node_module2, import_node_path17, import_node_url2, import_sdk, import_meta2, FALLBACK_CURSOR_MODELS, cachedModels, MODEL_CACHE_MS, cursorAdapter;
+var import_node_fs20, import_node_module2, import_node_path19, import_node_url2, import_sdk, import_meta2, FALLBACK_CURSOR_MODELS, cachedModels, MODEL_CACHE_MS, cursorAdapter;
 var init_cursor = __esm({
   "src/agents/cursor.ts"() {
     "use strict";
-    import_node_fs18 = require("fs");
+    import_node_fs20 = require("fs");
     import_node_module2 = require("module");
-    import_node_path17 = require("path");
+    import_node_path19 = require("path");
     import_node_url2 = require("url");
     import_sdk = require("@cursor/sdk");
     init_run();
@@ -7150,7 +7316,7 @@ async function listOpencodeModels() {
   if (opencode === "opencode") {
     const which = await run("which", ["opencode"], { reject: false });
     if (which.exitCode !== 0) return FALLBACK_OPENCODE_MODELS;
-  } else if (!(0, import_node_fs19.existsSync)(opencode)) {
+  } else if (!(0, import_node_fs21.existsSync)(opencode)) {
     return FALLBACK_OPENCODE_MODELS;
   }
   const listed = await run(opencode, ["models"], { reject: false });
@@ -7180,11 +7346,11 @@ function usageFromOpencode(tokens) {
     cacheWriteTokens: tokens.cache?.write ? Number(tokens.cache.write) : void 0
   };
 }
-var import_node_fs19, FALLBACK_OPENCODE_MODELS, cachedOpencodeModels, OPENCODE_MODEL_CACHE_MS, opencodeAdapter;
+var import_node_fs21, FALLBACK_OPENCODE_MODELS, cachedOpencodeModels, OPENCODE_MODEL_CACHE_MS, opencodeAdapter;
 var init_opencode = __esm({
   "src/agents/opencode.ts"() {
     "use strict";
-    import_node_fs19 = require("fs");
+    import_node_fs21 = require("fs");
     init_run();
     init_app_settings();
     init_global_workspace();
@@ -7210,7 +7376,7 @@ var init_opencode = __esm({
       async detect() {
         const opencode = resolveAgentExecutable("opencode");
         if (opencode !== "opencode") {
-          if (!(0, import_node_fs19.existsSync)(opencode)) {
+          if (!(0, import_node_fs21.existsSync)(opencode)) {
             return {
               agent: "opencode",
               installed: false,
@@ -7947,38 +8113,38 @@ __export(workspaces_exports, {
   syncWorkspacesFromThreads: () => syncWorkspacesFromThreads
 });
 function workspacesFile() {
-  return (0, import_node_path21.join)(appDataDir(), "workspaces.json");
+  return (0, import_node_path22.join)(appDataDir(), "workspaces.json");
 }
 function removedWorkspacesFile() {
-  return (0, import_node_path21.join)(appDataDir(), "removed-workspaces.json");
+  return (0, import_node_path22.join)(appDataDir(), "removed-workspaces.json");
 }
 function readAll() {
   const path = workspacesFile();
-  if (!(0, import_node_fs23.existsSync)(path)) return [];
+  if (!(0, import_node_fs24.existsSync)(path)) return [];
   try {
-    const raw = JSON.parse((0, import_node_fs23.readFileSync)(path, "utf8"));
+    const raw = JSON.parse((0, import_node_fs24.readFileSync)(path, "utf8"));
     return Array.isArray(raw) ? raw : [];
   } catch {
     return [];
   }
 }
 function writeAll(list) {
-  (0, import_node_fs23.mkdirSync)(appDataDir(), { recursive: true });
-  (0, import_node_fs23.writeFileSync)(workspacesFile(), JSON.stringify(list, null, 2), "utf8");
+  (0, import_node_fs24.mkdirSync)(appDataDir(), { recursive: true });
+  (0, import_node_fs24.writeFileSync)(workspacesFile(), JSON.stringify(list, null, 2), "utf8");
 }
 function readRemoved() {
   const path = removedWorkspacesFile();
-  if (!(0, import_node_fs23.existsSync)(path)) return /* @__PURE__ */ new Set();
+  if (!(0, import_node_fs24.existsSync)(path)) return /* @__PURE__ */ new Set();
   try {
-    const raw = JSON.parse((0, import_node_fs23.readFileSync)(path, "utf8"));
+    const raw = JSON.parse((0, import_node_fs24.readFileSync)(path, "utf8"));
     return new Set(Array.isArray(raw) ? raw.filter((p) => typeof p === "string") : []);
   } catch {
     return /* @__PURE__ */ new Set();
   }
 }
 function writeRemoved(paths) {
-  (0, import_node_fs23.mkdirSync)(appDataDir(), { recursive: true });
-  (0, import_node_fs23.writeFileSync)(removedWorkspacesFile(), JSON.stringify([...paths].sort(), null, 2), "utf8");
+  (0, import_node_fs24.mkdirSync)(appDataDir(), { recursive: true });
+  (0, import_node_fs24.writeFileSync)(removedWorkspacesFile(), JSON.stringify([...paths].sort(), null, 2), "utf8");
 }
 function rememberRemoved(repoPath) {
   const next = readRemoved();
@@ -8001,7 +8167,7 @@ function listWorkspaces() {
 async function addWorkspace(repoPath) {
   const root = await resolveRepoRoot(repoPath);
   if (!root || root === "/") throw new Error(`Invalid repo path: ${repoPath}`);
-  if (!(0, import_node_fs23.existsSync)(root)) throw new Error(`Repo not found: ${root}`);
+  if (!(0, import_node_fs24.existsSync)(root)) throw new Error(`Repo not found: ${root}`);
   forgetRemoved(root);
   await ensureGhPreferOrigin(root);
   const current = readAll();
@@ -8009,7 +8175,7 @@ async function addWorkspace(repoPath) {
   if (existing) return existing;
   const next = {
     path: root,
-    name: (0, import_node_path21.basename)(root),
+    name: (0, import_node_path22.basename)(root),
     addedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
   writeAll([...current, next]);
@@ -8031,10 +8197,10 @@ function syncWorkspacesFromThreads(repoPaths) {
     if (!path || path === "/" || isGlobalRepoPath(path) || byPath.has(path) || removed.has(path)) {
       continue;
     }
-    if (!(0, import_node_fs23.existsSync)(path)) continue;
+    if (!(0, import_node_fs24.existsSync)(path)) continue;
     const ws = {
       path,
-      name: (0, import_node_path21.basename)(path),
+      name: (0, import_node_path22.basename)(path),
       addedAt: (/* @__PURE__ */ new Date()).toISOString()
     };
     byPath.set(path, ws);
@@ -8044,12 +8210,12 @@ function syncWorkspacesFromThreads(repoPaths) {
   if (dirty) writeAll(next);
   return next.sort((a, b) => a.name.localeCompare(b.name));
 }
-var import_node_fs23, import_node_path21;
+var import_node_fs24, import_node_path22;
 var init_workspaces = __esm({
   "src/store/workspaces.ts"() {
     "use strict";
-    import_node_fs23 = require("fs");
-    import_node_path21 = require("path");
+    import_node_fs24 = require("fs");
+    import_node_path22 = require("path");
     init_paths();
     init_global_workspace();
     init_worktree();
@@ -8126,40 +8292,40 @@ __export(plan_file_exports, {
   writePlanFile: () => writePlanFile
 });
 function ensureAttachmentsGitignore2(worktreePath) {
-  const gitignoreAbs = (0, import_node_path29.join)(worktreePath, ATTACHMENTS_DIR, ".gitignore");
-  if ((0, import_node_fs33.existsSync)(gitignoreAbs)) return;
-  (0, import_node_fs33.mkdirSync)((0, import_node_path29.dirname)(gitignoreAbs), { recursive: true });
-  (0, import_node_fs33.writeFileSync)(gitignoreAbs, attachmentsGitignoreBody(), "utf8");
+  const gitignoreAbs = (0, import_node_path30.join)(worktreePath, ATTACHMENTS_DIR, ".gitignore");
+  if ((0, import_node_fs34.existsSync)(gitignoreAbs)) return;
+  (0, import_node_fs34.mkdirSync)((0, import_node_path30.dirname)(gitignoreAbs), { recursive: true });
+  (0, import_node_fs34.writeFileSync)(gitignoreAbs, attachmentsGitignoreBody(), "utf8");
 }
 function planFileAbs(worktreePath) {
-  return (0, import_node_path29.join)(worktreePath, PLAN_FILE_REL);
+  return (0, import_node_path30.join)(worktreePath, PLAN_FILE_REL);
 }
 function readTextIfPresent2(abs) {
-  if (!(0, import_node_fs33.existsSync)(abs)) return null;
+  if (!(0, import_node_fs34.existsSync)(abs)) return null;
   try {
-    const content = (0, import_node_fs33.readFileSync)(abs, "utf8");
+    const content = (0, import_node_fs34.readFileSync)(abs, "utf8");
     return content.trim() ? content : null;
   } catch {
     return null;
   }
 }
 function readPlanFile(worktreePath) {
-  return readTextIfPresent2(planFileAbs(worktreePath)) ?? readTextIfPresent2((0, import_node_path29.join)(worktreePath, `${LEGACY_ATTACHMENTS_DIR}/plan.md`)) ?? readTextIfPresent2((0, import_node_path29.join)(worktreePath, LEGACY_PLAN_FILE_REL));
+  return readTextIfPresent2(planFileAbs(worktreePath)) ?? readTextIfPresent2((0, import_node_path30.join)(worktreePath, `${LEGACY_ATTACHMENTS_DIR}/plan.md`)) ?? readTextIfPresent2((0, import_node_path30.join)(worktreePath, LEGACY_PLAN_FILE_REL));
 }
 function writePlanFile(worktreePath, content) {
   ensureAttachmentsGitignore2(worktreePath);
   const abs = planFileAbs(worktreePath);
-  (0, import_node_fs33.mkdirSync)((0, import_node_path29.dirname)(abs), { recursive: true });
+  (0, import_node_fs34.mkdirSync)((0, import_node_path30.dirname)(abs), { recursive: true });
   const body = content.trimEnd() + (content.endsWith("\n") ? "" : "\n");
-  (0, import_node_fs33.writeFileSync)(abs, body, "utf8");
+  (0, import_node_fs34.writeFileSync)(abs, body, "utf8");
   return PLAN_FILE_REL;
 }
-var import_node_fs33, import_node_path29;
+var import_node_fs34, import_node_path30;
 var init_plan_file = __esm({
   "src/plan/plan-file.ts"() {
     "use strict";
-    import_node_fs33 = require("fs");
-    import_node_path29 = require("path");
+    import_node_fs34 = require("fs");
+    import_node_path30 = require("path");
     init_workspace_scratch();
     init_plan_present();
     init_plan_present();
@@ -8180,7 +8346,7 @@ function setCaffeinateHoldHooks(next) {
   hooks = next;
 }
 function caffeinateHoldPath() {
-  return (0, import_node_path30.join)(appDataDir(), "caffeinate-hold.json");
+  return (0, import_node_path31.join)(appDataDir(), "caffeinate-hold.json");
 }
 function processAlive(pid) {
   if (hooks.processAlive) return hooks.processAlive(pid);
@@ -8214,9 +8380,9 @@ function uniqueIds(ids) {
 }
 function readHold() {
   const path = caffeinateHoldPath();
-  if (!(0, import_node_fs34.existsSync)(path)) return null;
+  if (!(0, import_node_fs35.existsSync)(path)) return null;
   try {
-    const parsed = JSON.parse((0, import_node_fs34.readFileSync)(path, "utf8"));
+    const parsed = JSON.parse((0, import_node_fs35.readFileSync)(path, "utf8"));
     if (typeof parsed?.pid === "number" && parsed.pid > 0) {
       return {
         pid: parsed.pid,
@@ -8238,7 +8404,7 @@ function writeHold(pid, threadIds) {
 }
 function clearHold() {
   try {
-    (0, import_node_fs34.unlinkSync)(caffeinateHoldPath());
+    (0, import_node_fs35.unlinkSync)(caffeinateHoldPath());
   } catch {
   }
 }
@@ -8323,13 +8489,13 @@ function releaseCaffeinateHoldForThread(threadId) {
   }
   return setCaffeinateHold(false, { threadId: id });
 }
-var import_node_child_process4, import_node_fs34, import_node_path30, hooks;
+var import_node_child_process4, import_node_fs35, import_node_path31, hooks;
 var init_caffeinate_hold = __esm({
   "src/store/caffeinate-hold.ts"() {
     "use strict";
     import_node_child_process4 = require("child_process");
-    import_node_fs34 = require("fs");
-    import_node_path30 = require("path");
+    import_node_fs35 = require("fs");
+    import_node_path31 = require("path");
     init_paths();
     init_private_file();
     hooks = {};
@@ -8344,10 +8510,10 @@ __export(cursor_recover_exports, {
 function recoverFinishedCursorRun(opts) {
   const agentId = opts.agentId.trim();
   if (!agentId) return null;
-  const runsPath = (0, import_node_path31.join)(appDataDir(), "cursor-sdk-store", "runs.ndjson");
-  if (!(0, import_node_fs35.existsSync)(runsPath)) return null;
+  const runsPath = (0, import_node_path32.join)(appDataDir(), "cursor-sdk-store", "runs.ndjson");
+  if (!(0, import_node_fs36.existsSync)(runsPath)) return null;
   try {
-    const lines = (0, import_node_fs35.readFileSync)(runsPath, "utf8").split("\n");
+    const lines = (0, import_node_fs36.readFileSync)(runsPath, "utf8").split("\n");
     let best = null;
     for (const line of lines) {
       const trimmed = line.trim();
@@ -8373,12 +8539,12 @@ function recoverFinishedCursorRun(opts) {
     return null;
   }
 }
-var import_node_fs35, import_node_path31;
+var import_node_fs36, import_node_path32;
 var init_cursor_recover = __esm({
   "src/agents/cursor-recover.ts"() {
     "use strict";
-    import_node_fs35 = require("fs");
-    import_node_path31 = require("path");
+    import_node_fs36 = require("fs");
+    import_node_path32 = require("path");
     init_paths();
   }
 });
@@ -8390,14 +8556,14 @@ init_nested_electron_env();
 var import_mcp = require("@modelcontextprotocol/sdk/server/mcp.js");
 var import_stdio = require("@modelcontextprotocol/sdk/server/stdio.js");
 var import_zod3 = require("zod");
-var import_node_path32 = require("path");
+var import_node_path33 = require("path");
 
 // src/orchestrator/orchestrator.ts
 var import_node_events = require("events");
 
 // src/slack/outbound-watch.ts
-var import_node_fs7 = require("fs");
-var import_node_path7 = require("path");
+var import_node_fs9 = require("fs");
+var import_node_path9 = require("path");
 init_paths();
 init_private_file();
 init_secure_file();
@@ -8440,19 +8606,19 @@ async function slackApi(token, method, params, fetchImpl) {
 }
 
 // src/slack/reply-target.ts
-var import_node_fs6 = require("fs");
-var import_node_path5 = require("path");
+var import_node_fs8 = require("fs");
+var import_node_path7 = require("path");
 init_paths();
 init_private_file();
 init_secure_file();
 function storePath() {
-  return (0, import_node_path5.join)(appDataDir(), "slack-reply-to.json");
+  return (0, import_node_path7.join)(appDataDir(), "slack-reply-to.json");
 }
 function readStore() {
   const path = storePath();
-  if (!(0, import_node_fs6.existsSync)(path)) return {};
+  if (!(0, import_node_fs8.existsSync)(path)) return {};
   try {
-    const parsed = isSecureFileEncrypted(path) ? readSecureJson(path) : JSON.parse((0, import_node_fs6.readFileSync)(path, "utf8"));
+    const parsed = isSecureFileEncrypted(path) ? readSecureJson(path) : JSON.parse((0, import_node_fs8.readFileSync)(path, "utf8"));
     return parsed?.targets && typeof parsed.targets === "object" ? parsed.targets : {};
   } catch {
     return {};
@@ -8463,11 +8629,11 @@ function getSlackReplyTarget(threadId) {
 }
 
 // src/slack/workspaces.ts
-var import_node_path6 = require("path");
+var import_node_path8 = require("path");
 init_paths();
 init_secure_file();
 function storePath2() {
-  return (0, import_node_path6.join)(appDataDir(), "slack-workspaces.json");
+  return (0, import_node_path8.join)(appDataDir(), "slack-workspaces.json");
 }
 function readStore2() {
   try {
@@ -8537,7 +8703,7 @@ var POLL_INTERVAL_MS = 12e3;
 var lastPollMs = 0;
 var nameCache = /* @__PURE__ */ new Map();
 function storePath3() {
-  return (0, import_node_path7.join)(appDataDir(), "slack-outbound-watch.json");
+  return (0, import_node_path9.join)(appDataDir(), "slack-outbound-watch.json");
 }
 function watchId(teamId, channelId, ts) {
   return `${teamId}:${channelId}:${ts}`;
@@ -8567,9 +8733,9 @@ function tsNewer(a, b) {
 }
 function readStore3() {
   const path = storePath3();
-  if (!(0, import_node_fs7.existsSync)(path)) return [];
+  if (!(0, import_node_fs9.existsSync)(path)) return [];
   try {
-    const parsed = isSecureFileEncrypted(path) ? readSecureJson(path) : JSON.parse((0, import_node_fs7.readFileSync)(path, "utf8"));
+    const parsed = isSecureFileEncrypted(path) ? readSecureJson(path) : JSON.parse((0, import_node_fs9.readFileSync)(path, "utf8"));
     return Array.isArray(parsed?.watches) ? parsed.watches : [];
   } catch {
     return [];
@@ -8901,12 +9067,12 @@ async function refreshSlackReplyBadges(opts) {
 }
 
 // src/orchestrator/orchestrator.ts
-var import_node_fs36 = require("fs");
+var import_node_fs37 = require("fs");
 init_error_detail();
 
 // src/agents/spawn.ts
-var import_node_readline = require("readline");
-var import_execa2 = require("execa");
+var import_node_readline2 = require("readline");
+var import_execa3 = require("execa");
 init_worktree();
 init_git_auth_mode();
 init_app_settings();
@@ -9182,7 +9348,7 @@ async function spawnAgentTurn(thread, input, onEvent) {
     const detail = err instanceof Error ? err.message : String(err);
     console.warn(`[sideboard] git auth env failed (${thread.worktreePath}): ${detail}`);
   }
-  const child = (0, import_execa2.execa)(cmd.file, cmd.args, {
+  const child = (0, import_execa3.execa)(cmd.file, cmd.args, {
     cwd: cmd.cwd,
     env,
     reject: false,
@@ -9202,7 +9368,7 @@ async function spawnAgentTurn(thread, input, onEvent) {
   let usage = null;
   const consume = (stream, kind) => {
     if (!stream) return;
-    const rl = (0, import_node_readline.createInterface)({ input: stream, crlfDelay: Infinity });
+    const rl = (0, import_node_readline2.createInterface)({ input: stream, crlfDelay: Infinity });
     rl.on("line", (line) => {
       if (kind === "stderr") {
         onEvent({ type: "stderr", data: line });
@@ -9387,13 +9553,15 @@ function shouldAutoArchiveOnPrMerge(opts) {
 }
 
 // src/hook/conductor.ts
-var import_node_fs20 = require("fs");
+var import_node_fs22 = require("fs");
 var import_node_net = require("net");
-var import_node_path18 = require("path");
-var import_execa3 = require("execa");
-var import_node_readline2 = require("readline");
+var import_node_path20 = require("path");
+var import_execa4 = require("execa");
+var import_node_readline3 = require("readline");
 init_settings();
 init_nested_electron_env();
+init_convention_setup();
+init_cursor_worktrees();
 init_git_auth_mode();
 init_nested_electron_env();
 var PORT_RANGE_SIZE = 10;
@@ -9402,9 +9570,9 @@ function matchSimpleGlob(pattern, name) {
   return new RegExp(`^${escaped}$`).test(name);
 }
 function readWorktreeInclude(repoPath) {
-  const path = (0, import_node_path18.join)(repoPath, ".worktreeinclude");
-  if (!(0, import_node_fs20.existsSync)(path)) return [];
-  return (0, import_node_fs20.readFileSync)(path, "utf8").split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("#"));
+  const path = (0, import_node_path20.join)(repoPath, ".worktreeinclude");
+  if (!(0, import_node_fs22.existsSync)(path)) return [];
+  return (0, import_node_fs22.readFileSync)(path, "utf8").split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("#"));
 }
 function resolveFilesToCopy(repoPath) {
   const fromInclude = readWorktreeInclude(repoPath);
@@ -9414,10 +9582,10 @@ function resolveFilesToCopy(repoPath) {
   if (settings?.fileIncludeGlobs?.length) {
     const matched = [];
     try {
-      for (const entry of (0, import_node_fs20.readdirSync)(repoPath, { withFileTypes: true })) {
+      for (const entry of (0, import_node_fs22.readdirSync)(repoPath, { withFileTypes: true })) {
         if (!entry.isFile()) continue;
         for (const glob of settings.fileIncludeGlobs) {
-          if (matchSimpleGlob(glob, entry.name) || matchSimpleGlob((0, import_node_path18.basename)(glob), entry.name)) {
+          if (matchSimpleGlob(glob, entry.name) || matchSimpleGlob((0, import_node_path20.basename)(glob), entry.name)) {
             matched.push(entry.name);
             break;
           }
@@ -9429,7 +9597,7 @@ function resolveFilesToCopy(repoPath) {
   }
   const defaults = [];
   try {
-    for (const entry of (0, import_node_fs20.readdirSync)(repoPath, { withFileTypes: true })) {
+    for (const entry of (0, import_node_fs22.readdirSync)(repoPath, { withFileTypes: true })) {
       if (entry.isFile() && entry.name.startsWith(".env")) {
         defaults.push(entry.name);
       }
@@ -9443,11 +9611,11 @@ function copyConfiguredFiles(repoPath, worktreePath) {
   const patterns = resolveFilesToCopy(repoPath);
   const copied = [];
   for (const rel of patterns) {
-    const src = (0, import_node_path18.join)(repoPath, rel);
-    if (!(0, import_node_fs20.existsSync)(src)) continue;
-    const dest = (0, import_node_path18.join)(worktreePath, rel);
-    (0, import_node_fs20.mkdirSync)((0, import_node_path18.dirname)(dest), { recursive: true });
-    (0, import_node_fs20.copyFileSync)(src, dest);
+    const src = (0, import_node_path20.join)(repoPath, rel);
+    if (!(0, import_node_fs22.existsSync)(src)) continue;
+    const dest = (0, import_node_path20.join)(worktreePath, rel);
+    (0, import_node_fs22.mkdirSync)((0, import_node_path20.dirname)(dest), { recursive: true });
+    (0, import_node_fs22.copyFileSync)(src, dest);
     copied.push(rel);
   }
   return copied;
@@ -9457,7 +9625,7 @@ async function captureLoginEnv() {
   if (cachedLoginEnv) return { ...cachedLoginEnv };
   const shell = process.env.SHELL?.trim() || (process.platform === "darwin" ? "/bin/zsh" : "/bin/bash");
   try {
-    const result = await (0, import_execa3.execa)(shell, ["-l", "-c", "env -0"], {
+    const result = await (0, import_execa4.execa)(shell, ["-l", "-c", "env -0"], {
       reject: false,
       timeout: 5e3
     });
@@ -9483,7 +9651,7 @@ function buildWorkspaceScriptEnv(opts, baseEnv) {
   const env = stripNestedElectronEnv({
     ...baseEnv ?? process.env
   });
-  const name = opts.workspaceName ?? (0, import_node_path18.basename)(opts.worktreePath);
+  const name = opts.workspaceName ?? (0, import_node_path20.basename)(opts.worktreePath);
   const ports = opts.ports ?? [];
   const primary = ports[0];
   env.SIDEBOARD_WORKSPACE_NAME = name;
@@ -9510,7 +9678,7 @@ function buildWorkspaceScriptEnv(opts, baseEnv) {
 }
 function pipeLines(stream, onLine) {
   if (!stream || !onLine) return;
-  const rl = (0, import_node_readline2.createInterface)({ input: stream });
+  const rl = (0, import_node_readline3.createInterface)({ input: stream });
   rl.on("line", onLine);
 }
 function killScriptTree(child, ports = []) {
@@ -9518,7 +9686,7 @@ function killScriptTree(child, ports = []) {
   if (pid) {
     try {
       if (process.platform === "win32") {
-        void (0, import_execa3.execa)("taskkill", ["/pid", String(pid), "/T", "/F"], { reject: false });
+        void (0, import_execa4.execa)("taskkill", ["/pid", String(pid), "/T", "/F"], { reject: false });
       } else {
         process.kill(-pid, "SIGTERM");
         setTimeout(() => {
@@ -9538,7 +9706,7 @@ function killScriptTree(child, ports = []) {
   for (const port of ports) {
     if (!Number.isFinite(port) || port <= 0) continue;
     if (process.platform === "win32") {
-      void (0, import_execa3.execa)(
+      void (0, import_execa4.execa)(
         "powershell",
         [
           "-NoProfile",
@@ -9548,7 +9716,7 @@ function killScriptTree(child, ports = []) {
         { reject: false }
       );
     } else {
-      void (0, import_execa3.execa)(
+      void (0, import_execa4.execa)(
         "zsh",
         ["-lc", `pids=$(lsof -tiTCP:${port} -sTCP:LISTEN 2>/dev/null); [ -n "$pids" ] && kill -TERM $pids 2>/dev/null; true`],
         { reject: false }
@@ -9573,7 +9741,7 @@ async function spawnWorkspaceScript(command, opts) {
   } catch {
   }
   const shell = process.platform === "darwin" ? "zsh" : "bash";
-  const child = (0, import_execa3.execa)(shell, ["-lc", command], {
+  const child = (0, import_execa4.execa)(shell, ["-lc", command], {
     cwd: opts.worktreePath,
     reject: false,
     env,
@@ -9591,6 +9759,14 @@ async function spawnWorkspaceScript(command, opts) {
     child
   };
 }
+async function attachAbort(handle, signal) {
+  if (signal) {
+    const onAbort = () => handle.kill();
+    if (signal.aborted) onAbort();
+    else signal.addEventListener("abort", onAbort, { once: true });
+  }
+  return handle.done;
+}
 async function runSetupScript(repoPath, worktreePath, onLine, opts) {
   const settings = loadWorkspaceSettings(worktreePath, repoPath);
   if (!settings?.setup) return { ran: false, exitCode: null, source: null };
@@ -9600,12 +9776,7 @@ async function runSetupScript(repoPath, worktreePath, onLine, opts) {
     defaultBranch: opts?.defaultBranch,
     onLine
   });
-  if (opts?.signal) {
-    const onAbort = () => handle.kill();
-    if (opts.signal.aborted) onAbort();
-    else opts.signal.addEventListener("abort", onAbort, { once: true });
-  }
-  const exitCode = await handle.done;
+  const exitCode = await attachAbort(handle, opts?.signal);
   return {
     ran: true,
     exitCode,
@@ -9613,6 +9784,34 @@ async function runSetupScript(repoPath, worktreePath, onLine, opts) {
     kill: handle.kill
   };
 }
+async function runConventionSetup(repoPath, worktreePath, onLine, opts) {
+  const found = findConventionSetup(worktreePath, repoPath);
+  if (!found) return { ran: false, exitCode: null, source: null };
+  onLine?.(`[setup] ${found.source}`);
+  const handle = await spawnWorkspaceScript(found.command, {
+    worktreePath,
+    repoPath,
+    defaultBranch: opts?.defaultBranch,
+    onLine
+  });
+  const exitCode = await attachAbort(handle, opts?.signal);
+  return {
+    ran: true,
+    exitCode,
+    source: found.source,
+    kill: handle.kill
+  };
+}
+async function runWorkspaceSetup(repoPath, worktreePath, onLine, opts) {
+  let setup = await runSetupScript(repoPath, worktreePath, onLine, opts);
+  if (!setup.ran) {
+    setup = await runCursorWorktreeSetup(repoPath, worktreePath, onLine);
+  }
+  if (!setup.ran) {
+    setup = await runConventionSetup(repoPath, worktreePath, onLine, opts);
+  }
+  return setup;
+}
 async function runArchiveScript(repoPath, worktreePath, onLine) {
   const settings = loadWorkspaceSettings(worktreePath, repoPath);
   if (!settings?.archive) return { ran: false, exitCode: null };
@@ -9705,75 +9904,9 @@ async function startDevServer(repoPath, worktreePath, onLine, opts) {
   };
 }
 
-// src/hook/cursor-worktrees.ts
-var import_node_fs21 = require("fs");
-var import_node_path19 = require("path");
-var import_execa4 = require("execa");
-var import_node_readline3 = require("readline");
-function loadCursorWorktreesJson(rootPath) {
-  const path = (0, import_node_path19.join)(rootPath, ".cursor", "worktrees.json");
-  if (!(0, import_node_fs21.existsSync)(path)) return null;
-  try {
-    return JSON.parse((0, import_node_fs21.readFileSync)(path, "utf8"));
-  } catch {
-    return null;
-  }
-}
-function resolveSetupSpec(config) {
-  if (process.platform === "win32") {
-    return config["setup-worktree-windows"] ?? config["setup-worktree"] ?? null;
-  }
-  return config["setup-worktree-unix"] ?? config["setup-worktree"] ?? null;
-}
-async function runCursorWorktreeSetup(repoPath, worktreePath, onLine) {
-  const fromWorktree = loadCursorWorktreesJson(worktreePath);
-  const fromRepo = worktreePath !== repoPath ? loadCursorWorktreesJson(repoPath) : null;
-  const config = fromWorktree ?? fromRepo;
-  if (!config) return { ran: false, exitCode: null, source: null };
-  const spec = resolveSetupSpec(config);
-  if (!spec) return { ran: false, exitCode: null, source: null };
-  const sourceLabel = fromWorktree ? ".cursor/worktrees.json (worktree)" : ".cursor/worktrees.json (main repo)";
-  const env = {
-    ...process.env,
-    ROOT_WORKTREE_PATH: repoPath
-  };
-  if (process.platform === "win32") {
-    env.ROOT_WORKTREE_PATH = repoPath;
-  }
-  const commands = Array.isArray(spec) ? spec : [spec.endsWith(".sh") || spec.endsWith(".ps1") ? (0, import_node_path19.join)(
-    fromWorktree ? worktreePath : repoPath,
-    ".cursor",
-    spec
-  ) : spec];
-  let lastExit = 0;
-  for (const command of commands) {
-    const isScriptPath = typeof spec === "string" && (spec.endsWith(".sh") || spec.endsWith(".ps1"));
-    const shell = process.platform === "win32" ? "powershell" : "bash";
-    const args = process.platform === "win32" ? isScriptPath ? ["-File", command] : ["-Command", command] : isScriptPath ? [command] : ["-lc", command];
-    onLine?.(`[cursor setup] ${command}`);
-    const child = (0, import_execa4.execa)(shell, args, {
-      cwd: worktreePath,
-      reject: false,
-      env
-    });
-    if (child.stdout && onLine) {
-      const rl = (0, import_node_readline3.createInterface)({ input: child.stdout });
-      rl.on("line", onLine);
-    }
-    if (child.stderr && onLine) {
-      const rl = (0, import_node_readline3.createInterface)({ input: child.stderr });
-      rl.on("line", onLine);
-    }
-    const result = await child;
-    lastExit = result.exitCode ?? null;
-    if (lastExit !== 0 && lastExit !== null) break;
-  }
-  return { ran: true, exitCode: lastExit, source: sourceLabel };
-}
-
 // src/git/orphan-cleanup.ts
-var import_node_fs22 = require("fs");
-var import_node_path20 = require("path");
+var import_node_fs23 = require("fs");
+var import_node_path21 = require("path");
 init_worktree();
 init_thread_store();
 init_paths();
@@ -9788,9 +9921,9 @@ async function findOrphanWorktrees(repoPaths) {
     repoPaths?.length ? repoPaths : threads.map((t) => t.repoPath).filter(Boolean)
   );
   const homeRoot = sideboardWorkspacesDir();
-  if ((0, import_node_fs22.existsSync)(homeRoot)) {
+  if ((0, import_node_fs23.existsSync)(homeRoot)) {
     try {
-      for (const entry of (0, import_node_fs22.readdirSync)(homeRoot, { withFileTypes: true })) {
+      for (const entry of (0, import_node_fs23.readdirSync)(homeRoot, { withFileTypes: true })) {
         if (!entry.isDirectory()) continue;
         void entry;
       }
@@ -9800,7 +9933,7 @@ async function findOrphanWorktrees(repoPaths) {
   const orphans = [];
   const seen = /* @__PURE__ */ new Set();
   for (const repoPath of repos) {
-    if (!repoPath || !(0, import_node_fs22.existsSync)(repoPath)) continue;
+    if (!repoPath || !(0, import_node_fs23.existsSync)(repoPath)) continue;
     try {
       const wts = await listWorktrees(repoPath);
       for (const wt of wts) {
@@ -9811,7 +9944,7 @@ async function findOrphanWorktrees(repoPaths) {
         seen.add(path);
         let mtimeMs = 0;
         try {
-          mtimeMs = (0, import_node_fs22.statSync)(path).mtimeMs;
+          mtimeMs = (0, import_node_fs23.statSync)(path).mtimeMs;
         } catch {
           mtimeMs = 0;
         }
@@ -9821,16 +9954,16 @@ async function findOrphanWorktrees(repoPaths) {
     }
     try {
       const root = worktreesRoot(repoPath);
-      if ((0, import_node_fs22.existsSync)(root)) {
-        for (const entry of (0, import_node_fs22.readdirSync)(root, { withFileTypes: true })) {
+      if ((0, import_node_fs23.existsSync)(root)) {
+        for (const entry of (0, import_node_fs23.readdirSync)(root, { withFileTypes: true })) {
           if (!entry.isDirectory()) continue;
-          const path = (0, import_node_path20.join)(root, entry.name).replace(/\/$/, "");
+          const path = (0, import_node_path21.join)(root, entry.name).replace(/\/$/, "");
           if (known.has(path) || seen.has(path)) continue;
-          if (!(0, import_node_fs22.existsSync)((0, import_node_path20.join)(path, ".git"))) continue;
+          if (!(0, import_node_fs23.existsSync)((0, import_node_path21.join)(path, ".git"))) continue;
           seen.add(path);
           let mtimeMs = 0;
           try {
-            mtimeMs = (0, import_node_fs22.statSync)(path).mtimeMs;
+            mtimeMs = (0, import_node_fs23.statSync)(path).mtimeMs;
           } catch {
             mtimeMs = Date.now();
           }
@@ -9967,8 +10100,8 @@ async function applyThreadIntoMain(thread, opts) {
 }
 
 // src/git/clone-repo.ts
-var import_node_fs24 = require("fs");
-var import_node_path22 = require("path");
+var import_node_fs25 = require("fs");
+var import_node_path23 = require("path");
 var import_execa6 = require("execa");
 init_paths();
 init_workspaces();
@@ -9978,12 +10111,12 @@ async function cloneRepoIntoSideboard(opts) {
   if (!url) throw new Error("Clone URL is required");
   let name = opts.name?.trim();
   if (!name) {
-    const leaf = (0, import_node_path22.basename)(url.replace(/\/$/, "").replace(/\.git$/, ""));
+    const leaf = (0, import_node_path23.basename)(url.replace(/\/$/, "").replace(/\.git$/, ""));
     name = leaf || "repo";
   }
   name = name.replace(/[^a-zA-Z0-9._-]+/g, "-").replace(/^-+|-+$/g, "") || "repo";
-  const dest = (0, import_node_path22.join)(sideboardReposDir(), name);
-  if ((0, import_node_fs24.existsSync)(dest)) {
+  const dest = (0, import_node_path23.join)(sideboardReposDir(), name);
+  if ((0, import_node_fs25.existsSync)(dest)) {
     const repoPath2 = await resolveRepoRoot(dest);
     const workspace2 = await ensureWorkspace(repoPath2);
     return { repoPath: repoPath2, workspace: workspace2 };
@@ -10003,7 +10136,7 @@ async function cloneRepoIntoSideboard(opts) {
 init_thread_store();
 
 // src/threads/create.ts
-var import_node_fs25 = require("fs");
+var import_node_fs26 = require("fs");
 
 // src/detect/detect.ts
 init_agents();
@@ -10048,7 +10181,7 @@ async function createThread(input, _onSetupLine) {
   });
   await requireAgent(resolved.agent);
   const repoPath = await resolveRepoRoot(input.repoPath);
-  if (!(0, import_node_fs25.existsSync)(repoPath)) {
+  if (!(0, import_node_fs26.existsSync)(repoPath)) {
     throw new Error(`Repo not found: ${repoPath}`);
   }
   let sourceRef = input.sourceRef;
@@ -10511,8 +10644,8 @@ function forkChatTab(input) {
 
 // src/review/request-review.ts
 var import_node_crypto5 = require("crypto");
-var import_node_fs26 = require("fs");
-var import_node_path23 = require("path");
+var import_node_fs27 = require("fs");
+var import_node_path24 = require("path");
 init_global_workspace();
 init_thread_store();
 
@@ -10660,22 +10793,22 @@ function shouldRefreshReviewRequestTemplate(content) {
   return LEGACY_REVIEW_TEMPLATE_MARKERS.every((m) => trimmed.includes(m));
 }
 function readTextIfPresent(abs) {
-  if (!(0, import_node_fs26.existsSync)(abs)) return null;
+  if (!(0, import_node_fs27.existsSync)(abs)) return null;
   try {
-    const content = (0, import_node_fs26.readFileSync)(abs, "utf8");
+    const content = (0, import_node_fs27.readFileSync)(abs, "utf8");
     return content.trim() ? content : null;
   } catch {
     return null;
   }
 }
 function ensureAttachmentsGitignore(worktreePath) {
-  const gitignoreAbs = (0, import_node_path23.join)(worktreePath, ATTACHMENTS_DIR, ".gitignore");
-  if ((0, import_node_fs26.existsSync)(gitignoreAbs)) return;
-  (0, import_node_fs26.mkdirSync)((0, import_node_path23.dirname)(gitignoreAbs), { recursive: true });
-  (0, import_node_fs26.writeFileSync)(gitignoreAbs, attachmentsGitignoreBody(), "utf8");
+  const gitignoreAbs = (0, import_node_path24.join)(worktreePath, ATTACHMENTS_DIR, ".gitignore");
+  if ((0, import_node_fs27.existsSync)(gitignoreAbs)) return;
+  (0, import_node_fs27.mkdirSync)((0, import_node_path24.dirname)(gitignoreAbs), { recursive: true });
+  (0, import_node_fs27.writeFileSync)(gitignoreAbs, attachmentsGitignoreBody(), "utf8");
 }
 function resolveReviewGuidelines(worktreePath) {
-  const repoAbs = (0, import_node_path23.join)(worktreePath, REPO_REVIEW_PATH);
+  const repoAbs = (0, import_node_path24.join)(worktreePath, REPO_REVIEW_PATH);
   const repoContent = readTextIfPresent(repoAbs);
   if (repoContent) {
     return {
@@ -10685,7 +10818,7 @@ function resolveReviewGuidelines(worktreePath) {
       source: "repo"
     };
   }
-  const localAbs = (0, import_node_path23.join)(worktreePath, REVIEW_REQUEST_PATH);
+  const localAbs = (0, import_node_path24.join)(worktreePath, REVIEW_REQUEST_PATH);
   const localContent = readTextIfPresent(localAbs);
   if (localContent && !shouldRefreshReviewRequestTemplate(localContent)) {
     return {
@@ -10695,7 +10828,7 @@ function resolveReviewGuidelines(worktreePath) {
       source: "local"
     };
   }
-  const legacyAbs = (0, import_node_path23.join)(worktreePath, LEGACY_REVIEW_REQUEST_PATH);
+  const legacyAbs = (0, import_node_path24.join)(worktreePath, LEGACY_REVIEW_REQUEST_PATH);
   const legacyContent = readTextIfPresent(legacyAbs);
   if (legacyContent && !shouldRefreshReviewRequestTemplate(legacyContent)) {
     return {
@@ -10706,8 +10839,8 @@ function resolveReviewGuidelines(worktreePath) {
     };
   }
   ensureAttachmentsGitignore(worktreePath);
-  (0, import_node_fs26.mkdirSync)((0, import_node_path23.dirname)(localAbs), { recursive: true });
-  (0, import_node_fs26.writeFileSync)(localAbs, REVIEW_REQUEST_TEMPLATE, "utf8");
+  (0, import_node_fs27.mkdirSync)((0, import_node_path24.dirname)(localAbs), { recursive: true });
+  (0, import_node_fs27.writeFileSync)(localAbs, REVIEW_REQUEST_TEMPLATE, "utf8");
   return {
     path: REVIEW_REQUEST_PATH,
     name: REVIEW_REQUEST_NAME,
@@ -10907,20 +11040,20 @@ function createQuotaFailoverChat(from, fallbackAgent, limitText) {
 
 // src/threads/adopt.ts
 var import_node_child_process3 = require("child_process");
-var import_node_fs27 = require("fs");
+var import_node_fs28 = require("fs");
 var import_node_os8 = require("os");
-var import_node_path24 = require("path");
+var import_node_path25 = require("path");
 var import_better_sqlite3 = __toESM(require("better-sqlite3"), 1);
 init_worktree();
 init_thread_store();
-var CONDUCTOR_APP_SUPPORT = (0, import_node_path24.join)(
+var CONDUCTOR_APP_SUPPORT = (0, import_node_path25.join)(
   process.env.HOME ?? "",
   "Library",
   "Application Support",
   "com.conductor.app"
 );
-var CONDUCTOR_DB = (0, import_node_path24.join)(CONDUCTOR_APP_SUPPORT, "conductor.db");
-var CURSOR_SDK_STORE = (0, import_node_path24.join)(CONDUCTOR_APP_SUPPORT, "cursor-sdk-store");
+var CONDUCTOR_DB = (0, import_node_path25.join)(CONDUCTOR_APP_SUPPORT, "conductor.db");
+var CURSOR_SDK_STORE = (0, import_node_path25.join)(CONDUCTOR_APP_SUPPORT, "cursor-sdk-store");
 function mapAgentType(raw) {
   if (!raw) return null;
   const v = raw.toLowerCase();
@@ -10932,21 +11065,21 @@ function mapAgentType(raw) {
   return null;
 }
 function resolveConductorCursorAgentId(workspacePath) {
-  if (!workspacePath || !(0, import_node_fs27.existsSync)(CURSOR_SDK_STORE)) return null;
+  if (!workspacePath || !(0, import_node_fs28.existsSync)(CURSOR_SDK_STORE)) return null;
   const normalized = workspacePath.replace(/\/$/, "");
   let best = null;
   let hashes;
   try {
-    hashes = (0, import_node_fs27.readdirSync)(CURSOR_SDK_STORE);
+    hashes = (0, import_node_fs28.readdirSync)(CURSOR_SDK_STORE);
   } catch {
     return null;
   }
   for (const hash of hashes) {
-    const agentsFile = (0, import_node_path24.join)(CURSOR_SDK_STORE, hash, "agents.ndjson");
-    if (!(0, import_node_fs27.existsSync)(agentsFile)) continue;
+    const agentsFile = (0, import_node_path25.join)(CURSOR_SDK_STORE, hash, "agents.ndjson");
+    if (!(0, import_node_fs28.existsSync)(agentsFile)) continue;
     let text3;
     try {
-      text3 = (0, import_node_fs27.readFileSync)(agentsFile, "utf8");
+      text3 = (0, import_node_fs28.readFileSync)(agentsFile, "utf8");
     } catch {
       continue;
     }
@@ -10970,7 +11103,7 @@ function resolveConductorCursorAgentId(workspacePath) {
   return best?.agentId ?? null;
 }
 async function adoptThread(input) {
-  if (!(0, import_node_fs27.existsSync)(input.worktreePath)) {
+  if (!(0, import_node_fs28.existsSync)(input.worktreePath)) {
     throw new Error(`Worktree not found: ${input.worktreePath}`);
   }
   const repoPath = await resolveRepoRoot(input.worktreePath);
@@ -10994,18 +11127,18 @@ async function adoptThread(input) {
   return thread;
 }
 function listConductorWorkspaces() {
-  if (!(0, import_node_fs27.existsSync)(CONDUCTOR_DB)) {
+  if (!(0, import_node_fs28.existsSync)(CONDUCTOR_DB)) {
     throw new Error(`Conductor DB not found at ${CONDUCTOR_DB}`);
   }
-  const tmp = (0, import_node_fs27.mkdtempSync)((0, import_node_path24.join)((0, import_node_os8.tmpdir)(), "sideboard-conductor-"));
-  const snapshot = (0, import_node_path24.join)(tmp, "conductor.db");
+  const tmp = (0, import_node_fs28.mkdtempSync)((0, import_node_path25.join)((0, import_node_os8.tmpdir)(), "sideboard-conductor-"));
+  const snapshot = (0, import_node_path25.join)(tmp, "conductor.db");
   try {
-    (0, import_node_fs27.copyFileSync)(CONDUCTOR_DB, snapshot);
+    (0, import_node_fs28.copyFileSync)(CONDUCTOR_DB, snapshot);
     for (const suffix of ["-wal", "-shm"]) {
       const src = `${CONDUCTOR_DB}${suffix}`;
-      if ((0, import_node_fs27.existsSync)(src)) {
+      if ((0, import_node_fs28.existsSync)(src)) {
         try {
-          (0, import_node_fs27.copyFileSync)(src, `${snapshot}${suffix}`);
+          (0, import_node_fs28.copyFileSync)(src, `${snapshot}${suffix}`);
         } catch {
         }
       }
@@ -11081,22 +11214,22 @@ function listConductorWorkspaces() {
       db.close();
     }
   } finally {
-    (0, import_node_fs27.rmSync)(tmp, { recursive: true, force: true });
+    (0, import_node_fs28.rmSync)(tmp, { recursive: true, force: true });
   }
 }
 function importConductorWorkspace(workspaceId) {
-  if (!(0, import_node_fs27.existsSync)(CONDUCTOR_DB)) {
+  if (!(0, import_node_fs28.existsSync)(CONDUCTOR_DB)) {
     throw new Error(`Conductor DB not found at ${CONDUCTOR_DB}`);
   }
-  const tmp = (0, import_node_fs27.mkdtempSync)((0, import_node_path24.join)((0, import_node_os8.tmpdir)(), "sideboard-conductor-"));
-  const snapshot = (0, import_node_path24.join)(tmp, "conductor.db");
+  const tmp = (0, import_node_fs28.mkdtempSync)((0, import_node_path25.join)((0, import_node_os8.tmpdir)(), "sideboard-conductor-"));
+  const snapshot = (0, import_node_path25.join)(tmp, "conductor.db");
   try {
-    (0, import_node_fs27.copyFileSync)(CONDUCTOR_DB, snapshot);
+    (0, import_node_fs28.copyFileSync)(CONDUCTOR_DB, snapshot);
     for (const suffix of ["-wal", "-shm"]) {
       const src = `${CONDUCTOR_DB}${suffix}`;
-      if ((0, import_node_fs27.existsSync)(src)) {
+      if ((0, import_node_fs28.existsSync)(src)) {
         try {
-          (0, import_node_fs27.copyFileSync)(src, `${snapshot}${suffix}`);
+          (0, import_node_fs28.copyFileSync)(src, `${snapshot}${suffix}`);
         } catch {
         }
       }
@@ -11114,7 +11247,7 @@ function importConductorWorkspace(workspaceId) {
       ).get(workspaceId);
       if (!row) throw new Error(`Conductor workspace not found: ${workspaceId}`);
       const worktreePath = String(row.workspacePath);
-      if (!(0, import_node_fs27.existsSync)(worktreePath)) {
+      if (!(0, import_node_fs28.existsSync)(worktreePath)) {
         throw new Error(`Conductor worktree missing on disk: ${worktreePath}`);
       }
       let sessionId = null;
@@ -11177,7 +11310,7 @@ function importConductorWorkspace(workspaceId) {
       db.close();
     }
   } finally {
-    (0, import_node_fs27.rmSync)(tmp, { recursive: true, force: true });
+    (0, import_node_fs28.rmSync)(tmp, { recursive: true, force: true });
   }
 }
 async function importConductorWorkspaceAsync(workspaceId) {
@@ -11185,7 +11318,7 @@ async function importConductorWorkspaceAsync(workspaceId) {
 }
 
 // src/threads/stack-layers.ts
-var import_node_fs28 = require("fs");
+var import_node_fs29 = require("fs");
 init_run();
 init_stack();
 init_worktree();
@@ -11253,7 +11386,7 @@ async function openStackLayer(input, _onSetupLine) {
   let createdWorktree = false;
   const trees = await listWorktrees(repoPath);
   const checkedOut = trees.find((w) => w.branch === branchName);
-  if (checkedOut?.path && (0, import_node_fs28.existsSync)(checkedOut.path)) {
+  if (checkedOut?.path && (0, import_node_fs29.existsSync)(checkedOut.path)) {
     if (input.reuseExistingWorktree !== false) {
       worktreePath = checkedOut.path;
     } else {
@@ -11395,7 +11528,7 @@ async function initStackFromThread(input, onSetupLine) {
 async function createPrStack(input, onSetupLine) {
   await requireAgent(input.agent);
   const repoPath = await resolveRepoRoot(input.repoPath);
-  if (!(0, import_node_fs28.existsSync)(repoPath)) throw new Error(`Repo not found: ${repoPath}`);
+  if (!(0, import_node_fs29.existsSync)(repoPath)) throw new Error(`Repo not found: ${repoPath}`);
   if (!input.branches.length) throw new Error("At least one branch name required");
   const status = await detectGhStack(repoPath);
   if (!status.available) throw new Error(status.reason);
@@ -11462,7 +11595,7 @@ async function createPrStack(input, onSetupLine) {
     }
   }
   const claimed = new Set(threads.map((t) => t.worktreePath));
-  if (!claimed.has(bootstrap.worktreePath) && (0, import_node_fs28.existsSync)(bootstrap.worktreePath)) {
+  if (!claimed.has(bootstrap.worktreePath) && (0, import_node_fs29.existsSync)(bootstrap.worktreePath)) {
     try {
       await removeWorktree(repoPath, bootstrap.worktreePath, {
         deleteBranch: bootstrap.branchName
@@ -11477,12 +11610,12 @@ async function createPrStack(input, onSetupLine) {
 init_worktree();
 
 // src/diff/diff.ts
-var import_node_fs29 = require("fs");
-var import_node_path25 = require("path");
+var import_node_fs30 = require("fs");
+var import_node_path26 = require("path");
 init_run();
 init_worktree();
 async function inspectGitWorktree(worktreePath) {
-  if (!worktreePath || !(0, import_node_fs29.existsSync)(worktreePath)) return "missing_worktree";
+  if (!worktreePath || !(0, import_node_fs30.existsSync)(worktreePath)) return "missing_worktree";
   const check = await git(["rev-parse", "--is-inside-work-tree"], worktreePath, {
     reject: false
   });
@@ -11490,7 +11623,7 @@ async function inspectGitWorktree(worktreePath) {
   return "ok";
 }
 async function initializeGitRepository(worktreePath) {
-  if (!worktreePath || !(0, import_node_fs29.existsSync)(worktreePath)) {
+  if (!worktreePath || !(0, import_node_fs30.existsSync)(worktreePath)) {
     throw new Error("Worktree not found");
   }
   const status = await inspectGitWorktree(worktreePath);
@@ -11625,11 +11758,11 @@ new file mode 100644
   };
 }
 async function untrackedPatch(worktreePath, path, maxHunk) {
-  const abs = (0, import_node_path25.join)(worktreePath, path);
+  const abs = (0, import_node_path26.join)(worktreePath, path);
   try {
-    const st = (0, import_node_fs29.statSync)(abs);
+    const st = (0, import_node_fs30.statSync)(abs);
     if (st.isFile() && st.size > maxHunk) {
-      const buf = (0, import_node_fs29.readFileSync)(abs).subarray(0, maxHunk);
+      const buf = (0, import_node_fs30.readFileSync)(abs).subarray(0, maxHunk);
       return syntheticAddPatch(path, buf.toString("utf8"), maxHunk);
     }
   } catch {
@@ -12130,8 +12263,8 @@ var DEFAULT_UPLOAD_MAX_BYTES = 5e7;
 function readWorktreeFileForUpload(worktreePath, relativePath, opts) {
   assertSafeRelativePath(relativePath);
   const maxBytes = opts?.maxBytes ?? DEFAULT_UPLOAD_MAX_BYTES;
-  const abs = (0, import_node_path25.join)(worktreePath, relativePath);
-  const st = (0, import_node_fs29.statSync)(abs);
+  const abs = (0, import_node_path26.join)(worktreePath, relativePath);
+  const st = (0, import_node_fs30.statSync)(abs);
   if (!st.isFile()) {
     throw new Error(`Not a file: ${relativePath}`);
   }
@@ -12140,7 +12273,7 @@ function readWorktreeFileForUpload(worktreePath, relativePath, opts) {
       `File too large to upload (${st.size} bytes; max ${maxBytes})`
     );
   }
-  const buf = (0, import_node_fs29.readFileSync)(abs);
+  const buf = (0, import_node_fs30.readFileSync)(abs);
   return {
     path: relativePath,
     contentBase64: buf.toString("base64"),
@@ -12150,12 +12283,12 @@ function readWorktreeFileForUpload(worktreePath, relativePath, opts) {
 function readWorktreeFile(worktreePath, relativePath, opts) {
   assertSafeRelativePath(relativePath);
   const maxBytes = opts?.maxBytes ?? 2e5;
-  const abs = (0, import_node_path25.join)(worktreePath, relativePath);
-  const st = (0, import_node_fs29.statSync)(abs);
+  const abs = (0, import_node_path26.join)(worktreePath, relativePath);
+  const st = (0, import_node_fs30.statSync)(abs);
   if (!st.isFile()) {
     throw new Error(`Not a file: ${relativePath}`);
   }
-  const buf = (0, import_node_fs29.readFileSync)(abs);
+  const buf = (0, import_node_fs30.readFileSync)(abs);
   if (isImageRelativePath(relativePath)) {
     const maxImageBytes = Math.max(maxBytes, 15e6);
     const truncated2 = buf.length > maxImageBytes;
@@ -12198,9 +12331,9 @@ function assertSafeRelativePath(relativePath) {
 }
 function writeWorktreeFile(worktreePath, relativePath, content) {
   assertSafeRelativePath(relativePath);
-  const abs = (0, import_node_path25.join)(worktreePath, relativePath);
-  (0, import_node_fs29.mkdirSync)((0, import_node_path25.dirname)(abs), { recursive: true });
-  (0, import_node_fs29.writeFileSync)(abs, content, "utf8");
+  const abs = (0, import_node_path26.join)(worktreePath, relativePath);
+  (0, import_node_fs30.mkdirSync)((0, import_node_path26.dirname)(abs), { recursive: true });
+  (0, import_node_fs30.writeFileSync)(abs, content, "utf8");
   return { path: relativePath };
 }
 async function getDiffSummary(worktreePath, repoPath, opts) {
@@ -12304,9 +12437,9 @@ async function confirmLand(thread, opts) {
 }
 
 // src/skills/discover.ts
-var import_node_fs30 = require("fs");
+var import_node_fs31 = require("fs");
 var import_node_os9 = require("os");
-var import_node_path26 = require("path");
+var import_node_path27 = require("path");
 function toCommand(name) {
   return name.normalize("NFKD").replace(/[\u0300-\u036f]/g, "").toLowerCase().trim().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
 }
@@ -12338,7 +12471,7 @@ function parseFrontmatter(content) {
 }
 function readSkill(skillMd, source) {
   try {
-    const content = (0, import_node_fs30.readFileSync)(skillMd, "utf8");
+    const content = (0, import_node_fs31.readFileSync)(skillMd, "utf8");
     const { name: fmName, description } = parseFrontmatter(content);
     const dirName = skillMd.split("/").slice(-2, -1)[0] || "skill";
     const name = fmName || dirName;
@@ -12357,19 +12490,19 @@ function readSkill(skillMd, source) {
   }
 }
 function scanSkillsDir(dir, source, out) {
-  if (!(0, import_node_fs30.existsSync)(dir)) return;
+  if (!(0, import_node_fs31.existsSync)(dir)) return;
   let entries;
   try {
-    entries = (0, import_node_fs30.readdirSync)(dir);
+    entries = (0, import_node_fs31.readdirSync)(dir);
   } catch {
     return;
   }
   for (const entry of entries) {
     if (entry.startsWith(".")) continue;
-    const skillMd = (0, import_node_path26.join)(dir, entry, "SKILL.md");
-    if (!(0, import_node_fs30.existsSync)(skillMd)) continue;
+    const skillMd = (0, import_node_path27.join)(dir, entry, "SKILL.md");
+    if (!(0, import_node_fs31.existsSync)(skillMd)) continue;
     try {
-      if (!(0, import_node_fs30.statSync)(skillMd).isFile()) continue;
+      if (!(0, import_node_fs31.statSync)(skillMd).isFile()) continue;
     } catch {
       continue;
     }
@@ -12378,24 +12511,24 @@ function scanSkillsDir(dir, source, out) {
   }
 }
 function scanClaudePluginSkills(pluginsRoot, out) {
-  if (!(0, import_node_fs30.existsSync)(pluginsRoot)) return;
+  if (!(0, import_node_fs31.existsSync)(pluginsRoot)) return;
   const walk = (dir, depth, lookingForSkillsDir) => {
     if (depth > 7) return;
     let entries;
     try {
-      entries = (0, import_node_fs30.readdirSync)(dir);
+      entries = (0, import_node_fs31.readdirSync)(dir);
     } catch {
       return;
     }
     if (lookingForSkillsDir && entries.includes("SKILL.md")) {
-      const skill = readSkill((0, import_node_path26.join)(dir, "SKILL.md"), "cli");
+      const skill = readSkill((0, import_node_path27.join)(dir, "SKILL.md"), "cli");
       if (skill) out.push(skill);
     }
     for (const entry of entries) {
       if (entry === "node_modules" || entry === ".git") continue;
-      const full = (0, import_node_path26.join)(dir, entry);
+      const full = (0, import_node_path27.join)(dir, entry);
       try {
-        if (!(0, import_node_fs30.statSync)(full).isDirectory()) continue;
+        if (!(0, import_node_fs31.statSync)(full).isDirectory()) continue;
       } catch {
         continue;
       }
@@ -12413,17 +12546,17 @@ function discoverSkills(worktreePath) {
   const home = (0, import_node_os9.homedir)();
   const collected = [];
   for (const rel of [".claude/skills", ".cursor/skills", ".sideboard/skills", ".brightsy/skills", "skills"]) {
-    scanSkillsDir((0, import_node_path26.join)(worktreePath, rel), "workspace", collected);
+    scanSkillsDir((0, import_node_path27.join)(worktreePath, rel), "workspace", collected);
   }
   for (const abs of [
-    (0, import_node_path26.join)(home, ".claude/skills"),
-    (0, import_node_path26.join)(home, ".cursor/skills"),
-    (0, import_node_path26.join)(home, ".sideboard/skills"),
-    (0, import_node_path26.join)(home, ".brightsy/skills")
+    (0, import_node_path27.join)(home, ".claude/skills"),
+    (0, import_node_path27.join)(home, ".cursor/skills"),
+    (0, import_node_path27.join)(home, ".sideboard/skills"),
+    (0, import_node_path27.join)(home, ".brightsy/skills")
   ]) {
     scanSkillsDir(abs, "user", collected);
   }
-  scanClaudePluginSkills((0, import_node_path26.join)(home, ".claude/plugins"), collected);
+  scanClaudePluginSkills((0, import_node_path27.join)(home, ".claude/plugins"), collected);
   const rank = { workspace: 0, user: 1, cli: 2 };
   const byCommand = /* @__PURE__ */ new Map();
   for (const skill of collected) {
@@ -12435,7 +12568,7 @@ function discoverSkills(worktreePath) {
   return [...byCommand.values()].sort((a, b) => a.command.localeCompare(b.command));
 }
 function readSkillBody(skillPath, maxChars = 12e3) {
-  const raw = (0, import_node_fs30.readFileSync)(skillPath, "utf8");
+  const raw = (0, import_node_fs31.readFileSync)(skillPath, "utf8");
   if (raw.startsWith("---")) {
     const end = raw.indexOf("\n---", 3);
     if (end >= 0) {
@@ -12528,8 +12661,8 @@ function expandComposerPrompt(worktreePath, prompt, opts) {
 }
 
 // src/composer/stage-files.ts
-var import_node_fs31 = require("fs");
-var import_node_path27 = require("path");
+var import_node_fs32 = require("fs");
+var import_node_path28 = require("path");
 var import_node_crypto7 = require("crypto");
 init_workspace_scratch();
 var IMAGE_EXTENSIONS2 = /* @__PURE__ */ new Set([
@@ -12555,7 +12688,7 @@ var IMAGE_MIME_BY_EXT = {
 var MAX_INLINE_BYTES = 4e5;
 var MAX_PREVIEW_BYTES = 5e6;
 function fileExtension(filePath) {
-  const base = (0, import_node_path27.basename)(filePath).toLowerCase();
+  const base = (0, import_node_path28.basename)(filePath).toLowerCase();
   return base.includes(".") ? base.split(".").pop() || "" : "";
 }
 function isImageFilePath(filePath) {
@@ -12565,22 +12698,22 @@ function imageMimeType(filePath) {
   return IMAGE_MIME_BY_EXT[fileExtension(filePath)] || "image/png";
 }
 function ensureAttachmentsDir(worktreePath) {
-  const dir = (0, import_node_path27.join)(worktreePath, ATTACHMENTS_DIR);
-  (0, import_node_fs31.mkdirSync)(dir, { recursive: true });
-  const gi = (0, import_node_path27.join)(dir, ".gitignore");
-  if (!(0, import_node_fs31.existsSync)(gi)) {
-    (0, import_node_fs31.writeFileSync)(gi, attachmentsGitignoreBody(), "utf8");
+  const dir = (0, import_node_path28.join)(worktreePath, ATTACHMENTS_DIR);
+  (0, import_node_fs32.mkdirSync)(dir, { recursive: true });
+  const gi = (0, import_node_path28.join)(dir, ".gitignore");
+  if (!(0, import_node_fs32.existsSync)(gi)) {
+    (0, import_node_fs32.writeFileSync)(gi, attachmentsGitignoreBody(), "utf8");
   }
   return dir;
 }
 function uniqueAttachmentName(dir, originalName) {
   const safe = originalName.replace(/[/\\]/g, "_") || "file";
-  if (!(0, import_node_fs31.existsSync)((0, import_node_path27.join)(dir, safe))) return safe;
-  const ext = (0, import_node_path27.extname)(safe);
+  if (!(0, import_node_fs32.existsSync)((0, import_node_path28.join)(dir, safe))) return safe;
+  const ext = (0, import_node_path28.extname)(safe);
   const stem = ext ? safe.slice(0, -ext.length) : safe;
   for (let i = 1; i < 1e4; i++) {
     const candidate = `${stem}-${i}${ext}`;
-    if (!(0, import_node_fs31.existsSync)((0, import_node_path27.join)(dir, candidate))) return candidate;
+    if (!(0, import_node_fs32.existsSync)((0, import_node_path28.join)(dir, candidate))) return candidate;
   }
   return `${stem}-${(0, import_node_crypto7.randomUUID)()}${ext}`;
 }
@@ -12636,15 +12769,15 @@ function stageAbsolutePathsAsAttachments(worktreePath, absolutePaths) {
   const dir = ensureAttachmentsDir(worktreePath);
   const out = [];
   for (const abs of absolutePaths) {
-    const originalName = (0, import_node_path27.basename)(abs);
+    const originalName = (0, import_node_path28.basename)(abs);
     try {
-      const st = (0, import_node_fs31.statSync)(abs);
+      const st = (0, import_node_fs32.statSync)(abs);
       if (!st.isFile()) continue;
       const name = uniqueAttachmentName(dir, originalName);
-      const destAbs = (0, import_node_path27.join)(dir, name);
-      (0, import_node_fs31.copyFileSync)(abs, destAbs);
+      const destAbs = (0, import_node_path28.join)(dir, name);
+      (0, import_node_fs32.copyFileSync)(abs, destAbs);
       const rel = `${ATTACHMENTS_DIR}/${name}`;
-      const buf = (0, import_node_fs31.readFileSync)(destAbs);
+      const buf = (0, import_node_fs32.readFileSync)(destAbs);
       out.push(attachmentFromBuffer(name, buf, { path: rel, sourceLabel: abs }));
     } catch (err) {
       out.push({
@@ -12666,8 +12799,8 @@ function stageBuffersAsAttachments(worktreePath, buffers) {
     try {
       const buf = Buffer.from(item.dataBase64, "base64");
       const name = uniqueAttachmentName(dir, originalName);
-      const destAbs = (0, import_node_path27.join)(dir, name);
-      (0, import_node_fs31.writeFileSync)(destAbs, buf);
+      const destAbs = (0, import_node_path28.join)(dir, name);
+      (0, import_node_fs32.writeFileSync)(destAbs, buf);
       const rel = `${ATTACHMENTS_DIR}/${name}`;
       out.push(attachmentFromBuffer(name, buf, { path: rel }));
     } catch (err) {
@@ -12687,18 +12820,18 @@ function attachmentsFromWorktreePaths(worktreePath, relativePaths) {
     if (!rel || rel.includes("..") || rel.startsWith("/")) {
       out.push({
         id: (0, import_node_crypto7.randomUUID)(),
-        name: (0, import_node_path27.basename)(rel) || "file",
+        name: (0, import_node_path28.basename)(rel) || "file",
         kind: "file",
         content: `(invalid path: ${rel})`
       });
       continue;
     }
-    const name = (0, import_node_path27.basename)(rel);
+    const name = (0, import_node_path28.basename)(rel);
     try {
-      const abs = (0, import_node_path27.join)(worktreePath, rel);
-      const st = (0, import_node_fs31.statSync)(abs);
+      const abs = (0, import_node_path28.join)(worktreePath, rel);
+      const st = (0, import_node_fs32.statSync)(abs);
       if (!st.isFile()) continue;
-      const buf = (0, import_node_fs31.readFileSync)(abs);
+      const buf = (0, import_node_fs32.readFileSync)(abs);
       out.push(attachmentFromBuffer(name, buf, { path: rel, sourceLabel: abs }));
     } catch (err) {
       out.push({
@@ -12713,11 +12846,11 @@ function attachmentsFromWorktreePaths(worktreePath, relativePaths) {
 }
 
 // src/agents/instructions.ts
-var import_node_fs32 = require("fs");
-var import_node_path28 = require("path");
+var import_node_fs33 = require("fs");
+var import_node_path29 = require("path");
 init_git_auth_mode();
 init_worktree_labels();
-function normPath2(p) {
+function normPath3(p) {
   return p.replace(/\/+$/, "");
 }
 function formatRenameBranchDirective(thread, opts) {
@@ -12738,8 +12871,8 @@ function formatRenameBranchDirective(thread, opts) {
   return lines.join("\n");
 }
 function formatWorktreeDirective(thread, opts) {
-  const worktree = normPath2(thread.worktreePath);
-  const repo = normPath2(thread.repoPath);
+  const worktree = normPath3(thread.worktreePath);
+  const repo = normPath3(thread.repoPath);
   const dir = worktreeNameFromPath(thread.worktreePath);
   const lines = [
     "Sideboard workspace (mandatory):",
@@ -12988,7 +13121,7 @@ var Orchestrator = class {
         }
         continue;
       }
-      if (!(0, import_node_fs36.existsSync)(thread.worktreePath)) {
+      if (!(0, import_node_fs37.existsSync)(thread.worktreePath)) {
         setStatus(thread.id, "broken", "Worktree missing on disk");
         this.emit({ type: "status_changed", threadId: thread.id, status: "broken" });
         continue;
@@ -13163,14 +13296,7 @@ var Orchestrator = class {
     return thread;
   }
   async finishCreateThread(threadId, prompt) {
-    await this.runSetupAfterCreate(threadId);
-    const { autoRunAfterSetupEnabled: autoRunAfterSetupEnabled2 } = await Promise.resolve().then(() => (init_app_settings(), app_settings_exports));
-    if (autoRunAfterSetupEnabled2()) {
-      try {
-        await this.startDev(threadId);
-      } catch {
-      }
-    }
+    const setup = this.runSetupAfterCreate(threadId);
     if (prompt) {
       try {
         await this.send(threadId, prompt);
@@ -13181,6 +13307,14 @@ var Orchestrator = class {
         });
       }
     }
+    await setup;
+    const { autoRunAfterSetupEnabled: autoRunAfterSetupEnabled2 } = await Promise.resolve().then(() => (init_app_settings(), app_settings_exports));
+    if (autoRunAfterSetupEnabled2()) {
+      try {
+        await this.startDev(threadId);
+      } catch {
+      }
+    }
   }
   /** Run workspace setup after a new worktree is created (no-op if none configured). */
   async runSetupAfterCreate(threadId) {
@@ -13878,7 +14012,7 @@ var Orchestrator = class {
     });
     this.emit({ type: "setup_started", threadId: thread.id });
     try {
-      let setup = await runSetupScript(
+      const setup = await runWorkspaceSetup(
         thread.repoPath,
         thread.worktreePath,
         (line) => {
@@ -13886,18 +14020,9 @@ var Orchestrator = class {
         },
         { signal: abort.signal }
       );
-      if (!setup.ran) {
-        setup = await runCursorWorktreeSetup(
-          thread.repoPath,
-          thread.worktreePath,
-          (line) => {
-            this.emit({ type: "setup_output", threadId: thread.id, line });
-          }
-        );
-      }
       if (!setup.ran) {
         throw new Error(
-          "No setup script in .sideboard/settings.toml, .conductor/settings.toml, or .cursor/worktrees.json"
+          "No setup script in .sideboard/settings.toml, .conductor/settings.toml, .cursor/worktrees.json, or script/setup (bin/setup, scripts/setup)"
         );
       }
       if (setup.exitCode !== 0 && setup.exitCode !== null) {
@@ -14205,7 +14330,7 @@ var Orchestrator = class {
       this.emit({ type: "status_changed", threadId: t.id, status: t.status });
     }
     for (const id of result.createdThreadIds) {
-      await this.runSetupAfterCreate(id);
+      void this.runSetupAfterCreate(id);
     }
     return { stack: result.stack, threads: result.threads };
   }
@@ -14222,7 +14347,7 @@ var Orchestrator = class {
       status: result.thread.status
     });
     if (result.createdWorktree) {
-      await this.runSetupAfterCreate(result.thread.id);
+      void this.runSetupAfterCreate(result.thread.id);
     }
     return { stack: result.stack, thread: result.thread };
   }
@@ -14237,7 +14362,7 @@ var Orchestrator = class {
       this.emit({ type: "status_changed", threadId: t.id, status: t.status });
     }
     for (const id of result.createdThreadIds) {
-      await this.runSetupAfterCreate(id);
+      void this.runSetupAfterCreate(id);
     }
     return { stack: result.stack, threads: result.threads };
   }
@@ -14248,7 +14373,7 @@ var Orchestrator = class {
       this.emit({ type: "status_changed", threadId: t.id, status: t.status });
     }
     for (const id of result.createdThreadIds) {
-      await this.runSetupAfterCreate(id);
+      void this.runSetupAfterCreate(id);
     }
     return { stack: result.stack, threads: result.threads };
   }
@@ -14379,7 +14504,7 @@ var Orchestrator = class {
   async forkThreadWorktree(input) {
     const thread = await forkThreadWorktree(input);
     this.emit({ type: "status_changed", threadId: thread.id, status: thread.status });
-    await this.runSetupAfterCreate(thread.id);
+    void this.runSetupAfterCreate(thread.id);
     return thread;
   }
   renameThread(threadRef, title) {
@@ -14482,7 +14607,7 @@ var Orchestrator = class {
       this.emit({ type: "status_changed", threadId: restored2.id, status: restored2.status });
       return restored2;
     }
-    if (!(0, import_node_fs36.existsSync)(thread.worktreePath)) {
+    if (!(0, import_node_fs37.existsSync)(thread.worktreePath)) {
       const { createThreadWorktree: createThreadWorktree2 } = await Promise.resolve().then(() => (init_worktree(), worktree_exports));
       const { execa: execa7 } = await import("execa");
       const slug = thread.worktreePath.split("/").pop();
@@ -15713,7 +15838,7 @@ async function startMcpServer() {
     async () => {
       const threads = orch.getThreads(true);
       const lines = threads.map((t) => {
-        const repo = t.repoPath === GLOBAL_WORKSPACE_ID ? "Orchestration" : (0, import_node_path32.basename)(t.repoPath) || t.repoPath;
+        const repo = t.repoPath === GLOBAL_WORKSPACE_ID ? "Orchestration" : (0, import_node_path33.basename)(t.repoPath) || t.repoPath;
         return `${t.id.slice(0, 8)}  ${t.status.padEnd(9)}  ${t.agent.padEnd(8)}  ${repo}  ${t.sourceType}:${t.sourceRef}  ${t.title}  sideboard://thread/${t.id}${t.devPort ? `  http://localhost:${t.devPort}` : ""}`;
       });
       return {
@@ -15924,7 +16049,7 @@ async function startMcpServer() {
     );
     server.tool(
       "create_thread",
-      `Create a new worktree thread (chat) from branch, pr, or ticket. Pass repoPath from list_workspaces. From an orchestration chat, omit parentThreadId (Sideboard binds the child to this chat) or pass the exact id from the turn reminder \u2014 never invent a uuid. Prefer omitting agent/model so Sideboard applies ${accountDefaultsHint}. Then use send_to_thread to chat.`,
+      `Create a new worktree thread (chat) from branch, pr, or ticket. Pass repoPath from list_workspaces. From an orchestration chat, omit parentThreadId (Sideboard binds the child to this chat) or pass the exact id from the turn reminder \u2014 never invent a uuid. Prefer omitting agent/model so Sideboard applies ${accountDefaultsHint}. Setup (settings.toml, .cursor/worktrees.json, or script/setup) runs in the background in parallel with the first turn. Then use send_to_thread to chat.`,
       {
         sourceType: import_zod3.z.enum(["branch", "pr", "ticket"]),
         sourceRef: import_zod3.z.string(),
@@ -16442,7 +16567,7 @@ async function startMcpServer() {
     );
     server.tool(
       "run_setup",
-      "Re-run workspace setup (Sideboard/Conductor settings or .cursor/worktrees.json)",
+      "Re-run workspace setup (Sideboard/Conductor settings, .cursor/worktrees.json, or script/setup). New worktrees already run this automatically.",
       { ref: import_zod3.z.string() },
       async ({ ref }) => {
         const result = await orch.runSetup(ref);