@sideboard-ai/core 0.1.242 → 0.1.244

package/dist/mcp/run-stdio.cjs

@@ -1660,7 +1660,8 @@ function normalizeThread(raw) {
     runScriptRequest: normalizeRunScriptRequest(raw.runScriptRequest),
     quotaResumeAt: raw.quotaResumeAt ?? null,
     quotaContinuedFromId: raw.quotaContinuedFromId ?? null,
-    archivedAt: typeof raw.archivedAt === "string" && raw.archivedAt.trim() ? raw.archivedAt.trim() : void 0
+    archivedAt: typeof raw.archivedAt === "string" && raw.archivedAt.trim() ? raw.archivedAt.trim() : void 0,
+    compactedMessages: Array.isArray(raw.compactedMessages) ? raw.compactedMessages : void 0
   };
 }
 function createEmptyThread(partial) {
@@ -3400,6 +3401,7 @@ function archivedUpdatedMs(thread) {
 }
 function isHistoryRetentionStub(thread) {
   if ((thread.attachments?.length ?? 0) > 0) return false;
+  if ((thread.compactedMessages?.length ?? 0) > 0) return false;
   const messages = thread.messages ?? [];
   if (messages.length === 0) return true;
   if (messages.length > 1) return false;
@@ -6159,6 +6161,7 @@ __export(worktree_exports, {
   getPrForHeadBranch: () => getPrForHeadBranch,
   getPrMeta: () => getPrMeta,
   ghHeadRef: () => ghHeadRef,
+  ghPrCreateAssigneeArgs: () => ghPrCreateAssigneeArgs,
   ghRepoSelectArgs: () => ghRepoSelectArgs,
   githubAgentGitEnv: () => githubAgentGitEnv,
   isDefaultishSourceRef: () => isDefaultishSourceRef,
@@ -7408,6 +7411,11 @@ async function mergePr(cwd, selector, opts) {
   }
   return { url, state: "MERGED" };
 }
+function ghPrCreateAssigneeArgs(assignee) {
+  const raw = assignee?.trim();
+  if (raw && /^(none|unassigned)$/i.test(raw)) return [];
+  return ["--assignee", raw || "@me"];
+}
 async function createOrUpdatePr(worktreePath, opts) {
   await ensureGhPreferOrigin(worktreePath);
   const slug = await resolveGithubRepoSlug(worktreePath);
@@ -7482,6 +7490,7 @@ async function createOrUpdatePrWithBodyFile(worktreePath, opts) {
       headRef
     ];
     if (opts.draft) args2.push("--draft");
+    args2.push(...ghPrCreateAssigneeArgs(opts.assignee));
     await gh(args2, worktreePath, { reject: false });
     const again = await gh(
       [...repoArgs, "pr", "view", branchOnly, "--json", "url", "--jq", ".url"],
@@ -7503,6 +7512,7 @@ async function createOrUpdatePrWithBodyFile(worktreePath, opts) {
     headRef
   ];
   if (opts.draft) args.push("--draft");
+  args.push(...ghPrCreateAssigneeArgs(opts.assignee));
   const created = await gh(args, worktreePath, { reject: false });
   if (created.exitCode !== 0) {
     const raw = created.stderr.trim() || created.stdout.trim() || "gh pr create failed";
@@ -8097,7 +8107,7 @@ function coordinatorGreenfieldPlaybook(reposDir) {
     "- Examples:",
     `  - Clone: \`git clone <url> ${reposDir}/<name>\``,
     `  - New GitHub repo: \`gh repo create <owner>/<name> --private --clone -- ${reposDir}/<name>\` (or mkdir + git init + gh repo create + remote add + push)`,
-    "- Then: add_workspace with that absolute path \u2192 create_thread (repoPath + parentThreadId) \u2192 send_to_thread (build) \u2192 wait_for_turn (loop while stillRunning) \u2192 ask_git create-draft (or send_to_thread `gh pr create --draft -R <origin-owner/name>`).",
+    "- Then: add_workspace with that absolute path \u2192 create_thread (repoPath + parentThreadId) \u2192 send_to_thread (build) \u2192 wait_for_turn (loop while stillRunning) \u2192 ask_git create-draft (or send_to_thread `gh pr create --draft --assignee @me -R <origin-owner/name>`).",
     "- Always target the child worktree's **origin** (`github:` slug from list_workspaces / `git remote get-url origin` in that worktree). Never open PRs against `upstream`.",
     "- Do coding work in the child worktree thread, not by editing files in this home cwd."
   ].join("\n");
@@ -8306,7 +8316,7 @@ var init_coordinator_prompt = __esm({
       '- request_review \u2014 open a Review chat tab on a worktree thread (attaches .claude/skills/review/SKILL.md when present, else .context/review.md copied from .sideboard/review.md / stock; sends "Review changes in this workspace."); then wait_for_turn (loop while stillRunning) / get_turn_result on the returned id. The review stays in that chat so they can read it and type next steps \u2014 do not tell the child to comment or update the PR or ticket.',
       "- ask_git \u2014 commit & push, open a draft PR, mark ready for review, resolve conflicts, or merge \u2014 same prompts as the desktop git buttons (Resolve, Create PR, \u2026). Always steers the worktree agent; then wait_for_turn (loop while stillRunning). Prefer this over paraphrasing. If the user gave a goal (Greptile 5/5, CI green), send_to_thread that goal so the worktree agent enters the watch-fix-push loop \u2014 do not tell the human to poll.",
       '- Merge (`ask_git` action=merge / send_to_thread "Merge PR.") only when the user explicitly asked to merge that PR. Do not merge because the work looks done, CI is green, or a typical flow includes it.',
-      '- Or send_to_thread with those exact phrases: "Commit and push.", "Commit, push, and open a draft PR.", "Ready for review.", "Merge the remote branch (main) into your branch and resolve conflicts. Then, commit and push your changes.", "Merge PR." (draft PRs: `gh pr create --draft -R <origin-owner/name>` using the workspace `github:` slug \u2014 never upstream). Never run git/gh from this orchestration cwd, and never merge the PR yourself.',
+      '- Or send_to_thread with those exact phrases: "Commit and push.", "Commit, push, and open a draft PR.", "Ready for review.", "Merge the remote branch (main) into your branch and resolve conflicts. Then, commit and push your changes.", "Merge PR." (draft PRs: `gh pr create --draft --assignee @me -R <origin-owner/name>` using the workspace `github:` slug \u2014 never upstream). Never run git/gh from this orchestration cwd, and never merge the PR yourself.',
       "Process guides:",
       "- Long child jobs (pack, test, deploy, anything that may run more than ~30s): workers always have `/long-running` (Sideboard product skill). Tell them to detach and wait; they may `stop_job` if it hangs or is doing the wrong thing; do not ask the human to poll.",
       "- Recurring multi-item / fan-out: if the child worktree has `.claude/skills/graph-engineering/SKILL.md`, tell the worker to follow it (`/graph-engineering`). Judge first; state on disk; grow the rulebook; do not patch three threads.",
@@ -9704,6 +9714,10 @@ var init_node_launch = __esm({
 // src/agents/injected-mcp.ts
 function sideboardWorktreeAllowedTools(opts) {
   const out = [...SIDEBOARD_ARTIFACT_MCP_ALLOWED_TOOLS];
+  if (!opts?.planMode) {
+    const idx = out.indexOf("mcp__sideboard__present_plan");
+    if (idx >= 0) out.splice(idx, 1);
+  }
   if (opts?.github !== false) out.push(...SIDEBOARD_GITHUB_MCP_ALLOWED_TOOLS);
   if (opts?.linear) out.push(...SIDEBOARD_LINEAR_MCP_ALLOWED_TOOLS);
   if (opts?.abletime) out.push(...SIDEBOARD_ABLETIME_MCP_ALLOWED_TOOLS);
@@ -10564,6 +10578,9 @@ function skillToolFromTextPart(part, id) {
     updatedAt: Date.now()
   };
 }
+function compactSummaryPart(text7, id = "compact-summary") {
+  return compactToolPart(text7, id, { status: "done" });
+}
 function compactToolPart(text7, id, opts) {
   const input = { trigger: opts?.trigger ?? "auto" };
   return withPartTimes(
@@ -10841,6 +10858,17 @@ function partsToAssistantText(parts) {
     (p) => p.type === "text" && !messagePartParentId(p)
   ).map((p) => p.text).join("").trim();
 }
+function lastAssistantMessageText(parts) {
+  if (!parts?.length) return "";
+  for (let i = parts.length - 1; i >= 0; i--) {
+    const p = parts[i];
+    if (!p || p.type !== "text" || messagePartParentId(p)) continue;
+    const text7 = p.text.trim();
+    if (!text7 || isInternalAgentStatusText(text7)) continue;
+    return text7;
+  }
+  return "";
+}
 function stripBrightsyNdjsonNoise(text7) {
   if (!text7 || !text7.includes('"type"')) return text7;
   let out = text7;
@@ -10878,6 +10906,9 @@ var init_message_parts = __esm({
 });
 
 // src/agents/types.ts
+function planModeTurnInstruction(planMode) {
+  return planMode ? PLAN_MODE_INSTRUCTION : PLAN_MODE_OFF_INSTRUCTION;
+}
 function permissionMode(thread) {
   if (thread.sourceType === "orchestration") {
     return {
@@ -10916,11 +10947,12 @@ function permissionMode(thread) {
     codexSandbox: "workspace-write"
   };
 }
-var PLAN_MODE_INSTRUCTION;
+var PLAN_MODE_INSTRUCTION, PLAN_MODE_OFF_INSTRUCTION;
 var init_types = __esm({
   "src/agents/types.ts"() {
     "use strict";
     PLAN_MODE_INSTRUCTION = "Plan mode is active and must remain active until the user turns Plan mode off in the UI (or Approves / Hands off the plan). Analyze the codebase, search and read files as needed, and produce or refine a clear implementation plan. Do not modify, create, or delete any project files except via Sideboard MCP present_plan (writes .context/attachments/plan.md). When you need a clarifying decision (approach forks, auth choice, scope) \u2014 not greetings, check-ins, or an invented task menu: (1) first write a short chat message that explains the decision and what each option means (tradeoffs, when to pick it) \u2014 do not leave the user staring at bare labels; (2) then call Sideboard MCP ask_user with the same options, including a description on every option. If one option is the obvious default, proceed without asking. Sideboard shows questions in the composer and mirrors them in chat. After ask_user, wait for the user's next message with their answers before finalizing the plan. When the plan is ready for approval: (1) call present_plan with the full markdown plan (title + content) so Sideboard saves .context/attachments/plan.md and shows it in chat for Approve / Hand off / Copy; (2) Claude should also call ExitPlanMode after present_plan. Do not skip present_plan \u2014 the plan must be a markdown file, not only chat prose.";
+    PLAN_MODE_OFF_INSTRUCTION = "Plan mode is off. Do not call present_plan or ExitPlanMode \u2014 those only work when the user turns Plan on in the composer. If you need to propose an approach, write it in chat.";
   }
 });
 
@@ -11433,7 +11465,8 @@ var init_claude = __esm({
             ...sideboardWorktreeAllowedTools({
               github: true,
               linear: isLinearConnected(),
-              abletime: isAbleTimeConnected()
+              abletime: isAbleTimeConnected(),
+              planMode: thread.planMode
             }),
             ...brightsyMcpAllowedTools(injectedBrightsyNames)
           ];
@@ -13488,9 +13521,9 @@ function gitActionExpansion(action, base) {
     case "commit-push":
       return "Commit any uncommitted work with a purpose-stating message, then push to origin (`git push -u origin HEAD`; this updates an existing PR when one is linked). Do not start a checks loop unless a goal was given.";
     case "create-draft":
-      return "Commit, push, then create a draft PR with `gh pr create --draft -R <origin-owner/name>` (title/body from the change purpose). Update the existing PR instead if one is linked.";
+      return "Commit, push, then create a draft PR with `gh pr create --draft --assignee @me -R <origin-owner/name>` (title/body from the change purpose). Update the existing PR instead if one is linked. Use a different `--assignee` only if the user named someone else.";
     case "create-web":
-      return "Commit, push, then `gh pr create --web -R <origin-owner/name>`.";
+      return "Commit, push, then `gh pr create --web --assignee @me -R <origin-owner/name>`. Use a different `--assignee` only if the user named someone else.";
     case "resolve-conflicts":
       return `Fetch the PR base${base ? ` (\`${base}\`)` : ""}, merge it into this branch, resolve conflicts carefully, then commit and push until the PR is mergeable.`;
     case "ready-for-review":
@@ -13983,12 +14016,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 text7 = (message.text ?? "").trim();
+  if (!text7 && message.role === "agent") {
+    text7 = lastAssistantMessageText(message.parts).trim();
+  }
+  if (!text7 || isInternalAgentStatusText(text7)) return null;
+  return { role: message.role, text: text7, 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 text7 = summaryText.trim();
   const summary = {
     role: "summary",
-    text: summaryText.trim(),
+    text: text7,
+    parts: [compactSummaryPart(text7)],
     ts: (/* @__PURE__ */ new Date()).toISOString()
   };
   return [summary, ...recent];
@@ -14016,6 +14075,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);
@@ -14023,6 +14083,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()
   };
@@ -14038,6 +14099,7 @@ var CONTEXT_COMPACT_CHARS, CONTEXT_KEEP_RECENT_CHARS, CONTEXT_KEEP_RECENT_MESSAG
 var init_context_compact = __esm({
   "src/composer/context-compact.ts"() {
     "use strict";
+    init_message_parts();
     init_error_detail();
     init_usage();
     init_context_estimate();
@@ -14596,1708 +14658,1714 @@ var init_worktree_run_ports = __esm({
   }
 });
 
-// src/hook/conductor.ts
-function matchSimpleGlob(pattern, name) {
-  const escaped = pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*").replace(/\?/g, ".");
-  return new RegExp(`^${escaped}$`).test(name);
-}
-function readWorktreeInclude(repoPath) {
-  const path = (0, import_node_path39.join)(repoPath, ".worktreeinclude");
-  if (!(0, import_node_fs39.existsSync)(path)) return [];
-  return (0, import_node_fs39.readFileSync)(path, "utf8").split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("#"));
-}
-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 (0, import_node_fs39.readdirSync)(repoPath, { withFileTypes: true })) {
-        if (!entry.isFile()) continue;
-        for (const glob of settings.fileIncludeGlobs) {
-          if (matchSimpleGlob(glob, entry.name) || matchSimpleGlob((0, import_node_path39.basename)(glob), entry.name)) {
-            matched.push(entry.name);
-            break;
-          }
-        }
-      }
-    } catch {
-    }
-    if (matched.length) return [...new Set(matched)];
-  }
-  const defaults = [];
-  try {
-    for (const entry of (0, import_node_fs39.readdirSync)(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 copyConfiguredFiles(repoPath, worktreePath) {
-  const patterns = resolveFilesToCopy(repoPath);
-  const copied = [];
-  for (const rel of patterns) {
-    const src = (0, import_node_path39.join)(repoPath, rel);
-    if (!(0, import_node_fs39.existsSync)(src)) continue;
-    const dest = (0, import_node_path39.join)(worktreePath, rel);
-    (0, import_node_fs39.mkdirSync)((0, import_node_path39.dirname)(dest), { recursive: true });
-    (0, import_node_fs39.copyFileSync)(src, dest);
-    copied.push(rel);
-  }
-  return copied;
+// src/mcp/wait-for-turn.ts
+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);
 }
-async function captureLoginEnv() {
-  if (cachedLoginEnv) return { ...cachedLoginEnv };
-  const shell = process.env.SHELL?.trim() || (process.platform === "darwin" ? "/bin/zsh" : "/bin/bash");
-  try {
-    const result = await (0, import_execa4.execa)(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 {
+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;
   }
-  cachedLoginEnv = { ...process.env };
-  return { ...cachedLoginEnv };
 }
-function buildWorkspaceScriptEnv(opts, baseEnv) {
-  const env = stripNestedElectronEnv({
-    ...baseEnv ?? process.env
-  });
-  const name = opts.workspaceName ?? (0, import_node_path39.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);
-    }
+var MCP_WAIT_FOR_TURN_MAX_MS, MCP_WAIT_STILL_RUNNING_HINT, MCP_WAIT_QUEUED_HINT, MCP_WAIT_STOPPED_HINT, MCP_WAIT_BROKEN_HINT, MCP_WAIT_ERROR_HINT, MCP_WAIT_INPUT_REQUIRED_HINT;
+var init_wait_for_turn = __esm({
+  "src/mcp/wait-for-turn.ts"() {
+    "use strict";
+    MCP_WAIT_FOR_TURN_MAX_MS = 45e3;
+    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.";
+    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.";
+    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.";
+    MCP_WAIT_BROKEN_HINT = "Child worktree is broken (missing on disk). Tell the user \u2014 do not treat this as success.";
+    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.";
+    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.";
   }
-  applyWorktreePkgCacheEnv(env, opts.worktreePath);
-  return env;
-}
-function pipeLines(stream, onLine) {
-  if (!stream || !onLine) return;
-  const rl = (0, import_node_readline3.createInterface)({ input: stream });
-  rl.on("line", onLine);
+});
+
+// src/mcp/wait-for-job.ts
+function mcpWaitForJobTimeoutMs(requested) {
+  return mcpWaitForTurnTimeoutMs(requested);
 }
-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);
+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 pids;
+  return s;
 }
-function listUnixListenerPids(port, selfPid) {
+function jobAlive(pid) {
+  if (!Number.isInteger(pid) || pid <= 0) return false;
   try {
-    const raw = (0, import_node_child_process4.execFileSync)("lsof", [`-tiTCP:${port}`, "-sTCP:LISTEN"], {
-      encoding: "utf8",
-      stdio: ["ignore", "pipe", "ignore"],
-      timeout: 2e3
-    });
-    return killableListenerPids(raw, selfPid);
+    process.kill(pid, 0);
+    return true;
   } catch {
-    return [];
+    return false;
   }
 }
-function listenerCwd(pid) {
-  if (!Number.isFinite(pid) || pid <= 0) return null;
+function processGroupAlive(pgid) {
+  if (process.platform === "win32") return false;
+  if (!Number.isInteger(pgid) || pgid <= 1) return false;
   try {
-    const raw = (0, import_node_child_process4.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 {
+    process.kill(-pgid, 0);
+    return true;
+  } catch (err) {
+    return err && typeof err === "object" && "code" in err && err.code === "EPERM";
   }
-  return null;
 }
-function realpathOrResolve(path) {
-  try {
-    return (0, import_node_fs39.realpathSync)(path);
-  } catch {
-    return (0, import_node_path39.resolve)(path);
-  }
+function jobTreeAlive(pid) {
+  if (pid == null) return false;
+  return jobAlive(pid) || processGroupAlive(pid);
 }
-function isOtherWorktreeListenerCwd(cwd, worktreePath) {
-  const wt = realpathOrResolve(worktreePath);
-  const c = realpathOrResolve(cwd);
-  if (c === wt || c.startsWith(wt + import_node_path39.sep)) return false;
-  const parent = (0, import_node_path39.dirname)(wt);
-  const thisName = (0, import_node_path39.basename)(wt);
-  if (!thisName || c === parent) return false;
-  if (!c.startsWith(parent + import_node_path39.sep)) return false;
-  const first = c.slice(parent.length + 1).split(import_node_path39.sep)[0];
-  return Boolean(first) && first !== thisName;
+function readIntFile(file) {
+  if (!(0, import_node_fs39.existsSync)(file)) return null;
+  const n = Number.parseInt((0, import_node_fs39.readFileSync)(file, "utf8").trim(), 10);
+  return Number.isInteger(n) ? n : null;
 }
-function signalPid(pid, signal) {
-  try {
-    process.kill(pid, signal);
-  } catch {
-  }
+function jobDir(root, id, legacy = false) {
+  return (0, import_node_path39.join)(root, legacy ? LEGACY_DETACHED_JOBS_DIR : DETACHED_JOBS_DIR, id);
 }
-function isThisWorktreeListenerCwd(cwd, worktreePath) {
-  const wt = realpathOrResolve(worktreePath);
-  const c = realpathOrResolve(cwd);
-  return c === wt || c.startsWith(wt + import_node_path39.sep);
+function resolveJobDir(root, id) {
+  const modern = jobDir(root, id, false);
+  if ((0, import_node_fs39.existsSync)(modern)) return modern;
+  const legacy = jobDir(root, id, true);
+  if ((0, import_node_fs39.existsSync)(legacy)) return legacy;
+  return modern;
 }
-function killDetachedRunTree(pid, worktreePath) {
-  if (!Number.isFinite(pid) || pid <= 1 || pid === process.pid) return;
-  const cwd = listenerCwd(pid);
-  if (!cwd || !isThisWorktreeListenerCwd(cwd, worktreePath)) return;
-  try {
-    process.kill(-pid, "SIGTERM");
-  } catch {
-    signalPid(pid, "SIGTERM");
+function listJobIdsIn(root, rel) {
+  const dir = (0, import_node_path39.join)(root, rel);
+  if (!(0, import_node_fs39.existsSync)(dir)) return [];
+  return (0, import_node_fs39.readdirSync)(dir, { withFileTypes: true }).filter((e) => e.isDirectory() && JOB_ID_RE.test(e.name)).map((e) => e.name);
+}
+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((0, import_node_path39.join)(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") {
-        (0, import_node_child_process4.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(text7) {
+  const t = (text7 ?? "").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(text7) {
+  if (typeof text7 !== "string") return false;
+  const t = text7.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 (0, import_execa4.execa)("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(text7) {
+  if (!text7.includes(GH_WATCH_REFRESH)) return text7;
+  const frames = text7.split(/(?=Refreshing run status every 3 seconds\.)/);
+  const watchFrames = frames.filter((f) => f.includes(GH_WATCH_REFRESH));
+  if (watchFrames.length <= 1) return text7;
+  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(text7) {
+  const collapsed = collapseGhRunWatchLog(text7);
+  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 = (0, import_execa4.execa)(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 (!(0, import_node_fs39.existsSync)(logFile)) return "(no log yet)";
+  const lines = (0, import_node_fs39.readFileSync)(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 (!(0, import_node_fs39.existsSync)(file)) return [];
+  const lines = (0, import_node_fs39.readFileSync)(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";
+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 reservePort() {
-  return new Promise((resolve2, reject) => {
-    const server = (0, import_node_net.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 = (0, import_node_net.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((0, import_node_path39.join)(dir, "pid"));
+  const running = jobTreeAlive(pid);
+  return {
+    pid,
+    running,
+    exitCode: readIntFile((0, import_node_path39.join)(dir, "exit")),
+    log: (0, import_node_path39.join)(dir, "log"),
+    cursor: (0, import_node_path39.join)(dir, "present.cursor"),
+    progress: tailProgress((0, import_node_path39.join)(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 {
+    (0, import_node_fs39.mkdirSync)((0, import_node_path39.dirname)(snap.cursor), { recursive: true });
+    (0, import_node_fs39.writeFileSync)(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 (!(0, import_node_fs39.existsSync)(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
-    });
+    (0, import_node_fs39.mkdirSync)((0, import_node_path39.dirname)(logFile), { recursive: true });
+    const body = line.endsWith("\n") ? line : `${line}
+`;
+    (0, import_node_fs39.appendFileSync)(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 (!(0, import_node_fs39.existsSync)(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;
   }
-}
-var import_node_fs39, import_node_child_process4, import_node_net, import_node_path39, import_execa4, import_node_readline3, PORT_RANGE_SIZE, RECLAIM_RETRY_DELAY_MS, RECLAIM_TRIES, cachedLoginEnv;
-var init_conductor = __esm({
-  "src/hook/conductor.ts"() {
-    "use strict";
-    import_node_fs39 = require("fs");
-    import_node_child_process4 = require("child_process");
-    import_node_net = require("net");
-    import_node_path39 = require("path");
-    import_execa4 = require("execa");
-    import_node_readline3 = require("readline");
-    init_settings();
-    init_nested_electron_env();
-    init_worktree_pkg_cache();
-    init_convention_setup();
-    init_cursor_worktrees();
-    init_git_auth_mode();
-    init_request_review();
-    init_worktree_exclude();
-    init_worktree_run_ports();
-    init_worktree_run_ports();
-    init_nested_electron_env();
-    PORT_RANGE_SIZE = 10;
-    RECLAIM_RETRY_DELAY_MS = 40;
-    RECLAIM_TRIES = 8;
-    cachedLoginEnv = null;
+  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."
+    };
   }
-});
-
-// src/store/setup-log.ts
-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;
-}
-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;
+  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 = (0, import_node_path39.join)(dir, "exit");
+  if (!(0, import_node_fs39.existsSync)(exitFile)) {
+    try {
+      (0, import_node_fs39.writeFileSync)(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 (0, import_node_path40.join)(threadsDir(), `${threadId}.setup.log.json`);
-}
-function setupLogKeyForWorktree(worktreePath) {
-  const norm = normalizeWorktreePath(worktreePath);
-  return `wt-${(0, import_node_crypto8.createHash)("sha1").update(norm).digest("hex").slice(0, 16)}`;
+var import_node_fs39, import_node_path39, MAX_JOB_CONTINUES, MAX_JOB_DELTA_LINES, MAX_JOB_DELTA_CHARS, DEFERRED_DONE_MAX_CHARS, GH_WATCH_REFRESH, MCP_WAIT_JOB_STILL_RUNNING_HINT, MCP_STOP_JOB_HINT, JOB_ID_RE;
+var init_wait_for_job = __esm({
+  "src/mcp/wait-for-job.ts"() {
+    "use strict";
+    import_node_fs39 = require("fs");
+    import_node_path39 = require("path");
+    init_workspace_scratch();
+    init_wait_for_turn();
+    MAX_JOB_CONTINUES = 8;
+    MAX_JOB_DELTA_LINES = 80;
+    MAX_JOB_DELTA_CHARS = 4e3;
+    DEFERRED_DONE_MAX_CHARS = 480;
+    GH_WATCH_REFRESH = "Refreshing run status every 3 seconds.";
+    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.";
+    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.";
+    JOB_ID_RE = /^[a-zA-Z0-9._-]{1,64}$/;
+  }
+});
+
+// src/hook/conductor.ts
+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 = (0, import_node_path40.join)(repoPath, ".worktreeinclude");
+  if (!(0, import_node_fs40.existsSync)(path)) return [];
+  return (0, import_node_fs40.readFileSync)(path, "utf8").split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("#"));
 }
-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 (0, import_node_fs40.readdirSync)(repoPath, { withFileTypes: true })) {
+        if (!entry.isFile()) continue;
+        for (const glob of settings.fileIncludeGlobs) {
+          if (matchSimpleGlob(glob, entry.name) || matchSimpleGlob((0, import_node_path40.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 {
-    (0, import_node_fs40.writeFileSync)(
-      setupLogPath(threadId),
-      `${JSON.stringify(materialize(mem))}
-`,
-      "utf8"
-    );
+    for (const entry of (0, import_node_fs40.readdirSync)(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 = (0, import_node_path40.join)(repoPath, rel);
+    if (!(0, import_node_fs40.existsSync)(src)) continue;
+    const dest = (0, import_node_path40.join)(worktreePath, rel);
+    (0, import_node_fs40.mkdirSync)((0, import_node_path40.dirname)(dest), { recursive: true });
+    (0, import_node_fs40.copyFileSync)(src, dest);
+    copied.push(rel);
+  }
+  return copied;
 }
-function loadFromDisk(threadId) {
-  const path = setupLogPath(threadId);
-  if (!(0, import_node_fs40.existsSync)(path)) return 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((0, import_node_fs40.readFileSync)(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 (0, import_execa4.execa)(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 ?? (0, import_node_path40.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 = (0, import_node_readline3.createInterface)({ 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 finishSetupLog(threadId, exitCode, source) {
-  const mem = memFor(threadId);
-  mem.running = false;
-  mem.exitCode = exitCode;
-  mem.source = source ?? mem.source;
-  persistNow(threadId);
-  return materialize(mem);
-}
-var import_node_crypto8, import_node_fs40, import_node_path40, EMPTY, MAX_SETUP_LOG_CHARS, memory, persistTimers, PERSIST_DEBOUNCE_MS;
-var init_setup_log = __esm({
-  "src/store/setup-log.ts"() {
-    "use strict";
-    import_node_crypto8 = require("crypto");
-    import_node_fs40 = require("fs");
-    import_node_path40 = require("path");
-    init_worktree_labels();
-    init_paths();
-    EMPTY = {
-      output: "",
-      running: false,
-      exitCode: null,
-      source: null
-    };
-    MAX_SETUP_LOG_CHARS = 256e3;
-    memory = /* @__PURE__ */ new Map();
-    persistTimers = /* @__PURE__ */ new Map();
-    PERSIST_DEBOUNCE_MS = 500;
+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);
   }
-});
-
-// src/store/run-log.ts
-function fromSnapshot2(snap) {
-  return {
-    chunks: snap.output ? [snap.output] : [],
-    length: snap.output.length,
-    running: snap.running,
-    exitCode: snap.exitCode,
-    scriptName: snap.scriptName
-  };
+  return pids;
 }
-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 = (0, import_node_child_process4.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 (0, import_node_path41.join)(threadsDir(), `${key}.run.log.json`);
-}
-function runLogKeyForWorktree(worktreePath, scriptName) {
-  const norm = normalizeWorktreePath(worktreePath);
-  const hash = (0, import_node_crypto9.createHash)("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 text7 = nl >= 0 && nl < cut.length - 1 ? cut.slice(nl + 1) : cut;
-  return { output: text7, truncated: true, outputChars };
 }
-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 {
-    (0, import_node_fs41.writeFileSync)(runLogPath(key), `${JSON.stringify(materialize2(mem))}
-`, "utf8");
+    const raw = (0, import_node_child_process4.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 (!(0, import_node_fs41.existsSync)(path)) return null;
+function realpathOrResolve(path) {
   try {
-    const raw = JSON.parse((0, import_node_fs41.readFileSync)(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 (0, import_node_fs40.realpathSync)(path);
   } catch {
-    return null;
+    return (0, import_node_path40.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 + import_node_path40.sep)) return false;
+  const parent = (0, import_node_path40.dirname)(wt);
+  const thisName = (0, import_node_path40.basename)(wt);
+  if (!thisName || c === parent) return false;
+  if (!c.startsWith(parent + import_node_path40.sep)) return false;
+  const first = c.slice(parent.length + 1).split(import_node_path40.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);
+function isThisWorktreeListenerCwd(cwd, worktreePath) {
+  const wt = realpathOrResolve(worktreePath);
+  const c = realpathOrResolve(cwd);
+  return c === wt || c.startsWith(wt + import_node_path40.sep);
 }
-var import_node_crypto9, import_node_fs41, import_node_path41, EMPTY2, MAX_RUN_LOG_CHARS, DEFAULT_RUN_LOG_TAIL_CHARS, memory2, persistTimers2, PERSIST_DEBOUNCE_MS2;
-var init_run_log = __esm({
-  "src/store/run-log.ts"() {
-    "use strict";
-    import_node_crypto9 = require("crypto");
-    import_node_fs41 = require("fs");
-    import_node_path41 = require("path");
-    init_worktree_labels();
-    init_setup_log();
-    init_paths();
-    EMPTY2 = {
-      output: "",
-      running: false,
-      exitCode: null,
-      scriptName: null
-    };
-    MAX_RUN_LOG_CHARS = 256e3;
-    DEFAULT_RUN_LOG_TAIL_CHARS = 16e3;
-    memory2 = /* @__PURE__ */ new Map();
-    persistTimers2 = /* @__PURE__ */ new Map();
-    PERSIST_DEBOUNCE_MS2 = 500;
+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;
+  }
+  try {
+    process.kill(-pid, "SIGTERM");
+  } catch {
+    signalPid(pid, "SIGTERM");
   }
-});
-
-// src/git/orphan-cleanup.ts
-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 ((0, import_node_fs42.existsSync)(homeRoot)) {
+function killListenersOnPorts(ports) {
+  const selfPid = process.pid;
+  for (const port of ports) {
+    if (!Number.isFinite(port) || port <= 0) continue;
     try {
-      for (const entry of (0, import_node_fs42.readdirSync)(homeRoot, { withFileTypes: true })) {
-        if (!entry.isDirectory()) continue;
-        void entry;
+      if (process.platform === "win32") {
+        (0, import_node_child_process4.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 {
     }
   }
-  const orphans = [];
-  const seen = /* @__PURE__ */ new Set();
-  for (const repoPath of repos) {
-    if (!repoPath || !(0, import_node_fs42.existsSync)(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 = (0, import_node_fs42.statSync)(path).mtimeMs;
-        } catch {
-          mtimeMs = 0;
-        }
-        orphans.push({ path, repoPath, mtimeMs });
-      }
-    } catch {
+}
+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 {
-      const root = worktreesRoot(repoPath);
-      if ((0, import_node_fs42.existsSync)(root)) {
-        for (const entry of (0, import_node_fs42.readdirSync)(root, { withFileTypes: true })) {
-          if (!entry.isDirectory()) continue;
-          const path = (0, import_node_path42.join)(root, entry.name).replace(/\/$/, "");
-          if (known.has(path) || seen.has(path)) continue;
-          if (!(0, import_node_fs42.existsSync)((0, import_node_path42.join)(path, ".git"))) continue;
-          seen.add(path);
-          let mtimeMs = 0;
+      if (process.platform === "win32") {
+        void (0, import_execa4.execa)("taskkill", ["/pid", String(pid), "/T", "/F"], { reject: false });
+      } else {
+        process.kill(-pid, "SIGTERM");
+        setTimeout(() => {
           try {
-            mtimeMs = (0, import_node_fs42.statSync)(path).mtimeMs;
+            process.kill(-pid, "SIGKILL");
           } catch {
-            mtimeMs = Date.now();
           }
-          orphans.push({ path, repoPath, mtimeMs });
-        }
+        }, 2500).unref?.();
       }
     } catch {
+      try {
+        child.kill("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;
-    }
-    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;
+  killListenersOnPorts(ports);
 }
-var import_node_fs42, import_node_path42;
-var init_orphan_cleanup = __esm({
-  "src/git/orphan-cleanup.ts"() {
-    "use strict";
-    import_node_fs42 = require("fs");
-    import_node_path42 = require("path");
-    init_worktree();
-    init_thread_store();
-    init_paths();
-    init_app_settings();
-  }
-});
-
-// 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 = (0, import_execa4.execa)(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 };
-}
-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;
+  return setup;
 }
-var init_history_cleanup = __esm({
-  "src/store/history-cleanup.ts"() {
-    "use strict";
-    init_app_settings();
-    init_history_retention();
-    init_thread_store();
-  }
-});
-
-// src/git/apply-into-main.ts
-async function applyThreadIntoMain(thread, opts) {
-  const method = opts?.method ?? "merge";
-  const target = opts?.targetBranch?.trim() || await resolveDefaultBranch(thread.repoPath);
-  const status = await (0, import_execa5.execa)("git", ["status", "--porcelain"], {
-    cwd: thread.repoPath,
-    reject: false
+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
   });
-  if (status.stdout.trim()) {
-    throw new Error(
-      `Main checkout is dirty \u2014 commit or stash before apply-into-main (${thread.repoPath})`
-    );
-  }
-  const checkout = await (0, import_execa5.execa)("git", ["checkout", target], {
-    cwd: thread.repoPath,
-    reject: false
+  const exitCode = await handle.done;
+  return { ran: true, exitCode };
+}
+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 (checkout.exitCode !== 0) {
-    throw new Error(
-      `Failed to checkout ${target}: ${checkout.stderr.trim() || checkout.stdout.trim()}`
-    );
+}
+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;
   }
-  if (method === "cherry-pick") {
-    const log = await (0, import_execa5.execa)(
-      "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 (0, import_execa5.execa)("git", ["cherry-pick", sha], {
-        cwd: thread.repoPath,
-        reject: false
-      });
-      if (cp.exitCode !== 0) {
-        await (0, import_execa5.execa)("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 getDefaultRunScript(worktreePath, repoPath);
+}
+function getRunMode(worktreePath, repoPath) {
+  return loadWorkspaceSettings(worktreePath, repoPath)?.runMode ?? "concurrent";
+}
+async function reservePort() {
+  return new Promise((resolve2, reject) => {
+    const server = (0, import_node_net.createServer)();
+    let released = false;
+    const release = () => new Promise((res) => {
+      if (released) {
+        res();
+        return;
       }
-    }
-    return {
-      applied: true,
-      method,
-      targetBranch: target,
-      message: `Cherry-picked ${shas.length} commit(s) from ${thread.branchName} into ${target}`
-    };
-  }
-  const merge = await (0, import_execa5.execa)(
-    "git",
-    ["merge", "--no-ff", "-m", `Apply Sideboard thread ${thread.branchName}`, thread.branchName],
-    { cwd: thread.repoPath, reject: false }
-  );
-  if (merge.exitCode !== 0) {
-    await (0, import_execa5.execa)("git", ["merge", "--abort"], {
-      cwd: thread.repoPath,
-      reject: false
+      released = true;
+      server.close(() => res());
     });
-    throw new Error(
-      `Merge failed: ${merge.stderr.trim() || merge.stdout.trim()}`
-    );
-  }
-  return {
-    applied: true,
-    method: "merge",
-    targetBranch: target,
-    message: `Merged ${thread.branchName} into ${target} at ${thread.repoPath}`
-  };
-}
-var import_execa5;
-var init_apply_into_main = __esm({
-  "src/git/apply-into-main.ts"() {
-    "use strict";
-    import_execa5 = require("execa");
-    init_worktree();
-  }
-});
-
-// src/git/clone-repo.ts
-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 = (0, import_node_path43.basename)(url.replace(/\/$/, "").replace(/\.git$/, ""));
-    name = leaf || "repo";
-  }
-  name = name.replace(/[^a-zA-Z0-9._-]+/g, "-").replace(/^-+|-+$/g, "") || "repo";
-  const dest = (0, import_node_path43.join)(sideboardReposDir(), name);
-  if ((0, import_node_fs43.existsSync)(dest)) {
-    const repoPath2 = await resolveRepoRoot(dest);
-    const workspace2 = await ensureWorkspace(repoPath2);
-    return { repoPath: repoPath2, workspace: workspace2 };
-  }
-  const result = await (0, import_execa6.execa)("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}`}`
-    );
-  }
-  const repoPath = await resolveRepoRoot(dest);
-  const workspace = await ensureWorkspace(repoPath);
-  return { repoPath, workspace };
+    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);
+  });
 }
-var import_node_fs43, import_node_path43, import_execa6;
-var init_clone_repo = __esm({
-  "src/git/clone-repo.ts"() {
-    "use strict";
-    import_node_fs43 = require("fs");
-    import_node_path43 = require("path");
-    import_execa6 = require("execa");
-    init_paths();
-    init_workspaces();
-    init_worktree();
-  }
-});
-
-// src/types/thread.ts
-function isAdoptableRunScriptRequest(req) {
-  return Boolean(req && !req.fulfilledAt && !req.error);
+async function tryReservePort(port) {
+  if (!Number.isInteger(port) || port <= 0 || port > 65535) return null;
+  return new Promise((resolve2) => {
+    const server = (0, import_node_net.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 });
+    });
+  });
 }
-var init_thread = __esm({
-  "src/types/thread.ts"() {
-    "use strict";
+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;
   }
-});
-
-// src/store/desktop-host.ts
-function desktopHostPidPath() {
-  return (0, import_node_path44.join)(appDataDir(), "desktop-host.pid");
+  return out;
 }
-function readDesktopHostPid() {
-  try {
-    const pid = Number.parseInt((0, import_node_fs44.readFileSync)(desktopHostPidPath(), "utf8").trim(), 10);
-    if (!Number.isFinite(pid) || pid <= 0) return null;
-    return pid;
-  } catch {
-    return null;
-  }
+function delay(ms) {
+  return new Promise((resolve2) => setTimeout(resolve2, ms));
 }
-function pidAlive(pid) {
+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 {
-    process.kill(pid, 0);
-    return true;
-  } catch {
-    return false;
+    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;
   }
 }
-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();
-}
-var import_node_fs44, import_node_path44;
-var init_desktop_host = __esm({
-  "src/store/desktop-host.ts"() {
-    "use strict";
-    import_node_fs44 = require("fs");
-    import_node_path44 = require("path");
-    init_paths();
+async function tryReserveAvailablePorts(ports) {
+  const held = [];
+  for (const port of ports) {
+    const next = await tryReservePort(port);
+    if (next) held.push(next);
   }
-});
-
-// src/orchestrator/child-halt.ts
-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;
+  return held;
 }
-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);
+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);
+  }
+  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");
+    }
+  }
+  return null;
 }
-function noticeKey(childId, status) {
-  return `${childId}:${status}`;
+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 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);
+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
   });
-  return true;
+  const ports = held.map((h) => h.port);
+  saveWorktreeRunPorts(worktreePath, script.name, ports);
+  try {
+    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;
+  }
 }
-var HALT_STATUSES, notified;
-var init_child_halt = __esm({
-  "src/orchestrator/child-halt.ts"() {
+var import_node_fs40, import_node_child_process4, import_node_net, import_node_path40, import_execa4, import_node_readline3, PORT_RANGE_SIZE, RECLAIM_RETRY_DELAY_MS, RECLAIM_TRIES, cachedLoginEnv;
+var init_conductor = __esm({
+  "src/hook/conductor.ts"() {
     "use strict";
-    init_global_workspace();
-    init_thread_store();
-    HALT_STATUSES = /* @__PURE__ */ new Set(["stopped", "error", "broken"]);
-    notified = /* @__PURE__ */ new Set();
+    import_node_fs40 = require("fs");
+    import_node_child_process4 = require("child_process");
+    import_node_net = require("net");
+    import_node_path40 = require("path");
+    import_execa4 = require("execa");
+    import_node_readline3 = require("readline");
+    init_settings();
+    init_nested_electron_env();
+    init_worktree_pkg_cache();
+    init_convention_setup();
+    init_cursor_worktrees();
+    init_git_auth_mode();
+    init_request_review();
+    init_worktree_exclude();
+    init_worktree_run_ports();
+    init_wait_for_job();
+    init_worktree_run_ports();
+    init_nested_electron_env();
+    PORT_RANGE_SIZE = 10;
+    RECLAIM_RETRY_DELAY_MS = 40;
+    RECLAIM_TRIES = 8;
+    cachedLoginEnv = null;
   }
 });
 
-// src/mcp/wait-for-turn.ts
-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);
+// src/store/setup-log.ts
+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;
 }
-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 fromSnapshot(snap) {
+  return {
+    chunks: snap.output ? [snap.output] : [],
+    length: snap.output.length,
+    running: snap.running,
+    exitCode: snap.exitCode,
+    source: snap.source
+  };
 }
-var MCP_WAIT_FOR_TURN_MAX_MS, MCP_WAIT_STILL_RUNNING_HINT, MCP_WAIT_QUEUED_HINT, MCP_WAIT_STOPPED_HINT, MCP_WAIT_BROKEN_HINT, MCP_WAIT_ERROR_HINT, MCP_WAIT_INPUT_REQUIRED_HINT;
-var init_wait_for_turn = __esm({
-  "src/mcp/wait-for-turn.ts"() {
-    "use strict";
-    MCP_WAIT_FOR_TURN_MAX_MS = 45e3;
-    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.";
-    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.";
-    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.";
-    MCP_WAIT_BROKEN_HINT = "Child worktree is broken (missing on disk). Tell the user \u2014 do not treat this as success.";
-    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.";
-    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 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;
   }
-});
-
-// src/mcp/wait-for-job.ts
-function mcpWaitForJobTimeoutMs(requested) {
-  return mcpWaitForTurnTimeoutMs(requested);
+  return {
+    output,
+    running: mem.running,
+    exitCode: mem.exitCode,
+    source: mem.source
+  };
 }
-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 s;
+function setupLogPath(threadId) {
+  return (0, import_node_path41.join)(threadsDir(), `${threadId}.setup.log.json`);
 }
-function jobAlive(pid) {
-  if (!Number.isInteger(pid) || pid <= 0) return false;
+function setupLogKeyForWorktree(worktreePath) {
+  const norm = normalizeWorktreePath(worktreePath);
+  return `wt-${(0, import_node_crypto8.createHash)("sha1").update(norm).digest("hex").slice(0, 16)}`;
+}
+function emptySetupLog() {
+  return { ...EMPTY };
+}
+function persistNow(threadId) {
+  const timer = persistTimers.get(threadId);
+  if (timer) {
+    clearTimeout(timer);
+    persistTimers.delete(threadId);
+  }
+  const mem = memory.get(threadId);
+  if (!mem) return;
   try {
-    process.kill(pid, 0);
-    return true;
+    (0, import_node_fs41.writeFileSync)(
+      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;
-  try {
-    process.kill(-pgid, 0);
-    return true;
-  } catch (err) {
-    return err && typeof err === "object" && "code" in err && err.code === "EPERM";
-  }
-}
-function jobTreeAlive(pid) {
-  if (pid == null) return false;
-  return jobAlive(pid) || processGroupAlive(pid);
-}
-function readIntFile(file) {
-  if (!(0, import_node_fs45.existsSync)(file)) return null;
-  const n = Number.parseInt((0, import_node_fs45.readFileSync)(file, "utf8").trim(), 10);
-  return Number.isInteger(n) ? n : null;
-}
-function jobDir(root, id, legacy = false) {
-  return (0, import_node_path45.join)(root, legacy ? LEGACY_DETACHED_JOBS_DIR : DETACHED_JOBS_DIR, id);
-}
-function resolveJobDir(root, id) {
-  const modern = jobDir(root, id, false);
-  if ((0, import_node_fs45.existsSync)(modern)) return modern;
-  const legacy = jobDir(root, id, true);
-  if ((0, import_node_fs45.existsSync)(legacy)) return legacy;
-  return modern;
-}
-function listJobIdsIn(root, rel) {
-  const dir = (0, import_node_path45.join)(root, rel);
-  if (!(0, import_node_fs45.existsSync)(dir)) return [];
-  return (0, import_node_fs45.readdirSync)(dir, { withFileTypes: true }).filter((e) => e.isDirectory() && JOB_ID_RE.test(e.name)).map((e) => e.name);
+function schedulePersist(threadId) {
+  if (persistTimers.has(threadId)) return;
+  persistTimers.set(
+    threadId,
+    setTimeout(() => {
+      persistTimers.delete(threadId);
+      persistNow(threadId);
+    }, PERSIST_DEBOUNCE_MS)
+  );
 }
-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((0, import_node_path45.join)(dir, "pid"));
-    if (jobTreeAlive(pid)) running.push(id);
+function loadFromDisk(threadId) {
+  const path = setupLogPath(threadId);
+  if (!(0, import_node_fs41.existsSync)(path)) return null;
+  try {
+    const raw = JSON.parse((0, import_node_fs41.readFileSync)(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;
   }
-  return running.sort();
-}
-function looksLikeDeferredDonePromise(text7) {
-  const t = (text7 ?? "").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 isJobContinuePrompt(text7) {
-  if (typeof text7 !== "string") return false;
-  const t = text7.trim();
-  return t.startsWith("Detached job still running:") || t.startsWith("You ended the turn after promising to report later");
 }
-function collapseGhRunWatchLog(text7) {
-  if (!text7.includes(GH_WATCH_REFRESH)) return text7;
-  const frames = text7.split(/(?=Refreshing run status every 3 seconds\.)/);
-  const watchFrames = frames.filter((f) => f.includes(GH_WATCH_REFRESH));
-  if (watchFrames.length <= 1) return text7;
-  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 memFor(threadId) {
+  const cached = memory.get(threadId);
+  if (cached) return cached;
+  const mem = fromSnapshot(loadFromDisk(threadId) ?? emptySetupLog());
+  memory.set(threadId, mem);
+  return mem;
 }
-function capJobLogDelta(text7) {
-  const collapsed = collapseGhRunWatchLog(text7);
-  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)}`;
+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 out;
+  return emptySetupLog();
 }
-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 beginSetupLog(threadId) {
+  const mem = {
+    chunks: [],
+    length: 0,
+    running: true,
+    exitCode: null,
+    source: null
+  };
+  memory.set(threadId, mem);
+  persistNow(threadId);
+  return materialize(mem);
 }
-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 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 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 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 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)
+var import_node_crypto8, import_node_fs41, import_node_path41, EMPTY, MAX_SETUP_LOG_CHARS, memory, persistTimers, PERSIST_DEBOUNCE_MS;
+var init_setup_log = __esm({
+  "src/store/setup-log.ts"() {
+    "use strict";
+    import_node_crypto8 = require("crypto");
+    import_node_fs41 = require("fs");
+    import_node_path41 = require("path");
+    init_worktree_labels();
+    init_paths();
+    EMPTY = {
+      output: "",
+      running: false,
+      exitCode: null,
+      source: null
     };
+    MAX_SETUP_LOG_CHARS = 256e3;
+    memory = /* @__PURE__ */ new Map();
+    persistTimers = /* @__PURE__ */ new Map();
+    PERSIST_DEBOUNCE_MS = 500;
   }
-  if (looksLikeDeferredDonePromise(opts.chatText) && !opts.alreadyNudged) {
-    return { action: "nudge", prompt: formatDeferredDoneContinuePrompt() };
+});
+
+// src/store/run-log.ts
+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;
   }
-  return { action: "none" };
+  return {
+    output,
+    running: mem.running,
+    exitCode: mem.exitCode,
+    scriptName: mem.scriptName
+  };
 }
-function tailProgress(logFile, maxLines = 12) {
-  if (!(0, import_node_fs45.existsSync)(logFile)) return "(no log yet)";
-  const lines = (0, import_node_fs45.readFileSync)(logFile, "utf8").split("\n");
-  return lines.slice(-maxLines).join("\n");
+function safeScriptToken(scriptName) {
+  const token = scriptName.replace(/[^a-zA-Z0-9._-]+/g, "_").slice(0, 64);
+  return token || "dev";
 }
-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 runLogPath(key) {
+  return (0, import_node_path42.join)(threadsDir(), `${key}.run.log.json`);
 }
-function readLogLines(file) {
-  if (!(0, import_node_fs45.existsSync)(file)) return [];
-  const lines = (0, import_node_fs45.readFileSync)(file, "utf8").split("\n");
-  if (lines.length && lines[lines.length - 1] === "") lines.pop();
-  return lines;
+function runLogKeyForWorktree(worktreePath, scriptName) {
+  const norm = normalizeWorktreePath(worktreePath);
+  const hash = (0, import_node_crypto9.createHash)("sha1").update(norm).digest("hex").slice(0, 16);
+  return `wt-${hash}-run-${safeScriptToken(scriptName)}`;
 }
-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 emptyRunLog() {
+  return { ...EMPTY2 };
 }
-function snapshotJob(dir) {
-  const pid = readIntFile((0, import_node_path45.join)(dir, "pid"));
-  const running = jobTreeAlive(pid);
-  return {
-    pid,
-    running,
-    exitCode: readIntFile((0, import_node_path45.join)(dir, "exit")),
-    log: (0, import_node_path45.join)(dir, "log"),
-    cursor: (0, import_node_path45.join)(dir, "present.cursor"),
-    progress: tailProgress((0, import_node_path45.join)(dir, "log"))
-  };
+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 text7 = nl >= 0 && nl < cut.length - 1 ? cut.slice(nl + 1) : cut;
+  return { output: text7, truncated: true, outputChars };
 }
-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);
+function persistNow2(key) {
+  const timer = persistTimers2.get(key);
+  if (timer) {
+    clearTimeout(timer);
+    persistTimers2.delete(key);
+  }
+  const mem = memory2.get(key);
+  if (!mem) return;
   try {
-    (0, import_node_fs45.mkdirSync)((0, import_node_path45.dirname)(snap.cursor), { recursive: true });
-    (0, import_node_fs45.writeFileSync)(snap.cursor, `${nextCursor}
-`);
+    (0, import_node_fs42.writeFileSync)(runLogPath(key), `${JSON.stringify(materialize2(mem))}
+`, "utf8");
   } catch {
   }
-  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 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 (!(0, import_node_fs42.existsSync)(path)) return null;
+  try {
+    const raw = JSON.parse((0, import_node_fs42.readFileSync)(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
+    };
+  } catch {
+    return null;
+  }
+}
+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 emptyRunLog();
+}
+function beginRunLog(key, scriptName) {
+  const mem = {
+    chunks: [],
+    length: 0,
+    running: true,
+    exitCode: null,
+    scriptName
   };
+  memory2.set(key, mem);
+  persistNow2(key);
+  return materialize2(mem);
 }
-async function sleepMs(ms) {
-  await new Promise((resolve2) => setTimeout(resolve2, ms));
+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);
 }
-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 (!(0, import_node_fs45.existsSync)(dir)) {
+function finishRunLog(key, exitCode) {
+  const mem = memFor2(key);
+  mem.running = false;
+  mem.exitCode = exitCode;
+  persistNow2(key);
+  return materialize2(mem);
+}
+function flushRunLog(key) {
+  persistNow2(key);
+}
+var import_node_crypto9, import_node_fs42, import_node_path42, EMPTY2, MAX_RUN_LOG_CHARS, DEFAULT_RUN_LOG_TAIL_CHARS, memory2, persistTimers2, PERSIST_DEBOUNCE_MS2;
+var init_run_log = __esm({
+  "src/store/run-log.ts"() {
+    "use strict";
+    import_node_crypto9 = require("crypto");
+    import_node_fs42 = require("fs");
+    import_node_path42 = require("path");
+    init_worktree_labels();
+    init_setup_log();
+    init_paths();
+    EMPTY2 = {
+      output: "",
+      running: false,
+      exitCode: null,
+      scriptName: null
+    };
+    MAX_RUN_LOG_CHARS = 256e3;
+    DEFAULT_RUN_LOG_TAIL_CHARS = 16e3;
+    memory2 = /* @__PURE__ */ new Map();
+    persistTimers2 = /* @__PURE__ */ new Map();
+    PERSIST_DEBOUNCE_MS2 = 500;
+  }
+});
+
+// src/git/orphan-cleanup.ts
+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 ((0, import_node_fs43.existsSync)(homeRoot)) {
+    try {
+      for (const entry of (0, import_node_fs43.readdirSync)(homeRoot, { withFileTypes: true })) {
+        if (!entry.isDirectory()) continue;
+        void entry;
+      }
+    } catch {
+    }
+  }
+  const orphans = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const repoPath of repos) {
+    if (!repoPath || !(0, import_node_fs43.existsSync)(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 = (0, import_node_fs43.statSync)(path).mtimeMs;
+        } catch {
+          mtimeMs = 0;
+        }
+        orphans.push({ path, repoPath, mtimeMs });
+      }
+    } catch {
+    }
+    try {
+      const root = worktreesRoot(repoPath);
+      if ((0, import_node_fs43.existsSync)(root)) {
+        for (const entry of (0, import_node_fs43.readdirSync)(root, { withFileTypes: true })) {
+          if (!entry.isDirectory()) continue;
+          const path = (0, import_node_path43.join)(root, entry.name).replace(/\/$/, "");
+          if (known.has(path) || seen.has(path)) continue;
+          if (!(0, import_node_fs43.existsSync)((0, import_node_path43.join)(path, ".git"))) continue;
+          seen.add(path);
+          let mtimeMs = 0;
+          try {
+            mtimeMs = (0, import_node_fs43.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;
+}
+var import_node_fs43, import_node_path43;
+var init_orphan_cleanup = __esm({
+  "src/git/orphan-cleanup.ts"() {
+    "use strict";
+    import_node_fs43 = require("fs");
+    import_node_path43 = require("path");
+    init_worktree();
+    init_thread_store();
+    init_paths();
+    init_app_settings();
+  }
+});
+
+// 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;
+}
+var init_history_cleanup = __esm({
+  "src/store/history-cleanup.ts"() {
+    "use strict";
+    init_app_settings();
+    init_history_retention();
+    init_thread_store();
+  }
+});
+
+// src/git/apply-into-main.ts
+async function applyThreadIntoMain(thread, opts) {
+  const method = opts?.method ?? "merge";
+  const target = opts?.targetBranch?.trim() || await resolveDefaultBranch(thread.repoPath);
+  const status = await (0, import_execa5.execa)("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 (0, import_execa5.execa)("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 (0, import_execa5.execa)(
+      "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 (0, import_execa5.execa)("git", ["cherry-pick", sha], {
+        cwd: thread.repoPath,
+        reject: false
+      });
+      if (cp.exitCode !== 0) {
+        await (0, import_execa5.execa)("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 {
-      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."
+      applied: true,
+      method,
+      targetBranch: target,
+      message: `Cherry-picked ${shas.length} commit(s) from ${thread.branchName} into ${target}`
     };
   }
-  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."
-    });
+  const merge = await (0, import_execa5.execa)(
+    "git",
+    ["merge", "--no-ff", "-m", `Apply Sideboard thread ${thread.branchName}`, thread.branchName],
+    { cwd: thread.repoPath, reject: false }
+  );
+  if (merge.exitCode !== 0) {
+    await (0, import_execa5.execa)("git", ["merge", "--abort"], {
+      cwd: thread.repoPath,
+      reject: false
+    });
+    throw new Error(
+      `Merge failed: ${merge.stderr.trim() || merge.stdout.trim()}`
+    );
+  }
+  return {
+    applied: true,
+    method: "merge",
+    targetBranch: target,
+    message: `Merged ${thread.branchName} into ${target} at ${thread.repoPath}`
+  };
+}
+var import_execa5;
+var init_apply_into_main = __esm({
+  "src/git/apply-into-main.ts"() {
+    "use strict";
+    import_execa5 = require("execa");
+    init_worktree();
+  }
+});
+
+// src/git/clone-repo.ts
+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 = (0, import_node_path44.basename)(url.replace(/\/$/, "").replace(/\.git$/, ""));
+    name = leaf || "repo";
   }
-  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())));
+  name = name.replace(/[^a-zA-Z0-9._-]+/g, "-").replace(/^-+|-+$/g, "") || "repo";
+  const dest = (0, import_node_path44.join)(sideboardReposDir(), name);
+  if ((0, import_node_fs44.existsSync)(dest)) {
+    const repoPath2 = await resolveRepoRoot(dest);
+    const workspace2 = await ensureWorkspace(repoPath2);
+    return { repoPath: repoPath2, workspace: workspace2 };
   }
-  snap = snapshotJob(dir);
-  return toResult(jobId, snap);
+  const result = await (0, import_execa6.execa)("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}`}`
+    );
+  }
+  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 {
-    }
+var import_node_fs44, import_node_path44, import_execa6;
+var init_clone_repo = __esm({
+  "src/git/clone-repo.ts"() {
+    "use strict";
+    import_node_fs44 = require("fs");
+    import_node_path44 = require("path");
+    import_execa6 = require("execa");
+    init_paths();
+    init_workspaces();
+    init_worktree();
+  }
+});
+
+// src/types/thread.ts
+function isAdoptableRunScriptRequest(req) {
+  return Boolean(req && !req.fulfilledAt && !req.error);
+}
+var init_thread = __esm({
+  "src/types/thread.ts"() {
+    "use strict";
   }
+});
+
+// src/store/desktop-host.ts
+function desktopHostPidPath() {
+  return (0, import_node_path45.join)(appDataDir(), "desktop-host.pid");
+}
+function readDesktopHostPid() {
   try {
-    process.kill(pid, signal);
+    const pid = Number.parseInt((0, import_node_fs45.readFileSync)(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 {
-    (0, import_node_fs45.mkdirSync)((0, import_node_path45.dirname)(logFile), { recursive: true });
-    const body = line.endsWith("\n") ? line : `${line}
-`;
-    (0, import_node_fs45.appendFileSync)(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 (!(0, import_node_fs45.existsSync)(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 = (0, import_node_path45.join)(dir, "exit");
-  if (!(0, import_node_fs45.existsSync)(exitFile)) {
-    try {
-      (0, import_node_fs45.writeFileSync)(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);
 }
-var import_node_fs45, import_node_path45, MAX_JOB_CONTINUES, MAX_JOB_DELTA_LINES, MAX_JOB_DELTA_CHARS, DEFERRED_DONE_MAX_CHARS, GH_WATCH_REFRESH, MCP_WAIT_JOB_STILL_RUNNING_HINT, MCP_STOP_JOB_HINT, JOB_ID_RE;
-var init_wait_for_job = __esm({
-  "src/mcp/wait-for-job.ts"() {
+function isThisProcessDesktopHost() {
+  return readDesktopHostPid() === process.pid && pidAlive(process.pid);
+}
+function thisProcessShouldDrainAgentQueues() {
+  if (isThisProcessDesktopHost()) return true;
+  return !isDesktopHostAlive();
+}
+var import_node_fs45, import_node_path45;
+var init_desktop_host = __esm({
+  "src/store/desktop-host.ts"() {
     "use strict";
     import_node_fs45 = require("fs");
     import_node_path45 = require("path");
-    init_workspace_scratch();
-    init_wait_for_turn();
-    MAX_JOB_CONTINUES = 8;
-    MAX_JOB_DELTA_LINES = 80;
-    MAX_JOB_DELTA_CHARS = 4e3;
-    DEFERRED_DONE_MAX_CHARS = 480;
-    GH_WATCH_REFRESH = "Refreshing run status every 3 seconds.";
-    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.";
-    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.";
-    JOB_ID_RE = /^[a-zA-Z0-9._-]{1,64}$/;
+    init_paths();
+  }
+});
+
+// src/orchestrator/child-halt.ts
+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);
+}
+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;
+}
+var HALT_STATUSES, notified;
+var init_child_halt = __esm({
+  "src/orchestrator/child-halt.ts"() {
+    "use strict";
+    init_global_workspace();
+    init_thread_store();
+    HALT_STATUSES = /* @__PURE__ */ new Set(["stopped", "error", "broken"]);
+    notified = /* @__PURE__ */ new Set();
   }
 });
 
@@ -21069,7 +21137,7 @@ function formatWorktreeDirective(thread, opts) {
     const slug = opts?.githubSlug ?? "<origin-owner/name>";
     const resolve2 = opts?.githubSlug ? "" : " Resolve `<origin-owner/name>` with `git remote get-url origin` in this worktree.";
     lines.push(
-      `- Prefer a draft PR first: \`gh pr create --draft -R ${slug}\` (update via \`gh pr edit -R ${slug}\`). Always pass \`-R\` \u2014 bare \`gh pr create\` may target upstream on dual-remote checkouts.${resolve2} Mark ready for review only when asked. If GitHub rejects the body as too long, retry with a short \`--body-file\` \u2014 do not paste a changelog or diff into \`--body\`.`
+      `- Prefer a draft PR first: \`gh pr create --draft --assignee @me -R ${slug}\` (update via \`gh pr edit -R ${slug}\`). Always pass \`-R\` \u2014 bare \`gh pr create\` may target upstream on dual-remote checkouts.${resolve2} Assign to the GitHub-connected user (\`--assignee @me\`) unless the user named someone else. Mark ready for review only when asked. If GitHub rejects the body as too long, retry with a short \`--body-file\` \u2014 do not paste a changelog or diff into \`--body\`.`
     );
   }
   lines.push(
@@ -21364,6 +21432,13 @@ function isPresentPlanToolName(name) {
   if (!name) return false;
   return /present_plan$/i.test(name) || /^mcp__sideboard__present_plan$/i.test(name);
 }
+function threadMayPresentPlan(thread) {
+  return Boolean(thread?.planMode);
+}
+function shouldRegisterPresentPlan(thread) {
+  if (thread == null) return true;
+  return threadMayPresentPlan(thread);
+}
 function extractPresentedPlan(parts) {
   if (!parts?.length) return null;
   for (let i = parts.length - 1; i >= 0; i--) {
@@ -21401,7 +21476,7 @@ function resolvePlanMarkdown(opts) {
   }
   return null;
 }
-var PLAN_FILE_REL, PLAN_FILE_NAME, LEGACY_PLAN_FILE_REL;
+var PLAN_FILE_REL, PLAN_FILE_NAME, LEGACY_PLAN_FILE_REL, PRESENT_PLAN_TOOL_DESCRIPTION, PRESENT_PLAN_REQUIRES_PLAN_MODE;
 var init_plan_present = __esm({
   "src/plan/plan-present.ts"() {
     "use strict";
@@ -21409,6 +21484,8 @@ var init_plan_present = __esm({
     PLAN_FILE_REL = `${ATTACHMENTS_DIR}/plan.md`;
     PLAN_FILE_NAME = "plan.md";
     LEGACY_PLAN_FILE_REL = ".sideboard/plan.md";
+    PRESENT_PLAN_TOOL_DESCRIPTION = "Only when Sideboard Plan mode is on (composer Plan chip). Saves the implementation plan to .context/attachments/plan.md and shows Approve / Hand off / Copy in chat. Pass the full plan body in content. Then Claude should call ExitPlanMode. If Plan mode is off, do not call this \u2014 write the plan in chat.";
+    PRESENT_PLAN_REQUIRES_PLAN_MODE = "Plan mode is off. Do not call present_plan or ExitPlanMode. Write the plan in chat. The user can turn Plan on in the composer.";
   }
 });
 
@@ -21418,11 +21495,15 @@ __export(plan_file_exports, {
   LEGACY_PLAN_FILE_REL: () => LEGACY_PLAN_FILE_REL,
   PLAN_FILE_NAME: () => PLAN_FILE_NAME,
   PLAN_FILE_REL: () => PLAN_FILE_REL,
+  PRESENT_PLAN_REQUIRES_PLAN_MODE: () => PRESENT_PLAN_REQUIRES_PLAN_MODE,
+  PRESENT_PLAN_TOOL_DESCRIPTION: () => PRESENT_PLAN_TOOL_DESCRIPTION,
   extractPresentedPlan: () => extractPresentedPlan,
   isPresentPlanToolName: () => isPresentPlanToolName,
   planFileAbs: () => planFileAbs,
   readPlanFile: () => readPlanFile,
   resolvePlanMarkdown: () => resolvePlanMarkdown,
+  shouldRegisterPresentPlan: () => shouldRegisterPresentPlan,
+  threadMayPresentPlan: () => threadMayPresentPlan,
   writePlanFile: () => writePlanFile
 });
 function ensureAttachmentsGitignore(worktreePath) {
@@ -23090,7 +23171,8 @@ var init_orchestrator = __esm({
             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",
@@ -23104,9 +23186,6 @@ var init_orchestrator = __esm({
             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);
@@ -23123,6 +23202,14 @@ var init_orchestrator = __esm({
             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(
@@ -23181,7 +23268,7 @@ var init_orchestrator = __esm({
           ].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,
@@ -26609,6 +26696,7 @@ function mcpArchiveBlockedReason(thread) {
 
 // src/mcp/server.ts
 init_profile();
+init_plan_present();
 
 // src/mcp/run-script-ref.ts
 init_chat_tabs();
@@ -29539,31 +29627,40 @@ async function startMcpServer() {
       return mcpJson(payload);
     }
   );
-  server.tool(
-    "present_plan",
-    "Save the implementation plan as markdown to .context/attachments/plan.md and show it in Sideboard chat for user approval (Copy / Hand off / Approve). Call this when the plan is ready \u2014 required in plan mode. Pass the full plan body in content. Then Claude should call ExitPlanMode.",
-    {
-      title: import_zod9.z.string().optional().describe("Short plan title (defaults to Plan)"),
-      content: import_zod9.z.string().min(1).describe("Full plan markdown (headings, steps, risks, open questions)"),
-      thread_id: import_zod9.z.string().optional().describe("Sideboard thread id when cwd is not the worktree")
-    },
-    async ({ title, content, thread_id }) => {
-      const { writePlanFile: writePlanFile2 } = await Promise.resolve().then(() => (init_plan_file(), plan_file_exports));
-      let root = process.cwd();
-      if (thread_id?.trim()) {
-        const t = orch.getThread(thread_id.trim());
+  const callingThreadId = process.env[SIDEBOARD_THREAD_ID_ENV]?.trim() || "";
+  const callingThread = callingThreadId ? orch.getThread(callingThreadId) : null;
+  if (shouldRegisterPresentPlan(callingThread)) {
+    server.tool(
+      "present_plan",
+      PRESENT_PLAN_TOOL_DESCRIPTION,
+      {
+        title: import_zod9.z.string().optional().describe("Short plan title (defaults to Plan)"),
+        content: import_zod9.z.string().min(1).describe("Full plan markdown (headings, steps, risks, open questions)"),
+        thread_id: import_zod9.z.string().optional().describe("Sideboard thread id when cwd is not the worktree")
+      },
+      async ({ title, content, thread_id }) => {
+        const { writePlanFile: writePlanFile2 } = await Promise.resolve().then(() => (init_plan_file(), plan_file_exports));
+        const ref = thread_id?.trim() || callingThreadId;
+        const t = ref ? orch.getThread(ref) : null;
+        if (t && !threadMayPresentPlan(t)) {
+          return mcpJson(
+            { ok: false, error: PRESENT_PLAN_REQUIRES_PLAN_MODE },
+            true
+          );
+        }
+        let root = process.cwd();
         if (t?.worktreePath?.trim()) root = t.worktreePath;
+        const path = writePlanFile2(root, content);
+        const payload = {
+          ok: true,
+          path,
+          title: title?.trim() || "Plan",
+          message: "Plan saved to .context/attachments/plan.md and shown in Sideboard chat for approval."
+        };
+        return mcpJson(payload);
       }
-      const path = writePlanFile2(root, content);
-      const payload = {
-        ok: true,
-        path,
-        title: title?.trim() || "Plan",
-        message: "Plan saved to .context/attachments/plan.md and shown in Sideboard chat for approval."
-      };
-      return mcpJson(payload);
-    }
-  );
+    );
+  }
   server.tool(
     "present_schema",
     "Open Sideboard\u2019s schema-driven side column (filterable table and/or form) when the user needs to filter, edit, publish, or persist records. Do not call this just to re-display rows you already wrote as a markdown table. If the user asks for an editable / interactive table, call this even if chat already showed those rows. Pass JSON Schema + optional schemaUi. Prefer datasource=inline with embedded resource/records. Use datasource=brightsy with resource_id only when the user is logged into Brightsy.",
@@ -30171,7 +30268,7 @@ async function startMcpServer() {
               error: true,
               action,
               lastError: message,
-              hint: /body is too long/i.test(message) ? "Branch is already pushed. send_to_thread so the worktree agent runs gh pr create --draft -R <origin> --body-file <short.md>. Keep the description short." : void 0
+              hint: /body is too long/i.test(message) ? "Branch is already pushed. send_to_thread so the worktree agent runs gh pr create --draft --assignee @me -R <origin> --body-file <short.md>. Keep the description short." : void 0
             },
             true
           );