fix: preserve explicit inventory selectors

Author: thymikee

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

@@ -154,7 +154,7 @@ test.each([
   {
     command: 'apps',
     flags: { device: 'iPhone 17' },
-    expected: { platform: 'ios', device: 'iPhone 17', serial: undefined },
+    expected: { platform: undefined, device: 'iPhone 17', serial: undefined },
   },
   {
     command: 'devices',
@@ -180,6 +180,41 @@ test.each([
   },
 );
 
+test('allows inventory commands to use explicit Apple selectors under another lock platform', () => {
+  const req = applyRequestLockPolicy({
+    token: 'token',
+    session: 'qa-android',
+    command: 'apps',
+    positionals: [],
+    flags: {
+      udid: 'SIM-001',
+    },
+    meta: {
+      lockPolicy: 'reject',
+      lockPlatform: 'android',
+    },
+  });
+
+  assert.equal(req.flags?.platform, undefined);
+  assert.equal(req.flags?.udid, 'SIM-001');
+});
+
+test('defaults inventory commands without explicit selectors to the lock platform', () => {
+  const req = applyRequestLockPolicy({
+    token: 'token',
+    session: 'qa-ios',
+    command: 'apps',
+    positionals: [],
+    flags: {},
+    meta: {
+      lockPolicy: 'reject',
+      lockPlatform: 'ios',
+    },
+  });
+
+  assert.equal(req.flags?.platform, 'ios');
+});
+
 test('allows matching redundant selectors for existing sessions', () => {
   const req = applyRequestLockPolicy(
     {

src/daemon/request-lock-policy.ts

@@ -83,7 +83,7 @@ function shouldApplyLockPlatformDefault(
   if (!canOverrideSelector) {
     return true;
   }
-  return flags.serial === undefined && flags.androidDeviceAllowlist === undefined;
+  return !LOCKABLE_SELECTOR_KEYS.some((key) => hasSelectorValue(flags[key]));
 }
 
 function applyStripLockPolicy(
@@ -119,13 +119,17 @@ function listFreshSessionConflicts(
   }
   for (const key of LOCKABLE_SELECTOR_KEYS) {
     const value = flags[key];
-    if (typeof value === 'string' && value.trim().length > 0) {
+    if (hasSelectorValue(value)) {
       conflicts.push({ key: key as SessionSelectorConflictKey, value });
     }
   }
   return conflicts;
 }
 
+function hasSelectorValue(value: unknown): value is string {
+  return typeof value === 'string' && value.trim().length > 0;
+}
+
 function platformSelectorsConflict(
   requested: ReturnType<typeof normalizePlatformSelector>,
   locked: ReturnType<typeof normalizePlatformSelector>,