replicas-engine 0.1.765 → 0.1.766

package/dist/src/{asp-host-X3XQGPRO.js → asp-host-QO7E55G6.js}

@@ -5,11 +5,11 @@ import {
   getCodexAspHost,
   restartCodexAspHost,
   restartCodexAspHostIfRunning
-} from "./chunk-4OLXBASZ.js";
-import "./chunk-WFWT2YFN.js";
-import "./chunk-SQX57KJM.js";
+} from "./chunk-AL25Z6UZ.js";
+import "./chunk-5R2WQ34N.js";
+import "./chunk-FFNEC4SD.js";
 import "./chunk-UZSNFLDQ.js";
-import "./chunk-UQETFAOK.js";
+import "./chunk-DC6RPXQZ.js";
 import "./chunk-VEQXQN22.js";
 export {
   getCodexAspHost,

package/dist/src/{chunk-CWSZPPD6.js → chunk-2ZDB6AIE.js}

@@ -3,12 +3,12 @@ import { createRequire as __createRequire } from 'node:module';
 const require = __createRequire(import.meta.url);
 import {
   monolithRequest
-} from "./chunk-WFWT2YFN.js";
+} from "./chunk-5R2WQ34N.js";
 import {
   extractCommandProtectionCommandText,
   findGitCommitSignals,
   findPrMergeSignals
-} from "./chunk-UQETFAOK.js";
+} from "./chunk-DC6RPXQZ.js";
 
 // src/services/command-protection-service.ts
 var DEFAULT_COMMAND_PROTECTION_BLOCK_MESSAGE = "Blocked by Replicas command protection.";

package/dist/src/{chunk-WFWT2YFN.js → chunk-5R2WQ34N.js}

@@ -15,7 +15,7 @@ import {
   isValidRelayBaseProvider,
   parsePosixEnvFile,
   readReplicasRuntimeEnv
-} from "./chunk-UQETFAOK.js";
+} from "./chunk-DC6RPXQZ.js";
 
 // src/engine-env.ts
 import { readFileSync as readFileSync2 } from "fs";

package/dist/src/{chunk-4OLXBASZ.js → chunk-AL25Z6UZ.js}

@@ -5,18 +5,18 @@ import {
   ENGINE_ENV,
   monolithRequest,
   setAgentCredentialSnapshot
-} from "./chunk-WFWT2YFN.js";
+} from "./chunk-5R2WQ34N.js";
 import {
   AppServerProcess,
   buildCodexAgentEnv
-} from "./chunk-SQX57KJM.js";
+} from "./chunk-FFNEC4SD.js";
 import {
   CODEX_AUTH_ENV_KEYS,
   CODEX_AUTH_ENV_KEYS_BY_METHOD,
   codexAuthEnvFromResponse,
   createErrorResult,
   createSuccessResult
-} from "./chunk-UQETFAOK.js";
+} from "./chunk-DC6RPXQZ.js";
 
 // src/managers/codex-token-manager.ts
 import { promises as fs } from "fs";
@@ -232,7 +232,7 @@ var CodexTokenManager = class extends BaseRefreshManager {
     const data = await response.json();
     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-X3XQGPRO.js");
+      const { restartCodexAspHostIfRunning: restartCodexAspHostIfRunning2 } = await import("./asp-host-QO7E55G6.js");
       await restartCodexAspHostIfRunning2();
     }
     if (data.scope) {

package/dist/src/{chunk-UQETFAOK.js → chunk-DC6RPXQZ.js}

@@ -646,6 +646,8 @@ function getClaudePartialMessageStreamId(event) {
   return typeof event.payload.streamId === "string" && event.payload.streamId ? event.payload.streamId : null;
 }
 var ACCEPTED_USER_MESSAGE_SOURCE = "replicas-chat-turn-accepted";
+var QUEUED_MESSAGE_REMOVED_EVENT_TYPE = "replicas-queued-message-removed";
+var REMOVED_MESSAGE_IDS_PAYLOAD_KEY = "removedMessageIds";
 var USER_MESSAGE_ID_PAYLOAD_KEY = "replicasMessageId";
 var CODEX_ASP_ITEM_ID_PAYLOAD_KEY = "codexAspItemId";
 var CODEX_ASP_TRANSCRIPT_UPDATED_EVENT_TYPE = "codex-asp-transcript-updated";
@@ -5585,6 +5587,7 @@ function parseCodexAspTranscript(transcript) {
 // ../shared/src/display-message/parsers/index.ts
 var INTERRUPTION_DEDUP_WINDOW_MS = 15e3;
 function parseAgentEvents(events, agentType) {
+  events = excludeQueuedAcceptedEvents(events, []);
   if (agentType === "codex") {
     return parseCodexEvents(events);
   }
@@ -5612,6 +5615,7 @@ function parseAgentEvents(events, agentType) {
   return parseClaudeEvents(events);
 }
 function parseDisplayMessages(events, agentType, codexAspTranscript, options = {}) {
+  events = excludeQueuedAcceptedEvents(events, []);
   const shouldFilter = options.filter ?? true;
   const parsedEvents = agentType === "claude" || agentType === "relay" ? parseClaudeEvents(events, options.parentToolUseId) : parseAgentEvents(events, agentType);
   const reconciledEvents = [];
@@ -5762,10 +5766,24 @@ function getUserMessageId(event) {
   const messageId = event.payload[USER_MESSAGE_ID_PAYLOAD_KEY];
   return typeof messageId === "string" ? messageId : null;
 }
+function getRemovedMessageIds(event) {
+  if (event.type !== QUEUED_MESSAGE_REMOVED_EVENT_TYPE) return [];
+  const messageIds = event.payload[REMOVED_MESSAGE_IDS_PAYLOAD_KEY];
+  if (Array.isArray(messageIds)) return messageIds.filter((id) => typeof id === "string");
+  const messageId = getUserMessageId(event);
+  return messageId ? [messageId] : [];
+}
 function getUserMessageItemId(event) {
   const itemId = event.payload[CODEX_ASP_ITEM_ID_PAYLOAD_KEY];
   return typeof itemId === "string" ? itemId : null;
 }
+function excludeQueuedAcceptedEvents(events, queue, removedMessageIds = []) {
+  const queuedMessageIds = /* @__PURE__ */ new Set([...queue.map((message) => message.id), ...removedMessageIds]);
+  for (const event of events) {
+    for (const messageId of getRemovedMessageIds(event)) queuedMessageIds.add(messageId);
+  }
+  return events.filter((event) => event.payload.source !== ACCEPTED_USER_MESSAGE_SOURCE || !queuedMessageIds.has(getUserMessageId(event) ?? ""));
+}
 function getEventTimestampMs(event) {
   return parseTimestampMs(event.timestamp);
 }
@@ -7287,13 +7305,15 @@ async function readJsonlPage(args) {
 }
 function parseChatTranscriptHistoryIndex(value) {
   if (!isRecord(value) || value.version !== 2 || !isNonNegativeInteger(value.sourceSize)) return void 0;
+  const removedMessageIds = Array.isArray(value.removedMessageIds) ? value.removedMessageIds.filter((id) => typeof id === "string") : [];
   if (value.codexAspTranscript === void 0) {
-    return { version: 2, sourceSize: value.sourceSize };
+    return { version: 2, sourceSize: value.sourceSize, ...removedMessageIds.length ? { removedMessageIds } : {} };
   }
   if (!isRecord(value.codexAspTranscript) || typeof value.codexAspTranscript.threadId !== "string" || typeof value.codexAspTranscript.updatedAt !== "string" || !isNonNegativeInteger(value.codexAspTranscript.size)) return void 0;
   return {
     version: 2,
     sourceSize: value.sourceSize,
+    ...removedMessageIds.length ? { removedMessageIds } : {},
     codexAspTranscript: {
       threadId: value.codexAspTranscript.threadId,
       updatedAt: value.codexAspTranscript.updatedAt,
@@ -7306,6 +7326,10 @@ function getChatTranscriptHistorySize(index) {
 }
 function createChatTranscriptPages(sourceBytes) {
   const history = parseAgentEventJsonlWithCodexAspTranscript(new TextDecoder("utf-8", { fatal: true }).decode(sourceBytes));
+  const removedMessageIds = /* @__PURE__ */ new Set();
+  for (const event of history.events) {
+    for (const messageId of getRemovedMessageIds(event)) removedMessageIds.add(messageId);
+  }
   const bytes = new TextEncoder().encode(history.transcript?.turns.length ? `${history.transcript.turns.map((turn) => JSON.stringify(turn)).join("\n")}
 ` : "");
   return {
@@ -7313,6 +7337,7 @@ function createChatTranscriptPages(sourceBytes) {
     index: {
       version: 2,
       sourceSize: sourceBytes.byteLength,
+      ...removedMessageIds.size ? { removedMessageIds: [...removedMessageIds] } : {},
       ...history.transcript ? {
         codexAspTranscript: {
           threadId: history.transcript.threadId,
@@ -7528,6 +7553,8 @@ export {
   CLAUDE_PARTIAL_MESSAGE_EVENT_TYPE,
   getClaudePartialMessageStreamId,
   ACCEPTED_USER_MESSAGE_SOURCE,
+  QUEUED_MESSAGE_REMOVED_EVENT_TYPE,
+  REMOVED_MESSAGE_IDS_PAYLOAD_KEY,
   USER_MESSAGE_ID_PAYLOAD_KEY,
   CODEX_ASP_TRANSCRIPT_UPDATED_EVENT_TYPE,
   CODEX_QUOTA_STATUS_EVENT_TYPE,
@@ -7584,6 +7611,8 @@ export {
   isAgentBackendEvent,
   getUserMessage,
   getUserMessageId,
+  getRemovedMessageIds,
+  excludeQueuedAcceptedEvents,
   getEventTimestampMs,
   areSameUserMessageEvents,
   parseAgentEventJsonlWithCodexAspTranscript,

package/dist/src/{chunk-SQX57KJM.js → chunk-FFNEC4SD.js}

@@ -4,7 +4,7 @@ const require = __createRequire(import.meta.url);
 import {
   HOOK_EXEC_MAX_BUFFER_BYTES,
   isVersionBelow
-} from "./chunk-UQETFAOK.js";
+} from "./chunk-DC6RPXQZ.js";
 
 // src/utils/codex-agent-env.ts
 function buildCodexAgentEnv(source = process.env) {
@@ -241,7 +241,7 @@ var DEFAULT_CODEX_ARGS = [
 var MIN_CODEX_CLI_VERSION = "0.153.3";
 var CODEX_UPGRADE_TIMEOUT_MS = 12e4;
 var codexCliVersionEnsured = null;
-var ENGINE_PACKAGE_VERSION = "0.1.765";
+var ENGINE_PACKAGE_VERSION = "0.1.766";
 var INITIALIZE_METHOD = "initialize";
 var INITIALIZED_NOTIFICATION = "initialized";
 var ACCOUNT_LOGIN_START_METHOD = "account/login/start";

package/dist/src/{chunk-L2BNNGQB.js → chunk-ZXZ2COVG.js}

@@ -4,7 +4,7 @@ const require = __createRequire(import.meta.url);
 import {
   findCodeHostPullRequestUrls,
   mayCreatePullRequest
-} from "./chunk-UQETFAOK.js";
+} from "./chunk-DC6RPXQZ.js";
 
 // src/services/post-tool-pr-notifier.ts
 async function notifyPostToolUse(toolName, toolInput, toolResult) {

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

@@ -3,12 +3,12 @@ import { createRequire as __createRequire } from 'node:module';
 const require = __createRequire(import.meta.url);
 import {
   evaluateCommandProtection
-} from "./chunk-CWSZPPD6.js";
-import "./chunk-WFWT2YFN.js";
+} from "./chunk-2ZDB6AIE.js";
+import "./chunk-5R2WQ34N.js";
 import {
   isRecord
 } from "./chunk-UZSNFLDQ.js";
-import "./chunk-UQETFAOK.js";
+import "./chunk-DC6RPXQZ.js";
 import "./chunk-VEQXQN22.js";
 
 // src/command-protection-hook.ts

package/dist/src/deepseek-command-protection-plugin.js

@@ -3,13 +3,13 @@ import { createRequire as __createRequire } from 'node:module';
 const require = __createRequire(import.meta.url);
 import {
   evaluateCommandProtection
-} from "./chunk-CWSZPPD6.js";
+} from "./chunk-2ZDB6AIE.js";
 import {
   notifyPostToolUse
-} from "./chunk-L2BNNGQB.js";
-import "./chunk-WFWT2YFN.js";
+} from "./chunk-ZXZ2COVG.js";
+import "./chunk-5R2WQ34N.js";
 import "./chunk-UZSNFLDQ.js";
-import "./chunk-UQETFAOK.js";
+import "./chunk-DC6RPXQZ.js";
 import "./chunk-VEQXQN22.js";
 
 // src/deepseek-command-protection-plugin.ts

package/dist/src/headless-agent.js

@@ -8,12 +8,12 @@ import {
 import {
   AppServerProcess,
   buildCodexAgentEnv
-} from "./chunk-SQX57KJM.js";
+} from "./chunk-FFNEC4SD.js";
 import {
   AGENT,
   getMemoryOutputSafetyViolation,
   headlessAgentRequestSchema
-} from "./chunk-UQETFAOK.js";
+} from "./chunk-DC6RPXQZ.js";
 import "./chunk-VEQXQN22.js";
 
 // src/headless-agent.ts

package/dist/src/index.js

@@ -91,7 +91,7 @@ import {
   evaluateCommandProtection,
   extractToolCommand,
   reportCommandProtectionBlock
-} from "./chunk-CWSZPPD6.js";
+} from "./chunk-2ZDB6AIE.js";
 import {
   ACCOUNT_RATE_LIMITS_UPDATED_METHOD,
   AGENT_MESSAGE_DELTA_METHOD,
@@ -124,20 +124,20 @@ import {
   recordCredentialFallback,
   recordExhaustedCredential,
   restartCodexAspHost
-} from "./chunk-4OLXBASZ.js";
+} from "./chunk-AL25Z6UZ.js";
 import {
   ENGINE_ENV,
   IS_WARMING_MODE,
   monolithRequest,
   monolithService,
   setAgentCredentialSnapshot
-} from "./chunk-WFWT2YFN.js";
+} from "./chunk-5R2WQ34N.js";
 import {
   AspClient,
   SUBPROCESS_MAX_BUFFER,
   execAsync,
   execFileAsync
-} from "./chunk-SQX57KJM.js";
+} from "./chunk-FFNEC4SD.js";
 import {
   isRecord as isRecord2
 } from "./chunk-UZSNFLDQ.js";
@@ -207,6 +207,8 @@ import {
   MEMORY_INDEX_FILENAME,
   MEMORY_ROOT,
   MERGED_MESSAGE_SEPARATOR,
+  QUEUED_MESSAGE_REMOVED_EVENT_TYPE,
+  REMOVED_MESSAGE_IDS_PAYLOAD_KEY,
   REPLICAS_CONFIG_FILENAMES,
   SANDBOX_PATHS,
   TIMEOUT,
@@ -248,6 +250,7 @@ import {
   describeQuotaLimit,
   detectAgentQuotaLimit,
   detectLanguageByPath,
+  excludeQueuedAcceptedEvents,
   extractErrorText,
   extractToolResultText,
   fetchAiGatewayModels,
@@ -268,6 +271,7 @@ import {
   getGoalCommand,
   getGoalCommandObjectiveValidationError,
   getProviderDisplayName,
+  getRemovedMessageIds,
   getSlashCommandsForProvider,
   getUserMessage,
   getUserMessageId,
@@ -333,7 +337,7 @@ import {
   spawnRelaySubagentRequestSchema,
   stripAgentDiagnosticErrors,
   withTimeout
-} from "./chunk-UQETFAOK.js";
+} from "./chunk-DC6RPXQZ.js";
 import {
   __commonJS,
   __export,
@@ -10684,7 +10688,7 @@ function workspaceChatEventSignals(event) {
     streamId: getClaudePartialMessageStreamId(event),
     json,
     userMessage: getComparableUserMessage(event),
-    userMessageId: getUserMessageId(event)
+    userMessageId: event.type === QUEUED_MESSAGE_REMOVED_EVENT_TYPE ? null : getUserMessageId(event)
   };
 }
 var emptyIndex = () => ({
@@ -10749,7 +10753,17 @@ function findDuplicatePosition(index, event) {
   }
   return match;
 }
-function mergeWorkspaceChatHistoryEvents(primary, supplemental) {
+function mergeWorkspaceChatHistoryEvents(primary, supplemental, removedMessageIds = []) {
+  const removed = new Set(removedMessageIds);
+  for (const events of [primary, supplemental]) {
+    for (const event of events) {
+      for (const messageId of getRemovedMessageIds(event)) removed.add(messageId);
+    }
+  }
+  if (removed.size > 0) {
+    primary = excludeQueuedAcceptedEvents(primary, [], [...removed]);
+    supplemental = excludeQueuedAcceptedEvents(supplemental, [], [...removed]);
+  }
   if (supplemental.length === 0) return [...primary];
   const merged = [...primary];
   const index = emptyIndex();
@@ -11573,22 +11587,6 @@ var MessageQueueService = class {
   getQueue() {
     return [...this.queue];
   }
-  /**
-   * Remove a message from the queue by its ID
-   * @returns true if the message was found and removed
-   */
-  removeFromQueue(messageId) {
-    const index = this.queue.findIndex((m) => m.id === messageId);
-    if (index === -1) return false;
-    this.queue.splice(index, 1);
-    return true;
-  }
-  clearQueue() {
-    const hadMessages = this.queue.length > 0;
-    this.queueCancellationVersion++;
-    this.queue = [];
-    return hadMessages;
-  }
   updateQueuedMessage(messageId, message) {
     const queuedMessage = this.queue.find((item) => item.id === messageId);
     if (!queuedMessage) return false;
@@ -11742,7 +11740,7 @@ var CodingAgentManager = class {
     );
     this.initialized = this.initialize();
   }
-  async persistAcceptedMessage(event) {
+  async persistHistoryEvent(event) {
     const history = this.getHistorySink();
     if (!history?.appendDurably) throw new Error("Chat history is unavailable");
     await history.appendDurably(event);
@@ -11782,11 +11780,32 @@ var CodingAgentManager = class {
       ...m.senderDisplayName ? { senderDisplayName: m.senderDisplayName } : {}
     }));
   }
-  removeFromQueue(messageId) {
-    return this.messageQueue.removeFromQueue(messageId);
+  async removeFromQueue(messageId, persistRemoval) {
+    return this.removeQueuedMessages([messageId], persistRemoval);
+  }
+  async clearQueue(persistRemoval) {
+    const messageIds = this.messageQueue.getQueue().map(({ id }) => id);
+    return this.removeQueuedMessages(messageIds, () => persistRemoval(messageIds));
   }
-  clearQueue() {
-    return this.messageQueue.clearQueue();
+  async removeQueuedMessages(messageIds, persistRemoval) {
+    const taken = messageIds.flatMap((messageId) => {
+      const item = this.messageQueue.takeFromQueue(messageId);
+      return item ? [item] : [];
+    });
+    if (taken.length === 0) return false;
+    try {
+      await persistRemoval();
+      return true;
+    } catch (error) {
+      this.restoreQueuedMessages(taken);
+      throw error;
+    }
+  }
+  restoreQueuedMessages(taken) {
+    for (let index = taken.length - 1; index >= 0; index--) {
+      this.messageQueue.restoreToQueue(taken[index].message, taken[index].index);
+    }
+    this.messageQueue.resumeIfIdle();
   }
   updateQueuedMessage(messageId, message) {
     return this.messageQueue.updateQueuedMessage(messageId, message);
@@ -11818,11 +11837,10 @@ var CodingAgentManager = class {
     if (!steered) {
       if (keepQueued) {
         const prioritized = this.messageQueue.takeFromQueue(messageId);
-        if (prioritized) this.messageQueue.restoreToQueue(prioritized.message, taken.index);
+        if (prioritized) this.restoreQueuedMessages([{ message: prioritized.message, index: taken.index }]);
       } else {
-        this.messageQueue.restoreToQueue(taken.message, taken.index);
+        this.restoreQueuedMessages([taken]);
       }
-      this.messageQueue.resumeIfIdle();
     }
     return {
       success: steered,
@@ -61003,7 +61021,9 @@ async function uploadChatTranscript(chatId, filePath, chat, capture) {
   } catch (error) {
     if (!(error && typeof error === "object" && "code" in error && error.code === "ENOENT")) throw error;
   }
-  if (historyPages.index.codexAspTranscript) metadata.historyIndex = historyPages.index;
+  if (historyPages.index.codexAspTranscript || historyPages.index.removedMessageIds?.length) {
+    metadata.historyIndex = historyPages.index;
+  }
   const uploadRequest = { chatId, size, metadata };
   const prepareResponse = await monolithRequest("/v1/engine/chat-transcripts/upload-url", {
     body: uploadRequest
@@ -61310,6 +61330,7 @@ function acceptedEventInCodexTranscript(acceptedEvent, transcript) {
 }
 var LAST_MESSAGE_PREVIEW_MAX = 200;
 var MAX_ACCEPTED_SEND_RESPONSES = 50;
+var MAX_REMOVED_MESSAGE_IDS = 6e3;
 var RELAY_SUBAGENT_POLL_INTERVAL_MS = 2e3;
 var DEFAULT_RELAY_SUBAGENT_TIMEOUT_MS = 6e5;
 async function resolveRelayBaseProvider(provider, requested) {
@@ -61346,6 +61367,7 @@ function normalizePersistedChat(chat) {
     lastMessageText: chat.lastMessageText ?? null,
     deletedAt: chat.deletedAt ?? null,
     fork: coerceChatForkInfo(chat.fork),
+    removedMessageIds: Array.isArray(chat.removedMessageIds) ? chat.removedMessageIds.filter((id) => typeof id === "string").slice(-MAX_REMOVED_MESSAGE_IDS) : [],
     acceptedSendResponses: isRecord2(chat.acceptedSendResponses) ? Object.fromEntries(Object.entries(chat.acceptedSendResponses).filter((entry) => {
       const response = entry[1];
       return isRecord2(response) && typeof response.messageId === "string" && typeof response.queued === "boolean" && typeof response.position === "number";
@@ -61608,7 +61630,7 @@ var ChatService = class {
       submittedAt
     );
     try {
-      await chat.provider.persistAcceptedMessage(acceptedEvent);
+      await chat.provider.persistHistoryEvent(acceptedEvent);
     } catch (error) {
       throw new ChatMessagePersistenceError(error);
     }
@@ -61627,10 +61649,12 @@ var ChatService = class {
       }
       chat.persisted.acceptedSendResponses = Object.fromEntries(chat.acceptedSendResponses);
     }
-    if (!chat.pendingMessageIds.includes(result.messageId)) {
-      chat.pendingMessageIds.push(result.messageId);
+    if (!chat.persisted.removedMessageIds?.includes(result.messageId)) {
+      if (!chat.pendingMessageIds.includes(result.messageId)) {
+        chat.pendingMessageIds.push(result.messageId);
+      }
+      chat.acceptedUserEvents.set(result.messageId, acceptedEvent);
     }
-    chat.acceptedUserEvents.set(result.messageId, acceptedEvent);
     chat.persisted.lastMessageText = request.message.trim().slice(0, LAST_MESSAGE_PREVIEW_MAX) || null;
     chat.persisted.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
@@ -61750,43 +61774,56 @@ var ChatService = class {
       queue: chat.provider.getQueue()
     };
   }
-  // A message removed from the queue will never run a turn, so its pending
-  // bookkeeping must go with it or hasActiveChatTurn stays true forever.
-  forgetPendingMessages(chat, messageIds) {
+  async forgetPendingMessages(chat, messageIds) {
     if (messageIds.length === 0) return;
     const removed = new Set(messageIds);
+    const event = {
+      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+      type: QUEUED_MESSAGE_REMOVED_EVENT_TYPE,
+      payload: { [REMOVED_MESSAGE_IDS_PAYLOAD_KEY]: [...removed] }
+    };
+    await chat.provider.persistHistoryEvent(event);
+    chat.persisted.removedMessageIds = [.../* @__PURE__ */ new Set([...chat.persisted.removedMessageIds ?? [], ...removed])].slice(-MAX_REMOVED_MESSAGE_IDS);
     chat.pendingMessageIds = chat.pendingMessageIds.filter((messageId) => !removed.has(messageId));
     for (const messageId of removed) {
       chat.acceptedUserEvents.delete(messageId);
       chat.errorNotificationTargets.delete(messageId);
     }
+    await this.persistAllChats().catch((error) => {
+      console.error("[ChatService] Failed to persist queued-message removals:", error);
+    });
+    await this.publish({
+      type: "chat.turn.delta",
+      payload: { chatId: chat.persisted.id, event }
+    }).catch((error) => {
+      console.error("[ChatService] Failed to publish queued-message removals:", error);
+    });
     this.publish({
       type: "chat.updated",
       payload: { chat: this.toSummary(chat) }
     }).catch(() => {
     });
   }
-  removeFromQueue(chatId, messageId) {
+  async removeFromQueue(chatId, messageId) {
     const chat = this.requireChat(chatId);
-    const success = chat.provider.removeFromQueue(messageId);
-    if (success) {
-      this.forgetPendingMessages(chat, [messageId]);
-    }
+    const success = await chat.provider.removeFromQueue(messageId, () => this.forgetPendingMessages(chat, [messageId]));
     return {
       success,
-      queue: chat.provider.getQueue()
+      queue: chat.provider.getQueue(),
+      removedMessageIds: success ? [messageId] : []
     };
   }
-  clearQueue(chatId) {
+  async clearQueue(chatId) {
     const chat = this.requireChat(chatId);
-    const queuedIds = chat.provider.getQueue().map((message) => message.id);
-    const success = chat.provider.clearQueue();
-    if (success) {
-      this.forgetPendingMessages(chat, queuedIds);
-    }
+    let queuedIds = [];
+    const success = await chat.provider.clearQueue(async (messageIds) => {
+      queuedIds = messageIds;
+      await this.forgetPendingMessages(chat, messageIds);
+    });
     return {
       success,
-      queue: chat.provider.getQueue()
+      queue: chat.provider.getQueue(),
+      removedMessageIds: success ? queuedIds : []
     };
   }
   updateQueuedMessage(chatId, messageId, message) {
@@ -62038,7 +62075,11 @@ var ChatService = class {
       chat.provider.getHistory(page2),
       this.readSenders(chatId)
     ]);
-    const historyEvents = mergeWorkspaceChatHistoryEvents([], history.events);
+    const historyEvents = excludeQueuedAcceptedEvents(
+      mergeWorkspaceChatHistoryEvents([], history.events),
+      chat.provider.getQueue(),
+      chat.persisted.removedMessageIds
+    );
     for (const [messageId, acceptedEvent] of chat.acceptedUserEvents) {
       if (acceptedEventInCodexTranscript(acceptedEvent, history.codexAspTranscript) || historyEvents.some((event) => isSameAcceptedUserEvent(event, acceptedEvent))) {
         chat.acceptedUserEvents.delete(messageId);
@@ -62047,12 +62088,17 @@ var ChatService = class {
     const isLatestPage = isLatestChatHistoryPage(page2);
     const queuedMessageIds = new Set(chat.provider.getQueue().map((message) => message.id));
     const acceptedEvents = (isLatestPage ? [...chat.acceptedUserEvents.entries()] : []).filter(([messageId]) => messageId === chat.activeMessageId || !chat.hasActiveTurn && chat.pendingMessageIds[0] === messageId && !queuedMessageIds.has(messageId)).map(([, acceptedEvent]) => acceptedEvent).filter((acceptedEvent) => !acceptedEventInCodexTranscript(acceptedEvent, history.codexAspTranscript) && !historyEvents.some((event) => isSameAcceptedUserEvent(event, acceptedEvent)));
-    const events = [...historyEvents, ...acceptedEvents].sort((a, b) => getEventTimestampMs(a) - getEventTimestampMs(b));
+    const events = excludeQueuedAcceptedEvents(
+      [...historyEvents, ...acceptedEvents].sort((a, b) => getEventTimestampMs(a) - getEventTimestampMs(b)),
+      [],
+      chat.persisted.removedMessageIds
+    );
     if (page2.limit !== void 0 && "beforeCursor" in history) {
       const cursor = parseChatHistoryCursor(history.beforeCursor ?? void 0);
       return {
         ...history,
         events,
+        removedMessageIds: chat.persisted.removedMessageIds,
         goal: history.goal ?? chat.provider.getGoal?.() ?? null,
         senders: getChatHistoryPageSenders(senders, page2),
         beforeCursor: createChatHistoryCursor({
@@ -62065,6 +62111,7 @@ var ChatService = class {
       return {
         ...history,
         events,
+        removedMessageIds: chat.persisted.removedMessageIds,
         totalEvents: (history.totalEvents ?? history.eventsStartIndex + history.events.length) - (history.events.length - historyEvents.length) + acceptedEvents.length,
         goal: history.goal ?? chat.provider.getGoal?.() ?? null,
         senders
@@ -62073,6 +62120,7 @@ var ChatService = class {
     return paginateChatHistory({
       thread_id: history.thread_id,
       events,
+      removedMessageIds: chat.persisted.removedMessageIds,
       codexAspTranscript: history.codexAspTranscript ?? null,
       goal: history.goal ?? chat.provider.getGoal?.() ?? null,
       senders
@@ -63918,9 +63966,9 @@ function createV1Routes(deps) {
       return c.json(jsonError("Failed to get queue", error instanceof Error ? error.message : "Unknown error"), 500);
     }
   });
-  app2.delete("/chats/:chatId/queue", (c) => {
+  app2.delete("/chats/:chatId/queue", async (c) => {
     try {
-      const result = deps.chatService.clearQueue(c.req.param("chatId"));
+      const result = await deps.chatService.clearQueue(c.req.param("chatId"));
       return c.json(result);
     } catch (error) {
       if (error instanceof ChatNotFoundError) {
@@ -63929,9 +63977,9 @@ function createV1Routes(deps) {
       return c.json(jsonError("Failed to clear queue", error instanceof Error ? error.message : "Unknown error"), 500);
     }
   });
-  app2.delete("/chats/:chatId/queue/:messageId", (c) => {
+  app2.delete("/chats/:chatId/queue/:messageId", async (c) => {
     try {
-      const result = deps.chatService.removeFromQueue(c.req.param("chatId"), c.req.param("messageId"));
+      const result = await deps.chatService.removeFromQueue(c.req.param("chatId"), c.req.param("messageId"));
       return c.json(result);
     } catch (error) {
       if (error instanceof ChatNotFoundError) {

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

@@ -3,11 +3,11 @@ import { createRequire as __createRequire } from 'node:module';
 const require = __createRequire(import.meta.url);
 import {
   notifyPostToolUse
-} from "./chunk-L2BNNGQB.js";
+} from "./chunk-ZXZ2COVG.js";
 import {
   isRecord
 } from "./chunk-UZSNFLDQ.js";
-import "./chunk-UQETFAOK.js";
+import "./chunk-DC6RPXQZ.js";
 import "./chunk-VEQXQN22.js";
 
 // src/post-tool-pr-hook.ts

package/dist/src/relay-mcp.js

@@ -4,7 +4,7 @@ const require = __createRequire(import.meta.url);
 import {
   messageRelaySubagentRequestSchema,
   spawnRelaySubagentRequestSchema
-} from "./chunk-UQETFAOK.js";
+} from "./chunk-DC6RPXQZ.js";
 import "./chunk-VEQXQN22.js";
 
 // src/relay-mcp.ts

package/package.json

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