Compare commits

..
Author SHA1 Message Date
Brent Vatne 5d8fd510b9 Run explore:binary on a local simulator, and bring the README up to date
explore:binary --simulator local explores a build on a simulator or emulator
it creates on this Mac, with no EAS login: the same devices capture uses,
recorded for the startup sweep, driven by agent-device with its own daemon or
by a local Argent tool-server. The report opens in the local Viewer; --upload
hosts it.

The README now covers local repack and local simulators, a single-path quick
start that reviews a change or explores a build, targets, and requirements
split by what each path needs. The explore-binary, explore-setup and
readme-refresh skills follow.
2026-10-17 15:45:47 -07:00
47 changed files with 252 additions and 1446 deletions

No files matched your search

+5 -6
View File
@@ -85,8 +85,6 @@ You need Node.js 24.12+. Reviewing a change needs an Expo account and an Expo SD
<details>
<summary><strong>Run it yourself</strong></summary>
There are two ways to use Explore: review a change to your Expo app, which needs an Expo account, or explore an iOS or Android build of any app directly, which needs no Expo account when it runs on your Mac.
**Review a change**, from your app's directory:
1. Make the app buildable on EAS, if it is not yet:
@@ -341,7 +339,7 @@ Explore pins each controller's version and starts the EAS session with it. Repor
Neither controller is installed with Explore. The first run that needs one downloads its pinned npm release (agent-device 1.6 MB, Argent 27 MB), checks it against the integrity hash Explore pins, and keeps it in `~/.cache/expo-explore/controllers` (`EXPLORE_CONTROLLER_CACHE` moves it). Behind a private registry, set `EXPLORE_NPM_REGISTRY` to a mirror of it.
Argent cannot switch the simulator's appearance yet ([software-mansion/argent#1509](https://github.com/software-mansion/argent/pull/1509)), so the host switches it: on an iOS EAS Simulator session (`eas simulator:control appearance.set`) and on a [local simulator](#simulator), every appearance the config asks for is captured. An Argent capture on an Android EAS Simulator session records one appearance: the one the app forces, else light. Explore warns when it skips one.
Argent cannot switch the simulator's appearance yet ([software-mansion/argent#1509](https://github.com/software-mansion/argent/pull/1509)), so an Argent capture on EAS Simulator records one appearance: the one the app forces, else light. Explore warns when it skips one. On a [local simulator](#simulator) the host switches it, so every appearance the config asks for is captured.
</details>
@@ -372,7 +370,7 @@ For a review, builds still run on EAS. The app is repacked with the route observ
With `--controller argent`, Explore installs Argent's tool-server on first use with `npm ci` from a lockfile Explore ships, so every dependency is pinned (about 160 MB, in the controller cache), and starts one per device. The host switches the appearance, so a local Argent capture records every appearance the config asks for. Reports record where they were captured, and a baseline is reused only by a review captured the same way.
A foldable folds before the app first opens (`pose` on a [target](#targets)); with agent-device on a local simulator it folds just after, since agent-device folds only inside a session. With Argent, an opened iPhone Duo is captured upright, in landscape. After a fold, Argent's reader can stay on the panel that went dark, so Explore checks that the lit panel is read. If it isn't, Explore restarts the tool-server on a local simulator. On EAS Simulator, where the tool-server is the session's, it resets Argent's device helpers, then restarts SpringBoard and folds again. On EAS Simulator, an opened iPhone Duo usually needs that SpringBoard restart, which adds about a minute.
A foldable folds before the app first opens (`pose` on a [target](#targets)); with agent-device on a local simulator it folds just after, since agent-device folds only inside a session. With Argent, an opened iPhone Duo is captured upright, in landscape. After a fold, Argent's reader can stay on the panel that went dark; Explore then restarts its tool-server, and if that is not enough SpringBoard as well, and opens the app again.
Each capture records what it starts on your Mac (simulators, emulators, controller daemons, tool-servers) and removes it when it ends. If a review or a local `explore:binary` run is stopped hard, the next local one stops what it left running; nothing Explore did not record is touched.
@@ -514,7 +512,7 @@ curl -s "$LINK/api/v1/screens?status=modified" | jq '.items[] | {route, status,
1. The review workflow runs on open, non-draft PRs from the repository whose author has write access. Bots such as Devin go under `ci.trustedAuthors` in `.expo-explore/config.yaml`.
2. Explore reads the diff and your router source to pick the affected screens.
3. It builds both revisions on EAS (reusing a build with the same native fingerprint) and captures each screen on EAS Simulator (or, on your machine, a local simulator), reusing a baseline of the base commit when one exists. If EAS fails to start a session, Explore starts a new one, up to five times within 30 minutes.
3. It builds both revisions on EAS (reusing a build with the same native fingerprint) and captures each screen on EAS Simulator (or, on your machine, a local simulator), reusing a baseline of the base commit when one exists.
4. It compares the captures. A screen with a source change is **Modified** if its captures differ.
5. It uploads the report to GitHub Actions and posts a PR comment.
@@ -533,7 +531,8 @@ Reports and baselines are kept for 30 days and diagnostics for 7. Hosted deploym
- The launch is captured once per appearance and compared like any screen. The comment says how long the splash stayed as it first appeared, when it first changed (a native launch screen handing over to an app-drawn one, an animation starting on it), and when the first screen settled. `capture.launch: video` adds a recording; a launch too fast to observe is reported as "no splash observed".
- On Android the splash usually shows only in the recording, which needs `ffmpeg`. The generated workflows install it.
- Hosted acceptance of agent mode with an API key is incomplete.
- With `capture.controller: argent` on an Android EAS Simulator session, each capture records one appearance (see [device controller](#controller)).
- With `capture.controller: argent` on EAS Simulator, each capture records one appearance (see [device controller](#controller)).
- On EAS Simulator, an opened iPhone Duo can fail to capture when Argent's reader stays on the cover panel after the fold. A [local simulator](#simulator) recovers from it.
- A local simulator runs only on your machine; the CI workflows capture on EAS Simulator.
- `explore:session` explores EAS Simulator sessions only.
+2 -2
View File
@@ -105,7 +105,7 @@ device:
exploration:
scope: changes # changes | all
capture:
# controller: agent-device # agent-device (default) | argent (one appearance per capture on Android EAS Simulator until Argent can switch it; --controller overrides it for one run)
# controller: agent-device # agent-device (default) | argent (one appearance per capture on EAS Simulator until Argent can switch it; --controller overrides it for one run)
# simulator: eas # eas (EAS Simulator, default) | local (a simulator or emulator Explore starts on this machine with Xcode or the Android SDK; --simulator overrides it for one run)
maxMinutes: 30
maxActions: 500
@@ -286,7 +286,7 @@ The provider selects the runtime that owns the navigation loop:
| `anthropic` | Claude Code through `@anthropic-ai/claude-agent-sdk` 0.3.285 and its platform-native package | `ANTHROPIC_API_KEY` |
| `openai` | Codex app-server from `@openai/codex` 0.159.2 and its platform-native package | `OPENAI_API_KEY` |
Both runtimes use Explore's device tools to operate the existing EAS Simulator through official `agent-device` 0.21.29-nightly.20261018.74. The runtime and native binaries come from the pinned tools installation. CI does not use the development-only `node_modules/.bin/claude` executable or an interactive subscription login.
Both runtimes use Explore's device tools to operate the existing EAS Simulator through official `agent-device` 0.21.28. The runtime and native binaries come from the pinned tools installation. CI does not use the development-only `node_modules/.bin/claude` executable or an interactive subscription login.
Create and commit the nonempty English prose file named by `agent.instructions`. The shared setup skill authors it from source and asks for missing test data or environment inputs. Describe how to reach the app's screens, necessary prerequisites, the representative state to use on both revisions, readiness signals, and actions to avoid. This file guides the runtime agent; it is not a list of mandatory YAML steps or a second screen inventory.
+35 -49
View File
@@ -1,12 +1,12 @@
{
"name": "@expo/explore",
"version": "0.19.6",
"version": "0.19.5",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@expo/explore",
"version": "0.19.6",
"version": "0.19.5",
"license": "MIT",
"dependencies": {
"@expo/repack-app": "0.10.1",
@@ -29,7 +29,7 @@
"@types/react-dom": "^19.2.4",
"@vitejs/plugin-react": "^4.7.0",
"@xyflow/react": "^12.11.3",
"agent-device": "0.21.29-nightly.20261018.74",
"agent-device": "0.21.28",
"babel-plugin-react-compiler": "^1.0.0",
"eslint": "^10.12.0",
"eslint-plugin-react-hooks": "^7.1.1",
@@ -48,7 +48,7 @@
"optionalDependencies": {
"@anthropic-ai/claude-agent-sdk": "0.3.285",
"@openai/codex": "0.159.2",
"eas-cli": "25.2.0"
"eas-cli": "25.0.0"
}
},
"node_modules/@0no-co/graphql.web": {
@@ -1600,15 +1600,15 @@
}
},
"node_modules/@expo/eas-build-job": {
"version": "25.2.0",
"resolved": "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-25.2.0.tgz",
"integrity": "sha512-RUp8sZniYWCiLQLGJrnMeAx8094BoejS6lm7EdSUs4nKkm6TtxyydRutGtoHlvBpvXOw3+OgimemqXUpmU5R8Q==",
"version": "25.0.0",
"resolved": "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-25.0.0.tgz",
"integrity": "sha512-Vuai42tVopKuK2KFyTWUsW9cL1YMY1dWhFAKz+evUV5AKaMCk4dYxOYZ6tBWNhIJ15bGK3p4N0YUomlAqubFWg==",
"license": "MIT",
"optional": true,
"dependencies": {
"@expo/logger": "25.2.0",
"@expo/logger": "25.0.0",
"@expo/results": "1.0.0",
"@expo/turtle-spawn": "25.2.0",
"@expo/turtle-spawn": "25.0.0",
"joi": "^17.13.1",
"semver": "^7.6.2",
"zod": "^4.3.5"
@@ -1642,14 +1642,14 @@
}
},
"node_modules/@expo/eas-json": {
"version": "25.2.0",
"resolved": "https://registry.npmjs.org/@expo/eas-json/-/eas-json-25.2.0.tgz",
"integrity": "sha512-ZikfZLZHadl5gzq5UZ7qWMTWFZNAO4K6NJC6iF8JmVh3kR1Blv+Zo2AolC0CYzSYOCyaRCZx+v2ZlJZeiVCf8w==",
"version": "25.0.0",
"resolved": "https://registry.npmjs.org/@expo/eas-json/-/eas-json-25.0.0.tgz",
"integrity": "sha512-ilPw4O0Lnce/6lbu1GPwega8KF2GqTio9vuNFjNaGL78pfxz7GdktBsJ9JRaGtiM0LYdPa09W2FYb7DcMY8xWA==",
"license": "MIT",
"optional": true,
"dependencies": {
"@babel/code-frame": "7.23.5",
"@expo/eas-build-job": "25.2.0",
"@expo/eas-build-job": "25.0.0",
"chalk": "4.1.2",
"env-string": "1.0.1",
"fs-extra": "11.2.0",
@@ -1836,19 +1836,6 @@
"node": ">=6"
}
},
"node_modules/@expo/experimentation": {
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/@expo/experimentation/-/experimentation-0.0.5.tgz",
"integrity": "sha512-eQtx5f7tUDZLeq2EXYOkBX+KivYa73CjUMkrEFh5sNMOpCWynisbdSiaSdSLHALWzYKz3uc0QlgWTz3V/6JESQ==",
"license": "MIT",
"optional": true,
"dependencies": {
"nullthrows": "^1.1.1"
},
"engines": {
"node": ">=16"
}
},
"node_modules/@expo/image-utils": {
"version": "0.7.6",
"resolved": "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.7.6.tgz",
@@ -1913,9 +1900,9 @@
}
},
"node_modules/@expo/logger": {
"version": "25.2.0",
"resolved": "https://registry.npmjs.org/@expo/logger/-/logger-25.2.0.tgz",
"integrity": "sha512-gtf/Lk9zE3k2wfEalAwioxDwvse69A2e/OhoDT7IRjlorRgcNJghr6V4FvDAZckQUkFR1IEHz2+FXvLKf9kjgg==",
"version": "25.0.0",
"resolved": "https://registry.npmjs.org/@expo/logger/-/logger-25.0.0.tgz",
"integrity": "sha512-KcNOYmeJH8GESYEjbiewg+LU98XH/yBs368XlPqmEHVZekkbOONpIzPd5AFcFRWO1BW0c2nl/58BUI876UFT8A==",
"license": "BUSL-1.1",
"optional": true,
"dependencies": {
@@ -2605,14 +2592,14 @@
}
},
"node_modules/@expo/steps": {
"version": "25.2.0",
"resolved": "https://registry.npmjs.org/@expo/steps/-/steps-25.2.0.tgz",
"integrity": "sha512-KKM8STsb0dAdI6lyN7WHfczvDdQlCx+vF4unq/qFk6PZgZMvE9+IT8mh25fqgwxNcpR7Ti+xFCip2hhvpK2yng==",
"version": "25.0.0",
"resolved": "https://registry.npmjs.org/@expo/steps/-/steps-25.0.0.tgz",
"integrity": "sha512-+o04mm5akQJRX0j9TwwkdZiuNM9swLxw9DsDPtFhbWceg95gky/vc/0qF200kjZL4DEMfd/WhzngBW9aqJ0JQg==",
"license": "BUSL-1.1",
"optional": true,
"dependencies": {
"@expo/eas-build-job": "25.2.0",
"@expo/logger": "25.2.0",
"@expo/eas-build-job": "25.0.0",
"@expo/logger": "25.0.0",
"@expo/spawn-async": "^1.7.2",
"arg": "^5.0.2",
"fast-glob": "^3.3.2",
@@ -2650,13 +2637,13 @@
"optional": true
},
"node_modules/@expo/turtle-spawn": {
"version": "25.2.0",
"resolved": "https://registry.npmjs.org/@expo/turtle-spawn/-/turtle-spawn-25.2.0.tgz",
"integrity": "sha512-1Lor7/+4T1JEb6kqu0dHstD+xOWTGbwA7QqWTBKYx4qtgtJ4Wbor17bzlp87KENAYDeWuX+7VHKxT66170m9wg==",
"version": "25.0.0",
"resolved": "https://registry.npmjs.org/@expo/turtle-spawn/-/turtle-spawn-25.0.0.tgz",
"integrity": "sha512-XBQZ2azxh0IWozO5hCxIJt150LjIGbk6VZakeyA6UXPHp1ESenm97o0JIHOvzQNOgBV481muV88KmIWHGt0yIA==",
"license": "BUSL-1.1",
"optional": true,
"dependencies": {
"@expo/logger": "25.2.0",
"@expo/logger": "25.0.0",
"@expo/spawn-async": "^1.7.2"
}
},
@@ -4593,9 +4580,9 @@
}
},
"node_modules/agent-device": {
"version": "0.21.29-nightly.20261018.74",
"resolved": "https://registry.npmjs.org/agent-device/-/agent-device-0.21.29-nightly.20261018.74.tgz",
"integrity": "sha512-7+ajWLr0J+8iLZ9q11ERbj6U14mC20umBK5BQQdw5aERA79yeXc3Ze6KmtvnILnWjEtoVkYQsXQasL8RL6Uatw==",
"version": "0.21.28",
"resolved": "https://registry.npmjs.org/agent-device/-/agent-device-0.21.28.tgz",
"integrity": "sha512-uGEENVhPzSpIACrVlt16O1mloODWJyAemTCT0boDb4L006JXN2rG747u1TRoQJudOpdP/Pm2urxNRHeECLMLfg==",
"dev": true,
"license": "MIT",
"bin": {
@@ -5735,9 +5722,9 @@
}
},
"node_modules/eas-cli": {
"version": "25.2.0",
"resolved": "https://registry.npmjs.org/eas-cli/-/eas-cli-25.2.0.tgz",
"integrity": "sha512-FFA6fSl2bPet9D3Eslupig3icXjyBzAbrsLE5r67wbEbh/CPDZQ+Q4W5TrpRui0uqfF16w58EGsFUQoQ0te0KQ==",
"version": "25.0.0",
"resolved": "https://registry.npmjs.org/eas-cli/-/eas-cli-25.0.0.tgz",
"integrity": "sha512-FBY3pIo/3L0s+8KK5ZpMKzlLrA5jOmr5kOpoOwkAXsxMrI4vo+LNoEsciRcOxjce9efc08GqEEPc/CxLRAWIvA==",
"license": "MIT",
"optional": true,
"dependencies": {
@@ -5745,12 +5732,11 @@
"@expo/code-signing-certificates": "0.0.5",
"@expo/config": "55.0.10",
"@expo/config-plugins": "55.0.7",
"@expo/eas-build-job": "25.2.0",
"@expo/eas-json": "25.2.0",
"@expo/eas-build-job": "25.0.0",
"@expo/eas-json": "25.0.0",
"@expo/env": "^1.0.0",
"@expo/experimentation": "0.0.5",
"@expo/json-file": "8.3.3",
"@expo/logger": "25.2.0",
"@expo/logger": "25.0.0",
"@expo/multipart-body-parser": "2.0.0",
"@expo/osascript": "2.1.4",
"@expo/package-manager": "1.9.10",
@@ -5762,7 +5748,7 @@
"@expo/results": "1.0.0",
"@expo/rudder-sdk-node": "1.1.1",
"@expo/spawn-async": "1.7.2",
"@expo/steps": "25.2.0",
"@expo/steps": "25.0.0",
"@expo/timeago.js": "1.0.0",
"@oclif/core": "^4.8.3",
"@oclif/plugin-autocomplete": "^3.2.40",
+3 -3
View File
@@ -1,6 +1,6 @@
{
"name": "@expo/explore",
"version": "0.19.6",
"version": "0.19.5",
"description": "Source-driven mobile app maps, deterministic CI capture, and visual reviews",
"license": "MIT",
"type": "module",
@@ -73,7 +73,7 @@
"optionalDependencies": {
"@anthropic-ai/claude-agent-sdk": "0.3.285",
"@openai/codex": "0.159.2",
"eas-cli": "25.2.0"
"eas-cli": "25.0.0"
},
"devDependencies": {
"@anthropic-ai/claude-code": "2.1.285",
@@ -83,7 +83,7 @@
"@types/react-dom": "^19.2.4",
"@vitejs/plugin-react": "^4.7.0",
"@xyflow/react": "^12.11.3",
"agent-device": "0.21.29-nightly.20261018.74",
"agent-device": "0.21.28",
"babel-plugin-react-compiler": "^1.0.0",
"eslint": "^10.12.0",
"eslint-plugin-react-hooks": "^7.1.1",
+16 -20
View File
@@ -1,4 +1,5 @@
import { createHash, randomUUID } from "node:crypto";
import { createRequire } from "node:module";
import { lstat, mkdir, mkdtemp, readFile, realpath, rm, writeFile } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
@@ -16,14 +17,13 @@ import { agentDeviceLauncher, ensureArgentToolServer, ensureController } from ".
import { agentDeviceClaims, approveLinkScheme, createLocalSimulator, deleteLocalEmulator, deleteLocalSimulator, hostEmulatorAbi, installOnLocalEmulator, installOnLocalSimulator, startLocalArgentServer,
startLocalEmulator, stopLocalAgentDevice, stopLocalArgentServer, waitForLocalEmulator, waitForLocalSimulator, type LocalArgentServer } from "../capture/local-simulator.js";
import { openLocalCaptureRecord, sweepLocalCaptures } from "../capture/local-registry.js";
import { approveSessionUrlSchemes, simulatorControlActions, type EasCommand } from "../capture/simulator-control.js";
import { DEFAULT_ANDROID_DEVICE } from "../config/explore-config.js";
import { createExplorationInputs } from "../config/exploration-inputs.js";
import { ExploreStore, getCoverage } from "../map/store.js";
import { whoamiAccounts } from "../report/preview-deploy.js";
import { CiError, serializeCiError, toCiError } from "../shared/ci-errors.js";
import { packageBin } from "../shared/package-paths.js";
import { assertDecodedPng, solidColour } from "../shared/png-evidence.js";
import { assertDecodedPng, type DecodedFrame } from "../shared/png-evidence.js";
import { CONTRACT, type ExploreMap, type Platform } from "../types.js";
import { assertEmulatorCompatible, extractIosBundle, inspectArchive, type ArchiveKind, type InspectedArchive, readArchiveIcon } from "./archive.js";
import { runBlackBoxExploration, type BlackBoxExplorerResult, type BlackBoxFrame, SYSTEM_DIALOG_PACKAGES } from "./explorer.js";
@@ -277,8 +277,6 @@ export type ConnectedSessionExploration = {
* serial (agent-device with a daemon of its own in `stateDirectory`, or a local Argent tool-server pinned to it).
*/
local?: { deviceId: string; osVersion: string; stateDirectory: string };
/** Runs once the app is installed and before anything opens it, as an EAS session's link approval must. */
afterInstall?: () => void;
};
/** Drives an agent-device daemon we already hold a connection to: optional install, open, then the model-led exploration. */
@@ -319,7 +317,6 @@ export async function exploreConnectedSession(ctx: ConnectedSessionExploration):
try { controller(["install", install.path, "--json"], 15 * 60_000); }
catch (error) { throw binaryError("APP_INSTALL_FAILED", `${controllerName} could not install the app: ${failureText(error)}`, "Check that the archive is a simulator build for this platform and under the size limit, then rerun.", { sessionId: connection.sessionId }); }
}
ctx.afterInstall?.();
// On a local device, the first open also builds agent-device's iOS runner.
const opened = controller(["open", bundleId, "--level", "full", "--json"], local ? 15 * 60_000 : 2 * 60_000);
const openedDevice = openedSimulatorDevice(opened.stdout, bundleId, "initial app open", platform, controllerSession);
@@ -717,8 +714,7 @@ export async function runBinaryExploration(options: BinaryExploreOptions): Promi
let installPath = archive.path;
if (archive.kind === "ios-tgz" || archive.kind === "ios-ipa") { say("unpacking the iOS bundle"); installPath = await extractIosBundle(archive, join(work, "bundle")); }
const appIcon = await readArchiveIcon(archive);
const exploreOn = (connection: SimulatorConnection, sessionJson: () => string, localDevice?: LocalDevice, afterInstall?: () => void) => exploreConnectedSession({ connection, platform, device, bundleId,
...(afterInstall ? { afterInstall } : {}),
const exploreOn = (connection: SimulatorConnection, sessionJson: () => string, localDevice?: LocalDevice) => exploreConnectedSession({ connection, platform, device, bundleId,
...(appIcon ? { appIcon } : {}), app: { name: archive.appName, ...(archive.version ? { version: archive.version } : {}) },
// A local device has the app installed by simctl or adb before the controller starts.
...(localDevice ? { local: localDevice } : { install: { path: installPath, kind: archive.kind } }),
@@ -774,18 +770,7 @@ export async function runBinaryExploration(options: BinaryExploreOptions): Promi
if (handoff.validationError) throw handoff.validationError;
if (!handoff.connection) throw new Error("Simulator handoff is missing its controller connection");
await rm(dotenvPath, { force: true });
// The app's own links open without iOS asking first, when the session's host can approve them (serve-sim 0.10.0).
const verifiedSession = sessionId;
const sessionEas: EasCommand = (args, commandOptions) => {
const result = eas(args, commandOptions?.timeoutMs);
if (result.status !== 0 && !commandOptions?.allowFailure) throw new Error(lastLine(result.stderr || result.stdout) || `eas ${args[0]} failed`);
return result;
};
const afterInstall = platform === "ios" && archive.urlSchemes.length ? () => {
const approved = approveSessionUrlSchemes(sessionEas, verifiedSession, simulatorControlActions(sessionEas, verifiedSession), bundleId, archive.urlSchemes);
if (approved.length) say(`approved ${approved.map(item => `${item}://`).join(", ")} links on the session`);
} : undefined;
({ runtime, exploration } = await exploreOn(handoff.connection, () => eas(["simulator:get", "--id", handoff.connection!.sessionId, "--json", "--non-interactive"], 2 * 60_000).stdout, undefined, afterInstall));
({ runtime, exploration } = await exploreOn(handoff.connection, () => eas(["simulator:get", "--id", handoff.connection!.sessionId, "--json", "--non-interactive"], 2 * 60_000).stdout));
}
} catch (error) {
primaryError = toCiError(error, { code: "EXPLORE_BINARY_FAILED", stage: "exploration", nextAction: "Inspect the diagnostic, correct the failing prerequisite, and rerun explore:binary." });
@@ -854,7 +839,18 @@ export function assertAppUrl(url: string, appSchemes: readonly string[] = []): v
export const BLANK_SCREENSHOT_MESSAGE = "The app blocks screen capture on this screen (Android FLAG_SECURE), so its screenshot came back blank.";
export { solidColour };
/** A capture-protected screen comes back as a single flat colour (black on Android); every 97th pixel is enough to tell. */
export function solidColour(png: Buffer): boolean {
let frame: DecodedFrame;
try { frame = createRequire(import.meta.url.replace(/\?.*$/, ""))("pngjs").PNG.sync.read(png, { checkCRC: false }) as DecodedFrame; }
catch { return false; }
const { data } = frame;
if (data.length < 4) return false;
for (let offset = 0; offset + 3 < data.length; offset += 4 * 97) {
if (data[offset] !== data[0] || data[offset + 1] !== data[1] || data[offset + 2] !== data[2]) return false;
}
return true;
}
/** Setup commands whose last positional is free text (`fill <ref> <text>`, `type <text>`): move the flags ahead of a `--` separator. */
export function guardPositionals(args: readonly string[]): string[] {
+7 -29
View File
@@ -301,8 +301,7 @@ export async function runBridgeCommand(argv: readonly string[], context: ArgentB
/** Reads are resent after a transport failure (they change nothing); a UI action is sent once, after a health check. */
const call = async (tool: string, args: Record<string, unknown> = {}, options?: { out?: string }): Promise<Record<string, unknown>> => {
// Tools that name devices their own way (or none) take no udid.
const withDevice = tool === "list-devices" || tool === "stop-all-simulator-servers" ? args : { udid: state.udid, ...args };
const withDevice = tool === "list-devices" ? args : { udid: state.udid, ...args };
for (let attempt = 0; ; attempt++) {
try { return record(await context.call(tool, withDevice, options)); }
catch (error) {
@@ -620,10 +619,6 @@ export async function runBridgeCommand(argv: readonly string[], context: ArgentB
const posture = positional[0];
if (posture !== "closed" && posture !== "half-open" && posture !== "open") throw new BridgeFailure("INVALID_ARGS", "fold needs closed, half-open or open.");
await beforeAction();
// Helpers the tool-server started before a fold can leave the panel it lights black and unread: on a fresh EAS
// session, whose tool-server started them at boot, the first fold opened to a black inner panel every time
// without this, and read the panel at once with it. A local tool-server is Explore's own and starts clean.
await call("stop-all-simulator-servers", { devices: [state.udid] });
const folded = await call("fold", { posture });
// The other panel lights at another size: every stored coordinate and element reference is stale.
delete state.screen;
@@ -635,33 +630,16 @@ export async function runBridgeCommand(argv: readonly string[], context: ArgentB
const lit = record(folded.screen);
if (finite(lit.width) && finite(lit.height) && lit.height > 0) {
const litRatio = lit.width / lit.height;
const follows = async () => {
for (let poll = 0; poll < 10; poll++) {
const shape = (await tree()).screen;
if (shape && shape.height > 0 && Math.abs(shape.width / shape.height - litRatio) < 0.004) return true;
await context.sleep(1_000);
}
return false;
};
// A reader still stuck on the dark panel is reset once more (the device's helpers, as reset-reader does): it is
// cheap and leaves the app alone. If that is not enough, capture restarts SpringBoard and folds again.
if (!await follows() && !await call("stop-all-simulator-servers", { devices: [state.udid] }).then(follows, () => false)) {
throw new BridgeFailure("CONTROLLER_FOLD_UNVERIFIED", `Argent kept reading the other panel after folding the device ${posture}, and after its device helpers were reset.`);
let followed = false;
for (let poll = 0; poll < 10 && !followed; poll++) {
const shape = (await tree()).screen;
followed = !!shape && shape.height > 0 && Math.abs(shape.width / shape.height - litRatio) < 0.004;
if (!followed) await context.sleep(1_000);
}
if (!followed) throw new BridgeFailure("CONTROLLER_FOLD_UNVERIFIED", `Argent kept reading the other panel after folding the device ${posture}.`);
}
return success({ action: "fold", pose: posture, ...(folded.panel !== undefined ? { panel: folded.panel } : {}) });
}
case "reset-reader": {
// Stops the device's Argent helpers, among them the accessibility service describe reads through; the
// tool-server starts fresh ones on the next call. It is how a reader stuck on the panel a fold turned off is
// reset where the tool-server itself cannot be restarted, as on EAS (it started it; never stop it there).
await ensureDevice();
const stopped = await call("stop-all-simulator-servers", { devices: [state.udid] });
delete state.screen;
delete state.refs;
state.generation += 1;
return success({ action: "reset-reader", stopped: Array.isArray(stopped.stopped) ? stopped.stopped.filter(item => typeof item === "string") : [] });
}
case "apps": return success({ apps: [] });
case "session": return success({ sessions: [] });
// TODO(argent#1509): map `settings appearance <scheme>` to Argent's `set-appearance` once a release with it is pinned.
+1 -1
View File
@@ -1,6 +1,6 @@
import { CiError } from "../shared/ci-errors.js";
export const EAS_CLI_VERSION = "25.2.0";
export const EAS_CLI_VERSION = "25.0.0";
export { AGENT_DEVICE_VERSION } from "../shared/agent-device-version.js";
export const CONTROLLER_SESSION = "expo-explore-runtime";
+1 -1
View File
@@ -92,7 +92,7 @@ export function approveLinkScheme(options: { runner: CommandRunner; udid: string
}
/** The pixel size of a PNG, from its header. */
export function pngSize(bytes: Buffer): { width: number; height: number } | undefined {
function pngSize(bytes: Buffer): { width: number; height: number } | undefined {
if (bytes.length < 24 || bytes.toString("latin1", 12, 16) !== "IHDR") return undefined;
return { width: bytes.readUInt32BE(16), height: bytes.readUInt32BE(20) };
}
+19 -206
View File
@@ -22,16 +22,14 @@ import { loadAppIcon, loadCachedAppIcon, storeAppIcon } from "./app-icon.js";
import { defaultRunner, runAgentControllerCommand } from "./controller.js";
import { silentProgress, type Progress } from "../shared/progress.js";
import { assertCaptureEasProfile, assertSimulatorAvailable, fingerprintFrom, hasEasEnvironmentFetchFailure, nativeBuildFrom, existingBuild, repackProfileFrom, prepareExactSourceBuild, type RepackMode } from "./eas-build.js";
import { SIMULATOR_DOTENV_FILE_NAME, SIMULATOR_DOTENV_HEADER, endedOwnSimulatorSession, liveSimulatorSessionsNamed, simulatorSessionName, simulatorStartFailure, readSimulatorDotenvHandoff, assertSimulatorSessionIdentity, assertSimulatorStopped, collectRuntime, controllerVersion, simulatorOsVersion, type ActiveSimulatorRuntime, type SimulatorConnection } from "./simulator.js";
import { SIMULATOR_DOTENV_FILE_NAME, SIMULATOR_DOTENV_HEADER, simulatorSessionName, simulatorStartFailure, readSimulatorDotenvHandoff, assertSimulatorSessionIdentity, assertSimulatorStopped, collectRuntime, controllerVersion, simulatorOsVersion, type ActiveSimulatorRuntime, type SimulatorConnection } from "./simulator.js";
import { argentControllerInvocation } from "./controller-invocation.js";
import { sharedBuild } from "./shared-build.js";
import { LOCAL_EMULATOR_STATE_PREFIX, LOCAL_SIMULATOR_STATE_PREFIX, agentDeviceClaims, assertLocalEmulatorCompatible, createLocalSimulator, startLocalEmulator, waitForLocalEmulator, waitForLocalSimulator, deleteLocalEmulator,
deleteLocalSimulator, hostEmulatorAbi, installOnLocalEmulator, installOnLocalSimulator, approveLinkScheme, localPoseShown,
pngSize, setLocalEmulatorAppearance, setLocalSimulatorAppearance, startLocalArgentServer, stopLocalAgentDevice, stopLocalArgentServer, type LocalArgentServer } from "./local-simulator.js";
setLocalEmulatorAppearance, setLocalSimulatorAppearance, startLocalArgentServer, stopLocalAgentDevice, stopLocalArgentServer, type LocalArgentServer } from "./local-simulator.js";
import { ensureArgentToolServer } from "../shared/controller-cache.js";
import { openLocalCaptureRecord } from "./local-registry.js";
import { approveSessionUrlSchemes, simulatorControl, simulatorControlActions, type EasCommand } from "./simulator-control.js";
import { solidColour } from "../shared/png-evidence.js";
import { type UnattributedSetting } from "./unattributed.js";
import { appScheme, hasConcreteRoutePath, unavailableRoute, capturePlannedRoutes, deviceArgs } from "./route-capture.js";
@@ -100,20 +98,6 @@ export type CiMapResult = {
};
/** New EAS sessions a capture starts in place of one EAS failed to start (ERRORED while booting, or never named). */
const SESSION_START_RETRIES = 5;
/**
* The most time, from the first failed start, that replacement sessions may take, waits included. It keeps a review
* inside its CI job (90 minutes for a baseline) with a native build, a repack and both captures still to run.
*/
const SESSION_RETRY_BUDGET_MS = 30 * 60_000;
/** How long one `eas simulator:start` may take: eas-cli waits up to 15 minutes for a session, not counting the queue. */
const SESSION_START_TIMEOUT_MS = 20 * 60_000;
/** The wait before each of them: 10 s, doubling, at most 2 minutes. */
export function sessionRetryDelayMs(retry: number): number {
return Math.min(10_000 * 2 ** (retry - 1), 120_000);
}
/**
* Minutes an EAS session is asked for beyond the capture's own budget. The session starts beside the repack, and the
* capture deadline only starts once the app is installed, so the session also has to outlast a slow or queued hosted
@@ -129,17 +113,6 @@ function sessionDurationLimit(error: unknown): number | undefined {
return match ? Math.floor(Number(match[1])) : undefined;
}
/**
* A start failure EAS may not repeat on the next try: a failed request, a dropped connection, a timeout, or no capacity
* right now. An account's quota, plan or permissions are not, and fail at once rather than after every retry.
*/
function transientSessionStartFailure(error: unknown): boolean {
if (error instanceof CiError && error.code === "CONTROLLER_REQUEST_TIMEOUT") return true;
const message = error instanceof Error ? error.message : String(error);
if (/not authori[sz]ed|unauthori[sz]ed|forbidden|permission|quota|billing|max duration/i.test(message)) return false;
return /GraphQL request failed|ECONNRESET|ETIMEDOUT|EAI_AGAIN|socket hang up|timed out|\b50[234]\b|capacity/i.test(message);
}
function positiveInteger(value: number, name: string): number {
if (!Number.isInteger(value) || value <= 0) {
throw new Error(`${name} must be a positive integer`);
@@ -438,26 +411,17 @@ async function executeCiMap(options: CiMapOptions, setStage: (stage: string) =>
say(`reading EAS build profile ${options.easProfile}`);
const eas = (args: string[], timeoutMs = 5 * 60_000, cwd = project) => runner({ command: options.easCommand, args,
cwd, environment: easEnvironment, timeoutMs });
// `eas simulator:control` names the session by id, from the session's own project directory.
const sessionEas: EasCommand = (args, commandOptions) => runner({ command: options.easCommand, args, cwd: simulatorProject, environment: easEnvironment,
timeoutMs: commandOptions?.timeoutMs ?? 5 * 60_000, ...(commandOptions?.allowFailure ? { allowFailure: true } : {}) });
// What the EAS session's host can do through simulator:control (iOS sessions on serve-sim 0.10.0 or later).
let controlActions = new Set<string>();
const configResult = eas(["config", "--platform", options.platform, "--profile", options.easProfile, "--json", "--non-interactive"]);
const profile = repackProfileFrom(configResult.stdout);
const configValue = parseJson(configResult.stdout, "eas config") as { appConfig: Record<string, unknown>; buildProfile: Record<string, unknown> };
scheme ??= appScheme(configValue.appConfig.scheme);
colorSchemes = resolveColorSchemes(options.appearance ?? "auto", configValue.appConfig, options.platform);
// Argent cannot switch the appearance itself. On a local device the host switches it (simctl, adb); on an EAS iOS
// session serve-sim does (appearance.set), which is known once the session starts; otherwise one appearance is captured.
let argentSchemes = controller === "argent" && !local ? argentColorSchemes(colorSchemes, configValue.appConfig, options.platform) : undefined;
const narrowToArgentScheme = () => {
if (!argentSchemes) return;
if (argentSchemes.skipped.length) say(`Argent cannot switch appearance on this session; capturing ${argentSchemes.schemes[0]} only, skipped ${argentSchemes.skipped.join(", ")}`);
colorSchemes = argentSchemes.schemes;
argentSchemes = undefined;
};
if (options.platform !== "ios") narrowToArgentScheme();
// Argent cannot switch the appearance itself; on a local device the host switches it (simctl, adb), so it is kept.
if (controller === "argent" && !local) {
const single = argentColorSchemes(colorSchemes, configValue.appConfig, options.platform);
if (single.skipped.length) say(`Argent cannot switch appearance yet (software-mansion/argent#1509); capturing ${single.schemes[0]} only, skipped ${single.skipped.join(", ")}`);
colorSchemes = single.schemes;
}
app = { name: profile.projectIdentity.name, ...(profile.projectIdentity.version ? { version: profile.projectIdentity.version } : {}),
...(profile.projectIdentity.buildNumber ? { buildNumber: profile.projectIdentity.buildNumber } : {}) };
projectId = profile.projectIdentity.projectId;
@@ -527,23 +491,19 @@ async function executeCiMap(options: CiMapOptions, setStage: (stage: string) =>
}
} catch (error) { await stopEarlyDevice().catch(() => undefined); throw error; }
// The session is named before its app exists: an EAS session starts while the app is repacked (startSession).
// A session EAS failed to start is replaced once (see the session block), under a name of its own.
const sessionNameFor = (retry: number) => simulatorSessionName({ mapName: options.name, mapId: options.buildId, gitCommit: options.gitCommit, easBuildId: local ? "local" : "installed",
runIdentity: JSON.stringify({ mapDirectory, outputDirectory, run: sourceEnvironment.GITHUB_RUN_ID, attempt: sourceEnvironment.GITHUB_RUN_ATTEMPT, ...(retry ? { sessionRetry: retry } : {}) }) });
let sessionRetries = 0;
let sessionName = sessionNameFor(0);
const sessionName = simulatorSessionName({ mapName: options.name, mapId: options.buildId, gitCommit: options.gitCommit, easBuildId: local ? "local" : "installed",
runIdentity: JSON.stringify({ mapDirectory, outputDirectory, run: sourceEnvironment.GITHUB_RUN_ID, attempt: sourceEnvironment.GITHUB_RUN_ATTEMPT }) });
/**
* Starts the EAS Simulator session in the background, empty, once the build to repack is known (not while a native
* build runs, which can take most of an hour of session time). The app is installed through the controller when both
* are ready. Resolves with the start command's failure, if any; the session block verifies what EAS handed over.
*/
const startSession = (retry?: { timeoutMs: number }) => {
const startSession = () => {
if (local || sessionStart) return;
if (!retry) say(`starting an EAS Simulator session (${options.device}) while the app is repacked`);
say(`starting an EAS Simulator session (${options.device}) while the app is repacked`);
const request = (minutes: number) => ({ command: options.easCommand, args: ["simulator:start", "--name", sessionName, "--platform", options.platform, "--device", options.device,
"--type", controller, "--package-version", controllerVersion(controller), "--public-link",
"--max-duration-minutes", String(minutes), "--out-config-type", "dotenv", "--non-interactive"], cwd: simulatorProject, environment: easEnvironment,
timeoutMs: retry?.timeoutMs ?? SESSION_START_TIMEOUT_MS });
"--max-duration-minutes", String(minutes), "--out-config-type", "dotenv", "--non-interactive"], cwd: simulatorProject, environment: easEnvironment, timeoutMs: 20 * 60_000 });
// An injected runner (tests) answers synchronously; a real start runs beside the repack.
const start = async (minutes: number) => options.runner ? options.runner(request(minutes)) : runAgentControllerCommand(request(minutes), options.signal ?? new AbortController().signal);
sessionStart = writeFile(dotenvPath, SIMULATOR_DOTENV_HEADER, { flag: "wx", mode: 0o600 })
@@ -637,72 +597,8 @@ async function executeCiMap(options: CiMapOptions, setStage: (stage: string) =>
throw new Error("The local device did not start before capture");
} else {
if (!localApp || !sessionStart) throw new Error("An EAS Simulator session needs the instrumented app on this machine");
let startError = await sessionStart;
let handoff = await readSimulatorDotenvHandoff(dotenvPath);
// EAS sometimes fails to start a session: it errors while booting, or the start request fails before a session is
// named. After every failed start, whatever it may have left running is accounted for; then, when the failure is
// provably EAS's, a new session replaces it, up to SESSION_START_RETRIES times within SESSION_RETRY_BUDGET_MS, with
// a growing wait. A session Explore cannot prove is its own is never replaced or stopped: that stays a handoff
// failure below, as does a lookup that fails.
const clock = options.now ?? Date.now;
const endedSessions: string[] = [];
let ended: { sessionId: string; status: string } | undefined;
let retryDeadline: number | undefined;
for (;;) {
const easRead = (args: string[]) => {
try { return runner({ command: options.easCommand, args, cwd: project, environment: easEnvironment, timeoutMs: 2 * 60_000, allowFailure: true }).stdout; }
catch { return ""; }
};
let reason: string | undefined;
ended = undefined;
if (handoff.sessionId) {
const status = endedOwnSimulatorSession(easRead(["simulator:get", "--id", handoff.sessionId, "--json", "--non-interactive"]),
{ sessionId: handoff.sessionId, sessionName, project: profile.projectIdentity, type: controller, platform: options.platform });
if (status) {
ended = { sessionId: handoff.sessionId, status };
endedSessions.push(handoff.sessionId);
reason = `EAS ended simulator session ${handoff.sessionId} (${status}) before it was ready`;
}
} else if (startError && transientSessionStartFailure(startError)) {
// The failed request may still have created a session: any by this exact name is stopped, so none is left running.
const live = liveSimulatorSessionsNamed(easRead(["simulator:list", "--name", sessionName, "--status", "new", "--status", "queued", "--status", "starting",
"--status", "in-progress", "--limit", "100", "--json", "--non-interactive"]), sessionName, profile.projectIdentity);
if (live) {
for (const id of live) assertSimulatorStopped(eas(["simulator:stop", "--id", id, "--json", "--non-interactive"], 2 * 60_000).stdout, id);
reason = `EAS could not start the simulator session (${simulatorStartFailure(startError, [options.expoToken]).message})`;
}
}
if (!reason || sessionRetries >= SESSION_START_RETRIES) break;
retryDeadline ??= clock() + SESSION_RETRY_BUDGET_MS;
const delayMs = sessionRetryDelayMs(sessionRetries + 1);
// A new start needs at least a minute of the budget after its wait; one started later could not finish in it.
const startTimeoutMs = Math.min(SESSION_START_TIMEOUT_MS, retryDeadline - clock() - delayMs);
if (startTimeoutMs < 60_000) break;
sessionRetries += 1;
say(`${reason}; starting a new EAS Simulator session in ${Math.round(delayMs / 1000)} s (${sessionRetries}/${SESSION_START_RETRIES})`);
options.signal?.throwIfAborted();
// Asynchronous and cancellable, so targets capturing beside this one keep running and Ctrl+C stops the wait.
if (options.sleep) options.sleep(delayMs);
else await new Promise<void>((resolve, reject) => {
const timer = setTimeout(() => { options.signal?.removeEventListener("abort", abort); resolve(); }, delayMs);
const abort = () => { clearTimeout(timer); reject(options.signal!.reason); };
options.signal?.addEventListener("abort", abort, { once: true });
});
options.signal?.throwIfAborted();
await rm(dotenvPath, { force: true });
sessionName = sessionNameFor(sessionRetries);
sessionStart = undefined;
startSession({ timeoutMs: startTimeoutMs });
startError = await sessionStart;
handoff = await readSimulatorDotenvHandoff(dotenvPath);
}
// Every session EAS ended is its own failure to start, never a question of ownership.
if (ended) throw new CiError({ code: "SIMULATOR_START_FAILED", stage: "session",
message: `EAS could not start a simulator session: ${endedSessions.length === 1 ? `session ${ended.sessionId} ended (${ended.status}) before it was ready`
: `${endedSessions.length} sessions ended before they were ready (the last, ${ended.sessionId}, ${ended.status})`}.`,
nextAction: "Rerun Explore. If sessions keep failing to start, check the EAS Simulator status and the sessions' logs on expo.dev.",
retryable: true, details: { attempts: sessionRetries + 1, endedSessions, ...(startError ? { startFailure: simulatorStartFailure(startError, [options.expoToken]) } : {}) },
...(startError ? { cause: startError } : {}) });
const startError = await sessionStart;
const handoff = await readSimulatorDotenvHandoff(dotenvPath);
const startSecrets = [options.expoToken, ...(handoff.connection ? [handoff.connection.daemonAuthToken] : [])];
const startFailure = startError ? simulatorStartFailure(startError, startSecrets) : undefined;
if (handoff.sessionId) {
@@ -732,8 +628,6 @@ async function executeCiMap(options: CiMapOptions, setStage: (stage: string) =>
if (!handoff.connection) throw new Error("Simulator handoff is missing its controller connection");
connection = handoff.connection;
await rm(dotenvPath, { force: true });
if (options.platform === "ios") controlActions = simulatorControlActions(sessionEas, sessionId);
if (!controlActions.has("appearance.set")) narrowToArgentScheme();
}
const controllerConfig = join(simulatorProject, "agent-device.json");
await writeFile(controllerConfig, "{}\n", { flag: "wx", mode: 0o400 });
@@ -761,22 +655,14 @@ async function executeCiMap(options: CiMapOptions, setStage: (stage: string) =>
say(`installing the app on session ${sessionId}`);
runner({ command: controllerCommand, args: ["install", localApp, "--session", CONTROLLER_SESSION, ...deviceArgs({ platform: options.platform, deviceModel: options.device }),
"--platform", options.platform, "--json"], cwd: simulatorProject, environment: controllerEnvironment, timeoutMs: 15 * 60_000 });
// Before any link opens, as a local capture does with simctl: the app's own links then open without the prompt.
if (sessionId && scheme) {
const approved = approveSessionUrlSchemes(sessionEas, sessionId, controlActions, options.bundleId, [scheme]);
if (approved.length) say(`approved ${approved.map(item => `${item}://`).join(", ")} links on session ${sessionId}`);
}
}
if (options.devicePose) {
// A fold relights the other panel and resizes the window. It comes before the app is first opened or read, so the
// controller's accessibility reader starts on the lit panel: Argent's, started on the outer panel, can stay there.
say(`folding ${options.device} ${options.devicePose}`);
const target = deviceArgs({ platform: options.platform, deviceModel: options.device, ...(localDevice() ? { provider: "local-simulator" as const, controllerDeviceId: localDevice()! } : {}) });
// agent-device reads the hinge back after folding and fails to (locally and on EAS); its display is checked instead.
const easAgentDevice = !!sessionId && controller === "agent-device";
const fold = () => runner({ command: controllerCommand, args: ["fold", options.devicePose!, "--session", CONTROLLER_SESSION, ...target, "--platform", options.platform, "--json"],
cwd: simulatorProject, environment: controllerEnvironment, timeoutMs: 2 * 60_000, ...(localSimulator || easAgentDevice ? { allowFailure: true } : {}) });
const pause = options.sleep ?? (milliseconds => { Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, milliseconds); });
cwd: simulatorProject, environment: controllerEnvironment, timeoutMs: 2 * 60_000, ...(localSimulator ? { allowFailure: true } : {}) });
if (localSimulator && controller === "argent") {
// Argent folds without a session and checks the fold against its own reader; this machine also checks the display.
fold();
@@ -794,59 +680,6 @@ async function executeCiMap(options: CiMapOptions, setStage: (stage: string) =>
...(options.sleep ? { sleep: options.sleep } : {}) })) throw new CiError({ code: "CONTROLLER_FOLD_UNVERIFIED", stage: "session",
message: `${options.device} did not show the ${options.devicePose} display after folding: ${(folded.stderr || folded.stdout).trim().split("\n").at(-1) ?? ""}`.trim(),
nextAction: "Rerun; if it persists, check that this Xcode's simulator supports folding the device." });
} else if (easAgentDevice && sessionId) {
// On EAS, agent-device also folds only inside a session, so the app opens first. The first fold of a fresh session
// can leave the panel it lights black, as it does for Argent: the controller then reads the old panel and a
// relaunch draws nothing. The display is the check, through the controller's own screenshot: in the pose's shape
// and drawn. If it is not, SpringBoard is restarted, the app reopened and the device folded again, once.
const open = (relaunch: boolean) => runner({ command: controllerCommand, args: ["open", options.bundleId, ...(relaunch ? ["--relaunch"] : []), "--session", CONTROLLER_SESSION,
...target, "--platform", options.platform, "--json"], cwd: simulatorProject, environment: controllerEnvironment, timeoutMs: 15 * 60_000 });
const shown = async () => {
if (options.devicePose !== "open" && options.devicePose !== "closed") return true;
const file = join(simulatorProject, "pose.png");
// The display relights and resizes over a moment after the hinge moves.
for (let attempt = 0; attempt < 10; attempt += 1) {
if (attempt) pause(1_000);
runner({ command: controllerCommand, args: ["screenshot", file, "--session", CONTROLLER_SESSION, ...target, "--platform", options.platform, "--json"],
cwd: simulatorProject, environment: controllerEnvironment, timeoutMs: 2 * 60_000, allowFailure: true });
const png = await readFile(file).catch(() => Buffer.alloc(0));
await rm(file, { force: true });
const size = pngSize(png);
if (size && (options.devicePose === "open" ? size.width > size.height : size.height > size.width) && !solidColour(png)) return true;
}
return false;
};
open(false);
fold();
if (!await shown()) {
if (!controlActions.has("springboard.restart")) throw new CiError({ code: "CONTROLLER_FOLD_UNVERIFIED", stage: "session",
message: `${options.device} did not show the ${options.devicePose} display after folding.`, nextAction: "Rerun the capture on a new session." });
say(`${options.device} did not draw the ${options.devicePose} display after the fold; restarting SpringBoard and folding ${options.devicePose} again`);
simulatorControl(sessionEas, sessionId, "springboard.restart");
pause(8_000);
open(true);
fold();
if (!await shown()) throw new CiError({ code: "CONTROLLER_READER_STUCK", stage: "session",
message: `${options.device} did not draw the ${options.devicePose} display after folding, nor after SpringBoard was restarted and it was folded again.`,
nextAction: "Rerun the capture; if it keeps happening, report it to Explore with the session's link." });
}
} else if (controller === "argent" && sessionId && controlActions.has("springboard.restart")) {
// The bridge has already reset Argent's device helpers once when its reader stayed on the dark panel. On EAS the
// tool-server cannot be restarted, so the next step is SpringBoard, then the same fold and check again.
try { fold(); }
catch (error) {
if (toCiError(error).code !== "CONTROLLER_FOLD_UNVERIFIED") throw error;
say(`Argent kept reading the other panel after the fold; restarting SpringBoard and folding ${options.devicePose} again`);
simulatorControl(sessionEas, sessionId, "springboard.restart");
pause(8_000);
try { fold(); }
catch (retry) {
if (toCiError(retry).code !== "CONTROLLER_FOLD_UNVERIFIED") throw retry;
throw new CiError({ code: "CONTROLLER_READER_STUCK", stage: "session",
message: `Argent's accessibility reader kept reading the panel the fold turned off, after its device helpers were reset and SpringBoard was restarted.`,
nextAction: "Rerun the capture; if it keeps happening, report it to Explore: this session's Argent tool-server needs a restart that EAS cannot do yet.", cause: retry });
}
}
} else fold();
}
runtimeStage = "runtime";
@@ -857,28 +690,9 @@ async function executeCiMap(options: CiMapOptions, setStage: (stage: string) =>
// (APP_NOT_READY). On this machine the capture runs that reader, so it recovers in two steps, each followed by one more
// open: a fresh tool-server, whose reader starts on the lit panel; then, as XcodeBuildMCP#537 found for this panel,
// SpringBoard restarted as well. The bridge's cached view of the device goes with the old server.
// On EAS the tool-server is the session's and must never be stopped, so the recovery there resets Argent's device
// helpers (reset-reader), then restarts SpringBoard as well, and then gives up with a reason rather than retrying.
const easArgentRecovery = !local && controller === "argent" && !!sessionId && options.platform === "ios";
for (let recovery = 0; ; recovery += 1) try { runtime = collect(); break; }
catch (error) {
if (toCiError(error).code !== "APP_NOT_READY") throw error;
if (easArgentRecovery && sessionId) {
if (recovery === 2 || recovery === 1 && !controlActions.has("springboard.restart")) throw new CiError({ code: "CONTROLLER_READER_STUCK", stage: "session",
message: "Argent's accessibility reader kept reading the panel the fold turned off, after its device helpers were reset"
+ `${recovery === 2 ? " and SpringBoard was restarted" : ""}.`,
nextAction: "Rerun the capture; if it keeps happening, report it to Explore: this session's Argent tool-server needs a restart that EAS cannot do yet.", cause: error });
if (recovery === 1) {
say("Argent still did not read the app; restarting SpringBoard, then resetting Argent's device helpers and opening the app again");
simulatorControl(sessionEas, sessionId, "springboard.restart");
// SpringBoard takes a moment to come back, and sends the app to the background; the next open brings it back.
(options.sleep ?? (milliseconds => { Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, milliseconds); }))(8_000);
} else say("Argent did not read the app after starting it; resetting Argent's device helpers and opening the app again");
runner({ command: controllerCommand, args: ["reset-reader", "--session", CONTROLLER_SESSION, "--platform", options.platform, "--json"],
cwd: simulatorProject, environment: controllerEnvironment, timeoutMs: 2 * 60_000 });
continue;
}
if (!localArgent || recovery === 2) throw error;
if (!localArgent || recovery === 2 || toCiError(error).code !== "APP_NOT_READY") throw error;
say(recovery === 0 ? "Argent did not read the app after starting it; restarting Argent's tool-server and opening the app again"
: "Argent still did not read the app; restarting SpringBoard and Argent's tool-server and opening the app again");
stopLocalArgentServer(localArgent);
@@ -915,11 +729,10 @@ async function executeCiMap(options: CiMapOptions, setStage: (stage: string) =>
const passes: CaptureBundle["outcomes"][] = [];
const recordingTools = launchSetting === "off" ? undefined : options.recordingTools === undefined ? ffmpegRecordingTools() : options.recordingTools ?? undefined;
for (const [index, colorScheme] of colorSchemes.entries()) {
// Argent cannot switch the appearance yet (software-mansion/argent#1509): the host does, simctl or adb on this
// machine and serve-sim on an EAS iOS session; elsewhere its single pass runs as the device starts.
// Argent cannot switch the appearance yet (software-mansion/argent#1509): on EAS its single pass runs as the device
// starts, and on this machine the host switches it.
if (controller !== "argent") runner({ command: controllerCommand, args: [...appearanceArgs(colorScheme), "--session", CONTROLLER_SESSION, ...deviceArgs(runtime), "--platform", options.platform],
cwd: simulatorProject, environment: controllerEnvironment, timeoutMs: 60_000 });
else if (sessionId && controlActions.has("appearance.set")) simulatorControl(sessionEas, sessionId, "appearance.set", [colorScheme]);
else if (localSimulator) setLocalSimulatorAppearance({ runner, udid: localSimulator, scheme: colorScheme, cwd: simulatorProject, environment: restrictedEnvironment });
else if (localEmulator) setLocalEmulatorAppearance({ runner, serial: localEmulator, scheme: colorScheme, cwd: simulatorProject, environment: restrictedEnvironment });
// A scheme change recreates the Android activity in place, and the sheets it re-presents lose their inset; a
-42
View File
@@ -1,42 +0,0 @@
import { isRecord } from "./common.js";
/** Runs the pinned EAS CLI with these arguments; throws when it exits non-zero unless `allowFailure` is set. */
export type EasCommand = (args: string[], options?: { timeoutMs?: number; allowFailure?: boolean }) => { stdout: string; stderr?: string };
/**
* The host actions an EAS Simulator iOS session offers through `eas simulator:control` (serve-sim's actions, 0.10.0 and
* later for the ones Explore uses): an empty set when the session or the EAS CLI offers none, so a caller falls back to
* what it did before them. The session is always named by id, never taken from a `.env.eas-simulator` beside it.
*
* These are a fallback: what the session's controller can do itself (agent-device or Argent: fold, appearance, a
* reader reset) goes through the controller. Explore uses an action here only for what neither controller offers —
* approving a link scheme, restarting SpringBoard, and Argent's appearance (software-mansion/argent#1509).
*/
export function simulatorControlActions(eas: EasCommand, sessionId: string): Set<string> {
try {
const listed = eas(["simulator:control", "--list", "--id", sessionId, "--json", "--non-interactive"], { timeoutMs: 2 * 60_000, allowFailure: true });
const actions = JSON.parse(listed.stdout) as unknown;
return new Set(isRecord(actions) ? Object.keys(actions) : []);
} catch { return new Set(); }
}
/** Runs one `eas simulator:control` action on the session; eas-cli fills in the device. Throws with EAS's reason. */
export function simulatorControl(eas: EasCommand, sessionId: string, action: string, values: readonly string[] = []): void {
// Values follow `--` so one that starts with a dash is never read as a flag.
eas(["simulator:control", action, "--id", sessionId, "--json", "--non-interactive", "--", ...values], { timeoutMs: 2 * 60_000 });
}
/**
* Lets the app open its own links without iOS asking "Open in “App”?" first, like local captures do with simctl. A
* session without the action keeps the controllers' prompt handling; http and https never prompt and are skipped.
*/
export function approveSessionUrlSchemes(eas: EasCommand, sessionId: string, actions: ReadonlySet<string>, bundleId: string, schemes: readonly string[]): string[] {
if (!actions.has("app.approveUrlScheme")) return [];
const approved: string[] = [];
for (const scheme of new Set(schemes.map(value => value.toLowerCase()))) {
if (scheme === "http" || scheme === "https" || !/^[a-z][a-z0-9+.-]*$/.test(scheme)) continue;
simulatorControl(eas, sessionId, "app.approveUrlScheme", [bundleId, scheme]);
approved.push(scheme);
}
return approved;
}
+11 -41
View File
@@ -237,7 +237,17 @@ export function assertSimulatorSessionIdentity(
) {
throw new Error("eas simulator:get did not prove the exact expected simulator session");
}
if (!sessionProjectProven(value, expectedSessionId, expectedProject)) {
// eas-cli 22.4.0 omits the `app` record; its `deviceRunSessionUrl` still binds the session
// to one exact owner and slug, so accept either proof but never neither.
const expectedSessionUrl = `https://expo.dev/accounts/${expectedProject.owner}`
+ `/projects/${expectedProject.slug}/simulator-sessions/${expectedSessionId}`;
const projectProven = isRecord(value.app)
? value.app.id === expectedProject.projectId
&& value.app.slug === expectedProject.slug
&& isRecord(value.app.ownerAccount)
&& value.app.ownerAccount.name === expectedProject.owner
: value.deviceRunSessionUrl === expectedSessionUrl;
if (!projectProven) {
throw new Error("eas simulator:get did not prove the exact expected simulator session");
}
if (expectedConnection && !remoteConfigMatches(value.remoteConfig, expectedConnection)) {
@@ -245,46 +255,6 @@ export function assertSimulatorSessionIdentity(
}
}
/**
* eas-cli 22.4.0 omits the `app` record; its `deviceRunSessionUrl` still binds the session to one exact owner and
* slug, so either proof is accepted but never neither.
*/
function sessionProjectProven(value: Record<string, unknown>, sessionId: string, project: RepackProfile["projectIdentity"]): boolean {
const expectedSessionUrl = `https://expo.dev/accounts/${project.owner}/projects/${project.slug}/simulator-sessions/${sessionId}`;
return isRecord(value.app)
? value.app.id === project.projectId && value.app.slug === project.slug && isRecord(value.app.ownerAccount) && value.app.ownerAccount.name === project.owner
: value.deviceRunSessionUrl === expectedSessionUrl;
}
/**
* The status (ERRORED or STOPPED) of a session `eas simulator:get` shows EAS ended before Explore could use it, when it
* is provably this capture's own: the exact id, name, type, platform and project. Only such a session is replaced by a
* new one; anything less certain (undefined here) stays a handoff failure.
*/
export function endedOwnSimulatorSession(stdout: string, expected: { sessionId: string; sessionName: string; project: RepackProfile["projectIdentity"];
type: "agent-device" | "argent"; platform: Platform }): "ERRORED" | "STOPPED" | undefined {
let value: unknown;
try { value = JSON.parse(stdout); } catch { return undefined; }
return isRecord(value) && value.id === expected.sessionId && value.name === expected.sessionName && value.type === expected.type
&& value.platform === expected.platform.toUpperCase() && (value.status === "ERRORED" || value.status === "STOPPED")
&& sessionProjectProven(value, expected.sessionId, expected.project) ? value.status : undefined;
}
/**
* This project's sessions with exactly this name that EAS may still be starting or running, from
* `eas simulator:list --json`: their ids when every one is provably this project's, or undefined when the listing
* cannot be read or a session by that name cannot be proven Explore's, so a caller never assumes none exist.
*/
export function liveSimulatorSessionsNamed(stdout: string, sessionName: string, project: RepackProfile["projectIdentity"]): string[] | undefined {
let value: unknown;
try { value = JSON.parse(stdout); } catch { return undefined; }
if (!isRecord(value) || !Array.isArray(value.sessions)) return undefined;
const live = new Set(["NEW", "QUEUED", "STARTING", "IN_PROGRESS"]);
const named = value.sessions.filter((session): session is Record<string, unknown> => isRecord(session) && session.name === sessionName && live.has(String(session.status)));
if (named.some(session => typeof session.id !== "string" || !/^[A-Za-z0-9._-]{1,256}$/.test(session.id) || !sessionProjectProven(session, session.id, project))) return undefined;
return named.map(session => session.id as string);
}
/** The session's published controller endpoint is the one Explore holds: agent-device's daemon, or Argent's tool-server. */
function remoteConfigMatches(remoteConfig: unknown, connection: SimulatorConnection): boolean {
if (!isRecord(remoteConfig)) return false;
+7 -15
View File
@@ -474,8 +474,7 @@ export async function runDoctor(options: DoctorOptions): Promise<DoctorReport> {
checks.push(config.mode === "agent"
? { step: 3, id: "mode", status: "pass", message: `Agent mode with ${config.agent!.provider} ${config.agent!.model}. Capture navigation uses the model and is billed to your ${config.agent!.provider} account.` }
: { step: 3, id: "mode", status: "pass", message: "Deterministic mode: capture replays config.yaml without a model, so it needs no API key and has no AI charges." });
const argentTargets = runTargets(config, { controller: options.controller }).filter(target => target.capture.controller === "argent");
if (argentTargets.length) checks.push(argentCheck(environment, argentTargets.some(target => target.app.platform === "android" && target.capture.simulator !== "local")));
if (runTargets(config, { controller: options.controller }).some(target => target.capture.controller === "argent")) checks.push(argentCheck(environment));
if (config.capture.launch !== "off") {
const ffmpeg = run("ffmpeg", ["-version"], project);
checks.push(ffmpeg.status === 0
@@ -631,20 +630,13 @@ export function summarizeCaptureCheck(plan: SourceCapturePlan, bundle: CaptureBu
* Capture the committed HEAD the way the baseline workflow does, with the local EAS login. This is
* the only doctor step that starts an EAS build and a simulator session.
*/
/**
* Argent fetches its pinned release on first use, and cannot switch the appearance itself (software-mansion/argent#1509):
* the host does, through `simulator:control` on an iOS EAS session or simctl and adb on this Mac. Only an Android EAS
* session has no host to ask, so its captures record one appearance. agent-device, the default, is not reported.
*/
function argentCheck(environment: NodeJS.ProcessEnv, androidOnEas: boolean): DoctorCheck {
/** An Argent capture records one appearance, and fetches the pinned Argent release on first use. agent-device, the default, is not reported. */
function argentCheck(environment: NodeJS.ProcessEnv): DoctorCheck {
const cached = controllerCached("argent", environment);
const release = `Device controller: Argent ${ARGENT_VERSION} (${cached ? "cached on this machine" : "fetched from npm on the first capture, about 27 MB"}). `;
return androidOnEas
? { step: 3, id: "controller", status: "warn", code: "CONTROLLER_APPEARANCE_FIXED",
message: `${release}Argent cannot switch the appearance on an Android EAS Simulator session yet (software-mansion/argent#1509), so those captures record one appearance: the app's forced one, else light.`,
nextAction: "Nothing to do unless you need dark-mode screenshots on Android; use agent-device (the default) for those." }
: { step: 3, id: "controller", status: "pass",
message: `${release}The simulator's host switches the appearance, so every appearance the config asks for is captured.` };
return { step: 3, id: "controller", status: "warn", code: "CONTROLLER_APPEARANCE_FIXED",
message: `Device controller: Argent ${ARGENT_VERSION} (${cached ? "cached on this machine" : "fetched from npm on the first capture, about 27 MB"}). `
+ "Argent cannot switch the simulator's appearance yet (software-mansion/argent#1509), so each capture records one appearance: the app's forced one, else light.",
nextAction: "Nothing to do unless you need dark-mode screenshots; use agent-device (the default) for those." };
}
export async function runCaptureCheck(options: { project: string; output: string; platform?: ExplorePlatform; controller?: string | undefined; simulator?: string | undefined; repack?: string | undefined; target?: string | undefined; environment?: NodeJS.ProcessEnv; runner?: CommandRunner; progress?: Progress }): Promise<CaptureCheckResult> {
+16 -28
View File
@@ -765,40 +765,16 @@ async function verifyDeployment(check: { origin: string; token: string; reports:
"Check EAS Hosting availability and rerun the deploy job.", { retryable: true, cause: error });
}
};
// What the token serves differs from what was deployed: a listing or report that does not match, or undefined.
const mismatch = async (): Promise<CiError | undefined> => {
for (const expected of check.reports) {
const report = await get(`/p/${check.token}/report.zip${expected.query}`);
const bytes = report.status === 200 ? new Uint8Array(await report.arrayBuffer()) : new Uint8Array();
if (report.status !== 200 || bytes.byteLength !== expected.bytes || createHash("sha256").update(bytes).digest("hex") !== expected.sha256) {
return deployError("PREVIEW_VERIFY_FAILED", "The hosted preview did not serve the exact report that was deployed.",
"Rerun the deploy job; the deployment's sealed key or ciphertext did not match.", { details: { status: report.status, report: expected.query } });
}
}
if (check.listing !== undefined) {
const list = await get(`/p/${check.token}/reports.json`);
const body = list.status === 200 ? await list.text() : "";
if (list.status !== 200 || body !== check.listing) return deployError("PREVIEW_VERIFY_FAILED", "The hosted preview did not list the targets that were deployed.",
"Rerun the deploy job; the deployment's report listing did not match.", { details: { status: list.status } });
}
return undefined;
};
const started = check.now();
let liveAfterMs = 0;
for (;;) {
// A browser's request: the token page negotiates, and anything that does not ask for HTML gets the Markdown index.
const shell = await get(`/p/${check.token}`, "text/html");
const serving = shell.status === 200 && (shell.headers.get("content-type") ?? "").startsWith("text/html");
// An alias with a fixed token (the example report) serves the token page from the deployment it still points at, so
// it has moved only once it serves this deployment's listing and reports as well.
const stale = serving && check.alias ? await mismatch() : undefined;
if (serving && !stale) { liveAfterMs = check.now() - started; break; }
if (shell.status === 200 && (shell.headers.get("content-type") ?? "").startsWith("text/html")) { liveAfterMs = check.now() - started; break; }
const waitedMs = check.now() - started;
if (waitedMs > check.timeoutMs) {
// An alias that does not serve the token page yet still points at an earlier deployment; the deployment itself not serving is a failed deployment.
if (check.alias) throw deployError("PREVIEW_ALIAS_BEHIND", stale
? `The alias ${check.origin} still serves an earlier deployment ${Math.round(waitedMs / 1000)} s after eas deploy returned.`
: `The alias ${check.origin} still answers HTTP ${shell.status} ${Math.round(waitedMs / 1000)} s after eas deploy returned.`,
if (check.alias) throw deployError("PREVIEW_ALIAS_BEHIND", `The alias ${check.origin} still answers HTTP ${shell.status} ${Math.round(waitedMs / 1000)} s after eas deploy returned.`,
"Nothing to do: the alias catches up on its own, and the next push verifies it again.", { retryable: true, details: { origin: check.origin, status: shell.status, waitedMs } });
throw deployError("PREVIEW_VERIFY_FAILED", `The hosted preview did not become available (HTTP ${shell.status}).`,
"Rerun the deploy job; if the deployment keeps failing verification, inspect it in the EAS Hosting dashboard.", { retryable: true, details: { origin: check.origin, status: shell.status, waitedMs } });
@@ -809,8 +785,20 @@ async function verifyDeployment(check: { origin: string; token: string; reports:
if (api.status !== 200 || !(api.headers.get("content-type") ?? "").startsWith("application/json")) {
throw deployError("PREVIEW_VERIFY_FAILED", `The hosted preview did not answer the agent API (HTTP ${api.status}).`, "Rerun the deploy job; if the deployment keeps failing verification, inspect it in the EAS Hosting dashboard.", { retryable: true });
}
// The deployment itself serves exactly what was deployed or it failed; the alias was checked while it was polled.
if (!check.alias) { const failure = await mismatch(); if (failure) throw failure; }
for (const expected of check.reports) {
const report = await get(`/p/${check.token}/report.zip${expected.query}`);
const bytes = report.status === 200 ? new Uint8Array(await report.arrayBuffer()) : new Uint8Array();
if (report.status !== 200 || bytes.byteLength !== expected.bytes || createHash("sha256").update(bytes).digest("hex") !== expected.sha256) {
throw deployError("PREVIEW_VERIFY_FAILED", "The hosted preview did not serve the exact report that was deployed.",
"Rerun the deploy job; the deployment's sealed key or ciphertext did not match.", { details: { status: report.status, report: expected.query } });
}
}
if (check.listing !== undefined) {
const list = await get(`/p/${check.token}/reports.json`);
const body = list.status === 200 ? await list.text() : "";
if (list.status !== 200 || body !== check.listing) throw deployError("PREVIEW_VERIFY_FAILED", "The hosted preview did not list the targets that were deployed.",
"Rerun the deploy job; the deployment's report listing did not match.", { details: { status: list.status } });
}
const other = check.token.endsWith("a") ? `${check.token.slice(0, -1)}b` : `${check.token.slice(0, -1)}a`;
// Errors name each probe by its shape: the near-miss token differs from the real one in its last character only.
for (const [path, shape] of [["/", "/"], [`/p/${other}`, "/p/<wrong token>"], [`/p/${other}/report.zip`, "/p/<wrong token>/report.zip"],
+1 -1
View File
@@ -3,4 +3,4 @@
* controller (`--package-version`), the daemon health check, and the screenshot diff tool must
* all be this version; each caller checks it by exact equality.
*/
export const AGENT_DEVICE_VERSION = "0.21.29-nightly.20261018.74";
export const AGENT_DEVICE_VERSION = "0.21.28";
+1 -1
View File
@@ -21,7 +21,7 @@ export type ControllerName = "agent-device" | "argent";
/** Each controller's npm release, the file Explore runs from it, and the integrity npm publishes for it. */
export const CONTROLLER_PACKAGES: Record<ControllerName, { name: string; version: string; bin: string; integrity: string }> = {
"agent-device": { name: "agent-device", version: AGENT_DEVICE_VERSION, bin: "bin/agent-device.mjs",
integrity: "sha512-7+ajWLr0J+8iLZ9q11ERbj6U14mC20umBK5BQQdw5aERA79yeXc3Ze6KmtvnILnWjEtoVkYQsXQasL8RL6Uatw==" },
integrity: "sha512-uGEENVhPzSpIACrVlt16O1mloODWJyAemTCT0boDb4L006JXN2rG747u1TRoQJudOpdP/Pm2urxNRHeECLMLfg==" },
argent: { name: "@swmansion/argent", version: ARGENT_VERSION, bin: "dist/cli.js",
integrity: "sha512-XXWlWZJlHKqnAvNx3RDhuiVFQOPqh5EDB76+mFAyqC2mutC6irzw03+M/6S/WQ+Dzz2IYOkEfOzQnOOdhrGgJg==" },
};
-17
View File
@@ -1,5 +1,4 @@
import { Buffer } from "node:buffer";
import { createRequire } from "node:module";
import { inflateSync } from "node:zlib";
import { STATUS_BAR_BAND_PERCENT } from "../contracts/capture.js";
@@ -8,22 +7,6 @@ export { STATUS_BAR_BAND_PERCENT };
/** Decoded RGBA pixels of one frame, as pngjs returns them (four bytes per pixel, row by row). */
export type DecodedFrame = { width: number; height: number; data: Buffer };
/**
* Whether a screenshot is a single flat colour: a capture-protected screen (black on Android), or a display that is lit
* but not drawn (an iPhone Duo's inner panel after its first fold on EAS). Every 97th pixel is enough to tell.
*/
export function solidColour(png: Buffer): boolean {
let frame: DecodedFrame;
try { frame = createRequire(import.meta.url.replace(/\?.*$/, ""))("pngjs").PNG.sync.read(png, { checkCRC: false }) as DecodedFrame; }
catch { return false; }
const { data } = frame;
if (data.length < 4) return false;
for (let offset = 0; offset + 3 < data.length; offset += 4 * 97) {
if (data[offset] !== data[0] || data[offset + 1] !== data[1] || data[offset + 2] !== data[2]) return false;
}
return true;
}
/**
* Whether a coordinate tap at normalized height `y` would act on a changed frame. Differences inside
* the status-bar band are ignored only when the tap lands below the band: a tap inside it acts on
+9 -130
View File
@@ -1491,19 +1491,8 @@ test("Esc closes the Inspector first, then deselects; arrows and hjkl walk the m
await expect(selected).toHaveCount(0);
await expect(page).toHaveURL(/\/map$/);
// Nothing selected: ↓ enters the map at its top, as → enters Screens at its first card; held, it
// keeps walking down from there and stops where it is on release.
await page.keyboard.down("ArrowDown");
await expect(selected).toHaveCount(1);
const entered = await selected.getAttribute("data-id");
await expect.poll(() => selected.getAttribute("data-id"), { timeout: 4000 }).not.toBe(entered);
await page.keyboard.up("ArrowDown");
const walkedTo = await selected.getAttribute("data-id");
await page.waitForTimeout(500);
await expect(selected).toHaveAttribute("data-id", walkedTo!);
await page.keyboard.press("Escape");
await expect(page.locator(".right-panel")).toHaveCount(0);
await page.keyboard.press("Escape");
// Nothing selected: the arrows are not map moves.
await page.keyboard.press("ArrowDown");
await expect(selected).toHaveCount(0);
await page.locator(".map-canvas .react-flow__node-screen .screen-screenshot-target").first().click();
@@ -1519,67 +1508,6 @@ test("Esc closes the Inspector first, then deselects; arrows and hjkl walk the m
await expect(selected).toHaveAttribute("data-id", child!);
});
test("a held key stops when Esc, another key or a dialog takes the keyboard; a menu keeps its own arrows", async ({ page }) => {
await page.goto("/map");
const selected = page.locator(".map-canvas .react-flow__node-screen.selected");
const inspector = page.locator(".right-panel");
const search = page.getByRole("dialog", { name: "Search Explore" });
const viewport = page.locator(".map-canvas .react-flow__viewport");
const mod = process.platform === "darwin" ? "Meta" : "Control";
// Nothing selected and a menu open: ← and → on its item are the menu's, not the map's.
await expect(selected).toHaveCount(0);
await page.locator(".zoom-button").click();
await expect(page.getByRole("menu")).toBeVisible();
await page.keyboard.press("ArrowDown");
await page.keyboard.press("ArrowLeft");
await page.keyboard.press("ArrowRight");
await expect(selected).toHaveCount(0);
await page.keyboard.press("Escape");
await expect(page.getByRole("menu")).toHaveCount(0);
// Esc mid-walk closes the Inspector, and the walk does not reopen it on its next step.
await page.locator(".map-canvas .react-flow__node-screen .screen-screenshot-target").first().click();
await expect(inspector).toBeVisible();
await page.keyboard.down("ArrowDown");
await page.keyboard.press("Escape");
await expect(inspector).toHaveCount(0);
await page.waitForTimeout(800);
await expect(inspector).toHaveCount(0);
await page.keyboard.up("ArrowDown");
// ⌘K mid-walk opens Search, and the selection behind it stays where it was.
await page.keyboard.down("ArrowDown");
await page.keyboard.press(`${mod}+k`);
await expect(search).toBeVisible();
const behind = await selected.getAttribute("data-id");
await page.waitForTimeout(800);
await expect(selected).toHaveAttribute("data-id", behind!);
await page.keyboard.up("ArrowDown");
await page.keyboard.press("Escape");
await expect(search).toHaveCount(0);
// A held + glides past the tap's one step and stops where it is on release.
const zoomNow = async () => (await readCanvasCamera(viewport)).zoom;
const before = await zoomNow();
await page.keyboard.down("Equal");
await expect.poll(zoomNow, { timeout: 4000 }).toBeGreaterThan(before * 1.2 * 1.2);
await page.keyboard.up("Equal");
const released = await zoomNow();
await page.waitForTimeout(300);
expect(await zoomNow()).toBeCloseTo(released, 3);
// Held −, then a click opens Search: the glide stops rather than zoom behind the dialog.
await page.keyboard.down("Minus");
await page.getByRole("button", { name: "Search", exact: true }).click();
await expect(search).toBeVisible();
await page.waitForTimeout(400);
const atOpen = await zoomNow();
await page.waitForTimeout(800);
expect(await zoomNow()).toBeCloseTo(atOpen, 3);
await page.keyboard.up("Minus");
});
test("a drag that starts on a transition edge pans the map", async ({ page }) => {
await page.goto("/map");
const viewport = page.locator(".map-canvas .react-flow__viewport");
@@ -2112,12 +2040,16 @@ test("canonicalizes the legacy Workspace route to Changes and reports the exact
if (entry.status === "unchanged") return total;
return total + (entry.currentScreenIds.length || entry.baselineScreenIds.length);
}, 0);
// The bottom bar's Compare button carries the count.
const badge = page.locator(".canvas-toolbar .toolbar-badge");
await expect(badge).toHaveText(String(expectedChanges));
const menu = await openChangesMenu(page);
await expect(menu.locator(".changes-panel-title .changes-panel-count")).toHaveText(String(expectedChanges));
// Without a baseline there is nothing to count. Compare still opens, and the view says why it is empty.
await page.goto("/map?baseline=none");
await expect(page).toHaveURL(/baseline=none/);
await expect(badge).toHaveCount(0);
const compare = page.getByRole("toolbar", { name: "Canvas tools" }).getByRole("button", { name: "Compare", exact: true });
await expect(compare).not.toHaveAttribute("aria-disabled", "true");
await compare.click();
@@ -2768,31 +2700,6 @@ test("drives the shell from the keyboard, and says so on hover", async ({ page }
}
await expect(page.getByRole("button", { name: "Comments", exact: true })).toHaveCount(0);
// A held modifier shows, on each button it makes a chord with, the key that completes it: ⇧ puts
// 1 on Fit canvas, ⌘ (Ctrl elsewhere) puts K on Search. Released, the hints go.
const hints = page.locator(".key-hint");
await expect(hints).toHaveCount(0);
await page.keyboard.down("Shift");
await expect(page.getByRole("button", { name: "Fit canvas" }).locator(".key-hint")).toHaveText("1");
await expect(page.getByRole("button", { name: "Center canvas" }).locator(".key-hint")).toHaveText("2");
await expect(page.getByRole("button", { name: "Search", exact: true }).locator(".key-hint")).toHaveCount(0);
await page.keyboard.up("Shift");
await expect(hints).toHaveCount(0);
await page.keyboard.down(mod);
await expect(page.getByRole("button", { name: "Search", exact: true }).locator(".key-hint")).toHaveText("K");
await expect(page.getByRole("button", { name: "Fit canvas" }).locator(".key-hint")).toHaveCount(0);
await page.keyboard.up(mod);
await expect(hints).toHaveCount(0);
// Focus that moves into a field by mouse, with ⇧ still down, takes the hints with it.
await page.keyboard.down("Shift");
await expect(page.getByRole("button", { name: "Fit canvas" }).locator(".key-hint")).toHaveText("1");
await page.getByRole("button", { name: "Search", exact: true }).click();
await expect(page.getByRole("dialog", { name: "Search Explore" })).toBeVisible();
await expect(hints).toHaveCount(0);
await page.keyboard.up("Shift");
await page.keyboard.press("Escape");
await expect(page.getByRole("dialog", { name: "Search Explore" })).toHaveCount(0);
// ⌘B opens and closes the Changes menu.
await page.keyboard.press(`${mod}+b`);
await expect(page.locator(".changes-menu")).toBeVisible();
@@ -2825,23 +2732,14 @@ test("drives the shell from the keyboard, and says so on hover", async ({ page }
await expect(page.locator(".tooltip-key")).toHaveText("C");
await page.getByRole("button", { name: "Expand inspector" }).hover();
await expect(page.locator(".tooltip-key")).toHaveText("I");
// The theme button names the mode in force, and T is its key.
// The theme button has no key: it names the mode in force and nothing else.
const themeButton = page.getByRole("button", { name: "Toggle theme" });
await themeButton.hover();
await expect(page.locator(".tooltip-content")).toContainText("Theme: Auto");
await expect(page.locator(".tooltip-key")).toHaveText("T");
await expect(page.locator(".tooltip-content")).toContainText("Theme:");
await expect(page.locator(".tooltip-key")).toHaveCount(0);
await page.mouse.move(0, 0);
const initialTheme = await page.locator("html").getAttribute("data-theme");
expect(initialTheme === "light" || initialTheme === "dark").toBe(true);
const otherTheme = initialTheme === "dark" ? "light" : "dark";
// T flips between dark and light from whatever Auto showed, and never steps back to Auto.
await page.keyboard.press("t");
await expect(page.locator("html")).toHaveAttribute("data-theme", otherTheme);
await page.keyboard.press("t");
await expect(page.locator("html")).toHaveAttribute("data-theme", initialTheme!);
await themeButton.hover();
await expect(page.locator(".tooltip-content")).toContainText(initialTheme === "dark" ? "Theme: Dark" : "Theme: Light");
await page.mouse.move(0, 0);
// The retired theme and inspector chords no longer answer.
await page.keyboard.press(`${mod}+Alt+t`);
await expect(page.locator("html")).toHaveAttribute("data-theme", initialTheme!);
@@ -4304,25 +4202,6 @@ test("desktop Compare: one command bar with the modes in it, even gaps to both b
for (let step = 1; step < before; step += 1) await page.keyboard.press("ArrowRight");
await expect(position).toHaveText(new RegExp(`^${before} of `));
// In Swipe, [ and ] nudge the divider; held, ] keeps going until it is released or at the edge.
await page.keyboard.press("2");
const divider = compare.getByRole("slider");
await expect(divider).toHaveAttribute("aria-valuenow", "50");
await page.keyboard.press("BracketLeft");
await expect(divider).toHaveAttribute("aria-valuenow", "45");
const dividerAt = async () => Number(await divider.getAttribute("aria-valuenow"));
await page.keyboard.down("BracketRight");
await expect(divider).toHaveAttribute("aria-valuenow", "50");
await expect.poll(dividerAt, { timeout: 4000 }).toBeGreaterThanOrEqual(65);
await page.keyboard.up("BracketRight");
const dividerHeld = await dividerAt();
await page.waitForTimeout(600);
expect(await dividerAt()).toBe(dividerHeld);
await page.keyboard.down("BracketRight");
await expect.poll(dividerAt, { timeout: 8000 }).toBe(100);
await page.keyboard.up("BracketRight");
await page.keyboard.press("1");
// The bar keeps one size whatever the route, so Next stays under the pointer: it can be clicked
// again and again through screens whose routes differ in length.
const nextButton = bar.getByRole("button", { name: "Next changed screen" });
+1 -8
View File
@@ -179,14 +179,7 @@ const Navigation=createStaticNavigation(Root); export default function App(){ret
}
return ok(identity(device));
}
if (command === 'fold') { device.pose = request.args[1]; return ok({ action: 'fold', pose: request.args[1] }); }
// The display a fold lit, as a pose check reads it: landscape when opened, and drawn.
if (command === 'screenshot' && request.args[1].endsWith('/pose.png')) {
const display = new PNG(device.pose === 'open' ? { width: 24, height: 16 } : { width: 16, height: 24 });
display.data[0] = 255;
writeFileSync(request.args[1], PNG.sync.write(display));
return ok({ path: request.args[1] });
}
if (command === 'fold') return ok({ action: 'fold', pose: request.args[1] });
if (command === 'install') {
const app = request.args[1];
device.build = platform === 'android' ? readFileSync(app, 'utf8') : readFileSync(join(app, 'build-id'), 'utf8');
+3 -29
View File
@@ -395,18 +395,9 @@ test("when Argent reads nothing while the prompt is up, Open is tapped from a sc
assert.equal(context.state.deepLinkPromptAccepted, true);
});
test("reset-reader stops the device's Argent helpers by its UDID and forgets what the old reader saw", async () => {
const state = { generation: 3, udid: UDID, screen: { width: 402, height: 874 }, refs: { e1: {} } };
const { calls, run } = harness("ios", { "stop-all-simulator-servers": { stopped: [`NativeDevtools:${UDID}`, `AXService:${UDID}`] } }, { state });
const reset = await run(["reset-reader", ...flags("ios")]);
assert.deepEqual(reset.json.data, { action: "reset-reader", stopped: [`NativeDevtools:${UDID}`, `AXService:${UDID}`] });
assert.deepEqual(calls, [{ tool: "stop-all-simulator-servers", args: { devices: [UDID] } }]);
assert.equal(state.screen, undefined); assert.equal(state.refs, undefined); assert.equal(state.generation, 4);
});
test("fold moves a foldable to a pose and forgets the old panel's geometry", async () => {
// Argent's fold answers with the panel it lit, in pixels; the inner panel is 2007 × 2853 (669 × 951 points).
const { run, calls, context } = harness("ios", { "list-devices": DUO_DEVICES, "ui-tree": [DUO_HOME, DUO_OPEN_EDIT_LANE], "stop-all-simulator-servers": { stopped: [] },
const { run, calls, context } = harness("ios", { "list-devices": DUO_DEVICES, "ui-tree": [DUO_HOME, DUO_OPEN_EDIT_LANE],
fold: { activeScreen: 3, screen: { id: 3, panel: "inner panel", width: 2007, height: 2853 }, posture: "open", hingeAngle: 180 } });
await run(["snapshot", ...flags("ios")]);
const generation = context.state.generation;
@@ -416,29 +407,12 @@ test("fold moves a foldable to a pose and forgets the old panel's geometry", asy
const fold = calls.findIndex(call => call.tool === "fold");
assert.equal(calls.slice(0, fold).filter(call => call.tool === "ui-tree").length, reads, "nothing is read between the command and the fold");
assert.deepEqual(calls[fold].args, { udid: "74195B53-4DBC-4EAA-9991-F98E5BB86BA8", posture: "open" });
// The device's helpers are reset just before the fold, so the panel it lights is read by fresh ones.
assert.deepEqual(calls[fold - 1], { tool: "stop-all-simulator-servers", args: { devices: ["74195B53-4DBC-4EAA-9991-F98E5BB86BA8"] } });
assert.equal(context.state.screen, undefined);
assert.equal(context.state.refs, undefined);
assert.equal(context.state.generation, generation + 1);
assert.equal((await run(["fold", "sideways", ...flags("ios")])).json.error.code, "INVALID_ARGS");
});
test("a reader stuck on the dark panel after a fold is reset once more before the fold is called unverified", async () => {
const fold = { activeScreen: 3, screen: { id: 3, panel: "inner panel", width: 2007, height: 2853 }, posture: "open", hingeAngle: 180 };
const stopped = { stopped: ["AXService:74195B53-4DBC-4EAA-9991-F98E5BB86BA8"] };
// Ten reads still in the cover panel's shape (as on EAS, 2026-10-17), then the inner panel once the helpers restart.
const recovers = harness("ios", { "list-devices": DUO_DEVICES, fold, "stop-all-simulator-servers": stopped, "ui-tree": [...Array(10).fill(DUO_HOME), DUO_OPEN_EDIT_LANE] });
assert.deepEqual((await recovers.run(["fold", "open", ...flags("ios")])).json.data, { action: "fold", pose: "open" });
assert.deepEqual(recovers.calls.filter(call => call.tool === "stop-all-simulator-servers").map(call => call.args), Array(2).fill({ devices: ["74195B53-4DBC-4EAA-9991-F98E5BB86BA8"] }));
const stuck = harness("ios", { "list-devices": DUO_DEVICES, fold, "stop-all-simulator-servers": stopped, "ui-tree": DUO_HOME });
const failed = await stuck.run(["fold", "open", ...flags("ios")]);
assert.equal(failed.json.error.code, "CONTROLLER_FOLD_UNVERIFIED");
assert.match(failed.json.error.message, /after its device helpers were reset/);
assert.equal(stuck.calls.filter(call => call.tool === "stop-all-simulator-servers").length, 2, "before the fold and once after, not in a loop");
});
test("an alert that is not the link prompt is left for capture to answer", async () => {
const other = { ...IOS_HOME, alertVisible: true, foregroundApp: "com.apple.springboard",
roots: [{ type: "Alert", label: "Delete all data?", frame: { x: 0.1, y: 0.4, width: 0.8, height: 0.2 }, children: [
@@ -560,9 +534,9 @@ test("a node its ancestor clips away is still reported hidden on iOS", () => {
test("a fold whose panel Argent never reads fails clearly instead of capturing the dark panel", async () => {
const lit = { activeScreen: 3, screen: { id: 3, panel: "inner panel", width: 2007, height: 2853 }, posture: "open", hingeAngle: 180 };
const blindClosed = { ...DUO_HOME, foregroundApp: undefined, roots: [{ role: "AXGroup", children: [] }] };
const late = harness("ios", { "list-devices": DUO_DEVICES, fold: lit, "stop-all-simulator-servers": { stopped: [] }, "ui-tree": [blindClosed, blindClosed, DUO_OPEN_EDIT_LANE] });
const late = harness("ios", { "list-devices": DUO_DEVICES, fold: lit, "ui-tree": [blindClosed, blindClosed, DUO_OPEN_EDIT_LANE] });
assert.equal((await late.run(["fold", "open", ...flags("ios")])).exitCode, 0, "a reader that catches up within the wait is fine");
const stuck = harness("ios", { "list-devices": DUO_DEVICES, fold: lit, "stop-all-simulator-servers": { stopped: [] }, "ui-tree": blindClosed });
const stuck = harness("ios", { "list-devices": DUO_DEVICES, fold: lit, "ui-tree": blindClosed });
const failed = await stuck.run(["fold", "open", ...flags("ios")]);
assert.equal(failed.json.error.code, "CONTROLLER_FOLD_UNVERIFIED");
assert.equal(stuck.calls.filter(call => call.tool === "fold").length, 1, "the session is not folded back and forth");
+17 -221
View File
@@ -112,10 +112,6 @@ async function fixture(t, settings = {}) {
const requests = [];
let current = '/'; let snapshots = 0; let sessionName; let screenshotAttempts = 0; let splashLeft = 0; let recordingPath = ''; let alert = null; let appearance = 'light'; let alertReads = 0;
let enteredName = false; let scrolledToContinue = false; let finishHidden = false; let wedgeCleared = false; let deviceLost = false; let relaunchedAfterForeign = false; let serverStarts = 0; let unreadableLeft = settings.unreadableAfterFold ?? 0;
// startsErrored / startsUnnamed: how many session starts EAS fails, after naming the session (it ERRORS) or before.
let starts = 0; let currentSession = 'session-1'; const erroredSessions = new Set(); let foldUnverifiedLeft = settings.foldUnverified ?? 0;
// blackAfterFold: the first so many folds of an EAS agent-device session light the panel but draw nothing.
let folds = 0;
const deviceName = settings.android ? 'Pixel 7' : 'iPhone 17 Pro';
const platform = settings.android ? 'android' : 'ios';
// A local simulator is the one the capture created, named for Explore.
@@ -186,14 +182,6 @@ async function fixture(t, settings = {}) {
appConfig: { name: 'Example', slug: 'example', owner: 'acme', ...(settings.userInterfaceStyle ? { userInterfaceStyle: settings.userInterfaceStyle } : {}), scheme: settings.noScheme ? undefined : 'sample',
...(settings.android ? { android: { package: 'com.example.app' } } : { ios: { bundleIdentifier: 'com.example.app' } }), extra: { eas: { projectId: PROJECT_ID } } } });
if (command === 'simulator:availability') return json({ available: settings.available !== false });
// controlActions: what the session's serve-sim offers through simulator:control (none unless a test names them).
if (command === 'simulator:control') {
assert.equal(value(request, '--id'), currentSession, 'simulator:control names the session');
if (request.args.includes('--list')) return json(Object.fromEntries((settings.controlActions ?? []).map(action => [action, { type: 'object' }])));
assert.ok((settings.controlActions ?? []).includes(request.args[1]), `${request.args[1]} is offered by the session`);
if (request.args[1] === 'appearance.set') appearance = request.args.at(-1);
return json({ id: currentSession, action: request.args[1], output: '' });
}
if (command === 'fingerprint:generate') return json({ hash: 'source-fingerprint' });
const buildMetadata = settings.buildMetadata ? { appVersion: '2.1.0', appBuildVersion: '42' } : {};
if (command === 'build:list') return json(settings.reuse ? [{ id: 'native-build', ...buildMetadata }] : []);
@@ -223,23 +211,13 @@ async function fixture(t, settings = {}) {
}
if (command === 'simulator:start') {
sessionName = value(request, '--name');
starts += 1; currentSession = `session-${starts}`;
if (starts <= (settings.startsUnnamed ?? 0)) { writeFileSync(join(request.cwd, '.env.eas-simulator'), HEADER); throw new Error('GraphQL request failed.'); }
if (starts <= (settings.startsErrored ?? 0)) erroredSessions.add(currentSession);
writeFileSync(join(request.cwd, '.env.eas-simulator'), HEADER + `EAS_SIMULATOR_SESSION_ID='${currentSession}'\n` + (settings.argent
writeFileSync(join(request.cwd, '.env.eas-simulator'), HEADER + "EAS_SIMULATOR_SESSION_ID='session-1'\n" + (settings.argent
? "ARGENT_TOOLS_URL='https://controller.example/session'\nARGENT_AUTH_TOKEN='" + DAEMON_TOKEN + "'\n"
: "AGENT_DEVICE_DAEMON_BASE_URL='https://controller.example/session'\nAGENT_DEVICE_DAEMON_AUTH_TOKEN='" + DAEMON_TOKEN + "'\n"));
if (settings.startFailure) throw new Error('start reported failure after allocation');
if (erroredSessions.has(currentSession)) throw new Error('Simulator session errored while starting');
return { stdout: 'ready', stderr: '' };
}
// orphanFromFailedStart: a start that failed before naming the session had still created one.
if (command === 'simulator:list') return json({ sessions: settings.orphanFromFailedStart && value(request, '--name') === sessionName ? [{ id: 'orphan-1', name: sessionName,
type: settings.argent ? 'argent' : 'agent-device', status: 'STARTING', platform: 'IOS',
// orphanUnproven: the session by that name does not show it belongs to this project.
deviceRunSessionUrl: `https://expo.dev/accounts/${settings.orphanUnproven ? 'someone-else' : 'acme'}/projects/example/simulator-sessions/orphan-1` }] : [], pageInfo: {} });
if (command === 'simulator:get') return json({ id: value(request, '--id'), name: sessionName, type: settings.argent ? 'argent' : 'agent-device', platform: settings.android ? 'ANDROID' : 'IOS',
status: erroredSessions.has(value(request, '--id')) ? 'ERRORED' : 'IN_PROGRESS',
if (command === 'simulator:get') return json({ id: 'session-1', name: sessionName, type: settings.argent ? 'argent' : 'agent-device', platform: settings.android ? 'ANDROID' : 'IOS', status: 'IN_PROGRESS',
app: { id: settings.wrongProject ? 'foreign-project' : PROJECT_ID, slug: 'example', ownerAccount: { name: 'acme' } },
remoteConfig: { ...(settings.argent ? { toolsUrl: 'https://controller.example/session', toolsAuthToken: DAEMON_TOKEN }
: { agentDeviceRemoteSessionUrl: 'https://controller.example/session', agentDeviceRemoteSessionToken: DAEMON_TOKEN }),
@@ -248,7 +226,7 @@ async function fixture(t, settings = {}) {
...(settings.previewApiUrl ? { previewApiUrl: settings.previewApiUrl } : {}) } });
if (command === 'simulator:stop') {
if (settings.stopFailure) throw new Error('stop unavailable');
return json({ id: value(request, '--id'), status: 'STOPPED' });
return json({ id: 'session-1', status: 'STOPPED' });
}
}
if (request.command === 'fake-repack') {
@@ -263,7 +241,6 @@ async function fixture(t, settings = {}) {
// An Argent capture runs its per-run bridge in place of agent-device; the bridge answers in agent-device's envelopes.
if (request.command === 'fake-controller' || (settings.argent && request.command.endsWith('/argent-controller'))) {
if (command === '--version') return { stdout: settings.argent ? '0.29.0' : AGENT_DEVICE_VERSION, stderr: '' };
if (command === 'reset-reader') return json({ success: true, data: { action: 'reset-reader', stopped: ['AXService:device'] } });
if (command === 'open') {
// unreadableAfterFold: Argent's reader stayed on the outer panel, so the first app opens find no readable app.
if (unreadableLeft > 0 && !request.args[2]?.startsWith('sample://')) { unreadableLeft -= 1;
@@ -297,11 +274,6 @@ async function fixture(t, settings = {}) {
// An EAS session starts empty while the app is repacked; the controller installs the app from this machine.
if (command === 'install') { assert.ok(existsSync(request.args[1]), 'the repacked app is on this machine'); return ok({ installed: true, appBundleId: 'com.example.app' }); }
// agent-device 0.21.15 cannot read Xcode 27.1's hinge angle back, so a local fold reports a failure after folding.
// foldUnverified: the bridge's reader stayed on the dark panel through its own reset, for that many folds.
// The bridge exits non-zero, and the runner throws its structured error, as defaultRunner does.
if (command === 'fold') folds += 1;
if (command === 'fold' && foldUnverifiedLeft > 0) { foldUnverifiedLeft -= 1;
throw controllerCommandFailure(json({ success: false, error: { code: 'CONTROLLER_FOLD_UNVERIFIED', message: 'Argent kept reading the other panel after folding the device open, and after its device helpers were reset.' } }).stdout, 'fold'); }
if (command === 'fold') return settings.local ? json({ success: false, error: { code: 'COMMAND_FAILED', message: "CoreDevice reported no hinge angle sample: Unknown option '--device'" } })
: ok({ action: 'fold', pose: request.args[1] });
if (command === 'record' && settings.recording) {
@@ -375,13 +347,6 @@ async function fixture(t, settings = {}) {
if (request.args[1] === 'appearance') appearance = request.args[2];
return ok({ setting: request.args[1], value: request.args[2] });
}
// The display after a fold, as agent-device's screenshot shows it on EAS: in the pose's shape, drawn or black.
if (command === 'screenshot' && request.args[1]?.endsWith('/pose.png')) {
const display = new PNG(settings.devicePose === 'open' ? { width: 30, height: 20 } : { width: 20, height: 30 });
if (folds > (settings.blackAfterFold ?? 0)) display.data[0] = 255;
writeFileSync(request.args[1], PNG.sync.write(display));
return ok({ path: request.args[1] });
}
if (command === 'screenshot') {
screenshotAttempts += 1;
if (settings.firstScreenshotFails && screenshotAttempts === 1) throw new Error('temporary screenshot transport error');
@@ -503,7 +468,7 @@ test('an Argent capture starts an argent session, drives it through the bridge,
}
// Argent cannot switch appearance yet: one pass, no `settings appearance`, and a warning naming what was skipped.
assert.equal(f.requests.some(request => request.args[0] === 'settings'), false);
assert.ok(lines.some(line => /Argent cannot switch appearance on this session; capturing light only, skipped dark/.test(line)), lines.join('\n'));
assert.ok(lines.some(line => /Argent cannot switch appearance yet .*capturing light only, skipped dark/.test(line)), lines.join('\n'));
const map = JSON.parse(await readFile(join(f.options.outputDirectory, 'screen-map.json'), 'utf8'));
assert.equal(map.run.controller, 'argent');
assert.equal(map.run.environment.colorSchemes, undefined);
@@ -515,150 +480,6 @@ test('an Argent capture starts an argent session, drives it through the bridge,
assert.equal(execution.controllerPackageVersion, '0.29.0');
});
test('on an EAS iOS session with serve-sim\'s appearance.set, an Argent capture records every appearance', async t => {
const f = await fixture(t, { argent: true, userInterfaceStyle: 'automatic', controlActions: ['appearance.set'] });
const lines = [];
assert.equal((await runCiMap({ ...f.options, progress: line => lines.push(line) })).runStatus, 'complete');
assert.equal(lines.some(line => /Argent cannot switch appearance/.test(line)), false, lines.join('\n'));
assert.deepEqual(f.requests.filter(request => request.args[0] === 'simulator:control' && request.args[1] === 'appearance.set').map(request => request.args.at(-1)), ['light', 'dark']);
const map = JSON.parse(await readFile(join(f.options.outputDirectory, 'screen-map.json'), 'utf8'));
assert.deepEqual(map.run.environment.colorSchemes, ['light', 'dark']);
});
test('an EAS iOS session approves the app\'s link scheme after installing it and before any link opens', async t => {
for (const argent of [false, true]) {
const f = await fixture(t, { argent, controlActions: ['app.approveUrlScheme'] });
assert.equal((await runCiMap(f.options)).runStatus, 'complete');
const approve = f.requests.findIndex(request => request.args[0] === 'simulator:control' && request.args[1] === 'app.approveUrlScheme');
assert.ok(approve >= 0, argent ? 'Argent' : 'agent-device');
assert.deepEqual(f.requests[approve].args.slice(f.requests[approve].args.indexOf('--') + 1), ['com.example.app', 'sample']);
const controller = f.requests.map((request, index) => ({ request, index })).filter(({ request }) => request.command === 'fake-controller' || request.command.endsWith('/argent-controller'));
const install = controller.find(({ request }) => request.args[0] === 'install');
const firstLink = controller.find(({ request }) => request.args[0] === 'open' && request.args[2]?.startsWith('sample://'));
assert.ok(install.index < approve && approve < firstLink.index, 'installed, then approved, then the first link');
}
// A session whose serve-sim predates the action keeps the controllers' prompt handling, and is not asked.
const older = await fixture(t, { argent: true });
assert.equal((await runCiMap(older.options)).runStatus, 'complete');
assert.equal(older.requests.some(request => request.args[0] === 'simulator:control' && !request.args.includes('--list')), false);
});
test('when Argent cannot read the app after a fold on EAS, the capture resets its device helpers, then restarts SpringBoard, and never stops the tool-server', async t => {
const actions = ['springboard.restart'];
for (const [unreadable, completes, resets, restarts] of [[1, true, 1, 0], [2, true, 2, 1], [3, false, 2, 1]]) {
const f = await fixture(t, { argent: true, devicePose: 'open', unreadableAfterFold: unreadable, controlActions: actions });
const lines = [];
const run = runCiMap({ ...f.options, progress: line => lines.push(line), sleep: () => {} });
if (completes) assert.equal((await run).runStatus, 'complete', `${unreadable} unreadable opens`);
else await assert.rejects(run, error => JSON.stringify(error).includes('CONTROLLER_READER_STUCK'));
assert.equal(f.requests.filter(request => request.command.endsWith('/argent-controller') && request.args[0] === 'reset-reader').length, resets);
assert.equal(f.requests.filter(request => request.args[0] === 'simulator:control' && request.args[1] === 'springboard.restart').length, restarts);
assert.equal(f.requests.some(request => request.args.join(' ').includes('server stop')), false, 'the session\'s tool-server is never stopped');
assert.ok(lines.some(line => /resetting Argent's device helpers/.test(line)), lines.join('\n'));
}
// Without springboard.restart (an older serve-sim), a second unreadable open is reported after the reset alone.
const older = await fixture(t, { argent: true, devicePose: 'open', unreadableAfterFold: 2 });
await assert.rejects(runCiMap({ ...older.options, sleep: () => {} }), error => JSON.stringify(error).includes('CONTROLLER_READER_STUCK'));
});
test('when a fold on EAS leaves Argent reading the dark panel, the capture restarts SpringBoard and folds again, once', async t => {
for (const [unverified, completes] of [[1, true], [2, false]]) {
const f = await fixture(t, { argent: true, devicePose: 'open', foldUnverified: unverified, controlActions: ['springboard.restart'] });
const run = runCiMap({ ...f.options, sleep: () => {} });
if (completes) assert.equal((await run).runStatus, 'complete');
else await assert.rejects(run, error => JSON.stringify(error).includes('CONTROLLER_READER_STUCK'));
assert.equal(f.requests.filter(request => request.command.endsWith('/argent-controller') && request.args[0] === 'fold').length, 2);
assert.equal(f.requests.filter(request => request.args[0] === 'simulator:control' && request.args[1] === 'springboard.restart').length, 1);
}
});
test('a session EAS ends while starting is replaced by a new one, under a name of its own, up to five times with a growing wait', async t => {
const f = await fixture(t, { startsErrored: 1 });
const lines = []; const waits = [];
const result = await runCiMap({ ...f.options, progress: line => lines.push(line), sleep: ms => { waits.push(ms); } });
assert.equal(result.runStatus, 'complete');
const started = f.requests.filter(request => request.args[0] === 'simulator:start').map(request => value(request, '--name'));
assert.equal(started.length, 2);
assert.notEqual(started[0], started[1], 'the new session has a name of its own');
assert.ok(lines.some(line => /EAS ended simulator session session-1 \(ERRORED\) before it was ready; starting a new EAS Simulator session in 10 s \(1\/5\)/.test(line)), lines.join('\n'));
assert.equal(lines.filter(line => /while the app is repacked/.test(line)).length, 1, 'only the first start runs beside the repack');
assert.equal(result.simulatorSessionId, 'session-2');
assert.ok(waits.includes(10_000));
// Five new sessions at most, waiting 10 s, 20 s, 40 s, 80 s and 120 s before them; then the failure to start is reported as one.
const always = await fixture(t, { startsErrored: 6 });
const backoff = [];
await assert.rejects(runCiMap({ ...always.options, sleep: ms => { if (ms >= 10_000) backoff.push(ms); } }),
error => error.code === 'SIMULATOR_START_FAILED' && /6 sessions ended before they were ready \(the last, session-6, ERRORED\)/.test(error.message)
&& error.details.endedSessions.length === 6 && error.details.attempts === 6);
assert.equal(always.requests.filter(request => request.args[0] === 'simulator:start').length, 6);
assert.deepEqual(backoff, [10_000, 20_000, 40_000, 80_000, 120_000]);
assert.equal(new Set(always.requests.filter(request => request.args[0] === 'simulator:start').map(request => value(request, '--name'))).size, 6, 'every session has its own name');
// One session that ended is a failure to start too, not a question of ownership.
const once = await fixture(t, { startsErrored: 6 });
await assert.rejects(runCiMap({ ...once.options, sleep: () => {}, runner: request => {
if (request.args[0] === 'simulator:start' && once.requests.filter(r => r.args[0] === 'simulator:start').length >= 1) throw new Error('Controller simulator:start exited with status 1: quota exhausted');
return once.options.runner(request);
} }), error => error.code === 'SIMULATOR_START_FAILED');
});
test('new sessions stay within 30 minutes of the first failed start, each start capped by what is left', async t => {
const f = await fixture(t, { startsErrored: 6 });
let clock = Date.parse('2026-10-18T00:00:00Z');
const timeouts = [];
await assert.rejects(runCiMap({ ...f.options, now: () => clock, sleep: ms => { clock += ms; }, runner: request => {
// Each start takes 10 minutes before EAS ends the session.
if (request.args[0] === 'simulator:start') { timeouts.push(request.timeoutMs); clock += 10 * 60_000; }
return f.options.runner(request);
} }), error => error.code === 'SIMULATOR_START_FAILED');
// The budget runs from the first failure, at 10:00, to 40:00. The start at 10:10 fits whole; those at 20:30 and 31:10
// get only what is left (19:30, then 8:50); after 41:10 none starts.
assert.deepEqual(timeouts, [20 * 60_000, 20 * 60_000, 19.5 * 60_000, (8 * 60 + 50) * 1000]);
});
test('Ctrl+C while waiting for a new session stops the review instead of starting one', async t => {
const f = await fixture(t, { startsErrored: 6 });
const controller = new AbortController();
await assert.rejects(runCiMap({ ...f.options, signal: controller.signal, sleep: () => controller.abort(new Error('interrupted')) }));
assert.equal(f.requests.filter(request => request.args[0] === 'simulator:start').length, 1);
});
test('a start that fails before naming a session stops any session of that name first, then starts a new one', async t => {
const f = await fixture(t, { startsUnnamed: 1, orphanFromFailedStart: true });
assert.equal((await runCiMap({ ...f.options, sleep: () => {} })).runStatus, 'complete');
const order = f.requests.map(request => request.args[0] === 'simulator:stop' && value(request, '--id') === 'orphan-1' ? 'stop-orphan' : request.args[0] === 'simulator:start' ? 'start' : undefined).filter(Boolean);
assert.deepEqual(order, ['start', 'stop-orphan', 'start']);
// The last failed start is accounted for as well, though no new session follows it.
const always = await fixture(t, { startsUnnamed: 6, orphanFromFailedStart: true });
await assert.rejects(runCiMap({ ...always.options, sleep: () => {} }), error => error.code === 'SIMULATOR_START_FAILED');
assert.equal(always.requests.filter(request => request.args[0] === 'simulator:stop' && value(request, '--id') === 'orphan-1').length, 6);
});
test('a session of that name Explore cannot prove is its own is never stopped or replaced', async t => {
const f = await fixture(t, { startsUnnamed: 1, orphanFromFailedStart: true, orphanUnproven: true });
await assert.rejects(runCiMap({ ...f.options, sleep: () => {} }), error => error.code === 'SIMULATOR_START_FAILED');
assert.equal(f.requests.filter(request => request.args[0] === 'simulator:start').length, 1);
assert.equal(f.requests.some(request => request.args[0] === 'simulator:stop'), false);
});
test('a session Explore cannot prove is its own is never replaced, even one that ERRORED', async t => {
const f = await fixture(t, { wrongProject: true, startsErrored: 1 });
await assert.rejects(runCiMap(f.options), error => /SESSION_HANDOFF_UNVERIFIED/.test(JSON.stringify(error)));
assert.equal(f.requests.filter(request => request.args[0] === 'simulator:start').length, 1);
});
test('account failures to start are not retried; temporary ones and timeouts are', async t => {
for (const [message, retried] of [['GraphQL request failed: not authorized', false], ['quota exhausted', false], ['GraphQL request failed.', true], ['No simulator capacity for iPhone Duo', true]]) {
const f = await fixture(t);
let starts = 0;
const run = runCiMap({ ...f.options, sleep: () => {}, runner: request => {
if (request.args[0] === 'simulator:start' && ++starts === 1) { writeFileSync(join(request.cwd, '.env.eas-simulator'), HEADER); throw new Error(`Controller simulator:start exited with status 1: ${message}`); }
return f.options.runner(request);
} });
if (retried) assert.equal((await run).runStatus, 'complete', message); else await assert.rejects(run, error => error.code === 'SIMULATOR_START_FAILED', message);
assert.equal(starts, retried ? 2 : 1, message);
}
});
test('an Argent capture of an app pinned to dark is labelled dark and is not warned about', async t => {
const f = await fixture(t, { argent: true, userInterfaceStyle: 'dark' });
const lines = [];
@@ -668,45 +489,20 @@ test('an Argent capture of an app pinned to dark is labelled dark and is not war
assert.equal(execution.colorScheme, 'dark');
});
test('device.pose with Argent folds the device first, before the app is opened, read or captured', async t => {
const f = await fixture(t, { devicePose: 'open', argent: true });
assert.equal((await runCiMap(f.options)).runStatus, 'complete');
const controller = f.requests.filter(request => request.command.endsWith('/argent-controller'));
const folds = controller.filter(request => request.args[0] === 'fold');
assert.equal(folds.length, 1);
assert.deepEqual(folds[0].args.slice(0, 2), ['fold', 'open']);
const foldAt = controller.indexOf(folds[0]);
// The fold comes first: the app is installed but not opened, read or captured before it, so the controller starts on the lit panel.
assert.deepEqual(controller.slice(0, foldAt).map(request => request.args[0]).filter(command => command !== '--version' && command !== 'install'), []);
// Argent's bridge is told the pose, so it captures the opened panel's landscape UI upright.
for (const request of controller) assert.equal(request.environment.EXPLORE_ARGENT_POSE, 'open');
});
test('device.pose with agent-device on EAS opens the app, folds, and checks the display it lit', async t => {
const f = await fixture(t, { devicePose: 'open' });
assert.equal((await runCiMap({ ...f.options, sleep: () => {} })).runStatus, 'complete');
const controller = f.requests.filter(request => request.command === 'fake-controller').map(request => request.args[0] === 'screenshot' && request.args[1].endsWith('/pose.png') ? 'pose' : request.args[0]);
// agent-device folds only inside a session, so the app opens first; the fold's hinge readback is not trusted, the display is.
assert.deepEqual(controller.filter(command => command !== '--version' && command !== 'install').slice(0, 3), ['open', 'fold', 'pose']);
assert.equal(f.requests.some(request => request.args[0] === 'simulator:control' && request.args[1] === 'springboard.restart'), false);
});
test('when an agent-device fold on EAS lights a black panel, the capture restarts SpringBoard, reopens the app and folds again, once', async t => {
for (const [black, completes] of [[1, true], [2, false]]) {
const f = await fixture(t, { devicePose: 'open', blackAfterFold: black, controlActions: ['springboard.restart'] });
const lines = [];
const run = runCiMap({ ...f.options, sleep: () => {}, progress: line => lines.push(line) });
if (completes) assert.equal((await run).runStatus, 'complete');
else await assert.rejects(run, error => JSON.stringify(error).includes('CONTROLLER_READER_STUCK'));
const controller = f.requests.filter(request => request.command === 'fake-controller');
assert.equal(controller.filter(request => request.args[0] === 'fold').length, 2);
assert.ok(controller.some(request => request.args[0] === 'open' && request.args.includes('--relaunch')), 'the app is reopened after SpringBoard');
assert.equal(f.requests.filter(request => request.args[0] === 'simulator:control' && request.args[1] === 'springboard.restart').length, 1);
assert.ok(lines.some(line => /did not draw the open display after the fold; restarting SpringBoard/.test(line)), lines.join('\n'));
test('device.pose folds the device first, before the app is opened, read or captured', async t => {
for (const argent of [false, true]) {
const f = await fixture(t, { devicePose: 'open', argent });
assert.equal((await runCiMap(f.options)).runStatus, 'complete');
const controller = f.requests.filter(request => request.command === 'fake-controller' || request.command.endsWith('/argent-controller'));
const folds = controller.filter(request => request.args[0] === 'fold');
assert.equal(folds.length, 1);
assert.deepEqual(folds[0].args.slice(0, 2), ['fold', 'open']);
const foldAt = controller.indexOf(folds[0]);
// The fold comes first: the app is installed but not opened, read or captured before it, so the controller starts on the lit panel.
assert.deepEqual(controller.slice(0, foldAt).map(request => request.args[0]).filter(command => command !== '--version' && command !== 'install'), []);
// Argent's bridge is told the pose, so it captures the opened panel's landscape UI upright.
if (argent) for (const request of controller) assert.equal(request.environment.EXPLORE_ARGENT_POSE, 'open');
}
// Without springboard.restart (an older serve-sim), a black panel is reported at once.
const older = await fixture(t, { devicePose: 'open', blackAfterFold: 1 });
await assert.rejects(runCiMap({ ...older.options, sleep: () => {} }), error => JSON.stringify(error).includes('CONTROLLER_FOLD_UNVERIFIED'));
});
test('a local simulator capture creates its own iOS simulator, installs the repacked app there, and deletes the simulator', async t => {
+2 -6
View File
@@ -639,12 +639,8 @@ test("doctor checks each target where it runs: local tools for local targets, EA
targets: { phone: { platform: "ios" }, cloud: { platform: "ios", device: "iPhone 17 Pro", simulator: "eas", controller: "argent" } } });
assert.deepEqual(devices(mixed), ["iPhone 17"]);
assert.equal(check(mixed, "eas-simulator")[0].status, "pass");
// The target's Argent is reported as a top-level one would be: on an iOS EAS session the host switches its appearance.
assert.equal(check(mixed, "controller")[0].status, "pass");
// Only Argent on an Android EAS session records a single appearance.
const android = await doctor({ ...baseConfig, targets: { phone: { platform: "ios" },
droid: { platform: "android", device: "pixel_7", bundleId: "com.example.app", easProfile: "explore-android", controller: "argent" } } });
assert.equal(check(android, "controller")[0].code, "CONTROLLER_APPEARANCE_FIXED");
// The target's Argent is reported as a top-level one would be.
assert.equal(check(mixed, "controller")[0].code, "CONTROLLER_APPEARANCE_FIXED");
// --simulator and --controller decide for every target, as they do in a capture.
const forced = await doctor({ ...baseConfig, targets: { phone: { platform: "ios", simulator: "local", controller: "argent" } } }, { simulator: "eas", controller: "agent-device" });
assert.deepEqual(devices(forced), []);
+1 -1
View File
@@ -130,7 +130,7 @@ function runtimeFor(side, map, expectedSamples = 3, capturedSamples = expectedSa
observationId: observation.id,
expectedSampleCount: expectedSamples,
controllerPackageVersion: "0.20.2",
easCliVersion: "25.2.0",
easCliVersion: "25.0.0",
},
runtime: {
kind: "eas-agent-device-raw",
-28
View File
@@ -1,28 +0,0 @@
import assert from "node:assert/strict";
import test from "node:test";
const { tsImport } = await import("tsx/esm/api");
const { heldKeyHint, shortcutModifiers } = await tsImport("../../viewer/src/utils/held-modifiers.ts", import.meta.url);
const { SHORTCUTS } = await tsImport("../../viewer/src/utils/shortcuts.ts", import.meta.url);
const held = (keys) => ({ shift: false, ctrl: false, meta: false, alt: false, ...keys });
test("holding a chord's modifiers shows the key that completes it; anything else shows nothing", () => {
assert.equal(heldKeyHint(SHORTCUTS.canvasByNumber.map, held({ ctrl: true }), true), "1");
assert.equal(heldKeyHint(SHORTCUTS.canvasByNumber.compare, held({ ctrl: true }), true), "3");
assert.equal(heldKeyHint(SHORTCUTS.camera.fit, held({ shift: true }), true), "1");
assert.equal(heldKeyHint(SHORTCUTS.appearance.app, held({ shift: true }), true), "T");
assert.equal(heldKeyHint(SHORTCUTS.canvasByNumber.map, held({ shift: true }), true), undefined, "the wrong modifier");
assert.equal(heldKeyHint(SHORTCUTS.canvasByNumber.map, held({ ctrl: true, shift: true }), true), undefined, "an extra modifier");
assert.equal(heldKeyHint(SHORTCUTS.canvas.map, held({ ctrl: true }), true), undefined, "a plain key has no chord");
assert.equal(heldKeyHint(SHORTCUTS.canvasByNumber.map, held({}), true), undefined, "nothing held");
});
test("mod is ⌘ on Apple keyboards and Ctrl elsewhere", () => {
assert.equal(heldKeyHint(SHORTCUTS.app.search, held({ meta: true }), true), "K");
assert.equal(heldKeyHint(SHORTCUTS.app.search, held({ ctrl: true }), true), undefined);
assert.equal(heldKeyHint(SHORTCUTS.app.search, held({ ctrl: true }), false), "K");
assert.equal(heldKeyHint(SHORTCUTS.app.search, held({ meta: true }), false), undefined);
assert.deepEqual(shortcutModifiers(SHORTCUTS.app.search, true), held({ meta: true }));
assert.deepEqual(shortcutModifiers(SHORTCUTS.app.search, false), held({ ctrl: true }));
});
+1 -68
View File
@@ -2,7 +2,7 @@ import assert from "node:assert/strict";
import test from "node:test";
const { tsImport } = await import("tsx/esm/api");
const { HOLD_INITIAL_DELAY_MS, HOLD_FIRST_INTERVAL_MS, HOLD_FLOOR_INTERVAL_MS, createKeyHold, glideRate, holdIntervalMs, holdSchedule } =
const { HOLD_INITIAL_DELAY_MS, HOLD_FIRST_INTERVAL_MS, HOLD_FLOOR_INTERVAL_MS, holdIntervalMs, holdSchedule } =
await tsImport("../../viewer/src/utils/key-hold.ts", import.meta.url);
test("a held paging key waits, then steps sooner and sooner down to a floor", () => {
@@ -16,70 +16,3 @@ test("a held paging key waits, then steps sooner and sooner down to a floor", ()
assert.ok(schedule.at(-1) < 2000, "six held steps fit in two seconds");
assert.ok(HOLD_INITIAL_DELAY_MS > HOLD_FIRST_INTERVAL_MS, "the hold begins slower than it repeats");
});
test("a held key steps on the schedule from its first step, and ends when a step finds nothing", (t) => {
t.mock.timers.enable({ apis: ["setTimeout"] });
const hold = createKeyHold();
let steps = 0;
hold.begin("ArrowRight", () => (steps += 1) < 3);
assert.ok(hold.holding("ArrowRight"));
assert.ok(!hold.holding("ArrowLeft"));
t.mock.timers.tick(HOLD_INITIAL_DELAY_MS - 1);
assert.equal(steps, 0, "nothing before the initial delay");
t.mock.timers.tick(1);
assert.equal(steps, 1, "the second step lands after the initial delay");
t.mock.timers.tick(holdIntervalMs(1));
assert.equal(steps, 2);
t.mock.timers.tick(holdIntervalMs(2));
assert.equal(steps, 3, "the third attempt finds nothing");
assert.ok(!hold.holding("ArrowRight"), "and the hold ends by itself");
t.mock.timers.tick(10_000);
assert.equal(steps, 3, "no further steps");
});
test("ending a hold, or beginning another key, stops the first", (t) => {
t.mock.timers.enable({ apis: ["setTimeout"] });
const hold = createKeyHold();
let right = 0;
let left = 0;
hold.begin("ArrowRight", () => { right += 1; return true; });
t.mock.timers.tick(HOLD_INITIAL_DELAY_MS);
assert.equal(right, 1);
hold.begin("ArrowLeft", () => { left += 1; return true; });
assert.ok(!hold.holding("ArrowRight"));
assert.ok(hold.holding("ArrowLeft"));
// Mock timers run one scheduled round per tick; a hold schedules the next step from each step.
t.mock.timers.tick(HOLD_INITIAL_DELAY_MS);
t.mock.timers.tick(holdIntervalMs(1));
assert.equal(right, 1, "the first key stopped stepping");
assert.equal(left, 2);
hold.end();
assert.ok(!hold.holding("ArrowLeft"));
t.mock.timers.tick(holdIntervalMs(2));
t.mock.timers.tick(1000);
assert.equal(left, 2);
});
test("another key ends a hold, as the OS's own repeat stops; its own repeats and a modifier do not", () => {
const key = (code, key = code, repeat = false) => ({ code, key, repeat });
const hold = createKeyHold();
hold.begin("ArrowDown", () => true);
hold.interrupt(key("ArrowDown", "ArrowDown", true));
hold.interrupt(key("ShiftLeft", "Shift"));
hold.interrupt(key("MetaLeft", "Meta"));
assert.ok(hold.holding("ArrowDown"), "its own repeat and a modifier leave it held");
hold.interrupt(key("Escape"));
assert.ok(!hold.holding("ArrowDown"), "Esc ends it");
hold.begin("ArrowDown", () => true);
hold.interrupt(key("KeyK", "k"));
assert.ok(!hold.holding("ArrowDown"), "so does the K of ⌘K");
hold.end();
});
test("a glide picks up from rest, then eases from the stepped hold's first speed up to its top speed", () => {
assert.equal(glideRate(0), 0, "it starts at rest, where the tap's step ended");
assert.ok(Math.abs(glideRate(80) - 1000 / HOLD_FIRST_INTERVAL_MS) < 0.2, "within a few frames it moves a step per first interval");
for (let at = 10; at <= 1200; at += 10) assert.ok(glideRate(at) >= glideRate(at - 10), `never slows, at ${at}ms`);
assert.equal(glideRate(1000), 1000 / HOLD_FLOOR_INTERVAL_MS, "after a second, a step per floor interval");
assert.equal(glideRate(5000), glideRate(1000), "and no faster");
});
+1 -9
View File
@@ -2,7 +2,7 @@ import assert from "node:assert/strict";
import test from "node:test";
const { tsImport } = await import("tsx/esm/api");
const { mapKeyDirection, mapKeyEntry, mapKeyTarget } = await tsImport("../../viewer/src/utils/map-keyboard.ts", import.meta.url);
const { mapKeyDirection, mapKeyTarget } = await tsImport("../../viewer/src/utils/map-keyboard.ts", import.meta.url);
// A top-to-bottom map: root fans out to a, b, c on one rank; b leads on to d; e is a stray rank with no edges.
// root
@@ -100,11 +100,3 @@ test("a left-to-right map needs no special case: the keys read positions", () =>
assert.equal(mapKeyTarget(rotated, "a", "down"), "b");
assert.equal(mapKeyTarget(rotated, "c", "up"), "b");
});
test("with nothing selected, an arrow enters the map at the edge it moves away from, as Screens' arrows do", () => {
assert.equal(mapKeyEntry(structure, "down"), "root", "down starts at the top");
assert.equal(mapKeyEntry(structure, "up"), "d", "up starts at the bottom; the leftmost of that rank");
assert.equal(mapKeyEntry(structure, "right"), "a", "right starts at the left edge");
assert.equal(mapKeyEntry(structure, "left"), "e", "left starts at the right edge");
assert.equal(mapKeyEntry({ positions: new Map() }, "down"), undefined, "an empty map has no entry");
});
+1 -15
View File
@@ -66,7 +66,7 @@ async function exportFixture(t, options) {
}
/** A fake EAS CLI plus a fake deployment: `deploy` captures the sealed report and .env, then serves them like the Worker would. */
function easFixture({ origin = "https://acme-explore--1lcbdcpwn3.expo.app", aliasOrigin = "https://acme-explore--bluesky.expo.app", accounts = ["brent-org"], failDeploy = false, aliasServes = true, aliasListing, existingComment } = {}) {
function easFixture({ origin = "https://acme-explore--1lcbdcpwn3.expo.app", aliasOrigin = "https://acme-explore--bluesky.expo.app", accounts = ["brent-org"], failDeploy = false, aliasServes = true, existingComment } = {}) {
let deploys = 0;
let latestComment = existingComment;
const calls = []; const captured = {};
@@ -107,8 +107,6 @@ function easFixture({ origin = "https://acme-explore--1lcbdcpwn3.expo.app", alia
? new Response("<!doctype html>", { status: 200, headers: { "content-type": "text/html; charset=utf-8" } })
: new Response("# Expo Explore report", { status: 200, headers: { "content-type": "text/markdown; charset=utf-8" } });
if (match[2] === "api/v1") return new Response(JSON.stringify({ kind: "pr-review" }), { status: 200, headers: { "content-type": "application/json; charset=utf-8" } });
// aliasListing: the alias still points at an earlier deployment of the same token and reports, listed the old way.
if (match[2] === "reports.json" && aliasListing && url.origin === aliasOrigin) return new Response(aliasListing, { status: 200, headers: { "content-type": "application/json; charset=utf-8" } });
if (match[2] === "reports.json") return new Response(JSON.stringify(captured.listing.map(({ path: _path, ...rest }) => rest)), { status: 200, headers: { "content-type": "application/json; charset=utf-8" } });
// Selection as the Worker does it: ?target= by id, ?platform= by id and then by platform, else the first.
const target = url.searchParams.get("target"), platform = url.searchParams.get("platform");
@@ -476,18 +474,6 @@ test("a fixture preview seals each platform's ZIP as is behind one alias and lis
assert.equal(logged.filter(line => /^::warning::The alias https:\/\/explore-viewer-pr--pr-12\.expo\.app still answers HTTP 404 \d+ s after eas deploy returned\. The pull request links the deployment https:\/\/acme-explore--1lcbdcpwn3\.expo\.app instead\./.test(line)).length, 1);
assert.ok(behind.requests.some(request => request.url.origin === "https://explore-viewer-pr--pr-12.expo.app"), "the alias was polled");
// The example report keeps one token and the same fixtures, so an alias still on the previous deployment serves the
// token page and the same report: only its listing (an older Viewer's) gives it away. That is an alias behind too.
const stale = easFixture({ aliasOrigin: "https://explore-viewer-pr--pr-12.expo.app", aliasListing: JSON.stringify([{ platform: "ios" }]) });
clock = now; logged.length = 0;
process.stderr.write = chunk => { logged.push(String(chunk)); return true; };
try {
linked = await deployFixturePreview({ reports: [{ platform: "ios", zipPath: join(root, "ios.zip") }], project: "explore-viewer-pr", owner: "brent-org", alias: "pr-12", token,
exportPath, environment: deployEnvironment, transport: stale.transport, run: stale.run, now: ticking, verifyTimeoutMs: 60_000 });
} finally { process.stderr.write = quiet; }
assert.equal(linked.previewUrl, `https://acme-explore--1lcbdcpwn3.expo.app/p/${token}`);
assert.equal(logged.filter(line => /^::warning::The alias https:\/\/explore-viewer-pr--pr-12\.expo\.app still serves an earlier deployment \d+ s after eas deploy returned\./.test(line)).length, 1);
await assert.rejects(deployFixturePreview({ reports: [{ platform: "ios", zipPath: join(root, "ios.zip") }, { platform: "ios", zipPath: join(root, "ios.zip") }],
project: "explore-viewer-pr", alias: "pr-12", exportPath, environment: deployEnvironment, transport: eas.transport, run: eas.run, verifyTimeoutMs: 1 }),
error => error.code === "PREVIEW_REPORTS_INVALID");
+1 -1
View File
@@ -60,7 +60,7 @@ function state(overrides = {}) {
phase: 'ready', pullRequest, mode: 'changes', executionMode: 'deterministic', configPath: '.expo-explore/config.yaml', links,
startedAt: Date.parse('2026-09-11T03:00:48Z'), updatedAt: Date.parse('2026-09-11T03:07:00Z'),
build: { appName: 'Example', appVersion: '1.4.0', appBuildNumber: '27', platform: 'ios', easProfile: 'explore', easBuildId: 'eas-build', reusedEasBuild: true },
runtime: { provider: 'eas-simulator', controller: 'agent-device', controllerPackageVersion: '0.20.2', easCliVersion: '25.2.0', platform: 'ios', deviceModel: 'iPhone 17', osVersion: '26.5', locale: 'en-US', orientation: 'portrait', colorScheme: 'light', sessionLifecycle: 'stopped' },
runtime: { provider: 'eas-simulator', controller: 'agent-device', controllerPackageVersion: '0.20.2', easCliVersion: '25.0.0', platform: 'ios', deviceModel: 'iPhone 17', osVersion: '26.5', locale: 'en-US', orientation: 'portrait', colorScheme: 'light', sessionLifecycle: 'stopped' },
capture: { planned: { base: 3, head: 3 }, done: { base: 3, head: 3 }, baseFromCache: true },
review: evidenceReview(),
evidence: {
+1 -1
View File
@@ -13,7 +13,7 @@ const BASE_SHA = "a".repeat(40);
const HEAD_SHA = "b".repeat(40);
const PNG = Buffer.from("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=", "base64");
const EXECUTION = {
provider: "eas-simulator", controller: "agent-device", controllerPackageVersion: AGENT_DEVICE_VERSION, easCliVersion: "25.2.0",
provider: "eas-simulator", controller: "agent-device", controllerPackageVersion: AGENT_DEVICE_VERSION, easCliVersion: "25.0.0",
platform: "ios", deviceModel: "iPhone 17", osVersion: "26.0", locale: "en-US", orientation: "portrait",
colorScheme: "light", sessionLifecycle: "stopped",
};
+2 -2
View File
@@ -16,7 +16,7 @@ function execution(overrides = {}) {
provider: "eas-simulator",
controller: "agent-device",
controllerPackageVersion: AGENT_DEVICE_VERSION,
easCliVersion: "25.2.0",
easCliVersion: "25.0.0",
platform: "ios",
deviceModel: "iPhone 17",
osVersion: "26.0",
@@ -189,7 +189,7 @@ test("projects one map surface into the five runtime evidence groups", () => {
assert.equal(result.groups.interaction.transitionCount.value, 1);
assert.equal(result.groups.ui.landmarks.value.length, 0);
assert.equal(result.groups.environment.controllerPackageVersion?.value, AGENT_DEVICE_VERSION);
assert.equal(result.groups.environment.easCliVersion?.value, "25.2.0");
assert.equal(result.groups.environment.easCliVersion?.value, "25.0.0");
});
test("normalizes multi-line labels and treats only open parser gaps as truncation", () => {
-40
View File
@@ -1,40 +0,0 @@
import assert from "node:assert/strict";
import test from "node:test";
import { tsImport } from "tsx/esm/api";
const { approveSessionUrlSchemes, simulatorControl, simulatorControlActions } = await tsImport("../../src/capture/simulator-control.ts", import.meta.url);
function easFake(listed) {
const calls = [];
const eas = (args, options) => {
calls.push({ args, options });
if (args.includes("--list")) { if (listed instanceof Error) throw listed; return { stdout: listed }; }
return { stdout: "{}" };
};
return { calls, eas };
}
test("a session's control actions come from --list, by session id; an older session or CLI has none", () => {
const { calls, eas } = easFake(JSON.stringify({ "appearance.set": {}, "springboard.restart": {} }));
assert.deepEqual([...simulatorControlActions(eas, "session-1")], ["appearance.set", "springboard.restart"]);
assert.deepEqual(calls[0].args, ["simulator:control", "--list", "--id", "session-1", "--json", "--non-interactive"]);
assert.equal(calls[0].options.allowFailure, true);
assert.equal(simulatorControlActions(easFake("Unknown command simulator:control").eas, "session-1").size, 0);
assert.equal(simulatorControlActions(easFake(new Error("eas exited 1")).eas, "session-1").size, 0);
});
test("an action's values follow --, so one that starts with a dash is never read as a flag", () => {
const { calls, eas } = easFake("{}");
simulatorControl(eas, "session-1", "clipboard.write", ["--not-a-flag"]);
assert.deepEqual(calls[0].args, ["simulator:control", "clipboard.write", "--id", "session-1", "--json", "--non-interactive", "--", "--not-a-flag"]);
});
test("link schemes are approved once each, lowercased, never http or https, and only when the session offers it", () => {
const { calls, eas } = easFake("{}");
const approved = approveSessionUrlSchemes(eas, "session-1", new Set(["app.approveUrlScheme"]), "dev.example.app", ["Example", "example", "https", "exp+example", "not a scheme"]);
assert.deepEqual(approved, ["example", "exp+example"]);
assert.deepEqual(calls.map(call => call.args.slice(-2)), [["dev.example.app", "example"], ["dev.example.app", "exp+example"]]);
const none = easFake("{}");
assert.deepEqual(approveSessionUrlSchemes(none.eas, "session-1", new Set(), "dev.example.app", ["example"]), []);
assert.equal(none.calls.length, 0);
});
+3 -17
View File
@@ -306,8 +306,6 @@ function ViewerApp() {
const [mapProjectionFitKey, setMapProjectionFitKey] = useState(0);
// A report captured in several appearances shows one at a time; the primary (first captured) is the default.
const [appearanceChoice, setAppearanceChoice] = useState<Appearance | undefined>();
// For the ⇧T shortcut, which steps to the next captured appearance; set once they are known.
const appearanceRef = useRef<{ options: readonly Appearance[]; current: Appearance | undefined }>({ options: [], current: undefined });
const [handoffOpen, setHandoffOpen] = useState(false);
/** Whether this page can hand the report off (a hosted preview); the A key reads it. */
const handoffAvailableRef = useRef(false);
@@ -373,10 +371,6 @@ function ViewerApp() {
const toggleTheme = useCallback(() => {
setThemePreference(current => current === "system" ? "dark" : current === "dark" ? "light" : "system");
}, []);
// The T key flips what is on screen, dark to light and back; only the button returns to Auto.
const flipTheme = useCallback(() => {
setThemePreference(current => (current === "system" ? preferredSystemTheme : current) === "dark" ? "light" : "dark");
}, [preferredSystemTheme]);
const load = useCallback(async (silent = false) => {
void silent;
@@ -1000,14 +994,6 @@ function ViewerApp() {
if (matchesShortcut(event, SHORTCUTS.app.handoff)) {
if (!handoffAvailableRef.current) return;
setHandoffOpen(true);
} else if (matchesShortcut(event, SHORTCUTS.appearance.theme)) {
flipTheme();
} else if (matchesShortcut(event, SHORTCUTS.appearance.app)) {
// Only a report captured in both schemes has another appearance to show.
const { options, current } = appearanceRef.current;
if (options.length < 2) return;
const index = current ? options.indexOf(current) : -1;
setAppearanceChoice(options[(index + 1) % options.length]);
} else if (matchesShortcut(event, SHORTCUTS.app.changes)) {
setChangesOpen((open) => !open);
} else if (matchesShortcut(event, SHORTCUTS.panel.right)) {
@@ -1023,7 +1009,7 @@ function ViewerApp() {
return () => {
window.removeEventListener("keydown", onKeyDown);
};
}, [clearSelectedScreen, flipTheme, navigate, searchOpen, selectCanvas, toggleRightPanel]);
}, [clearSelectedScreen, navigate, searchOpen, selectCanvas, toggleRightPanel]);
// A side-panel row or a deep link is a "go to": the camera fits that screen and the step is
// kept. Screens inventory clicks only select in place; Map clicks also focus the chosen screen. Repeating a selected target refits it without adding history.
@@ -1116,7 +1102,6 @@ function ViewerApp() {
const baseline = builds.find((build) => build.id === route.baseline);
const appearances = useMemo(() => appearanceOptions(payload?.map), [payload]);
const appearance = appearanceChoice && appearances.includes(appearanceChoice) ? appearanceChoice : appearances[0];
appearanceRef.current = { options: appearances, current: appearance };
const appearanceMap = useMemo(() => payload ? filterMapAppearance(payload.map, appearance) : undefined, [appearance, payload]);
const currentMap = useMemo(() => (
appearanceMap && workspace && currentBuild
@@ -1620,6 +1605,7 @@ function ViewerApp() {
) : <CanvasToolbar
canvas={route.canvas}
searchOpen={searchOpen}
compareCount={compareOrder.length}
{...(handoffAction ? { actions: handoffAction } : {})}
onOpenShortcuts={() => setShortcutsOpen(true)}
onSelectCanvas={selectCanvas}
@@ -1628,7 +1614,7 @@ function ViewerApp() {
</CanvasVisibleFrameProvider>
{shortcutsOpen ? (
<ShortcutsDialog
context={{ canvas: route.canvas, review: reviewingInSidebar, hasChanges: compareOrder.length > 0, handoff: Boolean(handoffInput), appearances: appearances.length > 1 }}
context={{ canvas: route.canvas, review: reviewingInSidebar, hasChanges: compareOrder.length > 0, handoff: Boolean(handoffInput) }}
onClose={() => setShortcutsOpen(false)}
/>
) : null}
@@ -3,7 +3,6 @@ import { Fullscreen, LocateFixed } from "lucide-react";
import { runCanvasZoomCommand } from "../../utils/canvas-zoom";
import { useCanvasZoom } from "../../hooks/use-canvas-zoom";
import { formatShortcut, SHORTCUTS } from "../../utils/shortcuts";
import { KeyHint } from "../shared/key-hint";
import { Menu, type MenuItem } from "../shared/menu";
import { Tooltip } from "../shared/tooltip";
import { FullscreenToggleButton, ThemeToggleButton, type ShellActionsProps, type ShellTheme } from "../panels/shell-actions";
@@ -87,7 +86,6 @@ function FitControl() {
disabled={!camera}
onClick={() => runCanvasZoomCommand(camera?.hasSelection() ? "selection" : "fit")}>
<Fullscreen aria-hidden="true" />
<KeyHint shortcut={SHORTCUTS.camera.fit} />
</button>
</Tooltip>
);
@@ -107,7 +105,6 @@ function RecenterControl() {
disabled={!camera}
onClick={() => runCanvasZoomCommand("recenter")}>
<LocateFixed aria-hidden="true" />
<KeyHint shortcut={SHORTCUTS.camera.center} />
</button>
</Tooltip>
);
+7 -4
View File
@@ -2,8 +2,7 @@ import { GitCompareArrows, Keyboard, LayoutGrid, Map, Search } from "lucide-reac
import { type CSSProperties } from "react";
import { Tooltip } from "../shared/tooltip";
import { useCanvasVisibleFrame } from "./visible-frame-provider";
import { CANVAS_NUMBER_KEYS, formatShortcut, SHORTCUTS } from "../../utils/shortcuts";
import { KeyHint } from "../shared/key-hint";
import { formatShortcut, SHORTCUTS } from "../../utils/shortcuts";
import {
CANVAS_DESCRIPTIONS,
CANVAS_LABELS,
@@ -22,6 +21,9 @@ const TOOLBAR_MINIMUM_FRAME_WIDTH = 220;
type CanvasToolbarProps = {
canvas: CanvasView;
searchOpen: boolean;
/** How many changed screens Compare holds, shown as a badge on its button. Compare's own header
steps through them. */
compareCount?: number;
/** Page-wide actions beside Search (Hand off to AI). */
actions?: React.ReactNode;
onSelectCanvas: (canvas: CanvasView) => void;
@@ -58,7 +60,6 @@ export function CanvasToolbar(props: CanvasToolbarProps) {
aria-expanded={props.searchOpen}
onClick={props.onOpenSearch}>
<Search />
<KeyHint shortcut={SHORTCUTS.app.search} />
</button>
</Tooltip>
{props.actions}
@@ -87,7 +88,9 @@ export function CanvasToolbar(props: CanvasToolbarProps) {
onClick={() => props.onSelectCanvas(id)}>
{VIEW_ICONS[id]}
<span className="toolbar-view-label" aria-hidden="true"><span>{CANVAS_LABELS[id]}</span></span>
{CANVAS_NUMBER_KEYS ? <KeyHint shortcut={SHORTCUTS.canvasByNumber[id]} /> : null}
{id === "compare" && props.compareCount ? (
<span className="toolbar-badge" aria-hidden="true">{props.compareCount}</span>
) : null}
</button>
</Tooltip>
);
+3 -60
View File
@@ -3,7 +3,6 @@ import { useReactFlow, useStore } from "@xyflow/react";
import { publishZoom, registerZoomApi, runCanvasZoomCommand } from "../../utils/canvas-zoom";
import { isTyping, matchesShortcut, SHORTCUTS } from "../../utils/shortcuts";
import { useCanvasVisibleFrame } from "./visible-frame-provider";
import { createKeyHold, glideWhileHeld, type KeyHold } from "../../utils/key-hold";
import {
canvasBoundsViewport,
canvasPriorityProjectionBounds,
@@ -16,8 +15,6 @@ import {
} from "./camera";
const DURATION = 160;
/** React Flow's zoomIn/zoomOut step, which a tap of + or − takes. */
const KEY_ZOOM_STEP = 1.2;
const PIXEL_WHEEL_ZOOM_RATE = 0.002;
const LINE_WHEEL_ZOOM_RATE = 0.05;
const PAGE_WHEEL_ZOOM_RATE = 1;
@@ -39,12 +36,6 @@ function canvasOwnsKeyboardEvent(event: KeyboardEvent, canvas: HTMLElement): boo
return focusOwned || canvas.matches(":hover");
}
function plainZoomDirection(event: KeyboardEvent): 1 | -1 | undefined {
if (event.key === "+" || event.key === "=") return 1;
if (event.key === "-" || event.key === "_") return -1;
return undefined;
}
function modifiedZoomCommand(event: KeyboardEvent): "in" | "out" | "100" | undefined {
if (event.code === "Equal" || event.code === "NumpadAdd") return "in";
if (event.code === "Minus" || event.code === "NumpadSubtract") return "out";
@@ -69,12 +60,6 @@ export function ZoomBridge(props: {
fitMaxZoom?: number;
}) {
const { visibleFrame } = useCanvasVisibleFrame();
// Outlives the effect below, which re-runs as the camera moves: a held key must not end just
// because its own zoom step re-registered the listeners.
const holdRef = useRef<KeyHold>(undefined);
holdRef.current ??= createKeyHold();
const hold = holdRef.current;
useEffect(() => () => hold.end(), [hold]);
const {
zoomIn,
zoomOut,
@@ -216,37 +201,8 @@ export function ZoomBridge(props: {
};
registerZoomApi(api);
// A tap of + or − takes one eased step. Held, the OS key repeat is ignored (each repeat
// restarting the easing made holding slower than tapping); once the tap's step has landed the
// camera glides instead, frame by frame about the pane's centre, as zoomIn does, until the key
// is released, the hold is interrupted, or the zoom reaches its limit.
const zoomStep = (direction: 1 | -1): boolean => {
const viewport = getViewport();
const next = Math.min(maxZoom, Math.max(minZoom, viewport.zoom * KEY_ZOOM_STEP ** direction));
if (next === viewport.zoom) return false;
if (direction === 1) void zoomIn({ duration: DURATION });
else void zoomOut({ duration: DURATION });
return true;
};
const zoomGlide = (direction: 1 | -1) => (steps: number): boolean => {
const viewport = getViewport();
const zoom = Math.min(maxZoom, Math.max(minZoom, viewport.zoom * KEY_ZOOM_STEP ** (direction * steps)));
if (zoom === viewport.zoom) return false;
const scale = zoom / viewport.zoom;
const centerX = canvasWidth / 2;
const centerY = canvasHeight / 2;
void setViewport({ zoom, x: centerX - (centerX - viewport.x) * scale, y: centerY - (centerY - viewport.y) * scale });
return true;
};
const onKeyDown = (event: KeyboardEvent) => {
hold.interrupt(event);
// Typing comes first: a held key's repeats belong to a field that took focus mid-hold.
if (isTyping(event.target)) return;
if (event.repeat && hold.holding(event.code)) {
event.preventDefault();
return;
}
// Browser zoom and canvas zoom use the same familiar chord. The pointer/focus boundary
// decides who owns it: canvas-owned events reset its camera; a focused panel or field keeps
@@ -269,18 +225,10 @@ export function ZoomBridge(props: {
event.preventDefault();
return;
}
const direction = plainZoomDirection(event);
if (!direction) return;
if (event.key === "+" || event.key === "=") runCanvasZoomCommand("in");
else if (event.key === "-" || event.key === "_") runCanvasZoomCommand("out");
else return;
event.preventDefault();
onCameraGestureStart.current?.();
if (!zoomStep(direction)) return;
// The hold only tracks the key (released, interrupted, a field or dialog taking over); the
// glide reads it every frame and stops with it.
hold.begin(event.code, () => true);
glideWhileHeld(hold, event.code, DURATION, zoomGlide(direction));
};
const onKeyUp = (event: KeyboardEvent) => {
if (hold.holding(event.code)) hold.end();
};
const onModifierWheel = (event: WheelEvent) => {
@@ -344,13 +292,9 @@ export function ZoomBridge(props: {
};
window.addEventListener("keydown", onKeyDown);
window.addEventListener("keyup", onKeyUp);
window.addEventListener("blur", hold.end);
canvas?.addEventListener("wheel", onModifierWheel, { capture: true, passive: false });
return () => {
window.removeEventListener("keydown", onKeyDown);
window.removeEventListener("keyup", onKeyUp);
window.removeEventListener("blur", hold.end);
canvas?.removeEventListener("wheel", onModifierWheel, { capture: true });
if (wheelFrame.current !== undefined) cancelAnimationFrame(wheelFrame.current);
wheelFrame.current = undefined;
@@ -364,7 +308,6 @@ export function ZoomBridge(props: {
getNodes,
getNodesBounds,
getViewport,
hold,
maxZoom,
minZoom,
props.fitPadding,
@@ -5,7 +5,6 @@ import { StatusGlyph } from "../shared/status-icon";
import { Tooltip } from "../shared/tooltip";
import { DIFF_LABELS, type DiffStatus } from "../../utils/build-diff";
import { formatShortcut, SHORTCUTS } from "../../utils/shortcuts";
import { KeyHint } from "../shared/key-hint";
import { setMeasurementsShown, useMeasurementsShown } from "../../utils/measurements-setting";
/** A screen whose every changed area only moved: how far, per direction, and whether no other finding remains. */
@@ -49,7 +48,6 @@ export function CompareNav(props: {
<StatusGlyph status={props.status} accessibilityOnly={props.accessibilityOnly} label={props.statusLabel ?? DIFF_LABELS[props.status]} />
{/* A route that does not fit loses its start, not the end that names the screen. */}
<code className="compare-nav-route" title={props.title}><bdi>{props.route}</bdi></code>
<KeyHint shortcut={SHORTCUTS.app.changes} />
</button>
</Tooltip>
{props.stepsApart ? null : <CompareSteps {...props} />}
@@ -6,7 +6,7 @@ import type { MapIndex } from "../../utils/model";
import type { ChangedScreen } from "../../utils/changed-screens";
import { groupVisualRegions, layoutShiftSummary, type VisualChange } from "../../utils/visual-diff";
import { formatShortcut, matchesShortcut, SHORTCUTS, shortcutsLive } from "../../utils/shortcuts";
import { createKeyHold, glideWhileHeld, HOLD_INITIAL_DELAY_MS, type KeyHold } from "../../utils/key-hold";
import { HOLD_INITIAL_DELAY_MS, holdIntervalMs } from "../../utils/key-hold";
import { optionalStorage } from "../../utils/embedded-report";
import { usePhoneLayout } from "../../utils/phone-layout";
import { ToggleGroup } from "../shared/toggle-group";
@@ -160,12 +160,11 @@ export function useCompareController(options: CompareControllerOptions) {
};
const flip = () => setFlipSide((side) => (side === "after" ? "before" : "after"));
const keyState = useRef({ previous, next, mode, activeArea, options, swipePosition });
keyState.current = { previous, next, mode, activeArea, options, swipePosition };
const keyState = useRef({ previous, next, mode, activeArea, options });
keyState.current = { previous, next, mode, activeArea, options };
// Stepping to the previous or next changed screen; a held key keeps stepping, accelerating, until
// it is released, the window loses focus, or the end is reached. The Swipe divider is continuous,
// so a tap of [ or ] nudges it one step and a held one glides. Both read the latest state.
// it is released, the window loses focus, or the list ends. Reads the latest neighbours on each step.
const stepScreen = (direction: 1 | -1): boolean => {
const state = keyState.current;
const target = direction === 1 ? state.next : state.previous;
@@ -173,38 +172,34 @@ export function useCompareController(options: CompareControllerOptions) {
state.options.onSelectScreen(target.id);
return true;
};
const moveDivider = (direction: 1 | -1, steps = 1): boolean => {
const state = keyState.current;
if (state.mode !== "swipe") return false;
const position = Math.max(0, Math.min(100, state.swipePosition + direction * SWIPE_STEP * steps));
if (position === state.swipePosition) return false;
state.swipePosition = position;
setSwipePosition(position);
return true;
const hold = useRef<{ code: string; timer: ReturnType<typeof setTimeout> } | undefined>(undefined);
const endHold = () => {
if (!hold.current) return;
clearTimeout(hold.current.timer);
hold.current = undefined;
};
const holdRef = useRef<KeyHold>(undefined);
holdRef.current ??= createKeyHold();
const hold = holdRef.current;
useEffect(() => hold.end, [hold]);
// The hold only tracks the key; the glide reads it every frame and stops with it.
const glideDivider = (code: string, direction: 1 | -1) => {
hold.begin(code, () => true);
glideWhileHeld(hold, code, HOLD_INITIAL_DELAY_MS, (steps) => moveDivider(direction, steps));
const beginHold = (code: string, direction: 1 | -1) => {
endHold();
let step = 1;
const tick = () => {
if (!stepScreen(direction)) { endHold(); return; }
hold.current = { code, timer: setTimeout(tick, holdIntervalMs(step)) };
step += 1;
};
hold.current = { code, timer: setTimeout(tick, HOLD_INITIAL_DELAY_MS) };
};
useEffect(() => endHold, []);
useEffect(() => {
const onKeyDown = (event: KeyboardEvent) => {
hold.interrupt(event);
// The browser's own repeat of the held key is not a step; it must not scroll either.
if (event.repeat && hold.holding(event.code)) { event.preventDefault(); return; }
if (event.defaultPrevented || !shortcutsLive(event)) return;
const state = keyState.current;
const keys = SHORTCUTS.compare;
const stepScreens = state.options.stepScreens !== false;
if (stepScreens && matchesShortcut(event, keys.previousScreen)) {
if (stepScreen(-1)) hold.begin(event.code, () => stepScreen(-1));
if (stepScreen(-1)) beginHold(event.code, -1);
} else if (stepScreens && matchesShortcut(event, keys.nextScreen)) {
if (stepScreen(1)) hold.begin(event.code, () => stepScreen(1));
if (stepScreen(1)) beginHold(event.code, 1);
} else if (matchesShortcut(event, keys.nextArea)) {
stepArea(1);
} else if (matchesShortcut(event, keys.previousArea)) {
@@ -225,10 +220,10 @@ export function useCompareController(options: CompareControllerOptions) {
flip();
} else if (matchesShortcut(event, keys.dividerLeft)) {
if (state.mode !== "swipe") return;
if (moveDivider(-1)) glideDivider(event.code, -1);
setSwipePosition((value) => Math.max(0, value - SWIPE_STEP));
} else if (matchesShortcut(event, keys.dividerRight)) {
if (state.mode !== "swipe") return;
if (moveDivider(1)) glideDivider(event.code, 1);
setSwipePosition((value) => Math.min(100, value + SWIPE_STEP));
} else if (matchesShortcut(event, keys.outlines)) {
toggleOutlines();
} else if (matchesShortcut(event, keys.whatChanged)) {
@@ -239,15 +234,15 @@ export function useCompareController(options: CompareControllerOptions) {
event.preventDefault();
};
const onKeyUp = (event: KeyboardEvent) => {
if (hold.holding(event.code)) hold.end();
if (hold.current && event.code === hold.current.code) endHold();
};
window.addEventListener("keydown", onKeyDown);
window.addEventListener("keyup", onKeyUp);
window.addEventListener("blur", hold.end);
window.addEventListener("blur", endHold);
return () => {
window.removeEventListener("keydown", onKeyDown);
window.removeEventListener("keyup", onKeyUp);
window.removeEventListener("blur", hold.end);
window.removeEventListener("blur", endHold);
};
});
@@ -17,8 +17,6 @@ export type ShortcutContext = {
hasChanges: boolean;
/** The report can be handed off to an agent (a hosted preview). */
handoff?: boolean;
/** The report was captured in both light and dark, so the app's appearance can be switched. */
appearances?: boolean;
};
const COMPARE = SHORTCUTS.compare;
@@ -77,15 +75,13 @@ export function shortcutGroups(context: ShortcutContext): Group[][] {
title: "View",
rows: [
...(context.canvas === "compare" ? [] : [{ label: "Show or hide the inspector", keys: [SHORTCUTS.panel.right] }]),
{ label: "Viewer theme: dark or light", keys: [SHORTCUTS.appearance.theme] },
...(context.appearances ? [{ label: "The app's appearance: light or dark", keys: [SHORTCUTS.appearance.app] }] : []),
{ label: "Show this list", keys: ["?"] },
],
};
const mapGroup: Group = {
title: "Map",
rows: [
{ label: "Walk the map, or enter it at an edge", keys: ["↑", "↓", "←", "→", "H J K L"] },
{ label: "Walk the map from the selected screen", keys: ["↑", "↓", "←", "→", "H J K L"] },
{ label: "Undo or redo moving a card", keys: [SHORTCUTS.edit.undo, SHORTCUTS.edit.redo] },
{ label: "Close the inspector, then deselect", keys: ["Esc"] },
],
+1 -4
View File
@@ -7,8 +7,6 @@ import { isPreviewPath, isReportTargetId, previewReportsUrl, targetQuery } from
import { ScreenshotImage } from "../shared/screenshot-image";
import { artifactUrl } from "../../utils/model";
import { Tooltip } from "../shared/tooltip";
import { KeyHint } from "../shared/key-hint";
import { formatShortcut, SHORTCUTS } from "../../utils/shortcuts";
import { ChangesMenu } from "./changes-menu";
import type { FocusStatus } from "../../utils/navigation";
import type { ExploreMap, MapIndex } from "../../utils/model";
@@ -194,13 +192,12 @@ export function AppPill(props: AppPillProps) {
) : null}
{props.appearance ? (
<>
<Tooltip label="Appearance · the same screens captured in the other scheme" shortcut={formatShortcut(SHORTCUTS.appearance.app)} placement="bottom">
<Tooltip label="Appearance · the same screens captured in the other scheme" placement="bottom">
<button ref={appearanceRef} type="button" className="collapsed-platform" aria-haspopup="menu" aria-expanded={appearanceOpen}
aria-label={`Appearance: ${appearanceLabel(props.appearance.current)}. Show the other appearance`}
onClick={() => setAppearanceOpen(open => !open)}>
{appearanceLabel(props.appearance.current)}
<svg aria-hidden="true" width="8" height="8" viewBox="0 0 8 8"><path d="M1 2.5 4 5.5 7 2.5" fill="none" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round" /></svg>
<KeyHint shortcut={SHORTCUTS.appearance.app} />
</button>
</Tooltip>
<Menu items={appearanceItems} open={appearanceOpen} anchorRef={appearanceRef} ariaLabel="Appearance" onDismiss={() => setAppearanceOpen(false)} />
@@ -1,7 +1,6 @@
import { useEffect, useState } from "react";
import { Maximize, Minimize, Moon, Sun, SunMoon } from "lucide-react";
import { Tooltip } from "../shared/tooltip";
import { formatShortcut, SHORTCUTS } from "../../utils/shortcuts";
import type { ThemePreference } from "../../utils/navigation";
export type ShellTheme = "light" | "dark";
@@ -52,7 +51,7 @@ const THEME_LABELS: Record<ThemePreference, string> = {
export function ThemeToggleButton(props: ShellActionsProps) {
const Icon = props.themePreference === "system" ? SunMoon : props.themePreference === "dark" ? Moon : Sun;
return (
<Tooltip label={THEME_LABELS[props.themePreference]} shortcut={formatShortcut(SHORTCUTS.appearance.theme)} placement="bottom">
<Tooltip label={THEME_LABELS[props.themePreference]} placement="bottom">
<button
type="button"
className={props.className ?? "icon-button"}
-14
View File
@@ -1,14 +0,0 @@
import { heldKeyHint, useHeldModifiers } from "../../utils/held-modifiers";
import type { Shortcut } from "../../utils/shortcuts";
/**
* The key that completes a chord, shown on a button's corner while the chord's modifiers are
* held. Hold ⌃ and the toolbar's sections show 1, 2 and 3; release it and they are gone.
* Nothing renders for a plain key or while nothing is held.
*/
export function KeyHint({ shortcut }: { shortcut: Shortcut }) {
const held = useHeldModifiers();
const key = heldKeyHint(shortcut, held);
if (!key) return null;
return <kbd className="key-hint" aria-hidden="true">{key}</kbd>;
}
+17 -13
View File
@@ -9,7 +9,7 @@ import { screenTree, treeIndex, treeNodeKey, treeScreenOrder, type ScreenTree, t
import type { Appearance } from "../../utils/appearance";
import type { FocusRequest, FocusStatus } from "../../utils/navigation";
import { shortcutsLive } from "../../utils/shortcuts";
import { createKeyHold } from "../../utils/key-hold";
import { HOLD_INITIAL_DELAY_MS, holdIntervalMs } from "../../utils/key-hold";
import { placeholderScreen } from "../../utils/map-frame";
import { ScreenScreenshotCard } from "../canvas/screen-screenshot-card";
import { useCanvasVisibleFrame } from "../canvas/visible-frame-provider";
@@ -393,23 +393,28 @@ export function ScreensView(props: ScreensViewProps) {
pickRef.current(id);
requestAnimationFrame(() => document.getElementById(cardId(id))?.querySelector<HTMLElement>(".screen-screenshot-target")?.focus({ preventScroll: true }));
};
// A held arrow keeps stepping from the card the last step landed on, not the lagging pick.
const hold = createKeyHold();
let hold: { code: string; at: string; timer: ReturnType<typeof setTimeout> } | undefined;
const endHold = () => {
if (hold) clearTimeout(hold.timer);
hold = undefined;
};
const beginHold = (code: string, at: string) => {
hold.begin(code, () => {
const id = next(code, at);
if (!id) return false;
at = id;
endHold();
let step = 1;
const tick = () => {
const id = hold && next(code, hold.at);
if (!hold || !id) { endHold(); return; }
go(id);
return true;
});
hold = { code, at: id, timer: setTimeout(tick, holdIntervalMs(step)) };
step += 1;
};
hold = { code, at, timer: setTimeout(tick, HOLD_INITIAL_DELAY_MS) };
};
const onKeyDown = (event: globalThis.KeyboardEvent) => {
hold.interrupt(event);
const arrow = ["ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown"].includes(event.code);
if (!arrow && event.key !== "Enter") return;
// The browser's own repeat of a held arrow would scroll the page under the hold.
if (event.repeat && hold.holding(event.code)) { event.preventDefault(); return; }
if (event.repeat && hold?.code === event.code) { event.preventDefault(); return; }
if (event.metaKey || event.ctrlKey || event.altKey || event.shiftKey || event.defaultPrevented || !shortcutsLive(event)) return;
const target = event.target instanceof Element ? event.target : null;
if (!arrow) {
@@ -431,9 +436,8 @@ export function ScreensView(props: ScreensViewProps) {
beginHold(event.code, id);
};
const onKeyUp = (event: globalThis.KeyboardEvent) => {
if (hold.holding(event.code)) hold.end();
if (hold && event.code === hold.code) endHold();
};
const endHold = hold.end;
window.addEventListener("keydown", onKeyDown);
window.addEventListener("keyup", onKeyUp);
window.addEventListener("blur", endHold);
+11 -39
View File
@@ -27,8 +27,7 @@ import type { FocusBehavior, FocusRequest, FocusStatus, MapDirection } from "../
import { focusStatusOf } from "../../utils/changed-screens";
import { displayPathForScreen } from "../../utils/screen-path";
import { shortcutsLive } from "../../utils/shortcuts";
import { arrowsOwnedBy, mapKeyDirection, mapKeyEntry, mapKeyTarget, type MapKeyDirection } from "../../utils/map-keyboard";
import { createKeyHold } from "../../utils/key-hold";
import { mapKeyDirection, mapKeyTarget } from "../../utils/map-keyboard";
const HOVER_CLEAR_DELAY = 180;
const MAP_LAYOUT_REVISION = "flat-v1";
@@ -553,51 +552,24 @@ function ConnectionCanvas(props: MapViewProps) {
if (hoverClearTimer.current !== undefined) window.clearTimeout(hoverClearTimer.current);
applyHover(undefined);
}, [applyHover]);
// The arrow keys (or h j k l) walk the map from the selected screen: along an edge in the
// layout's flow, across to the neighbour on the same rank otherwise. With nothing selected they
// enter the map at its edge, as on the Screens page. A held key keeps walking.
// With a screen selected, the arrow keys (or h j k l) walk the map: along an edge in the
// layout's flow, across to the neighbour on the same rank otherwise.
const { selectedScreenId } = props;
const selectedRef = useRef(selectedScreenId);
selectedRef.current = selectedScreenId;
useEffect(() => {
const hold = createKeyHold();
const move = (direction: MapKeyDirection, from: string | undefined): string | undefined => {
const structure = structureRef.current;
if (!structure) return undefined;
return from ? mapKeyTarget(structure, from, direction) : mapKeyEntry(structure, direction);
};
if (!selectedScreenId) return;
const onKeyDown = (event: KeyboardEvent) => {
hold.interrupt(event);
if (event.repeat && hold.holding(event.code)) { event.preventDefault(); return; }
if (event.defaultPrevented || !shortcutsLive(event) || arrowsOwnedBy(event.target)) return;
if (event.defaultPrevented || !shortcutsLive(event)) return;
const direction = mapKeyDirection(event);
if (!direction) return;
if (!structureRef.current) return;
const structure = structureRef.current;
if (!structure) return;
event.preventDefault();
let at = move(direction, selectedRef.current);
if (!at) return;
selectScreen(at);
hold.begin(event.code, () => {
const target = move(direction, at);
if (!target) return false;
at = target;
selectScreen(target);
return true;
});
};
const onKeyUp = (event: KeyboardEvent) => {
if (hold.holding(event.code)) hold.end();
const target = mapKeyTarget(structure, selectedScreenId, direction);
if (target) selectScreen(target);
};
window.addEventListener("keydown", onKeyDown);
window.addEventListener("keyup", onKeyUp);
window.addEventListener("blur", hold.end);
return () => {
hold.end();
window.removeEventListener("keydown", onKeyDown);
window.removeEventListener("keyup", onKeyUp);
window.removeEventListener("blur", hold.end);
};
}, [selectScreen]);
return () => window.removeEventListener("keydown", onKeyDown);
}, [selectScreen, selectedScreenId]);
const onViewportChange = useCallback((event: CanvasViewportChangeEvent) => {
viewportChangeHandler.current?.(event);
+15 -20
View File
@@ -1064,36 +1064,30 @@ code {
opacity 170ms ease-in-out calc(var(--toolbar-motion) * 0.35),
filter 170ms ease-in-out calc(var(--toolbar-motion) * 0.35);
}
/* The key that completes a chord, on a button's corner while its modifier is held: hold ⌃ and
the toolbar's sections show 1, 2 and 3. Quiet: a small key in the element colour. */
.toolbar-button:has(> .key-hint), .camera-action-button:has(> .key-hint), .collapsed-platform:has(> .key-hint), .compare-nav-picker:has(> .key-hint) { position: relative; }
.key-hint {
/* Compare's count of changed screens rides on its button's corner. */
.toolbar-button:has(> .toolbar-badge) { position: relative; }
.toolbar-badge {
position: absolute;
top: -6px;
right: -6px;
display: flex;
min-width: 16px;
height: 16px;
min-width: 18px;
height: 18px;
align-items: center;
justify-content: center;
padding: 0 4px;
border-radius: 5px;
color: var(--text);
background: var(--element);
box-shadow: 0 0 0 2px var(--surface), 0 1px 2px rgb(0 0 0 / 0.12);
font: inherit;
padding: 0 5px;
border-radius: 9px;
/* Light theme's deep orange takes white text, as the Modified pill does; dark theme's light
orange takes dark text. */
color: #fff;
background: var(--modified);
box-shadow: 0 0 0 2px var(--surface);
font-size: 10px;
font-weight: 600;
line-height: 1;
font-weight: 700;
font-variant-numeric: tabular-nums;
pointer-events: none;
animation: key-hint-in 100ms ease-out;
}
@keyframes key-hint-in {
from { opacity: 0; transform: translateY(2px); }
to { opacity: 1; transform: none; }
}
@media (prefers-reduced-motion: reduce) { .key-hint { animation: none; } }
:root[data-theme="dark"] .toolbar-badge { color: #0c0d0e; }
/* Reduced motion: the bar takes its new width at once; only the names fade, without the blur. */
@media (prefers-reduced-motion: reduce) {
.toolbar-view-label,
@@ -2392,6 +2386,7 @@ html [data-sonner-toaster][data-sonner-theme] {
background: #000;
}
.image-placeholder-reason {
display: block;
max-width: 80%;
-84
View File
@@ -1,84 +0,0 @@
// Which modifier keys are down right now, so a button can show the key that completes a chord
// with them: hold ⌃ and the toolbar's Map, Screens and Compare show 1, 2 and 3. One listener for
// the window; components subscribe and re-render only when the set of held modifiers changes.
import { useSyncExternalStore } from "react";
import { APPLE, isTyping, type Shortcut } from "./shortcuts";
export type HeldModifiers = { shift: boolean; ctrl: boolean; meta: boolean; alt: boolean };
const NONE: HeldModifiers = { shift: false, ctrl: false, meta: false, alt: false };
// The modifiers physically down, and the ones the hints show: none while focus is in a field,
// where a held Shift is for a capital letter, not for a chord. Focus can move by mouse with a
// modifier still down, so the shown set is worked out again on every focus change too.
let physical: HeldModifiers = NONE;
let held: HeldModifiers = NONE;
const listeners = new Set<() => void>();
function same(left: HeldModifiers, right: HeldModifiers): boolean {
return left.shift === right.shift && left.ctrl === right.ctrl && left.meta === right.meta && left.alt === right.alt;
}
function publish() {
const next = isTyping(document.activeElement) ? NONE : physical;
if (same(held, next)) return;
held = same(next, NONE) ? NONE : next;
for (const listener of listeners) listener();
}
function onKey(event: KeyboardEvent) {
physical = { shift: event.shiftKey, ctrl: event.ctrlKey, meta: event.metaKey, alt: event.altKey };
publish();
}
function clear() {
physical = NONE;
publish();
}
function subscribe(listener: () => void) {
if (listeners.size === 0) {
window.addEventListener("keydown", onKey, true);
window.addEventListener("keyup", onKey, true);
// A chord that leaves the page (⌘Tab, a browser shortcut) never sends its key up here.
window.addEventListener("blur", clear);
document.addEventListener("visibilitychange", clear);
document.addEventListener("focusin", publish);
document.addEventListener("focusout", publish);
}
listeners.add(listener);
return () => {
listeners.delete(listener);
if (listeners.size > 0) return;
window.removeEventListener("keydown", onKey, true);
window.removeEventListener("keyup", onKey, true);
window.removeEventListener("blur", clear);
document.removeEventListener("visibilitychange", clear);
document.removeEventListener("focusin", publish);
document.removeEventListener("focusout", publish);
physical = NONE;
held = NONE;
};
}
export function useHeldModifiers(): HeldModifiers {
return useSyncExternalStore(subscribe, () => held, () => NONE);
}
/** The modifiers a shortcut needs, on this keyboard: ⌘ for `mod` on Apple keyboards, Ctrl elsewhere. */
export function shortcutModifiers(shortcut: Shortcut, apple = APPLE): HeldModifiers {
return {
shift: Boolean(shortcut.shift),
ctrl: Boolean(shortcut.ctrl) || (Boolean(shortcut.mod) && !apple),
meta: Boolean(shortcut.mod) && apple,
alt: Boolean(shortcut.alt),
};
}
/**
* The key that completes `shortcut` with exactly the modifiers held, or nothing: a plain key has no
* chord to complete, and a held modifier that is not the shortcut's shows nothing for it.
*/
export function heldKeyHint(shortcut: Shortcut, held: HeldModifiers, apple = APPLE): string | undefined {
if (same(held, NONE)) return undefined;
return same(held, shortcutModifiers(shortcut, apple)) ? shortcut.key : undefined;
}
+1 -94
View File
@@ -2,11 +2,8 @@
* Paging by holding a key. The first step lands on key down; holding past the initial delay keeps
* stepping, each step a little sooner than the last until the floor, the way a held scrollbar arrow
* or a spinner accelerates. The browser's own key repeat is ignored (its rate is a fixed OS setting),
* so the hold is timed here and ends on key up, another key, blur, a field or dialog taking the
* keyboard, or the end of the list.
* so the hold is timed here and ends on key up, blur, or the end of the list.
*/
import { isTyping, modalOpen } from "./shortcuts";
export const HOLD_INITIAL_DELAY_MS = 250;
export const HOLD_FIRST_INTERVAL_MS = 200;
export const HOLD_FLOOR_INTERVAL_MS = 70;
@@ -27,93 +24,3 @@ export function holdSchedule(count: number): number[] {
}
return times;
}
export type KeyHold = {
/**
* Starts holding `code` after its first step already landed. `step` takes the next step and
* says whether there was one; the hold ends by itself when there is not.
*/
begin: (code: string, step: () => boolean) => void;
end: () => void;
/**
* Ends the hold when another key goes down, as the OS's own key repeat stops. A modifier does
* not end it, so ⇧ or ⌘ can join a held key. Call it first in the listener, before any guard.
*/
interrupt: (event: KeyboardEvent) => void;
/** Whether `code` is the key being held. */
holding: (code: string) => boolean;
};
const MODIFIER_KEYS = new Set(["Shift", "Control", "Alt", "Meta"]);
/** Whether the keyboard is still the page's: nothing is being typed into and no dialog is open. */
function keyboardFree(): boolean {
if (typeof document === "undefined") return true;
return !isTyping(document.activeElement) && !modalOpen();
}
// A glide moves at the stepped hold's speeds, in tap steps per second: one step per first
// interval at first, easing up to one per floor interval.
const GLIDE_START_RATE = 1000 / HOLD_FIRST_INTERVAL_MS;
const GLIDE_TOP_RATE = 1000 / HOLD_FLOOR_INTERVAL_MS;
const GLIDE_RAMP_MS = 1000;
/** A glide picks up from rest over this long, so it does not lurch out of the tap's step. */
const GLIDE_PICKUP_MS = 80;
/** How fast a glide moves `elapsed` milliseconds after it began, in tap steps per second. */
export function glideRate(elapsed: number): number {
const ramp = Math.min(1, elapsed / GLIDE_RAMP_MS);
return GLIDE_START_RATE * Math.min(1, elapsed / GLIDE_PICKUP_MS)
+ (GLIDE_TOP_RATE - GLIDE_START_RATE) * ramp * ramp * (3 - 2 * ramp);
}
/**
* For a continuous value (a zoom, a divider) a held key glides instead of stepping: from `delayMs`
* on, `move` is called every frame with how far to go, in tap steps (fractions of one), until the
* hold ends. `move` says whether it moved; at a limit it does not, and the hold ends there.
*/
export function glideWhileHeld(hold: KeyHold, code: string, delayMs: number, move: (steps: number) => boolean): void {
const start = performance.now() + delayMs;
let last = start;
const frame = (now: number) => {
if (!hold.holding(code)) return;
if (now > start) {
const steps = glideRate(now - start) * (now - Math.max(last, start)) / 1000;
last = now;
if (!move(steps)) {
hold.end();
return;
}
}
requestAnimationFrame(frame);
};
requestAnimationFrame(frame);
}
/** One held key at a time, timed on the schedule above. */
export function createKeyHold(): KeyHold {
let current: { code: string; timer: ReturnType<typeof setTimeout> } | undefined;
const end = () => {
if (current) clearTimeout(current.timer);
current = undefined;
};
return {
begin(code, step) {
end();
let count = 1;
const tick = () => {
const next = holdIntervalMs(count);
// A field or a dialog took the keyboard mid-hold: end, rather than step behind it.
if (!current || !keyboardFree() || !step()) { end(); return; }
current = { code, timer: setTimeout(tick, next) };
count += 1;
};
current = { code, timer: setTimeout(tick, HOLD_INITIAL_DELAY_MS) };
},
end,
interrupt(event) {
if (current && !event.repeat && event.code !== current.code && !MODIFIER_KEYS.has(event.key)) end();
},
holding: (code) => current?.code === code,
};
}
-27
View File
@@ -3,13 +3,6 @@ import type { ConnectionGroup } from "./graph-model";
export type MapKeyDirection = "up" | "down" | "left" | "right";
type Point = { x: number; y: number };
const ARROW_WIDGETS = '[role="menu"], [role="menubar"], [role="listbox"], [role="tree"], [role="tablist"], [role="radiogroup"], [role="slider"]';
/** Whether the key's target is a widget whose arrows are its own (a menu item, a list, tabs); the map leaves those keys to it. */
export function arrowsOwnedBy(target: EventTarget | null): boolean {
return target instanceof Element && target.closest(ARROW_WIDGETS) !== null;
}
/** Arrow keys and their Vim twins; anything else is not a map move. */
export function mapKeyDirection(event: Pick<KeyboardEvent, "key" | "altKey" | "ctrlKey" | "metaKey" | "shiftKey">): MapKeyDirection | undefined {
if (event.altKey || event.ctrlKey || event.metaKey || event.shiftKey) return undefined;
@@ -59,23 +52,3 @@ export function mapKeyTarget(
}
return best?.id;
}
/**
* The screen an arrow selects when nothing is: the one at the edge the key moves away from, as
* the Screens page's arrows enter at the first or last card. ↓ takes the topmost screen, ↑ the
* bottom one, → the leftmost, ← the rightmost; ties go to the screen nearest the other axis's start.
*/
export function mapKeyEntry(
structure: { positions: Map<string, Point> },
direction: MapKeyDirection,
): string | undefined {
const vertical = direction === "up" || direction === "down";
const sign = direction === "down" || direction === "right" ? 1 : -1;
let best: { id: string; along: number; across: number } | undefined;
for (const [id, point] of structure.positions) {
const along = sign * (vertical ? point.y : point.x);
const across = vertical ? point.x : point.y;
if (!best || along < best.along || (along === best.along && across < best.across)) best = { id, along, across };
}
return best?.id;
}
+1 -6
View File
@@ -16,7 +16,7 @@ export type Shortcut = {
key: string;
};
export const APPLE = typeof navigator !== "undefined"
const APPLE = typeof navigator !== "undefined"
&& /Mac|iPhone|iPad|iPod/.test(navigator.platform || navigator.userAgent);
/**
@@ -61,11 +61,6 @@ export const SHORTCUTS = {
panel: {
right: plain("KeyI", "I"),
},
/** T is the Viewer's own light or dark theme; ⇧T is the captured app's appearance, in a report that has both. */
appearance: {
theme: plain("KeyT", "T"),
app: shift("KeyT", "T"),
},
/** Canvas edits follow the platform-standard history keys. */
edit: {
undo: mod("KeyZ", "Z"),