replicas-engine 0.1.687 → 0.1.688

package/dist/src/{chunk-X6R4RI77.js → chunk-KS4CJNWB.js}

@@ -3837,6 +3837,7 @@ var HOSTED_COMPOSIO_PLUGIN_DEFINITIONS = [
   ["xero", "xero", "OAUTH2", false, "business", "Xero"],
   ["brex", "brex", "API_KEY", false, "business", "Brex"],
   ["buffer", "buffer", "OAUTH2", false, "business", "Buffer"],
+  ["docusign", "docusign", "OAUTH2", false, "business", "DocuSign"],
   ["canva", "canva", "OAUTH2", true, "productivity", "Canva"],
   ["webflow", "webflow", "API_KEY", false, "business", "Webflow"],
   ["firecrawl", "firecrawl", "API_KEY", false, "data", "Firecrawl"],
@@ -4027,6 +4028,86 @@ function isTerminalBackgroundTaskStatus(status) {
 // ../shared/src/display-message/constants.ts
 var USER_MESSAGE_MATCH_GRACE_PERIOD_MS = 3e4;
 
+// ../shared/src/user-message-matching.ts
+function parseTimestampMs(timestamp) {
+  const value = 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/agent-event-utils.ts
+function getUserMessage(event) {
+  return event.type === "event_msg" && event.payload.type === "user_message" && typeof event.payload.message === "string" ? event.payload.message : null;
+}
+function getUserMessageId(event) {
+  const messageId = event.payload[USER_MESSAGE_ID_PAYLOAD_KEY];
+  return typeof messageId === "string" ? messageId : null;
+}
+function getUserMessageItemId(event) {
+  const itemId = event.payload[CODEX_ASP_ITEM_ID_PAYLOAD_KEY];
+  return typeof itemId === "string" ? itemId : null;
+}
+function getEventTimestampMs(event) {
+  return parseTimestampMs(event.timestamp);
+}
+function areSameUserMessageEvents(a, b) {
+  const aMessage = getUserMessage(a);
+  const bMessage = getUserMessage(b);
+  if (!aMessage || aMessage !== bMessage) return false;
+  const aMessageId = getUserMessageId(a);
+  const bMessageId = getUserMessageId(b);
+  if (aMessageId || bMessageId) return aMessageId === bMessageId;
+  const aItemId = getUserMessageItemId(a);
+  const bItemId = getUserMessageItemId(b);
+  if (aItemId || bItemId) return aItemId === bItemId;
+  return areUserMessagesWithinMatchWindow(
+    { content: aMessage, timestamp: a.timestamp },
+    { content: bMessage, timestamp: b.timestamp }
+  );
+}
+function parseAgentEventJsonl(content, options = {}) {
+  const events = [];
+  for (const line of content.split("\n")) {
+    const trimmed = line.trim();
+    if (!trimmed) continue;
+    try {
+      const parsed = JSON.parse(trimmed);
+      if (isAgentBackendEvent(parsed)) {
+        events.push(parsed);
+      } else {
+        options.onInvalidLine?.({ line: trimmed });
+      }
+    } catch (error) {
+      options.onInvalidLine?.({ line: trimmed, error });
+    }
+  }
+  return events;
+}
+function parseAgentEventJsonlWithCodexAspTranscript(content, options = {}) {
+  const events = [];
+  let transcript = null;
+  const transcriptsByThreadId = /* @__PURE__ */ new Map();
+  for (const event of parseAgentEventJsonl(content, options)) {
+    if (event.type !== CODEX_ASP_TRANSCRIPT_UPDATED_EVENT_TYPE) {
+      events.push(event);
+      continue;
+    }
+    const delta = event.payload.transcriptDelta;
+    if (isCodexAspTranscriptDelta(delta)) {
+      const previous = transcriptsByThreadId.get(delta.threadId) ?? null;
+      transcript = applyCodexAspTranscriptDelta(previous, delta);
+    } else if (isCodexAspTranscript(event.payload.transcript)) {
+      transcript = event.payload.transcript;
+    }
+    if (transcript) {
+      transcriptsByThreadId.set(transcript.threadId, transcript);
+    }
+  }
+  return { events, transcript, transcriptsByThreadId };
+}
+
 // ../shared/src/json.ts
 function safeJsonParse(str, fallback) {
   try {
@@ -4107,6 +4188,12 @@ function createCallDisplayMessage(message) {
     timestamp: message.timestamp
   };
 }
+function insertDisplayMessageByTimestamp(messages, message) {
+  const messageMs = parseTimestampMs(message.timestamp);
+  let index = messages.length;
+  while (index > 0 && parseTimestampMs(messages[index - 1].timestamp) > messageMs) index--;
+  messages.splice(index, 0, message);
+}
 
 // ../shared/src/display-message/format.ts
 function unquoteShellArg(value) {
@@ -4174,86 +4261,6 @@ function skillNamesFromCommand(command) {
   })));
 }
 
-// ../shared/src/user-message-matching.ts
-function parseTimestampMs(timestamp) {
-  const value = 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/agent-event-utils.ts
-function getUserMessage(event) {
-  return event.type === "event_msg" && event.payload.type === "user_message" && typeof event.payload.message === "string" ? event.payload.message : null;
-}
-function getUserMessageId(event) {
-  const messageId = event.payload[USER_MESSAGE_ID_PAYLOAD_KEY];
-  return typeof messageId === "string" ? messageId : null;
-}
-function getUserMessageItemId(event) {
-  const itemId = event.payload[CODEX_ASP_ITEM_ID_PAYLOAD_KEY];
-  return typeof itemId === "string" ? itemId : null;
-}
-function getEventTimestampMs(event) {
-  return parseTimestampMs(event.timestamp);
-}
-function areSameUserMessageEvents(a, b) {
-  const aMessage = getUserMessage(a);
-  const bMessage = getUserMessage(b);
-  if (!aMessage || aMessage !== bMessage) return false;
-  const aMessageId = getUserMessageId(a);
-  const bMessageId = getUserMessageId(b);
-  if (aMessageId || bMessageId) return aMessageId === bMessageId;
-  const aItemId = getUserMessageItemId(a);
-  const bItemId = getUserMessageItemId(b);
-  if (aItemId || bItemId) return aItemId === bItemId;
-  return areUserMessagesWithinMatchWindow(
-    { content: aMessage, timestamp: a.timestamp },
-    { content: bMessage, timestamp: b.timestamp }
-  );
-}
-function parseAgentEventJsonl(content, options = {}) {
-  const events = [];
-  for (const line of content.split("\n")) {
-    const trimmed = line.trim();
-    if (!trimmed) continue;
-    try {
-      const parsed = JSON.parse(trimmed);
-      if (isAgentBackendEvent(parsed)) {
-        events.push(parsed);
-      } else {
-        options.onInvalidLine?.({ line: trimmed });
-      }
-    } catch (error) {
-      options.onInvalidLine?.({ line: trimmed, error });
-    }
-  }
-  return events;
-}
-function parseAgentEventJsonlWithCodexAspTranscript(content, options = {}) {
-  const events = [];
-  let transcript = null;
-  const transcriptsByThreadId = /* @__PURE__ */ new Map();
-  for (const event of parseAgentEventJsonl(content, options)) {
-    if (event.type !== CODEX_ASP_TRANSCRIPT_UPDATED_EVENT_TYPE) {
-      events.push(event);
-      continue;
-    }
-    const delta = event.payload.transcriptDelta;
-    if (isCodexAspTranscriptDelta(delta)) {
-      const previous = transcriptsByThreadId.get(delta.threadId) ?? null;
-      transcript = applyCodexAspTranscriptDelta(previous, delta);
-    } else if (isCodexAspTranscript(event.payload.transcript)) {
-      transcript = event.payload.transcript;
-    }
-    if (transcript) {
-      transcriptsByThreadId.set(transcript.threadId, transcript);
-    }
-  }
-  return { events, transcript, transcriptsByThreadId };
-}
-
 // ../shared/src/display-message/parsers/codex-parser.ts
 function getStatusFromExitCode(exitCode) {
   return exitCode === 0 ? "completed" : "failed";
@@ -6040,6 +6047,7 @@ function duplicateBucketKey(message, bucketOffset = 0) {
 }
 function mergeCodexAspDisplayMessages(primary, supplemental) {
   const merged = [...primary];
+  const primaryCount = primary.length;
   const firstIndexById = /* @__PURE__ */ new Map();
   const indexesByDuplicateBucket = /* @__PURE__ */ new Map();
   const indexMessage = (message, index) => {
@@ -6076,14 +6084,18 @@ function mergeCodexAspDisplayMessages(primary, supplemental) {
       unindexMessage(merged[duplicateIndex], duplicateIndex);
       merged[duplicateIndex] = {
         ...merged[duplicateIndex],
-        id: message.id,
-        timestamp: message.timestamp
+        id: message.id
       };
       firstIndexById.set(message.id, duplicateIndex);
       indexMessage(merged[duplicateIndex], duplicateIndex);
     }
   }
-  return merged.map((message, index) => ({ message, index })).sort((a, b) => parseTimestampMs(a.message.timestamp) - parseTimestampMs(b.message.timestamp) || a.index - b.index).map(({ message }) => message);
+  const ordered = merged.slice(0, primaryCount);
+  const supplementalOnly = merged.slice(primaryCount).map((message, index) => ({ message, index })).sort((a, b) => parseTimestampMs(a.message.timestamp) - parseTimestampMs(b.message.timestamp) || a.index - b.index);
+  for (const { message } of supplementalOnly) {
+    insertDisplayMessageByTimestamp(ordered, message);
+  }
+  return ordered;
 }
 function parseCodexAspTranscript(transcript) {
   const messages = [];
@@ -6169,24 +6181,18 @@ function parseDisplayMessages(events, agentType, codexAspTranscript, options = {
   const shouldFilter = options.filter ?? true;
   const parsedEvents = agentType === "claude" || agentType === "relay" ? parseClaudeEvents(events, options.parentToolUseId) : parseAgentEvents(events, agentType);
   const legacyMessages = shouldFilter ? filterDisplayMessages(parsedEvents, agentType) : parsedEvents;
-  const finalize = (messages) => shouldFilter ? applyAuthFallbackNotices(applyInterruptions(messages, events), events) : messages;
+  const applySyntheticNotices = (messages) => shouldFilter ? applyAuthFallbackNotices(applyInterruptions(messages, events), events) : messages;
   if (agentType !== "codex" || !codexAspTranscript) {
-    return finalize(legacyMessages);
+    return applySyntheticNotices(legacyMessages);
   }
   const nativeCodexMessages = shouldFilter ? filterDisplayMessages(parseCodexAspTranscript(codexAspTranscript), agentType) : parseCodexAspTranscript(codexAspTranscript);
-  return finalize(mergeCodexAspDisplayMessages(nativeCodexMessages, legacyMessages));
-}
-function insertByTimestamp(messages, message) {
-  const messageMs = parseTimestampMs(message.timestamp);
-  let index = messages.length;
-  while (index > 0 && parseTimestampMs(messages[index - 1].timestamp) > messageMs) index--;
-  messages.splice(index, 0, message);
+  return applySyntheticNotices(mergeCodexAspDisplayMessages(nativeCodexMessages, legacyMessages));
 }
 function applyInterruptions(messages, events) {
   const result = [...messages];
   for (const event of events) {
     if (event.type !== CHAT_INTERRUPTED_EVENT_TYPE) continue;
-    insertByTimestamp(result, {
+    insertDisplayMessageByTimestamp(result, {
       id: `interruption-${event.timestamp}`,
       type: "interruption",
       timestamp: event.timestamp
@@ -6233,7 +6239,7 @@ function applyAuthFallbackNotices(messages, events) {
   });
   if (notices.length === 0) return messages;
   const result = [...messages];
-  for (const notice of notices) insertByTimestamp(result, notice);
+  for (const notice of notices) insertDisplayMessageByTimestamp(result, notice);
   return result;
 }
 function isCodexInitializationPrompt(message) {
@@ -6755,7 +6761,7 @@ var DEFAULT_CODEX_ARGS = [
 var MIN_CODEX_CLI_VERSION = "0.144.6";
 var CODEX_UPGRADE_TIMEOUT_MS = 12e4;
 var codexCliVersionEnsured = null;
-var ENGINE_PACKAGE_VERSION = "0.1.687";
+var ENGINE_PACKAGE_VERSION = "0.1.688";
 var INITIALIZE_METHOD = "initialize";
 var INITIALIZED_NOTIFICATION = "initialized";
 var ACCOUNT_LOGIN_START_METHOD = "account/login/start";

package/dist/src/headless-agent.js

@@ -7,7 +7,7 @@ import {
   headlessAgentRequestSchema,
   putPresignedFile,
   recoverCompletedTurn
-} from "./chunk-X6R4RI77.js";
+} from "./chunk-KS4CJNWB.js";
 
 // src/headless-agent.ts
 import { createHash } from "crypto";

package/dist/src/index.js

@@ -192,7 +192,7 @@ import {
   serializeCanvasContentResponse,
   shellQuotePosix,
   stripAgentDiagnosticErrors
-} from "./chunk-X6R4RI77.js";
+} from "./chunk-KS4CJNWB.js";
 
 // src/index.ts
 import { serve } from "@hono/node-server";
@@ -3383,10 +3383,14 @@ var MessageQueueService = class {
   messageIdCounter = 0;
   processMessage;
   onProcessingChanged;
+  onMessageStarted;
+  acceptanceByMessage = /* @__PURE__ */ new WeakMap();
   constructor(processMessage, onProcessingChanged = () => {
+  }, onMessageStarted = async () => {
   }) {
     this.processMessage = processMessage;
     this.onProcessingChanged = onProcessingChanged;
+    this.onMessageStarted = onMessageStarted;
   }
   generateMessageId() {
     return `msg_${Date.now()}_${++this.messageIdCounter}`;
@@ -3395,15 +3399,20 @@ var MessageQueueService = class {
    * Add a message to the queue or start processing immediately if not busy
    * @returns Object indicating whether the message was queued or started processing
    */
-  async enqueue(request) {
+  async enqueue(request, onAccepted = async () => {
+  }) {
     if (this.processing && this.canMergeIntoTail(request)) {
       const tail = this.queue[this.queue.length - 1];
       this.mergeInto(tail, request);
-      return {
+      const response2 = {
         queued: true,
         messageId: tail.id,
         position: this.queue.length
       };
+      const acceptance = (this.acceptanceByMessage.get(tail) ?? Promise.resolve()).then(() => onAccepted(response2));
+      this.acceptanceByMessage.set(tail, acceptance);
+      await acceptance;
+      return response2;
     }
     const messageId = request.messageId ?? this.generateMessageId();
     const queuedMessage = {
@@ -3416,20 +3425,26 @@ var MessageQueueService = class {
     };
     if (this.processing) {
       this.queue.push(queuedMessage);
-      return {
+      const response2 = {
         queued: true,
         messageId,
         position: this.queue.length
       };
+      const acceptance = onAccepted(response2);
+      this.acceptanceByMessage.set(queuedMessage, acceptance);
+      await acceptance;
+      return response2;
     }
-    this.startProcessing(queuedMessage).catch((error) => {
-      console.error("[MessageQueue] Unhandled error in startProcessing:", error);
-    });
-    return {
+    const response = {
       queued: false,
       messageId,
       position: 0
     };
+    await onAccepted(response);
+    this.startProcessing(queuedMessage).catch((error) => {
+      console.error("[MessageQueue] Unhandled error in startProcessing:", error);
+    });
+    return response;
   }
   canMergeIntoTail(request) {
     if (!request.merge || !request.type) return false;
@@ -3447,6 +3462,15 @@ var MessageQueueService = class {
     this.processing = true;
     this.onProcessingChanged(true);
     try {
+      while (true) {
+        const acceptance = this.acceptanceByMessage.get(queuedMessage);
+        if (!acceptance) break;
+        await acceptance;
+        if (this.acceptanceByMessage.get(queuedMessage) !== acceptance) continue;
+        this.acceptanceByMessage.delete(queuedMessage);
+        break;
+      }
+      await this.onMessageStarted(queuedMessage);
       await this.processMessage(queuedMessage);
     } catch (error) {
       console.error("[MessageQueue] Error processing message:", error);
@@ -3562,6 +3586,7 @@ var CodingAgentManager = class {
   onEvent;
   hostOnTurnComplete;
   onProcessingChanged;
+  onMessageStarted;
   authFallback;
   compacting = false;
   constructor(options) {
@@ -3572,6 +3597,8 @@ var CodingAgentManager = class {
     this.hostOnTurnComplete = options.onTurnComplete;
     this.onProcessingChanged = options.onProcessingChanged ?? (() => {
     });
+    this.onMessageStarted = options.onMessageStarted ?? (async () => {
+    });
     this.authFallback = options.provider ? new AuthFallbackCoordinator(options.provider, (event) => {
       this.onEvent(event);
       this.getHistorySink()?.append(event);
@@ -3621,7 +3648,11 @@ var CodingAgentManager = class {
     historyFile.append(event);
   }
   initializeManager(processMessage) {
-    this.messageQueue = new MessageQueueService(processMessage, this.onProcessingChanged);
+    this.messageQueue = new MessageQueueService(
+      processMessage,
+      this.onProcessingChanged,
+      this.onMessageStarted
+    );
     this.initialized = this.initialize();
   }
   async interrupt() {
@@ -3671,9 +3702,9 @@ var CodingAgentManager = class {
   reorderQueue(messageId, newPosition) {
     return this.messageQueue.reorderQueue(messageId, newPosition);
   }
-  async enqueueMessage(request) {
+  async enqueueMessage(request, onAccepted) {
     await this.initialized;
-    return this.messageQueue.enqueue(request);
+    return this.messageQueue.enqueue(request, onAccepted);
   }
   // Take the message off the queue before steering: a turn completing mid-steer could otherwise pop it too.
   async steerFromQueue(messageId) {
@@ -7002,6 +7033,7 @@ var CodexAspManager = class extends CodingAgentManager {
     const observedTurnIds = /* @__PURE__ */ new Set();
     let lastCompletedTurn = null;
     let completedResolved = false;
+    let userMessageAttached = false;
     let goalContinuationTimer = null;
     const completedItems = [];
     const agentMessageDeltas = /* @__PURE__ */ new Map();
@@ -7030,6 +7062,11 @@ var CodexAspManager = class extends CodingAgentManager {
         resolveCompleted(lastCompletedTurn);
       }, GOAL_TURN_CONTINUATION_GRACE_MS);
     };
+    const attachUserMessage = (turn) => {
+      if (userMessageAttached) return;
+      userMessageAttached = true;
+      this.ensureTranscriptTurnUserMessage(threadId, turn, request);
+    };
     const handlers = {
       [ACCOUNT_RATE_LIMITS_UPDATED_METHOD]: (notification) => {
         this.handleRateLimits(notification.params.rateLimits);
@@ -7064,6 +7101,7 @@ var CodexAspManager = class extends CodingAgentManager {
         lastCompletedTurn = null;
         completedItems.length = 0;
         agentMessageDeltas.clear();
+        attachUserMessage(notification.params.turn);
         this.mergeTranscriptTurn(notification.params.threadId, notification.params.turn);
         this.emitTranscriptUpdated(notification.params.threadId, { immediate: true });
         linearForwarder.sendEvent(convertCodexAspNotification(notification, linearSessionId ?? ""));
@@ -7202,9 +7240,15 @@ var CodexAspManager = class extends CodingAgentManager {
       const started = await startTurn();
       tempImagePaths = started.tempImagePaths;
       if (started.turn) {
+        const alreadyObserved = observedTurnIds.has(started.turn.id);
         observedTurnId = started.turn.id;
         observedTurnIds.add(started.turn.id);
         this.activeTurnId = started.turn.id;
+        if (!alreadyObserved) {
+          attachUserMessage(started.turn);
+          this.mergeTranscriptTurn(threadId, started.turn);
+          this.emitTranscriptUpdated(threadId, { immediate: true });
+        }
       }
       const turn = await Promise.race([completed, disposed]);
       linearForwarder.flushThoughtAsResponse();
@@ -7449,6 +7493,28 @@ var CodexAspManager = class extends CodingAgentManager {
     }
     return turn;
   }
+  ensureTranscriptTurnUserMessage(threadId, turn, request) {
+    const timestamp = timestampFromSeconds(turn.startedAt);
+    const transcriptTurn = this.ensureTranscriptTurn(threadId, turn.id, timestamp);
+    const images = imageContentToUserMessageImages(request.images);
+    const userMessage = {
+      type: "userMessage",
+      id: request.messageId ?? `user-${turn.id}`,
+      content: request.message,
+      ...images ? { images } : {},
+      timestamp,
+      sequence: this.nextTranscriptSequence()
+    };
+    const existingIndex = findEquivalentCodexAspTranscriptItemIndex(transcriptTurn.items, userMessage);
+    if (existingIndex === -1) {
+      transcriptTurn.items.push(userMessage);
+    } else {
+      transcriptTurn.items[existingIndex] = mergeCodexAspTranscriptItem(
+        transcriptTurn.items[existingIndex],
+        userMessage
+      );
+    }
+  }
   mergeTranscriptTurn(threadId, turn) {
     const startedAt = timestampFromSeconds(turn.startedAt);
     const completedAt = turn.completedAt === null ? null : timestampFromSeconds(turn.completedAt);
@@ -10122,12 +10188,12 @@ var PiManager = class extends CodingAgentManager {
     await this.initialized;
     return mergeSlashCommands((this.session?.promptTemplates ?? []).map((template) => createProviderSlashCommand("pi", template.name, template.description)).filter((command) => Boolean(command)));
   }
-  async enqueueMessage(request) {
+  async enqueueMessage(request, onAccepted) {
     await this.initialized;
     if (!this.session && !this.getProviderCredentials()) {
       throw new Error("Aster or OpenRouter authentication is missing for Pi. Add an API key in Settings \u2192 Coding agents.");
     }
-    return this.messageQueue.enqueue(request);
+    return this.messageQueue.enqueue(request, onAccepted);
   }
   dispose() {
     this.unsubscribe?.();
@@ -10865,8 +10931,8 @@ var RelayManager = class {
       disallowedTools: []
     });
   }
-  async enqueueMessage(request) {
-    return this.inner.enqueueMessage(request);
+  async enqueueMessage(request, onAccepted) {
+    return this.inner.enqueueMessage(request, onAccepted);
   }
   async interrupt() {
     return this.inner.interrupt();
@@ -11840,6 +11906,23 @@ function isPiAvailable() {
 function isCursorAvailable() {
   return Boolean(ENGINE_ENV.CURSOR_API_KEY);
 }
+function createTurnMetadata(message, messageId, recordedAt) {
+  const event = createAcceptedUserMessageEvent(
+    message.message,
+    messageId,
+    recordedAt,
+    message.images
+  );
+  const sender = message.senderUserId && message.senderEmail ? {
+    messageId,
+    senderUserId: message.senderUserId,
+    senderEmail: message.senderEmail,
+    ...message.senderDisplayName ? { senderDisplayName: message.senderDisplayName } : {},
+    ...message.senderAvatarUrl ? { senderAvatarUrl: message.senderAvatarUrl } : {},
+    recordedAt
+  } : void 0;
+  return { event, ...sender ? { sender } : {} };
+}
 function isSameAcceptedUserEvent(event, acceptedEvent) {
   const eventMessageId = getUserMessageId(event);
   if (eventMessageId && eventMessageId === getUserMessageId(acceptedEvent)) return true;
@@ -12056,7 +12139,12 @@ var ChatService = class {
         return accepted;
       }
     }
-    const result = await chat.provider.enqueueMessage(request);
+    return chat.provider.enqueueMessage(
+      request,
+      (result) => this.handleMessageAccepted(chatId, chat, request, result)
+    );
+  }
+  async handleMessageAccepted(chatId, chat, request, result) {
     if (request.idempotencyKey) {
       chat.acceptedSendResponses.set(request.idempotencyKey, result);
       for (const key of chat.acceptedSendResponses.keys()) {
@@ -12066,11 +12154,10 @@ var ChatService = class {
       chat.persisted.acceptedSendResponses = Object.fromEntries(chat.acceptedSendResponses);
     }
     const submittedAt = request.submittedAt ?? (/* @__PURE__ */ new Date()).toISOString();
-    const acceptedEvent = createAcceptedUserMessageEvent(
-      request.message,
+    const { event: acceptedEvent, sender: recordedSender } = createTurnMetadata(
+      request,
       result.messageId,
-      submittedAt,
-      request.images
+      submittedAt
     );
     if (!chat.pendingMessageIds.includes(result.messageId)) {
       chat.pendingMessageIds.push(result.messageId);
@@ -12082,16 +12169,7 @@ var ChatService = class {
     chat.acceptedUserEvents.set(result.messageId, acceptedEvent);
     chat.persisted.lastMessageText = request.message.trim().slice(0, LAST_MESSAGE_PREVIEW_MAX) || null;
     this.touch(chat);
-    let recordedSender;
-    if (request.senderUserId && request.senderEmail) {
-      recordedSender = {
-        messageId: result.messageId,
-        senderUserId: request.senderUserId,
-        senderEmail: request.senderEmail,
-        ...request.senderDisplayName ? { senderDisplayName: request.senderDisplayName } : {},
-        ...request.senderAvatarUrl ? { senderAvatarUrl: request.senderAvatarUrl } : {},
-        recordedAt: submittedAt
-      };
+    if (recordedSender) {
       await this.appendSender(chatId, recordedSender);
     }
     await this.publish({
@@ -12105,11 +12183,6 @@ var ChatService = class {
         ...recordedSender ? { sender: recordedSender } : {}
       }
     });
-    return {
-      messageId: result.messageId,
-      queued: result.queued,
-      position: result.position
-    };
   }
   async appendSender(chatId, sender) {
     try {
@@ -12464,6 +12537,7 @@ var ChatService = class {
     const onProviderEvent = (event) => {
       this.handleTurnEvent(persisted.id, event);
     };
+    const onMessageStarted = (message) => this.handleTurnStarted(persisted.id, message);
     const onProcessingChanged = (processing) => {
       if (processing) return;
       const chat = this.getRuntimeChat(persisted.id);
@@ -12486,7 +12560,8 @@ var ChatService = class {
         onSaveSessionId: saveSession,
         onTurnComplete: onProviderTurnComplete,
         onEvent: onProviderEvent,
-        onProcessingChanged
+        onProcessingChanged,
+        onMessageStarted
       });
     } else if (persisted.provider === "relay") {
       const getProviderAvailability = () => ({
@@ -12506,6 +12581,7 @@ var ChatService = class {
         onTurnComplete: onProviderTurnComplete,
         onEvent: onProviderEvent,
         onProcessingChanged,
+        onMessageStarted,
         chatId: persisted.id,
         ...getProviderAvailability(),
         getProviderAvailability
@@ -12518,7 +12594,8 @@ var ChatService = class {
         onSaveSessionId: saveSession,
         onTurnComplete: onProviderTurnComplete,
         onEvent: onProviderEvent,
-        onProcessingChanged
+        onProcessingChanged,
+        onMessageStarted
       });
     } else if (persisted.provider === "deepseek") {
       provider = new DeepseekManager({
@@ -12528,7 +12605,8 @@ var ChatService = class {
         onSaveSessionId: saveSession,
         onTurnComplete: onProviderTurnComplete,
         onEvent: onProviderEvent,
-        onProcessingChanged
+        onProcessingChanged,
+        onMessageStarted
       });
     } else if (persisted.provider === "fx") {
       provider = new FxManager({
@@ -12538,7 +12616,8 @@ var ChatService = class {
         onSaveSessionId: saveSession,
         onTurnComplete: onProviderTurnComplete,
         onEvent: onProviderEvent,
-        onProcessingChanged
+        onProcessingChanged,
+        onMessageStarted
       });
     } else if (persisted.provider === "kimi") {
       provider = new KimiManager({
@@ -12548,7 +12627,8 @@ var ChatService = class {
         onSaveSessionId: saveSession,
         onTurnComplete: onProviderTurnComplete,
         onEvent: onProviderEvent,
-        onProcessingChanged
+        onProcessingChanged,
+        onMessageStarted
       });
     } else if (persisted.provider === "opencode") {
       provider = new OpencodeManager({
@@ -12558,7 +12638,8 @@ var ChatService = class {
         onSaveSessionId: saveSession,
         onTurnComplete: onProviderTurnComplete,
         onEvent: onProviderEvent,
-        onProcessingChanged
+        onProcessingChanged,
+        onMessageStarted
       });
     } else if (persisted.provider === "pi") {
       provider = new PiManager({
@@ -12568,7 +12649,8 @@ var ChatService = class {
         onSaveSessionId: saveSession,
         onTurnComplete: onProviderTurnComplete,
         onEvent: onProviderEvent,
-        onProcessingChanged
+        onProcessingChanged,
+        onMessageStarted
       });
     } else {
       provider = new CodexAspManager({
@@ -12578,7 +12660,8 @@ var ChatService = class {
         onSaveSessionId: saveSession,
         onTurnComplete: onProviderTurnComplete,
         onEvent: onProviderEvent,
-        onProcessingChanged
+        onProcessingChanged,
+        onMessageStarted
       });
     }
     return {
@@ -12626,31 +12709,41 @@ var ChatService = class {
     }
     return chat;
   }
+  async handleTurnStarted(chatId, message) {
+    const chat = this.getRuntimeChat(chatId);
+    if (!chat) return;
+    chat.pendingMessageIds = chat.pendingMessageIds.filter((messageId) => messageId !== message.id);
+    chat.hasActiveTurn = true;
+    chat.activeMessageId = message.id;
+    const { event: acceptedEvent, sender } = createTurnMetadata(
+      message,
+      message.id,
+      message.queuedAt
+    );
+    chat.acceptedUserEvents.set(message.id, acceptedEvent);
+    this.agentChatActivityTrackerService.noteTurnStarted(
+      chat.persisted.id,
+      message.id,
+      chat.persisted.provider
+    );
+    chat.activeErrorNotificationTarget = chat.errorNotificationTargets.get(message.id) ?? null;
+    chat.errorNotificationTargets.delete(message.id);
+    await this.publish({
+      type: "chat.turn.started",
+      payload: {
+        chatId,
+        messageId: message.id,
+        event: acceptedEvent,
+        ...sender ? { sender } : {}
+      }
+    });
+  }
   handleTurnEvent(chatId, event) {
     const chat = this.getRuntimeChat(chatId);
     if (!chat) {
       return;
     }
     keepAliveService.noteActivity();
-    if (!chat.hasActiveTurn && chat.pendingMessageIds.length > 0) {
-      const messageId = chat.pendingMessageIds.shift();
-      if (!messageId) {
-        return;
-      }
-      chat.hasActiveTurn = true;
-      chat.activeMessageId = messageId;
-      this.agentChatActivityTrackerService.noteTurnStarted(chat.persisted.id, messageId, chat.persisted.provider);
-      chat.activeErrorNotificationTarget = chat.errorNotificationTargets.get(messageId) ?? null;
-      chat.errorNotificationTargets.delete(messageId);
-      this.publish({
-        type: "chat.turn.started",
-        payload: {
-          chatId: chat.persisted.id,
-          messageId
-        }
-      }).catch(() => {
-      });
-    }
     const codexTranscript = getCodexTranscriptFromEvent(event);
     if (chat.hasActiveTurn) {
       const displayMessages = codexTranscript ? parseLatestCodexAspTranscriptTurn(codexTranscript) : parseDisplayMessages([event], chat.persisted.provider, null, {
@@ -12698,6 +12791,7 @@ var ChatService = class {
       type: "chat.turn.delta",
       payload: {
         chatId,
+        ...chat.activeMessageId ? { messageId: chat.activeMessageId } : {},
         event: eventToPublish
       }
     }).catch(() => {

package/package.json

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

package/workspace-sdk/shared/routes/plugin-catalog.d.ts

@@ -154,13 +154,13 @@ export declare const PLUGIN_CATALOG: readonly [{
     readonly name: "turbopuffer";
     readonly description: "Query and manage turbopuffer namespaces.";
 }, ...{
-    id: "close" | "notion" | "jira" | "confluence" | "googlecalendar" | "microsoftteams" | "outlook" | "bitbucket" | "datadog" | "pagerduty" | "intercom" | "zendesk" | "hubspot" | "supabase" | "figma" | "launchdarkly" | "asana" | "clickup" | "trello" | "todoist" | "airtable" | "coda" | "miro" | "sharepoint" | "onedrive" | "googleslides" | "googlemeet" | "googletasks" | "dropbox" | "box" | "discord" | "discordbot" | "zoom" | "googlechat" | "newrelic" | "betterstack" | "incidentio" | "grafana" | "honeycomb" | "bugsnag" | "circleci" | "buildkite" | "dockerhub" | "digitalocean" | "railway" | "render" | "firebase" | "cloudinary" | "configcat" | "googleanalytics" | "googlebigquery" | "amplitude" | "mixpanel" | "segment" | "databricks" | "snowflake" | "algolia" | "elasticsearch" | "salesforce" | "pipedrive" | "apollo" | "gong" | "freshdesk" | "helpscout" | "servicenow" | "mailchimp" | "customerio" | "klaviyo" | "shopify" | "quickbooks" | "xero" | "brex" | "buffer" | "canva" | "webflow" | "firecrawl" | "browserbase" | "exa" | "youtube" | "twitter" | "instagram" | "facebook";
+    id: "close" | "notion" | "jira" | "confluence" | "googlecalendar" | "microsoftteams" | "outlook" | "bitbucket" | "datadog" | "pagerduty" | "intercom" | "zendesk" | "hubspot" | "supabase" | "figma" | "launchdarkly" | "asana" | "clickup" | "trello" | "todoist" | "airtable" | "coda" | "miro" | "sharepoint" | "onedrive" | "googleslides" | "googlemeet" | "googletasks" | "dropbox" | "box" | "discord" | "discordbot" | "zoom" | "googlechat" | "newrelic" | "betterstack" | "incidentio" | "grafana" | "honeycomb" | "bugsnag" | "circleci" | "buildkite" | "dockerhub" | "digitalocean" | "railway" | "render" | "firebase" | "cloudinary" | "configcat" | "googleanalytics" | "googlebigquery" | "amplitude" | "mixpanel" | "segment" | "databricks" | "snowflake" | "algolia" | "elasticsearch" | "salesforce" | "pipedrive" | "apollo" | "gong" | "freshdesk" | "helpscout" | "servicenow" | "mailchimp" | "customerio" | "klaviyo" | "shopify" | "quickbooks" | "xero" | "brex" | "buffer" | "docusign" | "canva" | "webflow" | "firecrawl" | "browserbase" | "exa" | "youtube" | "twitter" | "instagram" | "facebook";
     backend: "composio";
-    toolkit: "close" | "notion" | "jira" | "confluence" | "googlecalendar" | "microsoft_teams" | "outlook" | "bitbucket" | "datadog" | "pagerduty" | "intercom" | "zendesk" | "hubspot" | "supabase" | "figma" | "launch_darkly" | "asana" | "clickup" | "trello" | "todoist" | "airtable" | "coda" | "miro" | "share_point" | "one_drive" | "googleslides" | "googlemeet" | "googletasks" | "dropbox" | "box" | "discord" | "discordbot" | "zoom" | "google_chat" | "new_relic" | "better_stack" | "incident_io" | "grafana" | "honeycomb_mcp" | "bugsnag" | "circleci" | "buildkite" | "docker_hub" | "digital_ocean" | "railway" | "render" | "firebase" | "cloudinary" | "configcat" | "google_analytics" | "googlebigquery" | "amplitude" | "mixpanel" | "segment" | "databricks" | "snowflake" | "algolia" | "elasticsearch" | "salesforce" | "pipedrive" | "apollo" | "gong" | "freshdesk" | "help_scout" | "servicenow" | "mailchimp" | "customerio" | "klaviyo" | "shopify" | "quickbooks" | "xero" | "brex" | "buffer" | "canva" | "webflow" | "firecrawl" | "browserbase_tool" | "exa" | "youtube" | "twitter" | "instagram" | "facebook";
+    toolkit: "close" | "notion" | "jira" | "confluence" | "googlecalendar" | "microsoft_teams" | "outlook" | "bitbucket" | "datadog" | "pagerduty" | "intercom" | "zendesk" | "hubspot" | "supabase" | "figma" | "launch_darkly" | "asana" | "clickup" | "trello" | "todoist" | "airtable" | "coda" | "miro" | "share_point" | "one_drive" | "googleslides" | "googlemeet" | "googletasks" | "dropbox" | "box" | "discord" | "discordbot" | "zoom" | "google_chat" | "new_relic" | "better_stack" | "incident_io" | "grafana" | "honeycomb_mcp" | "bugsnag" | "circleci" | "buildkite" | "docker_hub" | "digital_ocean" | "railway" | "render" | "firebase" | "cloudinary" | "configcat" | "google_analytics" | "googlebigquery" | "amplitude" | "mixpanel" | "segment" | "databricks" | "snowflake" | "algolia" | "elasticsearch" | "salesforce" | "pipedrive" | "apollo" | "gong" | "freshdesk" | "help_scout" | "servicenow" | "mailchimp" | "customerio" | "klaviyo" | "shopify" | "quickbooks" | "xero" | "brex" | "buffer" | "docusign" | "canva" | "webflow" | "firecrawl" | "browserbase_tool" | "exa" | "youtube" | "twitter" | "instagram" | "facebook";
     authType: "hosted";
     authScheme: "API_KEY" | "BASIC" | "BEARER_TOKEN" | "DCR_OAUTH" | "OAUTH1" | "OAUTH2";
     managedAuth: boolean;
     category: "data" | "productivity" | "business";
-    name: "Notion" | "Jira" | "Confluence" | "Google Calendar" | "Microsoft Teams" | "Outlook" | "Bitbucket" | "Datadog" | "PagerDuty" | "Intercom" | "Zendesk" | "HubSpot" | "Supabase" | "Figma" | "LaunchDarkly" | "Asana" | "ClickUp" | "Trello" | "Todoist" | "Airtable" | "Coda" | "Miro" | "SharePoint" | "OneDrive" | "Google Slides" | "Google Meet" | "Google Tasks" | "Dropbox" | "Box" | "Discord" | "Discord Bot" | "Zoom" | "Google Chat" | "New Relic" | "Better Stack" | "incident.io" | "Grafana" | "Honeycomb MCP" | "Bugsnag" | "CircleCI" | "Buildkite" | "Docker Hub" | "DigitalOcean" | "Railway" | "Render" | "Firebase" | "Cloudinary" | "ConfigCat" | "Google Analytics" | "Google BigQuery" | "Amplitude" | "Mixpanel" | "Segment" | "Databricks" | "Snowflake" | "Algolia" | "Elasticsearch" | "Salesforce" | "Pipedrive" | "Close" | "Apollo" | "Gong" | "Freshdesk" | "Help Scout" | "ServiceNow" | "Mailchimp" | "Customer.io" | "Klaviyo" | "Shopify" | "QuickBooks" | "Xero" | "Brex" | "Buffer" | "Canva" | "Webflow" | "Firecrawl" | "Browserbase" | "Exa" | "YouTube" | "Twitter/X" | "Instagram" | "Facebook";
+    name: "Notion" | "Jira" | "Confluence" | "Google Calendar" | "Microsoft Teams" | "Outlook" | "Bitbucket" | "Datadog" | "PagerDuty" | "Intercom" | "Zendesk" | "HubSpot" | "Supabase" | "Figma" | "LaunchDarkly" | "Asana" | "ClickUp" | "Trello" | "Todoist" | "Airtable" | "Coda" | "Miro" | "SharePoint" | "OneDrive" | "Google Slides" | "Google Meet" | "Google Tasks" | "Dropbox" | "Box" | "Discord" | "Discord Bot" | "Zoom" | "Google Chat" | "New Relic" | "Better Stack" | "incident.io" | "Grafana" | "Honeycomb MCP" | "Bugsnag" | "CircleCI" | "Buildkite" | "Docker Hub" | "DigitalOcean" | "Railway" | "Render" | "Firebase" | "Cloudinary" | "ConfigCat" | "Google Analytics" | "Google BigQuery" | "Amplitude" | "Mixpanel" | "Segment" | "Databricks" | "Snowflake" | "Algolia" | "Elasticsearch" | "Salesforce" | "Pipedrive" | "Close" | "Apollo" | "Gong" | "Freshdesk" | "Help Scout" | "ServiceNow" | "Mailchimp" | "Customer.io" | "Klaviyo" | "Shopify" | "QuickBooks" | "Xero" | "Brex" | "Buffer" | "DocuSign" | "Canva" | "Webflow" | "Firecrawl" | "Browserbase" | "Exa" | "YouTube" | "Twitter/X" | "Instagram" | "Facebook";
     description: string;
 }[]];