@sideboard-ai/core 0.1.149 → 0.1.151

package/dist/{chunk-BGQBELGJ.js → chunk-CZD4NRDZ.js}

@@ -278,6 +278,7 @@ var DEFAULT_AGENTS = /* @__PURE__ */ new Set([
   "cursor"
 ]);
 var GITHUB_GIT_AUTH_MODES = ["auto", "gh", "ssh", "token"];
+var FOLLOW_UP_BEHAVIORS = ["steer", "queue"];
 function emptyPublicIntegrations() {
   return {
     hasLinearApiKey: false,
@@ -601,6 +602,9 @@ function normalizeAdvanced(raw) {
   if (typeof source.orchestrationQuotaFallbackAgent === "string" && DEFAULT_AGENTS.has(source.orchestrationQuotaFallbackAgent) && source.orchestrationQuotaFallbackAgent !== "brightsy") {
     out.orchestrationQuotaFallbackAgent = source.orchestrationQuotaFallbackAgent;
   }
+  if (source.followUpBehavior === "queue" || source.followUpBehavior === "steer") {
+    out.followUpBehavior = source.followUpBehavior;
+  }
   return out;
 }
 function normalizeSettings(raw) {
@@ -1302,6 +1306,9 @@ function updateAdvancedSettings(patch) {
   if (typeof patch.orchestrationQuotaFallbackAgent === "string" && DEFAULT_AGENTS.has(patch.orchestrationQuotaFallbackAgent) && patch.orchestrationQuotaFallbackAgent !== "brightsy") {
     advanced.orchestrationQuotaFallbackAgent = patch.orchestrationQuotaFallbackAgent;
   }
+  if (patch.followUpBehavior === "queue" || patch.followUpBehavior === "steer") {
+    advanced.followUpBehavior = patch.followUpBehavior;
+  }
   return saveAppSettings({ ...current, advanced });
 }
 function autoRenameBranchEnabled(settings = loadAppSettings()) {
@@ -1347,6 +1354,9 @@ function orchestrationQuotaFallbackAgent(settings = loadAppSettings()) {
   }
   return "cursor";
 }
+function followUpBehavior(settings = loadAppSettings()) {
+  return settings.advanced.followUpBehavior === "queue" ? "queue" : "steer";
+}
 function maxConcurrentAgents(settings = loadAppSettings()) {
   const n = settings.advanced.maxConcurrent;
   if (typeof n === "number" && Number.isFinite(n)) {
@@ -1455,6 +1465,7 @@ export {
   issueSourceLabel,
   HARNESS_ENV_KEYS,
   GITHUB_GIT_AUTH_MODES,
+  FOLLOW_UP_BEHAVIORS,
   emptyPublicIntegrations,
   toPublicAppSettings,
   appSettingsPath,
@@ -1508,6 +1519,7 @@ export {
   autoCleanupOrphansEnabled,
   orchestrationQuotaOnLimit,
   orchestrationQuotaFallbackAgent,
+  followUpBehavior,
   maxConcurrentAgents,
   resolveClaudeExecutable,
   resolveAgentExecutable,

package/dist/{chunk-KPIYENTF.js → chunk-FNQNJOHY.js}

@@ -99,17 +99,93 @@ function withExportedPath(command, pathValue) {
   return `export PATH=${posixShellSingleQuote(pathValue)} && ${trimmed}`;
 }
 
+// src/git/github-agent-auth.ts
+import { chmodSync, existsSync as existsSync2, mkdirSync, writeFileSync } from "fs";
+import { homedir as homedir2 } from "os";
+import { dirname, join as join2 } from "path";
+function githubAgentAuthDir() {
+  const override = process.env.SIDEBOARD_GIT_AUTH_DIR?.trim();
+  if (override) return override;
+  return join2(homedir2(), ".sideboard-git-auth");
+}
+function githubCredentialStorePath() {
+  return join2(githubAgentAuthDir(), "git-credentials");
+}
+function githubGhConfigDir() {
+  return join2(githubAgentAuthDir(), "gh");
+}
+function writePrivateFile(file, body) {
+  mkdirSync(dirname(file), { recursive: true, mode: 448 });
+  try {
+    chmodSync(dirname(file), 448);
+  } catch {
+  }
+  writeFileSync(file, body, { encoding: "utf8", mode: 384 });
+  try {
+    chmodSync(file, 384);
+  } catch {
+  }
+}
+function gitCredentialStoreContents(token) {
+  return `https://x-access-token:${encodeURIComponent(token)}@github.com
+`;
+}
+function ghHostsYml(token, user = "x-access-token") {
+  const u = user.replace(/[^A-Za-z0-9._-]/g, "") || "x-access-token";
+  return [
+    "github.com:",
+    "    git_protocol: https",
+    `    user: ${u}`,
+    `    oauth_token: ${token}`,
+    "    users:",
+    `        ${u}:`,
+    `            oauth_token: ${token}`,
+    ""
+  ].join("\n");
+}
+function materializeGithubAgentAuth(token, user) {
+  const trimmed = token.trim();
+  if (!trimmed) return;
+  const root = githubAgentAuthDir();
+  mkdirSync(root, { recursive: true, mode: 448 });
+  try {
+    chmodSync(root, 448);
+  } catch {
+  }
+  writePrivateFile(githubCredentialStorePath(), gitCredentialStoreContents(trimmed));
+  const ghDir = githubGhConfigDir();
+  mkdirSync(ghDir, { recursive: true, mode: 448 });
+  writePrivateFile(join2(ghDir, "hosts.yml"), ghHostsYml(trimmed, user));
+  writePrivateFile(join2(ghDir, "config.yml"), "git_protocol: https\nprompt: disabled\n");
+}
+function githubAgentAuthReady() {
+  return existsSync2(githubCredentialStorePath()) && existsSync2(join2(githubGhConfigDir(), "hosts.yml"));
+}
+function githubCredentialHelperGitConfig() {
+  const file = githubCredentialStorePath();
+  return [
+    { key: "credential.helper", value: "" },
+    { key: "credential.helper", value: `store --file=${file}` }
+  ];
+}
+function githubGhConfigEnv() {
+  return {
+    GH_CONFIG_DIR: githubGhConfigDir(),
+    GH_PROMPT_DISABLED: "1"
+  };
+}
+
 // src/git/stale-lock.ts
-import { existsSync as existsSync2, statSync, unlinkSync } from "fs";
-import { join as join2 } from "path";
+import { existsSync as existsSync3, statSync, unlinkSync } from "fs";
+import { join as join3 } from "path";
 var STALE_INDEX_LOCK_MS = 2e4;
 function isIndexLockError(text) {
   return /Unable to create ['"][^'"]*index\.lock['"]: File exists/i.test(text);
 }
 function clearStaleIndexLock(gitDir, maxAgeMs = STALE_INDEX_LOCK_MS, now = Date.now()) {
-  const lockPath = join2(gitDir, "index.lock");
+  const lockPath = join3(gitDir, "index.lock");
   try {
-    if (!existsSync2(lockPath)) return null;
+    if (!existsSync3(lockPath)) return null;
     if (now - statSync(lockPath).mtimeMs < maxAgeMs) return null;
     unlinkSync(lockPath);
     return lockPath;
@@ -211,7 +287,10 @@ async function gh(args, cwd, opts) {
     timeoutMs: opts?.timeoutMs,
     env: {
       GH_PROMPT_DISABLED: "1",
-      GIT_TERMINAL_PROMPT: "0"
+      GIT_TERMINAL_PROMPT: "0",
+      // Isolated hosts.yml uses git_protocol: https so `gh pr create` does not
+      // shell out over SSH when Settings → Git is SSH (ask_git in Electron).
+      ...githubAgentAuthReady() ? githubGhConfigEnv() : {}
     }
   });
 }
@@ -230,6 +309,11 @@ export {
   posixShellSingleQuote,
   resolveCommandBinarySync,
   withExportedPath,
+  githubAgentAuthDir,
+  materializeGithubAgentAuth,
+  githubAgentAuthReady,
+  githubCredentialHelperGitConfig,
+  githubGhConfigEnv,
   clearStaleIndexLocks,
   run,
   resolveGitDirsForLockRecovery,

package/dist/{chunk-ED4UPEJX.js → chunk-G7SIQFBQ.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-S42XV45P.js";
 import {
   run
-} from "./chunk-KPIYENTF.js";
+} from "./chunk-FNQNJOHY.js";
 import {
   appDataDir
 } from "./chunk-BD2ICC4D.js";

package/dist/{chunk-TZWO7J4W.js → chunk-GCWAAPJ5.js}

@@ -12,6 +12,7 @@ import {
   formatTurnExitError,
   getAdapter,
   isBrightsyNdjsonLine,
+  isInternalAgentStatusText,
   isPollWrapperToolName,
   isSessionQuotaLimit,
   liveActivitySummary,
@@ -32,21 +33,13 @@ import {
   summarizeTurnStderr,
   toolDescription,
   turnFailChatText
-} from "./chunk-Q5DHVMXB.js";
+} from "./chunk-LZAOX76N.js";
 import {
   addWorkspace,
   ensureWorkspace,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-Q62SDB53.js";
-import {
-  extractPresentedPlan,
-  readPlanFile,
-  writePlanFile
-} from "./chunk-N5PM7HGQ.js";
-import {
-  releaseCaffeinateHoldForThread
-} from "./chunk-KLBOWJ74.js";
+} from "./chunk-TSCWSAQL.js";
 import {
   assertOrchestratorCapableAgent,
   attachmentsFromWorktreePaths,
@@ -63,14 +56,22 @@ import {
   persistPendingFileAttachments,
   stageAbsolutePathsAsAttachments,
   stageBuffersAsAttachments
-} from "./chunk-N3VNOFXQ.js";
+} from "./chunk-Y2FNDKHF.js";
+import {
+  extractPresentedPlan,
+  readPlanFile,
+  writePlanFile
+} from "./chunk-2SDMENAL.js";
+import {
+  releaseCaffeinateHoldForThread
+} from "./chunk-KLBOWJ74.js";
 import {
   SLACK_REPLY_FORMATTING,
   coordinatorSystemPrompt,
   coordinatorTurnReminder,
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd
-} from "./chunk-ZVYLEF72.js";
+} from "./chunk-OXOU2FRS.js";
 import {
   addPrStackLayer,
   allocateTeamName,
@@ -118,11 +119,11 @@ import {
   withRepoGitLock,
   worktreeDisplayLabelForGroup,
   worktreeNameFromPath
-} from "./chunk-JTPDWTWJ.js";
+} from "./chunk-3JBMACYX.js";
 import {
   ATTACHMENTS_DIR,
   LEGACY_ATTACHMENTS_DIR
-} from "./chunk-B3SJXYIJ.js";
+} from "./chunk-NVXVEGGM.js";
 import {
   appendMessage,
   createEmptyThread,
@@ -135,6 +136,9 @@ import {
   withThreadLock,
   writeThread
 } from "./chunk-EUXOHTUK.js";
+import {
+  ensureWorktreeSideboardIgnored
+} from "./chunk-SYFVUF2C.js";
 import {
   clearStaleIndexLocks,
   enrichPathWithNpmGlobalBin,
@@ -142,7 +146,7 @@ import {
   git,
   resolveGitDirsForLockRecovery,
   run
-} from "./chunk-KPIYENTF.js";
+} from "./chunk-FNQNJOHY.js";
 import {
   childEnvWithAppSettings,
   getIssueSource,
@@ -158,7 +162,7 @@ import {
   stripNestedElectronEnv,
   updateAdvancedSettings,
   writeSecureJson
-} from "./chunk-BGQBELGJ.js";
+} from "./chunk-CZD4NRDZ.js";
 import {
   writePrivateFile
 } from "./chunk-NSTQ6QKD.js";
@@ -391,7 +395,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-6TXQWBXN.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-Y5MWUU7C.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }
@@ -732,9 +736,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-2SIPM4PW.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-T7RL3XEC.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-5GXGBGEZ.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-ZK5MII7W.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -1966,6 +1970,7 @@ async function runConventionSetup(repoPath, worktreePath, onLine, opts) {
   };
 }
 async function runWorkspaceSetup(repoPath, worktreePath, onLine, opts) {
+  await ensureWorktreeSideboardIgnored(worktreePath);
   const reviewSkill = ensureReviewSkillFile(worktreePath);
   if (reviewSkill.wrote) {
     onLine?.(
@@ -2874,7 +2879,7 @@ async function createThread(input, _onSetupLine) {
   });
   await requireAgent(resolved.agent);
   if (input.cowboy) {
-    const { cowboyModeEnabled } = await import("./app-settings-ZCN632OJ.js");
+    const { cowboyModeEnabled } = await import("./app-settings-J3JBCUOT.js");
     if (!cowboyModeEnabled()) {
       throw new Error(
         "Cowboy mode is off. Enable it in Settings \u2192 Advanced."
@@ -2932,7 +2937,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-DI55AJX3.js");
+      const { ensureAbleTimeTask, issueAttachmentForAbleTimeTask } = await import("./abletime-CLC5UJC2.js");
       const task = await ensureAbleTimeTask({
         title: title?.trim() || "Untitled work",
         description: input.prompt?.trim() || void 0
@@ -3005,7 +3010,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-V4MTDWXS.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-JAOMXDXN.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -3397,7 +3402,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-USF6FRKV.js").then(
+  const { stdout: branch } = await import("./run-EBWL2Q4N.js").then(
     ({ git: git2 }) => git2(["rev-parse", "--abbrev-ref", "HEAD"], input.worktreePath)
   );
   const thread = createEmptyThread({
@@ -3412,8 +3417,10 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-UUJNOO4T.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-VICQYI2N.js");
   await ensureWorkspace2(repoPath);
+  const { ensureWorktreeSideboardIgnored: ensureWorktreeSideboardIgnored2 } = await import("./worktree-exclude-N5X5I422.js");
+  await ensureWorktreeSideboardIgnored2(input.worktreePath);
   return thread;
 }
 function listConductorWorkspaces() {
@@ -4709,7 +4716,7 @@ async function confirmLand(thread, opts) {
   if (preview.dirty) {
     committed = await commitAll(thread.worktreePath, meta.commitMessage);
   }
-  const { git: git2 } = await import("./run-USF6FRKV.js");
+  const { git: git2 } = await import("./run-EBWL2Q4N.js");
   const { stdout: headOut } = await git2(
     ["rev-parse", "--abbrev-ref", "HEAD"],
     thread.worktreePath,
@@ -4771,7 +4778,7 @@ node <detached-job.js> wait <id> --until-done
 node <detached-job.js> status <id>
 \`\`\`
 
-\`<id>\` is kebab-case (\`mac-release\`, \`core-test\`, \`fly-deploy\`). State is \`.sideboard/detached-jobs/<id>/\` (local scratch).
+\`<id>\` is kebab-case (\`mac-release\`, \`core-test\`, \`fly-deploy\`). State is \`.context/.sideboard/detached-jobs/<id>/\` (local scratch).
 
 Wait JSON:
 
@@ -5162,11 +5169,11 @@ function formatWorktreeDirective(thread, opts) {
     );
   } else if (opts?.githubSlug) {
     lines.push(
-      `- Prefer a draft PR first: \`gh pr create --draft -R ${opts.githubSlug}\` (or update via \`gh pr edit -R ${opts.githubSlug}\`) once the change set is coherent. Always pass \`-R ${opts.githubSlug}\` (this worktree's origin). Bare \`gh pr create\` may target upstream instead of origin on dual-remote checkouts. Mark ready for review only when asked. Title/body must reflect the change purpose, not the worktree name.`
+      `- Prefer a draft PR first: \`gh pr create --draft -R ${opts.githubSlug}\` (or update via \`gh pr edit -R ${opts.githubSlug}\`) once the change set is coherent. Always pass \`-R ${opts.githubSlug}\` (this worktree's origin). Bare \`gh pr create\` may target upstream instead of origin on dual-remote checkouts. Mark ready for review only when asked. Title/body must reflect the change purpose, not the worktree name. If GitHub rejects the GraphQL body as too long, retry with a short \`--body-file\` (limit 65,536 characters) \u2014 do not paste a changelog or diff into \`--body\`.`
     );
   } else {
     lines.push(
-      "- Prefer a draft PR first: `gh pr create --draft -R <origin-owner/name>` (or update via `gh pr edit -R \u2026`) once the change set is coherent. Resolve `<origin-owner/name>` with `git remote get-url origin` in this worktree \u2014 never from `upstream`. Mark ready for review only when asked. Title/body must reflect the change purpose, not the worktree name."
+      "- Prefer a draft PR first: `gh pr create --draft -R <origin-owner/name>` (or update via `gh pr edit -R \u2026`) once the change set is coherent. Resolve `<origin-owner/name>` with `git remote get-url origin` in this worktree \u2014 never from `upstream`. Mark ready for review only when asked. Title/body must reflect the change purpose, not the worktree name. If GitHub rejects the GraphQL body as too long, retry with a short `--body-file` (limit 65,536 characters) \u2014 do not paste a changelog or diff into `--body`."
     );
   }
   lines.push("");
@@ -5222,7 +5229,7 @@ function formatLongRunningDirective(opts) {
     "- Immediately `present_artifact` `type=log` with `artifact_id=<id>` and `status=running` \u2014 the side column is the live view.",
     `- Loop \`${invoke} wait <id>\` (returns in ~45s). stillRunning \u2192 present the same id with \`content=delta\` only \u2192 wait again. Do not resend the full log or HTML.`,
     "- ok \u2192 finish the task. failed \u2192 read the log, fix, start once.",
-    "State: `.sideboard/detached-jobs/<id>/` (local scratch). Full guide: `/long-running` (always available)."
+    "State: `.context/.sideboard/detached-jobs/<id>/` (local scratch). Full guide: `/long-running` (always available)."
   ].join("\n");
 }
 function formatLongRunningReminder(opts) {
@@ -5611,7 +5618,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-6TXQWBXN.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-Y5MWUU7C.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -5715,6 +5722,7 @@ function armSchedules() {
 }
 
 // src/orchestrator/orchestrator.ts
+var LIVE_TURN_SPAWN_GRACE_MS = 15e3;
 function isPidAlive(pid) {
   if (!Number.isFinite(pid) || pid <= 0) return false;
   try {
@@ -5793,6 +5801,39 @@ var Orchestrator = class {
     if (typeof pid === "number" && pid > 0 && isPidAlive(pid)) return false;
     return true;
   }
+  /**
+   * Whether a child is actually turning — not leftover disk `running` after
+   * the process died. Coordinators were telling users “Agent is running.
+   * Waiting for gate to pass” from stale stillRunning.
+   */
+  threadLooksLive(thread) {
+    if (thread.status === "queued") {
+      if (this.draining.has(thread.id) || this.startingTurns.has(thread.id)) return true;
+      return thread.queue.length > 0;
+    }
+    if (thread.status !== "running") return false;
+    if (this.activeTurns.has(thread.id) || this.startingTurns.has(thread.id)) return true;
+    const pid = thread.agentPid;
+    if (typeof pid === "number" && pid > 0 && isPidAlive(pid)) return true;
+    const updated = Date.parse(thread.updatedAt ?? "");
+    if (Number.isFinite(updated) && Date.now() - updated < LIVE_TURN_SPAWN_GRACE_MS) return true;
+    return false;
+  }
+  /** Desktop-only: persist idle/stopped when MCP would otherwise keep reporting live. */
+  healStaleReportedActivity(thread) {
+    if (!thisProcessShouldDrainAgentQueues()) return thread;
+    if (this.threadLooksLive(thread)) return thread;
+    if (thread.status === "running") {
+      this.healStaleRunningTurns();
+      return readThread(thread.id) ?? thread;
+    }
+    if (thread.status === "queued" && thread.queue.length === 0 && !this.activeTurns.has(thread.id) && !this.startingTurns.has(thread.id) && !this.draining.has(thread.id)) {
+      setStatus(thread.id, "idle");
+      this.emit({ type: "status_changed", threadId: thread.id, status: "idle" });
+      return readThread(thread.id) ?? thread;
+    }
+    return thread;
+  }
   async reconcile(repoPath, opts) {
     const reclaimStaleTurns = opts?.reclaimStaleTurns === true;
     const drainQueues = opts?.drainQueues !== false;
@@ -5836,7 +5877,7 @@ var Orchestrator = class {
           orphans: orphans.map((o) => ({ path: o.path, repoPath: o.repoPath }))
         });
       }
-      const { autoCleanupOrphansEnabled } = await import("./app-settings-ZCN632OJ.js");
+      const { autoCleanupOrphansEnabled } = await import("./app-settings-J3JBCUOT.js");
       if (autoCleanupOrphansEnabled() && shouldRunWorktreeCleanup() && orphans.length > 0) {
         await cleanupOrphanWorktrees({ repoPaths });
       }
@@ -6076,7 +6117,7 @@ var Orchestrator = class {
     }
     await setup;
     if (skipSetup) return;
-    const { autoRunAfterSetupEnabled } = await import("./app-settings-ZCN632OJ.js");
+    const { autoRunAfterSetupEnabled } = await import("./app-settings-J3JBCUOT.js");
     if (autoRunAfterSetupEnabled()) {
       try {
         await this.startDev(threadId);
@@ -6127,12 +6168,14 @@ var Orchestrator = class {
     this.emit({ type: "status_changed", threadId: thread.id, status: thread.status });
     return thread;
   }
-  async send(threadRef, prompt) {
+  async send(threadRef, prompt, opts) {
     const thread = this.requireThread(threadRef);
     if (thread.status === "archived") {
       throw new Error(`Thread is archived: ${thread.id}`);
     }
-    return withThreadLock(thread.id, async () => {
+    const followUp = opts?.followUp === "steer" ? "steer" : "queue";
+    let shouldSteer = false;
+    const sent = await withThreadLock(thread.id, async () => {
       const current = this.requireThread(thread.id);
       if (current.status === "archived") {
         throw new Error(`Thread is archived: ${thread.id}`);
@@ -6141,6 +6184,7 @@ var Orchestrator = class {
       this.crashContinued.delete(thread.id);
       this.haltDrain.delete(thread.id);
       const inFlight = this.activeTurns.has(thread.id) || this.startingTurns.has(thread.id) || current.status === "running";
+      shouldSteer = followUp === "steer" && (inFlight || current.queue.length > 0);
       const patch = { queue };
       if (!inFlight) patch.status = "queued";
       const pid = current.agentPid;
@@ -6152,16 +6196,20 @@ var Orchestrator = class {
       if (!inFlight) {
         this.emit({ type: "status_changed", threadId: thread.id, status: "queued" });
       }
-      if (thisProcessShouldDrainAgentQueues()) {
+      if (thisProcessShouldDrainAgentQueues() && !shouldSteer) {
         void this.drainQueue(thread.id);
       }
       return this.requireThread(thread.id);
     });
+    if (shouldSteer && sent.queue.length > 0) {
+      return this.sendQueuedMessageNow(sent.id, sent.queue.length - 1);
+    }
+    return sent;
   }
-  async fanOut(threadRefs, prompt) {
+  async fanOut(threadRefs, prompt, opts) {
     const results = [];
     for (const ref of threadRefs) {
-      results.push(await this.send(ref, prompt));
+      results.push(await this.send(ref, prompt, opts));
     }
     return results;
   }
@@ -6377,7 +6425,7 @@ var Orchestrator = class {
     }
     const isBrightsy = fresh.agent === "brightsy";
     const isOrchestration = isOrchestratorThread(fresh);
-    const { autoRenameBranchEnabled, getGithubGitAuthMode } = await import("./app-settings-ZCN632OJ.js");
+    const { autoRenameBranchEnabled, getGithubGitAuthMode } = await import("./app-settings-J3JBCUOT.js");
     const gitAuthMode = getGithubGitAuthMode();
     const worktreeDirective = isBrightsy || isOrchestration ? null : formatWorktreeDirective(fresh, {
       githubSlug: await resolveGithubRepoSlug(fresh.worktreePath).catch(
@@ -6965,8 +7013,8 @@ var Orchestrator = class {
     return created;
   }
   async waitForTurn(threadRef, timeoutMs = 6e5, opts) {
-    const thread = this.requireThread(threadRef);
-    if (!["running", "queued"].includes(thread.status)) {
+    const thread = this.healStaleReportedActivity(this.requireThread(threadRef));
+    if (!this.threadLooksLive(thread)) {
       return thread;
     }
     const start = Date.now();
@@ -7003,12 +7051,13 @@ var Orchestrator = class {
         }
       });
       timer = setInterval(() => {
-        const current = readThread(thread.id);
-        if (!current) {
+        const raw = readThread(thread.id);
+        if (!raw) {
           finish(() => reject(new Error(`Thread not found: ${thread.id}`)));
           return;
         }
-        if (!["running", "queued"].includes(current.status)) {
+        const current = this.healStaleReportedActivity(raw);
+        if (!this.threadLooksLive(current)) {
           finish(() => resolve(current));
           return;
         }
@@ -7031,20 +7080,22 @@ var Orchestrator = class {
     };
   }
   getTurnResult(threadRef) {
-    const thread = this.requireThread(threadRef);
+    const thread = this.healStaleReportedActivity(this.requireThread(threadRef));
     const lastAgent = [...thread.messages].reverse().find((m) => m.role === "agent");
     const lastError = thread.lastError ?? null;
-    const text = (lastAgent?.text ?? "").trim() || (thread.status === "error" || thread.status === "stopped" || thread.status === "broken" ? lastError ?? "" : "");
-    const stillRunning = thread.status === "running" || thread.status === "queued";
+    const rawText = (lastAgent?.text ?? "").trim();
+    const text = (rawText && !isInternalAgentStatusText(rawText) ? rawText : "") || (thread.status === "error" || thread.status === "stopped" || thread.status === "broken" ? lastError ?? "" : "");
+    const stillRunning = this.threadLooksLive(thread);
     const live = stillRunning ? readTurnLive(thread.id) : null;
-    const queuedHint = thread.status === "queued" && !live?.summary ? "Queued \u2014 waiting for a concurrency slot" : null;
+    const liveSummary = live?.summary && !isInternalAgentStatusText(live.summary) ? live.summary : null;
+    const queuedHint = stillRunning && thread.status === "queued" && !liveSummary ? "Queued \u2014 waiting for a concurrency slot" : null;
     return {
       text,
       status: thread.status,
       sessionId: thread.sessionId,
       lastError,
       stillRunning,
-      progress: live?.summary ?? queuedHint,
+      progress: liveSummary ?? queuedHint,
       lastActivityAt: live?.updatedAt ?? null,
       usage: lastAgent?.usage ?? null
     };
@@ -7237,7 +7288,7 @@ var Orchestrator = class {
         updateThread(thread.id, { title: meta.title });
       }
     }
-    const { autoArchiveOnMergeEnabled } = await import("./app-settings-ZCN632OJ.js");
+    const { autoArchiveOnMergeEnabled } = await import("./app-settings-J3JBCUOT.js");
     const latest = this.requireThread(thread.id);
     if (!shouldAutoArchiveOnPrMerge({
       previousPrState: prevState || null,
@@ -7392,7 +7443,14 @@ var Orchestrator = class {
       );
     }
     if ((action === "commit-push" || action === "create-draft" || action === "create-web") && thread.worktreePath?.trim() && !await isDirty(thread.worktreePath)) {
-      await this.pushAndMaybeOpenPr(thread, action);
+      try {
+        await this.pushAndMaybeOpenPr(thread, action);
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        updateThread(thread.id, { lastError: message });
+        this.emit({ type: "error", threadId: thread.id, message });
+        throw err;
+      }
       return this.requireThread(threadRef);
     }
     let prBase;
@@ -7547,7 +7605,7 @@ var Orchestrator = class {
     this.emit({ type: "status_changed", threadId: archived.id, status: "archived" });
     if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
       try {
-        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-UUJNOO4T.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-VICQYI2N.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -7574,7 +7632,7 @@ var Orchestrator = class {
           await runArchiveScript(thread.repoPath, thread.worktreePath);
         } catch {
         }
-        const { deleteBranchOnPurgeEnabled } = await import("./app-settings-ZCN632OJ.js");
+        const { deleteBranchOnPurgeEnabled } = await import("./app-settings-J3JBCUOT.js");
         const deleteBranch = opts?.deleteBranch ?? deleteBranchOnPurgeEnabled();
         await removeWorktree(thread.repoPath, thread.worktreePath, {
           deleteBranch: deleteBranch ? thread.branchName : void 0
@@ -7601,12 +7659,14 @@ var Orchestrator = class {
           `Cowboy checkout missing: ${thread.worktreePath}. Re-add the project folder, then restore.`
         );
       }
-      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-UCWWTVLS.js");
+      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-HTUM35NT.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-N5X5I422.js");
+      await ensureWorktreeSideboardIgnored2(dest);
       void createThreadWorktree2;
       void slug;
     }
@@ -7709,7 +7769,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-UCWWTVLS.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-HTUM35NT.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return orch.createThread({
@@ -7761,6 +7821,7 @@ export {
   updateSchedule,
   deleteSchedule,
   fireSchedule,
+  LIVE_TURN_SPAWN_GRACE_MS,
   isPidAlive,
   waitForPidExit,
   Orchestrator,