@sideboard-ai/core 0.1.318 → 0.1.320

package/dist/{chunk-BXTISNKW.js → chunk-B7UL36WH.js}

@@ -6,7 +6,7 @@ import {
 import {
   formatOptionalServicesDirectiveForTurn,
   formatOptionalServicesReminderForTurn
-} from "./chunk-MBYGWNLQ.js";
+} from "./chunk-OAFBHCSM.js";
 import {
   extractPresentedPlan,
   isPresentPlanToolName,
@@ -27,7 +27,7 @@ import {
   parseSessionQuotaResetAt,
   planModeTurnInstruction,
   resolveQuotaFallbackAgent
-} from "./chunk-GH7UMULC.js";
+} from "./chunk-ZYZBCLJR.js";
 import {
   applyWorktreePkgCacheEnv,
   askBlockStillWaiting,
@@ -65,7 +65,7 @@ import {
   worktreeDevProcessKey,
   worktreeRunProcessKey,
   worktreeSetupProcessKey
-} from "./chunk-NRSC4N5X.js";
+} from "./chunk-P74GXA5V.js";
 import {
   applyAgentEvent,
   clipAgentEventForPaint,
@@ -92,7 +92,7 @@ import {
   summarizeTurnStderr,
   toolDescription,
   turnFailChatText
-} from "./chunk-I5TESHDN.js";
+} from "./chunk-EQ52JR3Q.js";
 import {
   SLACK_REPLY_FORMATTING,
   addWorkspace,
@@ -117,7 +117,7 @@ import {
   stageAbsolutePathsAsAttachments,
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads
-} from "./chunk-A6C67DY5.js";
+} from "./chunk-5S3YP5KH.js";
 import {
   addPrStackLayer,
   allocateTeamSlug,
@@ -159,7 +159,7 @@ import {
   resolveRepoRoot,
   switchWorktreeBranch,
   withRepoGitLock
-} from "./chunk-A46CIARU.js";
+} from "./chunk-PNLGWAYE.js";
 import {
   clearStaleIndexLocks,
   enrichPathWithNpmGlobalBin,
@@ -201,7 +201,7 @@ import {
   usageOnLimit,
   withTurnScopedCost,
   writeViewerContext
-} from "./chunk-GCHSJCCX.js";
+} from "./chunk-IFU4W4C4.js";
 import {
   writePrivateFile
 } from "./chunk-NSTQ6QKD.js";
@@ -242,7 +242,10 @@ import {
   worktreeNameFromPath,
   worktreeSlugForTicket,
   writeThread
-} from "./chunk-HOLB6ZFZ.js";
+} from "./chunk-XMHMVEIY.js";
+import {
+  normalizeThinkingEffort
+} from "./chunk-KGZBYWZ3.js";
 import {
   annotateDevAccessRuns,
   appDataDir,
@@ -507,9 +510,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-BUWMRNW5.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-5A4H34AF.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-3CT3D5UM.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-M75TAN43.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -1955,6 +1958,71 @@ function claimSteerRequest(threadId) {
   });
 }
 
+// src/orchestrator/ephemeral-automation.ts
+function ephemeralRunReadyToArchive(thread) {
+  if (!thread.ephemeralAutomationId?.trim()) return false;
+  if (thread.status !== "idle" && thread.status !== "error") return false;
+  if (thread.queue.length > 0) return false;
+  if (thread.agentBlock?.reason?.trim()) return false;
+  if (thread.quotaResumeAt) return false;
+  return true;
+}
+function markEphemeralAutomation(threadId, opts) {
+  const id = opts.ephemeralAutomationId?.trim();
+  const current = readThread(threadId);
+  if (!current) throw new Error(`Thread not found: ${threadId}`);
+  if (!id) return current;
+  const title = opts.ephemeralTitle?.trim();
+  return updateThread(threadId, {
+    ephemeralAutomationId: id,
+    ...title ? { title, userSetTitle: true } : {}
+  });
+}
+async function archiveEphemeralAutomationIfReady(threadId, archive) {
+  const keep = await withThreadLock(threadId, async () => {
+    const thread = readThread(threadId);
+    if (!thread || !ephemeralRunReadyToArchive(thread)) return null;
+    const automationId = thread.ephemeralAutomationId?.trim();
+    if (!automationId) return null;
+    await archive(thread.id);
+    return {
+      automationId,
+      keepId: archivedContinuationId(automationId, threadId) ?? threadId
+    };
+  });
+  if (keep) forgetOlderEphemeralRuns(keep.automationId, keep.keepId);
+}
+function archivedContinuationId(automationId, sourceId) {
+  for (const thread of listThreads({ includeArchived: true })) {
+    if (thread.id === sourceId || thread.status !== "archived") continue;
+    if (thread.ephemeralAutomationId !== automationId) continue;
+    if (thread.quotaContinuedFromId !== sourceId) continue;
+    return thread.id;
+  }
+  return null;
+}
+function clearEphemeralAutomation(threadId) {
+  const thread = readThread(threadId);
+  if (!thread?.ephemeralAutomationId?.trim()) return;
+  updateThread(threadId, { ephemeralAutomationId: void 0 });
+}
+function forgetOlderEphemeralRuns(automationId, keepId) {
+  const id = automationId.trim();
+  if (!id || !keepId) return [];
+  const removed = [];
+  for (const thread of listThreads({ includeArchived: true })) {
+    if (thread.id === keepId) continue;
+    if (thread.status !== "archived") continue;
+    if (thread.ephemeralAutomationId !== id) continue;
+    try {
+      deleteThreadRecord(thread.id);
+      removed.push(thread.id);
+    } catch {
+    }
+  }
+  return removed;
+}
+
 // src/threads/agent-purpose-title.ts
 function agentPurposeStamp(input) {
   if (input.autoContinue) return null;
@@ -2632,7 +2700,7 @@ async function createThread(input, _onSetupLine) {
   });
   await requireAgent(resolved.agent);
   if (input.cowboy) {
-    const { cowboyModeEnabled } = await import("./app-settings-CZVFMOI5.js");
+    const { cowboyModeEnabled } = await import("./app-settings-KMPVI2B7.js");
     if (!cowboyModeEnabled()) {
       throw new Error(
         "Cowboy mode is off. Enable it in Settings \u2192 Advanced."
@@ -2691,7 +2759,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-TKAFNXCM.js");
+      const { ensureAbleTimeTask, issueAttachmentForAbleTimeTask } = await import("./abletime-CRRLEYTE.js");
       const task = await ensureAbleTimeTask({
         title: title?.trim() || "Untitled work",
         description: input.prompt?.trim() || void 0
@@ -3210,6 +3278,9 @@ function writeTurnLive(threadId, progress) {
     }
   }
 }
+function readTurnLiveParts(threadId) {
+  return buffers.get(threadId)?.parts.slice() ?? [];
+}
 function readTurnLive(threadId) {
   const path = threadLivePath(threadId);
   if (!existsSync6(path)) return null;
@@ -3447,17 +3518,23 @@ async function isolateQuotaFailover(run) {
   }
 }
 function createQuotaFailoverChat(from, fallbackAgent, limitText, opts) {
+  const ephemeralAutomationId = from.ephemeralAutomationId?.trim();
+  const ephemeralTitle = ephemeralAutomationId ? from.title.trim() : "";
   const handoff = buildQuotaHandoffAttachment(from, limitText, fallbackAgent);
   const tab = createChatTab({
     fromThreadId: from.id,
     agent: fallbackAgent,
     model: null,
     attachments: [handoff],
+    ...ephemeralTitle ? { title: ephemeralTitle } : {},
     ...opts && "accountId" in opts ? { accountId: opts.accountId } : {}
   });
   const patch = {
     quotaContinuedFromId: from.id,
-    sourceRef: from.sourceRef
+    sourceRef: from.sourceRef,
+    // The original drain archives as idle. This sibling has to carry the one-off
+    // so it archives when the continued turn finishes and History keeps it.
+    ...ephemeralAutomationId ? { ephemeralAutomationId } : {}
   };
   if (isOrchestratorThread(from)) {
     patch.parentThreadId = from.id;
@@ -3564,7 +3641,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { addWorkspace: addWorkspace2 } = await import("./workspaces-2V5UYPYC.js");
+  const { addWorkspace: addWorkspace2 } = await import("./workspaces-5QA3YM4L.js");
   await addWorkspace2(repoPath);
   const { ensureWorktreeSideboardIgnored } = await import("./worktree-exclude-5N2KTYIT.js");
   await ensureWorktreeSideboardIgnored(input.worktreePath);
@@ -5384,6 +5461,36 @@ function expandComposerPrompt(worktreePath, prompt, opts) {
   };
 }
 
+// src/composer/agent-has-replied.ts
+function joinSteerPrompt(base, addition) {
+  const next = addition.trim();
+  if (!next) return base;
+  const head = base.replace(/\s+$/, "");
+  if (!head) return next;
+  return `${head}
+${next}`;
+}
+function trailingUnansweredUserText(messages) {
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const message = messages[i];
+    if (!message || message.origin === "continue" || message.role === "summary") continue;
+    if (message.role === "agent") {
+      const text3 = (message.text ?? "").trim();
+      if (text3 || (message.parts?.length ?? 0) > 0) return null;
+      continue;
+    }
+    if (message.role === "user") return message.text;
+  }
+  return null;
+}
+function livePartsShowAgentReply(parts) {
+  for (const part of parts) {
+    if (part.type === "tool") return true;
+    if ((part.type === "text" || part.type === "thinking") && part.text.trim()) return true;
+  }
+  return false;
+}
+
 // src/composer/consume-attachments.ts
 function consumeComposerAttachments(thread) {
   return {
@@ -5436,6 +5543,128 @@ function shiftQueuedItem(queue, queueAttachments) {
   };
 }
 
+// src/orchestrator/enqueue-thread-send.ts
+function resolveSendFollowUp(thread, requested) {
+  if (requested === "steer" || requested === "queue") return requested;
+  return isOrchestratorThread(thread) ? followUpBehavior() : "queue";
+}
+function rewriteTrailingUserPrompt(threadId, from, to) {
+  if (from === to) return;
+  const thread = readThread(threadId);
+  if (!thread) return;
+  const messages = thread.messages.slice();
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const message = messages[i];
+    if (!message || message.origin === "continue" || message.role === "summary") continue;
+    if (message.role === "user" && message.text === from) {
+      messages[i] = { ...message, text: to };
+      updateThread(threadId, { messages });
+    }
+    return;
+  }
+}
+function reuseJoinedUserBubble(reused, threadId, last, promptText) {
+  return reused.delete(threadId) && last?.role === "user" && last.origin !== "continue" && last.text === promptText;
+}
+function promptForJoinedSteer(input) {
+  if (input.latestPrompt === input.promptText) return input.agentPrompt;
+  rewriteTrailingUserPrompt(input.threadId, input.promptText, input.latestPrompt);
+  const { agentPrompt: expandedLatest } = expandComposerPrompt(
+    input.worktreePath,
+    expandCanonicalGitRequest(input.latestPrompt),
+    { attachments: input.attachments }
+  );
+  return input.expandedPrompt && input.agentPrompt.endsWith(input.expandedPrompt) ? input.agentPrompt.slice(0, -input.expandedPrompt.length) + expandedLatest : `${input.agentPrompt}
+
+${expandedLatest}`;
+}
+function clearSendBookkeeping(host, threadId) {
+  host.crashContinued.delete(threadId);
+  host.jobContinueCount.delete(threadId);
+  host.jobContinueNudged.delete(threadId);
+  host.haltDrain.delete(threadId);
+}
+async function enqueueThreadSend(host, threadRef, prompt, opts) {
+  const thread = host.requireThread(threadRef);
+  if (thread.status === "archived") {
+    throw new Error(`Thread is archived: ${thread.id}`);
+  }
+  let shouldSteer = false;
+  const sent = await withThreadLock(thread.id, async () => {
+    const current = host.requireThread(thread.id);
+    if (current.status === "archived") {
+      throw new Error(`Thread is archived: ${thread.id}`);
+    }
+    const followUp = resolveSendFollowUp(current, opts?.followUp);
+    const explicit = opts?.attachments;
+    const consumed = explicit !== void 0 ? { attachments: current.attachments, consumed: explicit } : consumeComposerAttachments(current);
+    const inFlightEarly = host.activeTurns.has(thread.id) || host.startingTurns.has(thread.id) || current.status === "running";
+    const agentHasRepliedEarly = livePartsShowAgentReply(readTurnLiveParts(current.id));
+    const draft = host.openSteerPrompt.get(current.id);
+    const queuedHead = !inFlightEarly && current.status === "queued" && current.queue.length > 0 ? current.queue[0] : null;
+    const unanswered = followUp === "steer" && !agentHasRepliedEarly ? draft?.text ?? (inFlightEarly ? trailingUnansweredUserText(current.messages) : queuedHead) : null;
+    if (unanswered != null && (draft ? !draft.spawned : queuedHead != null)) {
+      clearSendBookkeeping(host, thread.id);
+      const combined = joinSteerPrompt(unanswered, prompt);
+      if (draft && !draft.spawned) {
+        draft.text = combined;
+        rewriteTrailingUserPrompt(current.id, unanswered, combined);
+      } else {
+        const queue = current.queue.slice();
+        queue[0] = combined;
+        const queueAttachments = alignQueueAttachments(queue.length, current.queueAttachments);
+        if (consumed.consumed.length > 0) {
+          queueAttachments[0] = [...queueAttachments[0] ?? [], ...consumed.consumed];
+        }
+        const patch2 = { queue, queueAttachments };
+        if (explicit === void 0 && consumed.consumed.length > 0) {
+          patch2.attachments = consumed.attachments;
+        }
+        updateThread(current.id, patch2);
+        host.emit({ type: "queue_changed", threadId: current.id, queue });
+      }
+      if (thisProcessShouldDrainAgentQueues() && !inFlightEarly) {
+        host.armDrain(current.id);
+      }
+      return host.requireThread(current.id);
+    }
+    const promptToQueue = unanswered != null ? joinSteerPrompt(unanswered, prompt) : prompt;
+    if (unanswered != null) {
+      if (draft) draft.text = promptToQueue;
+      rewriteTrailingUserPrompt(current.id, unanswered, promptToQueue);
+      host.reusedUserPrompt.add(current.id);
+    }
+    const queued = appendQueuedItem(
+      current.queue,
+      current.queueAttachments,
+      promptToQueue,
+      consumed.consumed
+    );
+    clearSendBookkeeping(host, thread.id);
+    const inFlight = host.activeTurns.has(thread.id) || host.startingTurns.has(thread.id) || current.status === "running";
+    shouldSteer = followUp === "steer" && (inFlight || current.queue.length > 0);
+    const patch = queued;
+    if (explicit === void 0 && consumed.consumed.length > 0) {
+      patch.attachments = consumed.attachments;
+    }
+    if (!inFlight) patch.status = "queued";
+    const pid = current.agentPid;
+    if (typeof pid === "number" && pid > 0 && !host.pidAlive(pid)) {
+      patch.agentPid = null;
+    }
+    updateThread(thread.id, patch);
+    host.emit({ type: "queue_changed", threadId: thread.id, queue: queued.queue });
+    if (!inFlight) {
+      host.emit({ type: "status_changed", threadId: thread.id, status: "queued" });
+    }
+    if (thisProcessShouldDrainAgentQueues() && !shouldSteer) {
+      host.armDrain(thread.id);
+    }
+    return host.requireThread(thread.id);
+  });
+  return { thread: sent, shouldSteer };
+}
+
 // src/agents/instructions.ts
 import { existsSync as existsSync12 } from "fs";
 import { join as join12 } from "path";
@@ -5594,7 +5823,7 @@ function formatWorktreeDirective(thread, opts) {
   lines.push(formatDevAccessHint(opts?.activeRuns));
   lines.push("");
   lines.push(
-    "Schedules: `create_schedule` / `list_schedules` (`at` / `every` / `cron`). `chatId=self` continues this chat; omit chatId for a new Global chat. Fires only while Sideboard.app is running. A future job turns on Settings \u2192 Advanced \u2192 Caffeinate while schedules are enabled."
+    "Automations (sidebar, after Board): `create_schedule` / `list_schedules` (`at` / `every` / `cron`). `chatId=self` continues this chat; omit chatId for a new Global chat. Fires only while Sideboard.app is running. A future job turns on Settings \u2192 Advanced \u2192 Caffeinate while automations are enabled."
   );
   lines.push(
     "`set_workspace_tags` labels this checkout (omit ref; replace, add, or remove). Not another checkout."
@@ -5614,7 +5843,7 @@ function connectedOrchestratorTurnReminder(thread, find) {
   return formatConnectedOrchestratorReminder(connectedOrchestrator(thread, find));
 }
 function formatWorktreeReminder() {
-  return "Sideboard workspace: stay in this cwd for all file and git work. Push and open PRs against origin, never upstream. Do not edit the main repo checkout. If a goal is given (Greptile 5/5, CI green), watch-fix-push until it lands \u2014 do not watch after every push. Schedules: create_schedule (at / every / cron; chatId=self for this chat). set_workspace_tags updates labels on this workspace (omit ref).";
+  return "Sideboard workspace: stay in this cwd for all file and git work. Push and open PRs against origin, never upstream. Do not edit the main repo checkout. If a goal is given (Greptile 5/5, CI green), watch-fix-push until it lands \u2014 do not watch after every push. Automations: create_schedule (at / every / cron; chatId=self for this chat). set_workspace_tags updates labels on this workspace (omit ref).";
 }
 function formatClaudeSubagentReminder() {
   return 'Claude subagents: if Task/Agent workers will edit files, write a short plan in this chat and continue in the same turn. Do not ask the user whether to isolate, and do not set worktree.bgIsolation to none. One writer may edit this workspace. Every other writer is an Agent with isolation "worktree" and a disjoint file list (read-only explore agents may overlap). While those agents run, leave their files alone. Merge each returned branch into this workspace, then remove the temporary worktree. You stay in this cwd. If Claude says another write-capable agent is in this directory, or that writes to the shared checkout are blocked, re-spawn that agent with isolation "worktree" or make the edit yourself. That note is another worker in this chat, or a worker Claude still has marked running. Do not mention it to the user.';
@@ -6232,7 +6461,7 @@ function parseDurationMs(every) {
 }
 function defaultScheduleName(prompt) {
   const line = prompt.trim().split(/\r?\n/, 1)[0]?.trim() ?? "";
-  if (!line) return "Untitled schedule";
+  if (!line) return "Untitled automation";
   return line.length > 60 ? `${line.slice(0, 57).trimEnd()}\u2026` : line;
 }
 function resolveScheduleThreadId(raw, env = process.env) {
@@ -6297,6 +6526,45 @@ function normalizeWhen(raw) {
   }
   throw new Error("Schedule `when` must be once, every, or cron");
 }
+var ATTACHMENT_KINDS = /* @__PURE__ */ new Set([
+  "transcript",
+  "file",
+  "issue",
+  "workspace",
+  "diff-comment",
+  "code-ref"
+]);
+function normalizeOptionalBool(raw) {
+  if (raw === true || raw === false) return raw;
+  return null;
+}
+function normalizeAutonomy(raw) {
+  return raw === "default" || raw === "full" ? raw : null;
+}
+function normalizeAttachments(raw) {
+  if (!Array.isArray(raw)) return [];
+  const out = [];
+  for (const item of raw) {
+    if (!item || typeof item !== "object") continue;
+    const row = item;
+    if (typeof row.id !== "string" || !row.id.trim()) continue;
+    if (typeof row.name !== "string" || !row.name) continue;
+    if (typeof row.content !== "string") continue;
+    if (!ATTACHMENT_KINDS.has(row.kind)) continue;
+    const next = {
+      id: row.id,
+      name: row.name,
+      kind: row.kind,
+      content: row.content
+    };
+    if (typeof row.path === "string" && row.path) next.path = row.path;
+    if (typeof row.previewDataUrl === "string" && row.previewDataUrl) {
+      next.previewDataUrl = row.previewDataUrl;
+    }
+    out.push(next);
+  }
+  return out;
+}
 function normalizeTask(raw) {
   const when = normalizeWhen(raw.when);
   const agent = raw.agent && isOrchestratorCapableAgent(raw.agent) ? raw.agent : null;
@@ -6309,6 +6577,11 @@ function normalizeTask(raw) {
     threadId: raw.threadId?.trim() || null,
     agent,
     model: raw.model?.trim() || null,
+    effort: normalizeThinkingEffort(raw.effort),
+    fast: normalizeOptionalBool(raw.fast),
+    planMode: normalizeOptionalBool(raw.planMode),
+    autonomy: normalizeAutonomy(raw.autonomy),
+    attachments: normalizeAttachments(raw.attachments),
     nextRunAt: raw.nextRunAt,
     lastRunAt: raw.lastRunAt ?? null,
     lastThreadId: raw.lastThreadId ?? null,
@@ -6355,6 +6628,11 @@ function buildTask(input, now) {
     threadId: input.threadId?.trim() || null,
     agent,
     model: input.model?.trim() || null,
+    effort: input.effort != null ? normalizeThinkingEffort(input.effort) : null,
+    fast: normalizeOptionalBool(input.fast),
+    planMode: normalizeOptionalBool(input.planMode),
+    autonomy: normalizeAutonomy(input.autonomy),
+    attachments: normalizeAttachments(input.attachments),
     nextRunAt,
     lastRunAt: null,
     lastThreadId: null,
@@ -6396,7 +6674,7 @@ function createSchedule(input) {
 function updateSchedule(id, patch) {
   const rows = readAll();
   const idx = rows.findIndex((row) => row.id === id || id.length >= 8 && row.id.startsWith(id));
-  if (idx < 0) throw new Error(`Schedule not found: ${id}`);
+  if (idx < 0) throw new Error(`Automation not found: ${id}`);
   const prev = rows[idx];
   const when = patch.when ? normalizeWhen(patch.when) : prev.when;
   const prompt = patch.prompt !== void 0 ? patch.prompt.trim() : prev.prompt;
@@ -6411,6 +6689,11 @@ function updateSchedule(id, patch) {
     threadId: patch.threadId !== void 0 ? patch.threadId?.trim() || null : prev.threadId,
     agent: patch.agent !== void 0 ? patch.agent ? coerceOrchestratorAgent(patch.agent) : null : prev.agent,
     model: patch.model !== void 0 ? patch.model?.trim() || null : prev.model,
+    effort: patch.effort !== void 0 ? normalizeThinkingEffort(patch.effort) : prev.effort,
+    fast: patch.fast !== void 0 ? normalizeOptionalBool(patch.fast) : prev.fast,
+    planMode: patch.planMode !== void 0 ? normalizeOptionalBool(patch.planMode) : prev.planMode,
+    autonomy: patch.autonomy !== void 0 ? normalizeAutonomy(patch.autonomy) : prev.autonomy,
+    attachments: patch.attachments !== void 0 ? normalizeAttachments(patch.attachments) : prev.attachments,
     nextRunAt: whenChanged ? computeNextRunAt(when).toISOString() : prev.nextRunAt,
     lastError: whenChanged ? null : prev.lastError,
     updatedAt: nowIso()
@@ -6425,13 +6708,13 @@ function deleteSchedule(id) {
   const next = rows.filter(
     (row) => row.id !== id && !(id.length >= 8 && row.id.startsWith(id))
   );
-  if (next.length === rows.length) throw new Error(`Schedule not found: ${id}`);
+  if (next.length === rows.length) throw new Error(`Automation not found: ${id}`);
   writeAll(next);
 }
 function recordScheduleRun(id, result) {
   const rows = readAll();
   const idx = rows.findIndex((row) => row.id === id);
-  if (idx < 0) throw new Error(`Schedule not found: ${id}`);
+  if (idx < 0) throw new Error(`Automation not found: ${id}`);
   const prev = rows[idx];
   const firedAt = result.firedAt ?? /* @__PURE__ */ new Date();
   const next = {
@@ -6458,21 +6741,56 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-N54V3B76.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-7BDZ5GWD.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
-    send: (id, prompt) => orch.send(id, prompt),
+    send: async (id, prompt, opts) => {
+      if (opts?.options && Object.keys(opts.options).length > 0) {
+        try {
+          orch.setThreadOptions(id, opts.options);
+        } catch {
+          const rest = scheduleOptionsAfterRefusedAgentSwitch(opts.options);
+          if (Object.keys(rest).length > 0) {
+            try {
+              orch.setThreadOptions(id, rest);
+            } catch {
+            }
+          }
+        }
+      }
+      const thread = findThreadByRef(id);
+      const attachments = thread ? persistPendingFileAttachments(thread.worktreePath, opts?.attachments ?? []) : opts?.attachments ?? [];
+      return orch.send(id, prompt, { attachments });
+    },
     startOrchestration: (opts) => startOrchestration2(opts)
   };
 }
+function scheduleOptionsAfterRefusedAgentSwitch(options) {
+  const { agent: _agent, model: _model, ...rest } = options;
+  return rest;
+}
+function scheduleSendOptions(schedule) {
+  const patch = {};
+  if (schedule.agent) {
+    patch.agent = schedule.agent;
+    patch.model = schedule.model;
+  } else if (schedule.model) {
+    patch.model = schedule.model;
+  }
+  if (schedule.effort) patch.effort = schedule.effort;
+  if (schedule.fast != null) patch.fast = schedule.fast;
+  if (schedule.planMode != null) patch.planMode = schedule.planMode;
+  if (schedule.autonomy) patch.autonomy = schedule.autonomy;
+  return Object.keys(patch).length > 0 ? patch : void 0;
+}
 function pickAgent(schedule) {
   if (schedule.agent) return schedule.agent;
   return coerceOrchestratorAgent(resolveOrchestratorDefaults().agent);
 }
 async function fireSchedule(id) {
   const schedule = getSchedule(id);
-  if (!schedule) throw new Error(`Schedule not found: ${id}`);
+  if (!schedule) throw new Error(`Automation not found: ${id}`);
   if (firing.has(schedule.id)) return schedule;
   firing.add(schedule.id);
   try {
@@ -6480,18 +6798,28 @@ async function fireSchedule(id) {
     const prompt = formatScheduledPrompt(schedule.name, schedule.prompt);
     const target = schedule.threadId ? deps.findThread(schedule.threadId) : null;
     if (target && target.status !== "archived") {
-      const sent = await deps.send(target.id, prompt);
+      const sent = await deps.send(target.id, prompt, {
+        attachments: schedule.attachments,
+        options: scheduleSendOptions(schedule)
+      });
       return recordScheduleRun(schedule.id, {
         lastThreadId: sent.id,
         lastError: null
       });
     }
+    const pinReplacement = Boolean(schedule.threadId) && schedule.when.kind !== "once";
     const created = await deps.startOrchestration({
       goal: prompt,
       agent: pickAgent(schedule),
-      model: schedule.model
+      model: schedule.model,
+      ...schedule.effort ? { effort: schedule.effort } : {},
+      ...schedule.fast != null ? { fast: schedule.fast } : {},
+      ...schedule.planMode != null ? { planMode: schedule.planMode } : {},
+      ...schedule.autonomy ? { autonomy: schedule.autonomy } : {},
+      attachments: schedule.attachments,
+      ...pinReplacement ? {} : { ephemeralAutomationId: schedule.id, ephemeralTitle: schedule.name }
     });
-    if (schedule.threadId && schedule.when.kind !== "once") {
+    if (pinReplacement) {
       updateSchedule(schedule.id, { threadId: created.id });
     }
     return recordScheduleRun(schedule.id, {
@@ -6574,10 +6902,6 @@ async function waitForPidExit(pid, timeoutMs) {
   }
   return true;
 }
-function resolveSendFollowUp(thread, requested) {
-  if (requested === "steer" || requested === "queue") return requested;
-  return isOrchestratorThread(thread) ? followUpBehavior() : "queue";
-}
 function resolveOrchChildFollowUp(requested) {
   if (requested === "steer" || requested === "queue") return requested;
   return followUpBehavior();
@@ -6606,6 +6930,13 @@ var Orchestrator = class {
   draining = /* @__PURE__ */ new Set();
   /** Threads past setStatus(running) but not yet in activeTurns (spawn in flight). */
   startingTurns = /* @__PURE__ */ new Set();
+  /**
+   * Prompt for the turn that has not been answered yet. Steer follow-ups before
+   * any agent output are joined onto this text instead of starting a second bubble.
+   */
+  openSteerPrompt = /* @__PURE__ */ new Map();
+  /** Next runTurn should keep the user bubble already rewritten to this prompt. */
+  reusedUserPrompt = /* @__PURE__ */ new Set();
   /** Last sync thread-file read for false-stop heal (throttled per thread). */
   lastReconcileHealAt = /* @__PURE__ */ new Map();
   /** Per-repo timestamp of the last `reconcile(repo, { light: true })`. */
@@ -6776,7 +7107,7 @@ var Orchestrator = class {
           orphans: orphans.map((o) => ({ path: o.path, repoPath: o.repoPath }))
         });
       }
-      const { autoCleanupOrphansEnabled } = await import("./app-settings-CZVFMOI5.js");
+      const { autoCleanupOrphansEnabled } = await import("./app-settings-KMPVI2B7.js");
       if (autoCleanupOrphansEnabled() && shouldRunWorktreeCleanup() && orphans.length > 0) {
         await cleanupOrphanWorktrees({ repoPaths });
       }
@@ -7170,7 +7501,7 @@ var Orchestrator = class {
     }
     await setup;
     if (skipSetup) return;
-    const { autoRunAfterSetupEnabled } = await import("./app-settings-CZVFMOI5.js");
+    const { autoRunAfterSetupEnabled } = await import("./app-settings-KMPVI2B7.js");
     if (autoRunAfterSetupEnabled()) {
       try {
         await this.startDev(threadId);
@@ -7216,54 +7547,29 @@ var Orchestrator = class {
     return thread;
   }
   async send(threadRef, prompt, opts) {
-    const thread = this.requireThread(threadRef);
-    if (thread.status === "archived") {
-      throw new Error(`Thread is archived: ${thread.id}`);
-    }
-    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}`);
-      }
-      const followUp = resolveSendFollowUp(current, opts?.followUp);
-      const explicit = opts?.attachments;
-      const consumed = explicit !== void 0 ? { attachments: current.attachments, consumed: explicit } : consumeComposerAttachments(current);
-      const queued = appendQueuedItem(
-        current.queue,
-        current.queueAttachments,
-        prompt,
-        consumed.consumed
-      );
-      this.crashContinued.delete(thread.id);
-      this.jobContinueCount.delete(thread.id);
-      this.jobContinueNudged.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 = queued;
-      if (explicit === void 0 && consumed.consumed.length > 0) {
-        patch.attachments = consumed.attachments;
-      }
-      if (!inFlight) patch.status = "queued";
-      const pid = current.agentPid;
-      if (typeof pid === "number" && pid > 0 && !isPidAlive(pid)) {
-        patch.agentPid = null;
-      }
-      updateThread(thread.id, patch);
-      this.emit({ type: "queue_changed", threadId: thread.id, queue: queued.queue });
-      if (!inFlight) {
-        this.emit({ type: "status_changed", threadId: thread.id, status: "queued" });
-      }
-      if (thisProcessShouldDrainAgentQueues() && !shouldSteer) {
-        this.armDrain(thread.id);
-      }
-      return this.requireThread(thread.id);
-    });
-    if (shouldSteer && sent.queue.length > 0) {
-      return this.sendQueuedMessageNow(sent.id, sent.queue.length - 1);
+    const sent = await enqueueThreadSend(
+      {
+        activeTurns: this.activeTurns,
+        startingTurns: this.startingTurns,
+        openSteerPrompt: this.openSteerPrompt,
+        reusedUserPrompt: this.reusedUserPrompt,
+        crashContinued: this.crashContinued,
+        jobContinueCount: this.jobContinueCount,
+        jobContinueNudged: this.jobContinueNudged,
+        haltDrain: this.haltDrain,
+        emit: (event) => this.emit(event),
+        armDrain: (id) => this.armDrain(id),
+        requireThread: (ref) => this.requireThread(ref),
+        pidAlive: (pid) => isPidAlive(pid)
+      },
+      threadRef,
+      prompt,
+      opts
+    );
+    if (sent.shouldSteer && sent.thread.queue.length > 0) {
+      return this.sendQueuedMessageNow(sent.thread.id, sent.thread.queue.length - 1);
     }
-    return sent;
+    return sent.thread;
   }
   async fanOut(threadRefs, prompt, opts) {
     const results = [];
@@ -7404,6 +7710,7 @@ var Orchestrator = class {
     } finally {
       this.draining.delete(threadId);
     }
+    await archiveEphemeralAutomationIfReady(threadId, (id) => this.archive(id));
   }
   async runTurn(threadId, prompt) {
     const existing = readThread(threadId);
@@ -7420,6 +7727,10 @@ var Orchestrator = class {
     this.emit({ type: "status_changed", threadId, status: "running" });
     this.emit({ type: "turn_started", threadId, prompt });
     try {
+      this.openSteerPrompt.set(threadId, {
+        text: typeof prompt === "string" ? prompt : "",
+        spawned: false
+      });
       try {
         const baseline = await captureTurnBaseline(thread.worktreePath);
         if (baseline) this.turnBaselines.set(threadId, baseline);
@@ -7445,18 +7756,21 @@ var Orchestrator = class {
         this.emit({ type: "error", threadId, message: `context compact failed: ${message}` });
         thread = this.requireThread(threadId);
       }
-      const promptText = typeof prompt === "string" ? prompt : "";
+      const promptText = this.openSteerPrompt.get(threadId)?.text ?? (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;
       if (!autoContinue) clearAgentBlock(threadId);
-      appendMessage(threadId, {
-        role: "user",
-        text: promptText,
-        ...sentAttachments ? { attachments: sentAttachments } : {},
-        ...autoContinue ? { origin: "continue" } : {},
-        ts: (/* @__PURE__ */ new Date()).toISOString()
-      });
+      const lastShown = this.requireThread(threadId).messages.at(-1);
+      if (!reuseJoinedUserBubble(this.reusedUserPrompt, threadId, lastShown, promptText)) {
+        appendMessage(threadId, {
+          role: "user",
+          text: promptText,
+          ...sentAttachments ? { attachments: sentAttachments } : {},
+          ...autoContinue ? { origin: "continue" } : {},
+          ts: (/* @__PURE__ */ new Date()).toISOString()
+        });
+      }
       if (!autoContinue) {
         const live = this.requireThread(threadId);
         const stamp = agentPurposeStamp({
@@ -7564,7 +7878,7 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
       }
       const isBrightsy = fresh.agent === "brightsy";
       const isOrchestration = isOrchestratorThread(fresh);
-      const { autoRenameBranchEnabled, getGithubGitAuthMode, gitBranchPrefixSetting } = await import("./app-settings-CZVFMOI5.js");
+      const { autoRenameBranchEnabled, getGithubGitAuthMode, gitBranchPrefixSetting } = await import("./app-settings-KMPVI2B7.js");
       const gitAuthMode = getGithubGitAuthMode();
       const worktreeDirective = isBrightsy || isOrchestration ? null : formatWorktreeDirective(fresh, {
         githubSlug: await withTimeout(
@@ -7655,11 +7969,22 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
       ].filter(Boolean).join("\n\n---\n\n");
       const stderrTail = [];
       traceTurn("runTurn.beforeSpawn", { threadId, agent: fresh.agent });
+      const steerDraft = this.openSteerPrompt.get(threadId);
+      if (steerDraft) steerDraft.spawned = true;
+      const promptForAgent = promptForJoinedSteer({
+        threadId,
+        promptText,
+        latestPrompt: steerDraft?.text ?? promptText,
+        agentPrompt,
+        expandedPrompt,
+        worktreePath: fresh.worktreePath,
+        attachments: autoContinue ? [] : sentAttachments ?? []
+      });
       const handle = await spawnAgentTurn(
         fresh,
         {
           cachedPrefix,
-          prompt: agentPrompt,
+          prompt: promptForAgent,
           systemPrompt: turnReminders,
           isolateCodexPlugins: fresh.isolateCodexPlugins === true
         },
@@ -7787,7 +8112,7 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
           retryThread,
           {
             cachedPrefix: retryPrefix,
-            prompt: agentPrompt,
+            prompt: promptForAgent,
             systemPrompt: turnReminders,
             isolateCodexPlugins: isolateCodexPluginRetry || retryThread.isolateCodexPlugins === true
           },
@@ -7947,6 +8272,7 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
     } finally {
       this.startingTurns.delete(threadId);
       this.activeTurns.delete(threadId);
+      this.openSteerPrompt.delete(threadId);
       this.processes.delete(`${threadId}:agent`);
       this.stoppedTurns.delete(threadId);
       this.runningCount = Math.max(0, this.runningCount - 1);
@@ -8880,7 +9206,7 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
       if (Object.keys(patch).length === 0) continue;
       updateThread(t.id, patch);
     }
-    const { autoArchiveOnMergeEnabled } = await import("./app-settings-CZVFMOI5.js");
+    const { autoArchiveOnMergeEnabled } = await import("./app-settings-KMPVI2B7.js");
     const latest = this.requireThread(thread.id);
     if (!shouldAutoArchiveOnPrMerge({
       previousPrState: prevState || null,
@@ -9204,7 +9530,7 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
           await runArchiveScript(thread.repoPath, thread.worktreePath);
         } catch {
         }
-        const { deleteBranchOnPurgeEnabled } = await import("./app-settings-CZVFMOI5.js");
+        const { deleteBranchOnPurgeEnabled } = await import("./app-settings-KMPVI2B7.js");
         const deleteBranch = opts?.deleteBranch ?? deleteBranchOnPurgeEnabled();
         await removeWorktree(thread.repoPath, thread.worktreePath, {
           deleteBranch: deleteBranch ? thread.branchName : void 0
@@ -9218,6 +9544,7 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
     if (thread.status !== "archived") {
       throw new Error("Thread is not archived");
     }
+    clearEphemeralAutomation(thread.id);
     if (isGlobalThread(thread)) {
       const { globalAgentCwd } = await import("./paths-HAAJNTTE.js");
       updateThread(thread.id, { worktreePath: globalAgentCwd() });
@@ -9317,10 +9644,11 @@ async function startOrchestration(opts) {
       planMode: opts.planMode,
       attachments: opts.attachments
     });
+    const ready2 = markEphemeralAutomation(thread2.id, opts);
     if (goal) {
-      return orch.send(thread2.id, goal);
+      return orch.send(ready2.id, goal);
     }
-    return thread2;
+    return ready2;
   }
   const { titleFromPrompt: titleFromPrompt2 } = await import("./title-ERD6D3C3.js");
   const title = titleFromPrompt2(goal) || "Orchestration";
@@ -9340,7 +9668,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-XJKLDYOL.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-O6BANO2I.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return orch.createThread({
@@ -9350,15 +9678,16 @@ async function startOrchestration(opts) {
       repoPath: repo
     });
   });
-  const { updateThread: upd } = await import("./thread-store-PLNIWFZ4.js");
+  const { updateThread: upd } = await import("./thread-store-JWHVXLDX.js");
   const updated = upd(thread.id, {
     sourceType: "orchestration",
     sourceRef: goal
   });
+  const ready = markEphemeralAutomation(updated.id, opts);
   if (goal) {
-    return orch.send(updated.id, goal);
+    return orch.send(ready.id, goal);
   }
-  return updated;
+  return ready;
 }
 
 export {
@@ -9396,6 +9725,7 @@ export {
   listFleetArchive,
   formatFleetArchive,
   readTurnLive,
+  resolveSendFollowUp,
   localhostPreviewUrl,
   parseIssueSince,
   formatGitHubSearchUpdatedSince,
@@ -9419,7 +9749,6 @@ export {
   RUN_SCRIPT_DESKTOP_ADOPT_MS,
   isPidAlive,
   waitForPidExit,
-  resolveSendFollowUp,
   resolveOrchChildFollowUp,
   LIGHT_RECONCILE_THROTTLE_MS,
   Orchestrator,