@@ -11,7 +11,7 @@ import { isWholeScreenRecordingScope } from '@agent-device/contracts/recording';
1111import { deviceIdentity , sameDeviceIdentity } from '@agent-device/kernel/device' ;
1212import { AppError , normalizeError } from '@agent-device/kernel/errors' ;
1313import { resolveTargetDevice } from '../../core/dispatch-resolve.ts' ;
14- import { ensureDeviceReady } from '../device-ready .ts' ;
14+ import { ensureBoundDeviceReady } from '../request-runtime-binding .ts' ;
1515import type { ScreenRecordingAdmissionLedger } from '../screen-recording-admission-ledger.ts' ;
1616import {
1717 adoptStartedScreenRecording ,
@@ -69,11 +69,18 @@ async function handleRecordCommandUnsafe(
6969 if ( plan . kind === 'start' && ! isWholeScreenRecordingScope ( scope ) && ! existingSession ) {
7070 return missingAppSessionResponse ( req ) ;
7171 }
72- const session = await resolveRecordingSession ( params , existingSession ) ;
72+ const resolvedSession = await resolveRecordingSession ( params , existingSession ) ;
73+ const { session } = resolvedSession ;
7374 if ( plan . kind === 'start' ) {
74- return await startRecording ( params , session , prepareRecordingRequest ( req ) , plan . use ) ;
75+ return await startRecording (
76+ params ,
77+ session ,
78+ prepareRecordingRequest ( req ) ,
79+ plan . use ,
80+ resolvedSession . needsReadiness ,
81+ ) ;
7582 }
76- return await stopRecording ( params , session , plan . kind ) ;
83+ return await stopRecording ( params , session , plan . kind , resolvedSession . needsReadiness ) ;
7784}
7885
7986function resolveRecordPlan ( req : DaemonRequest , session : SessionState | undefined ) {
@@ -91,24 +98,25 @@ function resolveRecordPlan(req: DaemonRequest, session: SessionState | undefined
9198async function resolveRecordingSession (
9299 params : RecordRuntimeHandlerParams ,
93100 existing : SessionState | undefined ,
94- ) : Promise < SessionState > {
101+ ) : Promise < Readonly < { session : SessionState ; needsReadiness : boolean } > > {
95102 const device = existing ?. device ?? ( await resolveTargetDevice ( params . req . flags ?? { } ) ) ;
96103 await params . retainDeviceExecutionLock ( device . id ) ;
97- if ( existing ) return existing ;
98- await ensureDeviceReady ( device ) ;
99- return createRecordOnlySession ( params , device ) ;
104+ if ( existing ) return { session : existing , needsReadiness : false } ;
105+ return { session : createRecordOnlySession ( params , device ) , needsReadiness : true } ;
100106}
101107
102108async function startRecording (
103109 params : RecordRuntimeHandlerParams ,
104110 session : SessionState ,
105111 prepared : ReturnType < typeof prepareRecordingRequest > ,
106112 use : typeof screenRecordingStartUse ,
113+ needsReadiness : boolean ,
107114) : Promise < DaemonResponse > {
108115 if ( session . screenRecording ) {
109116 return { ok : false , error : { code : 'INVALID_ARGS' , message : 'recording already in progress' } } ;
110117 }
111118 const admission = await params . bindDevice ( session . device , screenRecordingAdmissionUse ) ;
119+ if ( needsReadiness ) await ensureBoundDeviceReady ( admission ) ;
112120 const startFact = admission . facts . screenRecordingStart ;
113121 if ( ! startFact . available ) return buildRecordingUnsupportedResponse ( startFact ) ;
114122 const runtime = await params . bindDevice ( session . device , use ) ;
@@ -195,6 +203,7 @@ async function stopRecording(
195203 params : RecordRuntimeHandlerParams ,
196204 session : SessionState ,
197205 kind : 'stop-live' | 'stop-recovery' ,
206+ needsReadiness : boolean ,
198207) : Promise < DaemonResponse > {
199208 let completion ;
200209 try {
@@ -205,7 +214,7 @@ async function stopRecording(
205214 sessionName : params . sessionName ,
206215 sessionStore : params . sessionStore ,
207216 } )
208- : await finishRecovered ( params , session ) ;
217+ : await finishRecovered ( params , session , needsReadiness ) ;
209218 } catch ( error ) {
210219 deleteTerminalRecordOnlySession ( params , session ) ;
211220 throw error ;
@@ -237,7 +246,11 @@ function deleteTerminalRecordOnlySession(
237246 }
238247}
239248
240- async function finishRecovered ( params : RecordRuntimeHandlerParams , session : SessionState ) {
249+ async function finishRecovered (
250+ params : RecordRuntimeHandlerParams ,
251+ session : SessionState ,
252+ needsReadiness : boolean ,
253+ ) {
241254 const resourcePath = screenRecordingDurableResource . store . resolvePath (
242255 params . sessionStore . resolveSessionDir ( params . sessionName ) ,
243256 ) ;
@@ -270,6 +283,7 @@ async function finishRecovered(params: RecordRuntimeHandlerParams, session: Sess
270283 screenRecordingRecoveryUse ,
271284 recoveryScope ,
272285 ) ;
286+ if ( needsReadiness ) await ensureBoundDeviceReady ( runtime ) ;
273287 return createScreenRecordingRecoveryControl ( { runtime, dispose : async ( ) => { } } ) ;
274288 } ,
275289 } ) ;
0 commit comments