replicas-cli 0.2.404 → 0.2.405

package/dist/index.mjs

@@ -24395,7 +24395,7 @@ function formatTurnElapsed(ms) {
 }
 
 // ../shared/src/cli-version.ts
-var CLI_VERSION = "0.2.404";
+var CLI_VERSION = "0.2.405";
 
 // ../shared/src/version.ts
 function compareVersions(v1, v2) {
@@ -24730,17 +24730,23 @@ function normalizeBackgroundTaskStatus(status) {
   return "in_progress";
 }
 
+// ../shared/src/display-message/constants.ts
+var USER_MESSAGE_MATCH_GRACE_PERIOD_MS = 3e4;
+
 // ../shared/src/display-message/format.ts
 function formatStoppedAfter(durationMs) {
   if (durationMs === void 0) return "You stopped";
   return `You stopped after ${formatTurnElapsed(durationMs)}`;
 }
 
-// ../shared/src/agent-event-utils.ts
+// ../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/display-message/parsers/utils.ts
 var INTERRUPTED_MESSAGE_REGEX = /^\[Request interrupted by user.*\]$/;
@@ -25566,6 +25572,13 @@ function parseClaudeEvents(events, parentToolUseId) {
   const assistantThinking = /* @__PURE__ */ new Map();
   const assistantTextCounts = /* @__PURE__ */ new Map();
   const acceptedUserMessageIndexes = /* @__PURE__ */ new Set();
+  const canonicalUserMessageIndexes = /* @__PURE__ */ new Set();
+  const findMatchingUserMessageIndex = (indexes, content, timestamp) => {
+    return [...indexes].find((index) => {
+      const message = messages[index];
+      return message?.type === "user" && areUserMessagesWithinMatchWindow(message, { content, timestamp });
+    });
+  };
   let turnWasInterrupted = false;
   const taskAccumulator = new TaskAccumulator();
   const taskSnapshot = () => taskAccumulator.getTasks().map((task) => ({
@@ -25579,13 +25592,21 @@ function parseClaudeEvents(events, parentToolUseId) {
       const images = userMessageImages(event.payload.images);
       if (content || images) {
         const messageId = event.payload[USER_MESSAGE_ID_PAYLOAD_KEY];
-        acceptedUserMessageIndexes.add(messages.push({
+        const canonicalIndex = findMatchingUserMessageIndex(canonicalUserMessageIndexes, content, event.timestamp);
+        const canonical = canonicalIndex === void 0 ? void 0 : messages[canonicalIndex];
+        const message = {
           id: typeof messageId === "string" ? messageId : `user-${event.timestamp}`,
           type: "user",
           content,
-          images,
+          images: images?.length ? images : canonical?.type === "user" ? canonical.images : void 0,
           timestamp: event.timestamp
-        }) - 1);
+        };
+        if (canonicalIndex === void 0) {
+          acceptedUserMessageIndexes.add(messages.push(message) - 1);
+        } else {
+          messages[canonicalIndex] = message;
+          canonicalUserMessageIndexes.delete(canonicalIndex);
+        }
       }
       return;
     }
@@ -25647,10 +25668,11 @@ function parseClaudeEvents(events, parentToolUseId) {
         };
       }).filter((img) => img.data);
       if (textContent || images.length > 0) {
-        const acceptedIndex = [...acceptedUserMessageIndexes].find((index) => {
-          const accepted2 = messages[index];
-          return accepted2?.type === "user" && accepted2.content === textContent;
-        });
+        const acceptedIndex = findMatchingUserMessageIndex(
+          acceptedUserMessageIndexes,
+          textContent,
+          event.timestamp
+        );
         const accepted = acceptedIndex === void 0 ? void 0 : messages[acceptedIndex];
         const message = {
           id: accepted?.id ?? `user-${event.timestamp}`,
@@ -25660,7 +25682,7 @@ function parseClaudeEvents(events, parentToolUseId) {
           timestamp: event.timestamp
         };
         if (acceptedIndex === void 0) {
-          messages.push(message);
+          canonicalUserMessageIndexes.add(messages.push(message) - 1);
         } else {
           messages[acceptedIndex] = message;
           acceptedUserMessageIndexes.delete(acceptedIndex);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "replicas-cli",
-  "version": "0.2.404",
+  "version": "0.2.405",
   "description": "CLI for managing Replicas workspaces - SSH into cloud dev environments with automatic port forwarding",
   "main": "dist/index.mjs",
   "bin": {