@jingyi0605/codingns 0.3.5 → 0.4.0

package/node_modules/@codingns/session-sync-core/dist/providers/codex.js

@@ -1,11 +1,12 @@
 import { basename, dirname, join } from "node:path";
 import { existsSync, readFileSync, readdirSync, renameSync, statSync } from "node:fs";
 import crypto from "node:crypto";
-import { appendJsonLine, createRawRef, encodeCursor, ensureDirectory, extractTextBlocks, ensureText, messageIdFromRawRef, nextTimestamp, normalizeWorkspacePath, readFirstNonEmptyLine, readJsonLines, readTrailingJsonLines, safeDate, sliceHistory, stringifyStructuredValue, walkJsonlFiles } from "./utils.js";
+import { appendJsonLine, createRawRef, encodeCursor, ensureDirectory, extractTextBlocks, ensureText, messageIdFromRawRef, messageIdFromStableKey, nextTimestamp, normalizeWorkspacePath, readFirstNonEmptyLine, readJsonLines, readTrailingJsonLines, safeDate, sliceHistory, stringifyStructuredValue, walkJsonlFiles } from "./utils.js";
 import { loadDatabaseSync } from "../sqlite/node-sqlite.js";
 const CODEX_SESSION_TITLE_MAX_LENGTH = 48;
 const HISTORY_CACHE_LIMIT = 6;
 const SESSION_SUMMARY_CACHE_LIMIT = 512;
+const SPAWN_RELATION_SCAN_CACHE_LIMIT = 512;
 const RECENT_HISTORY_INITIAL_BYTES = 256 * 1024;
 const RECENT_HISTORY_MAX_BYTES = 4 * 1024 * 1024;
 const RECENT_HISTORY_BUFFER_MESSAGES = 24;
@@ -19,20 +20,32 @@ export class CodexAdapter {
     providerId = "codex";
     historyCache = new Map();
     sessionSummaryCache = new Map();
+    spawnRelationScanCache = new Map();
     threadMetadataIndexCache = null;
     constructor(options) {
         this.options = options;
     }
     async detectSessions(workspacePath, options) {
+        const discovery = await this.detectSessionsDetailed(workspacePath, options);
+        return discovery.sessions;
+    }
+    async detectSessionsDetailed(workspacePath, options) {
+        const startedAt = Date.now();
         const targetPath = normalizeWorkspacePath(workspacePath);
-        const files = this.listSessionFiles();
         const knownSessions = (options?.knownSessions ?? []).filter((session) => session.provider === this.providerId);
+        const threadMetadataIndex = this.readThreadMetadataIndex();
+        const files = this.listSessionFiles(targetPath, threadMetadataIndex, knownSessions);
         const knownByRawStoreRef = new Map(knownSessions.map((session) => [session.rawStoreRef, session]));
         const knownByProviderSessionId = new Map(knownSessions.map((session) => [session.providerSessionId, session]));
         const sessionsByProviderSessionId = new Map();
         const retainedSummaries = [];
         const pendingFiles = [];
+        let scannedFiles = 0;
+        let skippedByMtimeSize = 0;
+        let parsedFiles = 0;
+        let bytesRead = 0;
         for (const filePath of files) {
+            scannedFiles += 1;
             const stats = statSync(filePath);
             const cachedSummary = this.sessionSummaryCache.get(filePath);
             const fileSessionId = basename(filePath, ".jsonl");
@@ -47,6 +60,7 @@ export class CodexAdapter {
                 if (cachedSummary.summary
                     && hasUsableCodexTitle(cachedSummary.summary.title)
                     && normalizeWorkspacePath(cachedSummary.summary.workspacePath) === targetPath) {
+                    skippedByMtimeSize += 1;
                     retainedSummaries.push({
                         filePath,
                         stats,
@@ -67,6 +81,7 @@ export class CodexAdapter {
                 && hasUsableCodexTitle(knownByPath.title)
                 && (!sessionIdentity
                     || knownByPath.providerSessionId === sessionIdentity.threadId)) {
+                skippedByMtimeSize += 1;
                 if (normalizeWorkspacePath(knownByPath.workspacePath) === targetPath) {
                     retainedSummaries.push({
                         filePath,
@@ -81,6 +96,8 @@ export class CodexAdapter {
                     mtimeMs: stats.mtimeMs,
                     size: stats.size,
                     workspacePath: knownByPath.workspacePath,
+                    providerSessionId: knownByPath.providerSessionId,
+                    title: null,
                     summary: null
                 });
                 continue;
@@ -92,6 +109,8 @@ export class CodexAdapter {
                     mtimeMs: stats.mtimeMs,
                     size: stats.size,
                     workspacePath: sessionIdentity.cwd,
+                    providerSessionId: sessionIdentity.threadId,
+                    title: null,
                     summary: null
                 });
                 continue;
@@ -107,13 +126,33 @@ export class CodexAdapter {
             });
         }
         if (pendingFiles.length === 0 && retainedSummaries.length === 0) {
-            return [...sessionsByProviderSessionId.values()].sort((left, right) => (left.lastMessageAt ?? "").localeCompare(right.lastMessageAt ?? ""));
+            const sessions = [...sessionsByProviderSessionId.values()].sort((left, right) => (left.lastMessageAt ?? "").localeCompare(right.lastMessageAt ?? ""));
+            const diagnostic = {
+                provider: this.providerId,
+                status: "success",
+                durationMs: Date.now() - startedAt,
+                sessionCount: sessions.length,
+                isComplete: true,
+                errorMessage: null,
+                scannedFiles,
+                skippedByMtimeSize,
+                parsedFiles,
+                bytesRead
+            };
+            return {
+                sessions,
+                isComplete: true,
+                providerDiagnostics: [diagnostic]
+            };
         }
-        const threadMetadataIndex = this.readThreadMetadataIndex();
         const pendingThreadIds = new Set([...pendingFiles, ...retainedSummaries]
             .map((entry) => entry.sessionIdentity?.threadId ?? null)
             .filter((value) => value !== null));
-        const spawnedAgentRelationIndex = this.readSpawnedAgentRelationIndex([...pendingFiles, ...retainedSummaries].map((entry) => entry.filePath), targetPath, threadMetadataIndex, pendingThreadIds);
+        const spawnedAgentRelationIndex = this.readSpawnedAgentRelationIndex([...pendingFiles, ...retainedSummaries].map((entry) => ({
+            filePath: entry.filePath,
+            stats: entry.stats,
+            sessionIdentity: entry.sessionIdentity
+        })), targetPath, threadMetadataIndex, pendingThreadIds);
         for (const entry of retainedSummaries) {
             const currentThreadId = entry.sessionIdentity?.threadId ?? entry.summary.providerSessionId;
             const currentThreadMetadata = threadMetadataIndex.get(currentThreadId) ?? null;
@@ -127,21 +166,28 @@ export class CodexAdapter {
                 mtimeMs: entry.stats.mtimeMs,
                 size: entry.stats.size,
                 workspacePath: summary.workspacePath,
+                providerSessionId: summary.providerSessionId,
+                title: summary.title,
                 summary
             });
             sessionsByProviderSessionId.set(summary.providerSessionId, summary);
         }
         for (const entry of pendingFiles) {
             const { filePath, fileSessionId, stats, sessionIdentity } = entry;
+            parsedFiles += 1;
+            bytesRead += stats.size;
             const records = readJsonLines(filePath);
             const meta = records.find((record) => record.data.type === "session_meta")?.data;
             const metaPayload = (meta?.payload ?? {});
+            const codexSessionId = this.resolveCodexSessionId(metaPayload, fileSessionId);
             if (shouldIgnoreCodingNsDraftSession(metaPayload)) {
                 this.touchSessionSummaryCache(filePath, {
                     filePath,
                     mtimeMs: stats.mtimeMs,
                     size: stats.size,
                     workspacePath: null,
+                    providerSessionId: codexSessionId,
+                    title: null,
                     summary: null
                 });
                 continue;
@@ -155,11 +201,12 @@ export class CodexAdapter {
                     mtimeMs: stats.mtimeMs,
                     size: stats.size,
                     workspacePath: cachedWorkspacePath,
+                    providerSessionId: codexSessionId,
+                    title: null,
                     summary: null
                 });
                 continue;
             }
-            const codexSessionId = this.resolveCodexSessionId(metaPayload, fileSessionId);
             const currentThreadMetadata = threadMetadataIndex.get(codexSessionId) ??
                 (sessionIdentity ? threadMetadataIndex.get(sessionIdentity.threadId) : null);
             const currentSpawnRelation = spawnedAgentRelationIndex.get(codexSessionId) ??
@@ -178,6 +225,8 @@ export class CodexAdapter {
                     mtimeMs: stats.mtimeMs,
                     size: stats.size,
                     workspacePath: sessionWorkspacePath,
+                    providerSessionId: summary.providerSessionId,
+                    title: summary.title,
                     summary
                 });
                 sessionsByProviderSessionId.set(codexSessionId, summary);
@@ -204,10 +253,29 @@ export class CodexAdapter {
                 mtimeMs: stats.mtimeMs,
                 size: stats.size,
                 workspacePath: sessionWorkspacePath,
+                providerSessionId: summary.providerSessionId,
+                title: summary.title,
                 summary
             });
         }
-        return [...sessionsByProviderSessionId.values()].sort((left, right) => (left.lastMessageAt ?? "").localeCompare(right.lastMessageAt ?? ""));
+        const sessions = [...sessionsByProviderSessionId.values()].sort((left, right) => (left.lastMessageAt ?? "").localeCompare(right.lastMessageAt ?? ""));
+        const diagnostic = {
+            provider: this.providerId,
+            status: "success",
+            durationMs: Date.now() - startedAt,
+            sessionCount: sessions.length,
+            isComplete: true,
+            errorMessage: null,
+            scannedFiles,
+            skippedByMtimeSize,
+            parsedFiles,
+            bytesRead
+        };
+        return {
+            sessions,
+            isComplete: true,
+            providerDiagnostics: [diagnostic]
+        };
     }
     async readSessionHistory(providerSessionId, rawStoreRef, cursor, limit, direction = "forward") {
         const resolvedStoreRef = this.resolveSessionFilePath(rawStoreRef, providerSessionId);
@@ -439,20 +507,50 @@ export class CodexAdapter {
     }
     async readSessionTitle(providerSessionId, rawStoreRef) {
         const resolvedStoreRef = this.resolveSessionFilePath(rawStoreRef, providerSessionId);
-        const records = readJsonLines(resolvedStoreRef);
         const fileSessionId = basename(resolvedStoreRef, ".jsonl");
-        const meta = records.find((record) => record.data.type === "session_meta")?.data;
-        const metaPayload = (meta?.payload ?? {});
         const sessionIdentity = this.readSessionIdentity(resolvedStoreRef, fileSessionId);
-        const codexSessionId = this.resolveCodexSessionId(metaPayload, providerSessionId || fileSessionId);
         const threadMetadataIndex = this.readThreadMetadataIndex();
-        const messages = this.parseMessagesFromEntries(resolvedStoreRef, records, codexSessionId);
-        return (this.resolveIndexedTitle(threadMetadataIndex, codexSessionId) ??
+        const indexedTitle = this.resolveIndexedTitle(threadMetadataIndex, providerSessionId) ??
             (sessionIdentity
                 ? this.resolveIndexedTitle(threadMetadataIndex, sessionIdentity.threadId)
-                : null) ??
+                : null);
+        if (indexedTitle) {
+            return indexedTitle;
+        }
+        const stats = statSync(resolvedStoreRef);
+        const cachedSummary = this.sessionSummaryCache.get(resolvedStoreRef);
+        if (cachedSummary
+            && cachedSummary.mtimeMs === stats.mtimeMs
+            && cachedSummary.size === stats.size
+            && (cachedSummary.providerSessionId === providerSessionId
+                || (sessionIdentity
+                    && cachedSummary.providerSessionId === sessionIdentity.threadId))) {
+            this.touchSessionSummaryCache(resolvedStoreRef, cachedSummary);
+            if (cachedSummary.title) {
+                return cachedSummary.title;
+            }
+            if (cachedSummary.summary) {
+                return cachedSummary.summary.title;
+            }
+        }
+        const records = readJsonLines(resolvedStoreRef);
+        const meta = records.find((record) => record.data.type === "session_meta")?.data;
+        const metaPayload = (meta?.payload ?? {});
+        const codexSessionId = this.resolveCodexSessionId(metaPayload, providerSessionId || fileSessionId);
+        const messages = this.parseMessagesFromEntries(resolvedStoreRef, records, codexSessionId);
+        const resolvedTitle = (this.resolveIndexedTitle(threadMetadataIndex, codexSessionId) ??
             resolveCodexFallbackTitle(messages) ??
             fileSessionId);
+        this.touchSessionSummaryCache(resolvedStoreRef, {
+            filePath: resolvedStoreRef,
+            mtimeMs: stats.mtimeMs,
+            size: stats.size,
+            workspacePath: (sessionIdentity?.cwd ?? ensureText(metaPayload.cwd)) || null,
+            providerSessionId: codexSessionId,
+            title: resolvedTitle,
+            summary: null
+        });
+        return resolvedTitle;
     }
     async renameSessionTitle(providerSessionId, rawStoreRef, title) {
         const nextTitle = title.trim();
@@ -508,6 +606,8 @@ export class CodexAdapter {
         }
         this.sessionSummaryCache.delete(resolvedStoreRef);
         this.sessionSummaryCache.delete(nextStoreRef);
+        // 归档切换后线程索引的 archived / rollout_path 也变了，不能继续赌文件系统 mtime 一定会跳。
+        this.invalidateThreadMetadataIndexCache();
         return {
             rawStoreRef: nextStoreRef,
             isArchived
@@ -617,7 +717,8 @@ export class CodexAdapter {
                         firstUserMessage: null,
                         agentNickname: null,
                         agentRole: null,
-                        isArchived: null
+                        isArchived: null,
+                        rolloutPath: null
                     });
                 }
                 catch {
@@ -666,6 +767,7 @@ export class CodexAdapter {
                     firstUserMessage: ensureText(row.first_user_message).trim() || (current?.firstUserMessage ?? null),
                     agentNickname: ensureText(row.agent_nickname).trim() || (current?.agentNickname ?? null),
                     agentRole: ensureText(row.agent_role).trim() || (current?.agentRole ?? null),
+                    rolloutPath: ensureText(row.rollout_path).trim() || (current?.rolloutPath ?? null),
                     isArchived: typeof row.archived === "number"
                         ? row.archived === 1
                         : ensureText(row.rollout_path).includes("archived_sessions")
@@ -694,11 +796,40 @@ export class CodexAdapter {
         };
         return index;
     }
-    listSessionFiles() {
+    listSessionFiles(targetPath, threadMetadataIndex, knownSessions) {
         const activeFiles = walkJsonlFiles(join(this.options.homeDir, "sessions"));
-        const archivedFiles = walkJsonlFiles(join(this.options.homeDir, "archived_sessions"));
+        const archivedFiles = this.listArchivedSessionFiles(targetPath, threadMetadataIndex, knownSessions);
         return [...activeFiles, ...archivedFiles];
     }
+    listArchivedSessionFiles(targetPath, threadMetadataIndex, knownSessions) {
+        const archivedFiles = new Set();
+        for (const metadata of threadMetadataIndex.values()) {
+            if (metadata.isArchived !== true
+                || !metadata.rolloutPath) {
+                continue;
+            }
+            if (targetPath.length > 0
+                && normalizeWorkspacePath(metadata.cwd ?? "") !== targetPath) {
+                continue;
+            }
+            archivedFiles.add(metadata.rolloutPath);
+        }
+        for (const session of knownSessions) {
+            if (session.isArchived !== true
+                || normalizeWorkspacePath(session.workspacePath) !== targetPath
+                || !isCodexArchivedFilePath(session.rawStoreRef)) {
+                continue;
+            }
+            archivedFiles.add(session.rawStoreRef);
+        }
+        if (archivedFiles.size > 0) {
+            return [...archivedFiles].filter((filePath) => existsSync(filePath));
+        }
+        if (threadMetadataIndex.size === 0) {
+            return walkJsonlFiles(join(this.options.homeDir, "archived_sessions"));
+        }
+        return [];
+    }
     resolveSessionFilePath(rawStoreRef, providerSessionId) {
         const matchedByThreadId = this.findSessionFileByThreadId(providerSessionId);
         if (existsSync(rawStoreRef)) {
@@ -732,7 +863,10 @@ export class CodexAdapter {
         return buildSyntheticCodexHistoryPath(this.options.homeDir, providerSessionId);
     }
     findSessionFileByThreadId(providerSessionId) {
-        for (const filePath of this.listSessionFiles()) {
+        const threadMetadataIndex = this.readThreadMetadataIndex();
+        const activeFiles = walkJsonlFiles(join(this.options.homeDir, "sessions"));
+        const archivedFiles = this.listArchivedSessionFiles("", threadMetadataIndex, []);
+        for (const filePath of [...activeFiles, ...archivedFiles]) {
             const threadId = this.readThreadIdFromRawStore(filePath);
             if (threadId === providerSessionId) {
                 return filePath;
@@ -834,6 +968,20 @@ export class CodexAdapter {
             this.sessionSummaryCache.delete(oldestKey);
         }
     }
+    invalidateThreadMetadataIndexCache() {
+        this.threadMetadataIndexCache = null;
+    }
+    touchSpawnRelationScanCache(filePath, entry) {
+        this.spawnRelationScanCache.delete(filePath);
+        this.spawnRelationScanCache.set(filePath, entry);
+        while (this.spawnRelationScanCache.size > SPAWN_RELATION_SCAN_CACHE_LIMIT) {
+            const oldestKey = this.spawnRelationScanCache.keys().next().value;
+            if (!oldestKey) {
+                break;
+            }
+            this.spawnRelationScanCache.delete(oldestKey);
+        }
+    }
     isForkedChildHistoryAligned(childThreadReadResult, expectedHistory) {
         const expectedSignatures = collectCodexForkComparableSignatures(expectedHistory);
         if (expectedSignatures.length === 0) {
@@ -880,22 +1028,65 @@ export class CodexAdapter {
     readSpawnedAgentRelationIndex(files, targetPath, threadMetadataIndex, candidateThreadIds) {
         const directRelations = new Map();
         const spawnRecords = [];
-        for (const filePath of files) {
-            const sessionIdentity = this.readSessionIdentity(filePath, basename(filePath, ".jsonl"));
+        for (const entry of files) {
+            const { filePath, stats } = entry;
+            const cached = this.spawnRelationScanCache.get(filePath);
+            if (cached
+                && cached.mtimeMs === stats.mtimeMs
+                && cached.size === stats.size) {
+                this.touchSpawnRelationScanCache(filePath, cached);
+                if (cached.workspacePath !== targetPath) {
+                    continue;
+                }
+                for (const [threadId, relation] of cached.directRelations) {
+                    directRelations.set(threadId, relation);
+                }
+                spawnRecords.push(...cached.spawnRecords);
+                continue;
+            }
+            const sessionIdentity = entry.sessionIdentity ?? this.readSessionIdentity(filePath, basename(filePath, ".jsonl"));
             if (!sessionIdentity) {
+                this.touchSpawnRelationScanCache(filePath, {
+                    filePath,
+                    mtimeMs: stats.mtimeMs,
+                    size: stats.size,
+                    workspacePath: null,
+                    directRelations: [],
+                    spawnRecords: []
+                });
                 continue;
             }
-            if (normalizeWorkspacePath(sessionIdentity.cwd) !== targetPath) {
+            const workspacePath = normalizeWorkspacePath(sessionIdentity.cwd);
+            if (workspacePath !== targetPath) {
+                this.touchSpawnRelationScanCache(filePath, {
+                    filePath,
+                    mtimeMs: stats.mtimeMs,
+                    size: stats.size,
+                    workspacePath,
+                    directRelations: [],
+                    spawnRecords: []
+                });
                 continue;
             }
             if (sessionIdentity.parentThreadId) {
-                directRelations.set(sessionIdentity.threadId, {
+                const relation = {
                     parentProviderSessionId: sessionIdentity.parentThreadId
+                };
+                directRelations.set(sessionIdentity.threadId, relation);
+                this.touchSpawnRelationScanCache(filePath, {
+                    filePath,
+                    mtimeMs: stats.mtimeMs,
+                    size: stats.size,
+                    workspacePath,
+                    directRelations: [[sessionIdentity.threadId, relation]],
+                    spawnRecords: []
                 });
                 continue;
             }
             const records = readJsonLines(filePath).map((record) => record.data);
             const spawnCallById = new Map();
+            const fileSpawnRecords = [];
+            const fileDirectRelations = [];
             for (const record of records) {
                 if (record.type !== "response_item") {
                     continue;
@@ -916,6 +1107,7 @@ export class CodexAdapter {
                         timestampMs: toTimestampMs(record.timestamp)
                     };
                     spawnCallById.set(callId, spawnRecord);
+                    fileSpawnRecords.push(spawnRecord);
                     spawnRecords.push(spawnRecord);
                     continue;
                 }
@@ -931,10 +1123,20 @@ export class CodexAdapter {
                 if (!agentId) {
                     continue;
                 }
-                directRelations.set(agentId, {
+                const relation = {
                     parentProviderSessionId: spawnRecord.parentProviderSessionId
-                });
+                };
+                directRelations.set(agentId, relation);
+                fileDirectRelations.push([agentId, relation]);
             }
+            this.touchSpawnRelationScanCache(filePath, {
+                filePath,
+                mtimeMs: stats.mtimeMs,
+                size: stats.size,
+                workspacePath,
+                directRelations: fileDirectRelations,
+                spawnRecords: fileSpawnRecords
+            });
         }
         const relationCandidates = candidateThreadIds === undefined
             ? [...threadMetadataIndex.entries()]
@@ -1058,7 +1260,13 @@ export class CodexAdapter {
                     const content = ensureText(payload.message);
                     if (content.length > 0) {
                         pushMessage("event_msg", {
-                            messageId: messageIdFromRawRef(rawRef),
+                            messageId: resolveCodexParsedMessageId({
+                                providerSessionId,
+                                rawRef,
+                                role: "user",
+                                kind: "text",
+                                payloadId: payload.id
+                            }),
                             provider: this.providerId,
                             providerSessionId,
                             role: "user",
@@ -1074,7 +1282,13 @@ export class CodexAdapter {
                     const content = ensureText(payload.message);
                     if (content.length > 0) {
                         pushMessage("event_msg", {
-                            messageId: messageIdFromRawRef(rawRef),
+                            messageId: resolveCodexParsedMessageId({
+                                providerSessionId,
+                                rawRef,
+                                role: "assistant",
+                                kind: "text",
+                                payloadId: payload.id
+                            }),
                             provider: this.providerId,
                             providerSessionId,
                             role: "assistant",
@@ -1090,7 +1304,13 @@ export class CodexAdapter {
                     const content = extractTextBlocks(payload.text ?? payload.message).trim();
                     if (content.length > 0) {
                         pushMessage("event_msg", {
-                            messageId: messageIdFromRawRef(rawRef),
+                            messageId: resolveCodexParsedMessageId({
+                                providerSessionId,
+                                rawRef,
+                                role: "assistant",
+                                kind: "thinking",
+                                payloadId: payload.id
+                            }),
                             provider: this.providerId,
                             providerSessionId,
                             role: "assistant",
@@ -1112,7 +1332,13 @@ export class CodexAdapter {
                         return;
                     }
                     pushMessage("response_item", {
-                        messageId: messageIdFromRawRef(rawRef),
+                        messageId: resolveCodexParsedMessageId({
+                            providerSessionId,
+                            rawRef,
+                            role: "assistant",
+                            kind: "thinking",
+                            payloadId: payload.id
+                        }),
                         provider: this.providerId,
                         providerSessionId,
                         role: "assistant",
@@ -1131,7 +1357,13 @@ export class CodexAdapter {
                     const input = stringifyStructuredValue(inputSource);
                     toolNameById.set(callId, name);
                     pushMessage("response_item", {
-                        messageId: messageIdFromRawRef(rawRef),
+                        messageId: resolveCodexParsedMessageId({
+                            providerSessionId,
+                            rawRef,
+                            role: "tool",
+                            kind: "tool_call",
+                            callId
+                        }),
                         provider: this.providerId,
                         providerSessionId,
                         role: "tool",
@@ -1156,7 +1388,13 @@ export class CodexAdapter {
                     const output = extractTextBlocks(payload.output).trim() || stringifyStructuredValue(payload.output);
                     const resultState = resolveToolResultState(payload, output);
                     pushMessage("response_item", {
-                        messageId: messageIdFromRawRef(rawRef),
+                        messageId: resolveCodexParsedMessageId({
+                            providerSessionId,
+                            rawRef,
+                            role: "tool",
+                            kind: "tool_result",
+                            callId
+                        }),
                         provider: this.providerId,
                         providerSessionId,
                         role: "tool",
@@ -1184,7 +1422,13 @@ export class CodexAdapter {
                     return;
                 }
                 pushMessage("response_item", {
-                    messageId: messageIdFromRawRef(rawRef),
+                    messageId: resolveCodexParsedMessageId({
+                        providerSessionId,
+                        rawRef,
+                        role,
+                        kind: "text",
+                        payloadId: payload.id
+                    }),
                     provider: this.providerId,
                     providerSessionId,
                     role,
@@ -1380,6 +1624,37 @@ function areCodexTimestampsNear(left, right) {
     }
     return Math.abs(leftMs - rightMs) <= 1000;
 }
+function resolveCodexParsedMessageId(input) {
+    const stableIdentity = resolveCodexStableIdentity(input);
+    if (!stableIdentity) {
+        return messageIdFromRawRef(input.rawRef);
+    }
+    return messageIdFromStableKey(buildCodexStableMessageKey(input.providerSessionId, stableIdentity));
+}
+function resolveCodexStableIdentity(input) {
+    if (input.kind === "tool_call" || input.kind === "tool_result") {
+        const normalizedCallId = ensureText(input.callId).trim();
+        if (!normalizedCallId) {
+            return null;
+        }
+        return input.kind === "tool_call"
+            ? `tool:call:${normalizedCallId}`
+            : `tool:result:${normalizedCallId}`;
+    }
+    if (input.role !== "assistant"
+        && input.role !== "user") {
+        return null;
+    }
+    const normalizedPayloadId = ensureText(input.payloadId).trim();
+    if (!normalizedPayloadId) {
+        return null;
+    }
+    const identityKind = input.kind === "thinking" ? "thinking" : "text";
+    return `${input.role}:${identityKind}:${normalizedPayloadId}`;
+}
+function buildCodexStableMessageKey(providerSessionId, stableIdentity) {
+    return `codex:${providerSessionId}:${stableIdentity}`;
+}
 function extractTextFromArray(value) {
     if (!Array.isArray(value)) {
         return "";