Skip to content

Commit f1e5327

Browse files
committed
fix(codex): avoid partial events on stream failure
1 parent 3f8c461 commit f1e5327

1 file changed

Lines changed: 14 additions & 11 deletions

File tree

‎apps/codex/src/data-loader.ts‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ export async function loadTokenUsageEvents(options: LoadOptions = {}): Promise<L
231231
let currentModel: string | undefined;
232232
let currentModelIsFallback = false;
233233
let legacyFallbackUsed = false;
234+
const fileEvents: TokenUsageEvent[] = [];
234235
const lineReader = createInterface({
235236
input: createReadStream(file, { encoding: 'utf8' }),
236237
crlfDelay: Number.POSITIVE_INFINITY,
@@ -351,19 +352,21 @@ export async function loadTokenUsageEvents(options: LoadOptions = {}): Promise<L
351352
event.isFallbackModel = true;
352353
}
353354

354-
events.push(event);
355+
fileEvents.push(event);
356+
}
357+
} catch (error) {
358+
logger.debug('Failed to read Codex session file', error);
359+
continue;
355360
}
356-
} catch (error) {
357-
logger.debug('Failed to read Codex session file', error);
358-
continue;
359-
}
360361

361-
if (legacyFallbackUsed) {
362-
logger.debug('Legacy Codex session lacked model metadata; applied fallback', {
363-
file,
364-
model: LEGACY_FALLBACK_MODEL,
365-
});
366-
}
362+
events.push(...fileEvents);
363+
364+
if (legacyFallbackUsed) {
365+
logger.debug('Legacy Codex session lacked model metadata; applied fallback', {
366+
file,
367+
model: LEGACY_FALLBACK_MODEL,
368+
});
369+
}
367370
}
368371
}
369372

0 commit comments

Comments
 (0)