@sideboard-ai/core 0.1.318 → 0.1.319

package/dist/mcp/run-stdio.cjs

@@ -22170,6 +22170,7 @@ var init_abletime_projects = __esm({
 var abletime_exports = {};
 __export(abletime_exports, {
   ableTimeDependencyTarget: () => ableTimeDependencyTarget,
+  ableTimeStateIsClosed: () => ableTimeStateIsClosed,
   commentAbleTimeTask: () => commentAbleTimeTask,
   createAbleTimeTask: () => createAbleTimeTask,
   downloadAbleTimeAttachment: () => downloadAbleTimeAttachment,
@@ -22323,9 +22324,12 @@ function issueAttachmentForAbleTimeTask(task) {
     ].filter(Boolean).join("\n")
   };
 }
+function ableTimeStateIsClosed(state) {
+  const value = (state ?? "").trim().toLowerCase();
+  return Boolean(value && CLOSED_STATES.has(value));
+}
 function isOpenTask(task) {
-  const state = (task.state ?? "").toLowerCase();
-  return !state || !CLOSED_STATES.has(state);
+  return !ableTimeStateIsClosed(task.state);
 }
 async function getAbleTimeOrientation(opts) {
   const raw = await callAbleTimeTool("orientation", {}, opts);
@@ -23301,6 +23305,9 @@ function writeTurnLive(threadId, progress) {
     }
   }
 }
+function readTurnLiveParts(threadId) {
+  return buffers.get(threadId)?.parts.slice() ?? [];
+}
 function readTurnLive(threadId) {
   const path = threadLivePath(threadId);
   if (!(0, import_node_fs55.existsSync)(path)) return null;
@@ -25585,6 +25592,41 @@ var init_expand = __esm({
   }
 });
 
+// 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 text7 = (message.text ?? "").trim();
+      if (text7 || (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;
+}
+var init_agent_has_replied = __esm({
+  "src/composer/agent-has-replied.ts"() {
+    "use strict";
+  }
+});
+
 // src/composer/consume-attachments.ts
 function consumeComposerAttachments(thread) {
   return {
@@ -25642,6 +25684,142 @@ var init_consume_attachments = __esm({
   }
 });
 
+// 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 };
+}
+var init_enqueue_thread_send = __esm({
+  "src/orchestrator/enqueue-thread-send.ts"() {
+    "use strict";
+    init_agent_git_actions();
+    init_agent_has_replied();
+    init_expand();
+    init_consume_attachments();
+    init_desktop_host();
+    init_thread_store();
+    init_turn_live();
+    init_app_settings();
+    init_global_workspace();
+  }
+});
+
 // src/skills/detached-job-path.ts
 function compiledModuleDir() {
   const cjsDir = typeof __dirname !== "undefined" ? __dirname : "";
@@ -27385,10 +27563,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();
@@ -27538,6 +27712,7 @@ var init_orchestrator = __esm({
     init_read_worktree_tail();
     init_discover();
     init_expand();
+    init_enqueue_thread_send();
     init_consume_attachments();
     init_stage_files();
     init_context_compact();
@@ -27555,6 +27730,7 @@ var init_orchestrator = __esm({
     init_caffeinate_hold();
     init_schedule_runner();
     init_coordinator_prompt();
+    init_enqueue_thread_send();
     LIVE_TURN_SPAWN_GRACE_MS = 15e3;
     RUN_SCRIPT_DESKTOP_ADOPT_MS = 2e4;
     STALE_AGENT_PID_WAIT_MS = 2500;
@@ -27566,6 +27742,13 @@ var init_orchestrator = __esm({
       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 })`. */
@@ -28176,54 +28359,29 @@ var init_orchestrator = __esm({
         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 = [];
@@ -28380,6 +28538,10 @@ var init_orchestrator = __esm({
         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);
@@ -28405,18 +28567,21 @@ var init_orchestrator = __esm({
             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({
@@ -28615,11 +28780,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
             },
@@ -28747,7 +28923,7 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
               retryThread,
               {
                 cachedPrefix: retryPrefix,
-                prompt: agentPrompt,
+                prompt: promptForAgent,
                 systemPrompt: turnReminders,
                 isolateCodexPlugins: isolateCodexPluginRetry || retryThread.isolateCodexPlugins === true
               },
@@ -28907,6 +29083,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);

package/dist/mcp/run-stdio.js

@@ -56,7 +56,7 @@ import {
   updateSchedule,
   workspaceTagTargetRef,
   writeAgentBlock
-} from "../chunk-BXTISNKW.js";
+} from "../chunk-OO3R6CS2.js";
 import "../chunk-LX5R5JOR.js";
 import {
   commentAbleTimeTask,
@@ -76,9 +76,9 @@ import {
   searchAbleTimeTasks,
   toAbleTimeIssueInfo,
   updateAbleTimeTask
-} from "../chunk-I5CLCWUK.js";
-import "../chunk-VZAJVX36.js";
-import "../chunk-7SCVGGF6.js";
+} from "../chunk-QPLQXWND.js";
+import "../chunk-JD7CC6SW.js";
+import "../chunk-ZM43NTJJ.js";
 import {
   normalizeServiceOrigin
 } from "../chunk-MBYGWNLQ.js";

package/dist/{orchestrator-N54V3B76.js → orchestrator-H3DSZ5RM.js}

@@ -11,7 +11,7 @@ import {
   resolveSendFollowUp,
   startOrchestration,
   waitForPidExit
-} from "./chunk-BXTISNKW.js";
+} from "./chunk-OO3R6CS2.js";
 import "./chunk-LX5R5JOR.js";
 import "./chunk-MBYGWNLQ.js";
 import "./chunk-4GK32AYX.js";

package/dist/{orchestrator-2SXK4U65.js → orchestrator-NCA4LSCC.js}

@@ -9,7 +9,7 @@ import {
   resolveSendFollowUp,
   startOrchestration,
   waitForPidExit
-} from "./chunk-23ZUL2EX.js";
+} from "./chunk-U2N32EA6.js";
 import "./chunk-PGPSIEMW.js";
 import "./chunk-IAPO7ZFG.js";
 import "./chunk-HH3VVTEC.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sideboard-ai/core",
-  "version": "0.1.318",
+  "version": "0.1.319",
   "description": "Sideboard core — orchestration, agents, git worktrees, MCP server",
   "license": "Apache-2.0",
   "type": "module",