replicas-engine 0.1.985 → 0.1.987

package/dist/src/{asp-host-WFNJQSDE.js → asp-host-LOTCGOVD.js}

@@ -5,12 +5,12 @@ import {
   getCodexAspHost,
   restartCodexAspHost,
   restartCodexAspHostIfRunning
-} from "./chunk-C3CEF7DO.js";
-import "./chunk-VNL2VYM4.js";
-import "./chunk-DAVKTMQK.js";
-import "./chunk-QVK2OVNX.js";
+} from "./chunk-D5B72SUV.js";
+import "./chunk-TYH3IEXZ.js";
+import "./chunk-KAJYMTYA.js";
+import "./chunk-2PMHC6IL.js";
 import "./chunk-UZSNFLDQ.js";
-import "./chunk-LKTX2CHU.js";
+import "./chunk-QU4FXL4X.js";
 import "./chunk-VEQXQN22.js";
 export {
   getCodexAspHost,

package/dist/src/{chunk-QVK2OVNX.js → chunk-2PMHC6IL.js}

@@ -3,7 +3,7 @@ import { createRequire as __createRequire } from 'node:module';
 const require = __createRequire(import.meta.url);
 import {
   HOOK_EXEC_MAX_BUFFER_BYTES
-} from "./chunk-LKTX2CHU.js";
+} from "./chunk-QU4FXL4X.js";
 
 // src/utils/exec.ts
 import { exec, execFile } from "child_process";

package/dist/src/{chunk-MWCBGGWF.js → chunk-5EHMJ4OT.js}

@@ -5,7 +5,7 @@ import {
   extractCommandProtectionCommandText,
   isRecord,
   parseCodeHostPrUrl
-} from "./chunk-LKTX2CHU.js";
+} from "./chunk-QU4FXL4X.js";
 
 // src/services/published-pull-request-urls.ts
 function publishedPullRequestUrls(result) {

package/dist/src/{chunk-C3CEF7DO.js → chunk-D5B72SUV.js}

@@ -5,15 +5,15 @@ import {
   ENGINE_ENV,
   monolithRequest,
   setAgentCredentialSnapshot
-} from "./chunk-VNL2VYM4.js";
+} from "./chunk-TYH3IEXZ.js";
 import {
   AppServerProcess,
   buildCodexAgentEnv
-} from "./chunk-DAVKTMQK.js";
+} from "./chunk-KAJYMTYA.js";
 import {
   SUBPROCESS_MAX_BUFFER,
   execFileAsync
-} from "./chunk-QVK2OVNX.js";
+} from "./chunk-2PMHC6IL.js";
 import {
   isRecord
 } from "./chunk-UZSNFLDQ.js";
@@ -27,7 +27,7 @@ import {
   listOpenAICompatibleModels,
   readOllamaAuthEnv,
   resolveOpenAICompatibleModelsUrl
-} from "./chunk-LKTX2CHU.js";
+} from "./chunk-QU4FXL4X.js";
 
 // src/managers/codex-token-manager.ts
 import { promises as fs } from "fs";
@@ -260,7 +260,7 @@ var CodexTokenManager = class extends BaseRefreshManager {
     await this.applyCredentialUpdate(++this.credentialGeneration, async () => {
       await this.applyCredentialsResponse(data);
       setAgentCredentialSnapshot("codex", data);
-      const { restartCodexAspHostIfRunning: restartCodexAspHostIfRunning2 } = await import("./asp-host-WFNJQSDE.js");
+      const { restartCodexAspHostIfRunning: restartCodexAspHostIfRunning2 } = await import("./asp-host-LOTCGOVD.js");
       await restartCodexAspHostIfRunning2();
     });
     await this.start(true);
@@ -280,7 +280,7 @@ var CodexTokenManager = class extends BaseRefreshManager {
     await this.applyCredentialUpdate(generation, async () => {
       await this.applyCredentialsResponse(data);
       if (restartOnChange && CODEX_AUTH_ENV_KEYS.some((key, index) => process.env[key] !== previousEnv[index])) {
-        const { restartCodexAspHostIfRunning: restartCodexAspHostIfRunning2 } = await import("./asp-host-WFNJQSDE.js");
+        const { restartCodexAspHostIfRunning: restartCodexAspHostIfRunning2 } = await import("./asp-host-LOTCGOVD.js");
         await restartCodexAspHostIfRunning2();
       }
       setAgentCredentialSnapshot("codex", data);

package/dist/src/{chunk-6ZHOSG2F.js → chunk-G6QBYUZR.js}

@@ -3,18 +3,18 @@ import { createRequire as __createRequire } from 'node:module';
 const require = __createRequire(import.meta.url);
 import {
   monolithRequest
-} from "./chunk-VNL2VYM4.js";
+} from "./chunk-TYH3IEXZ.js";
 import {
   SUBPROCESS_MAX_BUFFER,
   execFileAsync
-} from "./chunk-QVK2OVNX.js";
+} from "./chunk-2PMHC6IL.js";
 import {
   extractCommandProtectionCommandText,
   findCommandProtectionGitLookups,
   findGitCommitSignals,
   findPrMergeSignals,
   parseCommandProtectionRequest
-} from "./chunk-LKTX2CHU.js";
+} from "./chunk-QU4FXL4X.js";
 
 // src/services/command-protection-service.ts
 import { readFile, stat } from "fs/promises";

package/dist/src/{chunk-DAVKTMQK.js → chunk-KAJYMTYA.js}

@@ -3,10 +3,10 @@ import { createRequire as __createRequire } from 'node:module';
 const require = __createRequire(import.meta.url);
 import {
   execFileAsync
-} from "./chunk-QVK2OVNX.js";
+} from "./chunk-2PMHC6IL.js";
 import {
   isVersionBelow
-} from "./chunk-LKTX2CHU.js";
+} from "./chunk-QU4FXL4X.js";
 
 // src/utils/codex-agent-env.ts
 function buildCodexAgentEnv(source = process.env) {
@@ -240,7 +240,7 @@ function getCodexModelProvider(method) {
   if (method === "foundry") return "azure";
   return method === "ollama" || method === "openai-compatible" ? "replicas_openai_compatible" : "openai";
 }
-var ENGINE_PACKAGE_VERSION = "0.1.985";
+var ENGINE_PACKAGE_VERSION = "0.1.987";
 var INITIALIZE_METHOD = "initialize";
 var INITIALIZED_NOTIFICATION = "initialized";
 var ACCOUNT_LOGIN_START_METHOD = "account/login/start";

package/dist/src/{chunk-LKTX2CHU.js → chunk-QU4FXL4X.js}

@@ -1083,7 +1083,6 @@ function getEventStreamId(event) {
   return null;
 }
 var CODEX_QUOTA_STATUS_EVENT_TYPE = "codex-quota-status";
-var COMPACTION_STATUS_EVENT_TYPE = "compaction-status";
 var CHAT_INTERRUPTED_EVENT_TYPE = "replicas-interrupted";
 var CHAT_GOAL_EVENT_TYPE = "chat-goal";
 var AUTH_RETRY_STATUS_EVENT_TYPE = "auth-retry-status";
@@ -1195,7 +1194,8 @@ var subagentResponseSchema = z3.object({
   chatId: z3.string().uuid(),
   status: z3.enum(["working", "completed"]),
   response: z3.string().optional(),
-  timedOut: z3.literal(true).optional()
+  timedOut: z3.literal(true).optional(),
+  interruptedByUserMessage: z3.literal(true).optional()
 });
 var integrationErrorNotificationTargetSchema = z3.discriminatedUnion("type", [
   z3.object({
@@ -1322,6 +1322,7 @@ var CODEX_ITEM_FIELD_CHECKS = {
 function isCodexAspTranscriptItem(value) {
   if (!isRecord(value) || typeof value.id !== "string" || typeof value.timestamp !== "string") return false;
   if (value.sequence !== void 0 && typeof value.sequence !== "number") return false;
+  if (value.completedAt !== void 0 && typeof value.completedAt !== "string") return false;
   if (typeof value.type !== "string" || !Object.hasOwn(CODEX_ITEM_FIELD_CHECKS, value.type)) return false;
   return CODEX_ITEM_FIELD_CHECKS[value.type](value);
 }
@@ -2046,6 +2047,7 @@ function normalizeBackgroundTaskStatus(status) {
 
 // ../shared/src/display-message/constants.ts
 var USER_MESSAGE_MATCH_GRACE_PERIOD_MS = 3e4;
+var COMPACTION_CONTENT = "Context compacted";
 
 // ../shared/src/shell-commands.ts
 var SHELL_OPAQUE = "\0";
@@ -2554,6 +2556,15 @@ function skillNamesFromCommand(command) {
   })));
 }
 
+// ../shared/src/user-message-matching.ts
+function parseTimestampMs(timestamp) {
+  const value = typeof timestamp === "number" ? timestamp : Date.parse(timestamp);
+  return Number.isFinite(value) ? value : 0;
+}
+function areUserMessagesWithinMatchWindow(a, b) {
+  return a.content === b.content && Math.abs(parseTimestampMs(a.timestamp) - parseTimestampMs(b.timestamp)) <= USER_MESSAGE_MATCH_GRACE_PERIOD_MS;
+}
+
 // ../shared/src/urls.ts
 var DASHBOARD_PATH = "/dashboard";
 var WEB_APP_PATHS = {
@@ -4911,15 +4922,6 @@ function stripAttachmentNote(text2) {
   };
 }
 
-// ../shared/src/user-message-matching.ts
-function parseTimestampMs(timestamp) {
-  const value = typeof timestamp === "number" ? timestamp : Date.parse(timestamp);
-  return Number.isFinite(value) ? value : 0;
-}
-function areUserMessagesWithinMatchWindow(a, b) {
-  return a.content === b.content && Math.abs(parseTimestampMs(a.timestamp) - parseTimestampMs(b.timestamp)) <= USER_MESSAGE_MATCH_GRACE_PERIOD_MS;
-}
-
 // ../shared/src/display-message/parsers/codex-asp-parser.ts
 function collectCodexTurns(events) {
   const turns = /* @__PURE__ */ new Map();
@@ -5092,9 +5094,10 @@ function messageForItem(item) {
     return {
       id: `reasoning-${item.id}`,
       type: "reasoning",
-      content: "Context compacted",
+      content: COMPACTION_CONTENT,
       status: normalizeCodexAspTranscriptStatus(item.status),
-      timestamp: item.timestamp
+      timestamp: item.timestamp,
+      completedAt: item.completedAt
     };
   }
   return {
@@ -5919,6 +5922,15 @@ function parseMuseEvents(events) {
         status: terminal ? "completed" : "in_progress",
         timestamp: typeof item.recordedAt === "string" ? item.recordedAt : event.timestamp
       });
+    } else if (item.kind === "compaction") {
+      upsertDisplayMessage(messages, {
+        id: `muse-compaction-${item.itemId}`,
+        type: "reasoning",
+        content: COMPACTION_CONTENT,
+        status: item.status === "failed" ? "failed" : terminal ? "completed" : "in_progress",
+        timestamp: typeof item.recordedAt === "string" ? item.recordedAt : event.timestamp,
+        completedAt: terminal ? event.timestamp : void 0
+      });
     } else if (item.kind === "toolCall") {
       let input = item.args;
       if (typeof item.args === "string") {
@@ -6252,6 +6264,7 @@ function parseClaudeEvents(events, parentToolUseId) {
   const completedStreamIds = /* @__PURE__ */ new Set();
   const supersededStreamIds = /* @__PURE__ */ new Set();
   let liveStreamId = null;
+  let compaction;
   const assistantThinking = /* @__PURE__ */ new Map();
   const assistantTextCounts = /* @__PURE__ */ new Map();
   const acceptedUserMessageIndexes = /* @__PURE__ */ new Set();
@@ -6544,6 +6557,11 @@ function parseClaudeEvents(events, parentToolUseId) {
         }
       });
     }
+    if (compaction && (event.type === "claude-result" || event.type === CHAT_INTERRUPTED_EVENT_TYPE)) {
+      compaction.status = "failed";
+      compaction.completedAt = event.timestamp;
+      compaction = void 0;
+    }
     if (event.type === "claude-result") {
       const payload = coerceClaudeResultPayload(event.payload);
       if (isClaudeResultError(payload)) {
@@ -6557,6 +6575,19 @@ function parseClaudeEvents(events, parentToolUseId) {
       }
     }
     if (event.type === "claude-system") {
+      const { subtype, status, compact_result: compactResult } = event.payload;
+      const compactionEnded = subtype === "compact_boundary" || compactResult === "failed";
+      if (compactionEnded || subtype === "status" && status === "compacting") {
+        if (!compaction) {
+          compaction = { id: `compaction-${event.timestamp}`, type: "reasoning", content: COMPACTION_CONTENT, timestamp: event.timestamp };
+          messages.push(compaction);
+        }
+        compaction.status = !compactionEnded ? "in_progress" : compactResult === "failed" ? "failed" : "completed";
+        if (compactionEnded) {
+          compaction.completedAt = event.timestamp;
+          compaction = void 0;
+        }
+      }
       const payload = coerceBackgroundTaskPayload(event.payload);
       if (payload?.ambient) ambientTaskIds.add(payload.taskId);
       if (payload && !ambientTaskIds.has(payload.taskId)) {
@@ -9093,7 +9124,6 @@ export {
   CODEX_HISTORY_FORMAT_EVENT_TYPE,
   getEventStreamId,
   CODEX_QUOTA_STATUS_EVENT_TYPE,
-  COMPACTION_STATUS_EVENT_TYPE,
   CHAT_INTERRUPTED_EVENT_TYPE,
   CHAT_GOAL_EVENT_TYPE,
   AUTH_RETRY_STATUS_EVENT_TYPE,
@@ -9131,6 +9161,7 @@ export {
   paginateChatHistory,
   coerceBackgroundTaskPayload,
   fileContentDiff,
+  areUserMessagesWithinMatchWindow,
   isGitHubUrl,
   parseCodeHostPrUrl,
   decodePathSegments,
@@ -9138,7 +9169,6 @@ export {
   createUuidFromHex,
   HISTORY_ROOT,
   HISTORY_INDEX_FILENAME,
-  areUserMessagesWithinMatchWindow,
   extractErrorText,
   isTransientErrorText,
   extractToolResultText,

package/dist/src/{chunk-VNL2VYM4.js → chunk-TYH3IEXZ.js}

@@ -14,7 +14,7 @@ import {
   isValidAgentProvider,
   parsePosixEnvFile,
   readReplicasRuntimeEnv
-} from "./chunk-LKTX2CHU.js";
+} from "./chunk-QU4FXL4X.js";
 
 // src/runtime-env-loader.ts
 import { readFileSync } from "fs";

package/dist/src/command-protection-hook.js

@@ -3,13 +3,13 @@ import { createRequire as __createRequire } from 'node:module';
 const require = __createRequire(import.meta.url);
 import {
   evaluateCommandProtection
-} from "./chunk-6ZHOSG2F.js";
-import "./chunk-VNL2VYM4.js";
-import "./chunk-QVK2OVNX.js";
+} from "./chunk-G6QBYUZR.js";
+import "./chunk-TYH3IEXZ.js";
+import "./chunk-2PMHC6IL.js";
 import {
   isRecord
 } from "./chunk-UZSNFLDQ.js";
-import "./chunk-LKTX2CHU.js";
+import "./chunk-QU4FXL4X.js";
 import "./chunk-VEQXQN22.js";
 
 // src/command-protection-hook.ts

package/dist/src/headless-agent.js

@@ -7,12 +7,12 @@ import {
 import {
   AppServerProcess,
   buildCodexAgentEnv
-} from "./chunk-DAVKTMQK.js";
-import "./chunk-QVK2OVNX.js";
+} from "./chunk-KAJYMTYA.js";
+import "./chunk-2PMHC6IL.js";
 import {
   AGENT,
   headlessAgentRequestSchema
-} from "./chunk-LKTX2CHU.js";
+} from "./chunk-QU4FXL4X.js";
 import "./chunk-VEQXQN22.js";
 
 // src/headless-agent.ts

package/dist/src/index.js

@@ -32,7 +32,7 @@ import {
   reportCommandProtectionBlock,
   resolveDiffBase,
   runGitCommand
-} from "./chunk-6ZHOSG2F.js";
+} from "./chunk-G6QBYUZR.js";
 import {
   ACCOUNT_RATE_LIMITS_UPDATED_METHOD,
   AGENT_MESSAGE_DELTA_METHOD,
@@ -57,7 +57,7 @@ import {
 } from "./chunk-P73LGPQO.js";
 import {
   publishedPullRequestUrls
-} from "./chunk-MWCBGGWF.js";
+} from "./chunk-5EHMJ4OT.js";
 import {
   BaseRefreshManager,
   CodexAspAuthMethodChangedError,
@@ -72,7 +72,7 @@ import {
   refreshDelayMs,
   restartCodexAspHost,
   routineRefreshExclusions
-} from "./chunk-C3CEF7DO.js";
+} from "./chunk-D5B72SUV.js";
 import {
   ENGINE_ENV,
   monolithRequest,
@@ -80,16 +80,16 @@ import {
   readRuntimeEnvFile,
   reloadEngineEnv,
   setAgentCredentialSnapshot
-} from "./chunk-VNL2VYM4.js";
+} from "./chunk-TYH3IEXZ.js";
 import {
   AspClient,
   getCodexModelProvider
-} from "./chunk-DAVKTMQK.js";
+} from "./chunk-KAJYMTYA.js";
 import {
   SUBPROCESS_MAX_BUFFER,
   execAsync,
   execFileAsync
-} from "./chunk-QVK2OVNX.js";
+} from "./chunk-2PMHC6IL.js";
 import {
   isRecord as isRecord2
 } from "./chunk-UZSNFLDQ.js";
@@ -119,7 +119,6 @@ import {
   CODEX_HISTORY_FORMAT_EVENT_TYPE,
   CODEX_ITEM_EVENT_TYPE,
   CODEX_QUOTA_STATUS_EVENT_TYPE,
-  COMPACTION_STATUS_EVENT_TYPE,
   CONTEXT_USAGE_EVENT_TYPE,
   CREDENTIAL_METHOD,
   CURSOR_CONNECTION_STATUS_EVENT_TYPE,
@@ -316,7 +315,7 @@ import {
   workspaceCredentialProviderSchema,
   workspaceTokenRequestSchema,
   workspaceTokenResponseSchema
-} from "./chunk-LKTX2CHU.js";
+} from "./chunk-QU4FXL4X.js";
 import {
   cloneMcpConfig,
   ensureCompatibilityImports,
@@ -10167,6 +10166,7 @@ var EnvironmentDetailsService = class {
     details.engineVersion = ENGINE_ENV.REPLICAS_SANDBOX_IMAGE_VERSION;
     details.supportsMidTurnSteering = true;
     details.supportsClaudeMidTurnSteering = true;
+    details.supportsSendNow = true;
     details.supportsClaudeGoals = true;
     details.supportsGoalUpdates = true;
     details.supportsQueuedMessageEditing = true;
@@ -11770,6 +11770,7 @@ var MessageQueueService = class {
   // version below.
   acceptanceWithdrawals = /* @__PURE__ */ new WeakSet();
   queueCancellationVersion = 0;
+  activeTurn = null;
   constructor(processMessage, onProcessingChanged = () => {
   }, onMessageStarted = async () => {
   }) {
@@ -11864,6 +11865,8 @@ var MessageQueueService = class {
     return tail.merge === true && tail.type === request.type;
   }
   async startProcessing(queuedMessage) {
+    const turn = new AbortController();
+    this.activeTurn = turn;
     this.processing = true;
     this.onProcessingChanged(true);
     try {
@@ -11875,11 +11878,14 @@ var MessageQueueService = class {
         this.acceptanceByMessage.delete(queuedMessage);
         break;
       }
-      await this.onMessageStarted(queuedMessage);
-      await this.processMessage(queuedMessage);
+      if (!turn.signal.aborted) {
+        await this.onMessageStarted(queuedMessage);
+        await this.processMessage(queuedMessage, turn.signal);
+      }
     } catch (error) {
       console.error("[MessageQueue] Error processing message:", error);
     } finally {
+      this.activeTurn = null;
       this.processing = false;
       if (this.queue.length === 0) {
         this.onProcessingChanged(false);
@@ -11899,22 +11905,15 @@ var MessageQueueService = class {
   isProcessing() {
     return this.processing;
   }
-  drainQueue(options) {
-    const maxItems = options?.maxItems ?? this.queue.length;
-    const maxChars = options?.maxChars ?? Number.POSITIVE_INFINITY;
-    const drained = [];
-    let totalChars = 0;
-    for (const message of this.queue) {
-      if (drained.length >= maxItems) break;
-      const text = message.message;
-      if (totalChars + text.length > maxChars) break;
-      drained.push(text);
-      totalChars += text.length;
-    }
+  drainQueue() {
+    const drained = this.queue;
     this.queueCancellationVersion++;
     this.queue = [];
     return drained;
   }
+  cancelActiveTurn() {
+    this.activeTurn?.abort();
+  }
   /**
    * Get all queued messages (does not include the currently processing message)
    */
@@ -11974,6 +11973,16 @@ Native subagent tools are disabled in this workspace. To delegate work to a suba
 // src/managers/coding-agent-manager.ts
 var MAX_INTERRUPT_QUEUE_ITEMS = 1e3;
 var MAX_INTERRUPT_QUEUE_CHARS = 2e5;
+function toQueuedMessageInfo(message) {
+  return {
+    id: message.id,
+    message: message.message,
+    queuedAt: message.queuedAt,
+    ...message.senderUserId ? { senderUserId: message.senderUserId } : {},
+    ...message.senderEmail ? { senderEmail: message.senderEmail } : {},
+    ...message.senderDisplayName ? { senderDisplayName: message.senderDisplayName } : {}
+  };
+}
 var subagentMcpConfigRequest = null;
 var CodingAgentManager = class {
   workingDirectory;
@@ -11992,7 +12001,7 @@ var CodingAgentManager = class {
   authFallback;
   subagentMcpChatId;
   subagentMcpEnabledForTurn = false;
-  compacting = false;
+  unreadSteers = /* @__PURE__ */ new Map();
   constructor(options) {
     this.workingDirectory = options.workingDirectory ?? ENGINE_ENV.WORKSPACE_ROOT;
     this.initialSessionId = options.initialSessionId;
@@ -12022,22 +12031,9 @@ var CodingAgentManager = class {
     return result;
   }
   onTurnComplete = async () => {
-    if (this.compacting) {
-      this.setCompacting(false);
-    }
+    this.requeueUnreadSteers();
     await this.hostOnTurnComplete();
   };
-  isCompacting() {
-    return this.compacting;
-  }
-  // Dedup so a noisy stream of native compaction events doesn't spam the UI with redundant status flips.
-  setCompacting(active) {
-    if (this.compacting === active) return;
-    this.compacting = active;
-    this.emitSyntheticEvent(COMPACTION_STATUS_EVENT_TYPE, {
-      state: active ? "in_progress" : "completed"
-    });
-  }
   emitSyntheticEvent(type, payload) {
     this.onEvent({
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
@@ -12080,9 +12076,10 @@ var CodingAgentManager = class {
   }
   initializeManager(processMessage) {
     this.messageQueue = new MessageQueueService(
-      async (request) => {
+      async (request, signal) => {
         await this.refreshSubagentMcp();
-        await processMessage(request);
+        if (signal.aborted) return;
+        await processMessage(request, signal);
       },
       this.onProcessingChanged,
       this.onMessageStarted
@@ -12110,46 +12107,55 @@ var CodingAgentManager = class {
     if (!history?.appendDurably) throw new Error("Chat history is unavailable");
     await history.appendDurably(event);
   }
-  async interrupt() {
-    const queuedMessages = this.messageQueue.getQueue();
-    const queue = this.messageQueue.drainQueue({
-      maxItems: MAX_INTERRUPT_QUEUE_ITEMS,
-      maxChars: MAX_INTERRUPT_QUEUE_CHARS
-    });
+  async interrupt(persistRemoval) {
+    const queuedMessages = this.messageQueue.drainQueue();
+    const unreadSteers = [...this.unreadSteers.values()];
+    this.unreadSteers.clear();
+    this.messageQueue.cancelActiveTurn();
     const isProcessing = this.isProcessing();
     if (isProcessing) {
       try {
         await this.interruptActiveTurn();
       } catch (error) {
-        this.restoreQueuedMessages(queuedMessages.slice(0, queue.length).map((message) => ({ message, index: 0 })));
+        for (const steer of unreadSteers) this.unreadSteers.set(steer.message.id, steer);
+        this.restoreQueuedMessages(queuedMessages.map((message, index) => ({ message, index })));
         throw error;
       }
-      const event = {
-        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-        type: CHAT_INTERRUPTED_EVENT_TYPE,
-        payload: {}
-      };
-      this.onEvent(event);
-      this.getHistorySink()?.append(event);
+    }
+    const removed = [...unreadSteers.map(({ message }) => message), ...queuedMessages];
+    if (removed.length > 0) await persistRemoval(removed.map(({ id }) => id));
+    if (isProcessing) this.recordInterrupted();
+    const queue = [];
+    let queueChars = 0;
+    for (const { message } of removed) {
+      if (queue.length >= MAX_INTERRUPT_QUEUE_ITEMS || queueChars + message.length > MAX_INTERRUPT_QUEUE_CHARS) break;
+      queue.push(message);
+      queueChars += message.length;
     }
     this.emitInterruptedQueueEvent(queue);
     return {
-      interrupted: isProcessing || queue.length > 0,
-      queue
+      interrupted: isProcessing || removed.length > 0,
+      queue,
+      removedMessageIds: removed.map(({ id }) => id)
     };
   }
+  recordInterrupted() {
+    const event = {
+      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+      type: CHAT_INTERRUPTED_EVENT_TYPE,
+      payload: {}
+    };
+    this.onEvent(event);
+    this.getHistorySink()?.append(event);
+  }
   isProcessing() {
     return this.messageQueue.isProcessing();
   }
   getQueue() {
-    return this.messageQueue.getQueue().map((m) => ({
-      id: m.id,
-      message: m.message,
-      queuedAt: m.queuedAt,
-      ...m.senderUserId ? { senderUserId: m.senderUserId } : {},
-      ...m.senderEmail ? { senderEmail: m.senderEmail } : {},
-      ...m.senderDisplayName ? { senderDisplayName: m.senderDisplayName } : {}
-    }));
+    return [
+      ...[...this.unreadSteers.values()].map(({ message, steeredAt }) => ({ ...toQueuedMessageInfo(message), steeredAt })),
+      ...this.messageQueue.getQueue().map(toQueuedMessageInfo)
+    ];
   }
   async removeFromQueue(messageId, persistRemoval) {
     return this.removeQueuedMessages([messageId], persistRemoval);
@@ -12195,33 +12201,54 @@ var CodingAgentManager = class {
     if (!taken) {
       return { success: false, queue: this.getQueue() };
     }
-    const keepQueued = this.keepSteeredMessageQueued();
-    if (keepQueued) {
-      this.messageQueue.restoreToQueue(taken.message, 0);
-    }
     let steered = false;
     try {
       steered = await this.steerRequest(taken.message);
     } catch (error) {
       console.error("[CodingAgentManager] steerRequest threw, keeping message queued:", error);
     }
-    if (!steered) {
-      if (keepQueued) {
-        const prioritized = this.messageQueue.takeFromQueue(messageId);
-        if (prioritized) this.restoreQueuedMessages([{ message: prioritized.message, index: taken.index }]);
-      } else {
-        this.restoreQueuedMessages([taken]);
+    if (steered) this.unreadSteers.set(messageId, { message: taken.message, steeredAt: (/* @__PURE__ */ new Date()).toISOString() });
+    else this.restoreQueuedMessages([{ message: taken.message, index: 0 }]);
+    return { success: steered, queue: this.getQueue() };
+  }
+  async sendNow(messageId) {
+    await this.initialized;
+    const queued = this.messageQueue.getQueue().some(({ id }) => id === messageId);
+    if (!queued && !this.unreadSteers.has(messageId)) return { success: false, queue: this.getQueue() };
+    const turnRunning = this.messageQueue.isProcessing();
+    if (turnRunning && this.canDeliverSteersNow()) {
+      if (queued) await this.steerFromQueue(messageId);
+      if (this.unreadSteers.has(messageId)) {
+        await this.deliverSteersNow();
+        return { success: true, queue: this.getQueue() };
       }
     }
-    return {
-      success: steered,
-      queue: this.getQueue(),
-      ...steered ? { steeredAt: (/* @__PURE__ */ new Date()).toISOString() } : {}
-    };
+    this.requeueUnreadSteers();
+    const taken = this.messageQueue.takeFromQueue(messageId);
+    if (taken) this.messageQueue.restoreToQueue(taken.message, 0);
+    if (turnRunning) {
+      this.recordInterrupted();
+      this.messageQueue.cancelActiveTurn();
+      await this.interruptActiveTurn();
+    }
+    return { success: true, queue: this.getQueue() };
   }
-  keepSteeredMessageQueued() {
+  requeueUnreadSteers() {
+    const steers = [...this.unreadSteers.values()].map(({ message }) => message);
+    this.unreadSteers.clear();
+    this.restoreQueuedMessages(steers.map((message) => ({ message, index: 0 })));
+  }
+  markSteerRead(messageId) {
+    const steer = this.unreadSteers.get(messageId);
+    this.unreadSteers.delete(messageId);
+    return steer?.message ?? this.messageQueue.takeFromQueue(messageId)?.message;
+  }
+  canDeliverSteersNow() {
     return false;
   }
+  deliverSteersNow() {
+    return Promise.resolve();
+  }
   steerRequest(_request) {
     return Promise.resolve(false);
   }
@@ -13054,11 +13081,19 @@ function isClaudeSessionActive(activity) {
 // src/managers/claude-background-tasks.ts
 var ClaudeBackgroundTasks = class {
   active = /* @__PURE__ */ new Set();
+  foreground = /* @__PURE__ */ new Set();
   reset() {
     this.active.clear();
+    this.foreground.clear();
   }
   update(message) {
-    if (message.type !== "system" || message.subtype !== "background_tasks_changed") return;
+    if (message.type !== "system") return;
+    if (message.subtype === "task_started" && message.is_backgrounded === false) this.foreground.add(message.task_id);
+    if (message.subtype === "task_notification") this.foreground.delete(message.task_id);
+    if (message.subtype === "task_updated" && (message.patch.is_backgrounded || message.patch.status && message.patch.status !== "running")) {
+      this.foreground.delete(message.task_id);
+    }
+    if (message.subtype !== "background_tasks_changed") return;
     this.active.clear();
     for (const task of message.tasks) {
       if (!task.ambient) this.active.add(task.task_id);
@@ -13378,25 +13413,31 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
     await this.abortAllPendingToolInputs();
     await this.tearDownSession(true);
   }
+  canDeliverSteersNow() {
+    return this.activeQuery !== null && this.backgroundTasks.foreground.size > 0;
+  }
+  async deliverSteersNow() {
+    await this.activeQuery?.backgroundTasks();
+  }
   // Claude Code folds a `next`-priority prompt into the running turn at its next tool boundary.
   async steerRequest(request) {
     const pendingTurn = this.pendingTurn;
     const promptStream = this.activePromptStream;
     if (!pendingTurn || !promptStream) return false;
-    if (getGoalCommand(request.message, request.goalMode)) {
-      this.messageQueue.restoreToQueue(request, 0);
-      await this.interruptActiveTurn();
-      return true;
-    }
+    if (getGoalCommand(request.message, request.goalMode)) return false;
     const userMessage = await this.buildUserMessage(request);
     if (this.pendingTurn !== pendingTurn || this.activePromptStream !== promptStream) return false;
     pendingTurn.userMessageUuids.add(userMessage.uuid);
-    const steer = { ...userMessage, priority: "next" };
-    pendingTurn.steered.push(steer);
-    await this.recordEvent(userMessage, request.messageId);
-    promptStream.push(steer);
+    pendingTurn.steers.set(userMessage.uuid, { messageId: request.id, userMessage });
+    promptStream.push({ ...userMessage, priority: "next" });
     return true;
   }
+  async recordSteerRead(uuid) {
+    const steer = this.pendingTurn?.steers.get(uuid);
+    if (!steer) return;
+    this.pendingTurn?.steers.delete(uuid);
+    if (this.markSteerRead(steer.messageId)) await this.recordEvent(steer.userMessage, steer.messageId);
+  }
   async abortAllPendingToolInputs() {
     const pending = Array.from(this.pendingToolInputs.values());
     this.pendingToolInputs.clear();
@@ -13652,7 +13693,7 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
       }
     }
   }
-  async processMessageInternal(request) {
+  async processMessageInternal(request, signal) {
     let lastError;
     let authRetryExhausted = false;
     let quotaFallbacks = 0;
@@ -13662,7 +13703,7 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
     let midTurnContinues = 0;
     let missingSessionReset = false;
     let currentRequest = request;
-    let carriedSteers = [];
+    let carriedSteers = /* @__PURE__ */ new Map();
     await this.goalClear?.catch(() => {
     });
     try {
@@ -13670,10 +13711,10 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
       await this.turnCredentials?.refresh();
       while (true) {
         const attemptedCredential = this.turnCredentials ? this.turnCredentials.snapshot() : ENGINE_ENV.REPLICAS_AGENT_CREDENTIALS.claude;
-        const steered = carriedSteers;
-        carriedSteers = [];
+        const steers = carriedSteers;
+        carriedSteers = /* @__PURE__ */ new Map();
         try {
-          await this.executeQuery(currentRequest, { skipUserMessageRecord: attempt > 0, steered });
+          await this.executeQuery(currentRequest, { skipUserMessageRecord: attempt > 0, signal, steers });
           return;
         } catch (error) {
           lastError = error;
@@ -13718,7 +13759,7 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
             missingSessionReset = true;
             console.warn(`[ClaudeManager] Session ${this.sessionId} has no transcript; starting a fresh session:`, error.message);
             this.sessionId = null;
-            carriedSteers = steered;
+            carriedSteers = steers;
             await this.onSaveSessionId(null);
             await this.tearDownSession();
             attempt++;
@@ -13901,21 +13942,21 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
     if (!promptStream || !activeQuery) {
       throw new Error("Claude session unavailable after ensureSession");
     }
-    if (this.pendingInterrupt) {
+    if (this.pendingInterrupt || options.signal?.aborted) {
       this.pendingInterrupt = false;
       return;
     }
     await new Promise((resolve7, reject) => {
-      const steered = options.steered ?? [];
+      const steers = options.steers ?? /* @__PURE__ */ new Map();
       this.pendingTurn = {
         resolve: resolve7,
         reject,
         sawActivity: false,
-        steered,
-        userMessageUuids: /* @__PURE__ */ new Set([userMessage.uuid, ...steered.flatMap((steer) => steer.uuid ?? [])])
+        steers,
+        userMessageUuids: /* @__PURE__ */ new Set([userMessage.uuid, ...steers.keys()])
       };
       promptStream.push(goalCommand ? { ...userMessage, message: { role: "user", content: `/goal ${goalObjective ?? "clear"}` } } : userMessage);
-      for (const steer of steered) promptStream.push(steer);
+      for (const { userMessage: steer } of steers.values()) promptStream.push({ ...steer, priority: "next" });
     });
   }
   async buildUserMessage({ message, images }) {
@@ -14138,6 +14179,10 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
         }
         const wasProcessing = this.isProcessing();
         this.setAuthRetrying(false);
+        const lifecycle2 = msg;
+        if (isRecord(lifecycle2) && lifecycle2.type === "command_lifecycle" && lifecycle2.state === "started" && typeof lifecycle2.command_uuid === "string") {
+          await this.recordSteerRead(lifecycle2.command_uuid);
+        }
         if (this.pendingTurn && _ClaudeManager.isTurnActivity(msg)) {
           this.pendingTurn.sawActivity = true;
         }
@@ -14164,6 +14209,7 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
           if (this.activeQuery !== response) break;
           this.sessionLinearForwarder?.flushThoughtAsResponse();
           const pendingUuids = this.pendingTurn?.userMessageUuids;
+          for (const uuid of msg.user_message_uuids ?? []) await this.recordSteerRead(uuid);
           if (msg.user_message_uuid) {
             for (const uuid of msg.user_message_uuids ?? [msg.user_message_uuid]) pendingUuids?.delete(uuid);
             if (pendingUuids?.size === 0) this.resolvePendingTurn();
@@ -14579,7 +14625,6 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
         console.error("[ClaudeManager] Failed to record published PR:", error);
       });
     }
-    this.trackNativeCompaction(message);
     if (message.type === "system" && message.subtype === "task_started" && message.ambient) {
       this.ambientTaskIds.add(message.task_id);
     }
@@ -14609,17 +14654,6 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
       this.recordGoalChange(null);
     }
   }
-  // Claude Code intercepts /compact and auto-compaction inside the SDK process; we just observe the status messages to mirror state to the UI.
-  trackNativeCompaction(message) {
-    if (message.type !== "system") return;
-    if (message.subtype === "status" && message.status === "compacting") {
-      this.setCompacting(true);
-      return;
-    }
-    if (message.subtype === "compact_boundary") {
-      this.setCompacting(false);
-    }
-  }
   async recordEvent(event, replicasMessageId) {
     const timestamp = (/* @__PURE__ */ new Date()).toISOString();
     const restampAmbient = event.type === "system" && "task_id" in event && this.ambientTaskIds.has(event.task_id);
@@ -15300,6 +15334,7 @@ var CodexAspManager = class extends CodingAgentManager {
   slashCommandsCache = null;
   slashCommandsRequest = null;
   steeredTempImagePaths = [];
+  compacting = false;
   steerLock = new AsyncLock();
   onCodexTurnStarted;
   onCodexTokenUsage;
@@ -15338,10 +15373,13 @@ var CodexAspManager = class extends CodingAgentManager {
   async subagentMcpForTurn(enabled) {
     return this.currentThreadId ? existsSync9(join17(SUBAGENT_MCP_THREADS_DIR, this.currentThreadId)) : enabled;
   }
-  async interruptActiveTurn() {
+  async interrupt(persistRemoval) {
     if (this.currentGoal?.status === "active") {
       await this.updateGoal({ status: "paused" });
     }
+    return super.interrupt(persistRemoval);
+  }
+  async interruptActiveTurn() {
     if (!this.currentThreadId || !this.activeTurnId) {
       return;
     }
@@ -15392,7 +15430,7 @@ var CodexAspManager = class extends CodingAgentManager {
     const threadId = this.currentThreadId;
     const expectedTurnId = this.activeTurnId;
     if (!threadId || !expectedTurnId || !this.messageQueue.isProcessing()) return false;
-    if (this.isCompacting()) return false;
+    if (this.compacting) return false;
     if (getGoalCommand(request.message, request.goalMode) || isCompactCommand(request.message)) return false;
     const { input, tempImagePaths } = await buildTurnInput(request);
     const result = await this.requestActiveTurnWithReconciliation(
@@ -15400,7 +15438,7 @@ var CodexAspManager = class extends CodingAgentManager {
       expectedTurnId,
       (host, turnId) => host.client.request(
         TURN_STEER_METHOD,
-        { threadId, expectedTurnId: turnId, input }
+        { threadId, expectedTurnId: turnId, input, clientUserMessageId: request.id }
       )
     );
     if (!result.ok) {
@@ -15416,7 +15454,6 @@ var CodexAspManager = class extends CodingAgentManager {
     } else {
       await removeTempImageFiles(tempImagePaths);
     }
-    this.recordUserMessageEvent(request);
     return true;
   }
   async getHistory(page2 = {}) {
@@ -15507,7 +15544,7 @@ var CodexAspManager = class extends CodingAgentManager {
       ...extraPayload
     }));
   }
-  async processMessageInternal(request) {
+  async processMessageInternal(request, signal) {
     let userMessageRecorded = false;
     let quotaFallbackAttempted = false;
     const recordUserMessage = (extraPayload = {}) => {
@@ -15518,8 +15555,8 @@ var CodexAspManager = class extends CodingAgentManager {
     const goalCommand = getGoalCommand(request.message, request.goalMode);
     const dispatch = async () => {
       if (isCompactCommand(request.message)) {
-        await this.executeAspTurn(request, recordUserMessage, {
-          runTurn: (host, threadId) => this.observeTurn(host, threadId, request, async () => {
+        await this.executeAspTurn(request, recordUserMessage, signal, {
+          runTurn: (host, threadId) => this.observeTurn(host, threadId, request, signal, async () => {
             await host.client.request(
               THREAD_COMPACT_START_METHOD,
               { threadId }
@@ -15543,13 +15580,13 @@ var CodexAspManager = class extends CodingAgentManager {
         return;
       }
       if (goalCommand?.type === "set") {
-        await this.executeAspTurn(request, recordUserMessage, {
-          runTurn: (host, threadId) => this.runGoalTurn(host, threadId, request, goalCommand.objective),
+        await this.executeAspTurn(request, recordUserMessage, signal, {
+          runTurn: (host, threadId) => this.runGoalTurn(host, threadId, request, goalCommand.objective, signal),
           userMessagePayload: { command: "goal" }
         });
         return;
       }
-      await this.executeAspTurn(request, recordUserMessage);
+      await this.executeAspTurn(request, recordUserMessage, signal);
     };
     let attemptedCredential = ENGINE_ENV.REPLICAS_AGENT_CREDENTIALS.codex;
     try {
@@ -15612,6 +15649,7 @@ var CodexAspManager = class extends CodingAgentManager {
       this.itemUpdateCoalescer.flushPending();
       this.itemUpdateCoalescer.dispose();
       this.activeTurnId = null;
+      this.compacting = false;
       await removeTempImageFiles(this.steeredTempImagePaths.splice(0));
       await this.historyFile?.flush();
       await this.onTurnComplete();
@@ -15640,14 +15678,15 @@ var CodexAspManager = class extends CodingAgentManager {
     const threadId = await this.ensureThread(host, request, developerInstructions);
     return { host, threadId };
   }
-  async executeAspTurn(request, recordUserMessage, options = {}) {
+  async executeAspTurn(request, recordUserMessage, signal, options = {}) {
     const host = await getCodexAspHost();
     const developerInstructions = this.buildCombinedInstructions(request.customInstructions, true);
     recordUserMessage(options.userMessagePayload);
     const threadId = await this.ensureThread(host, request, developerInstructions);
     const serviceTier = await this.resolveRequestedServiceTier(host, request);
     await this.applyThreadServiceTier(host, threadId, serviceTier);
-    const runTurn = options.runTurn ?? ((aspHost, aspThreadId) => this.runTurn(aspHost, aspThreadId, request, serviceTier));
+    if (signal.aborted) return;
+    const runTurn = options.runTurn ?? ((aspHost, aspThreadId) => this.runTurn(aspHost, aspThreadId, request, serviceTier, signal));
     let completedTurn;
     try {
       completedTurn = await runTurn(host, threadId);
@@ -15787,9 +15826,9 @@ ${text.slice(-24e3)}`
       console.warn("[CodexAspManager] Failed to apply skill registries:", error);
     }
   }
-  async runTurn(host, threadId, request, serviceTier) {
+  async runTurn(host, threadId, request, serviceTier, signal) {
     const { params, tempImagePaths } = await buildTurnStartParams(threadId, request, serviceTier);
-    return this.observeTurn(host, threadId, request, async () => {
+    return this.observeTurn(host, threadId, request, signal, async () => {
       const turnStartResponse = await host.client.request(
         TURN_START_METHOD,
         params
@@ -15797,8 +15836,8 @@ ${text.slice(-24e3)}`
       return { turn: turnStartResponse.turn, tempImagePaths };
     });
   }
-  async runGoalTurn(host, threadId, request, objective) {
-    return this.observeTurn(host, threadId, request, async () => {
+  async runGoalTurn(host, threadId, request, objective, signal) {
+    return this.observeTurn(host, threadId, request, signal, async () => {
       const response = await host.client.request(
         THREAD_GOAL_SET_METHOD,
         { threadId, objective, status: "active" }
@@ -15807,7 +15846,15 @@ ${text.slice(-24e3)}`
       return { turn: null, tempImagePaths: [] };
     });
   }
-  async observeTurn(host, threadId, request, startTurn) {
+  async observeTurn(host, threadId, request, signal, startTurn) {
+    let stopSent = false;
+    const interruptIfStopped = () => {
+      if (!signal.aborted || stopSent) return;
+      stopSent = true;
+      void this.interruptActiveTurn().catch((error) => {
+        console.error("[CodexAspManager] Failed to interrupt a turn stopped before it started:", error);
+      });
+    };
     let resolveCompleted;
     const completed = new Promise((resolve7) => {
       resolveCompleted = resolve7;
@@ -15861,7 +15908,7 @@ ${text.slice(-24e3)}`
       },
       [THREAD_COMPACTED_METHOD]: (notification) => {
         if (!matchesTurn(notification.params.threadId, notification.params.turnId)) return;
-        this.setCompacting(false);
+        this.compacting = false;
       },
       [TURN_STARTED_METHOD]: (notification) => {
         if (notification.params.threadId !== threadId) return;
@@ -15873,6 +15920,7 @@ ${text.slice(-24e3)}`
         completedItems.length = 0;
         agentMessageDeltas.clear();
         this.startTurn(notification.params.turn);
+        interruptIfStopped();
         linearForwarder.sendEvent(convertCodexAspNotification(notification, linearSessionId ?? ""));
       },
       [TURN_PLAN_UPDATED_METHOD]: (notification) => {
@@ -15881,8 +15929,10 @@ ${text.slice(-24e3)}`
       },
       [ITEM_STARTED_METHOD]: (notification) => {
         if (!matchesTurn(notification.params.threadId, notification.params.turnId)) return;
-        if (notification.params.item.type === "contextCompaction") {
-          this.setCompacting(true);
+        if (notification.params.item.type === "contextCompaction") this.compacting = true;
+        if (notification.params.item.type === "userMessage" && notification.params.item.clientId) {
+          const steer = this.markSteerRead(notification.params.item.clientId);
+          if (steer) this.recordUserMessageEvent(steer);
         }
         this.startItem(
           notification.params.turnId,
@@ -15893,9 +15943,7 @@ ${text.slice(-24e3)}`
       [ITEM_COMPLETED_METHOD]: (notification) => {
         if (!matchesTurn(notification.params.threadId, notification.params.turnId)) return;
         completedItems.push(notification.params.item);
-        if (notification.params.item.type === "contextCompaction") {
-          this.setCompacting(false);
-        }
+        if (notification.params.item.type === "contextCompaction") this.compacting = false;
         const itemFailed = notification.params.item.type === "commandExecution" && typeof notification.params.item.exitCode === "number" && notification.params.item.exitCode !== 0;
         this.completeItem(
           notification.params.turnId,
@@ -15989,6 +16037,7 @@ ${text.slice(-24e3)}`
         this.activeTurnId = started.turn.id;
         this.onCodexTurnStarted?.(threadId, started.turn.id);
         this.startTurn(started.turn);
+        interruptIfStopped();
       }
       const turn = await Promise.race([completed, disposed]);
       linearForwarder.flushThoughtAsResponse();
@@ -16197,8 +16246,8 @@ ${text.slice(-24e3)}`
     const live = turn.items.get(item.id);
     turn.items.delete(item.id);
     turn.persistedItemIds.add(item.id);
-    const timestamp = live?.timestamp ?? item.timestamp;
-    const persisted = item.type === "subagent" && item.status === "completed" ? { ...item, timestamp, status: "in_progress" } : { ...item, timestamp };
+    const completed = live ? { ...item, timestamp: live.timestamp, completedAt: item.timestamp } : item;
+    const persisted = completed.type === "subagent" && completed.status === "completed" ? { ...completed, status: "in_progress" } : completed;
     if (persisted.type === "subagent" && persisted.status === "in_progress") {
       const subagent = { turnId, item: persisted, active: new Set(persisted.receiverThreadIds), failed: false };
       for (const threadId of subagent.active) this.codexSubagents.set(threadId, subagent);
@@ -17163,7 +17212,7 @@ ${typeof pending.subject.command === "string" ? pending.subject.command : JSON.s
       }, this.historyFile);
     }
   }
-  async processMessageInternal(request) {
+  async processMessageInternal(request, signal) {
     let userMessageRecorded = false;
     const dispatch = async () => {
       const model = request.model ?? DEFAULT_MUSE_MODEL;
@@ -17186,7 +17235,6 @@ ${typeof pending.subject.command === "string" ? pending.subject.command : JSON.s
           sessionId: this.sessionId
         });
         if (isRecord(result2) && result2.status === "accepted") {
-          this.setCompacting(true);
           await completed2;
         } else {
           this.compactionComplete = null;
@@ -17210,6 +17258,7 @@ ${pending}
 </workspace-instructions>
 
 ` : ""}${request.planMode ? "Plan the requested work without modifying files or running mutating commands.\n\n" : ""}${request.message}`;
+      if (signal.aborted) return;
       this.turnError = null;
       const completed = new Promise((resolve7) => {
         this.turnComplete = { resolve: resolve7 };
@@ -17275,17 +17324,6 @@ ${pending}
       turnId: this.activeTurnId
     });
   }
-  async steerRequest(request) {
-    if (!this.sessionId || !this.activeTurnId) return false;
-    await this.request("turn/steer", {
-      commandId: uuidV7(),
-      sessionId: this.sessionId,
-      expectedTurnId: this.activeTurnId,
-      input: this.createTurnInput(request.message, request.images),
-      reasoningEffort: codexReasoningEffortForThinkingLevel(request.thinkingLevel)
-    });
-    return true;
-  }
   async respondToToolInput(requestId, selectionId) {
     const approval = [...this.pendingApprovals.values()].find((pending2) => pending2.requestId === requestId);
     if (approval) {
@@ -58712,13 +58750,6 @@ var PiManager = class extends CodingAgentManager {
   async interruptActiveTurn() {
     await this.session?.abort();
   }
-  async steerRequest(request) {
-    const session = this.session;
-    if (!session?.isStreaming) return false;
-    await session.steer(request.message);
-    this.recordUserMessage(session, request);
-    return true;
-  }
   async getHistory(page2 = {}) {
     await this.historyFile.flush();
     const history = await this.historyFile.loadEventsPage(page2);
@@ -58903,7 +58934,7 @@ var PiManager = class extends CodingAgentManager {
       skillName ? { skillName } : {}
     );
   }
-  async processMessageInternal(request) {
+  async processMessageInternal(request, signal) {
     try {
       const session = await this.ensureSession(request);
       this.recordUserMessage(session, request);
@@ -58912,6 +58943,7 @@ var PiManager = class extends CodingAgentManager {
         data: image.source.data,
         mimeType: image.source.media_type
       })) : void 0;
+      if (signal.aborted) return;
       await session.prompt(request.message, images ? { images } : void 0);
     } catch (error) {
       this.recordHistoryEvent("pi-error", { message: error instanceof Error ? error.message : String(error) }, this.historyFile);
@@ -60872,6 +60904,9 @@ var ChatService = class {
       if (signal?.aborted) throw new Error("Subagent wait was cancelled");
       const result = await this.getSubagent(parentChatId, chatId);
       if (result.status === "completed") return result;
+      if (this.requireChat(parentChatId).provider.getQueue().some(({ steeredAt }) => steeredAt && Date.parse(steeredAt) >= startedAt)) {
+        return { ...result, interruptedByUserMessage: true };
+      }
       const remainingMs = timeoutMs === null ? null : timeoutMs - (Date.now() - startedAt);
       if (remainingMs !== null && remainingMs <= 0) return { ...result, timedOut: true };
       await new Promise((resolve7) => setTimeout(
@@ -61054,7 +61089,7 @@ var ChatService = class {
   }
   async interrupt(chatId) {
     const chat = this.requireChat(chatId);
-    const result = await chat.provider.interrupt();
+    const result = await chat.provider.interrupt((messageIds) => this.forgetPendingMessages(chat, messageIds));
     this.endTrackedTurn(chatId);
     chat.hasActiveTurn = false;
     chat.activeMessageId = null;
@@ -61076,7 +61111,7 @@ var ChatService = class {
     if (!chat.provider.clearGoal) {
       return { interrupted: false, queue: [], goal: null };
     }
-    const interruptResult = await chat.provider.interrupt();
+    const interruptResult = await chat.provider.interrupt((messageIds) => this.forgetPendingMessages(chat, messageIds));
     this.endTrackedTurn(chatId);
     chat.hasActiveTurn = false;
     chat.activeMessageId = null;
@@ -61224,6 +61259,14 @@ var ChatService = class {
     }
     return result;
   }
+  async sendNow(chatId, messageId) {
+    const chat = this.requireChat(chatId);
+    const result = await chat.provider.sendNow(messageId);
+    if (result.success && !result.queue.some(({ id, steeredAt }) => id === messageId && !steeredAt)) {
+      chat.pendingMessageIds = chat.pendingMessageIds.filter((pendingMessageId) => pendingMessageId !== messageId);
+    }
+    return result;
+  }
   async respondToToolInput(chatId, requestId, selectionId) {
     const chat = this.requireChat(chatId);
     if (!chat.provider.respondToToolInput) {
@@ -61239,7 +61282,7 @@ var ChatService = class {
       const target = this.chats.get(id);
       if (!target || target.persisted.deletedAt) continue;
       if (target.provider.isProcessing()) {
-        await target.provider.interrupt().catch(() => {
+        await target.provider.interrupt((messageIds) => this.forgetPendingMessages(target, messageIds)).catch(() => {
         });
         target.hasActiveTurn = false;
         target.activeMessageId = null;
@@ -61681,7 +61724,6 @@ var ChatService = class {
       processing: hasActiveChatTurn(chat),
       activityTrackingVersion: 1,
       awaitingInput: chat.provider.isAwaitingInput?.() ?? false,
-      isCompacting: chat.provider.isCompacting?.() ?? false,
       isAuthRetrying: chat.provider.isAuthRetrying?.() ?? false,
       mayBeReconnecting: chat.provider.mayBeReconnecting?.() ?? false,
       goal: chat.provider.getGoal?.() ?? null,
@@ -61809,7 +61851,7 @@ var ChatService = class {
       }
     }).catch(() => {
     });
-    if (event.type === "replicas-tool-input-request" || event.type === "replicas-tool-input-resolved" || event.type === "compaction-status" || event.type === AUTH_RETRY_STATUS_EVENT_TYPE || event.type === AUTH_FALLBACK_EVENT_TYPE || event.type === CURSOR_CONNECTION_STATUS_EVENT_TYPE || event.type === CHAT_GOAL_EVENT_TYPE || event.type === "claude-result" || event.type === "claude-system" && (event.payload.subtype === "init" || event.payload.subtype === "session_state_changed" || event.payload.subtype === "background_tasks_changed" || coerceBackgroundTaskPayload(event.payload) !== null)) {
+    if (event.type === "replicas-tool-input-request" || event.type === "replicas-tool-input-resolved" || event.type === AUTH_RETRY_STATUS_EVENT_TYPE || event.type === AUTH_FALLBACK_EVENT_TYPE || event.type === CURSOR_CONNECTION_STATUS_EVENT_TYPE || event.type === CHAT_GOAL_EVENT_TYPE || event.type === "claude-result" || event.type === "claude-system" && (event.payload.subtype === "init" || event.payload.subtype === "session_state_changed" || event.payload.subtype === "background_tasks_changed" || coerceBackgroundTaskPayload(event.payload) !== null)) {
       this.publish({
         type: "chat.updated",
         payload: { chat: this.toSummary(chat) }
@@ -63525,17 +63567,21 @@ function createV1Routes(deps) {
       return c.json(jsonError("Failed to update queued message", error instanceof Error ? error.message : "Unknown error"), 500);
     }
   });
-  app2.post("/chats/:chatId/queue/:messageId/steer", async (c) => {
-    try {
-      const result = await deps.chatService.steerFromQueue(c.req.param("chatId"), c.req.param("messageId"));
-      return c.json(result);
-    } catch (error) {
-      if (error instanceof ChatNotFoundError) {
-        return c.json(jsonError("Chat not found", error.message), 404);
+  for (const { action, failure, run } of [
+    { action: "steer", failure: "Failed to steer queued message", run: (chatId, messageId) => deps.chatService.steerFromQueue(chatId, messageId) },
+    { action: "send-now", failure: "Failed to send queued message now", run: (chatId, messageId) => deps.chatService.sendNow(chatId, messageId) }
+  ]) {
+    app2.post(`/chats/:chatId/queue/:messageId/${action}`, async (c) => {
+      try {
+        return c.json(await run(c.req.param("chatId"), c.req.param("messageId")));
+      } catch (error) {
+        if (error instanceof ChatNotFoundError) {
+          return c.json(jsonError("Chat not found", error.message), 404);
+        }
+        return c.json(jsonError(failure, error instanceof Error ? error.message : "Unknown error"), 500);
       }
-      return c.json(jsonError("Failed to steer queued message", error instanceof Error ? error.message : "Unknown error"), 500);
-    }
-  });
+    });
+  }
   app2.post("/chats/:chatId/tool-input", async (c) => {
     try {
       const body = respondToolInputSchema.parse(await c.req.json());

package/dist/src/post-tool-pr-hook.js

@@ -3,13 +3,13 @@ import { createRequire as __createRequire } from 'node:module';
 const require = __createRequire(import.meta.url);
 import {
   publishedPullRequestUrls
-} from "./chunk-MWCBGGWF.js";
+} from "./chunk-5EHMJ4OT.js";
 import {
   isRecord
 } from "./chunk-UZSNFLDQ.js";
 import {
   shouldRefreshPullRequests
-} from "./chunk-LKTX2CHU.js";
+} from "./chunk-QU4FXL4X.js";
 import "./chunk-VEQXQN22.js";
 
 // src/services/post-tool-pr-notifier.ts

package/dist/src/subagent-mcp.js

@@ -9,7 +9,7 @@ import {
   spawnSubagentRequestSchema,
   subagentResponseSchema,
   waitSubagentRequestSchema
-} from "./chunk-LKTX2CHU.js";
+} from "./chunk-QU4FXL4X.js";
 import "./chunk-VEQXQN22.js";
 
 // src/subagent-mcp.ts
@@ -101,7 +101,7 @@ server.registerTool(SUBAGENT_MCP_TOOLS.getAgent, {
   content: [{ type: "text", text: await request(`/chats/${parentChatId}/subagents/${chat_id}`, "GET") }]
 }));
 server.registerTool(SUBAGENT_MCP_TOOLS.waitAgent, {
-  description: "Wait for one of this chat\u2019s subagents to finish over a heartbeat stream. A timeout stops waiting without interrupting the child.",
+  description: "Wait for one of this chat\u2019s subagents to finish over a heartbeat stream. A timeout, or a new message from the user, stops waiting without interrupting the child.",
   inputSchema: {
     chat_id: z.string().uuid(),
     timeout_minutes: waitSubagentRequestSchema.shape.timeoutMinutes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "replicas-engine",
-  "version": "0.1.985",
+  "version": "0.1.987",
   "description": "Lightweight API server for Replicas workspaces",
   "type": "module",
   "main": "dist/src/index.js",