replicas-cli 0.3.156 → 0.3.158

package/dist/index.cjs

@@ -26907,7 +26907,18 @@ function collectCodexTurns(events) {
   }
   return turns;
 }
+var turnMessages = /* @__PURE__ */ new WeakMap();
 function messagesForCodexTurn(turn) {
+  const [first] = turn.items;
+  const cached2 = first ? turnMessages.get(first) : void 0;
+  if (cached2 && cached2.turn.id === turn.id && cached2.turn.status === turn.status && cached2.turn.completedAt === turn.completedAt && cached2.turn.error === turn.error && cached2.turn.items.length === turn.items.length && cached2.turn.items.every((item, index) => item === turn.items[index])) {
+    return cached2.messages;
+  }
+  const messages = codexTurnMessages(turn);
+  if (first) turnMessages.set(first, { turn, messages });
+  return messages;
+}
+function codexTurnMessages(turn) {
   const items = turn.items.map((item, index) => ({ item, index })).sort((a, b) => parseTimestampMs(a.item.timestamp) - parseTimestampMs(b.item.timestamp) || a.index - b.index).map(({ item }) => item);
   const reasoning = items.filter(
     (item) => item.type === "reasoning" && item.text.trim().length > 0
@@ -27170,16 +27181,14 @@ function takeRecordedPrompt(prompts3, echo, turnIndex) {
 function parseCodexEvents(events) {
   const messages = [];
   const turns = collectCodexTurns(events);
-  const turnInsertions = [];
+  const turnInsertions = /* @__PURE__ */ new Map();
   const pendingCommands = /* @__PURE__ */ new Map();
   const pendingToolCalls = /* @__PURE__ */ new Map();
   const pendingPatches = /* @__PURE__ */ new Map();
   events.forEach((event, eventIndex) => {
     const turnId = codexItemFromEvent(event)?.turnId ?? codexTurnFromEvent(event)?.turnId;
     if (turnId !== void 0) {
-      if (!turnInsertions.some((insertion) => insertion.turnId === turnId)) {
-        turnInsertions.push({ index: messages.length, turnId });
-      }
+      if (!turnInsertions.has(turnId)) turnInsertions.set(turnId, messages.length);
       return;
     }
     if (event.type === "codex-asp-error") {
@@ -27359,7 +27368,7 @@ function parseCodexEvents(events) {
     recordedPrompts.set(content, prompts3);
   });
   const claimedPrompts = /* @__PURE__ */ new Set();
-  for (const { index, turnId } of turnInsertions.reverse()) {
+  for (const [turnId, index] of [...turnInsertions].reverse()) {
     const turn = turns.get(turnId);
     if (!turn) continue;
     const kept = [];
@@ -28004,12 +28013,9 @@ function parseStringField(value) {
   return trimmed ? trimmed : null;
 }
 function parseCreateResultTaskId(resultText) {
-  try {
-    const parsed = JSON.parse(resultText);
-    if (isRecord(parsed) && isRecord(parsed.task)) {
-      return parseStringField(parsed.task.id);
-    }
-  } catch {
+  const parsed = resultText.trimStart().startsWith("{") ? safeJsonParse(resultText, null) : null;
+  if (isRecord(parsed) && isRecord(parsed.task)) {
+    return parseStringField(parsed.task.id);
   }
   return resultText.match(/\bTask\s+#?([A-Za-z0-9_-]+)\s+created\b/i)?.[1] ?? null;
 }
@@ -28063,10 +28069,10 @@ var TaskAccumulator = class {
     }
     return false;
   }
-  processCreateResult(toolUseId, resultText) {
+  processCreateResult(toolUseId, content) {
     const pending = this.tasksByCreateToolUseId.get(toolUseId);
     if (!pending) return false;
-    const taskId = parseCreateResultTaskId(resultText);
+    const taskId = parseCreateResultTaskId(extractToolResultText(content, ""));
     if (!taskId) return false;
     this.tasksByTaskId.set(taskId, pending);
     this.tasksByCreateToolUseId.delete(toolUseId);
@@ -28088,7 +28094,7 @@ var TaskAccumulator = class {
       return this.processToolUse(block.name, block.id, toAccumulatorInput(block.input));
     }
     if (block.type === "tool_result" && typeof block.tool_use_id === "string") {
-      return this.processCreateResult(block.tool_use_id, extractToolResultText(block.content, ""));
+      return this.processCreateResult(block.tool_use_id, block.content);
     }
     return false;
   }
@@ -28098,7 +28104,18 @@ var TaskAccumulator = class {
 var ABORTED_TERMINAL_REASONS = /* @__PURE__ */ new Set(["aborted_streaming", "aborted_tools"]);
 var COMMAND_TOOL_NAMES = /* @__PURE__ */ new Set(["Bash", "bash", "shell"]);
 var FILE_TOOL_NAMES = /* @__PURE__ */ new Set(["Write", "Edit"]);
-function fileOrCommandMessage(toolName, toolUseId, input, timestamp) {
+var toolMessageTemplates = /* @__PURE__ */ new WeakMap();
+var toolResults = /* @__PURE__ */ new WeakMap();
+function fileOrCommandMessage(block, timestamp) {
+  let template = toolMessageTemplates.get(block);
+  if (!template) {
+    const input = typeof block.input === "string" ? safeJsonParse(block.input, {}) : block.input ?? {};
+    template = toolMessageTemplate(block.name ?? "", block.id ?? "", input);
+    toolMessageTemplates.set(block, template);
+  }
+  return { ...template, timestamp };
+}
+function toolMessageTemplate(toolName, toolUseId, input) {
   if (COMMAND_TOOL_NAMES.has(toolName)) {
     const command = typeof input.command === "string" ? input.command : "";
     const skillNames = skillNamesFromCommand(command);
@@ -28108,8 +28125,7 @@ function fileOrCommandMessage(toolName, toolUseId, input, timestamp) {
       command,
       ...skillNames.length > 0 ? { skillNames } : {},
       output: "",
-      status: "in_progress",
-      timestamp
+      status: "in_progress"
     };
   }
   const filePath = typeof input.file_path === "string" ? input.file_path : "";
@@ -28137,28 +28153,41 @@ function fileOrCommandMessage(toolName, toolUseId, input, timestamp) {
     id: `patch-${toolUseId}`,
     type: "patch",
     operations: [{ action: toolName === "Write" ? "add" : "update", path: filePath, diff }],
-    status: "in_progress",
-    timestamp
+    status: "in_progress"
   };
 }
-function createSubagentMessage(messageIndex, timestamp, fields) {
-  const { id = `subagent-${timestamp}-${messageIndex}`, ...message2 } = fields;
-  return { id, type: "subagent", ...message2, timestamp };
+function createSubagentMessage(timestamp, fields) {
+  return { id: `subagent-${fields.toolUseId}`, type: "subagent", ...fields, timestamp };
 }
-function collectNestedEvents(events, toolUseId) {
-  return events.filter((e) => e.payload.parent_tool_use_id === toolUseId).map(({ timestamp, type, payload }) => ({ timestamp, type, payload }));
+function groupNestedEvents(events) {
+  const nested = /* @__PURE__ */ new Map();
+  for (const { timestamp, type, payload } of events) {
+    const parent = payload.parent_tool_use_id;
+    if (typeof parent !== "string") continue;
+    const siblings = nested.get(parent);
+    if (siblings) siblings.push({ timestamp, type, payload });
+    else nested.set(parent, [{ timestamp, type, payload }]);
+  }
+  return nested;
 }
-function readToolResult(event) {
-  if (event.type !== "claude-user") return void 0;
+function extractToolResult(event) {
   const toolResult = normalizeContentBlocks(event.payload.message?.content).find((c) => c.type === "tool_result");
   if (!toolResult?.tool_use_id) return void 0;
+  const output2 = extractToolResultText(toolResult.content);
+  const exitCode = output2.match(/exit code:?\s*(\d+)/i)?.[1];
   return {
     toolResult,
     toolUseId: toolResult.tool_use_id,
-    output: extractToolResultText(toolResult.content),
+    output: output2,
+    exitCode: exitCode === void 0 ? void 0 : parseInt(exitCode, 10),
     status: toolResult.is_error ? "failed" : "completed"
   };
 }
+function readToolResult(event) {
+  if (event.type !== "claude-user") return void 0;
+  if (!toolResults.has(event)) toolResults.set(event, extractToolResult(event));
+  return toolResults.get(event);
+}
 function coerceClaudeResultPayload(payload) {
   return {
     is_error: typeof payload.is_error === "boolean" ? payload.is_error : void 0,
@@ -28215,6 +28244,8 @@ function parseClaudeEvents(events, parentToolUseId) {
     });
   };
   const taskAccumulator = new TaskAccumulator();
+  let nestedEventsByParent;
+  const collectNestedEvents = (toolUseId) => (nestedEventsByParent ?? (nestedEventsByParent = groupNestedEvents(events))).get(toolUseId) ?? [];
   const todoItems = /* @__PURE__ */ new WeakMap();
   const taskSnapshot = () => taskAccumulator.getTasks().map((task) => {
     const item = todoItems.get(task) ?? { text: task.subject, completed: task.status === "completed", itemStatus: task.status };
@@ -28409,8 +28440,8 @@ function parseClaudeEvents(events, parentToolUseId) {
           });
           if (toolName === "Task" || toolName === "Agent") {
             const inputObj = typeof toolInput === "string" ? safeJsonParse(toolInput, {}) : toolInput;
-            const nestedEvents = collectNestedEvents(events, toolUseId);
-            messages.push(createSubagentMessage(messages.length, event.timestamp, {
+            const nestedEvents = collectNestedEvents(toolUseId);
+            messages.push(createSubagentMessage(event.timestamp, {
               toolUseId,
               description: inputObj.description || "Subagent Task",
               prompt: inputObj.prompt || "",
@@ -28420,14 +28451,13 @@ function parseClaudeEvents(events, parentToolUseId) {
               nestedEvents
             }));
           } else if (COMMAND_TOOL_NAMES.has(toolName) || FILE_TOOL_NAMES.has(toolName)) {
-            const inputObj = typeof toolInput === "string" ? safeJsonParse(toolInput, {}) : toolInput;
-            messages.push(fileOrCommandMessage(toolName, toolUseId, inputObj, event.timestamp));
+            messages.push(fileOrCommandMessage(block, event.timestamp));
           } else if (toolName === "TaskCreate" || toolName === "TaskUpdate" || toolName === "TaskList") {
             taskAccumulator.processContentBlock(block);
             const snapshot = taskSnapshot();
             if (snapshot.length > 0) {
               messages.push({
-                id: `todo-${event.timestamp}-${messages.length}`,
+                id: `todo-${toolUseId}`,
                 type: "todo_list",
                 items: snapshot,
                 status: "completed",
@@ -28438,7 +28468,7 @@ function parseClaudeEvents(events, parentToolUseId) {
             const inputObj = typeof toolInput === "string" ? safeJsonParse(toolInput, {}) : toolInput;
             const query = inputObj.query || "";
             messages.push({
-              id: `search-${event.timestamp}-${messages.length}`,
+              id: `search-${toolUseId}`,
               type: "web_search",
               query,
               status: "in_progress",
@@ -28456,7 +28486,7 @@ function parseClaudeEvents(events, parentToolUseId) {
             });
           } else {
             messages.push(createCallDisplayMessage({
-              id: `toolcall-${event.timestamp}-${messages.length}`,
+              id: `toolcall-${toolUseId}`,
               server: "claude",
               tool: toolName,
               input: toolInput,
@@ -28507,10 +28537,8 @@ function parseClaudeEvents(events, parentToolUseId) {
         for (const workflowAgent of payload.workflowAgents ?? []) {
           const existingWorkflowAgent = workflowAgentMessageMap.get(workflowAgent.agentId);
           const nextWorkflowAgent = createSubagentMessage(
-            messages.length,
             existingWorkflowAgent?.timestamp ?? event.timestamp,
             {
-              id: existingWorkflowAgent?.id,
               toolUseId: workflowAgent.agentId,
               description: workflowAgent.label,
               prompt: workflowAgent.promptPreview ?? existingWorkflowAgent?.prompt ?? "",
@@ -28518,7 +28546,7 @@ function parseClaudeEvents(events, parentToolUseId) {
               model: workflowAgent.model ?? existingWorkflowAgent?.model,
               status: workflowAgent.state === "done" ? "completed" : workflowAgent.state === "error" ? "failed" : "in_progress",
               output: workflowAgent.resultPreview ?? workflowAgent.lastToolSummary ?? existingWorkflowAgent?.output,
-              nestedEvents: existingWorkflowAgent?.nestedEvents ?? collectNestedEvents(events, workflowAgent.agentId)
+              nestedEvents: existingWorkflowAgent?.nestedEvents ?? collectNestedEvents(workflowAgent.agentId)
             }
           );
           workflowAgentMessageMap.set(workflowAgent.agentId, upsertDisplayMessage(messages, nextWorkflowAgent));
@@ -28526,7 +28554,7 @@ function parseClaudeEvents(events, parentToolUseId) {
         const existing = taskMessageMap.get(payload.taskId);
         const nextStatus = payload.subtype === "task_notification" ? normalizeBackgroundTaskStatus(payload.status) : payload.subtype === "task_updated" && payload.patch?.status !== void 0 ? normalizeBackgroundTaskStatus(payload.patch?.status) : existing?.status ?? "in_progress";
         const nextMessage = {
-          id: existing?.id ?? `task-${event.timestamp}-${messages.length}`,
+          id: `task-${payload.taskId}`,
           type: "background_task",
           taskId: payload.taskId,
           toolUseId: payload.toolUseId ?? existing?.toolUseId,
@@ -28583,7 +28611,7 @@ function parseClaudeEvents(events, parentToolUseId) {
   for (const [streamId, { tool, timestamp }] of streamingTools) {
     if (toolCallMap.has(tool.id) || supersededStreamIds.has(streamId)) continue;
     if (!COMMAND_TOOL_NAMES.has(tool.name) && !FILE_TOOL_NAMES.has(tool.name)) continue;
-    messages.push(fileOrCommandMessage(tool.name, tool.id, "filePath" in tool ? { file_path: tool.filePath } : { command: tool.command }, timestamp));
+    messages.push(fileOrCommandMessage({ type: "tool_use", id: tool.id, name: tool.name, input: "filePath" in tool ? { file_path: tool.filePath } : { command: tool.command } }, timestamp));
   }
   filteredEvents.forEach((event) => {
     const result = readToolResult(event);
@@ -28600,12 +28628,7 @@ function parseClaudeEvents(events, parentToolUseId) {
     if (message2.type === "command") {
       message2.output = resultContent;
       message2.status = status;
-      const exitCodeMatch = resultContent.match(/exit code:?\s*(\d+)/i);
-      if (exitCodeMatch) {
-        message2.exitCode = parseInt(exitCodeMatch[1], 10);
-      } else {
-        message2.exitCode = isError ? 1 : 0;
-      }
+      message2.exitCode = result.exitCode ?? (isError ? 1 : 0);
     } else if (message2.type === "patch") {
       message2.status = status;
     } else if (message2.type === "web_search") {
@@ -29050,7 +29073,7 @@ var headlessAgentRequestSchema = external_exports.object({
 });
 
 // ../shared/src/cli-version.ts
-var CLI_VERSION = "0.3.156";
+var CLI_VERSION = "0.3.158";
 
 // ../shared/src/version.ts
 function compareVersions(v1, v2) {

package/package.json

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