replicas-cli 0.2.469 → 0.2.470

package/dist/index.mjs

@@ -10084,7 +10084,7 @@ function formatTurnElapsed(ms) {
 }
 
 // ../shared/src/cli-version.ts
-var CLI_VERSION = "0.2.469";
+var CLI_VERSION = "0.2.470";
 
 // ../shared/src/version.ts
 function compareVersions(v1, v2) {
@@ -25683,8 +25683,9 @@ function parseOpencodeEvents(events) {
     if (event.type === "event_msg" && event.payload.type === "user_message") {
       const message = event.payload.message;
       if (typeof message === "string" && message.trim()) {
+        const messageId = event.payload[USER_MESSAGE_ID_PAYLOAD_KEY];
         messages.push({
-          id: `opencode-user-${event.timestamp}-${messages.length}`,
+          id: typeof messageId === "string" ? messageId : `opencode-user-${event.timestamp}`,
           type: "user",
           content: message,
           timestamp: event.timestamp
@@ -25696,7 +25697,7 @@ function parseOpencodeEvents(events) {
       const error51 = assistantError(event.payload.info);
       if (error51) {
         messages.push({
-          id: `opencode-error-${event.timestamp}-${messages.length}`,
+          id: `opencode-${event.type}-${event.timestamp}`,
           type: "error",
           message: error51,
           timestamp: event.timestamp
@@ -25707,7 +25708,7 @@ function parseOpencodeEvents(events) {
     if (event.type === "opencode-error") {
       const message = typeof event.payload.message === "string" ? event.payload.message : "Opencode run failed";
       messages.push({
-        id: `opencode-error-${event.timestamp}-${messages.length}`,
+        id: `opencode-${event.type}-${event.timestamp}`,
         type: "error",
         message,
         timestamp: event.timestamp
@@ -25718,7 +25719,7 @@ function parseOpencodeEvents(events) {
       const tool = typeof event.payload.tool === "string" ? event.payload.tool : "tool";
       const input = event.payload.input ?? event.payload.arguments;
       const callId = typeof event.payload.callID === "string" ? event.payload.callID : null;
-      const id2 = callId ? `opencode-${callId}` : `opencode-${event.timestamp}-${messages.length}`;
+      const id2 = callId ? `opencode-${callId}` : `opencode-${event.type}-${event.timestamp}`;
       upsertDisplayMessage(messages, createCallDisplayMessage({
         id: id2,
         server: "opencode",
@@ -25731,7 +25732,7 @@ function parseOpencodeEvents(events) {
     }
     const part = partFromEvent(event);
     if (!part) continue;
-    let id = `opencode-${event.timestamp}-${messages.length}`;
+    let id = `opencode-${event.type}-${event.timestamp}`;
     if (typeof part.callID === "string") id = `opencode-${part.callID}`;
     else if (typeof part.id === "string") id = `opencode-${part.id}`;
     const time3 = isRecord(part.time) ? part.time : null;
@@ -26673,38 +26674,81 @@ function stableString(value) {
     return String(value);
   }
 }
-function duplicateMessage(a, b) {
-  if (a.id === b.id) return true;
-  if (a.type !== b.type || !nearTimestamp(a.timestamp, b.timestamp)) {
-    return false;
+function duplicateKey(message) {
+  if (message.type === "user" || message.type === "agent" || message.type === "reasoning") {
+    return JSON.stringify([message.type, message.content]);
   }
-  if (a.type === "user" && b.type === "user") return a.content === b.content;
-  if (a.type === "agent" && b.type === "agent") return a.content === b.content;
-  if (a.type === "reasoning" && b.type === "reasoning") return a.content === b.content;
-  if (a.type === "command" && b.type === "command") return a.command === b.command;
-  if (a.type === "web_search" && b.type === "web_search") return a.query === b.query;
-  if (a.type === "subagent" && b.type === "subagent") {
-    return a.description === b.description && a.prompt === b.prompt && a.subagentType === b.subagentType && a.model === b.model;
+  if (message.type === "command") return JSON.stringify([message.type, message.command]);
+  if (message.type === "web_search") return JSON.stringify([message.type, message.query]);
+  if (message.type === "subagent") {
+    return JSON.stringify([
+      message.type,
+      message.description,
+      message.prompt,
+      message.subagentType,
+      message.model
+    ]);
   }
-  if (a.type === "todo_list" && b.type === "todo_list") {
-    return stableString(a.items) === stableString(b.items);
+  if (message.type === "todo_list") {
+    return JSON.stringify([message.type, stableString(message.items)]);
   }
-  if (a.type === "patch" && b.type === "patch") {
-    return stableString(a.operations) === stableString(b.operations);
+  if (message.type === "patch") {
+    return JSON.stringify([message.type, stableString(message.operations)]);
   }
-  if (a.type === "tool_call" && b.type === "tool_call") {
-    return a.server === b.server && a.tool === b.tool && stableString(a.input) === stableString(b.input);
+  if (message.type === "tool_call") {
+    return JSON.stringify([
+      message.type,
+      message.server,
+      message.tool,
+      stableString(message.input)
+    ]);
   }
-  return false;
+  return null;
+}
+function duplicateBucketKey(message, bucketOffset = 0) {
+  const key = duplicateKey(message);
+  if (key === null) return null;
+  const bucket = Math.floor(parseTimestampMs(message.timestamp) / DUPLICATE_WINDOW_MS) + bucketOffset;
+  return JSON.stringify([bucket, key]);
 }
 function mergeCodexAspDisplayMessages(primary, supplemental) {
   const merged = [...primary];
+  const firstIndexById = /* @__PURE__ */ new Map();
+  const indexesByDuplicateBucket = /* @__PURE__ */ new Map();
+  const indexMessage = (message, index) => {
+    if (!firstIndexById.has(message.id)) firstIndexById.set(message.id, index);
+    const key = duplicateBucketKey(message);
+    if (key === null) return;
+    const indexes = indexesByDuplicateBucket.get(key) ?? /* @__PURE__ */ new Set();
+    indexes.add(index);
+    indexesByDuplicateBucket.set(key, indexes);
+  };
+  const unindexMessage = (message, index) => {
+    const key = duplicateBucketKey(message);
+    if (key === null) return;
+    const indexes = indexesByDuplicateBucket.get(key);
+    indexes?.delete(index);
+    if (indexes?.size === 0) indexesByDuplicateBucket.delete(key);
+  };
+  merged.forEach(indexMessage);
   for (const message of supplemental) {
-    const duplicateIndex = merged.findIndex((existing) => duplicateMessage(existing, message));
-    if (duplicateIndex === -1) {
-      merged.push(message);
+    let duplicateIndex = firstIndexById.get(message.id);
+    if (duplicateIndex === void 0) {
+      for (let bucketOffset = -1; bucketOffset <= 1; bucketOffset += 1) {
+        const key = duplicateBucketKey(message, bucketOffset);
+        for (const index of (key === null ? void 0 : indexesByDuplicateBucket.get(key)) ?? []) {
+          if (nearTimestamp(merged[index].timestamp, message.timestamp) && (duplicateIndex === void 0 || index < duplicateIndex)) {
+            duplicateIndex = index;
+          }
+        }
+      }
+    }
+    if (duplicateIndex === void 0) {
+      indexMessage(message, merged.push(message) - 1);
     } else if (message.type === "user") {
+      unindexMessage(merged[duplicateIndex], duplicateIndex);
       merged[duplicateIndex] = { ...merged[duplicateIndex], timestamp: message.timestamp };
+      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);

package/package.json

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