@@ -15,8 +15,6 @@ import {
1515 createSelectorDevice ,
1616 selectorReadSnapshot ,
1717} from './__tests__/test-utils/index.ts' ;
18- import { computeTargetEvidence } from '../../../daemon/session-target-evidence.ts' ;
19- import { WAIT_LANDMARK_MISMATCH_REASON } from '../../../replay/target-identity-node.ts' ;
2018import { AppError } from '@agent-device/kernel/errors' ;
2119
2220test ( 'runtime get reads text from a selector target' , async ( ) => {
@@ -498,10 +496,12 @@ test('runtime selector convenience methods use explicit target helpers', async (
498496} ) ;
499497
500498// ---------------------------------------------------------------------------
501- // #1349: wait's in-loop landmark identity verification (replay-only,
502- // threaded as `target.recordedLandmark`). Polling semantics are preserved —
503- // a same-selector impostor never aborts the wait; only the deadline turns
504- // rejected candidates into the fail-closed landmark refusal.
499+ // Wait polls ride out captures that judged the screen unreadable (the
500+ // mid-transition Android helper content verdicts) instead of aborting the
501+ // wait — the live-validated destination-guard gap from #1349's PR review.
502+ // (#1349's own in-loop landmark identity verification tests — the
503+ // `target.recordedLandmark` cases — moved to `selector-wait.test.ts`, the
504+ // 1:1 topology location for `selector-wait.ts`; #1478 P5 step 2 cell 7.)
505505// ---------------------------------------------------------------------------
506506
507507function landmarkScreen ( parentLabel : string ) {
@@ -518,134 +518,6 @@ function landmarkScreen(parentLabel: string) {
518518 ] ) ;
519519}
520520
521- function recordedLandmarkFor ( snapshot : ReturnType < typeof landmarkScreen > ) {
522- const node = snapshot . nodes [ 1 ] ! ;
523- const evidence = computeTargetEvidence (
524- { node, preActionNodes : snapshot . nodes } ,
525- { mode : 'landmark' } ,
526- ) ;
527- assert . ok ( evidence ) ;
528- assert . equal ( evidence . verification , 'verified' ) ;
529- return evidence ;
530- }
531-
532- function landmarkWaitDevice ( captures : Array < ReturnType < typeof landmarkScreen > > ) {
533- let call = 0 ;
534- const initial = captures [ 0 ] ! ;
535- const device = createAgentDevice ( {
536- backend : {
537- platform : 'ios' ,
538- captureSnapshot : async ( ) => {
539- const snapshot = captures [ Math . min ( call , captures . length - 1 ) ] ! ;
540- call += 1 ;
541- return { snapshot } ;
542- } ,
543- } satisfies AgentDeviceBackend ,
544- artifacts : createLocalArtifactAdapter ( ) ,
545- sessions : createMemorySessionStore ( [ { name : 'default' , snapshot : initial } ] ) ,
546- policy : localCommandPolicy ( ) ,
547- clock : createFakeClock ( ) ,
548- } ) ;
549- return device ;
550- }
551-
552- test ( 'runtime wait keeps polling past a same-selector impostor and succeeds on the recorded landmark' , async ( ) => {
553- const recordTime = landmarkScreen ( 'Detail Screen' ) ;
554- const recorded = recordedLandmarkFor ( recordTime ) ;
555- const impostor = landmarkScreen ( 'List Screen' ) ;
556- const empty = makeSnapshotState ( [ { index : 0 , depth : 0 , type : 'Other' , label : 'Loading' } ] ) ;
557- const device = landmarkWaitDevice ( [ empty , impostor , landmarkScreen ( 'Detail Screen' ) ] ) ;
558-
559- const result = await device . selectors . wait ( {
560- session : 'default' ,
561- target : {
562- kind : 'selector' ,
563- selector : 'label="Screen X"' ,
564- timeoutMs : 10_000 ,
565- recordedLandmark : recorded ,
566- } ,
567- } ) ;
568-
569- assert . equal ( result . kind , 'selector' ) ;
570- if ( result . kind !== 'selector' ) throw new Error ( 'unreachable' ) ;
571- // Two rejected polls (absent, then impostor) before the landmark appeared.
572- assert . equal ( result . waitedMs >= 600 , true ) ;
573- assert . equal ( result . node ?. label , 'Screen X' ) ;
574- assert . equal ( result . preActionNodes ?. length , 2 ) ;
575- } ) ;
576-
577- test ( 'runtime wait fails closed at the deadline when only impostors matched the selector' , async ( ) => {
578- const recorded = recordedLandmarkFor ( landmarkScreen ( 'Detail Screen' ) ) ;
579- const device = landmarkWaitDevice ( [ landmarkScreen ( 'List Screen' ) ] ) ;
580-
581- const error = await device . selectors
582- . wait ( {
583- session : 'default' ,
584- target : {
585- kind : 'selector' ,
586- selector : 'label="Screen X"' ,
587- timeoutMs : 1000 ,
588- recordedLandmark : recorded ,
589- } ,
590- } )
591- . then (
592- ( ) => undefined ,
593- ( thrown : unknown ) => thrown ,
594- ) ;
595-
596- assert . ok ( error instanceof AppError ) ;
597- assert . equal ( error . details ?. reason , WAIT_LANDMARK_MISMATCH_REASON ) ;
598- assert . equal ( error . details ?. matchCount , 1 ) ;
599- const observed = error . details ?. observed as { role : string ; label ?: string } ;
600- assert . equal ( observed . label , 'Screen X' ) ;
601- const ancestry = error . details ?. observedAncestry as Array < { role : string ; label ?: string } > ;
602- assert . equal ( ancestry [ 0 ] ?. label , 'List Screen' ) ;
603- } ) ;
604-
605- test ( 'runtime wait with a recorded landmark keeps the plain timeout when the selector never matched' , async ( ) => {
606- const recorded = recordedLandmarkFor ( landmarkScreen ( 'Detail Screen' ) ) ;
607- const empty = makeSnapshotState ( [ { index : 0 , depth : 0 , type : 'Other' , label : 'Loading' } ] ) ;
608- const device = landmarkWaitDevice ( [ empty ] ) ;
609-
610- await assert . rejects (
611- device . selectors . wait ( {
612- session : 'default' ,
613- target : {
614- kind : 'selector' ,
615- selector : 'label="Screen X"' ,
616- timeoutMs : 1000 ,
617- recordedLandmark : recorded ,
618- } ,
619- } ) ,
620- ( thrown : unknown ) => {
621- assert . ok ( thrown instanceof AppError ) ;
622- assert . match ( thrown . message , / w a i t t i m e d o u t f o r s e l e c t o r / ) ;
623- assert . equal ( thrown . details ?. reason , undefined ) ;
624- return true ;
625- } ,
626- ) ;
627- } ) ;
628-
629- test ( 'runtime wait without a recorded landmark returns the satisfying match for record-time evidence' , async ( ) => {
630- const device = landmarkWaitDevice ( [ landmarkScreen ( 'Detail Screen' ) ] ) ;
631-
632- const result = await device . selectors . wait ( {
633- session : 'default' ,
634- target : { kind : 'selector' , selector : 'label="Screen X"' , timeoutMs : 1000 } ,
635- } ) ;
636-
637- assert . equal ( result . kind , 'selector' ) ;
638- if ( result . kind !== 'selector' ) throw new Error ( 'unreachable' ) ;
639- assert . equal ( result . node ?. label , 'Screen X' ) ;
640- assert . equal ( result . preActionNodes ?. length , 2 ) ;
641- } ) ;
642-
643- // ---------------------------------------------------------------------------
644- // Wait polls ride out captures that judged the screen unreadable (the
645- // mid-transition Android helper content verdicts) instead of aborting the
646- // wait — the live-validated destination-guard gap from #1349's PR review.
647- // ---------------------------------------------------------------------------
648-
649521function unreadableCaptureError ( ) {
650522 return new AppError (
651523 'COMMAND_FAILED' ,
0 commit comments