@@ -57,6 +57,18 @@ test('Apple smoke shares setup and build while keeping platform state and native
   }
 });
 
+test('the workflow resolves the optional physical device variable before entering composites', () => {
+  const ios = appleJob().steps.find((step) => step.id === 'ios')!;
+  expect(ios.env?.IOS_UDID).toBe('${{ vars.IOS_UDID }}');
+  for (const action of ['smoke-ios', 'smoke-ios-run']) {
+    const source = fs.readFileSync(
+      path.join(repoRoot, `.github/actions/${action}/action.yml`),
+      'utf8',
+    );
+    expect(source).not.toMatch(/\$\{\{\s*vars\./);
+  }
+});
+
 test('Apple uploads shared diagnostics once and retains both platform logs after cleanup', () => {
   const { steps } = appleJob();
   const uploads = steps.filter(
 
@@ -48,15 +48,19 @@ test('the shared diagnostics artifact includes hidden files only from its declar
     '${{ inputs.runner-derived-path }}/Logs/**',
     'test/artifacts/**',
     'test/screenshots/**',
+    '${{ inputs.additional-paths }}',
   ]);
+  expect(action.inputs['additional-paths']).toMatchObject({ required: false, default: '' });
   expect(
-    paths(upload!).every((entry) =>
-      [
-        '${{ inputs.agent-state-dir }}/',
-        '${{ inputs.runner-derived-path }}/',
-        '~/.agent-device/logs/',
-        'test/',
-      ].some((prefix) => entry.startsWith(prefix)),
+    paths(upload!).every(
+      (entry) =>
+        entry === '${{ inputs.additional-paths }}' ||
+        [
+          '${{ inputs.agent-state-dir }}/',
+          '${{ inputs.runner-derived-path }}/',
+          '~/.agent-device/logs/',
+          'test/',
+        ].some((prefix) => entry.startsWith(prefix)),
     ),
   ).toBe(true);
 });