@sideboard-ai/core 0.1.216 → 0.1.218

package/dist/{chunk-C32SBNA3.js → chunk-SRFFIFW6.js}

@@ -24,7 +24,7 @@ import {
   resolveQuotaFallbackAgent,
   stripBrightsyNdjsonNoise,
   toolDescription
-} from "./chunk-DFTVZEZY.js";
+} from "./chunk-XRHTRXZN.js";
 import {
   SLACK_REPLY_FORMATTING,
   addWorkspace,
@@ -47,7 +47,7 @@ import {
   stageAbsolutePathsAsAttachments,
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads
-} from "./chunk-FNGXKY5W.js";
+} from "./chunk-OPYBLX4V.js";
 import {
   addPrStackLayer,
   allocateTeamName,
@@ -81,7 +81,6 @@ import {
   mergeAgentGitAuthEnv,
   mergePr,
   normalizeWorktreePath,
-  originGhRepoEnv,
   pushBranch,
   removeWorktree,
   resolveAgentGitAuthEnv,
@@ -97,7 +96,7 @@ import {
   worktreeDisplayLabelForGroup,
   worktreeNameFromPath,
   worktreeSlugForTicket
-} from "./chunk-NI243N27.js";
+} from "./chunk-KTZESHYH.js";
 import {
   ATTACHMENTS_DIR,
   DETACHED_JOBS_DIR,
@@ -106,7 +105,7 @@ import {
 } from "./chunk-6K64FJDD.js";
 import {
   ensureWorktreeSideboardIgnored
-} from "./chunk-QQKDGPUI.js";
+} from "./chunk-PO4M4JAJ.js";
 import {
   httpFetch
 } from "./chunk-N7WZ6NIN.js";
@@ -129,7 +128,7 @@ import {
   shouldRetryFailedAgentTurn,
   summarizeTurnStderr,
   turnFailChatText
-} from "./chunk-JZHRZ3DR.js";
+} from "./chunk-TQBUXKIB.js";
 import {
   HISTORY_CLEANUP_INTERVAL_HOURS_DEFAULT,
   applyTurnUsage,
@@ -164,10 +163,7 @@ import {
   updateAdvancedSettings,
   usageOnLimit,
   writeSecureJson
-} from "./chunk-L5CIEBLR.js";
-import {
-  stripNestedElectronEnv
-} from "./chunk-4TR3HZFT.js";
+} from "./chunk-EWHJNJHV.js";
 import {
   examplePrefixedBranch,
   sanitizeGitBranchPrefix
@@ -210,7 +206,10 @@ import {
   git,
   resolveGitDirsForLockRecovery,
   run
-} from "./chunk-UFHNSFAS.js";
+} from "./chunk-HVUVQXZ2.js";
+import {
+  stripNestedElectronEnv
+} from "./chunk-4TR3HZFT.js";
 
 // src/orchestrator/orchestrator.ts
 import { EventEmitter } from "events";
@@ -483,7 +482,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-WVZPTHBV.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-HKW3VLGX.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }
@@ -749,20 +748,104 @@ import { existsSync as existsSync19 } from "fs";
 import { createInterface } from "readline";
 import { execa } from "execa";
 
+// src/agents/turn-trace.ts
+import { appendFileSync } from "fs";
+import { join as join4 } from "path";
+function traceTurn(phase, extra) {
+  try {
+    const line = `${JSON.stringify({ t: (/* @__PURE__ */ new Date()).toISOString(), phase, ...extra })}
+`;
+    appendFileSync(join4(appDataDir(), "turn-spawn.log"), line);
+  } catch {
+  }
+}
+async function withTimeout(promise, ms, label) {
+  let timer;
+  try {
+    return await Promise.race([
+      promise,
+      new Promise((_, reject) => {
+        timer = setTimeout(
+          () => reject(new Error(`${label} timed out after ${ms}ms`)),
+          ms
+        );
+      })
+    ]);
+  } finally {
+    if (timer) clearTimeout(timer);
+  }
+}
+
+// src/hook/agent-host-env.ts
+import { delimiter } from "path";
+var DROP_EXACT = /* @__PURE__ */ new Set([
+  "NODE_PATH",
+  "NODE_ENV_ELECTRON_VITE",
+  "INIT_CWD",
+  "npm_command",
+  "npm_execpath",
+  "npm_node_execpath",
+  "npm_lifecycle_event",
+  "npm_lifecycle_script",
+  "PNPM_SCRIPT_SRC_DIR",
+  "PNPM_STORE_DIR",
+  "PORT",
+  "SIDEBOARD_ROOT_PATH",
+  "SIDEBOARD_IS_LOCAL",
+  "SIDEBOARD_WORKSPACE_PATH",
+  "SIDEBOARD_WORKSPACE_NAME",
+  "SIDEBOARD_PORT",
+  "CONDUCTOR_ROOT_PATH",
+  "CONDUCTOR_IS_LOCAL",
+  "CONDUCTOR_WORKSPACE_PATH",
+  "CONDUCTOR_WORKSPACE_NAME",
+  "CONDUCTOR_PORT",
+  "CONDUCTOR_DEFAULT_BRANCH",
+  "SIDEBOARD_DEFAULT_BRANCH"
+]);
+var DROP_PREFIXES = [
+  "npm_package_",
+  "npm_config_",
+  "PNPM_",
+  "SIDEBOARD_PORT_",
+  "CONDUCTOR_PORT_"
+];
+var HOST_PATH_NOISE = /(?:^|\/)node_modules\/\.bin(?:\/|$)|node-gyp-bin|electron-vite/i;
+function isAgentHostEnvKey(key) {
+  if (DROP_EXACT.has(key)) return true;
+  return DROP_PREFIXES.some((prefix) => key.startsWith(prefix));
+}
+function stripHostToolingPath(pathValue) {
+  if (!pathValue?.trim()) return "";
+  return pathValue.split(delimiter).filter((part) => part && !HOST_PATH_NOISE.test(part.replace(/\\/g, "/"))).join(delimiter);
+}
+function sanitizeAgentHostEnv(env, cwd) {
+  for (const key of Object.keys(env)) {
+    if (isAgentHostEnvKey(key)) delete env[key];
+  }
+  env.PATH = stripHostToolingPath(env.PATH);
+  const worktree = cwd?.trim();
+  if (worktree) {
+    env.PWD = worktree;
+    env.INIT_CWD = worktree;
+  }
+  return env;
+}
+
 // src/hook/worktree-pkg-cache.ts
 import { existsSync as existsSync3, mkdirSync } from "fs";
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 var WORKTREE_PKG_CACHE_REL = ".context/.sideboard/pkg-cache";
 function worktreePkgCacheRoot(worktreePath) {
-  return join4(worktreePath, WORKTREE_PKG_CACHE_REL);
+  return join5(worktreePath, WORKTREE_PKG_CACHE_REL);
 }
 function worktreePkgCacheEnv(worktreePath) {
   const root = worktreePkgCacheRoot(worktreePath);
-  const store = join4(root, "pnpm-store");
-  const pnpmCache = join4(root, "pnpm");
-  const npmCache = join4(root, "npm");
-  const nodeGyp = join4(root, "node-gyp");
-  const electron = join4(root, "electron");
+  const store = join5(root, "pnpm-store");
+  const pnpmCache = join5(root, "pnpm");
+  const npmCache = join5(root, "npm");
+  const nodeGyp = join5(root, "node-gyp");
+  const electron = join5(root, "electron");
   return {
     npm_config_store_dir: store,
     PNPM_STORE_DIR: store,
@@ -817,9 +900,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-6P236KKG.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-4TEMLESD.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-FQX6ALAI.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-5V7GEPBG.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -828,26 +911,54 @@ async function spawnAgentTurn(thread, input, onEvent) {
     assertOrchestratorCapableAgent(thread.agent);
   }
   const adapter = getAdapter(thread.agent);
-  const cmd = await adapter.buildTurn(thread, input);
+  const orch = isOrchestratorThread(thread);
+  traceTurn("spawn.buildTurn.start", {
+    threadId: thread.id,
+    agent: thread.agent,
+    orch,
+    cwd: thread.worktreePath
+  });
+  const cmd = await withTimeout(
+    adapter.buildTurn(thread, input),
+    2e4,
+    "buildTurn"
+  );
+  traceTurn("spawn.buildTurn.done", { file: cmd.file, cwd: cmd.cwd });
   if (cmd.cwd !== thread.worktreePath) {
     throw new Error(
       `Agent cwd must be the thread worktree (got ${cmd.cwd}, expected ${thread.worktreePath})`
     );
   }
   const env = childEnvWithAppSettings(cmd.env);
+  sanitizeAgentHostEnv(env, cmd.cwd);
+  ensureAgentPath(env);
   applyPromptCacheTtlEnv(thread.agent, env);
   applyAgentRunnerHeapEnv(env);
-  if (!isOrchestratorThread(thread)) {
+  if (!orch) {
     applyWorktreePkgCacheEnv(env, thread.worktreePath);
   }
   try {
-    if (isOrchestratorThread(thread)) {
-      mergeAgentGitAuthEnv(env, await resolveAgentGitAuthEnv(env));
-    } else {
-      mergeAgentGitAuthEnv(env, await originGhRepoEnv(thread.worktreePath, { env }));
+    traceTurn("spawn.gitAuth.start");
+    mergeAgentGitAuthEnv(
+      env,
+      await withTimeout(
+        resolveAgentGitAuthEnv(env, { cwd: thread.worktreePath }),
+        8e3,
+        "gitAuth"
+      )
+    );
+    if (!orch) {
+      const slug = await withTimeout(
+        resolveGithubRepoSlug(thread.worktreePath),
+        8e3,
+        "resolveGithubRepoSlug"
+      );
+      if (slug) env.GH_REPO = slug;
     }
+    traceTurn("spawn.gitAuth.done", { ghRepo: env.GH_REPO ?? null });
   } catch (err) {
     const detail = err instanceof Error ? err.message : String(err);
+    traceTurn("spawn.gitAuth.fail", { detail });
     console.warn(`[sideboard] git auth env failed (${thread.worktreePath}): ${detail}`);
   }
   const child = execa(cmd.file, cmd.args, {
@@ -860,6 +971,7 @@ async function spawnAgentTurn(thread, input, onEvent) {
     // so Claude doesn't wait ~3s for an empty pipe.
     stdin: cmd.stdin != null ? "pipe" : "ignore"
   });
+  traceTurn("spawn.execa", { pid: child.pid ?? null, file: cmd.file });
   if (cmd.stdin != null && child.stdin) {
     child.stdin.write(cmd.stdin);
     child.stdin.end();
@@ -1091,14 +1203,14 @@ import {
   readFileSync as readFileSync4
 } from "fs";
 import { createServer } from "net";
-import { basename, dirname as dirname2, join as join6 } from "path";
+import { basename, dirname as dirname2, join as join7 } from "path";
 import { execa as execa2 } from "execa";
 import { createInterface as createInterface2 } from "readline";
 
 // src/review/request-review.ts
 import { randomUUID as randomUUID2 } from "crypto";
 import { existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync as readFileSync3, writeFileSync } from "fs";
-import { dirname, join as join5 } from "path";
+import { dirname, join as join6 } from "path";
 
 // src/threads/chat-tabs.ts
 import { randomUUID } from "crypto";
@@ -1889,12 +2001,12 @@ function readTextIfPresent(abs) {
   }
 }
 function readLocalGuidelines(worktreePath) {
-  const localAbs = join5(worktreePath, REVIEW_REQUEST_PATH);
+  const localAbs = join6(worktreePath, REVIEW_REQUEST_PATH);
   const localContent = readTextIfPresent(localAbs);
   if (localContent && !shouldRefreshReviewRequestTemplate(localContent)) {
     return { path: REVIEW_REQUEST_PATH, content: localContent };
   }
-  const legacyAbs = join5(worktreePath, LEGACY_REVIEW_REQUEST_PATH);
+  const legacyAbs = join6(worktreePath, LEGACY_REVIEW_REQUEST_PATH);
   const legacyContent = readTextIfPresent(legacyAbs);
   if (legacyContent && !shouldRefreshReviewRequestTemplate(legacyContent)) {
     return { path: LEGACY_REVIEW_REQUEST_PATH, content: legacyContent };
@@ -1918,7 +2030,7 @@ function contextGuidelines(content, source) {
   };
 }
 function writeContextGuidelines(worktreePath, content) {
-  const abs = join5(worktreePath, CONTEXT_REVIEW_PATH);
+  const abs = join6(worktreePath, CONTEXT_REVIEW_PATH);
   mkdirSync2(dirname(abs), { recursive: true });
   const body = content.endsWith("\n") ? content : `${content}
 `;
@@ -1926,19 +2038,19 @@ function writeContextGuidelines(worktreePath, content) {
   return body;
 }
 function readSideboardReview(worktreePath, repoPath) {
-  const fromWorktree = readTextIfPresent(join5(worktreePath, REPO_REVIEW_PATH));
+  const fromWorktree = readTextIfPresent(join6(worktreePath, REPO_REVIEW_PATH));
   if (fromWorktree) return fromWorktree;
   const repo = repoPath?.replace(/\/+$/, "");
   const wt = worktreePath.replace(/\/+$/, "");
   if (!repo || repo === wt) return null;
-  return readTextIfPresent(join5(repo, REPO_REVIEW_PATH));
+  return readTextIfPresent(join6(repo, REPO_REVIEW_PATH));
 }
 function ensureReviewGuidelinesFile(worktreePath, repoPath) {
-  const skillContent = readTextIfPresent(join5(worktreePath, REVIEW_SKILL_PATH));
+  const skillContent = readTextIfPresent(join6(worktreePath, REVIEW_SKILL_PATH));
   if (skillContent) {
     return { ...skillGuidelines(skillContent, "skill"), wrote: false };
   }
-  const contextContent = readTextIfPresent(join5(worktreePath, CONTEXT_REVIEW_PATH));
+  const contextContent = readTextIfPresent(join6(worktreePath, CONTEXT_REVIEW_PATH));
   if (contextContent && !shouldRefreshReviewRequestTemplate(contextContent)) {
     return { ...contextGuidelines(contextContent, "local"), wrote: false };
   }
@@ -1976,7 +2088,7 @@ function buildReviewRequestAttachment(content, opts) {
   };
 }
 function readExistingReviewRequestFile(worktreePath) {
-  return readTextIfPresent(join5(worktreePath, REVIEW_SKILL_PATH)) ?? readTextIfPresent(join5(worktreePath, CONTEXT_REVIEW_PATH)) ?? readTextIfPresent(join5(worktreePath, REPO_REVIEW_PATH)) ?? readTextIfPresent(join5(worktreePath, REVIEW_REQUEST_PATH)) ?? readTextIfPresent(join5(worktreePath, LEGACY_REVIEW_REQUEST_PATH));
+  return readTextIfPresent(join6(worktreePath, REVIEW_SKILL_PATH)) ?? readTextIfPresent(join6(worktreePath, CONTEXT_REVIEW_PATH)) ?? readTextIfPresent(join6(worktreePath, REPO_REVIEW_PATH)) ?? readTextIfPresent(join6(worktreePath, REVIEW_REQUEST_PATH)) ?? readTextIfPresent(join6(worktreePath, LEGACY_REVIEW_REQUEST_PATH));
 }
 async function requestReview(threadRef, send) {
   const from = findThreadByRef(threadRef);
@@ -2011,7 +2123,7 @@ function matchSimpleGlob(pattern, name) {
   return new RegExp(`^${escaped}$`).test(name);
 }
 function readWorktreeInclude(repoPath) {
-  const path = join6(repoPath, ".worktreeinclude");
+  const path = join7(repoPath, ".worktreeinclude");
   if (!existsSync5(path)) return [];
   return readFileSync4(path, "utf8").split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("#"));
 }
@@ -2052,9 +2164,9 @@ function copyConfiguredFiles(repoPath, worktreePath) {
   const patterns = resolveFilesToCopy(repoPath);
   const copied = [];
   for (const rel of patterns) {
-    const src = join6(repoPath, rel);
+    const src = join7(repoPath, rel);
     if (!existsSync5(src)) continue;
-    const dest = join6(worktreePath, rel);
+    const dest = join7(worktreePath, rel);
     mkdirSync3(dirname2(dest), { recursive: true });
     copyFileSync(src, dest);
     copied.push(rel);
@@ -2359,7 +2471,7 @@ async function startDevServer(repoPath, worktreePath, onLine, opts) {
 // src/store/setup-log.ts
 import { createHash } from "crypto";
 import { existsSync as existsSync6, readFileSync as readFileSync5, writeFileSync as writeFileSync2 } from "fs";
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 var EMPTY = {
   output: "",
   running: false,
@@ -2401,7 +2513,7 @@ function materialize(mem) {
   };
 }
 function setupLogPath(threadId) {
-  return join7(threadsDir(), `${threadId}.setup.log.json`);
+  return join8(threadsDir(), `${threadId}.setup.log.json`);
 }
 function setupLogKeyForWorktree(worktreePath) {
   const norm = normalizeWorktreePath(worktreePath);
@@ -2510,7 +2622,7 @@ function finishSetupLog(threadId, exitCode, source) {
 
 // src/git/orphan-cleanup.ts
 import { existsSync as existsSync7, readdirSync as readdirSync2, statSync } from "fs";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 function isSideboardWorktreePath(path) {
   return path.includes("/.sideboard/worktrees/") || path.includes("/sideboard/workspaces/");
 }
@@ -2557,9 +2669,9 @@ async function findOrphanWorktrees(repoPaths) {
       if (existsSync7(root)) {
         for (const entry of readdirSync2(root, { withFileTypes: true })) {
           if (!entry.isDirectory()) continue;
-          const path = join8(root, entry.name).replace(/\/$/, "");
+          const path = join9(root, entry.name).replace(/\/$/, "");
           if (known.has(path) || seen.has(path)) continue;
-          if (!existsSync7(join8(path, ".git"))) continue;
+          if (!existsSync7(join9(path, ".git"))) continue;
           seen.add(path);
           let mtimeMs = 0;
           try {
@@ -2773,7 +2885,7 @@ async function applyThreadIntoMain(thread, opts) {
 
 // src/git/clone-repo.ts
 import { existsSync as existsSync8 } from "fs";
-import { basename as basename2, join as join9 } from "path";
+import { basename as basename2, join as join10 } from "path";
 import { execa as execa4 } from "execa";
 async function cloneRepoIntoSideboard(opts) {
   const url = opts.url.trim();
@@ -2784,7 +2896,7 @@ async function cloneRepoIntoSideboard(opts) {
     name = leaf || "repo";
   }
   name = name.replace(/[^a-zA-Z0-9._-]+/g, "-").replace(/^-+|-+$/g, "") || "repo";
-  const dest = join9(sideboardReposDir(), name);
+  const dest = join10(sideboardReposDir(), name);
   if (existsSync8(dest)) {
     const repoPath2 = await resolveRepoRoot(dest);
     const workspace2 = await ensureWorkspace(repoPath2);
@@ -2803,9 +2915,9 @@ async function cloneRepoIntoSideboard(opts) {
 
 // src/store/desktop-host.ts
 import { readFileSync as readFileSync6, unlinkSync, writeFileSync as writeFileSync3 } from "fs";
-import { join as join10 } from "path";
+import { join as join11 } from "path";
 function desktopHostPidPath() {
-  return join10(appDataDir(), "desktop-host.pid");
+  return join11(appDataDir(), "desktop-host.pid");
 }
 function claimDesktopHost(pid = process.pid) {
   writeFileSync3(desktopHostPidPath(), `${pid}
@@ -2891,14 +3003,14 @@ function notifyParentOfChildHalt(child, status, send) {
 
 // src/mcp/wait-for-job.ts
 import {
-  appendFileSync,
+  appendFileSync as appendFileSync2,
   existsSync as existsSync9,
   mkdirSync as mkdirSync4,
   readdirSync as readdirSync3,
   readFileSync as readFileSync7,
   writeFileSync as writeFileSync4
 } from "fs";
-import { dirname as dirname3, join as join11 } from "path";
+import { dirname as dirname3, join as join12 } from "path";
 
 // src/mcp/wait-for-turn.ts
 var MCP_WAIT_FOR_TURN_MAX_MS = 45e3;
@@ -2970,7 +3082,7 @@ function readIntFile(file) {
   return Number.isInteger(n) ? n : null;
 }
 function jobDir(root, id, legacy = false) {
-  return join11(root, legacy ? LEGACY_DETACHED_JOBS_DIR : DETACHED_JOBS_DIR, id);
+  return join12(root, legacy ? LEGACY_DETACHED_JOBS_DIR : DETACHED_JOBS_DIR, id);
 }
 function resolveJobDir(root, id) {
   const modern = jobDir(root, id, false);
@@ -2980,7 +3092,7 @@ function resolveJobDir(root, id) {
   return modern;
 }
 function listJobIdsIn(root, rel) {
-  const dir = join11(root, rel);
+  const dir = join12(root, rel);
   if (!existsSync9(dir)) return [];
   return readdirSync3(dir, { withFileTypes: true }).filter((e) => e.isDirectory() && JOB_ID_RE.test(e.name)).map((e) => e.name);
 }
@@ -2994,7 +3106,7 @@ function listRunningDetachedJobs(worktreePath) {
   const running = [];
   for (const id of ids) {
     const dir = resolveJobDir(root, id);
-    const pid = readIntFile(join11(dir, "pid"));
+    const pid = readIntFile(join12(dir, "pid"));
     if (jobTreeAlive(pid)) running.push(id);
   }
   return running.sort();
@@ -3007,6 +3119,7 @@ function looksLikeDeferredDonePromise(text) {
   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(text) {
+  if (typeof text !== "string") return false;
   const t = text.trim();
   return t.startsWith("Detached job still running:") || t.startsWith("You ended the turn after promising to report later");
 }
@@ -3097,15 +3210,15 @@ function takeDelta(logFile, cursorFile) {
   return { delta: capJobLogDelta(lines.slice(start).join("\n")), nextCursor: lines.length };
 }
 function snapshotJob(dir) {
-  const pid = readIntFile(join11(dir, "pid"));
+  const pid = readIntFile(join12(dir, "pid"));
   const running = jobTreeAlive(pid);
   return {
     pid,
     running,
-    exitCode: readIntFile(join11(dir, "exit")),
-    log: join11(dir, "log"),
-    cursor: join11(dir, "present.cursor"),
-    progress: tailProgress(join11(dir, "log"))
+    exitCode: readIntFile(join12(dir, "exit")),
+    log: join12(dir, "log"),
+    cursor: join12(dir, "present.cursor"),
+    progress: tailProgress(join12(dir, "log"))
   };
 }
 function toResult(id, snap, extra) {
@@ -3193,7 +3306,7 @@ function appendJobLog(logFile, line) {
     mkdirSync4(dirname3(logFile), { recursive: true });
     const body = line.endsWith("\n") ? line : `${line}
 `;
-    appendFileSync(logFile, body);
+    appendFileSync2(logFile, body);
   } catch {
   }
 }
@@ -3239,7 +3352,7 @@ async function stopDetachedJob(cwd, id, opts) {
     killProcessTree(targetPid, "SIGKILL");
     await sleep(100);
   }
-  const exitFile = join11(dir, "exit");
+  const exitFile = join12(dir, "exit");
   if (!existsSync9(exitFile)) {
     try {
       writeFileSync4(exitFile, "1\n");
@@ -3905,7 +4018,7 @@ async function createThread(input, _onSetupLine) {
   });
   await requireAgent(resolved.agent);
   if (input.cowboy) {
-    const { cowboyModeEnabled } = await import("./app-settings-2TN3WLZV.js");
+    const { cowboyModeEnabled } = await import("./app-settings-V2BBCX2H.js");
     if (!cowboyModeEnabled()) {
       throw new Error(
         "Cowboy mode is off. Enable it in Settings \u2192 Advanced."
@@ -3963,7 +4076,7 @@ async function createThread(input, _onSetupLine) {
   let sourceIsFork = false;
   if (!input.cowboy && sourceType === "branch" && (!sourceRef || sourceRef === "HEAD" || sourceRef === "default")) {
     if (isAbleTimeConnected() && getIssueSource() === "abletime") {
-      const { ensureAbleTimeTask, issueAttachmentForAbleTimeTask } = await import("./abletime-GDZLZRMY.js");
+      const { ensureAbleTimeTask, issueAttachmentForAbleTimeTask } = await import("./abletime-D6773P33.js");
       const task = await ensureAbleTimeTask({
         title: title?.trim() || "Untitled work",
         description: input.prompt?.trim() || void 0
@@ -4065,7 +4178,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-HETHRRZJ.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-YABJUV3V.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -4451,19 +4564,19 @@ import {
   rmSync
 } from "fs";
 import { tmpdir } from "os";
-import { join as join12 } from "path";
+import { join as join13 } from "path";
 import { createRequire } from "module";
-var CONDUCTOR_APP_SUPPORT = join12(
+var CONDUCTOR_APP_SUPPORT = join13(
   process.env.HOME ?? "",
   "Library",
   "Application Support",
   "com.conductor.app"
 );
-var CONDUCTOR_DB = join12(CONDUCTOR_APP_SUPPORT, "conductor.db");
-var CURSOR_SDK_STORE = join12(CONDUCTOR_APP_SUPPORT, "cursor-sdk-store");
+var CONDUCTOR_DB = join13(CONDUCTOR_APP_SUPPORT, "conductor.db");
+var CURSOR_SDK_STORE = join13(CONDUCTOR_APP_SUPPORT, "cursor-sdk-store");
 function thisModuleFile() {
   const cjsFile = typeof __filename !== "undefined" ? __filename : "";
-  return cjsFile || process.argv[1] || join12(process.cwd(), "package.json");
+  return cjsFile || process.argv[1] || join13(process.cwd(), "package.json");
 }
 function openReadonlySqlite(file) {
   const req = createRequire(thisModuleFile());
@@ -4491,7 +4604,7 @@ function resolveConductorCursorAgentId(workspacePath) {
     return null;
   }
   for (const hash of hashes) {
-    const agentsFile = join12(CURSOR_SDK_STORE, hash, "agents.ndjson");
+    const agentsFile = join13(CURSOR_SDK_STORE, hash, "agents.ndjson");
     if (!existsSync12(agentsFile)) continue;
     let text;
     try {
@@ -4523,7 +4636,7 @@ async function adoptThread(input) {
     throw new Error(`Worktree not found: ${input.worktreePath}`);
   }
   const repoPath = await resolveRepoRoot(input.worktreePath);
-  const { stdout: branch } = await import("./run-CAGKZLHA.js").then(
+  const { stdout: branch } = await import("./run-UEQM4JMZ.js").then(
     ({ git: git2 }) => git2(["rev-parse", "--abbrev-ref", "HEAD"], input.worktreePath)
   );
   const thread = createEmptyThread({
@@ -4538,9 +4651,9 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-R5LJCJRB.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-BCBBMMXB.js");
   await ensureWorkspace2(repoPath);
-  const { ensureWorktreeSideboardIgnored: ensureWorktreeSideboardIgnored2 } = await import("./worktree-exclude-X54WSOXM.js");
+  const { ensureWorktreeSideboardIgnored: ensureWorktreeSideboardIgnored2 } = await import("./worktree-exclude-L32WEBX6.js");
   await ensureWorktreeSideboardIgnored2(input.worktreePath);
   return thread;
 }
@@ -4551,8 +4664,8 @@ function listConductorWorkspaces() {
   if (!existsSync12(CONDUCTOR_DB)) {
     throw new Error(`Conductor DB not found at ${CONDUCTOR_DB}`);
   }
-  const tmp = mkdtempSync(join12(tmpdir(), "sideboard-conductor-"));
-  const snapshot = join12(tmp, "conductor.db");
+  const tmp = mkdtempSync(join13(tmpdir(), "sideboard-conductor-"));
+  const snapshot = join13(tmp, "conductor.db");
   try {
     copyFileSync2(CONDUCTOR_DB, snapshot);
     for (const suffix of ["-wal", "-shm"]) {
@@ -4642,8 +4755,8 @@ function importConductorWorkspace(workspaceId) {
   if (!existsSync12(CONDUCTOR_DB)) {
     throw new Error(`Conductor DB not found at ${CONDUCTOR_DB}`);
   }
-  const tmp = mkdtempSync(join12(tmpdir(), "sideboard-conductor-"));
-  const snapshot = join12(tmp, "conductor.db");
+  const tmp = mkdtempSync(join13(tmpdir(), "sideboard-conductor-"));
+  const snapshot = join13(tmp, "conductor.db");
   try {
     copyFileSync2(CONDUCTOR_DB, snapshot);
     for (const suffix of ["-wal", "-shm"]) {
@@ -5034,7 +5147,7 @@ function stackAgentDefaultsFrom(input) {
 
 // src/diff/diff.ts
 import { existsSync as existsSync14, mkdirSync as mkdirSync5, readFileSync as readFileSync10, statSync as statSync2, writeFileSync as writeFileSync6 } from "fs";
-import { dirname as dirname4, join as join13 } from "path";
+import { dirname as dirname4, join as join14 } from "path";
 async function inspectGitWorktree(worktreePath) {
   if (!worktreePath || !existsSync14(worktreePath)) return "missing_worktree";
   const check = await git(["rev-parse", "--is-inside-work-tree"], worktreePath, {
@@ -5180,7 +5293,7 @@ new file mode 100644
   };
 }
 async function untrackedPatch(worktreePath, path, maxHunk) {
-  const abs = join13(worktreePath, path);
+  const abs = join14(worktreePath, path);
   try {
     const st = statSync2(abs);
     if (st.isFile() && st.size > maxHunk) {
@@ -5650,6 +5763,15 @@ async function getDiff(worktreePath, repoPath, opts) {
     mergeBase: needsMergeBase ? mergeBase : null
   };
 }
+function statWorktreePath(worktreePath, relativePath) {
+  assertSafeRelativePath(relativePath);
+  const abs = join14(worktreePath, relativePath);
+  if (!existsSync14(abs)) return "missing";
+  const st = statSync2(abs);
+  if (st.isDirectory()) return "dir";
+  if (st.isFile()) return "file";
+  return "missing";
+}
 async function listWorktreeFiles(worktreePath, opts) {
   const maxFiles = opts?.maxFiles ?? 5e3;
   const tracked = await git(["ls-files", "-z"], worktreePath, { reject: false });
@@ -5685,7 +5807,7 @@ var DEFAULT_UPLOAD_MAX_BYTES = 5e7;
 function readWorktreeFileForUpload(worktreePath, relativePath, opts) {
   assertSafeRelativePath(relativePath);
   const maxBytes = opts?.maxBytes ?? DEFAULT_UPLOAD_MAX_BYTES;
-  const abs = join13(worktreePath, relativePath);
+  const abs = join14(worktreePath, relativePath);
   const st = statSync2(abs);
   if (!st.isFile()) {
     throw new Error(`Not a file: ${relativePath}`);
@@ -5705,7 +5827,7 @@ function readWorktreeFileForUpload(worktreePath, relativePath, opts) {
 function readWorktreeFile(worktreePath, relativePath, opts) {
   assertSafeRelativePath(relativePath);
   const maxBytes = opts?.maxBytes ?? 2e5;
-  const abs = join13(worktreePath, relativePath);
+  const abs = join14(worktreePath, relativePath);
   const st = statSync2(abs);
   if (!st.isFile()) {
     throw new Error(`Not a file: ${relativePath}`);
@@ -5753,7 +5875,7 @@ function assertSafeRelativePath(relativePath) {
 }
 function writeWorktreeFile(worktreePath, relativePath, content) {
   assertSafeRelativePath(relativePath);
-  const abs = join13(worktreePath, relativePath);
+  const abs = join14(worktreePath, relativePath);
   mkdirSync5(dirname4(abs), { recursive: true });
   writeFileSync6(abs, content, "utf8");
   return { path: relativePath };
@@ -5947,7 +6069,7 @@ async function confirmLand(thread, opts) {
   if (preview.dirty) {
     committed = await commitAll(thread.worktreePath, meta.commitMessage);
   }
-  const { git: git2 } = await import("./run-CAGKZLHA.js");
+  const { git: git2 } = await import("./run-UEQM4JMZ.js");
   const { stdout: headOut } = await git2(
     ["rev-parse", "--abbrev-ref", "HEAD"],
     thread.worktreePath,
@@ -5979,7 +6101,7 @@ async function confirmLand(thread, opts) {
 // src/skills/discover.ts
 import { existsSync as existsSync15, readdirSync as readdirSync5, readFileSync as readFileSync11, statSync as statSync3 } from "fs";
 import { homedir } from "os";
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 
 // src/skills/bundled/long-running.ts
 var LONG_RUNNING_SKILL_COMMAND = "long-running";
@@ -6144,7 +6266,7 @@ function scanSkillsDir(dir, source, out) {
   }
   for (const entry of entries) {
     if (entry.startsWith(".")) continue;
-    const skillMd = join14(dir, entry, "SKILL.md");
+    const skillMd = join15(dir, entry, "SKILL.md");
     if (!existsSync15(skillMd)) continue;
     try {
       if (!statSync3(skillMd).isFile()) continue;
@@ -6166,12 +6288,12 @@ function scanClaudePluginSkills(pluginsRoot, out) {
       return;
     }
     if (lookingForSkillsDir && entries.includes("SKILL.md")) {
-      const skill = readSkill(join14(dir, "SKILL.md"), "cli");
+      const skill = readSkill(join15(dir, "SKILL.md"), "cli");
       if (skill) out.push(skill);
     }
     for (const entry of entries) {
       if (entry === "node_modules" || entry === ".git") continue;
-      const full = join14(dir, entry);
+      const full = join15(dir, entry);
       try {
         if (!statSync3(full).isDirectory()) continue;
       } catch {
@@ -6191,17 +6313,17 @@ function discoverSkills(worktreePath) {
   const home = homedir();
   const collected = [];
   for (const rel of [".claude/skills", ".cursor/skills", ".sideboard/skills", ".brightsy/skills", "skills"]) {
-    scanSkillsDir(join14(worktreePath, rel), "workspace", collected);
+    scanSkillsDir(join15(worktreePath, rel), "workspace", collected);
   }
   for (const abs of [
-    join14(home, ".claude/skills"),
-    join14(home, ".cursor/skills"),
-    join14(home, ".sideboard/skills"),
-    join14(home, ".brightsy/skills")
+    join15(home, ".claude/skills"),
+    join15(home, ".cursor/skills"),
+    join15(home, ".sideboard/skills"),
+    join15(home, ".brightsy/skills")
   ]) {
     scanSkillsDir(abs, "user", collected);
   }
-  scanClaudePluginSkills(join14(home, ".claude/plugins"), collected);
+  scanClaudePluginSkills(join15(home, ".claude/plugins"), collected);
   collected.push(...bundledSkills());
   const rank = {
     workspace: 0,
@@ -6373,16 +6495,28 @@ function shiftQueuedItem(queue, queueAttachments) {
 
 // src/agents/instructions.ts
 import { existsSync as existsSync17 } from "fs";
-import { join as join16 } from "path";
+import { join as join17 } from "path";
 
 // src/skills/detached-job-path.ts
 import { existsSync as existsSync16 } from "fs";
-import { dirname as dirname5, join as join15 } from "path";
+import { dirname as dirname5, join as join16 } from "path";
 import { fileURLToPath } from "url";
 var DETACHED_JOB_FILENAMES = ["detached-job.cjs", "detached-job.js"];
+function compiledModuleDir() {
+  const cjsDir = typeof __dirname !== "undefined" ? __dirname : "";
+  if (cjsDir) return cjsDir;
+  try {
+    const url = import.meta.url;
+    if (typeof url === "string" && url.length > 0) {
+      return dirname5(fileURLToPath(url));
+    }
+  } catch {
+  }
+  return null;
+}
 function detachedJobScriptIn(dir) {
   for (const name of DETACHED_JOB_FILENAMES) {
-    const script = join15(dir, "scripts", name);
+    const script = join16(dir, "scripts", name);
     if (existsSync16(script)) return script;
   }
   return null;
@@ -6395,7 +6529,8 @@ function packagedDetachedJobPath() {
 function resolveDetachedJobScript() {
   const packaged = packagedDetachedJobPath();
   if (packaged) return packaged;
-  let dir = dirname5(fileURLToPath(import.meta.url));
+  let dir = compiledModuleDir();
+  if (!dir) return null;
   for (let i = 0; i < 8; i++) {
     const candidate = detachedJobScriptIn(dir);
     if (candidate) return candidate;
@@ -6588,9 +6723,9 @@ function formatPrGateDirective() {
 }
 function formatProcessGuideDirective(opts) {
   const worktree = opts?.worktreePath?.trim();
-  const hasGraphSkill = !!worktree && existsSync17(join16(worktree, ".claude/skills/graph-engineering/SKILL.md"));
-  const hasReviewSkill = !!worktree && existsSync17(join16(worktree, ".claude/skills/review/SKILL.md"));
-  const hasInstallSkill = !!worktree && existsSync17(join16(worktree, ".claude/skills/worktree-install/SKILL.md"));
+  const hasGraphSkill = !!worktree && existsSync17(join17(worktree, ".claude/skills/graph-engineering/SKILL.md"));
+  const hasReviewSkill = !!worktree && existsSync17(join17(worktree, ".claude/skills/review/SKILL.md"));
+  const hasInstallSkill = !!worktree && existsSync17(join17(worktree, ".claude/skills/worktree-install/SKILL.md"));
   return [
     "Process guides (recurring work only):",
     hasGraphSkill ? "- Migrations, ports, batch fixes, and other fan-out: follow `.claude/skills/graph-engineering/SKILL.md` (`/graph-engineering`). Judge first; state on disk; grow the rulebook; do not patch around it." : null,
@@ -6953,7 +7088,7 @@ async function syncThreadBranchFromGit(threadId) {
 // src/store/schedules.ts
 import { randomUUID as randomUUID4 } from "crypto";
 import { existsSync as existsSync18, readFileSync as readFileSync12 } from "fs";
-import { join as join17 } from "path";
+import { join as join18 } from "path";
 import { Cron } from "croner";
 var DURATION_RE = /^(\d+)(s|m|h|d)$/i;
 var UNIT_MS = {
@@ -6963,7 +7098,7 @@ var UNIT_MS = {
   d: 864e5
 };
 function schedulesPath() {
-  return join17(appDataDir(), "schedules.json");
+  return join18(appDataDir(), "schedules.json");
 }
 function parseDurationMs(every) {
   const m = every.trim().match(DURATION_RE);
@@ -7197,7 +7332,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-WVZPTHBV.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-HKW3VLGX.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -7499,7 +7634,7 @@ var Orchestrator = class {
           orphans: orphans.map((o) => ({ path: o.path, repoPath: o.repoPath }))
         });
       }
-      const { autoCleanupOrphansEnabled } = await import("./app-settings-2TN3WLZV.js");
+      const { autoCleanupOrphansEnabled } = await import("./app-settings-V2BBCX2H.js");
       if (autoCleanupOrphansEnabled() && shouldRunWorktreeCleanup() && orphans.length > 0) {
         await cleanupOrphanWorktrees({ repoPaths });
       }
@@ -7531,7 +7666,7 @@ var Orchestrator = class {
       }
       if (thread.queue.length > 0) {
         this.haltDrain.delete(thread.id);
-        void this.drainQueue(thread.id);
+        this.armDrain(thread.id);
       }
     }
   }
@@ -7786,7 +7921,7 @@ var Orchestrator = class {
     }
     await setup;
     if (skipSetup) return;
-    const { autoRunAfterSetupEnabled } = await import("./app-settings-2TN3WLZV.js");
+    const { autoRunAfterSetupEnabled } = await import("./app-settings-V2BBCX2H.js");
     if (autoRunAfterSetupEnabled()) {
       try {
         await this.startDev(threadId);
@@ -7867,7 +8002,7 @@ var Orchestrator = class {
         this.emit({ type: "status_changed", threadId: thread.id, status: "queued" });
       }
       if (thisProcessShouldDrainAgentQueues() && !shouldSteer) {
-        void this.drainQueue(thread.id);
+        this.armDrain(thread.id);
       }
       return this.requireThread(thread.id);
     });
@@ -7947,9 +8082,15 @@ var Orchestrator = class {
     if (inFlight || foreignLive) {
       this.stop(thread.id, { clearQueue: false, continueQueue: true });
     }
-    void this.drainQueue(thread.id);
+    this.armDrain(thread.id);
     return this.requireThread(thread.id);
   }
+  armDrain(threadId) {
+    void this.drainQueue(threadId).catch((err) => {
+      const detail = err instanceof Error ? err.message : String(err);
+      console.error(`[sideboard] drainQueue ${threadId}: ${detail}`);
+    });
+  }
   async drainQueue(threadId) {
     if (this.draining.has(threadId)) return;
     this.draining.add(threadId);
@@ -8021,196 +8162,205 @@ var Orchestrator = class {
     this.emit({ type: "status_changed", threadId, status: "running" });
     this.emit({ type: "turn_started", threadId, prompt });
     try {
-      const baseline = await captureTurnBaseline(thread.worktreePath);
-      if (baseline) this.turnBaselines.set(threadId, baseline);
-    } catch {
-    }
-    try {
-      const compact = await maybeCompactContext(thread);
-      if (compact.didCompact) {
-        thread = updateThread(threadId, {
-          messages: compact.thread.messages,
-          sessionId: compact.thread.sessionId
-        });
-        this.emit({
-          type: "context_compacted",
-          threadId,
-          olderCount: compact.olderCount ?? 0,
-          method: compact.method ?? "extractive"
-        });
+      try {
+        const baseline = await captureTurnBaseline(thread.worktreePath);
+        if (baseline) this.turnBaselines.set(threadId, baseline);
+      } catch {
       }
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      this.emit({ type: "error", threadId, message: `context compact failed: ${message}` });
-      thread = this.requireThread(threadId);
-    }
-    const autoContinue = isJobContinuePrompt(prompt) || prompt.trim().startsWith("The previous agent process ended before it finished.");
-    const parked = takePendingTurnAttachments(thread);
-    const sentAttachments = !autoContinue && parked.length > 0 ? parked : void 0;
-    appendMessage(threadId, {
-      role: "user",
-      text: prompt,
-      ...sentAttachments ? { attachments: sentAttachments } : {},
-      ...autoContinue ? { origin: "continue" } : {},
-      ts: (/* @__PURE__ */ new Date()).toISOString()
-    });
-    thread = this.requireThread(threadId);
-    const gitPrompt = expandCanonicalGitRequest(prompt);
-    const { agentPrompt: expandedPrompt } = expandComposerPrompt(
-      thread.worktreePath,
-      gitPrompt,
-      {
-        attachments: autoContinue ? [] : sentAttachments ?? []
+      try {
+        const compact = await maybeCompactContext(thread);
+        if (compact.didCompact) {
+          thread = updateThread(threadId, {
+            messages: compact.thread.messages,
+            sessionId: compact.thread.sessionId
+          });
+          this.emit({
+            type: "context_compacted",
+            threadId,
+            olderCount: compact.olderCount ?? 0,
+            method: compact.method ?? "extractive"
+          });
+        }
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        this.emit({ type: "error", threadId, message: `context compact failed: ${message}` });
+        thread = this.requireThread(threadId);
       }
-    );
-    const slackInbound = /^(Slack DM|Slack @mention)(?:\n|$)/.test(
-      expandedPrompt.trim()
-    );
-    const orchestrationReminder = isOrchestratorThread(thread) ? [
-      coordinatorTurnReminder({
-        parentId: threadId,
-        goal: thread.sourceRef || thread.title
-      }),
-      slackInbound ? [
-        "This turn is a Slack DM or @mention. Your reply is posted back in Slack \u2014 keep it concise. Sideboard signs it with this Mac's destination name; do not prefix the name yourself.",
-        SLACK_REPLY_FORMATTING
-      ].join("\n") : null
-    ].filter(Boolean).join("\n") : null;
-    const artifactReminder = thread.agent !== "brightsy" ? formatUiReminder() : null;
-    const longRunningReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) ? formatLongRunningReminder() : null;
-    const worktreeReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) ? formatWorktreeReminder() : null;
-    const optionalServicesReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) ? formatOptionalServicesReminder(loadAppSettings().integrations) : null;
-    const issueTicket = issueTicketFromThread(thread, resolveEffectiveIssueSource());
-    const issueToolsReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) ? formatIssueToolsReminder({
-      linear: isLinearConnected(),
-      abletime: isAbleTimeConnected(),
-      github: true,
-      ticketId: issueTicket?.id,
-      ticketProvider: issueTicket?.provider
-    }) : null;
-    const viewerContextReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) ? formatViewerContextReminder() : null;
-    const reviewWriteGateReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) && isReviewWriteGatedThread(
-      thread,
-      thread.worktreePath ? threadsSharingWorktree(thread.worktreePath) : []
-    ) ? formatReviewWriteGateReminder() : null;
-    const slackReplyContext = formatSlackRepliesForTurn(
-      pendingSlackExternalReplies(thread.messages)
-    );
-    const turnReminders = [
-      worktreeReminder,
-      optionalServicesReminder,
-      issueToolsReminder,
-      reviewWriteGateReminder,
-      viewerContextReminder,
-      artifactReminder,
-      longRunningReminder
-    ].filter(Boolean).join("\n\n") || void 0;
-    const prGateDirective = thread.agent !== "brightsy" && !isOrchestratorThread(thread) && mentionsPrGoal(prompt) ? formatPrGateDirective() : null;
-    const agentPrompt = [
-      thread.planMode ? PLAN_MODE_INSTRUCTION : null,
-      orchestrationReminder,
-      prGateDirective,
-      slackReplyContext,
-      expandedPrompt
-    ].filter(Boolean).join("\n\n");
-    if (!autoContinue && sentAttachments) {
-      updateThread(threadId, { pendingTurnAttachments: [] });
-    }
-    const adapter = getAdapter(thread.agent);
-    const resolved = await adapter.resolveSessionId(thread.worktreePath, thread.sessionId);
-    if (resolved && resolved !== thread.sessionId) {
-      updateThread(threadId, { sessionId: resolved });
-    }
-    const fresh = this.requireThread(threadId);
-    if (!fresh.worktreePath?.trim()) {
-      throw new Error(
-        `Thread ${threadId} has no worktreePath \u2014 refusing to start an agent outside an isolated worktree`
+      const promptText = typeof prompt === "string" ? prompt : "";
+      const autoContinue = isJobContinuePrompt(promptText) || promptText.startsWith("The previous agent process ended before it finished.");
+      const parked = takePendingTurnAttachments(thread);
+      const sentAttachments = !autoContinue && parked.length > 0 ? parked : void 0;
+      appendMessage(threadId, {
+        role: "user",
+        text: promptText,
+        ...sentAttachments ? { attachments: sentAttachments } : {},
+        ...autoContinue ? { origin: "continue" } : {},
+        ts: (/* @__PURE__ */ new Date()).toISOString()
+      });
+      traceTurn("runTurn.afterUserMessage", {
+        threadId,
+        agent: thread.agent,
+        orch: isOrchestratorThread(thread)
+      });
+      thread = this.requireThread(threadId);
+      const gitPrompt = expandCanonicalGitRequest(promptText);
+      const { agentPrompt: expandedPrompt } = expandComposerPrompt(
+        thread.worktreePath,
+        gitPrompt,
+        {
+          attachments: autoContinue ? [] : sentAttachments ?? []
+        }
       );
-    }
-    const isBrightsy = fresh.agent === "brightsy";
-    const isOrchestration = isOrchestratorThread(fresh);
-    const { autoRenameBranchEnabled, getGithubGitAuthMode, gitBranchPrefixSetting } = await import("./app-settings-2TN3WLZV.js");
-    const gitAuthMode = getGithubGitAuthMode();
-    const worktreeDirective = isBrightsy || isOrchestration ? null : formatWorktreeDirective(fresh, {
-      githubSlug: await resolveGithubRepoSlug(fresh.worktreePath).catch(
-        () => null
-      ),
-      gitAuthMode
-    });
-    const artifactDirective = isBrightsy ? null : formatArtifactDirective();
-    const longRunningDirective = isBrightsy || isOrchestration ? null : formatLongRunningDirective();
-    const optionalServicesDirective = isBrightsy || isOrchestration ? null : formatOptionalServicesDirective(loadAppSettings().integrations);
-    const freshIssueTicket = issueTicketFromThread(fresh, resolveEffectiveIssueSource());
-    const issueToolsDirective = isBrightsy || isOrchestration ? null : formatIssueToolsDirective({
-      linear: isLinearConnected(),
-      abletime: isAbleTimeConnected(),
-      github: true,
-      ticketId: freshIssueTicket?.id,
-      ticketProvider: freshIssueTicket?.provider
-    });
-    const reviewWriteGateDirective = isBrightsy || isOrchestration || !isReviewWriteGatedThread(
-      fresh,
-      fresh.worktreePath ? threadsSharingWorktree(fresh.worktreePath) : []
-    ) ? null : formatReviewWriteGateDirective();
-    let viewerContextDirective = null;
-    if (!isBrightsy && !isOrchestration) {
-      try {
-        viewerContextDirective = formatViewerContextDirective(
-          resolveViewerProfileForRepo(fresh.repoPath || fresh.worktreePath)
-        );
-      } catch {
-        viewerContextDirective = formatViewerContextDirective(
-          resolveViewerProfileForRepo()
+      const slackInbound = /^(Slack DM|Slack @mention)(?:\n|$)/.test(
+        expandedPrompt.trim()
+      );
+      const orchestrationReminder = isOrchestratorThread(thread) ? [
+        coordinatorTurnReminder({
+          parentId: threadId,
+          goal: thread.sourceRef || thread.title
+        }),
+        slackInbound ? [
+          "This turn is a Slack DM or @mention. Your reply is posted back in Slack \u2014 keep it concise. Sideboard signs it with this Mac's destination name; do not prefix the name yourself.",
+          SLACK_REPLY_FORMATTING
+        ].join("\n") : null
+      ].filter(Boolean).join("\n") : null;
+      const artifactReminder = thread.agent !== "brightsy" ? formatUiReminder() : null;
+      const longRunningReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) ? formatLongRunningReminder() : null;
+      const worktreeReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) ? formatWorktreeReminder() : null;
+      const optionalServicesReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) ? formatOptionalServicesReminder(loadAppSettings().integrations) : null;
+      const issueTicket = issueTicketFromThread(thread, resolveEffectiveIssueSource());
+      const issueToolsReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) ? formatIssueToolsReminder({
+        linear: isLinearConnected(),
+        abletime: isAbleTimeConnected(),
+        github: true,
+        ticketId: issueTicket?.id,
+        ticketProvider: issueTicket?.provider
+      }) : null;
+      const viewerContextReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) ? formatViewerContextReminder() : null;
+      const reviewWriteGateReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) && isReviewWriteGatedThread(
+        thread,
+        thread.worktreePath ? threadsSharingWorktree(thread.worktreePath) : []
+      ) ? formatReviewWriteGateReminder() : null;
+      const slackReplyContext = formatSlackRepliesForTurn(
+        pendingSlackExternalReplies(thread.messages)
+      );
+      const turnReminders = [
+        worktreeReminder,
+        optionalServicesReminder,
+        issueToolsReminder,
+        reviewWriteGateReminder,
+        viewerContextReminder,
+        artifactReminder,
+        longRunningReminder
+      ].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,
+        orchestrationReminder,
+        prGateDirective,
+        slackReplyContext,
+        expandedPrompt
+      ].filter(Boolean).join("\n\n");
+      if (!autoContinue && sentAttachments) {
+        updateThread(threadId, { pendingTurnAttachments: [] });
+      }
+      const adapter = getAdapter(thread.agent);
+      const resolved = await adapter.resolveSessionId(thread.worktreePath, thread.sessionId);
+      if (resolved && resolved !== thread.sessionId) {
+        updateThread(threadId, { sessionId: resolved });
+      }
+      const fresh = this.requireThread(threadId);
+      if (!fresh.worktreePath?.trim()) {
+        throw new Error(
+          `Thread ${threadId} has no worktreePath \u2014 refusing to start an agent outside an isolated worktree`
         );
       }
-    }
-    const settings = loadWorkspaceSettings(fresh.worktreePath, fresh.repoPath);
-    let renameBranchDirective = null;
-    if (!isBrightsy && !isOrchestration && autoRenameBranchEnabled()) {
-      const { resolveGitBranchPrefix } = await import("./branch-prefix-N3KTCRCE.js");
-      renameBranchDirective = formatRenameBranchDirective(fresh, {
-        customPrompt: settings?.prompts?.renameBranch,
-        branchPrefix: resolveGitBranchPrefix({
-          setting: gitBranchPrefixSetting()
-        })
+      const isBrightsy = fresh.agent === "brightsy";
+      const isOrchestration = isOrchestratorThread(fresh);
+      const { autoRenameBranchEnabled, getGithubGitAuthMode, gitBranchPrefixSetting } = await import("./app-settings-V2BBCX2H.js");
+      const gitAuthMode = getGithubGitAuthMode();
+      const worktreeDirective = isBrightsy || isOrchestration ? null : formatWorktreeDirective(fresh, {
+        githubSlug: await withTimeout(
+          resolveGithubRepoSlug(fresh.worktreePath),
+          8e3,
+          "resolveGithubRepoSlug"
+        ).catch(() => null),
+        gitAuthMode
       });
-    }
-    let seed = null;
-    if (!fresh.sessionId) {
-      const prior = fresh.messages.slice(0, -1);
-      seed = isBrightsy ? buildBrightsySessionSeed(prior) : buildSessionSeed(prior);
-    }
-    let coordinatorDirective = null;
-    if (isOrchestration) {
-      if (isGlobalThread(fresh)) {
-        ensureGlobalCoordinatorCwd({ orchestratorThreadId: fresh.id });
+      const artifactDirective = isBrightsy ? null : formatArtifactDirective();
+      const longRunningDirective = isBrightsy || isOrchestration ? null : formatLongRunningDirective();
+      const optionalServicesDirective = isBrightsy || isOrchestration ? null : formatOptionalServicesDirective(loadAppSettings().integrations);
+      const freshIssueTicket = issueTicketFromThread(fresh, resolveEffectiveIssueSource());
+      const issueToolsDirective = isBrightsy || isOrchestration ? null : formatIssueToolsDirective({
+        linear: isLinearConnected(),
+        abletime: isAbleTimeConnected(),
+        github: true,
+        ticketId: freshIssueTicket?.id,
+        ticketProvider: freshIssueTicket?.provider
+      });
+      const reviewWriteGateDirective = isBrightsy || isOrchestration || !isReviewWriteGatedThread(
+        fresh,
+        fresh.worktreePath ? threadsSharingWorktree(fresh.worktreePath) : []
+      ) ? null : formatReviewWriteGateDirective();
+      let viewerContextDirective = null;
+      if (!isBrightsy && !isOrchestration) {
+        try {
+          viewerContextDirective = formatViewerContextDirective(
+            resolveViewerProfileForRepo(fresh.repoPath || fresh.worktreePath)
+          );
+        } catch {
+          viewerContextDirective = formatViewerContextDirective(
+            resolveViewerProfileForRepo()
+          );
+        }
       }
-      if (!fresh.sessionId) {
-        const inventory = await enrichWorkspacesWithGithub(this.listWorkspaces());
-        coordinatorDirective = coordinatorSystemPrompt({
-          goal: fresh.sourceRef || fresh.title || "Orchestration",
-          parentId: fresh.id,
-          workspaces: inventory,
-          audience: /^(Slack DM|Slack @mention)(?:\n|$)/.test(
-            expandedPrompt.trim()
-          ) ? "slack" : "desktop"
+      const settings = loadWorkspaceSettings(fresh.worktreePath, fresh.repoPath);
+      let renameBranchDirective = null;
+      if (!isBrightsy && !isOrchestration && autoRenameBranchEnabled()) {
+        const { resolveGitBranchPrefix } = await import("./branch-prefix-N3KTCRCE.js");
+        renameBranchDirective = formatRenameBranchDirective(fresh, {
+          customPrompt: settings?.prompts?.renameBranch,
+          branchPrefix: resolveGitBranchPrefix({
+            setting: gitBranchPrefixSetting()
+          })
         });
       }
-    }
-    const cachedPrefix = fresh.sessionId ? "" : [
-      coordinatorDirective,
-      worktreeDirective,
-      optionalServicesDirective,
-      issueToolsDirective,
-      reviewWriteGateDirective,
-      viewerContextDirective,
-      artifactDirective,
-      longRunningDirective,
-      renameBranchDirective,
-      seed
-    ].filter(Boolean).join("\n\n---\n\n");
-    try {
+      let seed = null;
+      if (!fresh.sessionId) {
+        const prior = fresh.messages.slice(0, -1);
+        seed = isBrightsy ? buildBrightsySessionSeed(prior) : buildSessionSeed(prior);
+      }
+      let coordinatorDirective = null;
+      if (isOrchestration) {
+        if (isGlobalThread(fresh)) {
+          ensureGlobalCoordinatorCwd({ orchestratorThreadId: fresh.id });
+        }
+        if (!fresh.sessionId) {
+          const inventory = await enrichWorkspacesWithGithub(this.listWorkspaces());
+          coordinatorDirective = coordinatorSystemPrompt({
+            goal: fresh.sourceRef || fresh.title || "Orchestration",
+            parentId: fresh.id,
+            workspaces: inventory,
+            audience: /^(Slack DM|Slack @mention)(?:\n|$)/.test(
+              expandedPrompt.trim()
+            ) ? "slack" : "desktop"
+          });
+        }
+      }
+      const cachedPrefix = fresh.sessionId ? "" : [
+        coordinatorDirective,
+        worktreeDirective,
+        optionalServicesDirective,
+        issueToolsDirective,
+        reviewWriteGateDirective,
+        viewerContextDirective,
+        artifactDirective,
+        longRunningDirective,
+        renameBranchDirective,
+        seed
+      ].filter(Boolean).join("\n\n---\n\n");
       const stderrTail = [];
+      traceTurn("runTurn.beforeSpawn", { threadId, agent: fresh.agent });
       const handle = await spawnAgentTurn(
         fresh,
         {
@@ -9010,6 +9160,18 @@ var Orchestrator = class {
     const thread = this.requireThread(threadRef);
     return listWorktreeFiles(thread.worktreePath);
   }
+  async statPath(threadRef, relativePath) {
+    const thread = this.requireThread(threadRef);
+    if (relativePath.includes("..") || relativePath.startsWith("/")) {
+      return "missing";
+    }
+    if (!relativePath || relativePath === ".") return "dir";
+    try {
+      return statWorktreePath(thread.worktreePath, relativePath);
+    } catch {
+      return "missing";
+    }
+  }
   async readFile(threadRef, relativePath) {
     const thread = this.requireThread(threadRef);
     if (relativePath.includes("..") || relativePath.startsWith("/")) {
@@ -9165,7 +9327,7 @@ var Orchestrator = class {
     if (!titled.userSetTitle && meta.title && titled.title !== meta.title) {
       updateThread(thread.id, { title: meta.title });
     }
-    const { autoArchiveOnMergeEnabled } = await import("./app-settings-2TN3WLZV.js");
+    const { autoArchiveOnMergeEnabled } = await import("./app-settings-V2BBCX2H.js");
     const latest = this.requireThread(thread.id);
     if (!shouldAutoArchiveOnPrMerge({
       previousPrState: prevState || null,
@@ -9444,7 +9606,7 @@ var Orchestrator = class {
     this.enforceHistoryRetention();
     if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
       try {
-        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-R5LJCJRB.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-BCBBMMXB.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -9471,7 +9633,7 @@ var Orchestrator = class {
           await runArchiveScript(thread.repoPath, thread.worktreePath);
         } catch {
         }
-        const { deleteBranchOnPurgeEnabled } = await import("./app-settings-2TN3WLZV.js");
+        const { deleteBranchOnPurgeEnabled } = await import("./app-settings-V2BBCX2H.js");
         const deleteBranch = opts?.deleteBranch ?? deleteBranchOnPurgeEnabled();
         await removeWorktree(thread.repoPath, thread.worktreePath, {
           deleteBranch: deleteBranch ? thread.branchName : void 0
@@ -9498,13 +9660,13 @@ var Orchestrator = class {
           `Cowboy checkout missing: ${thread.worktreePath}. Re-add the project folder, then restore.`
         );
       }
-      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-MDMTCAHX.js");
+      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-7V67XTEO.js");
       const slug = thread.worktreePath.split("/").pop();
       const dest = thread.worktreePath;
       await withRepoGitLock(thread.repoPath, async () => {
         await git(["worktree", "add", dest, thread.branchName], thread.repoPath);
       });
-      const { ensureWorktreeSideboardIgnored: ensureWorktreeSideboardIgnored2 } = await import("./worktree-exclude-X54WSOXM.js");
+      const { ensureWorktreeSideboardIgnored: ensureWorktreeSideboardIgnored2 } = await import("./worktree-exclude-L32WEBX6.js");
       await ensureWorktreeSideboardIgnored2(dest);
       void createThreadWorktree2;
       void slug;
@@ -9608,7 +9770,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-MDMTCAHX.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-7V67XTEO.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return orch.createThread({
@@ -9820,6 +9982,7 @@ export {
   captureTurnBaseline,
   listBranchCommits,
   getDiff,
+  statWorktreePath,
   listWorktreeFiles,
   readWorktreeFileForUpload,
   readWorktreeFile,