@sideboard-ai/core 0.1.241 → 0.1.243

package/dist/{chunk-63UHRQ64.js → chunk-DARSRQUE.js}

@@ -4,17 +4,17 @@ import {
   extractPresentedPlan,
   readPlanFile,
   writePlanFile
-} from "./chunk-JFOPOMK7.js";
+} from "./chunk-WDDUIGFK.js";
 import {
   releaseCaffeinateHoldForThread
 } from "./chunk-DQN5U2VH.js";
 import {
-  PLAN_MODE_INSTRUCTION,
   adjustBrightsyTurnExit,
   applyAgentEvent,
   applyAgentRunnerHeapEnv,
   clipAgentEventForPaint,
   clipToolResultForStore,
+  compactSummaryPart,
   fallbackTurnFailDetail,
   finalizeParts,
   formatAgentErrorContinuePrompt,
@@ -24,6 +24,7 @@ import {
   isInternalAgentStatusText,
   isPollWrapperToolName,
   isSessionQuotaLimit,
+  lastAssistantMessageText,
   liveActivitySummary,
   looksLikeAgentFailureMessage,
   looksLikeInvalidAgentSession,
@@ -33,6 +34,7 @@ import {
   parseBrightsyCliLine,
   parseSessionQuotaResetAt,
   partsToAssistantText,
+  planModeTurnInstruction,
   pushTurnStderr,
   resolveQuotaFallbackAgent,
   shouldFeedErrorBackToAgent,
@@ -42,7 +44,7 @@ import {
   summarizeTurnStderr,
   toolDescription,
   turnFailChatText
-} from "./chunk-3Q4PVZ3U.js";
+} from "./chunk-HR4RNC73.js";
 import {
   SLACK_REPLY_FORMATTING,
   addWorkspace,
@@ -65,7 +67,7 @@ import {
   stageAbsolutePathsAsAttachments,
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads
-} from "./chunk-OKHOYI53.js";
+} from "./chunk-ECZTXNYR.js";
 import {
   addPrStackLayer,
   allocateTeamName,
@@ -114,7 +116,7 @@ import {
   worktreeDisplayLabelForGroup,
   worktreeNameFromPath,
   worktreeSlugForTicket
-} from "./chunk-TB6UMHIF.js";
+} from "./chunk-7UCZ4DRF.js";
 import {
   ATTACHMENTS_DIR,
   DETACHED_JOBS_DIR,
@@ -132,7 +134,7 @@ import {
   updateThread,
   withThreadLock,
   writeThread
-} from "./chunk-NJ5OXOTN.js";
+} from "./chunk-7HOKP4GR.js";
 import {
   ensureWorktreeSideboardIgnored
 } from "./chunk-DD67JWTN.js";
@@ -173,7 +175,7 @@ import {
   sumUsageList,
   updateAdvancedSettings,
   usageOnLimit
-} from "./chunk-QLWMHQPH.js";
+} from "./chunk-YLGBQVRK.js";
 import {
   writePrivateFile
 } from "./chunk-NSTQ6QKD.js";
@@ -488,9 +490,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-TD5SARNW.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-GIQ6F6IJ.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-ATK73HYU.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-PYIRQGU7.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -791,15 +793,15 @@ function shouldAutoArchiveOnPrMerge(opts) {
 // src/hook/conductor.ts
 import {
   copyFileSync,
-  existsSync as existsSync3,
-  mkdirSync as mkdirSync4,
-  readdirSync,
-  readFileSync as readFileSync3,
+  existsSync as existsSync4,
+  mkdirSync as mkdirSync5,
+  readdirSync as readdirSync2,
+  readFileSync as readFileSync4,
   realpathSync
 } from "fs";
 import { execFileSync } from "child_process";
 import { createServer } from "net";
-import { basename, dirname as dirname3, join as join5, resolve, sep } from "path";
+import { basename, dirname as dirname4, join as join6, resolve, sep } from "path";
 import { execa as execa2 } from "execa";
 import { createInterface as createInterface2 } from "readline";
 
@@ -1172,12 +1174,38 @@ ${match.text}`, "");
   blocks.push("Continue from this context. Do not repeat the summary unless asked.");
   return blocks.join("\n");
 }
+function compactArchiveProse(message) {
+  if (message.origin === "continue") return null;
+  if (message.role === "summary") return null;
+  let text = (message.text ?? "").trim();
+  if (!text && message.role === "agent") {
+    text = lastAssistantMessageText(message.parts).trim();
+  }
+  if (!text || isInternalAgentStatusText(text)) return null;
+  return { role: message.role, text, ts: message.ts };
+}
+function messagesForCompactArchive(older) {
+  const out = [];
+  for (const message of older) {
+    const prose = compactArchiveProse(message);
+    if (prose) out.push(prose);
+  }
+  return out;
+}
+function appendCompactedMessages(existing, older) {
+  const next = messagesForCompactArchive(older);
+  if (!existing?.length) return next;
+  if (!next.length) return existing;
+  return [...existing, ...next];
+}
 function applyCompaction(messages, summaryText, thresholds = {}) {
   const { older, recent } = splitForCompaction(messages, thresholds);
   if (older.length === 0) return messages;
+  const text = summaryText.trim();
   const summary = {
     role: "summary",
-    text: summaryText.trim(),
+    text,
+    parts: [compactSummaryPart(text)],
     ts: (/* @__PURE__ */ new Date()).toISOString()
   };
   return [summary, ...recent];
@@ -1205,6 +1233,7 @@ async function maybeCompactContext(thread, thresholds = {}, summarize = summariz
     cwd: thread.worktreePath
   });
   let messages = applyCompaction(thread.messages, summary, thresholds);
+  const compactedMessages = appendCompactedMessages(thread.compactedMessages, older);
   const resetSession = shouldResetSessionForOccupancy({ messages: thread.messages });
   if (resetSession) {
     messages = applyForwardOccupancy(messages);
@@ -1212,6 +1241,7 @@ async function maybeCompactContext(thread, thresholds = {}, summarize = summariz
   const next = {
     ...thread,
     messages,
+    ...compactedMessages.length ? { compactedMessages } : { compactedMessages: void 0 },
     sessionId: resetSession ? null : thread.sessionId,
     updatedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
@@ -1719,1595 +1749,1615 @@ function saveWorktreeRunPorts(worktreePath, scriptName, ports) {
 `, "utf8");
 }
 
-// src/hook/conductor.ts
-var PORT_RANGE_SIZE = 10;
-var RECLAIM_RETRY_DELAY_MS = 40;
-var RECLAIM_TRIES = 8;
-function matchSimpleGlob(pattern, name) {
-  const escaped = pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*").replace(/\?/g, ".");
-  return new RegExp(`^${escaped}$`).test(name);
-}
-function readWorktreeInclude(repoPath) {
-  const path = join5(repoPath, ".worktreeinclude");
-  if (!existsSync3(path)) return [];
-  return readFileSync3(path, "utf8").split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("#"));
+// src/mcp/wait-for-job.ts
+import {
+  appendFileSync as appendFileSync2,
+  existsSync as existsSync3,
+  mkdirSync as mkdirSync4,
+  readdirSync,
+  readFileSync as readFileSync3,
+  writeFileSync as writeFileSync3
+} from "fs";
+import { dirname as dirname3, join as join5 } from "path";
+
+// src/mcp/wait-for-turn.ts
+var MCP_WAIT_FOR_TURN_MAX_MS = 45e3;
+function mcpWaitForTurnTimeoutMs(requested) {
+  const n = requested ?? MCP_WAIT_FOR_TURN_MAX_MS;
+  if (!Number.isFinite(n)) return MCP_WAIT_FOR_TURN_MAX_MS;
+  return Math.min(Math.max(1e3, Math.floor(n)), MCP_WAIT_FOR_TURN_MAX_MS);
 }
-function resolveFilesToCopy(repoPath) {
-  const fromInclude = readWorktreeInclude(repoPath);
-  if (fromInclude.length) return fromInclude;
-  const settings = loadRepoSettings(repoPath);
-  if (settings?.filesToCopy?.length) return settings.filesToCopy;
-  if (settings?.fileIncludeGlobs?.length) {
-    const matched = [];
-    try {
-      for (const entry of readdirSync(repoPath, { withFileTypes: true })) {
-        if (!entry.isFile()) continue;
-        for (const glob of settings.fileIncludeGlobs) {
-          if (matchSimpleGlob(glob, entry.name) || matchSimpleGlob(basename(glob), entry.name)) {
-            matched.push(entry.name);
-            break;
-          }
-        }
-      }
-    } catch {
-    }
-    if (matched.length) return [...new Set(matched)];
-  }
-  const defaults = [];
-  try {
-    for (const entry of readdirSync(repoPath, { withFileTypes: true })) {
-      if (entry.isFile() && entry.name.startsWith(".env")) {
-        defaults.push(entry.name);
-      }
-    }
-  } catch {
+var MCP_WAIT_STILL_RUNNING_HINT = "Child is still working. Call wait_for_turn again. Do not send_to_thread a check-in (that steers / interrupts) or assume a hang while progress is updating.";
+var MCP_WAIT_QUEUED_HINT = "Child is queued waiting for a concurrency slot \u2014 it has not started yet. Call wait_for_turn again. Do not send_to_thread a check-in (that steers / interrupts), force_stop, or assume it failed to start.";
+var MCP_WAIT_STOPPED_HINT = "Child was stopped before the turn finished. Do not treat this as success. send_to_thread to resume, or tell the user.";
+var MCP_WAIT_BROKEN_HINT = "Child worktree is broken (missing on disk). Tell the user \u2014 do not treat this as success.";
+var MCP_WAIT_ERROR_HINT = "Child turn failed. lastError/text is the failure \u2014 switch agent, tell the user, or retry. Do not treat empty text as success.";
+var MCP_WAIT_INPUT_REQUIRED_HINT = "Child asked the user a question (ask_user). taskState is input-required. Wait for the user to answer in that chat \u2014 do not send_to_thread a check-in.";
+function mcpWaitTaskHint(taskState, status) {
+  switch (taskState) {
+    case "submitted":
+      return MCP_WAIT_QUEUED_HINT;
+    case "working":
+      return MCP_WAIT_STILL_RUNNING_HINT;
+    case "input-required":
+      return MCP_WAIT_INPUT_REQUIRED_HINT;
+    case "canceled":
+      return MCP_WAIT_STOPPED_HINT;
+    case "failed":
+      return status === "broken" ? MCP_WAIT_BROKEN_HINT : MCP_WAIT_ERROR_HINT;
+    default:
+      return void 0;
   }
-  if (defaults.length) return defaults;
-  return [".env.local", ".env"];
 }
-function copyConfiguredFiles(repoPath, worktreePath) {
-  const patterns = resolveFilesToCopy(repoPath);
-  const copied = [];
-  for (const rel of patterns) {
-    const src = join5(repoPath, rel);
-    if (!existsSync3(src)) continue;
-    const dest = join5(worktreePath, rel);
-    mkdirSync4(dirname3(dest), { recursive: true });
-    copyFileSync(src, dest);
-    copied.push(rel);
+
+// src/mcp/wait-for-job.ts
+var MAX_JOB_CONTINUES = 8;
+var MAX_JOB_DELTA_LINES = 80;
+var MAX_JOB_DELTA_CHARS = 4e3;
+var DEFERRED_DONE_MAX_CHARS = 480;
+var GH_WATCH_REFRESH = "Refreshing run status every 3 seconds.";
+var MCP_WAIT_JOB_STILL_RUNNING_HINT = "Job is still running. The type=log pane already appended this delta. Call wait_for_job again. If it is hanging, producing no useful output, or doing the wrong thing, call stop_job (same id) instead of looping forever. Do not end the turn or tell the user you will let them know later.";
+var MCP_STOP_JOB_HINT = "Stopped. The type=log pane is status=failed with the last delta. Do not wait again unless you start a new command.";
+var JOB_ID_RE = /^[a-zA-Z0-9._-]{1,64}$/;
+function mcpWaitForJobTimeoutMs(requested) {
+  return mcpWaitForTurnTimeoutMs(requested);
+}
+function sanitizeDetachedJobId(id) {
+  const s = id.trim();
+  if (!JOB_ID_RE.test(s)) {
+    throw new Error(`detached-job id must be 1\u201364 chars [A-Za-z0-9._-], got ${JSON.stringify(id)}`);
   }
-  return copied;
+  return s;
 }
-var cachedLoginEnv = null;
-async function captureLoginEnv() {
-  if (cachedLoginEnv) return { ...cachedLoginEnv };
-  const shell = process.env.SHELL?.trim() || (process.platform === "darwin" ? "/bin/zsh" : "/bin/bash");
+function jobAlive(pid) {
+  if (!Number.isInteger(pid) || pid <= 0) return false;
   try {
-    const result = await execa2(shell, ["-l", "-c", "env -0"], {
-      reject: false,
-      timeout: 5e3
-    });
-    if (result.exitCode === 0 && result.stdout) {
-      const env = { ...process.env };
-      for (const entry of result.stdout.split("\0")) {
-        if (!entry) continue;
-        const eq = entry.indexOf("=");
-        if (eq <= 0) continue;
-        const key = entry.slice(0, eq);
-        const value = entry.slice(eq + 1);
-        if (key) env[key] = value;
-      }
-      cachedLoginEnv = env;
-      return { ...env };
-    }
+    process.kill(pid, 0);
+    return true;
   } catch {
+    return false;
   }
-  cachedLoginEnv = { ...process.env };
-  return { ...cachedLoginEnv };
 }
-function buildWorkspaceScriptEnv(opts, baseEnv) {
-  const env = stripNestedElectronEnv({
-    ...baseEnv ?? process.env
-  });
-  const name = opts.workspaceName ?? basename(opts.worktreePath);
-  const ports = opts.ports ?? [];
-  const primary = ports[0];
-  env.SIDEBOARD_WORKSPACE_NAME = name;
-  env.SIDEBOARD_WORKSPACE_PATH = opts.worktreePath;
-  env.SIDEBOARD_ROOT_PATH = opts.repoPath;
-  env.SIDEBOARD_IS_LOCAL = "1";
-  if (opts.defaultBranch) env.SIDEBOARD_DEFAULT_BRANCH = opts.defaultBranch;
-  env.CONDUCTOR_WORKSPACE_NAME = name;
-  env.CONDUCTOR_WORKSPACE_PATH = opts.worktreePath;
-  env.CONDUCTOR_ROOT_PATH = opts.repoPath;
-  env.CONDUCTOR_IS_LOCAL = "1";
-  if (opts.defaultBranch) env.CONDUCTOR_DEFAULT_BRANCH = opts.defaultBranch;
-  if (primary != null) {
-    env.SIDEBOARD_PORT = String(primary);
-    env.CONDUCTOR_PORT = String(primary);
-    env.PORT = String(primary);
-    for (let i = 1; i < ports.length; i++) {
-      const p = ports[i];
-      env[`SIDEBOARD_PORT_${i}`] = String(p);
-      env[`CONDUCTOR_PORT_${i}`] = String(p);
-    }
+function processGroupAlive(pgid) {
+  if (process.platform === "win32") return false;
+  if (!Number.isInteger(pgid) || pgid <= 1) return false;
+  try {
+    process.kill(-pgid, 0);
+    return true;
+  } catch (err) {
+    return err && typeof err === "object" && "code" in err && err.code === "EPERM";
   }
-  applyWorktreePkgCacheEnv(env, opts.worktreePath);
-  return env;
-}
-function pipeLines(stream, onLine) {
-  if (!stream || !onLine) return;
-  const rl = createInterface2({ input: stream });
-  rl.on("line", onLine);
 }
-function killableListenerPids(raw, selfPid = process.pid) {
-  const pids = [];
-  for (const token of raw.trim().split(/\s+/)) {
-    const pid = Number(token);
-    if (!Number.isFinite(pid) || pid <= 0 || pid === selfPid) continue;
-    pids.push(pid);
-  }
-  return pids;
+function jobTreeAlive(pid) {
+  if (pid == null) return false;
+  return jobAlive(pid) || processGroupAlive(pid);
 }
-function listUnixListenerPids(port, selfPid) {
-  try {
-    const raw = execFileSync("lsof", [`-tiTCP:${port}`, "-sTCP:LISTEN"], {
-      encoding: "utf8",
-      stdio: ["ignore", "pipe", "ignore"],
-      timeout: 2e3
-    });
-    return killableListenerPids(raw, selfPid);
-  } catch {
-    return [];
-  }
+function readIntFile(file) {
+  if (!existsSync3(file)) return null;
+  const n = Number.parseInt(readFileSync3(file, "utf8").trim(), 10);
+  return Number.isInteger(n) ? n : null;
 }
-function listenerCwd(pid) {
-  if (!Number.isFinite(pid) || pid <= 0) return null;
-  try {
-    const raw = execFileSync("lsof", ["-a", "-p", String(pid), "-d", "cwd", "-Fn"], {
-      encoding: "utf8",
-      stdio: ["ignore", "pipe", "ignore"],
-      timeout: 2e3
-    });
-    for (const line of raw.split("\n")) {
-      if (line.startsWith("n") && line.length > 1) return line.slice(1);
-    }
-  } catch {
-  }
-  return null;
+function jobDir(root, id, legacy = false) {
+  return join5(root, legacy ? LEGACY_DETACHED_JOBS_DIR : DETACHED_JOBS_DIR, id);
 }
-function realpathOrResolve(path) {
-  try {
-    return realpathSync(path);
-  } catch {
-    return resolve(path);
-  }
+function resolveJobDir(root, id) {
+  const modern = jobDir(root, id, false);
+  if (existsSync3(modern)) return modern;
+  const legacy = jobDir(root, id, true);
+  if (existsSync3(legacy)) return legacy;
+  return modern;
 }
-function isOtherWorktreeListenerCwd(cwd, worktreePath) {
-  const wt = realpathOrResolve(worktreePath);
-  const c = realpathOrResolve(cwd);
-  if (c === wt || c.startsWith(wt + sep)) return false;
-  const parent = dirname3(wt);
-  const thisName = basename(wt);
-  if (!thisName || c === parent) return false;
-  if (!c.startsWith(parent + sep)) return false;
-  const first = c.slice(parent.length + 1).split(sep)[0];
-  return Boolean(first) && first !== thisName;
+function listJobIdsIn(root, rel) {
+  const dir = join5(root, rel);
+  if (!existsSync3(dir)) return [];
+  return readdirSync(dir, { withFileTypes: true }).filter((e) => e.isDirectory() && JOB_ID_RE.test(e.name)).map((e) => e.name);
 }
-function signalPid(pid, signal) {
-  try {
-    process.kill(pid, signal);
-  } catch {
+function listRunningDetachedJobs(worktreePath) {
+  const root = worktreePath.trim();
+  if (!root) return [];
+  const ids = /* @__PURE__ */ new Set([
+    ...listJobIdsIn(root, DETACHED_JOBS_DIR),
+    ...listJobIdsIn(root, LEGACY_DETACHED_JOBS_DIR)
+  ]);
+  const running = [];
+  for (const id of ids) {
+    const dir = resolveJobDir(root, id);
+    const pid = readIntFile(join5(dir, "pid"));
+    if (jobTreeAlive(pid)) running.push(id);
   }
+  return running.sort();
 }
-function killListenersOnPorts(ports) {
-  const selfPid = process.pid;
-  for (const port of ports) {
-    if (!Number.isFinite(port) || port <= 0) continue;
-    try {
-      if (process.platform === "win32") {
-        execFileSync(
-          "powershell",
-          [
-            "-NoProfile",
-            "-Command",
-            `Get-NetTCPConnection -LocalPort ${port} -ErrorAction SilentlyContinue | Where-Object { $_.OwningProcess -ne ${selfPid} } | ForEach-Object { Stop-Process -Id $_.OwningProcess -Force -ErrorAction SilentlyContinue }`
-          ],
-          { stdio: "ignore", timeout: 3e3 }
-        );
-        continue;
-      }
-      for (const pid of listUnixListenerPids(port, selfPid)) {
-        signalPid(pid, "SIGTERM");
-      }
-    } catch {
-    }
-  }
+function looksLikeDeferredDonePromise(text) {
+  const t = (text ?? "").trim();
+  if (!t || t.length > DEFERRED_DONE_MAX_CHARS) return false;
+  const unquoted = t.replace(/`[^`]*`/g, " ").replace(/["“”][^"“”]*["“”]/g, " ").replace(/\s+/g, " ").trim();
+  if (!unquoted) return false;
+  return /\b(i['’]?ll|i will)\s+let you know\b/i.test(unquoted) || /\blet you know when\b/i.test(unquoted) || /\b(check back|ping me)\s+when\b/i.test(unquoted) || /\bi(?:['’]ll| will)\s+(report|update you)\s+when\b/i.test(unquoted);
 }
-function killStaleWorktreeListeners(ports, worktreePath, signal = "SIGTERM") {
-  if (!worktreePath.trim()) {
-    killListenersOnPorts(ports);
-    return;
-  }
-  if (process.platform === "win32") {
-    killListenersOnPorts(ports);
-    return;
-  }
-  const selfPid = process.pid;
-  for (const port of ports) {
-    if (!Number.isFinite(port) || port <= 0) continue;
-    for (const pid of listUnixListenerPids(port, selfPid)) {
-      const cwd = listenerCwd(pid);
-      if (cwd && isOtherWorktreeListenerCwd(cwd, worktreePath)) continue;
-      signalPid(pid, signal);
-    }
-  }
+function isJobContinuePrompt(text) {
+  if (typeof text !== "string") return false;
+  const t = text.trim();
+  return t.startsWith("Detached job still running:") || t.startsWith("You ended the turn after promising to report later");
 }
-function killScriptTree(child, ports = []) {
-  const pid = child.pid;
-  if (pid) {
-    try {
-      if (process.platform === "win32") {
-        void execa2("taskkill", ["/pid", String(pid), "/T", "/F"], { reject: false });
-      } else {
-        process.kill(-pid, "SIGTERM");
-        setTimeout(() => {
-          try {
-            process.kill(-pid, "SIGKILL");
-          } catch {
-          }
-        }, 2500).unref?.();
-      }
-    } catch {
-      try {
-        child.kill("SIGTERM");
-      } catch {
-      }
-    }
-  }
-  killListenersOnPorts(ports);
+function collapseGhRunWatchLog(text) {
+  if (!text.includes(GH_WATCH_REFRESH)) return text;
+  const frames = text.split(/(?=Refreshing run status every 3 seconds\.)/);
+  const watchFrames = frames.filter((f) => f.includes(GH_WATCH_REFRESH));
+  if (watchFrames.length <= 1) return text;
+  const prefix = frames[0]?.includes(GH_WATCH_REFRESH) ? "" : frames[0] ?? "";
+  const last = watchFrames[watchFrames.length - 1] ?? "";
+  const omitted = watchFrames.length - 1;
+  const note = `(${omitted} identical gh run watch refresh${omitted === 1 ? "" : "es"} omitted)
+`;
+  return [prefix.trimEnd(), note, last.trimStart()].filter(Boolean).join("\n");
 }
-async function spawnWorkspaceScript(command, opts) {
-  const loginEnv = await captureLoginEnv();
-  const env = buildWorkspaceScriptEnv(
-    {
-      worktreePath: opts.worktreePath,
-      repoPath: opts.repoPath,
-      workspaceName: opts.workspaceName,
-      defaultBranch: opts.defaultBranch,
-      ports: opts.ports
-    },
-    loginEnv
-  );
-  try {
-    mergeAgentGitAuthEnv(
-      env,
-      await resolveAgentGitAuthEnv(env, { cwd: opts.worktreePath })
-    );
-  } catch {
-  }
-  if (opts.heldPorts?.length) {
-    await Promise.all(opts.heldPorts.map((h) => h.release()));
+function capJobLogDelta(text) {
+  const collapsed = collapseGhRunWatchLog(text);
+  const lines = collapsed.split("\n");
+  let out = lines.length > MAX_JOB_DELTA_LINES ? `\u2026(${lines.length - MAX_JOB_DELTA_LINES} earlier lines omitted)
+${lines.slice(-MAX_JOB_DELTA_LINES).join("\n")}` : collapsed;
+  if (out.length > MAX_JOB_DELTA_CHARS) {
+    out = `\u2026(truncated ${out.length} chars)
+${out.slice(-MAX_JOB_DELTA_CHARS)}`;
   }
-  const shell = process.platform === "darwin" ? "zsh" : "bash";
-  const child = execa2(shell, ["-lc", command], {
-    cwd: opts.worktreePath,
-    reject: false,
-    env,
-    // Own process group so Stop can tear down the whole tree (not just the shell).
-    // There is no settings.toml `stop=` / teardown hook for run scripts.
-    ...process.platform === "win32" ? {} : { detached: true }
-  });
-  pipeLines(child.stdout, opts.onLine);
-  pipeLines(child.stderr, opts.onLine);
-  const ports = opts.ports ?? [];
-  return {
-    pid: child.pid,
-    kill: () => killScriptTree(child, ports),
-    done: child.then((r) => r.exitCode ?? null),
-    child
-  };
+  return out;
 }
-async function attachAbort(handle, signal) {
-  if (signal) {
-    const onAbort = () => handle.kill();
-    if (signal.aborted) onAbort();
-    else signal.addEventListener("abort", onAbort, { once: true });
-  }
-  return handle.done;
+function formatJobStillRunningContinuePrompt(jobIds) {
+  const ids = jobIds.join(", ");
+  return [
+    `Detached job still running: ${ids}.`,
+    "Do not end this turn. Loop wait_for_job (same id) until stillRunning is false. The log pane updates from each wait result.",
+    "If the job is hanging or doing the wrong thing, call stop_job (same id) instead of looping forever.",
+    "Then report the result. Do not tell the user you will let them know later."
+  ].join(" ");
 }
-async function runSetupScript(repoPath, worktreePath, onLine, opts) {
-  const settings = loadWorkspaceSettings(worktreePath, repoPath);
-  if (!settings?.setup) return { ran: false, exitCode: null, source: null };
-  const source = workspaceSettingsSourceLabel(worktreePath, repoPath);
-  onLine?.(`[setup] ${source ?? "settings.toml"}`);
-  const handle = await spawnWorkspaceScript(settings.setup, {
-    worktreePath,
-    repoPath,
-    defaultBranch: opts?.defaultBranch,
-    onLine
-  });
-  const exitCode = await attachAbort(handle, opts?.signal);
-  return {
-    ran: true,
-    exitCode,
-    source,
-    kill: handle.kill
-  };
+function formatDeferredDoneContinuePrompt() {
+  return [
+    "You ended the turn after promising to report later, but no detached job is running.",
+    "If tests/pack/deploy still need to run: start once with detached-job.cjs, then loop wait_for_job until stillRunning is false (the log pane updates from wait JSON).",
+    "Do not say you will let the user know later."
+  ].join(" ");
 }
-async function runConventionSetup(repoPath, worktreePath, onLine, opts) {
-  const found = findConventionSetup(worktreePath, repoPath);
-  if (!found) return { ran: false, exitCode: null, source: null };
-  onLine?.(`[setup] ${found.source}`);
-  const handle = await spawnWorkspaceScript(found.command, {
-    worktreePath,
-    repoPath,
-    defaultBranch: opts?.defaultBranch,
-    onLine
+function turnWatchedDetachedJob(parts) {
+  return parts.some((p) => {
+    if (p.type !== "tool") return false;
+    if (/wait_for_job$/i.test(p.name ?? "") || /stop_job$/i.test(p.name ?? "")) return true;
+    const blob = [p.name, p.detail, p.description, p.input ? JSON.stringify(p.input) : ""].filter(Boolean).join(" ");
+    return /detached-job\.(?:js|cjs)\b/i.test(blob);
   });
-  const exitCode = await attachAbort(handle, opts?.signal);
-  return {
-    ran: true,
-    exitCode,
-    source: found.source,
-    kill: handle.kill
-  };
 }
-async function runWorkspaceSetup(repoPath, worktreePath, onLine, opts) {
-  await ensureWorktreeSideboardIgnored(worktreePath);
-  const review = ensureReviewGuidelinesFile(worktreePath, repoPath);
-  if (review.wrote) {
-    onLine?.(`[setup] wrote ${review.path} \u2014 local Review guidelines`);
-  }
-  let setup = await runSetupScript(repoPath, worktreePath, onLine, opts);
-  if (!setup.ran) {
-    setup = await runCursorWorktreeSetup(repoPath, worktreePath, onLine);
+function planJobContinue(opts) {
+  if (opts.isOrchestrator) return { action: "none" };
+  if (opts.agent === "brightsy") return { action: "none" };
+  if (opts.queueLength > 0) return { action: "none" };
+  if (opts.continueCount >= MAX_JOB_CONTINUES) return { action: "none" };
+  const farewell = looksLikeDeferredDonePromise(opts.chatText);
+  if (opts.runningJobIds.length > 0 && (farewell || opts.watchedJob)) {
+    return {
+      action: "wait",
+      jobIds: opts.runningJobIds,
+      prompt: formatJobStillRunningContinuePrompt(opts.runningJobIds)
+    };
   }
-  if (!setup.ran) {
-    setup = await runConventionSetup(repoPath, worktreePath, onLine, opts);
+  if (looksLikeDeferredDonePromise(opts.chatText) && !opts.alreadyNudged) {
+    return { action: "nudge", prompt: formatDeferredDoneContinuePrompt() };
   }
-  return setup;
-}
-async function runArchiveScript(repoPath, worktreePath, onLine) {
-  const settings = loadWorkspaceSettings(worktreePath, repoPath);
-  if (!settings?.archive) return { ran: false, exitCode: null };
-  const handle = await spawnWorkspaceScript(settings.archive, {
-    worktreePath,
-    repoPath,
-    onLine
-  });
-  const exitCode = await handle.done;
-  return { ran: true, exitCode };
+  return { action: "none" };
 }
-function listRunScripts(worktreePath, repoPath) {
-  const settings = loadWorkspaceSettings(worktreePath, repoPath);
-  if (!settings?.runScripts.length) return [];
-  return settings.runScripts.filter((s) => {
-    if (!s.availableIn?.length) return true;
-    return s.availableIn.includes("local");
-  });
+function tailProgress(logFile, maxLines = 12) {
+  if (!existsSync3(logFile)) return "(no log yet)";
+  const lines = readFileSync3(logFile, "utf8").split("\n");
+  return lines.slice(-maxLines).join("\n");
 }
-function getDefaultRunScript(worktreePath, repoPath) {
-  const scripts = listRunScripts(worktreePath, repoPath);
-  if (!scripts.length) return null;
-  return scripts.find((s) => s.default === true) ?? scripts.find((s) => s.name === "dev") ?? scripts.find((s) => s.name !== "all") ?? scripts[0] ?? null;
+function lastProgressLine(progress) {
+  const last = progress.split("\n").map((l) => l.trim()).filter((l) => l && l !== "(no log yet)").at(-1);
+  return last ? last.slice(0, 72) : void 0;
 }
-function getRunScript(worktreePath, repoPath, name) {
-  const scripts = listRunScripts(worktreePath, repoPath);
-  if (!scripts.length) return null;
-  if (name) {
-    return scripts.find((s) => s.name === name) ?? null;
-  }
-  return getDefaultRunScript(worktreePath, repoPath);
+function readLogLines(file) {
+  if (!existsSync3(file)) return [];
+  const lines = readFileSync3(file, "utf8").split("\n");
+  if (lines.length && lines[lines.length - 1] === "") lines.pop();
+  return lines;
 }
-function getRunMode(worktreePath, repoPath) {
-  return loadWorkspaceSettings(worktreePath, repoPath)?.runMode ?? "concurrent";
-}
-async function reservePort() {
-  return new Promise((resolve2, reject) => {
-    const server = createServer();
-    let released = false;
-    const release = () => new Promise((res) => {
-      if (released) {
-        res();
-        return;
-      }
-      released = true;
-      server.close(() => res());
-    });
-    server.listen(0, "127.0.0.1", () => {
-      const addr = server.address();
-      if (!addr || typeof addr === "string") {
-        void release().then(() => reject(new Error("Failed to allocate port")));
-        return;
-      }
-      resolve2({ port: addr.port, release });
-    });
-    server.on("error", reject);
-  });
+function takeDelta(logFile, cursorFile) {
+  const lines = readLogLines(logFile);
+  const cursor = readIntFile(cursorFile) ?? 0;
+  const start = Math.min(Math.max(0, cursor), lines.length);
+  return { delta: capJobLogDelta(lines.slice(start).join("\n")), nextCursor: lines.length };
 }
-async function tryReservePort(port) {
-  if (!Number.isInteger(port) || port <= 0 || port > 65535) return null;
-  return new Promise((resolve2) => {
-    const server = createServer();
-    let released = false;
-    const release = () => new Promise((res) => {
-      if (released) {
-        res();
-        return;
-      }
-      released = true;
-      server.close(() => res());
-    });
-    server.once("error", () => {
-      try {
-        server.close();
-      } catch {
-      }
-      resolve2(null);
-    });
-    server.listen(port, "127.0.0.1", () => {
-      resolve2({ port, release });
-    });
-  });
+function snapshotJob(dir) {
+  const pid = readIntFile(join5(dir, "pid"));
+  const running = jobTreeAlive(pid);
+  return {
+    pid,
+    running,
+    exitCode: readIntFile(join5(dir, "exit")),
+    log: join5(dir, "log"),
+    cursor: join5(dir, "present.cursor"),
+    progress: tailProgress(join5(dir, "log"))
+  };
 }
-function normalizePreferredPorts(ports, size) {
-  if (!ports?.length) return [];
-  const seen = /* @__PURE__ */ new Set();
-  const out = [];
-  for (const p of ports) {
-    if (!Number.isInteger(p) || p <= 0 || p > 65535 || seen.has(p)) continue;
-    seen.add(p);
-    out.push(p);
-    if (out.length >= size) break;
+function toResult(id, snap, extra) {
+  const failed = extra?.failed === true || !snap.running && snap.exitCode != null && snap.exitCode !== 0;
+  const ok = !snap.running && snap.exitCode === 0;
+  const stillRunning = snap.running && !ok;
+  const { delta, nextCursor } = takeDelta(snap.log, snap.cursor);
+  try {
+    mkdirSync4(dirname3(snap.cursor), { recursive: true });
+    writeFileSync3(snap.cursor, `${nextCursor}
+`);
+  } catch {
   }
-  return out;
+  const status = ok ? "ok" : failed && !stillRunning ? "failed" : stillRunning ? "running" : "idle";
+  const progress = extra?.progress ?? snap.progress;
+  return {
+    stillRunning,
+    ok,
+    failed: Boolean(failed && !stillRunning && !ok),
+    status,
+    id,
+    pid: snap.pid,
+    exitCode: snap.exitCode ?? void 0,
+    phase: lastProgressLine(progress),
+    delta,
+    progress,
+    hint: stillRunning ? MCP_WAIT_JOB_STILL_RUNNING_HINT : void 0
+  };
 }
-function delay(ms) {
-  return new Promise((resolve2) => setTimeout(resolve2, ms));
+async function sleepMs(ms) {
+  await new Promise((resolve2) => setTimeout(resolve2, ms));
 }
-async function fillPortRange(held, size) {
-  if (held.length >= size) return held;
-  const base = held[0]?.port;
-  const taken = new Set(held.map((h) => h.port));
-  try {
-    let offset = 0;
-    while (held.length < size) {
-      const candidate = base != null ? base + offset : null;
-      offset += 1;
-      if (candidate != null && taken.has(candidate)) continue;
-      const next = candidate != null ? await tryReservePort(candidate) : null;
-      if (next) {
-        held.push(next);
-        taken.add(next.port);
-      } else {
-        const ephemeral = await reservePort();
-        held.push(ephemeral);
-        taken.add(ephemeral.port);
-      }
-    }
-    return held;
-  } catch (err) {
-    await Promise.all(held.map((h) => h.release()));
-    throw err;
+async function waitForDetachedJob(cwd, id, opts) {
+  const jobId = sanitizeDetachedJobId(id);
+  const root = cwd.trim() || process.cwd();
+  const dir = resolveJobDir(root, jobId);
+  const timeoutMs = mcpWaitForJobTimeoutMs(opts?.timeoutMs);
+  const sleep = opts?.sleep ?? sleepMs;
+  if (!existsSync3(dir)) {
+    return {
+      stillRunning: false,
+      ok: false,
+      failed: true,
+      status: "failed",
+      id: jobId,
+      delta: "",
+      progress: "No detached job. Start one first.",
+      hint: "Start with detached-job.cjs start <id> -- <command>, then call wait_for_job again."
+    };
   }
-}
-async function tryReserveAvailablePorts(ports) {
-  const held = [];
-  for (const port of ports) {
-    const next = await tryReservePort(port);
-    if (next) held.push(next);
+  const deadline = Date.now() + timeoutMs;
+  let snap = snapshotJob(dir);
+  if (snap.exitCode === 0 && !snap.running) return toResult(jobId, snap);
+  if (!snap.running && snap.pid == null && snap.progress === "(no log yet)") {
+    return toResult(jobId, snap, {
+      failed: true,
+      progress: "No detached job. Start one first."
+    });
   }
-  return held;
-}
-async function reclaimPreferredPorts(ports, worktreePath) {
-  const primary = ports[0];
-  if (primary == null) return null;
-  const takePrimary = async () => {
-    const held2 = await tryReserveAvailablePorts(ports);
-    if (held2.some((h) => h.port === primary)) return held2;
-    await Promise.all(held2.map((h) => h.release()));
-    return null;
-  };
-  let held = await takePrimary();
-  if (held) return held;
-  if (worktreePath) {
-    killStaleWorktreeListeners(ports, worktreePath, "SIGTERM");
-  } else {
-    killListenersOnPorts(ports);
+  while (Date.now() < deadline) {
+    snap = snapshotJob(dir);
+    if (snap.exitCode === 0 && !snap.running) return toResult(jobId, snap);
+    if (!snap.running) return toResult(jobId, snap, { failed: true });
+    await sleep(Math.min(2e3, Math.max(50, deadline - Date.now())));
   }
-  for (let i = 0; i < RECLAIM_TRIES; i++) {
-    await delay(RECLAIM_RETRY_DELAY_MS);
-    held = await takePrimary();
-    if (held) return held;
-    if (i === 2 && worktreePath) {
-      killStaleWorktreeListeners(ports, worktreePath, "SIGKILL");
+  snap = snapshotJob(dir);
+  return toResult(jobId, snap);
+}
+function killProcessTree(pid, signal) {
+  if (!Number.isInteger(pid) || pid <= 0) return;
+  if (process.platform !== "win32") {
+    try {
+      process.kill(-pid, signal);
+      return;
+    } catch {
     }
   }
-  return null;
-}
-async function reservePortRange(size = PORT_RANGE_SIZE, opts) {
-  const preferred = normalizePreferredPorts(opts?.preferred, size);
-  if (preferred.length) {
-    const reused = await reclaimPreferredPorts(preferred, opts?.worktreePath);
-    if (reused) return fillPortRange(reused, size);
+  try {
+    process.kill(pid, signal);
+  } catch {
   }
-  const held = [await reservePort()];
-  return fillPortRange(held, size);
 }
-async function startDevServer(repoPath, worktreePath, onLine, opts) {
-  const script = getRunScript(worktreePath, repoPath, opts?.scriptName);
-  if (!script) return null;
-  const preferred = loadWorktreeRunPorts(worktreePath, script.name) ?? opts?.preferredPorts;
-  const held = await reservePortRange(PORT_RANGE_SIZE, {
-    preferred: preferred ?? void 0,
-    worktreePath
-  });
-  const ports = held.map((h) => h.port);
-  saveWorktreeRunPorts(worktreePath, script.name, ports);
+function appendJobLog(logFile, line) {
   try {
-    const handle = await spawnWorkspaceScript(script.command, {
-      worktreePath,
-      repoPath,
-      ports,
-      heldPorts: held,
-      defaultBranch: opts?.defaultBranch,
-      onLine
-    });
+    mkdirSync4(dirname3(logFile), { recursive: true });
+    const body = line.endsWith("\n") ? line : `${line}
+`;
+    appendFileSync2(logFile, body);
+  } catch {
+  }
+}
+async function stopDetachedJob(cwd, id, opts) {
+  const jobId = sanitizeDetachedJobId(id);
+  const root = cwd.trim() || process.cwd();
+  const dir = resolveJobDir(root, jobId);
+  const sleep = opts?.sleep ?? sleepMs;
+  const why = opts?.reason?.trim() ?? "";
+  if (!existsSync3(dir)) {
     return {
-      pid: handle.pid,
-      port: ports[0],
-      ports,
-      scriptName: script.name,
-      kill: handle.kill,
-      done: handle.done
+      stillRunning: false,
+      ok: false,
+      failed: true,
+      status: "failed",
+      id: jobId,
+      delta: "",
+      progress: "No detached job. Start one first.",
+      hint: "Start with detached-job.cjs start <id> -- <command>, then wait_for_job or stop_job.",
+      stopped: false,
+      reason: "not-found"
     };
-  } catch (err) {
-    await Promise.all(held.map((h) => h.release()));
-    throw err;
   }
-}
-
-// src/store/setup-log.ts
-import { createHash } from "crypto";
-import { existsSync as existsSync4, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
-import { join as join6 } from "path";
-var EMPTY = {
-  output: "",
-  running: false,
-  exitCode: null,
-  source: null
-};
-var MAX_SETUP_LOG_CHARS = 256e3;
-function appendSetupOutput(prev, line, max = MAX_SETUP_LOG_CHARS) {
-  const next = prev ? `${prev}
-${line}` : line;
-  if (next.length <= max) return next;
-  const cut = next.slice(next.length - max);
-  const nl = cut.indexOf("\n");
-  return nl >= 0 && nl < cut.length - 1 ? cut.slice(nl + 1) : cut;
-}
-var memory = /* @__PURE__ */ new Map();
-var persistTimers = /* @__PURE__ */ new Map();
-function fromSnapshot(snap) {
-  return {
-    chunks: snap.output ? [snap.output] : [],
-    length: snap.output.length,
-    running: snap.running,
-    exitCode: snap.exitCode,
-    source: snap.source
-  };
-}
-function materialize(mem) {
-  let output = mem.chunks.join("\n");
-  if (output.length > MAX_SETUP_LOG_CHARS) {
-    output = appendSetupOutput("", output);
-    mem.chunks = [output];
-    mem.length = output.length;
+  let snap = snapshotJob(dir);
+  if (!snap.running) {
+    const result2 = toResult(jobId, snap);
+    return {
+      ...result2,
+      stopped: false,
+      reason: "not-running",
+      hint: "That job is already finished. Read the log; do not wait again unless you start a new command."
+    };
+  }
+  appendJobLog(snap.log, `$ stop${why ? `: ${why}` : ""}`);
+  const targetPid = snap.pid;
+  if (targetPid != null) killProcessTree(targetPid, "SIGTERM");
+  const graceMs = Number.isFinite(opts?.graceMs) ? Math.max(50, opts.graceMs) : 2e3;
+  const deadline = Date.now() + graceMs;
+  while (Date.now() < deadline && jobTreeAlive(targetPid)) {
+    await sleep(Math.min(100, Math.max(20, deadline - Date.now())));
   }
+  if (targetPid != null) {
+    killProcessTree(targetPid, "SIGKILL");
+    await sleep(100);
+  }
+  const exitFile = join5(dir, "exit");
+  if (!existsSync3(exitFile)) {
+    try {
+      writeFileSync3(exitFile, "1\n");
+    } catch {
+    }
+  }
+  snap = snapshotJob(dir);
+  const stillRunning = jobTreeAlive(targetPid) || snap.running;
+  const result = toResult(jobId, snap, { failed: true });
+  const stopped = !stillRunning;
   return {
-    output,
-    running: mem.running,
-    exitCode: mem.exitCode,
-    source: mem.source
+    ...result,
+    stillRunning,
+    ok: false,
+    failed: true,
+    status: stillRunning ? "running" : "failed",
+    stopped,
+    reason: stopped ? "stopped" : "still-running",
+    stopReason: why || void 0,
+    hint: stopped ? MCP_STOP_JOB_HINT : MCP_WAIT_JOB_STILL_RUNNING_HINT
   };
 }
-function setupLogPath(threadId) {
-  return join6(threadsDir(), `${threadId}.setup.log.json`);
-}
-function setupLogKeyForWorktree(worktreePath) {
-  const norm = normalizeWorktreePath(worktreePath);
-  return `wt-${createHash("sha1").update(norm).digest("hex").slice(0, 16)}`;
+
+// src/hook/conductor.ts
+var PORT_RANGE_SIZE = 10;
+var RECLAIM_RETRY_DELAY_MS = 40;
+var RECLAIM_TRIES = 8;
+function matchSimpleGlob(pattern, name) {
+  const escaped = pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*").replace(/\?/g, ".");
+  return new RegExp(`^${escaped}$`).test(name);
 }
-function emptySetupLog() {
-  return { ...EMPTY };
+function readWorktreeInclude(repoPath) {
+  const path = join6(repoPath, ".worktreeinclude");
+  if (!existsSync4(path)) return [];
+  return readFileSync4(path, "utf8").split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("#"));
 }
-var PERSIST_DEBOUNCE_MS = 500;
-function persistNow(threadId) {
-  const timer = persistTimers.get(threadId);
-  if (timer) {
-    clearTimeout(timer);
-    persistTimers.delete(threadId);
+function resolveFilesToCopy(repoPath) {
+  const fromInclude = readWorktreeInclude(repoPath);
+  if (fromInclude.length) return fromInclude;
+  const settings = loadRepoSettings(repoPath);
+  if (settings?.filesToCopy?.length) return settings.filesToCopy;
+  if (settings?.fileIncludeGlobs?.length) {
+    const matched = [];
+    try {
+      for (const entry of readdirSync2(repoPath, { withFileTypes: true })) {
+        if (!entry.isFile()) continue;
+        for (const glob of settings.fileIncludeGlobs) {
+          if (matchSimpleGlob(glob, entry.name) || matchSimpleGlob(basename(glob), entry.name)) {
+            matched.push(entry.name);
+            break;
+          }
+        }
+      }
+    } catch {
+    }
+    if (matched.length) return [...new Set(matched)];
   }
-  const mem = memory.get(threadId);
-  if (!mem) return;
+  const defaults = [];
   try {
-    writeFileSync3(
-      setupLogPath(threadId),
-      `${JSON.stringify(materialize(mem))}
-`,
-      "utf8"
-    );
+    for (const entry of readdirSync2(repoPath, { withFileTypes: true })) {
+      if (entry.isFile() && entry.name.startsWith(".env")) {
+        defaults.push(entry.name);
+      }
+    }
   } catch {
   }
+  if (defaults.length) return defaults;
+  return [".env.local", ".env"];
 }
-function schedulePersist(threadId) {
-  if (persistTimers.has(threadId)) return;
-  persistTimers.set(
-    threadId,
-    setTimeout(() => {
-      persistTimers.delete(threadId);
-      persistNow(threadId);
-    }, PERSIST_DEBOUNCE_MS)
-  );
+function copyConfiguredFiles(repoPath, worktreePath) {
+  const patterns = resolveFilesToCopy(repoPath);
+  const copied = [];
+  for (const rel of patterns) {
+    const src = join6(repoPath, rel);
+    if (!existsSync4(src)) continue;
+    const dest = join6(worktreePath, rel);
+    mkdirSync5(dirname4(dest), { recursive: true });
+    copyFileSync(src, dest);
+    copied.push(rel);
+  }
+  return copied;
 }
-function loadFromDisk(threadId) {
-  const path = setupLogPath(threadId);
-  if (!existsSync4(path)) return null;
+var cachedLoginEnv = null;
+async function captureLoginEnv() {
+  if (cachedLoginEnv) return { ...cachedLoginEnv };
+  const shell = process.env.SHELL?.trim() || (process.platform === "darwin" ? "/bin/zsh" : "/bin/bash");
   try {
-    const raw = JSON.parse(readFileSync4(path, "utf8"));
-    return {
-      output: typeof raw.output === "string" ? raw.output : "",
-      running: Boolean(raw.running),
-      exitCode: typeof raw.exitCode === "number" ? raw.exitCode : null,
-      source: typeof raw.source === "string" ? raw.source : null
-    };
+    const result = await execa2(shell, ["-l", "-c", "env -0"], {
+      reject: false,
+      timeout: 5e3
+    });
+    if (result.exitCode === 0 && result.stdout) {
+      const env = { ...process.env };
+      for (const entry of result.stdout.split("\0")) {
+        if (!entry) continue;
+        const eq = entry.indexOf("=");
+        if (eq <= 0) continue;
+        const key = entry.slice(0, eq);
+        const value = entry.slice(eq + 1);
+        if (key) env[key] = value;
+      }
+      cachedLoginEnv = env;
+      return { ...env };
+    }
   } catch {
-    return null;
   }
+  cachedLoginEnv = { ...process.env };
+  return { ...cachedLoginEnv };
 }
-function memFor(threadId) {
-  const cached = memory.get(threadId);
-  if (cached) return cached;
-  const mem = fromSnapshot(loadFromDisk(threadId) ?? emptySetupLog());
-  memory.set(threadId, mem);
-  return mem;
-}
-function readSetupLog(threadId) {
-  const cached = memory.get(threadId);
-  if (cached) return materialize(cached);
-  const disk = loadFromDisk(threadId);
-  if (disk) {
-    memory.set(threadId, fromSnapshot(disk));
-    return disk;
+function buildWorkspaceScriptEnv(opts, baseEnv) {
+  const env = stripNestedElectronEnv({
+    ...baseEnv ?? process.env
+  });
+  const name = opts.workspaceName ?? basename(opts.worktreePath);
+  const ports = opts.ports ?? [];
+  const primary = ports[0];
+  env.SIDEBOARD_WORKSPACE_NAME = name;
+  env.SIDEBOARD_WORKSPACE_PATH = opts.worktreePath;
+  env.SIDEBOARD_ROOT_PATH = opts.repoPath;
+  env.SIDEBOARD_IS_LOCAL = "1";
+  if (opts.defaultBranch) env.SIDEBOARD_DEFAULT_BRANCH = opts.defaultBranch;
+  env.CONDUCTOR_WORKSPACE_NAME = name;
+  env.CONDUCTOR_WORKSPACE_PATH = opts.worktreePath;
+  env.CONDUCTOR_ROOT_PATH = opts.repoPath;
+  env.CONDUCTOR_IS_LOCAL = "1";
+  if (opts.defaultBranch) env.CONDUCTOR_DEFAULT_BRANCH = opts.defaultBranch;
+  if (primary != null) {
+    env.SIDEBOARD_PORT = String(primary);
+    env.CONDUCTOR_PORT = String(primary);
+    env.PORT = String(primary);
+    for (let i = 1; i < ports.length; i++) {
+      const p = ports[i];
+      env[`SIDEBOARD_PORT_${i}`] = String(p);
+      env[`CONDUCTOR_PORT_${i}`] = String(p);
+    }
   }
-  return emptySetupLog();
+  applyWorktreePkgCacheEnv(env, opts.worktreePath);
+  return env;
 }
-function beginSetupLog(threadId) {
-  const mem = {
-    chunks: [],
-    length: 0,
-    running: true,
-    exitCode: null,
-    source: null
-  };
-  memory.set(threadId, mem);
-  persistNow(threadId);
-  return materialize(mem);
+function pipeLines(stream, onLine) {
+  if (!stream || !onLine) return;
+  const rl = createInterface2({ input: stream });
+  rl.on("line", onLine);
 }
-function appendSetupLog(threadId, line) {
-  const mem = memFor(threadId);
-  mem.chunks.push(line);
-  mem.length += line.length + 1;
-  mem.running = true;
-  if (mem.length > MAX_SETUP_LOG_CHARS * 2) materialize(mem);
-  schedulePersist(threadId);
+function killableListenerPids(raw, selfPid = process.pid) {
+  const pids = [];
+  for (const token of raw.trim().split(/\s+/)) {
+    const pid = Number(token);
+    if (!Number.isFinite(pid) || pid <= 0 || pid === selfPid) continue;
+    pids.push(pid);
+  }
+  return pids;
 }
-function finishSetupLog(threadId, exitCode, source) {
-  const mem = memFor(threadId);
-  mem.running = false;
-  mem.exitCode = exitCode;
-  mem.source = source ?? mem.source;
-  persistNow(threadId);
-  return materialize(mem);
-}
-
-// src/store/run-log.ts
-import { createHash as createHash2 } from "crypto";
-import { existsSync as existsSync5, readFileSync as readFileSync5, writeFileSync as writeFileSync4 } from "fs";
-import { join as join7 } from "path";
-var EMPTY2 = {
-  output: "",
-  running: false,
-  exitCode: null,
-  scriptName: null
-};
-var MAX_RUN_LOG_CHARS = 256e3;
-var DEFAULT_RUN_LOG_TAIL_CHARS = 16e3;
-var memory2 = /* @__PURE__ */ new Map();
-var persistTimers2 = /* @__PURE__ */ new Map();
-function fromSnapshot2(snap) {
-  return {
-    chunks: snap.output ? [snap.output] : [],
-    length: snap.output.length,
-    running: snap.running,
-    exitCode: snap.exitCode,
-    scriptName: snap.scriptName
-  };
-}
-function materialize2(mem) {
-  let output = mem.chunks.join("\n");
-  if (output.length > MAX_RUN_LOG_CHARS) {
-    output = appendSetupOutput("", output, MAX_RUN_LOG_CHARS);
-    mem.chunks = [output];
-    mem.length = output.length;
+function listUnixListenerPids(port, selfPid) {
+  try {
+    const raw = execFileSync("lsof", [`-tiTCP:${port}`, "-sTCP:LISTEN"], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"],
+      timeout: 2e3
+    });
+    return killableListenerPids(raw, selfPid);
+  } catch {
+    return [];
   }
-  return {
-    output,
-    running: mem.running,
-    exitCode: mem.exitCode,
-    scriptName: mem.scriptName
-  };
-}
-function safeScriptToken(scriptName) {
-  const token = scriptName.replace(/[^a-zA-Z0-9._-]+/g, "_").slice(0, 64);
-  return token || "dev";
-}
-function runLogPath(key) {
-  return join7(threadsDir(), `${key}.run.log.json`);
-}
-function runLogKeyForWorktree(worktreePath, scriptName) {
-  const norm = normalizeWorktreePath(worktreePath);
-  const hash = createHash2("sha1").update(norm).digest("hex").slice(0, 16);
-  return `wt-${hash}-run-${safeScriptToken(scriptName)}`;
-}
-function emptyRunLog() {
-  return { ...EMPTY2 };
-}
-function sliceRunLogOutput(output, tailChars = DEFAULT_RUN_LOG_TAIL_CHARS) {
-  const max = Math.max(1, tailChars);
-  const outputChars = output.length;
-  if (outputChars <= max) return { output, truncated: false, outputChars };
-  const cut = output.slice(outputChars - max);
-  const nl = cut.indexOf("\n");
-  const text = nl >= 0 && nl < cut.length - 1 ? cut.slice(nl + 1) : cut;
-  return { output: text, truncated: true, outputChars };
 }
-var PERSIST_DEBOUNCE_MS2 = 500;
-function persistNow2(key) {
-  const timer = persistTimers2.get(key);
-  if (timer) {
-    clearTimeout(timer);
-    persistTimers2.delete(key);
-  }
-  const mem = memory2.get(key);
-  if (!mem) return;
+function listenerCwd(pid) {
+  if (!Number.isFinite(pid) || pid <= 0) return null;
   try {
-    writeFileSync4(runLogPath(key), `${JSON.stringify(materialize2(mem))}
-`, "utf8");
+    const raw = execFileSync("lsof", ["-a", "-p", String(pid), "-d", "cwd", "-Fn"], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"],
+      timeout: 2e3
+    });
+    for (const line of raw.split("\n")) {
+      if (line.startsWith("n") && line.length > 1) return line.slice(1);
+    }
   } catch {
   }
+  return null;
 }
-function schedulePersist2(key) {
-  if (persistTimers2.has(key)) return;
-  persistTimers2.set(
-    key,
-    setTimeout(() => {
-      persistTimers2.delete(key);
-      persistNow2(key);
-    }, PERSIST_DEBOUNCE_MS2)
-  );
-}
-function loadFromDisk2(key) {
-  const path = runLogPath(key);
-  if (!existsSync5(path)) return null;
+function realpathOrResolve(path) {
   try {
-    const raw = JSON.parse(readFileSync5(path, "utf8"));
-    return {
-      output: typeof raw.output === "string" ? raw.output : "",
-      running: Boolean(raw.running),
-      exitCode: typeof raw.exitCode === "number" ? raw.exitCode : null,
-      scriptName: typeof raw.scriptName === "string" ? raw.scriptName : null
-    };
+    return realpathSync(path);
   } catch {
-    return null;
+    return resolve(path);
   }
 }
-function memFor2(key) {
-  const cached = memory2.get(key);
-  if (cached) return cached;
-  const mem = fromSnapshot2(loadFromDisk2(key) ?? emptyRunLog());
-  memory2.set(key, mem);
-  return mem;
+function isOtherWorktreeListenerCwd(cwd, worktreePath) {
+  const wt = realpathOrResolve(worktreePath);
+  const c = realpathOrResolve(cwd);
+  if (c === wt || c.startsWith(wt + sep)) return false;
+  const parent = dirname4(wt);
+  const thisName = basename(wt);
+  if (!thisName || c === parent) return false;
+  if (!c.startsWith(parent + sep)) return false;
+  const first = c.slice(parent.length + 1).split(sep)[0];
+  return Boolean(first) && first !== thisName;
 }
-function readRunLog(key) {
-  const cached = memory2.get(key);
-  if (cached) return materialize2(cached);
-  const disk = loadFromDisk2(key);
-  if (disk) {
-    memory2.set(key, fromSnapshot2(disk));
-    return disk;
+function signalPid(pid, signal) {
+  try {
+    process.kill(pid, signal);
+  } catch {
   }
-  return emptyRunLog();
-}
-function beginRunLog(key, scriptName) {
-  const mem = {
-    chunks: [],
-    length: 0,
-    running: true,
-    exitCode: null,
-    scriptName
-  };
-  memory2.set(key, mem);
-  persistNow2(key);
-  return materialize2(mem);
-}
-function appendRunLog(key, line) {
-  const mem = memFor2(key);
-  mem.chunks.push(line);
-  mem.length += line.length + 1;
-  mem.running = true;
-  if (mem.length > MAX_RUN_LOG_CHARS * 2) materialize2(mem);
-  schedulePersist2(key);
-}
-function finishRunLog(key, exitCode) {
-  const mem = memFor2(key);
-  mem.running = false;
-  mem.exitCode = exitCode;
-  persistNow2(key);
-  return materialize2(mem);
-}
-function flushRunLog(key) {
-  persistNow2(key);
-}
-
-// src/git/orphan-cleanup.ts
-import { existsSync as existsSync6, readdirSync as readdirSync2, statSync } from "fs";
-import { join as join8 } from "path";
-function isSideboardWorktreePath(path) {
-  return path.includes("/.sideboard/worktrees/") || path.includes("/sideboard/workspaces/");
 }
-async function findOrphanWorktrees(repoPaths) {
-  const threads = listThreads({ includeArchived: true });
-  const known = new Set(threads.map((t) => t.worktreePath.replace(/\/$/, "")));
-  const repos = new Set(
-    repoPaths?.length ? repoPaths : threads.map((t) => t.repoPath).filter(Boolean)
-  );
-  const homeRoot = sideboardWorkspacesDir();
-  if (existsSync6(homeRoot)) {
-    try {
-      for (const entry of readdirSync2(homeRoot, { withFileTypes: true })) {
-        if (!entry.isDirectory()) continue;
-        void entry;
-      }
-    } catch {
-    }
+function isThisWorktreeListenerCwd(cwd, worktreePath) {
+  const wt = realpathOrResolve(worktreePath);
+  const c = realpathOrResolve(cwd);
+  return c === wt || c.startsWith(wt + sep);
+}
+function killDetachedRunTree(pid, worktreePath) {
+  if (!Number.isFinite(pid) || pid <= 1 || pid === process.pid) return;
+  const cwd = listenerCwd(pid);
+  if (cwd) {
+    if (!isThisWorktreeListenerCwd(cwd, worktreePath)) return;
+  } else if (!processGroupAlive(pid)) {
+    return;
   }
-  const orphans = [];
-  const seen = /* @__PURE__ */ new Set();
-  for (const repoPath of repos) {
-    if (!repoPath || !existsSync6(repoPath)) continue;
+  try {
+    process.kill(-pid, "SIGTERM");
+  } catch {
+    signalPid(pid, "SIGTERM");
+  }
+}
+function killListenersOnPorts(ports) {
+  const selfPid = process.pid;
+  for (const port of ports) {
+    if (!Number.isFinite(port) || port <= 0) continue;
     try {
-      const wts = await listWorktrees(repoPath);
-      for (const wt of wts) {
-        const path = wt.path.replace(/\/$/, "");
-        if (!isSideboardWorktreePath(path)) continue;
-        if (known.has(path)) continue;
-        if (seen.has(path)) continue;
-        seen.add(path);
-        let mtimeMs = 0;
-        try {
-          mtimeMs = statSync(path).mtimeMs;
-        } catch {
-          mtimeMs = 0;
-        }
-        orphans.push({ path, repoPath, mtimeMs });
+      if (process.platform === "win32") {
+        execFileSync(
+          "powershell",
+          [
+            "-NoProfile",
+            "-Command",
+            `Get-NetTCPConnection -LocalPort ${port} -ErrorAction SilentlyContinue | Where-Object { $_.OwningProcess -ne ${selfPid} } | ForEach-Object { Stop-Process -Id $_.OwningProcess -Force -ErrorAction SilentlyContinue }`
+          ],
+          { stdio: "ignore", timeout: 3e3 }
+        );
+        continue;
       }
-    } catch {
-    }
-    try {
-      const root = worktreesRoot(repoPath);
-      if (existsSync6(root)) {
-        for (const entry of readdirSync2(root, { withFileTypes: true })) {
-          if (!entry.isDirectory()) continue;
-          const path = join8(root, entry.name).replace(/\/$/, "");
-          if (known.has(path) || seen.has(path)) continue;
-          if (!existsSync6(join8(path, ".git"))) continue;
-          seen.add(path);
-          let mtimeMs = 0;
-          try {
-            mtimeMs = statSync(path).mtimeMs;
-          } catch {
-            mtimeMs = Date.now();
-          }
-          orphans.push({ path, repoPath, mtimeMs });
-        }
+      for (const pid of listUnixListenerPids(port, selfPid)) {
+        signalPid(pid, "SIGTERM");
       }
     } catch {
     }
   }
-  return orphans.sort((a, b) => a.mtimeMs - b.mtimeMs);
 }
-async function cleanupOrphanWorktrees(opts) {
-  const settings = loadAppSettings();
-  const maxCount = opts?.maxCount ?? settings.advanced.worktreeMaxCount ?? 25;
-  const orphans = await findOrphanWorktrees(opts?.repoPaths);
-  const activeCount = listThreads().filter((t) => t.status !== "archived").length;
-  const budget = Math.max(0, maxCount - activeCount);
-  const sortedNewestFirst = [...orphans].sort((a, b) => b.mtimeMs - a.mtimeMs);
-  const keep = new Set(sortedNewestFirst.slice(0, budget).map((o) => o.path));
-  const removed = [];
-  const kept = [];
-  for (const orphan of orphans) {
-    if (keep.has(orphan.path)) {
-      kept.push(orphan.path);
-      continue;
-    }
-    if (opts?.dryRun) {
-      removed.push(orphan.path);
-      continue;
+function killStaleWorktreeListeners(ports, worktreePath, signal = "SIGTERM") {
+  if (!worktreePath.trim()) {
+    killListenersOnPorts(ports);
+    return;
+  }
+  if (process.platform === "win32") {
+    killListenersOnPorts(ports);
+    return;
+  }
+  const selfPid = process.pid;
+  for (const port of ports) {
+    if (!Number.isFinite(port) || port <= 0) continue;
+    for (const pid of listUnixListenerPids(port, selfPid)) {
+      const cwd = listenerCwd(pid);
+      if (cwd && isOtherWorktreeListenerCwd(cwd, worktreePath)) continue;
+      signalPid(pid, signal);
     }
+  }
+}
+function killScriptTree(child, ports = []) {
+  const pid = child.pid;
+  if (pid) {
     try {
-      await removeWorktree(orphan.repoPath, orphan.path);
-      removed.push(orphan.path);
+      if (process.platform === "win32") {
+        void execa2("taskkill", ["/pid", String(pid), "/T", "/F"], { reject: false });
+      } else {
+        process.kill(-pid, "SIGTERM");
+        setTimeout(() => {
+          try {
+            process.kill(-pid, "SIGKILL");
+          } catch {
+          }
+        }, 2500).unref?.();
+      }
     } catch {
-      kept.push(orphan.path);
+      try {
+        child.kill("SIGTERM");
+      } catch {
+      }
     }
   }
-  if (!opts?.dryRun) {
-    updateAdvancedSettings({
-      worktreeLastCleanupAt: (/* @__PURE__ */ new Date()).toISOString()
-    });
-  }
-  return { removed, kept, orphans };
-}
-function shouldRunWorktreeCleanup(settings = loadAppSettings()) {
-  const intervalHours = settings.advanced.worktreeCleanupIntervalHours ?? 6;
-  const last = settings.advanced.worktreeLastCleanupAt;
-  if (!last) return true;
-  const elapsed = Date.now() - Date.parse(last);
-  return elapsed >= intervalHours * 36e5;
+  killListenersOnPorts(ports);
 }
-
-// src/store/history-cleanup.ts
-function stripArchivedTranscript(thread) {
-  writeThread(
+async function spawnWorkspaceScript(command, opts) {
+  const loginEnv = await captureLoginEnv();
+  const env = buildWorkspaceScriptEnv(
     {
-      ...thread,
-      attachments: [],
-      pendingTurnAttachments: [],
-      queueAttachments: [],
-      messages: [historyRetentionStubMessage(thread)]
+      worktreePath: opts.worktreePath,
+      repoPath: opts.repoPath,
+      workspaceName: opts.workspaceName,
+      defaultBranch: opts.defaultBranch,
+      ports: opts.ports
     },
-    { touch: false }
+    loginEnv
   );
-}
-function cleanupArchivedHistory(opts = {}) {
-  const settings = loadAppSettings();
-  if (!opts.force && opts.purgeOlderThanDays == null && !autoCleanupHistoryEnabled(settings)) {
-    return { stripped: [], purged: [] };
+  try {
+    mergeAgentGitAuthEnv(
+      env,
+      await resolveAgentGitAuthEnv(env, { cwd: opts.worktreePath })
+    );
+  } catch {
   }
-  const archived = listThreads({ includeArchived: true }).filter((t) => t.status === "archived");
-  const nowMs = opts.nowMs ?? Date.now();
-  const plan = opts.purgeOlderThanDays != null ? { stripIds: [], purgeIds: planHistoryAgePurge(archived, opts.purgeOlderThanDays, nowMs) } : planHistoryRetention(archived, {
-    maxCount: opts.maxCount ?? historyMaxCount(settings),
-    maxDays: opts.maxDays ?? historyMaxDays(settings),
-    nowMs
+  if (opts.heldPorts?.length) {
+    await Promise.all(opts.heldPorts.map((h) => h.release()));
+  }
+  const shell = process.platform === "darwin" ? "zsh" : "bash";
+  const child = execa2(shell, ["-lc", command], {
+    cwd: opts.worktreePath,
+    reject: false,
+    env,
+    // Own process group so Stop can tear down the whole tree (not just the shell).
+    // There is no settings.toml `stop=` / teardown hook for run scripts.
+    ...process.platform === "win32" ? {} : { detached: true }
   });
-  const stripped = [];
-  const purged = [];
-  if (opts.dryRun) {
-    return { stripped: plan.stripIds, purged: plan.purgeIds };
+  pipeLines(child.stdout, opts.onLine);
+  pipeLines(child.stderr, opts.onLine);
+  const ports = opts.ports ?? [];
+  return {
+    pid: child.pid,
+    kill: () => killScriptTree(child, ports),
+    done: child.then((r) => r.exitCode ?? null),
+    child
+  };
+}
+async function attachAbort(handle, signal) {
+  if (signal) {
+    const onAbort = () => handle.kill();
+    if (signal.aborted) onAbort();
+    else signal.addEventListener("abort", onAbort, { once: true });
   }
-  for (const id of plan.stripIds) {
-    const thread = readThread(id);
-    if (!thread || thread.status !== "archived") continue;
-    try {
-      stripArchivedTranscript(thread);
-      stripped.push(id);
-    } catch {
-    }
+  return handle.done;
+}
+async function runSetupScript(repoPath, worktreePath, onLine, opts) {
+  const settings = loadWorkspaceSettings(worktreePath, repoPath);
+  if (!settings?.setup) return { ran: false, exitCode: null, source: null };
+  const source = workspaceSettingsSourceLabel(worktreePath, repoPath);
+  onLine?.(`[setup] ${source ?? "settings.toml"}`);
+  const handle = await spawnWorkspaceScript(settings.setup, {
+    worktreePath,
+    repoPath,
+    defaultBranch: opts?.defaultBranch,
+    onLine
+  });
+  const exitCode = await attachAbort(handle, opts?.signal);
+  return {
+    ran: true,
+    exitCode,
+    source,
+    kill: handle.kill
+  };
+}
+async function runConventionSetup(repoPath, worktreePath, onLine, opts) {
+  const found = findConventionSetup(worktreePath, repoPath);
+  if (!found) return { ran: false, exitCode: null, source: null };
+  onLine?.(`[setup] ${found.source}`);
+  const handle = await spawnWorkspaceScript(found.command, {
+    worktreePath,
+    repoPath,
+    defaultBranch: opts?.defaultBranch,
+    onLine
+  });
+  const exitCode = await attachAbort(handle, opts?.signal);
+  return {
+    ran: true,
+    exitCode,
+    source: found.source,
+    kill: handle.kill
+  };
+}
+async function runWorkspaceSetup(repoPath, worktreePath, onLine, opts) {
+  await ensureWorktreeSideboardIgnored(worktreePath);
+  const review = ensureReviewGuidelinesFile(worktreePath, repoPath);
+  if (review.wrote) {
+    onLine?.(`[setup] wrote ${review.path} \u2014 local Review guidelines`);
   }
-  for (const id of plan.purgeIds) {
-    const thread = readThread(id);
-    if (!thread || thread.status !== "archived") continue;
-    try {
-      deleteThreadRecord(id);
-      purged.push(id);
-    } catch {
-    }
+  let setup = await runSetupScript(repoPath, worktreePath, onLine, opts);
+  if (!setup.ran) {
+    setup = await runCursorWorktreeSetup(repoPath, worktreePath, onLine);
   }
-  if (stripped.length > 0 || purged.length > 0) {
-    updateAdvancedSettings({
-      historyLastCleanupAt: new Date(nowMs).toISOString()
-    });
+  if (!setup.ran) {
+    setup = await runConventionSetup(repoPath, worktreePath, onLine, opts);
   }
-  return { stripped, purged };
+  return setup;
 }
-function shouldRunHistoryCleanup(settings = loadAppSettings()) {
-  if (!autoCleanupHistoryEnabled(settings)) return false;
-  const intervalHours = settings.advanced.historyCleanupIntervalHours ?? HISTORY_CLEANUP_INTERVAL_HOURS_DEFAULT;
-  const last = settings.advanced.historyLastCleanupAt;
-  if (!last) return true;
-  const elapsed = Date.now() - Date.parse(last);
-  return Number.isFinite(elapsed) && elapsed >= intervalHours * 36e5;
+async function runArchiveScript(repoPath, worktreePath, onLine) {
+  const settings = loadWorkspaceSettings(worktreePath, repoPath);
+  if (!settings?.archive) return { ran: false, exitCode: null };
+  const handle = await spawnWorkspaceScript(settings.archive, {
+    worktreePath,
+    repoPath,
+    onLine
+  });
+  const exitCode = await handle.done;
+  return { ran: true, exitCode };
 }
-
-// src/git/apply-into-main.ts
-import { execa as execa3 } from "execa";
-async function applyThreadIntoMain(thread, opts) {
-  const method = opts?.method ?? "merge";
-  const target = opts?.targetBranch?.trim() || await resolveDefaultBranch(thread.repoPath);
-  const status = await execa3("git", ["status", "--porcelain"], {
-    cwd: thread.repoPath,
-    reject: false
+function listRunScripts(worktreePath, repoPath) {
+  const settings = loadWorkspaceSettings(worktreePath, repoPath);
+  if (!settings?.runScripts.length) return [];
+  return settings.runScripts.filter((s) => {
+    if (!s.availableIn?.length) return true;
+    return s.availableIn.includes("local");
   });
-  if (status.stdout.trim()) {
-    throw new Error(
-      `Main checkout is dirty \u2014 commit or stash before apply-into-main (${thread.repoPath})`
-    );
+}
+function getDefaultRunScript(worktreePath, repoPath) {
+  const scripts = listRunScripts(worktreePath, repoPath);
+  if (!scripts.length) return null;
+  return scripts.find((s) => s.default === true) ?? scripts.find((s) => s.name === "dev") ?? scripts.find((s) => s.name !== "all") ?? scripts[0] ?? null;
+}
+function getRunScript(worktreePath, repoPath, name) {
+  const scripts = listRunScripts(worktreePath, repoPath);
+  if (!scripts.length) return null;
+  if (name) {
+    return scripts.find((s) => s.name === name) ?? null;
   }
-  const checkout = await execa3("git", ["checkout", target], {
-    cwd: thread.repoPath,
-    reject: false
-  });
-  if (checkout.exitCode !== 0) {
-    throw new Error(
-      `Failed to checkout ${target}: ${checkout.stderr.trim() || checkout.stdout.trim()}`
-    );
+  return getDefaultRunScript(worktreePath, repoPath);
+}
+function getRunMode(worktreePath, repoPath) {
+  return loadWorkspaceSettings(worktreePath, repoPath)?.runMode ?? "concurrent";
+}
+async function reservePort() {
+  return new Promise((resolve2, reject) => {
+    const server = createServer();
+    let released = false;
+    const release = () => new Promise((res) => {
+      if (released) {
+        res();
+        return;
+      }
+      released = true;
+      server.close(() => res());
+    });
+    server.listen(0, "127.0.0.1", () => {
+      const addr = server.address();
+      if (!addr || typeof addr === "string") {
+        void release().then(() => reject(new Error("Failed to allocate port")));
+        return;
+      }
+      resolve2({ port: addr.port, release });
+    });
+    server.on("error", reject);
+  });
+}
+async function tryReservePort(port) {
+  if (!Number.isInteger(port) || port <= 0 || port > 65535) return null;
+  return new Promise((resolve2) => {
+    const server = createServer();
+    let released = false;
+    const release = () => new Promise((res) => {
+      if (released) {
+        res();
+        return;
+      }
+      released = true;
+      server.close(() => res());
+    });
+    server.once("error", () => {
+      try {
+        server.close();
+      } catch {
+      }
+      resolve2(null);
+    });
+    server.listen(port, "127.0.0.1", () => {
+      resolve2({ port, release });
+    });
+  });
+}
+function normalizePreferredPorts(ports, size) {
+  if (!ports?.length) return [];
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const p of ports) {
+    if (!Number.isInteger(p) || p <= 0 || p > 65535 || seen.has(p)) continue;
+    seen.add(p);
+    out.push(p);
+    if (out.length >= size) break;
   }
-  if (method === "cherry-pick") {
-    const log = await execa3(
-      "git",
-      ["log", "--reverse", "--format=%H", `${target}..${thread.branchName}`],
-      { cwd: thread.repoPath, reject: false }
-    );
-    const shas = log.stdout.split("\n").map((s) => s.trim()).filter(Boolean);
-    if (!shas.length) {
-      return {
-        applied: false,
-        method,
-        targetBranch: target,
-        message: `No commits on ${thread.branchName} not already in ${target}`
-      };
-    }
-    for (const sha of shas) {
-      const cp = await execa3("git", ["cherry-pick", sha], {
-        cwd: thread.repoPath,
-        reject: false
-      });
-      if (cp.exitCode !== 0) {
-        await execa3("git", ["cherry-pick", "--abort"], {
-          cwd: thread.repoPath,
-          reject: false
-        });
-        throw new Error(
-          `Cherry-pick ${sha.slice(0, 8)} failed: ${cp.stderr.trim() || cp.stdout.trim()}`
-        );
+  return out;
+}
+function delay(ms) {
+  return new Promise((resolve2) => setTimeout(resolve2, ms));
+}
+async function fillPortRange(held, size) {
+  if (held.length >= size) return held;
+  const base = held[0]?.port;
+  const taken = new Set(held.map((h) => h.port));
+  try {
+    let offset = 0;
+    while (held.length < size) {
+      const candidate = base != null ? base + offset : null;
+      offset += 1;
+      if (candidate != null && taken.has(candidate)) continue;
+      const next = candidate != null ? await tryReservePort(candidate) : null;
+      if (next) {
+        held.push(next);
+        taken.add(next.port);
+      } else {
+        const ephemeral = await reservePort();
+        held.push(ephemeral);
+        taken.add(ephemeral.port);
       }
     }
-    return {
-      applied: true,
-      method,
-      targetBranch: target,
-      message: `Cherry-picked ${shas.length} commit(s) from ${thread.branchName} into ${target}`
-    };
-  }
-  const merge = await execa3(
-    "git",
-    ["merge", "--no-ff", "-m", `Apply Sideboard thread ${thread.branchName}`, thread.branchName],
-    { cwd: thread.repoPath, reject: false }
-  );
-  if (merge.exitCode !== 0) {
-    await execa3("git", ["merge", "--abort"], {
-      cwd: thread.repoPath,
-      reject: false
-    });
-    throw new Error(
-      `Merge failed: ${merge.stderr.trim() || merge.stdout.trim()}`
-    );
+    return held;
+  } catch (err) {
+    await Promise.all(held.map((h) => h.release()));
+    throw err;
   }
-  return {
-    applied: true,
-    method: "merge",
-    targetBranch: target,
-    message: `Merged ${thread.branchName} into ${target} at ${thread.repoPath}`
-  };
 }
-
-// src/git/clone-repo.ts
-import { existsSync as existsSync7 } from "fs";
-import { basename as basename2, join as join9 } from "path";
-import { execa as execa4 } from "execa";
-async function cloneRepoIntoSideboard(opts) {
-  const url = opts.url.trim();
-  if (!url) throw new Error("Clone URL is required");
-  let name = opts.name?.trim();
-  if (!name) {
-    const leaf = basename2(url.replace(/\/$/, "").replace(/\.git$/, ""));
-    name = leaf || "repo";
+async function tryReserveAvailablePorts(ports) {
+  const held = [];
+  for (const port of ports) {
+    const next = await tryReservePort(port);
+    if (next) held.push(next);
   }
-  name = name.replace(/[^a-zA-Z0-9._-]+/g, "-").replace(/^-+|-+$/g, "") || "repo";
-  const dest = join9(sideboardReposDir(), name);
-  if (existsSync7(dest)) {
-    const repoPath2 = await resolveRepoRoot(dest);
-    const workspace2 = await ensureWorkspace(repoPath2);
-    return { repoPath: repoPath2, workspace: workspace2 };
+  return held;
+}
+async function reclaimPreferredPorts(ports, worktreePath) {
+  const primary = ports[0];
+  if (primary == null) return null;
+  const takePrimary = async () => {
+    const held2 = await tryReserveAvailablePorts(ports);
+    if (held2.some((h) => h.port === primary)) return held2;
+    await Promise.all(held2.map((h) => h.release()));
+    return null;
+  };
+  let held = await takePrimary();
+  if (held) return held;
+  if (worktreePath) {
+    killStaleWorktreeListeners(ports, worktreePath, "SIGTERM");
+  } else {
+    killListenersOnPorts(ports);
   }
-  const result = await execa4("git", ["clone", url, dest], { reject: false });
-  if (result.exitCode !== 0) {
-    throw new Error(
-      `git clone failed: ${result.stderr?.trim() || result.stdout?.trim() || `exit ${result.exitCode}`}`
-    );
+  for (let i = 0; i < RECLAIM_TRIES; i++) {
+    await delay(RECLAIM_RETRY_DELAY_MS);
+    held = await takePrimary();
+    if (held) return held;
+    if (i === 2 && worktreePath) {
+      killStaleWorktreeListeners(ports, worktreePath, "SIGKILL");
+    }
   }
-  const repoPath = await resolveRepoRoot(dest);
-  const workspace = await ensureWorkspace(repoPath);
-  return { repoPath, workspace };
-}
-
-// src/types/thread.ts
-function isAdoptableRunScriptRequest(req) {
-  return Boolean(req && !req.fulfilledAt && !req.error);
-}
-
-// src/store/desktop-host.ts
-import { readFileSync as readFileSync6, unlinkSync, writeFileSync as writeFileSync5 } from "fs";
-import { join as join10 } from "path";
-function desktopHostPidPath() {
-  return join10(appDataDir(), "desktop-host.pid");
+  return null;
 }
-function readDesktopHostPid() {
-  try {
-    const pid = Number.parseInt(readFileSync6(desktopHostPidPath(), "utf8").trim(), 10);
-    if (!Number.isFinite(pid) || pid <= 0) return null;
-    return pid;
-  } catch {
-    return null;
+async function reservePortRange(size = PORT_RANGE_SIZE, opts) {
+  const preferred = normalizePreferredPorts(opts?.preferred, size);
+  if (preferred.length) {
+    const reused = await reclaimPreferredPorts(preferred, opts?.worktreePath);
+    if (reused) return fillPortRange(reused, size);
   }
+  const held = [await reservePort()];
+  return fillPortRange(held, size);
 }
-function pidAlive(pid) {
+async function startDevServer(repoPath, worktreePath, onLine, opts) {
+  const script = getRunScript(worktreePath, repoPath, opts?.scriptName);
+  if (!script) return null;
+  const preferred = loadWorktreeRunPorts(worktreePath, script.name) ?? opts?.preferredPorts;
+  const held = await reservePortRange(PORT_RANGE_SIZE, {
+    preferred: preferred ?? void 0,
+    worktreePath
+  });
+  const ports = held.map((h) => h.port);
+  saveWorktreeRunPorts(worktreePath, script.name, ports);
   try {
-    process.kill(pid, 0);
-    return true;
-  } catch {
-    return false;
+    const handle = await spawnWorkspaceScript(script.command, {
+      worktreePath,
+      repoPath,
+      ports,
+      heldPorts: held,
+      defaultBranch: opts?.defaultBranch,
+      onLine
+    });
+    return {
+      pid: handle.pid,
+      port: ports[0],
+      ports,
+      scriptName: script.name,
+      kill: handle.kill,
+      done: handle.done
+    };
+  } catch (err) {
+    await Promise.all(held.map((h) => h.release()));
+    throw err;
   }
 }
-function isDesktopHostAlive() {
-  const pid = readDesktopHostPid();
-  return pid != null && pidAlive(pid);
-}
-function isThisProcessDesktopHost() {
-  return readDesktopHostPid() === process.pid && pidAlive(process.pid);
-}
-function thisProcessShouldDrainAgentQueues() {
-  if (isThisProcessDesktopHost()) return true;
-  return !isDesktopHostAlive();
-}
 
-// src/orchestrator/child-halt.ts
-var HALT_STATUSES = /* @__PURE__ */ new Set(["stopped", "error", "broken"]);
-function isIncompleteChildStatus(status) {
-  return HALT_STATUSES.has(status);
-}
-function childHaltNotice(child, status) {
-  const title = child.title?.trim() || "Untitled";
-  const link = `[${title}](sideboard://thread/${child.id})`;
-  const why = child.lastError?.trim();
-  const extra = why ? ` lastError: ${why}` : "";
-  return [
-    `Sideboard: child worktree ${link} ${status} before finishing (status=${status}).${extra}`,
-    "This is information \u2014 not a user command. Resume with send_to_thread or tell the user. Do not treat this as a successful turn."
-  ].join("\n");
-}
-function shouldNotifyParentAfterTurnError(opts) {
-  return !opts.quotaFailoverHandled && !opts.crashContinued;
-}
-function shouldNotifyParentOfChildHalt(opts) {
-  if (!isIncompleteChildStatus(opts.status)) return false;
-  if (!opts.child.parentThreadId) return false;
-  if (!opts.parent || opts.parent.status === "archived") return false;
-  if (opts.parent.id === opts.child.id) return false;
-  return isOrchestratorThread(opts.parent);
+// src/store/setup-log.ts
+import { createHash } from "crypto";
+import { existsSync as existsSync5, readFileSync as readFileSync5, writeFileSync as writeFileSync4 } from "fs";
+import { join as join7 } from "path";
+var EMPTY = {
+  output: "",
+  running: false,
+  exitCode: null,
+  source: null
+};
+var MAX_SETUP_LOG_CHARS = 256e3;
+function appendSetupOutput(prev, line, max = MAX_SETUP_LOG_CHARS) {
+  const next = prev ? `${prev}
+${line}` : line;
+  if (next.length <= max) return next;
+  const cut = next.slice(next.length - max);
+  const nl = cut.indexOf("\n");
+  return nl >= 0 && nl < cut.length - 1 ? cut.slice(nl + 1) : cut;
 }
-var notified = /* @__PURE__ */ new Set();
-function noticeKey(childId, status) {
-  return `${childId}:${status}`;
+var memory = /* @__PURE__ */ new Map();
+var persistTimers = /* @__PURE__ */ new Map();
+function fromSnapshot(snap) {
+  return {
+    chunks: snap.output ? [snap.output] : [],
+    length: snap.output.length,
+    running: snap.running,
+    exitCode: snap.exitCode,
+    source: snap.source
+  };
 }
-function notifyParentOfChildHalt(child, status, send) {
-  const parent = child.parentThreadId ? readThread(child.parentThreadId) : null;
-  if (!shouldNotifyParentOfChildHalt({ child, parent, status })) return false;
-  const key = noticeKey(child.id, status);
-  if (notified.has(key)) return false;
-  notified.add(key);
-  const parentId = parent.id;
-  void send(parentId, childHaltNotice(child, status)).catch(() => {
-    notified.delete(key);
-  });
-  return true;
+function materialize(mem) {
+  let output = mem.chunks.join("\n");
+  if (output.length > MAX_SETUP_LOG_CHARS) {
+    output = appendSetupOutput("", output);
+    mem.chunks = [output];
+    mem.length = output.length;
+  }
+  return {
+    output,
+    running: mem.running,
+    exitCode: mem.exitCode,
+    source: mem.source
+  };
 }
-
-// src/mcp/wait-for-job.ts
-import {
-  appendFileSync as appendFileSync2,
-  existsSync as existsSync8,
-  mkdirSync as mkdirSync5,
-  readdirSync as readdirSync3,
-  readFileSync as readFileSync7,
-  writeFileSync as writeFileSync6
-} from "fs";
-import { dirname as dirname4, join as join11 } from "path";
-
-// src/mcp/wait-for-turn.ts
-var MCP_WAIT_FOR_TURN_MAX_MS = 45e3;
-function mcpWaitForTurnTimeoutMs(requested) {
-  const n = requested ?? MCP_WAIT_FOR_TURN_MAX_MS;
-  if (!Number.isFinite(n)) return MCP_WAIT_FOR_TURN_MAX_MS;
-  return Math.min(Math.max(1e3, Math.floor(n)), MCP_WAIT_FOR_TURN_MAX_MS);
+function setupLogPath(threadId) {
+  return join7(threadsDir(), `${threadId}.setup.log.json`);
 }
-var MCP_WAIT_STILL_RUNNING_HINT = "Child is still working. Call wait_for_turn again. Do not send_to_thread a check-in (that steers / interrupts) or assume a hang while progress is updating.";
-var MCP_WAIT_QUEUED_HINT = "Child is queued waiting for a concurrency slot \u2014 it has not started yet. Call wait_for_turn again. Do not send_to_thread a check-in (that steers / interrupts), force_stop, or assume it failed to start.";
-var MCP_WAIT_STOPPED_HINT = "Child was stopped before the turn finished. Do not treat this as success. send_to_thread to resume, or tell the user.";
-var MCP_WAIT_BROKEN_HINT = "Child worktree is broken (missing on disk). Tell the user \u2014 do not treat this as success.";
-var MCP_WAIT_ERROR_HINT = "Child turn failed. lastError/text is the failure \u2014 switch agent, tell the user, or retry. Do not treat empty text as success.";
-var MCP_WAIT_INPUT_REQUIRED_HINT = "Child asked the user a question (ask_user). taskState is input-required. Wait for the user to answer in that chat \u2014 do not send_to_thread a check-in.";
-function mcpWaitTaskHint(taskState, status) {
-  switch (taskState) {
-    case "submitted":
-      return MCP_WAIT_QUEUED_HINT;
-    case "working":
-      return MCP_WAIT_STILL_RUNNING_HINT;
-    case "input-required":
-      return MCP_WAIT_INPUT_REQUIRED_HINT;
-    case "canceled":
-      return MCP_WAIT_STOPPED_HINT;
-    case "failed":
-      return status === "broken" ? MCP_WAIT_BROKEN_HINT : MCP_WAIT_ERROR_HINT;
-    default:
-      return void 0;
-  }
+function setupLogKeyForWorktree(worktreePath) {
+  const norm = normalizeWorktreePath(worktreePath);
+  return `wt-${createHash("sha1").update(norm).digest("hex").slice(0, 16)}`;
 }
-
-// src/mcp/wait-for-job.ts
-var MAX_JOB_CONTINUES = 8;
-var MAX_JOB_DELTA_LINES = 80;
-var MAX_JOB_DELTA_CHARS = 4e3;
-var DEFERRED_DONE_MAX_CHARS = 480;
-var GH_WATCH_REFRESH = "Refreshing run status every 3 seconds.";
-var MCP_WAIT_JOB_STILL_RUNNING_HINT = "Job is still running. The type=log pane already appended this delta. Call wait_for_job again. If it is hanging, producing no useful output, or doing the wrong thing, call stop_job (same id) instead of looping forever. Do not end the turn or tell the user you will let them know later.";
-var MCP_STOP_JOB_HINT = "Stopped. The type=log pane is status=failed with the last delta. Do not wait again unless you start a new command.";
-var JOB_ID_RE = /^[a-zA-Z0-9._-]{1,64}$/;
-function mcpWaitForJobTimeoutMs(requested) {
-  return mcpWaitForTurnTimeoutMs(requested);
+function emptySetupLog() {
+  return { ...EMPTY };
 }
-function sanitizeDetachedJobId(id) {
-  const s = id.trim();
-  if (!JOB_ID_RE.test(s)) {
-    throw new Error(`detached-job id must be 1\u201364 chars [A-Za-z0-9._-], got ${JSON.stringify(id)}`);
+var PERSIST_DEBOUNCE_MS = 500;
+function persistNow(threadId) {
+  const timer = persistTimers.get(threadId);
+  if (timer) {
+    clearTimeout(timer);
+    persistTimers.delete(threadId);
   }
-  return s;
-}
-function jobAlive(pid) {
-  if (!Number.isInteger(pid) || pid <= 0) return false;
+  const mem = memory.get(threadId);
+  if (!mem) return;
   try {
-    process.kill(pid, 0);
-    return true;
+    writeFileSync4(
+      setupLogPath(threadId),
+      `${JSON.stringify(materialize(mem))}
+`,
+      "utf8"
+    );
   } catch {
-    return false;
   }
 }
-function processGroupAlive(pgid) {
-  if (process.platform === "win32") return false;
-  if (!Number.isInteger(pgid) || pgid <= 1) return false;
+function schedulePersist(threadId) {
+  if (persistTimers.has(threadId)) return;
+  persistTimers.set(
+    threadId,
+    setTimeout(() => {
+      persistTimers.delete(threadId);
+      persistNow(threadId);
+    }, PERSIST_DEBOUNCE_MS)
+  );
+}
+function loadFromDisk(threadId) {
+  const path = setupLogPath(threadId);
+  if (!existsSync5(path)) return null;
   try {
-    process.kill(-pgid, 0);
-    return true;
-  } catch (err) {
-    return err && typeof err === "object" && "code" in err && err.code === "EPERM";
+    const raw = JSON.parse(readFileSync5(path, "utf8"));
+    return {
+      output: typeof raw.output === "string" ? raw.output : "",
+      running: Boolean(raw.running),
+      exitCode: typeof raw.exitCode === "number" ? raw.exitCode : null,
+      source: typeof raw.source === "string" ? raw.source : null
+    };
+  } catch {
+    return null;
   }
 }
-function jobTreeAlive(pid) {
-  if (pid == null) return false;
-  return jobAlive(pid) || processGroupAlive(pid);
-}
-function readIntFile(file) {
-  if (!existsSync8(file)) return null;
-  const n = Number.parseInt(readFileSync7(file, "utf8").trim(), 10);
-  return Number.isInteger(n) ? n : null;
+function memFor(threadId) {
+  const cached = memory.get(threadId);
+  if (cached) return cached;
+  const mem = fromSnapshot(loadFromDisk(threadId) ?? emptySetupLog());
+  memory.set(threadId, mem);
+  return mem;
 }
-function jobDir(root, id, legacy = false) {
-  return join11(root, legacy ? LEGACY_DETACHED_JOBS_DIR : DETACHED_JOBS_DIR, id);
+function readSetupLog(threadId) {
+  const cached = memory.get(threadId);
+  if (cached) return materialize(cached);
+  const disk = loadFromDisk(threadId);
+  if (disk) {
+    memory.set(threadId, fromSnapshot(disk));
+    return disk;
+  }
+  return emptySetupLog();
 }
-function resolveJobDir(root, id) {
-  const modern = jobDir(root, id, false);
-  if (existsSync8(modern)) return modern;
-  const legacy = jobDir(root, id, true);
-  if (existsSync8(legacy)) return legacy;
-  return modern;
+function beginSetupLog(threadId) {
+  const mem = {
+    chunks: [],
+    length: 0,
+    running: true,
+    exitCode: null,
+    source: null
+  };
+  memory.set(threadId, mem);
+  persistNow(threadId);
+  return materialize(mem);
 }
-function listJobIdsIn(root, rel) {
-  const dir = join11(root, rel);
-  if (!existsSync8(dir)) return [];
-  return readdirSync3(dir, { withFileTypes: true }).filter((e) => e.isDirectory() && JOB_ID_RE.test(e.name)).map((e) => e.name);
+function appendSetupLog(threadId, line) {
+  const mem = memFor(threadId);
+  mem.chunks.push(line);
+  mem.length += line.length + 1;
+  mem.running = true;
+  if (mem.length > MAX_SETUP_LOG_CHARS * 2) materialize(mem);
+  schedulePersist(threadId);
 }
-function listRunningDetachedJobs(worktreePath) {
-  const root = worktreePath.trim();
-  if (!root) return [];
-  const ids = /* @__PURE__ */ new Set([
-    ...listJobIdsIn(root, DETACHED_JOBS_DIR),
-    ...listJobIdsIn(root, LEGACY_DETACHED_JOBS_DIR)
-  ]);
-  const running = [];
-  for (const id of ids) {
-    const dir = resolveJobDir(root, id);
-    const pid = readIntFile(join11(dir, "pid"));
-    if (jobTreeAlive(pid)) running.push(id);
-  }
-  return running.sort();
+function finishSetupLog(threadId, exitCode, source) {
+  const mem = memFor(threadId);
+  mem.running = false;
+  mem.exitCode = exitCode;
+  mem.source = source ?? mem.source;
+  persistNow(threadId);
+  return materialize(mem);
 }
-function looksLikeDeferredDonePromise(text) {
-  const t = (text ?? "").trim();
-  if (!t || t.length > DEFERRED_DONE_MAX_CHARS) return false;
-  const unquoted = t.replace(/`[^`]*`/g, " ").replace(/["“”][^"“”]*["“”]/g, " ").replace(/\s+/g, " ").trim();
-  if (!unquoted) return false;
-  return /\b(i['’]?ll|i will)\s+let you know\b/i.test(unquoted) || /\blet you know when\b/i.test(unquoted) || /\b(check back|ping me)\s+when\b/i.test(unquoted) || /\bi(?:['’]ll| will)\s+(report|update you)\s+when\b/i.test(unquoted);
+
+// src/store/run-log.ts
+import { createHash as createHash2 } from "crypto";
+import { existsSync as existsSync6, readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "fs";
+import { join as join8 } from "path";
+var EMPTY2 = {
+  output: "",
+  running: false,
+  exitCode: null,
+  scriptName: null
+};
+var MAX_RUN_LOG_CHARS = 256e3;
+var DEFAULT_RUN_LOG_TAIL_CHARS = 16e3;
+var memory2 = /* @__PURE__ */ new Map();
+var persistTimers2 = /* @__PURE__ */ new Map();
+function fromSnapshot2(snap) {
+  return {
+    chunks: snap.output ? [snap.output] : [],
+    length: snap.output.length,
+    running: snap.running,
+    exitCode: snap.exitCode,
+    scriptName: snap.scriptName
+  };
 }
-function isJobContinuePrompt(text) {
-  if (typeof text !== "string") return false;
-  const t = text.trim();
-  return t.startsWith("Detached job still running:") || t.startsWith("You ended the turn after promising to report later");
+function materialize2(mem) {
+  let output = mem.chunks.join("\n");
+  if (output.length > MAX_RUN_LOG_CHARS) {
+    output = appendSetupOutput("", output, MAX_RUN_LOG_CHARS);
+    mem.chunks = [output];
+    mem.length = output.length;
+  }
+  return {
+    output,
+    running: mem.running,
+    exitCode: mem.exitCode,
+    scriptName: mem.scriptName
+  };
 }
-function collapseGhRunWatchLog(text) {
-  if (!text.includes(GH_WATCH_REFRESH)) return text;
-  const frames = text.split(/(?=Refreshing run status every 3 seconds\.)/);
-  const watchFrames = frames.filter((f) => f.includes(GH_WATCH_REFRESH));
-  if (watchFrames.length <= 1) return text;
-  const prefix = frames[0]?.includes(GH_WATCH_REFRESH) ? "" : frames[0] ?? "";
-  const last = watchFrames[watchFrames.length - 1] ?? "";
-  const omitted = watchFrames.length - 1;
-  const note = `(${omitted} identical gh run watch refresh${omitted === 1 ? "" : "es"} omitted)
-`;
-  return [prefix.trimEnd(), note, last.trimStart()].filter(Boolean).join("\n");
+function safeScriptToken(scriptName) {
+  const token = scriptName.replace(/[^a-zA-Z0-9._-]+/g, "_").slice(0, 64);
+  return token || "dev";
 }
-function capJobLogDelta(text) {
-  const collapsed = collapseGhRunWatchLog(text);
-  const lines = collapsed.split("\n");
-  let out = lines.length > MAX_JOB_DELTA_LINES ? `\u2026(${lines.length - MAX_JOB_DELTA_LINES} earlier lines omitted)
-${lines.slice(-MAX_JOB_DELTA_LINES).join("\n")}` : collapsed;
-  if (out.length > MAX_JOB_DELTA_CHARS) {
-    out = `\u2026(truncated ${out.length} chars)
-${out.slice(-MAX_JOB_DELTA_CHARS)}`;
-  }
-  return out;
+function runLogPath(key) {
+  return join8(threadsDir(), `${key}.run.log.json`);
 }
-function formatJobStillRunningContinuePrompt(jobIds) {
-  const ids = jobIds.join(", ");
-  return [
-    `Detached job still running: ${ids}.`,
-    "Do not end this turn. Loop wait_for_job (same id) until stillRunning is false. The log pane updates from each wait result.",
-    "If the job is hanging or doing the wrong thing, call stop_job (same id) instead of looping forever.",
-    "Then report the result. Do not tell the user you will let them know later."
-  ].join(" ");
+function runLogKeyForWorktree(worktreePath, scriptName) {
+  const norm = normalizeWorktreePath(worktreePath);
+  const hash = createHash2("sha1").update(norm).digest("hex").slice(0, 16);
+  return `wt-${hash}-run-${safeScriptToken(scriptName)}`;
 }
-function formatDeferredDoneContinuePrompt() {
-  return [
-    "You ended the turn after promising to report later, but no detached job is running.",
-    "If tests/pack/deploy still need to run: start once with detached-job.cjs, then loop wait_for_job until stillRunning is false (the log pane updates from wait JSON).",
-    "Do not say you will let the user know later."
-  ].join(" ");
+function emptyRunLog() {
+  return { ...EMPTY2 };
 }
-function turnWatchedDetachedJob(parts) {
-  return parts.some((p) => {
-    if (p.type !== "tool") return false;
-    if (/wait_for_job$/i.test(p.name ?? "") || /stop_job$/i.test(p.name ?? "")) return true;
-    const blob = [p.name, p.detail, p.description, p.input ? JSON.stringify(p.input) : ""].filter(Boolean).join(" ");
-    return /detached-job\.(?:js|cjs)\b/i.test(blob);
-  });
+function sliceRunLogOutput(output, tailChars = DEFAULT_RUN_LOG_TAIL_CHARS) {
+  const max = Math.max(1, tailChars);
+  const outputChars = output.length;
+  if (outputChars <= max) return { output, truncated: false, outputChars };
+  const cut = output.slice(outputChars - max);
+  const nl = cut.indexOf("\n");
+  const text = nl >= 0 && nl < cut.length - 1 ? cut.slice(nl + 1) : cut;
+  return { output: text, truncated: true, outputChars };
 }
-function planJobContinue(opts) {
-  if (opts.isOrchestrator) return { action: "none" };
-  if (opts.agent === "brightsy") return { action: "none" };
-  if (opts.queueLength > 0) return { action: "none" };
-  if (opts.continueCount >= MAX_JOB_CONTINUES) return { action: "none" };
-  const farewell = looksLikeDeferredDonePromise(opts.chatText);
-  if (opts.runningJobIds.length > 0 && (farewell || opts.watchedJob)) {
+var PERSIST_DEBOUNCE_MS2 = 500;
+function persistNow2(key) {
+  const timer = persistTimers2.get(key);
+  if (timer) {
+    clearTimeout(timer);
+    persistTimers2.delete(key);
+  }
+  const mem = memory2.get(key);
+  if (!mem) return;
+  try {
+    writeFileSync5(runLogPath(key), `${JSON.stringify(materialize2(mem))}
+`, "utf8");
+  } catch {
+  }
+}
+function schedulePersist2(key) {
+  if (persistTimers2.has(key)) return;
+  persistTimers2.set(
+    key,
+    setTimeout(() => {
+      persistTimers2.delete(key);
+      persistNow2(key);
+    }, PERSIST_DEBOUNCE_MS2)
+  );
+}
+function loadFromDisk2(key) {
+  const path = runLogPath(key);
+  if (!existsSync6(path)) return null;
+  try {
+    const raw = JSON.parse(readFileSync6(path, "utf8"));
     return {
-      action: "wait",
-      jobIds: opts.runningJobIds,
-      prompt: formatJobStillRunningContinuePrompt(opts.runningJobIds)
+      output: typeof raw.output === "string" ? raw.output : "",
+      running: Boolean(raw.running),
+      exitCode: typeof raw.exitCode === "number" ? raw.exitCode : null,
+      scriptName: typeof raw.scriptName === "string" ? raw.scriptName : null
     };
+  } catch {
+    return null;
   }
-  if (looksLikeDeferredDonePromise(opts.chatText) && !opts.alreadyNudged) {
-    return { action: "nudge", prompt: formatDeferredDoneContinuePrompt() };
+}
+function memFor2(key) {
+  const cached = memory2.get(key);
+  if (cached) return cached;
+  const mem = fromSnapshot2(loadFromDisk2(key) ?? emptyRunLog());
+  memory2.set(key, mem);
+  return mem;
+}
+function readRunLog(key) {
+  const cached = memory2.get(key);
+  if (cached) return materialize2(cached);
+  const disk = loadFromDisk2(key);
+  if (disk) {
+    memory2.set(key, fromSnapshot2(disk));
+    return disk;
   }
-  return { action: "none" };
+  return emptyRunLog();
 }
-function tailProgress(logFile, maxLines = 12) {
-  if (!existsSync8(logFile)) return "(no log yet)";
-  const lines = readFileSync7(logFile, "utf8").split("\n");
-  return lines.slice(-maxLines).join("\n");
+function beginRunLog(key, scriptName) {
+  const mem = {
+    chunks: [],
+    length: 0,
+    running: true,
+    exitCode: null,
+    scriptName
+  };
+  memory2.set(key, mem);
+  persistNow2(key);
+  return materialize2(mem);
 }
-function lastProgressLine(progress) {
-  const last = progress.split("\n").map((l) => l.trim()).filter((l) => l && l !== "(no log yet)").at(-1);
-  return last ? last.slice(0, 72) : void 0;
+function appendRunLog(key, line) {
+  const mem = memFor2(key);
+  mem.chunks.push(line);
+  mem.length += line.length + 1;
+  mem.running = true;
+  if (mem.length > MAX_RUN_LOG_CHARS * 2) materialize2(mem);
+  schedulePersist2(key);
 }
-function readLogLines(file) {
-  if (!existsSync8(file)) return [];
-  const lines = readFileSync7(file, "utf8").split("\n");
-  if (lines.length && lines[lines.length - 1] === "") lines.pop();
-  return lines;
+function finishRunLog(key, exitCode) {
+  const mem = memFor2(key);
+  mem.running = false;
+  mem.exitCode = exitCode;
+  persistNow2(key);
+  return materialize2(mem);
 }
-function takeDelta(logFile, cursorFile) {
-  const lines = readLogLines(logFile);
-  const cursor = readIntFile(cursorFile) ?? 0;
-  const start = Math.min(Math.max(0, cursor), lines.length);
-  return { delta: capJobLogDelta(lines.slice(start).join("\n")), nextCursor: lines.length };
+function flushRunLog(key) {
+  persistNow2(key);
 }
-function snapshotJob(dir) {
-  const pid = readIntFile(join11(dir, "pid"));
-  const running = jobTreeAlive(pid);
-  return {
-    pid,
-    running,
-    exitCode: readIntFile(join11(dir, "exit")),
-    log: join11(dir, "log"),
-    cursor: join11(dir, "present.cursor"),
-    progress: tailProgress(join11(dir, "log"))
-  };
+
+// src/git/orphan-cleanup.ts
+import { existsSync as existsSync7, readdirSync as readdirSync3, statSync } from "fs";
+import { join as join9 } from "path";
+function isSideboardWorktreePath(path) {
+  return path.includes("/.sideboard/worktrees/") || path.includes("/sideboard/workspaces/");
 }
-function toResult(id, snap, extra) {
-  const failed = extra?.failed === true || !snap.running && snap.exitCode != null && snap.exitCode !== 0;
-  const ok = !snap.running && snap.exitCode === 0;
-  const stillRunning = snap.running && !ok;
-  const { delta, nextCursor } = takeDelta(snap.log, snap.cursor);
-  try {
-    mkdirSync5(dirname4(snap.cursor), { recursive: true });
-    writeFileSync6(snap.cursor, `${nextCursor}
-`);
-  } catch {
+async function findOrphanWorktrees(repoPaths) {
+  const threads = listThreads({ includeArchived: true });
+  const known = new Set(threads.map((t) => t.worktreePath.replace(/\/$/, "")));
+  const repos = new Set(
+    repoPaths?.length ? repoPaths : threads.map((t) => t.repoPath).filter(Boolean)
+  );
+  const homeRoot = sideboardWorkspacesDir();
+  if (existsSync7(homeRoot)) {
+    try {
+      for (const entry of readdirSync3(homeRoot, { withFileTypes: true })) {
+        if (!entry.isDirectory()) continue;
+        void entry;
+      }
+    } catch {
+    }
+  }
+  const orphans = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const repoPath of repos) {
+    if (!repoPath || !existsSync7(repoPath)) continue;
+    try {
+      const wts = await listWorktrees(repoPath);
+      for (const wt of wts) {
+        const path = wt.path.replace(/\/$/, "");
+        if (!isSideboardWorktreePath(path)) continue;
+        if (known.has(path)) continue;
+        if (seen.has(path)) continue;
+        seen.add(path);
+        let mtimeMs = 0;
+        try {
+          mtimeMs = statSync(path).mtimeMs;
+        } catch {
+          mtimeMs = 0;
+        }
+        orphans.push({ path, repoPath, mtimeMs });
+      }
+    } catch {
+    }
+    try {
+      const root = worktreesRoot(repoPath);
+      if (existsSync7(root)) {
+        for (const entry of readdirSync3(root, { withFileTypes: true })) {
+          if (!entry.isDirectory()) continue;
+          const path = join9(root, entry.name).replace(/\/$/, "");
+          if (known.has(path) || seen.has(path)) continue;
+          if (!existsSync7(join9(path, ".git"))) continue;
+          seen.add(path);
+          let mtimeMs = 0;
+          try {
+            mtimeMs = statSync(path).mtimeMs;
+          } catch {
+            mtimeMs = Date.now();
+          }
+          orphans.push({ path, repoPath, mtimeMs });
+        }
+      }
+    } catch {
+    }
+  }
+  return orphans.sort((a, b) => a.mtimeMs - b.mtimeMs);
+}
+async function cleanupOrphanWorktrees(opts) {
+  const settings = loadAppSettings();
+  const maxCount = opts?.maxCount ?? settings.advanced.worktreeMaxCount ?? 25;
+  const orphans = await findOrphanWorktrees(opts?.repoPaths);
+  const activeCount = listThreads().filter((t) => t.status !== "archived").length;
+  const budget = Math.max(0, maxCount - activeCount);
+  const sortedNewestFirst = [...orphans].sort((a, b) => b.mtimeMs - a.mtimeMs);
+  const keep = new Set(sortedNewestFirst.slice(0, budget).map((o) => o.path));
+  const removed = [];
+  const kept = [];
+  for (const orphan of orphans) {
+    if (keep.has(orphan.path)) {
+      kept.push(orphan.path);
+      continue;
+    }
+    if (opts?.dryRun) {
+      removed.push(orphan.path);
+      continue;
+    }
+    try {
+      await removeWorktree(orphan.repoPath, orphan.path);
+      removed.push(orphan.path);
+    } catch {
+      kept.push(orphan.path);
+    }
+  }
+  if (!opts?.dryRun) {
+    updateAdvancedSettings({
+      worktreeLastCleanupAt: (/* @__PURE__ */ new Date()).toISOString()
+    });
+  }
+  return { removed, kept, orphans };
+}
+function shouldRunWorktreeCleanup(settings = loadAppSettings()) {
+  const intervalHours = settings.advanced.worktreeCleanupIntervalHours ?? 6;
+  const last = settings.advanced.worktreeLastCleanupAt;
+  if (!last) return true;
+  const elapsed = Date.now() - Date.parse(last);
+  return elapsed >= intervalHours * 36e5;
+}
+
+// src/store/history-cleanup.ts
+function stripArchivedTranscript(thread) {
+  writeThread(
+    {
+      ...thread,
+      attachments: [],
+      pendingTurnAttachments: [],
+      queueAttachments: [],
+      compactedMessages: void 0,
+      messages: [historyRetentionStubMessage(thread)]
+    },
+    { touch: false }
+  );
+}
+function cleanupArchivedHistory(opts = {}) {
+  const settings = loadAppSettings();
+  if (!opts.force && opts.purgeOlderThanDays == null && !autoCleanupHistoryEnabled(settings)) {
+    return { stripped: [], purged: [] };
+  }
+  const archived = listThreads({ includeArchived: true }).filter((t) => t.status === "archived");
+  const nowMs = opts.nowMs ?? Date.now();
+  const plan = opts.purgeOlderThanDays != null ? { stripIds: [], purgeIds: planHistoryAgePurge(archived, opts.purgeOlderThanDays, nowMs) } : planHistoryRetention(archived, {
+    maxCount: opts.maxCount ?? historyMaxCount(settings),
+    maxDays: opts.maxDays ?? historyMaxDays(settings),
+    nowMs
+  });
+  const stripped = [];
+  const purged = [];
+  if (opts.dryRun) {
+    return { stripped: plan.stripIds, purged: plan.purgeIds };
+  }
+  for (const id of plan.stripIds) {
+    const thread = readThread(id);
+    if (!thread || thread.status !== "archived") continue;
+    try {
+      stripArchivedTranscript(thread);
+      stripped.push(id);
+    } catch {
+    }
+  }
+  for (const id of plan.purgeIds) {
+    const thread = readThread(id);
+    if (!thread || thread.status !== "archived") continue;
+    try {
+      deleteThreadRecord(id);
+      purged.push(id);
+    } catch {
+    }
+  }
+  if (stripped.length > 0 || purged.length > 0) {
+    updateAdvancedSettings({
+      historyLastCleanupAt: new Date(nowMs).toISOString()
+    });
+  }
+  return { stripped, purged };
+}
+function shouldRunHistoryCleanup(settings = loadAppSettings()) {
+  if (!autoCleanupHistoryEnabled(settings)) return false;
+  const intervalHours = settings.advanced.historyCleanupIntervalHours ?? HISTORY_CLEANUP_INTERVAL_HOURS_DEFAULT;
+  const last = settings.advanced.historyLastCleanupAt;
+  if (!last) return true;
+  const elapsed = Date.now() - Date.parse(last);
+  return Number.isFinite(elapsed) && elapsed >= intervalHours * 36e5;
+}
+
+// src/git/apply-into-main.ts
+import { execa as execa3 } from "execa";
+async function applyThreadIntoMain(thread, opts) {
+  const method = opts?.method ?? "merge";
+  const target = opts?.targetBranch?.trim() || await resolveDefaultBranch(thread.repoPath);
+  const status = await execa3("git", ["status", "--porcelain"], {
+    cwd: thread.repoPath,
+    reject: false
+  });
+  if (status.stdout.trim()) {
+    throw new Error(
+      `Main checkout is dirty \u2014 commit or stash before apply-into-main (${thread.repoPath})`
+    );
+  }
+  const checkout = await execa3("git", ["checkout", target], {
+    cwd: thread.repoPath,
+    reject: false
+  });
+  if (checkout.exitCode !== 0) {
+    throw new Error(
+      `Failed to checkout ${target}: ${checkout.stderr.trim() || checkout.stdout.trim()}`
+    );
+  }
+  if (method === "cherry-pick") {
+    const log = await execa3(
+      "git",
+      ["log", "--reverse", "--format=%H", `${target}..${thread.branchName}`],
+      { cwd: thread.repoPath, reject: false }
+    );
+    const shas = log.stdout.split("\n").map((s) => s.trim()).filter(Boolean);
+    if (!shas.length) {
+      return {
+        applied: false,
+        method,
+        targetBranch: target,
+        message: `No commits on ${thread.branchName} not already in ${target}`
+      };
+    }
+    for (const sha of shas) {
+      const cp = await execa3("git", ["cherry-pick", sha], {
+        cwd: thread.repoPath,
+        reject: false
+      });
+      if (cp.exitCode !== 0) {
+        await execa3("git", ["cherry-pick", "--abort"], {
+          cwd: thread.repoPath,
+          reject: false
+        });
+        throw new Error(
+          `Cherry-pick ${sha.slice(0, 8)} failed: ${cp.stderr.trim() || cp.stdout.trim()}`
+        );
+      }
+    }
+    return {
+      applied: true,
+      method,
+      targetBranch: target,
+      message: `Cherry-picked ${shas.length} commit(s) from ${thread.branchName} into ${target}`
+    };
+  }
+  const merge = await execa3(
+    "git",
+    ["merge", "--no-ff", "-m", `Apply Sideboard thread ${thread.branchName}`, thread.branchName],
+    { cwd: thread.repoPath, reject: false }
+  );
+  if (merge.exitCode !== 0) {
+    await execa3("git", ["merge", "--abort"], {
+      cwd: thread.repoPath,
+      reject: false
+    });
+    throw new Error(
+      `Merge failed: ${merge.stderr.trim() || merge.stdout.trim()}`
+    );
   }
-  const status = ok ? "ok" : failed && !stillRunning ? "failed" : stillRunning ? "running" : "idle";
-  const progress = extra?.progress ?? snap.progress;
   return {
-    stillRunning,
-    ok,
-    failed: Boolean(failed && !stillRunning && !ok),
-    status,
-    id,
-    pid: snap.pid,
-    exitCode: snap.exitCode ?? void 0,
-    phase: lastProgressLine(progress),
-    delta,
-    progress,
-    hint: stillRunning ? MCP_WAIT_JOB_STILL_RUNNING_HINT : void 0
+    applied: true,
+    method: "merge",
+    targetBranch: target,
+    message: `Merged ${thread.branchName} into ${target} at ${thread.repoPath}`
   };
 }
-async function sleepMs(ms) {
-  await new Promise((resolve2) => setTimeout(resolve2, ms));
-}
-async function waitForDetachedJob(cwd, id, opts) {
-  const jobId = sanitizeDetachedJobId(id);
-  const root = cwd.trim() || process.cwd();
-  const dir = resolveJobDir(root, jobId);
-  const timeoutMs = mcpWaitForJobTimeoutMs(opts?.timeoutMs);
-  const sleep = opts?.sleep ?? sleepMs;
-  if (!existsSync8(dir)) {
-    return {
-      stillRunning: false,
-      ok: false,
-      failed: true,
-      status: "failed",
-      id: jobId,
-      delta: "",
-      progress: "No detached job. Start one first.",
-      hint: "Start with detached-job.cjs start <id> -- <command>, then call wait_for_job again."
-    };
+
+// src/git/clone-repo.ts
+import { existsSync as existsSync8 } from "fs";
+import { basename as basename2, join as join10 } from "path";
+import { execa as execa4 } from "execa";
+async function cloneRepoIntoSideboard(opts) {
+  const url = opts.url.trim();
+  if (!url) throw new Error("Clone URL is required");
+  let name = opts.name?.trim();
+  if (!name) {
+    const leaf = basename2(url.replace(/\/$/, "").replace(/\.git$/, ""));
+    name = leaf || "repo";
   }
-  const deadline = Date.now() + timeoutMs;
-  let snap = snapshotJob(dir);
-  if (snap.exitCode === 0 && !snap.running) return toResult(jobId, snap);
-  if (!snap.running && snap.pid == null && snap.progress === "(no log yet)") {
-    return toResult(jobId, snap, {
-      failed: true,
-      progress: "No detached job. Start one first."
-    });
+  name = name.replace(/[^a-zA-Z0-9._-]+/g, "-").replace(/^-+|-+$/g, "") || "repo";
+  const dest = join10(sideboardReposDir(), name);
+  if (existsSync8(dest)) {
+    const repoPath2 = await resolveRepoRoot(dest);
+    const workspace2 = await ensureWorkspace(repoPath2);
+    return { repoPath: repoPath2, workspace: workspace2 };
   }
-  while (Date.now() < deadline) {
-    snap = snapshotJob(dir);
-    if (snap.exitCode === 0 && !snap.running) return toResult(jobId, snap);
-    if (!snap.running) return toResult(jobId, snap, { failed: true });
-    await sleep(Math.min(2e3, Math.max(50, deadline - Date.now())));
+  const result = await execa4("git", ["clone", url, dest], { reject: false });
+  if (result.exitCode !== 0) {
+    throw new Error(
+      `git clone failed: ${result.stderr?.trim() || result.stdout?.trim() || `exit ${result.exitCode}`}`
+    );
   }
-  snap = snapshotJob(dir);
-  return toResult(jobId, snap);
+  const repoPath = await resolveRepoRoot(dest);
+  const workspace = await ensureWorkspace(repoPath);
+  return { repoPath, workspace };
 }
-function killProcessTree(pid, signal) {
-  if (!Number.isInteger(pid) || pid <= 0) return;
-  if (process.platform !== "win32") {
-    try {
-      process.kill(-pid, signal);
-      return;
-    } catch {
-    }
-  }
+
+// src/types/thread.ts
+function isAdoptableRunScriptRequest(req) {
+  return Boolean(req && !req.fulfilledAt && !req.error);
+}
+
+// src/store/desktop-host.ts
+import { readFileSync as readFileSync7, unlinkSync, writeFileSync as writeFileSync6 } from "fs";
+import { join as join11 } from "path";
+function desktopHostPidPath() {
+  return join11(appDataDir(), "desktop-host.pid");
+}
+function readDesktopHostPid() {
   try {
-    process.kill(pid, signal);
+    const pid = Number.parseInt(readFileSync7(desktopHostPidPath(), "utf8").trim(), 10);
+    if (!Number.isFinite(pid) || pid <= 0) return null;
+    return pid;
   } catch {
+    return null;
   }
 }
-function appendJobLog(logFile, line) {
+function pidAlive(pid) {
   try {
-    mkdirSync5(dirname4(logFile), { recursive: true });
-    const body = line.endsWith("\n") ? line : `${line}
-`;
-    appendFileSync2(logFile, body);
+    process.kill(pid, 0);
+    return true;
   } catch {
+    return false;
   }
 }
-async function stopDetachedJob(cwd, id, opts) {
-  const jobId = sanitizeDetachedJobId(id);
-  const root = cwd.trim() || process.cwd();
-  const dir = resolveJobDir(root, jobId);
-  const sleep = opts?.sleep ?? sleepMs;
-  const why = opts?.reason?.trim() ?? "";
-  if (!existsSync8(dir)) {
-    return {
-      stillRunning: false,
-      ok: false,
-      failed: true,
-      status: "failed",
-      id: jobId,
-      delta: "",
-      progress: "No detached job. Start one first.",
-      hint: "Start with detached-job.cjs start <id> -- <command>, then wait_for_job or stop_job.",
-      stopped: false,
-      reason: "not-found"
-    };
-  }
-  let snap = snapshotJob(dir);
-  if (!snap.running) {
-    const result2 = toResult(jobId, snap);
-    return {
-      ...result2,
-      stopped: false,
-      reason: "not-running",
-      hint: "That job is already finished. Read the log; do not wait again unless you start a new command."
-    };
-  }
-  appendJobLog(snap.log, `$ stop${why ? `: ${why}` : ""}`);
-  const targetPid = snap.pid;
-  if (targetPid != null) killProcessTree(targetPid, "SIGTERM");
-  const graceMs = Number.isFinite(opts?.graceMs) ? Math.max(50, opts.graceMs) : 2e3;
-  const deadline = Date.now() + graceMs;
-  while (Date.now() < deadline && jobTreeAlive(targetPid)) {
-    await sleep(Math.min(100, Math.max(20, deadline - Date.now())));
-  }
-  if (targetPid != null) {
-    killProcessTree(targetPid, "SIGKILL");
-    await sleep(100);
-  }
-  const exitFile = join11(dir, "exit");
-  if (!existsSync8(exitFile)) {
-    try {
-      writeFileSync6(exitFile, "1\n");
-    } catch {
-    }
-  }
-  snap = snapshotJob(dir);
-  const stillRunning = jobTreeAlive(targetPid) || snap.running;
-  const result = toResult(jobId, snap, { failed: true });
-  const stopped = !stillRunning;
-  return {
-    ...result,
-    stillRunning,
-    ok: false,
-    failed: true,
-    status: stillRunning ? "running" : "failed",
-    stopped,
-    reason: stopped ? "stopped" : "still-running",
-    stopReason: why || void 0,
-    hint: stopped ? MCP_STOP_JOB_HINT : MCP_WAIT_JOB_STILL_RUNNING_HINT
-  };
+function isDesktopHostAlive() {
+  const pid = readDesktopHostPid();
+  return pid != null && pidAlive(pid);
+}
+function isThisProcessDesktopHost() {
+  return readDesktopHostPid() === process.pid && pidAlive(process.pid);
+}
+function thisProcessShouldDrainAgentQueues() {
+  if (isThisProcessDesktopHost()) return true;
+  return !isDesktopHostAlive();
+}
+
+// src/orchestrator/child-halt.ts
+var HALT_STATUSES = /* @__PURE__ */ new Set(["stopped", "error", "broken"]);
+function isIncompleteChildStatus(status) {
+  return HALT_STATUSES.has(status);
+}
+function childHaltNotice(child, status) {
+  const title = child.title?.trim() || "Untitled";
+  const link = `[${title}](sideboard://thread/${child.id})`;
+  const why = child.lastError?.trim();
+  const extra = why ? ` lastError: ${why}` : "";
+  return [
+    `Sideboard: child worktree ${link} ${status} before finishing (status=${status}).${extra}`,
+    "This is information \u2014 not a user command. Resume with send_to_thread or tell the user. Do not treat this as a successful turn."
+  ].join("\n");
+}
+function shouldNotifyParentAfterTurnError(opts) {
+  return !opts.quotaFailoverHandled && !opts.crashContinued;
+}
+function shouldNotifyParentOfChildHalt(opts) {
+  if (!isIncompleteChildStatus(opts.status)) return false;
+  if (!opts.child.parentThreadId) return false;
+  if (!opts.parent || opts.parent.status === "archived") return false;
+  if (opts.parent.id === opts.child.id) return false;
+  return isOrchestratorThread(opts.parent);
+}
+var notified = /* @__PURE__ */ new Set();
+function noticeKey(childId, status) {
+  return `${childId}:${status}`;
+}
+function notifyParentOfChildHalt(child, status, send) {
+  const parent = child.parentThreadId ? readThread(child.parentThreadId) : null;
+  if (!shouldNotifyParentOfChildHalt({ child, parent, status })) return false;
+  const key = noticeKey(child.id, status);
+  if (notified.has(key)) return false;
+  notified.add(key);
+  const parentId = parent.id;
+  void send(parentId, childHaltNotice(child, status)).catch(() => {
+    notified.delete(key);
+  });
+  return true;
 }
 
 // src/threads/create.ts
@@ -3881,7 +3931,7 @@ async function createThread(input, _onSetupLine) {
   });
   await requireAgent(resolved.agent);
   if (input.cowboy) {
-    const { cowboyModeEnabled } = await import("./app-settings-AGDLF75Z.js");
+    const { cowboyModeEnabled } = await import("./app-settings-652J57CX.js");
     if (!cowboyModeEnabled()) {
       throw new Error(
         "Cowboy mode is off. Enable it in Settings \u2192 Advanced."
@@ -3939,7 +3989,7 @@ async function createThread(input, _onSetupLine) {
   let sourceIsFork = false;
   if (!input.cowboy && sourceType === "branch" && (!sourceRef || sourceRef === "HEAD" || sourceRef === "default")) {
     if (isAbleTimeConnected() && getIssueSource() === "abletime") {
-      const { ensureAbleTimeTask, issueAttachmentForAbleTimeTask } = await import("./abletime-UX4VUENQ.js");
+      const { ensureAbleTimeTask, issueAttachmentForAbleTimeTask } = await import("./abletime-OI6FNSXX.js");
       const task = await ensureAbleTimeTask({
         title: title?.trim() || "Untitled work",
         description: input.prompt?.trim() || void 0
@@ -4502,7 +4552,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-4SFSCYKT.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-OIBSD5B6.js");
   await ensureWorkspace2(repoPath);
   const { ensureWorktreeSideboardIgnored: ensureWorktreeSideboardIgnored2 } = await import("./worktree-exclude-5N2KTYIT.js");
   await ensureWorktreeSideboardIgnored2(input.worktreePath);
@@ -7008,7 +7058,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-ZUOEBJFN.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-3IOISDFS.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -7333,7 +7383,7 @@ var Orchestrator = class {
           orphans: orphans.map((o) => ({ path: o.path, repoPath: o.repoPath }))
         });
       }
-      const { autoCleanupOrphansEnabled } = await import("./app-settings-AGDLF75Z.js");
+      const { autoCleanupOrphansEnabled } = await import("./app-settings-652J57CX.js");
       if (autoCleanupOrphansEnabled() && shouldRunWorktreeCleanup() && orphans.length > 0) {
         await cleanupOrphanWorktrees({ repoPaths });
       }
@@ -7680,7 +7730,7 @@ var Orchestrator = class {
     }
     await setup;
     if (skipSetup) return;
-    const { autoRunAfterSetupEnabled } = await import("./app-settings-AGDLF75Z.js");
+    const { autoRunAfterSetupEnabled } = await import("./app-settings-652J57CX.js");
     if (autoRunAfterSetupEnabled()) {
       try {
         await this.startDev(threadId);
@@ -7931,7 +7981,8 @@ var Orchestrator = class {
         if (compact.didCompact) {
           thread = updateThread(threadId, {
             messages: compact.thread.messages,
-            sessionId: compact.thread.sessionId
+            sessionId: compact.thread.sessionId,
+            compactedMessages: compact.thread.compactedMessages
           });
           this.emit({
             type: "context_compacted",
@@ -7945,9 +7996,6 @@ var Orchestrator = class {
         this.emit({ type: "error", threadId, message: `context compact failed: ${message}` });
         thread = this.requireThread(threadId);
       }
-      if (this.stoppedTurns.has(threadId)) {
-        return;
-      }
       const promptText = typeof prompt === "string" ? prompt : "";
       const autoContinue = isJobContinuePrompt(promptText) || promptText.startsWith("The previous agent process ended before it finished.");
       const parked = takePendingTurnAttachments(thread);
@@ -7964,6 +8012,14 @@ var Orchestrator = class {
         agent: thread.agent,
         orch: isOrchestratorThread(thread)
       });
+      if (this.stoppedTurns.has(threadId)) {
+        const stopped = writeLiveStatus(threadId, "stopped");
+        if (stopped?.status === "stopped") {
+          this.emit({ type: "status_changed", threadId, status: "stopped" });
+        }
+        this.emit({ type: "turn_finished", threadId, exitCode: 1 });
+        return;
+      }
       thread = this.requireThread(threadId);
       const gitPrompt = expandCanonicalGitRequest(promptText);
       const { agentPrompt: expandedPrompt } = expandComposerPrompt(
@@ -8022,7 +8078,7 @@ var Orchestrator = class {
       ].filter(Boolean).join("\n\n") || void 0;
       const prGateDirective = thread.agent !== "brightsy" && !isOrchestratorThread(thread) && mentionsPrGoal(promptText) ? formatPrGateDirective() : null;
       const agentPrompt = [
-        thread.planMode ? PLAN_MODE_INSTRUCTION : null,
+        planModeTurnInstruction(thread.planMode),
         orchestrationReminder,
         prGateDirective,
         injectedNoticeContext,
@@ -8044,7 +8100,7 @@ var Orchestrator = class {
       }
       const isBrightsy = fresh.agent === "brightsy";
       const isOrchestration = isOrchestratorThread(fresh);
-      const { autoRenameBranchEnabled, getGithubGitAuthMode, gitBranchPrefixSetting } = await import("./app-settings-AGDLF75Z.js");
+      const { autoRenameBranchEnabled, getGithubGitAuthMode, gitBranchPrefixSetting } = await import("./app-settings-652J57CX.js");
       const gitAuthMode = getGithubGitAuthMode();
       const worktreeDirective = isBrightsy || isOrchestration ? null : formatWorktreeDirective(fresh, {
         githubSlug: await withTimeout(
@@ -8525,6 +8581,9 @@ var Orchestrator = class {
     }
     const preferredPorts = active?.ports?.length ? active.ports : active?.port != null ? [active.port] : void 0;
     if (active && !existing) {
+      if (typeof active.pid === "number") {
+        killDetachedRunTree(active.pid, thread.worktreePath);
+      }
       killListenersOnPorts(collectActiveRunPorts([active]));
       this.syncWorktreeRuns(
         thread.worktreePath,
@@ -8597,7 +8656,8 @@ var Orchestrator = class {
       scriptName: resolvedName,
       port: handle.port,
       ports: handle.ports,
-      startedAt
+      startedAt,
+      ...typeof handle.pid === "number" && handle.pid > 1 ? { pid: handle.pid } : {}
     };
     const nextRuns = [
       ...latestShared.activeRuns.filter((r) => r.scriptName !== resolvedName),
@@ -8743,6 +8803,9 @@ var Orchestrator = class {
       }
       const run2 = shared.activeRuns.find((r) => r.scriptName === scriptName);
       if (!hadHandle2 && run2) {
+        if (typeof run2.pid === "number") {
+          killDetachedRunTree(run2.pid, thread.worktreePath);
+        }
         killListenersOnPorts(collectActiveRunPorts([run2]));
       }
       const remaining = shared.activeRuns.filter((r) => r.scriptName !== scriptName);
@@ -8764,6 +8827,11 @@ var Orchestrator = class {
       }
     }
     if (!hadHandle && shared.activeRuns.length > 0) {
+      for (const run2 of shared.activeRuns) {
+        if (typeof run2.pid === "number") {
+          killDetachedRunTree(run2.pid, thread.worktreePath);
+        }
+      }
       killListenersOnPorts(collectActiveRunPorts(shared.activeRuns));
     }
     this.syncWorktreeRuns(thread.worktreePath, [], null);
@@ -8805,6 +8873,11 @@ var Orchestrator = class {
         (k) => isWorktreeRunProcessKey(k, thread.worktreePath) || siblings.some((t) => k.startsWith(`${t.id}:run:`) || k === `${t.id}:dev`)
       );
       if (!force && hasLiveHandle) continue;
+      for (const run2 of shared.activeRuns) {
+        if (typeof run2.pid === "number") {
+          killDetachedRunTree(run2.pid, thread.worktreePath);
+        }
+      }
       killListenersOnPorts(collectActiveRunPorts(shared.activeRuns));
       if (shared.devPort != null) {
         killListenersOnPorts([shared.devPort]);
@@ -9318,7 +9391,7 @@ var Orchestrator = class {
     if (!titled.userSetTitle && meta.title && titled.title !== meta.title) {
       updateThread(thread.id, { title: meta.title });
     }
-    const { autoArchiveOnMergeEnabled } = await import("./app-settings-AGDLF75Z.js");
+    const { autoArchiveOnMergeEnabled } = await import("./app-settings-652J57CX.js");
     const latest = this.requireThread(thread.id);
     if (!shouldAutoArchiveOnPrMerge({
       previousPrState: prevState || null,
@@ -9600,7 +9673,7 @@ var Orchestrator = class {
     this.enforceHistoryRetention();
     if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
       try {
-        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-4SFSCYKT.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-OIBSD5B6.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -9627,7 +9700,7 @@ var Orchestrator = class {
           await runArchiveScript(thread.repoPath, thread.worktreePath);
         } catch {
         }
-        const { deleteBranchOnPurgeEnabled } = await import("./app-settings-AGDLF75Z.js");
+        const { deleteBranchOnPurgeEnabled } = await import("./app-settings-652J57CX.js");
         const deleteBranch = opts?.deleteBranch ?? deleteBranchOnPurgeEnabled();
         await removeWorktree(thread.repoPath, thread.worktreePath, {
           deleteBranch: deleteBranch ? thread.branchName : void 0
@@ -9654,7 +9727,7 @@ var Orchestrator = class {
           `Cowboy checkout missing: ${thread.worktreePath}. Re-add the project folder, then restore.`
         );
       }
-      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-Y5FES5D6.js");
+      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-5VRZVGP3.js");
       const slug = thread.worktreePath.split("/").pop();
       const dest = thread.worktreePath;
       await withRepoGitLock(thread.repoPath, async () => {
@@ -9764,7 +9837,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-Y5FES5D6.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-5VRZVGP3.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return orch.createThread({
@@ -9774,7 +9847,7 @@ async function startOrchestration(opts) {
       repoPath: repo
     });
   });
-  const { updateThread: upd } = await import("./thread-store-YOPKY74K.js");
+  const { updateThread: upd } = await import("./thread-store-JQB7KZJR.js");
   const updated = upd(thread.id, {
     sourceType: "orchestration",
     sourceRef: goal
@@ -9790,14 +9863,14 @@ export {
   needsCoordinatorAction,
   AGENT_GIT_ACTIONS,
   threadsSharingWorktree,
-  MAX_RUN_LOG_CHARS,
-  DEFAULT_RUN_LOG_TAIL_CHARS,
-  sliceRunLogOutput,
   mcpWaitForTurnTimeoutMs,
   mcpWaitTaskHint,
   mcpWaitForJobTimeoutMs,
   waitForDetachedJob,
   stopDetachedJob,
+  MAX_RUN_LOG_CHARS,
+  DEFAULT_RUN_LOG_TAIL_CHARS,
+  sliceRunLogOutput,
   BOARD_COLUMN_DEFS,
   HOME_BOARD_CACHE_TTL_MS,
   dedupeBoardIssues,