refactor: compact conditional runtime declarations

Author: thymikee

packages/contracts/src/command-platform-execution.test.ts

@@ -8,6 +8,7 @@ describe('command platform execution declaration', () => {
     { kind: 'none' },
     { kind: 'legacy' },
     { kind: 'inventory', use: inventoryUse },
+    { kind: 'device-runtime', use: { required: ['capture'], preferred: [] } },
     {
       kind: 'device-runtime',
       use: { required: ['capture'], preferred: ['inspect'], conditional: ['observe'] },
@@ -24,16 +25,16 @@ describe('command platform execution declaration', () => {
     { kind: 'inventory', use: inventoryUse, legacy: true },
     {
       kind: 'device-runtime',
-      use: { required: [], preferred: [], conditional: [] },
+      use: { required: [], preferred: [] },
       inventory: true,
     },
     {
       kind: 'device-runtime',
-      use: { required: ['capture', 'capture'], preferred: [], conditional: [] },
+      use: { required: ['capture', 'capture'], preferred: [] },
     },
     {
       kind: 'device-runtime',
-      use: { required: ['capture'], preferred: ['capture'], conditional: [] },
+      use: { required: ['capture'], preferred: ['capture'] },
     },
     {
       kind: 'device-runtime',
@@ -59,7 +60,7 @@ describe('command platform execution declaration', () => {
     { kind: 'device-runtime', uses: [appLogRuntimePlanUses[0], appLogRuntimePlanUses[0]] },
     {
       kind: 'device-runtime',
-      uses: [{ required: ['appLogStart'], preferred: ['appLogStart'], conditional: [] }],
+      uses: [{ required: ['appLogStart'], preferred: ['appLogStart'] }],
     },
   ])('rejects empty, duplicate, overlapping, or both-form runtime uses: %j', (value) => {
     expect(() => assertCommandPlatformExecution(value)).toThrow(/exactly one/);

packages/contracts/src/command-platform-execution.ts

@@ -67,11 +67,17 @@ function hasRuntimeUseDeclaration(value: unknown): boolean {
   const categories = [
     stringArray(use['required']),
     stringArray(use['preferred']),
-    stringArray(use['conditional']),
+    stringArray(use['conditional'] ?? []),
   ];
   if (!hasValidRuntimeUseCategories(categories)) return false;
-  if (!arePairwiseDisjoint(categories)) return false;
-  return sameKeys(Object.keys(use).sort(), ['conditional', 'preferred', 'required']);
+  const operations = categories.flat();
+  if (new Set(operations).size !== operations.length) return false;
+  return sameKeys(
+    Object.keys(use).sort(),
+    use['conditional'] === undefined
+      ? ['preferred', 'required']
+      : ['conditional', 'preferred', 'required'],
+  );
 }
 
 function hasValidRuntimeUseCategories(
@@ -82,17 +88,6 @@ function hasValidRuntimeUseCategories(
   );
 }
 
-function arePairwiseDisjoint(categories: readonly string[][]): boolean {
-  for (let leftIndex = 0; leftIndex < categories.length; leftIndex += 1) {
-    const left = categories[leftIndex];
-    if (!left) return false;
-    for (const right of categories.slice(leftIndex + 1)) {
-      if (!areDisjoint(left, right)) return false;
-    }
-  }
-  return true;
-}
-
 function stringArray(value: unknown): string[] | null {
   if (!Array.isArray(value)) return null;
   return value.every((key): key is string => typeof key === 'string') ? value : null;
@@ -102,11 +97,6 @@ function hasUniqueValues(values: readonly string[]): boolean {
   return new Set(values).size === values.length;
 }
 
-function areDisjoint(left: readonly string[], right: readonly string[]): boolean {
-  const leftValues = new Set(left);
-  return right.every((value) => !leftValues.has(value));
-}
-
 function sameKeys(actual: readonly string[], expected: readonly string[]): boolean {
   return actual.length === expected.length && actual.every((key, index) => key === expected[index]);
 }

packages/contracts/src/facades/platform.ts

@@ -263,20 +263,18 @@ export {
   captureSnapshotSignal,
   snapshotRuntimeOperationFacts,
 } from '../snapshot-runtime.ts';
-export { findTextRuntimeOperationFacts } from '../find-text-runtime.ts';
-export type {
-  FindTextInput,
-  FindTextResult,
-  FindTextRuntimeOperationFacts,
-  FindTextRuntimeOperations,
-} from '../find-text-runtime.ts';
-export { findSelectorRuntimeOperationFacts } from '../find-selector-runtime.ts';
+export { selectorObservationRuntimeOperationFacts } from '../selector-observation-runtime.ts';
 export type {
   FindSelectorInput,
   FindSelectorResult,
-  FindSelectorRuntimeOperationFacts,
   FindSelectorRuntimeOperations,
-} from '../find-selector-runtime.ts';
+  FindTextInput,
+  FindTextResult,
+  FindTextRuntimeOperations,
+  SelectorObservationRuntimeOperationFacts,
+  SelectorObservationRuntimeOperations,
+  SelectorObservationResult,
+} from '../selector-observation-runtime.ts';
 export type {
   CaptureSnapshotInput,
   LocalSnapshotInteractorResolver,

packages/contracts/src/find-selector-runtime.ts

@@ -30,7 +30,7 @@ test.each([
         appLogInspectUse,
         appLogDoctorUse,
         appLogStartUse,
-        { required: ['appLogCleanup'], preferred: [], conditional: [] },
+        { required: ['appLogCleanup'], preferred: [] },
       ],
     },
   },

packages/contracts/src/find-text-runtime.ts

@@ -52,20 +52,17 @@ test('normalizes all seven logs plans with their exact non-superset runtime use'
   assert.deepEqual(appLogDoctorUse, {
     required: ['appLogInspect', 'appLogDoctor'],
     preferred: [],
-    conditional: [],
   });
   assert.deepEqual(startUse, {
     required: ['appLogInspect', 'appLogStart'],
     preferred: [],
-    conditional: [],
   });
 });
 
 test('keeps fact-derived admission separate from every execution plan', () => {
   assert.deepEqual(appLogAdmissionUse, {
     required: [],
     preferred: ['appLogInspect'],
-    conditional: [],
   });
   assert.equal((appLogRuntimePlanUses as readonly object[]).includes(appLogAdmissionUse), false);
 });

packages/contracts/src/logs-runtime-cutover.test.ts

@@ -43,12 +43,10 @@ test('normalizes defaults and retains the requested alias and projection', () =>
   assert.deepEqual(networkDumpUse, {
     required: ['networkDump'],
     preferred: [],
-    conditional: [],
   });
   assert.deepEqual(networkAdmissionUse, {
     required: [],
     preferred: ['networkDump'],
-    conditional: [],
   });
 });
 

packages/contracts/src/logs-runtime-plan.test.ts

@@ -63,7 +63,6 @@ test.each([
     {
       required: ['captureSnapshot', 'captureSnapshotWithCustomActions'],
       preferred: [],
-      conditional: [],
     },
   ],
   [
@@ -74,7 +73,6 @@ test.each([
     {
       required: ['captureSnapshot', 'captureSnapshotWithoutActiveApp'],
       preferred: [],
-      conditional: [],
     },
   ],
   [
@@ -89,7 +87,6 @@ test.each([
         'captureSnapshotWithoutActiveApp',
       ],
       preferred: [],
-      conditional: [],
     },
   ],
 ] as const)(

packages/contracts/src/network-runtime-plan.test.ts

@@ -14,8 +14,7 @@ import type { ScreenRecordingRuntimeHost } from './screen-recording-runtime-host
 import type { ScreenRecordingRuntimeOperations } from './screen-recording-runtime.ts';
 import type { ScreenshotRuntimeOperations } from './screenshot-runtime.ts';
 import type { SnapshotRuntimeHost, SnapshotRuntimeOperations } from './snapshot-runtime.ts';
-import type { FindTextRuntimeOperations } from './find-text-runtime.ts';
-import type { FindSelectorRuntimeOperations } from './find-selector-runtime.ts';
+import type { SelectorObservationRuntimeOperations } from './selector-observation-runtime.ts';
 import type { ViewportRuntimeOperations } from './viewport-runtime.ts';
 import type { ElementTextRuntimeOperations } from './element-text-runtime.ts';
 import type {
@@ -49,8 +48,7 @@ export type PlatformRuntimeOperations = AppLogRuntimeOperations &
   ScreenRecordingRuntimeOperations &
   ScreenshotRuntimeOperations &
   SnapshotRuntimeOperations &
-  FindTextRuntimeOperations &
-  FindSelectorRuntimeOperations &
+  SelectorObservationRuntimeOperations &
   ViewportRuntimeOperations &
   ElementTextRuntimeOperations &
   DeviceReadinessRuntimeOperations &