fix: tighten env var surface (#560)

Author: thymikee

.github/workflows/ios.yml

@@ -21,10 +21,6 @@ jobs:
     env:
       IOS_RUNTIME_VERSION: "26.2"
       AGENT_DEVICE_IOS_RUNNER_DERIVED_PATH: ${{ github.workspace }}/.tmp/ios-runner-derived
-      AGENT_DEVICE_IOS_ALLOW_OVERRIDE_DERIVED_CLEAN: "1"
-      AGENT_DEVICE_IOS_SIMCTL_LIST_TIMEOUT_MS: "60000"
-      AGENT_DEVICE_IOS_BOOT_TIMEOUT_MS: "180000"
-      AGENT_DEVICE_IOS_APP_LAUNCH_TIMEOUT_MS: "60000"
     steps:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.github/workflows/macos.yml

@@ -20,7 +20,6 @@ jobs:
     timeout-minutes: 80
     env:
       AGENT_DEVICE_IOS_RUNNER_DERIVED_PATH: ${{ github.workspace }}/.tmp/macos-runner-derived
-      AGENT_DEVICE_IOS_APP_LAUNCH_TIMEOUT_MS: "60000"
     steps:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.github/workflows/replays-nightly.yml

@@ -52,10 +52,6 @@ jobs:
     env:
       IOS_RUNTIME_VERSION: "26.2"
       AGENT_DEVICE_IOS_RUNNER_DERIVED_PATH: ${{ github.workspace }}/.tmp/ios-runner-derived
-      AGENT_DEVICE_IOS_ALLOW_OVERRIDE_DERIVED_CLEAN: "1"
-      AGENT_DEVICE_IOS_SIMCTL_LIST_TIMEOUT_MS: "60000"
-      AGENT_DEVICE_IOS_BOOT_TIMEOUT_MS: "180000"
-      AGENT_DEVICE_IOS_APP_LAUNCH_TIMEOUT_MS: "60000"
     steps:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -103,7 +99,6 @@ jobs:
     timeout-minutes: 80
     env:
       AGENT_DEVICE_IOS_RUNNER_DERIVED_PATH: ${{ github.workspace }}/.tmp/macos-runner-derived
-      AGENT_DEVICE_IOS_APP_LAUNCH_TIMEOUT_MS: "60000"
     steps:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

ios-runner/AgentDeviceRunner/AgentDeviceRunnerUITests/RunnerTests+Lifecycle.swift

@@ -147,7 +147,7 @@ extension RunnerTests {
       ? (target.value(forKey: "waitForIdleTimeout") as? NSNumber)
       : nil
     if supportsWaitForIdleTimeout {
-      target.setValue(resolveScrollInteractionIdleTimeout(), forKey: "waitForIdleTimeout")
+      target.setValue(scrollInteractionIdleTimeoutDefault, forKey: "waitForIdleTimeout")
     }
     defer {
       if let previous {
@@ -191,19 +191,6 @@ extension RunnerTests {
     }
   }
 
-  private func resolveScrollInteractionIdleTimeout() -> TimeInterval {
-    guard
-      let raw = ProcessInfo.processInfo.environment["AGENT_DEVICE_IOS_INTERACTION_IDLE_TIMEOUT"],
-      !raw.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
-    else {
-      return scrollInteractionIdleTimeoutDefault
-    }
-    guard let parsed = Double(raw), parsed >= 0 else {
-      return scrollInteractionIdleTimeoutDefault
-    }
-    return min(parsed, 30)
-  }
-
   func shouldRetryCommand(_ command: Command) -> Bool {
     if RunnerEnv.isTruthy("AGENT_DEVICE_RUNNER_DISABLE_READONLY_RETRY") {
       return false

src/__tests__/cli-batch.test.ts

@@ -112,7 +112,7 @@ test('batch forwards reject lock policy for target retargeting', async () => {
     {
       env: {
         AGENT_DEVICE_PLATFORM: 'ios',
-        AGENT_DEVICE_SESSION_LOCKED: '1',
+        AGENT_DEVICE_SESSION_LOCK: 'reject',
       },
     },
   );
@@ -137,7 +137,6 @@ test('batch session lock flags apply to nested steps without env configuration',
     {
       env: {
         AGENT_DEVICE_PLATFORM: 'ios',
-        AGENT_DEVICE_SESSION_LOCKED: '0',
       },
     },
   );

src/__tests__/cli-config.test.ts

@@ -51,7 +51,7 @@ test('CLI merges config defaults with precedence user < project < env < CLI', as
   fs.rmSync(root, { recursive: true, force: true });
 });
 
-test('config and env can set appsFilter through canonical enum values', async () => {
+test('config can set appsFilter through canonical enum values', async () => {
   const { root, home, project } = makeTempWorkspace();
   fs.mkdirSync(path.join(home, '.agent-device'), { recursive: true });
   fs.writeFileSync(
@@ -62,12 +62,12 @@ test('config and env can set appsFilter through canonical enum values', async ()
 
   const result = await runCliCapture(['apps', '--json'], {
     cwd: project,
-    env: { HOME: home, AGENT_DEVICE_APPS_FILTER: 'all' },
+    env: { HOME: home },
   });
 
   assert.equal(result.code, null);
   assert.equal(result.calls.length, 1);
-  assert.equal(result.calls[0]?.flags?.appsFilter, 'all');
+  assert.equal(result.calls[0]?.flags?.appsFilter, 'user-installed');
 
   fs.rmSync(root, { recursive: true, force: true });
 });

src/__tests__/cli-diagnostics.test.ts

@@ -258,9 +258,9 @@ test('cli forwards bound-session lock policy when session defaults are configure
 
 test('cli session lock flag overrides environment for a single invocation', async () => {
   const previousPlatform = process.env.AGENT_DEVICE_PLATFORM;
-  const previousLocked = process.env.AGENT_DEVICE_SESSION_LOCKED;
+  const previousLock = process.env.AGENT_DEVICE_SESSION_LOCK;
   process.env.AGENT_DEVICE_PLATFORM = 'ios';
-  process.env.AGENT_DEVICE_SESSION_LOCKED = '0';
+  process.env.AGENT_DEVICE_SESSION_LOCK = 'strip';
   try {
     const result = await runCliCapture(
       ['snapshot', '--session-lock', 'reject', '--device', 'Pixel 9', '--json'],
@@ -275,7 +275,7 @@ test('cli session lock flag overrides environment for a single invocation', asyn
   } finally {
     if (previousPlatform === undefined) delete process.env.AGENT_DEVICE_PLATFORM;
     else process.env.AGENT_DEVICE_PLATFORM = previousPlatform;
-    if (previousLocked === undefined) delete process.env.AGENT_DEVICE_SESSION_LOCKED;
-    else process.env.AGENT_DEVICE_SESSION_LOCKED = previousLocked;
+    if (previousLock === undefined) delete process.env.AGENT_DEVICE_SESSION_LOCK;
+    else process.env.AGENT_DEVICE_SESSION_LOCK = previousLock;
   }
 });

src/__tests__/client-metro-startup-cleanup.test.ts

@@ -59,6 +59,7 @@ test('prepareMetroRuntime stops a spawned Metro process when startup readiness t
       installDependenciesIfNeeded: false,
       probeTimeoutMs: 10,
       startupTimeoutMs: 30_000,
+      env: { ...process.env, AGENT_DEVICE_DAEMON_AUTH_TOKEN: 'daemon-token' },
     });
 
     const expectedFailure = assert.rejects(

src/__tests__/client-metro.test.ts

@@ -175,11 +175,24 @@ test('prepareMetroRuntime rejects incomplete proxy configuration', async () => {
       prepareMetroRuntime({
         publicBaseUrl: 'https://sandbox.example.test',
         proxyBaseUrl: 'https://proxy.example.test',
+        env: {},
       }),
     (error) =>
       error instanceof AppError &&
       error.code === 'INVALID_ARGS' &&
-      error.message.includes('AGENT_DEVICE_PROXY_TOKEN'),
+      error.message.includes('AGENT_DEVICE_METRO_BEARER_TOKEN'),
+  );
+
+  await assert.rejects(
+    () =>
+      prepareMetroRuntime({
+        publicBaseUrl: 'https://sandbox.example.test',
+        env: { AGENT_DEVICE_METRO_BEARER_TOKEN: TEST_TOKEN },
+      }),
+    (error) =>
+      error instanceof AppError &&
+      error.code === 'INVALID_ARGS' &&
+      error.message.includes('requires --proxy-base-url'),
   );
 
   await assert.rejects(
@@ -188,6 +201,37 @@ test('prepareMetroRuntime rejects incomplete proxy configuration', async () => {
         publicBaseUrl: 'https://sandbox.example.test',
         proxyBaseUrl: 'https://proxy.example.test',
         proxyBearerToken: TEST_TOKEN,
+        env: {},
+      }),
+    (error) =>
+      error instanceof AppError &&
+      error.code === 'INVALID_ARGS' &&
+      error.message.includes('tenantId, runId, and leaseId bridge scope'),
+  );
+});
+
+test('prepareMetroRuntime falls back to daemon auth token for proxy auth', async () => {
+  await assert.rejects(
+    () =>
+      prepareMetroRuntime({
+        publicBaseUrl: 'https://sandbox.example.test',
+        proxyBaseUrl: 'https://proxy.example.test',
+        env: { AGENT_DEVICE_DAEMON_AUTH_TOKEN: TEST_TOKEN },
+      }),
+    (error) =>
+      error instanceof AppError &&
+      error.code === 'INVALID_ARGS' &&
+      error.message.includes('tenantId, runId, and leaseId bridge scope'),
+  );
+});
+
+test('prepareMetroRuntime honors metro bearer token env for proxy auth', async () => {
+  await assert.rejects(
+    () =>
+      prepareMetroRuntime({
+        publicBaseUrl: 'https://sandbox.example.test',
+        proxyBaseUrl: 'https://proxy.example.test',
+        env: { AGENT_DEVICE_METRO_BEARER_TOKEN: TEST_TOKEN },
       }),
     (error) =>
       error instanceof AppError &&