replicas-engine 0.1.220 → 0.1.221

package/dist/src/index.js

@@ -32,6 +32,9 @@ function codexReasoningEffortForThinkingLevel(thinkingLevel) {
 }
 
 // ../shared/src/event.ts
+var ACCEPTED_USER_MESSAGE_SOURCE = "replicas-chat-turn-accepted";
+var USER_MESSAGE_ID_PAYLOAD_KEY = "replicasMessageId";
+var CODEX_ASP_ITEM_ID_PAYLOAD_KEY = "codexAspItemId";
 var CODEX_QUOTA_STATUS_EVENT_TYPE = "codex-quota-status";
 var COMPACTION_STATUS_EVENT_TYPE = "compaction-status";
 var CHAT_GOAL_EVENT_TYPE = "chat-goal";
@@ -1761,7 +1764,7 @@ function parseReplicasConfigString(content, filename) {
 }
 
 // ../shared/src/engine/environment.ts
-var DAYTONA_SNAPSHOT_ID = "27-05-2026-royal-york-v2";
+var DAYTONA_SNAPSHOT_ID = "27-05-2026-royal-york-v3";
 
 // ../shared/src/engine/types.ts
 var DEFAULT_CHAT_TITLES = {
@@ -1863,6 +1866,50 @@ var MEDIA_KIND = {
 };
 var MEDIA_KINDS = [MEDIA_KIND.IMAGE, MEDIA_KIND.VIDEO, MEDIA_KIND.AUDIO];
 
+// ../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) {
+  const value = Date.parse(event.timestamp);
+  return Number.isNaN(value) ? 0 : value;
+}
+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 Math.abs(getEventTimestampMs(a) - getEventTimestampMs(b)) <= 3e4;
+}
+function mergeAgentEvents(primary, supplemental, options) {
+  const merged = [...primary];
+  const { areDuplicates, mergeEvent } = options;
+  for (const event of supplemental) {
+    const existingIndex = merged.findIndex((existing) => areDuplicates(existing, event));
+    if (existingIndex === -1) {
+      merged.push(event);
+      continue;
+    }
+    if (mergeEvent) {
+      merged[existingIndex] = mergeEvent(merged[existingIndex], event);
+    }
+  }
+  return merged;
+}
+
 // src/runtime-env-loader.ts
 function loadRuntimeEnvFile() {
   let content;
@@ -6265,21 +6312,27 @@ function itemToAgentEventDrafts(item, lifecycle) {
 }
 function threadToHistoryEvents(thread) {
   const events = [];
-  for (const turn of thread.turns) {
+  const turns = thread.turns.map((turn, index) => ({ turn, index })).sort((a, b) => (a.turn.startedAt ?? a.turn.completedAt ?? Number.MAX_SAFE_INTEGER) - (b.turn.startedAt ?? b.turn.completedAt ?? Number.MAX_SAFE_INTEGER) || a.index - b.index);
+  for (const { turn } of turns) {
     const startedAt = timestampFromSeconds(turn.startedAt);
     const completedAt = timestampFromSeconds(turn.completedAt ?? turn.startedAt);
-    for (const item of turn.items) {
-      if (item.type === "userMessage") {
-        const message = item.content.filter((input) => input.type === "text").map((input) => input.text).join("\n");
-        if (message) {
-          events.push({
-            timestamp: startedAt,
-            type: "event_msg",
-            payload: { type: "user_message", message }
-          });
-        }
-        continue;
+    const userMessages = turn.items.filter((item) => item.type === "userMessage");
+    const agentItems = turn.items.filter((item) => item.type !== "userMessage");
+    for (const item of userMessages) {
+      const message = item.content.filter((input) => input.type === "text").map((input) => input.text).join("\n");
+      if (message) {
+        events.push({
+          timestamp: startedAt,
+          type: "event_msg",
+          payload: {
+            type: "user_message",
+            message,
+            [CODEX_ASP_ITEM_ID_PAYLOAD_KEY]: item.id
+          }
+        });
       }
+    }
+    for (const item of agentItems) {
       for (const draft of itemToAgentEventDrafts(item, "started")) {
         events.push({ timestamp: startedAt, ...draft });
       }
@@ -6380,6 +6433,49 @@ function dispatchAspNotification(notification, handlers) {
 }
 
 // src/managers/codex-asp/codex-asp-manager.ts
+function historyEventKey(event) {
+  const payloadType = typeof event.payload.type === "string" ? event.payload.type : null;
+  const callId = typeof event.payload.call_id === "string" ? event.payload.call_id : null;
+  const itemId = typeof event.payload[CODEX_ASP_ITEM_ID_PAYLOAD_KEY] === "string" ? event.payload[CODEX_ASP_ITEM_ID_PAYLOAD_KEY] : null;
+  const messageId = typeof event.payload[USER_MESSAGE_ID_PAYLOAD_KEY] === "string" ? event.payload[USER_MESSAGE_ID_PAYLOAD_KEY] : null;
+  if (event.type === "response_item" && payloadType && callId) {
+    return `${event.type}:${payloadType}:${callId}`;
+  }
+  if (event.type === "event_msg" && event.payload.type === "user_message") {
+    if (messageId) return `${event.type}:user_message:message:${messageId}`;
+    if (itemId) return `${event.type}:user_message:item:${itemId}`;
+    const command = typeof event.payload.command === "string" ? event.payload.command : "";
+    const message = typeof event.payload.message === "string" ? event.payload.message : "";
+    return `${event.type}:user_message:${event.timestamp}:${command}:${message}`;
+  }
+  if (itemId && payloadType) {
+    return `${event.type}:${payloadType}:item:${itemId}`;
+  }
+  return `${event.type}:${event.timestamp}:${JSON.stringify(event.payload)}`;
+}
+function areDuplicateHistoryEvents(a, b) {
+  if (historyEventKey(a) === historyEventKey(b)) return true;
+  return areSameUserMessageEvents(a, b);
+}
+function mergeHistoryEvent(current, candidate) {
+  if (getUserMessage(current) && getUserMessage(current) === getUserMessage(candidate)) {
+    return {
+      ...current,
+      timestamp: getEventTimestampMs(current) <= getEventTimestampMs(candidate) ? current.timestamp : candidate.timestamp,
+      payload: {
+        ...current.payload,
+        ...candidate.payload
+      }
+    };
+  }
+  return candidate;
+}
+function mergeHistoryEvents(primary, supplemental) {
+  return mergeAgentEvents(primary, supplemental, {
+    areDuplicates: areDuplicateHistoryEvents,
+    mergeEvent: mergeHistoryEvent
+  });
+}
 var CodexAspManager = class extends CodingAgentManager {
   currentThreadId = null;
   activeTurnId = null;
@@ -6425,15 +6521,13 @@ var CodexAspManager = class extends CodingAgentManager {
         ),
         this.refreshThreadGoal(host, this.currentThreadId)
       ]);
-      const events = threadToHistoryEvents(response.thread);
-      if (events.length > 0) {
-        const supplementalEvents = this.historyEvents.filter((event) => event.type === CODEX_QUOTA_STATUS_EVENT_TYPE || event.type === CONTEXT_USAGE_EVENT_TYPE || event.type === CHAT_GOAL_EVENT_TYPE || event.type === "event_msg" && event.payload.command === "goal");
-        return {
-          thread_id: this.currentThreadId,
-          events: [...events, ...supplementalEvents].sort((a, b) => a.timestamp.localeCompare(b.timestamp)),
-          goal: this.currentGoal
-        };
-      }
+      const events = mergeHistoryEvents(this.historyEvents, threadToHistoryEvents(response.thread));
+      this.historyEvents.splice(0, this.historyEvents.length, ...events);
+      return {
+        thread_id: this.currentThreadId,
+        events,
+        goal: this.currentGoal
+      };
     } catch {
     }
     return {
@@ -6492,8 +6586,8 @@ var CodexAspManager = class extends CodingAgentManager {
   async executeGoalClearCommand(request, recordUserMessage) {
     const host = await getCodexAspHost();
     const developerInstructions = this.buildCombinedInstructions(request.customInstructions);
-    const threadId = await this.ensureThread(host, request, developerInstructions);
     recordUserMessage({ command: "goal" });
+    const threadId = await this.ensureThread(host, request, developerInstructions);
     await host.client.request(
       THREAD_GOAL_CLEAR_METHOD,
       { threadId }
@@ -6511,8 +6605,8 @@ var CodexAspManager = class extends CodingAgentManager {
       }
     }
     const developerInstructions = this.buildCombinedInstructions(request.customInstructions);
-    const threadId = await this.ensureThread(host, request, developerInstructions);
     recordUserMessage(options.userMessagePayload);
+    const threadId = await this.ensureThread(host, request, developerInstructions);
     const runTurn = options.runTurn ?? ((aspHost, aspThreadId, aspInstructions) => this.runTurn(aspHost, aspThreadId, request, aspInstructions));
     let completedTurn;
     try {
@@ -6747,8 +6841,7 @@ var CodexAspManager = class extends CodingAgentManager {
   }
   seedHistoryFromThread(thread) {
     const events = threadToHistoryEvents(thread);
-    if (events.length === 0) return;
-    this.historyEvents.splice(0, this.historyEvents.length, ...events);
+    this.historyEvents.splice(0, this.historyEvents.length, ...mergeHistoryEvents(this.historyEvents, events));
   }
   async refreshThreadGoal(host, threadId) {
     try {
@@ -7457,6 +7550,19 @@ function isPersistedChat(value) {
   const candidate = value;
   return typeof candidate.id === "string" && (candidate.provider === "claude" || candidate.provider === "codex" || candidate.provider === "relay") && typeof candidate.title === "string" && typeof candidate.createdAt === "string" && typeof candidate.updatedAt === "string" && (candidate.providerSessionId === null || typeof candidate.providerSessionId === "string") && (candidate.parentChatId === void 0 || candidate.parentChatId === null || typeof candidate.parentChatId === "string");
 }
+function createUserMessageEvent(message, messageId) {
+  return {
+    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+    type: "event_msg",
+    payload: {
+      type: "user_message",
+      message,
+      source: ACCEPTED_USER_MESSAGE_SOURCE,
+      [USER_MESSAGE_ID_PAYLOAD_KEY]: messageId
+    }
+  };
+}
+var isSameUserMessageEvent = areSameUserMessageEvents;
 var ChatService = class {
   constructor(workingDirectory) {
     this.workingDirectory = workingDirectory;
@@ -7534,7 +7640,9 @@ var ChatService = class {
   async sendMessage(chatId, request) {
     const chat = this.requireChat(chatId);
     const result = await chat.provider.enqueueMessage(request);
+    const acceptedEvent = createUserMessageEvent(request.message, result.messageId);
     chat.pendingMessageIds.push(result.messageId);
+    chat.acceptedUserEvents.set(result.messageId, acceptedEvent);
     this.touch(chat);
     let recordedSender;
     if (request.senderUserId && request.senderEmail) {
@@ -7553,6 +7661,7 @@ var ChatService = class {
         messageId: result.messageId,
         queued: result.queued,
         position: result.position,
+        event: acceptedEvent,
         ...recordedSender ? { sender: recordedSender } : {}
       }
     });
@@ -7599,8 +7708,10 @@ var ChatService = class {
     const chat = this.requireChat(chatId);
     const result = await chat.provider.interrupt();
     chat.hasActiveTurn = false;
+    chat.activeMessageId = null;
     keepAliveService.stop();
     chat.pendingMessageIds = [];
+    chat.acceptedUserEvents.clear();
     this.touch(chat);
     await this.publish({
       type: "chat.interrupted",
@@ -7690,9 +7801,10 @@ var ChatService = class {
       chat.provider.getHistory(),
       this.readSenders(chatId)
     ]);
+    const acceptedEvents = [...chat.acceptedUserEvents.values()].filter((acceptedEvent) => !history.events.some((event) => isSameUserMessageEvent(event, acceptedEvent)));
     return {
       thread_id: history.thread_id,
-      events: history.events,
+      events: [...history.events, ...acceptedEvents],
       goal: history.goal ?? chat.provider.getGoal?.() ?? null,
       senders
     };
@@ -7760,6 +7872,8 @@ var ChatService = class {
       persisted,
       provider,
       pendingMessageIds: [],
+      acceptedUserEvents: /* @__PURE__ */ new Map(),
+      activeMessageId: null,
       hasActiveTurn: false,
       observedBranchesByRepo: /* @__PURE__ */ new Map()
     };
@@ -7801,6 +7915,7 @@ var ChatService = class {
         return;
       }
       chat.hasActiveTurn = true;
+      chat.activeMessageId = messageId;
       keepAliveService.start();
       this.publish({
         type: "chat.turn.started",
@@ -7811,6 +7926,25 @@ var ChatService = class {
       }).catch(() => {
       });
     }
+    let eventToPublish = event;
+    if (event.type === "event_msg" && event.payload.type === "user_message") {
+      if (chat.activeMessageId) {
+        event.payload[USER_MESSAGE_ID_PAYLOAD_KEY] = chat.activeMessageId;
+        eventToPublish = {
+          ...event,
+          payload: {
+            ...event.payload,
+            [USER_MESSAGE_ID_PAYLOAD_KEY]: chat.activeMessageId
+          }
+        };
+      }
+      for (const [messageId, acceptedEvent] of chat.acceptedUserEvents) {
+        if (isSameUserMessageEvent(event, acceptedEvent)) {
+          chat.acceptedUserEvents.delete(messageId);
+          break;
+        }
+      }
+    }
     this.touch(chat);
     this.observeCurrentBranches(chat).catch(() => {
     });
@@ -7818,7 +7952,7 @@ var ChatService = class {
       type: "chat.turn.delta",
       payload: {
         chatId,
-        event
+        event: eventToPublish
       }
     }).catch(() => {
     });
@@ -7840,6 +7974,7 @@ var ChatService = class {
       return;
     }
     chat.hasActiveTurn = false;
+    chat.activeMessageId = null;
     keepAliveService.stop();
     this.publish({
       type: "chat.turn.completed",

package/package.json

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