remote-codex 0.11.38 → 0.11.40

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

@@ -11717,6 +11717,21 @@ import { pathToFileURL } from "url";
 import { promisify } from "util";
 var execFileAsync = promisify(execFile);
 var promptPhotoTokenPattern2 = /\[PHOTO\s+([^\]]+)\]/g;
+var activeTranscriptMatchWindowMs = 12e4;
+function normalizePromptForTurnReconciliation(value) {
+  return value.replace(/\[PHOTO\s+[^\]]+\]/g, " ").replace(/\s+/g, " ").trim();
+}
+function userPromptForTurn(turn) {
+  return turn.items.find((item) => item.kind === "userMessage")?.text ?? null;
+}
+function isRecentActiveTranscriptTurn(turn, activeStartedAt) {
+  if (!turn.startedAt) {
+    return true;
+  }
+  const transcriptStartedAt = Date.parse(turn.startedAt);
+  const activeStartedAtMs = Date.parse(activeStartedAt);
+  return !Number.isFinite(transcriptStartedAt) || !Number.isFinite(activeStartedAtMs) || Math.abs(transcriptStartedAt - activeStartedAtMs) <= activeTranscriptMatchWindowMs;
+}
 function mimeTypeForImagePath(filePath) {
   const extension = path10.extname(filePath).toLowerCase();
   switch (extension) {
@@ -12755,6 +12770,12 @@ var ClaudeRuntimeAdapter = class extends EventEmitter5 {
     return {
       ...summary,
       cwd,
+      // Claude's persisted session metadata remains "idle" while a query is
+      // streaming. The in-memory runtime is authoritative for that interval:
+      // returning the stale persisted status makes detail polling clear the
+      // active provider turn, which in turn drops live tool items from the
+      // transcript until Claude writes its final history record.
+      status: activeTurn ? "running" : summary.status,
       turns: this.reconcileActiveTranscriptTurn(providerSessionId, turns, activeTurn)
     };
   }
@@ -12987,9 +13008,11 @@ var ClaudeRuntimeAdapter = class extends EventEmitter5 {
     }
     const activeUserItem = userMessageHistoryItem(`${activeTurn.providerTurnId}:user`, prompt);
     const activeItems = [...activeTurn.itemOrder].map((itemId) => activeTurn.items.get(itemId)).filter((item) => Boolean(item));
-    const transcriptTurnIndex = turns.findLastIndex(
-      (turn) => turn.status === "completed" && turn.items.some((item) => item.kind === "userMessage") && !turn.items.some((item) => item.kind === "agentMessage")
-    );
+    const normalizedPrompt = normalizePromptForTurnReconciliation(prompt);
+    const transcriptTurnIndex = turns.findLastIndex((turn) => {
+      const transcriptPrompt = userPromptForTurn(turn);
+      return turn.status === "completed" && transcriptPrompt !== null && normalizePromptForTurnReconciliation(transcriptPrompt) === normalizedPrompt && !turn.items.some((item) => item.kind === "agentMessage") && isRecentActiveTranscriptTurn(turn, activeTurn.startedAt);
+    });
     if (transcriptTurnIndex < 0) {
       return turns;
     }
@@ -13000,6 +13023,11 @@ var ClaudeRuntimeAdapter = class extends EventEmitter5 {
         aliases = /* @__PURE__ */ new Map();
         this.historicalTurnIdAliases.set(providerSessionId, aliases);
       }
+      for (const [historicalTurnId, displayTurnId] of aliases) {
+        if (displayTurnId === activeTurn.providerTurnId && historicalTurnId !== transcriptTurn.providerTurnId) {
+          aliases.delete(historicalTurnId);
+        }
+      }
       aliases.set(transcriptTurn.providerTurnId, activeTurn.providerTurnId);
     }
     return turns.map((turn, index) => {
@@ -13022,9 +13050,16 @@ var ClaudeRuntimeAdapter = class extends EventEmitter5 {
     if (!aliases || aliases.size === 0) {
       return turns;
     }
+    const rawTurnIds = new Set(turns.map((turn) => turn.providerTurnId));
+    const usedTurnIds = /* @__PURE__ */ new Set();
     return turns.map((turn) => {
       const providerTurnId = aliases.get(turn.providerTurnId);
-      return providerTurnId ? { ...turn, providerTurnId } : turn;
+      if (!providerTurnId || usedTurnIds.has(providerTurnId) || providerTurnId !== turn.providerTurnId && rawTurnIds.has(providerTurnId)) {
+        usedTurnIds.add(turn.providerTurnId);
+        return turn;
+      }
+      usedTurnIds.add(providerTurnId);
+      return { ...turn, providerTurnId };
     });
   }
   async listMcpServers() {
@@ -13233,9 +13268,11 @@ var ClaudeRuntimeAdapter = class extends EventEmitter5 {
         const nextItem = withHistoryItemCreatedAt(item, messageCreatedAt);
         const existing = state.items.get(nextItem.id);
         addOrUpdateItem(state, nextItem);
-        if (nextItem.kind !== "agentMessage" && !existing) {
+        if (nextItem.kind === "agentMessage") {
+          this.emitItem(state, nextItem, "item.completed", { force: true });
+        } else if (!existing) {
           this.emitItem(state, nextItem, "item.started");
-        } else if (nextItem.kind !== "agentMessage" && existing) {
+        } else {
           this.emitItem(state, nextItem, "item.started", { force: true });
         }
       }
@@ -16955,7 +16992,7 @@ function deferLargeHistoryItemDetails(turn, deferredDetails) {
   };
 }
 function shouldPersistLiveHistoryItem(item) {
-  return item.kind === "commandExecution" || item.kind === "fileChange" || item.kind === "fileRead" || item.kind === "hook" || item.kind === "agentToolCall" || item.kind === "skillToolCall" || item.kind === "toolCall" || item.kind === "reasoning" || item.kind === "webSearch";
+  return item.kind === "agentMessage" && !isTransientAgentHistoryItem(item) || item.kind === "commandExecution" || item.kind === "fileChange" || item.kind === "fileRead" || item.kind === "hook" || item.kind === "agentToolCall" || item.kind === "skillToolCall" || item.kind === "toolCall" || item.kind === "reasoning" || item.kind === "webSearch";
 }
 function shouldPersistFinalHistoryItem(item) {
   return item.kind === "agentMessage" || shouldPersistLiveHistoryItem(item);
@@ -20281,7 +20318,9 @@ var ThreadHistoryPersistenceCoordinator = class {
       threadId: localThreadId,
       turnId,
       itemId: item.id,
-      itemJson: JSON.stringify(item)
+      itemJson: JSON.stringify(
+        item.kind === "agentMessage" ? { ...item, sourceTurnId: turnId } : item
+      )
     });
   }
   persistProjectedHistoryItem(localThreadId, turnId, item) {