refactor: trim lock policy cleanup

Author: thymikee

src/daemon/__tests__/request-lock-policy.test.ts

@@ -146,18 +146,7 @@ test.each([
       IOS_SESSION,
     );
 
-    assert.deepEqual(
-      {
-        platform: req.flags?.platform,
-        device: req.flags?.device,
-        serial: req.flags?.serial,
-      },
-      {
-        platform: expected.platform,
-        device: expected.device,
-        serial: expected.serial,
-      },
-    );
+    assert.deepEqual(selectedFlags(req), expected);
   },
 );
 
@@ -187,18 +176,7 @@ test.each([
       },
     });
 
-    assert.deepEqual(
-      {
-        platform: req.flags?.platform,
-        device: req.flags?.device,
-        serial: req.flags?.serial,
-      },
-      {
-        platform: expected.platform,
-        device: expected.device,
-        serial: expected.serial,
-      },
-    );
+    assert.deepEqual(selectedFlags(req), expected);
   },
 );
 
@@ -340,3 +318,15 @@ test('strips only conflicting selectors for existing sessions', () => {
   assert.equal(req.flags?.device, 'iPhone 16');
   assert.equal(req.flags?.serial, undefined);
 });
+
+function selectedFlags(req: ReturnType<typeof applyRequestLockPolicy>): {
+  platform: string | undefined;
+  device: string | undefined;
+  serial: string | undefined;
+} {
+  return {
+    platform: req.flags?.platform,
+    device: req.flags?.device,
+    serial: req.flags?.serial,
+  };
+}

src/daemon/request-lock-policy.ts

@@ -36,23 +36,17 @@ export function applyRequestLockPolicy(
   }
 
   const nextFlags: CommandFlags = { ...(req.flags ?? {}) };
-  const allowsSelectorOverride = SELECTOR_OVERRIDE_LOCK_POLICY_COMMANDS.has(req.command);
-  const conflicts = listLockPolicyConflicts(
-    req,
-    existingSession,
-    nextFlags,
-    allowsSelectorOverride,
-  );
+  const canOverrideSelector = SELECTOR_OVERRIDE_LOCK_POLICY_COMMANDS.has(req.command);
+  const conflicts = canOverrideSelector
+    ? []
+    : existingSession
+      ? listSessionSelectorConflicts(existingSession, nextFlags)
+      : listFreshSessionConflicts(nextFlags, req.meta?.lockPlatform, req.command);
   const lockPlatform = req.meta?.lockPlatform;
 
   if (conflicts.length === 0) {
     if (
-      shouldApplyLockPlatformDefault(
-        allowsSelectorOverride,
-        existingSession,
-        nextFlags,
-        lockPlatform,
-      )
+      shouldApplyLockPlatformDefault(canOverrideSelector, existingSession, nextFlags, lockPlatform)
     ) {
       nextFlags.platform = lockPlatform;
     }
@@ -77,28 +71,16 @@ export function applyRequestLockPolicy(
   );
 }
 
-function listLockPolicyConflicts(
-  req: DaemonRequest,
-  existingSession: SessionState | undefined,
-  flags: CommandFlags,
-  allowsSelectorOverride: boolean,
-): SessionSelectorConflict[] {
-  if (allowsSelectorOverride) return [];
-  return existingSession
-    ? listSessionSelectorConflicts(existingSession, flags)
-    : listFreshSessionConflicts(flags, req.meta?.lockPlatform, req.command);
-}
-
 function shouldApplyLockPlatformDefault(
-  allowsSelectorOverride: boolean,
+  canOverrideSelector: boolean,
   existingSession: SessionState | undefined,
   flags: CommandFlags,
   lockPlatform: LockPlatform,
 ): boolean {
   if (!lockPlatform || existingSession || flags.platform !== undefined) {
     return false;
   }
-  if (!allowsSelectorOverride) {
+  if (!canOverrideSelector) {
     return true;
   }
   return flags.serial === undefined && flags.androidDeviceAllowlist === undefined;