@@ -153,83 +153,27 @@ mod tests {
153153
154154 #[ test]
155155 fn dedupes_copied_branch_history_across_session_files ( ) {
156- let dir = temp_dir ( "branch-history" ) ;
157- let parent_history = [
158- json ! ( {
159- "timestamp" : "2026-05-12T08:00:00.000Z" ,
160- "type" : "turn_context" ,
161- "payload" : {
162- "model" : "gpt-5.2" ,
163- } ,
164- } )
165- . to_string ( ) ,
166- json ! ( {
167- "timestamp" : "2026-05-12T08:01:00.000Z" ,
168- "type" : "event_msg" ,
169- "payload" : {
170- "type" : "token_count" ,
171- "info" : {
172- "total_token_usage" : {
173- "input_tokens" : 1_000 ,
174- "cached_input_tokens" : 100 ,
175- "output_tokens" : 200 ,
176- "reasoning_output_tokens" : 20 ,
177- "total_tokens" : 1_200 ,
178- } ,
179- } ,
180- } ,
181- } )
182- . to_string ( ) ,
183- ]
184- . join ( "\n " ) ;
185- fs:: write (
186- dir. join ( "2026-05-12T08-00-00-parent.jsonl" ) ,
187- & parent_history,
188- )
189- . unwrap ( ) ;
190- fs:: write (
191- dir. join ( "2026-05-12T08-02-00-branch.jsonl" ) ,
192- [
193- parent_history,
194- json ! ( {
195- "timestamp" : "2026-05-12T08:02:00.000Z" ,
196- "type" : "event_msg" ,
197- "payload" : {
198- "type" : "token_count" ,
199- "info" : {
200- "total_token_usage" : {
201- "input_tokens" : 1_600 ,
202- "cached_input_tokens" : 300 ,
203- "output_tokens" : 450 ,
204- "reasoning_output_tokens" : 40 ,
205- "total_tokens" : 2_050 ,
206- } ,
207- } ,
208- } ,
209- } )
210- . to_string ( ) ,
211- ]
212- . join ( "\n " ) ,
213- )
214- . unwrap ( ) ;
215-
216- let events = load_codex_events_from_directory ( & dir, true ) . unwrap ( ) ;
217-
218- assert_eq ! ( events. len( ) , 2 ) ;
219- assert_eq ! ( events[ 0 ] . session_id, "2026-05-12T08-00-00-parent" ) ;
220- assert_eq ! ( events[ 0 ] . input_tokens, 1_000 ) ;
221- assert_eq ! ( events[ 0 ] . cached_input_tokens, 100 ) ;
222- assert_eq ! ( events[ 0 ] . output_tokens, 200 ) ;
223- assert_eq ! ( events[ 0 ] . reasoning_output_tokens, 20 ) ;
224- assert_eq ! ( events[ 0 ] . total_tokens, 1_200 ) ;
225- assert_eq ! ( events[ 1 ] . session_id, "2026-05-12T08-02-00-branch" ) ;
226- assert_eq ! ( events[ 1 ] . input_tokens, 600 ) ;
227- assert_eq ! ( events[ 1 ] . cached_input_tokens, 200 ) ;
228- assert_eq ! ( events[ 1 ] . output_tokens, 250 ) ;
229- assert_eq ! ( events[ 1 ] . reasoning_output_tokens, 20 ) ;
230- assert_eq ! ( events[ 1 ] . total_tokens, 850 ) ;
231-
232- fs:: remove_dir_all ( dir) . unwrap ( ) ;
156+ for single_thread in [ true , false ] {
157+ let events = load_codex_events_from_directory (
158+ & codex_branch_history_fixture_dir ( ) ,
159+ single_thread,
160+ )
161+ . unwrap ( ) ;
162+
163+ assert_eq ! ( events. len( ) , 2 ) ;
164+ assert_eq ! ( events[ 0 ] . session_id, "2026-05-12T08-00-00-parent" ) ;
165+ assert_eq ! ( events[ 0 ] . input_tokens, 1_000 ) ;
166+ assert_eq ! ( events[ 0 ] . cached_input_tokens, 100 ) ;
167+ assert_eq ! ( events[ 0 ] . output_tokens, 200 ) ;
168+ assert_eq ! ( events[ 0 ] . reasoning_output_tokens, 20 ) ;
169+ assert_eq ! ( events[ 0 ] . total_tokens, 1_200 ) ;
170+ assert_eq ! ( events[ 1 ] . session_id, "2026-05-12T08-02-00-branch" ) ;
171+ assert_eq ! ( events[ 1 ] . input_tokens, 600 ) ;
172+ assert_eq ! ( events[ 1 ] . cached_input_tokens, 200 ) ;
173+ assert_eq ! ( events[ 1 ] . output_tokens, 250 ) ;
174+ assert_eq ! ( events[ 1 ] . reasoning_output_tokens, 20 ) ;
175+ assert_eq ! ( events[ 1 ] . total_tokens, 850 ) ;
176+ }
233177 }
234178
235179 fn temp_dir ( name : & str ) -> PathBuf {
@@ -242,6 +186,11 @@ mod tests {
242186 dir
243187 }
244188
189+ fn codex_branch_history_fixture_dir ( ) -> PathBuf {
190+ PathBuf :: from ( env ! ( "CARGO_MANIFEST_DIR" ) )
191+ . join ( "../../../apps/ccusage/test/fixtures/codex/sessions/branch-history" )
192+ }
193+
245194 #[ test]
246195 fn loads_saved_codex_exec_json_usage ( ) {
247196 let dir = temp_dir ( "json-usage" ) ;
0 commit comments