livedesk 0.1.605 → 0.1.607

package/client/bin/livedesk-client.js

@@ -80,11 +80,12 @@ const RETIRED_CLIENT_MODEL_SINGLE_OPTIONS = new Set(['--ai', '--no-ai', '--fake-
 const RETIRED_CLIENT_MODEL_VALUE_OPTION = '--ai-model';
 let activeAgentProcess = null;
 let roleRestartRequest = null;
-let agentRestartRequest = null;
-let linuxVideoAccelerationStatus = null;
-let discoveryWakeController = new AbortController();
-let networkChangeMonitor = null;
-const sessionRefreshesInFlight = new WeakMap();
+let agentRestartRequest = null;
+let linuxVideoAccelerationStatus = null;
+let discoveryWakeController = new AbortController();
+let networkChangeMonitor = null;
+let desktopMainAuthSession = null;
+const sessionRefreshesInFlight = new WeakMap();
 const disposeAgentTerminationHandlers = installAgentTerminationHandlers({
     getAgentProcess: () => activeAgentProcess
 });
@@ -1097,8 +1098,11 @@ export function clearCachedHubTarget() {
     }
 }
 
-function readSavedSessionFromFile() {
-    for (const path of [preferredClientAuthPath(), CLIENT_AUTH_PATH, UNIFIED_CLIENT_AUTH_PATH]) {
+function readSavedSessionFromFile() {
+    if (isTruthy(process.env.LIVEDESK_DESKTOP_HOST)) {
+        return desktopMainAuthSession;
+    }
+    for (const path of [preferredClientAuthPath(), CLIENT_AUTH_PATH, UNIFIED_CLIENT_AUTH_PATH]) {
         try {
             const state = JSON.parse(readFileSync(path, 'utf8'));
             const raw = state?.[CLIENT_AUTH_STORAGE_KEY];
@@ -1113,20 +1117,43 @@ function readSavedSessionFromFile() {
     return null;
 }
 
-function writeSavedSessionToFile(session) {
-    const normalized = normalizeRuntimeAuthSession(session, { requireRefreshToken: true });
-    if (!normalized.ok) {
-        return false;
-    }
-    const storage = createFileStorage(preferredClientAuthPath());
+function writeSavedSessionToFile(session) {
+    const normalized = normalizeRuntimeAuthSession(session, { requireRefreshToken: true });
+    if (!normalized.ok) {
+        return false;
+    }
+    if (isTruthy(process.env.LIVEDESK_DESKTOP_HOST)) {
+        return Boolean(desktopMainAuthSession?.access_token);
+    }
+    const storage = createFileStorage(preferredClientAuthPath());
     storage.setItem(CLIENT_AUTH_STORAGE_KEY, JSON.stringify({ ...session, ...normalized.session }));
     return true;
 }
 
-function clearSavedSession() {
-    rmSync(CLIENT_AUTH_PATH, { force: true });
-    rmSync(UNIFIED_CLIENT_AUTH_PATH, { force: true });
-}
+function clearSavedSession() {
+    desktopMainAuthSession = null;
+    rmSync(CLIENT_AUTH_PATH, { force: true });
+    rmSync(UNIFIED_CLIENT_AUTH_PATH, { force: true });
+}
+
+export function acceptDesktopMainAuthSession(session) {
+    if (!isTruthy(process.env.LIVEDESK_DESKTOP_HOST)) return null;
+    const normalized = normalizeRuntimeAuthSession(session, { requireRefreshToken: true });
+    if (!normalized.ok) return null;
+    desktopMainAuthSession = {
+        ...session,
+        ...normalized.session,
+        user: {
+            ...(session?.user && typeof session.user === 'object' ? session.user : {}),
+            ...normalized.session.user
+        }
+    };
+    return desktopMainAuthSession;
+}
+
+export function clearDesktopMainAuthSession() {
+    desktopMainAuthSession = null;
+}
 
 export async function fetchSupabaseWithDeadline(
     input,
@@ -1167,22 +1194,28 @@ export async function fetchSupabaseWithDeadline(
     }
 }
 
-async function createSupabaseClient() {
-    const { createClient } = await import('@supabase/supabase-js');
-    return createClient(SUPABASE_URL, SUPABASE_PUBLISHABLE_KEY, {
-        global: {
-            fetch: fetchSupabaseWithDeadline
-        },
-        auth: {
-            autoRefreshToken: false,
-            persistSession: true,
-            detectSessionInUrl: false,
-            flowType: 'pkce',
-            storageKey: CLIENT_AUTH_STORAGE_KEY,
-            storage: createFileStorage(preferredClientAuthPath())
-        }
-    });
-}
+export async function createSupabaseClient() {
+    const { createClient } = await import('@supabase/supabase-js');
+    const desktopMainOwnsAuth = isTruthy(process.env.LIVEDESK_DESKTOP_HOST);
+    return createClient(SUPABASE_URL, SUPABASE_PUBLISHABLE_KEY, {
+        global: {
+            fetch: fetchSupabaseWithDeadline
+        },
+        ...(desktopMainOwnsAuth ? {
+            // Electron Main rotates and encrypts the refresh token. The local
+            // runtime receives only the current in-memory session and asks this
+            // client to attach its access token to database requests.
+            accessToken: async () => desktopMainAuthSession?.access_token || null
+        } : { auth: {
+            autoRefreshToken: false,
+            persistSession: true,
+            detectSessionInUrl: false,
+            flowType: 'pkce',
+            storageKey: CLIENT_AUTH_STORAGE_KEY,
+            storage: createFileStorage(preferredClientAuthPath())
+        } })
+    });
+}
 
 function getNestedErrorCode(error) {
     let cursor = error;
@@ -1313,8 +1346,12 @@ async function recoverRotatedSession(supabase, previousSession) {
     return null;
 }
 
-async function refreshSessionIfNeededCore(supabase) {
-    let existingSession = null;
+async function refreshSessionIfNeededCore(supabase) {
+    if (isTruthy(process.env.LIVEDESK_DESKTOP_HOST)) {
+        const normalized = normalizeRuntimeAuthSession(desktopMainAuthSession, { requireRefreshToken: true });
+        return normalized.ok ? desktopMainAuthSession : null;
+    }
+    let existingSession = null;
     try {
         const { data: existing } = await supabase.auth.getSession();
         existingSession = existing?.session || null;
@@ -1382,12 +1419,17 @@ function openBrowser(url) {
     spawn(command, [launchUrl.toString()], { detached: true, stdio: 'ignore' }).unref();
 }
 
-async function activateSupabaseSession(supabase, session) {
-    const normalized = normalizeRuntimeAuthSession(session, { requireRefreshToken: true });
-    if (!normalized.ok) {
-        throw new Error(normalized.error);
-    }
-    const { data: current } = await supabase.auth.getSession();
+async function activateSupabaseSession(supabase, session) {
+    const normalized = normalizeRuntimeAuthSession(session, { requireRefreshToken: true });
+    if (!normalized.ok) {
+        throw new Error(normalized.error);
+    }
+    if (isTruthy(process.env.LIVEDESK_DESKTOP_HOST)) {
+        const activeSession = acceptDesktopMainAuthSession(session);
+        if (!activeSession) throw new Error('desktop-main-session-required');
+        return activeSession;
+    }
+    const { data: current } = await supabase.auth.getSession();
     if (current?.session?.access_token === normalized.session.access_token) {
         const activeSession = current.session;
         if (!writeSavedSessionToFile(activeSession)) {
@@ -3173,7 +3215,7 @@ async function startConnectionChoiceServer(supabase, options = {}) {
 
             if (requestUrl.pathname === '/logout') {
                 try {
-                    await supabase.auth.signOut();
+                    await supabase.auth.signOut({ scope: 'local' });
                 } catch {
                 }
                 clearSavedSession();
@@ -3410,10 +3452,13 @@ async function chooseClientConnection(supabase, options = {}) {
             roleVersion: process.env.LIVEDESK_ROLE_VERSION,
             savedSession: options.savedSession,
             loadSavedSession: options.loadSavedSession,
-            initialChoice: options.initialChoice,
-            initialChoiceMessage: options.initialChoiceMessage,
-            beginGoogleSignIn: async redirectTo => {
-                const activeSupabase = await getSupabase();
+            initialChoice: options.initialChoice,
+            initialChoiceMessage: options.initialChoiceMessage,
+            onAuthSessionAccepted: acceptDesktopMainAuthSession,
+            onAuthSessionCleared: clearDesktopMainAuthSession,
+            beginGoogleSignIn: async redirectTo => {
+                if (isTruthy(process.env.LIVEDESK_DESKTOP_HOST)) throw new Error('desktop-main-auth-required');
+                const activeSupabase = await getSupabase();
                 if (!activeSupabase?.auth) throw new Error('supabase-session-required');
                 const { data, error } = await activeSupabase.auth.signInWithOAuth({
                     provider: 'google',
@@ -3426,9 +3471,10 @@ async function chooseClientConnection(supabase, options = {}) {
                 if (error) throw error;
                 if (!data?.url) throw new Error('google-authorization-url-missing');
                 return { url: data.url };
-            },
-            exchangeGoogleCode: async code => {
-                const activeSupabase = await getSupabase();
+            },
+            exchangeGoogleCode: async code => {
+                if (isTruthy(process.env.LIVEDESK_DESKTOP_HOST)) throw new Error('desktop-main-auth-required');
+                const activeSupabase = await getSupabase();
                 if (!activeSupabase?.auth) throw new Error('supabase-session-required');
                 const { data, error } = await activeSupabase.auth.exchangeCodeForSession(code);
                 if (error) throw error;

package/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.260",
+  "version": "0.1.262",
   "description": "VuvoDesk local remote client",
   "type": "module",
   "bin": {
@@ -42,10 +42,10 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.457",
-    "@livedesk/fast-osx-arm64": "0.1.457",
-    "@livedesk/fast-osx-x64": "0.1.457",
-    "@livedesk/fast-win-x64": "0.1.457"
+    "@livedesk/fast-linux-x64": "0.1.458",
+    "@livedesk/fast-osx-arm64": "0.1.458",
+    "@livedesk/fast-osx-x64": "0.1.458",
+    "@livedesk/fast-win-x64": "0.1.458"
   },
   "publishConfig": {
     "access": "public"

package/client/src/runtime/client-runtime-server.js

@@ -979,9 +979,13 @@ function writeSavedSession(session) {
   return true;
 }
 
-function clearSavedSession() {
-  writePrivateJsonAtomic(CLIENT_AUTH_PATH, {});
-}
+function clearSavedSession() {
+  if (process.env.LIVEDESK_DESKTOP_HOST === '1') {
+    rmSync(CLIENT_AUTH_PATH, { force: true });
+    return;
+  }
+  writePrivateJsonAtomic(CLIENT_AUTH_PATH, {});
+}
 
 function readBody(req) {
   return new Promise((resolveBody, reject) => {
@@ -1316,8 +1320,11 @@ export function createClientRuntimeServer(options = {}) {
     runtime.emit('client.auth.session', { result: state.auth.lastResult, error: message });
   };
 
-  const complete = (choice, message = 'Client credentials accepted. Finding the Hub.') => {
-    lastChoice = choice || lastChoice;
+  const complete = (choice, message = 'Client credentials accepted. Finding the Hub.') => {
+    if (choice?.session?.access_token) {
+      options.onAuthSessionAccepted?.(choice.session);
+    }
+    lastChoice = choice || lastChoice;
     if (completed) {
       if (choice?.session?.access_token) {
         const accountProfile = readClientAccountProfile(choice.session);
@@ -1634,9 +1641,10 @@ export function createClientRuntimeServer(options = {}) {
       respondJson(200, { ok: true, authenticated: true, persisted: true, role: 'client' });
       return;
     }
-    if (pathname === '/api/auth/session' && req.method === 'DELETE') {
-      clearSavedSession();
-      loggedOut = true;
+    if (pathname === '/api/auth/session' && req.method === 'DELETE') {
+      clearSavedSession();
+      options.onAuthSessionCleared?.();
+      loggedOut = true;
       completed = false;
       lastChoice = null;
       state.manager = '';

package/diagnostics/livedesk-mode3-capture-smoke.mjs

@@ -130,7 +130,7 @@ if (!ffmpegStaticPath || !existsSync(ffmpegStaticPath)) {
   throw new Error('The packaged ffmpeg-static decoder is unavailable.');
 }
 let ffmpegPath = ffmpegStaticPath;
-try {
+try {
   ffmpegPath = String(require('@ffmpeg-installer/ffmpeg')?.path || ffmpegStaticPath);
 } catch {
   // ffmpeg-static remains the portable decoder and compatibility fallback.
@@ -554,7 +554,7 @@ async function runWindowsInputAckProbe(binding, { expectHookLateStartFailure = f
   const socket = new WebSocket(`ws://127.0.0.1:${httpPort}/api/remote/input/ws`, {
     perMessageDeflate: false
   });
-  const sendInput = async (input, timeoutMs = 5_000) => {
+  const sendInput = async (input, timeoutMs = 5_000) => {
     const outcome = waitForWebSocketJson(
       socket,
       message => (
@@ -577,17 +577,101 @@ async function runWindowsInputAckProbe(binding, { expectHookLateStartFailure = f
         captureGeneration: binding.captureGeneration
       }
     }));
-    return outcome;
-  };
-
-  let resetApplied = false;
-  try {
-    const ready = waitForWebSocketJson(socket, message => message.type === 'RemoteInputSocketReady');
-    await Promise.all([waitForWebSocketOpen(socket), ready]);
-    const probe = await sendInput({
-      type: 'keyboard.probe',
-      inputSeq: 1,
-      inputEventId: `windows-physical-probe-${Date.now()}`,
+    try {
+      return await outcome;
+    } catch (error) {
+      throw new Error(
+        `Windows input ${input.type} seq=${input.inputSeq} did not return an outcome: `
+        + `${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  };
+
+  const dispatchReset = (reason) => {
+    if (socket.readyState !== WebSocket.OPEN) {
+      return false;
+    }
+    socket.send(JSON.stringify({
+      type: 'input',
+      deviceId: binding.deviceId,
+      fireAndForget: true,
+      input: {
+        type: 'keyboard.reset',
+        inputSeq: 0,
+        requestAck: false,
+        pressedCodes: [],
+        shiftKey: false,
+        ctrlKey: false,
+        altKey: false,
+        metaKey: false,
+        repeat: false,
+        reason,
+        monitorIndex: binding.monitorIndex,
+        controlSessionId: binding.sessionId,
+        controlCommandId: binding.commandId,
+        captureGeneration: binding.captureGeneration
+      }
+    }));
+    return true;
+  };
+
+  let resetDispatched = false;
+  try {
+    const ready = waitForWebSocketJson(socket, message => message.type === 'RemoteInputSocketReady');
+    await Promise.all([waitForWebSocketOpen(socket), ready]);
+    const pointer = await sendInput({
+      type: 'pointermove',
+      inputSeq: 1,
+      inputEventId: `windows-physical-pointer-${Date.now()}`,
+      normalizedX: 0.5,
+      normalizedY: 0.5
+    });
+    assert.equal(pointer.type, 'RemoteInputApplied', String(pointer.error || 'Windows pointer input failed.'));
+    assert.equal(pointer.duplicate, false, 'Windows pointer input was acknowledged as a duplicate.');
+    assert.equal(pointer.nativeInputBackend, 'win32-setcursorpos');
+    assert.equal(Number(pointer.nativeEventsRequested), 1);
+    assert.equal(Number(pointer.nativeEventsAccepted), 1);
+
+    const shiftDown = await sendInput({
+      type: 'keydown',
+      inputSeq: 2,
+      inputEventId: `windows-physical-shift-down-${Date.now()}`,
+      key: 'Shift',
+      code: 'ShiftLeft',
+      keyCode: 16,
+      location: 1,
+      pressedCodes: ['ShiftLeft'],
+      shiftKey: true,
+      ctrlKey: false,
+      altKey: false,
+      metaKey: false,
+      repeat: false
+    });
+    assert.equal(shiftDown.type, 'RemoteInputApplied', String(shiftDown.error || 'Windows Shift keydown failed.'));
+    assert.equal(shiftDown.duplicate, false, 'Windows Shift keydown was acknowledged as a duplicate.');
+
+    const shiftUp = await sendInput({
+      type: 'keyup',
+      inputSeq: 3,
+      inputEventId: `windows-physical-shift-up-${Date.now()}`,
+      key: 'Shift',
+      code: 'ShiftLeft',
+      keyCode: 16,
+      location: 1,
+      pressedCodes: [],
+      shiftKey: false,
+      ctrlKey: false,
+      altKey: false,
+      metaKey: false,
+      repeat: false
+    });
+    assert.equal(shiftUp.type, 'RemoteInputApplied', String(shiftUp.error || 'Windows Shift keyup failed.'));
+    assert.equal(shiftUp.duplicate, false, 'Windows Shift keyup was acknowledged as a duplicate.');
+
+    const probe = await sendInput({
+      type: 'keyboard.probe',
+      inputSeq: 4,
+      inputEventId: `windows-physical-probe-${Date.now()}`,
       pressedCodes: [],
       shiftKey: false,
       ctrlKey: false,
@@ -606,26 +690,31 @@ async function runWindowsInputAckProbe(binding, { expectHookLateStartFailure = f
         /diagnostic keyboard isolation hook did not become ready/i,
         'The forced late hook start did not fail at the bounded ready deadline.'
       );
-      const reset = await sendInput({
-        type: 'keyboard.reset',
-        inputSeq: 2,
-        inputEventId: `windows-late-start-reset-${Date.now()}`,
-        pressedCodes: [],
-        shiftKey: false,
-        ctrlKey: false,
-        altKey: false,
-        metaKey: false,
-        repeat: false,
-        reason: 'windows-hook-late-start-cleanup'
-      });
-      assert.equal(reset.type, 'RemoteInputApplied', String(reset.error || 'Windows late-start reset failed.'));
-      assert.equal(reset.duplicate, false, 'Windows late-start reset was acknowledged as a duplicate.');
-      resetApplied = true;
-      return {
-        lateStartFailure: true,
-        error: String(probe.error || ''),
-        resetApplied
-      };
+      const recovery = await sendInput({
+        type: 'pointermove',
+        inputSeq: 5,
+        inputEventId: `windows-late-start-recovery-${Date.now()}`,
+        normalizedX: 0.5,
+        normalizedY: 0.5
+      });
+      assert.equal(
+        recovery.type,
+        'RemoteInputApplied',
+        String(recovery.error || 'Windows input owner did not recover after the bounded hook failure.')
+      );
+      assert.equal(recovery.nativeInputBackend, 'win32-setcursorpos');
+      assert.equal(Number(recovery.nativeEventsRequested), 1);
+      assert.equal(Number(recovery.nativeEventsAccepted), 1);
+      resetDispatched = dispatchReset('windows-hook-late-start-cleanup');
+      assert.equal(resetDispatched, true, 'Windows late-start cleanup reset was not dispatched.');
+      return {
+        lateStartFailure: true,
+        pointerBackend: String(pointer.nativeInputBackend || ''),
+        normalKeyAcks: 2,
+        error: String(probe.error || ''),
+        recoveryApplied: true,
+        resetDispatched
+      };
     }
     assert.equal(probe.type, 'RemoteInputApplied', String(probe.error || 'Windows native input probe failed.'));
     assert.equal(probe.duplicate, false, 'Windows native input probe was acknowledged as a duplicate.');
@@ -637,57 +726,28 @@ async function runWindowsInputAckProbe(binding, { expectHookLateStartFailure = f
     assert.equal(probe.focusChanged, false, 'Windows native input probe changed the foreground window.');
     assert.equal(probe.inputDiagnostic, true);
 
-    const reset = await sendInput({
-      type: 'keyboard.reset',
-      inputSeq: 2,
-      inputEventId: `windows-physical-reset-${Date.now()}`,
-      pressedCodes: [],
-      shiftKey: false,
-      ctrlKey: false,
-      altKey: false,
-      metaKey: false,
-      repeat: false,
-      reason: 'windows-native-input-diagnostic-cleanup'
-    });
-    assert.equal(reset.type, 'RemoteInputApplied', String(reset.error || 'Windows native input reset failed.'));
-    assert.equal(reset.duplicate, false, 'Windows native input reset was acknowledged as a duplicate.');
-    resetApplied = true;
-    return {
-      backend: String(probe.nativeInputBackend || ''),
+    resetDispatched = dispatchReset('windows-native-input-diagnostic-cleanup');
+    assert.equal(resetDispatched, true, 'Windows native input cleanup reset was not dispatched.');
+    return {
+      pointerBackend: String(pointer.nativeInputBackend || ''),
+      pointerRequested: Number(pointer.nativeEventsRequested || 0),
+      pointerAccepted: Number(pointer.nativeEventsAccepted || 0),
+      normalKeyAcks: 2,
+      backend: String(probe.nativeInputBackend || ''),
       requested: Number(probe.nativeEventsRequested || 0),
       accepted: Number(probe.nativeEventsAccepted || 0),
       hookObserved: Number(probe.hookEventsObserved || 0),
       hookBlocked: Number(probe.hookEventsBlocked || 0),
       duplicate: probe.duplicate === true,
       focusChanged: probe.focusChanged === true,
-      resetApplied
-    };
-  } finally {
-    if (!resetApplied && socket.readyState === WebSocket.OPEN) {
-      try {
-        socket.send(JSON.stringify({
-          type: 'input',
-          deviceId: binding.deviceId,
-          fireAndForget: true,
-          input: {
-            type: 'keyboard.reset',
-            inputSeq: 0,
-            requestAck: false,
-            pressedCodes: [],
-            shiftKey: false,
-            ctrlKey: false,
-            altKey: false,
-            metaKey: false,
-            repeat: false,
-            reason: 'windows-native-input-diagnostic-finally',
-            monitorIndex: binding.monitorIndex,
-            controlSessionId: binding.sessionId,
-            controlCommandId: binding.commandId,
-            captureGeneration: binding.captureGeneration
-          }
-        }));
-      } catch {
-        // Closing the exact input owner also triggers RemoteFast ReleaseAll.
+      resetDispatched
+    };
+  } finally {
+    if (!resetDispatched) {
+      try {
+        dispatchReset('windows-native-input-diagnostic-finally');
+      } catch {
+        // Closing the exact input owner also triggers RemoteFast ReleaseAll.
       }
     }
     try { socket.close(); } catch {}
@@ -1704,9 +1764,9 @@ function removeMacDiagnosticSignalHandlers() {
   macSignalHandlers.clear();
 }
 
-installMacDiagnosticSignalHandlers();
-
-try {
+installMacDiagnosticSignalHandlers();
+
+inputDiagnostic: try {
   macIsolation = await prepareMacDiagnosticIsolation();
   if (isMacPhysicalGate) {
     macDiagnosticAbort.throwIfRequested();
@@ -1924,7 +1984,8 @@ try {
       if (metadata.deviceId !== connectedDeviceId || metadata.frameMode !== 'mode3-h264-hw') return;
       const payload = Buffer.from(data.subarray(4 + metadataLength));
       frames.push({ metadata, receivedAt: performance.now(), bytes: payload.length, payload });
-      if (frames.length >= (isMacPhysicalGate ? 75 : 90)) {
+      const requiredFrameCount = windowsInputAck ? 1 : (isMacPhysicalGate ? 75 : 90);
+      if (frames.length >= requiredFrameCount) {
         finish(resolve, frames);
       }
     };
@@ -1953,9 +2014,40 @@ try {
     monitorSelections: { [connectedDeviceId]: requestedMonitorIndex }
   }));
 
-  const frames = await withMacDiagnosticAbort(framePromise, cancelFrameWait);
-  let activeInputBindingFrame = frames.at(-1);
-  const initialCaptureIdentity = switchMonitor && isWindows
+  const frames = await withMacDiagnosticAbort(framePromise, cancelFrameWait);
+  let activeInputBindingFrame = frames.at(-1);
+  if (windowsInputAck) {
+    const inputProbe = await runWindowsInputAckProbe({
+      deviceId: connectedDeviceId,
+      sessionId: String(activeInputBindingFrame.metadata.sessionId || ''),
+      commandId: String(activeInputBindingFrame.metadata.commandId || ''),
+      captureGeneration: Number(activeInputBindingFrame.metadata.captureGeneration || 0),
+      monitorIndex: Number(activeInputBindingFrame.metadata.monitorIndex || 0)
+    }, {
+      expectHookLateStartFailure: windowsInputHookLateStart
+    });
+    if (windowsInputHookLateStart) {
+      console.log(
+        `Windows diagnostic hook late-start cleanup OK: expected timeout, `
+        + `Agent responsive=${inputProbe.recoveryApplied}, reset dispatched=${inputProbe.resetDispatched}.`
+      );
+    } else {
+      console.log(
+        `Windows pointer input ACK: ${inputProbe.pointerAccepted}/${inputProbe.pointerRequested} `
+        + `via ${inputProbe.pointerBackend}; normal key ACK: ${inputProbe.normalKeyAcks}/2; `
+        + `isolated modifier ACK: `
+        + `${inputProbe.accepted}/${inputProbe.requested} via ${inputProbe.backend}, `
+        + `hook=${inputProbe.hookObserved}/${inputProbe.hookBlocked}, `
+        + `duplicate=${inputProbe.duplicate}, `
+        + `focusChanged=${inputProbe.focusChanged}, reset dispatched=${inputProbe.resetDispatched}.`
+      );
+    }
+    // The Windows input gate shares only the minimum current Control binding
+    // setup with the video smoke. Encoder profile and soak assertions belong
+    // to their own commands and must not obscure native input evidence.
+    break inputDiagnostic;
+  }
+  const initialCaptureIdentity = switchMonitor && isWindows
     ? await waitFor(
         () => findWindowsCaptureIdentity(agentLogs, requestedMonitorIndex),
         3_000,
@@ -2426,31 +2518,6 @@ try {
     console.log(`Mode 3 monitor transition OK: ${requestedMonitorIndex} -> ${nextMonitorIndex}, first frame ${switchedFirstFrameMs.toFixed(0)}ms, generation ${previousCaptureGeneration} -> ${firstSwitchedFrame.metadata.captureGeneration}.`);
   }
 
-  if (windowsInputAck) {
-    const inputProbe = await runWindowsInputAckProbe({
-      deviceId: connectedDeviceId,
-      sessionId: String(activeInputBindingFrame.metadata.sessionId || ''),
-      commandId: String(activeInputBindingFrame.metadata.commandId || ''),
-      captureGeneration: Number(activeInputBindingFrame.metadata.captureGeneration || 0),
-      monitorIndex: Number(activeInputBindingFrame.metadata.monitorIndex || 0)
-    }, {
-      expectHookLateStartFailure: windowsInputHookLateStart
-    });
-    if (windowsInputHookLateStart) {
-      console.log(
-        `Windows diagnostic hook late-start cleanup OK: expected timeout, `
-        + `Agent responsive, reset=${inputProbe.resetApplied}.`
-      );
-    } else {
-      console.log(
-        `Windows native modifier input ACK: ${inputProbe.accepted}/${inputProbe.requested} `
-        + `via ${inputProbe.backend}, hook=${inputProbe.hookObserved}/${inputProbe.hookBlocked}, `
-        + `duplicate=${inputProbe.duplicate}, `
-        + `focusChanged=${inputProbe.focusChanged}, reset=${inputProbe.resetApplied}.`
-      );
-    }
-  }
-
   if (transitionToMode5) {
     const previousFrameSocket = frameSocket;
     frameSocket = new WebSocket(`ws://127.0.0.1:${httpPort}/api/remote/frames/ws?devices=${encodeURIComponent(connectedDeviceId)}`);