remote-codex 0.1.8 → 0.1.9

package/apps/supervisor-api/dist/index.js

@@ -10711,7 +10711,7 @@ function deferLargeHistoryItemDetails(turn, deferredDetails) {
   };
 }
 function shouldPersistLiveHistoryItem(item) {
-  return item.kind === "commandExecution" || item.kind === "fileChange" || item.kind === "hook" || item.kind === "toolCall" || item.kind === "webSearch";
+  return item.kind === "agentMessage" || item.kind === "commandExecution" || item.kind === "fileChange" || item.kind === "hook" || item.kind === "toolCall" || item.kind === "webSearch";
 }
 function parseStoredHistoryItem(value) {
   try {
@@ -10795,10 +10795,10 @@ function sortTurnItemsByRecordedSequence(items) {
 }
 function mergeHistoryItemsBySequence(items, missingItems) {
   if (missingItems.length === 0) {
-    return items;
+    return sortTurnItemsByRecordedSequence(items);
   }
   if (!missingItems.some(hasHistoryItemSequence)) {
-    return [...items, ...missingItems];
+    return sortTurnItemsByRecordedSequence([...items, ...missingItems]);
   }
   const mergedItems = [...items];
   const orderedMissingItems = sortHistoryItemsBySequence(missingItems);
@@ -10823,16 +10823,20 @@ function mergeHistoryItemsBySequence(items, missingItems) {
     }
     mergedItems.push(missingItem);
   }
-  return mergedItems;
+  return sortTurnItemsByRecordedSequence(mergedItems);
+}
+function copyPersistedSequence(item, persistedItem) {
+  if (!hasHistoryItemSequence(persistedItem)) {
+    return item;
+  }
+  const sequence = historyItemSequence(persistedItem);
+  return item.sequence === sequence ? item : { ...item, sequence };
 }
 function mergePersistedHistoryItemsIntoTurns(turns, persistedItemsByTurnId, deferredDetails) {
   if (persistedItemsByTurnId.size === 0) {
     return turns;
   }
   return turns.map((turn) => {
-    if (turn.status === "inProgress") {
-      return turn;
-    }
     const persistedItems = persistedItemsByTurnId.get(turn.id);
     if (!persistedItems || persistedItems.length === 0) {
       return turn;
@@ -10841,23 +10845,32 @@ function mergePersistedHistoryItemsIntoTurns(turns, persistedItemsByTurnId, defe
     const persistedItemsById = new Map(persistedItems.map((item) => [item.id, item]));
     const nextItems = turn.items.map((item) => {
       const persistedItem = persistedItemsById.get(item.id);
-      if (!persistedItem || item.kind !== persistedItem.kind || persistedItem.kind !== "commandExecution" && persistedItem.kind !== "toolCall") {
+      if (!persistedItem) {
         return item;
       }
-      const existingText = item.detailText?.trim() || item.text.trim();
-      const persistedText = persistedItem.detailText?.trim() || persistedItem.text.trim();
-      if (persistedText.length <= existingText.length) {
+      persistedItemsById.delete(item.id);
+      if (item.kind !== persistedItem.kind) {
         return item;
       }
-      changed = true;
-      persistedItemsById.delete(item.id);
-      return persistedItem.kind === "commandExecution" ? deferCommandHistoryItem2(
-        persistedItem,
-        deferredDetails
-      ) : deferToolCallHistoryItem2(
-        persistedItem,
-        deferredDetails
-      );
+      const sequencedItem = copyPersistedSequence(item, persistedItem);
+      if (sequencedItem !== item) {
+        changed = true;
+      }
+      if (persistedItem.kind === "commandExecution" || persistedItem.kind === "toolCall") {
+        const existingText = item.detailText?.trim() || item.text.trim();
+        const persistedText = persistedItem.detailText?.trim() || persistedItem.text.trim();
+        if (persistedText.length > existingText.length) {
+          changed = true;
+          return persistedItem.kind === "commandExecution" ? deferCommandHistoryItem2(
+            persistedItem,
+            deferredDetails
+          ) : deferToolCallHistoryItem2(
+            persistedItem,
+            deferredDetails
+          );
+        }
+      }
+      return sequencedItem;
     });
     const existingItemIds = new Set(nextItems.map((item) => item.id));
     const missingItems = [...persistedItemsById.values()].filter((item) => !existingItemIds.has(item.id)).map(
@@ -13587,10 +13600,22 @@ var ThreadService = class {
         if (!record) {
           return;
         }
-        this.recordTurnItemOrder(record.id, event.providerTurnId, event.itemId);
+        const sequence = this.recordTurnItemOrder(
+          record.id,
+          event.providerTurnId,
+          event.itemId
+        );
+        this.appendLiveAgentMessageDelta(
+          record.id,
+          event.providerTurnId,
+          event.itemId,
+          event.delta,
+          sequence
+        );
         this.emitThreadEvent("thread.output.delta", record.id, {
           turnId: event.providerTurnId,
           itemId: event.itemId,
+          sequence,
           delta: event.delta
         });
         return;
@@ -13833,6 +13858,30 @@ var ThreadService = class {
       updatedAt: (/* @__PURE__ */ new Date()).toISOString()
     });
   }
+  appendLiveAgentMessageDelta(localThreadId, turnId, itemId, delta, sequence) {
+    const current = this.threadLiveItems.get(localThreadId);
+    const currentItems = current?.turnId === turnId ? current.items : [];
+    const existing = currentItems.find((entry) => entry.id === itemId);
+    const nextItem = existing?.kind === "agentMessage" ? {
+      ...existing,
+      text: `${existing.text}${delta}`,
+      sequence
+    } : {
+      id: itemId,
+      kind: "agentMessage",
+      text: delta,
+      sequence
+    };
+    this.persistLiveHistoryItem(localThreadId, turnId, nextItem);
+    this.setLiveItems(localThreadId, {
+      turnId,
+      items: sortHistoryItemsBySequence([
+        ...currentItems.filter((entry) => entry.id !== itemId),
+        nextItem
+      ]),
+      updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+    });
+  }
   async toThreadHooksDto(provider, workspacePath, entry, fallbackWarnings = []) {
     const { globalHooksPath, projectHooksPath } = this.codexManagement.hooksPaths(workspacePath);
     const officialHooks = (entry?.hooks ?? []).map((hook) => ({
@@ -13893,11 +13942,17 @@ var ThreadService = class {
       return null;
     }
     const matchingTurn = turns.find((turn) => turn.id === current.turnId);
-    const materializedItemIds = new Set(
-      matchingTurn?.items.map((item) => item.id) ?? []
+    const materializedItemsById = new Map(
+      matchingTurn?.items.map((item) => [item.id, item]) ?? []
     );
     const nextItems = current.items.filter(
-      (item) => !materializedItemIds.has(item.id)
+      (item) => {
+        const materializedItem = materializedItemsById.get(item.id);
+        if (!materializedItem) {
+          return true;
+        }
+        return typeof item.sequence === "number" && Number.isFinite(item.sequence) && materializedItem.sequence !== item.sequence;
+      }
     );
     if (nextItems.length === current.items.length) {
       return current;

package/apps/supervisor-web/dist/assets/{highlighted-body-OFNGDK62-owvlMiML.js → highlighted-body-OFNGDK62-BFD4Ytvg.js}

@@ -1 +1 @@
-import{r,R as x,L as d,j as f,A as p}from"./index-CrcX157r.js";var N=({code:i,language:e,raw:a,className:u,startLine:n,lineNumbers:g,...m})=>{let{shikiTheme:l}=r.useContext(x),s=d(),[h,t]=r.useState(a);return r.useEffect(()=>{if(!s){t(a);return}let o=s.highlight({code:i,language:e,themes:l},c=>{t(c)});o&&t(o)},[i,e,l,s,a]),f.jsx(p,{className:u,language:e,lineNumbers:g,result:h,startLine:n,...m})};export{N as HighlightedCodeBlockBody};
+import{r,R as x,L as d,j as f,A as p}from"./index-Rd2EBQac.js";var N=({code:i,language:e,raw:a,className:u,startLine:n,lineNumbers:g,...m})=>{let{shikiTheme:l}=r.useContext(x),s=d(),[h,t]=r.useState(a);return r.useEffect(()=>{if(!s){t(a);return}let o=s.highlight({code:i,language:e,themes:l},c=>{t(c)});o&&t(o)},[i,e,l,s,a]),f.jsx(p,{className:u,language:e,lineNumbers:g,result:h,startLine:n,...m})};export{N as HighlightedCodeBlockBody};