66 ANDROID_SNAPSHOT_HELPER_CAPTURE_PHASE ,
77 ANDROID_SNAPSHOT_HELPER_SESSION_CAPTURE_PHASE ,
88 ANDROID_TOUCH_HELPER_GESTURE_PHASE ,
9+ type AndroidSnapshotHelperTransport ,
910} from '@agent-device/platform-android/mechanics' ;
1011import { test } from 'vitest' ;
1112import {
@@ -125,32 +126,46 @@ test('reads the settle wait of a --settle response and nothing from other respon
125126} ) ;
126127
127128// Trimmed from Android heavy-feed request logs.
128- const androidCapture = ( session : Record < string , unknown > , oneShot = false ) =>
129+ const sessionTimer = ( answered : boolean , event : Record < string , unknown > = { } ) =>
130+ line ( {
131+ phase : ANDROID_SNAPSHOT_HELPER_SESSION_CAPTURE_PHASE ,
132+ ...event ,
133+ data : {
134+ transport : 'persistent-session' satisfies AndroidSnapshotHelperTransport ,
135+ answered,
136+ ...( event . data as Record < string , unknown > | undefined ) ,
137+ } ,
138+ } ) ;
139+ const oneShotTimer = [
140+ line ( {
141+ level : 'debug' ,
142+ phase : 'exec_command' ,
143+ durationMs : 373 ,
144+ data : { command : 'adb' , event : 'settled' } ,
145+ } ) ,
146+ line ( {
147+ phase : ANDROID_SNAPSHOT_HELPER_CAPTURE_PHASE ,
148+ durationMs : 373 ,
149+ data : { transport : 'instrumentation' satisfies AndroidSnapshotHelperTransport } ,
150+ } ) ,
151+ ] ;
152+ const androidCapture = ( ...timers : string [ ] ) =>
129153 [
130- line ( { phase : ANDROID_SNAPSHOT_HELPER_SESSION_CAPTURE_PHASE , ...session } ) ,
131- ...( oneShot
132- ? [
133- line ( {
134- level : 'debug' ,
135- phase : 'exec_command' ,
136- durationMs : 373 ,
137- data : { command : 'adb' , event : 'settled' } ,
138- } ) ,
139- line ( { phase : ANDROID_SNAPSHOT_HELPER_CAPTURE_PHASE , durationMs : 373 } ) ,
140- ]
141- : [ ] ) ,
154+ ...timers ,
142155 line ( { phase : 'snapshot_capture' , durationMs : 380 , data : { backend : 'android' } } ) ,
143156 ] . join ( '\n' ) ;
144157
145158test ( 'names the Android helper transport that answered each capture' , ( ) => {
146- const session = profileRequestLog ( androidCapture ( { durationMs : 40 } ) ) ;
159+ const session = profileRequestLog ( androidCapture ( sessionTimer ( true , { durationMs : 40 } ) ) ) ;
147160 assert . deepEqual ( session . snapshotSources , {
148161 'android-helper/persistent-session' : { count : 1 , totalMs : 40 , failures : 0 } ,
149162 } ) ;
150163 assert . deepEqual ( session . fallbacks , [ ] ) ;
151164
152- // With the session off, the session timer settles cleanly and a one-shot capture answers.
153- const sessionOff = profileRequestLog ( androidCapture ( { durationMs : 0 } , true ) ) ;
165+ // With the session off, the session timer settles unanswered and a one-shot capture answers.
166+ const sessionOff = profileRequestLog (
167+ androidCapture ( sessionTimer ( false , { durationMs : 0 } ) , ...oneShotTimer ) ,
168+ ) ;
154169 assert . deepEqual ( sessionOff . snapshotSources , {
155170 'android-helper/persistent-session' : { count : 1 , totalMs : 0 , failures : 1 } ,
156171 'android-helper/instrumentation' : { count : 1 , totalMs : 373 , failures : 0 } ,
@@ -165,7 +180,10 @@ test('names the Android helper transport that answered each capture', () => {
165180
166181 const sessionFailed = profileRequestLog (
167182 [
168- androidCapture ( { level : 'error' , durationMs : 5000 , data : { error : 'socket closed' } } , true ) ,
183+ androidCapture (
184+ sessionTimer ( false , { level : 'error' , durationMs : 5000 , data : { error : 'socket closed' } } ) ,
185+ ...oneShotTimer ,
186+ ) ,
169187 line ( {
170188 level : 'warn' ,
171189 phase : 'android_snapshot_helper_session_fallback' ,
@@ -184,6 +202,24 @@ test('names the Android helper transport that answered each capture', () => {
184202 ] ) ;
185203} ) ;
186204
205+ test ( 'reads whether the Android session answered from its own timer, not from event order' , ( ) => {
206+ // A content re-capture can follow a session capture that answered. The answer still counts.
207+ const recaptured = profileRequestLog (
208+ androidCapture ( sessionTimer ( true , { durationMs : 40 } ) , ...oneShotTimer ) ,
209+ ) ;
210+ assert . deepEqual ( recaptured . snapshotSources [ 'android-helper/persistent-session' ] , {
211+ count : 1 ,
212+ totalMs : 40 ,
213+ failures : 0 ,
214+ } ) ;
215+
216+ // A request that ends before any one-shot capture still records the unanswered session.
217+ const unanswered = profileRequestLog ( androidCapture ( sessionTimer ( false , { durationMs : 12 } ) ) ) ;
218+ assert . deepEqual ( unanswered . snapshotSources , {
219+ 'android-helper/persistent-session' : { count : 1 , totalMs : 12 , failures : 1 } ,
220+ } ) ;
221+ } ) ;
222+
187223test ( 'counts Android helper gestures as runner commands' , ( ) => {
188224 const profile = profileRequestLog (
189225 [
0 commit comments