Fix older thread message review findings

Author: friuns

src/api/codexGateway.ts

@@ -1438,7 +1438,7 @@ export async function renameThread(threadId: string, threadName: string): Promis
 
 export async function rollbackThread(threadId: string, numTurns: number): Promise<UiMessage[]> {
   const payload = await callRpc<ThreadReadResponse>('thread/rollback', { threadId, numTurns })
-  return normalizeThreadMessagesV2(payload)
+  return normalizeThreadMessagesV2(payload, readThreadTurnStartIndex(payload))
 }
 
 export async function revertThreadFileChanges(threadId: string, turnId: string, cwd: string): Promise<{ reverted: number; errors: string[] }> {
@@ -1545,7 +1545,7 @@ export async function forkThread(
         threadId: forkedThreadId,
         cwd: normalizeThreadCwdFromPayload(payload),
         model: normalizeThreadModelFromPayload(payload),
-        messages: normalizeThreadMessagesV2(payload),
+        messages: normalizeThreadMessagesV2(payload, readThreadTurnStartIndex(payload)),
       }
     } catch (error) {
       throw normalizeCodexApiError(error, `Failed to fork thread ${threadId}`, 'thread/fork')

src/components/content/ThreadConversation.vue

@@ -1240,7 +1240,7 @@ const props = defineProps<{
   cwd: string
   hasMorePersistedAbove?: boolean
   isLoadingPersistedAbove?: boolean
-  loadEarlierMessages?: () => Promise<void>
+  loadEarlierMessages?: (threadId: string) => Promise<void>
 }>()
 
 const emit = defineEmits<{
@@ -4026,7 +4026,7 @@ async function loadMoreAbove(): Promise<void> {
     if (renderWindowStart.value > 0) {
       renderWindowStart.value = Math.max(0, renderWindowStart.value - LOAD_MORE_CHUNK)
     } else if (props.hasMorePersistedAbove === true) {
-      await props.loadEarlierMessages?.()
+      await props.loadEarlierMessages?.(threadIdAtStart)
     }
 
     await nextTick()

src/server/codexAppServerBridge.ts

@@ -5776,43 +5776,52 @@ export function createCodexBridgeMiddleware(): CodexBridgeMiddleware {
       }
 
       if (req.method === 'GET' && url.pathname === '/codex-api/thread-turn-page') {
-        const threadId = url.searchParams.get('threadId')?.trim() ?? ''
-        const beforeTurnId = url.searchParams.get('beforeTurnId')?.trim() ?? ''
-        const limitRaw = url.searchParams.get('limit')?.trim() ?? String(THREAD_RESPONSE_TURN_LIMIT)
-        const limit = Math.max(1, Math.min(50, Number.parseInt(limitRaw, 10) || THREAD_RESPONSE_TURN_LIMIT))
-        if (!threadId) {
-          setJson(res, 400, { error: 'Missing threadId' })
-          return
-        }
+        try {
+          const threadId = url.searchParams.get('threadId')?.trim() ?? ''
+          const beforeTurnId = url.searchParams.get('beforeTurnId')?.trim() ?? ''
+          const limitRaw = url.searchParams.get('limit')?.trim() ?? String(THREAD_RESPONSE_TURN_LIMIT)
+          const limit = Math.max(1, Math.min(50, Number.parseInt(limitRaw, 10) || THREAD_RESPONSE_TURN_LIMIT))
+          if (!threadId) {
+            setJson(res, 400, { error: 'Missing threadId' })
+            return
+          }
 
-        const threadReadResult = await appServer.rpc('thread/read', {
-          threadId,
-          includeTurns: true,
-        })
-        const record = asRecord(threadReadResult)
-        const thread = asRecord(record?.thread)
-        const turns = Array.isArray(thread?.turns) ? thread.turns : []
-        const beforeIndex = beforeTurnId
-          ? turns.findIndex((turn) => asRecord(turn)?.id === beforeTurnId)
-          : turns.length
-        const endIndex = beforeIndex >= 0 ? beforeIndex : turns.length
-        const startIndex = Math.max(0, endIndex - limit)
-        const pageTurns = turns.slice(startIndex, endIndex)
-        const pagedResult = {
-          ...record,
-          thread: {
-            ...thread,
-            turns: pageTurns,
-          },
-        }
-        const sanitized = await sanitizeThreadTurnsInlinePayloads('thread/read', pagedResult)
-        const result = await mergeSessionSkillInputsIntoThreadResult(sanitized)
+          const threadReadResult = await appServer.rpc('thread/read', {
+            threadId,
+            includeTurns: true,
+          })
+          const record = asRecord(threadReadResult)
+          const thread = asRecord(record?.thread)
+          if (!record || !thread) {
+            setJson(res, 502, { error: 'thread/read returned an invalid thread response' })
+            return
+          }
 
-        setJson(res, 200, {
-          result,
-          startTurnIndex: startIndex,
-          hasMoreOlder: startIndex > 0,
-        })
+          const turns = Array.isArray(thread.turns) ? thread.turns : []
+          const beforeIndex = beforeTurnId
+            ? turns.findIndex((turn) => asRecord(turn)?.id === beforeTurnId)
+            : turns.length
+          const endIndex = beforeIndex >= 0 ? beforeIndex : turns.length
+          const startIndex = Math.max(0, endIndex - limit)
+          const pageTurns = turns.slice(startIndex, endIndex)
+          const pagedResult = {
+            ...record,
+            thread: {
+              ...thread,
+              turns: pageTurns,
+            },
+          }
+          const sanitized = await sanitizeThreadTurnsInlinePayloads('thread/read', pagedResult)
+          const result = await mergeSessionSkillInputsIntoThreadResult(sanitized)
+
+          setJson(res, 200, {
+            result,
+            startTurnIndex: startIndex,
+            hasMoreOlder: startIndex > 0,
+          })
+        } catch (error) {
+          setJson(res, 500, { error: getErrorMessage(error, 'Failed to load earlier thread messages') })
+        }
         return
       }