Merge remote-tracking branch 'origin/main' into szdziedzic-codex/device-run-session-git-context-cli

# Conflicts: # CHANGELOG.md
[eas-cli] Send simulator commit messages
2026-11-15 03:38:08 -10:00 · 2026-07-27 18:33:30 +02:00 · 2026-07-27 18:28:13 +02:00 · 2026-07-27 16:24:00 +02:00 · 2026-07-27 14:25:49 +02:00 · 2026-07-27 14:08:59 +02:00
27 changed files with 1697 additions and 262 deletions
@@ -30,15 +30,17 @@
  "breakGlass": { "marker": "/skip-review" },
  "commentTag": "expo-ai-code-reviewer",

-  // ChatGPT/Codex subscription (OAuth): tokenEnv holds the REFRESH token from an
-  // `opencode auth login` ChatGPT sign-in (copy `.openai.refresh` out of OpenCode's
-  // auth.json); OpenCode mints short-lived access tokens from it on demand. All
-  // models above are on the subscription's allowlist, so reviews draw no metered
-  // spend. (To add pro-tier models later, see the mixed auth.providers setup in
-  // the @expo/code-review-cli README.)
+  // ChatGPT/Codex subscription (OAuth): tokenEnv holds the ACCESS token from an
+  // `opencode auth login` ChatGPT sign-in (`ecr setup-auth` extracts it) — a
+  // plain bearer with no rotation involvement; re-mint before its ~10-day expiry
+  // (doctor + the run preflight warn first). NEVER use the refresh token here:
+  // it is single-use and dies on first rotation. All models above are on the
+  // subscription's allowlist, so reviews draw no metered spend. (To add pro-tier
+  // models later, see the mixed auth.providers setup in the @expo/code-review-cli
+  // README.)
  "auth": {
    "mode": "oauth",
    "provider": "openai",
-    "tokenEnv": "CODEX_OAUTH_REFRESH_TOKEN"
+    "tokenEnv": "CODEX_OAUTH_ACCESS_TOKEN"
  }
 }
@@ -0,0 +1,31 @@
+<svg width="128" height="128" viewBox="0 0 128 128" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1887_635)">
+<rect width="128" height="128" rx="64" fill="#18191B"/>
+<path d="M99.6237 27.9758C119.134 47.4859 119.024 79.2583 99.3412 98.9413C79.6583 118.624 47.8858 118.734 28.3758 99.2237C8.86596 79.7136 8.976 47.9418 28.6589 28.2589C48.3418 8.57602 80.1136 8.46598 99.6237 27.9758Z" stroke="url(#paint0_linear_1887_635)" stroke-width="3.24"/>
+<path d="M114.38 64C114.38 72.6638 109.008 80.7192 99.8828 86.6855C90.7722 92.6425 78.0904 96.3799 64 96.3799C49.9096 96.3799 37.2278 92.6425 28.1172 86.6855C18.9922 80.7192 13.6201 72.6638 13.6201 64C13.6201 55.3362 18.9922 47.2808 28.1172 41.3144C37.2278 35.3575 49.9096 31.6201 64 31.6201C78.0904 31.6201 90.7722 35.3575 99.8828 41.3145C109.008 47.2808 114.38 55.3362 114.38 64Z" stroke="url(#paint1_linear_1887_635)" stroke-width="3.24"/>
+<path d="M64 13.6201C72.6638 13.6201 80.7192 18.9922 86.6855 28.1172C92.6425 37.2278 96.3799 49.9096 96.3799 64C96.3799 78.0904 92.6425 90.7722 86.6855 99.8828C80.7192 109.008 72.6638 114.38 64 114.38C55.3362 114.38 47.2808 109.008 41.3145 99.8828C35.3575 90.7722 31.6201 78.0904 31.6201 64C31.6201 49.9096 35.3575 37.2278 41.3145 28.1172C47.2808 18.9922 55.3362 13.6201 64 13.6201Z" stroke="url(#paint2_linear_1887_635)" stroke-width="3.24"/>
+<path d="M66.0082 42.48H61.9918C60.1376 42.48 58.4378 43.4711 57.5835 45.0503L40.5592 76.5206C40.164 77.2512 40.1343 78.1142 40.4784 78.8683L41.8881 81.9568C42.7652 83.8787 45.527 84.0723 46.6859 82.2932L62.8238 57.5187C63.0773 57.1295 63.5218 56.8932 64 56.8932C64.4782 56.8932 64.9227 57.1295 65.1761 57.5187L81.3141 82.2932C82.473 84.0723 85.2348 83.8787 86.1119 81.9568L87.5215 78.8683C87.8657 78.1142 87.836 77.2512 87.4408 76.5206L70.4165 45.0503C69.5622 43.4711 67.8624 42.48 66.0082 42.48Z" fill="url(#paint3_linear_1887_635)"/>
+</g>
+<rect x="1" y="1" width="126" height="126" rx="63" stroke="white" stroke-opacity="0.3" stroke-width="2"/>
+<defs>
+<linearGradient id="paint0_linear_1887_635" x1="112.4" y1="20.4" x2="138.422" y2="-10.3513" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint1_linear_1887_635" x1="130" y1="88" x2="233.2" y2="134.8" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint2_linear_1887_635" x1="86" y1="30.4" x2="130.8" y2="-75.2" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint3_linear_1887_635" x1="64" y1="84" x2="64" y2="210.5" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<clipPath id="clip0_1887_635">
+<rect width="128" height="128" rx="64" fill="white"/>
+</clipPath>
+</defs>
+</svg>
@@ -19,7 +19,7 @@ permissions:

 env:
  # Published reviewer run via npx (override with repo variable ECR_VERSION).
-  ECR_VERSION: ${{ vars.ECR_VERSION || '^0.5.0' }}
+  ECR_VERSION: ${{ vars.ECR_VERSION || '^0.6.0' }}

 concurrency:
  group: ai-code-review-cmd-${{ github.event.issue.number }}
@@ -77,12 +77,18 @@ jobs:
      # config, and never `gh pr checkout` the PR head. The reviewer engine itself
      # is the PUBLISHED @expo/code-review-cli (fetched by npx), not built from any
      # checkout, so attacker-controlled PR code never runs here. The diff + PR
-      # metadata come from the API (`gh pr diff`/`gh pr view`).
+      # metadata come from the API (`gh pr diff`/`gh pr view`); `ecr ci` (0.6.0+)
+      # loads configuration from the PR's immutable base commit and reads source
+      # from a head worktree scrubbed of ambient runtime config — the same trust
+      # model as the pull_request workflow.
      - name: Checkout (base ref only — never the PR head)
        if: steps.cmd.outputs.run == 'true'
        uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5
        with:
          fetch-depth: 1
+          # The CLI's git fetches authenticate through `gh` from GH_TOKEN; keep the
+          # token out of .git/config.
+          persist-credentials: false

      # Corepack so setup-node's yarn probe doesn't fail on the repo's yarn@4 pin
      # (the reviewer runs via npx, not yarn).
@@ -104,8 +110,8 @@ jobs:
        continue-on-error: true
        env:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CODEX_OAUTH_REFRESH_TOKEN: ${{ secrets.CODEX_OAUTH_REFRESH_TOKEN }}
-          ECR_EXPECTED_TOKEN_ENV: ${{ vars.ECR_EXPECTED_TOKEN_ENV || 'CODEX_OAUTH_REFRESH_TOKEN' }}
+          CODEX_OAUTH_ACCESS_TOKEN: ${{ secrets.CODEX_OAUTH_ACCESS_TOKEN }}
+          ECR_EXPECTED_TOKEN_ENV: ${{ vars.ECR_EXPECTED_TOKEN_ENV || 'CODEX_OAUTH_ACCESS_TOKEN' }}
          REVIEWER_MODEL: ${{ vars.REVIEWER_MODEL }}
          AGENTS: ${{ steps.cmd.outputs.agents }}
          ROUTE: ${{ steps.cmd.outputs.route }}
@@ -18,7 +18,7 @@ permissions:

 env:
  # Published reviewer run via npx (override with repo variable ECR_VERSION).
-  ECR_VERSION: ${{ vars.ECR_VERSION || '^0.5.0' }}
+  ECR_VERSION: ${{ vars.ECR_VERSION || '^0.6.0' }}

 concurrency:
  group: ai-code-review-dismiss-${{ github.event.issue.number }}
@@ -80,6 +80,9 @@ jobs:
        uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5
        with:
          fetch-depth: 1
+          # The CLI's git fetches authenticate through `gh` from GH_TOKEN; keep the
+          # token out of .git/config.
+          persist-credentials: false

      # Corepack so setup-node's yarn probe doesn't fail on the repo's yarn@4 pin
      # (dismiss runs the CLI via npx, not yarn).
@@ -13,8 +13,9 @@ permissions:
 env:
  # The reviewer is the published @expo/code-review-cli package, run via npx — the
  # repo only carries the `.expo-code-review/` config, not the engine source.
-  # Override with a repo variable ECR_VERSION to pin/bump; defaults to 0.5.x.
-  ECR_VERSION: ${{ vars.ECR_VERSION || '^0.5.0' }}
+  # Override with a repo variable ECR_VERSION to pin/bump; defaults to 0.6.x
+  # (0.6.0 = trusted base-commit configuration + PR-head runtime-config scrub).
+  ECR_VERSION: ${{ vars.ECR_VERSION || '^0.6.0' }}

 concurrency:
  group: ai-code-review-${{ github.event.pull_request.number }}
@@ -77,36 +78,22 @@ jobs:
          echo "agents=$agents" >> "$GITHUB_OUTPUT"
          echo "route=$route" >> "$GITHUB_OUTPUT"

-      - name: Checkout
+      # SECURITY: check out the PR's immutable BASE commit, never the PR head or
+      # merge ref — everything on this runner's disk comes from a commit that
+      # already merged. `ecr ci` (0.6.0+) additionally enforces this itself: it
+      # materializes the base commit via the GitHub API for configuration and the
+      # head commit (OID-pinned, scrubbed of ambient runtime config like
+      # opencode.json/plugins/AGENTS.md/.env) for source reads. persist-credentials
+      # off — the CLI's git fetches authenticate through `gh` from GH_TOKEN, so the
+      # token never lands in .git/config.
+      - name: Checkout (base commit only — never the PR head)
        if: steps.resolve.outputs.run == 'true'
        uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5
-        # The reviewer reads the working tree at HEAD and gets the diff from the
-        # API (`gh pr diff`), so a shallow checkout is enough — no full history.
+        # The diff comes from the API (`gh pr diff`), so a shallow checkout is enough.
        with:
+          ref: ${{ github.event.pull_request.base.sha }}
          fetch-depth: 1
-
-      # SECURITY: this pull_request workflow checks out the PR's code, which includes
-      # .expo-code-review/config.jsonc. Its `auth.tokenEnv` names the env var the CLI
-      # forwards as the model credential, so a PR could repoint it at another secret
-      # in the runner. Refuse to run unless tokenEnv is the expected value. That value
-      # comes from the workflow default / a repo variable — NOT from the PR's diff — so
-      # a config-only change can't move it, and the first PR that introduces the config
-      # passes because its tokenEnv already matches the default. (Backstop: the
-      # published CLI's own denylist refuses GITHUB_TOKEN/cloud-cred names regardless.
-      # Full fix: load config from the trusted base ref once this reviewer is on the
-      # default branch — see ROADMAP.)
-      - name: Guard config.jsonc tokenEnv
-        if: steps.resolve.outputs.run == 'true'
-        env:
-          EXPECTED: ${{ vars.ECR_EXPECTED_TOKEN_ENV || 'CODEX_OAUTH_REFRESH_TOKEN' }}
-        run: |
-          values=$(grep -oE '"tokenEnv"[[:space:]]*:[[:space:]]*"[A-Za-z0-9_]+"' .expo-code-review/config.jsonc | sed -E 's/.*"([A-Za-z0-9_]+)"$/\1/')
-          count=$(printf '%s\n' "$values" | grep -c .)
-          if [ "$count" != "1" ] || [ "$values" != "$EXPECTED" ]; then
-            echo "::error::.expo-code-review/config.jsonc auth.tokenEnv must be \"$EXPECTED\" (found: \"${values:-none}\"). Refusing to run so a PR can't redirect which secret is forwarded to the model provider."
-            exit 1
-          fi
-          echo "config tokenEnv OK: $values"
+          persist-credentials: false

      # eas-cli pins yarn@4 via package.json "packageManager", so actions/setup-node's
      # environment probe runs `yarn` and the global yarn 1.x refuses unless corepack
@@ -126,6 +113,20 @@ jobs:
          # tries to save an empty yarn cache and errors ("path(s) ... do not exist").
          package-manager-cache: false

+      # SECURITY: the TRUSTED BASE checkout above includes .expo-code-review/
+      # config.jsonc, whose auth.tokenEnv names the env var the CLI forwards as the
+      # model credential. `ecr verify-config` is the canonical guard (ships with the
+      # CLI): it sweeps every config (root + routing + all scopes, referenced or
+      # not) with the engine's real JSONC parser and refuses unless tokenEnv appears
+      # exactly once, in a ROOT-owned file, equal to ECR_EXPECTED_TOKEN_ENV — so a
+      # config change can't repoint it at another runner secret or sneak in a
+      # JSON-escaped key. Layer 2; layer 1 is the same runtime lock inside `ecr ci`.
+      - name: Guard config tokenEnv (root + routing + all scopes)
+        if: steps.resolve.outputs.run == 'true'
+        env:
+          ECR_EXPECTED_TOKEN_ENV: ${{ vars.ECR_EXPECTED_TOKEN_ENV || 'CODEX_OAUTH_ACCESS_TOKEN' }}
+        run: npx --yes -p "@expo/code-review-cli@$ECR_VERSION" ecr verify-config
+
      - name: Run AI review
        if: steps.resolve.outputs.run == 'true'
        # npx installs @expo/code-review-cli and its deps (incl. the `opencode`
@@ -135,13 +136,14 @@ jobs:
        env:
          # GitHub token scoped by the permissions block above (PR comments only).
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # ChatGPT/Codex subscription refresh token (auth.mode "oauth" in
-          # .expo-code-review/config.jsonc reads this env var); OpenCode mints
-          # access tokens from it. All reviews run on the subscription.
-          CODEX_OAUTH_REFRESH_TOKEN: ${{ secrets.CODEX_OAUTH_REFRESH_TOKEN }}
+          # ChatGPT/Codex subscription ACCESS token (auth.mode "oauth" in
+          # .expo-code-review/config.jsonc reads this env var) — used as-is, no
+          # rotation involvement; re-mint before its ~10-day expiry. All reviews
+          # run on the subscription.
+          CODEX_OAUTH_ACCESS_TOKEN: ${{ secrets.CODEX_OAUTH_ACCESS_TOKEN }}
          # Layer-1 runtime auth lock (mirrors the guard step): the CLI refuses to
          # run when the tokenEnv the loaded config honors differs from this.
-          ECR_EXPECTED_TOKEN_ENV: ${{ vars.ECR_EXPECTED_TOKEN_ENV || 'CODEX_OAUTH_REFRESH_TOKEN' }}
+          ECR_EXPECTED_TOKEN_ENV: ${{ vars.ECR_EXPECTED_TOKEN_ENV || 'CODEX_OAUTH_ACCESS_TOKEN' }}
          # Optional: override the model used by every agent.
          REVIEWER_MODEL: ${{ vars.REVIEWER_MODEL }}
          AGENTS: ${{ steps.resolve.outputs.agents }}
@@ -8,16 +8,28 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🎉 New features

+- [eas-cli] Include Git commit, commit message, and branch or tag metadata when creating simulator sessions. ([#4071](https://github.com/expo/eas-cli/pull/4071) by [@szdziedzic](https://github.com/szdziedzic))
+- [build-tools] Collect and upload Argent tool-server session events during remote simulator sessions, mirroring agent-device event collection. ([#4067](https://github.com/expo/eas-cli/pull/4067) by [@szdziedzic](https://github.com/szdziedzic))
+
+### 🐛 Bug fixes
+
+- [eas-cli] Suggest running `agent-device` via `npx` in EAS Simulator session instructions. ([#4070](https://github.com/expo/eas-cli/pull/4070) by [@szdziedzic](https://github.com/szdziedzic))
+
+### 🧹 Chores
+
+- [eas-cli] Refresh README as an EAS product landing page. ([#3844](https://github.com/expo/eas-cli/pull/3844) by [@szdziedzic](https://github.com/szdziedzic))
+- [eas-cli] Fix the EAS logo not rendering in the repository root README. ([#4093](https://github.com/expo/eas-cli/pull/4093) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [21.3.0](https://github.com/expo/eas-cli/releases/tag/v21.3.0) - 2026-07-27
+
+### 🎉 New features
+
 - [eas-cli] Handle new server-side errors thrown when observe features are blocked. ([#4042](https://github.com/expo/eas-cli/pull/4042) by [@douglowder](https://github.com/douglowder))
 - [eas-cli] Add `eas project:icon:set` to upload a project icon from the command line. ([#4068](https://github.com/expo/eas-cli/pull/4068) by [@brentvatne](https://github.com/brentvatne))
 - [eas-cli] Add `--account` flag to `eas init` to choose the account that should own the project, enabling non-interactive project creation (`eas init --account <name> --non-interactive`), and improve unconfigured-project error messages to list the accounts you can create projects in. ([#4057](https://github.com/expo/eas-cli/pull/4057) by [@williamgrosset](https://github.com/williamgrosset))
 - [eas-cli] Add `--json` flag to `eas init` to print the linked project (status, project ID, owner, slug, dashboard URL) as JSON to stdout, and add usage examples to `eas init --help`. ([#4079](https://github.com/expo/eas-cli/pull/4079) by [@brentvatne](https://github.com/brentvatne))
 - [eas-cli] Add `eas testflight:feedback` and `eas testflight:crashes` to read TestFlight tester feedback (comments, device info, screenshot URLs) and crash reports (including full crash logs) from App Store Connect. Both support `--offset`/`--limit` pagination, `--json`, and looking up a single submission by ID or by the App Store Connect URL that EAS workflow triggers expose as `${{ app_store_connect.beta_feedback.url }}`. ([#4084](https://github.com/expo/eas-cli/pull/4084) by [@brentvatne](https://github.com/brentvatne))

-### 🐛 Bug fixes
-
-### 🧹 Chores
-
 ## [21.2.0](https://github.com/expo/eas-cli/releases/tag/v21.2.0) - 2026-07-24

 ### 🎉 New features
@@ -100,6 +112,7 @@ This is the log of notable changes to EAS CLI and related packages.
 - [build-tools] Skip embedded bundle upload for development client builds instead of warning that the bundle is missing. ([#3940](https://github.com/expo/eas-cli/pull/3940) by [@gwdp](https://github.com/gwdp))
 - [eas-cli] Accept a navigation metric name in observe:metrics when passed in on the command line. ([#3973](https://github.com/expo/eas-cli/pull/3973) by [@douglowder](https://github.com/douglowder))
 - [eas-cli] Retry uploading assets that don't finish processing during `eas update`, instead of failing the update. ([#3918](https://github.com/expo/eas-cli/pull/3918) by [@gwdp](https://github.com/gwdp))
+- [eas-cli] Show network and HTTP response details for EAS Build request failures when GraphQL errors are empty. ([#3982](https://github.com/expo/eas-cli/pull/3982) by [@szdziedzic](https://github.com/szdziedzic))

 ### 🧹 Chores

@@ -0,0 +1,138 @@
+import { BuildRuntimePlatform, type BuildStepContext } from '@expo/steps';
+import spawn from '@expo/turtle-spawn';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+
+import { type CustomBuildContext } from '../../../customBuildContext';
+import { isProcessDescendantOfAsync } from '../../../utils/processes';
+import { pollArgentArtifactsForUploadAsync } from '../../utils/argentArtifacts';
+import { startArgentEventCollectionAsync } from '../../utils/argentEvents';
+import {
+  getDeviceRunSessionIdOrThrow,
+  getNgrokAuthtokenOrThrow,
+  getNgrokTunnelDomainOrThrow,
+  selectXcodeDeveloperDirectoryAsync,
+  spawnDetached,
+  startNgrokTunnelAsync,
+  uploadRemoteSessionConfigAsync,
+  waitForDeviceRunSessionStoppedAsync,
+} from '../../utils/remoteDeviceRunSession';
+import { createStartArgentRemoteSessionBuildFunction } from '../startArgentRemoteSession';
+
+// Redirect ~/.argent (where the tool-server writes its state file and event log) to a temp
+// home so waitForArgentToolServerStateAsync — which lives in the module under test and cannot
+// be mocked directly — can read a real state file we control.
+jest.mock('node:os', () => {
+  const actual = jest.requireActual('node:os');
+  const actualPath = jest.requireActual('node:path');
+  return {
+    ...actual,
+    homedir: () => actualPath.join(actual.tmpdir(), 'eas-argent-orchestration-home'),
+  };
+});
+jest.mock('@expo/turtle-spawn', () => ({ __esModule: true, default: jest.fn() }));
+jest.mock('../../../sentry');
+jest.mock('../../../utils/processes', () => ({ isProcessDescendantOfAsync: jest.fn() }));
+jest.mock('../../utils/argentArtifacts', () => ({ pollArgentArtifactsForUploadAsync: jest.fn() }));
+jest.mock('../../utils/argentEvents', () => ({
+  ...jest.requireActual('../../utils/argentEvents'),
+  startArgentEventCollectionAsync: jest.fn(),
+}));
+jest.mock('../../utils/remoteDeviceRunSession', () => ({
+  getDeviceRunSessionIdOrThrow: jest.fn(),
+  getNgrokAuthtokenOrThrow: jest.fn(),
+  getNgrokTunnelDomainOrThrow: jest.fn(),
+  selectXcodeDeveloperDirectoryAsync: jest.fn(),
+  spawnDetached: jest.fn(),
+  startNgrokTunnelAsync: jest.fn(),
+  startServeSimWithTunnelAsync: jest.fn(),
+  uploadRemoteSessionConfigAsync: jest.fn(),
+  waitForDeviceRunSessionStoppedAsync: jest.fn(),
+}));
+
+const TEST_HOME = path.join(os.tmpdir(), 'eas-argent-orchestration-home');
+const ARGENT_STATE_DIR = path.join(TEST_HOME, '.argent');
+const EXPECTED_EVENT_LOG_PATH = path.join(ARGENT_STATE_DIR, 'tool-server-events.jsonl');
+
+const mockStopAsync = jest.fn();
+
+describe('createStartArgentRemoteSessionBuildFunction orchestration', () => {
+  beforeEach(async () => {
+    jest.clearAllMocks();
+
+    jest.mocked(spawn).mockResolvedValue(undefined as never);
+    jest.mocked(isProcessDescendantOfAsync).mockResolvedValue(true);
+    jest.mocked(pollArgentArtifactsForUploadAsync).mockResolvedValue(undefined);
+    mockStopAsync.mockResolvedValue(undefined);
+    jest.mocked(startArgentEventCollectionAsync).mockResolvedValue({ stopAsync: mockStopAsync });
+
+    jest.mocked(getDeviceRunSessionIdOrThrow).mockReturnValue('device-run-session-id');
+    jest.mocked(getNgrokTunnelDomainOrThrow).mockReturnValue('tunnel.example.com');
+    jest.mocked(getNgrokAuthtokenOrThrow).mockReturnValue('ngrok-token');
+    jest.mocked(selectXcodeDeveloperDirectoryAsync).mockResolvedValue(undefined);
+    jest.mocked(spawnDetached).mockReturnValue({ pid: 4242, getOutput: () => '' });
+    jest.mocked(startNgrokTunnelAsync).mockResolvedValue('https://argent-abc.tunnel.example.com');
+    jest.mocked(uploadRemoteSessionConfigAsync).mockResolvedValue(undefined);
+    jest.mocked(waitForDeviceRunSessionStoppedAsync).mockResolvedValue(undefined);
+
+    // The (real) tool-server state wait reads this file from the redirected ~/.argent.
+    await fs.promises.mkdir(ARGENT_STATE_DIR, { recursive: true });
+    await fs.promises.writeFile(
+      path.join(ARGENT_STATE_DIR, 'tool-server-orchestration.json'),
+      JSON.stringify({ port: 5678, pid: 9999, token: 'tool-server-token' })
+    );
+  });
+
+  afterEach(async () => {
+    await fs.promises.rm(TEST_HOME, { recursive: true, force: true });
+  });
+
+  it('enables the event log flag, shares one path, and starts/stops the collector', async () => {
+    const ctx = {} as unknown as CustomBuildContext;
+    const buildFunction = createStartArgentRemoteSessionBuildFunction(ctx);
+
+    await buildFunction.fn!(
+      {
+        logger: { info: jest.fn(), warn: jest.fn() },
+        global: { runtimePlatform: BuildRuntimePlatform.LINUX },
+      } as unknown as BuildStepContext,
+      {
+        inputs: { package_version: { value: undefined } },
+        outputs: {},
+        env: { EXISTING: 'value' },
+      } as never
+    );
+
+    // (1) The event log flag is enabled, before the tool-server is launched.
+    const spawnCalls = jest.mocked(spawn).mock.calls;
+    const enableEventLogIndex = spawnCalls.findIndex(
+      ([command, args]) =>
+        command === 'bunx' && Array.isArray(args) && args.includes('tool-server-event-log')
+    );
+    expect(enableEventLogIndex).toBeGreaterThanOrEqual(0);
+    expect(jest.mocked(spawn).mock.invocationCallOrder[enableEventLogIndex]).toBeLessThan(
+      jest.mocked(spawnDetached).mock.invocationCallOrder[0]
+    );
+
+    // (2) The tool-server and the collector are pinned to the exact same event log path.
+    const serverEnv = jest.mocked(spawnDetached).mock.calls[0][0].env;
+    expect(serverEnv.ARGENT_EVENT_LOG).toBe(EXPECTED_EVENT_LOG_PATH);
+    expect(serverEnv.EXISTING).toBe('value');
+    expect(jest.mocked(startArgentEventCollectionAsync).mock.calls[0][0]).toMatchObject({
+      deviceRunSessionId: 'device-run-session-id',
+      eventLogPath: EXPECTED_EVENT_LOG_PATH,
+    });
+
+    // (3) Collection starts (before we wait for the session to stop) and (4) is torn down
+    // afterwards, exactly once.
+    expect(startArgentEventCollectionAsync).toHaveBeenCalledTimes(1);
+    expect(mockStopAsync).toHaveBeenCalledTimes(1);
+    expect(jest.mocked(startArgentEventCollectionAsync).mock.invocationCallOrder[0]).toBeLessThan(
+      jest.mocked(waitForDeviceRunSessionStoppedAsync).mock.invocationCallOrder[0]
+    );
+    expect(mockStopAsync.mock.invocationCallOrder[0]).toBeGreaterThan(
+      jest.mocked(waitForDeviceRunSessionStoppedAsync).mock.invocationCallOrder[0]
+    );
+  });
+});
@@ -4,12 +4,16 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';

+import { Sentry } from '../../../sentry';
 import {
  MIN_ARGENT_REMOTE_SESSION_VERSION,
+  stopArgentEventCollectionSafelyAsync,
  waitForArgentToolServerStateAsync,
  warnIfArgentPackageVersionCannotBeVerified,
 } from '../startArgentRemoteSession';

+jest.mock('../../../sentry');
+
 describe(warnIfArgentPackageVersionCannotBeVerified, () => {
  const warn = jest.fn();
  const logger = { warn } as unknown as bunyan;
@@ -143,3 +147,36 @@ describe(waitForArgentToolServerStateAsync, () => {
    ).rejects.toThrow(`state file belonging to process ${process.pid}`);
  });
 });
+
+describe(stopArgentEventCollectionSafelyAsync, () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('reports an unexpected stop failure without rejecting', async () => {
+    const error = new Error('stop failed');
+    const logger = { warn: jest.fn() } as unknown as bunyan;
+
+    await expect(
+      stopArgentEventCollectionSafelyAsync({
+        eventCollection: { stopAsync: jest.fn().mockRejectedValue(error) },
+        deviceRunSessionId: 'session-id',
+        logger,
+      })
+    ).resolves.toBeUndefined();
+
+    expect(Sentry.capture).toHaveBeenCalledWith(
+      'Could not finish argent session event collection',
+      error,
+      {
+        level: 'warning',
+        tags: { phase: 'argent-event-collection', operation: 'stop' },
+        extras: { deviceRunSessionId: 'session-id' },
+      }
+    );
+    expect(logger.warn).toHaveBeenCalledWith(
+      { err: error },
+      'Could not finish argent session event collection.'
+    );
+  });
+});
@@ -15,7 +15,7 @@ import path from 'node:path';
 import { type CustomBuildContext } from '../../customBuildContext';
 import { Sentry } from '../../sentry';
 import { pollAgentDeviceArtifactsForUploadAsync } from '../utils/agentDeviceArtifacts';
-import { startAgentDeviceEventCollectionAsync } from '../utils/deviceRunSessionEvents';
+import { startAgentDeviceEventCollectionAsync } from '../utils/agentDeviceEvents';
 import {
  type DetachedProcessHandle,
  getDeviceRunSessionIdOrThrow,
@@ -18,6 +18,7 @@ import { Sentry } from '../../sentry';
 import { isProcessDescendantOfAsync } from '../../utils/processes';
 import { sleepAsync } from '../../utils/retry';
 import { pollArgentArtifactsForUploadAsync } from '../utils/argentArtifacts';
+import { ARGENT_EVENT_LOG_FILENAME, startArgentEventCollectionAsync } from '../utils/argentEvents';
 import {
  getDeviceRunSessionIdOrThrow,
  getNgrokAuthtokenOrThrow,
@@ -31,9 +32,17 @@ import {
 } from '../utils/remoteDeviceRunSession';

 const ARGENT_PACKAGE_NAME = '@swmansion/argent';
-export const MIN_ARGENT_REMOTE_SESSION_VERSION = '0.12.0';
+// 0.16.0 is the first version that exposes the tool-server event log flag; keeping the floor
+// here lets us enable it (and the artifacts list endpoint) unconditionally below.
+export const MIN_ARGENT_REMOTE_SESSION_VERSION = '0.16.0';
 const ARGENT_ARTIFACTS_LIST_ENDPOINT_FLAG = 'artifacts-list-endpoint';
+// Tells the tool-server to write its structured event log so we can collect session events.
+const ARGENT_EVENT_LOG_FLAG = 'tool-server-event-log';
 const ARGENT_STATE_DIR = path.join(os.homedir(), '.argent');
+// Pin the event log path explicitly and hand the same value to the tool-server (via
+// ARGENT_EVENT_LOG) and the collector, so an ambient ARGENT_EVENT_LOG or a future change to
+// Argent's default can never make the two disagree.
+const ARGENT_EVENT_LOG_PATH = path.join(ARGENT_STATE_DIR, ARGENT_EVENT_LOG_FILENAME);
 const STARTUP_TIMEOUT_MS = 60_000;

 const ArgentToolServerStateSchema = z.object({
@@ -87,6 +96,13 @@ export function createStartArgentRemoteSessionBuildFunction(
        { env, logger }
      );

+      logger.info('Enabling the Argent tool-server event log flag.');
+      await spawn(
+        'bunx',
+        [`${ARGENT_PACKAGE_NAME}@${versionSpec}`, 'enable', ARGENT_EVENT_LOG_FLAG],
+        { env, logger }
+      );
+
      logger.info(`Launching ${ARGENT_PACKAGE_NAME}@${versionSpec} tool-server via bunx.`);
      // Keep Argent itself in foreground mode under the detached bunx process. This preserves
      // the bunx -> Argent CLI -> tool-server ancestry used to identify the matching state file.
@@ -102,7 +118,7 @@ export function createStartArgentRemoteSessionBuildFunction(
          '0',
          '--force',
        ],
-        env,
+        env: { ...env, ARGENT_EVENT_LOG: ARGENT_EVENT_LOG_PATH },
      });
      if (argentServer.pid === undefined) {
        throw new SystemError(
@@ -142,6 +158,13 @@ export function createStartArgentRemoteSessionBuildFunction(
        signal: artifactPollSignal,
      });

+      const eventCollection = await startArgentEventCollectionAsync({
+        ctx,
+        deviceRunSessionId,
+        eventLogPath: ARGENT_EVENT_LOG_PATH,
+        logger,
+      });
+
      try {
        const publicToolsUrl = await startNgrokTunnelAsync({
          port: toolServerPort,
@@ -184,6 +207,7 @@ export function createStartArgentRemoteSessionBuildFunction(
          signal,
        });
      } finally {
+        await stopArgentEventCollectionSafelyAsync({ eventCollection, deviceRunSessionId, logger });
        artifactPollAbortController.abort();
        try {
          await artifactPollingPromise;
@@ -197,6 +221,28 @@ export function createStartArgentRemoteSessionBuildFunction(
  });
 }

+export async function stopArgentEventCollectionSafelyAsync({
+  eventCollection,
+  deviceRunSessionId,
+  logger,
+}: {
+  eventCollection: { stopAsync: () => Promise<void> };
+  deviceRunSessionId: string;
+  logger: bunyan;
+}): Promise<void> {
+  try {
+    await eventCollection.stopAsync();
+  } catch (err) {
+    const error = err instanceof Error ? err : new Error(String(err));
+    Sentry.capture('Could not finish argent session event collection', error, {
+      level: 'warning',
+      tags: { phase: 'argent-event-collection', operation: 'stop' },
+      extras: { deviceRunSessionId },
+    });
+    logger.warn({ err: error }, 'Could not finish argent session event collection.');
+  }
+}
+
 export function warnIfArgentPackageVersionCannotBeVerified({
  packageVersion,
  logger,
@@ -6,7 +6,7 @@ import path from 'node:path';
 import { type CustomBuildContext } from '../../../customBuildContext';
 import RemoteLoggerStream from '../../../logging/RemoteLoggerStream';
 import { Sentry } from '../../../sentry';
-import { startAgentDeviceEventCollectionAsync } from '../deviceRunSessionEvents';
+import { startAgentDeviceEventCollectionAsync } from '../agentDeviceEvents';

 const mockEventLogStream = {
  init: jest.fn(async () => undefined),
@@ -370,7 +370,8 @@ describe(startAgentDeviceEventCollectionAsync, () => {

    expect(logger.warn).toHaveBeenCalledWith(
      {
-        agentDeviceEventParseFailures: { 'invalid-json': 1, 'invalid-event': 1 },
+        producer: 'agent-device',
+        eventParseFailures: { 'invalid-json': 1, 'invalid-event': 1 },
        parseFailureCount: 2,
      },
      'Could not parse 2 agent-device event log records.'
@@ -446,7 +447,7 @@ describe(startAgentDeviceEventCollectionAsync, () => {
      await waitForAsync(() =>
        expect(logger.warn).toHaveBeenCalledWith(
          { err: reportingError },
-          'Agent-device event collection poller failed.'
+          'Event collection poller for agent-device failed.'
        )
      );
      await expect(collection.stopAsync()).resolves.toBeUndefined();
@@ -457,7 +458,7 @@ describe(startAgentDeviceEventCollectionAsync, () => {
    expect(Sentry.capture).toHaveBeenCalledTimes(2);
    expect(Sentry.capture).toHaveBeenNthCalledWith(
      2,
-      'Agent-device event collection poller failed',
+      'Event collection poller for agent-device failed',
      reportingError,
      {
        level: 'warning',
@@ -502,7 +503,11 @@ describe(startAgentDeviceEventCollectionAsync, () => {
      }),
      {
        level: 'warning',
-        tags: { phase: 'device-run-session-event-collection', operation: 'setup' },
+        tags: {
+          phase: 'device-run-session-event-collection',
+          operation: 'setup',
+          producer: 'agent-device',
+        },
        extras: { deviceRunSessionId: 'session-id' },
      }
    );
@@ -0,0 +1,324 @@
+import { type bunyan } from '@expo/logger';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+
+import { type CustomBuildContext } from '../../../customBuildContext';
+import RemoteLoggerStream from '../../../logging/RemoteLoggerStream';
+import { Sentry } from '../../../sentry';
+import { startArgentEventCollectionAsync } from '../argentEvents';
+
+const mockEventLogStream = {
+  init: jest.fn(async () => undefined),
+  write: jest.fn(),
+  cleanUp: jest.fn(async () => undefined),
+};
+
+jest.mock('../../../logging/RemoteLoggerStream', () => ({
+  __esModule: true,
+  default: jest.fn(() => mockEventLogStream),
+}));
+jest.mock('../../../sentry');
+
+const EVENT_LOG_FILENAME = 'tool-server-events.jsonl';
+
+describe(startArgentEventCollectionAsync, () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('maps tool lifecycle records onto the shared operation vocabulary', async () => {
+    const stateDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'argent-events-'));
+    const eventLogFile = path.join(stateDir, EVENT_LOG_FILENAME);
+    await fs.promises.writeFile(
+      eventLogFile,
+      `${JSON.stringify(
+        bunyanRecord({
+          level: 30,
+          type: 'tool.invoked',
+          toolId: 'screenshot',
+          toolInvocationId: 'call-1',
+          msg: 'Capturing screenshot.',
+          time: '2026-07-10T12:00:00.000Z',
+        })
+      )}\n`
+    );
+    const ctx = createContext();
+    const logger = createLogger();
+    const collection = await startArgentEventCollectionAsync({
+      ctx,
+      deviceRunSessionId: 'session-id',
+      eventLogPath: eventLogFile,
+      logger,
+      pollIntervalMs: 10,
+    });
+
+    try {
+      await waitForAsync(() => expect(mockEventLogStream.write).toHaveBeenCalledTimes(1));
+      await fs.promises.appendFile(
+        eventLogFile,
+        `${JSON.stringify(
+          bunyanRecord({
+            level: 30,
+            type: 'tool.completed',
+            toolId: 'screenshot',
+            toolInvocationId: 'call-1',
+            durationMs: 12.34,
+            msg: 'Captured screenshot.',
+            time: '2026-07-10T12:00:01.000Z',
+          })
+        )}\n`
+      );
+      await waitForAsync(() => expect(mockEventLogStream.write).toHaveBeenCalledTimes(2));
+    } finally {
+      await collection.stopAsync();
+      await fs.promises.rm(stateDir, { recursive: true, force: true });
+    }
+
+    expect(ctx.graphqlClient.mutation).toHaveBeenCalledWith(expect.anything(), {
+      deviceRunSessionId: 'session-id',
+    });
+    expect(RemoteLoggerStream).toHaveBeenCalledWith({
+      logger,
+      uploadMethod: {
+        signedUrl: {
+          url: 'https://uploads.expo.test/events',
+          headers: { 'content-disposition': 'attachment; filename="events.ndjson"' },
+        },
+      },
+      options: { uploadIntervalMs: 5_000 },
+    });
+    expect(mockEventLogStream.init).toHaveBeenCalledTimes(1);
+    expect(mockEventLogStream.cleanUp).toHaveBeenCalledTimes(1);
+    expect(mockEventLogStream.write).toHaveBeenNthCalledWith(1, {
+      v: 1,
+      eventId: 'argent:session-id:tool-server-events:1',
+      ts: '2026-07-10T12:00:00.000Z',
+      producer: 'argent',
+      type: 'operation.started',
+      operationId: 'call-1',
+      summary: 'Capturing screenshot.',
+      data: { toolId: 'screenshot', sourceType: 'tool.invoked', sourceLevel: 30 },
+    });
+    expect(mockEventLogStream.write).toHaveBeenNthCalledWith(2, {
+      v: 1,
+      eventId: 'argent:session-id:tool-server-events:2',
+      ts: '2026-07-10T12:00:01.000Z',
+      producer: 'argent',
+      type: 'operation.completed',
+      operationId: 'call-1',
+      outcome: 'success',
+      durationMs: 12.34,
+      summary: 'Captured screenshot.',
+      data: { toolId: 'screenshot', sourceType: 'tool.completed', sourceLevel: 30 },
+    });
+    expect(Sentry.capture).not.toHaveBeenCalled();
+  });
+
+  it('marks failed tool records as failed operations and keeps their failure signal', async () => {
+    const failureSignal = {
+      error_code: 'REGISTRY_TOOL_FAILURE_UNCLASSIFIED',
+      failure_stage: 'registry_tool_failed_event',
+      failure_area: 'registry',
+      error_kind: 'unknown',
+    };
+    const event = await collectSingleEventAsync(
+      bunyanRecord({
+        level: 50,
+        type: 'tool.failed',
+        toolId: 'screenshot',
+        toolInvocationId: 'call-2',
+        failureSignal,
+        msg: 'Failed to capture screenshot.',
+        time: '2026-07-10T12:00:02.000Z',
+      })
+    );
+
+    expect(event).toEqual({
+      v: 1,
+      eventId: 'argent:session-id:tool-server-events:1',
+      ts: '2026-07-10T12:00:02.000Z',
+      producer: 'argent',
+      type: 'operation.completed',
+      operationId: 'call-2',
+      outcome: 'failure',
+      summary: 'Failed to capture screenshot.',
+      data: {
+        toolId: 'screenshot',
+        failureSignal,
+        sourceType: 'tool.failed',
+        sourceLevel: 50,
+      },
+    });
+  });
+
+  it('passes through non-tool lifecycle records unchanged', async () => {
+    const event = await collectSingleEventAsync(
+      bunyanRecord({
+        level: 30,
+        type: 'service.state_change',
+        serviceId: 'ax-service',
+        from: 'stopped',
+        to: 'running',
+        msg: 'Service ax-service changed state from stopped to running.',
+        time: '2026-07-10T12:00:03.000Z',
+      })
+    );
+
+    expect(event).toEqual({
+      v: 1,
+      eventId: 'argent:session-id:tool-server-events:1',
+      ts: '2026-07-10T12:00:03.000Z',
+      producer: 'argent',
+      type: 'service.state_change',
+      summary: 'Service ax-service changed state from stopped to running.',
+      data: {
+        serviceId: 'ax-service',
+        from: 'stopped',
+        to: 'running',
+        sourceType: 'service.state_change',
+        sourceLevel: 30,
+      },
+    });
+  });
+
+  // `type` and `msg` are both required by Argent's EventLogRecord, so a record missing either
+  // is a broken upstream contract worth reporting — not something to paper over with an
+  // invented summary.
+  it.each([
+    ['type', { time: '2026-07-10T12:00:00.000Z', msg: 'No type.' }],
+    ['msg', { time: '2026-07-10T12:00:00.000Z', type: 'tool.invoked', toolId: 'tap' }],
+  ])('reports a record missing %s without emitting an event', async (_field, record) => {
+    const stateDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'argent-events-'));
+    const eventLogPath = path.join(stateDir, EVENT_LOG_FILENAME);
+    await fs.promises.writeFile(eventLogPath, `${JSON.stringify(bunyanRecord(record))}\n`);
+    const collection = await startArgentEventCollectionAsync({
+      ctx: createContext(),
+      deviceRunSessionId: 'session-id',
+      eventLogPath,
+      logger: createLogger(),
+      pollIntervalMs: 10,
+    });
+
+    try {
+      await waitForAsync(() => expect(Sentry.capture).toHaveBeenCalledTimes(1));
+    } finally {
+      await collection.stopAsync();
+      await fs.promises.rm(stateDir, { recursive: true, force: true });
+    }
+
+    expect(mockEventLogStream.write).not.toHaveBeenCalled();
+    expect(Sentry.capture).toHaveBeenCalledWith('Could not parse an argent event log record', {
+      level: 'warning',
+      tags: { phase: 'argent-event-collection', reason: 'invalid-event' },
+      extras: { deviceRunSessionId: 'session-id', lineNumber: 1 },
+    });
+  });
+
+  it('surfaces a non-ENOENT discovery error instead of treating it as no events', async () => {
+    // A regular file standing in for the state directory makes access() fail with ENOTDIR
+    // (not ENOENT), which must propagate to the collector's Sentry reporting.
+    const notADirectory = path.join(
+      await fs.promises.mkdtemp(path.join(os.tmpdir(), 'argent-events-')),
+      'regular-file'
+    );
+    await fs.promises.writeFile(notADirectory, '');
+    const eventLogPath = path.join(notADirectory, EVENT_LOG_FILENAME);
+    const collection = await startArgentEventCollectionAsync({
+      ctx: createContext(),
+      deviceRunSessionId: 'session-id',
+      eventLogPath,
+      logger: createLogger(),
+      pollIntervalMs: 10,
+    });
+
+    try {
+      await waitForAsync(() => expect(Sentry.capture).toHaveBeenCalledTimes(1));
+    } finally {
+      await collection.stopAsync();
+      await fs.promises.rm(notADirectory, { force: true });
+    }
+
+    expect(mockEventLogStream.write).not.toHaveBeenCalled();
+    expect(Sentry.capture).toHaveBeenCalledWith(
+      'Could not collect argent events',
+      expect.objectContaining({ code: 'ENOTDIR' }),
+      {
+        level: 'warning',
+        tags: { phase: 'argent-event-collection' },
+        extras: { deviceRunSessionId: 'session-id' },
+      }
+    );
+  });
+});
+
+async function collectSingleEventAsync(
+  record: Record<string, unknown>
+): Promise<Record<string, unknown>> {
+  const stateDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'argent-events-'));
+  const eventLogPath = path.join(stateDir, EVENT_LOG_FILENAME);
+  await fs.promises.writeFile(eventLogPath, `${JSON.stringify(record)}\n`);
+  const collection = await startArgentEventCollectionAsync({
+    ctx: createContext(),
+    deviceRunSessionId: 'session-id',
+    eventLogPath,
+    logger: createLogger(),
+    pollIntervalMs: 10,
+  });
+
+  try {
+    await waitForAsync(() => expect(mockEventLogStream.write).toHaveBeenCalledTimes(1));
+  } finally {
+    await collection.stopAsync();
+    await fs.promises.rm(stateDir, { recursive: true, force: true });
+  }
+
+  return mockEventLogStream.write.mock.calls[0][0];
+}
+
+function bunyanRecord(fields: Record<string, unknown>): Record<string, unknown> {
+  return {
+    name: 'argent-tool-server',
+    hostname: 'test-host',
+    pid: 4242,
+    v: 0,
+    ...fields,
+  };
+}
+
+function createContext(): CustomBuildContext {
+  const mutation = jest.fn().mockReturnValue({
+    toPromise: async () => ({
+      data: {
+        deviceRunSession: {
+          createEventLogUploadSession: {
+            uploadSession: {
+              url: 'https://uploads.expo.test/events',
+              headers: { 'content-disposition': 'attachment; filename="events.ndjson"' },
+            },
+          },
+        },
+      },
+    }),
+  });
+  return { graphqlClient: { mutation } } as unknown as CustomBuildContext;
+}
+
+function createLogger(): bunyan {
+  return { info: jest.fn(), warn: jest.fn() } as unknown as bunyan;
+}
+
+async function waitForAsync(assertion: () => void): Promise<void> {
+  const deadline = Date.now() + 2_000;
+  for (;;) {
+    try {
+      assertion();
+      return;
+    } catch (err) {
+      if (Date.now() >= deadline) {
+        throw err;
+      }
+      await new Promise(resolve => setTimeout(resolve, 10));
+    }
+  }
+}
@@ -0,0 +1,155 @@
+import { type bunyan } from '@expo/logger';
+import fs from 'node:fs';
+import path from 'node:path';
+import { z } from 'zod';
+
+import { type CustomBuildContext } from '../../customBuildContext';
+import {
+  type DeviceRunSessionEvent,
+  type DeviceRunSessionEventParseFailure,
+  startDeviceRunSessionEventCollectionAsync,
+} from './deviceRunSessionEvents';
+
+const AGENT_DEVICE_PRODUCER = 'agent-device';
+
+const AGENT_DEVICE_EVENT_KIND_TO_TYPE: Record<string, string> = {
+  'request.started': 'operation.started',
+  'request.finished': 'operation.completed',
+  'action.recorded': 'interaction.recorded',
+};
+
+const AgentDeviceEventSchema = z
+  .object({
+    version: z.number(),
+    ts: z.string(),
+    session: z.string(),
+    kind: z.string(),
+    requestId: z.string().optional().catch(undefined),
+    command: z.string().optional().catch(undefined),
+    status: z.string().optional().catch(undefined),
+    summary: z.string().optional().catch(undefined),
+    details: z.record(z.string(), z.unknown()).optional().catch(undefined),
+  })
+  .passthrough();
+
+type AgentDeviceEvent = z.infer<typeof AgentDeviceEventSchema>;
+
+export async function startAgentDeviceEventCollectionAsync({
+  ctx,
+  deviceRunSessionId,
+  stateDir,
+  logger,
+  pollIntervalMs,
+}: {
+  ctx: CustomBuildContext;
+  deviceRunSessionId: string;
+  stateDir: string;
+  logger: bunyan;
+  pollIntervalMs?: number;
+}): Promise<{ stopAsync: () => Promise<void> }> {
+  return startDeviceRunSessionEventCollectionAsync({
+    ctx,
+    deviceRunSessionId,
+    logger,
+    pollIntervalMs,
+    source: {
+      producer: AGENT_DEVICE_PRODUCER,
+      findEventFilesAsync: () => findAgentDeviceEventFilesAsync(stateDir),
+      sourceKeyForFile: eventFile => path.basename(path.dirname(eventFile)),
+      parseLine: ({ line, sourceKey, sequenceNumber, deviceRunSessionId }) => {
+        const { event, failure } = parseAgentDeviceEvent(line);
+        if (!event) {
+          return { failure };
+        }
+        return {
+          event: normalizeAgentDeviceEvent({
+            event,
+            sequenceNumber,
+            sourceSessionDirectory: sourceKey,
+            deviceRunSessionId,
+          }),
+        };
+      },
+    },
+  });
+}
+
+async function findAgentDeviceEventFilesAsync(stateDir: string): Promise<string[]> {
+  const sessionsDir = path.join(stateDir, 'sessions');
+  let entries: fs.Dirent[];
+  try {
+    entries = await fs.promises.readdir(sessionsDir, { withFileTypes: true });
+  } catch (err) {
+    if ((err as NodeJS.ErrnoException).code === 'ENOENT') {
+      return [];
+    }
+    throw err;
+  }
+
+  return entries
+    .filter(entry => entry.isDirectory())
+    .map(entry => path.join(sessionsDir, entry.name, 'events.ndjson'));
+}
+
+type ParsedAgentDeviceEvent = {
+  event?: AgentDeviceEvent;
+  failure?: DeviceRunSessionEventParseFailure;
+};
+
+function parseAgentDeviceEvent(line: string): ParsedAgentDeviceEvent {
+  if (!line.trim()) {
+    return {};
+  }
+  try {
+    const result = AgentDeviceEventSchema.safeParse(JSON.parse(line));
+    return result.success ? { event: result.data } : { failure: 'invalid-event' };
+  } catch {
+    return { failure: 'invalid-json' };
+  }
+}
+
+function normalizeAgentDeviceEvent({
+  event,
+  sequenceNumber,
+  sourceSessionDirectory,
+  deviceRunSessionId,
+}: {
+  event: AgentDeviceEvent;
+  sequenceNumber: number;
+  sourceSessionDirectory: string;
+  deviceRunSessionId: string;
+}): DeviceRunSessionEvent {
+  const type = AGENT_DEVICE_EVENT_KIND_TO_TYPE[event.kind] ?? event.kind;
+  const durationMs = event.details?.durationMs;
+  const outcome =
+    event.status === 'ok' ? 'success' : event.status === 'error' ? 'failure' : undefined;
+  const summary =
+    event.summary ??
+    (event.kind === 'request.started'
+      ? `Started ${event.command ?? 'activity'}`
+      : event.kind === 'request.finished'
+        ? `Finished ${event.command ?? 'activity'}`
+        : event.kind === 'action.recorded'
+          ? `Recorded ${event.command ?? 'activity'}`
+          : `${event.kind}${event.command ? `: ${event.command}` : ''}`);
+
+  return {
+    v: 1,
+    // Consumers use eventId to deduplicate events across polls. Keep the per-file sequence
+    // monotonic across source-file truncations so an ID is never reused during collection.
+    eventId: `agent-device:${deviceRunSessionId}:${sourceSessionDirectory}:${sequenceNumber}`,
+    ts: event.ts,
+    producer: 'agent-device',
+    type,
+    ...(event.requestId ? { operationId: event.requestId } : {}),
+    ...(outcome ? { outcome } : {}),
+    ...(typeof durationMs === 'number' ? { durationMs } : {}),
+    summary,
+    data: {
+      ...event.details,
+      session: event.session,
+      sourceVersion: event.version,
+      ...(event.status ? { sourceStatus: event.status } : {}),
+    },
+  };
+}
@@ -0,0 +1,170 @@
+import { type bunyan } from '@expo/logger';
+import fs from 'node:fs';
+import path from 'node:path';
+import { z } from 'zod';
+
+import { type CustomBuildContext } from '../../customBuildContext';
+import {
+  type DeviceRunSessionEvent,
+  type DeviceRunSessionEventParseFailure,
+  startDeviceRunSessionEventCollectionAsync,
+} from './deviceRunSessionEvents';
+
+const ARGENT_PRODUCER = 'argent';
+// Argent's tool-server writes its event log to `~/.argent/tool-server-events.jsonl`
+// (its default $ARGENT_EVENT_LOG path) once the `tool-server-event-log` flag is on.
+export const ARGENT_EVENT_LOG_FILENAME = 'tool-server-events.jsonl';
+
+// Argent records are bunyan log lines tagged with a `type`. Map the tool-lifecycle
+// types onto the shared operation vocabulary; anything else (service.*,
+// tool_server.*, future types) passes through unchanged, mirroring agent-device.
+const ARGENT_EVENT_TYPE_TO_TYPE: Record<string, string> = {
+  'tool.invoked': 'operation.started',
+  'tool.completed': 'operation.completed',
+  'tool.failed': 'operation.completed',
+};
+
+// Bunyan bookkeeping plus the fields we promote to the top level of a
+// DeviceRunSessionEvent — excluded from the free-form `data` bag so it carries
+// only the record's own context (toolId, serviceId, failureSignal, ...).
+const NON_DATA_KEYS = new Set([
+  'name',
+  'hostname',
+  'pid',
+  'v',
+  'time',
+  'msg',
+  'level',
+  'type',
+  'toolInvocationId',
+  'durationMs',
+]);
+
+const ArgentEventSchema = z
+  .object({
+    time: z.string(),
+    type: z.string(),
+    // Argent's EventLogRecord requires `msg` and every emit site sets it to the
+    // human-readable description of the event, so it is our summary verbatim.
+    msg: z.string(),
+    level: z.number().optional().catch(undefined),
+    toolId: z.string().optional().catch(undefined),
+    toolInvocationId: z.string().optional().catch(undefined),
+    durationMs: z.number().optional().catch(undefined),
+  })
+  .passthrough();
+
+type ArgentEvent = z.infer<typeof ArgentEventSchema>;
+
+type ParsedArgentEvent = {
+  event?: ArgentEvent;
+  failure?: DeviceRunSessionEventParseFailure;
+};
+
+export async function startArgentEventCollectionAsync({
+  ctx,
+  deviceRunSessionId,
+  eventLogPath,
+  logger,
+  pollIntervalMs,
+}: {
+  ctx: CustomBuildContext;
+  deviceRunSessionId: string;
+  // Absolute path Argent's tool-server writes its event log to (its `ARGENT_EVENT_LOG`).
+  // The caller pins this on both sides so the collector and the tool-server never disagree.
+  eventLogPath: string;
+  logger: bunyan;
+  pollIntervalMs?: number;
+}): Promise<{ stopAsync: () => Promise<void> }> {
+  return startDeviceRunSessionEventCollectionAsync({
+    ctx,
+    deviceRunSessionId,
+    logger,
+    pollIntervalMs,
+    source: {
+      producer: ARGENT_PRODUCER,
+      findEventFilesAsync: () => findArgentEventFilesAsync(eventLogPath),
+      sourceKeyForFile: eventFile => path.basename(eventFile, path.extname(eventFile)),
+      parseLine: ({ line, sourceKey, sequenceNumber, deviceRunSessionId }) => {
+        const { event, failure } = parseArgentEvent(line);
+        if (!event) {
+          return { failure };
+        }
+        return {
+          event: normalizeArgentEvent({ event, sequenceNumber, sourceKey, deviceRunSessionId }),
+        };
+      },
+    },
+  });
+}
+
+async function findArgentEventFilesAsync(eventLogPath: string): Promise<string[]> {
+  try {
+    await fs.promises.access(eventLogPath);
+    return [eventLogPath];
+  } catch (err) {
+    // The tool-server has not created the file yet — expected until the first event is written.
+    // Surface any other error (permissions, I/O) to the engine so it reaches Sentry.
+    if ((err as NodeJS.ErrnoException).code === 'ENOENT') {
+      return [];
+    }
+    throw err;
+  }
+}
+
+function parseArgentEvent(line: string): ParsedArgentEvent {
+  if (!line.trim()) {
+    return {};
+  }
+  try {
+    const result = ArgentEventSchema.safeParse(JSON.parse(line));
+    return result.success ? { event: result.data } : { failure: 'invalid-event' };
+  } catch {
+    return { failure: 'invalid-json' };
+  }
+}
+
+function normalizeArgentEvent({
+  event,
+  sequenceNumber,
+  sourceKey,
+  deviceRunSessionId,
+}: {
+  event: ArgentEvent;
+  sequenceNumber: number;
+  sourceKey: string;
+  deviceRunSessionId: string;
+}): DeviceRunSessionEvent {
+  const type = ARGENT_EVENT_TYPE_TO_TYPE[event.type] ?? event.type;
+  const outcome =
+    event.type === 'tool.completed'
+      ? 'success'
+      : event.type === 'tool.failed'
+        ? 'failure'
+        : undefined;
+  const data: Record<string, unknown> = {};
+  for (const [key, value] of Object.entries(event)) {
+    if (!NON_DATA_KEYS.has(key) && value !== undefined) {
+      data[key] = value;
+    }
+  }
+  data.sourceType = event.type;
+  if (typeof event.level === 'number') {
+    data.sourceLevel = event.level;
+  }
+
+  return {
+    v: 1,
+    // Consumers use eventId to deduplicate events across polls. Keep the per-file sequence
+    // monotonic across source-file truncations so an ID is never reused during collection.
+    eventId: `argent:${deviceRunSessionId}:${sourceKey}:${sequenceNumber}`,
+    ts: event.time,
+    producer: 'argent',
+    type,
+    ...(event.toolInvocationId ? { operationId: event.toolInvocationId } : {}),
+    ...(outcome ? { outcome } : {}),
+    ...(typeof event.durationMs === 'number' ? { durationMs: event.durationMs } : {}),
+    summary: event.msg,
+    data,
+  };
+}
@@ -2,10 +2,8 @@ import { SystemError } from '@expo/eas-build-job';
 import { type bunyan } from '@expo/logger';
 import { graphql } from 'gql.tada';
 import fs from 'node:fs';
-import path from 'node:path';
 import { StringDecoder } from 'node:string_decoder';
 import { setTimeout as setTimeoutAsync } from 'node:timers/promises';
-import { z } from 'zod';

 import { type CustomBuildContext } from '../../customBuildContext';
 import RemoteLoggerStream from '../../logging/RemoteLoggerStream';
@@ -15,26 +13,6 @@ import { type SignedUrl } from '../../storage/uploadWithSignedUrl';
 const POLL_INTERVAL_MS = 1_000;
 const UPLOAD_INTERVAL_MS = 5_000;

-const AGENT_DEVICE_EVENT_KIND_TO_TYPE: Record<string, string> = {
-  'request.started': 'operation.started',
-  'request.finished': 'operation.completed',
-  'action.recorded': 'interaction.recorded',
-};
-
-const AgentDeviceEventSchema = z
-  .object({
-    version: z.number(),
-    ts: z.string(),
-    session: z.string(),
-    kind: z.string(),
-    requestId: z.string().optional().catch(undefined),
-    command: z.string().optional().catch(undefined),
-    status: z.string().optional().catch(undefined),
-    summary: z.string().optional().catch(undefined),
-    details: z.record(z.string(), z.unknown()).optional().catch(undefined),
-  })
-  .passthrough();
-
 const CREATE_DEVICE_RUN_SESSION_EVENT_LOG_UPLOAD_SESSION_MUTATION = graphql(`
  mutation CreateDeviceRunSessionEventLogUploadSession($deviceRunSessionId: ID!) {
    deviceRunSession {
@@ -48,8 +26,12 @@ const CREATE_DEVICE_RUN_SESSION_EVENT_LOG_UPLOAD_SESSION_MUTATION = graphql(`
  }
 `);

-type AgentDeviceEvent = z.infer<typeof AgentDeviceEventSchema>;
-
+/**
+ * The normalized, producer-agnostic event shape uploaded to the API server.
+ * Every remote-session producer (agent-device, argent, ...) tails its own
+ * event log and maps its records onto this common contract so consumers render
+ * a single unified session timeline.
+ */
 export type DeviceRunSessionEvent = {
  v: 1;
  eventId: string;
@@ -63,6 +45,44 @@ export type DeviceRunSessionEvent = {
  data?: Record<string, unknown>;
 };

+export type DeviceRunSessionEventParseFailure = 'invalid-json' | 'invalid-event';
+
+export type DeviceRunSessionEventParseResult = {
+  event?: DeviceRunSessionEvent;
+  failure?: DeviceRunSessionEventParseFailure;
+};
+
+/**
+ * Producer-specific adapter plugged into the generic collection engine. It only
+ * has to say where its event files live and how to turn one raw NDJSON line
+ * into a {@link DeviceRunSessionEvent}; the engine owns tailing, upload, polling
+ * and failure reporting.
+ */
+export type DeviceRunSessionEventSource = {
+  /**
+   * Stable producer identifier, e.g. `agent-device` or `argent`. Also used
+   * verbatim in diagnostic messages, which are phrased so it never needs
+   * recasing.
+   */
+  producer: string;
+  /** Discover the NDJSON event files to tail (absolute paths). */
+  findEventFilesAsync: () => Promise<string[]>;
+  /** Namespace component of the event ID derived from a tailed file path. */
+  sourceKeyForFile: (eventFile: string) => string;
+  /**
+   * Parse one raw NDJSON line. `sequenceNumber` is monotonic per file (kept
+   * stable across truncations) and `sourceKey` namespaces the event ID so an ID
+   * is never reused during collection. Blank lines should return an empty
+   * result so they neither emit an event nor count as a parse failure.
+   */
+  parseLine: (args: {
+    line: string;
+    sourceKey: string;
+    sequenceNumber: number;
+    deviceRunSessionId: string;
+  }) => DeviceRunSessionEventParseResult;
+};
+
 type EventFileState = {
  offset: number;
  nextSequenceNumber: number;
@@ -71,25 +91,20 @@ type EventFileState = {
  decoder: StringDecoder;
 };

-type AgentDeviceEventParseFailure = 'invalid-json' | 'invalid-event';
-type AgentDeviceEventParseResult = {
-  event?: AgentDeviceEvent;
-  failure?: AgentDeviceEventParseFailure;
-};
-
-export async function startAgentDeviceEventCollectionAsync({
+export async function startDeviceRunSessionEventCollectionAsync({
  ctx,
  deviceRunSessionId,
-  stateDir,
+  source,
  logger,
  pollIntervalMs = POLL_INTERVAL_MS,
 }: {
  ctx: CustomBuildContext;
  deviceRunSessionId: string;
-  stateDir: string;
+  source: DeviceRunSessionEventSource;
  logger: bunyan;
  pollIntervalMs?: number;
 }): Promise<{ stopAsync: () => Promise<void> }> {
+  const { producer } = source;
  let didReportEventLogFailure = false;
  const reportEventLogFailure = (error: Error, operation: 'setup' | 'cleanup'): void => {
    if (didReportEventLogFailure) {
@@ -98,7 +113,7 @@ export async function startAgentDeviceEventCollectionAsync({
    didReportEventLogFailure = true;
    Sentry.capture('Could not persist device run session events', error, {
      level: 'warning',
-      tags: { phase: 'device-run-session-event-collection', operation },
+      tags: { phase: 'device-run-session-event-collection', operation, producer },
      extras: { deviceRunSessionId },
    });
  };
@@ -124,13 +139,13 @@ export async function startAgentDeviceEventCollectionAsync({
  const states = new Map<string, EventFileState>();
  const controller = new AbortController();
  let parseFailureCount = 0;
-  const parseFailureCounts: Record<AgentDeviceEventParseFailure, number> = {
+  const parseFailureCounts: Record<DeviceRunSessionEventParseFailure, number> = {
    'invalid-json': 0,
    'invalid-event': 0,
  };
  let didReportCollectionFailure = false;
  const collectAsync = async (): Promise<void> => {
-    const eventFiles = await findAgentDeviceEventFilesAsync(stateDir);
+    const eventFiles = await source.findEventFilesAsync();
    await Promise.all(
      eventFiles.map(async eventFile => {
        const state = states.get(eventFile) ?? {
@@ -144,6 +159,7 @@ export async function startAgentDeviceEventCollectionAsync({
        await collectEventFileAsync({
          eventFile,
          state,
+          source,
          deviceRunSessionId,
          writeEvent: event => eventLogStream.write(event),
          onParseFailure: ({ failure, lineNumber }) => {
@@ -153,12 +169,12 @@ export async function startAgentDeviceEventCollectionAsync({
              return;
            }
            logger.warn(
-              { agentDeviceEventParseFailure: failure, lineNumber },
-              'Could not parse an agent-device event log record.'
+              { producer, eventParseFailure: failure, lineNumber },
+              `Could not parse an ${producer} event log record.`
            );
-            Sentry.capture('Could not parse an agent-device event log record', {
+            Sentry.capture(`Could not parse an ${producer} event log record`, {
              level: 'warning',
-              tags: { phase: 'agent-device-event-collection', reason: failure },
+              tags: { phase: `${producer}-event-collection`, reason: failure },
              extras: { deviceRunSessionId, lineNumber },
            });
          },
@@ -176,10 +192,10 @@ export async function startAgentDeviceEventCollectionAsync({
      }
      didReportCollectionFailure = true;
      const error = err instanceof Error ? err : new Error(String(err));
-      logger.warn({ err: error }, 'Could not collect agent-device events.');
-      Sentry.capture('Could not collect agent-device events', error, {
+      logger.warn({ err: error }, `Could not collect ${producer} events.`);
+      Sentry.capture(`Could not collect ${producer} events`, error, {
        level: 'warning',
-        tags: { phase: 'agent-device-event-collection' },
+        tags: { phase: `${producer}-event-collection` },
        extras: { deviceRunSessionId },
      });
    }
@@ -200,10 +216,10 @@ export async function startAgentDeviceEventCollectionAsync({
  })()
    .catch(err => {
      const error = err instanceof Error ? err : new Error(String(err));
-      logger.warn({ err: error }, 'Agent-device event collection poller failed.');
-      Sentry.capture('Agent-device event collection poller failed', error, {
+      logger.warn({ err: error }, `Event collection poller for ${producer} failed.`);
+      Sentry.capture(`Event collection poller for ${producer} failed`, error, {
        level: 'warning',
-        tags: { phase: 'agent-device-event-collection', operation: 'poll' },
+        tags: { phase: `${producer}-event-collection`, operation: 'poll' },
        extras: { deviceRunSessionId },
      });
    })
@@ -218,12 +234,12 @@ export async function startAgentDeviceEventCollectionAsync({
      await collectSafelyAsync();
      if (parseFailureCount > 1) {
        logger.warn(
-          { agentDeviceEventParseFailures: parseFailureCounts, parseFailureCount },
-          `Could not parse ${parseFailureCount} agent-device event log records.`
+          { producer, eventParseFailures: parseFailureCounts, parseFailureCount },
+          `Could not parse ${parseFailureCount} ${producer} event log records.`
        );
-        Sentry.capture('Could not parse multiple agent-device event log records', {
+        Sentry.capture(`Could not parse multiple ${producer} event log records`, {
          level: 'warning',
-          tags: { phase: 'agent-device-event-collection' },
+          tags: { phase: `${producer}-event-collection` },
          extras: { deviceRunSessionId, parseFailureCount, parseFailureCounts },
        });
      }
@@ -260,35 +276,23 @@ async function createEventLogUploadSessionAsync(
  };
 }

-async function findAgentDeviceEventFilesAsync(stateDir: string): Promise<string[]> {
-  const sessionsDir = path.join(stateDir, 'sessions');
-  let entries: fs.Dirent[];
-  try {
-    entries = await fs.promises.readdir(sessionsDir, { withFileTypes: true });
-  } catch (err) {
-    if ((err as NodeJS.ErrnoException).code === 'ENOENT') {
-      return [];
-    }
-    throw err;
-  }
-
-  return entries
-    .filter(entry => entry.isDirectory())
-    .map(entry => path.join(sessionsDir, entry.name, 'events.ndjson'));
-}
-
 async function collectEventFileAsync({
  eventFile,
  state,
+  source,
  deviceRunSessionId,
  writeEvent,
  onParseFailure,
 }: {
  eventFile: string;
  state: EventFileState;
+  source: DeviceRunSessionEventSource;
  deviceRunSessionId: string;
  writeEvent: (event: DeviceRunSessionEvent) => void;
-  onParseFailure: (failure: { failure: AgentDeviceEventParseFailure; lineNumber: number }) => void;
+  onParseFailure: (failure: {
+    failure: DeviceRunSessionEventParseFailure;
+    lineNumber: number;
+  }) => void;
 }): Promise<void> {
  let fileSize: number;
  try {
@@ -309,6 +313,7 @@ async function collectEventFileAsync({
    return;
  }

+  const sourceKey = source.sourceKeyForFile(eventFile);
  const handle = await fs.promises.open(eventFile, 'r');
  try {
    const buffer = new Uint8Array(new ArrayBuffer(fileSize - state.offset));
@@ -321,80 +326,21 @@ async function collectEventFileAsync({
    for (const line of lines) {
      const lineNumber = state.nextLineNumber++;
      const sequenceNumber = state.nextSequenceNumber++;
-      const { event, failure } = parseAgentDeviceEvent(line);
+      const { event, failure } = source.parseLine({
+        line,
+        sourceKey,
+        sequenceNumber,
+        deviceRunSessionId,
+      });
      if (failure) {
        onParseFailure({ failure, lineNumber });
      }
      if (!event) {
        continue;
      }
-      const deviceRunSessionEvent = normalizeAgentDeviceEvent({
-        event,
-        sequenceNumber,
-        sourceSessionDirectory: path.basename(path.dirname(eventFile)),
-        deviceRunSessionId,
-      });
-      writeEvent(deviceRunSessionEvent);
+      writeEvent(event);
    }
  } finally {
    await handle.close();
  }
 }
-
-function parseAgentDeviceEvent(line: string): AgentDeviceEventParseResult {
-  if (!line.trim()) {
-    return {};
-  }
-  try {
-    const result = AgentDeviceEventSchema.safeParse(JSON.parse(line));
-    return result.success ? { event: result.data } : { failure: 'invalid-event' };
-  } catch {
-    return { failure: 'invalid-json' };
-  }
-}
-
-function normalizeAgentDeviceEvent({
-  event,
-  sequenceNumber,
-  sourceSessionDirectory,
-  deviceRunSessionId,
-}: {
-  event: AgentDeviceEvent;
-  sequenceNumber: number;
-  sourceSessionDirectory: string;
-  deviceRunSessionId: string;
-}): DeviceRunSessionEvent {
-  const type = AGENT_DEVICE_EVENT_KIND_TO_TYPE[event.kind] ?? event.kind;
-  const durationMs = event.details?.durationMs;
-  const outcome =
-    event.status === 'ok' ? 'success' : event.status === 'error' ? 'failure' : undefined;
-  const summary =
-    event.summary ??
-    (event.kind === 'request.started'
-      ? `Started ${event.command ?? 'activity'}`
-      : event.kind === 'request.finished'
-        ? `Finished ${event.command ?? 'activity'}`
-        : event.kind === 'action.recorded'
-          ? `Recorded ${event.command ?? 'activity'}`
-          : `${event.kind}${event.command ? `: ${event.command}` : ''}`);
-
-  return {
-    v: 1,
-    // Consumers use eventId to deduplicate events across polls. Keep the per-file sequence
-    // monotonic across source-file truncations so an ID is never reused during collection.
-    eventId: `agent-device:${deviceRunSessionId}:${sourceSessionDirectory}:${sequenceNumber}`,
-    ts: event.ts,
-    producer: 'agent-device',
-    type,
-    ...(event.requestId ? { operationId: event.requestId } : {}),
-    ...(outcome ? { outcome } : {}),
-    ...(typeof durationMs === 'number' ? { durationMs } : {}),
-    summary,
-    data: {
-      ...event.details,
-      session: event.session,
-      sourceVersion: event.version,
-      ...(event.status ? { sourceStatus: event.status } : {}),
-    },
-  };
-}
@@ -1,34 +1,103 @@
-# eas-cli
+<!-- Everything above the "# Commands" section is generated from packages/eas-cli/scripts/readme-header.md. Edit that file, not README.md; `yarn version` regenerates README.md and overwrites this content. -->

-EAS command line tool
+<!-- The logo src is an absolute URL on purpose: this file is also the repository root README (README.md is a symlink to it), so it renders at two different depths and no single relative path resolves in both. -->

-[![oclif](https://img.shields.io/badge/cli-oclif-brightgreen.svg)](https://oclif.io)
-[![Version](https://img.shields.io/npm/v/eas-cli.svg)](https://npmjs.org/package/eas-cli)
-[![Downloads/week](https://img.shields.io/npm/dw/eas-cli.svg)](https://npmjs.org/package/eas-cli)
-[![License](https://img.shields.io/npm/l/eas-cli.svg)](https://github.com/expo/eas-cli/blob/main/package.json)
+<p align="center">
+  <a href="https://expo.dev/services">
+    <img alt="EAS" height="96" src="https://raw.githubusercontent.com/expo/eas-cli/main/.github/resources/eas.svg">
+  </a>
+</p>

- [Installation](#installation)
- [Usage](#usage)
- [Commands](#commands)
+<h1 align="center">EAS CLI</h1>

-# Installation
+<p align="center">Ship Expo and React Native apps from your terminal: build, submit, update, deploy, and automate with EAS.</p>
+
+<p align="center">
+  <a aria-label="eas documentation" href="https://docs.expo.dev/eas/">📚 Documentation</a>
+  &ensp;•&ensp;
+  <a aria-label="eas cli reference" href="https://docs.expo.dev/eas/cli/">📖 CLI Reference</a>
+  &ensp;•&ensp;
+  <a aria-label="eas" href="https://expo.dev/services">🚀 EAS</a>
+  &ensp;•&ensp;
+  <a aria-label="expo blog" href="https://expo.dev/blog">📝 Blog</a>
+  &ensp;•&ensp;
+  <a aria-label="expo changelog" href="https://expo.dev/changelog">📰 Changelog</a>
+  &ensp;•&ensp;
+  <a aria-label="contribute to eas cli" href="https://github.com/expo/eas-cli/blob/main/CONTRIBUTING.md">👏 Contribute</a>
+</p>
+
+<p align="center">
+  <a aria-label="npm version" href="https://www.npmjs.com/package/eas-cli" target="_blank">
+    <img alt="npm version" src="https://img.shields.io/npm/v/eas-cli.svg?style=for-the-badge&label=npm&labelColor=000000&color=4630EB" />
+  </a>
+  <a aria-label="npm downloads" href="https://npm-stat.com/charts.html?package=eas-cli" target="_blank">
+    <img alt="downloads" src="https://img.shields.io/npm/dm/eas-cli.svg?style=for-the-badge&labelColor=000000&color=33CC12&label=downloads" />
+  </a>
+  <a aria-label="License: MIT" href="https://github.com/expo/eas-cli/blob/main/LICENSE" target="_blank">
+    <img alt="License: MIT" src="https://img.shields.io/badge/License-MIT-success.svg?style=for-the-badge&labelColor=000000&color=33CC12" />
+  </a>
+  <a aria-label="Join the Expo Discord" href="https://chat.expo.dev" target="_blank">
+    <img alt="Discord" src="https://img.shields.io/discord/695411232856997968.svg?style=for-the-badge&color=5865F2&logo=discord&logoColor=FFFFFF" />
+  </a>
+</p>
+
+---
+
+EAS CLI is the command-line interface for [Expo Application Services (EAS)](https://expo.dev/services): deeply integrated cloud services for Expo and React Native apps, from the team behind Expo.
+
+It gives you a terminal-native path from source code to production: compile signed Android and iOS binaries in the cloud, submit them to the app stores, push over-the-air updates, deploy web apps and API routes, and automate the entire release process, from your machine or from CI.
+
+## Quick start
+
+Install the CLI, log in to your Expo account, and link your project:

 ```sh
-npm install -g eas-cli
-# or
-yarn global add eas-cli
+npm install --global eas-cli
+eas login
+eas init
 ```

-## Enforcing eas-cli version for your project
+Then ship:

-If you want to enforce the `eas-cli` version for your project, use the `"cli.version"` field in **eas.json**. Installing `eas-cli` to your project dependencies is strongly discouraged because it may cause dependency conflicts that are difficult to debug.
+```sh
+# Compile installable Android and iOS binaries in the cloud
+eas build --platform all

-An example of **eas.json** that enforces `eas-cli` in version `1.0.0` or newer:
+# Submit the latest builds to Google Play and the App Store
+eas submit --platform all
+
+# Push an over-the-air update to your users
+eas update --branch production --message "Fix checkout crash"
+```
+
+Prefer not to install globally? Every command also works with `npx eas-cli@latest`:
+
+```sh
+npx eas-cli@latest build --platform ios
+```
+
+New to EAS? Follow [Create your first build](https://docs.expo.dev/build/setup/) for a complete walkthrough.
+
+## What you can do
+
+- **[EAS Build](https://docs.expo.dev/build/introduction/)** (`eas build`): compile and sign Android and iOS apps with custom native code in the cloud, manage app credentials, and share internal distribution builds.
+- **[EAS Submit](https://docs.expo.dev/deploy/submit-to-app-stores/)** (`eas submit`): upload your app to Google Play and App Store Connect with one command.
+- **[EAS Update](https://docs.expo.dev/eas-update/introduction/)** (`eas update`): push JavaScript and asset fixes directly to users, with branches, channels, runtime versions, rollouts, and rollbacks.
+- **[EAS Workflows](https://docs.expo.dev/eas/workflows/get-started/)** (`eas workflow`): automate development and release with CI/CD jobs that build, test, submit, update, and deploy your app from `.eas/workflows`.
+- **[EAS Hosting](https://docs.expo.dev/eas/hosting/introduction/)** (`eas deploy`): deploy Expo Router and React Native web apps and API routes.
+- **[EAS Metadata](https://docs.expo.dev/eas/metadata/)** (`eas metadata:push`): maintain your app store presence from the command line (in preview).
+- **Project operations** (`eas env`, `eas credentials`, `eas device`, `eas channel`, …): manage environment variables, signing credentials, Apple devices, update channels, webhooks, and project settings.
+
+## Version policy
+
+EAS CLI is designed to be installed globally or run with `npx`. Installing `eas-cli` into project dependencies is strongly discouraged because it can cause dependency conflicts that are difficult to debug.
+
+If you want to enforce the `eas-cli` version for your project, use the `"cli.version"` field in [eas.json](https://docs.expo.dev/eas/json/):

 ```json
 {
  "cli": {
-    "version": ">=1.0.0"
+    "version": ">=21.0.0"
  },
  "build": {
    // build profiles
@@ -39,18 +108,13 @@ An example of **eas.json** that enforces `eas-cli` in version `1.0.0` or newer:
 }
 ```

-Learn more: https://docs.expo.dev/build/eas-json/
+## Learn more

-# Usage
-
-```sh
-eas COMMAND
-# runs the command
-eas (-v|--version|version)
-# prints the version
-eas --help COMMAND
-# outputs help for specific command
-```
+- [EAS documentation](https://docs.expo.dev/eas/) for the full service overview.
+- [EAS CLI reference](https://docs.expo.dev/eas/cli/) for command usage, flags, and arguments.
+- [Expo dashboard](https://expo.dev/) to view projects, builds, submissions, updates, and workflows.
+- [Expo changelog](https://expo.dev/changelog) and [blog](https://expo.dev/blog) for product updates.
+- [Discord](https://chat.expo.dev) for community support.

 # Commands

@@ -1,11 +1,35 @@
 const fs = require('fs/promises');
+const path = require('path');
+
+const packageRoot = path.join(__dirname, '..');
+const readmePath = path.join(packageRoot, 'README.md');
+const readmeHeaderPath = path.join(__dirname, 'readme-header.md');

 (async () => {
  // Patch `oclif readme` path and link generation
-  let readmeContent = await fs.readFile('README.md', 'utf8');
-  readmeContent = readmeContent.replace(/src\/commands/g, 'packages/eas-cli/src/commands');
-  await fs.writeFile('README.md', readmeContent);
+  let readmeContent = await fs.readFile(readmePath, 'utf8');
+  readmeContent = readmeContent
+    .replace(/\[src\/commands/g, '[packages/eas-cli/src/commands')
+    .replace(
+      /https:\/\/github\.com\/expo\/eas-cli\/blob\/v([^/]+)\/src\/commands/g,
+      'https://github.com/expo/eas-cli/blob/v$1/packages/eas-cli/src/commands'
+    )
+    .replace(
+      /packages\/eas-cli\/(?:packages\/eas-cli\/)+src\/commands/g,
+      'packages/eas-cli/src/commands'
+    );
+
+  const commandReferenceMarker = '# Commands\n\n<!-- commands -->';
+  const commandReferenceStart = readmeContent.indexOf(commandReferenceMarker);
+  if (commandReferenceStart === -1) {
+    throw new Error(`Could not find generated command reference marker in ${readmePath}`);
+  }
+
+  const readmeHeader = await fs.readFile(readmeHeaderPath, 'utf8');
+  readmeContent = `${readmeHeader.trimEnd()}\n\n${readmeContent.slice(commandReferenceStart)}`;
+
+  await fs.writeFile(readmePath, readmeContent);

  // eslint-disable-next-line no-console
-  console.log('Patched README path generation');
+  console.log('Patched README path generation and header');
 })();
@@ -0,0 +1,117 @@
+<!-- Everything above the "# Commands" section is generated from packages/eas-cli/scripts/readme-header.md. Edit that file, not README.md; `yarn version` regenerates README.md and overwrites this content. -->
+
+<!-- The logo src is an absolute URL on purpose: this file is also the repository root README (README.md is a symlink to it), so it renders at two different depths and no single relative path resolves in both. -->
+
+<p align="center">
+  <a href="https://expo.dev/services">
+    <img alt="EAS" height="96" src="https://raw.githubusercontent.com/expo/eas-cli/main/.github/resources/eas.svg">
+  </a>
+</p>
+
+<h1 align="center">EAS CLI</h1>
+
+<p align="center">Ship Expo and React Native apps from your terminal: build, submit, update, deploy, and automate with EAS.</p>
+
+<p align="center">
+  <a aria-label="eas documentation" href="https://docs.expo.dev/eas/">📚 Documentation</a>
+  &ensp;•&ensp;
+  <a aria-label="eas cli reference" href="https://docs.expo.dev/eas/cli/">📖 CLI Reference</a>
+  &ensp;•&ensp;
+  <a aria-label="eas" href="https://expo.dev/services">🚀 EAS</a>
+  &ensp;•&ensp;
+  <a aria-label="expo blog" href="https://expo.dev/blog">📝 Blog</a>
+  &ensp;•&ensp;
+  <a aria-label="expo changelog" href="https://expo.dev/changelog">📰 Changelog</a>
+  &ensp;•&ensp;
+  <a aria-label="contribute to eas cli" href="https://github.com/expo/eas-cli/blob/main/CONTRIBUTING.md">👏 Contribute</a>
+</p>
+
+<p align="center">
+  <a aria-label="npm version" href="https://www.npmjs.com/package/eas-cli" target="_blank">
+    <img alt="npm version" src="https://img.shields.io/npm/v/eas-cli.svg?style=for-the-badge&label=npm&labelColor=000000&color=4630EB" />
+  </a>
+  <a aria-label="npm downloads" href="https://npm-stat.com/charts.html?package=eas-cli" target="_blank">
+    <img alt="downloads" src="https://img.shields.io/npm/dm/eas-cli.svg?style=for-the-badge&labelColor=000000&color=33CC12&label=downloads" />
+  </a>
+  <a aria-label="License: MIT" href="https://github.com/expo/eas-cli/blob/main/LICENSE" target="_blank">
+    <img alt="License: MIT" src="https://img.shields.io/badge/License-MIT-success.svg?style=for-the-badge&labelColor=000000&color=33CC12" />
+  </a>
+  <a aria-label="Join the Expo Discord" href="https://chat.expo.dev" target="_blank">
+    <img alt="Discord" src="https://img.shields.io/discord/695411232856997968.svg?style=for-the-badge&color=5865F2&logo=discord&logoColor=FFFFFF" />
+  </a>
+</p>
+
+---
+
+EAS CLI is the command-line interface for [Expo Application Services (EAS)](https://expo.dev/services): deeply integrated cloud services for Expo and React Native apps, from the team behind Expo.
+
+It gives you a terminal-native path from source code to production: compile signed Android and iOS binaries in the cloud, submit them to the app stores, push over-the-air updates, deploy web apps and API routes, and automate the entire release process, from your machine or from CI.
+
+## Quick start
+
+Install the CLI, log in to your Expo account, and link your project:
+
+```sh
+npm install --global eas-cli
+eas login
+eas init
+```
+
+Then ship:
+
+```sh
+# Compile installable Android and iOS binaries in the cloud
+eas build --platform all
+
+# Submit the latest builds to Google Play and the App Store
+eas submit --platform all
+
+# Push an over-the-air update to your users
+eas update --branch production --message "Fix checkout crash"
+```
+
+Prefer not to install globally? Every command also works with `npx eas-cli@latest`:
+
+```sh
+npx eas-cli@latest build --platform ios
+```
+
+New to EAS? Follow [Create your first build](https://docs.expo.dev/build/setup/) for a complete walkthrough.
+
+## What you can do
+
+- **[EAS Build](https://docs.expo.dev/build/introduction/)** (`eas build`): compile and sign Android and iOS apps with custom native code in the cloud, manage app credentials, and share internal distribution builds.
+- **[EAS Submit](https://docs.expo.dev/deploy/submit-to-app-stores/)** (`eas submit`): upload your app to Google Play and App Store Connect with one command.
+- **[EAS Update](https://docs.expo.dev/eas-update/introduction/)** (`eas update`): push JavaScript and asset fixes directly to users, with branches, channels, runtime versions, rollouts, and rollbacks.
+- **[EAS Workflows](https://docs.expo.dev/eas/workflows/get-started/)** (`eas workflow`): automate development and release with CI/CD jobs that build, test, submit, update, and deploy your app from `.eas/workflows`.
+- **[EAS Hosting](https://docs.expo.dev/eas/hosting/introduction/)** (`eas deploy`): deploy Expo Router and React Native web apps and API routes.
+- **[EAS Metadata](https://docs.expo.dev/eas/metadata/)** (`eas metadata:push`): maintain your app store presence from the command line (in preview).
+- **Project operations** (`eas env`, `eas credentials`, `eas device`, `eas channel`, …): manage environment variables, signing credentials, Apple devices, update channels, webhooks, and project settings.
+
+## Version policy
+
+EAS CLI is designed to be installed globally or run with `npx`. Installing `eas-cli` into project dependencies is strongly discouraged because it can cause dependency conflicts that are difficult to debug.
+
+If you want to enforce the `eas-cli` version for your project, use the `"cli.version"` field in [eas.json](https://docs.expo.dev/eas/json/):
+
+```json
+{
+  "cli": {
+    "version": ">=21.0.0"
+  },
+  "build": {
+    // build profiles
+  },
+  "submit": {
+    // submit profiles
+  }
+}
+```
+
+## Learn more
+
+- [EAS documentation](https://docs.expo.dev/eas/) for the full service overview.
+- [EAS CLI reference](https://docs.expo.dev/eas/cli/) for command usage, flags, and arguments.
+- [Expo dashboard](https://expo.dev/) to view projects, builds, submissions, updates, and workflows.
+- [Expo changelog](https://expo.dev/changelog) and [blog](https://expo.dev/blog) for product updates.
+- [Discord](https://chat.expo.dev) for community support.
@@ -25,23 +25,27 @@ beforeEach(() => {
  jest.resetAllMocks();
 });

-const EXPECTED_STRINGIFIED_GRAPHQL_ERROR_JSON = `[
-  {
-    "name": "GraphQLError",
-    "extensions": {},
-    "message": "Error 1"
-  },
-  {
-    "name": "GraphQLError",
-    "extensions": {},
-    "message": "Error 2"
-  },
-  {
-    "name": "GraphQLError",
-    "extensions": {},
-    "message": "Error 3"
-  }
-]`;
+const EXPECTED_STRINGIFIED_GRAPHQL_ERROR_JSON = `Build request error details:
+{
+  "message": "[GraphQL] Error 1\\n[GraphQL] Error 2\\n[GraphQL] Error 3",
+  "graphQLErrors": [
+    {
+      "name": "GraphQLError",
+      "extensions": {},
+      "message": "Error 1"
+    },
+    {
+      "name": "GraphQLError",
+      "extensions": {},
+      "message": "Error 2"
+    },
+    {
+      "name": "GraphQLError",
+      "extensions": {},
+      "message": "Error 3"
+    }
+  ]
+}`;

 const EXPECTED_EAS_BUILD_DOWN_MESSAGE = `EAS Build is down for maintenance. Try again later. Check ${link(
  'https://status.expo.dev/'
@@ -110,7 +114,7 @@ describe(Build.name, () => {
          handleBuildRequestError(error, platform);
        } catch {}

-        expect(logDebugSpy).toBeCalledWith(undefined);
+        expect(logDebugSpy).not.toHaveBeenCalled();
      });

      it('does it with iOS', async () => {
@@ -122,7 +126,7 @@ describe(Build.name, () => {
          handleBuildRequestError(error, platform);
        } catch {}

-        expect(logDebugSpy).toBeCalledWith(undefined);
+        expect(logDebugSpy).not.toHaveBeenCalled();
      });
    });

@@ -507,6 +511,135 @@ describe(Build.name, () => {
              handleBuildRequestError(error, platform);
            });

+            assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
+          });
+        });
+        describe('with empty GraphQL errors and network response details', () => {
+          it('throws base Error class with network and response details', async () => {
+            const platform = Platform.ANDROID;
+            const error = new CombinedError({
+              graphQLErrors: [],
+              networkError: new Error('Request failed: 400 (Bad Request)'),
+              response: {
+                status: 400,
+                statusText: 'Bad Request',
+                headers: {
+                  get: (headerName: string) =>
+                    headerName === 'expo-request-id' ? mockRequestId : null,
+                },
+              },
+            });
+            const expectedMessage =
+              `${EXPECTED_GENERIC_MESSAGE}\n` +
+              'Network error: Request failed: 400 (Bad Request)\n' +
+              'Response status: 400 Bad Request\n' +
+              `Request ID: ${mockRequestId}`;
+
+            const handleBuildRequestErrorThrownError = getError<Error>(() => {
+              handleBuildRequestError(error, platform);
+            });
+
+            assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
+          });
+
+          it('logs network and response details to debug', async () => {
+            const platform = Platform.ANDROID;
+            const logDebugSpy = jest.spyOn(Log, 'debug');
+            const error = new CombinedError({
+              graphQLErrors: [],
+              networkError: new Error('Request failed: 400 (Bad Request)'),
+              response: {
+                status: 400,
+                statusText: 'Bad Request',
+                headers: {
+                  get: (headerName: string) =>
+                    headerName === 'expo-request-id' ? mockRequestId : null,
+                },
+              },
+            });
+
+            try {
+              handleBuildRequestError(error, platform);
+            } catch {}
+
+            expect(logDebugSpy).toBeCalledWith(expect.stringContaining('"graphQLErrors": []'));
+            expect(logDebugSpy).toBeCalledWith(
+              expect.stringContaining('"message": "[Network] Request failed: 400 (Bad Request)"')
+            );
+            expect(logDebugSpy).toBeCalledWith(
+              expect.stringContaining('"message": "Request failed: 400 (Bad Request)"')
+            );
+            expect(logDebugSpy).toBeCalledWith(expect.stringContaining('"status": 400'));
+            expect(logDebugSpy).toBeCalledWith(
+              expect.stringContaining(`"expo-request-id": "${mockRequestId}"`)
+            );
+          });
+
+          it('includes the request ID from the x-request-id header when expo-request-id is missing', async () => {
+            const platform = Platform.ANDROID;
+            const error = new CombinedError({
+              graphQLErrors: [],
+              networkError: new Error('Request failed: 400 (Bad Request)'),
+              response: {
+                status: 400,
+                statusText: 'Bad Request',
+                headers: {
+                  get: (headerName: string) =>
+                    headerName === 'x-request-id' ? mockRequestId : null,
+                },
+              },
+            });
+            const expectedMessage =
+              `${EXPECTED_GENERIC_MESSAGE}\n` +
+              'Network error: Request failed: 400 (Bad Request)\n' +
+              'Response status: 400 Bad Request\n' +
+              `Request ID: ${mockRequestId}`;
+
+            const handleBuildRequestErrorThrownError = getError<Error>(() => {
+              handleBuildRequestError(error, platform);
+            });
+
+            assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
+          });
+        });
+        describe('with the same request ID in GraphQL error extensions and response headers', () => {
+          it('does not duplicate the request ID line', async () => {
+            const platform = Platform.ANDROID;
+            const graphQLError = getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR');
+            const error = new CombinedError({
+              graphQLErrors: [graphQLError],
+              response: {
+                status: 400,
+                statusText: 'Bad Request',
+                headers: {
+                  get: (headerName: string) =>
+                    headerName === 'expo-request-id' ? mockRequestId : null,
+                },
+              },
+            });
+            const expectedMessage =
+              `${EXPECTED_GENERIC_MESSAGE}\n` +
+              `Request ID: ${mockRequestId}\n` +
+              'Error message: Error 1\n' +
+              'Response status: 400 Bad Request';
+
+            const handleBuildRequestErrorThrownError = getError<Error>(() => {
+              handleBuildRequestError(error, platform);
+            });
+
+            assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
+          });
+        });
+        describe('with no GraphQL, network, or response details', () => {
+          it('falls back to the top-level error message', async () => {
+            const platform = Platform.ANDROID;
+            const error = { graphQLErrors: [], message: 'Something went wrong' };
+            const expectedMessage = `${EXPECTED_GENERIC_MESSAGE}\nError message: Something went wrong`;
+
+            const handleBuildRequestErrorThrownError = getError<Error>(() => {
+              handleBuildRequestError(error, platform);
+            });
+
            assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
          });
        });
@@ -231,12 +231,17 @@ const SERVER_SIDE_DEFINED_ERRORS: Record<string, typeof EasCommandError> = {
 };

 export function handleBuildRequestError(error: any, platform: Platform): never {
-  Log.debug(JSON.stringify(error.graphQLErrors, null, 2));
+  logBuildRequestErrorDebugInfo(error);

-  const graphQLErrorCode: string = error?.graphQLErrors?.[0]?.extensions?.errorCode;
-  if (graphQLErrorCode in SERVER_SIDE_DEFINED_ERRORS) {
+  const graphQLErrors: GraphQLError[] = Array.isArray(error?.graphQLErrors)
+    ? error.graphQLErrors
+    : [];
+  const graphQLErrorCode: string | undefined = graphQLErrors[0]?.extensions?.errorCode as
+    | string
+    | undefined;
+  if (graphQLErrorCode && graphQLErrorCode in SERVER_SIDE_DEFINED_ERRORS) {
    const ErrorClass: typeof EasCommandError = SERVER_SIDE_DEFINED_ERRORS[graphQLErrorCode];
-    throw new ErrorClass(error?.graphQLErrors?.[0]?.message);
+    throw new ErrorClass(graphQLErrors[0]?.message);
  } else if (graphQLErrorCode === 'EAS_BUILD_DOWN_FOR_MAINTENANCE') {
    throw new EasBuildDownForMaintenanceError(
      `EAS Build is down for maintenance. Try again later. Check ${link(
@@ -247,25 +252,128 @@ export function handleBuildRequestError(error: any, platform: Platform): never {
    throw new EasBuildTooManyPendingBuildsError(
      `You have already reached the maximum number of pending ${requestedPlatformDisplayNames[platform]} builds for your account. Try again later.`
    );
-  } else if (error?.graphQLErrors) {
-    const errorMessage = error.graphQLErrors
-      .map((graphQLError: GraphQLError) => {
-        const requestIdLine = graphQLError?.extensions?.requestId
-          ? `\nRequest ID: ${graphQLError.extensions.requestId}`
-          : '';
-        const errorMessageLine = graphQLError?.message
-          ? `\nError message: ${graphQLError.message}`
-          : '';
-        return `${requestIdLine}${errorMessageLine}`;
-      })
-      .join('');
+  } else if (Array.isArray(error?.graphQLErrors)) {
+    const errorDetails = formatBuildRequestErrorDetails(error, graphQLErrors);
    throw new Error(
-      `Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, report the issue.${errorMessage}`
+      `Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, report the issue.${errorDetails}`
    );
  }
  throw error;
 }

+function formatBuildRequestErrorDetails(error: any, graphQLErrors: GraphQLError[]): string {
+  const details: string[] = graphQLErrors
+    .map((graphQLError: GraphQLError) => {
+      const requestIdLine = graphQLError?.extensions?.requestId
+        ? `\nRequest ID: ${graphQLError.extensions.requestId}`
+        : '';
+      const errorMessageLine = graphQLError?.message
+        ? `\nError message: ${graphQLError.message}`
+        : '';
+      return `${requestIdLine}${errorMessageLine}`;
+    })
+    .filter(Boolean);
+
+  if (error?.networkError?.message) {
+    details.push(`\nNetwork error: ${error.networkError.message}`);
+  }
+
+  const response = error?.response;
+  if (response?.status !== undefined || response?.statusText) {
+    const status = [response.status, response.statusText]
+      .filter(value => value !== undefined && value !== '')
+      .join(' ');
+    details.push(`\nResponse status: ${status}`);
+  }
+
+  const responseRequestId = getResponseRequestId(response);
+  const graphQLRequestIds = new Set(
+    graphQLErrors.map(graphQLError => graphQLError?.extensions?.requestId)
+  );
+  if (responseRequestId && !graphQLRequestIds.has(responseRequestId)) {
+    details.push(`\nRequest ID: ${responseRequestId}`);
+  }
+
+  if (details.length === 0 && error?.message) {
+    details.push(`\nError message: ${error.message}`);
+  }
+
+  return details.join('');
+}
+
+function getResponseRequestId(response: any): string | null {
+  return (
+    response?.headers?.get?.('expo-request-id') ?? response?.headers?.get?.('x-request-id') ?? null
+  );
+}
+
+function logBuildRequestErrorDebugInfo(error: any): void {
+  const debugInfo = collectBuildRequestErrorDebugInfo(error);
+  if (debugInfo) {
+    Log.debug(`Build request error details:\n${JSON.stringify(debugInfo, null, 2)}`);
+  }
+}
+
+function collectBuildRequestErrorDebugInfo(error: any): Record<string, unknown> | null {
+  if (!Array.isArray(error?.graphQLErrors) && !error?.response && !error?.networkError) {
+    return null;
+  }
+
+  const debugInfo: Record<string, unknown> = {};
+  if (error?.message) {
+    debugInfo.message = error.message;
+  }
+  if (Array.isArray(error?.graphQLErrors)) {
+    debugInfo.graphQLErrors = error.graphQLErrors;
+  }
+  if (error?.networkError) {
+    debugInfo.networkError = collectErrorDebugInfo(error.networkError);
+  }
+
+  const response = collectResponseDebugInfo(error?.response);
+  if (response) {
+    debugInfo.response = response;
+  }
+
+  return debugInfo;
+}
+
+function collectErrorDebugInfo(error: any): Record<string, unknown> {
+  const debugInfo: Record<string, unknown> = {};
+  for (const property of ['name', 'message', 'code', 'type', 'errno', 'syscall', 'stack']) {
+    if (error?.[property]) {
+      debugInfo[property] = error[property];
+    }
+  }
+  return debugInfo;
+}
+
+function collectResponseDebugInfo(response: any): Record<string, unknown> | null {
+  if (!response) {
+    return null;
+  }
+
+  const debugInfo: Record<string, unknown> = {};
+  for (const property of ['status', 'statusText', 'url']) {
+    if (response[property] !== undefined && response[property] !== '') {
+      debugInfo[property] = response[property];
+    }
+  }
+
+  const headers: Record<string, string> = {};
+  for (const headerName of ['expo-request-id', 'x-request-id', 'content-type']) {
+    const headerValue = response?.headers?.get?.(headerName);
+    if (headerValue) {
+      headers[headerName] = headerValue;
+    }
+  }
+  if (Object.keys(headers).length > 0) {
+    debugInfo.headers = headers;
+  }
+
+  return Object.keys(debugInfo).length > 0 ? debugInfo : null;
+}
+
 async function uploadProjectAsync<TPlatform extends Platform>(
  ctx: BuildContext<TPlatform>
 ): Promise<{
@@ -22,6 +22,7 @@ import {
  loadSimulatorEnvAsync,
  resetSimulatorEnvAsync,
 } from '../../../simulator/env';
+import { Client } from '../../../vcs/vcs';
 import SimulatorStart from '../start';

 jest.mock('fs-extra');
@@ -74,6 +75,14 @@ const mockLoadSimulatorEnvAsync = jest.mocked(loadSimulatorEnvAsync);
 const mockResetSimulatorEnvAsync = jest.mocked(resetSimulatorEnvAsync);
 const mockOra = jest.mocked(ora);
 const mockPromptAsync = jest.mocked(promptAsync);
+const vcsClient = {
+  getCommitHashAsync: jest.fn(),
+  getLastCommitMessageAsync: jest.fn(),
+  getCurrentRefAsync: jest.fn(),
+} as unknown as Client;
+const mockGetCommitHashAsync = jest.mocked(vcsClient.getCommitHashAsync);
+const mockGetLastCommitMessageAsync = jest.mocked(vcsClient.getLastCommitMessageAsync);
+const mockGetCurrentRefAsync = jest.mocked(vcsClient.getCurrentRefAsync);

 function makeCreatedDeviceRunSession(
  overrides: Partial<CreatedDeviceRunSession> = {}
@@ -150,6 +159,9 @@ describe(SimulatorStart, () => {
    mockLoadSimulatorEnvAsync.mockResolvedValue();
    mockResetSimulatorEnvAsync.mockResolvedValue();
    jest.mocked(fs.writeFile).mockResolvedValue(undefined as never);
+    mockGetCommitHashAsync.mockResolvedValue('0123456789abcdef0123456789abcdef01234567');
+    mockGetLastCommitMessageAsync.mockResolvedValue('Show Git context for simulator sessions');
+    mockGetCurrentRefAsync.mockResolvedValue('refs/heads/main');
  });

  afterAll(() => {
@@ -170,6 +182,7 @@ describe(SimulatorStart, () => {
      loggedIn: { graphqlClient },
      projectDir,
      projectId: 'project-123',
+      vcsClient,
    });
    return { command, getContextAsync };
  }
@@ -189,6 +202,9 @@ describe(SimulatorStart, () => {
    });
    expect(mockCreateDeviceRunSessionAsync).toHaveBeenCalledWith(graphqlClient, {
      appId: 'project-123',
+      gitCommitHash: '0123456789abcdef0123456789abcdef01234567',
+      gitCommitMessage: 'Show Git context for simulator sessions',
+      gitRef: 'refs/heads/main',
      packageVersion: undefined,
      platform: AppPlatform.Ios,
      type: DeviceRunSessionType.AgentDevice,
@@ -231,7 +247,7 @@ describe(SimulatorStart, () => {
      [
        '🔑 Run the following to use agent-device with the simulator:',
        '',
-        'eas simulator:exec agent-device <command>',
+        'eas simulator:exec npx agent-device <command>',
        '',
        '🌐 Open the following URL in your browser to preview the simulator:',
        '',
@@ -278,6 +294,9 @@ describe(SimulatorStart, () => {
    );
    expect(mockCreateDeviceRunSessionAsync).toHaveBeenCalledWith(graphqlClient, {
      appId: 'project-123',
+      gitCommitHash: '0123456789abcdef0123456789abcdef01234567',
+      gitCommitMessage: 'Show Git context for simulator sessions',
+      gitRef: 'refs/heads/main',
      packageVersion: undefined,
      platform: AppPlatform.Ios,
      type: DeviceRunSessionType.AgentDevice,
@@ -297,6 +316,9 @@ describe(SimulatorStart, () => {
    );
    expect(mockCreateDeviceRunSessionAsync).toHaveBeenCalledWith(graphqlClient, {
      appId: 'project-123',
+      gitCommitHash: '0123456789abcdef0123456789abcdef01234567',
+      gitCommitMessage: 'Show Git context for simulator sessions',
+      gitRef: 'refs/heads/main',
      packageVersion: undefined,
      platform: AppPlatform.Ios,
      type: DeviceRunSessionType.AgentDevice,
@@ -1,6 +1,7 @@
 import { Flags } from '@oclif/core';
 import nullthrows from 'nullthrows';

+import { truncateGitCommitMessage } from '../../build/metadata';
 import { getDeviceRunSessionUrl } from '../../build/utils/url';
 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
@@ -93,6 +94,7 @@ export default class SimulatorStart extends EasCommand {
    ...this.ContextOptions.ProjectId,
    ...this.ContextOptions.ProjectDir,
    ...this.ContextOptions.LoggedIn,
+    ...this.ContextOptions.Vcs,
  };

  async runAsync(): Promise<void> {
@@ -106,6 +108,7 @@ export default class SimulatorStart extends EasCommand {
    const {
      projectId,
      projectDir,
+      vcsClient,
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(SimulatorStart, {
      nonInteractive,
@@ -120,6 +123,12 @@ export default class SimulatorStart extends EasCommand {
    }

    const platform = await resolvePlatformAsync(flags.platform, nonInteractive);
+    const [gitCommitHash, lastCommitMessage, gitRef] = await Promise.all([
+      vcsClient.getCommitHashAsync(),
+      vcsClient.getLastCommitMessageAsync(),
+      vcsClient.getCurrentRefAsync(),
+    ]);
+    const gitCommitMessage = truncateGitCommitMessage(lastCommitMessage ?? undefined) ?? null;

    if (existingDeviceRunSessionId) {
      Log.warn(
@@ -140,6 +149,9 @@ export default class SimulatorStart extends EasCommand {
        type: DEVICE_RUN_SESSION_TYPE_BY_FLAG_VALUE[flags.type],
        packageVersion: flags['package-version'],
        maxRunTimeMinutes: flags['max-duration-minutes'],
+        gitCommitHash,
+        gitCommitMessage,
+        gitRef,
      });
      deviceRunSessionId = session.id;
      nullthrows(session.turtleJobRun?.id, 'Expected simulator session to start');
@@ -10,10 +10,16 @@ import {
  EnsureDeviceRunSessionStoppedMutationVariables,
 } from '../generated';

+type CreateDeviceRunSessionInputWithGitContext = CreateDeviceRunSessionInput & {
+  gitCommitHash?: string | null;
+  gitCommitMessage?: string | null;
+  gitRef?: string | null;
+};
+
 export const DeviceRunSessionMutation = {
  async createDeviceRunSessionAsync(
    graphqlClient: ExpoGraphqlClient,
-    deviceRunSessionInput: CreateDeviceRunSessionInput
+    deviceRunSessionInput: CreateDeviceRunSessionInputWithGitContext
  ): Promise<CreateDeviceRunSessionMutation['deviceRunSession']['createDeviceRunSession']> {
    const data = await withErrorHandlingAsync(
      graphqlClient
@@ -54,7 +54,7 @@ export function formatRemoteSessionInstructions(
          ? [
              '🔑 Run the following to use agent-device with the simulator:',
              '',
-              'eas simulator:exec agent-device <command>',
+              'eas simulator:exec npx agent-device <command>',
            ]
          : [
              '🔑 Run the following in your shell to attach to the agent-device daemon:',
@@ -243,6 +243,47 @@ describe('git', () => {
    ).resolves.not.toThrow();
  });

+  describe('getCurrentRefAsync', () => {
+    let repoRoot: string;
+    let vcs: GitClient;
+
+    beforeAll(async () => {
+      repoRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'eas-cli-git-ref-test-'));
+      await spawnAsync('git', ['init'], { cwd: repoRoot });
+      await spawnAsync('git', ['checkout', '-b', 'feature/device-sessions'], { cwd: repoRoot });
+      await spawnAsync('git', ['commit', '--allow-empty', '-m', 'initial commit'], {
+        cwd: repoRoot,
+      });
+      vcs = new GitClient({
+        requireCommit: false,
+        maybeCwdOverride: repoRoot,
+      });
+    });
+
+    afterAll(async () => {
+      await fs.rm(repoRoot, { recursive: true, force: true });
+    });
+
+    it('returns a fully qualified branch ref', async () => {
+      await expect(vcs.getCurrentRefAsync()).resolves.toBe('refs/heads/feature/device-sessions');
+    });
+
+    it('returns a fully qualified tag ref for a detached checkout', async () => {
+      await spawnAsync('git', ['tag', 'v1.2.3'], { cwd: repoRoot });
+      await spawnAsync('git', ['checkout', '--detach', 'v1.2.3'], { cwd: repoRoot });
+
+      await expect(vcs.getCurrentRefAsync()).resolves.toBe('refs/tags/v1.2.3');
+    });
+
+    it('returns null for a detached checkout without an exact tag', async () => {
+      await spawnAsync('git', ['commit', '--allow-empty', '-m', 'detached commit'], {
+        cwd: repoRoot,
+      });
+
+      await expect(vcs.getCurrentRefAsync()).resolves.toBeNull();
+    });
+  });
+
  describe('when requireCommit is true', () => {
    it('adheres to .easignore', async () => {
      const repoRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'eas-cli-git-test-'));
@@ -310,6 +310,30 @@ export default class GitClient extends Client {
    }
  }

+  public override async getCurrentRefAsync(): Promise<string | null> {
+    try {
+      const branchRef = (
+        await spawnAsync('git', ['symbolic-ref', '--quiet', 'HEAD'], {
+          cwd: this.maybeCwdOverride,
+        })
+      ).stdout.trim();
+      if (branchRef) {
+        return branchRef;
+      }
+    } catch {}
+
+    try {
+      const tag = (
+        await spawnAsync('git', ['describe', '--tags', '--exact-match', 'HEAD'], {
+          cwd: this.maybeCwdOverride,
+        })
+      ).stdout.trim();
+      return tag ? `refs/tags/${tag}` : null;
+    } catch {
+      return null;
+    }
+  }
+
  public override async getLastCommitMessageAsync(): Promise<string | null> {
    try {
      return (
@@ -66,6 +66,12 @@ export abstract class Client {
    return null;
  }

+  // (optional) returns the fully qualified ref for the current checkout
+  // used for metadata - implementation can be safely skipped
+  public async getCurrentRefAsync(): Promise<string | null> {
+    return null;
+  }
+
  // (optional) returns message of the last commit
  // used for EAS Update - implementation can be safely skipped
  public async getLastCommitMessageAsync(): Promise<string | null> {
Author	SHA1	Message	Date
szdziedzic	254c3986ce	Merge remote-tracking branch 'origin/main' into szdziedzic-codex/device-run-session-git-context-cli # Conflicts: # CHANGELOG.md	2026-07-27 18:33:30 +02:00
szdziedzic	49a2bbb1ab	[eas-cli] Send simulator commit messages	2026-07-27 18:28:13 +02:00
Szymon DziedzicandClaude Opus 4.8	83b86b8ee6	[build-tools] Collect Argent tool-server session events during remote sessions (#4067 ) * [build-tools] Collect Argent tool-server session events during remote sessions Argent's tool-server writes a structured event log (bunyan JSONL at ~/.argent/tool-server-events.jsonl) when the `tool-server-event-log` flag is on (@swmansion/argent >= 0.16.0). Tail it during remote simulator sessions and upload normalized events to the API server, mirroring agent-device. - Extract the file-tailing/upload/poll machinery from deviceRunSessionEvents.ts into a generic, producer-parameterized engine; move the agent-device adapter into agentDeviceEvents.ts (matching the deviceRunSessionArtifacts/Artifacts split). - Add argentEvents.ts: maps tool.invoked/completed/failed onto the shared operation. vocabulary and passes other record types through unchanged. - Enable the event log flag best-effort so older pinned Argent versions (where the flag does not exist) keep working without event collection. Co-Authored-By: Claude Opus 4.8 <[email protected]> * [build-tools] Require @swmansion/argent >= 0.16.0 and enable event log unconditionally Bump MIN_ARGENT_REMOTE_SESSION_VERSION to 0.16.0 (the first version exposing the tool-server event log flag) so the flag is guaranteed to exist, and enable it unconditionally like the artifacts list endpoint flag instead of best-effort. Co-Authored-By: Claude Opus 4.8 <[email protected]> * [build-tools] Address review: pin Argent event log path, tighten discovery, add orchestration test - Pin the event log path and pass it to both the tool-server (via ARGENT_EVENT_LOG) and the collector, so an ambient ARGENT_EVENT_LOG or a change to Argent's default can never make them disagree. - Only treat ENOENT as "no event file" in discovery; surface permission/I/O errors to Sentry via the collector's existing reporting. - Add an orchestration test covering the event-log flag enable, the shared path, and collector startup/cleanup ordering. Co-Authored-By: Claude Opus 4.8 <[email protected]> * [build-tools] Address review: drop naive capitalization and Argent summary fallback - Remove the capitalize() helper. Deriving prose from an identifier mangles casing that matters (iOS -> IOS), so the one message that started with the producer is now phrased to carry it mid-sentence and every diagnostic uses the producer id verbatim. - Argent's EventLogRecord requires `msg` and every emit site sets it to the human-readable description, so use it verbatim as the summary and drop the synthesized fallback. `msg` is now required in the schema, making a record without one a reported contract break rather than invented text. Co-Authored-By: Claude Opus 4.8 <[email protected]> --------- Co-authored-by: Claude Opus 4.8 <[email protected]>	2026-07-27 16:24:00 +02:00
Szymon DziedzicandClaude Opus 5	730c142c46	[eas-cli] Fix EAS logo not rendering in the root README (#4093 ) README.md at the repository root is a symlink to packages/eas-cli/README.md, so the same file is rendered by GitHub at two different depths. The relative `../../.github/resources/eas.svg` src resolves to /expo/eas-cli/raw/main/.github/resources/eas.svg on the package page, but walks above the repository root at the root page, where GitHub clamps it to /expo/eas-cli/.github/resources/eas.svg and the image 404s. Point the logo at an absolute raw URL so it resolves from both depths, and on npm. Co-authored-by: Claude Opus 5 <[email protected]>	2026-07-27 14:25:49 +02:00
Szymon DziedzicandClaude Opus 5	82de82bf7a	[eas-cli] Refresh README (#3844 ) * Refresh EAS CLI README Co-Authored-By: Claude Fable 5 <[email protected]> * Add changelog entry Co-Authored-By: Claude Fable 5 <[email protected]> * Link downloads badge to npm-stat instead of npmtrends npmtrends.com/eas-cli currently returns a 500 on direct load. Co-Authored-By: Claude Fable 5 <[email protected]> * Trim social badge row from README header Co-Authored-By: Claude Opus 4.8 <[email protected]> * [eas-cli] Address README review feedback Drop em dashes, link expo.dev/services instead of the redirecting expo.dev/eas, bump the eas.json version example to >=21.0.0, drop the retired Forums link, fix the 404ing dashboard link and the moved EAS Submit docs URL, and note that README.md's header is generated. Co-Authored-By: Claude Opus 5 <[email protected]> --------- Co-authored-by: Claude Fable 5 <[email protected]>	2026-07-27 14:08:59 +02:00
Szymon DziedzicandClaude Fable 5	d63d58203d	[eas-cli] Improve build request error details (#3982 ) * Improve build request error details * Add changelog entry * [eas-cli] Simplify build request error helpers, dedupe request ID by value - Dedupe the response request ID against GraphQL extension request IDs by comparing the IDs themselves instead of formatted-line substring matching - Always include the top-level error message in debug output instead of the conditional that tried to guess when it was redundant - Collapse formatResponseStatusLine/formatResponseRequestIdLine/ getResponseHeadersForDebug into their callers and rename the object-building helpers from format* to collect* - Pass graphQLErrors into formatBuildRequestErrorDetails instead of re-deriving it - Add tests for the x-request-id fallback, request ID dedupe, and the top-level error message fallback Co-Authored-By: Claude Fable 5 <[email protected]> --------- Co-authored-by: Claude Fable 5 <[email protected]>	2026-07-27 13:42:36 +02:00
Szymon Dziedzic	702d8808d3	[eas-cli] Use npx in agent-device simulator instructions (#4070 ) * [eas-cli] Use npx in agent-device simulator instructions * [eas-cli] Add changelog for simulator instructions	2026-07-27 13:00:49 +02:00
Brent Vatne	a98d929f14	[reviewer] Adopt ECR 0.6.0 trusted-base-commit trust model (#4092 )	2026-07-26 22:34:21 -07:00
Brent Vatne	8d005fe9c3	[reviewer] Switch the credential to the ChatGPT ACCESS token (#4090 )	2026-07-26 19:54:36 -07:00
Expo CI	8dc6bffe36	update CHANGELOG.md	2026-07-27 02:01:04 +00:00
szdziedzic	016923d0ac	[eas-cli] Add simulator Git context changelog	2026-07-24 11:04:59 +02:00
szdziedzic	aa2cbb2357	[eas-cli] Send Git context for simulator sessions	2026-07-24 11:03:16 +02:00