@sideboard-ai/core 0.1.196 → 0.1.198

package/dist/agents/cursor-runner.cjs

@@ -220,6 +220,53 @@ function sanitizeCursorStoreSegment(threadId) {
   return (threadId ?? "").trim().replace(/[^a-zA-Z0-9._-]/g, "_");
 }
 
+// src/agents/error-detail.ts
+function formatUnknownDetail(err) {
+  if (err == null) return "";
+  if (typeof err === "string") return err.trim();
+  if (err instanceof Error) {
+    const base = err.message.trim() || err.name;
+    const code = "code" in err && typeof err.code === "string" ? err.code.trim() : "";
+    return code && !base.includes(code) ? `${base} (${code})` : base;
+  }
+  if (typeof err === "object") {
+    const o = err;
+    const nested = o.error != null && typeof o.error === "object" ? formatUnknownDetail(o.error) : "";
+    const message = typeof o.message === "string" ? o.message.trim() : typeof o.error === "string" ? o.error.trim() : typeof o.result === "string" ? o.result.trim() : nested;
+    const code = typeof o.code === "string" ? o.code.trim() : "";
+    if (message) return code && !message.includes(code) ? `${message} (${code})` : message;
+    try {
+      const json = JSON.stringify(err);
+      if (json && json !== "{}" && json !== "null") return json;
+    } catch {
+    }
+  }
+  const fallback = String(err);
+  return fallback === "[object Object]" ? "" : fallback;
+}
+function extractJsonErrorMessage(obj) {
+  const nested = obj.error != null && typeof obj.error === "object" ? obj.error : null;
+  const candidates = [
+    typeof obj.message === "string" ? obj.message : null,
+    typeof obj.error === "string" ? obj.error : null,
+    nested && typeof nested.message === "string" ? nested.message : null,
+    typeof obj.result === "string" ? obj.result : null,
+    typeof obj.detail === "string" ? obj.detail : null
+  ];
+  for (const c of candidates) {
+    const t = c?.trim();
+    if (t) return t;
+  }
+  if (Array.isArray(obj.errors)) {
+    const parts = obj.errors.map((e) => formatUnknownDetail(e)).map((s) => s.trim()).filter(Boolean);
+    if (parts.length) return parts.join("; ");
+  }
+  return null;
+}
+function looksLikeCursorHttp2StreamClose(text) {
+  return /nghttp2/i.test(text.trim());
+}
+
 // src/agents/cursor-session.ts
 function cursorErrorMessage(err) {
   if (err instanceof Error) return err.message.trim();
@@ -251,7 +298,8 @@ function isRetryableCursorTransportError(err) {
   if (err && typeof err === "object" && "isRetryable" in err && err.isRetryable === true) {
     return true;
   }
-  return /network request failed/i.test(cursorErrorMessage(err));
+  const message = cursorErrorMessage(err);
+  return /network request failed/i.test(message) || looksLikeCursorHttp2StreamClose(message);
 }
 function looksLikeNonRetryableCursorFailure(message) {
   const lower = message.toLowerCase();
@@ -324,50 +372,6 @@ async function* iterateUntilIdle(iterable, idleMs, onIdle, activity) {
   }
 }
 
-// src/agents/error-detail.ts
-function formatUnknownDetail(err) {
-  if (err == null) return "";
-  if (typeof err === "string") return err.trim();
-  if (err instanceof Error) {
-    const base = err.message.trim() || err.name;
-    const code = "code" in err && typeof err.code === "string" ? err.code.trim() : "";
-    return code && !base.includes(code) ? `${base} (${code})` : base;
-  }
-  if (typeof err === "object") {
-    const o = err;
-    const nested = o.error != null && typeof o.error === "object" ? formatUnknownDetail(o.error) : "";
-    const message = typeof o.message === "string" ? o.message.trim() : typeof o.error === "string" ? o.error.trim() : typeof o.result === "string" ? o.result.trim() : nested;
-    const code = typeof o.code === "string" ? o.code.trim() : "";
-    if (message) return code && !message.includes(code) ? `${message} (${code})` : message;
-    try {
-      const json = JSON.stringify(err);
-      if (json && json !== "{}" && json !== "null") return json;
-    } catch {
-    }
-  }
-  const fallback = String(err);
-  return fallback === "[object Object]" ? "" : fallback;
-}
-function extractJsonErrorMessage(obj) {
-  const nested = obj.error != null && typeof obj.error === "object" ? obj.error : null;
-  const candidates = [
-    typeof obj.message === "string" ? obj.message : null,
-    typeof obj.error === "string" ? obj.error : null,
-    nested && typeof nested.message === "string" ? nested.message : null,
-    typeof obj.result === "string" ? obj.result : null,
-    typeof obj.detail === "string" ? obj.detail : null
-  ];
-  for (const c of candidates) {
-    const t = c?.trim();
-    if (t) return t;
-  }
-  if (Array.isArray(obj.errors)) {
-    const parts = obj.errors.map((e) => formatUnknownDetail(e)).map((s) => s.trim()).filter(Boolean);
-    if (parts.length) return parts.join("; ");
-  }
-  return null;
-}
-
 // src/agents/cursor-events.ts
 function usageFromCursor(usage) {
   if (!usage) return null;

package/dist/agents/cursor-runner.js

@@ -11,8 +11,9 @@ import {
   cursorSdkMessageToEvents,
   ensureCursorRipgrepPath,
   fetchCursorTurnCostUsd,
-  formatUnknownDetail
-} from "../chunk-NLHFAMC2.js";
+  formatUnknownDetail,
+  looksLikeCursorHttp2StreamClose
+} from "../chunk-CQ5R3VPP.js";
 import {
   dropNestedElectronEnvFromProcess
 } from "../chunk-4TR3HZFT.js";
@@ -55,7 +56,8 @@ function isRetryableCursorTransportError(err) {
   if (err && typeof err === "object" && "isRetryable" in err && err.isRetryable === true) {
     return true;
   }
-  return /network request failed/i.test(cursorErrorMessage(err));
+  const message = cursorErrorMessage(err);
+  return /network request failed/i.test(message) || looksLikeCursorHttp2StreamClose(message);
 }
 function looksLikeNonRetryableCursorFailure(message) {
   const lower = message.toLowerCase();

package/dist/{agents-CT4T6HA3.js → agents-5TZY6LLX.js}

@@ -38,7 +38,7 @@ import {
   resolveQuotaFallbackAgent,
   turnCostUsdFromCursorUsage,
   whichOnPath
-} from "./chunk-5DY2QWVN.js";
+} from "./chunk-SYXSSU7G.js";
 import "./chunk-6YTI2HBG.js";
 import "./chunk-3OHR73VK.js";
 import "./chunk-Y4MIXGPA.js";

package/dist/{agents-2JBVL66D.js → agents-AQQKPD46.js}

@@ -32,7 +32,7 @@ import {
   resolveLoginCommand,
   resolveQuotaFallbackAgent,
   whichOnPath
-} from "./chunk-NWIBA5CP.js";
+} from "./chunk-EA67VQM2.js";
 import "./chunk-HZTHWU6A.js";
 import "./chunk-S4QCBBXS.js";
 import "./chunk-6K64FJDD.js";
@@ -45,7 +45,7 @@ import {
   parseCursorRunnerLine,
   preferredCursorCostCents,
   turnCostUsdFromCursorUsage
-} from "./chunk-NLHFAMC2.js";
+} from "./chunk-CQ5R3VPP.js";
 import {
   ORCHESTRATOR_AGENT_KINDS,
   assertOrchestratorCapableAgent,

package/dist/{chunk-NXXJBRWQ.js → chunk-6YS5IKD2.js}

@@ -5,6 +5,7 @@ import {
 } from "./chunk-DJU54RYW.js";
 import {
   PLAN_MODE_INSTRUCTION,
+  adjustBrightsyTurnExit,
   allAdapters,
   applyAgentEvent,
   applyTurnUsage,
@@ -24,7 +25,7 @@ import {
   stripBrightsyNdjsonNoise,
   sumUsageList,
   toolDescription
-} from "./chunk-NWIBA5CP.js";
+} from "./chunk-EA67VQM2.js";
 import {
   SLACK_REPLY_FORMATTING,
   addWorkspace,
@@ -115,6 +116,7 @@ import {
 } from "./chunk-AXQ4ZWHK.js";
 import {
   applyAgentRunnerHeapEnv,
+  clipToolResultForStore,
   fallbackTurnFailDetail,
   formatAgentErrorContinuePrompt,
   formatTurnExitError,
@@ -127,7 +129,7 @@ import {
   shouldRetryFailedAgentTurn,
   summarizeTurnStderr,
   turnFailChatText
-} from "./chunk-NLHFAMC2.js";
+} from "./chunk-CQ5R3VPP.js";
 import {
   assertOrchestratorCapableAgent,
   childEnvWithAppSettings,
@@ -471,7 +473,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-CT7VSL7B.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-6ZNKCPNL.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }
@@ -903,11 +905,11 @@ async function spawnAgentTurn(thread, input, onEvent) {
   consume(child.stderr, "stderr");
   const done = child.then((result) => {
     outbound.flush();
-    const exitCode = result.exitCode ?? null;
-    onEvent({ type: "exit", data: exitCode });
     const finalized = finalizeParts(parts);
     const rawText = assistantText.trim() || partsToAssistantText(finalized);
     const text = thread.agent === "brightsy" ? stripBrightsyNdjsonNoise(rawText) : rawText;
+    const exitCode = thread.agent === "brightsy" ? adjustBrightsyTurnExit(result.exitCode ?? null, text) : result.exitCode ?? null;
+    onEvent({ type: "exit", data: exitCode });
     return { exitCode, sessionId, assistantText: text, parts: finalized, usage };
   });
   return {
@@ -1256,7 +1258,7 @@ function formatToolPart(t, detail) {
   if (t.input && Object.keys(t.input).length > 0) {
     lines.push("Input:");
     lines.push("```json");
-    lines.push(JSON.stringify(t.input, null, 2));
+    lines.push(clipToolResultForStore(JSON.stringify(t.input, null, 2)) ?? "");
     lines.push("```");
   } else if (t.detail) {
     lines.push(`Detail: ${t.detail}`);
@@ -1306,19 +1308,7 @@ ${m.text}`);
 }
 var SEED_MAX_CHARS = 6e4;
 var SEED_FULL_TOOL_MESSAGES = 6;
-function buildSessionSeed(messages, opts) {
-  if (messages.length === 0) return null;
-  const tools = opts?.tools ?? "full";
-  const fullCount = opts?.fullToolMessages ?? SEED_FULL_TOOL_MESSAGES;
-  const maxChars = opts?.maxChars ?? SEED_MAX_CHARS;
-  const olderTools = tools === "none" ? "none" : "summary";
-  const fullFrom = Math.max(0, messages.length - fullCount);
-  const blocks = messages.map(
-    (m, i) => formatMessageBlock(m, {
-      tools: i >= fullFrom ? tools : olderTools,
-      thinking: false
-    })
-  );
+function budgetSeedBlocks(messages, blocks, maxChars) {
   const keep = new Array(blocks.length).fill(false);
   let used = 0;
   for (let i = 0; i < blocks.length; i++) {
@@ -1335,20 +1325,34 @@ function buildSessionSeed(messages, opts) {
     used = next;
   }
   const dropped = keep.filter((k) => !k).length;
+  const marker = `_(${dropped} older message${dropped === 1 ? "" : "s"} omitted for length)_`;
   const kept = [];
   let markerPlaced = false;
   for (let i = 0; i < blocks.length; i++) {
     if (!keep[i]) continue;
     if (dropped > 0 && !markerPlaced && messages[i].role !== "summary") {
-      kept.push(`_(${dropped} older message${dropped === 1 ? "" : "s"} omitted for length)_`);
+      kept.push(marker);
       markerPlaced = true;
     }
     kept.push(blocks[i]);
   }
-  if (dropped > 0 && !markerPlaced) {
-    kept.push(`_(${dropped} older message${dropped === 1 ? "" : "s"} omitted for length)_`);
-  }
-  const body = kept.join("\n\n");
+  if (dropped > 0 && !markerPlaced) kept.push(marker);
+  return kept.join("\n\n");
+}
+function buildSessionSeed(messages, opts) {
+  if (messages.length === 0) return null;
+  const tools = opts?.tools ?? "full";
+  const fullCount = opts?.fullToolMessages ?? SEED_FULL_TOOL_MESSAGES;
+  const maxChars = opts?.maxChars ?? SEED_MAX_CHARS;
+  const olderTools = tools === "none" ? "none" : "summary";
+  const fullFrom = Math.max(0, messages.length - fullCount);
+  const blocks = messages.map(
+    (m, i) => formatMessageBlock(m, {
+      tools: i >= fullFrom ? tools : olderTools,
+      thinking: false
+    })
+  );
+  const body = budgetSeedBlocks(messages, blocks, maxChars);
   if (!body.trim()) return null;
   return [
     "Sideboard conversation context (restored after compaction or a new session):",
@@ -1404,10 +1408,12 @@ function messagesSinceLastBrightsyContextSummary(messages) {
   if (!match) return messages;
   return messages.slice(match.index + 1);
 }
-function buildBrightsySessionSeed(messages) {
+function buildBrightsySessionSeed(messages, opts) {
   const match = findLastBrightsyContextSummary(messages);
   const tail = match ? messages.slice(match.index + 1) : messages;
-  const body = formatMessagesAsTranscript(tail, { tools: "none", thinking: false });
+  const budget = Math.max(1e3, (opts?.maxChars ?? SEED_MAX_CHARS) - (match?.text.length ?? 0));
+  const tailBlocks = tail.map((m) => formatMessageBlock(m, { tools: "none", thinking: false }));
+  const body = budgetSeedBlocks(tail, tailBlocks, budget);
   if (!match && !body.trim()) return null;
   const blocks = [
     "Sideboard conversation context (restored after compaction or a new session):",
@@ -1510,6 +1516,10 @@ function pickRichestSetupLog(snaps) {
   }
   return best;
 }
+function resolveWorktreeSetupLog(shared, legacyChatLogs) {
+  if (shared.output || shared.running || shared.exitCode != null) return shared;
+  return pickRichestSetupLog(legacyChatLogs);
+}
 function mergeWorktreeActiveRuns(threads) {
   const byName = /* @__PURE__ */ new Map();
   let devPort = null;
@@ -2301,6 +2311,15 @@ var EMPTY = {
   exitCode: null,
   source: null
 };
+var MAX_SETUP_LOG_CHARS = 256e3;
+function appendSetupOutput(prev, line, max = MAX_SETUP_LOG_CHARS) {
+  const next = prev ? `${prev}
+${line}` : line;
+  if (next.length <= max) return next;
+  const cut = next.slice(next.length - max);
+  const nl = cut.indexOf("\n");
+  return nl >= 0 && nl < cut.length - 1 ? cut.slice(nl + 1) : cut;
+}
 var memory = /* @__PURE__ */ new Map();
 var persistTimers = /* @__PURE__ */ new Map();
 function setupLogPath(threadId) {
@@ -2388,8 +2407,7 @@ function appendSetupLog(threadId, line) {
   const current = memory.get(threadId) ?? readSetupLog(threadId);
   const snap = {
     ...current,
-    output: current.output ? `${current.output}
-${line}` : line,
+    output: appendSetupOutput(current.output, line),
     running: true
   };
   memory.set(threadId, snap);
@@ -3870,7 +3888,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-2JBVL66D.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-AQQKPD46.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -6876,7 +6894,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-CT7VSL7B.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-6ZNKCPNL.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -7571,6 +7589,7 @@ var Orchestrator = class {
       return true;
     });
     if (!promoted) return this.requireThread(thread.id);
+    if (!thisProcessShouldDrainAgentQueues()) return this.requireThread(thread.id);
     const current = this.requireThread(thread.id);
     const inFlight = this.activeTurns.has(thread.id) || this.startingTurns.has(thread.id);
     const livePid = current.agentPid;
@@ -8311,10 +8330,10 @@ var Orchestrator = class {
       thread.id,
       ...threadsSharingWorktree(thread.worktreePath).map((t) => t.id)
     ];
-    const snap = pickRichestSetupLog([
+    const snap = resolveWorktreeSetupLog(
       readSetupLog(setupLogKeyForWorktree(thread.worktreePath)),
-      ...[...new Set(siblingIds)].map((id) => readSetupLog(id))
-    ]) ?? readSetupLog(thread.id);
+      [...new Set(siblingIds)].map((id) => readSetupLog(id))
+    ) ?? readSetupLog(thread.id);
     if (snap.running && !this.hasWorktreeSetupProcess(thread.worktreePath)) {
       return { ...snap, running: false };
     }

package/dist/{chunk-NLHFAMC2.js → chunk-CQ5R3VPP.js}

@@ -207,11 +207,20 @@ function looksLikeInvalidAgentSession(text) {
   if (!lower) return false;
   return /session not found/.test(lower) || /no conversation found/.test(lower) || /conversation .+ not found/.test(lower) || /thread .+ not found/.test(lower) || /unknown session/.test(lower) || /invalid session/.test(lower) || /session .+ (missing|expired|deleted|gone)/.test(lower) || /cannot resume/.test(lower) || /failed to (load|resume|open) session/.test(lower) || /corrupt local agent checkpoint/.test(lower) || /missing root blob/.test(lower) || /\bagent\b.{0,120}\bnot found\b/.test(lower) || /\brun\b.{0,80}\bnot found for agent\b/.test(lower);
 }
+function looksLikeCursorHttp2StreamClose(text) {
+  return /nghttp2/i.test(text.trim());
+}
+function looksLikeBrightsyEmptyCompletion(text) {
+  const core = text.trim().replace(/^exit\s*\d+:\s*/i, "").replace(/^error:\s*/i, "").trim();
+  return /^i did not receive a valid model response\. please try again\.$/i.test(core);
+}
 function looksLikeRetryableRunnerCrash(text) {
   if (looksLikeAgentFailureMessage(text)) return false;
   if (looksLikeInvalidAgentSession(text)) return false;
   if (looksLikeV8Oom(text)) return false;
   if (looksLikeHugeToolResultDump(text)) return true;
+  if (looksLikeCursorHttp2StreamClose(text)) return true;
+  if (looksLikeBrightsyEmptyCompletion(text)) return true;
   const lower = text.trim().toLowerCase();
   if (/cannot find (?:package|module)|err_module_not_found/.test(lower)) return false;
   if (!lower) return true;
@@ -284,9 +293,12 @@ function humanizeAgentFailDetail(detail) {
   if (/corrupt local agent checkpoint|missing root blob|truncated crash dump/.test(lower)) {
     return `${raw} \u2014 retry the turn (Sideboard will start a fresh Cursor session).`;
   }
-  if (/connection stalled/.test(lower)) {
+  if (/connection stalled/.test(lower) || looksLikeCursorHttp2StreamClose(raw)) {
     return /retry the turn/i.test(raw) ? raw : `${raw} \u2014 retry the turn (Sideboard will start a fresh Cursor session).`;
   }
+  if (looksLikeBrightsyEmptyCompletion(raw)) {
+    return /retry the turn/i.test(raw) ? raw : `${raw} \u2014 retry the turn (Brightsy returned an empty model completion).`;
+  }
   if (/network request failed|cursor startup failed:.+\(retryable\)/.test(lower)) {
     return /retry the turn/i.test(raw) ? raw : `${raw} \u2014 retry the turn (a transient Cursor SDK network error).`;
   }
@@ -1098,6 +1110,8 @@ export {
   looksLikeV8Oom,
   summarizeTurnStderr,
   looksLikeInvalidAgentSession,
+  looksLikeCursorHttp2StreamClose,
+  looksLikeBrightsyEmptyCompletion,
   shouldRetryFailedAgentTurn,
   looksLikeAgentFailureMessage,
   fallbackTurnFailDetail,

package/dist/{chunk-3IGCU4AT.js → chunk-DROELG52.js}

@@ -5,9 +5,11 @@ import {
 } from "./chunk-YWI3IBP2.js";
 import {
   PLAN_MODE_INSTRUCTION,
+  adjustBrightsyTurnExit,
   applyAgentEvent,
   applyAgentRunnerHeapEnv,
   applyTurnUsage,
+  clipToolResultForStore,
   contextTokens,
   fallbackTurnFailDetail,
   finalizeParts,
@@ -36,7 +38,7 @@ import {
   summarizeTurnStderr,
   toolDescription,
   turnFailChatText
-} from "./chunk-5DY2QWVN.js";
+} from "./chunk-SYXSSU7G.js";
 import {
   SLACK_REPLY_FORMATTING,
   addWorkspace,
@@ -406,7 +408,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-2FTS55SG.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-L2H42HPW.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }
@@ -897,11 +899,11 @@ async function spawnAgentTurn(thread, input, onEvent) {
   consume(child.stderr, "stderr");
   const done = child.then((result) => {
     outbound.flush();
-    const exitCode = result.exitCode ?? null;
-    onEvent({ type: "exit", data: exitCode });
     const finalized = finalizeParts(parts);
     const rawText = assistantText.trim() || partsToAssistantText(finalized);
     const text = thread.agent === "brightsy" ? stripBrightsyNdjsonNoise(rawText) : rawText;
+    const exitCode = thread.agent === "brightsy" ? adjustBrightsyTurnExit(result.exitCode ?? null, text) : result.exitCode ?? null;
+    onEvent({ type: "exit", data: exitCode });
     return { exitCode, sessionId, assistantText: text, parts: finalized, usage };
   });
   return {
@@ -1230,7 +1232,7 @@ function formatToolPart(t, detail) {
   if (t.input && Object.keys(t.input).length > 0) {
     lines.push("Input:");
     lines.push("```json");
-    lines.push(JSON.stringify(t.input, null, 2));
+    lines.push(clipToolResultForStore(JSON.stringify(t.input, null, 2)) ?? "");
     lines.push("```");
   } else if (t.detail) {
     lines.push(`Detail: ${t.detail}`);
@@ -1280,19 +1282,7 @@ ${m.text}`);
 }
 var SEED_MAX_CHARS = 6e4;
 var SEED_FULL_TOOL_MESSAGES = 6;
-function buildSessionSeed(messages, opts) {
-  if (messages.length === 0) return null;
-  const tools = opts?.tools ?? "full";
-  const fullCount = opts?.fullToolMessages ?? SEED_FULL_TOOL_MESSAGES;
-  const maxChars = opts?.maxChars ?? SEED_MAX_CHARS;
-  const olderTools = tools === "none" ? "none" : "summary";
-  const fullFrom = Math.max(0, messages.length - fullCount);
-  const blocks = messages.map(
-    (m, i) => formatMessageBlock(m, {
-      tools: i >= fullFrom ? tools : olderTools,
-      thinking: false
-    })
-  );
+function budgetSeedBlocks(messages, blocks, maxChars) {
   const keep = new Array(blocks.length).fill(false);
   let used = 0;
   for (let i = 0; i < blocks.length; i++) {
@@ -1309,20 +1299,34 @@ function buildSessionSeed(messages, opts) {
     used = next;
   }
   const dropped = keep.filter((k) => !k).length;
+  const marker = `_(${dropped} older message${dropped === 1 ? "" : "s"} omitted for length)_`;
   const kept = [];
   let markerPlaced = false;
   for (let i = 0; i < blocks.length; i++) {
     if (!keep[i]) continue;
     if (dropped > 0 && !markerPlaced && messages[i].role !== "summary") {
-      kept.push(`_(${dropped} older message${dropped === 1 ? "" : "s"} omitted for length)_`);
+      kept.push(marker);
       markerPlaced = true;
     }
     kept.push(blocks[i]);
   }
-  if (dropped > 0 && !markerPlaced) {
-    kept.push(`_(${dropped} older message${dropped === 1 ? "" : "s"} omitted for length)_`);
-  }
-  const body = kept.join("\n\n");
+  if (dropped > 0 && !markerPlaced) kept.push(marker);
+  return kept.join("\n\n");
+}
+function buildSessionSeed(messages, opts) {
+  if (messages.length === 0) return null;
+  const tools = opts?.tools ?? "full";
+  const fullCount = opts?.fullToolMessages ?? SEED_FULL_TOOL_MESSAGES;
+  const maxChars = opts?.maxChars ?? SEED_MAX_CHARS;
+  const olderTools = tools === "none" ? "none" : "summary";
+  const fullFrom = Math.max(0, messages.length - fullCount);
+  const blocks = messages.map(
+    (m, i) => formatMessageBlock(m, {
+      tools: i >= fullFrom ? tools : olderTools,
+      thinking: false
+    })
+  );
+  const body = budgetSeedBlocks(messages, blocks, maxChars);
   if (!body.trim()) return null;
   return [
     "Sideboard conversation context (restored after compaction or a new session):",
@@ -1373,10 +1377,12 @@ function findLastBrightsyContextSummary(messages) {
   }
   return null;
 }
-function buildBrightsySessionSeed(messages) {
+function buildBrightsySessionSeed(messages, opts) {
   const match = findLastBrightsyContextSummary(messages);
   const tail = match ? messages.slice(match.index + 1) : messages;
-  const body = formatMessagesAsTranscript(tail, { tools: "none", thinking: false });
+  const budget = Math.max(1e3, (opts?.maxChars ?? SEED_MAX_CHARS) - (match?.text.length ?? 0));
+  const tailBlocks = tail.map((m) => formatMessageBlock(m, { tools: "none", thinking: false }));
+  const body = budgetSeedBlocks(tail, tailBlocks, budget);
   if (!match && !body.trim()) return null;
   const blocks = [
     "Sideboard conversation context (restored after compaction or a new session):",
@@ -1479,6 +1485,10 @@ function pickRichestSetupLog(snaps) {
   }
   return best;
 }
+function resolveWorktreeSetupLog(shared, legacyChatLogs) {
+  if (shared.output || shared.running || shared.exitCode != null) return shared;
+  return pickRichestSetupLog(legacyChatLogs);
+}
 function mergeWorktreeActiveRuns(threads) {
   const byName = /* @__PURE__ */ new Map();
   let devPort = null;
@@ -2242,6 +2252,15 @@ var EMPTY = {
   exitCode: null,
   source: null
 };
+var MAX_SETUP_LOG_CHARS = 256e3;
+function appendSetupOutput(prev, line, max = MAX_SETUP_LOG_CHARS) {
+  const next = prev ? `${prev}
+${line}` : line;
+  if (next.length <= max) return next;
+  const cut = next.slice(next.length - max);
+  const nl = cut.indexOf("\n");
+  return nl >= 0 && nl < cut.length - 1 ? cut.slice(nl + 1) : cut;
+}
 var memory = /* @__PURE__ */ new Map();
 var persistTimers = /* @__PURE__ */ new Map();
 function setupLogPath(threadId) {
@@ -2321,8 +2340,7 @@ function appendSetupLog(threadId, line) {
   const current = memory.get(threadId) ?? readSetupLog(threadId);
   const snap = {
     ...current,
-    output: current.output ? `${current.output}
-${line}` : line,
+    output: appendSetupOutput(current.output, line),
     running: true
   };
   memory.set(threadId, snap);
@@ -6529,7 +6547,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-2FTS55SG.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-L2H42HPW.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -7224,6 +7242,7 @@ var Orchestrator = class {
       return true;
     });
     if (!promoted) return this.requireThread(thread.id);
+    if (!thisProcessShouldDrainAgentQueues()) return this.requireThread(thread.id);
     const current = this.requireThread(thread.id);
     const inFlight = this.activeTurns.has(thread.id) || this.startingTurns.has(thread.id);
     const livePid = current.agentPid;
@@ -7964,10 +7983,10 @@ var Orchestrator = class {
       thread.id,
       ...threadsSharingWorktree(thread.worktreePath).map((t) => t.id)
     ];
-    const snap = pickRichestSetupLog([
+    const snap = resolveWorktreeSetupLog(
       readSetupLog(setupLogKeyForWorktree(thread.worktreePath)),
-      ...[...new Set(siblingIds)].map((id) => readSetupLog(id))
-    ]) ?? readSetupLog(thread.id);
+      [...new Set(siblingIds)].map((id) => readSetupLog(id))
+    ) ?? readSetupLog(thread.id);
     if (snap.running && !this.hasWorktreeSetupProcess(thread.worktreePath)) {
       return { ...snap, running: false };
     }