From 6697a0dbadbf5686c71f0f8bced071323ff30530 Mon Sep 17 00:00:00 2001
From: Mike Pitre <12040919+mikepitre@users.noreply.github.com>
Date: Fri, 23 Oct 2026 15:59:33 -0500
Subject: [PATCH 1/4] test(expo): post one kind of evidence and drop attach
 --both

Bumps @clerk/internal-mobile-e2e to da51b52, where attach refuses
--video with --screenshot and --both is gone. The verify-clerk-expo
skill now says to post the one kind the change calls for even when a
brief asks for both, and to say so in the hand-back. verify-attach.mjs
lays out a hand-off in one table instead of a section per kind.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .changeset/nice-moments-prove.md          |  2 ++
 .claude/skills/README.md                  | 10 +++---
 .claude/skills/verify-clerk-expo/SKILL.md |  2 +-
 integration/expo-native/package-lock.json |  6 ++--
 integration/expo-native/package.json      |  2 +-
 scripts/verify-attach.mjs                 | 37 +++++++++--------------
 scripts/verify-attach.test.mjs            | 32 +++-----------------
 7 files changed, 32 insertions(+), 59 deletions(-)
 create mode 100644 .changeset/nice-moments-prove.md

diff --git a/.changeset/nice-moments-prove.md b/.changeset/nice-moments-prove.md
new file mode 100644
index 00000000000..a845151cc84
--- /dev/null
+++ b/.changeset/nice-moments-prove.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.claude/skills/README.md b/.claude/skills/README.md
index 5b90de9df83..5f19c6d836b 100644
--- a/.claude/skills/README.md
+++ b/.claude/skills/README.md
@@ -45,8 +45,8 @@ relevant.
 
 ## Skills in this repo
 
-| Skill               | Use it for                                                                                                                                        |
-| ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `clerk-monorepo`    | Day-to-day work in the monorepo: setup, build/test loops, the package map, changesets, commits, PRs, breaking-change checks.                      |
-| `mosaic`            | Mosaic flow UI: authoring machines, controllers, and views, and migrating a legacy component into the split (with parity verification).           |
-| `verify-clerk-expo` | Proving a `@clerk/expo` change on an iOS simulator or Android emulator, local or borrowed on a CI runner, with video and screenshots as evidence. |
+| Skill               | Use it for                                                                                                                                         |
+| ------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `clerk-monorepo`    | Day-to-day work in the monorepo: setup, build/test loops, the package map, changesets, commits, PRs, breaking-change checks.                       |
+| `mosaic`            | Mosaic flow UI: authoring machines, controllers, and views, and migrating a legacy component into the split (with parity verification).            |
+| `verify-clerk-expo` | Proving a `@clerk/expo` change on an iOS simulator or Android emulator, local or borrowed on a CI runner, with a video or screenshots as evidence. |
diff --git a/.claude/skills/verify-clerk-expo/SKILL.md b/.claude/skills/verify-clerk-expo/SKILL.md
index e03293718b9..1ca7bd8d84e 100644
--- a/.claude/skills/verify-clerk-expo/SKILL.md
+++ b/.claude/skills/verify-clerk-expo/SKILL.md
@@ -208,7 +208,7 @@ $ integration/expo-native/bin/control-clerk-expo attach <run-id> --pr <n> --vide
 
 `attach` posts what you choose, and with neither `--screenshot` nor `--video` it fails with a usage error. Make two choices.
 
-Choose screenshots or the video by what changed, and post one kind. A change to behavior, to movement or animation, or to a flow shows in a video, so pass `--video`: one before and after video for each change, and no screenshots beside it. A still change, such as wording or a layout, shows in screenshots, so pass `--screenshot <label>` once for each screen the change touches, each with its before. `attach` refuses both flags together unless you add `--both`, which is for the rare change a reviewer cannot see in one kind alone.
+Choose screenshots or the video by what changed, and post one kind. A change to behavior, to movement or animation, or to a flow shows in a video, so pass `--video`: one before and after video for each change, and no screenshots beside it. A still change, such as wording or a layout, shows in screenshots, so pass `--screenshot <label>` once for each screen the change touches, each with its before. Never post both kinds, and `attach` refuses `--video` with `--screenshot`. When a brief, a prompt or a reviewer asks for both, post the one kind the change calls for, and say in your hand-back that you did and why.
 
 A video shows only the part of the run that you mark. Wrap the steps that show the change in `host.evidence`, and leave sign-in, seeding and navigation outside it:
 
diff --git a/integration/expo-native/package-lock.json b/integration/expo-native/package-lock.json
index d361bd351af..fa475f64358 100644
--- a/integration/expo-native/package-lock.json
+++ b/integration/expo-native/package-lock.json
@@ -6,7 +6,7 @@
     "": {
       "name": "verify-clerk-expo",
       "devDependencies": {
-        "@clerk/internal-mobile-e2e": "github:clerk/internal-mobile-e2e#ad396e6014ad86cd3d29e58933c75ab59905b7ab",
+        "@clerk/internal-mobile-e2e": "github:clerk/internal-mobile-e2e#da51b522f4ffc4f7920050201a7fc1cf6f088a29",
         "@types/node": "24.19.1",
         "typescript": "7.0.2"
       },
@@ -122,8 +122,8 @@
       }
     },
     "node_modules/@clerk/internal-mobile-e2e": {
-      "resolved": "git+ssh://git@github.com/clerk/internal-mobile-e2e.git#ad396e6014ad86cd3d29e58933c75ab59905b7ab",
-      "integrity": "sha512-ZcAvdmF2Jy65fgGRYR2aVErMfWclhqX8+kqpWV6+EfuNZ/52g53/Z02sGF3Vqp10c+uQyeAicHoiBgSt2jQNGA==",
+      "resolved": "git+ssh://git@github.com/clerk/internal-mobile-e2e.git#da51b522f4ffc4f7920050201a7fc1cf6f088a29",
+      "integrity": "sha512-IwoFkM0RUfCsPbKzQFuOwl1oaIAcKAvEqEQva82wixg/xVtafuUY0UVth5uzgm2LKvool/RbkPIMGzoUZ7SANg==",
       "dev": true,
       "dependencies": {
         "@e2e-dev/github": "0.4.0",
diff --git a/integration/expo-native/package.json b/integration/expo-native/package.json
index b17768f3d28..193a5ea6a82 100644
--- a/integration/expo-native/package.json
+++ b/integration/expo-native/package.json
@@ -7,7 +7,7 @@
     "typecheck": "tsc -p ."
   },
   "devDependencies": {
-    "@clerk/internal-mobile-e2e": "github:clerk/internal-mobile-e2e#ad396e6014ad86cd3d29e58933c75ab59905b7ab",
+    "@clerk/internal-mobile-e2e": "github:clerk/internal-mobile-e2e#da51b522f4ffc4f7920050201a7fc1cf6f088a29",
     "@types/node": "24.19.1",
     "typescript": "7.0.2"
   },
diff --git a/scripts/verify-attach.mjs b/scripts/verify-attach.mjs
index ba389dd0a39..f4c79a1e229 100644
--- a/scripts/verify-attach.mjs
+++ b/scripts/verify-attach.mjs
@@ -432,35 +432,28 @@ function mediaTables(files, hasBefore, uploaded) {
     const label = stem(name);
     const cell = (url, alt) => (isVideo(name) ? url : `<img src="${url}" width="${IMAGE_WIDTH}" alt="${alt}">`);
     return {
-      video: isVideo(name),
       label,
       after: cell(uploaded[at], hasBefore ? `After: ${label}` : label),
       before: hasBefore ? cell(uploaded[files.length + at], `Before: ${label}`) : '',
     };
   });
-  return [false, true].flatMap(video => {
-    const some = shown.filter(item => item.video === video);
-    if (some.length === 0) {
-      return [];
-    }
-    if (hasBefore) {
-      return [
-        table(
-          ['Before', 'After'],
-          some.map(item => [item.before, item.after]),
-        ),
-      ];
-    }
-    const rows = Array.from({ length: Math.ceil(some.length / ACROSS) }, (_, row) =>
-      some.slice(row * ACROSS, (row + 1) * ACROSS),
-    );
-    return rows.map(row =>
+  if (hasBefore) {
+    return [
       table(
-        row.map(item => `\`${item.label}\``),
-        [row.map(item => item.after)],
+        ['Before', 'After'],
+        shown.map(item => [item.before, item.after]),
       ),
-    );
-  });
+    ];
+  }
+  const rows = Array.from({ length: Math.ceil(shown.length / ACROSS) }, (_, row) =>
+    shown.slice(row * ACROSS, (row + 1) * ACROSS),
+  );
+  return rows.map(row =>
+    table(
+      row.map(item => `\`${item.label}\``),
+      [row.map(item => item.after)],
+    ),
+  );
 }
 
 // `gh pr edit --attach` rewrites only a markdown reference to a file, so the files go up as a list first, and the tables are written from the addresses GitHub gave them.
diff --git a/scripts/verify-attach.test.mjs b/scripts/verify-attach.test.mjs
index 6f8262ba85b..bd841154e1a 100644
--- a/scripts/verify-attach.test.mjs
+++ b/scripts/verify-attach.test.mjs
@@ -1289,13 +1289,9 @@ describe('the step that edits the description', () => {
     ['<!-- verify-evidence:ios -->', '', ...lines, '', '<!-- /verify-evidence:ios -->'].join('\n');
   const AFTER_ONLY = [
     '',
-    '| `profile` |',
-    '| :---: |',
-    `| <img src="${asset(2)}" width="280" alt="profile"> |`,
-    '',
-    '| `video` |',
-    '| :---: |',
-    `| ${asset(1)} |`,
+    '| `video` | `profile` |',
+    '| :---: | :---: |',
+    `| ${asset(1)} | <img src="${asset(2)}" width="280" alt="profile"> |`,
   ];
 
   it('adds the block after the description and attaches the files from their own directory, under names the description could not have guessed', async () => {
@@ -1494,24 +1490,6 @@ describe('the step that edits the description', () => {
     assert.equal(await published(CLIP), laidOut(SAID, '', '| `video` |', '| :---: |', `| ${asset(1)} |`));
   });
 
-  it('lays out both kinds when the hand-off holds both: the screenshots first, then the video, each as it is alone', async () => {
-    assert.equal(
-      await published([...CLIP, ...SHOT], [...WAS_CLIP, ...WAS_SHOT]),
-      laidOut(
-        `${SAID}${WAS}`,
-        '',
-        '| Before | After |',
-        '| :---: | :---: |',
-        `| <img src="${asset(4)}" width="280" alt="Before: profile"> | <img src="${asset(2)}" width="280" alt="After: profile"> |`,
-        '',
-        '| Before | After |',
-        '| :---: | :---: |',
-        `| ${asset(3)} | ${asset(1)} |`,
-      ),
-    );
-    assert.equal(await published([...CLIP, ...SHOT]), laidOut(SAID, ...AFTER_ONLY));
-  });
-
   const ASCII = Array.from({ length: 128 }, (_, code) => String.fromCharCode(code));
   const ADDRESS = 'https://github\\.com/user-attachments/assets/[0-9a-f-]{36}';
   const LABEL = '[A-Za-z0-9._-]+';
@@ -1732,7 +1710,7 @@ describe('the step that edits the description', () => {
     );
     assert.match(
       fake.state.laidOutBody,
-      /, 3 of 3 passed\. The pull request has newer commits\.\r\n\r\n\| `profile` \|/,
+      /, 3 of 3 passed\. The pull request has newer commits\.\r\n\r\n\| `video` \| `profile` \|/,
     );
   });
 
@@ -1764,7 +1742,7 @@ describe('the step that edits the description', () => {
     );
     assert.match(
       fake.state.laidOutBody,
-      /, 3 of 3 passed\. The pull request has newer commits\.\r\n\r\n\| `profile` \|/,
+      /, 3 of 3 passed\. The pull request has newer commits\.\r\n\r\n\| `video` \| `profile` \|/,
     );
   });
 

From 653f76cc2dd1bb2a9ca3800f8ad296f065f8bdec Mon Sep 17 00:00:00 2001
From: Mike Pitre <12040919+mikepitre@users.noreply.github.com>
Date: Fri, 23 Oct 2026 16:13:41 -0500
Subject: [PATCH 2/4] docs(verify): describe the one evidence table and when a
 before applies

The publisher lays out every file of a hand-off with a before in one
Before and After table, so the skill no longer says the video sits in a
table of its own. The kind paragraph now says a before goes with a flow
or screen that already exists. A test pins the one-table layout for a
hand-off that holds both kinds.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .claude/skills/verify-clerk-expo/SKILL.md |  4 ++--
 scripts/verify-attach.test.mjs            | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.claude/skills/verify-clerk-expo/SKILL.md b/.claude/skills/verify-clerk-expo/SKILL.md
index 1ca7bd8d84e..f9aa5e1a062 100644
--- a/.claude/skills/verify-clerk-expo/SKILL.md
+++ b/.claude/skills/verify-clerk-expo/SKILL.md
@@ -208,7 +208,7 @@ $ integration/expo-native/bin/control-clerk-expo attach <run-id> --pr <n> --vide
 
 `attach` posts what you choose, and with neither `--screenshot` nor `--video` it fails with a usage error. Make two choices.
 
-Choose screenshots or the video by what changed, and post one kind. A change to behavior, to movement or animation, or to a flow shows in a video, so pass `--video`: one before and after video for each change, and no screenshots beside it. A still change, such as wording or a layout, shows in screenshots, so pass `--screenshot <label>` once for each screen the change touches, each with its before. Never post both kinds, and `attach` refuses `--video` with `--screenshot`. When a brief, a prompt or a reviewer asks for both, post the one kind the change calls for, and say in your hand-back that you did and why.
+Choose screenshots or the video by what changed, and post one kind. A change to behavior, to movement or animation, or to a flow shows in a video, so pass `--video`: one video for each change, with its before when the flow already exists, and no screenshots beside it. A still change, such as wording or a layout, shows in screenshots, so pass `--screenshot <label>` once for each screen the change touches, each with its before when the screen already exists. Never post both kinds, and `attach` refuses `--video` with `--screenshot`. When a brief, a prompt or a reviewer asks for both, post the one kind the change calls for, and say in your hand-back that you did and why.
 
 A video shows only the part of the run that you mark. Wrap the steps that show the change in `host.evidence`, and leave sign-in, seeding and navigation outside it:
 
@@ -234,7 +234,7 @@ For screenshots, show each screen the change touches, and each state of a screen
 
 Some states are out of reach for a test user on the standard settings with the default roles. Try a settings file for the spec, or test data that the spec seeds, first. When neither reaches it, force the state with a small local patch to the build. Never commit or push the patch. Put the same patch on the before build and the after build, and run both on a local device, because `attach` refuses a run on a session build with uncommitted changes. In the pull request, say exactly what the patch changed and why no test user could reach the state without it.
 
-`attach` puts the files in the description of the pull request with `gh pr edit --attach`. It writes one block for the platform of the run, between the comments `<!-- verify-evidence:ios -->` and `<!-- /verify-evidence:ios -->`, or the same two with `android`. The block is a line and one or two tables. The line leads with the result and names the run, the device, the commit, and how many tests passed. With `--before` it also names the before run, its commit, and how many of its tests passed. With `--before`, a table has a `Before` and an `After` column and one row for each screenshot. Without it, the screenshots are two across, each under its label in code font. Each screenshot is 280 pixels wide. The video is in a table of its own under the screenshots.
+`attach` puts the files in the description of the pull request with `gh pr edit --attach`. It writes one block for the platform of the run, between the comments `<!-- verify-evidence:ios -->` and `<!-- /verify-evidence:ios -->`, or the same two with `android`. The block is a line and then one or more tables. The line leads with the result and names the run, the device, the commit, and how many tests passed. With `--before` it also names the before run, its commit, and how many of its tests passed. With `--before`, one table has a `Before` and an `After` column, and a row for each screenshot or one row for the video. Without it, the screenshots are two across, each under its label in code font, and the video is alone in a table under its name. Each screenshot is 280 pixels wide.
 
 The first `attach` of a platform adds its block after the description. A later `attach` of that platform replaces its block, so the description holds the latest run of each platform and the media does not pile up. `attach` changes nothing outside the block. Keep both comments of a block or remove both: `attach` refuses a description that has one without the other, or either one twice. A comment counts only when it is a whole line outside a code fence, so a description can quote one in a sentence or show a whole block as an example.
 
diff --git a/scripts/verify-attach.test.mjs b/scripts/verify-attach.test.mjs
index bd841154e1a..9ece098b8d9 100644
--- a/scripts/verify-attach.test.mjs
+++ b/scripts/verify-attach.test.mjs
@@ -1490,6 +1490,20 @@ describe('the step that edits the description', () => {
     assert.equal(await published(CLIP), laidOut(SAID, '', '| `video` |', '| :---: |', `| ${asset(1)} |`));
   });
 
+  it('lays out a hand-off that holds both kinds with a before as one Before and After table, in the order of the manifest', async () => {
+    assert.equal(
+      await published([...CLIP, ...SHOT], [...WAS_CLIP, ...WAS_SHOT]),
+      laidOut(
+        `${SAID}${WAS}`,
+        '',
+        '| Before | After |',
+        '| :---: | :---: |',
+        `| ${asset(3)} | ${asset(1)} |`,
+        `| <img src="${asset(4)}" width="280" alt="Before: profile"> | <img src="${asset(2)}" width="280" alt="After: profile"> |`,
+      ),
+    );
+  });
+
   const ASCII = Array.from({ length: 128 }, (_, code) => String.fromCharCode(code));
   const ADDRESS = 'https://github\\.com/user-attachments/assets/[0-9a-f-]{36}';
   const LABEL = '[A-Za-z0-9._-]+';

From 9d03b9a797d67fa6a4c578ee58d58606bbc3f5c7 Mon Sep 17 00:00:00 2001
From: Mike Pitre <12040919+mikepitre@users.noreply.github.com>
Date: Sat, 24 Oct 2026 13:21:03 -0500
Subject: [PATCH 3/4] test(expo): pick up the runner fix for agent-device that
 never starts (#10415)

---
 .changeset/quiet-pins-start.md            | 2 ++
 integration/expo-native/package-lock.json | 6 +++---
 integration/expo-native/package.json      | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/quiet-pins-start.md

diff --git a/.changeset/quiet-pins-start.md b/.changeset/quiet-pins-start.md
new file mode 100644
index 00000000000..a845151cc84
--- /dev/null
+++ b/.changeset/quiet-pins-start.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/integration/expo-native/package-lock.json b/integration/expo-native/package-lock.json
index fa475f64358..a2d2805160c 100644
--- a/integration/expo-native/package-lock.json
+++ b/integration/expo-native/package-lock.json
@@ -6,7 +6,7 @@
     "": {
       "name": "verify-clerk-expo",
       "devDependencies": {
-        "@clerk/internal-mobile-e2e": "github:clerk/internal-mobile-e2e#da51b522f4ffc4f7920050201a7fc1cf6f088a29",
+        "@clerk/internal-mobile-e2e": "github:clerk/internal-mobile-e2e#f82000b4a2eca1ba9330e19922495aa40d62d8e5",
         "@types/node": "24.19.1",
         "typescript": "7.0.2"
       },
@@ -122,8 +122,8 @@
       }
     },
     "node_modules/@clerk/internal-mobile-e2e": {
-      "resolved": "git+ssh://git@github.com/clerk/internal-mobile-e2e.git#da51b522f4ffc4f7920050201a7fc1cf6f088a29",
-      "integrity": "sha512-IwoFkM0RUfCsPbKzQFuOwl1oaIAcKAvEqEQva82wixg/xVtafuUY0UVth5uzgm2LKvool/RbkPIMGzoUZ7SANg==",
+      "resolved": "git+ssh://git@github.com/clerk/internal-mobile-e2e.git#f82000b4a2eca1ba9330e19922495aa40d62d8e5",
+      "integrity": "sha512-WCR0bWeGj+efSoXM3tTvpOXP+MQV8RXiGbJGjwweptWEC9iLXMGpO1lQVinkpnc6LONa8buoOgj3OSLPJ+/now==",
       "dev": true,
       "dependencies": {
         "@e2e-dev/github": "0.4.0",
diff --git a/integration/expo-native/package.json b/integration/expo-native/package.json
index 193a5ea6a82..4eb43273a16 100644
--- a/integration/expo-native/package.json
+++ b/integration/expo-native/package.json
@@ -7,7 +7,7 @@
     "typecheck": "tsc -p ."
   },
   "devDependencies": {
-    "@clerk/internal-mobile-e2e": "github:clerk/internal-mobile-e2e#da51b522f4ffc4f7920050201a7fc1cf6f088a29",
+    "@clerk/internal-mobile-e2e": "github:clerk/internal-mobile-e2e#f82000b4a2eca1ba9330e19922495aa40d62d8e5",
     "@types/node": "24.19.1",
     "typescript": "7.0.2"
   },

From cba06b7d9910c0b52dc54f742ae26638aad1c688 Mon Sep 17 00:00:00 2001
From: Mike Pitre <12040919+mikepitre@users.noreply.github.com>
Date: Sat, 24 Oct 2026 14:18:06 -0500
Subject: [PATCH 4/4] test(expo): pick up the runner fix that restarts a dead
 agent-device daemon (#10416)

---
 .changeset/steady-pins-restart.md         | 2 ++
 integration/expo-native/package-lock.json | 6 +++---
 integration/expo-native/package.json      | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/steady-pins-restart.md

diff --git a/.changeset/steady-pins-restart.md b/.changeset/steady-pins-restart.md
new file mode 100644
index 00000000000..a845151cc84
--- /dev/null
+++ b/.changeset/steady-pins-restart.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/integration/expo-native/package-lock.json b/integration/expo-native/package-lock.json
index a2d2805160c..55fe76c8079 100644
--- a/integration/expo-native/package-lock.json
+++ b/integration/expo-native/package-lock.json
@@ -6,7 +6,7 @@
     "": {
       "name": "verify-clerk-expo",
       "devDependencies": {
-        "@clerk/internal-mobile-e2e": "github:clerk/internal-mobile-e2e#f82000b4a2eca1ba9330e19922495aa40d62d8e5",
+        "@clerk/internal-mobile-e2e": "github:clerk/internal-mobile-e2e#882bf691eabba1e1d30bfe525544f5659c708f95",
         "@types/node": "24.19.1",
         "typescript": "7.0.2"
       },
@@ -122,8 +122,8 @@
       }
     },
     "node_modules/@clerk/internal-mobile-e2e": {
-      "resolved": "git+ssh://git@github.com/clerk/internal-mobile-e2e.git#f82000b4a2eca1ba9330e19922495aa40d62d8e5",
-      "integrity": "sha512-WCR0bWeGj+efSoXM3tTvpOXP+MQV8RXiGbJGjwweptWEC9iLXMGpO1lQVinkpnc6LONa8buoOgj3OSLPJ+/now==",
+      "resolved": "git+ssh://git@github.com/clerk/internal-mobile-e2e.git#882bf691eabba1e1d30bfe525544f5659c708f95",
+      "integrity": "sha512-aKQXU9dGgSJTgPMIRYXXhiOv8tK27WfZYHxzFDN8IkTlIAnlwvdSSGnPriFYD1m413skabwtck1MbEUSAL0HmQ==",
       "dev": true,
       "dependencies": {
         "@e2e-dev/github": "0.4.0",
diff --git a/integration/expo-native/package.json b/integration/expo-native/package.json
index 4eb43273a16..c71ffbc3117 100644
--- a/integration/expo-native/package.json
+++ b/integration/expo-native/package.json
@@ -7,7 +7,7 @@
     "typecheck": "tsc -p ."
   },
   "devDependencies": {
-    "@clerk/internal-mobile-e2e": "github:clerk/internal-mobile-e2e#f82000b4a2eca1ba9330e19922495aa40d62d8e5",
+    "@clerk/internal-mobile-e2e": "github:clerk/internal-mobile-e2e#882bf691eabba1e1d30bfe525544f5659c708f95",
     "@types/node": "24.19.1",
     "typescript": "7.0.2"
   },