test(web-shell): pin the remotes e2e to the scenario branch and armed…

… state - openBranchPicker derived its click target from a hardcoded branch name while accepting scenario overrides; it now reads the scenario branch, pinned by the search test whose fixture switches to feat/x (RED without the derivation). - The smoke test asserts the armed Confirm label between the two remove clicks, so a single-click regression fails at the witness instead of as a second-click timeout; pinned by a temporary single-click mutation that turns the assertion RED.
wenshao · Sep 17, 2026 · Sep 6, 2026 · Sep 6, 2026 · Sep 7, 2026 · Sep 7, 2026
commit 4c91aec28e1b5f4c786454289d43c6c09f51f726
diff --git a/packages/web-shell/client/e2e/web-shell.git-remotes.spec.ts b/packages/web-shell/client/e2e/web-shell.git-remotes.spec.ts
@@ -24,7 +24,7 @@ async function openBranchPicker(page: Page, scenario: WebShellDaemonScenario) {
   const environment = page.getByTestId('environment-panel');
   await expect(environment).toBeVisible();
   const branchRow = environment.getByRole('button', {
-    name: 'main',
+    name: scenario.gitStatus?.branch ?? 'main',
     exact: true,
   });
   await expect(branchRow).toBeVisible({ timeout: 10_000 });
@@ -83,6 +83,10 @@ test('git picker manages remotes: list, add, remove @smoke', async ({
 
   // Remove uses a two-click confirm: the first click only arms the button.
   await originRow.click();
+  // Armed-state witness: the row button flips to the confirm label with
+  // no remove request yet — a single-click regression fails HERE, not
+  // as a click timeout on the second click.
+  await expect(originRow).toHaveText('Confirm');
   expect(remoteRequests(daemon, '/git/remote/remove')).toHaveLength(0);
   await originRow.click();
   await expect(originRow).toHaveCount(0);
@@ -135,6 +139,11 @@ test('remotes panel search filters by name and URL', async ({
   page,
 }, testInfo) => {
   const scenario = createGitWorkspaceScenario({
+    gitStatus: {
+      v: 2,
+      workspaceCwd: '/tmp/qwen-web-shell-e2e',
+      branch: 'feat/x',
+    },
     gitRemotes: [
       {
         name: 'origin',