@sideboard-ai/core 0.1.67 → 0.1.71

package/dist/mcp/run-stdio.js

@@ -16,14 +16,14 @@ import {
   resolveQuotaFallbackAgent,
   sideboardMcpProfile,
   summarizeTurnStderr
-} from "../chunk-K7LM4CLD.js";
-import "../chunk-M5V4QIWF.js";
+} from "../chunk-NG7S3OPX.js";
+import "../chunk-VROPG6QF.js";
 import {
   addWorkspace,
   ensureWorkspace,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "../chunk-5HTTCYWA.js";
+} from "../chunk-UH57WVFP.js";
 import {
   extractPresentedPlan,
   readPlanFile,
@@ -38,13 +38,14 @@ import {
   isGlobalThread,
   isOrchestratorThread,
   orchestratorSessionPoisonedByBuiltins
-} from "../chunk-JWZNK3CQ.js";
+} from "../chunk-DGPUAZA4.js";
 import {
+  SLACK_REPLY_FORMATTING,
   coordinatorSystemPrompt,
   coordinatorTurnReminder,
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd
-} from "../chunk-57WWNMFP.js";
+} from "../chunk-7NCIHRAU.js";
 import {
   addPrStackLayer,
   allocateTeamName,
@@ -81,7 +82,7 @@ import {
   takenSlugsFromThread,
   threadDisplayLabel,
   worktreeNameFromPath
-} from "../chunk-LW5CMQGZ.js";
+} from "../chunk-OE7YBB5X.js";
 import {
   ATTACHMENTS_DIR,
   LEGACY_ATTACHMENTS_DIR,
@@ -105,20 +106,29 @@ import {
   gh,
   git,
   run
-} from "../chunk-FGDJOJ2L.js";
+} from "../chunk-AE5VBOFE.js";
 import {
   childEnvWithAppSettings,
-  getLinearApiKey,
+  disconnectLinearConnection,
   isLinearConnected,
+  isSecureFileEncrypted,
   loadAppSettings,
   orchestrationQuotaFallbackAgent,
   orchestrationQuotaOnLimit,
+  readSecureJson,
   resolveEffectiveIssueSource,
   resolveNewThreadOptions,
-  updateAdvancedSettings
-} from "../chunk-BPOTVI5J.js";
+  resolveVaultKey,
+  saveLinearOAuth,
+  updateAdvancedSettings,
+  writeSecureJson
+} from "../chunk-PTJJIQK7.js";
+import {
+  writePrivateFile
+} from "../chunk-NSTQ6QKD.js";
 import "../chunk-KGZBYWZ3.js";
 import {
+  appDataDir,
   loadRepoSettings,
   loadWorkspaceSettings,
   sideboardReposDir,
@@ -130,7 +140,7 @@ import {
 // src/mcp/server.ts
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { z } from "zod";
+import { z as z2 } from "zod";
 import { basename as basename4 } from "path";
 
 // src/orchestrator/orchestrator.ts
@@ -215,9 +225,9 @@ function toolFilePath(input) {
   if (!input) return void 0;
   return str(input.file_path) ?? str(input.path) ?? str(input.filePath) ?? str(input.filename);
 }
-function countLines(text) {
-  if (!text) return 0;
-  return text.split("\n").length;
+function countLines(text2) {
+  if (!text2) return 0;
+  return text2.split("\n").length;
 }
 function diffFromInput(input) {
   if (!input) return {};
@@ -344,9 +354,9 @@ function applyAgentEvent(parts, event) {
 function partsToAssistantText(parts) {
   return parts.filter((p) => p.type === "text").map((p) => p.text).join("").trim();
 }
-function stripBrightsyNdjsonNoise(text) {
-  if (!text || !text.includes('"type"')) return text;
-  let out = text;
+function stripBrightsyNdjsonNoise(text2) {
+  if (!text2 || !text2.includes('"type"')) return text2;
+  let out = text2;
   out = out.replace(
     /\{"type":"(?:tool_use|tool_result|tool|thinking|usage|done|error)"[\s\S]*?\}\s*(?=\{"type":"|$|(?=[A-Za-z*#]))/g,
     ""
@@ -391,9 +401,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("../global-workspace-YZ2NJVLL.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("../global-workspace-KHIFQUUM.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("../coordinator-prompt-6HMTOX4G.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("../coordinator-prompt-2J4PIMUF.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -480,8 +490,8 @@ async function spawnAgentTurn(thread, input, onEvent) {
     onEvent({ type: "exit", data: exitCode });
     const finalized = finalizeParts(parts);
     const rawText = assistantText.trim() || partsToAssistantText(finalized);
-    const text = thread.agent === "brightsy" ? stripBrightsyNdjsonNoise(rawText) : rawText;
-    return { exitCode, sessionId, assistantText: text, parts: finalized, usage };
+    const text2 = thread.agent === "brightsy" ? stripBrightsyNdjsonNoise(rawText) : rawText;
+    return { exitCode, sessionId, assistantText: text2, parts: finalized, usage };
   });
   return {
     pid: child.pid,
@@ -1209,7 +1219,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("../agents-OTBZVTZO.js");
+  const { getAdapter: getAdapter2 } = await import("../agents-GB7XL2LI.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -1265,9 +1275,9 @@ async function tryClaudeSummary(transcript, opts) {
       { cwd: opts?.cwd, reject: false }
     );
     if (exitCode !== 0) return null;
-    const text = stdout.trim();
-    if (text.length < 40) return null;
-    return text;
+    const text2 = stdout.trim();
+    if (text2.length < 40) return null;
+    return text2;
   } catch {
     return null;
   }
@@ -1316,9 +1326,9 @@ function extractiveSummary(transcript) {
   );
   return parts.join("\n");
 }
-function clipSummary(text) {
-  if (text.length <= MAX_SUMMARY_CHARS) return text;
-  return `${text.slice(0, MAX_SUMMARY_CHARS)}
+function clipSummary(text2) {
+  if (text2.length <= MAX_SUMMARY_CHARS) return text2;
+  return `${text2.slice(0, MAX_SUMMARY_CHARS)}
 
 [\u2026summary truncated\u2026]`;
 }
@@ -1931,8 +1941,8 @@ function buildQuotaHandoffAttachment(from, limitText, fallbackAgent) {
   );
   const recent = from.messages.slice(-8).map((m) => {
     const role = m.role === "user" ? "User" : m.role === "agent" ? "Agent" : "Summary";
-    const text = m.text.trim().replace(/\s+/g, " ").slice(0, 280);
-    return text ? `- ${role}: ${text}` : null;
+    const text2 = m.text.trim().replace(/\s+/g, " ").slice(0, 280);
+    return text2 ? `- ${role}: ${text2}` : null;
   }).filter(Boolean);
   const body = [
     `# Orchestration handoff`,
@@ -2028,13 +2038,13 @@ function resolveConductorCursorAgentId(workspacePath) {
   for (const hash of hashes) {
     const agentsFile = join6(CURSOR_SDK_STORE, hash, "agents.ndjson");
     if (!existsSync7(agentsFile)) continue;
-    let text;
+    let text2;
     try {
-      text = readFileSync4(agentsFile, "utf8");
+      text2 = readFileSync4(agentsFile, "utf8");
     } catch {
       continue;
     }
-    for (const line of text.split("\n")) {
+    for (const line of text2.split("\n")) {
       const trimmed = line.trim();
       if (!trimmed) continue;
       try {
@@ -2058,7 +2068,7 @@ async function adoptThread(input) {
     throw new Error(`Worktree not found: ${input.worktreePath}`);
   }
   const repoPath = await resolveRepoRoot(input.worktreePath);
-  const { stdout: branch } = await import("../run-Y2MI3EVV.js").then(
+  const { stdout: branch } = await import("../run-A4RHY7HH.js").then(
     ({ git: git2 }) => git2(["rev-parse", "--abbrev-ref", "HEAD"], input.worktreePath)
   );
   const thread = createEmptyThread({
@@ -2073,7 +2083,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-AIUYUXB7.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-SVQIEVIZ.js");
   await ensureWorkspace2(repoPath);
   return thread;
 }
@@ -2630,24 +2640,25 @@ function capPatch(patch, maxHunk) {
 
 \u2026 truncated (${patch.length - maxHunk} more chars)`;
 }
+var mergeBaseCache = /* @__PURE__ */ new Map();
+var MERGE_BASE_TTL_MS = 45e3;
 async function resolveMergeBase(worktreePath, base, repoPath) {
   const baseRef = await resolveDiffBaseRef(worktreePath, base, repoPath);
+  const cacheKey = `${worktreePath}\0${baseRef}`;
+  const hit = mergeBaseCache.get(cacheKey);
+  if (hit && Date.now() - hit.at < MERGE_BASE_TTL_MS) return hit.value;
   const { stdout } = await git(["merge-base", baseRef, "HEAD"], worktreePath, {
     reject: false
   });
-  const mb = stdout.trim();
-  return mb || baseRef;
+  const mb = stdout.trim() || baseRef;
+  mergeBaseCache.set(cacheKey, { at: Date.now(), value: mb });
+  return mb;
 }
 async function countUnpushedCommits(worktreePath) {
   const head = await git(["rev-parse", "--abbrev-ref", "HEAD"], worktreePath, {
     reject: false
   });
   const branch = head.stdout.trim();
-  if (branch && branch !== "HEAD") {
-    await git(["fetch", "origin", branch, "--quiet"], worktreePath, {
-      reject: false
-    });
-  }
   const upstream = await git(
     ["rev-list", "--count", "@{upstream}..HEAD"],
     worktreePath,
@@ -2680,11 +2691,37 @@ function splitCombinedDiff(stdout) {
   }
   return map;
 }
+function syntheticAddPatch(path, content, maxHunk) {
+  const lines = content.split("\n");
+  const body = lines.map((l) => `+${l}`).join("\n");
+  const header = `diff --git a/${path} b/${path}
+new file mode 100644
+--- /dev/null
++++ b/${path}
+@@ -0,0 +1,${lines.length} @@
+`;
+  return {
+    path,
+    status: "A",
+    patch: capPatch(`${header}${body}`, maxHunk),
+    additions: lines.length,
+    deletions: 0
+  };
+}
 async function untrackedPatch(worktreePath, path, maxHunk) {
+  const abs = join7(worktreePath, path);
+  try {
+    const st = statSync2(abs);
+    if (st.isFile() && st.size > maxHunk) {
+      const buf = readFileSync5(abs).subarray(0, maxHunk);
+      return syntheticAddPatch(path, buf.toString("utf8"), maxHunk);
+    }
+  } catch {
+  }
   const { stdout: patch } = await git(
-    ["diff", "--no-index", "--", "/dev/null", path],
+    ["diff", "--no-ext-diff", "--no-color", "--no-index", "--", "/dev/null", path],
     worktreePath,
-    { reject: false }
+    { reject: false, timeoutMs: 4e3 }
   );
   const normalized = patch.replace(/^diff --git a\/.+? b\/.+?$/m, `diff --git a/${path} b/${path}`).replace(/^--- .*$/m, "--- /dev/null").replace(/^\+\+\+ .*$/m, `+++ b/${path}`);
   const addLines = normalized.split("\n").filter((l) => l.startsWith("+") && !l.startsWith("+++")).length;
@@ -2696,22 +2733,97 @@ async function untrackedPatch(worktreePath, path, maxHunk) {
     deletions: 0
   };
 }
-async function listUntrackedPaths(worktreePath) {
-  const { stdout } = await git(
-    ["ls-files", "-z", "--others", "--exclude-standard"],
-    worktreePath,
-    { reject: false }
-  );
+async function listUntrackedPaths(worktreePath, path) {
+  const args = ["ls-files", "-z", "--others", "--exclude-standard"];
+  if (path) args.push("--", path);
+  const { stdout } = await git(args, worktreePath, { reject: false });
   return stdout.split("\0").filter(Boolean).filter((p) => !isSideboardScratchPath(p));
 }
-async function listUntrackedFiles(worktreePath, maxHunk) {
-  const paths = await listUntrackedPaths(worktreePath);
-  if (paths.length === 0) return [];
-  return Promise.all(paths.map((path) => untrackedPatch(worktreePath, path, maxHunk)));
+async function listUntrackedFiles(worktreePath, maxHunk, paths) {
+  const list = paths ?? await listUntrackedPaths(worktreePath);
+  if (list.length === 0) return [];
+  return Promise.all(list.map((path) => untrackedPatch(worktreePath, path, maxHunk)));
+}
+function untrackedStubs(paths) {
+  return paths.map((path) => ({
+    path,
+    status: "A",
+    patch: "",
+    additions: 0,
+    deletions: 0
+  }));
+}
+function pathspec(path) {
+  return path ? ["--", path] : [];
+}
+function gitDiff(args, cwd, opts) {
+  return git(["diff", "--no-ext-diff", "--no-color", ...args], cwd, {
+    reject: false,
+    timeoutMs: opts?.timeoutMs
+  });
+}
+function fileFromPatch(path, patch, maxHunk) {
+  let status = "M";
+  if (/^new file mode /m.test(patch) || /^--- \/dev\/null/m.test(patch)) {
+    status = "A";
+  } else if (/^deleted file mode /m.test(patch) || /^\+\+\+ \/dev\/null/m.test(patch)) {
+    status = "D";
+  } else if (/^rename from /m.test(patch)) {
+    status = "R";
+  }
+  const additions = patch.split("\n").filter((l) => l.startsWith("+") && !l.startsWith("+++")).length;
+  const deletions = patch.split("\n").filter((l) => l.startsWith("-") && !l.startsWith("---")).length;
+  return {
+    path,
+    status,
+    patch: capPatch(patch, maxHunk),
+    additions,
+    deletions
+  };
+}
+async function gitDiffParts(worktreePath, diffArgs, includePatches, path) {
+  const extra = pathspec(path);
+  if (includePatches) {
+    const diff = await gitDiff([...diffArgs, ...extra], worktreePath, {
+      timeoutMs: 4e3
+    });
+    return { nameStatus: "", numstat: "", combinedDiff: diff.stdout };
+  }
+  const [ns, num] = await Promise.all([
+    gitDiff(["--name-status", ...diffArgs, ...extra], worktreePath),
+    gitDiff(["--numstat", ...diffArgs, ...extra], worktreePath)
+  ]);
+  return {
+    nameStatus: ns.stdout,
+    numstat: num.stdout,
+    combinedDiff: ""
+  };
+}
+function formatStat(files) {
+  if (files.length === 0) return "(no changes)";
+  const additions = files.reduce((n2, f) => n2 + (f.additions ?? 0), 0);
+  const deletions = files.reduce((n2, f) => n2 + (f.deletions ?? 0), 0);
+  const n = files.length;
+  return `${n} file${n === 1 ? "" : "s"} changed, ${additions} insertions(+), ${deletions} deletions(-)`;
+}
+function emptyScopeStats() {
+  const z3 = emptyStat();
+  return {
+    commits: z3,
+    uncommitted: z3,
+    staged: z3,
+    unstaged: z3,
+    last_turn: z3
+  };
 }
 function filesFromDiff(nameStatus, numstat, combinedDiff, maxHunk) {
-  const counts = parseNumstat(numstat);
   const patches = splitCombinedDiff(combinedDiff);
+  if (!nameStatus.trim() && patches.size > 0) {
+    return [...patches.entries()].map(
+      ([path, patch]) => fileFromPatch(path, patch, maxHunk)
+    );
+  }
+  const counts = parseNumstat(numstat);
   const files = [];
   for (const { status, path } of parseNameStatus(nameStatus)) {
     const n = counts.get(path);
@@ -2733,11 +2845,11 @@ async function computeScopeStats(worktreePath, mergeBase, lastTurnBase, untracke
     { stdout: unstagedNum },
     lastTurnNum
   ] = await Promise.all([
-    mergeBase ? git(["diff", "--numstat", mergeBase], worktreePath, { reject: false }) : Promise.resolve({ stdout: "" }),
-    git(["diff", "--numstat", "HEAD"], worktreePath, { reject: false }),
-    git(["diff", "--numstat", "--cached"], worktreePath, { reject: false }),
-    git(["diff", "--numstat"], worktreePath, { reject: false }),
-    lastTurnBase ? git(["diff", "--numstat", lastTurnBase], worktreePath, { reject: false }) : Promise.resolve({ stdout: "" })
+    mergeBase ? gitDiff(["--numstat", mergeBase], worktreePath) : Promise.resolve({ stdout: "" }),
+    gitDiff(["--numstat", "HEAD"], worktreePath),
+    gitDiff(["--numstat", "--cached"], worktreePath),
+    gitDiff(["--numstat"], worktreePath),
+    lastTurnBase ? gitDiff(["--numstat", lastTurnBase], worktreePath) : Promise.resolve({ stdout: "" })
   ]);
   return {
     commits: mergeBase ? statFromNumstat(commitsNum, untrackedCount) : emptyStat(),
@@ -2756,7 +2868,7 @@ async function listBranchCommits(worktreePath, repoPath, opts) {
   if (head.exitCode !== 0) return [];
   let base = opts?.base;
   try {
-    base = base ?? await resolveDefaultBranch(repoPath);
+    base = base ?? await resolveDefaultBranch(repoPath, { network: false });
   } catch {
     base = "HEAD";
   }
@@ -2786,7 +2898,121 @@ async function listBranchCommits(worktreePath, repoPath, opts) {
   }
   return commits;
 }
+var SHA_RE = /^[0-9a-f]{7,40}$/i;
+function emptyPathDiff(scope, base, hasLastTurnBase, commitSha = null) {
+  return {
+    scope,
+    commitSha: scope === "commits" ? commitSha : null,
+    base,
+    files: [],
+    stat: formatStat([]),
+    dirty: false,
+    unpushed: 0,
+    hasLastTurnBase,
+    commits: [],
+    scopeStats: emptyScopeStats()
+  };
+}
+async function getPathDiff(worktreePath, repoPath, opts) {
+  const { path, scope, commitSha, lastTurnBase, hasLastTurnBase, includePatches, maxHunk } = opts;
+  if (scope === "last_turn" && !lastTurnBase) {
+    return emptyPathDiff(scope, "last turn", false);
+  }
+  let diffArgs;
+  let labelBase;
+  if (scope === "staged") {
+    diffArgs = ["--cached"];
+    labelBase = "staged";
+  } else if (scope === "unstaged") {
+    diffArgs = [];
+    labelBase = "unstaged";
+  } else if (scope === "uncommitted") {
+    diffArgs = ["HEAD"];
+    labelBase = "HEAD";
+  } else if (scope === "last_turn") {
+    diffArgs = [lastTurnBase];
+    labelBase = "last turn";
+  } else if (scope === "commits" && commitSha) {
+    diffArgs = [`${commitSha}^!`];
+    labelBase = commitSha.slice(0, 7);
+  } else if (scope === "commits" && opts.base && SHA_RE.test(opts.base)) {
+    diffArgs = [opts.base];
+    labelBase = opts.base.slice(0, 7);
+  } else if (scope === "commits") {
+    let base = opts.base;
+    try {
+      base = base ?? await resolveDefaultBranch(repoPath, { network: false });
+    } catch {
+      base = "HEAD";
+    }
+    const mergeBase = await resolveMergeBase(worktreePath, base, repoPath);
+    diffArgs = [mergeBase];
+    labelBase = mergeBase;
+  } else {
+    diffArgs = ["HEAD"];
+    labelBase = "HEAD";
+  }
+  const diff = await gitDiff(
+    includePatches ? [...diffArgs, "--", path] : ["--name-status", ...diffArgs, "--", path],
+    worktreePath,
+    { timeoutMs: 4e3 }
+  );
+  const filesMap = /* @__PURE__ */ new Map();
+  if (includePatches) {
+    const parsed = filesFromDiff("", "", diff.stdout, maxHunk);
+    for (const file of parsed) filesMap.set(file.path, file);
+    if (diff.stdout.trim() && !filesMap.has(path)) {
+      filesMap.set(path, fileFromPatch(path, diff.stdout, maxHunk));
+    }
+  } else {
+    for (const file of filesFromDiff(diff.stdout, "", "", maxHunk)) {
+      filesMap.set(file.path, file);
+    }
+  }
+  if (filesMap.size === 0) {
+    const maybe = await listUntrackedPaths(worktreePath, path);
+    if (maybe.length > 0) {
+      const extra = includePatches ? await listUntrackedFiles(worktreePath, maxHunk, maybe) : untrackedStubs(maybe);
+      for (const file of extra) filesMap.set(file.path, file);
+    }
+  }
+  const files = [...filesMap.values()].sort((a, b) => a.path.localeCompare(b.path));
+  return {
+    scope,
+    commitSha: scope === "commits" ? commitSha : null,
+    base: labelBase,
+    files,
+    stat: formatStat(files),
+    dirty: files.length > 0,
+    unpushed: 0,
+    hasLastTurnBase,
+    commits: [],
+    scopeStats: emptyScopeStats(),
+    mergeBase: SHA_RE.test(diffArgs[0] ?? "") ? diffArgs[0] : null
+  };
+}
 async function getDiff(worktreePath, repoPath, opts) {
+  const maxHunk = opts?.maxHunkChars ?? 8e3;
+  const scope = opts?.scope ?? "commits";
+  const lastTurnBase = opts?.lastTurnBase?.trim() || null;
+  const hasLastTurnBase = Boolean(lastTurnBase);
+  const commitSha = opts?.commitSha?.trim() || null;
+  const includePatches = opts?.includePatches ?? true;
+  const pathFilter = opts?.path?.trim() || null;
+  const fileOnly = Boolean(pathFilter);
+  const includeMeta = (opts?.includeMeta ?? true) && !fileOnly;
+  if (fileOnly && pathFilter && !includeMeta) {
+    return getPathDiff(worktreePath, repoPath, {
+      path: pathFilter,
+      scope,
+      commitSha,
+      lastTurnBase,
+      hasLastTurnBase,
+      base: opts?.base,
+      includePatches,
+      maxHunk
+    });
+  }
   const status = await inspectGitWorktree(worktreePath);
   if (status === "missing_worktree") {
     throw new Error("Worktree not found");
@@ -2794,18 +3020,19 @@ async function getDiff(worktreePath, repoPath, opts) {
   if (status === "not_git") {
     throw new Error("Not a Git repository");
   }
-  const maxHunk = opts?.maxHunkChars ?? 8e3;
-  const scope = opts?.scope ?? "commits";
-  const lastTurnBase = opts?.lastTurnBase?.trim() || null;
-  const hasLastTurnBase = Boolean(lastTurnBase);
-  const commitSha = opts?.commitSha?.trim() || null;
-  const head = await git(["rev-parse", "--verify", "HEAD"], worktreePath, {
+  const wantUntracked = opts?.includeUntracked !== void 0 ? opts.includeUntracked : !fileOnly && (scope === "commits" && !commitSha || scope === "uncommitted" || scope === "unstaged" || scope === "last_turn");
+  const needsMergeBase = scope === "commits" && !commitSha || includeMeta;
+  const headP = git(["rev-parse", "--verify", "HEAD"], worktreePath, {
     reject: false
   });
+  const untrackedP = wantUntracked ? listUntrackedPaths(worktreePath, pathFilter) : Promise.resolve([]);
+  const head = await headP;
   const hasHead = head.exitCode === 0;
-  const untrackedPaths = await listUntrackedPaths(worktreePath);
   if (!hasHead) {
-    const files2 = scope === "staged" ? [] : (await listUntrackedFiles(worktreePath, maxHunk)).sort(
+    const untrackedPaths2 = await untrackedP;
+    const files2 = scope === "staged" ? [] : includePatches ? (await listUntrackedFiles(worktreePath, maxHunk, untrackedPaths2)).sort(
+      (a, b) => a.path.localeCompare(b.path)
+    ) : untrackedStubs(untrackedPaths2).sort(
       (a, b) => a.path.localeCompare(b.path)
     );
     const untrackedStat = {
@@ -2819,7 +3046,7 @@ async function getDiff(worktreePath, repoPath, opts) {
       commitSha: null,
       base: "(no commits)",
       files: files2,
-      stat: files2.length ? files2.map((f) => ` ${f.path} | untracked`).join("\n") : "(no changes)",
+      stat: formatStat(files2),
       dirty: files2.length > 0,
       unpushed: 0,
       hasLastTurnBase,
@@ -2833,137 +3060,122 @@ async function getDiff(worktreePath, repoPath, opts) {
       }
     };
   }
-  let base = opts?.base;
-  try {
-    base = base ?? await resolveDefaultBranch(repoPath);
-  } catch {
-    base = "HEAD";
-  }
-  base = await resolveDiffBaseRef(worktreePath, base, repoPath);
-  if (base.startsWith("origin/")) {
-    const short = base.slice("origin/".length);
-    await git(["fetch", "origin", short, "--quiet"], worktreePath, {
-      reject: false
-    });
-    base = await resolveDiffBaseRef(worktreePath, short, repoPath);
+  let mergeBase = "HEAD";
+  let baseLabel = "HEAD";
+  if (needsMergeBase) {
+    let base = opts?.base;
+    try {
+      base = base ?? await resolveDefaultBranch(repoPath, { network: false });
+    } catch {
+      base = "HEAD";
+    }
+    mergeBase = await resolveMergeBase(worktreePath, base, repoPath);
+    baseLabel = await resolveDiffBaseRef(worktreePath, base, repoPath);
+  }
+  const includeUntracked = wantUntracked;
+  const metaPromise = includeMeta ? Promise.all([
+    computeScopeStats(
+      worktreePath,
+      mergeBase,
+      lastTurnBase,
+      // Cheap: don't wait on the untracked walk just to pad the badge.
+      0
+    ),
+    listBranchCommits(worktreePath, repoPath, { base: baseLabel }),
+    isDirty(worktreePath),
+    countUnpushedCommits(worktreePath)
+  ]).then(([scopeStats, commits, dirty, unpushed]) => ({
+    scopeStats,
+    commits,
+    dirty,
+    unpushed
+  })) : Promise.resolve({
+    scopeStats: emptyScopeStats(),
+    commits: [],
+    dirty: false,
+    unpushed: 0
+  });
+  if (scope === "last_turn" && !lastTurnBase) {
+    const meta2 = await metaPromise;
+    return {
+      scope,
+      commitSha: null,
+      base: "last turn",
+      files: [],
+      stat: "(no last agent turn)",
+      dirty: meta2.dirty,
+      unpushed: meta2.unpushed,
+      hasLastTurnBase: false,
+      commits: meta2.commits,
+      scopeStats: meta2.scopeStats
+    };
   }
-  const mergeBase = await resolveMergeBase(worktreePath, base, repoPath);
-  const scopeStats = await computeScopeStats(
-    worktreePath,
-    mergeBase,
-    lastTurnBase,
-    untrackedPaths.length
-  );
-  const includeUntracked = scope === "commits" && !commitSha || scope === "uncommitted" || scope === "unstaged" || scope === "last_turn";
-  let nameStatus = "";
-  let numstat = "";
-  let combinedDiff = "";
-  let labelBase = base;
+  let diffArgs;
+  let labelBase = baseLabel;
   if (scope === "staged") {
-    const [ns, num, diff] = await Promise.all([
-      git(["diff", "--name-status", "--cached"], worktreePath, { reject: false }),
-      git(["diff", "--numstat", "--cached"], worktreePath, { reject: false }),
-      git(["diff", "--cached"], worktreePath, { reject: false })
-    ]);
-    nameStatus = ns.stdout;
-    numstat = num.stdout;
-    combinedDiff = diff.stdout;
+    diffArgs = ["--cached"];
     labelBase = "staged";
   } else if (scope === "unstaged") {
-    const [ns, num, diff] = await Promise.all([
-      git(["diff", "--name-status"], worktreePath, { reject: false }),
-      git(["diff", "--numstat"], worktreePath, { reject: false }),
-      git(["diff"], worktreePath, { reject: false })
-    ]);
-    nameStatus = ns.stdout;
-    numstat = num.stdout;
-    combinedDiff = diff.stdout;
+    diffArgs = [];
     labelBase = "unstaged";
   } else if (scope === "uncommitted") {
-    const [ns, num, diff] = await Promise.all([
-      git(["diff", "--name-status", "HEAD"], worktreePath, { reject: false }),
-      git(["diff", "--numstat", "HEAD"], worktreePath, { reject: false }),
-      git(["diff", "HEAD"], worktreePath, { reject: false })
-    ]);
-    nameStatus = ns.stdout;
-    numstat = num.stdout;
-    combinedDiff = diff.stdout;
+    diffArgs = ["HEAD"];
     labelBase = "HEAD";
   } else if (scope === "last_turn") {
-    if (!lastTurnBase) {
-      const commits2 = await listBranchCommits(worktreePath, repoPath, { base });
-      return {
-        scope,
-        commitSha: null,
-        base: "last turn",
-        files: [],
-        stat: "(no last agent turn)",
-        dirty: await isDirty(worktreePath),
-        unpushed: await countUnpushedCommits(worktreePath),
-        hasLastTurnBase: false,
-        commits: commits2,
-        scopeStats
-      };
-    }
-    const [ns, num, diff] = await Promise.all([
-      git(["diff", "--name-status", lastTurnBase], worktreePath, { reject: false }),
-      git(["diff", "--numstat", lastTurnBase], worktreePath, { reject: false }),
-      git(["diff", lastTurnBase], worktreePath, { reject: false })
-    ]);
-    nameStatus = ns.stdout;
-    numstat = num.stdout;
-    combinedDiff = diff.stdout;
+    diffArgs = [lastTurnBase];
     labelBase = "last turn";
   } else if (scope === "commits" && commitSha) {
-    const range = `${commitSha}^!`;
-    const [ns, num, diff] = await Promise.all([
-      git(["diff", "--name-status", range], worktreePath, { reject: false }),
-      git(["diff", "--numstat", range], worktreePath, { reject: false }),
-      git(["diff", range], worktreePath, { reject: false })
-    ]);
-    nameStatus = ns.stdout;
-    numstat = num.stdout;
-    combinedDiff = diff.stdout;
+    diffArgs = [`${commitSha}^!`];
     labelBase = commitSha.slice(0, 7);
   } else {
-    const [ns, num, diff] = await Promise.all([
-      git(["diff", "--name-status", mergeBase], worktreePath, { reject: false }),
-      git(["diff", "--numstat", mergeBase], worktreePath, { reject: false }),
-      git(["diff", mergeBase], worktreePath, { reject: false })
-    ]);
-    nameStatus = ns.stdout;
-    numstat = num.stdout;
-    combinedDiff = diff.stdout;
-    labelBase = base;
-  }
-  const commits = await listBranchCommits(worktreePath, repoPath, { base });
+    diffArgs = [mergeBase];
+    labelBase = baseLabel;
+  }
+  const partsPromise = gitDiffParts(
+    worktreePath,
+    diffArgs,
+    includePatches,
+    pathFilter
+  );
+  const [parts, meta, untrackedPaths] = await Promise.all([
+    partsPromise,
+    metaPromise,
+    untrackedP
+  ]);
   const filesMap = /* @__PURE__ */ new Map();
-  for (const file of filesFromDiff(nameStatus, numstat, combinedDiff, maxHunk)) {
+  for (const file of filesFromDiff(
+    parts.nameStatus,
+    parts.numstat,
+    parts.combinedDiff,
+    maxHunk
+  )) {
     filesMap.set(file.path, file);
   }
   if (includeUntracked) {
-    const untrackedFiles = await listUntrackedFiles(worktreePath, maxHunk);
-    for (const file of untrackedFiles) {
+    const extra = includePatches ? await listUntrackedFiles(worktreePath, maxHunk, untrackedPaths) : untrackedStubs(untrackedPaths);
+    for (const file of extra) {
       if (!filesMap.has(file.path)) filesMap.set(file.path, file);
     }
+  } else if (fileOnly && pathFilter && !filesMap.has(pathFilter)) {
+    const maybe = await listUntrackedPaths(worktreePath, pathFilter);
+    if (maybe.length > 0) {
+      const extra = includePatches ? await listUntrackedFiles(worktreePath, maxHunk, maybe) : untrackedStubs(maybe);
+      for (const file of extra) filesMap.set(file.path, file);
+    }
   }
   const files = [...filesMap.values()].sort((a, b) => a.path.localeCompare(b.path));
-  const { stdout: statOut } = await git(
-    scope === "staged" ? ["diff", "--stat", "--cached"] : scope === "unstaged" ? ["diff", "--stat"] : scope === "uncommitted" ? ["diff", "--stat", "HEAD"] : scope === "last_turn" && lastTurnBase ? ["diff", "--stat", lastTurnBase] : scope === "commits" && commitSha ? ["diff", "--stat", `${commitSha}^!`] : ["diff", "--stat", mergeBase],
-    worktreePath,
-    { reject: false }
-  );
   return {
     scope,
     commitSha: scope === "commits" ? commitSha : null,
     base: labelBase,
     files,
-    stat: statOut.trim() || (files.length ? `${files.length} file(s)` : "(no changes)"),
-    dirty: await isDirty(worktreePath),
-    unpushed: await countUnpushedCommits(worktreePath),
+    stat: formatStat(files),
+    dirty: fileOnly || !includeMeta ? files.length > 0 : meta.dirty,
+    unpushed: meta.unpushed,
     hasLastTurnBase,
-    commits,
-    scopeStats
+    commits: meta.commits,
+    scopeStats: meta.scopeStats,
+    mergeBase: needsMergeBase ? mergeBase : null
   };
 }
 async function listWorktreeFiles(worktreePath, opts) {
@@ -3179,7 +3391,7 @@ async function previewLand(thread) {
   const target = await resolveDefaultBranch(thread.repoPath);
   if (thread.branchName === target || thread.branchName === "main" || thread.branchName === "master") {
   }
-  const { stdout: head } = await import("../run-Y2MI3EVV.js").then(
+  const { stdout: head } = await import("../run-A4RHY7HH.js").then(
     ({ git: git2 }) => git2(["rev-parse", "--abbrev-ref", "HEAD"], thread.worktreePath)
   );
   const current = head.trim();
@@ -3218,7 +3430,7 @@ async function confirmLand(thread, opts) {
   if (preview.dirty) {
     committed = await commitAll(thread.worktreePath, meta.commitMessage);
   }
-  const { git: git2 } = await import("../run-Y2MI3EVV.js");
+  const { git: git2 } = await import("../run-A4RHY7HH.js");
   const { stdout: headOut } = await git2(
     ["rev-parse", "--abbrev-ref", "HEAD"],
     thread.worktreePath,
@@ -3910,7 +4122,7 @@ var Orchestrator = class {
           orphans: orphans.map((o) => ({ path: o.path, repoPath: o.repoPath }))
         });
       }
-      const { autoCleanupOrphansEnabled } = await import("../app-settings-GJVZGU3M.js");
+      const { autoCleanupOrphansEnabled } = await import("../app-settings-P42Z3VOB.js");
       if (autoCleanupOrphansEnabled() && shouldRunWorktreeCleanup() && orphans.length > 0) {
         await cleanupOrphanWorktrees({ repoPaths });
       }
@@ -4067,7 +4279,7 @@ var Orchestrator = class {
   }
   async finishCreateThread(threadId, prompt) {
     await this.runSetupAfterCreate(threadId);
-    const { autoRunAfterSetupEnabled } = await import("../app-settings-GJVZGU3M.js");
+    const { autoRunAfterSetupEnabled } = await import("../app-settings-P42Z3VOB.js");
     if (autoRunAfterSetupEnabled()) {
       try {
         await this.startDev(threadId);
@@ -4147,11 +4359,11 @@ var Orchestrator = class {
     return results;
   }
   /** Edit the text of a not-yet-started queued message. */
-  async editQueuedMessage(threadRef, index, text) {
+  async editQueuedMessage(threadRef, index, text2) {
     const thread = this.requireThread(threadRef);
     return withThreadLock(thread.id, async () => {
       const current = this.requireThread(thread.id);
-      const trimmed = text.trim();
+      const trimmed = text2.trim();
       if (!trimmed || index < 0 || index >= current.queue.length) {
         return current;
       }
@@ -4296,10 +4508,19 @@ var Orchestrator = class {
         attachments: sentAttachments ?? thread.attachments
       }
     );
-    const orchestrationReminder = isOrchestratorThread(thread) ? coordinatorTurnReminder({
-      parentId: threadId,
-      goal: thread.sourceRef || thread.title
-    }) : null;
+    const slackInbound = /^(Slack DM|Slack @mention)(?:\n|$)/.test(
+      expandedPrompt.trim()
+    );
+    const orchestrationReminder = isOrchestratorThread(thread) ? [
+      coordinatorTurnReminder({
+        parentId: threadId,
+        goal: thread.sourceRef || thread.title
+      }),
+      slackInbound ? [
+        "This turn is a Slack DM or @mention. Your reply is posted back in Slack \u2014 keep it concise. Sideboard signs it with this Mac's destination name; do not prefix the name yourself.",
+        SLACK_REPLY_FORMATTING
+      ].join("\n") : null
+    ].filter(Boolean).join("\n") : null;
     const artifactReminder = thread.agent !== "brightsy" ? [
       "Sideboard side column (important):",
       "There is no claude.ai Artifact tool here \u2014 that is normal.",
@@ -4339,7 +4560,7 @@ var Orchestrator = class {
     });
     const artifactDirective = isBrightsy ? null : formatArtifactDirective();
     const settings = loadWorkspaceSettings(fresh.worktreePath, fresh.repoPath);
-    const { autoRenameBranchEnabled } = await import("../app-settings-GJVZGU3M.js");
+    const { autoRenameBranchEnabled } = await import("../app-settings-P42Z3VOB.js");
     const renameBranchDirective = !isBrightsy && !isOrchestration && autoRenameBranchEnabled() ? formatRenameBranchDirective(fresh, {
       customPrompt: settings?.prompts?.renameBranch
     }) : null;
@@ -4359,7 +4580,9 @@ var Orchestrator = class {
           goal: fresh.sourceRef || fresh.title || "Orchestration",
           parentId: fresh.id,
           workspaces: inventory,
-          audience: "desktop"
+          audience: /^(Slack DM|Slack @mention)(?:\n|$)/.test(
+            expandedPrompt.trim()
+          ) ? "slack" : "desktop"
         });
       }
     }
@@ -4902,6 +5125,11 @@ var Orchestrator = class {
     return getDiff(thread.worktreePath, thread.repoPath, {
       scope: opts?.scope,
       commitSha: opts?.commitSha,
+      base: opts?.base,
+      includePatches: opts?.includePatches,
+      includeMeta: opts?.includeMeta,
+      includeUntracked: opts?.includeUntracked,
+      path: opts?.path,
       lastTurnBase: this.turnBaselines.get(thread.id) ?? null
     });
   }
@@ -4979,7 +5207,8 @@ var Orchestrator = class {
       isDraft: false,
       reviewDecision: null,
       baseRefName: "",
-      headRefName: ""
+      headRefName: "",
+      isInMergeQueue: false
     };
     await this.persistPrMetaAndMaybeArchive(thread, metaLike);
     return { url: metaLike.url, state };
@@ -5029,7 +5258,7 @@ var Orchestrator = class {
         updateThread(thread.id, { title: meta.title });
       }
     }
-    const { autoArchiveOnMergeEnabled } = await import("../app-settings-GJVZGU3M.js");
+    const { autoArchiveOnMergeEnabled } = await import("../app-settings-P42Z3VOB.js");
     const latest = this.requireThread(thread.id);
     if (!shouldAutoArchiveOnPrMerge({
       previousPrState: prevState || null,
@@ -5253,7 +5482,7 @@ var Orchestrator = class {
     this.emit({ type: "status_changed", threadId: archived.id, status: "archived" });
     if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
       try {
-        const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-AIUYUXB7.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-SVQIEVIZ.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -5274,7 +5503,7 @@ var Orchestrator = class {
         await runArchiveScript(thread.repoPath, thread.worktreePath);
       } catch {
       }
-      const { deleteBranchOnPurgeEnabled } = await import("../app-settings-GJVZGU3M.js");
+      const { deleteBranchOnPurgeEnabled } = await import("../app-settings-P42Z3VOB.js");
       const deleteBranch = opts?.deleteBranch ?? deleteBranchOnPurgeEnabled();
       await removeWorktree(thread.repoPath, thread.worktreePath, {
         deleteBranch: deleteBranch ? thread.branchName : void 0
@@ -5295,7 +5524,7 @@ var Orchestrator = class {
       return restored2;
     }
     if (!existsSync13(thread.worktreePath)) {
-      const { createThreadWorktree: createThreadWorktree2 } = await import("../worktree-WMDJW2BL.js");
+      const { createThreadWorktree: createThreadWorktree2 } = await import("../worktree-KWXHMKRN.js");
       const { execa: execa6 } = await import("execa");
       const slug = thread.worktreePath.split("/").pop();
       const dest = thread.worktreePath;
@@ -5367,6 +5596,103 @@ function getOrchestrator() {
   return singleton;
 }
 
+// src/integrations/linear-oauth.ts
+import { createHash, randomBytes } from "crypto";
+import { createServer as createServer2 } from "http";
+
+// src/integrations/linear-app.ts
+var BAKED_LINEAR_CLIENT_ID = "39a15abc7ea5bea17c47f47f85ff5fd0";
+var BAKED_LINEAR_CLIENT_SECRET = "";
+
+// src/integrations/linear-oauth.ts
+var LINEAR_OAUTH_PORT = 19848;
+var LINEAR_OAUTH_REDIRECT = `http://127.0.0.1:${LINEAR_OAUTH_PORT}/callback`;
+var LINEAR_TOKEN = "https://api.linear.app/oauth/token";
+var REFRESH_SKEW_MS = 5 * 6e4;
+function linearOAuthCredentials() {
+  const settings = loadAppSettings();
+  const clientId = process.env.SIDEBOARD_LINEAR_CLIENT_ID?.trim() || settings.integrations.linearClientId?.trim() || BAKED_LINEAR_CLIENT_ID.trim();
+  const clientSecret = process.env.SIDEBOARD_LINEAR_CLIENT_SECRET?.trim() || settings.integrations.linearClientSecret?.trim() || BAKED_LINEAR_CLIENT_SECRET.trim();
+  if (!clientId) {
+    throw new Error(
+      `Linear browser sign-in needs a Linear OAuth app Client ID. Create one at linear.app/settings/api/applications/new with callback ${LINEAR_OAUTH_REDIRECT}, then set SIDEBOARD_LINEAR_CLIENT_ID (PKCE does not require a secret). You can still paste a personal API key.`
+    );
+  }
+  return { clientId, clientSecret };
+}
+function linearAuthorizationHeader(token) {
+  const t = token.trim();
+  if (!t) return t;
+  if (/^bearer\s+/i.test(t)) return t;
+  if (t.startsWith("lin_api_")) return t;
+  return `Bearer ${t}`;
+}
+async function exchangeLinearToken(body) {
+  const res = await fetch(LINEAR_TOKEN, {
+    method: "POST",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    body
+  });
+  const data = await res.json().catch(() => ({}));
+  if (!res.ok || data.error || !data.access_token?.trim()) {
+    const detail = data.error_description || data.error || `HTTP ${res.status}`;
+    throw new Error(`Linear OAuth token exchange failed: ${detail}`);
+  }
+  return data;
+}
+async function persistLinearTokens(data, viewer) {
+  return saveLinearOAuth({
+    accessToken: data.access_token.trim(),
+    refreshToken: data.refresh_token?.trim(),
+    expiresIn: data.expires_in,
+    viewerName: viewer?.name,
+    organizationName: viewer?.organizationName
+  });
+}
+var refreshInFlight = null;
+async function refreshLinearAccessToken(refreshToken) {
+  const { clientId, clientSecret } = linearOAuthCredentials();
+  const body = new URLSearchParams({
+    grant_type: "refresh_token",
+    refresh_token: refreshToken,
+    client_id: clientId
+  });
+  if (clientSecret) body.set("client_secret", clientSecret);
+  try {
+    const data = await exchangeLinearToken(body);
+    await persistLinearTokens(data);
+    return data.access_token.trim();
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    if (/invalid_grant|invalid_token|unauthorized/i.test(message)) {
+      disconnectLinearConnection();
+      throw new Error("Linear sign-in expired \u2014 connect again in Account settings");
+    }
+    throw err;
+  }
+}
+async function getLinearAuthToken(settings = loadAppSettings()) {
+  const access = settings.integrations.linearAccessToken?.trim() || "";
+  const refresh = settings.integrations.linearRefreshToken?.trim() || "";
+  const expiresAt = settings.integrations.linearTokenExpiresAt ?? 0;
+  const apiKey = settings.integrations.linearApiKey?.trim() || "";
+  if (access && (!refresh || Date.now() < expiresAt - REFRESH_SKEW_MS)) {
+    return access;
+  }
+  if (refresh) {
+    if (!refreshInFlight) {
+      refreshInFlight = refreshLinearAccessToken(refresh).finally(() => {
+        refreshInFlight = null;
+      });
+    }
+    return refreshInFlight.catch((err) => {
+      if (apiKey) return apiKey;
+      throw err;
+    });
+  }
+  return apiKey || null;
+}
+
 // src/integrations/linear.ts
 var LINEAR_GRAPHQL = "https://api.linear.app/graphql";
 var ASSIGNED_ISSUES_QUERY = `
@@ -5389,16 +5715,16 @@ query SideboardAssignedIssues($first: Int!) {
 }
 `;
 async function listLinearIssuesDirect(opts) {
-  const apiKey = (opts?.apiKey ?? getLinearApiKey())?.trim();
+  const apiKey = (opts?.apiKey ?? await getLinearAuthToken())?.trim();
   if (!apiKey) {
-    throw new Error("Linear is not connected \u2014 add an API key in Account settings");
+    throw new Error("Linear is not connected \u2014 sign in from Account settings");
   }
   const first = Math.max(1, Math.min(100, opts?.limit ?? 50));
   const res = await fetch(LINEAR_GRAPHQL, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
-      Authorization: apiKey
+      Authorization: linearAuthorizationHeader(apiKey)
     },
     body: JSON.stringify({
       query: ASSIGNED_ISSUES_QUERY,
@@ -5488,6 +5814,640 @@ function mcpArchiveBlockedReason(thread) {
   return null;
 }
 
+// src/mcp/slack-tools.ts
+import { z } from "zod";
+
+// src/slack/api.ts
+var SLACK_API = "https://slack.com/api";
+var SlackApiError = class extends Error {
+  constructor(method, slackError) {
+    super(`Slack ${method}: ${slackError}`);
+    this.method = method;
+    this.slackError = slackError;
+    this.name = "SlackApiError";
+  }
+  method;
+  slackError;
+};
+async function slackApi(token, method, params, fetchImpl) {
+  const doFetch = fetchImpl ?? fetch;
+  const body = new URLSearchParams();
+  if (params) {
+    for (const [key, value] of Object.entries(params)) {
+      if (value === void 0) continue;
+      body.set(key, String(value));
+    }
+  }
+  const res = await doFetch(`${SLACK_API}/${method}`, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${token}`,
+      "Content-Type": "application/x-www-form-urlencoded"
+    },
+    body
+  });
+  const json = await res.json();
+  if (!json.ok) {
+    throw new SlackApiError(method, json.error || `HTTP ${res.status}`);
+  }
+  return json;
+}
+
+// src/slack/destination.ts
+function isChannelId(raw) {
+  return /^[CGD][A-Z0-9]+$/i.test(raw);
+}
+function isUserId(raw) {
+  return /^U[A-Z0-9]+$/i.test(raw);
+}
+function isEmail(raw) {
+  return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(raw);
+}
+function normalizeSlackHandle(raw) {
+  let s = raw.trim();
+  const mention = s.match(/^<@([UW][A-Z0-9]+)(?:\|[^>]+)?>$/i);
+  if (mention?.[1]) return mention[1];
+  const channelMention = s.match(/^<#([CGD][A-Z0-9]+)(?:\|[^>]+)?>$/i);
+  if (channelMention?.[1]) return channelMention[1];
+  if (s.startsWith("#") || s.startsWith("@")) s = s.slice(1);
+  return s.trim();
+}
+async function listSlackUsers(token, opts) {
+  const query = opts?.query?.trim().toLowerCase() ?? "";
+  const limit = Math.min(200, Math.max(1, opts?.limit ?? 50));
+  const members = [];
+  let cursor;
+  do {
+    const data = await slackApi(
+      token,
+      "users.list",
+      {
+        limit: 200,
+        cursor: cursor || void 0
+      },
+      opts?.fetchImpl
+    );
+    for (const m of data.members ?? []) {
+      if (!m.id || m.deleted || m.is_bot) continue;
+      members.push(m);
+    }
+    cursor = data.response_metadata?.next_cursor?.trim() || void 0;
+  } while (cursor && members.length < 2e3);
+  const mapped = members.map((m) => ({
+    id: m.id,
+    name: m.name ?? m.id,
+    real_name: m.profile?.real_name,
+    display_name: m.profile?.display_name,
+    email: m.profile?.email
+  }));
+  const filtered = query ? mapped.filter((u) => {
+    const hay = [u.name, u.real_name, u.display_name, u.email, u.id].filter(Boolean).join(" ").toLowerCase();
+    return hay.includes(query);
+  }) : mapped;
+  return filtered.slice(0, limit);
+}
+async function findUserId(token, handle, fetchImpl) {
+  if (isUserId(handle)) {
+    return { id: handle, name: handle };
+  }
+  if (isEmail(handle)) {
+    try {
+      const data = await slackApi(
+        token,
+        "users.lookupByEmail",
+        { email: handle },
+        fetchImpl
+      );
+      if (data.user?.id) {
+        return {
+          id: data.user.id,
+          name: data.user.name ?? data.user.id,
+          real_name: data.user.profile?.real_name,
+          display_name: data.user.profile?.display_name,
+          email: data.user.profile?.email
+        };
+      }
+    } catch {
+    }
+  }
+  const users = await listSlackUsers(token, { query: handle, limit: 20, fetchImpl });
+  const exact = users.find(
+    (u) => u.name.toLowerCase() === handle.toLowerCase() || u.display_name?.toLowerCase() === handle.toLowerCase() || u.real_name?.toLowerCase() === handle.toLowerCase() || u.email?.toLowerCase() === handle.toLowerCase()
+  );
+  if (exact) return exact;
+  if (users.length === 1) return users[0];
+  if (users.length === 0) {
+    throw new Error(`No Slack user matching "${handle}"`);
+  }
+  throw new Error(
+    `Ambiguous Slack user "${handle}". Matches: ${users.slice(0, 5).map((u) => `${u.name} (${u.id})`).join(", ")}. Pass a user id (U\u2026) or use slack_list_users.`
+  );
+}
+async function openDmChannel(token, userId, fetchImpl) {
+  const data = await slackApi(
+    token,
+    "conversations.open",
+    { users: userId },
+    fetchImpl
+  );
+  const id = data.channel?.id?.trim();
+  if (!id) throw new Error(`Could not open Slack DM with user ${userId}`);
+  return id;
+}
+async function resolveChannelByName(token, name, fetchImpl) {
+  const data = await slackApi(
+    token,
+    "conversations.list",
+    {
+      types: "public_channel,private_channel",
+      exclude_archived: true,
+      limit: 200
+    },
+    fetchImpl
+  );
+  const match = (data.channels ?? []).find((c) => c.name?.toLowerCase() === name.toLowerCase());
+  if (!match?.id) throw new Error(`No Slack channel named #${name}`);
+  return match.id;
+}
+async function resolveSlackDestination(token, destination, opts) {
+  const raw = destination.trim();
+  if (!raw) throw new Error("destination is required");
+  const hadAt = raw.startsWith("@") || /^<@/i.test(raw);
+  const hadHash = raw.startsWith("#") || /^<#/i.test(raw);
+  const handle = normalizeSlackHandle(raw);
+  if (isChannelId(handle)) {
+    return {
+      channelId: handle,
+      kind: handle.toUpperCase().startsWith("D") ? "dm" : "channel",
+      label: handle
+    };
+  }
+  if (isUserId(handle) || hadAt || isEmail(handle)) {
+    const user = await findUserId(token, handle, opts?.fetchImpl);
+    if (opts?.forRead) {
+      const channelId2 = await openDmChannel(token, user.id, opts?.fetchImpl);
+      return {
+        channelId: channelId2,
+        kind: "user",
+        userId: user.id,
+        label: user.display_name || user.real_name || user.name
+      };
+    }
+    const channelId = await openDmChannel(token, user.id, opts?.fetchImpl);
+    return {
+      channelId,
+      kind: "user",
+      userId: user.id,
+      label: user.display_name || user.real_name || user.name
+    };
+  }
+  if (hadHash) {
+    const channelId = await resolveChannelByName(token, handle, opts?.fetchImpl);
+    return { channelId, kind: "channel", label: `#${handle}` };
+  }
+  try {
+    const channelId = await resolveChannelByName(token, handle, opts?.fetchImpl);
+    return { channelId, kind: "channel", label: `#${handle}` };
+  } catch (channelErr) {
+    try {
+      const user = await findUserId(token, handle, opts?.fetchImpl);
+      const channelId = await openDmChannel(token, user.id, opts?.fetchImpl);
+      return {
+        channelId,
+        kind: "user",
+        userId: user.id,
+        label: user.display_name || user.real_name || user.name
+      };
+    } catch {
+      throw channelErr;
+    }
+  }
+}
+
+// src/slack/github-link.ts
+function labelGithubUrl(url) {
+  const raw = url.trim();
+  if (!raw) return null;
+  let parsed;
+  try {
+    parsed = new URL(raw);
+  } catch {
+    return null;
+  }
+  if (!/(^|\.)github\.com$/i.test(parsed.hostname)) return null;
+  const path = parsed.pathname;
+  const hash = parsed.hash || "";
+  const pr = path.match(/\/([^/]+)\/([^/]+)\/pull\/(\d+)/i);
+  if (pr) {
+    const n = pr[3];
+    if (/#discussion_r\d+/i.test(hash) || /#pullrequestreview-\d+/i.test(hash)) {
+      return { kind: "comment", label: `PR #${n} comment`, url: raw };
+    }
+    if (/#issuecomment-\d+/i.test(hash)) {
+      return { kind: "comment", label: `PR #${n} comment`, url: raw };
+    }
+    return { kind: "pr", label: `PR #${n}`, url: raw };
+  }
+  const issueComment = path.match(/\/([^/]+)\/([^/]+)\/issues\/(\d+)/i);
+  if (issueComment && /#issuecomment-\d+/i.test(hash)) {
+    return { kind: "comment", label: `Issue #${issueComment[3]} comment`, url: raw };
+  }
+  const blob = path.match(/\/([^/]+)\/([^/]+)\/blob\/[^/]+\/(.+)$/i);
+  if (blob) {
+    const filePath = decodeURIComponent(blob[3]);
+    const fileName = filePath.split("/").pop() || filePath;
+    const line = hash.match(/^#L(\d+)(?:-L(\d+))?$/i);
+    if (line) {
+      const start = line[1];
+      const end = line[2];
+      const loc = end && end !== start ? `${start}-${end}` : start;
+      return { kind: "code", label: `${fileName}:${loc}`, url: raw };
+    }
+    return { kind: "code", label: fileName, url: raw };
+  }
+  return { kind: "other", label: "GitHub", url: raw };
+}
+function appendGithubLink(text2, githubUrl) {
+  const body = text2.trimEnd();
+  if (!githubUrl?.trim()) return body;
+  const labeled = labelGithubUrl(githubUrl);
+  if (!labeled) {
+    return body ? `${body}
+${githubUrl.trim()}` : githubUrl.trim();
+  }
+  const link = `<${labeled.url}|${labeled.label}>`;
+  return body ? `${body}
+${link}` : link;
+}
+
+// src/slack/outbound-watch.ts
+import { existsSync as existsSync14, readFileSync as readFileSync9 } from "fs";
+import { join as join12 } from "path";
+
+// src/slack/workspaces.ts
+import { join as join11 } from "path";
+function storePath() {
+  return join11(appDataDir(), "slack-workspaces.json");
+}
+function readStore() {
+  try {
+    const path = storePath();
+    const wasEncrypted = isSecureFileEncrypted(path);
+    const parsed = readSecureJson(path);
+    const workspaces = Array.isArray(parsed?.workspaces) ? parsed.workspaces : [];
+    if (workspaces.length > 0 && !wasEncrypted && resolveVaultKey()) {
+      writeSecureJson(path, { workspaces });
+    }
+    return workspaces;
+  } catch {
+    return [];
+  }
+}
+function toInfo(ws) {
+  return {
+    team_id: ws.team_id,
+    team_name: ws.team_name,
+    user_id: ws.user_id,
+    has_bot_token: Boolean(ws.bot_token),
+    has_user_token: Boolean(ws.user_token),
+    connected_at: ws.connected_at
+  };
+}
+function listSlackWorkspaces() {
+  return readStore().map(toInfo).sort((a, b) => a.team_name.localeCompare(b.team_name));
+}
+function getSlackWorkspace(teamId) {
+  const id = teamId.trim();
+  if (!id) return null;
+  return readStore().find(
+    (ws) => ws.team_id === id || ws.team_name.toLowerCase() === id.toLowerCase()
+  ) ?? null;
+}
+function slackTokenFor(ws, kind = "read") {
+  if (kind === "search") {
+    const token2 = ws.user_token?.trim();
+    if (!token2) {
+      throw new Error(
+        `Slack search needs a user token for ${ws.team_name}. Reconnect via Account \u2192 Slack (browser) or paste an xoxp- token.`
+      );
+    }
+    return token2;
+  }
+  const token = (kind === "write" ? ws.bot_token || ws.user_token : ws.user_token || ws.bot_token)?.trim();
+  if (!token) {
+    throw new Error(`Slack workspace ${ws.team_name} has no token`);
+  }
+  return token;
+}
+function requireSlackWorkspace(teamId) {
+  const ws = getSlackWorkspace(teamId);
+  if (!ws) {
+    const connected = listSlackWorkspaces();
+    const hint = connected.length === 0 ? "Connect a workspace in Account \u2192 Slack workspaces." : `Connected: ${connected.map((t) => `${t.team_name} (${t.team_id})`).join(", ")}`;
+    throw new Error(`Unknown Slack team_id "${teamId}". ${hint}`);
+  }
+  return ws;
+}
+
+// src/slack/outbound-watch.ts
+var MAX_WATCHES = 40;
+var WATCH_TTL_MS = 7 * 24 * 60 * 60 * 1e3;
+function storePath2() {
+  return join12(appDataDir(), "slack-outbound-watch.json");
+}
+function watchId(teamId, channelId, ts) {
+  return `${teamId}:${channelId}:${ts}`;
+}
+function slackArchiveUrl(channelId, ts) {
+  return `https://slack.com/archives/${channelId}/p${ts.replace(".", "")}`;
+}
+function readStore2() {
+  const path = storePath2();
+  if (!existsSync14(path)) return [];
+  try {
+    const parsed = isSecureFileEncrypted(path) ? readSecureJson(path) : JSON.parse(readFileSync9(path, "utf8"));
+    return Array.isArray(parsed?.watches) ? parsed.watches : [];
+  } catch {
+    return [];
+  }
+}
+function writeStore(watches) {
+  writePrivateFile(storePath2(), `${JSON.stringify({ watches }, null, 2)}
+`);
+  return watches;
+}
+function pruneWatches(watches, nowMs = Date.now()) {
+  const cutoff = nowMs - WATCH_TTL_MS;
+  const kept = watches.filter((w) => {
+    const posted = Date.parse(w.postedAt);
+    return Number.isFinite(posted) ? posted >= cutoff : true;
+  });
+  if (kept.length <= MAX_WATCHES) return kept;
+  return kept.slice().sort((a, b) => b.postedAt.localeCompare(a.postedAt)).slice(0, MAX_WATCHES);
+}
+function recordSlackOutboundWatch(input) {
+  const ts = input.ts.trim();
+  const channelId = input.channelId.trim();
+  const teamId = input.teamId.trim();
+  if (!ts || !channelId || !teamId) return null;
+  const owner = input.ownerUserId?.trim();
+  const toUser = input.toUserId?.trim();
+  if (toUser && owner && toUser === owner) return null;
+  const id = watchId(teamId, channelId, ts);
+  const next = {
+    id,
+    teamId,
+    channelId,
+    ts,
+    threadTs: input.threadTs?.trim() || ts,
+    kind: input.kind === "dm" ? "dm" : "channel",
+    toUserId: toUser,
+    toLabel: input.toLabel.trim() || toUser || channelId,
+    ownerUserId: owner,
+    postedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    lastSeenTs: ts,
+    unread: false,
+    permalink: slackArchiveUrl(channelId, ts)
+  };
+  const watches = pruneWatches(readStore2().filter((w) => w.id !== id));
+  watches.unshift(next);
+  writeStore(pruneWatches(watches));
+  return next;
+}
+
+// src/mcp/slack-tools.ts
+function text(payload, isError = false) {
+  return {
+    content: [{ type: "text", text: JSON.stringify(payload, null, 2) }],
+    ...isError ? { isError: true } : {}
+  };
+}
+function fail(err) {
+  return text(
+    { error: err instanceof Error ? err.message : String(err) },
+    true
+  );
+}
+function registerSlackTools(server) {
+  server.tool(
+    "list_teams",
+    "List Slack workspaces connected in Sideboard Account settings. Each row is team_id + name. Pass team_id to slack_list_channels, slack_list_users, slack_search, slack_read, and slack_post.",
+    {},
+    async () => {
+      const teams = listSlackWorkspaces();
+      if (teams.length === 0) {
+        return text({
+          teams: [],
+          hint: "No Slack workspaces connected. Add one in Account \u2192 Slack workspaces (paste xoxb-/xoxp- or browser sign-in)."
+        });
+      }
+      return text({
+        teams: teams.map((t) => ({
+          team_id: t.team_id,
+          name: t.team_name,
+          search: t.has_user_token
+        }))
+      });
+    }
+  );
+  server.tool(
+    "slack_list_channels",
+    "List channels in a connected Slack workspace. Pass team_id from list_teams.",
+    {
+      team_id: z.string(),
+      limit: z.number().optional()
+    },
+    async ({ team_id, limit }) => {
+      try {
+        const ws = requireSlackWorkspace(team_id);
+        const token = slackTokenFor(ws, "read");
+        const data = await slackApi(token, "conversations.list", {
+          types: "public_channel,private_channel",
+          exclude_archived: true,
+          limit: Math.min(200, Math.max(1, limit ?? 100))
+        });
+        return text({
+          team_id: ws.team_id,
+          team_name: ws.team_name,
+          channels: (data.channels ?? []).map((c) => ({
+            id: c.id,
+            name: c.name,
+            private: Boolean(c.is_private),
+            member: Boolean(c.is_member)
+          }))
+        });
+      } catch (err) {
+        return fail(err);
+      }
+    }
+  );
+  server.tool(
+    "slack_list_users",
+    "List or search people in a connected Slack workspace (for DMs / @mentions). Pass team_id from list_teams. Optional query matches name, display name, real name, or email.",
+    {
+      team_id: z.string(),
+      query: z.string().optional(),
+      limit: z.number().optional()
+    },
+    async ({ team_id, query, limit }) => {
+      try {
+        const ws = requireSlackWorkspace(team_id);
+        const token = slackTokenFor(ws, "read");
+        const users = await listSlackUsers(token, { query, limit });
+        return text({
+          team_id: ws.team_id,
+          team_name: ws.team_name,
+          query: query?.trim() || void 0,
+          users
+        });
+      } catch (err) {
+        return fail(err);
+      }
+    }
+  );
+  server.tool(
+    "slack_search",
+    "Search messages in a connected Slack workspace (needs a user token). Pass team_id from list_teams.",
+    {
+      team_id: z.string(),
+      query: z.string(),
+      count: z.number().optional()
+    },
+    async ({ team_id, query, count }) => {
+      try {
+        const ws = requireSlackWorkspace(team_id);
+        const token = slackTokenFor(ws, "search");
+        const data = await slackApi(token, "search.messages", {
+          query,
+          count: Math.min(50, Math.max(1, count ?? 10)),
+          sort: "timestamp"
+        });
+        return text({
+          team_id: ws.team_id,
+          team_name: ws.team_name,
+          query,
+          matches: (data.messages?.matches ?? []).map((m) => ({
+            channel: m.channel?.name || m.channel?.id,
+            user: m.username || m.user,
+            ts: m.ts,
+            text: m.text,
+            permalink: m.permalink
+          }))
+        });
+      } catch (err) {
+        return fail(err);
+      }
+    }
+  );
+  server.tool(
+    "slack_read",
+    "Read recent messages in a Slack channel or DM, or a thread when ts is set. Pass team_id from list_teams and #channel, @user, or a C\u2026/D\u2026/U\u2026 id.",
+    {
+      team_id: z.string(),
+      channel: z.string(),
+      ts: z.string().optional(),
+      limit: z.number().optional()
+    },
+    async ({ team_id, channel, ts, limit }) => {
+      try {
+        const ws = requireSlackWorkspace(team_id);
+        const token = slackTokenFor(ws, "read");
+        const dest = await resolveSlackDestination(token, channel, { forRead: true });
+        const n = Math.min(100, Math.max(1, limit ?? 20));
+        if (ts?.trim()) {
+          const data2 = await slackApi(token, "conversations.replies", {
+            channel: dest.channelId,
+            ts: ts.trim(),
+            limit: n
+          });
+          return text({
+            team_id: ws.team_id,
+            channel: dest.channelId,
+            label: dest.label,
+            thread_ts: ts.trim(),
+            messages: data2.messages ?? []
+          });
+        }
+        const data = await slackApi(token, "conversations.history", {
+          channel: dest.channelId,
+          limit: n
+        });
+        return text({
+          team_id: ws.team_id,
+          channel: dest.channelId,
+          label: dest.label,
+          messages: data.messages ?? []
+        });
+      } catch (err) {
+        return fail(err);
+      }
+    }
+  );
+  server.tool(
+    "slack_post",
+    "Post a message to a Slack channel or DM (as the Sideboard bot). Pass team_id from list_teams. Use to or channel for #name, @user, or C\u2026/D\u2026/U\u2026 ids. Optional github_url appends a PR / code / comment link. Only notify when the user asks. Thread with thread_ts when set.",
+    {
+      team_id: z.string(),
+      channel: z.string().optional(),
+      to: z.string().optional(),
+      text: z.string(),
+      github_url: z.string().optional(),
+      thread_ts: z.string().optional()
+    },
+    async ({ team_id, channel, to, text: message, github_url, thread_ts }) => {
+      try {
+        const destRaw = (to ?? channel)?.trim();
+        if (!destRaw) {
+          return fail(new Error("slack_post needs `to` or `channel` (#name, @user, or Slack id)"));
+        }
+        const ws = requireSlackWorkspace(team_id);
+        const token = slackTokenFor(ws, "write");
+        const dest = await resolveSlackDestination(token, destRaw);
+        const body = appendGithubLink(message, github_url);
+        const data = await slackApi(
+          token,
+          "chat.postMessage",
+          {
+            channel: dest.channelId,
+            text: body,
+            thread_ts: thread_ts?.trim() || void 0,
+            unfurl_links: true,
+            unfurl_media: true
+          }
+        );
+        const postedTs = data.ts?.trim();
+        const postedChannel = (data.channel || dest.channelId).trim();
+        if (postedTs && postedChannel) {
+          try {
+            recordSlackOutboundWatch({
+              teamId: ws.team_id,
+              channelId: postedChannel,
+              ts: postedTs,
+              threadTs: thread_ts?.trim() || postedTs,
+              kind: dest.kind === "channel" ? "channel" : "dm",
+              toUserId: dest.userId,
+              toLabel: dest.label,
+              ownerUserId: ws.user_id
+            });
+          } catch {
+          }
+        }
+        return text({
+          ok: true,
+          team_id: ws.team_id,
+          channel: postedChannel,
+          label: dest.label,
+          kind: dest.kind,
+          user_id: dest.userId,
+          ts: postedTs
+        });
+      } catch (err) {
+        return fail(err);
+      }
+    }
+  );
+}
+
 // src/mcp/server.ts
 var MAX_ORCH_THREADS = 5;
 var CREATE_THREAD_TIMEOUT_MS = 9e4;
@@ -5511,7 +6471,7 @@ function withTimeout(promise, ms, label) {
 async function startMcpServer() {
   const orch = getOrchestrator();
   try {
-    const { maxConcurrentAgents } = await import("../app-settings-GJVZGU3M.js");
+    const { maxConcurrentAgents } = await import("../app-settings-P42Z3VOB.js");
     orch.setMaxConcurrent(maxConcurrentAgents());
   } catch {
   }
@@ -5564,7 +6524,7 @@ async function startMcpServer() {
   server.tool(
     "get_thread",
     "Get a compact thread summary by id/ref",
-    { ref: z.string() },
+    { ref: z2.string() },
     async ({ ref }) => {
       const t = orch.getThread(ref);
       if (!t) {
@@ -5593,14 +6553,14 @@ async function startMcpServer() {
     "present_artifact",
     "Show an HTML, SVG, markdown, or React document in Sideboard\u2019s Claude-style side column (desktop). Use instead of claude.ai\u2019s artifact tool \u2014 pass the full document content. Prefer type=html for interactive pages. For type=react, pass a single component module that `export default`s a component (JSX/TSX ok) \u2014 Sideboard bootstraps React/ReactDOM/Babel and renders it; only `react`/`react-dom` imports are available, no other npm packages.",
     {
-      title: z.string().describe("Short title shown in the artifact pane header"),
-      type: z.enum(["html", "svg", "markdown", "react"]).describe(
+      title: z2.string().describe("Short title shown in the artifact pane header"),
+      type: z2.enum(["html", "svg", "markdown", "react"]).describe(
         "Artifact kind \u2014 html opens an iframe preview; react transpiles and renders a default-exported component in a sandboxed iframe"
       ),
-      content: z.string().describe(
+      content: z2.string().describe(
         "Full document body (complete HTML page, SVG markup, markdown, or a React component module with a default export)"
       ),
-      artifact_id: z.string().optional().describe("Stable id when updating the same artifact across turns")
+      artifact_id: z2.string().optional().describe("Stable id when updating the same artifact across turns")
     },
     async ({ title, type, artifact_id }) => {
       const id = artifact_id?.trim() || `artifact_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`;
@@ -5618,15 +6578,15 @@ async function startMcpServer() {
     "ask_user",
     "Ask the user clarifying multiple-choice questions in Sideboard\u2019s composer (plan mode). Before calling, write a short chat message explaining the decision and what each option means. Include a description on every option. Use for approach forks and requirements \u2014 not for \u201Cis the plan ready?\u201D. After calling, stop and wait for their next message with answers.",
     {
-      questions: z.array(
-        z.object({
-          question: z.string().describe("Full question text ending with ?"),
-          header: z.string().max(24).optional().describe("Short label shown above the question"),
-          multiSelect: z.boolean().optional().describe("Allow selecting multiple options"),
-          options: z.array(
-            z.object({
-              label: z.string(),
-              description: z.string().optional().describe("What this option means / when to choose it (strongly preferred)")
+      questions: z2.array(
+        z2.object({
+          question: z2.string().describe("Full question text ending with ?"),
+          header: z2.string().max(24).optional().describe("Short label shown above the question"),
+          multiSelect: z2.boolean().optional().describe("Allow selecting multiple options"),
+          options: z2.array(
+            z2.object({
+              label: z2.string(),
+              description: z2.string().optional().describe("What this option means / when to choose it (strongly preferred)")
             })
           ).min(2).max(6).describe("2\u20136 choices (Sideboard also offers Other)")
         })
@@ -5645,9 +6605,9 @@ async function startMcpServer() {
     "present_plan",
     "Save the implementation plan as markdown to .context/attachments/plan.md and show it in Sideboard chat for user approval (Copy / Hand off / Approve). Call this when the plan is ready \u2014 required in plan mode. Pass the full plan body in content. Then Claude should call ExitPlanMode.",
     {
-      title: z.string().optional().describe("Short plan title (defaults to Plan)"),
-      content: z.string().min(1).describe("Full plan markdown (headings, steps, risks, open questions)"),
-      thread_id: z.string().optional().describe("Sideboard thread id when cwd is not the worktree")
+      title: z2.string().optional().describe("Short plan title (defaults to Plan)"),
+      content: z2.string().min(1).describe("Full plan markdown (headings, steps, risks, open questions)"),
+      thread_id: z2.string().optional().describe("Sideboard thread id when cwd is not the worktree")
     },
     async ({ title, content, thread_id }) => {
       const { writePlanFile: writePlanFile2 } = await import("../plan-file-PHVKUAEE.js");
@@ -5668,17 +6628,17 @@ async function startMcpServer() {
   );
   server.tool(
     "present_schema",
-    "Open Sideboard\u2019s schema-driven CMS side column (filterable table and/or form). Pass JSON Schema + schemaUi (Brightsy extensions supported). Use datasource=brightsy with resource_id (record type UUID) when logged into Brightsy; use datasource=inline with embedded resource/records for any other source.",
+    "Open Sideboard\u2019s schema-driven side column (filterable table and/or form). Pass JSON Schema + optional schemaUi. Prefer datasource=inline with embedded resource/records. Use datasource=brightsy with resource_id only when the user is logged into Brightsy.",
     {
-      title: z.string().describe("Pane title"),
-      mode: z.enum(["table", "form"]).optional().describe("table = list/filter records; form = edit one record"),
-      datasource: z.enum(["brightsy", "inline"]).optional().describe("brightsy resolves via login; inline uses embedded resource/records"),
-      resource_id: z.string().optional().describe("Brightsy record type UUID (or generic resource id)"),
-      record_id: z.string().optional().describe("Record id when opening form mode"),
-      resource: z.record(z.unknown()).optional().describe("Inline { id, title, schema, schemaUi?, slug? }"),
-      record: z.record(z.unknown()).optional().describe("Inline record { id, data, published_at? }"),
-      records: z.array(z.record(z.unknown())).optional().describe("Inline records for table mode"),
-      pane_id: z.string().optional().describe("Stable pane id across updates")
+      title: z2.string().describe("Pane title"),
+      mode: z2.enum(["table", "form"]).optional().describe("table = list/filter records; form = edit one record"),
+      datasource: z2.enum(["brightsy", "inline"]).optional().describe("brightsy resolves via login; inline uses embedded resource/records"),
+      resource_id: z2.string().optional().describe("Brightsy record type UUID (or generic resource id)"),
+      record_id: z2.string().optional().describe("Record id when opening form mode"),
+      resource: z2.record(z2.unknown()).optional().describe("Inline { id, title, schema, schemaUi?, slug? }"),
+      record: z2.record(z2.unknown()).optional().describe("Inline record { id, data, published_at? }"),
+      records: z2.array(z2.record(z2.unknown())).optional().describe("Inline records for table mode"),
+      pane_id: z2.string().optional().describe("Stable pane id across updates")
     },
     async (args) => {
       const id = args.pane_id?.trim() || `schema_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`;
@@ -5699,10 +6659,10 @@ async function startMcpServer() {
     "present_files",
     "Open Sideboard\u2019s Files column (CMS-style file manager: browse, upload, pick). Use datasource=brightsy when the user is logged into Brightsy account storage; datasource=memory for a session-local demo store. Prefer this over claiming a file manager UI is unavailable. Pair with present_schema when editing records that need media.",
     {
-      title: z.string().optional().describe("Pane title (default: Files)"),
-      datasource: z.enum(["brightsy", "memory"]).optional().describe("brightsy = account storage via login; memory = session demo store"),
-      path: z.string().optional().describe("Initial folder path (e.g. public)"),
-      pane_id: z.string().optional().describe("Stable pane id across updates")
+      title: z2.string().optional().describe("Pane title (default: Files)"),
+      datasource: z2.enum(["brightsy", "memory"]).optional().describe("brightsy = account storage via login; memory = session demo store"),
+      path: z2.string().optional().describe("Initial folder path (e.g. public)"),
+      pane_id: z2.string().optional().describe("Stable pane id across updates")
     },
     async (args) => {
       const id = args.pane_id?.trim() || `files_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`;
@@ -5717,23 +6677,62 @@ async function startMcpServer() {
       return { content: [{ type: "text", text: JSON.stringify(payload) }] };
     }
   );
+  registerSlackTools(server);
   if (sideboardMcpProfile() !== "worktree") {
-    const { resolveNewThreadOptions: resolveNewThreadOptions2, resolveThreadDefaults } = await import("../app-settings-GJVZGU3M.js");
+    const { getCaffeinateHold, setCaffeinateHold } = await import("../caffeinate-hold-BEJIYPJ7.js");
+    const { resolveNewThreadOptions: resolveNewThreadOptions2, resolveThreadDefaults } = await import("../app-settings-P42Z3VOB.js");
     const accountDefaults = resolveThreadDefaults();
     const accountDefaultsHint = `Account defaults: agent=${accountDefaults.agent}, model=${accountDefaults.model?.trim() || "Auto"}, effort=${accountDefaults.effort}`;
+    server.tool(
+      "set_caffeinate",
+      "Keep this Mac awake with caffeinate (like Claude Code) across turns \u2014 independent of Settings toggles. Turn ON when the user will be away from the keyboard, is driving work from Slack, or asks you to keep the machine awake. Turn OFF when they say they are done, wrapping up, going to sleep, or no longer need the Mac awake. macOS only.",
+      {
+        enabled: z2.boolean().describe("true = hold caffeinate on; false = release and let the Mac sleep")
+      },
+      async ({ enabled }) => {
+        const state = setCaffeinateHold(enabled);
+        if (enabled && !state.held) {
+          return {
+            content: [
+              {
+                type: "text",
+                text: JSON.stringify({
+                  ...state,
+                  ok: false,
+                  message: state.platform === "darwin" ? "Could not start caffeinate." : "Caffeinate is macOS only."
+                })
+              }
+            ],
+            isError: true
+          };
+        }
+        return {
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify({
+                ...getCaffeinateHold(),
+                ok: true,
+                message: state.held ? "Mac will stay awake until you call set_caffeinate with enabled=false (or the user says they are done)." : "Caffeinate hold released. The Mac can sleep (unless Settings caffeinate toggles are on)."
+              })
+            }
+          ]
+        };
+      }
+    );
     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.`,
       {
-        sourceType: z.enum(["branch", "pr", "ticket"]),
-        sourceRef: z.string(),
-        agent: z.enum(["claude", "codex", "opencode", "brightsy", "cursor"]).optional().describe(`Omit to use Account default agent (${accountDefaults.agent})`),
-        model: z.string().nullable().optional().describe(
+        sourceType: z2.enum(["branch", "pr", "ticket"]),
+        sourceRef: z2.string(),
+        agent: z2.enum(["claude", "codex", "opencode", "brightsy", "cursor"]).optional().describe(`Omit to use Account default agent (${accountDefaults.agent})`),
+        model: z2.string().nullable().optional().describe(
           `Usually omit to use Account default model (${accountDefaults.model?.trim() || "Auto"}). Pass null only to force Auto / agent-default.`
         ),
-        repoPath: z.string(),
-        title: z.string().optional(),
-        parentThreadId: z.string().optional().describe(
+        repoPath: z2.string(),
+        title: z2.string().optional(),
+        parentThreadId: z2.string().optional().describe(
           "Orchestration: omit (preferred) or pass YOUR chat id from the turn reminder / AGENTS.md. Do not invent uuids."
         )
       },
@@ -5840,9 +6839,9 @@ async function startMcpServer() {
       "send_to_thread",
       "Queue a prompt on a worktree thread chat (runs under concurrency cap). Use after create_thread to start or continue a conversation. Set force_stop=true to interrupt an in-flight/queued turn (kill + clear queue) before queueing this prompt \u2014 use when the thread is mid-turn or has stale queued prompts you need to replace.",
       {
-        ref: z.string(),
-        prompt: z.string(),
-        force_stop: z.boolean().optional()
+        ref: z2.string(),
+        prompt: z2.string(),
+        force_stop: z2.boolean().optional()
       },
       async ({ ref, prompt, force_stop }) => {
         if (force_stop) {
@@ -5871,8 +6870,8 @@ async function startMcpServer() {
       "wait_for_turn",
       "Block until the thread finishes its current/queued turn (avoids polling). Use after send_to_thread to read the agent reply.",
       {
-        ref: z.string(),
-        timeoutMs: z.number().optional()
+        ref: z2.string(),
+        timeoutMs: z2.number().optional()
       },
       async ({ ref, timeoutMs }) => {
         const thread = await orch.waitForTurn(ref, timeoutMs ?? 6e5);
@@ -5894,7 +6893,7 @@ async function startMcpServer() {
     server.tool(
       "get_turn_result",
       "Final assistant message only (not full transcript)",
-      { ref: z.string() },
+      { ref: z2.string() },
       async ({ ref }) => {
         const result = orch.getTurnResult(ref);
         return { content: [{ type: "text", text: JSON.stringify(result) }] };
@@ -5904,8 +6903,8 @@ async function startMcpServer() {
       "stop_thread",
       "Force-stop a thread: kill any in-flight agent turn AND clear queued prompts so drainQueue cannot continue. Does not archive the worktree. Optional force defaults to true.",
       {
-        ref: z.string(),
-        force: z.boolean().optional()
+        ref: z2.string(),
+        force: z2.boolean().optional()
       },
       async ({ ref, force }) => {
         const t = orch.getThread(ref);
@@ -5934,8 +6933,8 @@ async function startMcpServer() {
     );
     server.tool(
       "archive_thread",
-      "Archive a thread (stops agent/dev, runs archive script, removes worktree when last chat tab). Cannot archive the cloud coordinator \u2014 use the Sideboard UI for that.",
-      { ref: z.string() },
+      "Archive a thread (stops agent/dev, runs archive script, removes worktree when last chat tab). Coordinators open PRs only by asking the worktree agent.",
+      { ref: z2.string() },
       async ({ ref }) => {
         const t = orch.getThread(ref);
         if (!t) {
@@ -5968,7 +6967,7 @@ async function startMcpServer() {
     server.tool(
       "restore_thread",
       "Restore an archived thread (recreates worktree from branch when needed)",
-      { ref: z.string() },
+      { ref: z2.string() },
       async ({ ref }) => {
         try {
           const restored = await orch.restore(ref);
@@ -5994,8 +6993,8 @@ async function startMcpServer() {
       "get_diff",
       "Compact diff summary (capped hunks, paginated)",
       {
-        ref: z.string(),
-        maxFiles: z.number().optional()
+        ref: z2.string(),
+        maxFiles: z2.number().optional()
       },
       async ({ ref, maxFiles }) => {
         const summary = await orch.diffSummary(ref);
@@ -6015,7 +7014,7 @@ async function startMcpServer() {
     server.tool(
       "request_review",
       'Start a merge-readiness Review on a worktree agent thread (same as the desktop Review button). Opens a new Review chat tab, attaches .sideboard/review.md when present (else local Review request.md / stock template), and sends "Review changes in this workspace." Expect Approve / Approve with nits / Request changes / Needs more information. Pass a worktree thread ref \u2014 not the orchestrator. Then wait_for_turn / get_turn_result on the returned review tab id.',
-      { ref: z.string().describe("Worktree thread id/ref to review") },
+      { ref: z2.string().describe("Worktree thread id/ref to review") },
       async ({ ref }) => {
         try {
           const tab = await orch.requestReview(ref);
@@ -6040,7 +7039,7 @@ async function startMcpServer() {
         }
       }
     );
-    const agentEnum = z.enum(["claude", "codex", "opencode", "brightsy", "cursor"]);
+    const agentEnum = z2.enum(["claude", "codex", "opencode", "brightsy", "cursor"]);
     server.tool(
       "list_models",
       "List models for an agent. Prefer Auto: do not call this unless you have a reason to pin a specific model (user request, cost/latency, capability). Omit agent to list all.",
@@ -6063,11 +7062,11 @@ async function startMcpServer() {
       "fork_worktree",
       "Fork a worktree agent chat into a NEW git worktree + chat (desktop \u201CFork to new workspace\u201D). Seeds a transcript (through through_index, default all). Optional agent override. Leave model unset for Auto (default) \u2014 only pass model when you have a reason. Not for the orchestrator. Then send_to_thread / wait_for_turn on the returned id.",
       {
-        ref: z.string().describe("Worktree thread id/ref to fork"),
-        through_index: z.number().optional().describe("Inclusive message index to include in the transcript (default: all)"),
+        ref: z2.string().describe("Worktree thread id/ref to fork"),
+        through_index: z2.number().optional().describe("Inclusive message index to include in the transcript (default: all)"),
         agent: agentEnum.optional().describe("Agent for the forked chat (default: same as source)"),
-        model: z.string().nullable().optional().describe("Usually omit (Auto). Only set from list_models when you need a specific model"),
-        title: z.string().optional()
+        model: z2.string().nullable().optional().describe("Usually omit (Auto). Only set from list_models when you need a specific model"),
+        title: z2.string().optional()
       },
       async ({ ref, through_index, agent, model, title }) => {
         try {
@@ -6106,13 +7105,13 @@ async function startMcpServer() {
     );
     server.tool(
       "fork_chat",
-      "Fork a chat into a NEW tab on the SAME workspace: worktree agent \u2192 same worktree tab; Global orchestration chat \u2192 new orchestration chat (same synthetic home). Seeds a transcript; optional agent override. Leave model unset for Auto unless you have a reason. Orchestration forks require an MCP-capable agent (claude, cursor, codex, opencode \u2014 not brightsy). Remote coordinators use this to continue an orchestration chat on another agent after session limits. Then send_to_thread / wait_for_turn on the returned id. Use fork_worktree only for worktree agents that need a new git worktree.",
+      "Fork a chat into a NEW tab on the SAME workspace: worktree agent \u2192 same worktree tab; Global orchestration chat \u2192 new orchestration chat (same synthetic home). Seeds a transcript; optional agent override. Leave model unset for Auto unless you have a reason. Orchestration forks require an MCP-capable agent (claude, cursor, codex, opencode \u2014 not brightsy). Slack / Global orchestrators use this to continue an orchestration chat on another agent after session limits. Then send_to_thread / wait_for_turn on the returned id. Use fork_worktree only for worktree agents that need a new git worktree.",
       {
-        ref: z.string().describe("Thread id/ref to fork (worktree agent or orchestration chat)"),
-        through_index: z.number().optional().describe("Inclusive message index to include in the transcript (default: all)"),
+        ref: z2.string().describe("Thread id/ref to fork (worktree agent or orchestration chat)"),
+        through_index: z2.number().optional().describe("Inclusive message index to include in the transcript (default: all)"),
         agent: agentEnum.optional().describe("Agent for the forked chat (default: same as source)"),
-        model: z.string().nullable().optional().describe("Usually omit (Auto). Only set from list_models when you need a specific model"),
-        title: z.string().optional()
+        model: z2.string().nullable().optional().describe("Usually omit (Auto). Only set from list_models when you need a specific model"),
+        title: z2.string().optional()
       },
       async ({ ref, through_index, agent, model, title }) => {
         try {
@@ -6158,8 +7157,8 @@ async function startMcpServer() {
       "run_dev_script",
       "Start a .sideboard/.conductor run script for a thread (default script if name omitted); returns port",
       {
-        ref: z.string(),
-        name: z.string().optional()
+        ref: z2.string(),
+        name: z2.string().optional()
       },
       async ({ ref, name }) => {
         const result = await orch.startDev(ref, name);
@@ -6181,7 +7180,7 @@ async function startMcpServer() {
     server.tool(
       "list_run_scripts",
       "List named run scripts available for a thread",
-      { ref: z.string() },
+      { ref: z2.string() },
       async ({ ref }) => {
         const scripts = orch.listThreadRunScripts(ref);
         const active = orch.getActiveRuns(ref);
@@ -6199,8 +7198,8 @@ async function startMcpServer() {
       "stop_dev_script",
       "Stop a running script for a thread (all scripts if name omitted)",
       {
-        ref: z.string(),
-        name: z.string().optional()
+        ref: z2.string(),
+        name: z2.string().optional()
       },
       async ({ ref, name }) => {
         orch.stopDev(ref, name);
@@ -6210,7 +7209,7 @@ async function startMcpServer() {
     server.tool(
       "run_setup",
       "Re-run workspace setup (Sideboard/Conductor settings or .cursor/worktrees.json)",
-      { ref: z.string() },
+      { ref: z2.string() },
       async ({ ref }) => {
         const result = await orch.runSetup(ref);
         return {
@@ -6221,7 +7220,7 @@ async function startMcpServer() {
     server.tool(
       "add_workspace",
       "Register a git repo as a Sideboard workspace",
-      { repoPath: z.string() },
+      { repoPath: z2.string() },
       async ({ repoPath }) => {
         const ws = await orch.addWorkspace(repoPath);
         return { content: [{ type: "text", text: JSON.stringify(ws) }] };
@@ -6230,7 +7229,7 @@ async function startMcpServer() {
     server.tool(
       "remove_workspace",
       "Unregister a Sideboard workspace (does not archive threads)",
-      { repoPath: z.string() },
+      { repoPath: z2.string() },
       async ({ repoPath }) => {
         orch.removeWorkspace(repoPath);
         return { content: [{ type: "text", text: "ok" }] };
@@ -6240,12 +7239,12 @@ async function startMcpServer() {
       "fanout",
       "Best-of-n: create one thread per agent with the same prompt (parallel attempts)",
       {
-        prompt: z.string(),
-        agents: z.array(z.enum(["claude", "codex", "opencode", "brightsy", "cursor"])),
-        repoPath: z.string(),
-        sourceType: z.enum(["branch", "pr", "ticket"]).optional(),
-        sourceRef: z.string().optional(),
-        title: z.string().optional()
+        prompt: z2.string(),
+        agents: z2.array(z2.enum(["claude", "codex", "opencode", "brightsy", "cursor"])),
+        repoPath: z2.string(),
+        sourceType: z2.enum(["branch", "pr", "ticket"]).optional(),
+        sourceRef: z2.string().optional(),
+        title: z2.string().optional()
       },
       async (args) => {
         const threads = await orch.bestOfN(args);
@@ -6272,8 +7271,8 @@ async function startMcpServer() {
       "list_branches",
       "List git branches in a registered workspace. Pass repoPath from list_workspaces (unmerged into the default branch by default \u2014 for create_thread sourceType=branch).",
       {
-        repoPath: z.string(),
-        unmergedOnly: z.boolean().optional()
+        repoPath: z2.string(),
+        unmergedOnly: z2.boolean().optional()
       },
       async ({ repoPath, unmergedOnly }) => {
         const root = await resolveRepoRoot(repoPath);
@@ -6293,7 +7292,7 @@ async function startMcpServer() {
     server.tool(
       "list_prs",
       "List open GitHub PRs for a registered workspace. Pass repoPath from list_workspaces (uses gh against that repo remote). Then create_thread with sourceType=pr.",
-      { repoPath: z.string() },
+      { repoPath: z2.string() },
       async ({ repoPath }) => {
         const root = await resolveRepoRoot(repoPath);
         const prs = await listPrs(root);
@@ -6312,7 +7311,7 @@ async function startMcpServer() {
     server.tool(
       "get_pr_stack",
       "Load the GitHub PR stack for a thread worktree (`gh stack view --json`). Returns null JSON when the branch is not stacked. Prefer this before mergePr on stacked PRs.",
-      { ref: z.string() },
+      { ref: z2.string() },
       async ({ ref }) => {
         const stack = await orch.getPrStack(ref);
         return {
@@ -6324,8 +7323,8 @@ async function startMcpServer() {
       "open_pr_stack_layers",
       "Materialize one worktree+thread per stack layer (or a single 1-based layer). Pass a thread ref already on the stack.",
       {
-        ref: z.string(),
-        layer: z.number().int().positive().optional()
+        ref: z2.string(),
+        layer: z2.number().int().positive().optional()
       },
       async ({ ref, layer }) => {
         const result = await orch.openPrStackLayers(ref, { layer });
@@ -6359,9 +7358,9 @@ async function startMcpServer() {
       "add_stack_layer",
       "Add a branch on top of the current stack (`gh stack add`) and open a worktree+thread for it.",
       {
-        ref: z.string(),
-        branchName: z.string(),
-        title: z.string().optional()
+        ref: z2.string(),
+        branchName: z2.string(),
+        title: z2.string().optional()
       },
       async ({ ref, branchName, title }) => {
         const result = await orch.addStackLayer(ref, branchName, { title });
@@ -6390,11 +7389,11 @@ async function startMcpServer() {
       "create_pr_stack",
       "Create a new GitHub PR stack with one Sideboard worktree per layer (bottom\u2192top branch names). Requires `gh extension install github/gh-stack`.",
       {
-        repoPath: z.string(),
-        branches: z.array(z.string()).min(1),
-        agent: z.enum(["claude", "codex", "opencode", "brightsy", "cursor"]),
-        base: z.string().optional(),
-        title: z.string().optional()
+        repoPath: z2.string(),
+        branches: z2.array(z2.string()).min(1),
+        agent: z2.enum(["claude", "codex", "opencode", "brightsy", "cursor"]),
+        base: z2.string().optional(),
+        title: z2.string().optional()
       },
       async (args) => {
         const result = await orch.createPrStack({
@@ -6432,7 +7431,7 @@ async function startMcpServer() {
     server.tool(
       "list_issues",
       "List issues from Sideboard Account connections (Linear API or GitHub Issues; Linear\u2192GitHub fallback when Linear is not connected). Pass repoPath from list_workspaces \u2014 GitHub Issues are scoped to that repo. Then create_thread with sourceType=ticket.",
-      { repoPath: z.string() },
+      { repoPath: z2.string() },
       async ({ repoPath }) => {
         const root = await resolveRepoRoot(repoPath);
         const result = await listIssues(root);
@@ -6443,8 +7442,8 @@ async function startMcpServer() {
       "list_linear_issues",
       "Deprecated: prefer list_issues. Lists assigned Linear issues via the chosen agent MCP connector",
       {
-        agent: z.enum(["claude", "codex", "opencode"]),
-        repoPath: z.string()
+        agent: z2.enum(["claude", "codex", "opencode"]),
+        repoPath: z2.string()
       },
       async ({ agent, repoPath }) => {
         const issues = await listLinearIssues(agent, repoPath);