replicas-cli 0.2.454 → 0.2.456

package/dist/index.mjs

@@ -7730,29 +7730,51 @@ function getClaudePartialMessageStreamId(event) {
   if (event.type !== CLAUDE_PARTIAL_MESSAGE_EVENT_TYPE) return null;
   return typeof event.payload.streamId === "string" && event.payload.streamId ? event.payload.streamId : null;
 }
-function getEventSignature(event) {
-  const streamId = getClaudePartialMessageStreamId(event);
-  if (streamId) {
-    return `${CLAUDE_PARTIAL_MESSAGE_EVENT_TYPE}:${streamId}`;
-  }
-  const normalize = (input) => {
-    if (Array.isArray(input)) return input.map(normalize);
-    if (input && typeof input === "object") {
-      const entries = Object.entries(input).sort(([a], [b]) => a.localeCompare(b)).map(([key, val]) => [key, normalize(val)]);
-      return Object.fromEntries(entries);
-    }
-    return input;
-  };
-  try {
-    return JSON.stringify(normalize(event));
-  } catch {
-    return String(event);
-  }
-}
+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_ASP_TRANSCRIPT_UPDATED_EVENT_TYPE = "codex-asp-transcript-updated";
 var CODEX_QUOTA_STATUS_EVENT_TYPE = "codex-quota-status";
 var CHAT_INTERRUPTED_EVENT_TYPE = "replicas-interrupted";
+var CHAT_GOAL_EVENT_TYPE = "chat-goal";
+var CHAT_GOAL_STATUSES = [
+  "active",
+  "paused",
+  "blocked",
+  "usageLimited",
+  "budgetLimited",
+  "complete"
+];
+function isChatGoalStatus(value) {
+  return typeof value === "string" && CHAT_GOAL_STATUSES.some((status) => status === value);
+}
+function coerceChatGoalPayload(payload) {
+  const goal = payload.goal;
+  if (goal === null || goal === void 0) return null;
+  if (typeof goal !== "object") return null;
+  const candidate = goal;
+  const threadId = candidate.threadId;
+  const objective = candidate.objective;
+  const status = candidate.status;
+  const tokensUsed = candidate.tokensUsed;
+  const timeUsedSeconds = candidate.timeUsedSeconds;
+  const createdAt = candidate.createdAt;
+  const updatedAt = candidate.updatedAt;
+  const tokenBudget = candidate.tokenBudget ?? null;
+  if (typeof threadId !== "string" || typeof objective !== "string" || !isChatGoalStatus(status) || typeof tokensUsed !== "number" || typeof timeUsedSeconds !== "number" || typeof createdAt !== "string" || typeof updatedAt !== "string" || tokenBudget !== null && typeof tokenBudget !== "number") {
+    return null;
+  }
+  return {
+    threadId,
+    objective,
+    status,
+    tokenBudget,
+    tokensUsed,
+    timeUsedSeconds,
+    createdAt,
+    updatedAt
+  };
+}
 
 // ../shared/src/credentials/types.ts
 var CREDENTIAL_SCOPE = {
@@ -10056,7 +10078,7 @@ function formatTurnElapsed(ms) {
 }
 
 // ../shared/src/cli-version.ts
-var CLI_VERSION = "0.2.454";
+var CLI_VERSION = "0.2.456";
 
 // ../shared/src/version.ts
 function compareVersions(v1, v2) {
@@ -24651,6 +24673,90 @@ function normalizeCodexAspTranscriptStatus(status, failed = false) {
   if (status === "completed") return "completed";
   return "in_progress";
 }
+function isCodexAspTranscript(value) {
+  if (!isRecord(value)) return false;
+  return typeof value.threadId === "string" && typeof value.updatedAt === "string" && Array.isArray(value.turns);
+}
+function isCodexAspTranscriptDelta(value) {
+  if (!isRecord(value)) return false;
+  if (typeof value.threadId !== "string" || typeof value.updatedAt !== "string" || !Array.isArray(value.turns) || value.reset !== void 0 && value.reset !== null && !isCodexAspTranscript(value.reset)) {
+    return false;
+  }
+  return value.turns.every((turn) => isRecord(turn) && typeof turn.id === "string" && typeof turn.status === "string" && typeof turn.startedAt === "string" && (turn.completedAt === null || typeof turn.completedAt === "string") && Array.isArray(turn.items) && turn.items.every((item) => isRecord(item) && typeof item.id === "string" && (item.item === void 0 || isRecord(item.item) && typeof item.item.type === "string" && typeof item.item.id === "string" && typeof item.item.timestamp === "string") && (item.appendText === void 0 || typeof item.appendText === "string") && (item.appendOutput === void 0 || typeof item.appendOutput === "string")));
+}
+function appendCodexAspTranscriptField(current, append) {
+  return append === void 0 ? current : `${current ?? ""}${append}`;
+}
+function patchCodexAspTranscriptItem(current, delta) {
+  const base = delta.item ?? current;
+  if (!base) {
+    return null;
+  }
+  if (base.type === "agentMessage" && delta.appendText !== void 0) {
+    return {
+      ...base,
+      text: appendCodexAspTranscriptField(base.text, delta.appendText) ?? ""
+    };
+  }
+  if ((base.type === "commandExecution" || base.type === "fileChange") && delta.appendOutput !== void 0) {
+    return {
+      ...base,
+      output: appendCodexAspTranscriptField(base.output, delta.appendOutput)
+    };
+  }
+  return base;
+}
+function applyCodexAspTranscriptDelta(current, delta) {
+  if (!delta) return current ?? null;
+  if (delta.reset === null) {
+    return null;
+  }
+  const base = delta.reset ?? (current?.threadId === delta.threadId ? current : {
+    threadId: delta.threadId,
+    updatedAt: delta.updatedAt,
+    turns: []
+  });
+  const turns = base.turns.map((turn) => ({
+    ...turn,
+    items: [...turn.items]
+  }));
+  for (const turnDelta of delta.turns) {
+    let turn = turns.find((candidate) => candidate.id === turnDelta.id);
+    if (!turn) {
+      turn = {
+        id: turnDelta.id,
+        status: turnDelta.status,
+        startedAt: turnDelta.startedAt,
+        completedAt: turnDelta.completedAt,
+        items: []
+      };
+      turns.push(turn);
+    } else {
+      turn.status = turnDelta.status;
+      turn.startedAt = turnDelta.startedAt;
+      turn.completedAt = turnDelta.completedAt;
+    }
+    for (const itemDelta of turnDelta.items) {
+      const itemIndex = turn.items.findIndex((item) => item.id === itemDelta.id);
+      const patched = patchCodexAspTranscriptItem(turn.items[itemIndex], itemDelta);
+      if (!patched) continue;
+      if (itemIndex === -1) {
+        turn.items.push(patched);
+      } else {
+        turn.items[itemIndex] = patched;
+      }
+    }
+  }
+  turns.sort((a, b) => Date.parse(a.startedAt) - Date.parse(b.startedAt));
+  for (const turn of turns) {
+    turn.items.sort((a, b) => (a.sequence ?? Number.MAX_SAFE_INTEGER) - (b.sequence ?? Number.MAX_SAFE_INTEGER) || Date.parse(a.timestamp) - Date.parse(b.timestamp));
+  }
+  return {
+    threadId: delta.threadId,
+    updatedAt: delta.updatedAt,
+    turns
+  };
+}
 
 // ../shared/src/routes/workspaces.ts
 var WORKSPACE_STATUSES = ["active", "sleeping", "archived", "preparing", "error"];
@@ -24930,6 +25036,15 @@ function normalizeBackgroundTaskStatus(status) {
 // ../shared/src/display-message/constants.ts
 var USER_MESSAGE_MATCH_GRACE_PERIOD_MS = 3e4;
 
+// ../shared/src/json.ts
+function safeJsonParse(str, fallback) {
+  try {
+    return JSON.parse(str);
+  } catch {
+    return fallback;
+  }
+}
+
 // ../shared/src/display-message/parsers/utils.ts
 var INTERRUPTED_MESSAGE_REGEX = /^\[Request interrupted by user.*\]$/;
 function userMessageImages(value) {
@@ -24946,6 +25061,32 @@ function stringifyDisplayValue(value) {
     return String(value);
   }
 }
+function upsertDisplayMessage(messages, message) {
+  const index = messages.findIndex((candidate) => candidate.id === message.id);
+  if (index === -1) messages.push(message);
+  else messages[index] = message;
+}
+function parseSkillName(tool, input) {
+  if (typeof tool !== "string") return null;
+  const normalizedTool = tool.toLowerCase();
+  if (normalizedTool.startsWith("skill.")) return tool.slice("skill.".length) || null;
+  if (normalizedTool !== "skill") return null;
+  const parsedInput = typeof input === "string" ? safeJsonParse(input, null) : input;
+  if (!isRecord(parsedInput)) return null;
+  const skillName = parsedInput.skill ?? parsedInput.name;
+  return typeof skillName === "string" && skillName ? skillName : null;
+}
+function createCallDisplayMessage(message) {
+  const skillName = message.server.toLowerCase() === "skills" ? message.tool : parseSkillName(message.tool, message.input);
+  if (skillName === null) return { ...message, type: "tool_call" };
+  return {
+    id: message.id,
+    type: "skill",
+    skillName,
+    status: message.status,
+    timestamp: message.timestamp
+  };
+}
 
 // ../shared/src/display-message/format.ts
 function formatStoppedAfter(durationMs) {
@@ -24962,13 +25103,47 @@ 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/json.ts
-function safeJsonParse(str, fallback) {
-  try {
-    return JSON.parse(str);
-  } catch {
-    return fallback;
+// ../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 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 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;
 }
 
 // ../shared/src/display-message/parsers/codex-parser.ts
@@ -25137,17 +25312,17 @@ function parseCodexEvents(events) {
           const operations = parsePatch(input);
           pendingPatches.set(callId, { input, status, timestamp: event.timestamp, operations });
         } else {
-          const msg = {
-            id: `toolcall-${callId || getPayloadString(event, CODEX_ASP_ITEM_ID_PAYLOAD_KEY) || `${event.timestamp}-${eventIndex}`}`,
-            type: "tool_call",
+          const id = `toolcall-${callId || getPayloadString(event, CODEX_ASP_ITEM_ID_PAYLOAD_KEY) || `${event.timestamp}-${eventIndex}`}`;
+          const msg = createCallDisplayMessage({
+            id,
             server,
             tool: name,
             input,
             status,
             timestamp: event.timestamp
-          };
+          });
           messages.push(msg);
-          if (callId) {
+          if (callId && msg.type === "tool_call") {
             pendingToolCalls.set(callId, msg);
           }
         }
@@ -25231,10 +25406,10 @@ function getCursorThinkingText(event) {
 function isTerminalStatus(status) {
   return status === "FINISHED" || status === "ERROR" || status === "CANCELLED" || status === "EXPIRED";
 }
-function finalizeOpenTools(messages, toolIndexes, status) {
-  for (const index of toolIndexes.values()) {
+function finalizeOpenCalls(messages, callIndexes, status) {
+  for (const index of callIndexes.values()) {
     const message = messages[index];
-    if (message?.type === "tool_call" && message.status === "in_progress") {
+    if ((message?.type === "tool_call" || message?.type === "skill") && message.status === "in_progress") {
       messages[index] = {
         ...message,
         status
@@ -25244,7 +25419,7 @@ function finalizeOpenTools(messages, toolIndexes, status) {
 }
 function parseCursorEvents(events) {
   const messages = [];
-  const toolIndexes = /* @__PURE__ */ new Map();
+  const callIndexes = /* @__PURE__ */ new Map();
   const runAssistantSegments = /* @__PURE__ */ new Map();
   const runThinkingSegments = /* @__PURE__ */ new Map();
   let activeAssistant = null;
@@ -25336,21 +25511,20 @@ function parseCursorEvents(events) {
       const tool = typeof event.payload.name === "string" ? event.payload.name : "tool";
       const status = cursorStatusToDisplayStatus(event.payload.status);
       const input = isRecord(event.payload.args) ? event.payload.args : typeof event.payload.args === "string" ? event.payload.args : void 0;
-      const existing = toolIndexes.get(callId);
-      const next = {
+      const existing = callIndexes.get(callId);
+      const next = createCallDisplayMessage({
         id: callId,
-        type: "tool_call",
         server: "cursor",
         tool,
         ...input !== void 0 ? { input } : {},
         output: stringifyDisplayValue(event.payload.result),
         status,
         timestamp: event.timestamp
-      };
+      });
       if (existing === void 0) {
-        toolIndexes.set(callId, messages.push(next) - 1);
+        callIndexes.set(callId, messages.push(next) - 1);
       } else {
-        messages[existing] = { ...messages[existing], ...next };
+        messages[existing] = next;
       }
       continue;
     }
@@ -25372,7 +25546,7 @@ function parseCursorEvents(events) {
       if (isTerminalStatus(status)) {
         const displayStatus = cursorStatusToDisplayStatus(status);
         finalizeActiveThinking(displayStatus);
-        finalizeOpenTools(messages, toolIndexes, displayStatus);
+        finalizeOpenCalls(messages, callIndexes, displayStatus);
         activeThinking = null;
         activeAssistant = null;
       }
@@ -25380,7 +25554,7 @@ function parseCursorEvents(events) {
     }
     if (event.type === "cursor-error") {
       finalizeActiveThinking("failed");
-      finalizeOpenTools(messages, toolIndexes, "failed");
+      finalizeOpenCalls(messages, callIndexes, "failed");
       activeAssistant = null;
       activeThinking = null;
       const message = typeof event.payload.message === "string" ? event.payload.message : "Cursor run failed";
@@ -25405,14 +25579,6 @@ function partFromEvent(event) {
 function toolStatus(status) {
   return status === "completed" ? "completed" : status === "error" ? "failed" : "in_progress";
 }
-function setById(messages, id, next) {
-  const index = messages.findIndex((message) => message.id === id);
-  if (index === -1) {
-    messages.push(next);
-  } else {
-    messages[index] = next;
-  }
-}
 function assistantError(info) {
   if (!isRecord(info) || !isRecord(info.error)) return null;
   const data = isRecord(info.error.data) ? info.error.data : null;
@@ -25457,15 +25623,32 @@ function parseOpencodeEvents(events) {
       });
       continue;
     }
+    if (event.type === "opencode-session.next.tool.called") {
+      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}`;
+      upsertDisplayMessage(messages, createCallDisplayMessage({
+        id: id2,
+        server: "opencode",
+        tool,
+        input: isRecord(input) ? input : stringifyDisplayValue(input),
+        status: "in_progress",
+        timestamp: event.timestamp
+      }));
+      continue;
+    }
     const part = partFromEvent(event);
     if (!part) continue;
-    const id = typeof part.id === "string" ? `opencode-${part.id}` : `opencode-${event.timestamp}-${messages.length}`;
+    let id = `opencode-${event.timestamp}-${messages.length}`;
+    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;
     const timestamp = timestampFromMs(time3?.start, event.timestamp);
     if (part.type === "text") {
       const text = typeof part.text === "string" ? part.text : "";
       if (text.trim()) {
-        setById(messages, id, {
+        upsertDisplayMessage(messages, {
           id,
           type: "agent",
           content: text,
@@ -25477,7 +25660,7 @@ function parseOpencodeEvents(events) {
     if (part.type === "reasoning") {
       const text = typeof part.text === "string" ? part.text : "";
       if (text.trim()) {
-        setById(messages, id, {
+        upsertDisplayMessage(messages, {
           id,
           type: "reasoning",
           content: text,
@@ -25490,23 +25673,24 @@ function parseOpencodeEvents(events) {
     if (part.type === "tool" && isRecord(part.state)) {
       const state = part.state;
       const status = toolStatus(state.status);
+      const tool = typeof part.tool === "string" ? part.tool : "tool";
+      const input = state.input;
       const output = state.status === "completed" ? stringifyDisplayValue(state.output) : state.status === "error" ? stringifyDisplayValue(state.error) : void 0;
-      setById(messages, id, {
+      upsertDisplayMessage(messages, createCallDisplayMessage({
         id,
-        type: "tool_call",
         server: "opencode",
-        tool: typeof part.tool === "string" ? part.tool : "tool",
-        input: isRecord(state.input) ? state.input : stringifyDisplayValue(state.input),
+        tool,
+        input: isRecord(input) ? input : stringifyDisplayValue(input),
         output,
         status,
         timestamp
-      });
+      }));
       continue;
     }
     if (part.type === "patch") {
       const files = Array.isArray(part.files) ? part.files.filter((file2) => typeof file2 === "string") : [];
       if (files.length > 0) {
-        setById(messages, id, {
+        upsertDisplayMessage(messages, {
           id,
           type: "file_change",
           changes: files.map((path6) => ({ path: path6, kind: "update" })),
@@ -25523,11 +25707,6 @@ function parseOpencodeEvents(events) {
 function nestedPayload(event) {
   return isRecord(event.payload.assistantMessageEvent) ? event.payload.assistantMessageEvent : event.payload;
 }
-function setById2(messages, id, message) {
-  const index = messages.findIndex((candidate) => candidate.id === id);
-  if (index === -1) messages.push(message);
-  else messages[index] = message;
-}
 function toolStatus2(value) {
   return value === "completed" || value === "success" ? "completed" : value === "error" ? "failed" : "in_progress";
 }
@@ -25563,8 +25742,8 @@ function parsePiEvents(events) {
       if (payload.type === "thinking_delta" && typeof payload.delta === "string") thinking.set(id, `${thinking.get(id) ?? ""}${payload.delta}`);
       const textContent = text.get(id);
       const thinkingContent = thinking.get(id);
-      if (textContent !== void 0) setById2(messages, `pi-${id}`, { id: `pi-${id}`, type: "agent", content: textContent, timestamp: event.timestamp });
-      if (thinkingContent !== void 0) setById2(messages, `pi-thinking-${id}`, { id: `pi-thinking-${id}`, type: "reasoning", content: thinkingContent, status: "in_progress", timestamp: event.timestamp });
+      if (textContent !== void 0) upsertDisplayMessage(messages, { id: `pi-${id}`, type: "agent", content: textContent, timestamp: event.timestamp });
+      if (thinkingContent !== void 0) upsertDisplayMessage(messages, { id: `pi-thinking-${id}`, type: "reasoning", content: thinkingContent, status: "in_progress", timestamp: event.timestamp });
       continue;
     }
     if (event.type === "pi-message_start") {
@@ -25576,16 +25755,18 @@ function parsePiEvents(events) {
       const payload = event.payload;
       const input = payload.args ?? payload.input;
       const id = typeof payload.toolCallId === "string" ? payload.toolCallId : typeof payload.id === "string" ? payload.id : `tool-${event.timestamp}`;
-      setById2(messages, `pi-tool-${id}`, {
-        id: `pi-tool-${id}`,
-        type: "tool_call",
+      const tool = typeof payload.toolName === "string" ? payload.toolName : "tool";
+      const messageId = `pi-tool-${id}`;
+      const status = event.type === "pi-tool_execution_end" ? toolStatus2(payload.isError ? "error" : "completed") : "in_progress";
+      upsertDisplayMessage(messages, createCallDisplayMessage({
+        id: messageId,
         server: "pi",
-        tool: typeof payload.toolName === "string" ? payload.toolName : "tool",
+        tool,
         input: isRecord(input) ? input : stringifyDisplayValue(input),
         output: event.type === "pi-tool_execution_end" ? stringifyDisplayValue(payload.result ?? payload.error) : void 0,
-        status: event.type === "pi-tool_execution_end" ? toolStatus2(payload.isError ? "error" : "completed") : "in_progress",
+        status,
         timestamp: event.timestamp
-      });
+      }));
     }
   }
   return messages;
@@ -25751,14 +25932,6 @@ function isClaudeResultError(payload) {
   if (payload.errors?.length && stripAgentDiagnosticErrors(payload.errors).length === 0) return false;
   return Boolean(payload.is_error) || payload.subtype !== "success";
 }
-function upsertDisplayMessage(messages, message) {
-  const index = messages.findIndex((existing) => existing.id === message.id);
-  if (index === -1) {
-    messages.push(message);
-  } else {
-    messages[index] = message;
-  }
-}
 var LOCAL_COMMAND_ECHO_REGEX = /^<(?:command-name|command-message|local-command-stdout|local-command-stderr)>/;
 function parseClaudeEvents(events, parentToolUseId) {
   const messages = [];
@@ -26041,7 +26214,7 @@ function parseClaudeEvents(events, parentToolUseId) {
           } else if (toolName === "Skill") {
             const inputObj = typeof toolInput === "string" ? safeJsonParse(toolInput, {}) : toolInput;
             messages.push({
-              id: `skill-${event.timestamp}-${messages.length}`,
+              id: `skill-${toolUseId}`,
               type: "skill",
               skillName: inputObj.skill || "unknown",
               args: inputObj.args,
@@ -26316,16 +26489,15 @@ function messageForItem(item) {
     };
   }
   if (item.type === "toolCall") {
-    return {
+    return createCallDisplayMessage({
       id: `toolcall-${item.id}`,
-      type: "tool_call",
       server: item.server,
       tool: item.tool,
       input: inputForDisplay(item.input),
       output: item.output,
       status: normalizeCodexAspTranscriptStatus(item.status),
       timestamp: item.timestamp
-    };
+    });
   }
   if (item.type === "subagent") {
     return {
@@ -26458,7 +26630,8 @@ function parseAgentEvents(events, agentType) {
 }
 function parseDisplayMessages(events, agentType, codexAspTranscript, options = {}) {
   const shouldFilter = options.filter ?? true;
-  const legacyMessages = shouldFilter ? filterDisplayMessages(parseAgentEvents(events, agentType), agentType) : parseAgentEvents(events, agentType);
+  const parsedEvents = agentType === "claude" || agentType === "relay" ? parseClaudeEvents(events, options.parentToolUseId) : parseAgentEvents(events, agentType);
+  const legacyMessages = shouldFilter ? filterDisplayMessages(parsedEvents, agentType) : parsedEvents;
   if (agentType !== "codex" || !codexAspTranscript) {
     return shouldFilter ? applyInterruptions(legacyMessages, events) : legacyMessages;
   }
@@ -33742,7 +33915,31 @@ function useGenerateWorkspaceName() {
 // ../shared/src/hooks/useWorkspaceEngine.ts
 import { useCallback as useCallback4 } from "react";
 import { useQuery as useQuery2, useMutation as useMutation2 } from "@tanstack/react-query";
-function upsertChat(chats, chat) {
+
+// ../shared/src/workspace-chat.ts
+import { queryOptions } from "@tanstack/react-query";
+var workspaceChatKeys = {
+  chats: (workspaceId) => ["workspace-chats", workspaceId],
+  allChats: (workspaceId) => ["workspace-all-chats", workspaceId],
+  histories: (workspaceId) => ["chat-history", workspaceId],
+  history: (workspaceId, chatId) => ["chat-history", workspaceId, chatId],
+  queues: (workspaceId) => ["chat-queue", workspaceId],
+  queue: (workspaceId, chatId) => ["chat-queue", workspaceId, chatId]
+};
+function workspaceChatsQueryOptions({
+  workspaceId,
+  fetchChats,
+  enabled = true,
+  staleTime = 6e4
+}) {
+  return queryOptions({
+    queryKey: workspaceChatKeys.chats(workspaceId),
+    queryFn: fetchChats,
+    enabled: Boolean(workspaceId) && enabled,
+    staleTime
+  });
+}
+function upsertWorkspaceChat(chats, chat) {
   const existingIndex = chats.findIndex((item) => item.id === chat.id);
   if (existingIndex === -1) {
     return [chat, ...chats].sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));
@@ -33751,7 +33948,7 @@ function upsertChat(chats, chat) {
   next[existingIndex] = chat;
   return next.sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));
 }
-function patchChat(chats, chatId, patch) {
+function patchWorkspaceChat(chats, chatId, patch) {
   let changed = false;
   const next = chats.map((chat) => {
     if (chat.id !== chatId) return chat;
@@ -33760,21 +33957,229 @@ function patchChat(chats, chatId, patch) {
   });
   return changed ? next.sort((a, b) => b.updatedAt.localeCompare(a.updatedAt)) : chats;
 }
+function isAcceptedUserMessage(event) {
+  return getUserMessage(event) !== null && event.payload.source === ACCEPTED_USER_MESSAGE_SOURCE;
+}
+function areDuplicateUserMessages(a, b) {
+  if (areSameUserMessageEvents(a, b)) return true;
+  const aMessage = getUserMessage(a);
+  const bMessage = getUserMessage(b);
+  if (!aMessage || aMessage !== bMessage) return false;
+  const aAccepted = isAcceptedUserMessage(a);
+  const bAccepted = isAcceptedUserMessage(b);
+  return aAccepted !== bAccepted ? areUserMessagesWithinMatchWindow(
+    { content: aMessage, timestamp: a.timestamp },
+    { content: bMessage, timestamp: b.timestamp }
+  ) : false;
+}
+function areDuplicateWorkspaceChatEvents(a, b) {
+  const aPartialStreamId = getClaudePartialMessageStreamId(a);
+  const bPartialStreamId = getClaudePartialMessageStreamId(b);
+  return aPartialStreamId !== null && aPartialStreamId === bPartialStreamId || JSON.stringify(a) === JSON.stringify(b) || areDuplicateUserMessages(a, b);
+}
+function mergeWorkspaceChatHistoryEvents(primary, supplemental) {
+  return mergeAgentEvents(primary, supplemental, {
+    areDuplicates: areDuplicateWorkspaceChatEvents,
+    mergeEvent: (current, candidate) => getClaudePartialMessageStreamId(candidate) !== null ? candidate : current
+  });
+}
+function isSameChatSender(a, b) {
+  return a.senderUserId === b.senderUserId && a.recordedAt === b.recordedAt;
+}
+function codexAspTranscriptUpdateFromEvent(event) {
+  if (event.type !== CODEX_ASP_TRANSCRIPT_UPDATED_EVENT_TYPE) return null;
+  const { payload } = event;
+  const updatedAt = payload.updatedAt;
+  const transcript = payload.transcript;
+  const transcriptDelta = payload.transcriptDelta;
+  if (typeof updatedAt !== "string" || transcript !== null && !isCodexAspTranscript(transcript) || transcriptDelta !== void 0 && !isCodexAspTranscriptDelta(transcriptDelta)) {
+    return null;
+  }
+  const threadId = typeof payload.threadId === "string" ? payload.threadId : void 0;
+  return {
+    updatedAt,
+    transcript,
+    ...transcriptDelta ? { transcriptDelta } : {},
+    ...threadId ? { threadId } : {}
+  };
+}
+function patchCachedChats(queryClient2, workspaceId, chatId, patch) {
+  for (const queryKey of [
+    workspaceChatKeys.chats(workspaceId),
+    workspaceChatKeys.allChats(workspaceId)
+  ]) {
+    queryClient2.setQueryData(
+      queryKey,
+      (current) => current ? {
+        ...current,
+        chats: patchWorkspaceChat(current.chats, chatId, patch)
+      } : current
+    );
+  }
+}
+function applyWorkspaceChatEvent(queryClient2, workspaceId, event, options = {}) {
+  if (event.type === "chat.created" || event.type === "chat.updated") {
+    const { chat } = event.payload;
+    queryClient2.setQueryData(
+      workspaceChatKeys.allChats(workspaceId),
+      (current) => current ? { ...current, chats: upsertWorkspaceChat(current.chats, chat) } : current
+    );
+    if (chat.parentChatId === null && !options.skipRootChatUpsert) {
+      queryClient2.setQueryData(
+        workspaceChatKeys.chats(workspaceId),
+        (current) => ({
+          ...current ?? {},
+          chats: upsertWorkspaceChat(current?.chats ?? [], chat),
+          deletedChats: (current?.deletedChats ?? []).filter((item) => item.id !== chat.id)
+        })
+      );
+    }
+    return "chat-list-changed";
+  }
+  if (event.type === "chat.deleted") {
+    queryClient2.setQueryData(workspaceChatKeys.chats(workspaceId), (current) => {
+      if (!current) return current;
+      const deletedChat = event.payload.chat;
+      return {
+        ...current,
+        chats: current.chats.filter((chat) => chat.id !== event.payload.chatId),
+        deletedChats: deletedChat?.deletedAt ? [
+          deletedChat,
+          ...(current.deletedChats ?? []).filter((chat) => chat.id !== deletedChat.id)
+        ] : (current.deletedChats ?? []).filter((chat) => chat.id !== event.payload.chatId)
+      };
+    });
+    queryClient2.setQueryData(
+      workspaceChatKeys.allChats(workspaceId),
+      (current) => current ? {
+        ...current,
+        chats: current.chats.filter((chat) => chat.id !== event.payload.chatId)
+      } : current
+    );
+    queryClient2.removeQueries({
+      queryKey: workspaceChatKeys.history(workspaceId, event.payload.chatId)
+    });
+    return "chat-list-changed";
+  }
+  if (event.type === "chat.turn.accepted") {
+    if (event.payload.queued) {
+      queryClient2.invalidateQueries({
+        queryKey: workspaceChatKeys.queue(workspaceId, event.payload.chatId)
+      });
+      return "queue-changed";
+    }
+    const sender = event.payload.sender;
+    const acceptedEvent = event.payload.event;
+    if (sender || acceptedEvent) {
+      queryClient2.setQueryData(
+        workspaceChatKeys.history(workspaceId, event.payload.chatId),
+        (current) => ({
+          ...current ?? { thread_id: null },
+          events: acceptedEvent ? mergeWorkspaceChatHistoryEvents(current?.events ?? [], [acceptedEvent]) : current?.events ?? [],
+          senders: sender ? [
+            ...(current?.senders ?? []).filter(
+              (candidate) => !isSameChatSender(candidate, sender)
+            ),
+            sender
+          ] : current?.senders
+        })
+      );
+    }
+    patchCachedChats(queryClient2, workspaceId, event.payload.chatId, {
+      processing: true,
+      awaitingInput: false,
+      updatedAt: event.ts
+    });
+    return "chat-list-changed";
+  }
+  if (event.type === "chat.turn.started") {
+    queryClient2.setQueryData(
+      workspaceChatKeys.queue(workspaceId, event.payload.chatId),
+      (current) => current ? {
+        ...current,
+        queue: current.queue.filter((message) => message.id !== event.payload.messageId)
+      } : current
+    );
+    queryClient2.invalidateQueries({
+      queryKey: workspaceChatKeys.queue(workspaceId, event.payload.chatId)
+    });
+    patchCachedChats(queryClient2, workspaceId, event.payload.chatId, {
+      processing: true,
+      awaitingInput: false,
+      updatedAt: event.ts
+    });
+    const history = queryClient2.getQueryData(
+      workspaceChatKeys.history(workspaceId, event.payload.chatId)
+    );
+    if (!history?.events.some((candidate) => getUserMessageId(candidate) === event.payload.messageId)) {
+      queryClient2.invalidateQueries({
+        queryKey: workspaceChatKeys.history(workspaceId, event.payload.chatId)
+      });
+    }
+    return "chat-list-changed";
+  }
+  if (event.type === "chat.turn.delta") {
+    const historyKey = workspaceChatKeys.history(workspaceId, event.payload.chatId);
+    const transcriptUpdate = codexAspTranscriptUpdateFromEvent(event.payload.event);
+    if (transcriptUpdate) {
+      queryClient2.setQueryData(historyKey, (current) => {
+        const transcript = transcriptUpdate.transcriptDelta ? applyCodexAspTranscriptDelta(
+          current?.codexAspTranscript ?? transcriptUpdate.transcript ?? null,
+          transcriptUpdate.transcriptDelta
+        ) : transcriptUpdate.transcript ?? current?.codexAspTranscript ?? null;
+        return {
+          ...current ?? { events: [] },
+          thread_id: current?.thread_id ?? transcript?.threadId ?? transcriptUpdate.threadId ?? null,
+          codexAspTranscript: transcript
+        };
+      });
+      return "turn-delta";
+    }
+    queryClient2.setQueryData(historyKey, (current) => ({
+      ...current ?? { thread_id: null },
+      events: mergeWorkspaceChatHistoryEvents(current?.events ?? [], [event.payload.event]),
+      goal: event.payload.event.type === CHAT_GOAL_EVENT_TYPE ? coerceChatGoalPayload(event.payload.event.payload) : current?.goal
+    }));
+    return "turn-delta";
+  }
+  if (event.type === "chat.turn.completed" || event.type === "chat.interrupted") {
+    patchCachedChats(queryClient2, workspaceId, event.payload.chatId, {
+      processing: getTerminalChatProcessing(event),
+      awaitingInput: false,
+      isAuthRetrying: false,
+      updatedAt: event.ts
+    });
+    queryClient2.invalidateQueries({
+      queryKey: workspaceChatKeys.history(workspaceId, event.payload.chatId)
+    });
+    queryClient2.invalidateQueries({
+      queryKey: workspaceChatKeys.queue(workspaceId, event.payload.chatId)
+    });
+    queryClient2.invalidateQueries({
+      queryKey: workspaceChatKeys.allChats(workspaceId)
+    });
+    return "turn-completed";
+  }
+  return null;
+}
+
+// ../shared/src/hooks/useWorkspaceEngine.ts
 function useWorkspaceChats(workspaceId) {
   const auth = useReplicasAuth();
   const orgFetch = useOrgFetch();
-  return useQuery2({
-    queryKey: ["workspace-chats", workspaceId],
-    queryFn: () => orgFetch(`/v1/workspaces/${workspaceId}/chats`),
-    enabled: !!workspaceId,
-    staleTime: 6e4
-  }, auth.queryClient);
+  return useQuery2(
+    workspaceChatsQueryOptions({
+      workspaceId,
+      fetchChats: () => orgFetch(`/v1/workspaces/${workspaceId}/chats`)
+    }),
+    auth.queryClient
+  );
 }
 function useChatHistory(workspaceId, chatId) {
   const auth = useReplicasAuth();
   const orgFetch = useOrgFetch();
   return useQuery2({
-    queryKey: ["chat-history", workspaceId, chatId],
+    queryKey: workspaceChatKeys.history(workspaceId, chatId),
     queryFn: () => orgFetch(`/v1/workspaces/${workspaceId}/chats/${chatId}/history`),
     enabled: !!workspaceId && !!chatId
   }, auth.queryClient);
@@ -33851,67 +34256,7 @@ function useWorkspaceEvents(workspaceId, enabled = true) {
   const qc = auth.queryClient;
   const handleEvent = useCallback4((event) => {
     if (!workspaceId) return;
-    const chatsKey = ["workspace-chats", workspaceId];
-    if (event.type === "chat.created" || event.type === "chat.updated") {
-      if (event.payload.chat.parentChatId === null) {
-        qc.setQueryData(chatsKey, (current) => {
-          if (!current) return { chats: [event.payload.chat] };
-          return { chats: upsertChat(current.chats, event.payload.chat) };
-        });
-      }
-      return;
-    }
-    if (event.type === "chat.deleted") {
-      qc.setQueryData(chatsKey, (current) => {
-        if (!current) return current;
-        return { chats: current.chats.filter((chat) => chat.id !== event.payload.chatId) };
-      });
-      qc.removeQueries({ queryKey: ["chat-history", workspaceId, event.payload.chatId] });
-      return;
-    }
-    if (event.type === "chat.turn.accepted") {
-      if (!event.payload.queued) {
-        qc.setQueryData(chatsKey, (current) => {
-          if (!current) return current;
-          return { chats: patchChat(current.chats, event.payload.chatId, { processing: true, updatedAt: event.ts }) };
-        });
-      }
-      return;
-    }
-    if (event.type === "chat.turn.started") {
-      qc.setQueryData(chatsKey, (current) => {
-        if (!current) return current;
-        return { chats: patchChat(current.chats, event.payload.chatId, { processing: true, updatedAt: event.ts }) };
-      });
-      return;
-    }
-    if (event.type === "chat.turn.completed" || event.type === "chat.interrupted") {
-      qc.setQueryData(chatsKey, (current) => {
-        if (!current) return current;
-        return { chats: patchChat(current.chats, event.payload.chatId, { processing: getTerminalChatProcessing(event), updatedAt: event.ts }) };
-      });
-      qc.invalidateQueries({ queryKey: ["chat-history", workspaceId, event.payload.chatId] });
-      return;
-    }
-    if (event.type === "chat.turn.delta") {
-      qc.setQueryData(
-        ["chat-history", workspaceId, event.payload.chatId],
-        (current) => {
-          const incomingSignature = getEventSignature(event.payload.event);
-          if (!current) {
-            return { thread_id: null, events: [event.payload.event] };
-          }
-          const existingIndex = current.events.findIndex((e) => getEventSignature(e) === incomingSignature);
-          if (existingIndex !== -1) {
-            const events = current.events.slice();
-            events[existingIndex] = event.payload.event;
-            return { ...current, events };
-          }
-          return { ...current, events: [...current.events, event.payload.event] };
-        }
-      );
-      return;
-    }
+    if (applyWorkspaceChatEvent(qc, workspaceId, event)) return;
     if (event.type === "repo.status.changed") {
       qc.setQueryData(["workspace-status", workspaceId, false], (current) => {
         if (!current) return current;

package/package.json

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